[java-identity-provider COMMIT] in /trunk: idp-attribute-api/pom.xml idp-attribute-api/src/test/java/net/shibboleth/i...

[noreply at shibboleth.net]

Author: scantor
Date: Mon Apr  4 23:35:15 2016
New Revision: 8196

URL: http://svn.shibboleth.net/view/java-identity-provider?rev=8196&view=rev
Log:
IDP-504 - Unit tests should avoid creating XMLObjectBuilders explicitly

https://issues.shibboleth.net/jira/browse/IDP-504

Modified:
    trunk/idp-attribute-api/pom.xml
    trunk/idp-attribute-api/src/test/java/net/shibboleth/idp/attribute/XMLObjectAttributeValueTest.java
    trunk/idp-cas-impl/src/main/java/net/shibboleth/idp/cas/flow/impl/BuildSamlValidationSuccessMessageAction.java
    trunk/idp-saml-api/src/test/java/net/shibboleth/idp/saml/attribute/encoding/AbstractSAML1AttributeEncoderTest.java
    trunk/idp-saml-api/src/test/java/net/shibboleth/idp/saml/attribute/encoding/AbstractSAML2AttributeEncoderTest.java
    trunk/idp-saml-api/src/test/java/net/shibboleth/idp/saml/attribute/encoding/AbstractSAMLAttributeEncoderTest.java
    trunk/idp-saml-api/src/test/java/net/shibboleth/idp/saml/attribute/encoding/SAMLEncoderSupportTest.java
    trunk/idp-saml-impl/src/test/java/net/shibboleth/idp/saml/attribute/principalconnector/impl/PrincipalConnectorTest.java
    trunk/idp-saml-impl/src/test/java/net/shibboleth/idp/saml/attribute/principalconnector/impl/PrinicpalConnectorCanonicalizerTest.java
    trunk/idp-saml-impl/src/test/java/net/shibboleth/idp/saml/profile/impl/InitializeAuthenticationContextTest.java

Modified: trunk/idp-attribute-api/pom.xml
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-attribute-api/pom.xml?rev=8196&r1=8195&r2=8196&view=diff
==============================================================================
--- trunk/idp-attribute-api/pom.xml	(original)
+++ trunk/idp-attribute-api/pom.xml	Mon Apr  4 23:35:15 2016
@@ -44,6 +44,13 @@
         <!-- Runtime Dependencies -->
 
         <!-- Test Dependencies -->
+        <dependency>
+            <groupId>${opensaml.groupId}</groupId>
+            <artifactId>opensaml-core</artifactId>
+            <version>${opensaml.version}</version>
+            <type>test-jar</type>
+            <scope>test</scope>
+        </dependency>
 
     </dependencies>
     

Modified: trunk/idp-attribute-api/src/test/java/net/shibboleth/idp/attribute/XMLObjectAttributeValueTest.java
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-attribute-api/src/test/java/net/shibboleth/idp/attribute/XMLObjectAttributeValueTest.java?rev=8196&r1=8195&r2=8196&view=diff
==============================================================================
--- trunk/idp-attribute-api/src/test/java/net/shibboleth/idp/attribute/XMLObjectAttributeValueTest.java	(original)
+++ trunk/idp-attribute-api/src/test/java/net/shibboleth/idp/attribute/XMLObjectAttributeValueTest.java	Mon Apr  4 23:35:15 2016
@@ -21,20 +21,26 @@
 
 import net.shibboleth.utilities.java.support.logic.ConstraintViolationException;
 
+import org.opensaml.core.xml.XMLObjectBaseTestCase;
+import org.opensaml.core.xml.XMLObjectBuilder;
+import org.opensaml.core.xml.config.XMLObjectProviderRegistrySupport;
 import org.opensaml.core.xml.schema.XSString;
-import org.opensaml.core.xml.schema.impl.XSStringBuilder;
 import org.testng.Assert;
+import org.testng.annotations.BeforeClass;
 import org.testng.annotations.Test;
 
 /** Unit test for {@link XMLObjectAttributeValue}. */
-public class XMLObjectAttributeValueTest {
+public class XMLObjectAttributeValueTest extends XMLObjectBaseTestCase {
     
     private XSString xsId1;
     private XSString xsId2;
     private XSString xsId3;
     
-    public XMLObjectAttributeValueTest() {
-        XSStringBuilder  builder = new XSStringBuilder();
+    @BeforeClass
+    public void setUp() {
+        final XMLObjectBuilder<XSString> builder =
+                XMLObjectProviderRegistrySupport.getBuilderFactory().<XSString>getBuilderOrThrow(
+                        XSString.TYPE_NAME);
         QName foo = new QName("foo");
         xsId1 = builder.buildObject(foo);
         xsId1.setValue("one");

Modified: trunk/idp-cas-impl/src/main/java/net/shibboleth/idp/cas/flow/impl/BuildSamlValidationSuccessMessageAction.java
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-cas-impl/src/main/java/net/shibboleth/idp/cas/flow/impl/BuildSamlValidationSuccessMessageAction.java?rev=8196&r1=8195&r2=8196&view=diff
==============================================================================
--- trunk/idp-cas-impl/src/main/java/net/shibboleth/idp/cas/flow/impl/BuildSamlValidationSuccessMessageAction.java	(original)
+++ trunk/idp-cas-impl/src/main/java/net/shibboleth/idp/cas/flow/impl/BuildSamlValidationSuccessMessageAction.java	Mon Apr  4 23:35:15 2016
@@ -28,12 +28,27 @@
 import net.shibboleth.utilities.java.support.security.IdentifierGenerationStrategy;
 
 import org.joda.time.DateTime;
+import org.opensaml.core.xml.XMLObjectBuilder;
+import org.opensaml.core.xml.config.XMLObjectProviderRegistrySupport;
 import org.opensaml.core.xml.schema.XSString;
-import org.opensaml.core.xml.schema.impl.XSStringBuilder;
 import org.opensaml.profile.context.ProfileRequestContext;

[... 322 lines stripped ...]