Author: kono
Date: 2011-09-28 14:09:52 -0700 (Wed, 28 Sep 2011)
New Revision: 27018
Added:
core3/impl/trunk/ding-impl/ding-presentation-impl/src/test/java/org/cytoscape/view/DNetworkViewTest.java
Modified:
core3/impl/trunk/ding-impl/ding-presentation-impl/pom.xml
core3/impl/trunk/ding-impl/ding-presentation-impl/src/main/java/org/cytoscape/ding/impl/DNodeView.java
core3/impl/trunk/ding-impl/ding-presentation-impl/src/test/java/org/cytoscape/ding/NetworkViewTestSupport.java
Log:
Network View test had been moved to DING.
Modified: core3/impl/trunk/ding-impl/ding-presentation-impl/pom.xml
===================================================================
--- core3/impl/trunk/ding-impl/ding-presentation-impl/pom.xml 2011-09-28
19:02:25 UTC (rev 27017)
+++ core3/impl/trunk/ding-impl/ding-presentation-impl/pom.xml 2011-09-28
21:09:52 UTC (rev 27018)
@@ -119,6 +119,12 @@
<groupId>org.cytoscape</groupId>
<artifactId>vizmap-gui-api</artifactId>
</dependency>
+
+ <dependency>
+ <groupId>org.cytoscape</groupId>
+ <artifactId>spacial</artifactId>
+ <version>${project.version}</version>
+ </dependency>
<!-- Wrapped libraries -->
@@ -177,6 +183,19 @@
<version>${project.version}</version>
<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-api</artifactId>
+ <type>test-jar</type>
+ <scope>test</scope>
+ </dependency>
+
</dependencies>
</project>
Modified:
core3/impl/trunk/ding-impl/ding-presentation-impl/src/main/java/org/cytoscape/ding/impl/DNodeView.java
===================================================================
---
core3/impl/trunk/ding-impl/ding-presentation-impl/src/main/java/org/cytoscape/ding/impl/DNodeView.java
2011-09-28 19:02:25 UTC (rev 27017)
+++
core3/impl/trunk/ding-impl/ding-presentation-impl/src/main/java/org/cytoscape/ding/impl/DNodeView.java
2011-09-28 21:09:52 UTC (rev 27018)
@@ -195,7 +195,7 @@
private final VisualLexicon lexicon;
- DNodeView(final VisualLexicon lexicon, final DGraphView graphView, int
inx, final CyNode model) {
+ public DNodeView(final VisualLexicon lexicon, final DGraphView
graphView, int inx, final CyNode model) {
super(model);
if (graphView == null)
Modified:
core3/impl/trunk/ding-impl/ding-presentation-impl/src/test/java/org/cytoscape/ding/NetworkViewTestSupport.java
===================================================================
---
core3/impl/trunk/ding-impl/ding-presentation-impl/src/test/java/org/cytoscape/ding/NetworkViewTestSupport.java
2011-09-28 19:02:25 UTC (rev 27017)
+++
core3/impl/trunk/ding-impl/ding-presentation-impl/src/test/java/org/cytoscape/ding/NetworkViewTestSupport.java
2011-09-28 21:09:52 UTC (rev 27018)
@@ -1,29 +1,23 @@
package org.cytoscape.ding;
-import java.util.Properties;
+import static org.mockito.Mockito.mock;
-import org.cytoscape.property.BasicCyProperty;
-import org.cytoscape.property.CyProperty;
-import org.cytoscape.property.CyProperty.SavePolicy;
+import org.cytoscape.ding.customgraphics.CustomGraphicsManager;
+import org.cytoscape.ding.impl.DVisualLexicon;
+import org.cytoscape.ding.impl.DingViewModelFactory;
+import org.cytoscape.ding.impl.ViewTaskFactoryListener;
+import org.cytoscape.event.CyEventHelper;
+import org.cytoscape.model.CyNetworkTableManager;
import org.cytoscape.model.NetworkTestSupport;
import org.cytoscape.model.TableTestSupport;
-import org.cytoscape.view.model.CyNetworkView;
-import org.cytoscape.view.model.CyNetworkViewFactory;
-import org.cytoscape.model.CyNetworkTableManager;
import org.cytoscape.service.util.CyServiceRegistrar;
-import org.cytoscape.ding.customgraphics.CustomGraphicsManager;
import org.cytoscape.spacial.internal.rtree.RTreeFactory;
-import org.cytoscape.work.undo.UndoSupport;
+import org.cytoscape.view.model.CyNetworkView;
+import org.cytoscape.view.model.CyNetworkViewFactory;
import org.cytoscape.work.TaskManager;
-import org.cytoscape.service.util.CyServiceRegistrar;
-import org.cytoscape.event.CyEventHelper;
-import org.cytoscape.ding.impl.DingViewModelFactory;
-import org.cytoscape.ding.impl.DVisualLexicon;
-import org.cytoscape.ding.impl.ViewTaskFactoryListener;
+import org.cytoscape.work.undo.UndoSupport;
-import static org.mockito.Mockito.*;
-
public class NetworkViewTestSupport extends NetworkTestSupport {
protected CyNetworkViewFactory viewFactory;
Added:
core3/impl/trunk/ding-impl/ding-presentation-impl/src/test/java/org/cytoscape/view/DNetworkViewTest.java
===================================================================
---
core3/impl/trunk/ding-impl/ding-presentation-impl/src/test/java/org/cytoscape/view/DNetworkViewTest.java
(rev 0)
+++
core3/impl/trunk/ding-impl/ding-presentation-impl/src/test/java/org/cytoscape/view/DNetworkViewTest.java
2011-09-28 21:09:52 UTC (rev 27018)
@@ -0,0 +1,117 @@
+package org.cytoscape.view;
+
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.when;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+
+import org.cytoscape.ding.impl.DGraphView;
+import org.cytoscape.dnd.DropNetworkViewTaskFactory;
+import org.cytoscape.dnd.DropNodeViewTaskFactory;
+import org.cytoscape.event.CyEventHelper;
+import org.cytoscape.model.CyEdge;
+import org.cytoscape.model.CyNetworkTableManager;
+import org.cytoscape.model.CyNode;
+import org.cytoscape.model.CyTableFactory;
+import org.cytoscape.model.Identifiable;
+import org.cytoscape.model.NetworkTestSupport;
+import org.cytoscape.model.TableTestSupport;
+import org.cytoscape.model.subnetwork.CyRootNetworkFactory;
+import org.cytoscape.spacial.SpacialIndex2DFactory;
+import org.cytoscape.spacial.internal.rtree.RTreeFactory;
+import org.cytoscape.task.EdgeViewTaskFactory;
+import org.cytoscape.task.NetworkViewTaskFactory;
+import org.cytoscape.task.NodeViewTaskFactory;
+import org.cytoscape.view.model.AbstractCyNetworkViewTest;
+import org.cytoscape.view.model.VisualLexicon;
+import org.cytoscape.work.TaskManager;
+import org.cytoscape.work.undo.UndoSupport;
+import org.junit.Before;
+import org.mockito.*;
+
+public class DNetworkViewTest extends AbstractCyNetworkViewTest {
+
+
+ private CyTableFactory dataFactory;
+ private CyRootNetworkFactory cyRoot;
+ private SpacialIndex2DFactory spacialFactory;
+
+
+ @Mock
+ private UndoSupport undo;
+ @Mock
+ private VisualLexicon dingLexicon;
+ @Mock
+ private Map<NodeViewTaskFactory, Map> nodeViewTFs;
+ @Mock
+ private Map<EdgeViewTaskFactory, Map> edgeViewTFs;
+ @Mock
+ private Map<NetworkViewTaskFactory, Map> emptySpaceTFs;
+ @Mock
+ private Map<DropNodeViewTaskFactory, Map> dropNodeViewTFs;
+ @Mock
+ private Map<DropNetworkViewTaskFactory, Map> dropEmptySpaceTFs;
+ @Mock
+ private TaskManager manager;
+ @Mock
+ private CyEventHelper eventHelper;
+ @Mock
+ private CyNetworkTableManager tableMgr;
+
+ private final TableTestSupport tableSupport = new TableTestSupport();
+ private final NetworkTestSupport netSupport = new NetworkTestSupport();
+
+ @Before
+ public void setUp() throws Exception {
+ MockitoAnnotations.initMocks(this);
+
+
+ dataFactory = tableSupport.getTableFactory();
+ cyRoot = netSupport.getRootNetworkFactory();
+ spacialFactory = new RTreeFactory();
+
+ buildNetwork();
+ view = new DGraphView(network, dataFactory, cyRoot, undo,
spacialFactory, dingLexicon,
+ nodeViewTFs, edgeViewTFs, emptySpaceTFs,
dropNodeViewTFs,
+ dropEmptySpaceTFs, manager, eventHelper,
tableMgr);
+ }
+
+ @Override
+ public void buildNetwork() {
+ network = netSupport.getNetwork();
+
+ node1 = network.addNode();
+ node2 = network.addNode();
+ node3 = network.addNode();
+ node4 = network.addNode();
+ node5 = network.addNode();
+
+ List<CyNode> nl = new ArrayList<CyNode>();
+ nl.add(node1);
+ nl.add(node2);
+ nl.add(node3);
+ nl.add(node4);
+ nl.add(node5);
+
+ edge1 = network.addEdge(node1, node2, true);
+ edge2 = network.addEdge(node1, node3, true);
+ edge3 = network.addEdge(node1, node4, true);
+ edge4 = network.addEdge(node2, node3, true);
+ edge5 = network.addEdge(node1, node5, true);
+ edge6 = network.addEdge(node3, node4, true);
+ edge7 = network.addEdge(node4, node5, true);
+ edge8 = network.addEdge(node2, node5, true);
+
+ List<CyEdge> el = new ArrayList<CyEdge>();
+ el.add(edge1);
+ el.add(edge2);
+ el.add(edge3);
+ el.add(edge4);
+ el.add(edge5);
+ el.add(edge6);
+ el.add(edge7);
+ el.add(edge8);
+ }
+}
--
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.
