Author: kono
Date: 2011-07-18 17:05:51 -0700 (Mon, 18 Jul 2011)
New Revision: 26206
Modified:
core3/core-task-impl/trunk/src/main/java/org/cytoscape/task/internal/loaddatatable/AbstractLoadAttributesTask.java
core3/core-task-impl/trunk/src/main/java/org/cytoscape/task/internal/loaddatatable/LoadAttributesFileTask.java
core3/core-task-impl/trunk/src/main/java/org/cytoscape/task/internal/loaddatatable/LoadAttributesURLTask.java
core3/core-task-impl/trunk/src/test/java/org/cytoscape/task/internal/loaddatatable/LoadAttributesFileTaskFactoryImplTest.java
core3/core-task-impl/trunk/src/test/java/org/cytoscape/task/internal/loaddatatable/LoadAttributesURLTaskFactoryImplTest.java
Log:
fixes #22 Test cases had been modified for loaddatatable package.
Modified:
core3/core-task-impl/trunk/src/main/java/org/cytoscape/task/internal/loaddatatable/AbstractLoadAttributesTask.java
===================================================================
---
core3/core-task-impl/trunk/src/main/java/org/cytoscape/task/internal/loaddatatable/AbstractLoadAttributesTask.java
2011-07-18 23:10:54 UTC (rev 26205)
+++
core3/core-task-impl/trunk/src/main/java/org/cytoscape/task/internal/loaddatatable/AbstractLoadAttributesTask.java
2011-07-19 00:05:51 UTC (rev 26206)
@@ -2,15 +2,12 @@
import java.net.URI;
-import org.cytoscape.model.CyTable;
-import org.cytoscape.model.CyTableManager;
-import org.cytoscape.io.read.CyTableReaderManager;
+
import org.cytoscape.io.read.CyTableReader;
+import org.cytoscape.io.read.CyTableReaderManager;
+import org.cytoscape.model.CyTableManager;
import org.cytoscape.work.AbstractTask;
import org.cytoscape.work.TaskMonitor;
-import org.cytoscape.work.Tunable;
-import java.util.Set;
-import java.util.Iterator;
abstract class AbstractLoadAttributesTask extends AbstractTask {
Modified:
core3/core-task-impl/trunk/src/main/java/org/cytoscape/task/internal/loaddatatable/LoadAttributesFileTask.java
===================================================================
---
core3/core-task-impl/trunk/src/main/java/org/cytoscape/task/internal/loaddatatable/LoadAttributesFileTask.java
2011-07-18 23:10:54 UTC (rev 26205)
+++
core3/core-task-impl/trunk/src/main/java/org/cytoscape/task/internal/loaddatatable/LoadAttributesFileTask.java
2011-07-19 00:05:51 UTC (rev 26206)
@@ -2,15 +2,11 @@
import java.io.File;
-import org.cytoscape.model.CyTable;
-import org.cytoscape.model.CyTableManager;
+
import org.cytoscape.io.read.CyTableReaderManager;
-import org.cytoscape.io.read.CyTableReader;
-import org.cytoscape.work.AbstractTask;
+import org.cytoscape.model.CyTableManager;
import org.cytoscape.work.TaskMonitor;
import org.cytoscape.work.Tunable;
-import java.util.Set;
-import java.util.Iterator;
public class LoadAttributesFileTask extends AbstractLoadAttributesTask {
Modified:
core3/core-task-impl/trunk/src/main/java/org/cytoscape/task/internal/loaddatatable/LoadAttributesURLTask.java
===================================================================
---
core3/core-task-impl/trunk/src/main/java/org/cytoscape/task/internal/loaddatatable/LoadAttributesURLTask.java
2011-07-18 23:10:54 UTC (rev 26205)
+++
core3/core-task-impl/trunk/src/main/java/org/cytoscape/task/internal/loaddatatable/LoadAttributesURLTask.java
2011-07-19 00:05:51 UTC (rev 26206)
@@ -2,15 +2,11 @@
import java.net.URL;
-import org.cytoscape.model.CyTable;
-import org.cytoscape.model.CyTableManager;
+
import org.cytoscape.io.read.CyTableReaderManager;
-import org.cytoscape.io.read.CyTableReader;
-import org.cytoscape.work.AbstractTask;
+import org.cytoscape.model.CyTableManager;
import org.cytoscape.work.TaskMonitor;
import org.cytoscape.work.Tunable;
-import java.util.Set;
-import java.util.Iterator;
public class LoadAttributesURLTask extends AbstractLoadAttributesTask {
Modified:
core3/core-task-impl/trunk/src/test/java/org/cytoscape/task/internal/loaddatatable/LoadAttributesFileTaskFactoryImplTest.java
===================================================================
---
core3/core-task-impl/trunk/src/test/java/org/cytoscape/task/internal/loaddatatable/LoadAttributesFileTaskFactoryImplTest.java
2011-07-18 23:10:54 UTC (rev 26205)
+++
core3/core-task-impl/trunk/src/test/java/org/cytoscape/task/internal/loaddatatable/LoadAttributesFileTaskFactoryImplTest.java
2011-07-19 00:05:51 UTC (rev 26206)
@@ -2,27 +2,51 @@
import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertTrue;
-import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.*;
+
+import java.io.File;
+
import org.cytoscape.io.read.CyTableReaderManager;
import org.cytoscape.model.CyTableManager;
import org.cytoscape.work.Task;
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 LoadAttributesFileTaskFactoryImplTest {
- @Test
- public void testRun() throws Exception {
+
+ @Mock
+ CyTableReaderManager rmgr;
+
+ @Mock
+ CyTableManager tmgr;
+
+ @Mock
+ TaskMonitor tm;
+
+ @Before
+ public void initMocks() {
+ MockitoAnnotations.initMocks(this);
- CyTableReaderManager rmgr = mock(CyTableReaderManager.class);;
- CyTableManager tmgr = mock(CyTableManager.class);;
+ }
- LoadAttributesFileTaskFactoryImpl factory = new
LoadAttributesFileTaskFactoryImpl(rmgr, tmgr);
-
+ @Test(expected = NullPointerException.class)
+ public void testLoadAttributesFileTaskFactory() throws Exception {
+
+ final LoadAttributesFileTaskFactoryImpl factory = new
LoadAttributesFileTaskFactoryImpl(rmgr, tmgr);
TaskIterator ti = factory.getTaskIterator();
assertNotNull(ti);
+
+ assertTrue(ti.hasNext());
+ Task t = ti.next();
+ assertNotNull(t);
+
+ ((LoadAttributesFileTask) t).file = new
File("./src/test/resources/empty.txt");
- assertTrue( ti.hasNext() );
- Task t = ti.next();
- assertNotNull( t );
+ // This throws NPE, but it;s normal.
+ t.run(tm);
}
}
Modified:
core3/core-task-impl/trunk/src/test/java/org/cytoscape/task/internal/loaddatatable/LoadAttributesURLTaskFactoryImplTest.java
===================================================================
---
core3/core-task-impl/trunk/src/test/java/org/cytoscape/task/internal/loaddatatable/LoadAttributesURLTaskFactoryImplTest.java
2011-07-18 23:10:54 UTC (rev 26205)
+++
core3/core-task-impl/trunk/src/test/java/org/cytoscape/task/internal/loaddatatable/LoadAttributesURLTaskFactoryImplTest.java
2011-07-19 00:05:51 UTC (rev 26206)
@@ -2,27 +2,49 @@
import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertTrue;
-import static org.mockito.Mockito.mock;
+
+import java.net.URL;
+
import org.cytoscape.io.read.CyTableReaderManager;
import org.cytoscape.model.CyTableManager;
import org.cytoscape.work.Task;
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 LoadAttributesURLTaskFactoryImplTest {
- @Test
- public void testRun() throws Exception {
+
+ @Mock
+ private CyTableReaderManager rmgr;
+
+ @Mock
+ private CyTableManager tmgr;
+
+ @Mock
+ private TaskMonitor tm;
+
+ @Before
+ public void initMocks() {
+ MockitoAnnotations.initMocks(this);
- CyTableReaderManager rmgr = mock(CyTableReaderManager.class);;
- CyTableManager tmgr = mock(CyTableManager.class);;
+ }
+
+ @Test(expected = NullPointerException.class)
+ public void testLoadAttributesURLTaskFactory() throws Exception {
- LoadAttributesURLTaskFactoryImpl factory = new
LoadAttributesURLTaskFactoryImpl(rmgr, tmgr);
+ final LoadAttributesURLTaskFactoryImpl factory = new
LoadAttributesURLTaskFactoryImpl(rmgr, tmgr);
- TaskIterator ti = factory.getTaskIterator();
+ final TaskIterator ti = factory.getTaskIterator();
assertNotNull(ti);
assertTrue( ti.hasNext() );
Task t = ti.next();
- assertNotNull( t );
+ assertNotNull( t );
+
+ ((LoadAttributesURLTask)t).url = new
URL("http://chianti.ucsd.edu/kono/data/galFiltered.sif";);
+ t.run(tm);
}
}
--
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.
