Author: mes
Date: 2011-08-09 14:33:32 -0700 (Tue, 09 Aug 2011)
New Revision: 26505
Modified:
core3/impl/trunk/io-impl/pom.xml
core3/impl/trunk/io-impl/src/test/java/org/cytoscape/io/internal/read/AbstractNetworkViewReaderTester.java
core3/impl/trunk/io-impl/src/test/java/org/cytoscape/io/internal/read/datatable/CSVCyReaderTest.java
core3/impl/trunk/io-impl/src/test/java/org/cytoscape/io/internal/read/gml/GMLNetworkReaderTest.java
core3/impl/trunk/io-impl/src/test/java/org/cytoscape/io/internal/read/xgmml/XGMMLNetworkReaderTest.java
core3/impl/trunk/io-impl/src/test/java/org/cytoscape/io/internal/util/UnrecognizedVisualPropertyManagerTest.java
Log:
updated to remove test-support
Modified: core3/impl/trunk/io-impl/pom.xml
===================================================================
--- core3/impl/trunk/io-impl/pom.xml 2011-08-09 21:30:07 UTC (rev 26504)
+++ core3/impl/trunk/io-impl/pom.xml 2011-08-09 21:33:32 UTC (rev 26505)
@@ -179,14 +179,46 @@
<scope>test</scope>
</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>
</dependencies>
</project>
Modified:
core3/impl/trunk/io-impl/src/test/java/org/cytoscape/io/internal/read/AbstractNetworkViewReaderTester.java
===================================================================
---
core3/impl/trunk/io-impl/src/test/java/org/cytoscape/io/internal/read/AbstractNetworkViewReaderTester.java
2011-08-09 21:30:07 UTC (rev 26504)
+++
core3/impl/trunk/io-impl/src/test/java/org/cytoscape/io/internal/read/AbstractNetworkViewReaderTester.java
2011-08-09 21:33:32 UTC (rev 26505)
@@ -18,8 +18,8 @@
import org.cytoscape.property.BasicCyProperty;
import org.cytoscape.property.CyProperty;
import org.cytoscape.property.CyProperty.SavePolicy;
-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.CyNetworkView;
Modified:
core3/impl/trunk/io-impl/src/test/java/org/cytoscape/io/internal/read/datatable/CSVCyReaderTest.java
===================================================================
---
core3/impl/trunk/io-impl/src/test/java/org/cytoscape/io/internal/read/datatable/CSVCyReaderTest.java
2011-08-09 21:30:07 UTC (rev 26504)
+++
core3/impl/trunk/io-impl/src/test/java/org/cytoscape/io/internal/read/datatable/CSVCyReaderTest.java
2011-08-09 21:33:32 UTC (rev 26505)
@@ -14,7 +14,7 @@
import org.cytoscape.model.CyTable;
import org.cytoscape.model.CyTable.Mutability;
import org.cytoscape.model.CyTableFactory;
-import org.cytoscape.test.support.DataTableTestSupport;
+import org.cytoscape.model.TableTestSupport;
import org.cytoscape.work.TaskMonitor;
import org.junit.Before;
import org.junit.Test;
@@ -29,8 +29,8 @@
@Before
public void setUp() {
- DataTableTestSupport tableTestSupport = new
DataTableTestSupport();
- tableFactory = tableTestSupport.getDataTableFactory();
+ TableTestSupport tableTestSupport = new TableTestSupport();
+ tableFactory = tableTestSupport.getTableFactory();
MockitoAnnotations.initMocks(this);
}
Modified:
core3/impl/trunk/io-impl/src/test/java/org/cytoscape/io/internal/read/gml/GMLNetworkReaderTest.java
===================================================================
---
core3/impl/trunk/io-impl/src/test/java/org/cytoscape/io/internal/read/gml/GMLNetworkReaderTest.java
2011-08-09 21:30:07 UTC (rev 26504)
+++
core3/impl/trunk/io-impl/src/test/java/org/cytoscape/io/internal/read/gml/GMLNetworkReaderTest.java
2011-08-09 21:33:32 UTC (rev 26505)
@@ -13,7 +13,7 @@
import org.cytoscape.model.CyNetwork;
import org.cytoscape.model.CyTableFactory;
import org.cytoscape.model.CyTableManager;
-import org.cytoscape.test.support.DataTableTestSupport;
+import org.cytoscape.model.TableTestSupport;
import org.cytoscape.view.model.CyNetworkView;
import org.cytoscape.view.model.VisualLexicon;
import org.cytoscape.view.presentation.RenderingEngineManager;
@@ -38,8 +38,8 @@
// FIXME
//when(lexicon.getVisualProperties(any(String.class))).thenReturn(new
LinkedList<VisualProperty<?>>());
- DataTableTestSupport tblTestSupport = new
DataTableTestSupport();
- CyTableFactory tableFactory =
tblTestSupport.getDataTableFactory();
+ TableTestSupport tblTestSupport = new TableTestSupport();
+ CyTableFactory tableFactory = tblTestSupport.getTableFactory();
CyTableManager tableMgr= mock(CyTableManager.class);
unrecognizedVisualPropertyMgr = new
UnrecognizedVisualPropertyManager(tableFactory, tableMgr);
Modified:
core3/impl/trunk/io-impl/src/test/java/org/cytoscape/io/internal/read/xgmml/XGMMLNetworkReaderTest.java
===================================================================
---
core3/impl/trunk/io-impl/src/test/java/org/cytoscape/io/internal/read/xgmml/XGMMLNetworkReaderTest.java
2011-08-09 21:30:07 UTC (rev 26504)
+++
core3/impl/trunk/io-impl/src/test/java/org/cytoscape/io/internal/read/xgmml/XGMMLNetworkReaderTest.java
2011-08-09 21:33:32 UTC (rev 26505)
@@ -18,7 +18,7 @@
import org.cytoscape.model.CyNode;
import org.cytoscape.model.CyTableFactory;
import org.cytoscape.model.CyTableManager;
-import org.cytoscape.test.support.DataTableTestSupport;
+import org.cytoscape.model.TableTestSupport;
import org.cytoscape.view.model.CyNetworkView;
import org.cytoscape.view.model.CyNetworkViewFactory;
import org.cytoscape.view.presentation.RenderingEngineManager;
@@ -56,8 +56,8 @@
networkViewFactory = mock(CyNetworkViewFactory.class);
networkFactory = mock(CyNetworkFactory.class);
- DataTableTestSupport tblTestSupport = new
DataTableTestSupport();
- tableFactory = tblTestSupport.getDataTableFactory();
+ TableTestSupport tblTestSupport = new TableTestSupport();
+ tableFactory = tblTestSupport.getTableFactory();
ByteArrayInputStream is = new
ByteArrayInputStream("".getBytes("UTF-8")); // TODO: use XGMML string or load
from file
Modified:
core3/impl/trunk/io-impl/src/test/java/org/cytoscape/io/internal/util/UnrecognizedVisualPropertyManagerTest.java
===================================================================
---
core3/impl/trunk/io-impl/src/test/java/org/cytoscape/io/internal/util/UnrecognizedVisualPropertyManagerTest.java
2011-08-09 21:30:07 UTC (rev 26504)
+++
core3/impl/trunk/io-impl/src/test/java/org/cytoscape/io/internal/util/UnrecognizedVisualPropertyManagerTest.java
2011-08-09 21:33:32 UTC (rev 26505)
@@ -15,7 +15,7 @@
import org.cytoscape.model.CyTableFactory;
import org.cytoscape.model.CyTableManager;
import org.cytoscape.model.CyTable.SavePolicy;
-import org.cytoscape.test.support.DataTableTestSupport;
+import org.cytoscape.model.TableTestSupport;
import org.cytoscape.view.model.CyNetworkView;
import org.cytoscape.view.model.View;
import org.junit.Before;
@@ -30,8 +30,8 @@
@Before
public void setUp() throws Exception {
- DataTableTestSupport tblTestSupport = new
DataTableTestSupport();
- tableFactory = tblTestSupport.getDataTableFactory();
+ TableTestSupport tblTestSupport = new TableTestSupport();
+ tableFactory = tblTestSupport.getTableFactory();
CyTableManager tableMgr = mock(CyTableManager.class);
unrecognizedVisualPropertyMgr = new
UnrecognizedVisualPropertyManager(tableFactory, tableMgr);
--
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.
