Began adding a UI Smoke Test

Wavesonics · Wavesonics · commit 5e5d4da56283 · 2025-05-11T21:25:20.000-07:00
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -34,11 +34,11 @@ jobs:
       - name: Run Unit Tests
         run: ./gradlew test
     
-#      - name: Run Instrumentation Tests
-#        uses: reactivecircus/android-emulator-runner@v2
-#        with:
-#          api-level: 35
-#          target: default
-#          arch: x86_64
-#          profile: Nexus 6
-#          script: ./gradlew connectedCheck
+      - name: Run Instrumentation Tests
+        uses: reactivecircus/android-emulator-runner@v2
+        with:
+          api-level: 35
+          target: default
+          arch: x86_64
+          profile: Nexus 6
+          script: ./gradlew connectedCheck
diff --git a/app/build.gradle.kts b/app/build.gradle.kts
@@ -126,11 +126,13 @@ dependencies {
 	testImplementation(libs.kotlinx.coroutines.test)
 	testImplementation(kotlin("test"))
 	androidTestImplementation(libs.androidx.junit)
-	androidTestImplementation(libs.androidx.espresso.core)
+	androidTestImplementation(libs.androidx.rules)
 	androidTestImplementation(platform(libs.androidx.compose.bom))
 	androidTestImplementation(libs.androidx.ui.test.junit4)
 	androidTestImplementation(libs.mockk.android)
 	androidTestImplementation(libs.mockk.agent)
+	androidTestImplementation(libs.ui.test.junit4)
+	debugImplementation(libs.ui.test.manifest)
 	debugImplementation(libs.androidx.ui.tooling)
 	debugImplementation(libs.androidx.ui.test.manifest)
 }
diff --git a/app/src/androidTest/kotlin/com/darkrockstudios/app/securecamera/SmokeTestUiTest.kt b/app/src/androidTest/kotlin/com/darkrockstudios/app/securecamera/SmokeTestUiTest.kt
@@ -0,0 +1,142 @@
+package com.darkrockstudios.app.securecamera
+
+import android.app.Application
+import android.content.res.Resources
+import androidx.annotation.StringRes
+import androidx.compose.ui.semantics.Role
+import androidx.compose.ui.semantics.SemanticsProperties
+import androidx.compose.ui.test.SemanticsMatcher
+import androidx.compose.ui.test.assertIsDisplayed
+import androidx.compose.ui.test.hasContentDescription
+import androidx.compose.ui.test.hasSetTextAction
+import androidx.compose.ui.test.hasTextExactly
+import androidx.compose.ui.test.junit4.createAndroidComposeRule
+import androidx.compose.ui.test.onNodeWithText
+import androidx.compose.ui.test.performClick
+import androidx.compose.ui.test.performTextClearance
+import androidx.compose.ui.test.performTextInput
+import androidx.test.core.app.ApplicationProvider
+import androidx.test.rule.GrantPermissionRule
+import kotlinx.coroutines.test.runTest
+import org.junit.Rule
+import org.junit.Test
+import kotlin.time.Duration.Companion.seconds
+
+
+class SmokeTestUiTest {
+
+	@get:Rule
+	val permissionsRule = GrantPermissionRule.grant(
+		android.Manifest.permission.POST_NOTIFICATIONS,
+		android.Manifest.permission.ACCESS_FINE_LOCATION,
+		android.Manifest.permission.CAMERA
+	)
+
+	@get:Rule
+	val composeTestRule = createAndroidComposeRule<MainActivity>()
+
+	@Test
+	fun smokeTest() = runTest {
+		composeTestRule.apply {
+			onNodeWithText(str(R.string.intro_next)).performClick()
+			onNodeWithText(str(R.string.intro_slide1_title)).assertIsDisplayed()
+
+			onNodeWithText(str(R.string.intro_next)).performClick()
+			onNodeWithText(str(R.string.intro_slide2_title)).assertIsDisplayed()
+
+			onNodeWithText(str(R.string.intro_skip)).performClick()
+			onNodeWithText(str(R.string.security_intro_supported_security_label)).assertIsDisplayed()
+
+			onNodeWithText(str(R.string.intro_next)).performClick()
+			onNodeWithText(str(R.string.pin_creation_title)).assertIsDisplayed()
+
+			onNode(
+				hasSetTextAction() and hasTextExactly(
+					str(R.string.pin_creation_hint),
+					includeEditableText = false
+				)
+			).performTextInput("3133734")
+
+			onNode(
+				hasSetTextAction() and hasTextExactly(
+					str(R.string.pin_creation_confirm_hint),
+					includeEditableText = false
+				)
+			).performTextInput("313373")
+
+			onNodeWithText(str(R.string.pin_creation_button)).performClick()
+
+			onNodeWithText(str(R.string.pin_creation_error)).assertIsDisplayed()
+
+			onNode(
+				hasSetTextAction() and hasTextExactly(
+					str(R.string.pin_creation_hint),
+					includeEditableText = false
+				)
+			).apply {
+				performTextClearance()
+				performTextInput("123456")
+			}
+
+			onNode(
+				hasSetTextAction() and hasTextExactly(
+					str(R.string.pin_creation_confirm_hint),
+					includeEditableText = false
+				)
+			).apply {
+				performTextClearance()
+				performTextInput("123456")
+			}
+
+			onNodeWithText(str(R.string.pin_creation_button)).performClick()
+
+			onNodeWithText(str(R.string.pin_creation_error_weak_pin)).assertIsDisplayed()
+
+			onNode(
+				hasSetTextAction() and hasTextExactly(
+					str(R.string.pin_creation_hint),
+					includeEditableText = false
+				)
+			).apply {
+				performTextClearance()
+				performTextInput("313373")
+			}
+
+			onNode(
+				hasSetTextAction() and hasTextExactly(
+					str(R.string.pin_creation_confirm_hint),
+					includeEditableText = false
+				)
+			).apply {
+				performTextClearance()
+				performTextInput("313373")
+			}
+
+			onNodeWithText(str(R.string.pin_creation_button)).performClick()
+
+			onNodeWithText(str(R.string.pin_creating_vault)).assertIsDisplayed()
+
+			composeTestRule.waitUntil(
+				timeoutMillis = 10.seconds.inWholeMilliseconds
+			) {
+				composeTestRule
+					.onAllNodes(hasRole(Role.Button) and hasContentDescription(str(R.string.camera_shutter_button_desc)))
+					.fetchSemanticsNodes().isNotEmpty()
+			}
+
+			onNode(
+				hasRole(Role.Button) and hasContentDescription(str(R.string.camera_shutter_button_desc))
+			).assertExists()
+		}
+	}
+
+	fun hasRole(role: Role): SemanticsMatcher =
+		SemanticsMatcher.expectValue(SemanticsProperties.Role, role)
+
+	private fun str(@StringRes id: Int): String = r.getString(id)
+	private val r: Resources
+		get() {
+			val application = ApplicationProvider.getApplicationContext<Application?>()
+			return application.resources
+		}
+}
diff --git a/app/src/main/kotlin/com/darkrockstudios/app/securecamera/camera/BottomCameraControls.kt b/app/src/main/kotlin/com/darkrockstudios/app/securecamera/camera/BottomCameraControls.kt
@@ -9,24 +9,33 @@ import androidx.compose.material.icons.Icons
 import androidx.compose.material.icons.filled.Camera
 import androidx.compose.material.icons.filled.PhotoLibrary
 import androidx.compose.material.icons.filled.Settings
