react-native-audio-browser 0.2.0-next.3 → 0.2.0-next.30

package/android/src/test/java/com/audiobrowser/TestFixtures.kt

@@ -1,13 +1,21 @@
 package com.audiobrowser
 
 import com.audiobrowser.util.artworkOf
-
+import com.margelo.nitro.audiobrowser.ArtworkRendering
 import com.margelo.nitro.audiobrowser.ArtworkRequestConfig
+import com.margelo.nitro.audiobrowser.CardImage
+import com.margelo.nitro.audiobrowser.GridTile
 import com.margelo.nitro.audiobrowser.ImageQueryParams
-import com.margelo.nitro.audiobrowser.ImageRowItem
+import com.margelo.nitro.audiobrowser.ImageShape
 import com.margelo.nitro.audiobrowser.ImageSource
 import com.margelo.nitro.audiobrowser.MediaRequestConfig
+import com.margelo.nitro.audiobrowser.NativeRouteEntry
+import com.margelo.nitro.audiobrowser.ResolvedTrack
+import com.margelo.nitro.audiobrowser.Section
+import com.margelo.nitro.audiobrowser.SectionStyle
+import com.margelo.nitro.audiobrowser.StyleDisplay
 import com.margelo.nitro.audiobrowser.Track
+import com.margelo.nitro.audiobrowser.TrackStyle
 import com.margelo.nitro.audiobrowser.TransformableRequestConfig
 
 /**
@@ -25,47 +33,38 @@ object TestFixtures {
     artist: String? = null,
     album: String? = null,
     favorited: Boolean? = null,
-    groupTitle: String? = null,
-    imageRow: Array<ImageRowItem>? = null,
+    disabled: Boolean? = null,
+    style: TrackStyle? = null,
   ) =
     Track(
       id = id,
-      url = null,
+      path = null,
       src = src,
       artwork = artworkOf(artwork),
       artworkSource = null,
       request = null,
-      artworkCarPlayTinted = null,
       title = title,
       subtitle = null,
       artist = artist,
-      albumUrl = null,
+      albumPath = null,
       album = album,
       description = null,
       genre = null,
       duration = null,
-      style = null,
-      childrenStyle = null,
+      style = style,
+      disabled = disabled,
       favorited = favorited,
-      groupTitle = groupTitle,
       live = null,
-      imageRow = imageRow,
+      icyCharset = null,
     )
 
-  fun imageRowItem(src: String, title: String = src) =
-    ImageRowItem(
-      id = null,
-      url = null,
-      src = src,
-      artwork = null,
-      artworkSource = null,
-      title = title,
-      artist = null,
-      album = null,
-      albumUrl = null,
-      live = null,
-      request = null,
-    )
+  /** A page [Section] — plain list by default. */
+  fun section(
+    children: Array<Track> = emptyArray(),
+    title: String? = null,
+    style: SectionStyle? = null,
+    path: String? = null,
+  ) = Section(title = title, style = style, path = path, children = children)
 
   fun transformableConfig(
     baseUrl: String? = null,
@@ -114,32 +113,81 @@ object TestFixtures {
    */
   fun browseTrack(
     title: String = "T",
-    url: String = "https://api.example.com/channel/abc",
+    path: String = "https://api.example.com/channel/abc",
     artwork: String? = null,
     artworkSource: ImageSource? = null,
+    style: TrackStyle? = null,
   ) =
     Track(
       id = null,
-      url = url,
+      path = path,
       src = null, // browsable, not playable
       artwork = artworkOf(artwork),
       artworkSource = artworkSource,
       request = null,
-      artworkCarPlayTinted = null,
       title = title,
       subtitle = null,
       artist = null,
-      albumUrl = null,
+      albumPath = null,
+      album = null,
+      description = null,
+      genre = null,
+      duration = null,
+      style = style,
+      disabled = null,
+      favorited = null,
+      live = null,
+      icyCharset = null,
+    )
+
+  /** A container [ResolvedTrack] — what a browse route hands back for a path. */
+  fun resolvedTrack(
+    path: String = "/container",
+    title: String = "Container",
+    children: Array<Track>? = null,
+    sections: Array<Section>? = null,
+    style: SectionStyle? = null,
+  ) =
+    ResolvedTrack(
+      path = path,
+      style = style,
+      sections = sections,
+      children = children,
+      carPlaySiriListButton = null,
+      id = null,
+      src = null,
+      artwork = null,
+      artworkSource = null,
+      request = null,
+      title = title,
+      subtitle = null,
+      artist = null,
+      albumPath = null,
       album = null,
       description = null,
       genre = null,
       duration = null,
-      style = null,
-      childrenStyle = null,
+      disabled = null,
       favorited = null,
-      groupTitle = null,
       live = null,
-      imageRow = null,
+      icyCharset = null,
+    )
+
+  /**
+   * A route serving [browseStatic] verbatim. `browseStatic` is the only one of the three browse
+   * arms (callback > config > static) that needs neither the JNI bridge nor HTTP, so it is how a
+   * unit test gives [com.audiobrowser.browser.BrowserManager] page content to resolve.
+   */
+  fun staticRoute(path: String, browseStatic: ResolvedTrack) =
+    NativeRouteEntry(
+      path = path,
+      browseCallback = null,
+      browseConfig = null,
+      browseStatic = browseStatic,
+      searchCallback = null,
+      searchConfig = null,
+      media = null,
+      artwork = null,
     )
 
   fun artworkConfig(
@@ -163,4 +211,42 @@ object TestFixtures {
       contentType = null,
       userAgent = null,
     )
+
+  fun trackStyle(
+    display: StyleDisplay? = null,
+    artworkRendering: ArtworkRendering? = null,
+    imageShape: ImageShape? = null,
+    accessorySymbol: String? = null,
+    cardTint: String? = null,
+    cardImage: CardImage? = null,
+  ) =
+    TrackStyle(
+      display = display,
+      artworkRendering = artworkRendering,
+      imageShape = imageShape,
+      accessorySymbol = accessorySymbol,
+      cardTint = cardTint,
+      cardImage = cardImage,
+    )
+
+  fun sectionStyle(
+    display: StyleDisplay? = null,
+    artworkRendering: ArtworkRendering? = null,
+    imageShape: ImageShape? = null,
+    accessorySymbol: String? = null,
+    cardTint: String? = null,
+    cardImage: CardImage? = null,
+    gridWrap: Boolean? = null,
+    gridTile: GridTile? = null,
+  ) =
+    SectionStyle(
+      gridWrap = gridWrap,
+      gridTile = gridTile,
+      display = display,
+      artworkRendering = artworkRendering,
+      imageShape = imageShape,
+      accessorySymbol = accessorySymbol,
+      cardTint = cardTint,
+      cardImage = cardImage,
+    )
 }

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

@@ -0,0 +1,153 @@
+package com.audiobrowser.browser
+
+import com.audiobrowser.TestFixtures.resolvedTrack
+import com.audiobrowser.TestFixtures.staticRoute
+import com.audiobrowser.TestFixtures.track
+import kotlinx.coroutines.runBlocking
+import org.junit.Assert.assertEquals
+import org.junit.Before
+import org.junit.Test
+import org.junit.runner.RunWith
+import org.robolectric.RobolectricTestRunner
+
+/**
+ * Favorite hydration keyed by track identity (id when non-blank, else src — see Track.identity /
+ * ADR 0008). Hydration is exercised through [BrowserManager.resolve], the path every browse page
+ * takes.
+ *
+ * Routes serve `browseStatic` (no JNI/HTTP); Robolectric is required for `android.util.LruCache`
+ * and `android.net.Uri`.
+ */
+@RunWith(RobolectricTestRunner::class)
+class BrowserManagerFavoritesTest {
+
+  private lateinit var browserManager: BrowserManager
+
+  @Before
+  fun setup() {
+    browserManager = BrowserManager()
+  }
+
+  private fun servePage(path: String, vararg children: com.margelo.nitro.audiobrowser.Track) {
+    browserManager.config =
+      BrowserConfig(
+        routes =
+          arrayOf(staticRoute(path, resolvedTrack(path = path, children = arrayOf(*children))))
+      )
+  }
+
+  private fun favoritedByTitle(children: Array<com.margelo.nitro.audiobrowser.Track>?) =
+    children?.associate { it.title to it.favorited }
+
+  @Test
+  fun `hydrates by id when the track has one`() = runBlocking {
+    servePage(
+      "/home",
+      track(title = "A", id = "stable-a", src = "https://s/a.mp3"),
+      track(title = "B", id = "stable-b", src = "https://s/b.mp3"),
+    )
+    browserManager.setFavoriteEnabled(true)
+    browserManager.setFavorites(listOf("stable-b"))
+
+    val resolved = browserManager.resolve("/home")
+
+    assertEquals(
+      mapOf("A" to false, "B" to true),
+      favoritedByTitle(resolved.flattenedChildren?.toTypedArray()),
+    )
+  }
+
+  @Test
+  fun `falls back to src for id-less tracks`() = runBlocking {
+    servePage(
+      "/home",
+      track(title = "A", src = "https://s/a.mp3"),
+      track(title = "B", src = "https://s/b.mp3"),
+    )
+    browserManager.setFavoriteEnabled(true)
+    browserManager.setFavorites(listOf("https://s/b.mp3"))
+
+    val resolved = browserManager.resolve("/home")
+
+    assertEquals(
+      mapOf("A" to false, "B" to true),
+      favoritedByTitle(resolved.flattenedChildren?.toTypedArray()),
+    )
+  }
+
+  @Test
+  fun `a favorite stored under src does not match an id-bearing track`() = runBlocking {
+    // The identity is the id when present — a src-keyed entry must not light up
+    // a track whose identity is its id (one rule, no partial matching).
+    servePage("/home", track(title = "A", id = "stable-a", src = "https://s/a.mp3"))
+    browserManager.setFavoriteEnabled(true)
+    browserManager.setFavorites(listOf("https://s/a.mp3"))
+
+    val resolved = browserManager.resolve("/home")
+
+    assertEquals(mapOf("A" to false), favoritedByTitle(resolved.flattenedChildren?.toTypedArray()))
+  }
+
+  @Test
+  fun `caller-set favorited wins over hydration`() = runBlocking {
+    servePage(
+      "/home",
+      track(title = "A", id = "stable-a", src = "https://s/a.mp3", favorited = false),
+    )
+    browserManager.setFavoriteEnabled(true)
+    browserManager.setFavorites(listOf("stable-a"))
+
+    val resolved = browserManager.resolve("/home")
+
+    // API-provided value is never overwritten, even when the identity is favorited.
+    assertEquals(mapOf("A" to false), favoritedByTitle(resolved.flattenedChildren?.toTypedArray()))
+  }
+
+  @Test
+  fun `disabled favoriting leaves tracks untouched`() = runBlocking {
+    servePage("/home", track(title = "A", id = "stable-a", src = "https://s/a.mp3"))
+    // favoriteEnabled defaults to false
+    browserManager.setFavorites(listOf("stable-a"))
+
+    val resolved = browserManager.resolve("/home")
+
+    assertEquals(
+      mapOf<String, Boolean?>("A" to null),
+      favoritedByTitle(resolved.flattenedChildren?.toTypedArray()),
+    )
+  }
+
+  @Test
+  fun `updateFavorite adds and removes by identity`() = runBlocking {
+    servePage("/home", track(title = "A", id = "stable-a", src = "https://s/a.mp3"))
+    browserManager.setFavoriteEnabled(true)
+
+    assertEquals(
+      mapOf("A" to false),
+      favoritedByTitle(browserManager.resolve("/home").flattenedChildren?.toTypedArray()),
+    )
+
+    browserManager.updateFavorite("stable-a", true)
+    assertEquals(
+      mapOf("A" to true),
+      favoritedByTitle(browserManager.resolve("/home").flattenedChildren?.toTypedArray()),
+    )
+
+    browserManager.updateFavorite("stable-a", false)
+    assertEquals(
+      mapOf("A" to false),
+      favoritedByTitle(browserManager.resolve("/home").flattenedChildren?.toTypedArray()),
+    )
+  }
+
+  @Test
+  fun `getCachedTrack re-hydrates favorites by identity`() = runBlocking {
+    servePage("/home", track(title = "A", id = "stable-a", src = "https://s/a.mp3"))
+    browserManager.setFavoriteEnabled(true)
+    browserManager.resolve("/home")
+
+    browserManager.updateFavorite("stable-a", true)
+
+    assertEquals(true, browserManager.getCachedTrack("stable-a")?.favorited)
+  }
+}

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

@@ -8,6 +8,8 @@ import org.junit.Assert.assertNull
 import org.junit.Assert.assertSame
 import org.junit.Before
 import org.junit.Test
+import org.junit.runner.RunWith
+import org.robolectric.RobolectricTestRunner
 
 /**
  * Tests the request/browse layer resolution + caching introduced for resolver thunks.
@@ -26,7 +28,11 @@ import org.junit.Test
  * bump, no in-flight cache) is identical for the static and resolver paths — `resolveLayer` only
  * differs in how it produces the `TransformableRequestConfig` — so the guard is fully covered here.
  * The resolver-await path is covered by the TS/web-stub tests and on iOS.
+ *
+ * Runs under Robolectric for [BrowserManager]'s `android.util.LruCache` fields: `clearContentCache`
+ * calls `evictAll()`, which a plain JVM test cannot execute.
  */
+@RunWith(RobolectricTestRunner::class)
 class BrowserManagerLayerResolutionTest {
 
   private lateinit var browserManager: BrowserManager
@@ -138,4 +144,13 @@ class BrowserManagerLayerResolutionTest {
     assertSame(request, browserManager.resolvedRequestLayerForTest)
     assertNull(browserManager.resolvedBrowseLayerForTest)
   }
+
+  @Test
+  fun `viewMoreTitle falls back to the in-code default when unconfigured`() = runTest {
+    // The only viewMoreTitle path a JVM test can reach — a configured callback returns a Nitro
+    // Promise, see the resolver-thunk gap noted above.
+    browserManager.config = BrowserConfig()
+
+    assertEquals(BrowserManager.DEFAULT_VIEW_MORE_TITLE, browserManager.viewMoreTitle())
+  }
 }