From c066cbf0448dc42743a1da337c749dffd9c1a56d Mon Sep 17 00:00:00 2001
From: Michael Bayne <mdb@samskivert.com>
Date: Mon, 17 Nov 2014 14:06:48 -0800
Subject: [PATCH] Specify test_dir in the unit test.

Now that it's consistent, we can avoid extra build shenanigans.
---
 build.xml                                                  | 1 -
 pom.xml                                                    | 3 ---
 .../com/samskivert/servlet/SiteResourceLoaderTest.java     | 7 ++++++-
 3 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/build.xml b/build.xml
index 91731f14..6f6b6556 100644
--- a/build.xml
+++ b/build.xml
@@ -65,7 +65,6 @@
         <path refid="built.classpath"/>
         <fileset dir="lib/test" includes="*.jar"/>
       </classpath>
-      <sysproperty key="test_dir" value="${tclasses.dir}"/>
       <formatter type="brief" usefile="false"/>
       <formatter type="xml"/>
       <batchtest todir="${deploy.dir}/test-reports">
diff --git a/pom.xml b/pom.xml
index 0430a438..dbf2fda9 100644
--- a/pom.xml
+++ b/pom.xml
@@ -149,9 +149,6 @@
           <excludes>
             <exclude>com/samskivert/swing/TestComboButtonBox*</exclude>
           </excludes>
-          <systemProperties>
-            <property><name>test_dir</name><value>target/test-classes</value></property>
-          </systemProperties>
           <additionalClasspathElements>
             <additionalClasspathElement>lib/test/test.jar</additionalClasspathElement>
             <additionalClasspathElement>lib/test/test-al.jar</additionalClasspathElement>
diff --git a/src/test/java/com/samskivert/servlet/SiteResourceLoaderTest.java b/src/test/java/com/samskivert/servlet/SiteResourceLoaderTest.java
index bf27b121..bbfd6fe9 100644
--- a/src/test/java/com/samskivert/servlet/SiteResourceLoaderTest.java
+++ b/src/test/java/com/samskivert/servlet/SiteResourceLoaderTest.java
@@ -21,6 +21,11 @@ import com.samskivert.test.TestUtil;
 
 public class SiteResourceLoaderTest
 {
+    @BeforeClass
+    public static void setTestDir () {
+        System.setProperty("test_dir", "target/test-classes");
+    }
+
     @Test
     public void runTest ()
     {
@@ -39,7 +44,7 @@ public class SiteResourceLoaderTest
 
         } catch (IOException ioe) {
             ioe.printStackTrace();
-            fail("Caught exception while testing resource loader.");
+            fail("Caught exception while testing resource loader: " + ioe);
         }
     }