react-native-audio-browser 0.2.0-next.11 → 0.2.0-next.13

package/android/src/test/java/com/audiobrowser/browser/StyleResolverTest.kt

@@ -0,0 +1,154 @@
+package com.audiobrowser.browser
+
+import com.audiobrowser.TestFixtures.sectionStyle
+import com.audiobrowser.TestFixtures.trackStyle
+import com.margelo.nitro.audiobrowser.ArtworkRendering
+import com.margelo.nitro.audiobrowser.CardImage
+import com.margelo.nitro.audiobrowser.GridTile
+import com.margelo.nitro.audiobrowser.ImageShape
+import com.margelo.nitro.audiobrowser.StyleDisplay
+import org.junit.Assert.assertEquals
+import org.junit.Assert.assertNull
+import org.junit.Test
+
+/**
+ * Resolution semantics (ADR 0011): container properties and `display` resolve by scope override
+ * (`section ?? page`), inherited item properties resolve `track ?? section ?? page` — and `display`
+ * never inherits onto an item.
+ */
+class StyleResolverTest {
+
+  @Test
+  fun `section overrides the page per property`() {
+    val resolved =
+      StyleResolver.sectionStyle(
+        section =
+          sectionStyle(display = StyleDisplay.LIST, artworkRendering = null, gridWrap = null),
+        page =
+          sectionStyle(
+            display = StyleDisplay.GRID,
+            artworkRendering = ArtworkRendering.STENCIL,
+            gridWrap = false,
+          ),
+      )
+    // Declared on the section: wins. Undeclared: the page's scope-wide value.
+    assertEquals(StyleDisplay.LIST, resolved.display)
+    assertEquals(ArtworkRendering.STENCIL, resolved.artworkRendering)
+    assertEquals(false, resolved.gridWrap)
+  }
+
+  @Test
+  fun `a styleless section takes the page block`() {
+    val resolved =
+      StyleResolver.sectionStyle(
+        section = null,
+        page = sectionStyle(display = StyleDisplay.GRID, artworkRendering = null, gridWrap = true),
+      )
+    assertEquals(StyleDisplay.GRID, resolved.display)
+    assertEquals(true, resolved.gridWrap)
+  }
+
+  @Test
+  fun `track overrides the section per property`() {
+    val resolved =
+      StyleResolver.trackStyle(
+        track = trackStyle(display = null, artworkRendering = ArtworkRendering.ORIGINAL),
+        section =
+          sectionStyle(
+            display = StyleDisplay.GRID,
+            artworkRendering = ArtworkRendering.STENCIL,
+            gridWrap = null,
+          ),
+      )
+    assertEquals(ArtworkRendering.ORIGINAL, resolved.artworkRendering)
+  }
+
+  @Test
+  fun `a styleless track inherits the section value`() {
+    val resolved =
+      StyleResolver.trackStyle(
+        track = null,
+        section =
+          sectionStyle(display = null, artworkRendering = ArtworkRendering.STENCIL, gridWrap = null),
+      )
+    assertEquals(ArtworkRendering.STENCIL, resolved.artworkRendering)
+  }
+
+  @Test
+  fun `display never inherits onto an item`() {
+    // The track's own display is the page promise for the page IT opens; the
+    // section's describes its children's layout. Neither may surface as the
+    // item's resolved display.
+    val resolved =
+      StyleResolver.trackStyle(
+        track = trackStyle(display = StyleDisplay.GRID, artworkRendering = null),
+        section =
+          sectionStyle(display = StyleDisplay.GRID, artworkRendering = null, gridWrap = null),
+      )
+    assertNull(resolved.display)
+  }
+
+  @Test
+  fun `imageShape inherits and overrides per item`() {
+    // Section-wide circular (an artists shelf); one album overrides.
+    val inherited =
+      StyleResolver.trackStyle(
+        track = null,
+        section = sectionStyle(imageShape = ImageShape.CIRCULAR),
+      )
+    assertEquals(ImageShape.CIRCULAR, inherited.imageShape)
+    val overridden =
+      StyleResolver.trackStyle(
+        track = trackStyle(imageShape = ImageShape.ROUNDED_RECTANGLE),
+        section = sectionStyle(imageShape = ImageShape.CIRCULAR),
+      )
+    assertEquals(ImageShape.ROUNDED_RECTANGLE, overridden.imageShape)
+  }
+
+  @Test
+  fun `accessorySymbol inherits and 'none' resolves as a value`() {
+    val inherited =
+      StyleResolver.trackStyle(track = null, section = sectionStyle(accessorySymbol = "lock.fill"))
+    assertEquals("lock.fill", inherited.accessorySymbol)
+    // 'none' is the inheritance escape — it must survive resolution intact
+    // (the renderer, not the resolver, maps it to "no accessory").
+    val escaped =
+      StyleResolver.trackStyle(
+        track = trackStyle(accessorySymbol = "none"),
+        section = sectionStyle(accessorySymbol = "lock.fill"),
+      )
+    assertEquals("none", escaped.accessorySymbol)
+  }
+
+  @Test
+  fun `gridTile resolves by scope override`() {
+    // A page-wide card treatment; one section opts back to plain tiles.
+    val inherited =
+      StyleResolver.sectionStyle(section = null, page = sectionStyle(gridTile = GridTile.CARD))
+    assertEquals(GridTile.CARD, inherited.gridTile)
+    val overridden =
+      StyleResolver.sectionStyle(
+        section = sectionStyle(gridTile = GridTile.PLAIN),
+        page = sectionStyle(gridTile = GridTile.CARD),
+      )
+    assertEquals(GridTile.PLAIN, overridden.gridTile)
+  }
+
+  @Test
+  fun `card properties inherit and override per item`() {
+    val inherited =
+      StyleResolver.trackStyle(
+        track = null,
+        section = sectionStyle(cardTint = "#1e3a8a", cardImage = CardImage.BACKGROUND),
+      )
+    assertEquals("#1e3a8a", inherited.cardTint)
+    assertEquals(CardImage.BACKGROUND, inherited.cardImage)
+    val overridden =
+      StyleResolver.trackStyle(
+        track = trackStyle(cardImage = CardImage.NORMAL),
+        section = sectionStyle(cardTint = "#1e3a8a", cardImage = CardImage.BACKGROUND),
+      )
+    assertEquals(CardImage.NORMAL, overridden.cardImage)
+    assertEquals("#1e3a8a", overridden.cardTint)
+  }
+}

