X-Git-Url: http://www.project-moonshot.org/gitweb/?a=blobdiff_plain;f=xmltoolingtest%2FKeyInfoTest.h;h=64fb6c7c58c51cb233f5d6be9cd9ab8aa5cc02ac;hb=1634821217afa6ee6751d075afdf23a53f9b73c8;hp=2d2ec97109bd039af3c29a3b565747fe640b5606;hpb=5abd16757f109ccf2b6a7c3b40b98ae858bddae8;p=shibboleth%2Fcpp-xmltooling.git

diff --git a/xmltoolingtest/KeyInfoTest.h b/xmltoolingtest/KeyInfoTest.h
index 2d2ec97..64fb6c7 100644
--- a/xmltoolingtest/KeyInfoTest.h
+++ b/xmltoolingtest/KeyInfoTest.h
@@ -34,8 +34,6 @@ public:
     }
 
     void testKeyInfo1() {
-        TS_TRACE("testKeyInfo1");
-
         string path=data_path + "KeyInfo1.xml";
         ifstream fs(path.c_str());
         DOMDocument* doc=XMLToolingConfig::getConfig().getValidatingParser().parse(fs);
@@ -44,9 +42,7 @@ public:
         const XMLObjectBuilder* b = XMLObjectBuilder::getBuilder(doc->getDocumentElement());
         TS_ASSERT(b!=NULL);
 
-        auto_ptr<KeyInfo> kiObject(
-            dynamic_cast<KeyInfo*>(b->buildFromDocument(doc))
-            );
+        auto_ptr<KeyInfo> kiObject(dynamic_cast<KeyInfo*>(b->buildFromDocument(doc)));
         TS_ASSERT(kiObject.get()!=NULL);
         TSM_ASSERT_EQUALS("Number of child elements was not expected value",
             3, kiObject->getOrderedChildren().size());
@@ -56,15 +52,12 @@ public:
             1, kiObject->getX509Datas().front()->getX509Certificates().size());
 
         auto_ptr_XMLCh expected("Public Key for CN=xmldap.org, OU=Domain Control Validated, O=xmldap.org");
-        TSM_ASSERT_SAME_DATA("KeyName was not expected value",
-            expected.get(), kiObject->getKeyNames().front()->getName(), XMLString::stringLen(expected.get()));
+        TSM_ASSERT("KeyName was not expected value", XMLString::equals(expected.get(), kiObject->getKeyNames().front()->getName()));
 
-        Validator::checkValidity(kiObject.get());
+        KeyInfoSchemaValidators.validate(kiObject.get());
     }
 
     void testKeyInfo2() {
-        TS_TRACE("testKeyInfo2");
-
         string path=data_path + "KeyInfo2.xml";
         ifstream fs(path.c_str());
         DOMDocument* doc=XMLToolingConfig::getConfig().getValidatingParser().parse(fs);
@@ -73,9 +66,7 @@ public:
         const XMLObjectBuilder* b = XMLObjectBuilder::getBuilder(doc->getDocumentElement());
         TS_ASSERT(b!=NULL);
 
-        auto_ptr<KeyInfo> kiObject(
-            dynamic_cast<KeyInfo*>(b->buildFromDocument(doc))
-            );
+        auto_ptr<KeyInfo> kiObject(dynamic_cast<KeyInfo*>(b->buildFromDocument(doc)));
         TS_ASSERT(kiObject.get()!=NULL);
         TSM_ASSERT_EQUALS("Number of child elements was not expected value",
             2, kiObject->getOrderedChildren().size());
@@ -84,12 +75,10 @@ public:
         TSM_ASSERT_EQUALS("Number of child elements was not expected value",
             2, kiObject->getSPKIDatas().front()->getSPKISexps().size());
 
-        Validator::checkValidity(kiObject.get());
+        KeyInfoSchemaValidators.validate(kiObject.get());
     }
 
     void testKeyInfo3() {
-        TS_TRACE("testKeyInfo3");
-
         string path=data_path + "KeyInfo3.xml";
         ifstream fs(path.c_str());
         DOMDocument* doc=XMLToolingConfig::getConfig().getParser().parse(fs);
@@ -98,10 +87,8 @@ public:
         const XMLObjectBuilder* b = XMLObjectBuilder::getBuilder(doc->getDocumentElement());
         TS_ASSERT(b!=NULL);
 
-        auto_ptr<KeyInfo> kiObject(
-            dynamic_cast<KeyInfo*>(b->buildFromDocument(doc))
-            );
+        auto_ptr<KeyInfo> kiObject(dynamic_cast<KeyInfo*>(b->buildFromDocument(doc)));
         TS_ASSERT(kiObject.get()!=NULL);
-        TS_ASSERT_THROWS(Validator::checkValidity(kiObject.get()),ValidationException);
+        TS_ASSERT_THROWS(KeyInfoSchemaValidators.validate(kiObject.get()),ValidationException);
     }
 };