Removed ValidatingXMLObject interface and implementations.

[shibboleth/xmltooling.git] / xmltoolingtest / SignatureTest.h

diff --git a/xmltoolingtest/SignatureTest.h b/xmltoolingtest/SignatureTest.h
index 458fa7e..d52c0a2 100644 (file)
--- a/xmltoolingtest/SignatureTest.h
+++ b/xmltoolingtest/SignatureTest.h
@@ -52,10 +52,6 @@ class TestValidator : public SignatureValidator
 {\r
     XMLCh* m_uri;\r
     \r
-    TestValidator(const TestValidator& src) : SignatureValidator(src) {\r
-        m_uri=XMLString::replicate(src.m_uri);\r
-    }\r
-\r
 public:\r
     TestValidator(const XMLCh* uri, XSECCryptoKey* key) : SignatureValidator(new KeyResolver(key)) {\r
         m_uri=XMLString::replicate(uri);\r
@@ -65,10 +61,6 @@ public:
         XMLString::release(&m_uri);\r
     }\r
 \r
-    TestValidator* clone() const {\r
-        return new TestValidator(*this);\r
-    }\r
-\r
     void validate(const Signature* sigObj) const {\r
         DSIGSignature* sig=sigObj->getXMLSignature();\r
         if (!sig)\r
@@ -185,10 +177,10 @@ public:
         auto_ptr<SimpleXMLObject> sxObject2(dynamic_cast<SimpleXMLObject*>(b->buildFromDocument(doc)));\r
         TS_ASSERT(sxObject2.get()!=NULL);\r
         TS_ASSERT(sxObject2->getSignature()!=NULL);\r
-        sxObject2->getSignature()->registerValidator(new TestValidator(&chNull,m_key->clone()));\r
         \r
         try {\r
-            sxObject2->getSignature()->validate(false);\r
+            TestValidator tv(&chNull,m_key->clone());\r
+            tv.validate(sxObject2->getSignature());\r
         }\r
         catch (XMLToolingException& e) {\r
             TS_TRACE(e.what());\r