[java-idp-testbed COMMIT] in /trunk/src/test/java/idp/saml2: AbstractSAML2FlowTest.java AbstractSAML2SSOFlowTest.java

[noreply at shibboleth.net]

Author: tzeller
Date: Mon Jun  2 14:45:34 2014
New Revision: 249

URL: http://svn.shibboleth.net/view/java-idp-testbed?rev=249&view=rev
Log:
Some cleanup of flow tests so they can be moved to idp-conf.

Modified:
    trunk/src/test/java/idp/saml2/AbstractSAML2FlowTest.java
    trunk/src/test/java/idp/saml2/AbstractSAML2SSOFlowTest.java

Modified: trunk/src/test/java/idp/saml2/AbstractSAML2FlowTest.java
URL: http://svn.shibboleth.net/view/java-idp-testbed/trunk/src/test/java/idp/saml2/AbstractSAML2FlowTest.java?rev=249&r1=248&r2=249&view=diff
==============================================================================
--- trunk/src/test/java/idp/saml2/AbstractSAML2FlowTest.java (original)
+++ trunk/src/test/java/idp/saml2/AbstractSAML2FlowTest.java Mon Jun  2 14:45:34 2014
@@ -67,7 +67,7 @@
 @ContextConfiguration({"/system/conf/testbed-beans.xml", "file:src/main/webapp/WEB-INF/sp/testbed.xml"})
 public class AbstractSAML2FlowTest extends AbstractFlowTest {
 
-    @Qualifier("sp.Credential") @Autowired private Credential spCredential;
+    @Qualifier("sp.Credential") @Autowired protected Credential spCredential;
     
     private Assertion decryptAssertion(final EncryptedAssertion encrypted) throws DecryptionException {
         ArrayList<EncryptedKeyResolver> resolverChain = new ArrayList<>();

Modified: trunk/src/test/java/idp/saml2/AbstractSAML2SSOFlowTest.java
URL: http://svn.shibboleth.net/view/java-idp-testbed/trunk/src/test/java/idp/saml2/AbstractSAML2SSOFlowTest.java?rev=249&r1=248&r2=249&view=diff
==============================================================================
--- trunk/src/test/java/idp/saml2/AbstractSAML2SSOFlowTest.java (original)
+++ trunk/src/test/java/idp/saml2/AbstractSAML2SSOFlowTest.java Mon Jun  2 14:45:34 2014
@@ -27,10 +27,9 @@
 import net.shibboleth.utilities.java.support.net.SimpleUrlCanonicalizer;
 import net.shibboleth.utilities.java.support.net.UrlBuilder;
 import net.shibboleth.utilities.java.support.security.IdentifierGenerationStrategy;
-
-import org.apache.velocity.app.VelocityEngine;
+import net.shibboleth.utilities.java.support.security.Type4UuidIdentifierGenerationStrategy;
+
 import org.joda.time.DateTime;
-import org.opensaml.core.xml.XMLObjectBuilderFactory;
 import org.opensaml.messaging.context.MessageContext;
 import org.opensaml.saml.common.SAMLObject;
 import org.opensaml.saml.common.messaging.context.SAMLEndpointContext;
@@ -56,26 +55,18 @@
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Qualifier;
-import org.springframework.test.context.ContextConfiguration;
 
 /**
- *
+ * Abstract SAML 2 SSO flow test.
  */
- at ContextConfiguration({"file:src/main/webapp/WEB-INF/sp/testbed.xml"})
 public abstract class AbstractSAML2SSOFlowTest extends AbstractSAML2FlowTest {
 
     /** Class logger. */
     @Nonnull protected final Logger log = LoggerFactory.getLogger(AbstractSAML2SSOFlowTest.class);
 
-    @Autowired private XMLObjectBuilderFactory builderFactory;
-
-    @Autowired @Qualifier("testbed.IdGenerator") private IdentifierGenerationStrategy idGenerator;
+    @Nonnull private IdentifierGenerationStrategy idGenerator = new Type4UuidIdentifierGenerationStrategy();
 
     @Qualifier("idp.Credential") @Autowired private Credential idpCredential;
-    
-    @Qualifier("sp.Credential") @Autowired private Credential spCredential;
-
-    @Autowired private VelocityEngine velocityEngine;
 
     public String getDestinationRedirect(HttpServletRequest servletRequest) {
         // TODO servlet context
@@ -130,7 +121,8 @@
         authnRequest.setProtocolBinding(SAMLConstants.SAML2_POST_BINDING_URI);
 
         final Issuer issuer =
-                (Issuer) builderFactory.getBuilder(Issuer.DEFAULT_ELEMENT_NAME).buildObject(Issuer.DEFAULT_ELEMENT_NAME);
+                (Issuer) builderFactory.getBuilder(Issuer.DEFAULT_ELEMENT_NAME)
+                        .buildObject(Issuer.DEFAULT_ELEMENT_NAME);
         issuer.setValue(AbstractFlowTest.SP_ENTITY_ID);
         authnRequest.setIssuer(issuer);
 
@@ -141,14 +133,16 @@
         authnRequest.setNameIDPolicy(nameIDPolicy);
 
         final NameID nameID =
-                (NameID) builderFactory.getBuilder(NameID.DEFAULT_ELEMENT_NAME).buildObject(NameID.DEFAULT_ELEMENT_NAME);
+                (NameID) builderFactory.getBuilder(NameID.DEFAULT_ELEMENT_NAME)
+                        .buildObject(NameID.DEFAULT_ELEMENT_NAME);
         nameID.setValue("jdoe");
-        
+
         final Subject subject =
-                (Subject) builderFactory.getBuilder(Subject.DEFAULT_ELEMENT_NAME).buildObject(Subject.DEFAULT_ELEMENT_NAME);
+                (Subject) builderFactory.getBuilder(Subject.DEFAULT_ELEMENT_NAME).buildObject(
+                        Subject.DEFAULT_ELEMENT_NAME);
         subject.setEncryptedID(getEncrypter().encrypt(nameID));
         authnRequest.setSubject(subject);
-        
+
         return authnRequest;
     }
 
@@ -165,7 +159,7 @@
         encrypter.setKeyPlacement(KeyPlacement.PEER);
         return encrypter;
     }

[... 13 lines stripped ...]