* temp commit.

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

diff --git a/src/css/test/unit/import/test_import.c b/src/css/test/unit/import/test_import.c
index cb486b3..da2b954 100644 (file)
--- a/src/css/test/unit/import/test_import.c
+++ b/src/css/test/unit/import/test_import.c
@@ -196,19 +196,18 @@ void test_import_005()
   CU_ASSERT_OR_GOTO_END(doc->rootNode->child != NULL);
   CU_ASSERT_OR_GOTO_END(doc->rootNode->child->name != NULL);
   CU_ASSERT_OR_GOTO_END(strcasecmp(doc->rootNode->child->name, "<sentinel>") == 0);
-  CU_ASSERT(doc->rootNode->child->next != NULL); if (CU_get_number_of_failures() != 0) goto end;
-  CU_ASSERT(doc->rootNode->child->next->type == SCSSTYPE_ATKEYWORD); if (CU_get_number_of_failures() != 0) goto end;
-  CU_ASSERT(doc->rootNode->child->next->name != NULL); if (CU_get_number_of_failures() != 0) goto end;
-  CU_ASSERT(strcasecmp(doc->rootNode->child->next->name, "@import") == 0); if (CU_get_number_of_failures() != 0) goto end;
-  CU_ASSERT(strcasecmp(doc->rootNode->child->next->value1, "abc") == 0); if (CU_get_number_of_failures() != 0) goto end;
-  CU_ASSERT(strcasecmp(doc->rootNode->child->next->value2, "all") == 0); if (CU_get_number_of_failures() != 0) goto end;
-  CU_ASSERT(doc->rootNode->child->next->next != NULL); if (CU_get_number_of_failures() != 0) goto end;
-  CU_ASSERT(doc->rootNode->child->next->next->type == SCSSTYPE_ATKEYWORD); if (CU_get_number_of_failures() != 0) goto end;
-  CU_ASSERT(doc->rootNode->child->next->next->name != NULL); if (CU_get_number_of_failures() != 0) goto end;
-  CU_ASSERT(strcasecmp(doc->rootNode->child->next->next->name, "@import") == 0); if (CU_get_number_of_failures() != 0) goto end;
-  CU_ASSERT(strcasecmp(doc->rootNode->child->next->next->value1, "") == 0); if (CU_get_number_of_failures() != 0) goto end;
-  CU_ASSERT(strcasecmp(doc->rootNode->child->next->next->value2, "all") == 0); if (CU_get_number_of_failures() != 0) goto end;
-
+  CU_ASSERT_OR_GOTO_END(doc->rootNode->child->next != NULL);
+  CU_ASSERT_OR_GOTO_END(doc->rootNode->child->next->type == SCSSTYPE_ATKEYWORD);
+  CU_ASSERT_OR_GOTO_END(doc->rootNode->child->next->name != NULL);
+  CU_ASSERT_OR_GOTO_END(strcasecmp(doc->rootNode->child->next->name, "@import") == 0);
+  CU_ASSERT_OR_GOTO_END(strcasecmp(doc->rootNode->child->next->value1, "abc") == 0);
+  CU_ASSERT_OR_GOTO_END(strcasecmp(doc->rootNode->child->next->value2, "all") == 0);
+  CU_ASSERT_OR_GOTO_END(doc->rootNode->child->next->next != NULL);
+  CU_ASSERT_OR_GOTO_END(doc->rootNode->child->next->next->type == SCSSTYPE_ATKEYWORD);
+  CU_ASSERT_OR_GOTO_END(doc->rootNode->child->next->next->name != NULL);
+  CU_ASSERT_OR_GOTO_END(strcasecmp(doc->rootNode->child->next->next->name, "@import") == 0);
+  CU_ASSERT_OR_GOTO_END(strcasecmp(doc->rootNode->child->next->next->value1, "") == 0);
+  CU_ASSERT_OR_GOTO_END(strcasecmp(doc->rootNode->child->next->next->value2, "all") == 0);
 
 end:
   apr_terminate();