null+****@clear*****
null+****@clear*****
2011年 3月 9日 (水) 16:00:05 JST
Kouhei Sutou 2011-03-09 07:00:05 +0000 (Wed, 09 Mar 2011)
New Revision: 19b9cb6924dac3ec1f0981f46dda584b67dd8fa7
Log:
swap test function order.
Modified files:
test/unit/story/test-taiyaki.c
Modified: test/unit/story/test-taiyaki.c (+22 -22)
===================================================================
--- test/unit/story/test-taiyaki.c 2011-03-09 06:55:13 +0000 (54b5418)
+++ test/unit/story/test-taiyaki.c 2011-03-09 07:00:05 +0000 (6977313)
@@ -22,8 +22,8 @@
#include "../lib/grn-assertions.h"
void test_in_circle(void);
-void test_in_rectangle_long_longitude(void);
void test_in_rectangle_long_latitude(void);
+void test_in_rectangle_long_longitude(void);
void test_in_rectangle_over_border(void);
void test_sort(void);
void test_filter_by_tag_and_sort_by_distance_from_tokyo_tocho(void);
@@ -128,22 +128,24 @@ test_in_circle(void)
}
void
-test_in_rectangle_long_longitude(void)
+test_in_rectangle_long_latitude(void)
{
- gdouble takada_no_baba_latitude = 35.7121;
- gdouble takada_no_baba_longitude = 139.7038;
- gdouble tsukiji_latitude = 35.6684;
- gdouble tsukiji_longitude = 139.7727;
+ gdouble sugamo_latitude = 35.73360;
+ gdouble sugamo_longitude = 139.7394;
+ gdouble daiba_latitude = 35.62614;
+ gdouble daiba_longitude = 139.7714;
gdouble budoukan_latitude = 35.69328;
gdouble budoukan_longitude = 139.74968;
cut_assert_equal_string(
- "[[[3],"
+ "[[[5],"
"[[\"name\",\"ShortText\"],[\"_score\",\"Int32\"],"
"[\"location\",\"WGS84GeoPoint\"]],"
"[\"たい焼き鉄次 大丸東京店\",2186,\"128451283x503166852\"],"
"[\"たいやき神田達磨 八重洲店\",2296,\"128453260x503174156\"],"
- "[\"銀座 かずや\",2415,\"128424629x503139222\"]"
+ "[\"銀座 かずや\",2415,\"128424629x503139222\"],"
+ "[\"根津のたいやき\",3210,\"128592911x503145263\"],"
+ "[\"築地 さのきや\",3579,\"128397312x503174596\"]"
"]]",
send_command(
cut_take_printf(
@@ -152,31 +154,28 @@ test_in_rectangle_long_longitude(void)
"--output_columns 'name, _score, location' "
"--filter 'geo_in_rectangle(location, \"%s\", \"%s\")' "
"--scorer '_score=geo_distance(location, \"%s\")'",
- grn_test_location_string(takada_no_baba_latitude,
- takada_no_baba_longitude),
- grn_test_location_string(tsukiji_latitude, tsukiji_longitude),
+ grn_test_location_string(sugamo_latitude, sugamo_longitude),
+ grn_test_location_string(daiba_latitude, daiba_longitude),
grn_test_location_string(budoukan_latitude, budoukan_longitude))));
}
void
-test_in_rectangle_long_latitude(void)
+test_in_rectangle_long_longitude(void)
{
- gdouble sugamo_latitude = 35.73360;
- gdouble sugamo_longitude = 139.7394;
- gdouble daiba_latitude = 35.62614;
- gdouble daiba_longitude = 139.7714;
+ gdouble takada_no_baba_latitude = 35.7121;
+ gdouble takada_no_baba_longitude = 139.7038;
+ gdouble tsukiji_latitude = 35.6684;
+ gdouble tsukiji_longitude = 139.7727;
gdouble budoukan_latitude = 35.69328;
gdouble budoukan_longitude = 139.74968;
cut_assert_equal_string(
- "[[[5],"
+ "[[[3],"
"[[\"name\",\"ShortText\"],[\"_score\",\"Int32\"],"
"[\"location\",\"WGS84GeoPoint\"]],"
"[\"たい焼き鉄次 大丸東京店\",2186,\"128451283x503166852\"],"
"[\"たいやき神田達磨 八重洲店\",2296,\"128453260x503174156\"],"
- "[\"銀座 かずや\",2415,\"128424629x503139222\"],"
- "[\"根津のたいやき\",3210,\"128592911x503145263\"],"
- "[\"築地 さのきや\",3579,\"128397312x503174596\"]"
+ "[\"銀座 かずや\",2415,\"128424629x503139222\"]"
"]]",
send_command(
cut_take_printf(
@@ -185,8 +184,9 @@ test_in_rectangle_long_latitude(void)
"--output_columns 'name, _score, location' "
"--filter 'geo_in_rectangle(location, \"%s\", \"%s\")' "
"--scorer '_score=geo_distance(location, \"%s\")'",
- grn_test_location_string(sugamo_latitude, sugamo_longitude),
- grn_test_location_string(daiba_latitude, daiba_longitude),
+ grn_test_location_string(takada_no_baba_latitude,
+ takada_no_baba_longitude),
+ grn_test_location_string(tsukiji_latitude, tsukiji_longitude),
grn_test_location_string(budoukan_latitude, budoukan_longitude))));
}