Author: mes
Date: 2011-08-09 14:28:52 -0700 (Tue, 09 Aug 2011)
New Revision: 26503

Modified:
   core3/impl/trunk/core-task-impl/pom.xml
   
core3/impl/trunk/core-task-impl/src/test/java/org/cytoscape/task/internal/creation/CreateNetworkViewTaskTest.java
   
core3/impl/trunk/core-task-impl/src/test/java/org/cytoscape/task/internal/creation/NewEmptyNetworkTaskTest.java
   
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/destruction/DestroyNetworkTaskTest.java
   
core3/impl/trunk/core-task-impl/src/test/java/org/cytoscape/task/internal/destruction/DestroyNetworkViewTaskTest.java
   
core3/impl/trunk/core-task-impl/src/test/java/org/cytoscape/task/internal/export/network/CyNetworkViewWriterTest.java
   
core3/impl/trunk/core-task-impl/src/test/java/org/cytoscape/task/internal/hide/HideSelectedEdgesTaskTest.java
   
core3/impl/trunk/core-task-impl/src/test/java/org/cytoscape/task/internal/hide/HideSelectedNodesTaskTest.java
Log:
updated to remove test-support

Modified: core3/impl/trunk/core-task-impl/pom.xml
===================================================================
--- core3/impl/trunk/core-task-impl/pom.xml     2011-08-09 21:12:34 UTC (rev 
26502)
+++ core3/impl/trunk/core-task-impl/pom.xml     2011-08-09 21:28:52 UTC (rev 
26503)
@@ -144,12 +144,32 @@
                </dependency>
                <dependency>
                        <groupId>org.cytoscape</groupId>
-                       <artifactId>test-support</artifactId>
+                       <artifactId>model-impl</artifactId>
+                       <version>${project.version}</version>
+                       <type>test-jar</type>
                        <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>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>io-api</artifactId>
                        <type>test-jar</type>
                        <scope>test</scope>
@@ -160,10 +180,21 @@
                        <type>test-jar</type>
                        <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>
+               <dependency>
+                       <groupId>org.cytoscape</groupId>
+                       <artifactId>service-api</artifactId>
+                       <scope>test</scope>
+               </dependency>
        </dependencies>
 </project>

Modified: 
core3/impl/trunk/core-task-impl/src/test/java/org/cytoscape/task/internal/creation/CreateNetworkViewTaskTest.java
===================================================================
--- 
core3/impl/trunk/core-task-impl/src/test/java/org/cytoscape/task/internal/creation/CreateNetworkViewTaskTest.java
   2011-08-09 21:12:34 UTC (rev 26502)
+++ 
core3/impl/trunk/core-task-impl/src/test/java/org/cytoscape/task/internal/creation/CreateNetworkViewTaskTest.java
   2011-08-09 21:28:52 UTC (rev 26503)
@@ -11,8 +11,8 @@
 
 import org.cytoscape.event.CyEventHelper;
 import org.cytoscape.model.CyNetwork;
-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.CyNetworkView;
 import org.cytoscape.view.model.CyNetworkViewFactory;
 import org.cytoscape.view.model.CyNetworkViewManager;

Modified: 
core3/impl/trunk/core-task-impl/src/test/java/org/cytoscape/task/internal/creation/NewEmptyNetworkTaskTest.java
===================================================================
--- 
core3/impl/trunk/core-task-impl/src/test/java/org/cytoscape/task/internal/creation/NewEmptyNetworkTaskTest.java
     2011-08-09 21:12:34 UTC (rev 26502)
+++ 
core3/impl/trunk/core-task-impl/src/test/java/org/cytoscape/task/internal/creation/NewEmptyNetworkTaskTest.java
     2011-08-09 21:28:52 UTC (rev 26503)
@@ -9,8 +9,8 @@
 import org.cytoscape.model.CyNetworkFactory;
 import org.cytoscape.model.CyNetworkManager;
 import org.cytoscape.session.CyNetworkNaming;
-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.CyNetworkView;
 import org.cytoscape.view.model.CyNetworkViewFactory;
 import org.cytoscape.view.model.CyNetworkViewManager;

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
        2011-08-09 21:12:34 UTC (rev 26502)
+++ 
core3/impl/trunk/core-task-impl/src/test/java/org/cytoscape/task/internal/creation/NewNetworkSelectedNodesEdgesTaskTest.java
        2011-08-09 21:28:52 UTC (rev 26503)
@@ -11,8 +11,8 @@
 import org.cytoscape.model.subnetwork.CyRootNetworkFactory;
 import org.cytoscape.session.CyApplicationManager;
 import org.cytoscape.session.CyNetworkNaming;
-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.cytoscape.view.model.CyNetworkViewManager;
 import org.cytoscape.view.vizmap.VisualMappingManager;

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
 2011-08-09 21:12:34 UTC (rev 26502)
+++ 
core3/impl/trunk/core-task-impl/src/test/java/org/cytoscape/task/internal/creation/NewNetworkSelectedNodesOnlyTaskTest.java
 2011-08-09 21:28:52 UTC (rev 26503)
@@ -20,8 +20,8 @@
 import org.cytoscape.model.subnetwork.CyRootNetworkFactory;
 import org.cytoscape.session.CyApplicationManager;
 import org.cytoscape.session.CyNetworkNaming;