package/android/src/test/java/com/audiobrowser/extension/TappedTrackTest.kt

@@ -0,0 +1,43 @@
+package com.audiobrowser.extension
+
+import com.audiobrowser.TestFixtures.track
+import com.audiobrowser.util.BrowserPathHelper
+import org.junit.Assert.assertEquals
+import org.junit.Test
+import org.junit.runner.RunWith
+import org.robolectric.RobolectricTestRunner
+
+/**
+ * The skip-in-place queue match (ADR 0009): exact contextual-path equality pins the tapped copy;
+ * the identity match remains for index-less paths; an index-stamped path with no exact match
+ * misses, so the caller re-expands. Robolectric for `android.net.Uri` (contextual-path parsing).
+ */
+@RunWith(RobolectricTestRunner::class)
+class TappedTrackTest {
+
+  private fun stamped(id: String, index: Int) = BrowserPathHelper.build("/page", id, index)
+
+  private val queue =
+    arrayOf(
+      track(src = "a").copy(path = stamped("a", 0)),
+      track(src = "b").copy(path = stamped("b", 1)),
+      track(src = "a").copy(path = stamped("a", 2)),
+    )
+
+  @Test
+  fun `exact path match pins the tapped copy of a duplicate identity`() {
+    assertEquals(2, queue.indexOfTappedTrack(stamped("a", 2), "a"))
+  }
+
+  @Test
+  fun `index-less path falls back to the identity match`() {
+    assertEquals(0, queue.indexOfTappedTrack(BrowserPathHelper.build("/page", "a"), "a"))
+  }
+
+  @Test
+  fun `index-stamped path with no exact match misses instead of identity-skipping`() {
+    // A tap in another section whose identity also sits in this queue: the
+    // caller must re-expand (re-scoping to the tapped section), not skip.
+    assertEquals(-1, queue.indexOfTappedTrack(stamped("a", 7), "a"))
+  }
+}

package/android/src/test/java/com/audiobrowser/extension/TrackIdentityTest.kt

@@ -0,0 +1,41 @@
+package com.audiobrowser.extension
+
+import com.audiobrowser.TestFixtures.track
+import org.junit.Assert.assertEquals
+import org.junit.Assert.assertNull
+import org.junit.Test
+
+/**
+ * THE identity rule (ADR 0008): a track's identity is its `id` when non-blank, else its `src`.
+ * Everything that compares tracks — favorites, section scoping, skip-in-place, `__trackId` — goes
+ * through this extension.
+ */
+class TrackIdentityTest {
+
+  @Test
+  fun `id wins over src`() {
+    assertEquals("stable-id", track(id = "stable-id", src = "https://s/a.mp3").identity)
+  }
+
+  @Test
+  fun `blank id falls back to src`() {
+    assertEquals("https://s/a.mp3", track(id = "", src = "https://s/a.mp3").identity)
+    assertEquals("https://s/a.mp3", track(id = "  ", src = "https://s/a.mp3").identity)
+  }
+
+  @Test
+  fun `missing id falls back to src`() {
+    assertEquals("https://s/a.mp3", track(id = null, src = "https://s/a.mp3").identity)
+  }
+
+  @Test
+  fun `id alone is an identity`() {
+    assertEquals("stable-id", track(id = "stable-id", src = null).identity)
+  }
+
+  @Test
+  fun `neither id nor src means no identity`() {
+    assertNull(track(id = null, src = null).identity)
+    assertNull(track(id = "", src = null).identity)
+  }
+}

