Tests for inverse animation (ankidroid#14337)

* Update AbstractFlashcardViewer.kt * add test + overriden param for testing intent val * replace override with robolectric shadodw Instead of having to setup hacky deprecated stuff in the test flashcard viewer I've switched to using robolectric shadows --------- Co-authored-by: Rory Jones <[email protected]>
mikunimaru · Sep 17, 2023 · 032959c · 032959c
1 parent 6fcab97
commit 032959c
Show file tree

Hide file tree

Showing 2 changed files with 32 additions and 1 deletion.
diff --git a/AnkiDroid/src/main/java/com/ichi2/anki/AbstractFlashcardViewer.kt b/AnkiDroid/src/main/java/com/ichi2/anki/AbstractFlashcardViewer.kt
@@ -786,7 +786,6 @@ abstract class AbstractFlashcardViewer :
         finish()
     }
 
-    @NeedsTest("Starting animation from swipe is inverse to the finishing one")
     protected open fun editCard(fromGesture: Gesture? = null) {
         if (currentCard == null) {
             // This should never occurs. It means the review button was pressed while there is no more card in the reviewer.

diff --git a/AnkiDroid/src/test/java/com/ichi2/anki/AbstractFlashcardViewerTest.kt b/AnkiDroid/src/test/java/com/ichi2/anki/AbstractFlashcardViewerTest.kt
@@ -2,12 +2,17 @@
 
 package com.ichi2.anki
 
+import android.app.Application
+import android.content.Context
 import android.content.Intent
 import android.os.Build
 import android.webkit.RenderProcessGoneDetail
 import androidx.annotation.CheckResult
 import androidx.annotation.RequiresApi
+import androidx.core.content.IntentCompat
+import androidx.test.core.app.ApplicationProvider
 import androidx.test.ext.junit.runners.AndroidJUnit4
+import com.ichi2.anim.ActivityTransitionAnimation
 import com.ichi2.anki.AbstractFlashcardViewer.WebViewSignalParserUtils.ANSWER_ORDINAL_1
 import com.ichi2.anki.AbstractFlashcardViewer.WebViewSignalParserUtils.ANSWER_ORDINAL_2
 import com.ichi2.anki.AbstractFlashcardViewer.WebViewSignalParserUtils.ANSWER_ORDINAL_3
@@ -17,6 +22,8 @@ import com.ichi2.anki.AbstractFlashcardViewer.WebViewSignalParserUtils.SHOW_ANSW
 import com.ichi2.anki.AbstractFlashcardViewer.WebViewSignalParserUtils.SIGNAL_NOOP
 import com.ichi2.anki.AbstractFlashcardViewer.WebViewSignalParserUtils.TYPE_FOCUS
 import com.ichi2.anki.AbstractFlashcardViewer.WebViewSignalParserUtils.getSignalFromUrl
+import com.ichi2.anki.AnkiActivity.Companion.FINISH_ANIMATION_EXTRA
+import com.ichi2.anki.cardviewer.Gesture
 import com.ichi2.anki.cardviewer.ViewerCommand
 import com.ichi2.anki.preferences.sharedPrefs
 import com.ichi2.anki.reviewer.AutomaticAnswer
@@ -35,10 +42,12 @@ import org.junit.jupiter.params.provider.MethodSource
 import org.junit.runner.RunWith
 import org.mockito.Mockito.*
 import org.robolectric.Robolectric
+import org.robolectric.Shadows
 import org.robolectric.android.controller.ActivityController
 import org.robolectric.shadows.ShadowToast
 import java.util.*
 import java.util.stream.Stream
+import com.ichi2.anim.ActivityTransitionAnimation.Direction as Direction
 
 @RequiresApi(api = Build.VERSION_CODES.O) // getImeHintLocales, toLanguageTags, onRenderProcessGone, RenderProcessGoneDetail
 @RunWith(AndroidJUnit4::class)
@@ -153,6 +162,29 @@ class AbstractFlashcardViewerTest : RobolectricTest() {
         assertThat(viewer.cardContent, containsString("Hello"))
     }
 
+    @Test
+    fun testEditCardProvidesInverseTransition() {
+        val viewer: NonAbstractFlashcardViewer = getViewer(true)
+        val gestures = listOf(Gesture.SWIPE_LEFT, Gesture.SWIPE_UP, Gesture.LONG_TAP)
+
+        gestures.forEach { gesture ->
+            val expectedAnimation =
+                AbstractFlashcardViewer.getAnimationTransitionFromGesture(gesture)
+            val expectedInverseAnimation =
+                ActivityTransitionAnimation.getInverseTransition(expectedAnimation)
+
+            viewer.executeCommand(ViewerCommand.EDIT, gesture)
+            val actual = Shadows.shadowOf(ApplicationProvider.getApplicationContext<Context>() as Application).nextStartedActivity
+
+            val actualInverseAnimation = IntentCompat.getParcelableExtra(
+                actual,
+                FINISH_ANIMATION_EXTRA,
+                Direction::class.java
+            )
+            assertEquals(expectedInverseAnimation, actualInverseAnimation)
+        }
+    }
+
     @Test
     fun testCommandPerformsAnswerCard() {
         // Regression for #8527/#8572