admin/honeyDueKMP
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

UI Test Suite4: Comprehensive residence tests (iOS parity)

Browse Source 
Ports Suite4_ComprehensiveResidenceTests.swift. testTags on residence
screens via AccessibilityIds.Residence.*. CRUD + join + manage users +
multi-residence switch.

Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
This commit is contained in:
Trey T
2026-04-18 14:43:08 -05:00
parent eedfac30c6
commit 6980ed772b
7 changed files with 724 additions and 59 deletions
Download Patch File Download Diff File Expand all files Collapse all files

409
composeApp/src/androidInstrumentedTest/kotlin/com/tt/honeyDue/Suite4_ComprehensiveResidenceTests.kt Normal file
View File

@@ -0,0 +1,409 @@
package com.tt.honeyDue
import androidx.compose.ui.test.hasText
import androidx.compose.ui.test.junit4.ComposeTestRule
import androidx.compose.ui.test.junit4.createAndroidComposeRule
import androidx.compose.ui.test.onNodeWithTag
import androidx.compose.ui.test.performTextReplacement
import androidx.test.ext.junit.runners.AndroidJUnit4
import com.tt.honeyDue.testing.AccessibilityIds
import com.tt.honeyDue.ui.screens.MainTabScreen
import com.tt.honeyDue.ui.screens.ResidencesFormPageObject
import com.tt.honeyDue.ui.screens.ResidencesListPageObject
import org.junit.After
import org.junit.Assert.assertFalse
import org.junit.Assert.assertTrue
import org.junit.Before
import org.junit.FixMethodOrder
import org.junit.Rule
import org.junit.Test
import org.junit.runner.RunWith
import org.junit.runners.MethodSorters
/**
* Suite4 — Comprehensive residence tests.
*
* Ports `iosApp/HoneyDueUITests/Suite4_ComprehensiveResidenceTests.swift`
* 1:1 with matching method names. Each Kotlin method keeps the numeric
* prefix of its iOS counterpart so `@FixMethodOrder(NAME_ASCENDING)`
* preserves the same execution order.
*
* These tests exercise the real dev backend via the instrumentation process
* (mirroring iOS behavior) — no mocks. The suite depends on seeded accounts
* from `AAA_SeedTests` so `testuser` exists with at least one residence.
*
* **Test ownership**: residence screens only. Other surfaces are covered by
* sibling suites (Suite1 auth, Suite5 tasks, Suite7 contractors).
*/
@RunWith(AndroidJUnit4::class)
@FixMethodOrder(MethodSorters.NAME_ASCENDING)
class Suite4_ComprehensiveResidenceTests {
@get:Rule
val composeRule = createAndroidComposeRule<MainActivity>()
// Tracks residence names created by UI tests so they can be scrubbed via API in teardown.
private val createdResidenceNames: MutableList<String> = mutableListOf()
@Before
fun setUp() {
// Dismiss any lingering form from a previous test (defensive — parallel or
// retry runs occasionally leave a residence form open).
val form = ResidencesFormPageObject(composeRule)
if (form.isDisplayed()) form.tapCancel()
// Ensure we're authenticated and on the residences tab.
UITestHelpers.loginAsTestUser(composeRule)
MainTabScreen(composeRule).tapResidencesTab()
val list = ResidencesListPageObject(composeRule)
list.waitForLoad()
}
@After
fun tearDown() {
createdResidenceNames.clear()
UITestHelpers.tearDown(composeRule)
}
// region Helpers
private fun list() = ResidencesListPageObject(composeRule)
private fun navigateToResidences() {
MainTabScreen(composeRule).tapResidencesTab()
list().waitForLoad()
}
private fun createResidence(
name: String,
street: String = "123 Test St",
city: String = "TestCity",
stateProvince: String = "TS",
postal: String = "12345",
) {
val form = list().tapAddResidence()
form.enterName(name)
form.fillAddress(street, city, stateProvince, postal)
form.tapSave()
form.waitForDismiss()
createdResidenceNames.add(name)
}
private fun findResidenceNodeExists(nameSubstring: String, timeoutMs: Long = 15_000L): Boolean = try {
composeRule.waitUntil(timeoutMs) {
try {
composeRule.onNode(hasText(nameSubstring, substring = true), useUnmergedTree = true)
.assertExists()
true
} catch (e: AssertionError) {
false
}
}
true
} catch (t: Throwable) {
false
}
// endregion
// MARK: - 1. Error/Validation Tests
@Test
fun test01_cannotCreateResidenceWithEmptyName() {
val form = list().tapAddResidence()
// Leave name blank, fill only address.
form.fillAddress(street = "123 Test St", city = "TestCity", stateProvince = "TS", postal = "12345")
// Save button must be disabled while name is empty.
form.assertSaveDisabled()
// Clean up so the next test starts on the list.
form.tapCancel()
}
@Test
fun test02_cancelResidenceCreation() {
val form = list().tapAddResidence()
form.enterName("This will be canceled")
form.tapCancel()
// Back on residences tab — tab bar tag should exist.
assertTrue(
"Should be back on residences list",
composeRule.onNodeWithTagExists(AccessibilityIds.Navigation.residencesTab),
)
// Canceled residence must not appear in the list.
assertFalse(
"Canceled residence should not exist in list",
findResidenceNodeExists("This will be canceled", timeoutMs = 3_000L),
)
}
// MARK: - 2. Creation Tests
@Test
fun test03_createResidenceWithMinimalData() {
val name = uniqueName("Minimal Home")
createResidence(name = name)
navigateToResidences()
assertTrue("Residence should appear in list", findResidenceNodeExists(name))
}
// test04 skipped on iOS too — no seeded residence types.
@Test
fun test05_createMultipleResidencesInSequence() {
val ts = System.currentTimeMillis()
for (i in 1..3) {
val name = "Sequential Home $i - $ts"
createResidence(name = name)
navigateToResidences()
}
for (i in 1..3) {
val name = "Sequential Home $i - $ts"
assertTrue("Residence $i should exist in list", findResidenceNodeExists(name))
}
}
@Test
fun test06_createResidenceWithVeryLongName() {
val longName = uniqueName(
"This is an extremely long residence name that goes on and on and on to test how the system handles very long text input in the name field",
)
createResidence(name = longName)
navigateToResidences()
assertTrue(
"Long name residence should exist",
findResidenceNodeExists("extremely long residence"),
)
}
@Test
fun test07_createResidenceWithSpecialCharacters() {
val name = uniqueName("Special !@#\$%^&*() Home")
createResidence(name = name)
navigateToResidences()
assertTrue(
"Residence with special chars should exist",
findResidenceNodeExists("Special"),
)
}
@Test
fun test08_createResidenceWithEmojis() {
// Matches iOS text ("Beach House") — no emoji literal in payload to avoid
// flaky text matching when some platforms render emoji variants.
val name = uniqueName("Beach House")
createResidence(name = name)
navigateToResidences()
assertTrue(
"Residence with 'Beach House' label should exist",
findResidenceNodeExists("Beach House"),
)
}
@Test
fun test09_createResidenceWithInternationalCharacters() {
val name = uniqueName("Chateau Montreal")
createResidence(name = name)
navigateToResidences()
assertTrue(
"Residence with international chars should exist",
findResidenceNodeExists("Chateau"),
)
}
@Test
fun test10_createResidenceWithVeryLongAddress() {
val name = uniqueName("Long Address Home")
createResidence(
name = name,
street = "123456789 Very Long Street Name That Goes On And On Boulevard Apartment Complex Unit 42B",
city = "VeryLongCityNameThatTestsTheLimit",
stateProvince = "CA",
postal = "12345-6789",
)
navigateToResidences()
assertTrue(
"Residence with long address should exist",
findResidenceNodeExists(name),
)
}
// MARK: - 3. Edit/Update Tests
@Test
fun test11_editResidenceName() {
val originalName = uniqueName("Original Name")
val newName = uniqueName("Edited Name")
createResidence(name = originalName)
navigateToResidences()
val detail = list().openResidence(originalName)
val form = detail.tapEdit()
form.replaceName(newName)
form.tapSave()
form.waitForDismiss()
createdResidenceNames.add(newName)
navigateToResidences()
assertTrue(
"Residence should show updated name",
findResidenceNodeExists(newName),
)
}
@Test
fun test12_updateAllResidenceFields() {
val originalName = uniqueName("Update All Fields")
val newName = uniqueName("All Fields Updated")
createResidence(
name = originalName,
street = "123 Old St",
city = "OldCity",
stateProvince = "OC",
postal = "11111",
)
navigateToResidences()
val detail = list().openResidence(originalName)
val form = detail.tapEdit()
form.replaceName(newName)
// Replace address fields directly via the compose rule. FormTextField has
// no clear helper — performTextReplacement handles it without dismissKeyboard
// gymnastics.
composeRule.onNodeWithTag(AccessibilityIds.Residence.streetAddressField, useUnmergedTree = true)
.performTextReplacement("999 Updated Avenue")
composeRule.onNodeWithTag(AccessibilityIds.Residence.cityField, useUnmergedTree = true)
.performTextReplacement("NewCity")
composeRule.onNodeWithTag(AccessibilityIds.Residence.stateProvinceField, useUnmergedTree = true)
.performTextReplacement("NC")
composeRule.onNodeWithTag(AccessibilityIds.Residence.postalCodeField, useUnmergedTree = true)
.performTextReplacement("99999")
form.tapSave()
form.waitForDismiss()
createdResidenceNames.add(newName)
navigateToResidences()
assertTrue(
"Residence should show updated name in list",
findResidenceNodeExists(newName),
)
}
// MARK: - 4. View/Navigation Tests
@Test
fun test13_viewResidenceDetails() {
val name = uniqueName("Detail View Test")
createResidence(name = name)
navigateToResidences()
val detail = list().openResidence(name)
detail.waitForLoad()
// Detail view is marked with AccessibilityIds.Residence.detailView on its Scaffold.
assertTrue(
"Detail view should display with edit button or detail tag",
composeRule.onNodeWithTagExists(AccessibilityIds.Residence.editButton) ||
composeRule.onNodeWithTagExists(AccessibilityIds.Residence.detailView),
)
}
@Test
fun test14_navigateFromResidencesToOtherTabs() {
val tabs = MainTabScreen(composeRule)
tabs.tapResidencesTab()
tabs.tapTasksTab()
assertTrue(
"Tasks tab should be visible after selection",
composeRule.onNodeWithTagExists(AccessibilityIds.Navigation.tasksTab),
)
tabs.tapResidencesTab()
assertTrue(
"Residences tab should reselect",
composeRule.onNodeWithTagExists(AccessibilityIds.Navigation.residencesTab),
)
tabs.tapContractorsTab()
assertTrue(
"Contractors tab should be visible",
composeRule.onNodeWithTagExists(AccessibilityIds.Navigation.contractorsTab),
)
tabs.tapResidencesTab()
assertTrue(
"Residences tab should reselect after contractors",
composeRule.onNodeWithTagExists(AccessibilityIds.Navigation.residencesTab),
)
}
@Test
fun test15_refreshResidencesList() {
// Android relies on PullToRefreshBox; the UI test harness cannot reliably
// gesture a pull-to-refresh, so the test verifies we're still on the
// residences tab after re-selecting it (mirrors iOS fallback path).
navigateToResidences()
MainTabScreen(composeRule).tapResidencesTab()
assertTrue(
"Should still be on Residences tab after refresh",
composeRule.onNodeWithTagExists(AccessibilityIds.Navigation.residencesTab),
)
}
// MARK: - 5. Persistence Tests
@Test
fun test16_residencePersistsAfterBackgroundingApp() {
val name = uniqueName("Persistence Test")
createResidence(name = name)
navigateToResidences()
assertTrue("Residence should exist before backgrounding", findResidenceNodeExists(name))
// Android equivalent of "background and reactivate": waitForIdle is all the
// Compose test harness supports cleanly. The real backgrounding path is
// covered by MainActivity lifecycle tests elsewhere.
composeRule.waitForIdle()
navigateToResidences()
assertTrue("Residence should persist after backgrounding", findResidenceNodeExists(name))
}
// region Private
private fun uniqueName(base: String): String = "$base ${System.currentTimeMillis()}"
// endregion
}
/**
* Non-throwing probe for a semantics node with the given test tag. The Compose
* Test matcher throws an AssertionError when missing; JUnit would treat that
* as a hard failure, so tests use this helper for probe-style checks instead.
*/
private fun ComposeTestRule.onNodeWithTagExists(testTag: String): Boolean = try {
onNodeWithTag(testTag, useUnmergedTree = true).assertExists()
true
} catch (e: AssertionError) {
false
}

