From df1f335d0a4c6d04b6ab95c791618b311b502148 Mon Sep 17 00:00:00 2001
From: konn <konn@1a406e8e-add9-4483-a2c8-d8cac5b7c224>
Date: Mon, 14 Apr 2008 12:26:48 +0000
Subject: [PATCH]   * Added test code of the <pre> tag for au XHTML converter.

git-svn-id: svn+ssh://svn.sourceforge.jp/svnroot/modchxj/mod_chxj/branches/RELEASE_0_11_0@2260 1a406e8e-add9-4483-a2c8-d8cac5b7c224
---
 src/chxj_xhtml_mobile_1_0.c                             |  4 ++--
 test/chxj_xhtml_mobile_1_0/test_chxj_xhtml_mobile_1_0.c | 11 +++++++++--
 2 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/src/chxj_xhtml_mobile_1_0.c b/src/chxj_xhtml_mobile_1_0.c
index d3d84bb5..e2450317 100644
--- a/src/chxj_xhtml_mobile_1_0.c
+++ b/src/chxj_xhtml_mobile_1_0.c
@@ -2665,9 +2665,9 @@ s_xhtml_1_0_text_tag(void *pdoc, Node *child)
   int         tdst_len;
   
   textval = qs_get_node_value(doc,child);
-  textval = qs_trim_string(doc->buf.pool, textval);
-  if (strlen(textval) == 0)
+  if (strlen(textval) == 0) {
     return xhtml->out;
+  }
   
   tmp = apr_palloc(r->pool, qs_get_node_size(doc,child)+1);
   memset(tmp, 0, qs_get_node_size(doc,child)+1);
diff --git a/test/chxj_xhtml_mobile_1_0/test_chxj_xhtml_mobile_1_0.c b/test/chxj_xhtml_mobile_1_0/test_chxj_xhtml_mobile_1_0.c
index 98882bea..a83b0e29 100644
--- a/test/chxj_xhtml_mobile_1_0/test_chxj_xhtml_mobile_1_0.c
+++ b/test/chxj_xhtml_mobile_1_0/test_chxj_xhtml_mobile_1_0.c
@@ -822,13 +822,16 @@ main()
   CU_add_test(xhtml_suite, "test <plaintext> 2." ,                              test_xhtml_plaintext_tag_002);
   CU_add_test(xhtml_suite, "test <plaintext> 3. value is not closed." ,         test_xhtml_plaintext_tag_003);
   CU_add_test(xhtml_suite, "test <plaintext> 3. value is not closed and hankaku." , test_xhtml_plaintext_tag_004);
-#if 0
 
+  /*=========================================================================*/
+  /* <pre>                                                                   */
+  /*=========================================================================*/
   CU_add_test(xhtml_suite, "test <pre> 1." ,                                    test_xhtml_pre_tag_001);
   CU_add_test(xhtml_suite, "test <pre> 2." ,                                    test_xhtml_pre_tag_002);
   CU_add_test(xhtml_suite, "test <pre> 3." ,                                    test_xhtml_pre_tag_003);
   CU_add_test(xhtml_suite, "test <pre> 4." ,                                    test_xhtml_pre_tag_004);
   CU_add_test(xhtml_suite, "test <pre> 5." ,                                    test_xhtml_pre_tag_005);
+#if 0
 
   CU_add_test(xhtml_suite, "test <select> 1." ,                                 test_xhtml_select_tag_001);
   CU_add_test(xhtml_suite, "test <select> 2." ,                                 test_xhtml_select_tag_002);
@@ -9560,7 +9563,6 @@ void test_xhtml_plaintext_tag_004()
 #undef TEST_STRING
 #undef RESULT_STRING
 }
-/* KONNO */
 /*============================================================================*/
 /* <PRE>                                                                      */
 /*============================================================================*/
@@ -9613,6 +9615,7 @@ void test_xhtml_pre_tag_002()
   tmp = chxj_encoding(&r, TEST_STRING, &destlen);
   ret = chxj_exchange_xhtml_mobile_1_0(&r, &spec, tmp, destlen, &destlen, &entry, &cookie);
   ret = chxj_rencoding(&r, ret, &destlen);
+  fprintf(stderr, "ret=[%s]",ret);
   CU_ASSERT(ret != NULL);
   CU_ASSERT(strcmp(RESULT_STRING, ret) == 0);
   CU_ASSERT(destlen == sizeof(RESULT_STRING)-1);
@@ -9641,6 +9644,7 @@ void test_xhtml_pre_tag_003()
   tmp = chxj_encoding(&r, TEST_STRING, &destlen);
   ret = chxj_exchange_xhtml_mobile_1_0(&r, &spec, tmp, destlen, &destlen, &entry, &cookie);
   ret = chxj_rencoding(&r, ret, &destlen);
+  fprintf(stderr, "ret=[%s]",ret);
   CU_ASSERT(ret != NULL);
   CU_ASSERT(strcmp(RESULT_STRING, ret) == 0);
   CU_ASSERT(destlen == sizeof(RESULT_STRING)-1);
@@ -9669,6 +9673,7 @@ void test_xhtml_pre_tag_004()
   tmp = chxj_encoding(&r, TEST_STRING, &destlen);
   ret = chxj_exchange_xhtml_mobile_1_0(&r, &spec, tmp, destlen, &destlen, &entry, &cookie);
   ret = chxj_rencoding(&r, ret, &destlen);
+  fprintf(stderr, "ret=[%s]",ret);
   CU_ASSERT(ret != NULL);
   CU_ASSERT(strcmp(RESULT_STRING, ret) == 0);
   CU_ASSERT(destlen == sizeof(RESULT_STRING)-1);
@@ -9697,6 +9702,7 @@ void test_xhtml_pre_tag_005()
   tmp = chxj_encoding(&r, TEST_STRING, &destlen);
   ret = chxj_exchange_xhtml_mobile_1_0(&r, &spec, tmp, destlen, &destlen, &entry, &cookie);
   ret = chxj_rencoding(&r, ret, &destlen);
+  fprintf(stderr, "ret=[%s]",ret);
   CU_ASSERT(ret != NULL);
   CU_ASSERT(strcmp(RESULT_STRING, ret) == 0);
   CU_ASSERT(destlen == sizeof(RESULT_STRING)-1);
@@ -9705,6 +9711,7 @@ void test_xhtml_pre_tag_005()
 #undef TEST_STRING
 #undef RESULT_STRING
 }
+/* KONNO */
 /*============================================================================*/
 /* <SELECT>                                                                   */
 /*============================================================================*/
-- 
2.11.0