Author: kono
Date: 2011-07-13 17:13:28 -0700 (Wed, 13 Jul 2011)
New Revision: 26175
Added:
core3/core-task-impl/trunk/src/test/java/org/cytoscape/task/internal/destruction/
core3/core-task-impl/trunk/src/test/java/org/cytoscape/task/internal/destruction/DestroyNetworkTaskTest.java
core3/core-task-impl/trunk/src/test/java/org/cytoscape/task/internal/destruction/DestroyNetworkViewTaskTest.java
Modified:
core3/core-task-impl/trunk/pom.xml
core3/core-task-impl/trunk/src/main/java/org/cytoscape/task/internal/destruction/DestroyNetworkTask.java
core3/core-task-impl/trunk/src/main/java/org/cytoscape/task/internal/destruction/DestroyNetworkViewTask.java
Log:
fixes #17 tests for destroy package had been added.
Modified: core3/core-task-impl/trunk/pom.xml
===================================================================
--- core3/core-task-impl/trunk/pom.xml 2011-07-13 22:36:34 UTC (rev 26174)
+++ core3/core-task-impl/trunk/pom.xml 2011-07-14 00:13:28 UTC (rev 26175)
@@ -167,6 +167,13 @@
</dependency>
<dependency>
<groupId>org.cytoscape</groupId>
+ <artifactId>test-support</artifactId>
+ <version>3.0.0-alpha3-SNAPSHOT</version>
+ <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/destruction/DestroyNetworkTask.java
===================================================================
---
core3/core-task-impl/trunk/src/main/java/org/cytoscape/task/internal/destruction/DestroyNetworkTask.java
2011-07-13 22:36:34 UTC (rev 26174)
+++
core3/core-task-impl/trunk/src/main/java/org/cytoscape/task/internal/destruction/DestroyNetworkTask.java
2011-07-14 00:13:28 UTC (rev 26175)
@@ -30,19 +30,18 @@
package org.cytoscape.task.internal.destruction;
-import org.cytoscape.model.CyNetworkManager;
+import java.util.Collection;
+
import org.cytoscape.model.CyNetwork;
-import org.cytoscape.work.Task;
-import org.cytoscape.work.TaskMonitor;
+import org.cytoscape.model.CyNetworkManager;
import org.cytoscape.task.AbstractNetworkCollectionTask;
+import org.cytoscape.work.TaskMonitor;
-import java.util.Collection;
-
public class DestroyNetworkTask extends AbstractNetworkCollectionTask {
private final CyNetworkManager netmgr;
- public DestroyNetworkTask(Collection<CyNetwork> nets, final
CyNetworkManager netmgr) {
+ public DestroyNetworkTask(final Collection<CyNetwork> nets, final
CyNetworkManager netmgr) {
super(nets);
this.netmgr = netmgr;
}
Modified:
core3/core-task-impl/trunk/src/main/java/org/cytoscape/task/internal/destruction/DestroyNetworkViewTask.java
===================================================================
---
core3/core-task-impl/trunk/src/main/java/org/cytoscape/task/internal/destruction/DestroyNetworkViewTask.java
2011-07-13 22:36:34 UTC (rev 26174)
+++
core3/core-task-impl/trunk/src/main/java/org/cytoscape/task/internal/destruction/DestroyNetworkViewTask.java
2011-07-14 00:13:28 UTC (rev 26175)
@@ -38,15 +38,15 @@
public class DestroyNetworkViewTask extends AbstractNetworkViewCollectionTask {
- private final CyNetworkViewManager networkViewManager;
+ private final CyNetworkViewManager networkViewManager;
- public DestroyNetworkViewTask(final Collection<CyNetworkView> views, final
CyNetworkViewManager networkViewManager) {
- super(views);
- this.networkViewManager = networkViewManager;
- }
+ public DestroyNetworkViewTask(final Collection<CyNetworkView> views,
final CyNetworkViewManager networkViewManager) {
+ super(views);
+ this.networkViewManager = networkViewManager;
+ }
- public void run(TaskMonitor tm) {
- for (final CyNetworkView n : networkViews)
- networkViewManager.destroyNetworkView(n);
- }
+ public void run(TaskMonitor tm) {
+ for (final CyNetworkView n : networkViews)
+ networkViewManager.destroyNetworkView(n);
+ }
}
Added:
core3/core-task-impl/trunk/src/test/java/org/cytoscape/task/internal/destruction/DestroyNetworkTaskTest.java
===================================================================
---
core3/core-task-impl/trunk/src/test/java/org/cytoscape/task/internal/destruction/DestroyNetworkTaskTest.java
(rev 0)
+++
core3/core-task-impl/trunk/src/test/java/org/cytoscape/task/internal/destruction/DestroyNetworkTaskTest.java
2011-07-14 00:13:28 UTC (rev 26175)
@@ -0,0 +1,46 @@
+package org.cytoscape.task.internal.destruction;
+
+
+import static org.mockito.Mockito.*;
+
+import java.util.HashSet;
+import java.util.Set;
+
+import org.cytoscape.model.CyNetwork;
+import org.cytoscape.model.CyNetworkManager;
+import org.cytoscape.test.support.NetworkTestSupport;
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Test;
+
+public class DestroyNetworkTaskTest {
+
+ private final NetworkTestSupport support = new NetworkTestSupport();
+
+ private CyNetworkManager netmgr;
+
+ @Before
+ public void setUp() throws Exception {
+ netmgr = mock(CyNetworkManager.class);
+ }
+
+ @After
+ public void tearDown() throws Exception {
+ }
+
+ @Test
+ public void testDestroyNetworkTask() throws Exception {
+ final CyNetwork network1 = support.getNetwork();
+ final CyNetwork network2 = support.getNetwork();
+ final Set<CyNetwork> networks = new HashSet<CyNetwork>();
+ networks.add(network1);
+ networks.add(network2);
+
+ final DestroyNetworkTask task = new
DestroyNetworkTask(networks, netmgr);
+ task.run(null);
+
+ verify(netmgr, times(1)).destroyNetwork(network1);
+ verify(netmgr, times(1)).destroyNetwork(network2);
+ }
+
+}
Added:
core3/core-task-impl/trunk/src/test/java/org/cytoscape/task/internal/destruction/DestroyNetworkViewTaskTest.java
===================================================================
---
core3/core-task-impl/trunk/src/test/java/org/cytoscape/task/internal/destruction/DestroyNetworkViewTaskTest.java
(rev 0)
+++
core3/core-task-impl/trunk/src/test/java/org/cytoscape/task/internal/destruction/DestroyNetworkViewTaskTest.java
2011-07-14 00:13:28 UTC (rev 26175)
@@ -0,0 +1,48 @@
+package org.cytoscape.task.internal.destruction;
+
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.times;
+import static org.mockito.Mockito.verify;
+
+import java.util.HashSet;
+import java.util.Set;
+
+import org.cytoscape.test.support.NetworkViewTestSupport;
+import org.cytoscape.view.model.CyNetworkView;
+import org.cytoscape.view.model.CyNetworkViewManager;
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Test;
+
+
+public class DestroyNetworkViewTaskTest {
+
+ private final NetworkViewTestSupport support = new
NetworkViewTestSupport();
+
+ private CyNetworkViewManager viewManager;
+
+ @Before
+ public void setUp() throws Exception {
+ viewManager = mock(CyNetworkViewManager.class);
+ }
+
+ @After
+ public void tearDown() throws Exception {
+ }
+
+ @Test
+ public void testDestroyNetworkTask() throws Exception {
+ final CyNetworkView view1 = support.getNetworkView();
+ final CyNetworkView view2 = support.getNetworkView();
+ final Set<CyNetworkView> views = new HashSet<CyNetworkView>();
+ views.add(view1);
+ views.add(view2);
+
+ final DestroyNetworkViewTask task = new
DestroyNetworkViewTask(views, viewManager);
+ task.run(null);
+
+ verify(viewManager, times(1)).destroyNetworkView(view1);
+ verify(viewManager, times(1)).destroyNetworkView(view1);
+ }
+
+}
--
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.