-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.cytoscape.view.model.CyNetworkViewManager;
 import org.cytoscape.view.vizmap.VisualMappingManager;

Modified: 
core3/impl/trunk/core-task-impl/src/test/java/org/cytoscape/task/internal/destruction/DestroyNetworkTaskTest.java
===================================================================
--- 
core3/impl/trunk/core-task-impl/src/test/java/org/cytoscape/task/internal/destruction/DestroyNetworkTaskTest.java
   2011-08-09 21:12:34 UTC (rev 26502)
+++ 
core3/impl/trunk/core-task-impl/src/test/java/org/cytoscape/task/internal/destruction/DestroyNetworkTaskTest.java
   2011-08-09 21:28:52 UTC (rev 26503)
@@ -8,7 +8,7 @@
 
 import org.cytoscape.model.CyNetwork;
 import org.cytoscape.model.CyNetworkManager;
-import org.cytoscape.test.support.NetworkTestSupport;
+import org.cytoscape.model.NetworkTestSupport;
 import org.junit.After;
 import org.junit.Before;
 import org.junit.Test;

Modified: 
core3/impl/trunk/core-task-impl/src/test/java/org/cytoscape/task/internal/destruction/DestroyNetworkViewTaskTest.java
===================================================================
--- 
core3/impl/trunk/core-task-impl/src/test/java/org/cytoscape/task/internal/destruction/DestroyNetworkViewTaskTest.java
       2011-08-09 21:12:34 UTC (rev 26502)
+++ 
core3/impl/trunk/core-task-impl/src/test/java/org/cytoscape/task/internal/destruction/DestroyNetworkViewTaskTest.java
       2011-08-09 21:28:52 UTC (rev 26503)
@@ -7,7 +7,7 @@
 import java.util.HashSet;
 import java.util.Set;
 
-import org.cytoscape.test.support.NetworkViewTestSupport;
+import org.cytoscape.view.model.NetworkViewTestSupport;
 import org.cytoscape.view.model.CyNetworkView;
 import org.cytoscape.view.model.CyNetworkViewManager;
 import org.junit.After;

Modified: 
core3/impl/trunk/core-task-impl/src/test/java/org/cytoscape/task/internal/export/network/CyNetworkViewWriterTest.java
===================================================================
--- 
core3/impl/trunk/core-task-impl/src/test/java/org/cytoscape/task/internal/export/network/CyNetworkViewWriterTest.java
       2011-08-09 21:12:34 UTC (rev 26502)
+++ 
core3/impl/trunk/core-task-impl/src/test/java/org/cytoscape/task/internal/export/network/CyNetworkViewWriterTest.java
       2011-08-09 21:28:52 UTC (rev 26503)
@@ -13,7 +13,7 @@
 import org.cytoscape.io.CyFileFilter;
 import org.cytoscape.io.write.AbstractCyWriterTest;
 import org.cytoscape.io.write.CyNetworkViewWriterManager;
-import org.cytoscape.test.support.NetworkViewTestSupport;
+import org.cytoscape.view.model.NetworkViewTestSupport;
 import org.cytoscape.view.model.CyNetworkView;
 import org.junit.Before;
 import org.junit.Test;

Modified: 
core3/impl/trunk/core-task-impl/src/test/java/org/cytoscape/task/internal/hide/HideSelectedEdgesTaskTest.java
===================================================================
--- 
core3/impl/trunk/core-task-impl/src/test/java/org/cytoscape/task/internal/hide/HideSelectedEdgesTaskTest.java
       2011-08-09 21:12:34 UTC (rev 26502)
+++ 
core3/impl/trunk/core-task-impl/src/test/java/org/cytoscape/task/internal/hide/HideSelectedEdgesTaskTest.java
       2011-08-09 21:28:52 UTC (rev 26503)
@@ -8,7 +8,7 @@
 import org.cytoscape.model.CyNetwork;
 import org.cytoscape.model.CyNode;
 import org.cytoscape.task.AbstractNetworkViewTaskTest;
-import org.cytoscape.test.support.NetworkViewTestSupport;
+import org.cytoscape.view.model.NetworkViewTestSupport;
 import org.cytoscape.view.model.CyNetworkView;
 import org.cytoscape.work.TaskMonitor;
 import org.cytoscape.work.undo.UndoSupport;

Modified: 
core3/impl/trunk/core-task-impl/src/test/java/org/cytoscape/task/internal/hide/HideSelectedNodesTaskTest.java
===================================================================
--- 
core3/impl/trunk/core-task-impl/src/test/java/org/cytoscape/task/internal/hide/HideSelectedNodesTaskTest.java
       2011-08-09 21:12:34 UTC (rev 26502)
+++ 
core3/impl/trunk/core-task-impl/src/test/java/org/cytoscape/task/internal/hide/HideSelectedNodesTaskTest.java
       2011-08-09 21:28:52 UTC (rev 26503)
@@ -8,7 +8,7 @@
 
 import org.cytoscape.event.CyEventHelper;
 import org.cytoscape.task.AbstractNetworkViewTaskTest;
-import org.cytoscape.test.support.NetworkViewTestSupport;
+import org.cytoscape.view.model.NetworkViewTestSupport;
 import org.cytoscape.view.model.CyNetworkView;
 import org.cytoscape.work.TaskMonitor;
 import org.cytoscape.work.undo.UndoSupport;

-- 
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.

Reply via email to