react-native-audio-browser 1.0.0-next.4 → 1.0.0-next.6

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (239) hide show
  1. package/android/src/cast/java/com/audiobrowser/cast/CastSupport.kt +75 -10
  2. package/android/src/main/java/com/audiobrowser/AudioBrowser.kt +41 -6
  3. package/android/src/main/java/com/audiobrowser/browser/BrowseArtworkRegistry.kt +25 -9
  4. package/android/src/main/java/com/audiobrowser/browser/BrowserManager.kt +210 -125
  5. package/android/src/main/java/com/audiobrowser/browser/FavoriteChange.kt +61 -0
  6. package/android/src/main/java/com/audiobrowser/http/HttpClient.kt +2 -59
  7. package/android/src/main/java/com/audiobrowser/http/RequestConfigBuilder.kt +3 -3
  8. package/android/src/main/java/com/audiobrowser/model/PlayerUpdateOptions.kt +2 -0
  9. package/android/src/main/java/com/audiobrowser/player/CapabilityControls.kt +2 -0
  10. package/android/src/main/java/com/audiobrowser/player/InterceptingPlayer.kt +14 -1
  11. package/android/src/main/java/com/audiobrowser/player/MediaSessionCallback.kt +201 -107
  12. package/android/src/main/java/com/audiobrowser/player/MediaSessionCommandManager.kt +2 -0
  13. package/android/src/main/java/com/audiobrowser/player/PlaybackStateMachine.kt +55 -26
  14. package/android/src/main/java/com/audiobrowser/player/Player.kt +168 -51
  15. package/android/src/main/java/com/audiobrowser/player/PlayerListener.kt +19 -8
  16. package/android/src/main/java/com/audiobrowser/player/RetryLoop.kt +1 -1
  17. package/android/src/main/java/com/audiobrowser/remote/RemoteSwitchingPlayer.kt +52 -7
  18. package/android/src/main/java/com/audiobrowser/util/ArtworkContentProvider.kt +2 -3
  19. package/android/src/main/java/com/audiobrowser/util/ArtworkRoutes.kt +5 -5
  20. package/android/src/main/java/com/audiobrowser/util/ArtworkUris.kt +5 -0
  21. package/android/src/main/java/com/audiobrowser/util/AwaitCancellable.kt +35 -11
  22. package/android/src/main/java/com/audiobrowser/util/BrowserPathHelper.kt +11 -0
  23. package/android/src/main/java/com/audiobrowser/util/TrackFactory.kt +10 -7
  24. package/android/src/main/res/values/strings.xml +5 -2
  25. package/android/src/test/java/androidx/media3/session/SessionViews.kt +15 -0
  26. package/android/src/test/java/com/audiobrowser/ConfigurationStartTest.kt +72 -0
  27. package/android/src/test/java/com/audiobrowser/ContentRefreshNavigationErrorTest.kt +1 -0
  28. package/android/src/test/java/com/audiobrowser/NavigateTrackTest.kt +1 -0
  29. package/android/src/test/java/com/audiobrowser/ResolveFormattedErrorTest.kt +1 -0
  30. package/android/src/test/java/com/audiobrowser/TestFixtures.kt +9 -6
  31. package/android/src/test/java/com/audiobrowser/browser/BrowseArtworkRegistryTest.kt +19 -0
  32. package/android/src/test/java/com/audiobrowser/browser/BrowserManagerFavoritesTest.kt +58 -0
  33. package/android/src/test/java/com/audiobrowser/browser/BrowserManagerInvalidationTest.kt +15 -0
  34. package/android/src/test/java/com/audiobrowser/browser/BrowserManagerSearchFailureTest.kt +168 -0
  35. package/android/src/test/java/com/audiobrowser/browser/BrowserManagerTest.kt +32 -0
  36. package/android/src/test/java/com/audiobrowser/browser/FavoriteChangeTest.kt +106 -0
  37. package/android/src/test/java/com/audiobrowser/http/RequestConfigBuilderTest.kt +43 -18
  38. package/android/src/test/java/com/audiobrowser/player/CapabilityControlsTest.kt +1 -0
  39. package/android/src/test/java/com/audiobrowser/player/FavoriteCapabilityTest.kt +8 -19
  40. package/android/src/test/java/com/audiobrowser/player/FavoriteRestampTest.kt +117 -0
  41. package/android/src/test/java/com/audiobrowser/player/HandleTrackLoadSeekTest.kt +1 -0
  42. package/android/src/test/java/com/audiobrowser/player/LiveSeekCommandTest.kt +1 -0
  43. package/android/src/test/java/com/audiobrowser/player/PlaybackStateMachineTest.kt +58 -1
  44. package/android/src/test/java/com/audiobrowser/player/PlayerCastTest.kt +40 -1
  45. package/android/src/test/java/com/audiobrowser/player/PlayerRetryTest.kt +115 -2
  46. package/android/src/test/java/com/audiobrowser/player/QueueEventOnSessionPlayersTest.kt +40 -0
  47. package/android/src/test/java/com/audiobrowser/player/QueueEventTest.kt +153 -0
  48. package/android/src/test/java/com/audiobrowser/player/QueueItemPickTest.kt +130 -0
  49. package/android/src/test/java/com/audiobrowser/player/SessionBrowserNeverConfiguredTest.kt +98 -0
  50. package/android/src/test/java/com/audiobrowser/player/SessionUncachedIdTest.kt +396 -0
  51. package/android/src/test/java/com/audiobrowser/player/SessionViewTest.kt +6 -2
  52. package/android/src/test/java/com/audiobrowser/player/SessionVoiceSearchTest.kt +116 -14
  53. package/android/src/test/java/com/audiobrowser/player/StandardSkipTest.kt +26 -0
  54. package/android/src/test/java/com/audiobrowser/player/TabsChangedTest.kt +81 -0
  55. package/android/src/test/java/com/audiobrowser/remote/FakeRemote.kt +12 -1
  56. package/android/src/test/java/com/audiobrowser/remote/RemoteSwitchingPlayerTest.kt +241 -0
  57. package/android/src/test/java/com/audiobrowser/util/ArtworkContentProviderTest.kt +11 -0
  58. package/android/src/test/java/com/audiobrowser/util/ArtworkRoutesTest.kt +25 -0
  59. package/android/src/test/java/com/audiobrowser/util/AwaitCancellableTest.kt +43 -2
  60. package/android/src/test/java/com/audiobrowser/util/CoilArtworkLoaderTest.kt +38 -0
  61. package/android/src/test/java/com/audiobrowser/util/TrackFactoryRatingTest.kt +11 -0
  62. package/android/src/testCast/java/com/audiobrowser/cast/SdkCastRemoteTest.kt +187 -2
  63. package/ios/AVPlayerEngine.swift +2 -2
  64. package/ios/Browser/BrowserPathHelper.swift +11 -9
  65. package/ios/Browser/PageResolver.swift +1 -1
  66. package/ios/CarPlay/CarPlayListItemFactory.swift +2 -2
  67. package/ios/CarPlay/CarPlayNowPlayingManager.swift +64 -31
  68. package/ios/CarPlay/NowPlayingButtonRules.swift +26 -0
  69. package/ios/CarPlay/SectionPresentation.swift +7 -0
  70. package/ios/Extension/Promise+AwaitCallback.swift +13 -4
  71. package/ios/HybridAudioBrowser+Player.swift +3 -2
  72. package/ios/HybridAudioBrowser.swift +1 -1
  73. package/ios/Model/NitroTypeStubs.swift +15 -0
  74. package/ios/Model/PlayerUpdateOptions.swift +2 -1
  75. package/ios/PlaybackEvent.swift +20 -0
  76. package/ios/Player/Player.swift +17 -3
  77. package/ios/Player/QueueManager.swift +23 -41
  78. package/ios/Tests/AwaitCallbackTests.swift +8 -0
  79. package/ios/Tests/BrowserPathHelperTests.swift +18 -0
  80. package/ios/Tests/CapabilityRemoteCommandTests.swift +4 -0
  81. package/ios/Tests/DataURLDecodingTests.swift +25 -0
  82. package/ios/Tests/GenerationMemoTests.swift +136 -0
  83. package/ios/Tests/JSCallbackErrorTests.swift +33 -0
  84. package/ios/Tests/NowPlayingButtonRulesTests.swift +35 -0
  85. package/ios/Tests/PlaybackStateMachineTests.swift +15 -0
  86. package/ios/Tests/PlayerPolicyTests.swift +51 -28
  87. package/ios/Tests/PlayerProgressTests.swift +0 -2
  88. package/ios/Tests/PlayerTests.swift +54 -0
  89. package/ios/Tests/QueueManagerTests.swift +111 -78
  90. package/ios/Tests/RequestLayerTests.swift +11 -0
  91. package/ios/Tests/RoutePickerSourceFrameTests.swift +30 -0
  92. package/ios/Tests/RoutePickerSourceLifetimeTests.swift +79 -0
  93. package/ios/Tests/SectionPresentationTests.swift +13 -0
  94. package/ios/Tests/Support/TestTypes.swift +23 -1
  95. package/ios/Util/ArtworkImageFetcher.swift +40 -16
  96. package/ios/Util/AwaitCallback.swift +16 -10
  97. package/ios/Util/GenerationMemo.swift +81 -17
  98. package/ios/Util/JSCallbackError.swift +23 -0
  99. package/ios/Util/OutputPicker.swift +25 -5
  100. package/ios/Util/RoutePickerSourceFrame.swift +17 -0
  101. package/ios/Util/RoutePickerSourceLifetime.swift +34 -0
  102. package/lib/commonjs/features/browser-config.js +3 -2
  103. package/lib/commonjs/features/browser-config.js.map +1 -1
  104. package/lib/commonjs/features/browser.js +7 -8
  105. package/lib/commonjs/features/browser.js.map +1 -1
  106. package/lib/commonjs/features/output.js +7 -3
  107. package/lib/commonjs/features/output.js.map +1 -1
  108. package/lib/commonjs/features/player/options.js.map +1 -1
  109. package/lib/commonjs/web/NativeAudioBrowser.js +43 -2
  110. package/lib/commonjs/web/NativeAudioBrowser.js.map +1 -1
  111. package/lib/commonjs/web/browser/BrowserManager.js +37 -65
  112. package/lib/commonjs/web/browser/BrowserManager.js.map +1 -1
  113. package/lib/commonjs/web/browser/SearchManager.js +1 -4
  114. package/lib/commonjs/web/browser/SearchManager.js.map +1 -1
  115. package/lib/commonjs/web/http/RequestConfigBuilder.js +53 -55
  116. package/lib/commonjs/web/http/RequestConfigBuilder.js.map +1 -1
  117. package/lib/commonjs/web/player/NowPlayingManager.js +3 -22
  118. package/lib/commonjs/web/player/NowPlayingManager.js.map +1 -1
  119. package/lib/commonjs/web/util/BrowserPathHelper.js +5 -7
  120. package/lib/commonjs/web/util/BrowserPathHelper.js.map +1 -1
  121. package/lib/commonjs/web/util/GenerationMemo.js +92 -0
  122. package/lib/commonjs/web/util/GenerationMemo.js.map +1 -0
  123. package/lib/module/features/browser-config.js +3 -2
  124. package/lib/module/features/browser-config.js.map +1 -1
  125. package/lib/module/features/browser.js +7 -8
  126. package/lib/module/features/browser.js.map +1 -1
  127. package/lib/module/features/output.js +7 -3
  128. package/lib/module/features/output.js.map +1 -1
  129. package/lib/module/features/player/options.js.map +1 -1
  130. package/lib/module/web/NativeAudioBrowser.js +43 -2
  131. package/lib/module/web/NativeAudioBrowser.js.map +1 -1
  132. package/lib/module/web/browser/BrowserManager.js +37 -66
  133. package/lib/module/web/browser/BrowserManager.js.map +1 -1
  134. package/lib/module/web/browser/SearchManager.js +1 -5
  135. package/lib/module/web/browser/SearchManager.js.map +1 -1
  136. package/lib/module/web/http/RequestConfigBuilder.js +53 -55
  137. package/lib/module/web/http/RequestConfigBuilder.js.map +1 -1
  138. package/lib/module/web/player/NowPlayingManager.js +3 -22
  139. package/lib/module/web/player/NowPlayingManager.js.map +1 -1
  140. package/lib/module/web/util/BrowserPathHelper.js +5 -7
  141. package/lib/module/web/util/BrowserPathHelper.js.map +1 -1
  142. package/lib/module/web/util/GenerationMemo.js +87 -0
  143. package/lib/module/web/util/GenerationMemo.js.map +1 -0
  144. package/lib/typescript/src/features/browser-config.d.ts.map +1 -1
  145. package/lib/typescript/src/features/browser.d.ts +7 -8
  146. package/lib/typescript/src/features/browser.d.ts.map +1 -1
  147. package/lib/typescript/src/features/output.d.ts +8 -4
  148. package/lib/typescript/src/features/output.d.ts.map +1 -1
  149. package/lib/typescript/src/features/player/options.d.ts +19 -1
  150. package/lib/typescript/src/features/player/options.d.ts.map +1 -1
  151. package/lib/typescript/src/specs/audio-browser.nitro.d.ts +11 -0
  152. package/lib/typescript/src/specs/audio-browser.nitro.d.ts.map +1 -1
  153. package/lib/typescript/src/types/browser-native.d.ts +2 -1
  154. package/lib/typescript/src/types/browser-native.d.ts.map +1 -1
  155. package/lib/typescript/src/types/browser.d.ts +55 -8
  156. package/lib/typescript/src/types/browser.d.ts.map +1 -1
  157. package/nitrogen/generated/android/AudioBrowserOnLoad.cpp +2 -0
  158. package/nitrogen/generated/android/c++/JArtworkRequestConfig.hpp +3 -0
  159. package/nitrogen/generated/android/c++/JFindTrackParams.hpp +57 -0
  160. package/nitrogen/generated/android/c++/JFunc_std__shared_ptr_Promise_RequestConfig___MediaTransformParams.hpp +13 -1
  161. package/nitrogen/generated/android/c++/JFunc_std__shared_ptr_Promise_RequestConfig___RequestConfig_std__optional_std__unordered_map_std__string__std__string__.hpp +13 -1
  162. package/nitrogen/generated/android/c++/JFunc_std__shared_ptr_Promise_RequestConfig___Track.hpp +13 -1
  163. package/nitrogen/generated/android/c++/JFunc_std__shared_ptr_Promise_std__optional_FormattedNavigationError____FormatNavigationErrorParams.hpp +13 -1
  164. package/nitrogen/generated/android/c++/JFunc_std__shared_ptr_Promise_std__optional_NowPlayingUpdate____FormatNowPlayingParams.hpp +13 -1
  165. package/nitrogen/generated/android/c++/JFunc_std__shared_ptr_Promise_std__optional_std__string____Track.hpp +13 -1
  166. package/nitrogen/generated/android/c++/JFunc_std__shared_ptr_Promise_std__shared_ptr_Promise_GateDecision_____NativeGateRequest.hpp +23 -2
  167. package/nitrogen/generated/android/c++/JFunc_std__shared_ptr_Promise_std__shared_ptr_Promise_RequestConfig_____MediaTransformParams.hpp +23 -2
  168. package/nitrogen/generated/android/c++/JFunc_std__shared_ptr_Promise_std__shared_ptr_Promise_RequestConfig_____RequestConfig_std__optional_std__unordered_map_std__string__std__string__.hpp +23 -2
  169. package/nitrogen/generated/android/c++/JFunc_std__shared_ptr_Promise_std__shared_ptr_Promise_RequestConfig_____Track.hpp +23 -2
  170. package/nitrogen/generated/android/c++/JFunc_std__shared_ptr_Promise_std__shared_ptr_Promise_TransformableRequestConfig____.hpp +23 -2
  171. package/nitrogen/generated/android/c++/JFunc_std__shared_ptr_Promise_std__shared_ptr_Promise_std__optional_Track______FindTrackParams.hpp +171 -0
  172. package/nitrogen/generated/android/c++/JFunc_std__shared_ptr_Promise_std__shared_ptr_Promise_std__vector_Track______SearchParams.hpp +23 -2
  173. package/nitrogen/generated/android/c++/JFunc_std__shared_ptr_Promise_std__shared_ptr_Promise_void_____TrackLoadEvent.hpp +23 -2
  174. package/nitrogen/generated/android/c++/JFunc_std__shared_ptr_Promise_std__string__.hpp +13 -1
  175. package/nitrogen/generated/android/c++/JFunc_std__shared_ptr_Promise_std__variant_ResolvedTrack__BrowseError__std__shared_ptr_Promise_std__variant_ResolvedTrack__BrowseError_______BrowserSourceCallbackParam.hpp +13 -1
  176. package/nitrogen/generated/android/c++/JHybridAudioBrowserSpec.cpp +15 -3
  177. package/nitrogen/generated/android/c++/JHybridAudioBrowserSpec.hpp +1 -1
  178. package/nitrogen/generated/android/c++/JMediaRequestConfig.hpp +3 -0
  179. package/nitrogen/generated/android/c++/JNativeBrowserConfiguration.hpp +20 -2
  180. package/nitrogen/generated/android/c++/JNativeRouteEntry.hpp +3 -0
  181. package/nitrogen/generated/android/c++/JNativeSetupPlayerOptions.hpp +3 -0
  182. package/nitrogen/generated/android/c++/JOutputPickerAnchor.hpp +69 -0
  183. package/nitrogen/generated/android/c++/JPlayerCapabilities.hpp +5 -1
  184. package/nitrogen/generated/android/c++/JTransformableRequestConfig.hpp +3 -0
  185. package/nitrogen/generated/android/c++/JVariant_ResolvedTrack_BrowseError_Promise_BrowseResult_.hpp +13 -1
  186. package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/FindTrackParams.kt +51 -0
  187. package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/Func_std__shared_ptr_Promise_std__shared_ptr_Promise_std__optional_Track______FindTrackParams.kt +78 -0
  188. package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/HybridAudioBrowserSpec.kt +1 -1
  189. package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/NativeBrowserConfiguration.kt +11 -6
  190. package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/OutputPickerAnchor.kt +66 -0
  191. package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/PlayerCapabilities.kt +7 -2
  192. package/nitrogen/generated/ios/AudioBrowser-Swift-Cxx-Bridge.cpp +35 -1
  193. package/nitrogen/generated/ios/AudioBrowser-Swift-Cxx-Bridge.hpp +144 -15
  194. package/nitrogen/generated/ios/AudioBrowser-Swift-Cxx-Umbrella.hpp +8 -0
  195. package/nitrogen/generated/ios/c++/HybridAudioBrowserSpecSwift.hpp +8 -2
  196. package/nitrogen/generated/ios/swift/FindTrackParams.swift +29 -0
  197. package/nitrogen/generated/ios/swift/Func_std__shared_ptr_Promise_std__shared_ptr_Promise_std__optional_Track______FindTrackParams.swift +67 -0
  198. package/nitrogen/generated/ios/swift/Func_void_std__optional_Track_.swift +46 -0
  199. package/nitrogen/generated/ios/swift/Func_void_std__shared_ptr_Promise_std__optional_Track___.swift +66 -0
  200. package/nitrogen/generated/ios/swift/HybridAudioBrowserSpec.swift +1 -1
  201. package/nitrogen/generated/ios/swift/HybridAudioBrowserSpec_cxx.swift +2 -2
  202. package/nitrogen/generated/ios/swift/NativeBrowserConfiguration.swift +48 -1
  203. package/nitrogen/generated/ios/swift/OutputPickerAnchor.swift +44 -0
  204. package/nitrogen/generated/ios/swift/PlayerCapabilities.swift +19 -1
  205. package/nitrogen/generated/shared/c++/FindTrackParams.hpp +83 -0
  206. package/nitrogen/generated/shared/c++/HybridAudioBrowserSpec.hpp +4 -1
  207. package/nitrogen/generated/shared/c++/NativeBrowserConfiguration.hpp +10 -3
  208. package/nitrogen/generated/shared/c++/OutputPickerAnchor.hpp +95 -0
  209. package/nitrogen/generated/shared/c++/PlayerCapabilities.hpp +5 -1
  210. package/package.json +1 -1
  211. package/src/codegen-js-error-message.test.ts +78 -0
  212. package/src/features/browser-config.test.ts +7 -0
  213. package/src/features/browser-config.ts +3 -2
  214. package/src/features/browser.ts +7 -8
  215. package/src/features/output.ts +13 -5
  216. package/src/features/player/options.ts +19 -1
  217. package/src/specs/audio-browser.nitro.ts +16 -3
  218. package/src/types/browser-native.ts +4 -1
  219. package/src/types/browser.ts +60 -8
  220. package/src/web/NativeAudioBrowser.ts +43 -3
  221. package/src/web/__tests__/nowPlayingArtwork.test.ts +191 -0
  222. package/src/web/browser/BrowserManager.ts +50 -79
  223. package/src/web/browser/SearchManager.ts +1 -8
  224. package/src/web/browser/__tests__/artwork-resolution.test.ts +33 -0
  225. package/src/web/browser/__tests__/layer-resolver.test.ts +47 -1
  226. package/src/web/http/RequestConfigBuilder.test.ts +151 -1
  227. package/src/web/http/RequestConfigBuilder.ts +72 -57
  228. package/src/web/player/NowPlayingManager.test.ts +29 -0
  229. package/src/web/player/NowPlayingManager.ts +4 -27
  230. package/src/web/util/BrowserPathHelper.test.ts +23 -0
  231. package/src/web/util/BrowserPathHelper.ts +6 -7
  232. package/src/web/util/GenerationMemo.test.ts +148 -0
  233. package/src/web/util/GenerationMemo.ts +103 -0
  234. package/website/guide/audio-output.md +34 -7
  235. package/website/guide/browser.md +21 -0
  236. package/website/guide/carplay.md +1 -1
  237. package/website/guide/configuration.md +10 -9
  238. package/website/guide/gate.md +1 -1
  239. package/website/guide/remote-controls.md +35 -0
