Add some missing clearAllMocks() calls

SRGSSR · Dec 18, 2024 · 13cf17b · 13cf17b
1 parent 8522d6d
commit 13cf17b
Show file tree

Hide file tree

Showing 7 changed files with 38 additions and 8 deletions.
diff --git a/pillarbox-analytics/src/test/java/ch/srgssr/pillarbox/analytics/SRGAnalyticsSingletonTest.kt b/pillarbox-analytics/src/test/java/ch/srgssr/pillarbox/analytics/SRGAnalyticsSingletonTest.kt
@@ -9,8 +9,8 @@ import android.content.Context
 import androidx.test.core.app.ApplicationProvider
 import androidx.test.ext.junit.runners.AndroidJUnit4
 import com.comscore.Analytics
+import io.mockk.clearAllMocks
 import io.mockk.mockkStatic
-import io.mockk.unmockkAll
 import org.junit.runner.RunWith
 import org.robolectric.Shadows.shadowOf
 import kotlin.test.AfterTest
@@ -37,7 +37,7 @@ class SRGAnalyticsSingletonTest {
 
     @AfterTest
     fun tearDown() {
-        unmockkAll()
+        clearAllMocks()
     }
 
     @Test(expected = IllegalArgumentException::class)

diff --git a/pillarbox-analytics/src/test/java/ch/srgssr/pillarbox/analytics/SRGAnalyticsTest.kt b/pillarbox-analytics/src/test/java/ch/srgssr/pillarbox/analytics/SRGAnalyticsTest.kt
@@ -10,9 +10,11 @@ import ch.srgssr.pillarbox.analytics.commandersact.CommandersActPageView
 import ch.srgssr.pillarbox.analytics.comscore.ComScore
 import ch.srgssr.pillarbox.analytics.comscore.ComScorePageView
 import io.mockk.Called
+import io.mockk.clearAllMocks
 import io.mockk.confirmVerified
 import io.mockk.mockk
 import io.mockk.verify
+import kotlin.test.AfterTest
 import kotlin.test.BeforeTest
 import kotlin.test.Test
 
@@ -31,6 +33,11 @@ class SRGAnalyticsTest {
         )
     }
 
