X-Git-Url: http://wamblee.org/gitweb/?a=blobdiff_plain;f=system%2Fgeneral%2Fsrc%2Ftest%2Fjava%2Forg%2Fwamblee%2Fsystem%2Fgraph%2Fcomponent%2FConnectRequiredProvidedEdgeFilterTest.java;h=53621c91c63bbe40999e56e8e252aebe38625945;hb=49ce7cb8387601982d5e6ef186ce206d38f6e3d7;hp=88f29b8d5e051fc17b45907b1f5403b5e0390b6d;hpb=0d8d8f24656e585ee75558cfd6a4c661f8f14985;p=utils

diff --git a/system/general/src/test/java/org/wamblee/system/graph/component/ConnectRequiredProvidedEdgeFilterTest.java b/system/general/src/test/java/org/wamblee/system/graph/component/ConnectRequiredProvidedEdgeFilterTest.java
index 88f29b8d..53621c91 100644
--- a/system/general/src/test/java/org/wamblee/system/graph/component/ConnectRequiredProvidedEdgeFilterTest.java
+++ b/system/general/src/test/java/org/wamblee/system/graph/component/ConnectRequiredProvidedEdgeFilterTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2008 the original author or authors.
+ * Copyright 2005-2010 the original author or authors.
  * 
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -12,12 +12,10 @@
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
  * See the License for the specific language governing permissions and
  * limitations under the License.
- */ 
+ */
 package org.wamblee.system.graph.component;
 
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.List;
+import junit.framework.TestCase;
 
 import org.wamblee.system.container.Application;
 import org.wamblee.system.core.Environment;
@@ -25,79 +23,92 @@ import org.wamblee.system.graph.DefaultEdge;
 import org.wamblee.system.graph.Edge;
 import org.wamblee.system.graph.EdgeFilter;
 import org.wamblee.system.graph.Node;
+
 import org.wamblee.test.AssertionUtils;
 
-import junit.framework.TestCase;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
 
+/**
+ * 
+ * @author $author$
+ * @version $Revision$
+ */
 public class ConnectRequiredProvidedEdgeFilterTest extends TestCase {
-
     private Application app1 = new Application("app1", "pf1.");
+
     private Application app2 = new Application("app2", "pf2.");
-    
+
     private Environment env1 = new Environment("env1", "pf3.");
+
     private Environment env2 = new Environment("env2", "pf4.");
- 
-    
-    private void compare(Boolean[] aExpected, EdgeFilter aRestriction) { 
-       List<Boolean> result = new ArrayList<Boolean>();
-       
-      
-       
-       // order will be: 
-       //     env1, app1
-       //     env1, app2
-       //     env2, app1
-       //     env2, app2
-       for (Environment env: new Environment[] { env1, env2} ) { 
-           for (Application app: new Application[] { app1, app2} ) {
-               Node from = new RequiredInterfaceNode(
-                       app, app.getRequiredInterfaces().get(0));
-               Node to = new ProvidedInterfaceNode(
-                       env, env.getProvidedInterfaces().get(0));
-               Edge edge = new DefaultEdge(from, to); 
-               result.add(aRestriction.isViolated(edge));
-           }
-       }
-     
-       
-       assertEquals(Arrays.asList(aExpected), result);
+
+    private void compare(Boolean[] aExpected, EdgeFilter aRestriction) {
+        List<Boolean> result = new ArrayList<Boolean>();
+
+        // order will be:
+        // env1, app1
+        // env1, app2
+        // env2, app1
+        // env2, app2
+        for (Environment env : new Environment[] { env1, env2 }) {
+            for (Application app : new Application[] { app1, app2 }) {
+                Node from = new RequiredInterfaceNode(app, app
+                    .getRequiredInterfaces().get(0));
+                Node to = new ProvidedInterfaceNode(env, env
+                    .getProvidedInterfaces().get(0));
+                Edge edge = new DefaultEdge(from, to);
+                result.add(aRestriction.isViolated(edge));
+            }
+        }
+
+        assertEquals(Arrays.asList(aExpected), result);
     }
 
-    public void testNoRestriction() { 
+    public void testNoRestriction() {
         AssertionUtils.assertException(new AssertionUtils.ErroneousCode() {
             @Override
             public void run() throws Exception {
-                EdgeFilter restriction = new ConnectRequiredProvidedEdgeFilter(null, null, null, null);
-                
+                EdgeFilter restriction = new ConnectRequiredProvidedEdgeFilter(
+                    null, null, null, null);
+                ignoredVariable(restriction);
             }
         }, IllegalArgumentException.class);
         AssertionUtils.assertException(new AssertionUtils.ErroneousCode() {
             @Override
             public void run() throws Exception {
-                EdgeFilter restriction = new ConnectRequiredProvidedEdgeFilter(null, null, "x", "y");
+                EdgeFilter restriction = new ConnectRequiredProvidedEdgeFilter(
+                    null, null, "x", "y");
+                ignoredVariable(restriction);
             }
         }, IllegalArgumentException.class);
     }
-    
-    public void testClientServer() { 
-        EdgeFilter restriction = new ConnectRequiredProvidedEdgeFilter("app1", null, "env1", null);
-        compare(new Boolean[] { false, false, true, false}, restriction);
+
+    private static final void ignoredVariable(Object aObject) {
+        // for findbugs.
+    }
+
+    public void testClientServer() {
+        EdgeFilter restriction = new ConnectRequiredProvidedEdgeFilter("app1",
+            null, "env1", null);
+        compare(new Boolean[] { false, false, true, false }, restriction);
     }
-    
-    public void testNoConnectionsAtAll() { 
-        EdgeFilter restriction = new ConnectRequiredProvidedEdgeFilter("app1", null, null, null);
-        compare(new Boolean[] { true, false, true, false}, restriction);
+
+    public void testNoConnectionsAtAll() {
+        EdgeFilter restriction = new ConnectRequiredProvidedEdgeFilter("app1",
+            null, null, null);
+        compare(new Boolean[] { true, false, true, false }, restriction);
     }
-    
-    public void testExplicitConfig() { 
+
+    public void testExplicitConfig() {
         app1 = new Application("app1");
         app2 = new Application("app2");
         env1 = new Environment("env1");
         env2 = new Environment("env2");
-        
-        EdgeFilter restriction = new ConnectRequiredProvidedEdgeFilter(
-                "app2", "string", "env1", "datasource");
-        compare(new Boolean[] { false, false, false, true}, restriction);
-        
+
+        EdgeFilter restriction = new ConnectRequiredProvidedEdgeFilter("app2",
+            "string", "env1", "datasource");
+        compare(new Boolean[] { false, false, false, true }, restriction);
     }
 }