null+****@clear*****
null+****@clear*****
2010年 7月 27日 (火) 11:59:33 JST
Kouhei Sutou 2010-07-27 02:59:33 +0000 (Tue, 27 Jul 2010)
New Revision: 556029f858a12b609dcba9df5ac9e9d492ceefcf
Log:
use more suitable test data.
Modified files:
test/unit/core/test-table-patricia-trie-sort.c
Modified: test/unit/core/test-table-patricia-trie-sort.c (+80 -58)
===================================================================
--- test/unit/core/test-table-patricia-trie-sort.c 2010-07-27 00:29:01 +0000 (f2d6423)
+++ test/unit/core/test-table-patricia-trie-sort.c 2010-07-27 02:59:33 +0000 (7b8b116)
@@ -175,60 +175,64 @@ data_near_geo(void)
NULL)
ADD_DATA("no limit",
- gcut_list_string_new(INSPECTED_POINT(1, 2, 3,
- 4, 5, 6),
- INSPECTED_POINT(1, 2, 3,
- 7, 8, 9),
- INSPECTED_POINT(7, 8, 9,
- 4, 5, 6),
- INSPECTED_POINT(-89, -59, -59,
- 1, 2, 3),
- INSPECTED_POINT(89, 59, 59,
- -178, -58, -57),
- INSPECTED_POINT(-88, -58, -57,
- -178, -58, -57),
- INSPECTED_POINT(88, 58, 58,
- 178, 58, 58),
- INSPECTED_POINT(89, 59, 59,
- 179, 59, 59),
- INSPECTED_POINT(1, 2, 3,
- 179, 59, 59),
+ gcut_list_string_new(INSPECTED_POINT(-1, -1, -1,
+ 0, 0, 0),
+ INSPECTED_POINT(1, 0, 0,
+ 1, 0, 0),
+ INSPECTED_POINT(-1, 0, 0,
+ 1, 1, 1),
+ INSPECTED_POINT(1, 1, 0,
+ 1, 1, 0),
+ INSPECTED_POINT(1, 1, 1,
+ 1, 1, 1),
+ INSPECTED_POINT(1, 1, 10,
+ -1, -1, -1),
+ INSPECTED_POINT(-1, -2, -1,
+ -1, -1, -1),
+ INSPECTED_POINT(90, 0, 0,
+ 0, 0, 0),
+ INSPECTED_POINT(-90, 0, 0,
+ 1, 0, 0),
+ INSPECTED_POINT(-2, -1, -1,
+ -179, -59, -59),
+ INSPECTED_POINT(2, 1, 1,
+ 180, 0, 0),
+ INSPECTED_POINT(1, 2, 1,
+ -179, -59, -59),
+ INSPECTED_POINT(-1, -1, -1,
+ 180, 0, 0),
+ INSPECTED_POINT(0, 0, 0,
+ -179, -59, -59),
+ INSPECTED_POINT(0, 0, 0,
+ 180, 0, 0),
NULL),
TAKEN_POINT(0, 0, 0,
0, 0, 0),
0, -1);
ADD_DATA("limit",
- gcut_list_string_new(INSPECTED_POINT(1, 2, 3,
- 4, 5, 6),
- INSPECTED_POINT(1, 2, 3,
- 7, 8, 9),
- INSPECTED_POINT(7, 8, 9,
- 4, 5, 6),
- INSPECTED_POINT(-89, -59, -59,
- 1, 2, 3),
- INSPECTED_POINT(89, 59, 59,
- -178, -58, -57),
+ gcut_list_string_new(INSPECTED_POINT(-1, -1, -1,
+ 0, 0, 0),
+ INSPECTED_POINT(1, 0, 0,
+ 1, 0, 0),
+ INSPECTED_POINT(-1, 0, 0,
+ 1, 1, 1),
NULL),
TAKEN_POINT(0, 0, 0,
0, 0, 0),
- 0, 5);
+ 0, 3);
ADD_DATA("offset - limit",
- gcut_list_string_new(INSPECTED_POINT(7, 8, 9,
- 4, 5, 6),
- INSPECTED_POINT(-89, -59, -59,
- 1, 2, 3),
- INSPECTED_POINT(89, 59, 59,
- -178, -58, -57),
- INSPECTED_POINT(-88, -58, -57,
- -178, -58, -57),
- INSPECTED_POINT(88, 58, 58,
- 178, 58, 58),
+ gcut_list_string_new(INSPECTED_POINT(-1, 0, 0,
+ 1, 1, 1),
+ INSPECTED_POINT(1, 1, 0,
+ 1, 1, 0),
+ INSPECTED_POINT(1, 1, 1,
+ 1, 1, 1),
NULL),
TAKEN_POINT(0, 0, 0,
0, 0, 0),
- 2, 5);
+ 2, 3);
#undef ADD_DATA
}
@@ -251,25 +255,43 @@ test_near_geo(gpointer data)
" [\"%s\"],\n"
" [\"%s\"],\n"
" [\"%s\"],\n"
+ " [\"%s\"],\n"
+ " [\"%s\"],\n"
+ " [\"%s\"],\n"
+ " [\"%s\"],\n"
+ " [\"%s\"],\n"
+ " [\"%s\"],\n"
" [\"%s\"]",
- TAKEN_POINT(1, 2, 3,
- 4, 5, 6),
- TAKEN_POINT(1, 2, 3,
- 7, 8, 9),
- TAKEN_POINT(7, 8, 9,
- 4, 5, 6),
- TAKEN_POINT(89, 59, 59,
- 179, 59, 59),
- TAKEN_POINT(89, 59, 59,
- -178, -58, -57),
- TAKEN_POINT(88, 58, 58,
- 178, 58, 58),
- TAKEN_POINT(-89, -59, -59,
- 1, 2, 3),
- TAKEN_POINT(1, 2, 3,
- 179, 59, 59),
- TAKEN_POINT(-88, -58, -57,
- -178, -58, -57)));
+ TAKEN_POINT(0, 0, 0,
+ 180, 0, 0),
+ TAKEN_POINT(0, 0, 0,
+ -179, -59, -59),
+ TAKEN_POINT(-1, -1, -1,
+ 180, 0, 0),
+ TAKEN_POINT(2, 1, 1,
+ 180, 0, 0),
+ TAKEN_POINT(-2, -1, -1,
+ -179, -59, -59),
+ TAKEN_POINT(1, 2, 1,
+ -179, -59, -59),
+ TAKEN_POINT(90, 0, 0,
+ 0, 0, 0),
+ TAKEN_POINT(-90, 0, 0,
+ 1, 0, 0),
+ TAKEN_POINT(1, 0, 0,
+ 1, 0, 0),
+ TAKEN_POINT(1, 1, 0,
+ 1, 1, 0),
+ TAKEN_POINT(1, 1, 1,
+ 1, 1, 1),
+ TAKEN_POINT(-1, 0, 0,
+ 1, 1, 1),
+ TAKEN_POINT(-1, -1, -1,
+ 0, 0, 0),
+ TAKEN_POINT(-1, -2, -1,
+ -1, -1, -1),
+ TAKEN_POINT(1, 1, 10,
+ -1, -1, -1)));
result = grn_table_create(context, NULL, 0, NULL, GRN_TABLE_NO_KEY,
NULL, table);