fix: ensure navigation actions pass verification on button click

PeriodPals · Oct 28, 2024 · 470d1b2 · 470d1b2
1 parent 076069e
commit 470d1b2
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 6 deletions.
diff --git a/app/src/androidTest/java/com/android/periodpals/ui/alert/AlertScreenTest.kt b/app/src/androidTest/java/com/android/periodpals/ui/alert/AlertScreenTest.kt
@@ -155,8 +155,6 @@ class AlertScreenTest {
 
     // Verify that the navigation action occurs
     // This can be done by checking that the current screen is not the AlertScreen
-    composeTestRule.onNodeWithTag("alertScreen").assertDoesNotExist()
     verify(navigationActions).navigateTo(screen = Screen.ALERT_LIST)
-    composeTestRule.onNodeWithTag("alertListScreen").assertIsDisplayed()
   }
 }
diff --git a/app/src/androidTest/java/com/android/periodpals/ui/profile/CreateProfileTest.kt b/app/src/androidTest/java/com/android/periodpals/ui/profile/CreateProfileTest.kt
@@ -147,7 +147,6 @@ class CreateProfileTest {
     composeTestRule.onNodeWithTag("save_button").assertIsDisplayed().performClick()
 
     // Verify that the navigation action occurs
-    composeTestRule.onNodeWithTag("createProfileScreen").assertDoesNotExist()
     verify(navigationActions).navigateTo(screen = Screen.PROFILE)
   }
 }
diff --git a/app/src/main/java/com/android/periodpals/ui/profile/CreateProfile.kt b/app/src/main/java/com/android/periodpals/ui/profile/CreateProfile.kt
@@ -71,7 +71,7 @@ fun CreateProfileScreen(navigationActions: NavigationActions) {
           }
 
   Scaffold(
-      modifier = Modifier.fillMaxSize(),
+      modifier = Modifier.fillMaxSize().testTag("createProfileScreen"),
       content = { padding ->
         Column(
             modifier = Modifier.fillMaxSize().padding(16.dp).padding(padding),
@@ -195,11 +195,12 @@ private fun validateName(name: String): Boolean {
 /** Validates the date is in the format DD/MM/YYYY and is a valid date. */
 fun validateDate(date: String): Boolean {
   val parts = date.split("/")
-  val calendar = GregorianCalendar()
+  val calendar = GregorianCalendar.getInstance()
   calendar.isLenient = false
   if (parts.size == 3) {
     return try {
-      calendar.set(parts[2].toInt(), parts[1].toInt() - 1, parts[0].toInt(), 0, 0, 0)
+      calendar.set(parts[2].toInt(), parts[1].toInt() - 1, parts[0].toInt())
+      calendar.time
       true
     } catch (e: Exception) {
       false