Merge schema validators into one suite.

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

diff --git a/xmltoolingtest/KeyInfoTest.h b/xmltoolingtest/KeyInfoTest.h
index 64fb6c7..5086243 100644 (file)
--- a/xmltoolingtest/KeyInfoTest.h
+++ b/xmltoolingtest/KeyInfoTest.h
@@ -54,7 +54,7 @@ public:
         auto_ptr_XMLCh expected("Public Key for CN=xmldap.org, OU=Domain Control Validated, O=xmldap.org");\r
         TSM_ASSERT("KeyName was not expected value", XMLString::equals(expected.get(), kiObject->getKeyNames().front()->getName()));\r
 \r
-        KeyInfoSchemaValidators.validate(kiObject.get());\r
+        SchemaValidators.validate(kiObject.get());\r
     }\r
 \r
     void testKeyInfo2() {\r
@@ -75,7 +75,7 @@ public:
         TSM_ASSERT_EQUALS("Number of child elements was not expected value",\r
             2, kiObject->getSPKIDatas().front()->getSPKISexps().size());\r
 \r
-        KeyInfoSchemaValidators.validate(kiObject.get());\r
+        SchemaValidators.validate(kiObject.get());\r
     }\r
 \r
     void testKeyInfo3() {\r
@@ -89,6 +89,6 @@ public:
 \r
         auto_ptr<KeyInfo> kiObject(dynamic_cast<KeyInfo*>(b->buildFromDocument(doc)));\r
         TS_ASSERT(kiObject.get()!=NULL);\r
-        TS_ASSERT_THROWS(KeyInfoSchemaValidators.validate(kiObject.get()),ValidationException);\r
+        TS_ASSERT_THROWS(SchemaValidators.validate(kiObject.get()),ValidationException);\r
     }\r
 };\r