Author: kono
Date: 2011-09-28 10:49:46 -0700 (Wed, 28 Sep 2011)
New Revision: 27010
Modified:
core3/impl/trunk/vizmap-impl/impl/src/test/java/org/cytoscape/view/vizmap/VisualMappingManagerTest.java
core3/impl/trunk/vizmap-impl/impl/src/test/java/org/cytoscape/view/vizmap/VisualStyleTest.java
core3/impl/trunk/vizmap-impl/pom.xml
Log:
Imports are organized to use Ding test support.
Modified:
core3/impl/trunk/vizmap-impl/impl/src/test/java/org/cytoscape/view/vizmap/VisualMappingManagerTest.java
===================================================================
---
core3/impl/trunk/vizmap-impl/impl/src/test/java/org/cytoscape/view/vizmap/VisualMappingManagerTest.java
2011-09-28 17:39:37 UTC (rev 27009)
+++
core3/impl/trunk/vizmap-impl/impl/src/test/java/org/cytoscape/view/vizmap/VisualMappingManagerTest.java
2011-09-28 17:49:46 UTC (rev 27010)
@@ -1,14 +1,12 @@
package org.cytoscape.view.vizmap;
-import static org.mockito.Mockito.*;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.when;
import org.cytoscape.event.CyEventHelper;
-import org.cytoscape.view.model.VisualLexicon;
-import org.cytoscape.view.presentation.property.NullVisualProperty;
import org.cytoscape.view.vizmap.internal.VisualLexiconManager;
import org.cytoscape.view.vizmap.internal.VisualMappingManagerImpl;
-import org.cytoscape.view.vizmap.internal.VisualStyleFactoryImpl;
import org.junit.After;
import org.junit.Before;
Modified:
core3/impl/trunk/vizmap-impl/impl/src/test/java/org/cytoscape/view/vizmap/VisualStyleTest.java
===================================================================
---
core3/impl/trunk/vizmap-impl/impl/src/test/java/org/cytoscape/view/vizmap/VisualStyleTest.java
2011-09-28 17:39:37 UTC (rev 27009)
+++
core3/impl/trunk/vizmap-impl/impl/src/test/java/org/cytoscape/view/vizmap/VisualStyleTest.java
2011-09-28 17:49:46 UTC (rev 27010)
@@ -1,28 +1,22 @@
package org.cytoscape.view.vizmap;
-import static org.mockito.Mockito.*;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.when;
import java.util.Collection;
import java.util.HashSet;
-import java.util.Set;
import java.util.Properties;
+import java.util.Set;
-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.view.model.NetworkViewTestSupport;
-import org.cytoscape.model.CyEdge;
-import org.cytoscape.model.CyNetwork;
-import org.cytoscape.model.CyNode;
+import org.cytoscape.ding.NetworkViewTestSupport;
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.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.junit.Before;
public class VisualStyleTest extends AbstractVisualStyleTest {
@@ -31,7 +25,7 @@
public void setUp() throws Exception {
final Class<String> type = String.class;
CyProperty<Properties> cyProperties = mock(CyProperty.class);
- NetworkViewTestSupport nvts = new NetworkViewTestSupport(cyProperties);
+ NetworkViewTestSupport nvts = new NetworkViewTestSupport();
network = nvts.getNetworkFactory().getInstance();
node1 = network.addNode();
Modified: core3/impl/trunk/vizmap-impl/pom.xml
===================================================================
--- core3/impl/trunk/vizmap-impl/pom.xml 2011-09-28 17:39:37 UTC (rev
27009)
+++ core3/impl/trunk/vizmap-impl/pom.xml 2011-09-28 17:49:46 UTC (rev
27010)
@@ -6,7 +6,6 @@
<version>3.0.0-alpha8-SNAPSHOT</version>
</parent>
- <groupId>org.cytoscape</groupId>
<artifactId>vizmap-impl-parent</artifactId>
<packaging>pom</packaging>
<name>vizmap-impl-parent</name>
@@ -165,5 +164,18 @@
<artifactId>property-api</artifactId>
<scope>test</scope>
</dependency>
+ <dependency>
+ <groupId>org.cytoscape</groupId>
+ <artifactId>ding-presentation-impl</artifactId>
+ <version>${project.version}</version>
+ <type>test-jar</type>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.cytoscape</groupId>
+ <artifactId>ding-presentation-impl</artifactId>
+ <version>${project.version}</version>
+ <scope>test</scope>
+ </dependency>
</dependencies>
</project>
--
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.
