[test-android] Tests are now runnable as ./gradlew connectedCheck

test-android/app/src/androidTest/java/org/fluidsynth/fluidsynth_tests/ExampleInstrumentedTest.kt

@@ -2,6 +2,7 @@ package org.fluidsynth.fluidsynth_tests
 
 import androidx.test.platform.app.InstrumentationRegistry
 import androidx.test.ext.junit.runners.AndroidJUnit4
+import org.fluidsynth.fluidsynthtests.TestRunner
 
 import org.junit.Test
 import org.junit.runner.RunWith
@@ -20,5 +21,7 @@ class ExampleInstrumentedTest {
         // Context of the app under test.
         val appContext = InstrumentationRegistry.getInstrumentation().targetContext
         assertEquals("org.fluidsynth.fluidsynth_tests", appContext.packageName)
+
+        TestRunner.runTests()
     }
 }

test-android/app/src/main/cpp/native-lib.cpp

@@ -1,14 +1,9 @@
 #include <jni.h>
 #include <string>
+#include <jni.h>
 
 extern "C" int run_all_fluidsynth_tests();
 
-extern "C" JNIEXPORT jstring JNICALL
-Java_org_fluidsynth_fluidsynthtests_MainActivity_stringFromJNI(
-        JNIEnv* env,
-        jobject /* this */) {
+extern "C" JNIEXPORT void JNICALL Java_org_fluidsynth_fluidsynthtests_TestRunner_00024Companion_runTests(JNIEnv* env, jobject thiz) {
     run_all_fluidsynth_tests();
-
-    std::string hello = "Hello from C++";
-    return env->NewStringUTF(hello.c_str());
-}
+}

test-android/app/src/main/java/org/fluidsynth/fluidsynthtests/MainActivity.kt

@@ -14,20 +14,9 @@ class MainActivity : AppCompatActivity() {
         binding = ActivityMainBinding.inflate(layoutInflater)
         setContentView(binding.root)
 
+        TestRunner.runTests()
+
         // Example of a call to a native method
-        binding.sampleText.text = stringFromJNI()
-    }
-
-    /**
-     * A native method that is implemented by the 'native-lib' native library,
-     * which is packaged with this application.
-     */
-    external fun stringFromJNI(): String
-
-    companion object {
-        // Used to load the 'native-lib' library on application startup.
-        init {
-            System.loadLibrary("native-lib")
-        }
+        binding.sampleText.text = "If this shows up then there was no reported test failure!"
     }
 }

test-android/app/src/main/java/org/fluidsynth/fluidsynthtests/TestRunner.kt

@@ -0,0 +1,10 @@
+package org.fluidsynth.fluidsynthtests
+
+class TestRunner {
+    companion object {
+        external fun runTests()
+        init {
+            System.loadLibrary("native-lib")
+        }
+    }
+}