Author: kono
Date: 2011-07-13 15:36:34 -0700 (Wed, 13 Jul 2011)
New Revision: 26174
Added:
core3/core-task-impl/trunk/src/test/java/org/cytoscape/task/internal/exportgraphics/
core3/core-task-impl/trunk/src/test/java/org/cytoscape/task/internal/exportgraphics/ExportNetworkImageTaskFactoryTest.java
Modified:
core3/core-task-impl/trunk/src/main/java/org/cytoscape/task/internal/exportgraphics/ExportNetworkImageTaskFactory.java
core3/core-task-impl/trunk/src/test/java/org/cytoscape/task/internal/io/ViewWriterTest.java
Log:
fixes #18 tests for exportgraphics package had been added.
Modified:
core3/core-task-impl/trunk/src/main/java/org/cytoscape/task/internal/exportgraphics/ExportNetworkImageTaskFactory.java
===================================================================
---
core3/core-task-impl/trunk/src/main/java/org/cytoscape/task/internal/exportgraphics/ExportNetworkImageTaskFactory.java
2011-07-13 22:33:40 UTC (rev 26173)
+++
core3/core-task-impl/trunk/src/main/java/org/cytoscape/task/internal/exportgraphics/ExportNetworkImageTaskFactory.java
2011-07-13 22:36:34 UTC (rev 26174)
@@ -37,15 +37,16 @@
public class ExportNetworkImageTaskFactory extends
AbstractNetworkViewTaskFactory {
- private final PresentationWriterManager viewWriterMgr;
+
+ private final PresentationWriterManager presentationWriterMgr;
private final CyApplicationManager applicationManager;
- public ExportNetworkImageTaskFactory(PresentationWriterManager
viewWriterMgr, CyApplicationManager applicationManager) {
- this.viewWriterMgr = viewWriterMgr;
+ public ExportNetworkImageTaskFactory(final PresentationWriterManager
presentationWriterMgr, final CyApplicationManager applicationManager) {
+ this.presentationWriterMgr = presentationWriterMgr;
this.applicationManager = applicationManager;
}
public TaskIterator getTaskIterator() {
- return new TaskIterator( new ViewWriter( viewWriterMgr, view,
applicationManager.getCurrentRenderingEngine() ) );
+ return new TaskIterator( new ViewWriter( presentationWriterMgr,
view, applicationManager.getCurrentRenderingEngine() ) );
}
}
Added:
core3/core-task-impl/trunk/src/test/java/org/cytoscape/task/internal/exportgraphics/ExportNetworkImageTaskFactoryTest.java
===================================================================
---
core3/core-task-impl/trunk/src/test/java/org/cytoscape/task/internal/exportgraphics/ExportNetworkImageTaskFactoryTest.java
(rev 0)
+++
core3/core-task-impl/trunk/src/test/java/org/cytoscape/task/internal/exportgraphics/ExportNetworkImageTaskFactoryTest.java
2011-07-13 22:36:34 UTC (rev 26174)
@@ -0,0 +1,57 @@
+package org.cytoscape.task.internal.exportgraphics;
+
+
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.when;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import org.cytoscape.io.CyFileFilter;
+import org.cytoscape.io.write.PresentationWriterManager;
+import org.cytoscape.session.CyApplicationManager;
+import org.cytoscape.task.internal.io.ViewWriter;
+import org.cytoscape.view.model.CyNetworkView;
+import org.cytoscape.view.presentation.RenderingEngine;
+import org.cytoscape.work.Task;
+import org.cytoscape.work.TaskIterator;
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Test;
+
+public class ExportNetworkImageTaskFactoryTest {
+
+ private final PresentationWriterManager viewWriterMgr =
mock(PresentationWriterManager.class);
+ private final CyApplicationManager applicationManager =
mock(CyApplicationManager.class);
+
+ @Before
+ public void setUp() throws Exception {
+ final List<CyFileFilter> filters = new
ArrayList<CyFileFilter>();
+ final CyFileFilter dummyFilter = mock(CyFileFilter.class);
+ filters.add(dummyFilter);
+
when(viewWriterMgr.getAvailableWriterFilters()).thenReturn(filters);
+ final RenderingEngine engine = mock(RenderingEngine.class);
+
when(applicationManager.getCurrentRenderingEngine()).thenReturn(engine);
+ }
+
+ @After
+ public void tearDown() throws Exception {
+ }
+
+ @Test
+ public void testExportNetworkImageTaskFactory() throws Exception {
+ final ExportNetworkImageTaskFactory factory = new
ExportNetworkImageTaskFactory(viewWriterMgr, applicationManager);
+ final CyNetworkView view = mock(CyNetworkView.class);
+ factory.setNetworkView(view);
+
+ final TaskIterator itr = factory.getTaskIterator();
+
+ assertNotNull(itr);
+ assertTrue(itr.hasNext());
+ final Task task = itr.next();
+ assertTrue(task instanceof ViewWriter);
+ }
+
+}
Modified:
core3/core-task-impl/trunk/src/test/java/org/cytoscape/task/internal/io/ViewWriterTest.java
===================================================================
---
core3/core-task-impl/trunk/src/test/java/org/cytoscape/task/internal/io/ViewWriterTest.java
2011-07-13 22:33:40 UTC (rev 26173)
+++
core3/core-task-impl/trunk/src/test/java/org/cytoscape/task/internal/io/ViewWriterTest.java
2011-07-13 22:36:34 UTC (rev 26174)
@@ -1,22 +1,23 @@
package org.cytoscape.task.internal.io;
+import static org.mockito.Matchers.argThat;
+import static org.mockito.Matchers.eq;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.when;
+
import java.io.File;
import java.util.ArrayList;
import java.util.List;
-import org.cytoscape.view.presentation.RenderingEngine;
import org.cytoscape.io.CyFileFilter;
import org.cytoscape.io.write.AbstractCyWriterTest;
import org.cytoscape.io.write.CyWriter;
import org.cytoscape.io.write.PresentationWriterManager;
import org.cytoscape.view.model.View;
-import org.cytoscape.work.util.ListSingleSelection;
-
+import org.cytoscape.view.presentation.RenderingEngine;
import org.junit.Before;
-
import org.mockito.ArgumentMatcher;
-import static org.mockito.Mockito.*;
public class ViewWriterTest extends AbstractCyWriterTest {
--
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.
