Author: rozagh
Date: 2012-08-20 10:04:19 -0700 (Mon, 20 Aug 2012)
New Revision: 30226
Modified:
core3/impl/trunk/core-task-impl/src/test/java/org/cytoscape/task/internal/table/MapTableToNetworkTableTaskTest.java
core3/impl/trunk/core-task-impl/src/test/java/org/cytoscape/task/internal/table/MappingIntegrationTest.java
core3/impl/trunk/core-task-impl/src/test/java/org/cytoscape/task/internal/table/UpdateAddedNetworkAttributeTaskTest.java
Log:
fixes for failing tests because of the changes made in Revision 30223
Modified:
core3/impl/trunk/core-task-impl/src/test/java/org/cytoscape/task/internal/table/MapTableToNetworkTableTaskTest.java
===================================================================
---
core3/impl/trunk/core-task-impl/src/test/java/org/cytoscape/task/internal/table/MapTableToNetworkTableTaskTest.java
2012-08-20 16:59:57 UTC (rev 30225)
+++
core3/impl/trunk/core-task-impl/src/test/java/org/cytoscape/task/internal/table/MapTableToNetworkTableTaskTest.java
2012-08-20 17:04:19 UTC (rev 30226)
@@ -20,6 +20,7 @@
import org.cytoscape.work.Task;
import org.cytoscape.work.TaskIterator;
import org.cytoscape.work.TaskMonitor;
+import org.cytoscape.work.TunableHandlerFactory;
import org.junit.Test;
import static org.mockito.Mockito.mock;
@@ -48,8 +49,8 @@
private static CyEventHelper eventHelper = new DummyCyEventHelper();
private static CyNetworkManagerImpl netMgr = new
CyNetworkManagerImpl(eventHelper);
private static SyncTunableMutator stm = new SyncTunableMutator();
- private static TunableSetterImpl ts = new TunableSetterImpl(stm, new
TunableRecorderManager());
- SyncTunableHandlerFactory syncTunableHandlerFactory = new
SyncTunableHandlerFactory();
+ private static SyncTunableHandlerFactory syncTunableHandlerFactory =
new SyncTunableHandlerFactory();
+ private static TunableSetterImpl ts =new TunableSetterImpl(new
SyncTunableMutatorFactory(syncTunableHandlerFactory), new
TunableRecorderManager()); // new TunableSetterImpl(stm, new
TunableRecorderManager());
Properties syncFactoryProp = new Properties();
@Test
Modified:
core3/impl/trunk/core-task-impl/src/test/java/org/cytoscape/task/internal/table/MappingIntegrationTest.java
===================================================================
---
core3/impl/trunk/core-task-impl/src/test/java/org/cytoscape/task/internal/table/MappingIntegrationTest.java
2012-08-20 16:59:57 UTC (rev 30225)
+++
core3/impl/trunk/core-task-impl/src/test/java/org/cytoscape/task/internal/table/MappingIntegrationTest.java
2012-08-20 17:04:19 UTC (rev 30226)
@@ -36,9 +36,11 @@
import org.cytoscape.work.Task;
import org.cytoscape.work.TaskIterator;
import org.cytoscape.work.TaskMonitor;
+import org.cytoscape.work.TunableHandlerFactory;
import org.cytoscape.work.internal.sync.SyncTaskManager;
import org.cytoscape.work.internal.sync.SyncTunableHandlerFactory;
import org.cytoscape.work.internal.sync.SyncTunableMutator;
+import org.cytoscape.work.internal.sync.SyncTunableMutatorFactory;
import org.cytoscape.work.internal.sync.TunableRecorderManager;
import org.cytoscape.work.internal.sync.TunableSetterImpl;
import org.cytoscape.work.undo.UndoSupport;
@@ -55,10 +57,11 @@
private CyEventHelper eventHelper = new DummyCyEventHelper();
private CyNetworkManagerImpl netMgr = new
CyNetworkManagerImpl(eventHelper);
private SyncTunableMutator stm = new SyncTunableMutator();
- private TunableSetterImpl ts = new TunableSetterImpl(stm, new
TunableRecorderManager());
+ SyncTunableHandlerFactory syncTunableHandlerFactory = new
SyncTunableHandlerFactory();
+
+ private TunableSetterImpl ts = new TunableSetterImpl(new
SyncTunableMutatorFactory(syncTunableHandlerFactory), new
TunableRecorderManager()); // new TunableSetterImpl(stm, new
TunableRecorderManager());
CyTableManager tabMgr = new CyTableManagerImpl(eventHelper, new
CyNetworkTableManagerImpl(), netMgr);
private UpdateAddedNetworkAttributes up = new
UpdateAddedNetworkAttributes(new MapGlobalToLocalTableTaskFactoryImpl(tabMgr,
netMgr, ts), new SyncTaskManager(stm));
- SyncTunableHandlerFactory syncTunableHandlerFactory = new
SyncTunableHandlerFactory();
Properties syncFactoryProp = new Properties();
@Test
Modified:
core3/impl/trunk/core-task-impl/src/test/java/org/cytoscape/task/internal/table/UpdateAddedNetworkAttributeTaskTest.java
===================================================================
---
core3/impl/trunk/core-task-impl/src/test/java/org/cytoscape/task/internal/table/UpdateAddedNetworkAttributeTaskTest.java
2012-08-20 16:59:57 UTC (rev 30225)
+++
core3/impl/trunk/core-task-impl/src/test/java/org/cytoscape/task/internal/table/UpdateAddedNetworkAttributeTaskTest.java
2012-08-20 17:04:19 UTC (rev 30226)
@@ -28,9 +28,11 @@
import org.cytoscape.work.Task;
import org.cytoscape.work.TaskIterator;
import org.cytoscape.work.TaskMonitor;
+import org.cytoscape.work.TunableHandlerFactory;
import org.cytoscape.work.internal.sync.SyncTaskManager;
import org.cytoscape.work.internal.sync.SyncTunableHandlerFactory;
import org.cytoscape.work.internal.sync.SyncTunableMutator;
+import org.cytoscape.work.internal.sync.SyncTunableMutatorFactory;
import org.cytoscape.work.internal.sync.TunableRecorderManager;
import org.cytoscape.work.internal.sync.TunableSetterImpl;
import org.junit.Before;
@@ -47,10 +49,10 @@
private CyEventHelper eventHelper = new DummyCyEventHelper();
private CyNetworkManagerImpl netMgr = new
CyNetworkManagerImpl(eventHelper);
private SyncTunableMutator stm = new SyncTunableMutator();
- private TunableSetterImpl ts = new TunableSetterImpl(stm, new
TunableRecorderManager());
+ SyncTunableHandlerFactory syncTunableHandlerFactory = new
SyncTunableHandlerFactory();
+ private TunableSetterImpl ts = new TunableSetterImpl(new
SyncTunableMutatorFactory(syncTunableHandlerFactory), new
TunableRecorderManager()); // new TunableSetterImpl(stm, new
TunableRecorderManager());
CyTableManager tabMgr = new CyTableManagerImpl(eventHelper, new
CyNetworkTableManagerImpl(), netMgr);
private UpdateAddedNetworkAttributes up = new
UpdateAddedNetworkAttributes(new MapGlobalToLocalTableTaskFactoryImpl(tabMgr,
netMgr, ts), new SyncTaskManager(stm));
- SyncTunableHandlerFactory syncTunableHandlerFactory = new
SyncTunableHandlerFactory();
Properties syncFactoryProp = new Properties();
@Test
--
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.
