Author: mes
Date: 2011-08-09 13:53:30 -0700 (Tue, 09 Aug 2011)
New Revision: 26499
Modified:
core3/impl/trunk/viewmodel-impl/impl/src/test/java/org/cytoscape/view/model/NetworkViewTestSupport.java
core3/impl/trunk/viewmodel-impl/pom.xml
Log:
updated network view test support to work from here
Modified:
core3/impl/trunk/viewmodel-impl/impl/src/test/java/org/cytoscape/view/model/NetworkViewTestSupport.java
===================================================================
---
core3/impl/trunk/viewmodel-impl/impl/src/test/java/org/cytoscape/view/model/NetworkViewTestSupport.java
2011-08-09 20:47:00 UTC (rev 26498)
+++
core3/impl/trunk/viewmodel-impl/impl/src/test/java/org/cytoscape/view/model/NetworkViewTestSupport.java
2011-08-09 20:53:30 UTC (rev 26499)
@@ -1,15 +1,19 @@
-package org.cytoscape.test.support;
+package org.cytoscape.view.model;
import java.util.Properties;
import org.cytoscape.property.BasicCyProperty;
import org.cytoscape.property.CyProperty;
import org.cytoscape.property.CyProperty.SavePolicy;
+import org.cytoscape.model.NetworkTestSupport;
import org.cytoscape.view.model.CyNetworkView;
import org.cytoscape.view.model.CyNetworkViewFactory;
import org.cytoscape.view.model.internal.NetworkViewFactoryImpl;
+import org.cytoscape.service.util.CyServiceRegistrar;
+import static org.mockito.Mockito.*;
+
public class NetworkViewTestSupport extends NetworkTestSupport {
protected CyNetworkViewFactory viewFactory;
@@ -19,7 +23,7 @@
}
public NetworkViewTestSupport(CyProperty<Properties> properties) {
- viewFactory = new NetworkViewFactoryImpl( eventHelper, new
StubServiceRegistrar(), properties );
+ viewFactory = new NetworkViewFactoryImpl( eventHelper,
mock(CyServiceRegistrar.class), properties );
}
public CyNetworkView getNetworkView() {
Modified: core3/impl/trunk/viewmodel-impl/pom.xml
===================================================================
--- core3/impl/trunk/viewmodel-impl/pom.xml 2011-08-09 20:47:00 UTC (rev
26498)
+++ core3/impl/trunk/viewmodel-impl/pom.xml 2011-08-09 20:53:30 UTC (rev
26499)
@@ -111,5 +111,12 @@
<type>test-jar</type>
<scope>test</scope>
</dependency>
+ <dependency>
+ <groupId>org.cytoscape</groupId>
+ <artifactId>model-impl</artifactId>
+ <version>${project.version}</version>
+ <scope>test</scope>
+ <type>test-jar</type>
+ </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.
