Misc fixes from addtl KeyInfo tests.

[shibboleth/cpp-xmltooling.git] / xmltoolingtest / xmltoolingtest.h

diff --git a/xmltoolingtest/xmltoolingtest.h b/xmltoolingtest/xmltoolingtest.h
index d63fccb..20450a4 100644 (file)
--- a/xmltoolingtest/xmltoolingtest.h
+++ b/xmltoolingtest/xmltoolingtest.h
@@ -38,7 +38,9 @@ public:
         nonvalidatingPool = new ParserPool();\r
         if (getenv("XMLTOOLINGTEST_DATA"))\r
             data_path=std::string(getenv("XMLTOOLINGTEST_DATA")) + "/";\r
-        return true;\r
+        std::string catpath=data_path + "catalog.xml";\r
+        auto_ptr_XMLCh temp(catpath.c_str());\r
+        return validatingPool->loadCatalog(temp.get());\r
     }\r
     bool tearDownWorld() {\r
         delete validatingPool;\r
@@ -72,12 +74,6 @@ public:
         XMLObjectBuilder::deregisterDefaultBuilder();\r
     }\r
 \r
-    void testCatalog(void) {\r
-        std::string path=data_path + "catalog.xml";\r
-        auto_ptr_XMLCh temp(path.c_str());\r
-        TS_ASSERT(validatingPool->loadCatalog(temp.get()));\r
-    }\r
-\r
     void testUnknown() {\r
         ifstream fs("../xmltoolingtest/data/SimpleXMLObjectWithChildren.xml");\r
         DOMDocument* doc=nonvalidatingPool->parse(fs);\r