Added ValidatorSuite around groups of static validators.

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

diff --git a/xmltoolingtest/xmltoolingtest.h b/xmltoolingtest/xmltoolingtest.h
index fcf5a69..fe1e867 100644 (file)
--- a/xmltoolingtest/xmltoolingtest.h
+++ b/xmltoolingtest/xmltoolingtest.h
@@ -21,8 +21,8 @@
 #include <xmltooling/XMLToolingConfig.h>\r
 #include <xmltooling/util/ParserPool.h>\r
 \r
-ParserPool* validatingPool=NULL;\r
-ParserPool* nonvalidatingPool=NULL;\r
+//#define XMLTOOLINGTEST_LEAKCHECK\r
+\r
 std::string data_path = "../xmltoolingtest/data/";\r
 \r
 class ToolingFixture : public CxxTest::GlobalFixture\r
@@ -32,15 +32,13 @@ public:
         XMLToolingConfig::getConfig().log_config();\r
         if (!XMLToolingConfig::getConfig().init())\r
             return false;\r
-        validatingPool = new ParserPool(true,true);\r
-        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 XMLToolingConfig::getConfig().getValidatingParser().loadCatalog(temp.get());\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
@@ -70,15 +68,9 @@ 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
+        DOMDocument* doc=XMLToolingConfig::getConfig().getParser().parse(fs);\r
         TS_ASSERT(doc!=NULL);\r
 \r
         string buf1;\r
@@ -106,7 +98,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
@@ -118,7 +110,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