* Added test code of the qs_is_checked_checkbox_attr() function.

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

diff --git a/include/chxj_tag_util.h b/include/chxj_tag_util.h
index baf6636..f525791 100644 (file)
--- a/include/chxj_tag_util.h
+++ b/include/chxj_tag_util.h
@@ -34,21 +34,12 @@ extern char *qs_get_size_attr(Doc *doc, Node *tag, apr_pool_t *pool);
 extern char *qs_get_accesskey_attr(Doc *doc, Node *tag, apr_pool_t *pool);
 extern char *qs_get_istyle_attr(Doc *doc, Node *tag, apr_pool_t *pool);
 extern char* qs_get_maxlength_attr(Doc *doc, Node *tag, apr_pool_t *pool);
-
-
-extern int qs_is_checked_checkbox_attr(
-  Doc*         doc, 
-  Node*        tag, 
-  request_rec* r);
-
-
-
-
+extern int qs_is_checked_checkbox_attr(Doc *doc, Node *tag, apr_pool_t *pool);
 
 extern int   chxj_chxjif_is_mine(
-  device_table* spec, 
-  Doc*          doc, 
-  Node*         tag);
+  device_table *spec, 
+  Doc          *doc, 
+  Node         *tag);
 
 extern char* qs_get_destlang_attr(
   Doc* doc, 

diff --git a/src/chxj_hdml.c b/src/chxj_hdml.c
index f775d15..5ba279d 100644 (file)
--- a/src/chxj_hdml.c
+++ b/src/chxj_hdml.c
@@ -1941,7 +1941,7 @@ s_hdml_do_input_checkbox_tag(hdml_t *hdml, Node *tag)
   /*--------------------------------------------------------------------------*/
   /* It is examined whether it is CHECKED.                                    */
   /*--------------------------------------------------------------------------*/
-  chk = qs_is_checked_checkbox_attr(doc, tag, r);
+  chk = qs_is_checked_checkbox_attr(doc, tag, r->pool);
 
   /*--------------------------------------------------------------------------*/
   /* The value of the name attribute and the value attribute is acquired      */

diff --git a/src/chxj_tag_util.c b/src/chxj_tag_util.c
index 946e3b4..737b596 100644 (file)
--- a/src/chxj_tag_util.c
+++ b/src/chxj_tag_util.c
@@ -400,7 +400,7 @@ qs_get_istyle_attr(Doc *doc, Node *tag, apr_pool_t *pool)
  *                 destination is specified.
  * @param tag  [i] The tag node to want to acquire the MAXLENGTH attribute
  *                 is specified.
- * @param r    [i] To use POOL, the pointer to request_rec is specified.
+ * @param pool [i] To use POOL.
  * @return The value of the MAXLENGTH attribute is returned. NULL is
  *         returned when not is.
  */
@@ -428,11 +428,11 @@ qs_get_maxlength_attr(Doc *doc, Node *tag, apr_pool_t *pool)
  *                 destination is specified.
  * @param tag  [i] The tag node to want to acquire the CHECKBOX attribute
  *                 is specified.
- * @param r    [i] To use POOL, the pointer to request_rec is specified.
+ * @param pool [i] To use POOL.
  * @return 1 is returned when it is CHECKED and, additionally, 0 is returned. 
  */
 int
-qs_is_checked_checkbox_attr(Doc *doc, Node *tag, request_rec *UNUSED(r))
+qs_is_checked_checkbox_attr(Doc *doc, Node *tag, apr_pool_t *UNUSED(pool))
 {
   Attr *attr;
   for (attr = qs_get_attr(doc,tag);

diff --git a/test/chxj_tag_util/test_chxj_tag_util.c b/test/chxj_tag_util/test_chxj_tag_util.c
index 11f6828..fbf14a8 100644 (file)
--- a/test/chxj_tag_util/test_chxj_tag_util.c
+++ b/test/chxj_tag_util/test_chxj_tag_util.c
@@ -105,7 +105,7 @@ void test_qs_get_istyle_attr_004();
 void test_qs_get_istyle_attr_005();
 void test_qs_get_istyle_attr_006();
 /*===========================================================================*/
-/* qs_get_maxlength_attr()                                                      */
+/* qs_get_maxlength_attr()                                                   */
 /*===========================================================================*/
 void test_qs_get_maxlength_attr_001();
 void test_qs_get_maxlength_attr_002();
@@ -113,6 +113,12 @@ void test_qs_get_maxlength_attr_003();
 void test_qs_get_maxlength_attr_004();
 void test_qs_get_maxlength_attr_005();
 void test_qs_get_maxlength_attr_006();
+/*===========================================================================*/
+/* qs_is_checked_checkbox_attr()                                             */
+/*===========================================================================*/
+void test_qs_is_checked_checkbox_attr_001();
+void test_qs_is_checked_checkbox_attr_002();
+void test_qs_is_checked_checkbox_attr_003();
 /* pend */
 
 void test_log_rerror(const char *file, int line, int level, apr_status_t status, const request_rec *r, const char *fmt, ...)
@@ -225,7 +231,7 @@ main()
   CU_add_test(str_util_suite, "qs_get_istyle_attr() 005",                              test_qs_get_istyle_attr_005);
   CU_add_test(str_util_suite, "qs_get_istyle_attr() 006",                              test_qs_get_istyle_attr_006);
   /*=========================================================================*/
-  /* qs_get_maxlength_attr()                                                    */
+  /* qs_get_maxlength_attr()                                                 */
   /*=========================================================================*/
   CU_add_test(str_util_suite, "qs_get_maxlength_attr() 001",                           test_qs_get_maxlength_attr_001);
   CU_add_test(str_util_suite, "qs_get_maxlength_attr() 002",                           test_qs_get_maxlength_attr_002);
@@ -233,6 +239,12 @@ main()
   CU_add_test(str_util_suite, "qs_get_maxlength_attr() 004",                           test_qs_get_maxlength_attr_004);
   CU_add_test(str_util_suite, "qs_get_maxlength_attr() 005",                           test_qs_get_maxlength_attr_005);
   CU_add_test(str_util_suite, "qs_get_maxlength_attr() 006",                           test_qs_get_maxlength_attr_006);
+  /*=========================================================================*/
+  /* qs_is_checked_checkbox_attr()                                           */
+  /*=========================================================================*/
+  CU_add_test(str_util_suite, "qs_is_checked_checkbox_attr() 001",                     test_qs_is_checked_checkbox_attr_001);
+  CU_add_test(str_util_suite, "qs_is_checked_checkbox_attr() 002",                     test_qs_is_checked_checkbox_attr_002);
+  CU_add_test(str_util_suite, "qs_is_checked_checkbox_attr() 003",                     test_qs_is_checked_checkbox_attr_003);
   /* aend */
 
   CU_basic_run_tests();
@@ -1232,6 +1244,51 @@ void test_qs_get_maxlength_attr_006()
 #undef RESULT_STRING
 #undef TEST_STRING
 }
+/*===========================================================================*/
+/* qs_is_checked_checkbox_attr()                                             */
+/*===========================================================================*/
+void test_qs_is_checked_checkbox_attr_001()
+{
+#define TEST_STRING "<input checked>"
+  Node *node;
+  int ret;
+  APR_INIT;
+ 
+  node = qs_parse_string(&doc, TEST_STRING, sizeof(TEST_STRING)); 
+  ret = qs_is_checked_checkbox_attr(&doc, node->child, p);
+  CU_ASSERT(ret == 1);
+
+  APR_TERM;
+#undef TEST_STRING
+}
+void test_qs_is_checked_checkbox_attr_002()
+{
+#define TEST_STRING "<input checked=''>"
+  Node *node;
+  int ret;
+  APR_INIT;
+ 
+  node = qs_parse_string(&doc, TEST_STRING, sizeof(TEST_STRING)); 
+  ret = qs_is_checked_checkbox_attr(&doc, node->child, p);
+  CU_ASSERT(ret == 1);
+
+  APR_TERM;
+#undef TEST_STRING
+}
+void test_qs_is_checked_checkbox_attr_003()
+{
+#define TEST_STRING "<input>"
+  Node *node;
+  int ret;
+  APR_INIT;
+ 
+  node = qs_parse_string(&doc, TEST_STRING, sizeof(TEST_STRING)); 
+  ret = qs_is_checked_checkbox_attr(&doc, node->child, p);
+  CU_ASSERT(ret == 0);
+
+  APR_TERM;
+#undef TEST_STRING
+}
 /*
  * vim:ts=2 et
  */