Added ValidatorSuite around groups of static validators.

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

diff --git a/xmltoolingtest/KeyInfoTest.h b/xmltoolingtest/KeyInfoTest.h
index 2d2ec97..8672906 100644 (file)
--- a/xmltoolingtest/KeyInfoTest.h
+++ b/xmltoolingtest/KeyInfoTest.h
@@ -59,7 +59,7 @@ public:
         TSM_ASSERT_SAME_DATA("KeyName was not expected value",\r
             expected.get(), kiObject->getKeyNames().front()->getName(), XMLString::stringLen(expected.get()));\r
 \r
-        Validator::checkValidity(kiObject.get());\r
+        KeyInfoSchemaValidators.validate(kiObject.get());\r
     }\r
 \r
     void testKeyInfo2() {\r
@@ -84,7 +84,7 @@ public:
         TSM_ASSERT_EQUALS("Number of child elements was not expected value",\r
             2, kiObject->getSPKIDatas().front()->getSPKISexps().size());\r
 \r
-        Validator::checkValidity(kiObject.get());\r
+        KeyInfoSchemaValidators.validate(kiObject.get());\r
     }\r
 \r
     void testKeyInfo3() {\r
@@ -102,6 +102,6 @@ public:
             dynamic_cast<KeyInfo*>(b->buildFromDocument(doc))\r
             );\r
         TS_ASSERT(kiObject.get()!=NULL);\r
-        TS_ASSERT_THROWS(Validator::checkValidity(kiObject.get()),ValidationException);\r
+        TS_ASSERT_THROWS(KeyInfoSchemaValidators.validate(kiObject.get()),ValidationException);\r
     }\r
 };\r