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

[noreply at shibboleth.net]

Author: rdw
Date: Wed Jun 13 12:08:35 2012
New Revision: 3066

URL: http://svn.shibboleth.net/view/java-opensaml?rev=3066&view=rev
Log:
Extra testing - code coverage up to 98% (and three bugs found!)

Modified:
    trunk/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/metadata/impl/SSODescriptorImpl.java
    trunk/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/metadata/impl/AssertionIDRequestServiceTest.java
    trunk/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/metadata/impl/EmailAddressTest.java
    trunk/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/metadata/impl/KeyDescriptorTest.java
    trunk/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/metadata/impl/OrganizationNameTest.java
    trunk/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/metadata/impl/OrganizationURLTest.java
    trunk/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/metadata/impl/RequestedAttributeTest.java
    trunk/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/metadata/impl/SPSSODescriptorTest.java
    trunk/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/metadata/impl/ServiceDescriptionTest.java
    trunk/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/metadata/impl/SingleSignOnServiceTest.java
    trunk/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/metadata/impl/SurNameTest.java
    trunk/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/metadata/impl/TelephoneNumberTest.java

Modified: trunk/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/metadata/impl/SSODescriptorImpl.java
URL: http://svn.shibboleth.net/view/java-opensaml/trunk/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/metadata/impl/SSODescriptorImpl.java?rev=3066&r1=3065&r2=3066&view=diff
==============================================================================
--- trunk/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/metadata/impl/SSODescriptorImpl.java (original)
+++ trunk/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/metadata/impl/SSODescriptorImpl.java Wed Jun 13 12:08:35 2012
@@ -118,7 +118,7 @@
             return Collections.unmodifiableList(new ArrayList<Endpoint>(manageNameIDServices));
         }
         
-        return null;
+        return Collections.EMPTY_LIST;
     }
     
     /** {@inheritDoc} */

Modified: trunk/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/metadata/impl/AssertionIDRequestServiceTest.java
URL: http://svn.shibboleth.net/view/java-opensaml/trunk/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/metadata/impl/AssertionIDRequestServiceTest.java?rev=3066&r1=3065&r2=3066&view=diff
==============================================================================
--- trunk/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/metadata/impl/AssertionIDRequestServiceTest.java (original)
+++ trunk/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/metadata/impl/AssertionIDRequestServiceTest.java Wed Jun 13 12:08:35 2012
@@ -68,7 +68,8 @@
         
         Assert.assertEquals(service.getBinding(), expectedBinding, "Binding URI was not expected value");
         Assert.assertEquals(service.getLocation(), expectedLocation, "Location was not expected value");
-        Assert.assertEquals(service.getResponseLocation(), expectedResponseLocation, "ResponseLocation was not expected value");;
+        Assert.assertEquals(service.getResponseLocation(), expectedResponseLocation, "ResponseLocation was not expected value");
+        Assert.assertEquals(service.getUnknownXMLObjects(AssertionIDRequestService.DEFAULT_ELEMENT_NAME).size(), 0);
     }
 
     /** {@inheritDoc} */

Modified: trunk/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/metadata/impl/EmailAddressTest.java
URL: http://svn.shibboleth.net/view/java-opensaml/trunk/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/metadata/impl/EmailAddressTest.java?rev=3066&r1=3065&r2=3066&view=diff
==============================================================================
--- trunk/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/metadata/impl/EmailAddressTest.java (original)
+++ trunk/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/metadata/impl/EmailAddressTest.java Wed Jun 13 12:08:35 2012
@@ -59,7 +59,7 @@
     /** {@inheritDoc} */
     @Test
     public void testSingleElementMarshall() {
-        EmailAddress address = (EmailAddress) buildXMLObject(EmailAddress.DEFAULT_ELEMENT_NAME);
+        EmailAddress address = (new EmailAddressBuilder()).buildObject();
         
         address.setAddress(expectedAddress);
 

Modified: trunk/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/metadata/impl/KeyDescriptorTest.java
URL: http://svn.shibboleth.net/view/java-opensaml/trunk/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/metadata/impl/KeyDescriptorTest.java?rev=3066&r1=3065&r2=3066&view=diff
==============================================================================
--- trunk/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/metadata/impl/KeyDescriptorTest.java (original)

[... 485 lines stripped ...]