Author: mes
Date: 2010-09-05 16:45:12 -0700 (Sun, 05 Sep 2010)
New Revision: 21707
Modified:
core3/test-support/trunk/src/main/java/org/cytoscape/test/support/NetworkTestSupport.java
core3/test-support/trunk/src/test/java/org/cytoscape/test/support/DataTableTestSupportTest.java
Log:
changes to support the concept of primary key in CyDataTable
Modified:
core3/test-support/trunk/src/main/java/org/cytoscape/test/support/NetworkTestSupport.java
===================================================================
---
core3/test-support/trunk/src/main/java/org/cytoscape/test/support/NetworkTestSupport.java
2010-09-05 23:44:35 UTC (rev 21706)
+++
core3/test-support/trunk/src/main/java/org/cytoscape/test/support/NetworkTestSupport.java
2010-09-05 23:45:12 UTC (rev 21707)
@@ -5,10 +5,12 @@
import org.cytoscape.event.DummyCyEventHelper;
import org.cytoscape.model.CyNetwork;
import org.cytoscape.model.CyNetworkFactory;
+import org.cytoscape.model.CyDataTableFactory;
import org.cytoscape.model.StubTableManager;
import org.cytoscape.model.CyTableManager;
import org.cytoscape.model.internal.CyNetworkFactoryImpl;
+import org.cytoscape.model.internal.CyDataTableFactoryImpl;
public class NetworkTestSupport {
@@ -19,7 +21,9 @@
public NetworkTestSupport() {
eventHelper = new DummyCyEventHelper();
tableMgr = new StubTableManager();
- networkFactory = new CyNetworkFactoryImpl( eventHelper,
tableMgr );
+ CyDataTableFactory tableFactory = new
CyDataTableFactoryImpl(eventHelper);
+
+ networkFactory = new CyNetworkFactoryImpl( eventHelper,
tableMgr, tableFactory );
}
public CyNetwork getNetwork() {
Modified:
core3/test-support/trunk/src/test/java/org/cytoscape/test/support/DataTableTestSupportTest.java
===================================================================
---
core3/test-support/trunk/src/test/java/org/cytoscape/test/support/DataTableTestSupportTest.java
2010-09-05 23:44:35 UTC (rev 21706)
+++
core3/test-support/trunk/src/test/java/org/cytoscape/test/support/DataTableTestSupportTest.java
2010-09-05 23:45:12 UTC (rev 21707)
@@ -24,8 +24,8 @@
public void setUp() {
eventHelper = support.getDummyCyEventHelper();
- mgr = factory.createTable(Integer.toString( rand.nextInt(10000)
), false);
- attrs = mgr.getRow(1);
+ mgr = factory.createTable(Integer.toString( rand.nextInt(10000)
), "SUID", Long.class, false);
+ attrs = mgr.getRow(1l);
}
public void tearDown() {
--
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.
