test: fix video capture mode with analysis test to ignore if analysis…

… is not supported
ujizin · Dec 10, 2023 · f802d9d · f802d9d
1 parent e70279f
commit f802d9d
Show file tree

Hide file tree

Showing 5 changed files with 40 additions and 13 deletions.
diff --git a/camposer/src/androidTest/AndroidManifest.xml b/camposer/src/androidTest/AndroidManifest.xml
@@ -3,6 +3,12 @@
 
     <uses-sdk android:targetSdkVersion="31" />
 
+    <uses-permission android:name="android.permission.POST_NOTIFICATIONS" />
+
+    <uses-permission android:name="android.permission.READ_MEDIA_IMAGES" />
+    <uses-permission android:name="android.permission.READ_MEDIA_AUDIO" />
+    <uses-permission android:name="android.permission.READ_MEDIA_VIDEO" />
+
     <uses-permission android:name="android.permission.CAMERA" />
     <uses-feature
         android:name="android.hardware.camera2"

diff --git a/camposer/src/androidTest/java/com/ujizin/camposer/CameraTest.kt b/camposer/src/androidTest/java/com/ujizin/camposer/CameraTest.kt
@@ -1,6 +1,7 @@
 package com.ujizin.camposer
 
 import android.Manifest
+import android.os.Build
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.test.junit4.ComposeContentTestRule
 import androidx.compose.ui.test.junit4.createComposeRule
@@ -16,9 +17,23 @@ internal abstract class CameraTest {
 
     @get:Rule
     val permissions: GrantPermissionRule = GrantPermissionRule.grant(
-        Manifest.permission.CAMERA,
-        Manifest.permission.RECORD_AUDIO,
-        Manifest.permission.READ_EXTERNAL_STORAGE
+        *mutableListOf(
+            Manifest.permission.CAMERA,
+            Manifest.permission.RECORD_AUDIO,
+        ).apply {
+            if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU) {
+                add(Manifest.permission.POST_NOTIFICATIONS)
+                add(Manifest.permission.READ_MEDIA_AUDIO)
+                add(Manifest.permission.READ_MEDIA_VIDEO)
+                add(Manifest.permission.READ_MEDIA_IMAGES)
+            } else {
+                add(Manifest.permission.READ_EXTERNAL_STORAGE)
+            }
+
+            if (Build.VERSION.SDK_INT < Build.VERSION_CODES.Q) {
+                add(Manifest.permission.WRITE_EXTERNAL_STORAGE)
+            }
+        }.toTypedArray()
     )
 
     protected lateinit var cameraState: CameraState

diff --git a/camposer/src/androidTest/java/com/ujizin/camposer/CaptureModeTest.kt b/camposer/src/androidTest/java/com/ujizin/camposer/CaptureModeTest.kt
@@ -90,8 +90,10 @@ internal class CaptureModeTest : CameraTest() {
                     is VideoCaptureResult.Success -> {
                         assertEquals(Uri.fromFile(videoFile), result.savedUri)
                         assertEquals(CaptureMode.Video, cameraState.captureMode)
-                        assertEquals(true, cameraState.isImageAnalysisEnabled)
-                        assertEquals(true, isAnalyzeCalled)
+                        if (cameraState.isImageAnalysisSupported) {
+                            assertEquals(true, cameraState.isImageAnalysisEnabled)
+                            assertEquals(true, isAnalyzeCalled)
+                        }
                     }
                 }
             }
@@ -115,7 +117,7 @@ internal class CaptureModeTest : CameraTest() {
     }
 
     private companion object {
-        private const val RECORD_VIDEO_DELAY = 500L
+        private const val RECORD_VIDEO_DELAY = 1000L
         private const val IMAGE_TEST_FILENAME = "capture_mode_test.jpg"
         private const val VIDEO_TEST_FILENAME = "capture_mode_test.mp4"
     }

diff --git a/camposer/src/androidTest/java/com/ujizin/camposer/FlashModeTest.kt b/camposer/src/androidTest/java/com/ujizin/camposer/FlashModeTest.kt
@@ -27,7 +27,7 @@ internal class FlashModeTest : CameraTest() {
 
         FlashMode.values().forEach { mode ->
             flashMode.value = mode
-            onNodeWithTag("$mode").assertIsDisplayed()
+            onNodeWithTag("${flashMode.value}").assertIsDisplayed()
             runOnIdle { assertEquals(mode, cameraState.flashMode) }
         }
     }
@@ -39,7 +39,7 @@ internal class FlashModeTest : CameraTest() {
         cameraState.hasFlashUnit = false
 
         flashMode.value = FlashMode.On
-        onNodeWithTag("$flashMode").assertDoesNotExist()
+        onNodeWithTag("${flashMode.value}").assertDoesNotExist()
         runOnIdle { assertEquals(FlashMode.Off, cameraState.flashMode) }
     }
 

diff --git a/camposer/src/androidTest/java/com/ujizin/camposer/ImageAnalyzerTest.kt b/camposer/src/androidTest/java/com/ujizin/camposer/ImageAnalyzerTest.kt
@@ -27,8 +27,10 @@ internal class ImageAnalyzerTest : CameraTest() {
         waitUntil(ANALYZER_TIME_OUT) { isAnalyzeCalled }
 
         runOnIdle {
-            assertEquals(true, cameraState.isImageAnalysisEnabled)
-            assertEquals(true, isAnalyzeCalled)
+            if (cameraState.isImageAnalysisSupported) {
+                assertEquals(true, cameraState.isImageAnalysisEnabled)
+                assertEquals(true, isAnalyzeCalled)
+            }
         }
     }
 
@@ -38,14 +40,16 @@ internal class ImageAnalyzerTest : CameraTest() {
         initImageAnalyzerCamera(isImageAnalyzeEnabled = false) { isAnalyzeCalled = true }
 
         runOnIdle {
-            assertEquals(false, cameraState.isImageAnalysisEnabled)
-            assertEquals(false, isAnalyzeCalled)
+            if (cameraState.isImageAnalysisSupported) {
+                assertEquals(false, cameraState.isImageAnalysisEnabled)
+                assertEquals(false, isAnalyzeCalled)
+            }
         }
     }
 
     @Test
     fun test_imageAnalysisSupported() = with(composeTestRule) {
-        var expectImageAnalysisSupported = true
+        var expectImageAnalysisSupported: Boolean? = null
         initImageAnalyzerCamera(isImageAnalyzeEnabled = true) {
             expectImageAnalysisSupported = cameraState.isImageAnalysisSupported()
         }