Specify test_dir in the unit test.
Now that it's consistent, we can avoid extra build shenanigans.
This commit is contained in:
@@ -65,7 +65,6 @@
|
|||||||
<path refid="built.classpath"/>
|
<path refid="built.classpath"/>
|
||||||
<fileset dir="lib/test" includes="*.jar"/>
|
<fileset dir="lib/test" includes="*.jar"/>
|
||||||
</classpath>
|
</classpath>
|
||||||
<sysproperty key="test_dir" value="${tclasses.dir}"/>
|
|
||||||
<formatter type="brief" usefile="false"/>
|
<formatter type="brief" usefile="false"/>
|
||||||
<formatter type="xml"/>
|
<formatter type="xml"/>
|
||||||
<batchtest todir="${deploy.dir}/test-reports">
|
<batchtest todir="${deploy.dir}/test-reports">
|
||||||
|
|||||||
@@ -149,9 +149,6 @@
|
|||||||
<excludes>
|
<excludes>
|
||||||
<exclude>com/samskivert/swing/TestComboButtonBox*</exclude>
|
<exclude>com/samskivert/swing/TestComboButtonBox*</exclude>
|
||||||
</excludes>
|
</excludes>
|
||||||
<systemProperties>
|
|
||||||
<property><name>test_dir</name><value>target/test-classes</value></property>
|
|
||||||
</systemProperties>
|
|
||||||
<additionalClasspathElements>
|
<additionalClasspathElements>
|
||||||
<additionalClasspathElement>lib/test/test.jar</additionalClasspathElement>
|
<additionalClasspathElement>lib/test/test.jar</additionalClasspathElement>
|
||||||
<additionalClasspathElement>lib/test/test-al.jar</additionalClasspathElement>
|
<additionalClasspathElement>lib/test/test-al.jar</additionalClasspathElement>
|
||||||
|
|||||||
@@ -21,6 +21,11 @@ import com.samskivert.test.TestUtil;
|
|||||||
|
|
||||||
public class SiteResourceLoaderTest
|
public class SiteResourceLoaderTest
|
||||||
{
|
{
|
||||||
|
@BeforeClass
|
||||||
|
public static void setTestDir () {
|
||||||
|
System.setProperty("test_dir", "target/test-classes");
|
||||||
|
}
|
||||||
|
|
||||||
@Test
|
@Test
|
||||||
public void runTest ()
|
public void runTest ()
|
||||||
{
|
{
|
||||||
@@ -39,7 +44,7 @@ public class SiteResourceLoaderTest
|
|||||||
|
|
||||||
} catch (IOException ioe) {
|
} catch (IOException ioe) {
|
||||||
ioe.printStackTrace();
|
ioe.printStackTrace();
|
||||||
fail("Caught exception while testing resource loader.");
|
fail("Caught exception while testing resource loader: " + ioe);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user