Author: mes
Date: 2011-08-09 13:41:41 -0700 (Tue, 09 Aug 2011)
New Revision: 26497
Added:
core3/impl/trunk/model-impl/impl/src/test/java/org/cytoscape/model/NetworkTestSupport.java
Removed:
core3/support/trunk/test-support/src/main/java/org/cytoscape/test/support/NetworkTestSupport.java
Log:
reorganizing test-support
Copied:
core3/impl/trunk/model-impl/impl/src/test/java/org/cytoscape/model/NetworkTestSupport.java
(from rev 26496,
core3/support/trunk/test-support/src/main/java/org/cytoscape/test/support/NetworkTestSupport.java)
===================================================================
---
core3/impl/trunk/model-impl/impl/src/test/java/org/cytoscape/model/NetworkTestSupport.java
(rev 0)
+++
core3/impl/trunk/model-impl/impl/src/test/java/org/cytoscape/model/NetworkTestSupport.java
2011-08-09 20:41:41 UTC (rev 26497)
@@ -0,0 +1,40 @@
+
+package org.cytoscape.test.support;
+
+import org.cytoscape.equations.Interpreter;
+import org.cytoscape.event.CyEventHelper;
+import org.cytoscape.event.DummyCyEventHelper;
+import org.cytoscape.model.CyNetwork;
+import org.cytoscape.model.CyNetworkFactory;
+import org.cytoscape.model.CyTableFactory;
+
+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 CyTableManagerImpl tableMgr;
+
+ public NetworkTestSupport() {
+ eventHelper = new DummyCyEventHelper();
+ tableMgr = mock(CyTableManagerImpl.class);
+ CyTableFactoryImpl tableFactory = new
CyTableFactoryImpl(eventHelper,tableMgr, mock(Interpreter.class));
+
+ networkFactory = new CyNetworkFactoryImpl( eventHelper,
tableMgr, tableFactory );
+ }
+
+ public CyNetwork getNetwork() {
+ return networkFactory.getInstance();
+ }
+
+ public CyNetworkFactory getNetworkFactory() {
+ return networkFactory;
+ }
+}
+
+
Deleted:
core3/support/trunk/test-support/src/main/java/org/cytoscape/test/support/NetworkTestSupport.java
===================================================================
---
core3/support/trunk/test-support/src/main/java/org/cytoscape/test/support/NetworkTestSupport.java
2011-08-09 13:57:20 UTC (rev 26496)
+++
core3/support/trunk/test-support/src/main/java/org/cytoscape/test/support/NetworkTestSupport.java
2011-08-09 20:41:41 UTC (rev 26497)
@@ -1,40 +0,0 @@
-
-package org.cytoscape.test.support;
-
-import org.cytoscape.equations.Interpreter;
-import org.cytoscape.event.CyEventHelper;
-import org.cytoscape.event.DummyCyEventHelper;
-import org.cytoscape.model.CyNetwork;
-import org.cytoscape.model.CyNetworkFactory;
-import org.cytoscape.model.CyTableFactory;
-
-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 CyTableManagerImpl tableMgr;
-
- public NetworkTestSupport() {
- eventHelper = new DummyCyEventHelper();
- tableMgr = mock(CyTableManagerImpl.class);
- CyTableFactoryImpl tableFactory = new
CyTableFactoryImpl(eventHelper,tableMgr, mock(Interpreter.class));
-
- networkFactory = new CyNetworkFactoryImpl( eventHelper,
tableMgr, tableFactory );
- }
-
- public CyNetwork getNetwork() {
- return networkFactory.getInstance();
- }
-
- public CyNetworkFactory getNetworkFactory() {
- return networkFactory;
- }
-}
-
-
--
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.
