Tests: Unify core test resources across JUnit and ScalaTest

Fixes a test failure running the ScalaTests under Ant
This commit is contained in:
str4d
2019-08-10 17:19:21 +00:00
parent 8586c28b5f
commit 459eb7fdcd
12 changed files with 7 additions and 19 deletions

View File

@@ -237,14 +237,6 @@
</classpath>
<compilerarg line="${javac.compilerargs}" />
</javac>
<!-- EdDSA test vectors -->
<copy todir="./build/obj">
<fileset dir="./test/junit/">
<include name="net/i2p/crypto/eddsa/test.data"/>
<include name="net/i2p/crypto/eddsa/math/baseDblPrecmp"/>
<include name="net/i2p/crypto/eddsa/math/basePrecmp"/>
</fileset>
</copy>
</target>
<!-- jars with tests -->
<target name="jarScalaTest" depends="scalatest.compileTest">
@@ -321,6 +313,7 @@
<pathelement location="${scalatest.jar}" />
<pathelement location="./build/obj_cobertura" />
<pathelement location="./build/obj" />
<pathelement location="./test/resources" />
<pathelement location="../../build/jbigi.jar" />
<pathelement location="${with.clover}" />
<pathelement location="${with.cobertura}" />
@@ -363,6 +356,7 @@
<pathelement location="${junit.home}/junit4.jar" />
<pathelement location="./build/obj_cobertura" />
<pathelement location="./build/obj" />
<pathelement location="./test/resources" />
<pathelement location="../../build/jbigi.jar" />
<pathelement location="${with.clover}" />
<pathelement location="${with.cobertura}" />