Author: mes
Date: 2011-08-09 14:42:03 -0700 (Tue, 09 Aug 2011)
New Revision: 26508
Modified:
core3/impl/trunk/table-import-impl/pom.xml
core3/impl/trunk/table-import-impl/src/test/java/org/cytoscape/tableimport/internal/reader/ontology/GeneAssociationReaderTest.java
core3/impl/trunk/table-import-impl/src/test/java/org/cytoscape/tableimport/internal/reader/ontology/OBOReaderTest.java
Log:
updated to remove test-support
Modified: core3/impl/trunk/table-import-impl/pom.xml
===================================================================
--- core3/impl/trunk/table-import-impl/pom.xml 2011-08-09 21:40:08 UTC (rev
26507)
+++ core3/impl/trunk/table-import-impl/pom.xml 2011-08-09 21:42:03 UTC (rev
26508)
@@ -193,6 +193,48 @@
<artifactId>mockito-all</artifactId>
<scope>test</scope>
</dependency>
+ <dependency>
+ <groupId>org.cytoscape</groupId>
+ <artifactId>model-impl</artifactId>
+ <version>${project.version}</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.cytoscape</groupId>
+ <artifactId>model-impl</artifactId>
+ <version>${project.version}</version>
+ <type>test-jar</type>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.cytoscape</groupId>
+ <artifactId>viewmodel-impl</artifactId>
+ <version>${project.version}</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.cytoscape</groupId>
+ <artifactId>viewmodel-impl</artifactId>
+ <version>${project.version}</version>
+ <type>test-jar</type>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.cytoscape</groupId>
+ <artifactId>service-api</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.cytoscape</groupId>
+ <artifactId>event-api</artifactId>
+ <type>test-jar</type>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.cytoscape</groupId>
+ <artifactId>equations-api</artifactId>
+ <scope>test</scope>
+ </dependency>
</dependencies>
</project>
Modified:
core3/impl/trunk/table-import-impl/src/test/java/org/cytoscape/tableimport/internal/reader/ontology/GeneAssociationReaderTest.java
===================================================================
---
core3/impl/trunk/table-import-impl/src/test/java/org/cytoscape/tableimport/internal/reader/ontology/GeneAssociationReaderTest.java
2011-08-09 21:40:08 UTC (rev 26507)
+++
core3/impl/trunk/table-import-impl/src/test/java/org/cytoscape/tableimport/internal/reader/ontology/GeneAssociationReaderTest.java
2011-08-09 21:42:03 UTC (rev 26508)
@@ -14,9 +14,9 @@
import org.cytoscape.model.CyTable;
import org.cytoscape.model.CyTableFactory;
import org.cytoscape.session.CyApplicationManager;
-import org.cytoscape.test.support.DataTableTestSupport;
-import org.cytoscape.test.support.NetworkTestSupport;
-import org.cytoscape.test.support.NetworkViewTestSupport;
+import org.cytoscape.model.TableTestSupport;
+import org.cytoscape.model.NetworkTestSupport;
+import org.cytoscape.view.model.NetworkViewTestSupport;
import org.cytoscape.view.model.CyNetworkViewFactory;
import org.cytoscape.work.TaskMonitor;
import org.junit.After;
@@ -40,11 +40,11 @@
NetworkViewTestSupport viewSupport = new
NetworkViewTestSupport();
NetworkTestSupport netSupport = new NetworkTestSupport();
- DataTableTestSupport tableSupport = new DataTableTestSupport();
+ TableTestSupport tableSupport = new TableTestSupport();
CyNetworkViewFactory cyNetworkViewFactory =
viewSupport.getNetworkViewFactory();
CyNetworkFactory cyNetworkFactory =
netSupport.getNetworkFactory();
- tableFactory = tableSupport.getDataTableFactory();
+ tableFactory = tableSupport.getTableFactory();
dag = cyNetworkFactory.getInstance();
CyEventHelper eventHelper = mock(CyEventHelper.class);
tm = mock(TaskMonitor.class);
Modified:
core3/impl/trunk/table-import-impl/src/test/java/org/cytoscape/tableimport/internal/reader/ontology/OBOReaderTest.java
===================================================================
---
core3/impl/trunk/table-import-impl/src/test/java/org/cytoscape/tableimport/internal/reader/ontology/OBOReaderTest.java
2011-08-09 21:40:08 UTC (rev 26507)
+++
core3/impl/trunk/table-import-impl/src/test/java/org/cytoscape/tableimport/internal/reader/ontology/OBOReaderTest.java
2011-08-09 21:42:03 UTC (rev 26508)
@@ -11,8 +11,8 @@
import org.cytoscape.model.CyNetworkFactory;
import org.cytoscape.model.CyRow;
import org.cytoscape.model.CyTable;
-import org.cytoscape.test.support.NetworkTestSupport;
-import org.cytoscape.test.support.NetworkViewTestSupport;
+import org.cytoscape.model.NetworkTestSupport;
+import org.cytoscape.view.model.NetworkViewTestSupport;
import org.cytoscape.view.model.CyNetworkViewFactory;
import org.junit.After;
import org.junit.Before;
--
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.
