Author: kono
Date: 2011-07-14 17:21:38 -0700 (Thu, 14 Jul 2011)
New Revision: 26188

Added:
   core3/core-task-impl/trunk/src/test/java/org/cytoscape/task/internal/export/
   
core3/core-task-impl/trunk/src/test/java/org/cytoscape/task/internal/export/graphics/
   
core3/core-task-impl/trunk/src/test/java/org/cytoscape/task/internal/export/graphics/ExportNetworkImageTaskFactoryTest.java
   
core3/core-task-impl/trunk/src/test/java/org/cytoscape/task/internal/export/network/
   
core3/core-task-impl/trunk/src/test/java/org/cytoscape/task/internal/export/network/CyNetworkViewWriterTest.java
Removed:
   
core3/core-task-impl/trunk/src/test/java/org/cytoscape/task/internal/exportgraphics/ExportNetworkImageTaskFactoryTest.java
Log:
fixes #19 tests for *.export.network package had been added.

Copied: 
core3/core-task-impl/trunk/src/test/java/org/cytoscape/task/internal/export/graphics/ExportNetworkImageTaskFactoryTest.java
 (from rev 26185, 
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/export/graphics/ExportNetworkImageTaskFactoryTest.java
                         (rev 0)
+++ 
core3/core-task-impl/trunk/src/test/java/org/cytoscape/task/internal/export/graphics/ExportNetworkImageTaskFactoryTest.java
 2011-07-15 00:21:38 UTC (rev 26188)
@@ -0,0 +1,58 @@
+package org.cytoscape.task.internal.export.graphics;
+
+
+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.export.ViewWriter;
+import 
org.cytoscape.task.internal.export.graphics.ExportNetworkImageTaskFactory;
+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);
+       }
+
+}

Added: 
core3/core-task-impl/trunk/src/test/java/org/cytoscape/task/internal/export/network/CyNetworkViewWriterTest.java
===================================================================
--- 
core3/core-task-impl/trunk/src/test/java/org/cytoscape/task/internal/export/network/CyNetworkViewWriterTest.java
                            (rev 0)
+++ 
core3/core-task-impl/trunk/src/test/java/org/cytoscape/task/internal/export/network/CyNetworkViewWriterTest.java
    2011-07-15 00:21:38 UTC (rev 26188)
@@ -0,0 +1,52 @@
+package org.cytoscape.task.internal.export.network;
+
+
+import static org.mockito.Matchers.any;
+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.io.CyFileFilter;
+import org.cytoscape.io.write.AbstractCyWriterTest;
+import org.cytoscape.io.write.CyNetworkViewWriterManager;
+import org.cytoscape.test.support.NetworkViewTestSupport;
+import org.cytoscape.view.model.CyNetworkView;
+import org.junit.Before;
+import org.junit.Test;
+
+public class CyNetworkViewWriterTest extends AbstractCyWriterTest {
+       
+       private final NetworkViewTestSupport viewSupport = new 
NetworkViewTestSupport();
+       
+       private CyNetworkViewWriterManager writerManager;
+       private CyNetworkView view;
+
+       @Before
+       public void setUp() throws Exception {
+               writerManager = mock(CyNetworkViewWriterManager.class);
+               view = viewSupport.getNetworkView();
+               
+               final List<CyFileFilter> filters = new 
ArrayList<CyFileFilter>();
+               final CyFileFilter dummyFilter = mock(CyFileFilter.class);
+               filters.add(dummyFilter);
+               
when(writerManager.getAvailableWriterFilters()).thenReturn(filters);
+               
+               
+               
+               final CyNetworkViewWriter writer = new 
CyNetworkViewWriter(writerManager, view);
+               this.cyWriter = writer;
+               
+               when(writerManager.getWriter(eq(view), eq(dummyFilter), 
any(File.class))).thenReturn(writer, writer);
+               
+       }
+       
+       @Test
+       @Override
+       public void testGetWriter() throws Exception {
+               // TODO: What should be tested?
+       }
+}

Deleted: 
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
  2011-07-14 23:32:45 UTC (rev 26187)
+++ 
core3/core-task-impl/trunk/src/test/java/org/cytoscape/task/internal/exportgraphics/ExportNetworkImageTaskFactoryTest.java
  2011-07-15 00:21:38 UTC (rev 26188)
@@ -1,58 +0,0 @@
-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.export.ViewWriter;
-import 
org.cytoscape.task.internal.export.graphics.ExportNetworkImageTaskFactory;
-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);
-       }
-
-}

-- 
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.

Reply via email to