[java-opensaml COMMIT] in /trunk/opensaml-saml-impl/src/test: java/org/opensaml/saml/saml2/metadata/impl/AffiliationD...

[noreply at shibboleth.net]

Author: rdw
Date: Thu Jun  7 17:43:44 2012
New Revision: 3063

URL: http://svn.shibboleth.net/view/java-opensaml?rev=3063&view=rev
Log:
More code coverage

Added:
    trunk/opensaml-saml-impl/src/test/resources/data/org/opensaml/saml/saml2/metadata/impl/SingleLogoutServiceChildElements.xml   (with props)
Modified:
    trunk/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/metadata/impl/AffiliationDescriptorTest.java
    trunk/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/metadata/impl/ArtifactResolutionServiceTest.java
    trunk/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/metadata/impl/AttributeConsumingServiceTest.java
    trunk/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/metadata/impl/AuthnAuthorityDescriptorTest.java
    trunk/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/metadata/impl/ContactPersonTest.java
    trunk/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/metadata/impl/EncryptionMethodTest.java
    trunk/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/metadata/impl/EntityDescriptorTest.java
    trunk/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/metadata/impl/GivenNameTest.java
    trunk/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/metadata/impl/ManageNameIDServiceTest.java
    trunk/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/metadata/impl/NameIDMappingServiceTest.java
    trunk/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/metadata/impl/PDPDescriptorTest.java
    trunk/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/metadata/impl/SingleLogoutServiceTest.java
    trunk/opensaml-saml-impl/src/test/resources/data/org/opensaml/saml/saml2/metadata/impl/AffiliationDescriptorChildElements.xml
    trunk/opensaml-saml-impl/src/test/resources/data/org/opensaml/saml/saml2/metadata/impl/ContactPersonUnknownAttributes.xml

Modified: trunk/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/metadata/impl/AffiliationDescriptorTest.java
URL: http://svn.shibboleth.net/view/java-opensaml/trunk/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/metadata/impl/AffiliationDescriptorTest.java?rev=3063&r1=3062&r2=3063&view=diff
==============================================================================
--- trunk/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/metadata/impl/AffiliationDescriptorTest.java (original)
+++ trunk/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/metadata/impl/AffiliationDescriptorTest.java Thu Jun  7 17:43:44 2012
@@ -17,21 +17,34 @@
 
 package org.opensaml.saml.saml2.metadata.impl;
 
+import java.util.List;
+import java.util.Set;
+
 import javax.xml.namespace.QName;
 
 import org.joda.time.DateTime;
 import org.joda.time.chrono.ISOChronology;
+import org.opensaml.core.xml.Namespace;
+import org.opensaml.core.xml.NamespaceManager;
+import org.opensaml.core.xml.XMLObject;
 import org.opensaml.core.xml.XMLObjectProviderBaseTestCase;
+import org.opensaml.core.xml.schema.XSBooleanValue;
 import org.opensaml.core.xml.util.AttributeMap;
+import org.opensaml.core.xml.util.IDIndex;
 import org.opensaml.saml.common.xml.SAMLConstants;
 import org.opensaml.saml.saml2.common.Extensions;
 import org.opensaml.saml.saml2.metadata.AffiliateMember;
 import org.opensaml.saml.saml2.metadata.AffiliationDescriptor;
+import org.opensaml.saml.saml2.metadata.EncryptionMethod;
+import org.opensaml.saml.saml2.metadata.KeyDescriptor;
+import org.opensaml.security.credential.UsageType;
+import org.opensaml.xmlsec.signature.KeyInfo;
 import org.opensaml.xmlsec.signature.Signature;
 import org.opensaml.xmlsec.signature.support.SignatureConstants;
 import org.testng.Assert;
 import org.testng.annotations.BeforeMethod;
 import org.testng.annotations.Test;
+import org.w3c.dom.Element;
 
 /**
  * Test case for creating, marshalling, and unmarshalling
@@ -88,6 +101,8 @@
 
         DateTime validUntil = descriptor.getValidUntil();
         Assert.assertNull(validUntil, "validUntil attribute has a value of " + validUntil + ", expected no value");
+        
+        Assert.assertTrue(descriptor.isValid());
     }
 
     /** {@inheritDoc} */
@@ -109,6 +124,7 @@
         DateTime validUntil = descriptor.getValidUntil();
         Assert.assertEquals(expectedValidUntil
                 .compareTo(validUntil), 0, "validUntil attribute value did not match expected value");
+        Assert.assertFalse(descriptor.isValid());
     }
 
     /** {@inheritDoc} */
@@ -129,7 +145,7 @@
 
         Assert.assertNotNull(descriptor.getExtensions(), "Extensions");
         Assert.assertNotNull(descriptor.getSignature(), "Signature");
-        Assert.assertEquals(descriptor.getKeyDescriptors().size(), 0, "KeyDescriptor count");
+        Assert.assertEquals(descriptor.getKeyDescriptors().size(), 1, "KeyDescriptor count");
         Assert.assertEquals(descriptor.getMembers().size(), 3, "Affiliate Member count ");
     }
 
@@ -175,6 +191,16 @@
                 SAMLConstants.SAML20MD_PREFIX);
         AffiliationDescriptor descriptor = (AffiliationDescriptor) buildXMLObject(qname);
 

[... 486 lines stripped ...]