From d0cb714f6985b402aaa82957cb33edf1eeafe8ee Mon Sep 17 00:00:00 2001
From: zab <zab@mail.i2p>
Date: Fri, 4 Jan 2013 20:17:35 +0000
Subject: [PATCH] add installer/resources to the classpath for eclipse and
junit task do not use hardcoded filesystem path in junit test (test
still fails for different reason)
---
core/java/.classpath | 1 +
core/java/build.xml | 1 +
.../net/i2p/client/naming/BlockfileNamingServiceTest.java | 7 ++++---
3 files changed, 6 insertions(+), 3 deletions(-)
diff --git a/core/java/.classpath b/core/java/.classpath
index a2a2a595a3..5ed3d26f7b 100644
--- a/core/java/.classpath
+++ b/core/java/.classpath
@@ -4,5 +4,6 @@
<classpathentry kind="src" path="test/junit"/>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
<classpathentry kind="con" path="org.eclipse.jdt.junit.JUNIT_CONTAINER/4"/>
+ <classpathentry kind="lib" path="../../installer/resources"/>
<classpathentry kind="output" path="build/obj"/>
</classpath>
diff --git a/core/java/build.xml b/core/java/build.xml
index 289f84d6ec..970f9efd58 100644
--- a/core/java/build.xml
+++ b/core/java/build.xml
@@ -213,6 +213,7 @@
<junit printsummary="withOutAndErr" fork="yes" maxmemory="384m" showoutput="yes" >
<sysproperty key="net.sourceforge.cobertura.datafile" file="./cobertura.ser" />
<classpath>
+ <pathelement location="../../installer/resources/" />
<pathelement path="${classpath}" />
<pathelement location="${hamcrest.home}/hamcrest-core.jar" />
<pathelement location="${hamcrest.home}/hamcrest-library.jar" />
diff --git a/core/java/test/junit/net/i2p/client/naming/BlockfileNamingServiceTest.java b/core/java/test/junit/net/i2p/client/naming/BlockfileNamingServiceTest.java
index 229528e41b..6df39002d1 100644
--- a/core/java/test/junit/net/i2p/client/naming/BlockfileNamingServiceTest.java
+++ b/core/java/test/junit/net/i2p/client/naming/BlockfileNamingServiceTest.java
@@ -1,11 +1,10 @@
package net.i2p.client.naming;
import junit.framework.TestCase;
-import static org.junit.Assert.*;
-import static org.hamcrest.CoreMatchers.*;
import java.io.File;
import java.io.IOException;
+import java.io.InputStream;
import java.util.ArrayList;
import java.util.Collections;
import java.util.List;
@@ -26,7 +25,9 @@ public class BlockfileNamingServiceTest extends TestCase {
_names = null;
Properties props = new Properties();
try {
- DataHelper.loadProps(props, new File("../../installer/resources/hosts.txt"), true);
+ InputStream is = getClass().getResourceAsStream("/hosts.txt");
+ assertNotNull("test classpath not set correctly",is);
+ DataHelper.loadProps(props, is, true);
_names = new ArrayList(props.keySet());
Collections.shuffle(_names);
} catch (IOException ioe) {
--
GitLab