Author: mes
Date: 2011-08-09 14:38:31 -0700 (Tue, 09 Aug 2011)
New Revision: 26506
Modified:
core3/impl/trunk/psi-mi-impl/pom.xml
core3/impl/trunk/psi-mi-impl/src/test/java/org/cytoscape/psi_mi/internal/cyto_mapper/MapFromCytoscapeTest.java
core3/impl/trunk/psi-mi-impl/src/test/java/org/cytoscape/psi_mi/internal/cyto_mapper/MapToCytoscapeTest.java
core3/impl/trunk/psi-mi-impl/src/test/java/org/cytoscape/psi_mi/internal/data_mapper/MapInteractionsToPsiOneTest.java
core3/impl/trunk/psi-mi-impl/src/test/java/org/cytoscape/psi_mi/internal/data_mapper/MapInteractionsToPsiTwoFiveTest.java
core3/impl/trunk/psi-mi-impl/src/test/java/org/cytoscape/psi_mi/internal/plugin/PsiMiNetworkViewReaderTest.java
core3/impl/trunk/psi-mi-impl/src/test/java/org/cytoscape/psi_mi/internal/plugin/PsiMiTabReaderTest.java
Log:
updated to remove test-support
Modified: core3/impl/trunk/psi-mi-impl/pom.xml
===================================================================
--- core3/impl/trunk/psi-mi-impl/pom.xml 2011-08-09 21:33:32 UTC (rev
26505)
+++ core3/impl/trunk/psi-mi-impl/pom.xml 2011-08-09 21:38:31 UTC (rev
26506)
@@ -59,15 +59,52 @@
<artifactId>model-api</artifactId>
</dependency>
<dependency>
+ <groupId>org.mockito</groupId>
+ <artifactId>mockito-all</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
<groupId>org.cytoscape</groupId>
- <artifactId>test-support</artifactId>
+ <artifactId>model-impl</artifactId>
+ <version>${project.version}</version>
<scope>test</scope>
</dependency>
<dependency>
- <groupId>org.mockito</groupId>
- <artifactId>mockito-all</artifactId>
+ <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>
<build>
<plugins>
Modified:
core3/impl/trunk/psi-mi-impl/src/test/java/org/cytoscape/psi_mi/internal/cyto_mapper/MapFromCytoscapeTest.java
===================================================================
---
core3/impl/trunk/psi-mi-impl/src/test/java/org/cytoscape/psi_mi/internal/cyto_mapper/MapFromCytoscapeTest.java
2011-08-09 21:33:32 UTC (rev 26505)
+++
core3/impl/trunk/psi-mi-impl/src/test/java/org/cytoscape/psi_mi/internal/cyto_mapper/MapFromCytoscapeTest.java
2011-08-09 21:38:31 UTC (rev 26506)
@@ -47,7 +47,7 @@
import org.cytoscape.psi_mi.internal.model.Interaction;
import org.cytoscape.psi_mi.internal.model.Interactor;
import org.cytoscape.psi_mi.internal.util.ContentReader;
-import org.cytoscape.test.support.NetworkTestSupport;
+import org.cytoscape.model.NetworkTestSupport;
import org.junit.Before;
import org.junit.Test;
Modified:
core3/impl/trunk/psi-mi-impl/src/test/java/org/cytoscape/psi_mi/internal/cyto_mapper/MapToCytoscapeTest.java
===================================================================
---
core3/impl/trunk/psi-mi-impl/src/test/java/org/cytoscape/psi_mi/internal/cyto_mapper/MapToCytoscapeTest.java
2011-08-09 21:33:32 UTC (rev 26505)
+++
core3/impl/trunk/psi-mi-impl/src/test/java/org/cytoscape/psi_mi/internal/cyto_mapper/MapToCytoscapeTest.java
2011-08-09 21:38:31 UTC (rev 26506)
@@ -55,7 +55,7 @@
import org.cytoscape.psi_mi.internal.model.vocab.InteractorVocab;
import org.cytoscape.psi_mi.internal.util.AttributeUtil;
import org.cytoscape.psi_mi.internal.util.ContentReader;
-import org.cytoscape.test.support.NetworkTestSupport;
+import org.cytoscape.model.NetworkTestSupport;
import org.junit.Before;
import org.junit.Test;
Modified:
core3/impl/trunk/psi-mi-impl/src/test/java/org/cytoscape/psi_mi/internal/data_mapper/MapInteractionsToPsiOneTest.java
===================================================================
---
core3/impl/trunk/psi-mi-impl/src/test/java/org/cytoscape/psi_mi/internal/data_mapper/MapInteractionsToPsiOneTest.java
2011-08-09 21:33:32 UTC (rev 26505)
+++
core3/impl/trunk/psi-mi-impl/src/test/java/org/cytoscape/psi_mi/internal/data_mapper/MapInteractionsToPsiOneTest.java
2011-08-09 21:38:31 UTC (rev 26506)
@@ -66,7 +66,7 @@
import org.cytoscape.psi_mi.internal.schema.mi1.RefType;
import org.cytoscape.psi_mi.internal.schema.mi1.XrefType;
import org.cytoscape.psi_mi.internal.util.ContentReader;
-import org.cytoscape.test.support.NetworkTestSupport;
+import org.cytoscape.model.NetworkTestSupport;
import org.junit.Before;
import org.junit.Test;
Modified:
core3/impl/trunk/psi-mi-impl/src/test/java/org/cytoscape/psi_mi/internal/data_mapper/MapInteractionsToPsiTwoFiveTest.java
===================================================================
---
core3/impl/trunk/psi-mi-impl/src/test/java/org/cytoscape/psi_mi/internal/data_mapper/MapInteractionsToPsiTwoFiveTest.java
2011-08-09 21:33:32 UTC (rev 26505)
+++
core3/impl/trunk/psi-mi-impl/src/test/java/org/cytoscape/psi_mi/internal/data_mapper/MapInteractionsToPsiTwoFiveTest.java
2011-08-09 21:38:31 UTC (rev 26506)
@@ -65,7 +65,7 @@
import org.cytoscape.psi_mi.internal.schema.mi25.ParticipantType;
import org.cytoscape.psi_mi.internal.schema.mi25.XrefType;
import org.cytoscape.psi_mi.internal.util.ContentReader;
-import org.cytoscape.test.support.NetworkTestSupport;
+import org.cytoscape.model.NetworkTestSupport;
import org.junit.Before;
import org.junit.Test;
Modified:
core3/impl/trunk/psi-mi-impl/src/test/java/org/cytoscape/psi_mi/internal/plugin/PsiMiNetworkViewReaderTest.java
===================================================================
---
core3/impl/trunk/psi-mi-impl/src/test/java/org/cytoscape/psi_mi/internal/plugin/PsiMiNetworkViewReaderTest.java
2011-08-09 21:33:32 UTC (rev 26505)
+++
core3/impl/trunk/psi-mi-impl/src/test/java/org/cytoscape/psi_mi/internal/plugin/PsiMiNetworkViewReaderTest.java
2011-08-09 21:38:31 UTC (rev 26506)
@@ -11,8 +11,8 @@
import org.cytoscape.io.read.CyNetworkReader;
import org.cytoscape.model.CyNetwork;
import org.cytoscape.model.CyNetworkFactory;
-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.layout.CyLayoutAlgorithm;
import org.cytoscape.view.layout.CyLayoutAlgorithmManager;
import org.cytoscape.view.model.CyNetworkViewFactory;
Modified:
core3/impl/trunk/psi-mi-impl/src/test/java/org/cytoscape/psi_mi/internal/plugin/PsiMiTabReaderTest.java
===================================================================
---
core3/impl/trunk/psi-mi-impl/src/test/java/org/cytoscape/psi_mi/internal/plugin/PsiMiTabReaderTest.java
2011-08-09 21:33:32 UTC (rev 26505)
+++
core3/impl/trunk/psi-mi-impl/src/test/java/org/cytoscape/psi_mi/internal/plugin/PsiMiTabReaderTest.java
2011-08-09 21:38:31 UTC (rev 26506)
@@ -12,8 +12,8 @@
import org.cytoscape.io.read.CyNetworkReader;
import org.cytoscape.model.CyNetwork;
import org.cytoscape.model.CyNetworkFactory;
-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.layout.CyLayoutAlgorithm;
import org.cytoscape.view.layout.CyLayoutAlgorithmManager;
import org.cytoscape.view.model.CyNetworkViewFactory;
--
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.
