Merge pull request #513 from MikeOrtiz/ScreenshotCompare

Screenshot compare tests on each pull request

Author: hannesa2

.github/workflows/Android-CI.yml

@@ -20,6 +20,9 @@ jobs:
         uses: actions/checkout@v3
         with:
           fetch-depth: 0
+          submodules: true
+      - name: prepare
+        run: brew install exiftool imagemagick
       - name: Install JDK ${{ matrix.java_version }}
         uses: actions/setup-java@v3
         with:
@@ -54,6 +57,18 @@ jobs:
           path: |
             app/build/outputs/connected_android_test_additional_output/debugAndroidTest/connected
             app/build/outputs/androidTest-results/connected
+      - name: Compare screenshots
+        run: |
+          ls -ls app/build/outputs/connected_android_test_additional_output/debugAndroidTest/connected
+          cp app/build/outputs/connected_android_test_additional_output/debugAndroidTest/connected/emulator\(AVD\)\ -\ 9/* screenshotsToCompare
+          ./screenShotCompare.sh
+      - name: Archive screenshots diffs
+        if: ${{ always() }}
+        uses: actions/upload-artifact@v3
+        with:
+          name: Touch-Screenshots-diffs
+          path: |
+            screenshotDiffs
   Check:
     name: Check
     runs-on: ubuntu-latest

.gitmodules

@@ -0,0 +1,3 @@
+[submodule "git-diff-image"]
+	path = git-diff-image
+	url = git@github.com:ewanmellor/git-diff-image.git

app/src/androidTest/java/info/touchimage/demo/TouchTest.kt

@@ -28,9 +28,10 @@ class TouchTest {
     @Test
     fun testSingleTouch() {
         onView(withId(R.id.imageSingle)).perform(TouchAction(4f, 8f))
-        takeScreenshot()
+        onView(withId(R.id.imageSingle)).captureToBitmap()
             .writeToTestStorage("${javaClass.simpleName}_${nameRule.methodName}-touch1")
         onView(withId(R.id.imageSingle)).perform(TouchAction(40f, 80f))
+        Thread.sleep(300)
         takeScreenshot()
             .writeToTestStorage("${javaClass.simpleName}_${nameRule.methodName}-touch2")
     }

app/src/main/java/info/touchimage/demo/GlideExampleActivity.kt

@@ -32,8 +32,9 @@ class GlideExampleActivity : AppCompatActivity() {
                 override fun onResourceReady(resource: Drawable, transition: Transition<in Drawable?>?) {
                     binding.imageGlide.setImageDrawable(resource)
                     binding.textLoaded.visibility = View.VISIBLE
-                    binding.textLoaded.text = getString(R.string.loaded) + " within ${System.currentTimeMillis() - start} ms"
-                    Log.d("GlideExampleActivity", binding.textLoaded.text as String)
+                    val loadTime = System.currentTimeMillis() - start
+                    binding.textLoaded.text = getString(R.string.loaded) + " within <ignored> ms"
+                    Log.d("GlideExampleActivity", loadTime.toString() + "ms")
                 }
 
                 override fun onLoadCleared(placeholder: Drawable?) = Unit

git-diff-image

@@ -0,0 +1,9 @@
+diffFiles=./screenshotDiffs
+mkdir $diffFiles
+#cp app/build/outputs/connected_android_test_additional_output/debugAndroidTest/connected/emulator\(AVD\)\ -\ 9/* screenshotsToCompare
+set -x
+./git-diff-image/install.sh
+GIT_DIFF_IMAGE_OUTPUT_DIR=$diffFiles git diff-image
+
+# set error when diffs are there
+[ "$(ls -A $diffFiles)" ] && exit 1 || exit 0