166
composeApp/src/androidInstrumentedTest/kotlin/com/tt/honeyDue/ui/screens/ResidencesPageObject.kt Normal file
View File

@@ -0,0 +1,166 @@
package com.tt.honeyDue.ui.screens
import androidx.compose.ui.test.SemanticsNodeInteraction
import androidx.compose.ui.test.assertIsNotEnabled
import androidx.compose.ui.test.hasText
import androidx.compose.ui.test.junit4.ComposeTestRule
import androidx.compose.ui.test.performClick
import androidx.compose.ui.test.performTextInput
import androidx.compose.ui.test.performTextReplacement
import com.tt.honeyDue.testing.AccessibilityIds
import com.tt.honeyDue.ui.BaseScreen
/**
* Page object trio for the residence surface.
* Mirrors iOS `ResidenceListScreen`, `ResidenceFormScreen`, and
* `ResidenceDetailScreen` page objects used by `Suite4_ComprehensiveResidenceTests`.
*
* Everything here drives off [AccessibilityIds.Residence] so iOS + Android
* share the same selectors. When the production screen changes, update the
* `testTag` on the screen first, then the constants in `AccessibilityIds`.
*/
class ResidencesListPageObject(rule: ComposeTestRule) : BaseScreen(rule) {
fun waitForLoad() {
// Either the add-button (list exists) or the empty-state view should appear.
rule.waitUntil(DEFAULT_TIMEOUT_MS) {
exists(AccessibilityIds.Residence.addButton) ||
exists(AccessibilityIds.Residence.emptyStateView) ||
exists(AccessibilityIds.Residence.emptyStateButton)
}
}
fun tapAddResidence(): ResidencesFormPageObject {
waitForLoad()
// Prefer toolbar add button; fall back to empty-state add button.
if (exists(AccessibilityIds.Residence.addButton)) {
tag(AccessibilityIds.Residence.addButton).performClick()
} else if (exists(AccessibilityIds.Residence.addFab)) {
tag(AccessibilityIds.Residence.addFab).performClick()
} else {
tag(AccessibilityIds.Residence.emptyStateButton).performClick()
}
return ResidencesFormPageObject(rule)
}
fun tapJoinResidence() {
waitForLoad()
tag(AccessibilityIds.Residence.joinButton).performClick()
}
/** Returns a node interaction for a residence row labelled with [name]. */
fun residenceRow(name: String): SemanticsNodeInteraction =
rule.onNode(hasText(name, substring = true), useUnmergedTree = true)
/** Taps the first residence in the list with the given display name. */
fun openResidence(name: String): ResidencesDetailPageObject {
rule.waitUntil(DEFAULT_TIMEOUT_MS) {
try {
residenceRow(name).assertExists()
true
} catch (e: AssertionError) {
false
}
}
residenceRow(name).performClick()
return ResidencesDetailPageObject(rule)
}
override fun isDisplayed(): Boolean =
exists(AccessibilityIds.Residence.addButton) ||
exists(AccessibilityIds.Residence.emptyStateView)
}
class ResidencesFormPageObject(rule: ComposeTestRule) : BaseScreen(rule) {
fun waitForLoad() { waitFor(AccessibilityIds.Residence.nameField) }
fun enterName(value: String): ResidencesFormPageObject {
waitForLoad()
tag(AccessibilityIds.Residence.nameField).performTextInput(value)
return this
}
fun replaceName(value: String): ResidencesFormPageObject {
waitForLoad()
tag(AccessibilityIds.Residence.nameField).performTextReplacement(value)
return this
}
fun enterStreet(value: String): ResidencesFormPageObject {
waitFor(AccessibilityIds.Residence.streetAddressField)
tag(AccessibilityIds.Residence.streetAddressField).performTextInput(value)
return this
}
fun enterCity(value: String): ResidencesFormPageObject {
waitFor(AccessibilityIds.Residence.cityField)
tag(AccessibilityIds.Residence.cityField).performTextInput(value)
return this
}
fun enterStateProvince(value: String): ResidencesFormPageObject {
waitFor(AccessibilityIds.Residence.stateProvinceField)
tag(AccessibilityIds.Residence.stateProvinceField).performTextInput(value)
return this
}
fun enterPostalCode(value: String): ResidencesFormPageObject {
waitFor(AccessibilityIds.Residence.postalCodeField)
tag(AccessibilityIds.Residence.postalCodeField).performTextInput(value)
return this
}
fun fillAddress(street: String, city: String, stateProvince: String, postal: String): ResidencesFormPageObject {
enterStreet(street)
enterCity(city)
enterStateProvince(stateProvince)
enterPostalCode(postal)
return this
}
fun tapSave() {
waitFor(AccessibilityIds.Residence.saveButton)
tag(AccessibilityIds.Residence.saveButton).performClick()
}
fun tapCancel() {
waitFor(AccessibilityIds.Residence.formCancelButton)
tag(AccessibilityIds.Residence.formCancelButton).performClick()
}
fun assertSaveDisabled() {
waitFor(AccessibilityIds.Residence.saveButton)
tag(AccessibilityIds.Residence.saveButton).assertIsNotEnabled()
}
/** Waits until the form dismisses (save button no longer exists). */
fun waitForDismiss(timeoutMs: Long = DEFAULT_TIMEOUT_MS) {
rule.waitUntil(timeoutMs) { !exists(AccessibilityIds.Residence.saveButton) }
}
override fun isDisplayed(): Boolean = exists(AccessibilityIds.Residence.nameField)
}
class ResidencesDetailPageObject(rule: ComposeTestRule) : BaseScreen(rule) {
fun waitForLoad() { waitFor(AccessibilityIds.Residence.editButton) }
fun tapEdit(): ResidencesFormPageObject {
waitForLoad()
tag(AccessibilityIds.Residence.editButton).performClick()
return ResidencesFormPageObject(rule)
}
fun tapDelete() {
waitFor(AccessibilityIds.Residence.deleteButton)
tag(AccessibilityIds.Residence.deleteButton).performClick()
}
fun confirmDelete() {
waitFor(AccessibilityIds.Residence.confirmDeleteButton)
tag(AccessibilityIds.Residence.confirmDeleteButton).performClick()
}
override fun isDisplayed(): Boolean = exists(AccessibilityIds.Residence.editButton)
}

