#1394 fix tests

Author: sds100

base/src/test/java/io/github/sds100/keymapper/base/actions/GetActionErrorUseCaseTest.kt

@@ -7,11 +7,8 @@ import io.github.sds100.keymapper.common.utils.KMError
 import io.github.sds100.keymapper.system.inputmethod.ImeInfo
 import io.github.sds100.keymapper.system.permissions.Permission
 import io.github.sds100.keymapper.system.permissions.PermissionAdapter
-import io.github.sds100.keymapper.system.shizuku.ShizukuAdapter
 import kotlinx.coroutines.ExperimentalCoroutinesApi
-import kotlinx.coroutines.flow.MutableStateFlow
 import kotlinx.coroutines.flow.first
-import kotlinx.coroutines.flow.update
 import kotlinx.coroutines.test.StandardTestDispatcher
 import kotlinx.coroutines.test.TestScope
 import kotlinx.coroutines.test.runTest
@@ -52,13 +49,11 @@ class GetActionErrorUseCaseTest {
 
     private lateinit var useCase: GetActionErrorUseCaseImpl
 
-    private lateinit var mockShizukuAdapter: ShizukuAdapter
     private lateinit var fakeInputMethodAdapter: FakeInputMethodAdapter
     private lateinit var mockPermissionAdapter: PermissionAdapter
 
     @Before
     fun init() {
-        mockShizukuAdapter = mock()
         fakeInputMethodAdapter = FakeInputMethodAdapter()
         mockPermissionAdapter = mock()
 
@@ -77,7 +72,6 @@ class GetActionErrorUseCaseTest {
     }
 
     private fun setupKeyEventActionTest(chosenIme: ImeInfo) {
-        whenever(mockShizukuAdapter.isInstalled).then { MutableStateFlow(false) }
         whenever(mockPermissionAdapter.isGranted(Permission.WRITE_SECURE_SETTINGS)).then { true }
         fakeInputMethodAdapter.chosenIme.value = chosenIme
         fakeInputMethodAdapter.inputMethods.value = listOf(GBOARD_IME_INFO, GUI_KEYBOARD_IME_INFO)
@@ -221,42 +215,4 @@ class GetActionErrorUseCaseTest {
             assertThat(errors[1], nullValue())
             assertThat(errors[2], `is`(KMError.NoCompatibleImeChosen))
         }
-
-    /**
-     * #776
-     */
-    @Test
-    fun `don't show Shizuku errors if a compatible ime is selected`() = testScope.runTest {
-        // GIVEN
-        whenever(mockShizukuAdapter.isInstalled).then { MutableStateFlow(true) }
-        fakeInputMethodAdapter.chosenIme.update { GUI_KEYBOARD_IME_INFO }
-
-        val action = ActionData.InputKeyEvent(keyCode = KeyEvent.KEYCODE_VOLUME_DOWN)
-
-        // WHEN
-        val errorMap = useCase.actionErrorSnapshot.first().getErrors(listOf(action))
-
-        // THEN
-        assertThat(errorMap[action], nullValue())
-    }
-
-    /**
-     * #776
-     */
-    @Test
-    fun `show Shizuku errors if a compatible ime is not selected and Shizuku is installed`() =
-        testScope.runTest {
-            // GIVEN
-            whenever(mockShizukuAdapter.isInstalled).then { MutableStateFlow(true) }
-            whenever(mockShizukuAdapter.isStarted).then { MutableStateFlow(false) }
-            fakeInputMethodAdapter.chosenIme.update { GBOARD_IME_INFO }
-
-            val action = ActionData.InputKeyEvent(keyCode = KeyEvent.KEYCODE_VOLUME_DOWN)
-
-            // WHEN
-            val errorMap = useCase.actionErrorSnapshot.first().getErrors(listOf(action))
-
-            // THEN
-            assertThat(errorMap[action], `is`(KMError.ShizukuNotStarted))
-        }
 }

base/src/test/java/io/github/sds100/keymapper/base/actions/PerformActionsUseCaseTest.kt

@@ -254,7 +254,6 @@ class PerformActionsUseCaseTest {
             val action = ActionData.InputKeyEvent(
                 keyCode = 1,
                 metaState = 0,
-                useShell = false,
                 device = ActionData.InputKeyEvent.Device(
                     descriptor = descriptor,
                     name = "fake_name_2",
@@ -316,7 +315,6 @@ class PerformActionsUseCaseTest {
             val action = ActionData.InputKeyEvent(
                 keyCode = 1,
                 metaState = 0,
-                useShell = false,
                 device = ActionData.InputKeyEvent.Device(descriptor = descriptor, name = ""),
             )
 

data/src/main/java/io/github/sds100/keymapper/data/entities/TriggerKeyEntity.kt

@@ -132,7 +132,7 @@ sealed class TriggerKeyEntity : Parcelable {
             uid: String,
         ): KeyEventTriggerKeyEntity {
             val keyCode by json.byInt(KeyEventTriggerKeyEntity.NAME_KEYCODE)
-            val scanCode by json.byInt(KeyEventTriggerKeyEntity.NAME_SCANCODE)
+            val scanCode by json.byNullableInt(KeyEventTriggerKeyEntity.NAME_SCANCODE)
             val deviceId by json.byString(KeyEventTriggerKeyEntity.NAME_DEVICE_ID)
             val deviceName by json.byNullableString(KeyEventTriggerKeyEntity.NAME_DEVICE_NAME)
             val clickType by json.byInt(NAME_CLICK_TYPE)