null+****@clear*****
null+****@clear*****
2011年 11月 19日 (土) 22:32:36 JST
Kouhei Sutou 2011-11-19 13:32:36 +0000 (Sat, 19 Nov 2011)
New Revision: 0618be07fc3d19dbb2ce7fc728314de1a7771731
Log:
[test] follow key management backend change. fixes #1167
key managerment backend was changed to grn_dat from grn_pat at
964ec43bf468229b119de155bc14b3eee49706d1
Modified files:
test/unit/core/test-command-column-list.c
test/unit/core/test-command-dump.c
test/unit/core/test-command-load.c
test/unit/core/test-command-select.c
Modified: test/unit/core/test-command-column-list.c (+20 -20)
===================================================================
--- test/unit/core/test-command-column-list.c 2011-11-19 13:18:23 +0000 (10f9665)
+++ test/unit/core/test-command-column-list.c 2011-11-19 13:32:36 +0000 (885c7b4)
@@ -106,27 +106,27 @@ test_columns(void)
"[]"
"],"
"[%d,"
- "\"comment\","
- "\"%s.0000102\","
- "\"var\","
+ "\"age\","
+ "\"%s.0000101\","
+ "\"fix\","
"\"COLUMN_SCALAR|PERSISTENT\","
"\"Users\","
- "\"Text\","
+ "\"UInt32\","
"[]"
"],"
"[%d,"
- "\"age\","
- "\"%s.0000101\","
- "\"fix\","
+ "\"comment\","
+ "\"%s.0000102\","
+ "\"var\","
"\"COLUMN_SCALAR|PERSISTENT\","
"\"Users\","
- "\"UInt32\","
+ "\"Text\","
"[]"
"]"
"]",
grn_obj_id(context, get("Users")),
- grn_obj_id(context, get("Users.comment")), database_path,
- grn_obj_id(context, get("Users.age")), database_path),
+ grn_obj_id(context, get("Users.age")), database_path,
+ grn_obj_id(context, get("Users.comment")), database_path),
send_command("column_list Users"));
}
@@ -218,24 +218,24 @@ test_xml(void)
"<SOURCES></SOURCES></COLUMN>\n"
"<COLUMN>\n"
"<INT>%u</INT>\n"
- "<TEXT>comment</TEXT>\n"
- "<TEXT>%s.0000102</TEXT>\n"
- "<TEXT>var</TEXT>\n"
+ "<TEXT>age</TEXT>\n"
+ "<TEXT>%s.0000101</TEXT>\n"
+ "<TEXT>fix</TEXT>\n"
"<TEXT>COLUMN_SCALAR|PERSISTENT</TEXT>\n"
"<TEXT>Users</TEXT>\n"
- "<TEXT>Text</TEXT>\n"
+ "<TEXT>UInt32</TEXT>\n"
"<SOURCES></SOURCES></COLUMN>\n"
"<COLUMN>\n"
"<INT>%u</INT>\n"
- "<TEXT>age</TEXT>\n"
- "<TEXT>%s.0000101</TEXT>\n"
- "<TEXT>fix</TEXT>\n"
+ "<TEXT>comment</TEXT>\n"
+ "<TEXT>%s.0000102</TEXT>\n"
+ "<TEXT>var</TEXT>\n"
"<TEXT>COLUMN_SCALAR|PERSISTENT</TEXT>\n"
"<TEXT>Users</TEXT>\n"
- "<TEXT>UInt32</TEXT>\n"
+ "<TEXT>Text</TEXT>\n"
"<SOURCES></SOURCES></COLUMN></COLUMN_LIST>",
grn_obj_id(context, get("Users")),
- grn_obj_id(context, get("Users.comment")), database_path,
- grn_obj_id(context, get("Users.age")), database_path),
+ grn_obj_id(context, get("Users.age")), database_path,
+ grn_obj_id(context, get("Users.comment")), database_path),
send_command("column_list Users --output_type xml"));
}
Modified: test/unit/core/test-command-dump.c (+2 -2)
===================================================================
--- test/unit/core/test-command-dump.c 2011-11-19 13:18:23 +0000 (2d60802)
+++ test/unit/core/test-command-dump.c 2011-11-19 13:32:36 +0000 (e4e3391)
@@ -528,8 +528,8 @@ test_load_with_vector_int32_reference_key(void)
"]\n"
"load --table comments\n"
"[\n"
- "[\"_key\",\"text\",\"author\"],\n"
- "[\"groonga\",\"it is fast\",[1000,1001]]\n"
+ "[\"_key\",\"author\",\"text\"],\n"
+ "[\"groonga\",[1000,1001],\"it is fast\"]\n"
"]";
assert_send_commands(commands);
Modified: test/unit/core/test-command-load.c (+23 -23)
===================================================================
--- test/unit/core/test-command-load.c 2011-11-19 13:18:23 +0000 (c5f48f0)
+++ test/unit/core/test-command-load.c 2011-11-19 13:32:36 +0000 (69798a8)
@@ -116,11 +116,11 @@ test_columns(void)
"["
"[\"_id\",\"UInt32\"],"
"[\"_key\",\"ShortText\"],"
- "[\"name\",\"ShortText\"],"
- "[\"desc\",\"ShortText\"]"
+ "[\"desc\",\"ShortText\"],"
+ "[\"name\",\"ShortText\"]"
"],"
- "[1,\"mori\",\"モリ\",\"タポ\"],"
- "[2,\"tapo\",\"タポ\",\"モリモリモリタポ\"]"
+ "[1,\"mori\",\"タポ\",\"モリ\"],"
+ "[2,\"tapo\",\"モリモリモリタポ\",\"タポ\"]"
"]]",
send_command("select Users"));
}
@@ -239,9 +239,9 @@ data_null(void)
"[[[1],"
"[[\"_id\",\"UInt32\"],"
"[\"_key\",\"ShortText\"],"
- "[\"scores\",\"Int32\"],"
- "[\"nick\",\"ShortText\"]],"
- "[1,\"Daijiro MORI\",[5,5,5],\"\"]]]",
+ "[\"nick\",\"ShortText\"],"
+ "[\"scores\",\"Int32\"]],"
+ "[1,\"Daijiro MORI\",\"\",[5,5,5]]]]",
"load --table Students --columns '_key, nick'\n"
"[\n"
" [\"Daijiro MORI\", null]\n"
@@ -250,9 +250,9 @@ data_null(void)
"[[[1],"
"[[\"_id\",\"UInt32\"],"
"[\"_key\",\"ShortText\"],"
- "[\"scores\",\"Int32\"],"
- "[\"nick\",\"ShortText\"]],"
- "[1,\"Daijiro MORI\",[5,5,5],\"\"]]]",
+ "[\"nick\",\"ShortText\"],"
+ "[\"scores\",\"Int32\"]],"
+ "[1,\"Daijiro MORI\",\"\",[5,5,5]]]]",
"load --table Students --columns '_key, nick'\n"
"[\n"
" [\"Daijiro MORI\", \"\"]\n"
@@ -262,9 +262,9 @@ data_null(void)
"[[[1],"
"[[\"_id\",\"UInt32\"],"
"[\"_key\",\"ShortText\"],"
- "[\"scores\",\"Int32\"],"
- "[\"nick\",\"ShortText\"]],"
- "[1,\"Daijiro MORI\",[],\"morita\"]]]",
+ "[\"nick\",\"ShortText\"],"
+ "[\"scores\",\"Int32\"]],"
+ "[1,\"Daijiro MORI\",\"morita\",[]]]]",
"load --table Students --columns '_key, scores'\n"
"[\n"
" [\"Daijiro MORI\", null]\n"
@@ -273,9 +273,9 @@ data_null(void)
"[[[1],"
"[[\"_id\",\"UInt32\"],"
"[\"_key\",\"ShortText\"],"
- "[\"scores\",\"Int32\"],"
- "[\"nick\",\"ShortText\"]],"
- "[1,\"Daijiro MORI\",[],\"morita\"]]]",
+ "[\"nick\",\"ShortText\"],"
+ "[\"scores\",\"Int32\"]],"
+ "[1,\"Daijiro MORI\",\"morita\",[]]]]",
"load --table Students --columns '_key, scores'\n"
"[\n"
" [\"Daijiro MORI\", \"\"]\n"
@@ -284,9 +284,9 @@ data_null(void)
"[[[1],"
"[[\"_id\",\"UInt32\"],"
"[\"_key\",\"ShortText\"],"
- "[\"scores\",\"Int32\"],"
- "[\"nick\",\"ShortText\"]],"
- "[1,\"Daijiro MORI\",[],\"morita\"]]]",
+ "[\"nick\",\"ShortText\"],"
+ "[\"scores\",\"Int32\"]],"
+ "[1,\"Daijiro MORI\",\"morita\",[]]]]",
"load --table Students --columns '_key, scores'\n"
"[\n"
" [\"Daijiro MORI\", []]\n"
@@ -556,10 +556,10 @@ test_each(gconstpointer data)
"[[[2],"
"[[\"_id\",\"UInt32\"],"
"[\"_key\",\"ShortText\"],"
- "[\"location\",\"WGS84GeoPoint\"],"
- "[\"distance_from_tokyo_tocho\",\"UInt32\"]],"
- "[1,\"alice\",\"128429532x503148672\",6674],"
- "[2,\"bob\",\"128536272x502686360\",5364]]]",
+ "[\"distance_from_tokyo_tocho\",\"UInt32\"],"
+ "[\"location\",\"WGS84GeoPoint\"]],"
+ "[1,\"alice\",6674,\"128429532x503148672\"],"
+ "[2,\"bob\",5364,\"128536272x502686360\"]]]",
send_command("select Users"));
}
Modified: test/unit/core/test-command-select.c (+6 -6)
===================================================================
--- test/unit/core/test-command-select.c 2011-11-19 13:18:23 +0000 (0902c26)
+++ test/unit/core/test-command-select.c 2011-11-19 13:32:36 +0000 (42b5dba)
@@ -313,9 +313,9 @@ test_vector_reference_id(void)
cut_assert_equal_string("[[[1],"
"[[\"_id\",\"UInt32\"],"
"[\"_key\",\"ShortText\"],"
- "[\"text\",\"ShortText\"],"
- "[\"authors\",\"Users\"]],"
- "[1,\"groonga\",\"it is fast\",[1,2]]]]",
+ "[\"authors\",\"Users\"],"
+ "[\"text\",\"ShortText\"]],"
+ "[1,\"groonga\",[1,2],\"it is fast\"]]]",
send_command("select Comments"));
}
@@ -347,9 +347,9 @@ test_vector_int32_reference_key(void)
cut_assert_equal_string("[[[1],"
"[[\"_id\",\"UInt32\"],"
"[\"_key\",\"ShortText\"],"
- "[\"text\",\"ShortText\"],"
- "[\"authors\",\"Users\"]],"
- "[1,\"groonga\",\"it is fast\",[1000,1001]]]]",
+ "[\"authors\",\"Users\"],"
+ "[\"text\",\"ShortText\"]],"
+ "[1,\"groonga\",[1000,1001],\"it is fast\"]]]",
send_command("select Comments"));
}