updated coding rules.

[utils] / system / general / src / test / java / org / wamblee / system / graph / CompositeEdgeFilterTest.java

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 7889c35723f25e62926c8530b4bc38f6eb6d6b87..96fd009a4e915c7a771d63b8e859c97e08fc15d7 100644 (file)
--- 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,13 +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 org.easymock.classextension.EasyMock;
-import org.easymock.classextension.IMocksControl;
-import static org.easymock.classextension.EasyMock.*;
 import org.wamblee.system.container.Application;
 import org.wamblee.system.core.Component;
 import org.wamblee.system.core.Environment;
@@ -31,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) { 
@@ -43,19 +40,16 @@ 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) {
-        base.isViolated( (Edge)EasyMock.anyObject());
-        EasyMock.expectLastCall().andReturn(aResult);
+       stub(base.isViolated((Edge)anyObject())).toReturn(aResult);
     }
     
     public void testOneRestriction() { 
-        IMocksControl control = EasyMock.createStrictControl();
-      
-        EdgeFilter base = control.createMock(EdgeFilter.class);
+        EdgeFilter base = mock(EdgeFilter.class);
         CompositeEdgeFilter composite = new CompositeEdgeFilter();
         composite.add(base);
         
@@ -63,59 +57,45 @@ public class CompositeEdgeFilterTest extends TestCase {
         
         configureRestriction(base, false);
         
-        control.replay();
-        assertFalse(composite.isViolated(createEdge(_app, _app.getRequiredInterfaces().get(0), 
-                _env, _env.getProvidedInterfaces().get(0))));
-        control.verify();
+        assertFalse(composite.isViolated(createEdge(app, app.getRequiredInterfaces().get(0), 
+                env, env.getProvidedInterfaces().get(0))));
         
         // Second let the base return true and verify the result.
-        control.reset();
         configureRestriction(base, true);
         
-        control.replay();
-        assertTrue(composite.isViolated(createEdge(_app, _app.getRequiredInterfaces().get(0), 
-                _env, _env.getProvidedInterfaces().get(0))));
-        control.verify();
+        assertTrue(composite.isViolated(createEdge(app, app.getRequiredInterfaces().get(0), 
+                env, env.getProvidedInterfaces().get(0))));
     }
 
    
     
     public void testTwoRestrictions() { 
-        IMocksControl control = EasyMock.createStrictControl();
-        
-        EdgeFilter base1 = control.createMock(EdgeFilter.class);
+        EdgeFilter base1 = mock(EdgeFilter.class);
         CompositeEdgeFilter composite = new CompositeEdgeFilter();
         composite.add(base1);
-        EdgeFilter base2 = control.createMock(EdgeFilter.class);
+        EdgeFilter base2 = mock(EdgeFilter.class);
         composite.add(base2);
         
         // 1. base1 not violated and base 2 not violated -> not violated. 
         
         configureRestriction(base1, false);
         configureRestriction(base2, false);
-        control.replay();
-        assertFalse(composite.isViolated(createEdge(_app, _app.getRequiredInterfaces().get(0), 
-                _env, _env.getProvidedInterfaces().get(0))));
-        control.verify();
-        control.reset();
+        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);
-        control.replay();
-        assertTrue(composite.isViolated(createEdge(_app, _app.getRequiredInterfaces().get(0), 
-                _env, _env.getProvidedInterfaces().get(0))));
-        control.verify();
-        control.reset();
-        
+       
+        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.
-        control.replay();
-        assertTrue(composite.isViolated(createEdge(_app, _app.getRequiredInterfaces().get(0), 
-                _env, _env.getProvidedInterfaces().get(0))));
-        control.verify();
-        control.reset();
+      
+        assertTrue(composite.isViolated(createEdge(app, app.getRequiredInterfaces().get(0), 
+                env, env.getProvidedInterfaces().get(0))));
     }
     
 }