Support for a catalog path.

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

diff --git a/xmltoolingtest/xmltoolingtest.h b/xmltoolingtest/xmltoolingtest.h
index fe1e867..6507143 100644 (file)
--- a/xmltoolingtest/xmltoolingtest.h
+++ b/xmltoolingtest/xmltoolingtest.h
@@ -30,13 +30,15 @@ class ToolingFixture : public CxxTest::GlobalFixture
 public:\r
     bool setUpWorld() {\r
         XMLToolingConfig::getConfig().log_config();\r
-        if (!XMLToolingConfig::getConfig().init())\r
-            return false;\r
+\r
         if (getenv("XMLTOOLINGTEST_DATA"))\r
             data_path=std::string(getenv("XMLTOOLINGTEST_DATA")) + "/";\r
-        std::string catpath=data_path + "catalog.xml";\r
-        auto_ptr_XMLCh temp(catpath.c_str());\r
-        return XMLToolingConfig::getConfig().getValidatingParser().loadCatalog(temp.get());\r
+        XMLToolingConfig::getConfig().catalog_path = data_path + "catalog.xml";\r
+\r
+        if (!XMLToolingConfig::getConfig().init())\r
+            return false;\r
+        \r
+        return true;\r
     }\r
     bool tearDownWorld() {\r
         XMLToolingConfig::getConfig().term();\r