From 003654d43289a52f82d504e85c57f408dc69642e Mon Sep 17 00:00:00 2001 From: konn Date: Fri, 18 Apr 2008 10:52:03 +0000 Subject: [PATCH] * Added test code of the tag for SoftBank HTML converter. git-svn-id: svn+ssh://svn.sourceforge.jp/svnroot/modchxj/mod_chxj/branches/RELEASE_0_11_0@2391 1a406e8e-add9-4483-a2c8-d8cac5b7c224 --- src/chxj_jhtml.c | 2 +- test/chxj_jhtml/test_chxj_jhtml.c | 202 +++++++++++++++++++++++++++++++++++++- 2 files changed, 201 insertions(+), 3 deletions(-) diff --git a/src/chxj_jhtml.c b/src/chxj_jhtml.c index 8d87b897..f9acbbfb 100644 --- a/src/chxj_jhtml.c +++ b/src/chxj_jhtml.c @@ -1279,7 +1279,7 @@ s_jhtml_start_font_tag(void *pdoc, Node *node) attr = qs_get_next_attr(doc,attr)) { char *name = qs_get_attr_name(doc,attr); char *value = qs_get_attr_value(doc,attr); - if (STRCASEEQ('c','C',"color",name)) { + if (STRCASEEQ('c','C',"color",name) && value && *value) { W_L(" color=\""); W_V(value); W_L("\""); diff --git a/test/chxj_jhtml/test_chxj_jhtml.c b/test/chxj_jhtml/test_chxj_jhtml.c index 5666feac..60e1cf73 100644 --- a/test/chxj_jhtml/test_chxj_jhtml.c +++ b/test/chxj_jhtml/test_chxj_jhtml.c @@ -445,6 +445,13 @@ void test_jhtml_meta_tag_006(); void test_jhtml_meta_tag_007(); void test_jhtml_meta_tag_008(); void test_jhtml_meta_tag_009(); + +void test_jhtml_font_tag_001(); +void test_jhtml_font_tag_002(); +void test_jhtml_font_tag_003(); +void test_jhtml_font_tag_004(); +void test_jhtml_font_tag_005(); +void test_jhtml_font_tag_006(); /* pend */ int @@ -974,8 +981,16 @@ main() CU_add_test(jhtml_suite, "test 7." , test_jhtml_meta_tag_007); CU_add_test(jhtml_suite, "test 8." , test_jhtml_meta_tag_008); CU_add_test(jhtml_suite, "test 9." , test_jhtml_meta_tag_009); -#if 0 -#endif + + /*=========================================================================*/ + /* */ + /*=========================================================================*/ + CU_add_test(jhtml_suite, "test 1." , test_jhtml_font_tag_001); + CU_add_test(jhtml_suite, "test 2." , test_jhtml_font_tag_002); + CU_add_test(jhtml_suite, "test 3." , test_jhtml_font_tag_003); + CU_add_test(jhtml_suite, "test 4." , test_jhtml_font_tag_004); + CU_add_test(jhtml_suite, "test 5." , test_jhtml_font_tag_005); + CU_add_test(jhtml_suite, "test 6." , test_jhtml_font_tag_006); /* aend */ CU_basic_run_tests(); @@ -12346,6 +12361,189 @@ void test_jhtml_meta_tag_009() #undef TEST_STRING #undef RESULT_STRING } +/*============================================================================*/ +/* */ +/*============================================================================*/ +void test_jhtml_font_tag_001() +{ +#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_jhtml(&r, &spec, tmp, destlen, &destlen, &entry, &cookie); + ret = chxj_rencoding(&r, ret, &destlen); + fprintf(stderr, "actual:[%s]\n", ret); + fprintf(stderr, "expect:[%s]\n", RESULT_STRING); + 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_jhtml_font_tag_002() +{ +#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_jhtml(&r, &spec, tmp, destlen, &destlen, &entry, &cookie); + ret = chxj_rencoding(&r, ret, &destlen); + fprintf(stderr, "actual:[%s]\n", ret); + fprintf(stderr, "expect:[%s]\n", RESULT_STRING); + 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_jhtml_font_tag_003() +{ +#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_jhtml(&r, &spec, tmp, destlen, &destlen, &entry, &cookie); + ret = chxj_rencoding(&r, ret, &destlen); + fprintf(stderr, "actual:[%s]\n", ret); + fprintf(stderr, "expect:[%s]\n", RESULT_STRING); + 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_jhtml_font_tag_004() +{ +#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_jhtml(&r, &spec, tmp, destlen, &destlen, &entry, &cookie); + ret = chxj_rencoding(&r, ret, &destlen); + fprintf(stderr, "actual:[%s]\n", ret); + fprintf(stderr, "expect:[%s]\n", RESULT_STRING); + 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_jhtml_font_tag_005() +{ +#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_jhtml(&r, &spec, tmp, destlen, &destlen, &entry, &cookie); + ret = chxj_rencoding(&r, ret, &destlen); + fprintf(stderr, "actual:[%s]\n", ret); + fprintf(stderr, "expect:[%s]\n", RESULT_STRING); + 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_jhtml_font_tag_006() +{ +#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_jhtml(&r, &spec, tmp, destlen, &destlen, &entry, &cookie); + ret = chxj_rencoding(&r, ret, &destlen); + fprintf(stderr, "actual:[%s]\n", ret); + fprintf(stderr, "expect:[%s]\n", RESULT_STRING); + 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