Author: kono
Date: 2011-07-19 16:49:56 -0700 (Tue, 19 Jul 2011)
New Revision: 26221
Added:
core3/core-task-impl/trunk/src/test/java/org/cytoscape/task/internal/session/OpenSessionTaskTest.java
core3/core-task-impl/trunk/src/test/java/org/cytoscape/task/internal/session/SaveSessionAsTaskTest.java
core3/core-task-impl/trunk/src/test/java/org/cytoscape/task/internal/session/SaveSessionTaskTest.java
core3/core-task-impl/trunk/src/test/resources/test_session1.cys
Modified:
core3/core-task-impl/trunk/src/main/java/org/cytoscape/task/internal/zoom/AbstractZoomTask.java
core3/core-task-impl/trunk/src/test/java/org/cytoscape/task/internal/session/NewSessionTaskTest.java
Log:
fixes #20 tests had been added for .session package.
Modified:
core3/core-task-impl/trunk/src/main/java/org/cytoscape/task/internal/zoom/AbstractZoomTask.java
===================================================================
---
core3/core-task-impl/trunk/src/main/java/org/cytoscape/task/internal/zoom/AbstractZoomTask.java
2011-07-19 23:43:49 UTC (rev 26220)
+++
core3/core-task-impl/trunk/src/main/java/org/cytoscape/task/internal/zoom/AbstractZoomTask.java
2011-07-19 23:49:56 UTC (rev 26221)
@@ -48,6 +48,8 @@
this.factor = factor;
}
+
+ @Override
public void run(TaskMonitor tm) {
final double oldFactor =
view.getVisualProperty(NETWORK_SCALE_FACTOR).doubleValue();
view.setVisualProperty(NETWORK_SCALE_FACTOR, oldFactor *
factor);
Modified:
core3/core-task-impl/trunk/src/test/java/org/cytoscape/task/internal/session/NewSessionTaskTest.java
===================================================================
---
core3/core-task-impl/trunk/src/test/java/org/cytoscape/task/internal/session/NewSessionTaskTest.java
2011-07-19 23:43:49 UTC (rev 26220)
+++
core3/core-task-impl/trunk/src/test/java/org/cytoscape/task/internal/session/NewSessionTaskTest.java
2011-07-19 23:49:56 UTC (rev 26221)
@@ -1,23 +1,30 @@
package org.cytoscape.task.internal.session;
-import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.times;
import static org.mockito.Mockito.verify;
+
import org.cytoscape.session.CySessionManager;
import org.cytoscape.work.TaskMonitor;
+import org.junit.Before;
import org.junit.Test;
+import org.mockito.Mock;
+import org.mockito.MockitoAnnotations;
public class NewSessionTaskTest {
+ @Mock private TaskMonitor tm;
+ @Mock private CySessionManager mgr;
+
+ @Before
+ public void initMocks() {
+ MockitoAnnotations.initMocks(this);
+ }
+
@Test
public void testRun() throws Exception {
- TaskMonitor tm = mock(TaskMonitor.class);
- CySessionManager mgr = mock(CySessionManager.class);;
+ final NewSessionTask t = new NewSessionTask(mgr);
- NewSessionTask t = new NewSessionTask(mgr);
-
t.run(tm);
-
verify(mgr, times(1)).setCurrentSession(null, null);
}
}
Added:
core3/core-task-impl/trunk/src/test/java/org/cytoscape/task/internal/session/OpenSessionTaskTest.java
===================================================================
---
core3/core-task-impl/trunk/src/test/java/org/cytoscape/task/internal/session/OpenSessionTaskTest.java
(rev 0)
+++
core3/core-task-impl/trunk/src/test/java/org/cytoscape/task/internal/session/OpenSessionTaskTest.java
2011-07-19 23:49:56 UTC (rev 26221)
@@ -0,0 +1,51 @@
+package org.cytoscape.task.internal.session;
+
+import static org.mockito.Mockito.times;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
+
+import java.io.File;
+
+import org.cytoscape.io.read.CySessionReader;
+import org.cytoscape.io.read.CySessionReaderManager;
+import org.cytoscape.io.util.RecentlyOpenedTracker;
+import org.cytoscape.session.CyApplicationManager;
+import org.cytoscape.session.CySessionManager;
+import org.cytoscape.work.TaskIterator;
+import org.cytoscape.work.TaskMonitor;
+import org.junit.Before;
+import org.junit.Test;
+import org.mockito.Mock;
+import org.mockito.MockitoAnnotations;
+
+public class OpenSessionTaskTest {
+
+ @Mock private TaskMonitor tm;
+ @Mock private CySessionManager mgr;
+ @Mock private CySessionReaderManager readerManager;
+ @Mock private CyApplicationManager appManager;
+ @Mock private RecentlyOpenedTracker tracker;
+
+ @Mock private CySessionReader reader;
+
+ private File sampleFile;
+
+ @Before
+ public void initMocks() {
+ MockitoAnnotations.initMocks(this);
+ sampleFile = new File("./src/test/resources/test_session1.cys");
+
when(readerManager.getReader(sampleFile.toURI(),sampleFile.getName())).thenReturn(reader);
+ }
+
+ @Test
+ public void testRun() throws Exception {
+ final OpenSessionTask t = new OpenSessionTask(mgr,
readerManager, appManager, tracker);
+ t.setTaskIterator(new TaskIterator(t));
+
+ t.file = sampleFile;
+
+ t.run(tm);
+ verify(reader, times(1)).run(tm);
+ }
+
+}
Added:
core3/core-task-impl/trunk/src/test/java/org/cytoscape/task/internal/session/SaveSessionAsTaskTest.java
===================================================================
---
core3/core-task-impl/trunk/src/test/java/org/cytoscape/task/internal/session/SaveSessionAsTaskTest.java
(rev 0)
+++
core3/core-task-impl/trunk/src/test/java/org/cytoscape/task/internal/session/SaveSessionAsTaskTest.java
2011-07-19 23:49:56 UTC (rev 26221)
@@ -0,0 +1,36 @@
+package org.cytoscape.task.internal.session;
+
+import org.cytoscape.io.write.CySessionWriterManager;
+import org.cytoscape.session.CySessionManager;
+import org.cytoscape.work.TaskIterator;
+import org.cytoscape.work.TaskMonitor;
+import org.junit.Before;
+import org.junit.Test;
+import org.mockito.Mock;
+import org.mockito.MockitoAnnotations;
+
+import static org.mockito.Mockito.times;
+import static org.mockito.Mockito.verify;
+
+public class SaveSessionAsTaskTest {
+
+ @Mock private TaskMonitor tm;
+ @Mock private CySessionManager mgr;
+ @Mock private CySessionWriterManager writerMgr;
+
+
+ @Before
+ public void initMocks() {
+ MockitoAnnotations.initMocks(this);
+ }
+
+
+ @Test(expected=NullPointerException.class)
+ public void testSaveSessionAsTask() throws Exception {
+ final SaveSessionAsTask t = new SaveSessionAsTask(writerMgr,
mgr);
+ t.setTaskIterator(new TaskIterator(t));
+
+ t.run(tm);
+ verify(mgr, times(1)).getCurrentSession();
+ }
+}
Added:
core3/core-task-impl/trunk/src/test/java/org/cytoscape/task/internal/session/SaveSessionTaskTest.java
===================================================================
---
core3/core-task-impl/trunk/src/test/java/org/cytoscape/task/internal/session/SaveSessionTaskTest.java
(rev 0)
+++
core3/core-task-impl/trunk/src/test/java/org/cytoscape/task/internal/session/SaveSessionTaskTest.java
2011-07-19 23:49:56 UTC (rev 26221)
@@ -0,0 +1,35 @@
+package org.cytoscape.task.internal.session;
+
+import org.cytoscape.io.write.CySessionWriterManager;
+import org.cytoscape.session.CySessionManager;
+import org.cytoscape.work.TaskIterator;
+import org.cytoscape.work.TaskMonitor;
+import org.junit.Before;
+import org.junit.Test;
+import org.mockito.Mock;
+import org.mockito.MockitoAnnotations;
+
+
+public class SaveSessionTaskTest {
+
+ @Mock private TaskMonitor tm;
+ @Mock private CySessionManager mgr;
+ @Mock private CySessionWriterManager writerMgr;
+
+
+ @Before
+ public void initMocks() {
+ MockitoAnnotations.initMocks(this);
+ }
+
+
+ @Test(expected=NullPointerException.class)
+ public void testSaveSessionTask() throws Exception {
+ final SaveSessionTask t = new SaveSessionTask(writerMgr, mgr);
+ t.setTaskIterator(new TaskIterator(t));
+
+ t.run(tm);
+ // TODO: how can we test classes with generated code (cannot
mock them!)
+// verify(reader, times(1)).run(tm);
+ }
+}
Added: core3/core-task-impl/trunk/src/test/resources/test_session1.cys
===================================================================
(Binary files differ)
Property changes on:
core3/core-task-impl/trunk/src/test/resources/test_session1.cys
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
--
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.
