Author: mes
Date: 2010-07-30 12:31:07 -0700 (Fri, 30 Jul 2010)
New Revision: 21096
Added:
cytoscape/trunk/src/test/resources/
cytoscape/trunk/src/test/resources/testData/
Removed:
cytoscape/trunk/src/main/resources/testData/
Modified:
cytoscape/trunk/src/test/java/cytoscape/plugin/PluginFileReaderTest.java
cytoscape/trunk/src/test/java/cytoscape/plugin/PluginManagerTest.java
cytoscape/trunk/src/test/java/cytoscape/plugin/PluginPropertiesTest.java
cytoscape/trunk/src/test/java/cytoscape/plugin/PluginTestXML.java
cytoscape/trunk/src/test/java/cytoscape/plugin/PluginTrackerTest.java
cytoscape/trunk/src/test/java/cytoscape/visual/EdgeAppearanceCalculatorTest.java
cytoscape/trunk/src/test/java/cytoscape/visual/NodeAppearanceCalculatorTest.java
cytoscape/trunk/src/test/java/cytoscape/visual/VisualMappingManagerTest.java
Log:
moved testData into proper subdir
Modified:
cytoscape/trunk/src/test/java/cytoscape/plugin/PluginFileReaderTest.java
===================================================================
--- cytoscape/trunk/src/test/java/cytoscape/plugin/PluginFileReaderTest.java
2010-07-30 19:26:33 UTC (rev 21095)
+++ cytoscape/trunk/src/test/java/cytoscape/plugin/PluginFileReaderTest.java
2010-07-30 19:31:07 UTC (rev 21096)
@@ -35,7 +35,7 @@
String FS = "/";
String UserDir = System.getProperty("user.dir");
UserDir = UserDir.replaceFirst(FS, "");
- return "file:///" + UserDir + FS + "src" + FS + "main" + FS +
"resources" + FS + "testData" + FS + "plugins" + FS;
+ return "file:///" + UserDir + FS + "src" + FS + "test" + FS +
"resources" + FS + "testData" + FS + "plugins" + FS;
}
/*
Modified: cytoscape/trunk/src/test/java/cytoscape/plugin/PluginManagerTest.java
===================================================================
--- cytoscape/trunk/src/test/java/cytoscape/plugin/PluginManagerTest.java
2010-07-30 19:26:33 UTC (rev 21095)
+++ cytoscape/trunk/src/test/java/cytoscape/plugin/PluginManagerTest.java
2010-07-30 19:31:07 UTC (rev 21096)
@@ -30,7 +30,7 @@
UserDir = UserDir.replaceAll("\\\\", FS);
}
UserDir = UserDir.replaceFirst("/", "");
- return "file:///" + UserDir + FS + "src" + FS + "main" + FS +
"resources" + FS + "testData" + FS + "plugins" + FS;
+ return "file:///" + UserDir + FS + "src" + FS + "test" + FS +
"resources" + FS + "testData" + FS + "plugins" + FS;
}
private String cleanFileUrl(String url) {
@@ -636,7 +636,7 @@
public void testMinorCorruptedTrackerFile() {
mgr.resetManager();
PluginManager.setPluginManageDirectory(System.getProperty("java.io.tmpdir"));
- File file = new
File("src/main/resources/testData/plugins/track_plugins_c1.xml");
+ File file = new
File("src/test/resources/testData/plugins/track_plugins_c1.xml");
file = copyFileToTempDir(file);
mgr = PluginManager.getPluginManager();
@@ -655,7 +655,7 @@
public void testMajorCorruptedTrackerFile() {
mgr.resetManager();
PluginManager.setPluginManageDirectory(System.getProperty("java.io.tmpdir"));
- File file = new
File("src/main/resources/testData/plugins/track_plugins_c2.xml");
+ File file = new
File("src/test/resources/testData/plugins/track_plugins_c2.xml");
file = copyFileToTempDir(file);
mgr = PluginManager.getPluginManager();
assertNotNull(mgr);
Modified:
cytoscape/trunk/src/test/java/cytoscape/plugin/PluginPropertiesTest.java
===================================================================
--- cytoscape/trunk/src/test/java/cytoscape/plugin/PluginPropertiesTest.java
2010-07-30 19:26:33 UTC (rev 21095)
+++ cytoscape/trunk/src/test/java/cytoscape/plugin/PluginPropertiesTest.java
2010-07-30 19:31:07 UTC (rev 21096)
@@ -19,7 +19,7 @@
protected void setUp() throws Exception {
super.setUp();
String FS = java.io.File.separator;
- String TestProps = System.getProperty("user.dir") + FS + "src"
+ FS + "main" + FS + "resources" + FS + "testData" + FS + "plugins" + FS +
"test_plugin.props";
+ String TestProps = System.getProperty("user.dir") + FS + "src"
+ FS + "test" + FS + "resources" + FS + "testData" + FS + "plugins" + FS +
"test_plugin.props";
pp = new PluginProperties(TestProps);
}
Modified: cytoscape/trunk/src/test/java/cytoscape/plugin/PluginTestXML.java
===================================================================
--- cytoscape/trunk/src/test/java/cytoscape/plugin/PluginTestXML.java
2010-07-30 19:26:33 UTC (rev 21095)
+++ cytoscape/trunk/src/test/java/cytoscape/plugin/PluginTestXML.java
2010-07-30 19:31:07 UTC (rev 21096)
@@ -31,7 +31,7 @@
UserDir = UserDir.replaceFirst("\\w:", "");
UserDir = UserDir.replaceAll("\\\\", FS);
}
- return UserDir + FS + "src" + FS + "main" + FS + "resources" +
FS + "testData" + FS + "plugins" + FS;
+ return UserDir + FS + "src" + FS + "test" + FS + "resources" +
FS + "testData" + FS + "plugins" + FS;
}
// get the xsl file as a stream
Modified: cytoscape/trunk/src/test/java/cytoscape/plugin/PluginTrackerTest.java
===================================================================
--- cytoscape/trunk/src/test/java/cytoscape/plugin/PluginTrackerTest.java
2010-07-30 19:26:33 UTC (rev 21095)
+++ cytoscape/trunk/src/test/java/cytoscape/plugin/PluginTrackerTest.java
2010-07-30 19:31:07 UTC (rev 21096)
@@ -326,7 +326,7 @@
public void testPartiallyCorruptedXml() {
// partially corrupted file
try {
- File file = new
File("src/main/resources/testData/plugins/track_plugins_c1.xml");
+ File file = new
File("src/test/resources/testData/plugins/track_plugins_c1.xml");
PluginTracker tk = new PluginTracker(file);
assertNotNull(tk);
// Note: do NOT call write or you change the test file
Modified:
cytoscape/trunk/src/test/java/cytoscape/visual/EdgeAppearanceCalculatorTest.java
===================================================================
---
cytoscape/trunk/src/test/java/cytoscape/visual/EdgeAppearanceCalculatorTest.java
2010-07-30 19:26:33 UTC (rev 21095)
+++
cytoscape/trunk/src/test/java/cytoscape/visual/EdgeAppearanceCalculatorTest.java
2010-07-30 19:31:07 UTC (rev 21096)
@@ -85,7 +85,7 @@
* DOCUMENT ME!
*/
public void setUp() {
- cyNet =
Cytoscape.createNetworkFromFile("src/main/resources/testData/small.sif");
+ cyNet =
Cytoscape.createNetworkFromFile("src/test/resources/testData/small.sif");
a = Cytoscape.getCyNode("a");
b = Cytoscape.getCyNode("b");
ab = Cytoscape.getCyEdge(a, b, Semantics.INTERACTION, "pp",
false);
@@ -93,8 +93,8 @@
try {
CyAttributesReader.loadAttributes(Cytoscape.getEdgeAttributes(),
- new
FileReader("src/main/resources/testData/small.edgeAttr"));
-
props.load(FileUtil.getInputStream("src/main/resources/testData/small.vizmap.props"));
+ new
FileReader("src/test/resources/testData/small.edgeAttr"));
+
props.load(FileUtil.getInputStream("src/test/resources/testData/small.vizmap.props"));
} catch (Exception e) {
e.printStackTrace();
}
Modified:
cytoscape/trunk/src/test/java/cytoscape/visual/NodeAppearanceCalculatorTest.java
===================================================================
---
cytoscape/trunk/src/test/java/cytoscape/visual/NodeAppearanceCalculatorTest.java
2010-07-30 19:26:33 UTC (rev 21095)
+++
cytoscape/trunk/src/test/java/cytoscape/visual/NodeAppearanceCalculatorTest.java
2010-07-30 19:31:07 UTC (rev 21096)
@@ -91,7 +91,7 @@
*/
public void setUp() {
System.out.println("setup begin");
- cyNet =
Cytoscape.createNetworkFromFile("src/main/resources/testData/small.sif");
+ cyNet =
Cytoscape.createNetworkFromFile("src/test/resources/testData/small.sif");
a = Cytoscape.getCyNode("a");
b = Cytoscape.getCyNode("b");
c = Cytoscape.getCyNode("c");
@@ -100,8 +100,8 @@
try {
CyAttributesReader.loadAttributes(Cytoscape.getNodeAttributes(),
- new
FileReader("src/main/resources/testData/small.nodeAttr"));
-
props.load(FileUtil.getInputStream("src/main/resources/testData/small.vizmap.props"));
+ new
FileReader("src/test/resources/testData/small.nodeAttr"));
+
props.load(FileUtil.getInputStream("src/test/resources/testData/small.vizmap.props"));
} catch (Exception e) {
e.printStackTrace();
}
Modified:
cytoscape/trunk/src/test/java/cytoscape/visual/VisualMappingManagerTest.java
===================================================================
---
cytoscape/trunk/src/test/java/cytoscape/visual/VisualMappingManagerTest.java
2010-07-30 19:26:33 UTC (rev 21095)
+++
cytoscape/trunk/src/test/java/cytoscape/visual/VisualMappingManagerTest.java
2010-07-30 19:31:07 UTC (rev 21096)
@@ -92,7 +92,7 @@
*/
public void setUp() {
System.out.println("setup begin");
- cyNet =
Cytoscape.createNetworkFromFile("src/main/resources/testData/small.sif");
+ cyNet =
Cytoscape.createNetworkFromFile("src/test/resources/testData/small.sif");
a = Cytoscape.getCyNode("a");
b = Cytoscape.getCyNode("b");
c = Cytoscape.getCyNode("c");
@@ -101,8 +101,8 @@
try {
CyAttributesReader.loadAttributes(Cytoscape.getNodeAttributes(),
- new
FileReader("src/main/resources/testData/small.nodeAttr"));
-
props.load(FileUtil.getInputStream("src/main/resources/testData/small.vizmap.props"));
+ new
FileReader("src/test/resources/testData/small.nodeAttr"));
+
props.load(FileUtil.getInputStream("src/test/resources/testData/small.vizmap.props"));
} catch (Exception e) {
e.printStackTrace();
}
--
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.
