X-Git-Url: http://www.project-moonshot.org/gitweb/?a=blobdiff_plain;f=xmltoolingtest%2Fxmltoolingtest.h;h=30b8622d8f356da3bc3dc55afd6ce846df298de3;hb=fe799793a4aced0cf8a21bb1c4c401215e04c8c6;hp=d63fccb67d8ad5301c038f7fc4c9feb59a4b903e;hpb=c47d9a28b514e071b6fbb1dfce4b5f258d26a67f;p=shibboleth%2Fcpp-xmltooling.git

diff --git a/xmltoolingtest/xmltoolingtest.h b/xmltoolingtest/xmltoolingtest.h
index d63fccb..30b8622 100644
--- a/xmltoolingtest/xmltoolingtest.h
+++ b/xmltoolingtest/xmltoolingtest.h
@@ -1,134 +1,126 @@
-/*
- *  Copyright 2001-2005 Internet2
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#include "XMLObjectBaseTestCase.h"
-
-#include <fstream>
-#include <cxxtest/GlobalFixture.h>
-#include <xmltooling/XMLToolingConfig.h>
-#include <xmltooling/util/ParserPool.h>
-
-//#define XMLTOOLINGTEST_LEAKCHECK
-
-ParserPool* validatingPool=NULL;
-ParserPool* nonvalidatingPool=NULL;
-std::string data_path = "../xmltoolingtest/data/";
-
-class ToolingFixture : public CxxTest::GlobalFixture
-{
-public:
-    bool setUpWorld() {
-        XMLToolingConfig::getConfig().log_config();
-        if (!XMLToolingConfig::getConfig().init())
-            return false;
-        validatingPool = new ParserPool(true,true);
-        nonvalidatingPool = new ParserPool();
-        if (getenv("XMLTOOLINGTEST_DATA"))
-            data_path=std::string(getenv("XMLTOOLINGTEST_DATA")) + "/";
-        return true;
-    }
-    bool tearDownWorld() {
-        delete validatingPool;
-        delete nonvalidatingPool;
-        XMLToolingConfig::getConfig().term();
-#if defined(_MSC_VER ) && defined(XMLTOOLINGTEST_LEAKCHECK)
-       _CrtSetReportMode( _CRT_WARN, _CRTDBG_MODE_FILE );
-       _CrtSetReportFile( _CRT_WARN, _CRTDBG_FILE_STDOUT );
-       _CrtSetReportMode( _CRT_ERROR, _CRTDBG_MODE_FILE );
-       _CrtSetReportFile( _CRT_ERROR, _CRTDBG_FILE_STDOUT );
-       _CrtSetReportMode( _CRT_ASSERT, _CRTDBG_MODE_FILE );
-       _CrtSetReportFile( _CRT_ASSERT, _CRTDBG_FILE_STDOUT );
-       _CrtDumpMemoryLeaks();
-#endif
-        return true;
-    }
-    //bool setUp() { printf( "</test>" ); return true; }
-    //bool tearDown() { printf( "</test>" ); return true; }
-};
-
-static ToolingFixture globalFixture;
-
-class GlobalTest : public CxxTest::TestSuite
-{
-public:
-    void setUp() {
-        XMLObjectBuilder::registerDefaultBuilder(new UnknownElementBuilder());
-    }
-
-    void tearDown() {
-        XMLObjectBuilder::deregisterDefaultBuilder();
-    }
-
-    void testCatalog(void) {
-        std::string path=data_path + "catalog.xml";
-        auto_ptr_XMLCh temp(path.c_str());
-        TS_ASSERT(validatingPool->loadCatalog(temp.get()));
-    }
-
-    void testUnknown() {
-        ifstream fs("../xmltoolingtest/data/SimpleXMLObjectWithChildren.xml");
-        DOMDocument* doc=nonvalidatingPool->parse(fs);
-        TS_ASSERT(doc!=NULL);
-
-        string buf1;
-        XMLHelper::serialize(doc->getDocumentElement(), buf1);
-
-        const XMLObjectBuilder* b=XMLObjectBuilder::getBuilder(doc->getDocumentElement());
-        TS_ASSERT(b!=NULL);
-
-        auto_ptr<XMLObject> xmlObject(b->buildFromDocument(doc)); // bind document
-        TS_ASSERT(xmlObject.get()!=NULL);
-
-        auto_ptr<XMLObject> clonedObject(xmlObject->clone());
-        TS_ASSERT(clonedObject.get()!=NULL);
-
-        DOMElement* rootElement=clonedObject->marshall();
-        TS_ASSERT(rootElement!=NULL);
-
-        // should reuse DOM
-        TS_ASSERT(rootElement==clonedObject->marshall());
-
-        string buf2;
-        XMLHelper::serialize(rootElement, buf2);
-        TS_ASSERT_EQUALS(buf1,buf2);
-    }
-
-    void testUnknownWithDocChange() {
-        ifstream fs("../xmltoolingtest/data/SimpleXMLObjectWithChildren.xml");
-        DOMDocument* doc=nonvalidatingPool->parse(fs);
-        TS_ASSERT(doc!=NULL);
-
-        string buf1;
-        XMLHelper::serialize(doc->getDocumentElement(), buf1);
-
-        const XMLObjectBuilder* b=XMLObjectBuilder::getBuilder(doc->getDocumentElement());
-        TS_ASSERT(b!=NULL);
-
-        auto_ptr<XMLObject> xmlObject(b->buildFromDocument(doc)); // bind document
-        TS_ASSERT(xmlObject.get()!=NULL);
-
-        DOMDocument* newDoc=nonvalidatingPool->newDocument();
-        DOMElement* rootElement=xmlObject->marshall(newDoc);
-        TS_ASSERT(rootElement!=NULL);
-
-        string buf2;
-        XMLHelper::serialize(rootElement, buf2);
-        TS_ASSERT_EQUALS(buf1,buf2);
-
-        newDoc->release();
-    }
-};
-
+/*
+ *  Copyright 2001-2007 Internet2
+ * 
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#include "XMLObjectBaseTestCase.h"
+
+#include <fstream>
+#include <cxxtest/GlobalFixture.h>
+#include <xmltooling/XMLToolingConfig.h>
+#include <xmltooling/util/ParserPool.h>
+
+//#define XMLTOOLINGTEST_LEAKCHECK
+
+std::string data_path = "../xmltoolingtest/data/";
+
+class ToolingFixture : public CxxTest::GlobalFixture
+{
+public:
+    bool setUpWorld() {
+        XMLToolingConfig::getConfig().log_config();
+
+        if (getenv("XMLTOOLINGTEST_DATA"))
+            data_path=std::string(getenv("XMLTOOLINGTEST_DATA")) + "/";
+        XMLToolingConfig::getConfig().catalog_path = data_path + "catalog.xml";
+
+        if (!XMLToolingConfig::getConfig().init())
+            return false;
+        
+        return true;
+    }
+    bool tearDownWorld() {
+        XMLToolingConfig::getConfig().term();
+#if defined(_MSC_VER ) && defined(XMLTOOLINGTEST_LEAKCHECK)
+       _CrtSetReportMode( _CRT_WARN, _CRTDBG_MODE_FILE );
+       _CrtSetReportFile( _CRT_WARN, _CRTDBG_FILE_STDOUT );
+       _CrtSetReportMode( _CRT_ERROR, _CRTDBG_MODE_FILE );
+       _CrtSetReportFile( _CRT_ERROR, _CRTDBG_FILE_STDOUT );
+       _CrtSetReportMode( _CRT_ASSERT, _CRTDBG_MODE_FILE );
+       _CrtSetReportFile( _CRT_ASSERT, _CRTDBG_FILE_STDOUT );
+       _CrtDumpMemoryLeaks();
+#endif
+        return true;
+    }
+    //bool setUp() { printf( "</test>" ); return true; }
+    //bool tearDown() { printf( "</test>" ); return true; }
+};
+
+static ToolingFixture globalFixture;
+
+class GlobalTest : public CxxTest::TestSuite
+{
+public:
+    void setUp() {
+        XMLObjectBuilder::registerDefaultBuilder(new UnknownElementBuilder());
+    }
+
+    void tearDown() {
+        XMLObjectBuilder::deregisterDefaultBuilder();
+    }
+
+    void testUnknown() {
+        ifstream fs("../xmltoolingtest/data/SimpleXMLObjectWithChildren.xml");
+        DOMDocument* doc=XMLToolingConfig::getConfig().getParser().parse(fs);
+        TS_ASSERT(doc!=NULL);
+
+        string buf1;
+        XMLHelper::serialize(doc->getDocumentElement(), buf1);
+
+        const XMLObjectBuilder* b=XMLObjectBuilder::getBuilder(doc->getDocumentElement());
+        TS_ASSERT(b!=NULL);
+
+        auto_ptr<XMLObject> xmlObject(b->buildFromDocument(doc)); // bind document
+        TS_ASSERT(xmlObject.get()!=NULL);
+
+        auto_ptr<XMLObject> clonedObject(xmlObject->clone());
+        TS_ASSERT(clonedObject.get()!=NULL);
+
+        DOMElement* rootElement=clonedObject->marshall();
+        TS_ASSERT(rootElement!=NULL);
+
+        // should reuse DOM
+        TS_ASSERT(rootElement==clonedObject->marshall());
+
+        string buf2;
+        XMLHelper::serialize(rootElement, buf2);
+        TS_ASSERT_EQUALS(buf1,buf2);
+    }
+
+    void testUnknownWithDocChange() {
+        ifstream fs("../xmltoolingtest/data/SimpleXMLObjectWithChildren.xml");
+        DOMDocument* doc=XMLToolingConfig::getConfig().getParser().parse(fs);
+        TS_ASSERT(doc!=NULL);
+
+        string buf1;
+        XMLHelper::serialize(doc->getDocumentElement(), buf1);
+
+        const XMLObjectBuilder* b=XMLObjectBuilder::getBuilder(doc->getDocumentElement());
+        TS_ASSERT(b!=NULL);
+
+        auto_ptr<XMLObject> xmlObject(b->buildFromDocument(doc)); // bind document
+        TS_ASSERT(xmlObject.get()!=NULL);
+
+        DOMDocument* newDoc=XMLToolingConfig::getConfig().getParser().newDocument();
+        DOMElement* rootElement=xmlObject->marshall(newDoc);
+        TS_ASSERT(rootElement!=NULL);
+
+        string buf2;
+        XMLHelper::serialize(rootElement, buf2);
+        TS_ASSERT_EQUALS(buf1,buf2);
+
+        newDoc->release();
+    }
+};
+