From d4d697fae148aa2061faaeb48a00608f06f49a38 Mon Sep 17 00:00:00 2001
From: konn <konn@1a406e8e-add9-4483-a2c8-d8cac5b7c224>
Date: Fri, 18 Apr 2008 10:51:46 +0000
Subject: [PATCH]   * Added test code of the <ul> tag for SoftBank HTML
 converter.

git-svn-id: svn+ssh://svn.sourceforge.jp/svnroot/modchxj/mod_chxj/branches/RELEASE_0_11_0@2384 1a406e8e-add9-4483-a2c8-d8cac5b7c224
---
 test/chxj_jhtml/test_chxj_jhtml.c | 23 ++++++++++++++++++-----
 1 file changed, 18 insertions(+), 5 deletions(-)

diff --git a/test/chxj_jhtml/test_chxj_jhtml.c b/test/chxj_jhtml/test_chxj_jhtml.c
index dd8ff1d9..8a5e71da 100644
--- a/test/chxj_jhtml/test_chxj_jhtml.c
+++ b/test/chxj_jhtml/test_chxj_jhtml.c
@@ -923,13 +923,16 @@ main()
   CU_add_test(jhtml_suite, "test <title> 1." ,                                  test_jhtml_title_tag_001);
   CU_add_test(jhtml_suite, "test <title> 2." ,                                  test_jhtml_title_tag_002);
 
-#if 0
+  /*=========================================================================*/
+  /* <UL>                                                                    */
+  /*=========================================================================*/
   CU_add_test(jhtml_suite, "test <ul> 1." ,                                     test_jhtml_ul_tag_001);
   CU_add_test(jhtml_suite, "test <ul> 2." ,                                     test_jhtml_ul_tag_002);
   CU_add_test(jhtml_suite, "test <ul> 3." ,                                     test_jhtml_ul_tag_003);
   CU_add_test(jhtml_suite, "test <ul> 4." ,                                     test_jhtml_ul_tag_004);
   CU_add_test(jhtml_suite, "test <ul> 5." ,                                     test_jhtml_ul_tag_005);
 
+#if 0
   CU_add_test(jhtml_suite, "test <blink> 1." ,                                  test_jhtml_blink_tag_001);
   CU_add_test(jhtml_suite, "test <blink> 2." ,                                  test_jhtml_blink_tag_002);
   CU_add_test(jhtml_suite, "test <blink> 3." ,                                  test_jhtml_blink_tag_003);
@@ -11259,7 +11262,6 @@ void test_jhtml_title_tag_002()
 #undef TEST_STRING
 #undef RESULT_STRING
 }
-/* KONNO */
 /*============================================================================*/
 /* <UL>                                                                       */
 /*============================================================================*/
@@ -11283,6 +11285,8 @@ void test_jhtml_ul_tag_001()
   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);
@@ -11311,6 +11315,8 @@ void test_jhtml_ul_tag_002()
   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);
@@ -11322,7 +11328,7 @@ void test_jhtml_ul_tag_002()
 void test_jhtml_ul_tag_003() 
 {
 #define  TEST_STRING "<ul><li></ul>"
-#define  RESULT_STRING "<ul><li></ul>"
+#define  RESULT_STRING "<ul><li></li></ul>"
   char  *ret;
   char  *tmp;
   device_table spec;
@@ -11339,6 +11345,8 @@ void test_jhtml_ul_tag_003()
   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);
@@ -11350,7 +11358,7 @@ void test_jhtml_ul_tag_003()
 void test_jhtml_ul_tag_004() 
 {
 #define  TEST_STRING "<ul abc><li></ul>"
-#define  RESULT_STRING "<ul><li></ul>"
+#define  RESULT_STRING "<ul><li></li></ul>"
   char  *ret;
   char  *tmp;
   device_table spec;
@@ -11367,6 +11375,8 @@ void test_jhtml_ul_tag_004()
   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);
@@ -11378,7 +11388,7 @@ void test_jhtml_ul_tag_004()
 void test_jhtml_ul_tag_005() 
 {
 #define  TEST_STRING "<ul abc><li>abc</ul>"
-#define  RESULT_STRING "<ul><li>abc</ul>"
+#define  RESULT_STRING "<ul><li>abc</li></ul>"
   char  *ret;
   char  *tmp;
   device_table spec;
@@ -11395,6 +11405,8 @@ void test_jhtml_ul_tag_005()
   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);
@@ -11403,6 +11415,7 @@ void test_jhtml_ul_tag_005()
 #undef TEST_STRING
 #undef RESULT_STRING
 }
+/* KONNO */
 /*============================================================================*/
 /* <BLINK>                                                                    */
 /*============================================================================*/
-- 
2.11.0