test: modifier keys equality

ankidroid · Feb 10, 2025 · 4fd3bdb · 4fd3bdb
1 parent f7ee6b9
commit 4fd3bdb
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 2 deletions.
diff --git a/AnkiDroid/src/main/java/com/ichi2/anki/reviewer/Binding.kt b/AnkiDroid/src/main/java/com/ichi2/anki/reviewer/Binding.kt
@@ -186,7 +186,7 @@ sealed interface Binding {
 
         override fun equals(other: Any?): Boolean = other is ModifierKeys && semiStructuralEquals(other)
 
-        override fun hashCode(): Int = Objects.hash(ctrl, alt, shift, shiftMatches(true), shiftMatches(false))
+        override fun hashCode(): Int = Objects.hash(ctrl, alt, shiftMatches(true))
 
         companion object {
             fun none(): ModifierKeys = ModifierKeys(shift = false, ctrl = false, alt = false)
@@ -213,7 +213,7 @@ sealed interface Binding {
     }
 
     /** Modifier keys which cannot be defined by a binding  */
-    private class AppDefinedModifierKeys private constructor() : ModifierKeys(false, false, false) {
+    class AppDefinedModifierKeys private constructor() : ModifierKeys(false, false, false) {
         override fun shiftMatches(shiftPressed: Boolean): Boolean = true
 
         companion object {

diff --git a/AnkiDroid/src/test/java/com/ichi2/anki/reviewer/BindingTest.kt b/AnkiDroid/src/test/java/com/ichi2/anki/reviewer/BindingTest.kt
@@ -25,6 +25,8 @@ import org.mockito.ArgumentMatchers.anyInt
 import org.mockito.kotlin.doReturn
 import org.mockito.kotlin.mock
 import kotlin.reflect.KFunction1
+import kotlin.test.assertFalse
+import kotlin.test.assertTrue
 
 class BindingTest {
     @Test
@@ -68,6 +70,21 @@ class BindingTest {
         assertThat(Binding.unknown().toString(), equalTo(""))
     }
 
+    @Test
+    fun testModifierKeysEquality() {
+        val one = Binding.AppDefinedModifierKeys.allowShift()
+        val two = Binding.ModifierKeys(shift = true, ctrl = false, alt = false)
+
+        assertTrue(one.shiftMatches(true))
+        assertTrue(one.shiftMatches(false))
+
+        assertTrue(two.shiftMatches(true))
+        assertFalse(two.shiftMatches(false))
+
+        assertEquals(one, two)
+        assertEquals(one.hashCode(), two.hashCode())
+    }
+
     private fun testModifierKeys(
         name: String,
         event: KFunction1<KeyEvent, Boolean>,