null+****@clear*****
null+****@clear*****
2010年 6月 28日 (月) 11:40:07 JST
Kouhei Sutou 2010-06-28 02:40:07 +0000 (Mon, 28 Jun 2010)
New Revision: 5f5dd0373827f0c7f7e74d7301c97d58e1a61f84
Log:
test-table-sort-key -> test-table-sort-key-from-str.
Modified files:
test/unit/core/Makefile.am
Renamed files:
test/unit/core/test-table-sort-key-from-str.c
(from test/unit/core/test-table-sort-key.c)
Modified: test/unit/core/Makefile.am (+2 -2)
===================================================================
--- test/unit/core/Makefile.am 2010-06-26 08:43:26 +0000 (ddb2d18)
+++ test/unit/core/Makefile.am 2010-06-28 02:40:07 +0000 (b7da96f)
@@ -34,7 +34,7 @@ noinst_LTLIBRARIES = \
test-function-cast.la \
test-store-ja.la \
test-log.la \
- test-table-sort-key.la \
+ test-table-sort-key-from-str.la \
test-inspect.la \
test-command-load.la \
test-command-column-list.la \
@@ -97,7 +97,7 @@ test_register_la_SOURCES = test-register.c
test_function_cast_la_SOURCES = test-function-cast.c
test_store_ja_la_SOURCES = test-store-ja.c
test_log_la_SOURCES = test-log.c
-test_table_sort_key_la_SOURCES = test-table-sort-key.c
+test_table_sort_key_from_str_la_SOURCES = test-table-sort-key-from-str.c
test_inspect_la_SOURCES = test-inspect.c
test_command_load_la_SOURCES = test-command-load.c
test_command_column_list_la_SOURCES = test-command-column-list.c
Renamed: test/unit/core/test-table-sort-key-from-str.c (+9 -9) 89%
===================================================================
--- test/unit/core/test-table-sort-key.c 2010-06-26 08:43:26 +0000 (368c5e7)
+++ test/unit/core/test-table-sort-key-from-str.c 2010-06-28 02:40:07 +0000 (04d3cf4)
@@ -23,10 +23,10 @@
#include "../lib/grn-assertions.h"
-void data_table_sort_key_from_str(void);
-void test_table_sort_key_from_str(gconstpointer data);
-void data_table_sort_key_from_str_invalid(void);
-void test_table_sort_key_from_str_invalid(gconstpointer data);
+void data_valid(void);
+void test_valid(gconstpointer data);
+void data_invalid(void);
+void test_invalid(gconstpointer data);
static gchar *tmp_directory;
@@ -39,7 +39,7 @@ cut_startup(void)
{
tmp_directory = g_build_filename(grn_test_get_base_dir(),
"tmp",
- "table-sort-key",
+ "table-sort-key-from-str",
NULL);
}
@@ -87,7 +87,7 @@ cut_teardown(void)
}
void
-data_table_sort_key_from_str(void)
+data_valid(void)
{
#define ADD_DATUM(str, count) \
gcut_add_datum("[" str "] == " #count, \
@@ -115,7 +115,7 @@ data_table_sort_key_from_str(void)
}
void
-test_table_sort_key_from_str(gconstpointer data)
+test_valid(gconstpointer data)
{
unsigned i, nkeys;
const char *str = gcut_data_get_string(data, "keys");
@@ -129,7 +129,7 @@ test_table_sort_key_from_str(gconstpointer data)
}
void
-data_table_sort_key_from_str_invalid(void)
+data_invalid(void)
{
#define ADD_DATUM(str) \
gcut_add_datum("[" str "] is invalid", \
@@ -147,7 +147,7 @@ data_table_sort_key_from_str_invalid(void)
}
void
-test_table_sort_key_from_str_invalid(gconstpointer data)
+test_invalid(gconstpointer data)
{
unsigned nkeys;
const char *str = gcut_data_get_string(data, "keys");