Tests now also work in Ant

marvinm2 · Nov 4, 2013 · d68cfd8 · d68cfd8
1 parent 0cf31de
commit d68cfd8
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 3 deletions.
diff --git a/build-common.xml b/build-common.xml
@@ -111,6 +111,7 @@
 			<pathelement location="resources"/>
 			<pathelement location="build"/>
 			<pathelement location="test"/>
+                        <pathelement location="test-data"/>
 		</path>
 		<javac srcdir="test" debug="true" 
 					includes="**"

diff --git a/org.bridgedb/.classpath b/org.bridgedb/.classpath
@@ -4,6 +4,7 @@
 	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
 	<classpathentry kind="src" path="src"/>
 	<classpathentry kind="src" path="test"/>
+	<classpathentry kind="src" path="test-data"/>
 	<classpathentry exported="true" kind="lib" path="build-lib/measure.jar"/>
 	<classpathentry kind="con" path="org.eclipse.jdt.junit.JUNIT_CONTAINER/4"/>
 	<classpathentry kind="output" path="bin"/>

diff --git a/org.bridgedb/test/org/bridgedb/IDMapperStackTest.java b/org.bridgedb/test/org/bridgedb/IDMapperStackTest.java
@@ -1,6 +1,5 @@
 package org.bridgedb;
 
-import java.io.File;
 import java.net.MalformedURLException;
 import java.net.URL;
 import java.util.HashMap;
@@ -30,8 +29,10 @@ public void setUp() throws ClassNotFoundException, IDMapperException, MalformedU
 
 		for (String fileName : FILENAMES) 
 		{   // Load all IDMappers for test data files
-            File file = new File("test-data/" + fileName + ".csv");
-            URL url = file.toURI().toURL();
+			String fullName = fileName + ".csv";
+			ClassLoader classLoader = this.getClass().getClassLoader();
+			URL url = classLoader.getResource(fullName);
+			Assert.assertNotNull("Could not find resource in classpath: " + fullName, url);
 			IDMapper m = BridgeDb.connect("idmapper-text:" + url);
 			mappers.put(fileName, m);
 			stack.addIDMapper(m);