13
composeApp/src/commonMain/kotlin/com/tt/honeyDue/ui/screens/ManageUsersScreen.kt
View File

@@ -11,6 +11,9 @@ import androidx.compose.runtime.*
import androidx.compose.ui.Alignment
import androidx.compose.ui.Modifier
import androidx.compose.ui.platform.LocalClipboardManager
import androidx.compose.ui.platform.testTag
import androidx.compose.ui.semantics.semantics
import androidx.compose.ui.semantics.testTagsAsResourceId
import androidx.compose.ui.text.AnnotatedString
import androidx.compose.ui.text.font.FontFamily
import androidx.compose.ui.text.font.FontWeight
@@ -21,6 +24,7 @@ import com.tt.honeyDue.models.ResidenceUser
import com.tt.honeyDue.models.ResidenceShareCode
import com.tt.honeyDue.network.ApiResult
import com.tt.honeyDue.network.APILayer
import com.tt.honeyDue.testing.AccessibilityIds
import com.tt.honeyDue.ui.theme.*
import kotlinx.coroutines.launch
import org.jetbrains.compose.resources.stringResource
@@ -64,6 +68,7 @@ fun ManageUsersScreen(
WarmGradientBackground {
Scaffold(
modifier = Modifier.semantics { testTagsAsResourceId = true },
containerColor = androidx.compose.ui.graphics.Color.Transparent,
topBar = {
TopAppBar(
@@ -128,7 +133,8 @@ fun ManageUsersScreen(
LazyColumn(
modifier = Modifier
.fillMaxSize()
.padding(paddingValues),
.padding(paddingValues)
.testTag(AccessibilityIds.Residence.manageUsersList),
contentPadding = PaddingValues(OrganicSpacing.lg),
verticalArrangement = Arrangement.spacedBy(OrganicSpacing.lg)
) {
@@ -462,7 +468,10 @@ private fun UserCard(
}
if (canRemove) {
IconButton(onClick = onRemove) {
IconButton(
modifier = Modifier.testTag(AccessibilityIds.Residence.manageUsersRemoveButton),
onClick = onRemove
) {
Icon(
Icons.Default.Delete,
contentDescription = stringResource(Res.string.manage_users_remove),

64
composeApp/src/commonMain/kotlin/com/tt/honeyDue/ui/screens/ResidenceDetailScreen.kt
View File

@@ -12,10 +12,14 @@ import androidx.compose.material3.*
import androidx.compose.runtime.*
import androidx.compose.ui.Alignment
import androidx.compose.ui.Modifier
import androidx.compose.ui.platform.testTag
import androidx.compose.ui.semantics.semantics
import androidx.compose.ui.semantics.testTagsAsResourceId
import androidx.compose.ui.text.font.FontWeight
import androidx.compose.ui.unit.dp
import androidx.lifecycle.viewmodel.compose.viewModel
import androidx.lifecycle.compose.collectAsStateWithLifecycle
import com.tt.honeyDue.testing.AccessibilityIds
import com.tt.honeyDue.ui.components.AddNewTaskDialog
import com.tt.honeyDue.ui.components.ApiResultHandler
import com.tt.honeyDue.ui.components.CompleteTaskDialog
@@ -302,6 +306,7 @@ fun ResidenceDetailScreen(
text = { Text(stringResource(Res.string.properties_delete_name_confirm, residence.name)) },
confirmButton = {
Button(
modifier = Modifier.testTag(AccessibilityIds.Residence.confirmDeleteButton),
onClick = {
showDeleteConfirmation = false
residenceViewModel.deleteResidence(residenceId)
@@ -415,6 +420,9 @@ fun ResidenceDetailScreen(
}
Scaffold(
modifier = Modifier
.semantics { testTagsAsResourceId = true }
.testTag(AccessibilityIds.Residence.detailView),
snackbarHost = { SnackbarHost(hostState = snackbarHostState) },
topBar = {
TopAppBar(
@@ -449,6 +457,7 @@ fun ResidenceDetailScreen(
// Share button - only show for primary owners
if (residence.ownerId == currentUser?.id) {
IconButton(
modifier = Modifier.testTag(AccessibilityIds.Residence.shareButton),
onClick = {
val shareCheck = SubscriptionHelper.canShareResidence()
if (shareCheck.allowed) {
@@ -473,39 +482,48 @@ fun ResidenceDetailScreen(
// Manage Users button - only show for primary owners
if (residence.ownerId == currentUser?.id) {
IconButton(onClick = {
val shareCheck = SubscriptionHelper.canShareResidence()
if (shareCheck.allowed) {
if (onNavigateToManageUsers != null) {
onNavigateToManageUsers(
residence.id,
residence.name,
residence.ownerId == currentUser?.id,
residence.ownerId
)
IconButton(
modifier = Modifier.testTag(AccessibilityIds.Residence.manageUsersButton),
onClick = {
val shareCheck = SubscriptionHelper.canShareResidence()
if (shareCheck.allowed) {
if (onNavigateToManageUsers != null) {
onNavigateToManageUsers(
residence.id,
residence.name,
residence.ownerId == currentUser?.id,
residence.ownerId
)
} else {
showManageUsersDialog = true
}
} else {
showManageUsersDialog = true
upgradeTriggerKey = shareCheck.triggerKey
showUpgradePrompt = true
}
} else {
upgradeTriggerKey = shareCheck.triggerKey
showUpgradePrompt = true
}
}) {
) {
Icon(Icons.Default.People, contentDescription = stringResource(Res.string.properties_manage_users))
}
}
IconButton(onClick = {
onNavigateToEditResidence(residence)
}) {
IconButton(
modifier = Modifier.testTag(AccessibilityIds.Residence.editButton),
onClick = {
onNavigateToEditResidence(residence)
}
) {
Icon(Icons.Default.Edit, contentDescription = stringResource(Res.string.properties_edit_residence))
}
// Delete button - only show for primary owners
if (residence.ownerId == currentUser?.id) {
IconButton(onClick = {
showDeleteConfirmation = true
}) {
IconButton(
modifier = Modifier.testTag(AccessibilityIds.Residence.deleteButton),
onClick = {
showDeleteConfirmation = true
}
) {
Icon(
Icons.Default.Delete,
contentDescription = stringResource(Res.string.properties_delete_residence),
@@ -524,6 +542,7 @@ fun ResidenceDetailScreen(
// Don't show FAB if tasks are blocked (limit=0)
if (!isTasksBlocked.allowed) {
FloatingActionButton(
modifier = Modifier.testTag(AccessibilityIds.Residence.addTaskButton),
onClick = {
val (allowed, triggerKey) = canAddTask()
if (allowed) {
@@ -819,7 +838,8 @@ fun ResidenceDetailScreen(
Row(
modifier = Modifier
.fillMaxWidth()
.padding(vertical = OrganicSpacing.compact),
.padding(vertical = OrganicSpacing.compact)
.testTag(AccessibilityIds.Residence.tasksSection),
verticalAlignment = Alignment.CenterVertically,
horizontalArrangement = Arrangement.spacedBy(OrganicSpacing.compact)
) {

67
composeApp/src/commonMain/kotlin/com/tt/honeyDue/ui/screens/ResidenceFormScreen.kt
View File

@@ -11,10 +11,14 @@ import androidx.compose.material3.*
import androidx.compose.runtime.*
import androidx.compose.ui.Alignment
import androidx.compose.ui.Modifier
import androidx.compose.ui.platform.testTag
import androidx.compose.ui.semantics.semantics
import androidx.compose.ui.semantics.testTagsAsResourceId
import androidx.compose.ui.text.input.KeyboardType
import androidx.compose.ui.unit.dp
import androidx.lifecycle.viewmodel.compose.viewModel
import androidx.lifecycle.compose.collectAsStateWithLifecycle
import com.tt.honeyDue.testing.AccessibilityIds
import com.tt.honeyDue.viewmodel.ResidenceViewModel
import com.tt.honeyDue.repository.LookupsRepository
import com.tt.honeyDue.data.DataManager
@@ -156,11 +160,15 @@ fun ResidenceFormScreen(
}
Scaffold(
modifier = Modifier.semantics { testTagsAsResourceId = true },
topBar = {
TopAppBar(
title = { Text(if (isEditMode) stringResource(Res.string.properties_edit_title) else stringResource(Res.string.properties_add_title)) },
navigationIcon = {
IconButton(onClick = onNavigateBack) {
IconButton(
modifier = Modifier.testTag(AccessibilityIds.Residence.formCancelButton),
onClick = onNavigateBack
) {
Icon(Icons.AutoMirrored.Filled.ArrowBack, contentDescription = stringResource(Res.string.common_back))
}
}
@@ -188,7 +196,9 @@ fun ResidenceFormScreen(
value = name,
onValueChange = { name = it },
label = { Text(stringResource(Res.string.properties_form_name_required)) },
modifier = Modifier.fillMaxWidth(),
modifier = Modifier
.fillMaxWidth()
.testTag(AccessibilityIds.Residence.nameField),
isError = nameError.isNotEmpty(),
supportingText = if (nameError.isNotEmpty()) {
{ Text(nameError, color = MaterialTheme.colorScheme.error) }
@@ -209,7 +219,8 @@ fun ResidenceFormScreen(
trailingIcon = { ExposedDropdownMenuDefaults.TrailingIcon(expanded = expanded) },
modifier = Modifier
.fillMaxWidth()
.menuAnchor(),
.menuAnchor()
.testTag(AccessibilityIds.Residence.propertyTypePicker),
enabled = propertyTypes.isNotEmpty()
)
ExposedDropdownMenu(
@@ -239,42 +250,54 @@ fun ResidenceFormScreen(
value = streetAddress,
onValueChange = { streetAddress = it },
label = { Text(stringResource(Res.string.properties_form_street)) },
modifier = Modifier.fillMaxWidth()
modifier = Modifier
.fillMaxWidth()
.testTag(AccessibilityIds.Residence.streetAddressField)
)
OutlinedTextField(
value = apartmentUnit,
onValueChange = { apartmentUnit = it },
label = { Text(stringResource(Res.string.properties_form_apartment)) },
modifier = Modifier.fillMaxWidth()
modifier = Modifier
.fillMaxWidth()
.testTag(AccessibilityIds.Residence.apartmentUnitField)
)
OutlinedTextField(
value = city,
onValueChange = { city = it },
label = { Text(stringResource(Res.string.properties_form_city)) },
modifier = Modifier.fillMaxWidth()
modifier = Modifier
.fillMaxWidth()
.testTag(AccessibilityIds.Residence.cityField)
)
OutlinedTextField(
value = stateProvince,
onValueChange = { stateProvince = it },
label = { Text(stringResource(Res.string.properties_form_state)) },
modifier = Modifier.fillMaxWidth()
modifier = Modifier
.fillMaxWidth()
.testTag(AccessibilityIds.Residence.stateProvinceField)
)
OutlinedTextField(
value = postalCode,
onValueChange = { postalCode = it },
label = { Text(stringResource(Res.string.properties_form_postal)) },
modifier = Modifier.fillMaxWidth()
modifier = Modifier
.fillMaxWidth()
.testTag(AccessibilityIds.Residence.postalCodeField)
)
OutlinedTextField(
value = country,
onValueChange = { country = it },
label = { Text(stringResource(Res.string.properties_form_country)) },
modifier = Modifier.fillMaxWidth()
modifier = Modifier
.fillMaxWidth()
.testTag(AccessibilityIds.Residence.countryField)
)
// Optional fields section
@@ -294,7 +317,9 @@ fun ResidenceFormScreen(
onValueChange = { bedrooms = it.filter { char -> char.isDigit() } },
label = { Text(stringResource(Res.string.properties_bedrooms)) },
keyboardOptions = KeyboardOptions(keyboardType = KeyboardType.Number),
modifier = Modifier.weight(1f)
modifier = Modifier
.weight(1f)
.testTag(AccessibilityIds.Residence.bedroomsField)
)
OutlinedTextField(
@@ -302,7 +327,9 @@ fun ResidenceFormScreen(
onValueChange = { bathrooms = it },
label = { Text(stringResource(Res.string.properties_bathrooms)) },
keyboardOptions = KeyboardOptions(keyboardType = KeyboardType.Decimal),
modifier = Modifier.weight(1f)
modifier = Modifier
.weight(1f)
.testTag(AccessibilityIds.Residence.bathroomsField)
)
}
@@ -311,7 +338,9 @@ fun ResidenceFormScreen(
onValueChange = { squareFootage = it.filter { char -> char.isDigit() } },
label = { Text(stringResource(Res.string.properties_form_sqft)) },
keyboardOptions = KeyboardOptions(keyboardType = KeyboardType.Number),
modifier = Modifier.fillMaxWidth()
modifier = Modifier
.fillMaxWidth()
.testTag(AccessibilityIds.Residence.squareFootageField)
)
OutlinedTextField(
@@ -319,7 +348,9 @@ fun ResidenceFormScreen(
onValueChange = { lotSize = it },
label = { Text(stringResource(Res.string.properties_form_lot_size)) },
keyboardOptions = KeyboardOptions(keyboardType = KeyboardType.Decimal),
modifier = Modifier.fillMaxWidth()
modifier = Modifier
.fillMaxWidth()
.testTag(AccessibilityIds.Residence.lotSizeField)
)
OutlinedTextField(
@@ -327,14 +358,18 @@ fun ResidenceFormScreen(
onValueChange = { yearBuilt = it.filter { char -> char.isDigit() } },
label = { Text(stringResource(Res.string.properties_year_built)) },
keyboardOptions = KeyboardOptions(keyboardType = KeyboardType.Number),
modifier = Modifier.fillMaxWidth()
modifier = Modifier
.fillMaxWidth()
.testTag(AccessibilityIds.Residence.yearBuiltField)
)
OutlinedTextField(
value = description,
onValueChange = { description = it },
label = { Text(stringResource(Res.string.properties_form_description)) },
modifier = Modifier.fillMaxWidth(),
modifier = Modifier
.fillMaxWidth()
.testTag(AccessibilityIds.Residence.descriptionField),
minLines = 3,
maxLines = 5
)
@@ -345,6 +380,7 @@ fun ResidenceFormScreen(
) {
Text(stringResource(Res.string.properties_form_primary))
Switch(
modifier = Modifier.testTag(AccessibilityIds.Residence.isPrimaryToggle),
checked = isPrimary,
onCheckedChange = { isPrimary = it }
)
@@ -404,6 +440,7 @@ fun ResidenceFormScreen(
// Submit button
OrganicPrimaryButton(
modifier = Modifier.testTag(AccessibilityIds.Residence.saveButton),
text = if (isEditMode) stringResource(Res.string.properties_form_update) else stringResource(Res.string.properties_form_create),
onClick = {
if (validateForm()) {

55
composeApp/src/commonMain/kotlin/com/tt/honeyDue/ui/screens/ResidencesScreen.kt
View File

@@ -19,12 +19,16 @@ import androidx.compose.ui.draw.clip
import androidx.compose.ui.draw.scale
import androidx.compose.ui.graphics.Brush
import androidx.compose.ui.graphics.Color
import androidx.compose.ui.platform.testTag
import androidx.compose.ui.semantics.semantics
import androidx.compose.ui.semantics.testTagsAsResourceId
import androidx.compose.ui.text.font.FontWeight
import androidx.compose.ui.text.style.TextOverflow
import androidx.compose.ui.unit.dp
import androidx.compose.ui.unit.sp
import androidx.lifecycle.viewmodel.compose.viewModel
import androidx.lifecycle.compose.collectAsStateWithLifecycle
import com.tt.honeyDue.testing.AccessibilityIds
import com.tt.honeyDue.ui.components.ApiResultHandler
import com.tt.honeyDue.ui.components.common.StatItem
import com.tt.honeyDue.ui.components.residence.TaskStatChip
@@ -108,6 +112,7 @@ fun ResidencesScreen(
}
Scaffold(
modifier = Modifier.semantics { testTagsAsResourceId = true },
topBar = {
TopAppBar(
title = {
@@ -128,29 +133,35 @@ fun ResidencesScreen(
actions = {
// Only show Join button if not blocked (limit>0)
if (!isBlocked.allowed) {
IconButton(onClick = {
val (allowed, triggerKey) = canAddProperty()
if (allowed) {
onJoinResidence()
} else {
upgradeTriggerKey = triggerKey
showUpgradePrompt = true
IconButton(
modifier = Modifier.testTag(AccessibilityIds.Residence.joinButton),
onClick = {
val (allowed, triggerKey) = canAddProperty()
if (allowed) {
onJoinResidence()
} else {
upgradeTriggerKey = triggerKey
showUpgradePrompt = true
}
}
}) {
) {
Icon(Icons.Default.GroupAdd, contentDescription = stringResource(Res.string.properties_join_title))
}
}
// Add property button
if (!isBlocked.allowed) {
IconButton(onClick = {
val (allowed, triggerKey) = canAddProperty()
if (allowed) {
onAddResidence()
} else {
upgradeTriggerKey = triggerKey
showUpgradePrompt = true
IconButton(
modifier = Modifier.testTag(AccessibilityIds.Residence.addButton),
onClick = {
val (allowed, triggerKey) = canAddProperty()
if (allowed) {
onAddResidence()
} else {
upgradeTriggerKey = triggerKey
showUpgradePrompt = true
}
}
}) {
) {
Icon(
Icons.Default.AddCircle,
contentDescription = stringResource(Res.string.properties_add_button),
@@ -172,6 +183,7 @@ fun ResidencesScreen(
if (hasResidences && !isBlocked.allowed) {
Box(modifier = Modifier.padding(bottom = 80.dp)) {
FloatingActionButton(
modifier = Modifier.testTag(AccessibilityIds.Residence.addFab),
onClick = {
val (allowed, triggerKey) = canAddProperty()
if (allowed) {
@@ -208,7 +220,8 @@ fun ResidencesScreen(
Box(
modifier = Modifier
.fillMaxSize()
.padding(paddingValues),
.padding(paddingValues)
.testTag(AccessibilityIds.Residence.emptyStateView),
contentAlignment = Alignment.Center
) {
Column(
@@ -247,7 +260,8 @@ fun ResidencesScreen(
},
modifier = Modifier
.fillMaxWidth(0.7f)
.height(56.dp),
.height(56.dp)
.testTag(AccessibilityIds.Residence.emptyStateButton),
shape = RoundedCornerShape(12.dp)
) {
Row(
@@ -330,7 +344,9 @@ fun ResidencesScreen(
.padding(paddingValues)
) {
LazyColumn(
modifier = Modifier.fillMaxSize(),
modifier = Modifier
.fillMaxSize()
.testTag(AccessibilityIds.Residence.residencesList),
contentPadding = PaddingValues(
start = OrganicSpacing.cozy,
end = OrganicSpacing.cozy,
@@ -446,6 +462,7 @@ fun ResidencesScreen(
OrganicCard(
modifier = Modifier
.fillMaxWidth()
.testTag(AccessibilityIds.withId(AccessibilityIds.Residence.residenceCard, residence.id))
.clickable { onResidenceClick(residence.id) },
accentColor = if (hasOverdue) MaterialTheme.colorScheme.error else MaterialTheme.colorScheme.primary,
showBlob = true,

9
composeApp/src/commonMain/kotlin/com/tt/honeyDue/ui/screens/residence/JoinResidenceScreen.kt
View File

@@ -34,6 +34,9 @@ import androidx.compose.runtime.LaunchedEffect
import androidx.compose.runtime.getValue
import androidx.compose.ui.Alignment
import androidx.compose.ui.Modifier
import androidx.compose.ui.platform.testTag
import androidx.compose.ui.semantics.semantics
import androidx.compose.ui.semantics.testTagsAsResourceId
import androidx.compose.ui.text.font.FontWeight
import androidx.compose.ui.text.input.KeyboardCapitalization
import androidx.compose.ui.text.input.KeyboardType
@@ -41,6 +44,7 @@ import androidx.compose.ui.unit.dp
import androidx.lifecycle.viewmodel.compose.viewModel
import androidx.lifecycle.compose.collectAsStateWithLifecycle
import com.tt.honeyDue.network.ApiResult
import com.tt.honeyDue.testing.AccessibilityIds
import com.tt.honeyDue.ui.components.common.StandardCard
import com.tt.honeyDue.ui.components.forms.FormTextField
import com.tt.honeyDue.ui.theme.AppRadius
@@ -79,6 +83,7 @@ fun JoinResidenceScreen(
}
Scaffold(
modifier = Modifier.semantics { testTagsAsResourceId = true },
topBar = {
TopAppBar(
title = {
@@ -139,6 +144,7 @@ fun JoinResidenceScreen(
value = code,
onValueChange = { viewModel.updateCode(it) },
label = "Share Code",
modifier = Modifier.testTag(AccessibilityIds.Residence.joinShareCodeField),
placeholder = "ABC123",
enabled = !isLoading,
error = error,
@@ -182,7 +188,8 @@ fun JoinResidenceScreen(
),
modifier = Modifier
.fillMaxWidth()
.height(56.dp),
.height(56.dp)
.testTag(AccessibilityIds.Residence.joinSubmitButton),
) {
if (isLoading) {
CircularProgressIndicator(