package/android/src/test/java/com/audiobrowser/player/CapabilityControlsTest.kt

@@ -3,7 +3,6 @@ package com.audiobrowser.player
 import com.margelo.nitro.audiobrowser.PlayerCapabilities
 import com.margelo.nitro.audiobrowser.RemoteButton
 import com.margelo.nitro.audiobrowser.RemoteButtonLayout
-import com.margelo.nitro.audiobrowser.Variant_Boolean_FavoriteConfig
 import org.junit.Assert.assertEquals
 import org.junit.Assert.assertFalse
 import org.junit.Assert.assertTrue
@@ -36,7 +35,7 @@ class CapabilityControlsTest {
       skipToPrevious = skipToPrevious,
       jumpForward = jumpForward,
       jumpBackward = jumpBackward,
-      favorite = favorite?.let { Variant_Boolean_FavoriteConfig.First(it) },
+      favorite = favorite,
       shuffleMode = null,
       repeatMode = null,
       playbackRate = null,

package/android/src/test/java/com/audiobrowser/player/NowPlayingUpdaterTest.kt

@@ -377,7 +377,7 @@ class NowPlayingUpdaterTest {
   }
 
   @Test
-  fun `artwork re-resolves for a new track id and skips without an id`() = runTest {
+  fun `artwork re-resolves for a new track identity including id-less tracks`() = runTest {
     val surface =
       FakeSurface().apply {
         currentTrack = track("A", id = "a")
@@ -393,10 +393,31 @@ class NowPlayingUpdaterTest {
     runCurrent()
     assertEquals(2, surface.artworkResolveCount)
 
+    // The config runs for id-less tracks too — no blanket skip.
     surface.currentTrack = track("C", id = null, src = "https://s/c.mp3")
     updater.render()
     runCurrent()
-    assertEquals(2, surface.artworkResolveCount) // no id → no resolve
+    assertEquals(3, surface.artworkResolveCount)
+    assertEquals(0 to "https://img/a.png", surface.artworkStamps.last())
+  }
+
+  @Test
+  fun `artwork for an id-less track resolves once keyed on src identity`() = runTest {
+    val surface =
+      FakeSurface().apply {
+        currentTrack = track("C", id = null, src = "https://s/c.mp3")
+        hasNowPlayingArtworkConfig = true
+        artworkResult = "https://img/c.png"
+      }
+    val updater = NowPlayingUpdater(surface, backgroundScope)
+
+    updater.render()
+    runCurrent()
+    updater.updateNowPlaying(update(title = "Song")) // re-render, same track
+    runCurrent()
+
+    assertEquals(1, surface.artworkResolveCount)
+    assertEquals(listOf(0 to "https://img/c.png"), surface.artworkStamps)
   }
 
   @Test
@@ -439,4 +460,23 @@ class NowPlayingUpdaterTest {
 
     assertTrue(surface.artworkStamps.isEmpty())
   }
+
+  @Test
+  fun `a stale artwork result for an id-less track is not stamped after a track change`() =
+    runTest {
+      val surface =
+        FakeSurface().apply {
+          currentTrack = track("A", id = null, src = "https://s/a.mp3")
+          hasNowPlayingArtworkConfig = true
+          artworkResult = "https://img/a.png"
+        }
+      val updater = NowPlayingUpdater(surface, backgroundScope)
+
+      updater.render() // schedules the artwork resolve
+      // Skip to another id-less track before it lands: identity (src) keying must catch it.
+      surface.currentTrack = track("B", id = null, src = "https://s/b.mp3")
+      runCurrent()
+
+      assertTrue(surface.artworkStamps.isEmpty())
+    }
 }

package/android/src/test/java/com/audiobrowser/player/PlaybackStateStoreTrackJsonTest.kt

@@ -0,0 +1,55 @@
+package com.audiobrowser.player
+
+import com.audiobrowser.TestFixtures
+import com.audiobrowser.TestFixtures.trackStyle
+import com.margelo.nitro.audiobrowser.ArtworkRendering
+import com.margelo.nitro.audiobrowser.StyleDisplay
+import org.junit.Assert.assertEquals
+import org.junit.Assert.assertNull
+import org.junit.Test
+import org.junit.runner.RunWith
+import org.robolectric.RobolectricTestRunner
+
+/**
+ * The bespoke org.json persistence of the resumption track. ADR 0011: the style block and
+ * `disabled` survive process death (a restored queue keeps its visible fidelity), and a snapshot
+ * written before the block model — `style` as an enum-name string — restores without a declaration
+ * rather than failing.
+ */
+@RunWith(RobolectricTestRunner::class)
+class PlaybackStateStoreTrackJsonTest {
+
+  @Test
+  fun `style and disabled survive the round-trip`() {
+    val track =
+      TestFixtures.track(title = "Night Mix", src = "https://s/a.mp3", disabled = true)
+        .copy(
+          style =
+            trackStyle(display = StyleDisplay.GRID, artworkRendering = ArtworkRendering.STENCIL)
+        )
+
+    val restored = PlaybackStateStore.trackFromJson(PlaybackStateStore.trackToJson(track))
+
+    assertEquals(StyleDisplay.GRID, restored?.style?.display)
+    assertEquals(ArtworkRendering.STENCIL, restored?.style?.artworkRendering)
+    assertEquals(true, restored?.disabled)
+  }
+
+  @Test
+  fun `a track without style round-trips without one`() {
+    val track = TestFixtures.track(title = "Plain", src = "https://s/a.mp3")
+
+    val restored = PlaybackStateStore.trackFromJson(PlaybackStateStore.trackToJson(track))
+
+    assertNull(restored?.style)
+    assertNull(restored?.disabled)
+  }
+
+  @Test
+  fun `a pre-block snapshot with a string style restores without a declaration`() {
+    val restored = PlaybackStateStore.trackFromJson("""{"title":"X","src":"s","style":"LIST"}""")
+
+    assertEquals("X", restored?.title)
+    assertNull(restored?.style)
+  }
+}

package/android/src/test/java/com/audiobrowser/player/ShuffleOrderLedByTest.kt

@@ -0,0 +1,79 @@
+package com.audiobrowser.player
+
+import androidx.media3.common.C
+import org.junit.Assert.assertEquals
+import org.junit.Assert.assertNotEquals
+import org.junit.Assert.assertTrue
+import org.junit.Test
+
+/**
+ * Media3's `ShuffleOrder.cloneAndSet(insertionCount, startIndex)` discards the start index (the
+ * interface default clears and re-inserts from 0, and `DefaultShuffleOrder` does not override it),
+ * so `setMediaItems(items, startIndex, …)` leaves the starting track at a random shuffle position —
+ * last, for a 1-in-N share of queues, which reads as end-of-queue from the very first track.
+ */
+class ShuffleOrderLedByTest {
+  @Test
+  fun `the start index leads the order`() {
+    for (start in 0 until 6) {
+      val order = shuffleOrderLedBy(startIndex = start, count = 6)
+      assertEquals("start index must be at shuffle position 0", start, order.firstIndex)
+      assertNotEquals(
+        "a queue of 6 must have somewhere to advance to from its start track",
+        C.INDEX_UNSET.toLong(),
+        order.getNextIndex(start).toLong(),
+      )
+    }
+  }
+
+  @Test
+  fun `every index appears exactly once`() {
+    val order = shuffleOrderLedBy(startIndex = 3, count = 8)
+    assertEquals(8, order.length)
+    val seen = mutableListOf<Int>()
+    var index = order.firstIndex
+    while (index != C.INDEX_UNSET) {
+      seen.add(index)
+      index = order.getNextIndex(index)
+    }
+    assertEquals((0 until 8).toList(), seen.sorted())
+  }
+
+  @Test
+  fun `a single-track queue leads with its only track and ends there`() {
+    val order = shuffleOrderLedBy(startIndex = 0, count = 1)
+    assertEquals(0, order.firstIndex)
+    assertEquals(C.INDEX_UNSET, order.getNextIndex(0))
+  }
+
+  @Test
+  fun `an out-of-range start index is clamped rather than throwing`() {
+    assertEquals(4, shuffleOrderLedBy(startIndex = 99, count = 5).firstIndex)
+    assertEquals(0, shuffleOrderLedBy(startIndex = -3, count = 5).firstIndex)
+  }
+
+  @Test
+  fun `an empty queue produces an empty order`() {
+    assertEquals(0, shuffleOrderLedBy(startIndex = 0, count = 0).length)
+  }
+
+  @Test
+  fun `the tail is actually shuffled`() {
+    // Not a strict guarantee of any single draw — but across many draws an
+    // unshuffled tail would be impossible to miss.
+    val tails =
+      (0 until 50)
+        .map { shuffleOrderLedBy(startIndex = 0, count = 8) }
+        .map { order ->
+          buildList {
+            var index = order.getNextIndex(order.firstIndex)
+            while (index != C.INDEX_UNSET) {
+              add(index)
+              index = order.getNextIndex(index)
+            }
+          }
+        }
+        .toSet()
+    assertTrue("50 draws produced one identical tail — the order is not shuffled", tails.size > 1)
+  }
+}

package/android/src/test/java/com/audiobrowser/util/BrowserPathHelperTest.kt

@@ -1,28 +1,53 @@
 package com.audiobrowser.util
 
-import org.junit.Assert.assertFalse
-import org.junit.Assert.assertTrue
+import org.junit.Assert.assertEquals
+import org.junit.Assert.assertNull
 import org.junit.Test
+import org.junit.runner.RunWith
+import org.robolectric.RobolectricTestRunner
 
+@RunWith(RobolectricTestRunner::class)
 class BrowserPathHelperTest {
 
   @Test
-  fun `containsSegment matches a uid as a full path segment`() {
-    val path = "/listen/amsterdam-funk-channel/Gw0LGB8j"
-    assertTrue(BrowserPathHelper.containsSegment(path, "Gw0LGB8j"))
-    assertTrue(BrowserPathHelper.containsSegment(path, "amsterdam-funk-channel"))
-    assertTrue(BrowserPathHelper.containsSegment(path, "listen"))
-    assertTrue(BrowserPathHelper.containsSegment("/listen/x/Gw0LGB8j?hl=en", "Gw0LGB8j"))
-    assertTrue(BrowserPathHelper.containsSegment("/listen/x/Gw0LGB8j#frag", "Gw0LGB8j"))
+  fun `build round-trips a src carrying its own query params`() {
+    // A src carrying its own query string (signed CDN URL) must survive the
+    // build → extract/strip round-trip: an unescaped `&` would split the src
+    // into stray query params, truncating the trackId and polluting the
+    // parent path.
+    val src = "https://cdn.example.com/stream.mp3?token=abc&exp=1699999999"
+    val url = BrowserPathHelper.build("/library", src)
+    assertEquals(src, BrowserPathHelper.extractTrackId(url))
+    assertEquals("/library", BrowserPathHelper.stripTrackId(url))
   }
 
   @Test
-  fun `containsSegment rejects partial-segment and missing matches`() {
-    val path = "/listen/amsterdam-funk-channel/Gw0LGB8j"
-    assertFalse(BrowserPathHelper.containsSegment(path, "Gw0LGB8"))
-    assertFalse(BrowserPathHelper.containsSegment(path, "funk"))
-    assertFalse(BrowserPathHelper.containsSegment(path, "msterdam-funk-channe"))
-    assertFalse(BrowserPathHelper.containsSegment(path, "NopeNope"))
-    assertFalse(BrowserPathHelper.containsSegment(path, ""))
+  fun `build round-trips a src with equals and plus`() {
+    val src = "https://cdn.example.com/a+b.mp3?sig=x=y"
+    val url = BrowserPathHelper.build("/library", src)
+    assertEquals(src, BrowserPathHelper.extractTrackId(url))
+    assertEquals("/library", BrowserPathHelper.stripTrackId(url))
+  }
+
+  @Test
+  fun `build stamps the index and round-trips it`() {
+    val src = "https://cdn.example.com/stream.mp3?token=abc&exp=1"
+    val url = BrowserPathHelper.build("/library", src, 3)
+    assertEquals(src, BrowserPathHelper.extractTrackId(url))
+    assertEquals(3, BrowserPathHelper.extractIndex(url))
+    assertEquals("/library", BrowserPathHelper.stripTrackId(url))
+  }
+
+  @Test
+  fun `extractIndex returns null without a stamped index`() {
+    val url = BrowserPathHelper.build("/library", "song.mp3")
+    assertNull(BrowserPathHelper.extractIndex(url))
+  }
+
+  @Test
+  fun `extractIndex returns null for non-contextual or malformed-index URLs`() {
+    assertNull(BrowserPathHelper.extractIndex("/library"))
+    assertNull(BrowserPathHelper.extractIndex("/library?__trackId=song.mp3&__index=x"))
+    assertNull(BrowserPathHelper.extractIndex("/library?__trackId=song.mp3&__index=-1"))
   }
 }