Author: kono
Date: 2011-07-14 14:10:25 -0700 (Thu, 14 Jul 2011)
New Revision: 26183
Added:
core3/core-task-impl/trunk/src/test/java/org/cytoscape/task/internal/creation/CreateNetworkViewTaskTest.java
core3/core-task-impl/trunk/src/test/java/org/cytoscape/task/internal/creation/NewEmptyNetworkTaskTest.java
core3/core-task-impl/trunk/src/test/java/org/cytoscape/task/internal/creation/NewNetworkSelectedNodesEdgesTaskTest.java
core3/core-task-impl/trunk/src/test/java/org/cytoscape/task/internal/creation/NewNetworkSelectedNodesOnlyTaskTest.java
Modified:
core3/core-task-impl/trunk/pom.xml
core3/core-task-impl/trunk/src/main/java/org/cytoscape/task/internal/creation/NewEmptyNetworkTask.java
Log:
fixes #16 tests for creation package had been added.
Modified: core3/core-task-impl/trunk/pom.xml
===================================================================
--- core3/core-task-impl/trunk/pom.xml 2011-07-14 19:37:42 UTC (rev 26182)
+++ core3/core-task-impl/trunk/pom.xml 2011-07-14 21:10:25 UTC (rev 26183)
@@ -162,7 +162,7 @@
<dependency>
<groupId>org.mockito</groupId>
<artifactId>mockito-all</artifactId>
- <version>1.8.1</version>
+ <version>1.8.5</version>
<scope>test</scope>
</dependency>
<dependency>
Modified:
core3/core-task-impl/trunk/src/main/java/org/cytoscape/task/internal/creation/NewEmptyNetworkTask.java
===================================================================
---
core3/core-task-impl/trunk/src/main/java/org/cytoscape/task/internal/creation/NewEmptyNetworkTask.java
2011-07-14 19:37:42 UTC (rev 26182)
+++
core3/core-task-impl/trunk/src/main/java/org/cytoscape/task/internal/creation/NewEmptyNetworkTask.java
2011-07-14 21:10:25 UTC (rev 26183)
@@ -66,14 +66,14 @@
public CyNetworkView run(TaskMonitor tm) {
final CyNetwork newNet = cnf.getInstance();
- newNet.getCyRow().set(CyTableEntry.NAME,
-
namingUtil.getSuggestedNetworkTitle("Network"));
+ newNet.getCyRow().set(CyTableEntry.NAME,
namingUtil.getSuggestedNetworkTitle("Network"));
final CyNetworkView view = cnvf.getNetworkView(newNet);
networkManager.addNetwork(newNet);
networkViewManager.addNetworkView(view);
return view;
}
+ @Override
public void cancel() {
cancel = true;
}
Added:
core3/core-task-impl/trunk/src/test/java/org/cytoscape/task/internal/creation/CreateNetworkViewTaskTest.java
===================================================================
---
core3/core-task-impl/trunk/src/test/java/org/cytoscape/task/internal/creation/CreateNetworkViewTaskTest.java
(rev 0)
+++
core3/core-task-impl/trunk/src/test/java/org/cytoscape/task/internal/creation/CreateNetworkViewTaskTest.java
2011-07-14 21:10:25 UTC (rev 26183)
@@ -0,0 +1,38 @@
+package org.cytoscape.task.internal.creation;
+
+
+import static org.mockito.Matchers.any;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.times;
+import static org.mockito.Mockito.verify;
+
+import org.cytoscape.model.CyNetwork;
+import org.cytoscape.test.support.NetworkTestSupport;
+import org.cytoscape.test.support.NetworkViewTestSupport;
+import org.cytoscape.view.model.CyNetworkView;
+import org.cytoscape.view.model.CyNetworkViewFactory;
+import org.cytoscape.view.model.CyNetworkViewManager;
+import org.cytoscape.work.TaskMonitor;
+import org.junit.Test;
+
+
+public class CreateNetworkViewTaskTest {
+
+ private final NetworkTestSupport support = new NetworkTestSupport();
+ private final NetworkViewTestSupport viewSupport = new
NetworkViewTestSupport();
+
+ private CyNetwork networkModel = support.getNetwork();
+ private CyNetworkViewFactory viewFactory =
viewSupport.getNetworkViewFactory();
+
+ private CyNetworkViewManager networkViewManager =
mock(CyNetworkViewManager.class);
+
+ @Test
+ public void testCreateNetworkViewTask() throws Exception {
+ final TaskMonitor tm = mock(TaskMonitor.class);
+ final CreateNetworkViewTask task = new
CreateNetworkViewTask(networkModel, viewFactory, networkViewManager, null);
+
+ task.run(tm);
+ verify(networkViewManager,
times(1)).addNetworkView(any(CyNetworkView.class));
+ }
+
+}
Added:
core3/core-task-impl/trunk/src/test/java/org/cytoscape/task/internal/creation/NewEmptyNetworkTaskTest.java
===================================================================
---
core3/core-task-impl/trunk/src/test/java/org/cytoscape/task/internal/creation/NewEmptyNetworkTaskTest.java
(rev 0)
+++
core3/core-task-impl/trunk/src/test/java/org/cytoscape/task/internal/creation/NewEmptyNetworkTaskTest.java
2011-07-14 21:10:25 UTC (rev 26183)
@@ -0,0 +1,47 @@
+package org.cytoscape.task.internal.creation;
+
+import static org.mockito.Matchers.any;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.times;
+import static org.mockito.Mockito.verify;
+
+import org.cytoscape.model.CyNetwork;
+import org.cytoscape.model.CyNetworkFactory;
+import org.cytoscape.model.CyNetworkManager;
+import org.cytoscape.session.CyNetworkNaming;
+import org.cytoscape.test.support.NetworkTestSupport;
+import org.cytoscape.test.support.NetworkViewTestSupport;
+import org.cytoscape.view.model.CyNetworkView;
+import org.cytoscape.view.model.CyNetworkViewFactory;
+import org.cytoscape.view.model.CyNetworkViewManager;
+import org.cytoscape.work.TaskMonitor;
+import org.junit.Test;
+import org.mockito.Mock;
+
+public class NewEmptyNetworkTaskTest {
+
+ private final NetworkTestSupport support = new NetworkTestSupport();
+ private final NetworkViewTestSupport viewSupport = new
NetworkViewTestSupport();
+
+ private CyNetworkFactory cnf = support.getNetworkFactory();
+ private CyNetworkViewFactory cnvf = viewSupport.getNetworkViewFactory();
+
+ @Mock
+ private CyNetworkManager netmgr;
+ @Mock
+ private CyNetworkViewManager networkViewManager;
+ @Mock
+ private CyNetworkNaming namingUtil;
+
+
+ @Test
+ public void testNewEmptyNetworkTask() throws Exception {
+ final NewEmptyNetworkTask task = new NewEmptyNetworkTask(cnf,
cnvf, netmgr, networkViewManager, namingUtil);
+ final TaskMonitor taskMonitor = mock(TaskMonitor.class);
+ task.run(taskMonitor);
+
+ verify(netmgr, times(1)).addNetwork(any(CyNetwork.class));
+ verify(networkViewManager,
times(1)).addNetworkView(any(CyNetworkView.class));
+ }
+
+}
Added:
core3/core-task-impl/trunk/src/test/java/org/cytoscape/task/internal/creation/NewNetworkSelectedNodesEdgesTaskTest.java
===================================================================
---
core3/core-task-impl/trunk/src/test/java/org/cytoscape/task/internal/creation/NewNetworkSelectedNodesEdgesTaskTest.java
(rev 0)
+++
core3/core-task-impl/trunk/src/test/java/org/cytoscape/task/internal/creation/NewNetworkSelectedNodesEdgesTaskTest.java
2011-07-14 21:10:25 UTC (rev 26183)
@@ -0,0 +1,62 @@
+package org.cytoscape.task.internal.creation;
+
+import java.util.List;
+
+import org.cytoscape.model.CyNetwork;
+import org.cytoscape.model.CyNetworkManager;
+import org.cytoscape.model.CyNode;
+import org.cytoscape.model.CyRow;
+import org.cytoscape.model.CyTable;
+import org.cytoscape.model.subnetwork.CyRootNetworkFactory;
+import org.cytoscape.session.CyApplicationManager;
+import org.cytoscape.session.CyNetworkNaming;
+import org.cytoscape.test.support.NetworkTestSupport;
+import org.cytoscape.test.support.NetworkViewTestSupport;
+import org.cytoscape.view.model.CyNetworkViewFactory;
+import org.cytoscape.view.model.CyNetworkViewManager;
+import org.cytoscape.view.vizmap.VisualMappingManager;
+import org.cytoscape.work.TaskMonitor;
+import org.junit.Before;
+import org.junit.Test;
+
+import static org.mockito.Mockito.*;
+
+public class NewNetworkSelectedNodesEdgesTaskTest {
+
+ private final NetworkTestSupport support = new NetworkTestSupport();
+ private final NetworkViewTestSupport viewSupport = new
NetworkViewTestSupport();
+
+ private CyNetwork net = support.getNetwork();
+ private CyRootNetworkFactory cyroot = mock(CyRootNetworkFactory.class);
+ private CyNetworkViewFactory cnvf = viewSupport.getNetworkViewFactory();
+ private CyNetworkManager netmgr = mock(CyNetworkManager.class);
+ private CyNetworkViewManager networkViewManager =
mock(CyNetworkViewManager.class);
+ private CyNetworkNaming cyNetworkNaming = mock(CyNetworkNaming.class);
+ private VisualMappingManager vmm = mock(VisualMappingManager.class);
+ private CyApplicationManager appManager =
mock(CyApplicationManager.class);
+
+ @Before
+ public void setUp() throws Exception {
+ }
+
+ @Test
+ public void testNewNetworkSelectedNodesEdgesTask() throws Exception {
+
+ final CyNode node1 = net.addNode();
+ final CyNode node2 = net.addNode();
+ final CyNode node3 = net.addNode();
+
+ final CyTable nodeTable = net.getDefaultNodeTable();
+ node1.getCyRow().set(CyNetwork.SELECTED, true);
+
+
+ final NewNetworkSelectedNodesEdgesTask task = new
NewNetworkSelectedNodesEdgesTask(net, cyroot, cnvf, netmgr,
+ networkViewManager, cyNetworkNaming, vmm,
appManager);
+
+ TaskMonitor tm = mock(TaskMonitor.class);
+
+ // TODO how can we test this?
+ task.run(tm);
+ }
+
+}
Added:
core3/core-task-impl/trunk/src/test/java/org/cytoscape/task/internal/creation/NewNetworkSelectedNodesOnlyTaskTest.java
===================================================================
---
core3/core-task-impl/trunk/src/test/java/org/cytoscape/task/internal/creation/NewNetworkSelectedNodesOnlyTaskTest.java
(rev 0)
+++
core3/core-task-impl/trunk/src/test/java/org/cytoscape/task/internal/creation/NewNetworkSelectedNodesOnlyTaskTest.java
2011-07-14 21:10:25 UTC (rev 26183)
@@ -0,0 +1,78 @@
+package org.cytoscape.task.internal.creation;
+
+
+import static org.junit.Assert.*;
+import static org.mockito.Mockito.mock;
+
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.List;
+
+import org.cytoscape.model.CyEdge;
+import org.cytoscape.model.CyNetwork;
+import org.cytoscape.model.CyNetworkManager;
+import org.cytoscape.model.CyNode;
+import org.cytoscape.model.CyTable;
+import org.cytoscape.model.subnetwork.CyRootNetworkFactory;
+import org.cytoscape.session.CyApplicationManager;
+import org.cytoscape.session.CyNetworkNaming;
+import org.cytoscape.test.support.NetworkTestSupport;
+import org.cytoscape.test.support.NetworkViewTestSupport;
+import org.cytoscape.view.model.CyNetworkViewFactory;
+import org.cytoscape.view.model.CyNetworkViewManager;
+import org.cytoscape.view.vizmap.VisualMappingManager;
+import org.junit.Before;
+import org.junit.Test;
+
+public class NewNetworkSelectedNodesOnlyTaskTest {
+
+ private final NetworkTestSupport support = new NetworkTestSupport();
+ private final NetworkViewTestSupport viewSupport = new
NetworkViewTestSupport();
+
+ private CyNetwork net = support.getNetwork();
+ private CyRootNetworkFactory cyroot = mock(CyRootNetworkFactory.class);
+ private CyNetworkViewFactory cnvf = viewSupport.getNetworkViewFactory();
+ private CyNetworkManager netmgr = mock(CyNetworkManager.class);
+ private CyNetworkViewManager networkViewManager =
mock(CyNetworkViewManager.class);
+ private CyNetworkNaming cyNetworkNaming = mock(CyNetworkNaming.class);
+ private VisualMappingManager vmm = mock(VisualMappingManager.class);
+ private CyApplicationManager appManager =
mock(CyApplicationManager.class);
+
+
+ @Before
+ public void setUp() throws Exception {
+ }
+
+ @Test
+ public void testNewNetworkSelectedNodesEdgesTask() throws Exception {
+ NewNetworkSelectedNodesOnlyTask task = new
NewNetworkSelectedNodesOnlyTask(net, cyroot, cnvf, netmgr,
+ networkViewManager, cyNetworkNaming, vmm,
appManager);
+
+ final CyNode node1 = net.addNode();
+ final CyNode node2 = net.addNode();
+ final CyNode node3 = net.addNode();
+
+ final CyEdge edge1 = net.addEdge(node1, node2, true);
+
+ final List<CyNode> selectedNodes = new ArrayList<CyNode>();
+
+ node1.getCyRow().set(CyNetwork.SELECTED, true);
+ node2.getCyRow().set(CyNetwork.SELECTED, true);
+
+ selectedNodes.add(node1);
+ selectedNodes.add(node2);
+
+ final Collection<CyEdge> edges = task.getEdges(net,
selectedNodes);
+
+ assertNotNull(edges);
+ assertEquals(1, edges.size());
+
+ final CyEdge testEdge = edges.iterator().next();
+
+ assertEquals(edge1, testEdge);
+
+ // TODO: fix this
+ //task.run(null);
+ }
+
+}
--
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.
