Added singleton methods on typed builders.

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

diff --git a/xmltoolingtest/XMLObjectBaseTestCase.h b/xmltoolingtest/XMLObjectBaseTestCase.h
index 6371026..b0088f5 100644 (file)
--- a/xmltoolingtest/XMLObjectBaseTestCase.h
+++ b/xmltoolingtest/XMLObjectBaseTestCase.h
@@ -15,6 +15,7 @@
  */
 
 #include <cxxtest/TestSuite.h>
+#include <xmltooling/AbstractComplexElement.h>
 #include <xmltooling/ElementProxy.h>
 #include <xmltooling/exceptions.h>
 #include <xmltooling/XMLObjectBuilder.h>
@@ -23,15 +24,16 @@
 #include <xmltooling/io/AbstractXMLObjectUnmarshaller.h>
 #include <xmltooling/impl/AnyElement.h>
 #include <xmltooling/impl/UnknownElement.h>
-#ifndef XMLTOOLING_NO_XMLSEC
-    #include <xmltooling/signature/Signature.h>
-#endif
 #include <xmltooling/util/ParserPool.h>
 #include <xmltooling/util/XMLConstants.h>
 #include <xmltooling/util/XMLHelper.h>
 #include <xmltooling/util/XMLObjectChildrenList.h>
 
-using namespace xmlsignature;
+#ifndef XMLTOOLING_NO_XMLSEC
+    #include <xmltooling/signature/Signature.h>
+    using namespace xmlsignature;
+#endif
+
 using namespace xmltooling;
 using namespace std;
 
@@ -44,7 +46,11 @@ extern string data_path;
     #pragma warning( disable : 4250 4251 )
 #endif
 
-class SimpleXMLObject : public AbstractDOMCachingXMLObject, public AbstractXMLObjectMarshaller, public AbstractXMLObjectUnmarshaller
+class SimpleXMLObject
+    : public AbstractComplexElement,
+        public AbstractDOMCachingXMLObject,
+        public AbstractXMLObjectMarshaller,
+        public AbstractXMLObjectUnmarshaller
 {
 protected:
     SimpleXMLObject(const SimpleXMLObject& src) : AbstractXMLObject(src), AbstractDOMCachingXMLObject(src),
@@ -180,6 +186,15 @@ public:
         ) const {
         return new SimpleXMLObject(nsURI, localName, prefix, schemaType);
     }
+
+    static SimpleXMLObject* newSimpleXMLObject() {\r
+        const SimpleXMLObjectBuilder* b = dynamic_cast<const SimpleXMLObjectBuilder*>(\r
+            XMLObjectBuilder::getBuilder(QName(SimpleXMLObject::NAMESPACE,SimpleXMLObject::LOCAL_NAME))\r
+            );\r
+        if (b)\r
+            return b->buildObject();\r
+        throw XMLObjectException("Unable to obtain typed builder for SimpleXMLObject.");\r
+    }\r
 };
 
 #if defined (_MSC_VER)