fix: resolve merging problems

Some changes from main had been incorrectly merged.
PeriodPals · Oct 31, 2024 · 35de269 · 35de269
1 parent b4ebe26
commit 35de269
Showing 1 changed file with 9 additions and 9 deletions.
diff --git a/app/src/androidTest/java/com/android/periodpals/ui/authentication/SignInTest.kt b/app/src/androidTest/java/com/android/periodpals/ui/authentication/SignInTest.kt
@@ -7,7 +7,7 @@ import androidx.compose.ui.test.junit4.createComposeRule
 import androidx.compose.ui.test.onNodeWithTag
 import androidx.compose.ui.test.performClick
 import androidx.compose.ui.test.performTextInput
-import com.android.periodpals.model.auth.AuthViewModel
+import com.android.periodpals.model.authentication.AuthenticationViewModel
 import com.android.periodpals.model.user.UserAuthState
 import com.android.periodpals.ui.navigation.NavigationActions
 import com.android.periodpals.ui.navigation.Screen
@@ -25,7 +25,7 @@ class SignInScreenTest {
 
   @get:Rule val composeTestRule = createComposeRule()
   private lateinit var navigationActions: NavigationActions
-  private lateinit var authViewModel: AuthViewModel
+  private lateinit var authViewModel: AuthenticationViewModel
 
   companion object {
     private const val email = "test@example.com"
@@ -35,11 +35,11 @@ class SignInScreenTest {
   @Before
   fun setUp() {
     navigationActions = mock(NavigationActions::class.java)
-    authViewModel = mock(AuthViewModel::class.java)
+    authViewModel = mock(AuthenticationViewModel::class.java)
 
     `when`(navigationActions.currentRoute()).thenReturn(Screen.SIGN_IN)
     `when`(authViewModel.userAuthState)
-        .thenReturn(mutableStateOf(UserAuthState.Success("User is logged in")))
+      .thenReturn(mutableStateOf(UserAuthState.Success("User is logged in")))
     composeTestRule.setContent { SignInScreen(authViewModel, navigationActions) }
   }
 
@@ -73,7 +73,7 @@ class SignInScreenTest {
 
     composeTestRule.onNodeWithTag("signInPassword").performTextInput(password)
     composeTestRule.onNodeWithTag("signInButton").performClick()
-    verify(authViewModel, never()).logInWithEmail(any(), any(), any())
+    verify(authViewModel, never()).logInWithEmail(any(), any())
   }
 
   @Test
@@ -83,16 +83,16 @@ class SignInScreenTest {
     composeTestRule.onNodeWithTag("signInButton").performClick()
     composeTestRule.onNodeWithTag("signInPasswordError").assertIsDisplayed()
     composeTestRule
-        .onNodeWithTag("signInPasswordError")
-        .assertTextEquals("Password cannot be empty")
+      .onNodeWithTag("signInPasswordError")
+      .assertTextEquals("Password cannot be empty")
   }
 
   @Test
   fun emptyPasswordDoesNotCallVM() {
 
     composeTestRule.onNodeWithTag("signInEmail").performTextInput(email)
     composeTestRule.onNodeWithTag("signInButton").performClick()
-    verify(authViewModel, never()).logInWithEmail(any(), any(), any())
+    verify(authViewModel, never()).logInWithEmail(any(), any())
   }
 
   @Test
@@ -109,7 +109,7 @@ class SignInScreenTest {
     composeTestRule.onNodeWithTag("signInEmail").performTextInput(email)
     composeTestRule.onNodeWithTag("signInPassword").performTextInput(password)
     composeTestRule.onNodeWithTag("signInButton").performClick()
-    verify(authViewModel).logInWithEmail(any(), eq(email), eq(password))
+    verify(authViewModel).logInWithEmail(eq(email), eq(password))
   }
 
   @Test