Simplify storage context mgmt.

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

diff --git a/xmltoolingtest/xmltoolingtest.h b/xmltoolingtest/xmltoolingtest.h
index 20450a4..6507143 100644 (file)
--- a/xmltoolingtest/xmltoolingtest.h
+++ b/xmltoolingtest/xmltoolingtest.h
@@ -23,8 +23,6 @@
 \r
 //#define XMLTOOLINGTEST_LEAKCHECK\r
 \r
-ParserPool* validatingPool=NULL;\r
-ParserPool* nonvalidatingPool=NULL;\r
 std::string data_path = "../xmltoolingtest/data/";\r
 \r
 class ToolingFixture : public CxxTest::GlobalFixture\r
@@ -32,19 +30,17 @@ class ToolingFixture : public CxxTest::GlobalFixture
 public:\r
     bool setUpWorld() {\r
         XMLToolingConfig::getConfig().log_config();\r
-        if (!XMLToolingConfig::getConfig().init())\r
-            return false;\r
-        validatingPool = new ParserPool(true,true);\r
-        nonvalidatingPool = new ParserPool();\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 validatingPool->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
-        delete validatingPool;\r
-        delete nonvalidatingPool;\r
         XMLToolingConfig::getConfig().term();\r
 #if defined(_MSC_VER ) && defined(XMLTOOLINGTEST_LEAKCHECK)\r
        _CrtSetReportMode( _CRT_WARN, _CRTDBG_MODE_FILE );\r
@@ -76,7 +72,7 @@ public:
 \r
     void testUnknown() {\r
         ifstream fs("../xmltoolingtest/data/SimpleXMLObjectWithChildren.xml");\r
-        DOMDocument* doc=nonvalidatingPool->parse(fs);\r
+        DOMDocument* doc=XMLToolingConfig::getConfig().getParser().parse(fs);\r
         TS_ASSERT(doc!=NULL);\r
 \r
         string buf1;\r
@@ -104,7 +100,7 @@ public:
 \r
     void testUnknownWithDocChange() {\r
         ifstream fs("../xmltoolingtest/data/SimpleXMLObjectWithChildren.xml");\r
-        DOMDocument* doc=nonvalidatingPool->parse(fs);\r
+        DOMDocument* doc=XMLToolingConfig::getConfig().getParser().parse(fs);\r
         TS_ASSERT(doc!=NULL);\r
 \r
         string buf1;\r
@@ -116,7 +112,7 @@ public:
         auto_ptr<XMLObject> xmlObject(b->buildFromDocument(doc)); // bind document\r
         TS_ASSERT(xmlObject.get()!=NULL);\r
 \r
-        DOMDocument* newDoc=nonvalidatingPool->newDocument();\r
+        DOMDocument* newDoc=XMLToolingConfig::getConfig().getParser().newDocument();\r
         DOMElement* rootElement=xmlObject->marshall(newDoc);\r
         TS_ASSERT(rootElement!=NULL);\r
 \r