null+****@clear*****
null+****@clear*****
2012年 4月 18日 (水) 14:26:34 JST
khayashi 2012-04-18 14:26:34 +0900 (Wed, 18 Apr 2012) New Revision: 578530d4f51f986e8a6dc576c062e3b93e13bf7d Log: test: migrate a test from Cutter to grntest style The test checks output_columns option ignores spaces in argument. Added files: test/function/suite/select/output-columns/with-space.expected test/function/suite/select/output-columns/with-space.test Modified files: test/unit/core/test-command-select.c Added: test/function/suite/select/output-columns/with-space.expected (+44 -0) 100644 =================================================================== --- /dev/null +++ test/function/suite/select/output-columns/with-space.expected 2012-04-18 14:26:34 +0900 (6cb56dc) @@ -0,0 +1,44 @@ +table_create Sites TABLE_HASH_KEY ShortText +[[0,0.0,0.0],true] +column_create Sites uri COLUMN_SCALAR ShortText +[[0,0.0,0.0],true] +load --table Sites +[ +["_key","uri"], +["groonga","http://groonga.org/"], +["razil","http://razil.jp/"] +] +[[0,0.0,0.0],2] +select Sites --output_columns '_key, uri' +[ + [ + 0, + 0.0, + 0.0 + ], + [ + [ + [ + 2 + ], + [ + [ + "_key", + "ShortText" + ], + [ + "uri", + "ShortText" + ] + ], + [ + "groonga", + "http://groonga.org/" + ], + [ + "razil", + "http://razil.jp/" + ] + ] + ] +] Added: test/function/suite/select/output-columns/with-space.test (+11 -0) 100644 =================================================================== --- /dev/null +++ test/function/suite/select/output-columns/with-space.test 2012-04-18 14:26:34 +0900 (ec538d4) @@ -0,0 +1,11 @@ +table_create Sites TABLE_HASH_KEY ShortText +column_create Sites uri COLUMN_SCALAR ShortText + +load --table Sites +[ +["_key","uri"], +["groonga","http://groonga.org/"], +["razil","http://razil.jp/"] +] + +select Sites --output_columns '_key, uri' Modified: test/unit/core/test-command-select.c (+0 -21) =================================================================== --- test/unit/core/test-command-select.c 2012-04-17 11:48:37 +0900 (5a04907) +++ test/unit/core/test-command-select.c 2012-04-18 14:26:34 +0900 (def9c88) @@ -24,7 +24,6 @@ #include "../lib/grn-assertions.h" -void test_output_columns_with_space(void); void test_vector_geo_point(void); void test_vector_geo_point_with_query(void); void test_unmatched_output_columns(void); @@ -102,26 +101,6 @@ cut_teardown(void) } void -test_output_columns_with_space(void) -{ - assert_send_commands("table_create Sites TABLE_HASH_KEY ShortText\n" - "column_create Sites uri COLUMN_SCALAR ShortText\n" - "load --table Sites\n" - "[\n" - "[\"_key\",\"uri\"],\n" - "[\"groonga\",\"http://groonga.org/\"],\n" - "[\"razil\",\"http://razil.jp/\"]\n" - "]"); - cut_assert_equal_string("[[[2]," - "[[\"_key\",\"ShortText\"]," - "[\"uri\",\"ShortText\"]]," - "[\"groonga\",\"http://groonga.org/\"]," - "[\"razil\",\"http://razil.jp/\"]]]", - send_command("select Sites " - "--output_columns '_key, uri'")); -} - -void test_vector_geo_point(void) { assert_send_command("table_create Shops TABLE_HASH_KEY ShortText");