Merge pull request #1309 from keymapperorg/fix-tests

Fix tests

.github/workflows/production.yml

@@ -10,6 +10,25 @@ concurrency:
   cancel-in-progress: true
 
 jobs:
+  test:
+    name: Run unit tests
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v4
+
+      - name: set up JDK 17
+        uses: actions/setup-java@v3
+        with:
+          distribution: 'oracle'
+          java-version: 17
+          cache: 'gradle'
+
+      - name: Setup Android SDK
+        uses: android-actions/setup-android@v2
+
+      - name: Unit tests
+        run: bash ./gradlew testDebugUnitTest
+
   apk:
     name: Build and release to production
     runs-on: ubuntu-latest

.github/workflows/pull-request.yml

@@ -4,6 +4,25 @@ on:
   pull_request:
 
 jobs:
+  test:
+    name: Run unit tests
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v4
+
+      - name: set up JDK 17
+        uses: actions/setup-java@v3
+        with:
+          distribution: 'oracle'
+          java-version: 17
+          cache: 'gradle'
+
+      - name: Setup Android SDK
+        uses: android-actions/setup-android@v2
+
+      - name: Unit tests
+        run: bash ./gradlew testDebugUnitTest
+
   style:
     name: Code style check
     runs-on: ubuntu-latest

.github/workflows/testing.yml

@@ -10,6 +10,25 @@ concurrency:
   cancel-in-progress: true
 
 jobs:
+  test:
+    name: Run unit tests
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v4
+
+      - name: set up JDK 17
+        uses: actions/setup-java@v3
+        with:
+          distribution: 'oracle'
+          java-version: 17
+          cache: 'gradle'
+
+      - name: Setup Android SDK
+        uses: android-actions/setup-android@v2
+
+      - name: Unit tests
+        run: bash ./gradlew testDebugUnitTest
+
   style:
     name: Code style check
     runs-on: ubuntu-latest

app/build.gradle

@@ -116,7 +116,7 @@ dependencies {
     compileOnly project(':systemstubs')
 
     def room_version = "2.6.1"
-    def coroutinesVersion = "1.5.0"
+    def coroutinesVersion = "1.9.0"
     def nav_version = '2.7.7'
     def work_version = "2.9.1"
     def epoxy_version = "4.6.2"

app/src/main/java/io/github/sds100/keymapper/system/notifications/NotificationController.kt

@@ -108,8 +108,8 @@ class NotificationController(
     /**
      * Open the app and use the String as the Intent action.
      */
-    private val _openApp: MutableSharedFlow<String?> = MutableSharedFlow()
-    val openApp: SharedFlow<String?> = _openApp.asSharedFlow()
+    private val _openApp: MutableSharedFlow<String> = MutableSharedFlow()
+    val openApp: SharedFlow<String> = _openApp.asSharedFlow()
 
     private val _showToast = MutableSharedFlow<String>()
     val showToast = _showToast.asSharedFlow()
@@ -213,7 +213,7 @@ class NotificationController(
                 ACTION_STOP_SERVICE -> controlAccessibilityService.stopService()
 
                 ACTION_DISMISS_TOGGLE_MAPPINGS -> manageNotifications.dismiss(ID_TOGGLE_MAPPINGS)
-                ACTION_OPEN_KEY_MAPPER -> _openApp.emit(null)
+                ACTION_OPEN_KEY_MAPPER -> _openApp.emit("")
                 ACTION_SHOW_IME_PICKER -> showImePicker.show(fromForeground = false)
                 ACTION_SHOW_KEYBOARD -> hideInputMethod.show()
                 ACTION_TOGGLE_KEYBOARD -> toggleCompatibleIme.toggle().onSuccess {
@@ -224,12 +224,12 @@ class NotificationController(
 
                 ACTION_FINGERPRINT_GESTURE_FEATURE -> {
                     onboardingUseCase.approvedFingerprintFeaturePrompt = true
-                    _openApp.emit(null)
+                    _openApp.emit("")
                 }
 
                 ACTION_ON_SETUP_CHOSEN_DEVICES_AGAIN -> {
                     onboardingUseCase.approvedSetupChosenDevicesAgainNotification()
-                    _openApp.emit(null)
+                    _openApp.emit("")
                 }
             }
         }.flowOn(dispatchers.default()).launchIn(coroutineScope)