X-Git-Url: http://wamblee.org/gitweb/?a=blobdiff_plain;ds=sidebyside;f=system%2Fgeneral%2Fsrc%2Ftest%2Fjava%2Forg%2Fwamblee%2Fsystem%2Fgraph%2FGraphTest.java;h=675a06bd6c1c7247c713a9b1af79fc85b40afb27;hb=8557fbe8c7ea4e1cbcbf10d3c4e8c60c9c1e312b;hp=305765f90670da4abb60d599083d5f62bba6edbf;hpb=436718e7b7ee0bb9f37db496dbde5c011d5f84e3;p=utils

diff --git a/system/general/src/test/java/org/wamblee/system/graph/GraphTest.java b/system/general/src/test/java/org/wamblee/system/graph/GraphTest.java
index 305765f9..675a06bd 100644
--- a/system/general/src/test/java/org/wamblee/system/graph/GraphTest.java
+++ b/system/general/src/test/java/org/wamblee/system/graph/GraphTest.java
@@ -18,9 +18,10 @@ package org.wamblee.system.graph;
 import java.util.Arrays;
 import java.util.List;
 
-import org.easymock.classextension.EasyMock;
+import static org.mockito.Mockito.*;
 import org.wamblee.test.AssertionUtils;
 
+
 import junit.framework.TestCase;
 
 public class GraphTest extends TestCase {
@@ -99,6 +100,32 @@ public class GraphTest extends TestCase {
         assertEquals(12, edges.size()); // 2 outgoing and 2 incoming nodes.
     }
     
+    public void testApplyFilter() { 
+        Graph graph = new Graph(); 
+        graph.addNode(new DefaultNode("x"));
+        graph.addNode(new DefaultNode("y"));
+        graph.addNode(new DefaultNode("z"));
+        graph.addEdge(new DefaultEdge(graph.findNode("x"), graph.findNode("y")));
+        graph.addEdge(new DefaultEdge(graph.findNode("y"), graph.findNode("z")));
+        graph.addEdge(new DefaultEdge(graph.findNode("z"), graph.findNode("x")));
+        
+        assertEquals(3, graph.getEdges().size());
+        
+        graph.applyFilter(new EdgeFilter() { 
+            @Override
+            public boolean isViolated(Edge aEdge) {
+                if (aEdge.getFrom().getName().equals("x")) { 
+                    return false; 
+                }
+                return true; 
+            }
+        }); 
+        
+        assertEquals(1, graph.getEdges().size());
+        assertEquals("x", graph.getEdges().get(0).getFrom().getName());
+           
+    }
+    
     public void testFindIncomingOutgoing() { 
         Graph graph = new Graph();
         Node x = new DefaultNode("x");
@@ -130,12 +157,13 @@ public class GraphTest extends TestCase {
         graph.addNode(x);
         graph.addNode(y);
         graph.addEdge(e);
-        Visitor visitor = EasyMock.createMock(Visitor.class);
-        visitor.visitNode(x);
-        visitor.visitNode(y);
-        visitor.visitEdge(e);
-        EasyMock.replay(visitor);
+        Visitor visitor = mock(Visitor.class); 
+        
         graph.accept(visitor);
-        EasyMock.verify(visitor);
+        verify(visitor).visitNode(x);
+        verify(visitor).visitNode(y);
+        verify(visitor).visitEdge(e);
+        
+        verifyNoMoreInteractions(visitor);
     }
 }