X-Git-Url: http://www.project-moonshot.org/gitweb/?a=blobdiff_plain;f=samltest%2Fsaml2%2Fcore%2Fimpl%2FNewEncryptedID20Test.h;h=c09a9040ca87bc3960da575327c2a82c6ac52246;hb=e9554c255ad3c91c7c4976e7a1a54905903e66a2;hp=e9a3ef7f8fd1733a5c99f296237d7150a98f7489;hpb=31bc751c4d57cbefbcda84e5a6afc7dffee22dcf;p=shibboleth%2Fcpp-opensaml.git

diff --git a/samltest/saml2/core/impl/NewEncryptedID20Test.h b/samltest/saml2/core/impl/NewEncryptedID20Test.h
index e9a3ef7..c09a904 100644
--- a/samltest/saml2/core/impl/NewEncryptedID20Test.h
+++ b/samltest/saml2/core/impl/NewEncryptedID20Test.h
@@ -1,71 +1,71 @@
-/*
- *  Copyright 2001-2006 Internet2
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#include "internal.h"
-#include <saml/saml2/core/Protocols.h>
-#include <xmltooling/encryption/Encryption.h>
-#include <xmltooling/util/XMLConstants.h>
-
-using namespace opensaml;
-using namespace opensaml::saml2p;
-using namespace xmlencryption;
-
-class NewEncryptedID20Test : public CxxTest::TestSuite, public SAMLObjectBaseTestCase {
-
-public:
-    void setUp() {
-        singleElementFile = data_path + "saml2/core/impl/NewEncryptedID.xml";
-        childElementsFile  = data_path + "saml2/core/impl/NewEncryptedIDChildElements.xml";    
-        SAMLObjectBaseTestCase::setUp();
-    }
-    
-    void tearDown() {
-        SAMLObjectBaseTestCase::tearDown();
-    }
-
-    void testSingleElementUnmarshall() {
-        auto_ptr<XMLObject> xo(unmarshallElement(singleElementFile));
-        NewEncryptedID* encID = dynamic_cast<NewEncryptedID*>(xo.get());
-        TS_ASSERT(encID!=NULL);
-        TSM_ASSERT("EncryptedData child element", encID->getEncryptedData()==NULL);
-        TSM_ASSERT_EQUALS("# of EncryptedKey child elements", 0, encID->getEncryptedKeys().size());
-    }
-
-    void testChildElementsUnmarshall() {
-        auto_ptr<XMLObject> xo(unmarshallElement(childElementsFile));
-        NewEncryptedID* encID = dynamic_cast<NewEncryptedID*>(xo.get());
-        TS_ASSERT(encID!=NULL);
-        TSM_ASSERT("EncryptedData child element", encID->getEncryptedData()!=NULL);
-        TSM_ASSERT_EQUALS("# of EncryptedKey child elements", 2, encID->getEncryptedKeys().size());
-    }
-
-    void testSingleElementMarshall() {
-        NewEncryptedID* encID=NewEncryptedIDBuilder::buildNewEncryptedID();
-        assertEquals(expectedDOM, encID);
-    }
-
-    void testChildElementsMarshall() {
-        NewEncryptedID* encID=NewEncryptedIDBuilder::buildNewEncryptedID();
-        // Do this just so don't have to redeclare the xenc namespace prefix on every child element in the control XML file
-        Namespace* ns = new Namespace(xmltooling::XMLConstants::XMLENC_NS, xmltooling::XMLConstants::XMLENC_PREFIX);
-        encID->addNamespace(*ns);
-        encID->setEncryptedData(EncryptedDataBuilder::buildEncryptedData());
-        encID->getEncryptedKeys().push_back(EncryptedKeyBuilder::buildEncryptedKey());
-        encID->getEncryptedKeys().push_back(EncryptedKeyBuilder::buildEncryptedKey());
-        assertEquals(expectedChildElementsDOM, encID);
-    }
-
-};
+/*
+ *  Copyright 2001-2010 Internet2
+ * 
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#include "internal.h"
+#include <saml/saml2/core/Protocols.h>
+#include <xmltooling/encryption/Encryption.h>
+#include <xmltooling/util/XMLConstants.h>
+
+using namespace opensaml;
+using namespace opensaml::saml2p;
+using namespace xmlencryption;
+
+class NewEncryptedID20Test : public CxxTest::TestSuite, public SAMLObjectBaseTestCase {
+
+public:
+    void setUp() {
+        singleElementFile = data_path + "saml2/core/impl/NewEncryptedID.xml";
+        childElementsFile  = data_path + "saml2/core/impl/NewEncryptedIDChildElements.xml";    
+        SAMLObjectBaseTestCase::setUp();
+    }
+    
+    void tearDown() {
+        SAMLObjectBaseTestCase::tearDown();
+    }
+
+    void testSingleElementUnmarshall() {
+        auto_ptr<XMLObject> xo(unmarshallElement(singleElementFile));
+        NewEncryptedID* encID = dynamic_cast<NewEncryptedID*>(xo.get());
+        TS_ASSERT(encID!=nullptr);
+        TSM_ASSERT("EncryptedData child element", encID->getEncryptedData()==nullptr);
+        TSM_ASSERT_EQUALS("# of EncryptedKey child elements", 0, encID->getEncryptedKeys().size());
+    }
+
+    void testChildElementsUnmarshall() {
+        auto_ptr<XMLObject> xo(unmarshallElement(childElementsFile));
+        NewEncryptedID* encID = dynamic_cast<NewEncryptedID*>(xo.get());
+        TS_ASSERT(encID!=nullptr);
+        TSM_ASSERT("EncryptedData child element", encID->getEncryptedData()!=nullptr);
+        TSM_ASSERT_EQUALS("# of EncryptedKey child elements", 2, encID->getEncryptedKeys().size());
+    }
+
+    void testSingleElementMarshall() {
+        NewEncryptedID* encID=NewEncryptedIDBuilder::buildNewEncryptedID();
+        assertEquals(expectedDOM, encID);
+    }
+
+    void testChildElementsMarshall() {
+        NewEncryptedID* encID=NewEncryptedIDBuilder::buildNewEncryptedID();
+        // Do this just so don't have to redeclare the xenc namespace prefix on every child element in the control XML file
+        Namespace* ns = new Namespace(xmlconstants::XMLENC_NS, xmlconstants::XMLENC_PREFIX);
+        encID->addNamespace(*ns);
+        encID->setEncryptedData(EncryptedDataBuilder::buildEncryptedData());
+        encID->getEncryptedKeys().push_back(EncryptedKeyBuilder::buildEncryptedKey());
+        encID->getEncryptedKeys().push_back(EncryptedKeyBuilder::buildEncryptedKey());
+        assertEquals(expectedChildElementsDOM, encID);
+    }
+
+};