Author: kono
Date: 2011-07-20 16:50:11 -0700 (Wed, 20 Jul 2011)
New Revision: 26227
Added:
core3/core-task-impl/trunk/src/test/java/org/cytoscape/task/internal/hide/HideSelectedEdgesTaskTest.java
core3/core-task-impl/trunk/src/test/java/org/cytoscape/task/internal/hide/HideSelectedNodesTaskTest.java
core3/core-task-impl/trunk/src/test/java/org/cytoscape/task/internal/hide/HideUtilsTest.java
Modified:
core3/core-task-impl/trunk/pom.xml
core3/core-task-impl/trunk/src/main/java/org/cytoscape/task/internal/hide/HideSelectedNodesTask.java
Log:
fixes #23 tests had been added for .hide package.
Modified: core3/core-task-impl/trunk/pom.xml
===================================================================
--- core3/core-task-impl/trunk/pom.xml 2011-07-20 23:34:11 UTC (rev 26226)
+++ core3/core-task-impl/trunk/pom.xml 2011-07-20 23:50:11 UTC (rev 26227)
@@ -120,15 +120,9 @@
<artifactId>io-api</artifactId>
<version>3.0.0-alpha5-SNAPSHOT</version>
</dependency>
+
<dependency>
<groupId>org.cytoscape</groupId>
- <artifactId>io-api</artifactId>
- <version>3.0.0-alpha5-SNAPSHOT</version>
- <type>test-jar</type>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.cytoscape</groupId>
<artifactId>property-api</artifactId>
<version>3.0.0-alpha5-SNAPSHOT</version>
</dependency>
@@ -153,6 +147,8 @@
<version>3.0.0-alpha3-SNAPSHOT</version>
</dependency>
+
+ <!-- Test Dependencies -->
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
@@ -174,6 +170,21 @@
<dependency>
<groupId>org.cytoscape</groupId>
+ <artifactId>io-api</artifactId>
+ <version>3.0.0-alpha5-SNAPSHOT</version>
+ <type>test-jar</type>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.cytoscape</groupId>
+ <artifactId>core-task-api</artifactId>
+ <version>3.0.0-alpha4-SNAPSHOT</version>
+ <type>test-jar</type>
+ <scope>test</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>org.cytoscape</groupId>
<artifactId>event-api</artifactId>
<version>3.0.0-alpha6-SNAPSHOT</version>
</dependency>
Modified:
core3/core-task-impl/trunk/src/main/java/org/cytoscape/task/internal/hide/HideSelectedNodesTask.java
===================================================================
---
core3/core-task-impl/trunk/src/main/java/org/cytoscape/task/internal/hide/HideSelectedNodesTask.java
2011-07-20 23:34:11 UTC (rev 26226)
+++
core3/core-task-impl/trunk/src/main/java/org/cytoscape/task/internal/hide/HideSelectedNodesTask.java
2011-07-20 23:50:11 UTC (rev 26227)
@@ -55,7 +55,7 @@
public void run(TaskMonitor e) {
final CyNetwork curr = view.getModel();
- final List<CyNode> selectedNodes =
CyTableUtil.getNodesInState(curr,"selected",true);
+ final List<CyNode> selectedNodes =
CyTableUtil.getNodesInState(curr, CyNetwork.SELECTED ,true);
HideUtils.setVisibleNodes( selectedNodes, false, view );
Added:
core3/core-task-impl/trunk/src/test/java/org/cytoscape/task/internal/hide/HideSelectedEdgesTaskTest.java
===================================================================
---
core3/core-task-impl/trunk/src/test/java/org/cytoscape/task/internal/hide/HideSelectedEdgesTaskTest.java
(rev 0)
+++
core3/core-task-impl/trunk/src/test/java/org/cytoscape/task/internal/hide/HideSelectedEdgesTaskTest.java
2011-07-20 23:50:11 UTC (rev 26227)
@@ -0,0 +1,51 @@
+package org.cytoscape.task.internal.hide;
+
+import org.cytoscape.model.CyEdge;
+import org.cytoscape.model.CyNetwork;
+import org.cytoscape.model.CyNode;
+import org.cytoscape.task.AbstractNetworkViewTaskTest;
+import org.cytoscape.test.support.NetworkViewTestSupport;
+import org.cytoscape.view.model.CyNetworkView;
+import org.cytoscape.work.TaskMonitor;
+import org.junit.Before;
+import org.junit.Test;
+import org.mockito.Mock;
+import org.mockito.MockitoAnnotations;
+
+
+public class HideSelectedEdgesTaskTest extends AbstractNetworkViewTaskTest {
+
+ private final NetworkViewTestSupport viewSupport = new
NetworkViewTestSupport();
+ private CyNetworkView view = viewSupport.getNetworkView();
+ @Mock TaskMonitor tm;
+
+ CyEdge edge1;
+ CyEdge edge2;
+ CyEdge edge3;
+
+ @Before
+ public void initMocks() {
+ MockitoAnnotations.initMocks(this);
+
+ final CyNetwork network = view.getModel();
+ final CyNode n1 = network.addNode();
+ final CyNode n2 = network.addNode();
+ final CyNode n3 = network.addNode();
+
+ edge1 = view.getModel().addEdge(n1, n2, true);
+ edge2 = network.addEdge(n1, n3, true);
+ edge3 = network.addEdge(n2, n3, true);
+
+ edge1.getCyRow().set(CyNetwork.SELECTED, true);
+ edge3.getCyRow().set(CyNetwork.SELECTED, true);
+ }
+
+ @Test(expected=NullPointerException.class)
+ public void testHideSelectedEdgesTask() throws Exception {
+
+ final HideSelectedEdgesTask task = new
HideSelectedEdgesTask(view);
+
+ task.run(tm);
+ }
+
+}
Added:
core3/core-task-impl/trunk/src/test/java/org/cytoscape/task/internal/hide/HideSelectedNodesTaskTest.java
===================================================================
---
core3/core-task-impl/trunk/src/test/java/org/cytoscape/task/internal/hide/HideSelectedNodesTaskTest.java
(rev 0)
+++
core3/core-task-impl/trunk/src/test/java/org/cytoscape/task/internal/hide/HideSelectedNodesTaskTest.java
2011-07-20 23:50:11 UTC (rev 26227)
@@ -0,0 +1,31 @@
+package org.cytoscape.task.internal.hide;
+
+import org.cytoscape.task.AbstractNetworkViewTaskTest;
+import org.cytoscape.test.support.NetworkViewTestSupport;
+import org.cytoscape.view.model.CyNetworkView;
+import org.cytoscape.work.TaskMonitor;
+import org.junit.Before;
+import org.junit.Test;
+import org.mockito.Mock;
+import org.mockito.MockitoAnnotations;
+
+
+public class HideSelectedNodesTaskTest extends AbstractNetworkViewTaskTest {
+
+ private final NetworkViewTestSupport viewSupport = new
NetworkViewTestSupport();
+ private CyNetworkView view = viewSupport.getNetworkView();
+ @Mock TaskMonitor tm;
+
+ @Before
+ public void initMocks() {
+ MockitoAnnotations.initMocks(this);
+ }
+
+ @Test
+ public void testHideSelectedEdgesTask() throws Exception {
+
+ final HideSelectedNodesTask task = new
HideSelectedNodesTask(view);
+ task.run(tm);
+ }
+
+}
Added:
core3/core-task-impl/trunk/src/test/java/org/cytoscape/task/internal/hide/HideUtilsTest.java
===================================================================
---
core3/core-task-impl/trunk/src/test/java/org/cytoscape/task/internal/hide/HideUtilsTest.java
(rev 0)
+++
core3/core-task-impl/trunk/src/test/java/org/cytoscape/task/internal/hide/HideUtilsTest.java
2011-07-20 23:50:11 UTC (rev 26227)
@@ -0,0 +1,73 @@
+package org.cytoscape.task.internal.hide;
+
+import java.util.ArrayList;
+import java.util.Collection;
+
+import org.cytoscape.model.CyEdge;
+import org.cytoscape.model.CyNetwork;
+import org.cytoscape.model.CyNode;
+import org.cytoscape.view.model.CyNetworkView;
+import org.cytoscape.view.model.View;
+import org.junit.Before;
+import org.junit.Test;
+import org.mockito.Mock;
+import org.mockito.MockitoAnnotations;
+
+import static org.mockito.Mockito.*;
+
+
+public class HideUtilsTest {
+
+ @Mock private CyNetworkView view;
+ @Mock private CyNetwork network;
+
+ private Collection<CyEdge> edges;
+ private Collection<CyNode> nodes;
+
+ @Mock CyEdge edge1;
+ @Mock CyEdge edge2;
+ @Mock CyEdge edge3;
+ @Mock CyNode node1;
+ @Mock CyNode node2;
+ @Mock CyNode node3;
+ @Mock private View<CyEdge> ev1;
+ @Mock private View<CyEdge> ev2;
+ @Mock private View<CyEdge> ev3;
+ @Mock private View<CyNode> nv1;
+ @Mock private View<CyNode> nv2;
+ @Mock private View<CyNode> nv3;
+
+ @Before
+ public void initMocks() {
+ edges = new ArrayList<CyEdge>();
+ edges.add(edge1);
+ edges.add(edge2);
+ edges.add(edge3);
+
+ nodes = new ArrayList<CyNode>();
+ nodes.add(node1);
+ nodes.add(node2);
+ nodes.add(node3);
+
+ MockitoAnnotations.initMocks(this);
+ when(view.getEdgeView(any(CyEdge.class))).thenReturn(ev1, ev2,
ev3);
+ when(view.getNodeView(any(CyNode.class))).thenReturn(nv1, nv2,
nv3);
+ when(view.getModel()).thenReturn(network);
+ }
+
+ @Test
+ public void testsetVisibleEdges() throws Exception {
+
+ HideUtils.setVisibleEdges(edges, true, view);
+ verify(view, times(3)).getEdgeView(any(CyEdge.class));
+
+ }
+
+ @Test
+ public void testsetVisibleNodes() throws Exception {
+
+ HideUtils.setVisibleNodes(nodes, true, view);
+ verify(view, times(3)).getNodeView(any(CyNode.class));
+
+ }
+}
--
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.
