* Added test code for <ul> tag to CHTML1.0 converter.

git-svn-id: svn+ssh://svn.sourceforge.jp/svnroot/modchxj/mod_chxj/branches/RELEASE_0_11_0@2051 1a406e8e-add9-4483-a2c8-d8cac5b7c224

diff --git a/src/chxj_chtml10.c b/src/chxj_chtml10.c
index 7cbcb7c..108c331 100644 (file)
--- a/src/chxj_chtml10.c
+++ b/src/chxj_chtml10.c
@@ -765,7 +765,7 @@ s_chtml10_start_ul_tag(void* pdoc, Node* UNUSED(node))
   doc        = chtml10->doc;
   r          = doc->r;
 
-  W10_L("<ul>\r\n");
+  W10_L("<ul>");
 
   return chtml10->out;
 }
@@ -790,7 +790,7 @@ s_chtml10_end_ul_tag(void* pdoc, Node* UNUSED(child))
   doc     = chtml10->doc;
   r       = doc->r;
 
-  W10_L("</ul>\r\n");
+  W10_L("</ul>");
 
   return chtml10->out;
 }

diff --git a/test/chxj_chtml10/test_chxj_chtml10.c b/test/chxj_chtml10/test_chxj_chtml10.c
index 8417a16..7194d6c 100644 (file)
--- a/test/chxj_chtml10/test_chxj_chtml10.c
+++ b/test/chxj_chtml10/test_chxj_chtml10.c
@@ -356,6 +356,12 @@ void test_chtml10_textarea_tag_019();
 
 void test_chtml10_title_tag_001(); 
 void test_chtml10_title_tag_002(); 
+
+void test_chtml10_ul_tag_001(); 
+void test_chtml10_ul_tag_002(); 
+void test_chtml10_ul_tag_003(); 
+void test_chtml10_ul_tag_004(); 
+void test_chtml10_ul_tag_005(); 
 /* pend */
 
 int
@@ -664,6 +670,12 @@ main()
 
   CU_add_test(chtml10_suite, "test <title> 1." ,                                  test_chtml10_title_tag_001); 
   CU_add_test(chtml10_suite, "test <title> 2." ,                                  test_chtml10_title_tag_002); 
+
+  CU_add_test(chtml10_suite, "test <ul> 1." ,                                     test_chtml10_ul_tag_001); 
+  CU_add_test(chtml10_suite, "test <ul> 2." ,                                     test_chtml10_ul_tag_002); 
+  CU_add_test(chtml10_suite, "test <ul> 3." ,                                     test_chtml10_ul_tag_003); 
+  CU_add_test(chtml10_suite, "test <ul> 4." ,                                     test_chtml10_ul_tag_004); 
+  CU_add_test(chtml10_suite, "test <ul> 5." ,                                     test_chtml10_ul_tag_005); 
   /* aend */
 
   CU_basic_run_tests();
@@ -8855,6 +8867,146 @@ void test_chtml10_title_tag_002()
 #undef TEST_STRING
 #undef RESULT_STRING
 }
+void test_chtml10_ul_tag_001() 
+{
+#define  TEST_STRING "<ul>"
+#define  RESULT_STRING "<ul></ul>"
+  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_ul_tag_002() 
+{
+#define  TEST_STRING "<ul></ul>"
+#define  RESULT_STRING "<ul></ul>"
+  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_ul_tag_003() 
+{
+#define  TEST_STRING "<ul><li></ul>"
+#define  RESULT_STRING "<ul><li></ul>"
+  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_ul_tag_004() 
+{
+#define  TEST_STRING "<ul abc><li></ul>"
+#define  RESULT_STRING "<ul><li></ul>"
+  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_ul_tag_005() 
+{
+#define  TEST_STRING "<ul abc><li>abc</ul>"
+#define  RESULT_STRING "<ul><li>abc</ul>"
+  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
  */