Author: mes
Date: 2011-07-28 13:07:13 -0700 (Thu, 28 Jul 2011)
New Revision: 26305
Modified:
core3/vizmap-api/trunk/pom.xml
core3/vizmap-api/trunk/src/test/java/org/cytoscape/view/vizmap/AbstractVisualStyleTest.java
core3/vizmap-impl/trunk/impl/src/test/java/org/cytoscape/view/vizmap/VisualStyleTest.java
core3/vizmap-impl/trunk/pom.xml
Log:
moved use of test-support from vizmap api to impl
Modified: core3/vizmap-api/trunk/pom.xml
===================================================================
--- core3/vizmap-api/trunk/pom.xml 2011-07-28 19:35:43 UTC (rev 26304)
+++ core3/vizmap-api/trunk/pom.xml 2011-07-28 20:07:13 UTC (rev 26305)
@@ -124,7 +124,7 @@
<dependency>
<groupId>org.mockito</groupId>
<artifactId>mockito-all</artifactId>
- <version>1.8.1</version>
+ <version>${mockito.version}</version>
<scope>test</scope>
</dependency>
<dependency>
@@ -135,12 +135,6 @@
</dependency>
<dependency>
<groupId>org.cytoscape</groupId>
- <artifactId>test-support</artifactId>
- <version>3.0.0-alpha3-SNAPSHOT</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.cytoscape</groupId>
<artifactId>property-api</artifactId>
<version>3.0.0-alpha5-SNAPSHOT</version>
<scope>test</scope>
Modified:
core3/vizmap-api/trunk/src/test/java/org/cytoscape/view/vizmap/AbstractVisualStyleTest.java
===================================================================
---
core3/vizmap-api/trunk/src/test/java/org/cytoscape/view/vizmap/AbstractVisualStyleTest.java
2011-07-28 19:35:43 UTC (rev 26304)
+++
core3/vizmap-api/trunk/src/test/java/org/cytoscape/view/vizmap/AbstractVisualStyleTest.java
2011-07-28 20:07:13 UTC (rev 26305)
@@ -14,7 +14,6 @@
import org.cytoscape.model.CyNode;
import org.cytoscape.model.CyTable;
import org.cytoscape.property.CyProperty;
-import org.cytoscape.test.support.NetworkViewTestSupport;
import org.cytoscape.view.model.CyNetworkView;
import org.cytoscape.view.model.View;
import org.cytoscape.view.model.VisualLexicon;
@@ -40,10 +39,6 @@
protected VisualLexicon lexicon;
-// protected DiscreteMapping<String, Paint> colorMapping1;
-// protected DiscreteMapping<String, Paint> colorMapping2;
-
-
// Simple test network
protected CyNode node1;
protected CyNode node2;
@@ -53,46 +48,6 @@
protected CyNetworkView networkView;
- @Before
- public void setUp() throws Exception {
-
- final Class<String> type = String.class;
-// colorMapping1 = new DiscreteMapping<String, Paint>(attrName,
type,
-// MinimalVisualLexicon.NODE_PAINT);
-// colorMapping2 = new DiscreteMapping<String, Paint>(attrName,
type,
-// MinimalVisualLexicon.NODE_FILL_COLOR);
-//
-// colorMapping1.putMapValue("red", RED2);
-// colorMapping1.putMapValue("green", GREEN2);
-// colorMapping1.putMapValue("blue", Color.BLUE);
-//
-// colorMapping2.putMapValue("red", RED1);
-// colorMapping2.putMapValue("green", GREEN1);
-// colorMapping2.putMapValue("blue", Color.BLUE);
-
- CyProperty<Properties> cyProperties = mock(CyProperty.class);
- NetworkViewTestSupport nvts = new
NetworkViewTestSupport(cyProperties);
- network = nvts.getNetworkFactory().getInstance();
-
- node1 = network.addNode();
- node2 = network.addNode();
- node3 = network.addNode();
-
- edge = network.addEdge(node1, node2, true);
- CyTable nodeTable = network.getDefaultNodeTable();
- nodeTable.createColumn(attrName, String.class, true);
- nodeTable.getRow(node1.getSUID()).set(attrName, "red");
- nodeTable.getRow(node2.getSUID()).set(attrName, "green");
- nodeTable.getRow(node3.getSUID()).set(attrName, "foo");
-
- networkView =
nvts.getNetworkViewFactory().getNetworkView(network);
- }
-
- @After
- public void tearDown() throws Exception {
- }
-
-
@Test
public void testVisualStyle() {
assertNotNull(style);
Modified:
core3/vizmap-impl/trunk/impl/src/test/java/org/cytoscape/view/vizmap/VisualStyleTest.java
===================================================================
---
core3/vizmap-impl/trunk/impl/src/test/java/org/cytoscape/view/vizmap/VisualStyleTest.java
2011-07-28 19:35:43 UTC (rev 26304)
+++
core3/vizmap-impl/trunk/impl/src/test/java/org/cytoscape/view/vizmap/VisualStyleTest.java
2011-07-28 20:07:13 UTC (rev 26305)
@@ -5,13 +5,23 @@
import java.util.Collection;
import java.util.HashSet;
import java.util.Set;
+import java.util.Properties;
-import org.cytoscape.view.model.VisualLexicon;
-import org.cytoscape.view.model.VisualProperty;
import org.cytoscape.view.presentation.property.MinimalVisualLexicon;
import org.cytoscape.view.presentation.property.NullVisualProperty;
import org.cytoscape.view.vizmap.internal.VisualLexiconManager;
import org.cytoscape.view.vizmap.internal.VisualStyleFactoryImpl;
+import org.cytoscape.test.support.NetworkViewTestSupport;
+import org.cytoscape.model.CyEdge;
+import org.cytoscape.model.CyNetwork;
+import org.cytoscape.model.CyNode;
+import org.cytoscape.model.CyTable;
+import org.cytoscape.property.CyProperty;
+import org.cytoscape.view.model.CyNetworkView;
+import org.cytoscape.view.model.View;
+import org.cytoscape.view.model.VisualLexicon;
+import org.cytoscape.view.model.VisualProperty;
+
import org.junit.After;
import org.junit.Before;
@@ -19,7 +29,23 @@
@Before
public void setUp() throws Exception {
- super.setUp();
+ final Class<String> type = String.class;
+ CyProperty<Properties> cyProperties = mock(CyProperty.class);
+ NetworkViewTestSupport nvts = new NetworkViewTestSupport(cyProperties);
+ network = nvts.getNetworkFactory().getInstance();
+
+ node1 = network.addNode();
+ node2 = network.addNode();
+ node3 = network.addNode();
+
+ edge = network.addEdge(node1, node2, true);
+ CyTable nodeTable = network.getDefaultNodeTable();
+ nodeTable.createColumn(attrName, String.class, true);
+ nodeTable.getRow(node1.getSUID()).set(attrName, "red");
+ nodeTable.getRow(node2.getSUID()).set(attrName, "green");
+ nodeTable.getRow(node3.getSUID()).set(attrName, "foo");
+
+ networkView = nvts.getNetworkViewFactory().getNetworkView(network);
// Create root node.
final VisualLexiconManager lexManager =
mock(VisualLexiconManager.class);
@@ -42,9 +68,4 @@
newTitle = "Style 2";
style = visualStyleFactory.getInstance(originalTitle);
}
-
- @After
- public void tearDown() throws Exception {
- }
-
}
Modified: core3/vizmap-impl/trunk/pom.xml
===================================================================
--- core3/vizmap-impl/trunk/pom.xml 2011-07-28 19:35:43 UTC (rev 26304)
+++ core3/vizmap-impl/trunk/pom.xml 2011-07-28 20:07:13 UTC (rev 26305)
@@ -106,10 +106,16 @@
<version>${junit.version}</version>
<scope>test</scope>
</dependency>
+ <dependency>
+ <groupId>org.cytoscape</groupId>
+ <artifactId>test-support</artifactId>
+ <version>3.0.0-alpha3-SNAPSHOT</version>
+ <scope>test</scope>
+ </dependency>
<dependency>
<groupId>org.mockito</groupId>
<artifactId>mockito-all</artifactId>
- <version>1.8.1</version>
+ <version>${mockito.version}</version>
<scope>test</scope>
</dependency>
<dependency>
--
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.
