From f34eba11cbd8559d4d06f96e19affa70abaf86ff Mon Sep 17 00:00:00 2001
From: Oliver Burn <oliver@puppycrawl.com>
Date: Thu, 30 Aug 2001 13:09:57 +0000
Subject: [PATCH] improved technique to locate files

---
 build.xml                                     | 25 +++++++++++--------
 .../tools/checkstyle/CheckerTest.java         |  3 +--
 2 files changed, 15 insertions(+), 13 deletions(-)

diff --git a/build.xml b/build.xml
index 42f9f9697..9f249989c 100644
--- a/build.xml
+++ b/build.xml
@@ -1,7 +1,3 @@
-<!-- ----------------------------------------------------------------- -->
-<!-- You will need ANT 1.4Beta1 or greater to be able to run the tests -->
-<!-- ----------------------------------------------------------------- -->
-
 <project name="test" default="compile.checkstyle" basedir=".">
 
   <!-- set global properties for this build -->
@@ -16,6 +12,7 @@
   <!-- distributed jar file. -->
   <property name="antlr.home" value="c:/apps/antlr-2.7.1" />
   <property name="regexp.jar" value="c:/apps/jakarta-regexp-1.2/jakarta-regexp-1.2.jar" />
+  <property name="junit.jar" value="c:/apps/junit3.5/junit.jar" />
   <property name="checkstyle.dir" value="src/checkstyle/com/puppycrawl/tools/checkstyle" />
   <property name="version" value="1.3" />
 
@@ -29,13 +26,16 @@
     <path refid="build.classpath" />
   </path>
 
-  <path id="tests.classpath">
-    <!-- first entry needed to locate source files -->
-    <pathelement location="src/tests" />
-    <pathelement location="classes/tests" />
+  <path id="tests.buildpath">
+    <pathelement location="${junit.jar}" />
     <path refid="run.classpath" />
   </path>
 
+  <path id="tests.runpath">
+    <pathelement location="classes/tests" />
+    <path refid="tests.buildpath" />
+  </path>
+
   <target name="display.classpath">
     <property name="asd" refid="run.classpath" />
     <echo message="Classpath is ${asd}" />
@@ -85,7 +85,7 @@
     <javac srcdir="src/tests"
            destdir="classes/tests"
 	   deprecation="on" debug="on"
-           classpathref="run.classpath" />
+           classpathref="tests.buildpath" />
   </target>
 
   <!-- -->
@@ -145,9 +145,12 @@
   </target>
 
   <target name="run.tests" depends="compile.tests">
-    <junit printsummary="yes">
+    <property name="tests.dir"
+	      location="src/tests/com/puppycrawl/tools/checkstyle"/>
+    <junit printsummary="yes" fork="yes">
+      <jvmarg value="-Dtests.dir=${tests.dir}"/>
       <formatter type="plain" />
-      <classpath refid="tests.classpath"/>
+      <classpath refid="tests.runpath"/>
       <batchtest>
         <fileset dir="src/tests">
           <include name="**/*Test.java" />
diff --git a/src/tests/com/puppycrawl/tools/checkstyle/CheckerTest.java b/src/tests/com/puppycrawl/tools/checkstyle/CheckerTest.java
index c38f7e6fc..7ff73ad9e 100644
--- a/src/tests/com/puppycrawl/tools/checkstyle/CheckerTest.java
+++ b/src/tests/com/puppycrawl/tools/checkstyle/CheckerTest.java
@@ -32,8 +32,7 @@ public class CheckerTest
     protected String getPath(String aFilename)
         throws IOException
     {
-        final URL u = getClass().getResource(".");
-        final File f = new File(u.getPath(), aFilename);
+        final File f = new File(System.getProperty("tests.dir"), aFilename);
         return f.getCanonicalPath();
     }