MaximeZmt · kamilababayeva · Apr 4, 2022 · Apr 1, 2022 · Apr 1, 2022 · Apr 1, 2022
diff --git a/app/src/androidTest/java/ch/sdp/vibester/BuzzerScoreUpdaterTest.kt b/app/src/androidTest/java/ch/sdp/vibester/BuzzerScoreUpdaterTest.kt
@@ -1,15 +1,13 @@
 package ch.sdp.vibester
 
 import junit.framework.Assert.assertTrue
-import org.hamcrest.CoreMatchers.equalTo
-import org.hamcrest.MatcherAssert.assertThat
 import org.junit.Test
 
 public class BuzzerScoreUpdaterTest {
 
     @Test
     fun constructorTestWithSameSizedArrays() {
-        val idArray = arrayOf(R.id.buzzer_0, R.id.buzzer_1, R.id.buzzer_2, R.id.buzzer_3)
+        val idArray = arrayListOf(R.id.buzzer_0, R.id.buzzer_1, R.id.buzzer_2, R.id.buzzer_3)
         val scoreArray = arrayOf(0, 0, 0, 0)
         val testUpdater = BuzzerScoreUpdater(idArray, scoreArray)
         for (key in idArray) {
@@ -22,7 +20,7 @@ public class BuzzerScoreUpdaterTest {
 
     @Test
     fun arrayUpdateTest() {
-        val idArray = arrayOf(R.id.buzzer_0, R.id.buzzer_1, R.id.buzzer_2, R.id.buzzer_3)
+        val idArray = arrayListOf(R.id.buzzer_0, R.id.buzzer_1, R.id.buzzer_2, R.id.buzzer_3)
         val scoreArray = arrayOf(0, 0, 0, 0)
         val testUpdater = BuzzerScoreUpdater(idArray, scoreArray)
         for (id in idArray) {
@@ -33,7 +31,7 @@ public class BuzzerScoreUpdaterTest {
 
     @Test
     fun arrayUpdateWithWrongIdReturns() {
-        val idArray = arrayOf(R.id.buzzer_0, R.id.buzzer_1, R.id.buzzer_2, R.id.buzzer_3)
+        val idArray = arrayListOf(R.id.buzzer_0, R.id.buzzer_1, R.id.buzzer_2, R.id.buzzer_3)
         val scoreArray = arrayOf(0, 0, 0, 0)
         val testUpdater = BuzzerScoreUpdater(idArray, scoreArray)
         testUpdater.updateScoresArray(-1)

diff --git a/app/src/androidTest/java/ch/sdp/vibester/GenreTemporaryTest.kt b/app/src/androidTest/java/ch/sdp/vibester/GenreTemporaryTest.kt
diff --git a/app/src/androidTest/java/ch/sdp/vibester/GenreToLyricsTest.kt b/app/src/androidTest/java/ch/sdp/vibester/GenreToLyricsTest.kt
diff --git a/app/src/androidTest/java/ch/sdp/vibester/GenreToTypingTest.kt b/app/src/androidTest/java/ch/sdp/vibester/GenreToTypingTest.kt
diff --git a/...bester/activity/GamescreenActivityTest.kt → ...ster/activity/BuzzerScreenActivityTest.kt b/...bester/activity/GamescreenActivityTest.kt → ...ster/activity/BuzzerScreenActivityTest.kt
@@ -18,12 +18,11 @@ import org.junit.Test
 import org.junit.runner.RunWith
 
 @RunWith(AndroidJUnit4::class)
-
-class GamescreenActivityTest {
+class BuzzerScreenActivityTest {
 
     @get:Rule
     val testRule = ActivityScenarioRule(
-        GamescreenActivity::class.java
+        BuzzerScreenActivity::class.java
     )
 
     @Before
@@ -77,30 +76,13 @@ class GamescreenActivityTest {
      */
     @Test
     fun checkIntentOnEnding() {
-        val incArray: ArrayList<String> = arrayListOf()
-        incArray.addAll(arrayOf("One", "Two", "Three"))
-
-        val statNames: ArrayList<String> = arrayListOf()
-        statNames.addAll(
-            arrayOf(
-                "Hello there",
-                "Second Stat",
-                "Third Stat",
-                "Fourth Stat",
-                "Fifth Stat"
-            )
-        )
-
-        val statVal: ArrayList<String> = arrayListOf()
-        statVal.addAll(
-            arrayOf(
-                "General Kenobi",
-                "----- *2 -----",
-                "----- *3 -----",
-                "----- *4 -----",
-                "----- *5 -----"
-            )
-        )
+        val mockArray = arrayListOf<String>("One", "Two", "Three", "Four", "Five")
+
+        val incArray: ArrayList<String> = mockArray
+
+        val statNames: ArrayList<String> = mockArray
+
+        val statVal: ArrayList<String> = mockArray
 
         onView(withId(R.id.go_to_end)).perform(click())
         intended(hasComponent(GameEndingActivity::class.java.name))