+    @AfterTest
+    fun tearDown() {
+        clearAllMocks()
+    }
+
     @Test
     fun `sendPageView invokes comScore and commandersAct`() {
         val commandersActPageView = CommandersActPageView(

diff --git a/pillarbox-analytics/src/test/java/ch/srgssr/pillarbox/analytics/comscore/ComScoreSrgTest.kt b/pillarbox-analytics/src/test/java/ch/srgssr/pillarbox/analytics/comscore/ComScoreSrgTest.kt
@@ -10,11 +10,11 @@ import androidx.test.ext.junit.runners.AndroidJUnit4
 import ch.srgssr.pillarbox.analytics.AnalyticsConfig
 import com.comscore.Analytics
 import com.comscore.PublisherConfiguration
+import io.mockk.clearAllMocks
 import io.mockk.confirmVerified
 import io.mockk.every
 import io.mockk.mockk
 import io.mockk.mockkStatic
-import io.mockk.unmockkAll
 import io.mockk.verify
 import org.junit.runner.RunWith
 import org.robolectric.Shadows.shadowOf
@@ -44,7 +44,7 @@ class ComScoreSrgTest {
 
     @AfterTest
     fun tearDown() {
-        unmockkAll()
+        clearAllMocks()
     }
 
     @Test(expected = IllegalArgumentException::class)

diff --git a/...ness/src/test/java/ch/srgssr/pillarbox/core/business/tracker/SRGEventLoggerTrackerTest.kt b/...ness/src/test/java/ch/srgssr/pillarbox/core/business/tracker/SRGEventLoggerTrackerTest.kt
@@ -6,18 +6,31 @@ package ch.srgssr.pillarbox.core.business.tracker
 
 import androidx.media3.exoplayer.ExoPlayer
 import androidx.test.ext.junit.runners.AndroidJUnit4
+import io.mockk.clearAllMocks
 import io.mockk.mockk
 import io.mockk.verifySequence
 import org.junit.runner.RunWith
+import kotlin.test.AfterTest
+import kotlin.test.BeforeTest
 import kotlin.test.Test
 
 @RunWith(AndroidJUnit4::class)
 class SRGEventLoggerTrackerTest {
+    private lateinit var player: ExoPlayer
+
+    @BeforeTest
+    fun setUp() {
+        player = mockk(relaxed = true)
+    }
+
+    @AfterTest
+    fun tearDown() {
+        clearAllMocks()
+    }
+
     @Test
     fun `event logger`() {
-        val player = mockk<ExoPlayer>(relaxed = true)
         val eventLogger = SRGEventLoggerTracker.Factory().create()
-
         eventLogger.start(player, Unit)
         eventLogger.stop(player)
 

diff --git a/...s/src/test/java/ch/srgssr/pillarbox/core/business/tracker/comscore/ComScoreTrackerTest.kt b/...s/src/test/java/ch/srgssr/pillarbox/core/business/tracker/comscore/ComScoreTrackerTest.kt
@@ -11,11 +11,11 @@ import androidx.test.ext.junit.runners.AndroidJUnit4
 import ch.srgssr.pillarbox.analytics.BuildConfig
 import com.comscore.Analytics
 import com.comscore.streaming.StreamingAnalytics
+import io.mockk.clearAllMocks
 import io.mockk.confirmVerified
 import io.mockk.every
 import io.mockk.mockk
 import io.mockk.mockkStatic
-import io.mockk.unmockkAll
 import io.mockk.verify
 import org.junit.runner.RunWith
 import kotlin.test.AfterTest
@@ -33,7 +33,7 @@ class ComScoreTrackerTest {
 
     @AfterTest
     fun tearDown() {
-        unmockkAll()
+        clearAllMocks()
     }
 
     @Test

diff --git a/pillarbox-player/src/test/java/ch/srgssr/pillarbox/player/network/RequestSenderTest.kt b/pillarbox-player/src/test/java/ch/srgssr/pillarbox/player/network/RequestSenderTest.kt
@@ -6,6 +6,7 @@ package ch.srgssr.pillarbox.player.network
 
 import ch.srgssr.pillarbox.player.network.RequestSender.send
 import ch.srgssr.pillarbox.player.network.RequestSender.toJsonRequestBody
+import io.mockk.clearAllMocks
 import io.mockk.every
 import io.mockk.mockk
 import kotlinx.serialization.Serializable
@@ -36,6 +37,8 @@ class RequestSenderTest {
     @AfterTest
     fun tearDown() {
         buffer.close()
+
+        clearAllMocks()
     }
 
     @Test

diff --git a/...test/java/ch/srgssr/pillarbox/player/notification/PillarboxMediaDescriptionAdapterTest.kt b/...test/java/ch/srgssr/pillarbox/player/notification/PillarboxMediaDescriptionAdapterTest.kt
@@ -12,10 +12,12 @@ import androidx.media3.common.Player
 import androidx.media3.ui.PlayerNotificationManager.MediaDescriptionAdapter
 import androidx.test.core.app.ApplicationProvider
 import androidx.test.ext.junit.runners.AndroidJUnit4
+import io.mockk.clearAllMocks
 import io.mockk.every
 import io.mockk.mockk
 import org.junit.runner.RunWith
 import org.robolectric.Shadows.shadowOf
+import kotlin.test.AfterTest
 import kotlin.test.BeforeTest
 import kotlin.test.Test
 import kotlin.test.assertContentEquals
@@ -35,6 +37,11 @@ class PillarboxMediaDescriptionAdapterTest {
         mediaDescriptionAdapter = PillarboxMediaDescriptionAdapter(pendingIntent, context)
     }
 
+    @AfterTest
+    fun tearDown() {
+        clearAllMocks()
+    }
+
     @Test
     fun `get current content title, with displayTitle and title in metadata`() {
         val displayTitle = "Media display title"