* Added test code of the <pre> tag for CHTML2.0 converter.

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

diff --git a/src/chxj_chtml10.c b/src/chxj_chtml10.c
index 44dac77..5d4c9c4 100644 (file)
--- a/src/chxj_chtml10.c
+++ b/src/chxj_chtml10.c
@@ -2997,10 +2997,6 @@ s_chtml10_text(void *pdoc, Node *child)
   r       = doc->r;
 
   textval = qs_get_node_value(doc,child);
-#if 0
-  textval = qs_trim_string(doc->buf.pool, textval);
-#endif
-
   if (strlen(textval) == 0) {
     return chtml10->out;
   }

diff --git a/src/chxj_chtml20.c b/src/chxj_chtml20.c
index 800f611..0523803 100644 (file)
--- a/src/chxj_chtml20.c
+++ b/src/chxj_chtml20.c
@@ -3129,9 +3129,9 @@ s_chtml20_text_tag(void *pdoc, Node *child)
   r       = doc->r;
   
   textval = qs_get_node_value(doc,child);
-  textval = qs_trim_string(doc->buf.pool, textval);
-  if (strlen(textval) == 0) 
+  if (strlen(textval) == 0) {
     return chtml20->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_chtml20/test_chxj_chtml20.c b/test/chxj_chtml20/test_chxj_chtml20.c
index 796c138..466328c 100644 (file)
--- a/test/chxj_chtml20/test_chxj_chtml20.c
+++ b/test/chxj_chtml20/test_chxj_chtml20.c
@@ -354,6 +354,12 @@ void test_chtml20_plaintext_tag_001();
 void test_chtml20_plaintext_tag_002();
 void test_chtml20_plaintext_tag_003();
 void test_chtml20_plaintext_tag_004();
+
+void test_chtml20_pre_tag_001();
+void test_chtml20_pre_tag_002();
+void test_chtml20_pre_tag_003();
+void test_chtml20_pre_tag_004();
+void test_chtml20_pre_tag_005();
 /* pend */
 
 int
@@ -677,6 +683,12 @@ main()
   CU_add_test(chtml20_suite, "test <plaintext> 2." ,                              test_chtml20_plaintext_tag_002);
   CU_add_test(chtml20_suite, "test <plaintext> 3. value is not closed." ,         test_chtml20_plaintext_tag_003);
   CU_add_test(chtml20_suite, "test <plaintext> 3. value is not closed and hankaku." , test_chtml20_plaintext_tag_004);
+
+  CU_add_test(chtml20_suite, "test <pre> 1." ,                                    test_chtml20_pre_tag_001);
+  CU_add_test(chtml20_suite, "test <pre> 2." ,                                    test_chtml20_pre_tag_002);
+  CU_add_test(chtml20_suite, "test <pre> 3." ,                                    test_chtml20_pre_tag_003);
+  CU_add_test(chtml20_suite, "test <pre> 4." ,                                    test_chtml20_pre_tag_004);
+  CU_add_test(chtml20_suite, "test <pre> 5." ,                                    test_chtml20_pre_tag_005);
   /* aend */
 
   CU_basic_run_tests();
@@ -8968,6 +8980,149 @@ void test_chtml20_plaintext_tag_004()
 #undef TEST_STRING
 #undef RESULT_STRING
 }
+/*============================================================================*/
+/* <PRE>                                                                      */
+/*============================================================================*/
+void test_chtml20_pre_tag_001() 
+{
+#define  TEST_STRING "<pre></pre>"
+#define  RESULT_STRING "<pre></pre>"
+  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_chtml20(&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_chtml20_pre_tag_002() 
+{
+#define  TEST_STRING "<pre>\n</pre>"
+#define  RESULT_STRING "<pre>\n</pre>"
+  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_chtml20(&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_chtml20_pre_tag_003() 
+{
+#define  TEST_STRING "<pre>\n\n</pre>"
+#define  RESULT_STRING "<pre>\n\n</pre>"
+  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_chtml20(&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_chtml20_pre_tag_004() 
+{
+#define  TEST_STRING "<pre><h1>あああ\n\n</pre>"
+#define  RESULT_STRING "<pre><h1>あああ\n\n</h1></pre>"
+  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_chtml20(&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_chtml20_pre_tag_005() 
+{
+#define  TEST_STRING "<pre><h1>ﾊﾝｶｸ</h1>\n\n</pre>"
+#define  RESULT_STRING "<pre><h1>ﾊﾝｶｸ</h1>\n\n</pre>"
+  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_chtml20(&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
  */