[java-identity-provider COMMIT] in /trunk/idp-profile-spring/src: main/java/net/shibboleth/idp/profile/spring/relying...

[noreply at shibboleth.net]

Author: rdw
Date: Mon Apr 21 09:35:21 2014
New Revision: 5752

URL: http://svn.shibboleth.net/view/java-identity-provider?rev=5752&view=rev
Log:
Fix breaking test

Modified:
    trunk/idp-profile-spring/src/main/java/net/shibboleth/idp/profile/spring/relyingparty/RelyingPartyGroupParser.java
    trunk/idp-profile-spring/src/test/java/net/shibboleth/idp/profile/spring/relyingparty/RelyingPartyGroupTest.java

Modified: trunk/idp-profile-spring/src/main/java/net/shibboleth/idp/profile/spring/relyingparty/RelyingPartyGroupParser.java
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-profile-spring/src/main/java/net/shibboleth/idp/profile/spring/relyingparty/RelyingPartyGroupParser.java?rev=5752&r1=5751&r2=5752&view=diff
==============================================================================
--- trunk/idp-profile-spring/src/main/java/net/shibboleth/idp/profile/spring/relyingparty/RelyingPartyGroupParser.java (original)
+++ trunk/idp-profile-spring/src/main/java/net/shibboleth/idp/profile/spring/relyingparty/RelyingPartyGroupParser.java Mon Apr 21 09:35:21 2014
@@ -59,9 +59,10 @@
         builder.setLazyInit(true);
         builder.setInitMethodName("initialize");
         builder.setDestroyMethodName("destroy");
+        
 
-        builder.addPropertyValue("id", "RelyingPartyGroup from "
-                + parserContext.getReaderContext().getResource().getFilename());
+        builder.addPropertyValue("id", "RelyingPartyGroup["
+                + parserContext.getReaderContext().getResource().getFilename()+"]");
 
         // All the Relying Parties
         final List<BeanDefinition> relyingParties =

Modified: trunk/idp-profile-spring/src/test/java/net/shibboleth/idp/profile/spring/relyingparty/RelyingPartyGroupTest.java
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-profile-spring/src/test/java/net/shibboleth/idp/profile/spring/relyingparty/RelyingPartyGroupTest.java?rev=5752&r1=5751&r2=5752&view=diff
==============================================================================
--- trunk/idp-profile-spring/src/test/java/net/shibboleth/idp/profile/spring/relyingparty/RelyingPartyGroupTest.java (original)
+++ trunk/idp-profile-spring/src/test/java/net/shibboleth/idp/profile/spring/relyingparty/RelyingPartyGroupTest.java Mon Apr 21 09:35:21 2014
@@ -124,7 +124,7 @@
         DefaultRelyingPartyConfigurationResolver resolver =
                 context.getBean(DefaultRelyingPartyConfigurationResolver.class);
 
-        Assert.assertEquals(resolver.getId(), "RelyingPartyGroup");
+        Assert.assertEquals(resolver.getId(), "RelyingPartyGroup[relying-party-group2.xml]");
 
         final List<RelyingPartyConfiguration> rps = resolver.getRelyingPartyConfigurations();
         Assert.assertEquals(rps.size(), 2);