projects / shibboleth / cpp-opensaml.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 03d6951)
Attribute test
authorScott Cantor <cantor.2@osu.edu>
Thu, 11 May 2006 04:47:45 +0000 (04:47 +0000)
committerScott Cantor <cantor.2@osu.edu>
Thu, 11 May 2006 04:47:45 +0000 (04:47 +0000)
samltest/data/saml1/core/impl/AttributeWithChildren.xml patch | blob | history
samltest/internal.h patch | blob | history
samltest/saml1/core/impl/AttributeTest.h [new file with mode: 0644] patch | blob
samltest/samltest.vcproj patch | blob | history

diff --git a/samltest/data/saml1/core/impl/AttributeWithChildren.xml b/samltest/data/saml1/core/impl/AttributeWithChildren.xml
index f52888f..d74812b 100644 (file)
Binary files a/samltest/data/saml1/core/impl/AttributeWithChildren.xml and b/samltest/data/saml1/core/impl/AttributeWithChildren.xml differ
diff --git a/samltest/internal.h b/samltest/internal.h
index 1c97b69..84cbd20 100644 (file)
--- a/samltest/internal.h
+++ b/samltest/internal.h
@@ -72,7 +72,15 @@ protected:
 
     void assertEquals(const char* failMessage, DOMDocument* expectedDOM, XMLObject* xmlObject) {
         DOMElement* generatedDOM = xmlObject->marshall();
-        TSM_ASSERT(failMessage,generatedDOM->isEqualNode(expectedDOM->getDocumentElement()));
+        if (!generatedDOM->isEqualNode(expectedDOM->getDocumentElement())) {
+            string buf;
+            XMLHelper::serialize(generatedDOM, buf);
+            TS_TRACE(buf.c_str());
+            buf.erase();
+            XMLHelper::serialize(expectedDOM->getDocumentElement(), buf);
+            TS_TRACE(buf.c_str());
+            TSM_ASSERT(failMessage, false);
+        }
     }
 
     void assertEquals(DOMDocument* expectedDOM, XMLObject* xmlObject) {
diff --git a/samltest/saml1/core/impl/AttributeTest.h b/samltest/saml1/core/impl/AttributeTest.h
new file mode 100644 (file)
index 0000000..0e5afe8
--- /dev/null
+++ b/samltest/saml1/core/impl/AttributeTest.h
@@ -0,0 +1,87 @@
+/*\r
+ *  Copyright 2001-2006 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/saml1/core/Assertions.h>\r
+\r
+using namespace opensaml::saml1;\r
+\r
+class AttributeTest : public CxxTest::TestSuite, public SAMLObjectBaseTestCase {\r
+    XMLCh* expectedAttributeName;\r
+    XMLCh* expectedAttributeNamespace;\r
+\r
+public:\r
+    void setUp() {\r
+        expectedAttributeName=XMLString::transcode("AttributeName");\r
+        expectedAttributeNamespace=XMLString::transcode("namespace");\r
+        singleElementFile = data_path + "saml1/core/impl/singleAttribute.xml";\r
+        singleElementOptionalAttributesFile = data_path + "saml1/core/impl/singleAttributeAttributes.xml";\r
+        childElementsFile = data_path + "saml1/core/impl/AttributeWithChildren.xml";\r
+        SAMLObjectBaseTestCase::setUp();\r
+    }\r
+    \r
+    void tearDown() {\r
+        XMLString::release(&expectedAttributeName);\r
+        XMLString::release(&expectedAttributeNamespace);\r
+        SAMLObjectBaseTestCase::tearDown();\r
+    }\r
+\r
+    void testSingleElementUnmarshall() {\r
+        auto_ptr<XMLObject> xo(unmarshallElement(singleElementFile));\r
+        Attribute& a = dynamic_cast<Attribute&>(*xo.get());\r
+        TSM_ASSERT("AttributeName", a.getAttributeName()==NULL);\r
+        TSM_ASSERT("AttributeNamespace", a.getAttributeNamespace()==NULL);\r
+        TSM_ASSERT_EQUALS("<AttributeValue> subelement found", 0, a.getAttributeValues().size());\r
+    }\r
+\r
+    void testSingleElementOptionalAttributesUnmarshall() {\r
+        auto_ptr<XMLObject> xo(unmarshallElement(singleElementOptionalAttributesFile));\r
+        Attribute& a = dynamic_cast<Attribute&>(*xo.get());\r
+        TSM_ASSERT_SAME_DATA("AttributeName", expectedAttributeName, a.getAttributeName(), XMLString::stringLen(expectedAttributeName));\r
+        TSM_ASSERT_SAME_DATA("AttributeNamespace", expectedAttributeNamespace, a.getAttributeNamespace(), XMLString::stringLen(expectedAttributeNamespace));\r
+    }\r
+\r
+    void testChildElementsUnmarshall() {\r
+        auto_ptr<XMLObject> xo(unmarshallElement(childElementsFile));\r
+        Attribute& a = dynamic_cast<Attribute&>(*xo.get());\r
+        TSM_ASSERT_EQUALS("Number of <AttributeValue> subelements", 4, a.getAttributeValues().size());\r
+    }\r
+\r
+    void testSingleElementMarshall() {\r
+        assertEquals(expectedDOM, AttributeBuilder::buildAttribute());\r
+    }\r
+\r
+    void testSingleElementOptionalAttributesMarshall() {\r
+        Attribute* a=AttributeBuilder::buildAttribute();\r
+        a->setAttributeName(expectedAttributeName);\r
+        a->setAttributeNamespace(expectedAttributeNamespace);\r
+        assertEquals(expectedOptionalAttributesDOM, a);\r
+    }\r
+\r
+    void testChildElementsMarshall(){\r
+        Attribute* a=AttributeBuilder::buildAttribute();\r
+        \r
+        const XMLCh xsdstring[] = UNICODE_LITERAL_6(s,t,r,i,n,g);\r
+       \r
+        const XMLObjectBuilder* builder=XMLObjectBuilder::getBuilder(QName(SAMLConstants::SAML1_NS,AttributeValue::LOCAL_NAME));\r
+        TS_ASSERT(builder!=NULL);\r
+        QName xsitype(XMLConstants::XSD_NS,xsdstring,XMLConstants::XSD_PREFIX);\r
+        for (int i=0; i<4; i++)\r
+            a->getAttributeValues().push_back(builder->buildObject(SAMLConstants::SAML1_NS, AttributeValue::LOCAL_NAME, SAMLConstants::SAML1_PREFIX, &xsitype)); \r
+\r
+        assertEquals(expectedChildElementsDOM, a);\r
+    }\r
+};\r
diff --git a/samltest/samltest.vcproj b/samltest/samltest.vcproj
index 09f17b3..c6f5e45 100644 (file)
--- a/samltest/samltest.vcproj
+++ b/samltest/samltest.vcproj
@@ -215,6 +215,10 @@
                                                        RelativePath=".\saml1\core\impl\AttributeStatementTest.cpp"\r
                                                        >\r
                                                </File>\r
+                                               <File\r
+                                                       RelativePath=".\saml1\core\impl\AttributeTest.cpp"\r
+                                                       >\r
+                                               </File>\r
                                        </Filter>\r
                                </Filter>\r
                        </Filter>\r
@@ -237,7 +241,7 @@
                                        <Tool\r
                                                Name="VCCustomBuildTool"\r
                                                CommandLine="\perl\bin\perl.exe -w \cxxtest\cxxtestgen.pl --error-printer --have-eh --have-std --abort-on-fail -o &quot;$(InputName)&quot;.cpp &quot;$(InputPath)&quot;&#x0D;&#x0A;"\r
-                                               Outputs="$(Input).cpp"\r
+                                               Outputs="$(InputName).cpp"\r
                                        />\r
                                </FileConfiguration>\r
                                <FileConfiguration\r
@@ -246,7 +250,7 @@
                                        <Tool\r
                                                Name="VCCustomBuildTool"\r
                                                CommandLine="\perl\bin\perl.exe -w \cxxtest\cxxtestgen.pl --error-printer --have-eh --have-std --abort-on-fail -o &quot;$(InputName)&quot;.cpp &quot;$(InputPath)&quot;&#x0D;&#x0A;"\r
-                                               Outputs="$(Input).cpp"\r
+                                               Outputs="$(InputName).cpp"\r
                                        />\r
                                </FileConfiguration>\r
                        </File>\r
@@ -355,7 +359,7 @@
                                                                >\r
                                                                <Tool\r
                                                                        Name="VCCustomBuildTool"\r
-                                                                       CommandLine="\perl\bin\perl.exe -w \cxxtest\cxxtestgen.pl --part --have-eh --have-std --abort-on-fail -o &quot;$(InputDir)$(InputName)&quot;.cpp &quot;$(InputPath)&quot;"\r
+                                                                       CommandLine="\perl\bin\perl.exe -w \cxxtest\cxxtestgen.pl --part --have-eh --have-std --abort-on-fail -o &quot;$(InputDir)$(InputName)&quot;.cpp &quot;$(InputPath)&quot;&#x0D;&#x0A;"\r
                                                                        Outputs="&quot;$(InputDir)$(InputName)&quot;.cpp"\r
                                                                />\r
                                                        </FileConfiguration>\r
@@ -364,7 +368,7 @@
                                                                >\r
                                                                <Tool\r
                                                                        Name="VCCustomBuildTool"\r
-                                                                       CommandLine="\perl\bin\perl.exe -w \cxxtest\cxxtestgen.pl --part --have-eh --have-std --abort-on-fail -o &quot;$(InputDir)$(InputName)&quot;.cpp &quot;$(InputPath)&quot;"\r
+                                                                       CommandLine="\perl\bin\perl.exe -w \cxxtest\cxxtestgen.pl --part --have-eh --have-std --abort-on-fail -o &quot;$(InputDir)$(InputName)&quot;.cpp &quot;$(InputPath)&quot;&#x0D;&#x0A;"\r
                                                                        Outputs="&quot;$(InputDir)$(InputName)&quot;.cpp"\r
                                                                />\r
                                                        </FileConfiguration>\r
@@ -377,7 +381,29 @@
                                                                >\r
                                                                <Tool\r
                                                                        Name="VCCustomBuildTool"\r
-                                                                       CommandLine="\perl\bin\perl.exe -w \cxxtest\cxxtestgen.pl --part --have-eh --have-std --abort-on-fail -o &quot;$(InputDir)$(InputName)&quot;.cpp &quot;$(InputPath)&quot;"\r
+                                                                       CommandLine="\perl\bin\perl.exe -w \cxxtest\cxxtestgen.pl --part --have-eh --have-std --abort-on-fail -o &quot;$(InputDir)$(InputName)&quot;.cpp &quot;$(InputPath)&quot;&#x0D;&#x0A;"\r
+                                                                       Outputs="&quot;$(InputDir)$(InputName)&quot;.cpp"\r
+                                                               />\r
+                                                       </FileConfiguration>\r
+                                                       <FileConfiguration\r
+                                                               Name="Release|Win32"\r
+                                                               >\r
+                                                               <Tool\r
+                                                                       Name="VCCustomBuildTool"\r
+                                                                       CommandLine="\perl\bin\perl.exe -w \cxxtest\cxxtestgen.pl --part --have-eh --have-std --abort-on-fail -o &quot;$(InputDir)$(InputName)&quot;.cpp &quot;$(InputPath)&quot;&#x0D;&#x0A;"\r
+                                                                       Outputs="&quot;$(InputDir)$(InputName)&quot;.cpp"\r
+                                                               />\r
+                                                       </FileConfiguration>\r
+                                               </File>\r
+                                               <File\r
+                                                       RelativePath=".\saml1\core\impl\AttributeTest.h"\r
+                                                       >\r
+                                                       <FileConfiguration\r
+                                                               Name="Debug|Win32"\r
+                                                               >\r
+                                                               <Tool\r
+                                                                       Name="VCCustomBuildTool"\r
+                                                                       CommandLine="\perl\bin\perl.exe -w \cxxtest\cxxtestgen.pl --part --have-eh --have-std --abort-on-fail -o &quot;$(InputDir)$(InputName)&quot;.cpp &quot;$(InputPath)&quot;&#x0D;&#x0A;"\r
                                                                        Outputs="&quot;$(InputDir)$(InputName)&quot;.cpp"\r
                                                                />\r
                                                        </FileConfiguration>\r
@@ -386,7 +412,7 @@
                                                                >\r
                                                                <Tool\r
                                                                        Name="VCCustomBuildTool"\r
-                                                                       CommandLine="\perl\bin\perl.exe -w \cxxtest\cxxtestgen.pl --part --have-eh --have-std --abort-on-fail -o &quot;$(InputDir)$(InputName)&quot;.cpp &quot;$(InputPath)&quot;"\r
+                                                                       CommandLine="\perl\bin\perl.exe -w \cxxtest\cxxtestgen.pl --part --have-eh --have-std --abort-on-fail -o &quot;$(InputDir)$(InputName)&quot;.cpp &quot;$(InputPath)&quot;&#x0D;&#x0A;"\r
                                                                        Outputs="&quot;$(InputDir)$(InputName)&quot;.cpp"\r
                                                                />\r
                                                        </FileConfiguration>\r
Unnamed repository; edit this file 'description' to name the repository.