Author: mes
Date: 2010-10-25 10:00:05 -0700 (Mon, 25 Oct 2010)
New Revision: 22352
Modified:
core3/test-support/trunk/pom.xml
core3/test-support/trunk/src/main/java/org/cytoscape/test/support/NetworkTestSupport.java
Log:
updated to reflect model-api changes
Modified: core3/test-support/trunk/pom.xml
===================================================================
--- core3/test-support/trunk/pom.xml 2010-10-25 16:59:32 UTC (rev 22351)
+++ core3/test-support/trunk/pom.xml 2010-10-25 17:00:05 UTC (rev 22352)
@@ -85,5 +85,10 @@
<artifactId>viewmodel-impl</artifactId>
<version>1.0-SNAPSHOT</version>
</dependency>
+ <dependency>
+ <groupId>org.mockito</groupId>
+ <artifactId>mockito-all</artifactId>
+ <version>1.8.1</version>
+ </dependency>
</dependencies>
</project>
Modified:
core3/test-support/trunk/src/main/java/org/cytoscape/test/support/NetworkTestSupport.java
===================================================================
---
core3/test-support/trunk/src/main/java/org/cytoscape/test/support/NetworkTestSupport.java
2010-10-25 16:59:32 UTC (rev 22351)
+++
core3/test-support/trunk/src/main/java/org/cytoscape/test/support/NetworkTestSupport.java
2010-10-25 17:00:05 UTC (rev 22352)
@@ -6,22 +6,23 @@
import org.cytoscape.model.CyNetwork;
import org.cytoscape.model.CyNetworkFactory;
import org.cytoscape.model.CyTableFactory;
-import org.cytoscape.model.StubTableManager;
-import org.cytoscape.model.CyTableManager;
import org.cytoscape.model.internal.CyNetworkFactoryImpl;
import org.cytoscape.model.internal.CyTableFactoryImpl;
+import org.cytoscape.model.internal.CyTableManagerImpl;
+import static org.mockito.Mockito.*;
+
public class NetworkTestSupport {
protected CyNetworkFactory networkFactory;
protected CyEventHelper eventHelper;
- protected CyTableManager tableMgr;
+ protected CyTableManagerImpl tableMgr;
public NetworkTestSupport() {
eventHelper = new DummyCyEventHelper();
- tableMgr = new StubTableManager();
- CyTableFactory tableFactory = new
CyTableFactoryImpl(eventHelper);
+ tableMgr = mock(CyTableManagerImpl.class);
+ CyTableFactoryImpl tableFactory = new
CyTableFactoryImpl(eventHelper);
networkFactory = new CyNetworkFactoryImpl( eventHelper,
tableMgr, tableFactory );
}
--
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.
