Author: rozagh
Date: 2012-06-08 13:18:26 -0700 (Fri, 08 Jun 2012)
New Revision: 29509
Modified:
core3/impl/trunk/core-task-impl/src/test/java/org/cytoscape/task/internal/creation/NewNetworkSelectedNodesEdgesTaskTest.java
core3/impl/trunk/core-task-impl/src/test/java/org/cytoscape/task/internal/creation/NewNetworkSelectedNodesOnlyTaskTest.java
core3/impl/trunk/core-task-impl/src/test/java/org/cytoscape/task/internal/table/MapTableToNetworkTableTaskTest.java
core3/impl/trunk/core-task-impl/src/test/java/org/cytoscape/task/internal/table/MappingIntegrationTest.java
Log:
Correcting some test files.
Modified:
core3/impl/trunk/core-task-impl/src/test/java/org/cytoscape/task/internal/creation/NewNetworkSelectedNodesEdgesTaskTest.java
===================================================================
---
core3/impl/trunk/core-task-impl/src/test/java/org/cytoscape/task/internal/creation/NewNetworkSelectedNodesEdgesTaskTest.java
2012-06-08 18:57:35 UTC (rev 29508)
+++
core3/impl/trunk/core-task-impl/src/test/java/org/cytoscape/task/internal/creation/NewNetworkSelectedNodesEdgesTaskTest.java
2012-06-08 20:18:26 UTC (rev 29509)
@@ -67,6 +67,9 @@
//net.getRow(node2).set(CyNetwork.SELECTED, true);
net.getRow(edge1).set(CyNetwork.SELECTED, true);
+ int numberOfNetsBeforeTask = netmgr.getNetworkSet().size();
+ List<CyNetwork> netListbeforeTask = new
ArrayList<CyNetwork>(netmgr.getNetworkSet());
+
final NewNetworkSelectedNodesEdgesTask task =
new NewNetworkSelectedNodesEdgesTask(undoSupport, net,
cyroot, cnvf, netmgr,
networkViewManager, cyNetworkNaming,
@@ -76,10 +79,14 @@
task.setTaskIterator(new TaskIterator(task));
task.run(mock(TaskMonitor.class));
- assertEquals(2, netmgr.getNetworkSet().size());
+ int numberOfNetsAfterTask = netmgr.getNetworkSet().size();
+
+ assertEquals(1, numberOfNetsAfterTask - numberOfNetsBeforeTask);
+
List<CyNetwork> networkList = new
ArrayList<CyNetwork>(netmgr.getNetworkSet());
- assertEquals(2, networkList.get(1).getNodeList().size());
- assertEquals(1, networkList.get(1).getEdgeList().size());
+ networkList.removeAll(netListbeforeTask);
+ assertEquals(2, networkList.get(0).getNodeList().size());
+ assertEquals(1, networkList.get(0).getEdgeList().size());
}
}
Modified:
core3/impl/trunk/core-task-impl/src/test/java/org/cytoscape/task/internal/creation/NewNetworkSelectedNodesOnlyTaskTest.java
===================================================================
---
core3/impl/trunk/core-task-impl/src/test/java/org/cytoscape/task/internal/creation/NewNetworkSelectedNodesOnlyTaskTest.java
2012-06-08 18:57:35 UTC (rev 29508)
+++
core3/impl/trunk/core-task-impl/src/test/java/org/cytoscape/task/internal/creation/NewNetworkSelectedNodesOnlyTaskTest.java
2012-06-08 20:18:26 UTC (rev 29509)
@@ -67,6 +67,9 @@
//net.getRow(node2).set(CyNetwork.SELECTED, true);
net.getRow(edge1).set(CyNetwork.SELECTED, true);
+ int numberOfNetsBeforeTask = netmgr.getNetworkSet().size();
+ List<CyNetwork> netListbeforeTask = new
ArrayList<CyNetwork>(netmgr.getNetworkSet());
+
final NewNetworkSelectedNodesOnlyTask task =
new NewNetworkSelectedNodesOnlyTask(undoSupport, net,
cyroot, cnvf, netmgr,
networkViewManager, cyNetworkNaming,
@@ -76,9 +79,12 @@
task.setTaskIterator(new TaskIterator(task));
task.run(mock(TaskMonitor.class));
- assertEquals(2, netmgr.getNetworkSet().size());
+ int numberOfNetsAfterTask = netmgr.getNetworkSet().size();
+ assertEquals(1, numberOfNetsAfterTask - numberOfNetsBeforeTask);
+
List<CyNetwork> networkList = new
ArrayList<CyNetwork>(netmgr.getNetworkSet());
- assertEquals(1, networkList.get(1).getNodeList().size());
- assertEquals(0, networkList.get(1).getEdgeList().size());
+ networkList.removeAll(netListbeforeTask);
+ assertEquals(1, networkList.get(0).getNodeList().size());
+ assertEquals(0, networkList.get(0).getEdgeList().size());
}
}
Modified:
core3/impl/trunk/core-task-impl/src/test/java/org/cytoscape/task/internal/table/MapTableToNetworkTableTaskTest.java
===================================================================
---
core3/impl/trunk/core-task-impl/src/test/java/org/cytoscape/task/internal/table/MapTableToNetworkTableTaskTest.java
2012-06-08 18:57:35 UTC (rev 29508)
+++
core3/impl/trunk/core-task-impl/src/test/java/org/cytoscape/task/internal/table/MapTableToNetworkTableTaskTest.java
2012-06-08 20:18:26 UTC (rev 29509)
@@ -79,7 +79,7 @@
mapping(table1, net1, false);
assertNotNull(net1.getDefaultNodeTable().getColumn("col1"));
- assertEquals("col1 row1",
net1.getDefaultNodeTable().getRow(node1.getSUID()).get("col1", String.class) );
+ assertEquals("col1 row1", net1.getRow(node1).get("col1",
String.class) );
}
Modified:
core3/impl/trunk/core-task-impl/src/test/java/org/cytoscape/task/internal/table/MappingIntegrationTest.java
===================================================================
---
core3/impl/trunk/core-task-impl/src/test/java/org/cytoscape/task/internal/table/MappingIntegrationTest.java
2012-06-08 18:57:35 UTC (rev 29508)
+++
core3/impl/trunk/core-task-impl/src/test/java/org/cytoscape/task/internal/table/MappingIntegrationTest.java
2012-06-08 20:18:26 UTC (rev 29509)
@@ -97,9 +97,11 @@
net1.getDefaultNodeTable().getRow(node2.getSUID()).set(CyNetwork.NAME,
node2Name);
netMgr.addNetwork(net1);
-
((CySubNetworkImpl) net1).handleEvent(new
NetworkAddedEvent(netMgr, net1));
-
+
+
+ List<CyNetwork> firstnetlist = new
ArrayList<CyNetwork>(netMgr.getNetworkSet());
+
//creating a table for mapping to all networks
table1 = new CyTableImpl("dummy table", "ID", String.class,
true, true,
CyTable.SavePolicy.DO_NOT_SAVE , eventHelper,
new InterpreterImpl(), 2);
@@ -126,10 +128,14 @@
newNetTask.setTaskIterator(new TaskIterator(newNetTask));
newNetTask.run(mock(TaskMonitor.class));
- assertEquals(2, netMgr.getNetworkSet().size());
- List<CyNetwork> newNetList = new
ArrayList<CyNetwork>(netMgr.getNetworkSet());
- subnet1 = newNetList.get(1);
+ List<CyNetwork> secondNetList = new
ArrayList<CyNetwork>(netMgr.getNetworkSet());
+ secondNetList.removeAll(firstnetlist);
+ assertEquals(1, secondNetList.size());
+
+ subnet1 = secondNetList.get(0);
+ secondNetList = new
ArrayList<CyNetwork>(netMgr.getNetworkSet());
+
((CySubNetworkImpl) subnet1).handleEvent(new
NetworkAddedEvent(netMgr, subnet1));
assertEquals(2, subnet1.getNodeList().size());
@@ -137,7 +143,7 @@
assertNotNull(subnet1.getDefaultNodeTable().getColumn(table1sCol));
//these two tests are failing because the required table update
when creating the subnetwork is not handled
//hence the nodes are there but the related rows in the table
are empty
- assertEquals(table1sRow1,
subnet1.getDefaultNodeTable().getRow(subnet1.getNodeList().get(0).getSUID()).get(table1sCol,
String.class) );
+ assertEquals(table1sRow1, subnet1.getRow(node1).get(table1sCol,
String.class) );
//creating another table to map to the net1 only
table2 = new CyTableImpl("dummy table", "ID", String.class,
true, true,
@@ -165,10 +171,13 @@
newNetTask2.setTaskIterator(new TaskIterator(newNetTask2));
newNetTask2.run(mock(TaskMonitor.class));
- assertEquals(3, netMgr.getNetworkSet().size());
+
- newNetList = new ArrayList<CyNetwork>(netMgr.getNetworkSet());
- subnet2 = newNetList.get(0);
+
+ List<CyNetwork> thirdNetList = new
ArrayList<CyNetwork>(netMgr.getNetworkSet());
+ thirdNetList.removeAll(secondNetList);
+ assertEquals(1, thirdNetList.size());
+ subnet2 = thirdNetList.get(0);
((CySubNetworkImpl) subnet2).handleEvent(new
NetworkAddedEvent(netMgr, subnet2));
@@ -180,8 +189,8 @@
//these two tests are failing because the required table update
when creating the subnetwork is not handled
//hence the nodes are there but the related rows in the table
are empty
- assertEquals(table1sRow1,
subnet2.getDefaultNodeTable().getRow(subnet2.getNodeList().get(0).getSUID()).get(table1sCol,
String.class) );
- assertEquals(table2sRow1,
subnet2.getDefaultNodeTable().getRow(subnet2.getNodeList().get(0).getSUID()).get(table2sCol,
String.class) );
+ assertEquals(table1sRow1, subnet2.getRow(node1).get(table1sCol,
String.class) );
+ assertEquals(table2sRow1, subnet2.getRow(node1).get(table2sCol,
String.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.
