[java-identity-provider COMMIT] in /trunk/idp-profile-api/src/test/java/net/shibboleth/idp: profile/AbstractProfileAc...

[noreply at shibboleth.net]

Author: tzeller
Date: Wed Oct 17 17:46:25 2012
New Revision: 4225

URL: http://svn.shibboleth.net/view/java-identity-provider?rev=4225&view=rev
Log:
Updated tests with constraint exceptions and to handle AbstractProfileActions whose id defaults to the class name.

Modified:
    trunk/idp-profile-api/src/test/java/net/shibboleth/idp/profile/AbstractProfileActionTest.java
    trunk/idp-profile-api/src/test/java/net/shibboleth/idp/profile/config/AbstractProfileConfigurationTest.java
    trunk/idp-profile-api/src/test/java/net/shibboleth/idp/relyingparty/RelyingPartyConfigurationTest.java

Modified: trunk/idp-profile-api/src/test/java/net/shibboleth/idp/profile/AbstractProfileActionTest.java
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-profile-api/src/test/java/net/shibboleth/idp/profile/AbstractProfileActionTest.java?rev=4225&r1=4224&r2=4225&view=diff
==============================================================================
--- trunk/idp-profile-api/src/test/java/net/shibboleth/idp/profile/AbstractProfileActionTest.java (original)
+++ trunk/idp-profile-api/src/test/java/net/shibboleth/idp/profile/AbstractProfileActionTest.java Wed Oct 17 17:46:25 2012
@@ -34,7 +34,7 @@
 
     @Test public void testActionId() {
         MockIdentityProviderAction action = new MockIdentityProviderAction(null);
-        Assert.assertNull(action.getId());
+        Assert.assertEquals(action.getId(), MockIdentityProviderAction.class.getName());
 
         action.setId(" mock");
         Assert.assertEquals(action.getId(), "mock");
@@ -54,24 +54,18 @@
         }
     }
 
-    @Test public void testActionIinitialization() {
+    @Test public void testActionInitialization() {
         MockIdentityProviderAction action = new MockIdentityProviderAction(null);
         Assert.assertFalse(action.isInitialized());
-
-        try {
-            action.initialize();
-            Assert.fail();
-        } catch (ComponentInitializationException e) {
-            // expected this
-        }
-
         action.setId("mock");
+        
         try {
             action.initialize();
         } catch (ComponentInitializationException e) {
             Assert.fail();
         }
 
+        Assert.assertEquals(action.getId(), "mock");               
         action.setId("foo");
         Assert.assertEquals(action.getId(), "mock");
     }

Modified: trunk/idp-profile-api/src/test/java/net/shibboleth/idp/profile/config/AbstractProfileConfigurationTest.java
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-profile-api/src/test/java/net/shibboleth/idp/profile/config/AbstractProfileConfigurationTest.java?rev=4225&r1=4224&r2=4225&view=diff
==============================================================================
--- trunk/idp-profile-api/src/test/java/net/shibboleth/idp/profile/config/AbstractProfileConfigurationTest.java (original)
+++ trunk/idp-profile-api/src/test/java/net/shibboleth/idp/profile/config/AbstractProfileConfigurationTest.java Wed Oct 17 17:46:25 2012
@@ -18,6 +18,7 @@
 package net.shibboleth.idp.profile.config;
 
 import net.shibboleth.idp.relyingparty.MockProfileConfiguration;
+import net.shibboleth.utilities.java.support.logic.ConstraintViolationException;
 
 import org.testng.Assert;
 import org.testng.annotations.Test;
@@ -33,14 +34,14 @@
         try {
             config = new MockProfileConfiguration(null);
             Assert.fail();
-        } catch (IllegalArgumentException e) {
+        } catch (ConstraintViolationException e) {
 
         }
 
         try {
             config = new MockProfileConfiguration("");
             Assert.fail();
-        } catch (IllegalArgumentException e) {
+        } catch (ConstraintViolationException e) {
 
         }
     }
@@ -57,7 +58,7 @@
     @Test
     public void testSecurityConfiguration(){
         MockProfileConfiguration config = new MockProfileConfiguration("mock");
-        Assert.assertNull(config.getSecurityConfiguration());
+        Assert.assertNotNull(config.getSecurityConfiguration());
         
         SecurityConfiguration securityConfig = new SecurityConfiguration();
         config.setSecurityConfiguration(securityConfig);

Modified: trunk/idp-profile-api/src/test/java/net/shibboleth/idp/relyingparty/RelyingPartyConfigurationTest.java
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-profile-api/src/test/java/net/shibboleth/idp/relyingparty/RelyingPartyConfigurationTest.java?rev=4225&r1=4224&r2=4225&view=diff
==============================================================================
--- trunk/idp-profile-api/src/test/java/net/shibboleth/idp/relyingparty/RelyingPartyConfigurationTest.java (original)
+++ trunk/idp-profile-api/src/test/java/net/shibboleth/idp/relyingparty/RelyingPartyConfigurationTest.java Wed Oct 17 17:46:25 2012
@@ -21,6 +21,7 @@
 import java.util.Collections;
 
 import net.shibboleth.idp.profile.config.ProfileConfiguration;
+import net.shibboleth.utilities.java.support.logic.ConstraintViolationException;
 
 import org.testng.Assert;
 import org.testng.annotations.Test;
@@ -54,37 +55,33 @@

[... 45 lines stripped ...]