Author: kono
Date: 2012-03-22 11:49:25 -0700 (Thu, 22 Mar 2012)
New Revision: 28615
Modified:
core3/api/trunk/vizmap-api/src/test/java/org/cytoscape/view/vizmap/AbstractVisualStyleTest.java
core3/impl/trunk/ding-impl/ding-presentation-impl/src/test/java/org/cytoscape/ding/NetworkViewTestSupport.java
Log:
Some test cases had been fixed.
Modified:
core3/api/trunk/vizmap-api/src/test/java/org/cytoscape/view/vizmap/AbstractVisualStyleTest.java
===================================================================
---
core3/api/trunk/vizmap-api/src/test/java/org/cytoscape/view/vizmap/AbstractVisualStyleTest.java
2012-03-22 16:07:37 UTC (rev 28614)
+++
core3/api/trunk/vizmap-api/src/test/java/org/cytoscape/view/vizmap/AbstractVisualStyleTest.java
2012-03-22 18:49:25 UTC (rev 28615)
@@ -106,10 +106,10 @@
style.setDefaultValue(BasicVisualLexicon.NODE_FILL_COLOR,
Color.YELLOW);
// FIXME!
-// style.apply(nodeView3);
-// assertEquals(RED1,
nodeView1.getVisualProperty(BasicVisualLexicon.NODE_FILL_COLOR));
-// assertEquals(RED1,
nodeView2.getVisualProperty(BasicVisualLexicon.NODE_FILL_COLOR));
-// assertEquals(Color.YELLOW,
nodeView3.getVisualProperty(BasicVisualLexicon.NODE_FILL_COLOR));
+ style.apply(nodeView3);
+ assertEquals(RED1,
nodeView1.getVisualProperty(BasicVisualLexicon.NODE_FILL_COLOR));
+ assertEquals(RED1,
nodeView2.getVisualProperty(BasicVisualLexicon.NODE_FILL_COLOR));
+ assertEquals(Color.YELLOW,
nodeView3.getVisualProperty(BasicVisualLexicon.NODE_FILL_COLOR));
}
}
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
2012-03-22 16:07:37 UTC (rev 28614)
+++
core3/impl/trunk/ding-impl/ding-presentation-impl/src/test/java/org/cytoscape/ding/NetworkViewTestSupport.java
2012-03-22 18:49:25 UTC (rev 28615)
@@ -3,12 +3,11 @@
import static org.mockito.Mockito.mock;
-import org.cytoscape.ding.impl.cyannotator.create.AnnotationFactoryManager;
import org.cytoscape.ding.customgraphics.CustomGraphicsManager;
import org.cytoscape.ding.impl.DingViewModelFactory;
import org.cytoscape.ding.impl.ViewTaskFactoryListener;
+import org.cytoscape.ding.impl.cyannotator.create.AnnotationFactoryManager;
import org.cytoscape.event.CyEventHelper;
-import org.cytoscape.model.CyNetworkTableManager;
import org.cytoscape.model.NetworkTestSupport;
import org.cytoscape.model.TableTestSupport;
import org.cytoscape.service.util.CyServiceRegistrar;
@@ -24,21 +23,21 @@
protected CyNetworkViewFactory viewFactory;
public NetworkViewTestSupport() {
+ super();
DVisualLexicon dVisualLexicon = new
DVisualLexicon(mock(CustomGraphicsManager.class));
- NetworkTestSupport networkTestSupport = new
NetworkTestSupport();
TableTestSupport tableTestSupport = new TableTestSupport();
viewFactory = new
DingViewModelFactory(tableTestSupport.getTableFactory(),
-
networkTestSupport.getRootNetworkFactory(),
+ getRootNetworkFactory(),
mock(UndoSupport.class),
new RTreeFactory(),
dVisualLexicon,
mock(DialogTaskManager.class),
mock(SubmenuTaskManager.class),
mock(CyServiceRegistrar.class),
-
mock(CyNetworkTableManager.class),
+ networkTableMgr,
mock(CyEventHelper.class),
mock(ViewTaskFactoryListener.class),
mock(AnnotationFactoryManager.class));
--
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.
