[utilities COMMIT] in /java-support/trunk/src/test/java/net/shibboleth/utilities/java/support: component/AbstractIden...

[noreply at shibboleth.net]

Author: rdw
Date: Fri Jan  6 10:44:02 2012
New Revision: 194

URL: http://svn.shibboleth.net/view/utilities?rev=194&view=rev
Log:
Indentifiable components only throw an assert on null/empty values if they do  not implement Initializable.
Fix a few breakages thrown by additional asserts added in 187

Removed:
    java-support/trunk/src/test/java/net/shibboleth/utilities/java/support/component/SettableIdentifiableComponent.java
Modified:
    java-support/trunk/src/test/java/net/shibboleth/utilities/java/support/component/AbstractIdentifiableComponentTest.java
    java-support/trunk/src/test/java/net/shibboleth/utilities/java/support/component/AbstractIdentifiableInitializableComponentTest.java
    java-support/trunk/src/test/java/net/shibboleth/utilities/java/support/net/HttpResourceTest.java

Modified: java-support/trunk/src/test/java/net/shibboleth/utilities/java/support/component/AbstractIdentifiableComponentTest.java
URL: http://svn.shibboleth.net/view/utilities/java-support/trunk/src/test/java/net/shibboleth/utilities/java/support/component/AbstractIdentifiableComponentTest.java?rev=194&r1=193&r2=194&view=diff
==============================================================================
--- java-support/trunk/src/test/java/net/shibboleth/utilities/java/support/component/AbstractIdentifiableComponentTest.java (original)
+++ java-support/trunk/src/test/java/net/shibboleth/utilities/java/support/component/AbstractIdentifiableComponentTest.java Fri Jan  6 10:44:02 2012
@@ -18,6 +18,7 @@
 package net.shibboleth.utilities.java.support.component;
 
 import org.testng.Assert;
+import org.testng.annotations.BeforeMethod;
 import org.testng.annotations.Test;
 
 /**
@@ -26,44 +27,25 @@
 public class AbstractIdentifiableComponentTest {
 
     private static final String STRING1 = "s1";
+
     private static final String STRING2 = "string2";
-    
-    protected static void testNullAssignment(SettableIdentifiableComponent component) {
-        Assert.assertNull(component.getId());
-        boolean thrown = false;
-        try {
-            component.setId(null);
-        } catch (Exception e) {
-            thrown = true;
-        }
-        Assert.assertTrue(thrown, "Setting a null ID should throw");
-        
-        thrown = false;
-        try {
-            component.setId("");
-        } catch (Exception e) {
-            thrown = true;
-        }
-        Assert.assertTrue(thrown, "Setting en empty ID should throw");        
+
+    private InternalComponent component;
+
+    @BeforeMethod public void setup() {
+        component = new InternalComponent();
     }
-    
-    @Test
-    public void abstractIdentifiableComponentTest() {
-        
-        SettableIdentifiableComponent component = new InternalComponent();
-        
-        testNullAssignment(component);
+
+    @Test public void abstractIdentifiableComponentTest() {
+
         component.setId(STRING1);
         Assert.assertEquals(component.getId(), STRING1, "Should be what was set");
         component.setId(STRING2);
         Assert.assertNotSame(component.getId(), STRING1, "Should not be what was originally set");
         Assert.assertEquals(component.getId(), STRING2, "Should be what was set");
-        
+
     }
-    
-    private class InternalComponent extends AbstractIdentifiableComponent implements SettableIdentifiableComponent {
-        public void setId(final String componentId) {
-            super.setId(componentId);
-        }
+
+    private class InternalComponent extends AbstractIdentifiableComponent {
     }
 }

Modified: java-support/trunk/src/test/java/net/shibboleth/utilities/java/support/component/AbstractIdentifiableInitializableComponentTest.java
URL: http://svn.shibboleth.net/view/utilities/java-support/trunk/src/test/java/net/shibboleth/utilities/java/support/component/AbstractIdentifiableInitializableComponentTest.java?rev=194&r1=193&r2=194&view=diff
==============================================================================
--- java-support/trunk/src/test/java/net/shibboleth/utilities/java/support/component/AbstractIdentifiableInitializableComponentTest.java (original)
+++ java-support/trunk/src/test/java/net/shibboleth/utilities/java/support/component/AbstractIdentifiableInitializableComponentTest.java Fri Jan  6 10:44:02 2012
@@ -18,6 +18,7 @@
 package net.shibboleth.utilities.java.support.component;
 
 import org.testng.Assert;
+import org.testng.annotations.BeforeMethod;
 import org.testng.annotations.Test;
 
 /**
@@ -26,72 +27,90 @@
 public class AbstractIdentifiableInitializableComponentTest {
 
     private static final String STRING1 = "s1";
+
     private static final String STRING2 = "string2";
+
     private static final String STRING3 = "Three String";
 
-    @Test
-    public void abstractIdentifiableInitializableComponentTest() throws ComponentInitializationException {
-        MyComponent component = new MyComponent();
-        
-        Assert.assertFalse(component.isInitialized(), "New Component should not be initialized");

[... 134 lines stripped ...]