Refactor Auth + Going forward score part 2

app/src/androidTest/java/ch/sdp/vibester/activity/AuthenticationActivityTest.kt

@@ -14,6 +14,7 @@ import androidx.test.ext.junit.rules.ActivityScenarioRule
 import androidx.test.ext.junit.runners.AndroidJUnit4
 import androidx.test.platform.app.InstrumentationRegistry
 import ch.sdp.vibester.R
+import ch.sdp.vibester.TestMode
 import ch.sdp.vibester.auth.FireBaseAuthenticator
 import com.google.android.gms.tasks.OnCompleteListener
 import com.google.android.gms.tasks.Task
@@ -179,6 +180,8 @@ class AuthenticationActivityTest {
         val username = "[email protected]"
         val password = "password"
 
+        TestMode.setTest()
+
         val mockTask = createMockTask(true)
         val mockUser = createMockUser(username)
         every { mockAuthenticator.createAccount(username, password) } returns mockTask
@@ -187,7 +190,6 @@ class AuthenticationActivityTest {
         onView(withId(R.id.username)).perform(ViewActions.typeText(username), closeSoftKeyboard())
         onView(withId(R.id.password)).perform(ViewActions.typeText(password), closeSoftKeyboard())
         onView(withId(R.id.createAcc)).perform(click())
-
         Intents.intended(IntentMatchers.hasComponent(CreateProfileActivity::class.java.name))
         Intents.intended(IntentMatchers.hasExtra("email", username))
 

app/src/androidTest/java/ch/sdp/vibester/activity/BuzzerScreenActivityTest.kt

@@ -14,6 +14,9 @@ import androidx.test.espresso.matcher.ViewMatchers.*
 import androidx.test.ext.junit.rules.ActivityScenarioRule
 import androidx.test.ext.junit.runners.AndroidJUnit4
 import ch.sdp.vibester.R
+import ch.sdp.vibester.TestMode
+import dagger.hilt.android.testing.HiltAndroidRule
+import dagger.hilt.android.testing.HiltAndroidTest
 import org.junit.After
 import org.junit.Before
 import org.junit.Rule
@@ -100,6 +103,8 @@ class BuzzerScreenActivityTest {
      */
     @Test
     fun checkIntentOnEnding() {
+        TestMode.setTest()
+
         val mockArray = arrayListOf<String>("One", "Two", "Three", "Four", "Five")
 
         val incArray: ArrayList<String> = mockArray

app/src/androidTest/java/ch/sdp/vibester/activity/CreateProfileActivityTest.kt

@@ -4,13 +4,14 @@ import android.content.Intent
 import androidx.test.core.app.ActivityScenario
 import androidx.test.core.app.ApplicationProvider
 import androidx.test.espresso.Espresso.onView
-import androidx.test.espresso.action.ViewActions
+import androidx.test.espresso.action.ViewActions.*
 import androidx.test.espresso.intent.Intents
 import androidx.test.espresso.intent.matcher.IntentMatchers
 import androidx.test.espresso.matcher.ViewMatchers.* //change this import
 import androidx.test.ext.junit.runners.AndroidJUnit4
 import ch.sdp.vibester.R
-import ch.sdp.vibester.database.UsersRepo
+import ch.sdp.vibester.TestMode
+import ch.sdp.vibester.database.DataGetter
 import ch.sdp.vibester.user.User
 import dagger.hilt.android.testing.BindValue
 import dagger.hilt.android.testing.HiltAndroidRule
@@ -38,14 +39,14 @@ class CreateProfileActivityTest {
     }
 
     @BindValue @JvmField
-    val mockUsersRepo = mockk<UsersRepo>()
+    val mockUsersRepo = mockk<DataGetter>()
 
     private fun createMockInvocation(email: String) {
-        every {mockUsersRepo.createUser(any(), any(), any())} answers {
+        every {mockUsersRepo.createUser(any(), any(), any(), any())} answers {
             lastArg<(String) -> Unit>().invoke(email)
         }
 
-        every { mockUsersRepo.getUserData(any(), any()) } answers {
+        every { mockUsersRepo.getUserData(any()) } answers {
             secondArg<(User) -> Unit>().invoke(User())
         }
     }
@@ -57,24 +58,28 @@ class CreateProfileActivityTest {
 
     @Test
     fun createAccCorrect() {
+        TestMode.setTest()
+
         var username = "mockUsername"
         var mockEmail = "[email protected]"
 
         val intent = Intent(ApplicationProvider.getApplicationContext(), CreateProfileActivity::class.java)
         intent.putExtra("email", mockEmail)
+        intent.putExtra("isUnitTest", true)
 
         createMockInvocation(mockEmail)
 
         val scn: ActivityScenario<CreateProfileActivity> = ActivityScenario.launch(intent)
 
-        onView(withId(R.id.accountUsername)).perform(ViewActions.typeText(username),
-            ViewActions.closeSoftKeyboard()
+        onView(withId(R.id.accountUsername)).perform(typeText(username),
+            closeSoftKeyboard()
         )
 
-        onView(withId(R.id.createButton)).perform(ViewActions.click())
+       onView(withId(R.id.createButton)).perform(click())
 
-        Intents.intended(IntentMatchers.hasComponent(ProfileActivity::class.java.name))
-        Intents.intended(IntentMatchers.hasExtra("email", mockEmail))
+       Intents.intended(IntentMatchers.hasComponent(ProfileActivity::class.java.name))
+       Intents.intended(IntentMatchers.hasExtra("email", mockEmail))
+       Intents.intended(IntentMatchers.hasExtra("isUnitTest", true))
     }
 
 }

app/src/androidTest/java/ch/sdp/vibester/activity/GameEndingActivityTest.kt

@@ -14,6 +14,9 @@ import androidx.test.espresso.matcher.ViewMatchers.*
 import androidx.test.ext.junit.rules.ActivityScenarioRule
 import androidx.test.ext.junit.runners.AndroidJUnit4
 import ch.sdp.vibester.R
+import ch.sdp.vibester.TestMode
+import dagger.hilt.android.testing.HiltAndroidRule
+import dagger.hilt.android.testing.HiltAndroidTest
 import org.junit.After
 import org.junit.Before
 import org.junit.Rule
@@ -23,8 +26,7 @@ import org.junit.runner.RunWith
 @RunWith(AndroidJUnit4::class)
 class GameEndingActivityTest {
 
-    @Rule
-    @JvmField
+    @get:Rule
     val activityRule = ActivityScenarioRule(GameEndingActivity::class.java)
 
     @Before
@@ -47,6 +49,8 @@ class GameEndingActivityTest {
 
     @Test
     fun checkIntentOnCalled() {
+        TestMode.setTest()
+
         incArray.addAll(arrayOf("One", "Two", "Three"))
         statNames.addAll(
             arrayOf(

app/src/androidTest/java/ch/sdp/vibester/activity/LyricsBelongGameActivityTest.kt

@@ -16,13 +16,16 @@ import androidx.test.rule.GrantPermissionRule
 import ch.sdp.vibester.R
 import ch.sdp.vibester.api.LastfmMethod
 import ch.sdp.vibester.helper.TypingGameManager
+import dagger.hilt.android.testing.HiltAndroidRule
+import dagger.hilt.android.testing.HiltAndroidTest
 import org.hamcrest.CoreMatchers.not
 import org.junit.*
 import org.junit.Assert.assertEquals
 import org.junit.runner.RunWith
 
 @RunWith(AndroidJUnit4::class)
 class LyricsBelongGameActivityTest {
+
     private val sleepTime: Long = 5000
     private val songName = "Thunder"
     private val artistName = "Imagine Dragons"

app/src/androidTest/java/ch/sdp/vibester/activity/ProfileActivityTest.kt

@@ -13,7 +13,7 @@ import androidx.test.espresso.intent.matcher.IntentMatchers
 import androidx.test.espresso.matcher.ViewMatchers.* //change this import
 import androidx.test.ext.junit.runners.AndroidJUnit4
 import ch.sdp.vibester.R
-import ch.sdp.vibester.database.UsersRepo
+import ch.sdp.vibester.database.DataGetter
 import ch.sdp.vibester.model.UserSharedPref
 import ch.sdp.vibester.user.User
 import dagger.hilt.android.testing.BindValue
@@ -42,11 +42,11 @@ class ProfileActivityTest {
     }
 
     @BindValue @JvmField
-    val mockUsersRepo = mockk<UsersRepo>()
+    val mockUsersRepo = mockk<DataGetter>()
 
-    private fun createMockInvocation(mockUser: User) {
-        every { mockUsersRepo.getUserData(any(), any()) } answers {
-            secondArg<(User) -> Unit>().invoke(mockUser)
+    private fun createMockInvocation(mockProfile: User) {
+        every { mockUsersRepo.getUserData(any()) } answers {
+            secondArg<(User) -> Unit>().invoke(mockProfile)
         }
         every { mockUsersRepo.updateFieldString(any(), any(), any()) } answers {}
     }
@@ -61,9 +61,10 @@ class ProfileActivityTest {
         val inputProfile = User("Lalisa Bon","bit.ly/3IUnyAF", "[email protected]",  12, 8, 29, 0)
         val ctx = ApplicationProvider.getApplicationContext() as Context
         val intent = Intent(ctx, ProfileActivity::class.java)
+        intent.putExtra("isUnitTest", true)
+        intent.putExtra("userTestProfile",  inputProfile)
 
         createMockInvocation(inputProfile)
-        UserSharedPref.setUser(ctx, inputProfile, false)
         val scn: ActivityScenario<ProfileActivity> = ActivityScenario.launch(intent)
 
         onView(withId(R.id.username)).check(matches(withText(inputProfile.username)))
@@ -76,6 +77,8 @@ class ProfileActivityTest {
     fun clickBackToMain(){
         val ctx = ApplicationProvider.getApplicationContext() as Context
         val intent = Intent(ctx, ProfileActivity::class.java)
+        intent.putExtra("isUnitTest", true)
+
         val scn: ActivityScenario<ProfileActivity> = ActivityScenario.launch(intent)
 
         onView(withId(R.id.profile_returnToMain)).perform(click())
@@ -88,6 +91,8 @@ class ProfileActivityTest {
         val inputProfile = User("Lalisa Bon","bit.ly/3IUnyAF", "[email protected]",  12, 8, 29, 0)
         val ctx = ApplicationProvider.getApplicationContext() as Context
         val intent = Intent(ctx, ProfileActivity::class.java)
+        intent.putExtra("isUnitTest", true)
+        intent.putExtra("userTestProfile", inputProfile)
 
         UserSharedPref.setUser(ctx, inputProfile, false)
         createMockInvocation(inputProfile)
@@ -110,6 +115,8 @@ class ProfileActivityTest {
         val inputProfile = User( "Lalisa Bon","bit.ly/3IUnyAF", "[email protected]",  12, 8, 29, 0)
         val ctx = ApplicationProvider.getApplicationContext() as Context
         val intent = Intent(ctx, ProfileActivity::class.java)
+        intent.putExtra("isUnitTest", true)
+        intent.putExtra("userTestProfile", inputProfile)
 
         UserSharedPref.setUser(ctx, inputProfile, false)
         createMockInvocation(inputProfile)

app/src/androidTest/java/ch/sdp/vibester/activity/TypingGameActivityTest.kt

@@ -20,6 +20,8 @@ import ch.sdp.vibester.R
 import ch.sdp.vibester.api.LastfmMethod
 import ch.sdp.vibester.helper.TypingGameManager
 import ch.sdp.vibester.model.Song
+import dagger.hilt.android.testing.HiltAndroidRule
+import dagger.hilt.android.testing.HiltAndroidTest
 import org.junit.After
 import org.junit.Assert.assertEquals
 import org.junit.Before
@@ -30,6 +32,20 @@ import org.junit.runner.RunWith
 @RunWith(AndroidJUnit4::class)
 class TypingGameActivityTest {
 
+    @JvmField
+    @get:Rule
+    val activityRule = ActivityScenarioRule(TypingGameActivity::class.java)
+
+    @Before
+    fun setUp() {
+        Intents.init()
+    }
+
+    @After
+    fun clean() {
+        Intents.release()
+    }
+
     private val expectedSize = 200
     private fun setGameManager(numSongs:Int = 1, valid: Boolean = true): TypingGameManager {
         val epilogue = "{\"tracks\":{\"track\":["
@@ -50,21 +66,6 @@ class TypingGameActivityTest {
         return gameManager
     }
 
-    @Rule
-    @JvmField
-    val activityRule = ActivityScenarioRule(TypingGameActivity::class.java)
-
-    @Before
-    fun setUp() {
-        Intents.init()
-    }
-
-    @After
-    fun clean() {
-        Intents.release()
-    }
-
-
     @Test
     fun spaceGenTest() {
         val height = 10

app/src/androidTest/java/ch/sdp/vibester/activity/WelcomeActivityTest.kt

@@ -1,5 +1,7 @@
 package ch.sdp.vibester.activity
 
+import android.content.Context
+import androidx.test.core.app.ApplicationProvider
 import androidx.test.espresso.Espresso.onView
 import androidx.test.espresso.action.ViewActions.click
 import androidx.test.espresso.intent.Intents
@@ -9,6 +11,7 @@ import androidx.test.espresso.matcher.ViewMatchers.withId
 import androidx.test.ext.junit.rules.ActivityScenarioRule
 import androidx.test.ext.junit.runners.AndroidJUnit4
 import ch.sdp.vibester.R
+import ch.sdp.vibester.TestMode
 import com.google.firebase.auth.FirebaseAuth
 import dagger.hilt.android.testing.HiltAndroidRule
 import dagger.hilt.android.testing.HiltAndroidTest
@@ -17,6 +20,7 @@ import org.junit.Before
 import org.junit.Rule
 import org.junit.Test
 import org.junit.runner.RunWith
+import org.junit.runner.manipulation.Ordering
 
 @HiltAndroidTest
 @RunWith(AndroidJUnit4::class)
@@ -71,6 +75,7 @@ class WelcomeActivityTest {
 
     @Test
     fun checkIntentOnSearch() {
+        TestMode.setTest()
         onView(withId(R.id.welcome_search)).perform(click())
         intended(hasComponent(SearchUserActivity::class.java.name))
     }

app/src/main/java/ch/sdp/vibester/TestMode.kt

@@ -0,0 +1,17 @@
+package ch.sdp.vibester
+
+class TestMode private constructor(){
+    companion object{
+        private var isTest: Boolean = false
+
+        fun setTest(){
+            isTest = true
+        }
+
+        fun isTest(): Boolean {
+            return isTest
+        }
+
+
+    }
+}