Simplify mocking THEOplayer version

Author: MattiasBuelens

ui/src/main/java/com/theoplayer/android/ui/Helper.kt

@@ -71,23 +71,3 @@ fun rememberTrackLabel(
 ): String = remember(key1 = track.id, key2 = track.uid) {
     constructLabel(track) ?: resources.getString(R.string.theoplayer_ui_track_unknown)
 }
-
-/**
- * Memoize the most recent call.
- */
-internal inline fun <P, R> memoizeLast(crossinline transform: (P) -> R): (P) -> R {
-    return object : (P) -> R {
-        private var lastCall: Pair<P, R>? = null
-
-        override fun invoke(input: P): R {
-            val lastCall = this.lastCall
-            return if (lastCall != null && lastCall.first == input) {
-                lastCall.second
-            } else {
-                transform(input).also { output ->
-                    this.lastCall = input to output
-                }
-            }
-        }
-    }
-}

ui/src/main/java/com/theoplayer/android/ui/util/Compat.kt

@@ -9,7 +9,7 @@ import com.theoplayer.android.api.player.track.texttrack.TextTrack
 internal val TextTrack.captionChannelCompat: Int?
     get() {
         // TextTrack.getCaptionChannel was added in THEOplayer 10.13.0.
-        return if (theoplayerVersion >= version1013) {
+        return if (THEOplayerGlobalExt.version >= version1013) {
             TheoPlayer1013Impl.getTextTrackCaptionChannel(this)
         } else null
     }

ui/src/main/java/com/theoplayer/android/ui/util/TrackExts.kt

@@ -52,7 +52,7 @@ internal fun constructLabel(
 ): String? {
     val label: String? = if (
         (track is TextTrack) &&
-        theoplayerVersion.major < 11 &&
+        THEOplayerGlobalExt.version.major < 11 &&
         (isLabelCeaFormatted(track.label) || (track.label != null && track.language == track.label))
     ) {
         // If we are below 11th major release

ui/src/main/java/com/theoplayer/android/ui/util/VersionUtil.kt

@@ -1,7 +1,6 @@
 package com.theoplayer.android.ui.util
 
 import com.theoplayer.android.api.THEOplayerGlobal
-import com.theoplayer.android.ui.memoizeLast
 
 private const val VERSION_DELIMITER = '.'
 
@@ -55,10 +54,9 @@ internal data class Version(
     }
 }
 
-private val getCachedTheoplayerVersion = memoizeLast(Version::parse)
-
-/**
- * Returns the major version of THEOplayer.
- */
-internal val theoplayerVersion: Version
-    get() = getCachedTheoplayerVersion(THEOplayerGlobal.getVersion())
+internal object THEOplayerGlobalExt {
+    /**
+     * Returns the version of THEOplayer, as a [Version].
+     */
+    val version: Version by lazy { Version.parse(THEOplayerGlobal.getVersion()) }
+}

ui/src/test/java/com/theoplayer/android/ui/util/TrackExtsTest.kt

@@ -1,12 +1,13 @@
 package com.theoplayer.android.ui.util
 
-import com.theoplayer.android.api.THEOplayerGlobal
 import com.theoplayer.android.api.player.track.Track
 import com.theoplayer.android.api.player.track.texttrack.TextTrack
 import com.theoplayer.android.api.player.track.texttrack.TextTrackType
+import io.mockk.clearMocks
 import io.mockk.clearStaticMockk
 import io.mockk.every
 import io.mockk.mockk
+import io.mockk.mockkObject
 import io.mockk.mockkStatic
 import org.junit.After
 import org.junit.Assert
@@ -100,8 +101,8 @@ class TrackExtsTest {
 
         @Before
         fun setUp() {
-            mockkStatic(THEOplayerGlobal::class)
-            every { THEOplayerGlobal.getVersion() } returns args.playerVersion
+            mockkObject(THEOplayerGlobalExt)
+            every { THEOplayerGlobalExt.version } returns Version.parse(args.playerVersion)
 
             every { track.type } returns TextTrackType.CEA608
             every { track.label } returns args.label
@@ -114,7 +115,7 @@ class TrackExtsTest {
 
         @After
         fun tearDown() {
-            clearStaticMockk(THEOplayerGlobal::class)
+            clearMocks(THEOplayerGlobalExt)
             clearStaticMockk(Track::localizedLanguageName)
         }