@@ -0,0 +1,396 @@
1
+ package com.audiobrowser.player
2
+
3
+ import android.os.Bundle
4
+ import android.os.Looper
5
+ import androidx.media3.common.C
6
+ import androidx.media3.common.MediaItem
7
+ import androidx.media3.session.LibraryResult
8
+ import androidx.media3.session.MediaSession
9
+ import androidx.media3.session.SessionError
10
+ import com.audiobrowser.AudioBrowser
11
+ import com.audiobrowser.TestFixtures
12
+ import com.audiobrowser.browser.BrowserConfig
13
+ import com.audiobrowser.browser.BrowserManager
14
+ import com.audiobrowser.buildService
15
+ import com.audiobrowser.session
16
+ import com.google.common.util.concurrent.ListenableFuture
17
+ import com.margelo.nitro.audiobrowser.NativeRouteEntry
18
+ import com.margelo.nitro.audiobrowser.Track
19
+ import java.util.concurrent.CancellationException
20
+ import java.util.concurrent.ExecutionException
21
+ import java.util.concurrent.TimeUnit
22
+ import kotlinx.coroutines.CompletableDeferred
23
+ import org.junit.After
24
+ import org.junit.Assert.assertEquals
25
+ import org.junit.Assert.assertFalse
26
+ import org.junit.Assert.assertNull
27
+ import org.junit.Assert.assertThrows
28
+ import org.junit.Test
29
+ import org.junit.runner.RunWith
30
+ import org.mockito.Mockito.RETURNS_DEFAULTS
31
+ import org.mockito.Mockito.mock
32
+ import org.mockito.Mockito.mockingDetails
33
+ import org.mockito.stubbing.Answer
34
+ import org.robolectric.RobolectricTestRunner
35
+ import org.robolectric.Shadows.shadowOf
36
+
37
+ /**
38
+ * A controller can send an id this process never browsed: a car resuming its last track after the
39
+ * process died. The id is a bare stable id, with no uri, so only the consumer can say what it
40
+ * plays.
41
+ */
42
+ @RunWith(RobolectricTestRunner::class)
43
+ class SessionUncachedIdTest {
44
+
45
+ private val controller = buildService()
46
+ private val service = controller.get()
47
+ private val player = service.player
48
+ private val car =
49
+ MediaSession.ControllerInfo.createTestOnlyControllerInfo(
50
+ "car",
51
+ 0,
52
+ 0,
53
+ MediaSession.ControllerInfo.LEGACY_CONTROLLER_VERSION,
54
+ MediaSession.ControllerInfo.LEGACY_CONTROLLER_INTERFACE_VERSION,
55
+ false,
56
+ Bundle.EMPTY,
57
+ false,
58
+ )
59
+ private val session = mock(MediaSession::class.java)
60
+
61
+ private val asked = mutableListOf<String>()
62
+
63
+ @After
64
+ fun destroy() {
65
+ controller.destroy()
66
+ }
67
+
68
+ private fun station(id: String) =
69
+ TestFixtures.track(title = "Station", id = id, src = "https://s/$id.mp3")
70
+
71
+ private lateinit var browserManager: BrowserManager
72
+
73
+ private fun browserWith(
74
+ ready: Boolean = true,
75
+ routes: Array<NativeRouteEntry>? = null,
76
+ findTrack: (suspend (String) -> Track?)?,
77
+ ) {
78
+ browserManager =
79
+ BrowserManager().apply {
80
+ config =
81
+ BrowserConfig(
82
+ routes = routes,
83
+ findTrack =
84
+ findTrack?.let { find ->
85
+ val asking: suspend (String) -> Track? = { id ->
86
+ asked += id
87
+ find(id)
88
+ }
89
+ asking
90
+ },
91
+ )
92
+ }
93
+ val configuration = TestFixtures.browserConfiguration()
94
+ player.browser =
95
+ mock(
96
+ AudioBrowser::class.java,
97
+ Answer {
98
+ when {
99
+ it.method.name == "getConfiguration" -> configuration
100
+ it.method.name.startsWith("getBrowserManager") -> browserManager
101
+ else -> RETURNS_DEFAULTS.answer(it)
102
+ }
103
+ },
104
+ )
105
+ if (ready) player.notifyBrowserConfigurationReady()
106
+ }
107
+
108
+ /** What Media3 sets for the legacy `playFromMediaId(id)`: an id, no uri, no metadata. */
109
+ private fun requestPlay(
110
+ mediaId: String
111
+ ): ListenableFuture<MediaSession.MediaItemsWithStartPosition> =
112
+ player
113
+ .getMediaSessionCallback()
114
+ .onSetMediaItems(
115
+ session,
116
+ car,
117
+ mutableListOf(MediaItem.Builder().setMediaId(mediaId).build()),
118
+ C.INDEX_UNSET,
119
+ C.TIME_UNSET,
120
+ )
121
+
122
+ private fun playFromMediaId(mediaId: String) = requestPlay(mediaId).get(5, TimeUnit.SECONDS)
123
+
124
+ private fun getItem(mediaId: String): LibraryResult<MediaItem> =
125
+ player
126
+ .getMediaSessionCallback()
127
+ .onGetItem(service.session, car, mediaId)
128
+ .get(5, TimeUnit.SECONDS)
129
+
130
+ /**
131
+ * The error codes sent to the car, waiting up to [waitMs] for the first. The library reports from
132
+ * the thread that failed the future, then posts to Main, so the report can land after `get()`
133
+ * returns.
134
+ */
135
+ private fun errorsSentToTheCar(waitMs: Long = 5_000): List<Int> {
136
+ repeat((waitMs / 20).toInt()) {
137
+ shadowOf(Looper.getMainLooper()).idle()
138
+ val sent =
139
+ mockingDetails(session).invocations.filter {
140
+ it.method.name == "sendError" && it.arguments[0] == car
141
+ }
142
+ if (sent.isNotEmpty()) return sent.map { (it.arguments[1] as SessionError).code }
143
+ Thread.sleep(20)
144
+ }
145
+ return emptyList()
146
+ }
147
+
148
+ private fun assertPlayFailsAndTellsTheCar(mediaId: String) {
149
+ val request = requestPlay(mediaId)
150
+ assertThrows(ExecutionException::class.java) { request.get(5, TimeUnit.SECONDS) }
151
+ assertEquals(listOf(SessionError.ERROR_UNKNOWN), errorsSentToTheCar())
152
+ }
153
+
154
+ @Test
155
+ fun `an id never browsed plays the track the consumer finds for it`() {
156
+ browserWith { id -> station(id) }
157
+
158
+ val item = playFromMediaId("U1eRRwaa").mediaItems.single()
159
+
160
+ assertEquals(listOf("U1eRRwaa"), asked)
161
+ assertEquals("Station", item.mediaMetadata.title.toString())
162
+ assertEquals("https://s/U1eRRwaa.mp3", item.localConfiguration?.uri.toString())
163
+ }
164
+
165
+ @Test
166
+ fun `a found track plays under the id the controller sent`() {
167
+ browserWith { TestFixtures.track(title = "Station", id = "other", src = "https://s/a.mp3") }
168
+
169
+ assertEquals("U1eRRwaa", playFromMediaId("U1eRRwaa").mediaItems.single().mediaId)
170
+ }
171
+
172
+ @Test
173
+ fun `a found track is remembered, so a second play does not ask again`() {
174
+ browserWith { id -> station(id) }
175
+
176
+ playFromMediaId("U1eRRwaa")
177
+ playFromMediaId("U1eRRwaa")
178
+
179
+ assertEquals(listOf("U1eRRwaa"), asked)
180
+ }
181
+
182
+ @Test
183
+ fun `an item lookup for an id never browsed answers the track the consumer finds`() {
184
+ browserWith { id -> station(id) }
185
+
186
+ val result = getItem("U1eRRwaa")
187
+
188
+ assertEquals(LibraryResult.RESULT_SUCCESS, result.resultCode)
189
+ assertEquals("Station", result.value?.mediaMetadata?.title.toString())
190
+ assertEquals(listOf("U1eRRwaa"), asked)
191
+ }
192
+
193
+ @Test
194
+ fun `a browse path or a url is never asked of the consumer`() {
195
+ browserWith { id -> station(id) }
196
+
197
+ getItem("/library/missing")
198
+ assertThrows(ExecutionException::class.java) { playFromMediaId("/library/missing") }
199
+ playFromMediaId("https://s/a.mp3")
200
+ getItem("https://example.invalid/a.mp3")
201
+
202
+ assertEquals(emptyList<String>(), asked)
203
+ }
204
+
205
+ @Test
206
+ fun `an id with a scheme-like prefix is asked of the consumer`() {
207
+ browserWith { id -> station(id) }
208
+
209
+ playFromMediaId("station:123")
210
+
211
+ assertEquals(listOf("station:123"), asked)
212
+ }
213
+
214
+ @Test
215
+ fun `an id the consumer does not know fails the play and tells the controller`() {
216
+ browserWith { null }
217
+
218
+ assertPlayFailsAndTellsTheCar("gone")
219
+ assertEquals(listOf("gone"), asked)
220
+ }
221
+
222
+ @Test
223
+ fun `a found track without a src fails the play and tells the controller`() {
224
+ browserWith { id -> TestFixtures.track(title = "Page", id = id, src = null) }
225
+
226
+ assertPlayFailsAndTellsTheCar("U1eRRwaa")
227
+ assertEquals(listOf("U1eRRwaa"), asked)
228
+ }
229
+
230
+ @Test
231
+ fun `a find that throws fails the play and tells the controller`() {
232
+ browserWith { throw IllegalStateException("offline") }
233
+
234
+ assertPlayFailsAndTellsTheCar("U1eRRwaa")
235
+ assertEquals(listOf("U1eRRwaa"), asked)
236
+ }
237
+
238
+ @Test
239
+ fun `without findTrack an id never browsed fails the play and tells the controller`() {
240
+ browserWith(findTrack = null)
241
+
242
+ assertPlayFailsAndTellsTheCar("U1eRRwaa")
243
+ }
244
+
245
+ @Test
246
+ fun `a play that arrives before the browser is configured plays once it is`() {
247
+ browserWith(ready = false) { id -> station(id) }
248
+
249
+ val request = requestPlay("U1eRRwaa")
250
+ assertFalse(request.isDone)
251
+ player.notifyBrowserConfigurationReady()
252
+
253
+ assertEquals(
254
+ "Station",
255
+ request.get(5, TimeUnit.SECONDS).mediaItems.single().mediaMetadata.title.toString(),
256
+ )
257
+ }
258
+
259
+ @Test
260
+ fun `a play and an item lookup for the same id in flight ask the consumer once`() {
261
+ val answer = CompletableDeferred<Track>()
262
+ browserWith { answer.await() }
263
+
264
+ val lookup = player.getMediaSessionCallback().onGetItem(service.session, car, "U1eRRwaa")
265
+ val play = requestPlay("U1eRRwaa")
266
+ waitUntil { asked.isNotEmpty() }
267
+ answer.complete(station("U1eRRwaa"))
268
+
269
+ assertEquals(LibraryResult.RESULT_SUCCESS, lookup.get(5, TimeUnit.SECONDS).resultCode)
270
+ assertEquals("U1eRRwaa", play.get(5, TimeUnit.SECONDS).mediaItems.single().mediaId)
271
+ assertEquals(listOf("U1eRRwaa"), asked)
272
+ }
273
+
274
+ @Test
275
+ fun `a found track is remembered under the id only, not its path or src`() {
276
+ browserWith {
277
+ TestFixtures.track(title = "Station", id = "x", src = "https://s/a.mp3")
278
+ .copy(path = "/page/a")
279
+ }
280
+
281
+ playFromMediaId("U1eRRwaa")
282
+
283
+ assertNull(browserManager.getCachedTrack("/page/a"))
284
+ assertNull(browserManager.getCachedTrack("https://s/a.mp3"))
285
+ }
286
+
287
+ @Test
288
+ fun `an item lookup for an id the consumer does not know is not browsed as a path`() {
289
+ browserWith(
290
+ routes =
291
+ arrayOf(
292
+ TestFixtures.staticRoute(BrowserManager.DEFAULT_ROUTE_PATH, TestFixtures.resolvedTrack())
293
+ )
294
+ ) {
295
+ null
296
+ }
297
+
298
+ assertEquals(SessionError.ERROR_BAD_VALUE, getItem("U1eRRwaa").resultCode)
299
+ }
300
+
301
+ @Test
302
+ fun `a newer play cancels an earlier one still finding its track`() {
303
+ val answer = CompletableDeferred<Track>()
304
+ browserWith { answer.await() }
305
+
306
+ val earlier = requestPlay("U1eRRwaa")
307
+ waitUntil { asked.isNotEmpty() }
308
+ val newer =
309
+ player
310
+ .getMediaSessionCallback()
311
+ .onSetMediaItems(
312
+ session,
313
+ car,
314
+ mutableListOf(
315
+ MediaItem.Builder()
316
+ .setMediaId("B")
317
+ .setRequestMetadata(
318
+ MediaItem.RequestMetadata.Builder()
319
+ .setMediaUri(android.net.Uri.parse("https://s/b.mp3"))
320
+ .build()
321
+ )
322
+ .build()
323
+ ),
324
+ C.INDEX_UNSET,
325
+ C.TIME_UNSET,
326
+ )
327
+
328
+ assertEquals("B", newer.get(5, TimeUnit.SECONDS).mediaItems.single().mediaId)
329
+ answer.complete(station("U1eRRwaa"))
330
+ assertThrows(CancellationException::class.java) { earlier.get(5, TimeUnit.SECONDS) }
331
+ assertEquals(emptyList<Int>(), errorsSentToTheCar(waitMs = 200))
332
+ }
333
+
334
+ @Test
335
+ fun `a play from the app while a car's play is finding its track is not replaced by it`() {
336
+ val answer = CompletableDeferred<Track>()
337
+ browserWith { answer.await() }
338
+
339
+ val carPlay = requestPlay("U1eRRwaa")
340
+ waitUntil { asked.isNotEmpty() }
341
+ player.load(station("app"))
342
+ shadowOf(Looper.getMainLooper()).idle()
343
+ answer.complete(station("U1eRRwaa"))
344
+
345
+ assertThrows(CancellationException::class.java) { carPlay.get(5, TimeUnit.SECONDS) }
346
+ assertEquals(emptyList<Int>(), errorsSentToTheCar(waitMs = 200))
347
+ }
348
+
349
+ @Test
350
+ fun `a new queue from the app while a car's play is finding its track drops the car's play`() {
351
+ val answer = CompletableDeferred<Track>()
352
+ browserWith { answer.await() }
353
+
354
+ val carPlay = requestPlay("U1eRRwaa")
355
+ waitUntil { asked.isNotEmpty() }
356
+ player.setQueue(arrayOf(station("app")))
357
+ shadowOf(Looper.getMainLooper()).idle()
358
+ answer.complete(station("U1eRRwaa"))
359
+
360
+ assertThrows(CancellationException::class.java) { carPlay.get(5, TimeUnit.SECONDS) }
361
+ }
362
+
363
+ @Test
364
+ fun `a favorite restamp while a car's play is finding its track does not drop it`() {
365
+ assertCarPlaySurvives { player.replaceTrack(0, station("app").copy(favorited = true)) }
366
+ }
367
+
368
+ @Test
369
+ fun `an up-next add while a car's play is finding its track does not drop it`() {
370
+ assertCarPlaySurvives { player.add(station("next")) }
371
+ }
372
+
373
+ /** A car play of an unbrowsed id plays, though [meanwhile] edits the queue during its find. */
374
+ private fun assertCarPlaySurvives(meanwhile: () -> Unit) {
375
+ val answer = CompletableDeferred<Track>()
376
+ browserWith { answer.await() }
377
+ player.load(station("app"))
378
+ shadowOf(Looper.getMainLooper()).idle()
379
+
380
+ val carPlay = requestPlay("U1eRRwaa")
381
+ waitUntil { asked.isNotEmpty() }
382
+ meanwhile()
383
+ shadowOf(Looper.getMainLooper()).idle()
384
+ answer.complete(station("U1eRRwaa"))
385
+
386
+ assertEquals("U1eRRwaa", carPlay.get(5, TimeUnit.SECONDS).mediaItems.single().mediaId)
387
+ }
388
+
389
+ private fun waitUntil(condition: () -> Boolean) {
390
+ repeat(250) {
391
+ if (condition()) return
392
+ Thread.sleep(20)
393
+ }
394
+ throw AssertionError("condition not met within 5 s")
395
+ }
396
+ }
@@ -138,7 +138,7 @@ class SessionViewTest {
138
138
  }
