Author: pwang
Date: 2010-12-07 16:15:47 -0800 (Tue, 07 Dec 2010)
New Revision: 23123
Modified:
core3/test-support/trunk/pom.xml
core3/test-support/trunk/src/main/java/org/cytoscape/test/support/DataTableTestSupport.java
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:
Update to use new versions of model-api
Modified: core3/test-support/trunk/pom.xml
===================================================================
--- core3/test-support/trunk/pom.xml 2010-12-07 23:44:56 UTC (rev 23122)
+++ core3/test-support/trunk/pom.xml 2010-12-08 00:15:47 UTC (rev 23123)
@@ -25,7 +25,7 @@
<dependency>
<groupId>org.cytoscape</groupId>
<artifactId>model-api</artifactId>
- <version>1.0-SNAPSHOT</version>
+ <version>3.0.0-alpha2-SNAPSHOT</version>
<type>test-jar</type>
</dependency>
<dependency>
@@ -43,7 +43,7 @@
<dependency>
<groupId>org.cytoscape</groupId>
<artifactId>model-api</artifactId>
- <version>1.0-SNAPSHOT</version>
+ <version>3.0.0-alpha2-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.cytoscape</groupId>
@@ -59,13 +59,20 @@
<dependency>
<groupId>org.cytoscape</groupId>
<artifactId>model-impl</artifactId>
- <version>1.0-SNAPSHOT</version>
+ <version>3.0.0-alpha2-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.cytoscape</groupId>
<artifactId>viewmodel-impl</artifactId>
<version>1.0-SNAPSHOT</version>
</dependency>
+
+ <dependency>
+ <groupId>org.cytoscape</groupId>
+ <artifactId>equations-impl</artifactId>
+ <version>1.0-SNAPSHOT</version>
+ </dependency>
+
<dependency>
<groupId>org.mockito</groupId>
<artifactId>mockito-all</artifactId>
Modified:
core3/test-support/trunk/src/main/java/org/cytoscape/test/support/DataTableTestSupport.java
===================================================================
---
core3/test-support/trunk/src/main/java/org/cytoscape/test/support/DataTableTestSupport.java
2010-12-07 23:44:56 UTC (rev 23122)
+++
core3/test-support/trunk/src/main/java/org/cytoscape/test/support/DataTableTestSupport.java
2010-12-08 00:15:47 UTC (rev 23123)
@@ -9,6 +9,7 @@
import org.cytoscape.model.internal.CyTableFactoryImpl;
import org.cytoscape.model.internal.CyTableManagerImpl;
+import org.cytoscape.equations.Interpreter;
import static org.mockito.Mockito.*;
@@ -19,7 +20,7 @@
public DataTableTestSupport() {
eventHelper = new DummyCyEventHelper();
- tableFactory = new CyTableFactoryImpl( eventHelper,
mock(CyTableManagerImpl.class) );
+ tableFactory = new CyTableFactoryImpl( eventHelper,
mock(CyTableManagerImpl.class), mock(Interpreter.class) );
}
public CyTableFactory getDataTableFactory() {
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-12-07 23:44:56 UTC (rev 23122)
+++
core3/test-support/trunk/src/main/java/org/cytoscape/test/support/NetworkTestSupport.java
2010-12-08 00:15:47 UTC (rev 23123)
@@ -1,6 +1,7 @@
package org.cytoscape.test.support;
+import org.cytoscape.equations.Interpreter;
import org.cytoscape.event.CyEventHelper;
import org.cytoscape.event.DummyCyEventHelper;
import org.cytoscape.model.CyNetwork;
@@ -22,7 +23,7 @@
public NetworkTestSupport() {
eventHelper = new DummyCyEventHelper();
tableMgr = mock(CyTableManagerImpl.class);
- CyTableFactoryImpl tableFactory = new
CyTableFactoryImpl(eventHelper,tableMgr);
+ CyTableFactoryImpl tableFactory = new
CyTableFactoryImpl(eventHelper,tableMgr, mock(Interpreter.class));
networkFactory = new CyNetworkFactoryImpl( eventHelper,
tableMgr, tableFactory );
}
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-12-07 23:44:56 UTC (rev 23122)
+++
core3/test-support/trunk/src/test/java/org/cytoscape/test/support/DataTableTestSupportTest.java
2010-12-08 00:15:47 UTC (rev 23123)
@@ -14,6 +14,7 @@
DataTableTestSupport support;
CyTableFactory factory;
+ CyTable mgr;
Random rand;
public DataTableTestSupportTest() {
@@ -24,7 +25,7 @@
public void setUp() {
eventHelper = support.getDummyCyEventHelper();
- mgr = factory.createTable(Integer.toString( rand.nextInt(10000)
), "SUID", Long.class, false);
+ CyTable mgr = factory.createTable(Integer.toString(
rand.nextInt(10000) ), "SUID", Long.class, false);
attrs = mgr.getRow(1l);
}
--
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.
