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

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

diff --git a/src/chxj_chtml20.c b/src/chxj_chtml20.c
index c7a8f30..e5bd928 100644 (file)
--- a/src/chxj_chtml20.c
+++ b/src/chxj_chtml20.c
@@ -640,17 +640,12 @@ s_chtml20_start_meta_tag(void *pdoc, Node *node)
   for (attr = qs_get_attr(doc,node);
        attr;
        attr = qs_get_next_attr(doc,attr)) {
-
-    char *name;
-    char *value;
-
-    name   = qs_get_attr_name(doc,attr);
-    value  = qs_get_attr_value(doc,attr);
-
+    char *name = qs_get_attr_name(doc,attr);
+    char *value = qs_get_attr_value(doc,attr);
     switch(*name) {
     case 'h':
     case 'H':
-      if (strcasecmp(name, "http-equiv") == 0) {
+      if (strcasecmp(name, "http-equiv") == 0 && value && *value) {
         /*----------------------------------------------------------------------*/
         /* CHTML 2.0                                                            */
         /*----------------------------------------------------------------------*/
@@ -668,7 +663,7 @@ s_chtml20_start_meta_tag(void *pdoc, Node *node)
 
     case 'c':
     case 'C':
-      if (strcasecmp(name, "content") == 0) {
+      if (strcasecmp(name, "content") == 0 && value && *value) {
         if (content_type_flag) {
           W_L(" ");
           W_V(name);

diff --git a/test/chxj_chtml10/test_chxj_chtml10.c b/test/chxj_chtml10/test_chxj_chtml10.c
index 35b5c05..1d1cad9 100644 (file)
--- a/test/chxj_chtml10/test_chxj_chtml10.c
+++ b/test/chxj_chtml10/test_chxj_chtml10.c
@@ -371,6 +371,7 @@ void test_chtml10_blink_tag_001();
 void test_chtml10_blink_tag_002(); 
 void test_chtml10_blink_tag_003(); 
 void test_chtml10_blink_tag_004(); 
+
 /* pend */
 
 int
@@ -711,6 +712,7 @@ main()
   CU_add_test(chtml10_suite, "test <blink> 2." ,                                  test_chtml10_blink_tag_002); 
   CU_add_test(chtml10_suite, "test <blink> 3." ,                                  test_chtml10_blink_tag_003); 
   CU_add_test(chtml10_suite, "test <blink> 4." ,                                  test_chtml10_blink_tag_004); 
+
   /* aend */
 
   CU_basic_run_tests();

diff --git a/test/chxj_chtml20/test_chxj_chtml20.c b/test/chxj_chtml20/test_chxj_chtml20.c
index 0b0b0be..4ba930e 100644 (file)
--- a/test/chxj_chtml20/test_chxj_chtml20.c
+++ b/test/chxj_chtml20/test_chxj_chtml20.c
@@ -435,6 +435,16 @@ void test_chtml20_marquee_tag_015();
 void test_chtml20_marquee_tag_016();
 void test_chtml20_marquee_tag_017();
 void test_chtml20_marquee_tag_018();
+
+void test_chtml20_meta_tag_001();
+void test_chtml20_meta_tag_002();
+void test_chtml20_meta_tag_003();
+void test_chtml20_meta_tag_004();
+void test_chtml20_meta_tag_005();
+void test_chtml20_meta_tag_006();
+void test_chtml20_meta_tag_007();
+void test_chtml20_meta_tag_008();
+void test_chtml20_meta_tag_009();
 /* pend */
 
 int
@@ -839,6 +849,16 @@ main()
   CU_add_test(chtml20_suite, "test <marquee> 16." ,                               test_chtml20_marquee_tag_016);
   CU_add_test(chtml20_suite, "test <marquee> 17." ,                               test_chtml20_marquee_tag_017);
   CU_add_test(chtml20_suite, "test <marquee> 18." ,                               test_chtml20_marquee_tag_018);
+
+  CU_add_test(chtml20_suite, "test <meta> 1." ,                                   test_chtml20_meta_tag_001);
+  CU_add_test(chtml20_suite, "test <meta> 2." ,                                   test_chtml20_meta_tag_002);
+  CU_add_test(chtml20_suite, "test <meta> 3." ,                                   test_chtml20_meta_tag_003);
+  CU_add_test(chtml20_suite, "test <meta> 4." ,                                   test_chtml20_meta_tag_004);
+  CU_add_test(chtml20_suite, "test <meta> 5." ,                                   test_chtml20_meta_tag_005);
+  CU_add_test(chtml20_suite, "test <meta> 6." ,                                   test_chtml20_meta_tag_006);
+  CU_add_test(chtml20_suite, "test <meta> 7." ,                                   test_chtml20_meta_tag_007);
+  CU_add_test(chtml20_suite, "test <meta> 8." ,                                   test_chtml20_meta_tag_008);
+  CU_add_test(chtml20_suite, "test <meta> 9." ,                                   test_chtml20_meta_tag_009);
   /* aend */
 
   CU_basic_run_tests();
@@ -11223,6 +11243,261 @@ void test_chtml20_marquee_tag_018()
 #undef TEST_STRING
 #undef RESULT_STRING
 }
+/*============================================================================*/
+/* <META>                                                                     */
+/*============================================================================*/
+void test_chtml20_meta_tag_001() 
+{
+#define  TEST_STRING "<meta>"
+#define  RESULT_STRING "<meta>"
+  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_meta_tag_002() 
+{
+#define  TEST_STRING "<meta http-equiv>"
+#define  RESULT_STRING "<meta>"
+  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_meta_tag_003() 
+{
+#define  TEST_STRING "<meta http-equiv=\"\">"
+#define  RESULT_STRING "<meta>"
+  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_meta_tag_004() 
+{
+#define  TEST_STRING "<meta http-equiv=\"content-type\">"
+#define  RESULT_STRING "<meta http-equiv=\"content-type\">"
+  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_meta_tag_005() 
+{
+#define  TEST_STRING "<meta http-equiv=\"abc\">"
+#define  RESULT_STRING "<meta http-equiv=\"abc\">"
+  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_meta_tag_006() 
+{
+#define  TEST_STRING "<meta content>"
+#define  RESULT_STRING "<meta>"
+  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_meta_tag_007() 
+{
+#define  TEST_STRING "<meta content=\"\">"
+#define  RESULT_STRING "<meta>"
+  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_meta_tag_008() 
+{
+#define  TEST_STRING "<meta http-equiv=\"Content-Type\" content=\"text/html\">"
+#define  RESULT_STRING "<meta http-equiv=\"Content-Type\" content=\"text/html; charset=Windows-31J\">"
+  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_meta_tag_009() 
+{
+#define  TEST_STRING "<meta http-equiv=\"Content-Type\" content=\"application/xhtml+xml\">"
+#define  RESULT_STRING "<meta http-equiv=\"Content-Type\" content=\"text/html; charset=Windows-31J\">"
+  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
  */