139
139
 
140
140
  @Test
141
- fun `a reconnect attempt tells the session nothing it was already told`() {
141
+ fun `a reconnect attempt's events tell the session nothing it was already told`() {
142
142
  val server = ServerSocket(0)
143
143
  val connections = AtomicInteger()
144
144
  val drop = CountDownLatch(1)
@@ -205,7 +205,11 @@ class SessionViewTest {
205
205
  goOnline(context)
206
206
  player.setup(PlayerSetupOptions(retryPolicy = retryPolicy))
207
207
  player.setCallbacks(callbacks)
208
- session = MediaSession.Builder(context, player.forwardingPlayer).build()
208
+ // Media3's 3 s re-sends run while the engine loads: a slow connection adds them to the counts.
209
+ session =
210
+ MediaSession.Builder(context, player.forwardingPlayer)
211
+ .setPeriodicPositionUpdateEnabled(false)
212
+ .build()
209
213
  player.setMediaSession(session)
210
214
  player.exoPlayer.trackSelectionParameters =
211
215
  player.exoPlayer.trackSelectionParameters
@@ -1,17 +1,25 @@
1
1
  package com.audiobrowser.player
2
2
 
3
3
  import android.os.Bundle
4
+ import android.os.Looper
4
5
  import android.provider.MediaStore
5
6
  import androidx.media3.common.C
6
7
  import androidx.media3.common.MediaItem
7
8
  import androidx.media3.session.MediaSession
9
+ import androidx.media3.session.legacy.PlaybackStateCompat
10
+ import androidx.media3.session.legacyState
11
+ import androidx.media3.session.recordLegacyErrors
8
12
  import com.audiobrowser.AudioBrowser
9
13
  import com.audiobrowser.TestFixtures
10
14
  import com.audiobrowser.browser.BrowserConfig
11
15
  import com.audiobrowser.browser.BrowserManager
12
16
  import com.audiobrowser.buildService
17
+ import com.audiobrowser.goOnline
13
18
  import com.audiobrowser.session
14
19
  import com.audiobrowser.util.JsPromise
20
+ import com.google.common.util.concurrent.ListenableFuture
21
+ import com.margelo.nitro.audiobrowser.FormattedNavigationError
22
+ import com.margelo.nitro.audiobrowser.Func_std__shared_ptr_Promise_std__optional_FormattedNavigationError____FormatNavigationErrorParams
15
23
  import com.margelo.nitro.audiobrowser.Func_std__shared_ptr_Promise_std__shared_ptr_Promise_std__vector_Track______SearchParams
16
24
  import com.margelo.nitro.audiobrowser.Gate
17
25
  import com.margelo.nitro.audiobrowser.GateEvent
@@ -28,9 +36,14 @@ import org.junit.Assert.assertThrows
28
36
  import org.junit.Test
29
37
  import org.junit.runner.RunWith
30
38
  import org.mockito.Mockito.RETURNS_DEFAULTS
39
+ import org.mockito.Mockito.any
31
40
  import org.mockito.Mockito.mock
41
+ import org.mockito.Mockito.never
42
+ import org.mockito.Mockito.verify
32
43
  import org.mockito.stubbing.Answer
33
44
  import org.robolectric.RobolectricTestRunner
45
+ import org.robolectric.RuntimeEnvironment
46
+ import org.robolectric.Shadows.shadowOf
34
47
 
35
48
  /**
36
49
  * Media3 turns a legacy controller's `playFromSearch` into a set of one media item that has the
@@ -63,8 +76,15 @@ class SessionVoiceSearchTest {
63
76
  controller.destroy()
64
77
  }
65
78
 
66
- private fun browserWhoseSearchAnswers(vararg results: Track, gated: Boolean = false) {
67
- val answer = JsPromise<Array<Track>>().apply { resolve(arrayOf(*results)) }
79
+ private fun browserWhoseSearchAnswers(
80
+ vararg results: Track,
81
+ gated: Boolean = false,
82
+ failure: Throwable? = null,
83
+ ) {
84
+ val answer =
85
+ JsPromise<Array<Track>>().apply {
86
+ if (failure != null) reject(failure) else resolve(arrayOf(*results))
87
+ }
68
88
  val bridge = JsPromise<Promise<Array<Track>>>().apply { resolve(answer.promise) }
69
89
  val browserManager =
70
90
  BrowserManager().apply {
@@ -87,7 +107,16 @@ class SessionVoiceSearchTest {
87
107
  )
88
108
  )
89
109
  }
90
- val configuration = TestFixtures.browserConfiguration()
110
+ val configuration =
111
+ TestFixtures.browserConfiguration()
112
+ .copy(
113
+ formatNavigationError =
114
+ Func_std__shared_ptr_Promise_std__optional_FormattedNavigationError____FormatNavigationErrorParams {
115
+ JsPromise<FormattedNavigationError?>()
116
+ .apply { resolve(FormattedNavigationError("${it.error.code} ${it.kind}", it.path)) }
117
+ .promise
118
+ }
119
+ )
91
120
  val onGate: (GateEvent) -> Unit = { gateEvents += it }
92
121
  player.browser =
93
122
  mock(
@@ -99,6 +128,7 @@ class SessionVoiceSearchTest {
99
128
  it.method.name == "getOnGate" -> onGate
100
129
  it.method.name == "getConfiguration" -> configuration
101
130
  it.method.name.startsWith("getBrowserManager") -> browserManager
131
+ it.method.name.startsWith("resolveFormattedError") -> it.callRealMethod()
102
132
  else -> RETURNS_DEFAULTS.answer(it)
103
133
  }
104
134
  },
@@ -107,10 +137,11 @@ class SessionVoiceSearchTest {
107
137
  }
108
138
 
109
139
  /** What Media3 sets for the legacy `playFromSearch(query, extras)`. */
110
- private fun playFromSearch(
140
+ private fun requestFromSearch(
111
141
  query: String,
112
142
  extras: Bundle? = null,
113
- ): MediaSession.MediaItemsWithStartPosition {
143
+ session: MediaSession = service.session,
144
+ ): ListenableFuture<MediaSession.MediaItemsWithStartPosition> {
114
145
  val item =
115
146
  MediaItem.Builder()
116
147
  .setMediaId(MediaItem.DEFAULT_MEDIA_ID)
@@ -120,14 +151,16 @@ class SessionVoiceSearchTest {
120
151
  .build()
121
152
  return player
122
153
  .getMediaSessionCallback()
123
- .onSetMediaItems(
124
- service.session,
125
- legacyController,
126
- mutableListOf(item),
127
- C.INDEX_UNSET,
128
- C.TIME_UNSET,
129
- )
130
- .get(5, TimeUnit.SECONDS)
154
+ .onSetMediaItems(session, legacyController, mutableListOf(item), C.INDEX_UNSET, C.TIME_UNSET)
155
+ }
156
+
157
+ private fun playFromSearch(query: String, extras: Bundle? = null) =
158
+ requestFromSearch(query, extras).get(5, TimeUnit.SECONDS)
159
+
160
+ /** Runs what a failed request posts to main, which a report does from the failing thread. */
161
+ private fun idleAfterReports() {
162
+ Thread.sleep(200)
163
+ shadowOf(Looper.getMainLooper()).idle()
131
164
  }
132
165
 
133
166
  @Test
@@ -164,10 +197,79 @@ class SessionVoiceSearchTest {
164
197
  @Test
165
198
  fun `a gated search is refused before it runs, and reports the gate`() {
166
199
  browserWhoseSearchAnswers(TestFixtures.track(title = "a"), gated = true)
200
+ val session = mock(MediaSession::class.java)
167
201
 
168
- assertThrows(ExecutionException::class.java) { playFromSearch("jazz") }
202
+ val request = requestFromSearch("jazz", session = session)
203
+ assertThrows(ExecutionException::class.java) { request.get(5, TimeUnit.SECONDS) }
204
+ // A report would come from the failing thread after get() returns: give it the time one takes.
205
+ Thread.sleep(200)
206
+ shadowOf(Looper.getMainLooper()).idle()
207
+
208
+ // A gate is app state, not a failure: the controller is told nothing.
209
+ verify(session, never()).sendError(any(), any())
169
210
 
170
211
  assertEquals(listOf(GateEvent(GateReason.SEARCH)), gateEvents)
171
212
  assertEquals(emptyList<SearchParams>(), searches)
172
213
  }
214
+
215
+ @Test
216
+ fun `a search without a playable result tells the car the app's empty copy, keeping the state`() {
217
+ goOnline(RuntimeEnvironment.getApplication())
218
+ browserWhoseSearchAnswers(
219
+ TestFixtures.track(title = "unavailable", src = "https://s/x.mp3", disabled = true)
220
+ )
221
+ val errors = service.session.recordLegacyErrors()
222
+ val stateBefore = service.session.legacyState()
223
+
224
+ assertThrows(ExecutionException::class.java) { playFromSearch("zqx qqq") }
225
+ idleAfterReports()
226
+
227
+ assertEquals(listOf(stateBefore to "EMPTY_CONTENT SEARCH\n/__search?q=zqx+qqq"), errors())
228
+ assertEquals(PlaybackStateCompat.STATE_NONE, service.session.legacyState())
229
+ }
230
+
231
+ @Test
232
+ fun `a search without a result while offline tells the car it is offline`() {
233
+ browserWhoseSearchAnswers()
234
+ val errors = service.session.recordLegacyErrors()
235
+
236
+ assertThrows(ExecutionException::class.java) { playFromSearch("jazz") }
237
+ idleAfterReports()
238
+
239
+ assertEquals(listOf("NETWORK_ERROR SEARCH\n/__search?q=jazz"), errors().map { it.second })
240
+ }
241
+
242
+ @Test
243
+ fun `a failed search while offline tells the car it is offline`() {
244
+ browserWhoseSearchAnswers(failure = RuntimeException("search source down"))
245
+ val errors = service.session.recordLegacyErrors()
246
+
247
+ assertThrows(ExecutionException::class.java) { playFromSearch("jazz") }
248
+ idleAfterReports()
249
+
250
+ assertEquals(listOf("NETWORK_ERROR SEARCH\n/__search?q=jazz"), errors().map { it.second })
251
+ }
252
+
253
+ @Test
254
+ fun `a failed search tells the car it failed`() {
255
+ goOnline(RuntimeEnvironment.getApplication())
256
+ browserWhoseSearchAnswers(failure = RuntimeException("search source down"))
257
+ val errors = service.session.recordLegacyErrors()
258
+
259
+ assertThrows(ExecutionException::class.java) { playFromSearch("jazz") }
260
+ idleAfterReports()
261
+
262
+ assertEquals(listOf("UNKNOWN_ERROR SEARCH\n/__search?q=jazz"), errors().map { it.second })
263
+ }
264
+
265
+ @Test
266
+ fun `a gated search tells the car nothing, the gate speaks for it`() {
267
+ browserWhoseSearchAnswers(TestFixtures.track(title = "a"), gated = true)
268
+ val errors = service.session.recordLegacyErrors()
269
+
270
+ assertThrows(ExecutionException::class.java) { playFromSearch("jazz") }
271
+ idleAfterReports()
272
+
273
+ assertEquals(emptyList<Pair<Int, String>>(), errors())
274
+ }
173
275
  }
@@ -49,6 +49,7 @@ class StandardSkipTest {
49
49
  private fun capabilities(
50
50
  skipToNext: Boolean? = null,
51
51
  skipToPrevious: Boolean? = null,
52
+ skipToQueueItem: Boolean? = null,
52
53
  jump: Boolean = false,
53
54
  favorite: Boolean = true,
54
55
  ) =
@@ -59,6 +60,7 @@ class StandardSkipTest {
59
60
  seekTo = null,
60
61
  skipToNext = skipToNext,
61
62
  skipToPrevious = skipToPrevious,
63
+ skipToQueueItem = skipToQueueItem,
62
64
  jumpForward = jump,
63
65
  jumpBackward = jump,
64
66
  favorite = favorite,
@@ -133,6 +135,30 @@ class StandardSkipTest {
133
135
  assertTrue(commands.contains(MediaPlayer.COMMAND_SEEK_TO_PREVIOUS_MEDIA_ITEM))
134
136
  }
135
137
 
138
+ @Test
139
+ fun `a pick of a queue item is offered unless its capability is off`() {
140
+ assertTrue(commands(capabilities()).contains(MediaPlayer.COMMAND_SEEK_TO_MEDIA_ITEM))
141
+ assertTrue(
142
+ commands(capabilities(skipToQueueItem = true))
143
+ .contains(MediaPlayer.COMMAND_SEEK_TO_MEDIA_ITEM)
144
+ )
145
+ assertFalse(
146
+ commands(capabilities(skipToQueueItem = false))
147
+ .contains(MediaPlayer.COMMAND_SEEK_TO_MEDIA_ITEM)
148
+ )
149
+ }
150
+
151
+ @Test
152
+ fun `a disabled pick of a queue item leaves skipping and seeking in the item`() {
153
+ val commands = commands(capabilities(skipToQueueItem = false))
154
+ assertTrue(commands.contains(MediaPlayer.COMMAND_SEEK_TO_NEXT))
155
+ assertTrue(commands.contains(MediaPlayer.COMMAND_SEEK_TO_NEXT_MEDIA_ITEM))
156
+ assertTrue(commands.contains(MediaPlayer.COMMAND_SEEK_TO_PREVIOUS))
157
+ assertTrue(commands.contains(MediaPlayer.COMMAND_SEEK_TO_PREVIOUS_MEDIA_ITEM))
158
+ assertTrue(commands.contains(MediaPlayer.COMMAND_SEEK_IN_CURRENT_MEDIA_ITEM))
159
+ assertTrue(commands.contains(MediaPlayer.COMMAND_SEEK_TO_DEFAULT_POSITION))
160
+ }
161
+
136
162
  private fun acceptsRatings(capabilities: PlayerCapabilities): Boolean {
137
163
  manager.updateMediaSession(session, capabilities, null, searchAvailable = false)
138
164
  return manager