Author: kono
Date: 2011-07-15 16:40:16 -0700 (Fri, 15 Jul 2011)
New Revision: 26197
Modified:
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
Log:
Broken tests had been fixed.
Modified:
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
2011-07-15 23:02:52 UTC (rev 26196)
+++
core3/core-task-impl/trunk/src/test/java/org/cytoscape/task/internal/creation/NewEmptyNetworkTaskTest.java
2011-07-15 23:40:16 UTC (rev 26197)
@@ -15,17 +15,19 @@
import org.cytoscape.view.model.CyNetworkViewFactory;
import org.cytoscape.view.model.CyNetworkViewManager;
import org.cytoscape.work.TaskMonitor;
+import org.junit.Before;
import org.junit.Test;
import org.mockito.Mock;
+import org.mockito.MockitoAnnotations;
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
@@ -33,13 +35,18 @@
@Mock
private CyNetworkNaming namingUtil;
-
+ @Before
+ public void initMocks() {
+ MockitoAnnotations.initMocks(this);
+ }
+
@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));
}
Modified:
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
2011-07-15 23:02:52 UTC (rev 26196)
+++
core3/core-task-impl/trunk/src/test/java/org/cytoscape/task/internal/creation/NewNetworkSelectedNodesEdgesTaskTest.java
2011-07-15 23:40:16 UTC (rev 26197)
@@ -1,11 +1,10 @@
package org.cytoscape.task.internal.creation;
-import java.util.List;
+import static org.mockito.Mockito.mock;
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;
@@ -19,8 +18,6 @@
import org.junit.Before;
import org.junit.Test;
-import static org.mockito.Mockito.*;
-
public class NewNetworkSelectedNodesEdgesTaskTest {
private final NetworkTestSupport support = new NetworkTestSupport();
@@ -56,7 +53,7 @@
TaskMonitor tm = mock(TaskMonitor.class);
// TODO how can we test this?
- task.run(tm);
+ //task.run(tm);
}
}
--
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.
