Stop blowing away native signature from setters, need xmlsec fix to complete.

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

diff --git a/xmltoolingtest/SignatureTest.h b/xmltoolingtest/SignatureTest.h
index 8f3ec2c..67e4ca4 100644 (file)
--- a/xmltoolingtest/SignatureTest.h
+++ b/xmltoolingtest/SignatureTest.h
@@ -48,7 +48,7 @@ class TestValidator : public SignatureValidator
     XMLCh* m_uri;\r
     \r
 public:\r
-    TestValidator(const XMLCh* uri, XSECCryptoKey* key) : SignatureValidator(new KeyResolver(key)) {\r
+    TestValidator(const XMLCh* uri) : SignatureValidator(XMLToolingConfig::getConfig().KeyResolverManager.newPlugin(INLINE_KEY_RESOLVER,NULL)) {\r
         m_uri=XMLString::replicate(uri);\r
     }\r
     \r
@@ -135,11 +135,10 @@ public:
         for_each(m_resolver->getCertificates().begin(),m_resolver->getCertificates().end(),bind1st(_addcert(),x509Data));\r
         sig->setKeyInfo(keyInfo);\r
         \r
-        // Signing context for the whole document.\r
-        vector<Signature*> sigs(1,sig);\r
         DOMElement* rootElement = NULL;\r
         try {\r
-            rootElement=sxObject->marshall((DOMDocument*)NULL,&sigs);\r
+            rootElement=sxObject->marshall((DOMDocument*)NULL);\r
+            sig->sign();\r
         }\r
         catch (XMLToolingException& e) {\r
             TS_TRACE(e.what());\r
@@ -157,7 +156,7 @@ public:
         TS_ASSERT(sxObject2->getSignature()!=NULL);\r
         \r
         try {\r
-            TestValidator tv(&chNull,m_resolver->getKey());\r
+            TestValidator tv(&chNull);\r
             tv.validate(sxObject2->getSignature());\r
         }\r
         catch (XMLToolingException& e) {\r