-import androidx.compose.material3.*
+import androidx.compose.material3.ButtonDefaults
+import androidx.compose.material3.ElevatedButton
+import androidx.compose.material3.FilledTonalButton
+import androidx.compose.material3.Icon
+import androidx.compose.material3.MaterialTheme
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.draw.clip
+import androidx.compose.ui.platform.LocalContext
 import androidx.compose.ui.res.stringResource
+import androidx.compose.ui.semantics.contentDescription
+import androidx.compose.ui.semantics.semantics
 import androidx.compose.ui.unit.dp
 import androidx.navigation.NavHostController
 import com.darkrockstudios.app.securecamera.R
 import com.darkrockstudios.app.securecamera.navigation.AppDestinations
 
 @Composable
 fun BottomCameraControls(
-	modifier: Modifier = Modifier.Companion,
+	modifier: Modifier = Modifier,
 	onCapture: (() -> Unit)?,
 	isLoading: Boolean,
 	navController: NavHostController,
 ) {
+	val context = LocalContext.current
+
 	Box(
 		modifier = modifier
 			.fillMaxWidth()
@@ -35,22 +44,25 @@ fun BottomCameraControls(
 		ElevatedButton(
 			onClick = { navController.navigate(AppDestinations.SETTINGS_ROUTE) },
 			enabled = isLoading.not(),
-			modifier = Modifier.Companion.align(Alignment.Companion.BottomStart),
+			modifier = Modifier.align(Alignment.BottomStart),
 		) {
 			Icon(
 				imageVector = Icons.Filled.Settings,
 				contentDescription = stringResource(R.string.camera_settings_button),
-				modifier = Modifier.Companion.size(32.dp),
+				modifier = Modifier.size(32.dp),
 			)
 		}
 
 		if (onCapture != null) {
 			FilledTonalButton(
 				onClick = onCapture,
-				modifier = Modifier.Companion
+				modifier = Modifier
 					.size(80.dp)
 					.clip(CircleShape)
-					.align(Alignment.Companion.BottomCenter),
+					.align(Alignment.BottomCenter)
+					.semantics {
+						contentDescription = context.getString(R.string.camera_shutter_button_desc)
+					},
 				colors = ButtonDefaults.filledTonalButtonColors(
 					containerColor = MaterialTheme.colorScheme.primary,
 				),
@@ -59,20 +71,20 @@ fun BottomCameraControls(
 					imageVector = Icons.Filled.Camera,
 					contentDescription = stringResource(id = R.string.camera_capture_content_description),
 					tint = MaterialTheme.colorScheme.onPrimary,
-					modifier = Modifier.Companion.size(32.dp),
+					modifier = Modifier.size(32.dp),
 				)
 			}
 		}
 
 		ElevatedButton(
 			onClick = { navController.navigate(AppDestinations.GALLERY_ROUTE) },
 			enabled = isLoading.not(),
-			modifier = Modifier.Companion.align(Alignment.Companion.BottomEnd),
+			modifier = Modifier.align(Alignment.BottomEnd),
 		) {
 			Icon(
 				imageVector = Icons.Filled.PhotoLibrary,
 				contentDescription = stringResource(id = R.string.camera_gallery_content_description),
-				modifier = Modifier.Companion.size(32.dp),
+				modifier = Modifier.size(32.dp),
 			)
 		}
 	}
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
@@ -117,6 +117,7 @@
     <string name="camera_settings_content_description">Settings</string>
     <string name="camera_permissions_required">Camera permissions are required.</string>
     <string name="camera_open_settings">Open Settings</string>
+    <string name="camera_shutter_button_desc">Take Photo</string>
 
     <!-- Settings Screen -->
     <string name="settings_title">Settings</string>
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -3,6 +3,7 @@ argon2kt = "1.6.0"
 bcrypt = "0.10.2"
 faceDetection = "16.1.7"
 kotlinxCoroutinesTest = "1.10.2"
+rules = "1.6.1"
 versionCode = "15"
 versionName = "3.1.0"
 workManager = "2.10.1"
@@ -26,7 +27,6 @@ runtimeLivedata = "1.8.1"
 coreKtx = "1.16.0"
 junit = "4.13.2"
 junitVersion = "1.2.1"
-espressoCore = "3.6.1"
 activityCompose = "1.10.1"
 composeBom = "2025.05.00"
 navigationCompose = "2.9.0"
@@ -52,6 +52,7 @@ androidx-lifecycle-viewmodel-compose = { module = "androidx.lifecycle:lifecycle-
 androidx-lifecycle-viewmodel-ktx = { module = "androidx.lifecycle:lifecycle-viewmodel-ktx", version.ref = "lifecycleViewModel" }
 androidx-material-icons-extended = { module = "androidx.compose.material:material-icons-extended", version.ref = "materialIconsExtended" }
 androidx-navigation-compose = { module = "androidx.navigation:navigation-compose", version.ref = "navigationCompose" }
+androidx-rules = { module = "androidx.test:rules", version.ref = "rules" }
 androidx-runtime-livedata = { module = "androidx.compose.runtime:runtime-livedata", version.ref = "runtimeLivedata" }
 argon2kt = { module = "com.lambdapioneer.argon2kt:argon2kt", version.ref = "argon2kt" }
 bcrypt = { module = "at.favre.lib:bcrypt", version.ref = "bcrypt" }
@@ -63,7 +64,6 @@ cryptography-provider-jdk = { module = "dev.whyoleg.cryptography:cryptography-pr
 cryptography-core = { module = "dev.whyoleg.cryptography:cryptography-core" }
 junit = { group = "junit", name = "junit", version.ref = "junit" }
 androidx-junit = { group = "androidx.test.ext", name = "junit", version.ref = "junitVersion" }
-androidx-espresso-core = { group = "androidx.test.espresso", name = "espresso-core", version.ref = "espressoCore" }
 androidx-lifecycle-runtime-ktx = { group = "androidx.lifecycle", name = "lifecycle-runtime-ktx", version.ref = "lifecycleRuntimeCompose" }
 androidx-activity-compose = { group = "androidx.activity", name = "activity-compose", version.ref = "activityCompose" }
 androidx-compose-bom = { group = "androidx.compose", name = "compose-bom", version.ref = "composeBom" }
@@ -89,6 +89,8 @@ mockk-android = { module = "io.mockk:mockk-android", version.ref = "mockk" }
 androidx-datastore-preferences = { module = "androidx.datastore:datastore-preferences", version.ref = "datastorePreferences" }
 androidx-datastore-preferences-core = { module = "androidx.datastore:datastore-preferences-core", version.ref = "datastorePreferences" }
 kotlinx-serialization-json = { module = "org.jetbrains.kotlinx:kotlinx-serialization-json", version.ref = "kotlinx-serialization" }
+ui-test-junit4 = { module = "androidx.compose.ui:ui-test-junit4" }
+ui-test-manifest = { module = "androidx.compose.ui:ui-test-manifest" }
 zoomable = { module = "net.engawapg.lib:zoomable", version.ref = "zoomable" }
 androidx-work-runtime-ktx = { module = "androidx.work:work-runtime-ktx", version.ref = "workManager" }
 
