Merge pull request #114 from input-output-hk/run-jni-java-test-on-ci

run java tests in jvm in ci

.github/workflows/ci_checks.yaml

@@ -143,3 +143,43 @@ jobs:
 
       - name: run check script
         run: bash bindings/wallet-c/check_header.sh
+
+  jni-java-test:
+    runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        java: [8]
+        architecture: [x86, x64]
+
+    name: Test jni
+    steps:
+      - name: Checkout sources
+        uses: actions/checkout@v1
+        with:
+          submodules: true
+
+      - name: Setup java
+        uses: actions/setup-java@v1
+        with:
+          java-version: ${{ matrix.java }}
+          architecture: ${{ matrix.architecture }}
+
+      - uses: actions-rs/toolchain@v1
+        with:
+          toolchain: stable
+        if: matrix.architecture == 'x64'
+
+      - uses: actions-rs/toolchain@v1
+        with:
+          toolchain: stable
+          target: i686-unknown-linux-gnu
+        if: matrix.architecture == 'x86'
+
+      - run: sudo apt install gcc-multilib
+        if: matrix.architecture == 'x86'
+
+      - run: python3 ./bindings/wallet-jni/java/run_test.py
+        if: matrix.architecture == 'x64'
+
+      - run: python3 ./bindings/wallet-jni/java/run_test.py --target i686-unknown-linux-gnu
+        if: matrix.architecture == 'x86'

bindings/wallet-jni/java/run_test.py

@@ -3,10 +3,10 @@
 from pathlib import Path
 import subprocess
 import sys
+import argparse
 
 scriptdirectory = Path(__file__).parent
 rootdirectory = scriptdirectory.parent.parent.parent
-dynlibdirectory = rootdirectory / "target" / "debug"
 
 junit = "junit-4.13.jar"
 hamcrest = "hamcrest-core-1.3.jar"
@@ -16,8 +16,9 @@
 
 
 def compile_java_classes():
-    packageFiles = map(str, (scriptdirectory /
-                             Path("com/iohk/jormungandrwallet")).glob("*.java"))
+    packageFiles = map(str, (
+        Path("com/iohk/jormungandrwallet")).glob("*.java"))
+
     out = subprocess.run([
         "javac", "-cp", classpath, "WalletTest.java", *packageFiles], cwd=scriptdirectory)
 
@@ -27,21 +28,34 @@ def compile_java_classes():
         sys.exit(1)
 
 
-def compile_jni():
-    build_jni = subprocess.run(
-        ["cargo", "build", "-p" "wallet-jni"])
+def compile_jni(target):
+    args = ["cargo", "build", "-p" "wallet-jni"]
+    if target:
+        args.append("--target")
+        args.append(target)
+
+    build_jni = subprocess.run(args, cwd=rootdirectory)
 
     if build_jni.returncode != 0:
         print(f"failed to build jni, command:\n {' '.join(build_jni.args) }")
         sys.exit(1)
 
 
 def run():
+    parser = argparse.ArgumentParser(description='run tests')
+    parser.add_argument('--target', metavar='TARGET', type=str,
+                        help='target to use with cargo build', default=None)
+
+    args = parser.parse_args()
+
     compile_java_classes()
-    compile_jni()
+    compile_jni(args.target)
+
+    dynlibdirectory = rootdirectory / "target" / \
+        (args.target if args.target else ".") / "debug"
 
     out = subprocess.run([
-        "java", f"-Djava.library.path={dynlibdirectory}", "-cp", classpath, "org.junit.runner.JUnitCore", "WalletTest"
+        "java", f"-Djava.library.path={dynlibdirectory.resolve()}", "-cp", classpath, "org.junit.runner.JUnitCore", "WalletTest"
     ], cwd=scriptdirectory)
 
     if out.returncode != 0: