[java-identity-provider COMMIT] in /trunk/idp-profile-impl/src/test/java/net/shibboleth/idp/relyingparty/impl: Activa...

[noreply at shibboleth.net]

Author: scantor
Date: Tue Dec  3 14:04:59 2013
New Revision: 4979

URL: http://svn.shibboleth.net/view/java-identity-provider?rev=4979&view=rev
Log:
Rename and fix tests.

Added:
    trunk/idp-profile-impl/src/test/java/net/shibboleth/idp/relyingparty/impl/ConditionalRelyingPartyConfigurationResolverTest.java
      - copied, changed from r4978, trunk/idp-profile-impl/src/test/java/net/shibboleth/idp/relyingparty/impl/ActivatedRelyingPartyConfigurationResolverTest.java
    trunk/idp-profile-impl/src/test/java/net/shibboleth/idp/relyingparty/impl/ConditionalRelyingPartyConfigurationTest.java
      - copied, changed from r4978, trunk/idp-profile-impl/src/test/java/net/shibboleth/idp/relyingparty/impl/ActivatedRelyingPartyConfigurationTest.java
Modified:
    trunk/idp-profile-impl/src/test/java/net/shibboleth/idp/relyingparty/impl/ActivatedRelyingPartyConfigurationResolverTest.java
    trunk/idp-profile-impl/src/test/java/net/shibboleth/idp/relyingparty/impl/ActivatedRelyingPartyConfigurationTest.java

Copied: trunk/idp-profile-impl/src/test/java/net/shibboleth/idp/relyingparty/impl/ConditionalRelyingPartyConfigurationResolverTest.java (from r4978, trunk/idp-profile-impl/src/test/java/net/shibboleth/idp/relyingparty/impl/ActivatedRelyingPartyConfigurationResolverTest.java)
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-profile-impl/src/test/java/net/shibboleth/idp/relyingparty/impl/ConditionalRelyingPartyConfigurationResolverTest.java?p2=trunk/idp-profile-impl/src/test/java/net/shibboleth/idp/relyingparty/impl/ConditionalRelyingPartyConfigurationResolverTest.java&p1=trunk/idp-profile-impl/src/test/java/net/shibboleth/idp/relyingparty/impl/ActivatedRelyingPartyConfigurationResolverTest.java&r1=4978&r2=4979&rev=4979&view=diff
==============================================================================
--- trunk/idp-profile-impl/src/test/java/net/shibboleth/idp/relyingparty/impl/ActivatedRelyingPartyConfigurationResolverTest.java (original)
+++ trunk/idp-profile-impl/src/test/java/net/shibboleth/idp/relyingparty/impl/ConditionalRelyingPartyConfigurationResolverTest.java Tue Dec  3 14:04:59 2013
@@ -28,12 +28,12 @@
 import com.google.common.base.Predicates;
 
 /** Unit test for {@link ConditionalRelyingPartyConfigurationResolver}. */
-public class ActivatedRelyingPartyConfigurationResolverTest {
+public class ConditionalRelyingPartyConfigurationResolverTest {
 
     @Test public void testConstruction() {
         ConditionalRelyingPartyConfigurationResolver resolver;
 
-        ArrayList<ConditionalRelyingPartyConfiguration> rpConfigs = new ArrayList<ConditionalRelyingPartyConfiguration>();
+        ArrayList<ConditionalRelyingPartyConfiguration> rpConfigs = new ArrayList<>();
         rpConfigs.add(new ConditionalRelyingPartyConfiguration("one", "foo", null, Predicates
                 .<ProfileRequestContext> alwaysTrue()));
         rpConfigs.add(new ConditionalRelyingPartyConfiguration("two", "foo", null, Predicates
@@ -71,7 +71,7 @@
                 new ConditionalRelyingPartyConfiguration("three", "foo", null,
                         Predicates.<ProfileRequestContext> alwaysTrue());
 
-        ArrayList<ConditionalRelyingPartyConfiguration> rpConfigs = new ArrayList<ConditionalRelyingPartyConfiguration>();
+        ArrayList<ConditionalRelyingPartyConfiguration> rpConfigs = new ArrayList<>();
         rpConfigs.add(config1);
         rpConfigs.add(config2);
         rpConfigs.add(config3);
@@ -79,6 +79,7 @@
         ConditionalRelyingPartyConfigurationResolver resolver = new ConditionalRelyingPartyConfigurationResolver();
         resolver.setId("test");
         resolver.setRelyingPartyConfigurations(rpConfigs);
+        resolver.initialize();
 
         Iterable<ConditionalRelyingPartyConfiguration> results = resolver.resolve(requestContext);
         Assert.assertNotNull(results);

Copied: trunk/idp-profile-impl/src/test/java/net/shibboleth/idp/relyingparty/impl/ConditionalRelyingPartyConfigurationTest.java (from r4978, trunk/idp-profile-impl/src/test/java/net/shibboleth/idp/relyingparty/impl/ActivatedRelyingPartyConfigurationTest.java)
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-profile-impl/src/test/java/net/shibboleth/idp/relyingparty/impl/ConditionalRelyingPartyConfigurationTest.java?p2=trunk/idp-profile-impl/src/test/java/net/shibboleth/idp/relyingparty/impl/ConditionalRelyingPartyConfigurationTest.java&p1=trunk/idp-profile-impl/src/test/java/net/shibboleth/idp/relyingparty/impl/ActivatedRelyingPartyConfigurationTest.java&r1=4978&r2=4979&rev=4979&view=diff
==============================================================================
--- trunk/idp-profile-impl/src/test/java/net/shibboleth/idp/relyingparty/impl/ActivatedRelyingPartyConfigurationTest.java (original)
+++ trunk/idp-profile-impl/src/test/java/net/shibboleth/idp/relyingparty/impl/ConditionalRelyingPartyConfigurationTest.java Tue Dec  3 14:04:59 2013
@@ -28,7 +28,7 @@
 import com.google.common.base.Predicates;
 
 /** Unit test for {@link ConditionalRelyingPartyConfiguration}. */

[... 6 lines stripped ...]