diff --git a/.github/workflows/android.yml b/.github/workflows/android.yml index fd96d9c4..83d55264 100644 --- a/.github/workflows/android.yml +++ b/.github/workflows/android.yml @@ -34,3 +34,7 @@ jobs: - name: Build with Gradle run: ./gradlew build working-directory: android + + - name: Run Android Tests + run: ./gradlew connectedAndroidTest + working-directory: android diff --git a/android/core/build.gradle b/android/core/build.gradle index 2e375f39..28767fb4 100644 --- a/android/core/build.gradle +++ b/android/core/build.gradle @@ -58,7 +58,6 @@ dependencies { cargoNdk { module = "../common" // Directory containing Cargo.toml librariesNames = ["libferrostar.so"] - verbose = true } android.libraryVariants.all { variant -> diff --git a/android/core/src/androidTest/java/com/stadiamaps/ferrostar/core/ValhallaCoreTest.kt b/android/core/src/androidTest/java/com/stadiamaps/ferrostar/core/ValhallaCoreTest.kt index d59443d0..53fa2c89 100644 --- a/android/core/src/androidTest/java/com/stadiamaps/ferrostar/core/ValhallaCoreTest.kt +++ b/android/core/src/androidTest/java/com/stadiamaps/ferrostar/core/ValhallaCoreTest.kt @@ -2,6 +2,7 @@ * FIXME: This file should move out of Android Tests ASAP. * It only exists here because I haven't yet figured out how to build and link the platform-native * binaries via JNI just yet and this works. + * See https://github.com/willir/cargo-ndk-android-gradle/issues/12. * * This solution is STUPIDLY INEFFICIENT and will probably contribute to global climate change since * an Android emulator uses like two whole CPU cores when idling. diff --git a/android/demo-app/src/androidTest/java/com/stadiamaps/ferrostar/ExampleInstrumentedTest.kt b/android/demo-app/src/androidTest/java/com/stadiamaps/ferrostar/ExampleInstrumentedTest.kt index 3c24a230..cb59b2da 100644 --- a/android/demo-app/src/androidTest/java/com/stadiamaps/ferrostar/ExampleInstrumentedTest.kt +++ b/android/demo-app/src/androidTest/java/com/stadiamaps/ferrostar/ExampleInstrumentedTest.kt @@ -19,6 +19,6 @@ class ExampleInstrumentedTest { fun useAppContext() { // Context of the app under test. val appContext = InstrumentationRegistry.getInstrumentation().targetContext - assertEquals("com.stadiamaps.ferrostar", appContext.packageName) + assertEquals("com.stadiamaps.ferrostar.demo", appContext.packageName) } } \ No newline at end of file