[java-idp-integration-tests COMMIT] in /trunk/src/test: conf/relying-party.xml java/net/shibboleth/idp/test/saml2/SAM...

[noreply at shibboleth.net]

Author: scantor
Date: Tue Nov  4 21:49:40 2014
New Revision: 32

URL: http://svn.shibboleth.net/view/java-idp-integration-tests?rev=32&view=rev
Log:
IDP-506 - Attempt to compensate for changes, override relying-party.xml in classpath to activate consent flows.

Added:
    trunk/src/test/conf/relying-party.xml   (with props)
Modified:
    trunk/src/test/java/net/shibboleth/idp/test/saml2/SAML2UnsolicitedSSOIntegrationWithConsentTest.java

Modified: trunk/src/test/java/net/shibboleth/idp/test/saml2/SAML2UnsolicitedSSOIntegrationWithConsentTest.java
URL: http://svn.shibboleth.net/view/java-idp-integration-tests/trunk/src/test/java/net/shibboleth/idp/test/saml2/SAML2UnsolicitedSSOIntegrationWithConsentTest.java?rev=32&r1=31&r2=32&view=diff
==============================================================================
--- trunk/src/test/java/net/shibboleth/idp/test/saml2/SAML2UnsolicitedSSOIntegrationWithConsentTest.java (original)
+++ trunk/src/test/java/net/shibboleth/idp/test/saml2/SAML2UnsolicitedSSOIntegrationWithConsentTest.java Tue Nov  4 21:49:40 2014
@@ -36,7 +36,6 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.testng.annotations.AfterClass;
-import org.testng.annotations.BeforeClass;
 import org.testng.annotations.BeforeMethod;
 import org.testng.annotations.Test;
 
@@ -48,9 +47,6 @@
     /** Class logger. */
     @Nonnull private final Logger log = LoggerFactory.getLogger(SAML2UnsolicitedSSOIntegrationWithConsentTest.class);
 
-    /** Property name to enable consent flows. */
-    public final static String ENABLE_CONSENT_FLOW_PROPERTY_KEY = "idp.intercept.flows";
-
     /** Property value of consent flows to enable. */
     public final static String ENABLE_CONSENT_FLOW_PROPERTY_VALUE = "terms-of-use|attribute-release";
 
@@ -102,15 +98,6 @@
 
     /** Web driver. */
     @Nonnull protected WebDriver driver;
-
-    /**
-     * Activate consent flows.
-     * 
-     * @throws Exception
-     */
-    @BeforeClass protected void enableConsentFlows() throws Exception {
-        replaceIdPProperty(ENABLE_CONSENT_FLOW_PROPERTY_KEY, ENABLE_CONSENT_FLOW_PROPERTY_VALUE);
-    }
 
     /**
      * Restore idp.properties from original source.