Author: mes
Date: 2010-10-28 16:57:29 -0700 (Thu, 28 Oct 2010)
New Revision: 22628
Modified:
core3/viewmodel-api/trunk/src/test/java/org/cytoscape/view/model/AbstractCyNetworkViewTest.java
Log:
reworked unit test to mock a CyNetwork rather than create from a factory
Modified:
core3/viewmodel-api/trunk/src/test/java/org/cytoscape/view/model/AbstractCyNetworkViewTest.java
===================================================================
---
core3/viewmodel-api/trunk/src/test/java/org/cytoscape/view/model/AbstractCyNetworkViewTest.java
2010-10-28 23:46:11 UTC (rev 22627)
+++
core3/viewmodel-api/trunk/src/test/java/org/cytoscape/view/model/AbstractCyNetworkViewTest.java
2010-10-28 23:57:29 UTC (rev 22628)
@@ -9,6 +9,9 @@
import org.cytoscape.model.CyNetwork;
import org.cytoscape.model.CyNode;
import org.junit.Test;
+import static org.mockito.Mockito.*;
+import java.util.List;
+import java.util.ArrayList;
public abstract class AbstractCyNetworkViewTest {
@@ -59,7 +62,6 @@
modelTypeTest = true;
assertTrue(modelTypeTest);
-
}
@@ -68,22 +70,42 @@
*/
protected void buildNetwork() {
- node1 = network.addNode();
- node2 = network.addNode();
- node3 = network.addNode();
- node4 = network.addNode();
- node5 = network.addNode();
-
- edge1 = network.addEdge(node1, node2, true);
- edge2 = network.addEdge(node2, node2, true);
- edge3 = network.addEdge(node3, node4, true);
- edge4 = network.addEdge(node1, node5, true);
- edge5 = network.addEdge(node5, node4, true);
- edge6 = network.addEdge(node3, node2, true);
- edge7 = network.addEdge(node5, node1, true);
- edge8 = network.addEdge(node4, node3, true);
+ network = mock(CyNetwork.class);
+
+ node1 = mock(CyNode.class);
+ node2 = mock(CyNode.class);
+ node3 = mock(CyNode.class);
+ node4 = mock(CyNode.class);
+ node5 = mock(CyNode.class);
+
+ List<CyNode> nl = new ArrayList<CyNode>();
+ nl.add(node1);
+ nl.add(node2);
+ nl.add(node3);
+ nl.add(node4);
+ nl.add(node5);
+
+ when(network.getNodeList()).thenReturn(nl);
+
+ edge1 = mock(CyEdge.class);
+ edge2 = mock(CyEdge.class);
+ edge3 = mock(CyEdge.class);
+ edge4 = mock(CyEdge.class);
+ edge5 = mock(CyEdge.class);
+ edge6 = mock(CyEdge.class);
+ edge7 = mock(CyEdge.class);
+ edge8 = mock(CyEdge.class);
+
+ List<CyEdge> el = new ArrayList<CyEdge>();
+ el.add(edge1);
+ el.add(edge2);
+ el.add(edge3);
+ el.add(edge4);
+ el.add(edge5);
+ el.add(edge6);
+ el.add(edge7);
+ el.add(edge8);
+
+ when(network.getEdgeList()).thenReturn(el);
}
-
-
-
}
--
You received this message because you are subscribed to the Google Groups
"cytoscape-cvs" group.
To post to this group, send email to [email protected].
To unsubscribe from this group, send email to
[email protected].
For more options, visit this group at
http://groups.google.com/group/cytoscape-cvs?hl=en.
