SDP-Rock-Paper-Scissors · bhvrgav · Apr 26, 2022 · Apr 26, 2022 · Apr 27, 2022 · Apr 28, 2022
diff --git a/.idea/misc.xml b/.idea/misc.xml
diff --git a/app/build.gradle b/app/build.gradle
@@ -118,6 +118,7 @@ dependencies {
     androidTestImplementation('androidx.test.espresso:espresso-contrib:3.4.0') {
         exclude module: "protobuf-lite"
     }
+    implementation('androidx.test.espresso:espresso-idling-resource:3.4.0')
 
     // Import the BoM for the Firebase platform
     implementation platform('com.google.firebase:firebase-bom:30.0.2')

diff --git a/app/src/androidTest/java/ch/epfl/sweng/rps/CacheTests.kt b/app/src/androidTest/java/ch/epfl/sweng/rps/CacheTests.kt
@@ -8,13 +8,13 @@ import androidx.annotation.ColorInt
 import androidx.test.ext.junit.runners.AndroidJUnit4
 import androidx.test.platform.app.InstrumentationRegistry
 import ch.epfl.sweng.rps.TestUtils.initializeForTest
+import ch.epfl.sweng.rps.remote.Env
 import ch.epfl.sweng.rps.models.remote.LeaderBoardInfo
 import ch.epfl.sweng.rps.models.remote.User
 import ch.epfl.sweng.rps.models.ui.UserStat
 import ch.epfl.sweng.rps.persistence.Cache
 import ch.epfl.sweng.rps.persistence.PrivateStorage
 import ch.epfl.sweng.rps.persistence.Storage
-import ch.epfl.sweng.rps.remote.Env
 import ch.epfl.sweng.rps.services.ServiceLocator
 import com.google.firebase.ktx.Firebase
 import io.mockk.mockk

diff --git a/app/src/androidTest/java/ch/epfl/sweng/rps/ExampleInstrumentedTest.kt b/app/src/androidTest/java/ch/epfl/sweng/rps/ExampleInstrumentedTest.kt
@@ -1,11 +1,13 @@
 package ch.epfl.sweng.rps
 
-import androidx.test.ext.junit.runners.AndroidJUnit4
 import androidx.test.platform.app.InstrumentationRegistry
-import org.junit.Assert.assertEquals
+import androidx.test.ext.junit.runners.AndroidJUnit4
+
 import org.junit.Test
 import org.junit.runner.RunWith
 
+import org.junit.Assert.*
+
 /**
  * Instrumented test, which will execute on an Android device.
  *

diff --git a/app/src/androidTest/java/ch/epfl/sweng/rps/LeaderBoardFragmentTest.kt b/app/src/androidTest/java/ch/epfl/sweng/rps/LeaderBoardFragmentTest.kt
@@ -121,4 +121,3 @@ class LeaderBoardFragmentTest {
     }
 
 }
-
diff --git a/app/src/androidTest/java/ch/epfl/sweng/rps/SettingsPageTest.kt b/app/src/androidTest/java/ch/epfl/sweng/rps/SettingsPageTest.kt
@@ -92,6 +92,7 @@ class SettingsPageTest {
     }
 
 
+
     @Test
     fun testSettingsPage() {
         onView(withId(R.id.settings)).check(matches(isDisplayed()))

diff --git a/app/src/androidTest/java/ch/epfl/sweng/rps/StatisticsFragmentTest.kt b/app/src/androidTest/java/ch/epfl/sweng/rps/StatisticsFragmentTest.kt
@@ -179,5 +179,4 @@ class StatisticsFragmentTest {
         }
     }
 
-}
-
+}
diff --git a/app/src/androidTest/java/ch/epfl/sweng/rps/services/FirebaseGameServiceTest.kt b/app/src/androidTest/java/ch/epfl/sweng/rps/services/FirebaseGameServiceTest.kt
@@ -1,11 +1,11 @@
 package ch.epfl.sweng.rps.services
 
 import ch.epfl.sweng.rps.TestUtils.initializeForTest
-import ch.epfl.sweng.rps.models.remote.Game
+import ch.epfl.sweng.rps.remote.FirebaseReferences
 import ch.epfl.sweng.rps.models.remote.GameMode
+import ch.epfl.sweng.rps.models.remote.Game
 import ch.epfl.sweng.rps.models.remote.Hand
 import ch.epfl.sweng.rps.models.remote.Round
-import ch.epfl.sweng.rps.remote.FirebaseReferences
 import ch.epfl.sweng.rps.remote.FirebaseRepository
 import ch.epfl.sweng.rps.utils.consume
 import com.google.firebase.Timestamp
Original file line number	Diff line number	Diff line change
Expand Up		@@ -121,4 +121,3 @@ class LeaderBoardFragmentTest {
		}

		}
-Original file line number
+Diff line change
@@ Expand Up / @@ -92,6 +92,7 @@ class SettingsPageTest { @@
         }
         @Test
         fun testSettingsPage() {
             onView(withId(R.id.settings)).check(matches(isDisplayed()))
@@ Expand Down @@