X-Git-Url: http://wamblee.org/gitweb/?a=blobdiff_plain;f=system%2Fgeneral%2Fsrc%2Ftest%2Fjava%2Forg%2Fwamblee%2Fsystem%2Fgraph%2FCompositeEdgeFilterTest.java;h=96fd009a4e915c7a771d63b8e859c97e08fc15d7;hb=81fe8784a2182e25f92a7591ec5b0fba00afb828;hp=55cae8964983a8e12efd2be53a7910651772a700;hpb=e1d0e6374e9592a0c758bdd6a8422b2dc1c9fdfb;p=utils

diff --git a/system/general/src/test/java/org/wamblee/system/graph/CompositeEdgeFilterTest.java b/system/general/src/test/java/org/wamblee/system/graph/CompositeEdgeFilterTest.java
index 55cae896..96fd009a 100644
--- a/system/general/src/test/java/org/wamblee/system/graph/CompositeEdgeFilterTest.java
+++ b/system/general/src/test/java/org/wamblee/system/graph/CompositeEdgeFilterTest.java
@@ -15,12 +15,10 @@
  */ 
 package org.wamblee.system.graph;
 
-import java.util.Arrays;
-
+import static org.mockito.Matchers.*;
+import static org.mockito.Mockito.*;
 import junit.framework.TestCase;
 
-import static org.mockito.Mockito.*; 
-
 import org.wamblee.system.container.Application;
 import org.wamblee.system.core.Component;
 import org.wamblee.system.core.Environment;
@@ -30,8 +28,8 @@ import org.wamblee.system.graph.component.ProvidedInterfaceNode;
 import org.wamblee.system.graph.component.RequiredInterfaceNode;
 
 public class CompositeEdgeFilterTest extends TestCase {
-    private Application _app = new Application(); 
-    private Environment _env = new Environment();
+    private Application app = new Application(); 
+    private Environment env = new Environment();
     
     private Edge createEdge(Component aClient, RequiredInterface aRequired, 
             Component aServer, ProvidedInterface aProvided) { 
@@ -42,8 +40,8 @@ public class CompositeEdgeFilterTest extends TestCase {
 
     public void testEmpty() { 
         EdgeFilter restriction = new CompositeEdgeFilter(); 
-        assertFalse(restriction.isViolated(createEdge(_app, _app.getRequiredInterfaces().get(0), 
-                _env, _env.getProvidedInterfaces().get(0))));
+        assertFalse(restriction.isViolated(createEdge(app, app.getRequiredInterfaces().get(0), 
+                env, env.getProvidedInterfaces().get(0))));
     }
     
     private void configureRestriction(EdgeFilter base, boolean aResult) {
@@ -59,14 +57,14 @@ public class CompositeEdgeFilterTest extends TestCase {
         
         configureRestriction(base, false);
         
-        assertFalse(composite.isViolated(createEdge(_app, _app.getRequiredInterfaces().get(0), 
-                _env, _env.getProvidedInterfaces().get(0))));
+        assertFalse(composite.isViolated(createEdge(app, app.getRequiredInterfaces().get(0), 
+                env, env.getProvidedInterfaces().get(0))));
         
         // Second let the base return true and verify the result.
         configureRestriction(base, true);
         
-        assertTrue(composite.isViolated(createEdge(_app, _app.getRequiredInterfaces().get(0), 
-                _env, _env.getProvidedInterfaces().get(0))));
+        assertTrue(composite.isViolated(createEdge(app, app.getRequiredInterfaces().get(0), 
+                env, env.getProvidedInterfaces().get(0))));
     }
 
    
@@ -82,22 +80,22 @@ public class CompositeEdgeFilterTest extends TestCase {
         
         configureRestriction(base1, false);
         configureRestriction(base2, false);
-        assertFalse(composite.isViolated(createEdge(_app, _app.getRequiredInterfaces().get(0), 
-                _env, _env.getProvidedInterfaces().get(0))));
+        assertFalse(composite.isViolated(createEdge(app, app.getRequiredInterfaces().get(0), 
+                env, env.getProvidedInterfaces().get(0))));
         
         // 2. base 1 not violated but base 2 violated -> violated
         configureRestriction(base1, false);
         configureRestriction(base2, true);
        
-        assertTrue(composite.isViolated(createEdge(_app, _app.getRequiredInterfaces().get(0), 
-                _env, _env.getProvidedInterfaces().get(0))));
+        assertTrue(composite.isViolated(createEdge(app, app.getRequiredInterfaces().get(0), 
+                env, env.getProvidedInterfaces().get(0))));
      
         // 3. base 1 violated -> violated and base 2 not called. 
         configureRestriction(base1, true);
         // base 2 should not be called.
       
-        assertTrue(composite.isViolated(createEdge(_app, _app.getRequiredInterfaces().get(0), 
-                _env, _env.getProvidedInterfaces().get(0))));
+        assertTrue(composite.isViolated(createEdge(app, app.getRequiredInterfaces().get(0), 
+                env, env.getProvidedInterfaces().get(0))));
     }
     
 }