Tests: Unify core test resources across JUnit and ScalaTest

Fixes a test failure running the ScalaTests under Ant

core/build.gradle

@@ -29,11 +29,7 @@ sourceSets {
             }
         }
         resources {
-            srcDir 'java/test/junit'
-            include 'resources/*'
-            include 'net/i2p/crypto/eddsa/test.data'
-            include 'net/i2p/crypto/eddsa/math/baseDblPrecmp'
-            include 'net/i2p/crypto/eddsa/math/basePrecmp'
+            srcDir 'java/test/resources'
         }
     }
     jmh {

core/java/build.xml

@@ -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}" />

core/java/test/scalatest/net/i2p/crypto/CertUtilSpec.scala

@@ -10,10 +10,7 @@ import org.scalatest.Matchers
 class CertUtilSpec extends FunSpec with Matchers {
 
   describe("CertUtil") {
-    // For some stupid gradle issues, it don't copies reosurces. So hacky way.
-    // When added to junit directory, it get copied. Until a better way is found,
-    // this is the non-optimal solution.
-    val certFileUrl = getClass.getResource("/resources/meeh_at_mail.i2p.crt")
+    val certFileUrl = getClass.getResource("/meeh_at_mail.i2p.crt")
     val certFile = new File(certFileUrl.toURI)
 
     it("should be able to read a certificate") {

core/java/test/scalatest/net/i2p/crypto/SU3FileSpec.scala

@@ -17,10 +17,10 @@ class SU3FileSpec extends FunSpec with Matchers {
   }
 
   describe("SU3File") {
-    val certFileUrl = getClass.getResource("/resources/meeh_at_mail.i2p.crt")
+    val certFileUrl = getClass.getResource("/meeh_at_mail.i2p.crt")
     val certFile = new File(certFileUrl.toURI)
 
-    val seedFileUrl = getClass.getResource("/resources/i2pseeds.su3")
+    val seedFileUrl = getClass.getResource("/i2pseeds.su3")
     val seedFile = new File(seedFileUrl.toURI)
 
     it("should be able to verify a valid file") {

history.txt

@@ -5,6 +5,7 @@
    - Fix compilation bug after SSU HMAC implementation move
    - Temporarily mitigate discrepancy between Ant and Gradle in
      SingleFileNamingServiceTest
+   - Unify core test resources across JUnit and ScalaTest
 
 2019-08-05 zzz
  * i2ptunnel: