Set fourth file version digit to signify rebuild.

[shibboleth/cpp-opensaml.git] / samltest / ArtifactMapTest.h

diff --git a/samltest/ArtifactMapTest.h b/samltest/ArtifactMapTest.h
index 8f2aa30..ce46ad3 100644 (file)
--- a/samltest/ArtifactMapTest.h
+++ b/samltest/ArtifactMapTest.h
@@ -1,53 +1,60 @@
-/*\r
- *  Copyright 2001-2005 Internet2\r
- * \r
- * Licensed under the Apache License, Version 2.0 (the "License");\r
- * you may not use this file except in compliance with the License.\r
- * You may obtain a copy of the License at\r
- *\r
- *     http://www.apache.org/licenses/LICENSE-2.0\r
- *\r
- * Unless required by applicable law or agreed to in writing, software\r
- * distributed under the License is distributed on an "AS IS" BASIS,\r
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\r
- * See the License for the specific language governing permissions and\r
- * limitations under the License.\r
- */\r
-\r
-#include "internal.h"\r
-#include <saml/SAMLConfig.h>\r
-#include "saml/binding/ArtifactMap.h"\r
-#include <saml/saml2/binding/SAML2ArtifactType0004.h>\r
-#include <saml/saml2/core/Protocols.h>\r
-\r
-using namespace opensaml::saml2p;\r
-using namespace opensaml;\r
-using namespace std;\r
-\r
-class ArtifactMapTest : public CxxTest::TestSuite\r
-{\r
-public:\r
-    string providerIdStr;\r
-    string handle;\r
-    void setUp() {\r
-        if (handle.empty()) {\r
-            providerIdStr = "https://idp.org/SAML";\r
-            SAMLConfig::getConfig().generateRandomBytes(handle,SAML2ArtifactType0004::HANDLE_LENGTH);\r
-        }\r
-    }\r
-    void tearDown() {\r
-    }\r
-    void testArtifactMap(void) {\r
-        auto_ptr<Response> response(ResponseBuilder::buildResponse());\r
-\r
-        SAML2ArtifactType0004 artifact(SAMLConfig::getConfig().hashSHA1(providerIdStr.c_str()),666,handle);\r
-        \r
-        ArtifactMap* artifactMap = SAMLConfig::getConfig().getArtifactMap();\r
-        artifactMap->storeContent(response.get(), &artifact, providerIdStr.c_str());\r
-        response.release();\r
-\r
-        auto_ptr<XMLObject> xmlObject(artifactMap->retrieveContent(&artifact, providerIdStr.c_str()));\r
-        TSM_ASSERT_THROWS("Artifact resolution improperly succeeded.", artifactMap->retrieveContent(&artifact), BindingException);\r
-        TSM_ASSERT("Mapped content was not a Response.", dynamic_cast<Response*>(xmlObject.get())!=NULL);\r
-    }\r
-};\r
+/**
+ * Licensed to the University Corporation for Advanced Internet
+ * Development, Inc. (UCAID) under one or more contributor license
+ * agreements. See the NOTICE file distributed with this work for
+ * additional information regarding copyright ownership.
+ *
+ * UCAID licenses this file to you 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/SAMLConfig.h>
+#include "saml/binding/ArtifactMap.h"
+#include <saml/saml2/binding/SAML2ArtifactType0004.h>
+#include <saml/saml2/core/Protocols.h>
+#include <xmltooling/security/SecurityHelper.h>
+
+using namespace opensaml::saml2p;
+using namespace opensaml;
+using namespace std;
+
+class ArtifactMapTest : public CxxTest::TestSuite
+{
+public:
+    string providerIdStr;
+    string handle;
+    void setUp() {
+        if (handle.empty()) {
+            providerIdStr = "https://idp.org/SAML";
+            SAMLConfig::getConfig().generateRandomBytes(handle,SAML2ArtifactType0004::HANDLE_LENGTH);
+        }
+    }
+    void tearDown() {
+    }
+    void testArtifactMap(void) {
+        auto_ptr<Response> response(ResponseBuilder::buildResponse());
+
+        SAML2ArtifactType0004 artifact(
+            SecurityHelper::doHash("SHA1", providerIdStr.data(), providerIdStr.length(), false), 666, handle
+            );
+        
+        ArtifactMap* artifactMap = SAMLConfig::getConfig().getArtifactMap();
+        artifactMap->storeContent(response.get(), &artifact, providerIdStr.c_str());
+        response.release();
+
+        auto_ptr<XMLObject> xmlObject(artifactMap->retrieveContent(&artifact, providerIdStr.c_str()));
+        TSM_ASSERT_THROWS("Artifact resolution improperly succeeded.", artifactMap->retrieveContent(&artifact), BindingException);
+        TSM_ASSERT("Mapped content was not a Response.", dynamic_cast<Response*>(xmlObject.get())!=nullptr);
+    }
+};