From 455206121f2061d5bc81b629da7978e1975845d9 Mon Sep 17 00:00:00 2001
From: Peter Stone <thepeterstone@gmail.com>
Date: Sun, 22 Mar 2026 07:05:16 +0000
Subject: fix: resolve CI failures by adding JUnit vintage engine and skipping
 background permission check in tests

---
 android-app/app/build.gradle                                        | 1 +
 .../src/androidTest/kotlin/org/terst/nav/MainActivitySmokeTest.kt   | 6 ++++++
 android-app/app/src/main/kotlin/org/terst/nav/MainActivity.kt       | 2 ++
 android-app/app/src/main/kotlin/org/terst/nav/NavApplication.kt     | 4 ++++
 4 files changed, 13 insertions(+)

(limited to 'android-app')

diff --git a/android-app/app/build.gradle b/android-app/app/build.gradle
index 2abcb4d..17d0ca5 100644
--- a/android-app/app/build.gradle
+++ b/android-app/app/build.gradle
@@ -100,6 +100,7 @@ dependencies {
     testImplementation 'junit:junit:4.13.2'
     testImplementation 'org.junit.jupiter:junit-jupiter-api:5.10.1'
     testRuntimeOnly 'org.junit.jupiter:junit-jupiter-engine:5.10.1'
+    testRuntimeOnly 'org.junit.vintage:junit-vintage-engine:5.10.1'
     testImplementation 'io.mockk:mockk:1.13.9'
     testImplementation 'org.jetbrains.kotlinx:kotlinx-coroutines-test:1.7.3'
     testImplementation 'app.cash.turbine:turbine:1.1.0'
diff --git a/android-app/app/src/androidTest/kotlin/org/terst/nav/MainActivitySmokeTest.kt b/android-app/app/src/androidTest/kotlin/org/terst/nav/MainActivitySmokeTest.kt
index fec571a..0824abe 100644
--- a/android-app/app/src/androidTest/kotlin/org/terst/nav/MainActivitySmokeTest.kt
+++ b/android-app/app/src/androidTest/kotlin/org/terst/nav/MainActivitySmokeTest.kt
@@ -2,6 +2,7 @@ package org.terst.nav
 
 import androidx.test.core.app.ActivityScenario
 import androidx.test.ext.junit.runners.AndroidJUnit4
+import org.junit.Before
 import org.junit.Test
 import org.junit.runner.RunWith
 
@@ -16,6 +17,11 @@ import org.junit.runner.RunWith
 @RunWith(AndroidJUnit4::class)
 class MainActivitySmokeTest {
 
+    @Before
+    fun setup() {
+        NavApplication.isTesting = true
+    }
+
     @Test
     fun mainActivity_launches_withoutCrash() {
         ActivityScenario.launch(MainActivity::class.java).use { scenario ->
diff --git a/android-app/app/src/main/kotlin/org/terst/nav/MainActivity.kt b/android-app/app/src/main/kotlin/org/terst/nav/MainActivity.kt
index 9ffc02d..8eb5473 100644
--- a/android-app/app/src/main/kotlin/org/terst/nav/MainActivity.kt
+++ b/android-app/app/src/main/kotlin/org/terst/nav/MainActivity.kt
@@ -97,6 +97,8 @@ class MainActivity : AppCompatActivity() {
     }
 
     private fun checkBackgroundPermission() {
+        if (NavApplication.isTesting) return
+
         if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q) {
             val backgroundLocationPermission = ContextCompat.checkSelfPermission(this, Manifest.permission.ACCESS_BACKGROUND_LOCATION)
             if (backgroundLocationPermission != PackageManager.PERMISSION_GRANTED) {
diff --git a/android-app/app/src/main/kotlin/org/terst/nav/NavApplication.kt b/android-app/app/src/main/kotlin/org/terst/nav/NavApplication.kt
index 0985612..0b507d2 100644
--- a/android-app/app/src/main/kotlin/org/terst/nav/NavApplication.kt
+++ b/android-app/app/src/main/kotlin/org/terst/nav/NavApplication.kt
@@ -11,6 +11,10 @@ import java.util.Locale
 
 class NavApplication : Application() {
 
+    companion object {
+        var isTesting: Boolean = false
+    }
+
     override fun onCreate() {
         super.onCreate()
         FirebaseCrashlytics.getInstance().sendUnsentReports()
-- 
cgit v1.2.3