null+****@clear*****
null+****@clear*****
2011年 12月 28日 (水) 11:37:17 JST
Kouhei Sutou 2011-12-28 11:37:17 +0900 (Wed, 28 Dec 2011)
New Revision: 43835297d3edada119fdfa8c5fe53a2403606ff4
Log:
[geo][test] follow approximate type changes. refs #1226
Modified files:
test/unit/core/test-geo.c
Modified: test/unit/core/test-geo.c (+15 -15)
===================================================================
--- test/unit/core/test-geo.c 2011-12-28 11:36:15 +0900 (eda0580)
+++ test/unit/core/test-geo.c 2011-12-28 11:37:17 +0900 (5065d91)
@@ -28,10 +28,10 @@
void test_in_circle(void);
void test_in_rectangle(void);
-void data_distance(void);
-void test_distance(gconstpointer data);
-void test_distance2(void);
-void test_distance3(void);
+void data_distance_rectangle(void);
+void test_distance_rectangle(gconstpointer data);
+void test_distance_sphere(void);
+void test_distance_ellipsoid(void);
void test_estimate_in_rectangle(void);
static gchar *tmp_directory;
@@ -234,7 +234,7 @@ assign_shinjuku_and_takane(gconstpointer data)
}
void
-data_distance(void)
+data_distance_rectangle(void)
{
#define ADD_DATUM(label, shinjuku, takane) \
gcut_add_datum(label, \
@@ -271,29 +271,29 @@ data_distance(void)
}
void
-test_distance(gconstpointer data)
+test_distance_rectangle(gconstpointer data)
{
assign_shinjuku_and_takane(data);
cut_assert_equal_double(12585.4, 10,
- grn_geo_distance(context, shinjuku, takane));
+ grn_geo_distance_rectangle(context, shinjuku, takane));
}
void
-test_distance2(void)
+test_distance_sphere(void)
{
cut_assert_equal_double(12585.4, 10,
- grn_geo_distance2(context,
- shinjuku_wgs84,
- takane_wgs84));
+ grn_geo_distance_sphere(context,
+ shinjuku_wgs84,
+ takane_wgs84));
}
void
-test_distance3(void)
+test_distance_ellipsoid(void)
{
cut_assert_equal_double(12640.8, 10,
- grn_geo_distance3(context,
- shinjuku_wgs84,
- takane_wgs84));
+ grn_geo_distance_ellipsoid(context,
+ shinjuku_wgs84,
+ takane_wgs84));
}
void