null+****@clear*****
null+****@clear*****
2010年 7月 2日 (金) 21:53:20 JST
Tasuku SUENAGA a.k.a. gunyarakun 2010-07-02 12:53:20 +0000 (Fri, 02 Jul 2010)
New Revision: c48dc82e08290f1cfb245d4618dff2a6712c7926
Log:
Updated test for proc. which returns a bare number.
Modified files:
test/unit/core/test-command-cache-limit.c
test/unit/core/test-command-load.c
Modified: test/unit/core/test-command-cache-limit.c (+5 -5)
===================================================================
--- test/unit/core/test-command-cache-limit.c 2010-07-02 12:23:57 +0000 (01e9829)
+++ test/unit/core/test-command-cache-limit.c 2010-07-02 12:53:20 +0000 (22007da)
@@ -89,14 +89,14 @@ cut_teardown(void)
void
test_get(void)
{
- cut_assert_equal_string("100", send_command("cache_limit"));
+ cut_assert_equal_string("[100]", send_command("cache_limit"));
}
void
test_set(void)
{
- cut_assert_equal_string("100", send_command("cache_limit --max 1000"));
- cut_assert_equal_string("1000", send_command("cache_limit"));
+ cut_assert_equal_string("[100]", send_command("cache_limit --max 1000"));
+ cut_assert_equal_string("[1000]", send_command("cache_limit"));
}
void
@@ -107,7 +107,7 @@ test_set_invalid_minus(void)
GRN_INVALID_ARGUMENT,
"max value is invalid unsigned integer format: <-1>",
"cache_limit --max -1");
- cut_assert_equal_string("100", send_command("cache_limit"));
+ cut_assert_equal_string("[100]", send_command("cache_limit"));
}
void
@@ -118,5 +118,5 @@ test_set_invalid_string(void)
GRN_INVALID_ARGUMENT,
"max value is invalid unsigned integer format: <LIMIT>",
"cache_limit --max LIMIT");
- cut_assert_equal_string("100", send_command("cache_limit"));
+ cut_assert_equal_string("[100]", send_command("cache_limit"));
}
Modified: test/unit/core/test-command-load.c (+3 -3)
===================================================================
--- test/unit/core/test-command-load.c 2010-07-02 12:23:57 +0000 (1a3b21a)
+++ test/unit/core/test-command-load.c 2010-07-02 12:53:20 +0000 (8967a71)
@@ -90,7 +90,7 @@ test_columns(void)
assert_send_command("column_create Users name COLUMN_SCALAR ShortText");
assert_send_command("column_create Users desc COLUMN_SCALAR ShortText");
cut_assert_equal_string(
- "2",
+ "[2]",
send_command("load --table Users --columns '_key,name,desc'\n"
"[\n"
" [\"mori\", \"モリ\", \"タポ\"],\n"
@@ -157,7 +157,7 @@ test_bool(gconstpointer data)
{
assert_send_command("table_create Users TABLE_HASH_KEY ShortText");
assert_send_command("column_create Users enabled COLUMN_SCALAR Bool");
- cut_assert_equal_string("2",
+ cut_assert_equal_string("[2]",
send_command(gcut_data_get_string(data,
"load-command")));
cut_assert_equal_string("[[[2],"
@@ -178,7 +178,7 @@ test_int32_key(void)
assert_send_command("table_create Students TABLE_HASH_KEY Int32");
assert_send_command("column_create Students name COLUMN_SCALAR ShortText");
cut_assert_equal_string(
- "1",
+ "[1]",
send_command("load --table Students\n"
"[{\"_key\": 1, \"name\": \"morita\"}]"));
cut_assert_equal_string("[[[1],"