From 96f62c426a7b9142fa4f33fbedb756063fa73208 Mon Sep 17 00:00:00 2001 From: konn Date: Sun, 6 Apr 2008 14:50:23 +0000 Subject: [PATCH] * Added test code for attribute to CHTML1.0 converter. git-svn-id: svn+ssh://svn.sourceforge.jp/svnroot/modchxj/mod_chxj/branches/RELEASE_0_11_0@2030 1a406e8e-add9-4483-a2c8-d8cac5b7c224 --- src/chxj_chtml10.c | 9 +- test/chxj_chtml10/test_chxj_chtml10.c | 150 ++++++++++++++++++++++++++++++++++ 2 files changed, 156 insertions(+), 3 deletions(-) diff --git a/src/chxj_chtml10.c b/src/chxj_chtml10.c index 0a81f150..eaf9364f 100644 --- a/src/chxj_chtml10.c +++ b/src/chxj_chtml10.c @@ -1987,9 +1987,12 @@ s_chtml10_start_input_tag(void* pdoc, Node* node) } if (name) { - W10_L(" name=\""); - W10_V(name); - W10_L("\""); + name = qs_trim_string(doc->buf.pool,name); + if (name && *name != 0) { + W10_L(" name=\""); + W10_V(name); + W10_L("\""); + } } if (value) { diff --git a/test/chxj_chtml10/test_chxj_chtml10.c b/test/chxj_chtml10/test_chxj_chtml10.c index 2d391247..efa283e4 100644 --- a/test/chxj_chtml10/test_chxj_chtml10.c +++ b/test/chxj_chtml10/test_chxj_chtml10.c @@ -249,6 +249,11 @@ void test_chtml10_input_tag_008(); void test_chtml10_input_tag_009(); void test_chtml10_input_tag_010(); void test_chtml10_input_tag_011(); +void test_chtml10_input_tag_012(); +void test_chtml10_input_tag_013(); +void test_chtml10_input_tag_014(); +void test_chtml10_input_tag_015(); +void test_chtml10_input_tag_016(); int @@ -450,6 +455,11 @@ main() CU_add_test(chtml10_suite, "test with value(submit)." , test_chtml10_input_tag_009); CU_add_test(chtml10_suite, "test with value(reset)." , test_chtml10_input_tag_010); CU_add_test(chtml10_suite, "test with value(unknown)." , test_chtml10_input_tag_011); + CU_add_test(chtml10_suite, "test ." , test_chtml10_input_tag_012); + CU_add_test(chtml10_suite, "test with void value." , test_chtml10_input_tag_013); + CU_add_test(chtml10_suite, "test with alphabetic value." , test_chtml10_input_tag_014); + CU_add_test(chtml10_suite, "test with japanese value." , test_chtml10_input_tag_015); + CU_add_test(chtml10_suite, "test with japanese-hankaku value." , test_chtml10_input_tag_016); CU_basic_run_tests(); CU_cleanup_registry(); @@ -5896,6 +5906,146 @@ void test_chtml10_input_tag_011() #undef TEST_STRING #undef RESULT_STRING } +void test_chtml10_input_tag_012() +{ +#define TEST_STRING "" +#define RESULT_STRING "" + char *ret; + char *tmp; + device_table spec; + chxjconvrule_entry entry; + cookie_t cookie; + apr_size_t destlen; + APR_INIT; + + COOKIE_INIT(cookie); + + SPEC_INIT(spec); + destlen = sizeof(TEST_STRING)-1; + + tmp = chxj_encoding(&r, TEST_STRING, &destlen); + ret = chxj_exchange_chtml10(&r, &spec, tmp, destlen, &destlen, &entry, &cookie); + ret = chxj_rencoding(&r, ret, &destlen); + CU_ASSERT(ret != NULL); + CU_ASSERT(strcmp(RESULT_STRING, ret) == 0); + CU_ASSERT(destlen == sizeof(RESULT_STRING)-1); + + APR_TERM; +#undef TEST_STRING +#undef RESULT_STRING +} +void test_chtml10_input_tag_013() +{ +#define TEST_STRING "" +#define RESULT_STRING "" + char *ret; + char *tmp; + device_table spec; + chxjconvrule_entry entry; + cookie_t cookie; + apr_size_t destlen; + APR_INIT; + + COOKIE_INIT(cookie); + + SPEC_INIT(spec); + destlen = sizeof(TEST_STRING)-1; + + tmp = chxj_encoding(&r, TEST_STRING, &destlen); + ret = chxj_exchange_chtml10(&r, &spec, tmp, destlen, &destlen, &entry, &cookie); + ret = chxj_rencoding(&r, ret, &destlen); + CU_ASSERT(ret != NULL); + CU_ASSERT(strcmp(RESULT_STRING, ret) == 0); + CU_ASSERT(destlen == sizeof(RESULT_STRING)-1); + + APR_TERM; +#undef TEST_STRING +#undef RESULT_STRING +} +void test_chtml10_input_tag_014() +{ +#define TEST_STRING "" +#define RESULT_STRING "" + char *ret; + char *tmp; + device_table spec; + chxjconvrule_entry entry; + cookie_t cookie; + apr_size_t destlen; + APR_INIT; + + COOKIE_INIT(cookie); + + SPEC_INIT(spec); + destlen = sizeof(TEST_STRING)-1; + + tmp = chxj_encoding(&r, TEST_STRING, &destlen); + ret = chxj_exchange_chtml10(&r, &spec, tmp, destlen, &destlen, &entry, &cookie); + ret = chxj_rencoding(&r, ret, &destlen); + CU_ASSERT(ret != NULL); + CU_ASSERT(strcmp(RESULT_STRING, ret) == 0); + CU_ASSERT(destlen == sizeof(RESULT_STRING)-1); + + APR_TERM; +#undef TEST_STRING +#undef RESULT_STRING +} +void test_chtml10_input_tag_015() +{ +#define TEST_STRING "" +#define RESULT_STRING "" + char *ret; + char *tmp; + device_table spec; + chxjconvrule_entry entry; + cookie_t cookie; + apr_size_t destlen; + APR_INIT; + + COOKIE_INIT(cookie); + + SPEC_INIT(spec); + destlen = sizeof(TEST_STRING)-1; + + tmp = chxj_encoding(&r, TEST_STRING, &destlen); + ret = chxj_exchange_chtml10(&r, &spec, tmp, destlen, &destlen, &entry, &cookie); + ret = chxj_rencoding(&r, ret, &destlen); + CU_ASSERT(ret != NULL); + CU_ASSERT(strcmp(RESULT_STRING, ret) == 0); + CU_ASSERT(destlen == sizeof(RESULT_STRING)-1); + + APR_TERM; +#undef TEST_STRING +#undef RESULT_STRING +} +void test_chtml10_input_tag_016() +{ +#define TEST_STRING "" +#define RESULT_STRING "" + char *ret; + char *tmp; + device_table spec; + chxjconvrule_entry entry; + cookie_t cookie; + apr_size_t destlen; + APR_INIT; + + COOKIE_INIT(cookie); + + SPEC_INIT(spec); + destlen = sizeof(TEST_STRING)-1; + + tmp = chxj_encoding(&r, TEST_STRING, &destlen); + ret = chxj_exchange_chtml10(&r, &spec, tmp, destlen, &destlen, &entry, &cookie); + ret = chxj_rencoding(&r, ret, &destlen); + CU_ASSERT(ret != NULL); + CU_ASSERT(strcmp(RESULT_STRING, ret) == 0); + CU_ASSERT(destlen == sizeof(RESULT_STRING)-1); + + APR_TERM; +#undef TEST_STRING +#undef RESULT_STRING +} /* * vim:ts=2 et */ -- 2.11.0