[java-identity-provider COMMIT] in /trunk/idp-attribute-resolver-impl/src/test/java/net/shibboleth/idp/attribute/reso...

[noreply at shibboleth.net]

Author: tzeller
Date: Tue Oct 23 17:33:45 2012
New Revision: 4229

URL: http://svn.shibboleth.net/view/java-identity-provider?rev=4229&view=rev
Log:
More attempts to update tests so they pass.

Modified:
    trunk/idp-attribute-resolver-impl/src/test/java/net/shibboleth/idp/attribute/resolver/impl/ad/RegexAtributeTest.java
    trunk/idp-attribute-resolver-impl/src/test/java/net/shibboleth/idp/attribute/resolver/impl/ad/ScopedAttributeTest.java

Modified: trunk/idp-attribute-resolver-impl/src/test/java/net/shibboleth/idp/attribute/resolver/impl/ad/RegexAtributeTest.java
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-attribute-resolver-impl/src/test/java/net/shibboleth/idp/attribute/resolver/impl/ad/RegexAtributeTest.java?rev=4229&r1=4228&r2=4229&view=diff
==============================================================================
--- trunk/idp-attribute-resolver-impl/src/test/java/net/shibboleth/idp/attribute/resolver/impl/ad/RegexAtributeTest.java (original)
+++ trunk/idp-attribute-resolver-impl/src/test/java/net/shibboleth/idp/attribute/resolver/impl/ad/RegexAtributeTest.java Tue Oct 23 17:33:45 2012
@@ -39,6 +39,7 @@
 import net.shibboleth.utilities.java.support.component.ComponentInitializationException;
 import net.shibboleth.utilities.java.support.component.DestroyedComponentException;
 import net.shibboleth.utilities.java.support.component.UninitializedComponentException;
+import net.shibboleth.utilities.java.support.component.UnmodifiableComponentException;
 import net.shibboleth.utilities.java.support.logic.ConstraintViolationException;
 
 import org.testng.Assert;
@@ -174,7 +175,7 @@
         try {
             attrDef.setRegularExpression(TestSources.CONNECTOR_ATTRIBUTE_VALUE_REGEXP_PATTERN);
             Assert.fail("setRegExp after destroy");
-        } catch (DestroyedComponentException e) {
+        } catch (UnmodifiableComponentException e) {
             // OK
         }
         try {

Modified: trunk/idp-attribute-resolver-impl/src/test/java/net/shibboleth/idp/attribute/resolver/impl/ad/ScopedAttributeTest.java
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-attribute-resolver-impl/src/test/java/net/shibboleth/idp/attribute/resolver/impl/ad/ScopedAttributeTest.java?rev=4229&r1=4228&r2=4229&view=diff
==============================================================================
--- trunk/idp-attribute-resolver-impl/src/test/java/net/shibboleth/idp/attribute/resolver/impl/ad/ScopedAttributeTest.java (original)
+++ trunk/idp-attribute-resolver-impl/src/test/java/net/shibboleth/idp/attribute/resolver/impl/ad/ScopedAttributeTest.java Tue Oct 23 17:33:45 2012
@@ -168,7 +168,9 @@
         } catch (UninitializedComponentException e) {
             // OK
         }
-        attrDef.initialize();
+        
+        attrDef.setScope(TEST_SCOPE);
+        attrDef.initialize();        
         
         Assert.assertEquals(attrDef.getScope(), TEST_SCOPE);