Author: kono
Date: 2011-08-17 13:31:56 -0700 (Wed, 17 Aug 2011)
New Revision: 26587
Modified:
core3/impl/trunk/core-task-impl/src/main/java/org/cytoscape/task/internal/quickstart/datasource/AbstractFilePreprocessor.java
core3/impl/trunk/core-task-impl/src/main/java/org/cytoscape/task/internal/quickstart/datasource/BioGridPreprocessor.java
core3/impl/trunk/core-task-impl/src/test/java/org/cytoscape/task/internal/quickstart/remote/BioGridPreprocessorTest.java
Log:
Test output will be created under target/testoutput directory.
Modified:
core3/impl/trunk/core-task-impl/src/main/java/org/cytoscape/task/internal/quickstart/datasource/AbstractFilePreprocessor.java
===================================================================
---
core3/impl/trunk/core-task-impl/src/main/java/org/cytoscape/task/internal/quickstart/datasource/AbstractFilePreprocessor.java
2011-08-17 17:07:41 UTC (rev 26586)
+++
core3/impl/trunk/core-task-impl/src/main/java/org/cytoscape/task/internal/quickstart/datasource/AbstractFilePreprocessor.java
2011-08-17 20:31:56 UTC (rev 26587)
@@ -40,7 +40,7 @@
throw new NullPointerException("Property is missing.");
this.dataFileDirectory = new File(config.getSettingLocation(),
INTERACTION_DIR_NAME);
- if (!dataFileDirectory.exists())
+ if (dataFileDirectory.exists() == false)
dataFileDirectory.mkdir();
this.sourceMap = new HashMap<String, URL>();
Modified:
core3/impl/trunk/core-task-impl/src/main/java/org/cytoscape/task/internal/quickstart/datasource/BioGridPreprocessor.java
===================================================================
---
core3/impl/trunk/core-task-impl/src/main/java/org/cytoscape/task/internal/quickstart/datasource/BioGridPreprocessor.java
2011-08-17 17:07:41 UTC (rev 26586)
+++
core3/impl/trunk/core-task-impl/src/main/java/org/cytoscape/task/internal/quickstart/datasource/BioGridPreprocessor.java
2011-08-17 20:31:56 UTC (rev 26587)
@@ -52,6 +52,9 @@
private boolean isUpToDate() throws IOException {
final File[] files = this.dataFileDirectory.listFiles();
+ if(files == null)
+ return false;
+
boolean up2date = false;
for (File file : files) {
Modified:
core3/impl/trunk/core-task-impl/src/test/java/org/cytoscape/task/internal/quickstart/remote/BioGridPreprocessorTest.java
===================================================================
---
core3/impl/trunk/core-task-impl/src/test/java/org/cytoscape/task/internal/quickstart/remote/BioGridPreprocessorTest.java
2011-08-17 17:07:41 UTC (rev 26586)
+++
core3/impl/trunk/core-task-impl/src/test/java/org/cytoscape/task/internal/quickstart/remote/BioGridPreprocessorTest.java
2011-08-17 20:31:56 UTC (rev 26587)
@@ -1,5 +1,6 @@
package org.cytoscape.task.internal.quickstart.remote;
+import static org.junit.Assert.*;
import static org.mockito.Mockito.when;
import java.io.File;
@@ -14,6 +15,7 @@
import org.mockito.Mock;
import org.mockito.MockitoAnnotations;
+
public class BioGridPreprocessorTest {
@Mock
@@ -27,7 +29,11 @@
MockitoAnnotations.initMocks(this);
when(properties.getProperties()).thenReturn(new Properties());
-
+ final File sampleDirectory = new File("target/testoutput");
+ boolean success = sampleDirectory.mkdir();
+
+ assertTrue(success);
+ when(config.getSettingLocation()).thenReturn(sampleDirectory);
}
@After
@@ -41,6 +47,7 @@
processor.setSource(file.toURI().toURL());
processor.processFile();
+
}
}
--
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.
