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,106 @@
1
+ package com.audiobrowser.browser
2
+
3
+ import com.audiobrowser.TestFixtures.resolvedTrack
4
+ import com.audiobrowser.TestFixtures.section
5
+ import com.audiobrowser.TestFixtures.track
6
+ import org.junit.Assert.assertEquals
7
+ import org.junit.Assert.assertNull
8
+ import org.junit.Test
9
+
10
+ class FavoriteChangeTest {
11
+
12
+ private fun change(previous: Set<String>, favorites: Set<String>) =
13
+ FavoriteChange.between(previous, favorites)!!
14
+
15
+ @Test
16
+ fun `a replace with the same identities is no change`() {
17
+ assertNull(FavoriteChange.between(setOf("a", "b"), setOf("b", "a")))
18
+ }
19
+
20
+ @Test
21
+ fun `a hydrated track follows a later replace, both ways`() {
22
+ val added = change(emptySet(), setOf("a"))
23
+ val favorited = added.restamp(track(src = "a", favorited = false))
24
+ assertEquals(true, favorited?.favorited)
25
+
26
+ val removed = change(setOf("a"), emptySet())
27
+ assertEquals(false, removed.restamp(favorited!!)?.favorited)
28
+ }
29
+
30
+ @Test
31
+ fun `restamp fills an unset flag`() {
32
+ assertEquals(true, change(emptySet(), setOf("a")).restamp(track(src = "a"))?.favorited)
33
+ }
34
+
35
+ @Test
36
+ fun `restamp leaves a track whose identity did not change`() {
37
+ val change = change(setOf("a"), setOf("a", "c"))
38
+ // Carried by the tracks themselves, against the set: only a change to their identity moves
39
+ // them.
40
+ assertNull(change.restamp(track(src = "a", favorited = false)))
41
+ assertNull(change.restamp(track(src = "b", favorited = true)))
42
+ }
43
+
44
+ @Test
45
+ fun `restampStamped leaves an unset flag to hydration`() {
46
+ val change = change(emptySet(), setOf("a"))
47
+ assertNull(change.restampStamped(track(src = "a")))
48
+ assertEquals(true, change.restampStamped(track(src = "a", favorited = false))?.favorited)
49
+ }
50
+
51
+ @Test
52
+ fun `restamp leaves a track that already agrees`() {
53
+ assertNull(change(emptySet(), setOf("a")).restamp(track(src = "a", favorited = true)))
54
+ }
55
+
56
+ @Test
57
+ fun `restamp matches by id before src`() {
58
+ val change = change(emptySet(), setOf("https://s/a.mp3"))
59
+ assertNull(change.restamp(track(id = "stable-a", src = "https://s/a.mp3", favorited = false)))
60
+ }
61
+
62
+ @Test
63
+ fun `restamp leaves a track without identity alone`() {
64
+ assertNull(change(emptySet(), setOf("/browse")).restamp(track(src = null)))
65
+ }
66
+
67
+ @Test
68
+ fun `a toggle restamps its identity even when the set already agreed`() {
69
+ val toggle = FavoriteChange.toggle("a", true)
70
+ assertEquals(true, toggle.restamp(track(src = "a", favorited = false))?.favorited)
71
+ assertNull(toggle.restamp(track(src = "b", favorited = false)))
72
+ }
73
+
74
+ @Test
75
+ fun `restamps the changed tracks of a page`() {
76
+ val page =
77
+ resolvedTrack(
78
+ path = "/p",
79
+ sections =
80
+ arrayOf(
81
+ section(arrayOf(track(src = "a", favorited = false))),
82
+ section(
83
+ arrayOf(track(src = "b", favorited = true), track(src = "c", favorited = false))
84
+ ),
85
+ ),
86
+ )
87
+
88
+ val restamped = change(setOf("b"), setOf("a", "c")).restamp(page)
89
+
90
+ assertEquals(
91
+ listOf(listOf(true), listOf(false, true)),
92
+ restamped?.sections?.map { section -> section.children.map { it.favorited } },
93
+ )
94
+ assertEquals("/p", restamped?.path)
95
+ }
96
+
97
+ @Test
98
+ fun `a page with no changed track is not restamped`() {
99
+ val page =
100
+ resolvedTrack(
101
+ path = "/p",
102
+ sections = arrayOf(section(arrayOf(track(src = "b", favorited = true)))),
103
+ )
104
+ assertNull(change(setOf("b"), setOf("b", "elsewhere")).restamp(page))
105
+ }
106
+ }
@@ -248,6 +248,24 @@ class RequestConfigBuilderTest {
248
248
  assertEquals("https://api.example.com/albums", result.url)
249
249
  }
250
250
 
251
+ @Test
252
+ fun `buildUrl leaves the query off a data URL`() {
253
+ val dataUrl = "data:image/png;base64,iVBORw0KGgo="
254
+ val config =
255
+ RequestConfig(
256
+ method = null,
257
+ path = dataUrl,
258
+ baseUrl = "https://api.example.com",
259
+ headers = null,
260
+ query = mapOf("w" to "512"),
261
+ body = null,
262
+ contentType = null,
263
+ userAgent = null,
264
+ )
265
+
266
+ assertEquals(dataUrl, RequestConfigBuilder.buildUrl(config))
267
+ }
268
+
251
269
  @Test
252
270
  fun `buildUrl joins the query with an ampersand when the path already has one`() = runTest {
253
271
  val relative =
@@ -354,25 +372,32 @@ class RequestConfigBuilderTest {
354
372
  }
355
373
 
356
374
  @Test
357
- fun `a throwing transformSync's CallbackException carries its message without the JS stack`() =
358
- runTest {
359
- val base =
360
- RequestConfig(null, "/library", "https://api.example.com", null, null, null, null, null)
361
- val layer =
362
- transformableConfig()
363
- .copy(
364
- transformSync =
365
- throwingTransformSync(
366
- "token expired\n\nError: token expired\n at transformSync (:11:92)"
367
- )
368
- )
369
- try {
370
- RequestConfigBuilder.mergeConfig(base, layer, emptyMap())
371
- fail("expected CallbackException")
372
- } catch (e: CallbackException) {
373
- assertEquals("token expired", e.message)
374
- }
375
+ fun `a throwing transformSync's CallbackException keeps its message whole`() = runTest {
376
+ val base =
377
+ RequestConfig(null, "/library", "https://api.example.com", null, null, null, null, null)
378
+ val message = "Error: token expired\n\nsign in again"
379
+ val layer = transformableConfig().copy(transformSync = throwingTransformSync(message))
380
+ try {
381
+ RequestConfigBuilder.mergeConfig(base, layer, emptyMap())
382
+ fail("expected CallbackException")
383
+ } catch (e: CallbackException) {
384
+ assertEquals(message, e.message)
385
+ }
386
+ }
387
+
388
+ @Test
389
+ fun `a transform rejecting with a TypeError gives its message alone`() = runTest {
390
+ val base =
391
+ RequestConfig(null, "/library", "https://api.example.com", null, null, null, null, null)
392
+ val layer =
393
+ transformableConfig().copy(transform = throwingTransform("bad header", name = "TypeError"))
394
+ try {
395
+ RequestConfigBuilder.mergeConfig(base, layer, emptyMap())
396
+ fail("expected CallbackException")
397
+ } catch (e: CallbackException) {
398
+ assertEquals("bad header", e.message)
375
399
  }
400
+ }
376
401
 
377
402
  @Test
378
403
  fun `mergeConfigOrBase skips a layer whose transform throws`() = runTest {
@@ -28,6 +28,7 @@ class CapabilityControlsTest {
28
28
  seekTo = seekTo,
29
29
  skipToNext = skipToNext,
30
30
  skipToPrevious = skipToPrevious,
31
+ skipToQueueItem = null,
31
32
  jumpForward = jumpForward,
32
33
  jumpBackward = jumpBackward,
33
34
  favorite = favorite,
@@ -2,11 +2,9 @@ package com.audiobrowser.player
2
2
 
3
3
  import android.os.Looper
4
4
  import androidx.media3.common.HeartRating
5
- import androidx.media3.common.MediaItem
6
- import androidx.media3.common.Player as MediaPlayer
7
- import androidx.media3.common.Timeline
8
5
  import androidx.media3.session.MediaSession
9
6
  import com.audiobrowser.AudioBrowser
7
+ import com.audiobrowser.Callbacks
10
8
  import com.audiobrowser.TestFixtures
11
9
  import com.audiobrowser.browser.BrowserConfig
12
10
  import com.audiobrowser.browser.BrowserManager
@@ -24,6 +22,7 @@ import org.junit.Before
24
22
  import org.junit.Test
25
23
  import org.junit.runner.RunWith
26
24
  import org.mockito.Mockito.mock
25
+ import org.mockito.Mockito.mockingDetails
27
26
  import org.mockito.Mockito.`when`
28
27
  import org.robolectric.RobolectricTestRunner
29
28
  import org.robolectric.RuntimeEnvironment
@@ -93,7 +92,7 @@ class FavoriteCapabilityTest {
93
92
  }
94
93
 
95
94
  @Test
96
- fun `the restamp is one timeline change, in place`() {
95
+ fun `the restamp is in place, and changes no track JS sees`() {
97
96
  player.add(
98
97
  arrayOf(
99
98
  TestFixtures.track(title = "a", src = "https://s/a.mp3"),
@@ -103,25 +102,15 @@ class FavoriteCapabilityTest {
103
102
  )
104
103
  player.exoPlayer.seekTo(1, 0)
105
104
  idle()
106
- var timelineChanges = 0
107
- var transitions = 0
108
- player.exoPlayer.addListener(
109
- object : MediaPlayer.Listener {
110
- override fun onTimelineChanged(timeline: Timeline, reason: Int) {
111
- timelineChanges++
112
- }
113
-
114
- override fun onMediaItemTransition(mediaItem: MediaItem?, reason: Int) {
115
- transitions++
116
- }
117
- }
118
- )
105
+ val callbacks = mock(Callbacks::class.java)
106
+ player.setCallbacks(callbacks)
119
107
 
120
108
  player.applyOptions(favorite(true))
121
109
  idle()
122
110
 
123
- assertEquals(1, timelineChanges)
124
- assertEquals(0, transitions)
111
+ val calls = mockingDetails(callbacks).invocations.map { it.method.name }
112
+ assertEquals(0, calls.count { it == "onPlaybackQueueChanged" })
113
+ assertEquals(0, calls.count { it == "onPlaybackActiveTrackChanged" })
125
114
  assertEquals(1, player.exoPlayer.currentMediaItemIndex)
126
115
  assertTrue(rating(1) is HeartRating)
127
116
  }
@@ -0,0 +1,117 @@
1
+ package com.audiobrowser.player
2
+
3
+ import android.os.Looper
4
+ import androidx.media3.common.HeartRating
5
+ import androidx.media3.session.MediaSession
6
+ import com.audiobrowser.AudioBrowser
7
+ import com.audiobrowser.TestFixtures
8
+ import com.audiobrowser.browser.BrowserConfig
9
+ import com.audiobrowser.browser.BrowserManager
10
+ import com.audiobrowser.browser.FavoriteChange
11
+ import com.audiobrowser.browser.flattenedChildren
12
+ import com.audiobrowser.model.PlayerSetupOptions
13
+ import com.audiobrowser.model.PlayerUpdateOptions
14
+ import com.audiobrowser.util.TrackFactory
15
+ import kotlinx.coroutines.runBlocking
16
+ import org.junit.After
17
+ import org.junit.Assert.assertEquals
18
+ import org.junit.Before
19
+ import org.junit.Test
20
+ import org.junit.runner.RunWith
21
+ import org.mockito.Mockito.mock
22
+ import org.mockito.Mockito.`when`
23
+ import org.robolectric.RobolectricTestRunner
24
+ import org.robolectric.RuntimeEnvironment
25
+ import org.robolectric.Shadows.shadowOf
26
+
27
+ @RunWith(RobolectricTestRunner::class)
28
+ class FavoriteRestampTest {
29
+
30
+ private val app = RuntimeEnvironment.getApplication()
31
+ private val player = Player(app)
32
+ private lateinit var session: MediaSession
33
+
34
+ private val a = TestFixtures.track(title = "a", src = "https://s/a.mp3", favorited = false)
35
+ private val b = TestFixtures.track(title = "b", src = "https://s/b.mp3", favorited = false)
36
+
37
+ @Before
38
+ fun setUp() {
39
+ player.setup(PlayerSetupOptions())
40
+ session = MediaSession.Builder(app, player.exoPlayer).build()
41
+ player.setMediaSession(session)
42
+ player.applyOptions(
43
+ PlayerUpdateOptions().let { it.copy(capabilities = it.capabilities.copy(favorite = true)) }
44
+ )
45
+ }
46
+
47
+ @After
48
+ fun release() {
49
+ session.release()
50
+ player.exoPlayer.release()
51
+ TrackFactory.favoriteEnabled = false
52
+ }
53
+
54
+ private fun idle() = shadowOf(Looper.getMainLooper()).idle()
55
+
56
+ private fun favorited() = player.tracks.map { it.favorited }
57
+
58
+ private fun ratings() =
59
+ (0 until player.exoPlayer.mediaItemCount).map {
60
+ (player.exoPlayer.getMediaItemAt(it).mediaMetadata.userRating as HeartRating).isHeart
61
+ }
62
+
63
+ private fun heartButton() =
64
+ session.mediaButtonPreferences.single { it.displayName.toString().contains("favorites") }
65
+
66
+ @Test
67
+ fun `a toggle restamps every queued copy of the active track`() {
68
+ player.add(arrayOf(a, b, a))
69
+ idle()
70
+
71
+ player.setActiveTrackFavorited(true)
72
+
73
+ assertEquals(listOf(true, false, true), favorited())
74
+ assertEquals(listOf(true, false, true), ratings())
75
+ }
76
+
77
+ @Test
78
+ fun `a toggle restamps the content on screen`() = runBlocking {
79
+ val browserManager = BrowserManager()
80
+ browserManager.config =
81
+ BrowserConfig(
82
+ routes =
83
+ arrayOf(
84
+ TestFixtures.staticRoute(
85
+ "/home",
86
+ TestFixtures.resolvedTrack(path = "/home", children = arrayOf(a, b)),
87
+ )
88
+ )
89
+ )
90
+ browserManager.navigate("/home")
91
+ player.browser =
92
+ mock(AudioBrowser::class.java).also { `when`(it.browserManager).thenReturn(browserManager) }
93
+ player.add(arrayOf(a))
94
+ idle()
95
+
96
+ player.setActiveTrackFavorited(true)
97
+
98
+ assertEquals(
99
+ listOf(true, false),
100
+ browserManager.getContent()?.flattenedChildren?.map { it.favorited },
101
+ )
102
+ }
103
+
104
+ @Test
105
+ fun `the heart button follows a favorite change to the current track`() {
106
+ player.add(arrayOf(b, a, b))
107
+ player.exoPlayer.seekTo(1, 0)
108
+ idle()
109
+
110
+ player.applyFavoriteChange(FavoriteChange.between(emptySet(), setOf("https://s/a.mp3"))!!)
111
+ idle()
112
+
113
+ assertEquals(listOf(false, true, false), favorited())
114
+ assertEquals(listOf(false, true, false), ratings())
115
+ assertEquals("Remove from favorites", heartButton().displayName.toString())
116
+ }
117
+ }
@@ -93,6 +93,7 @@ class HandleTrackLoadSeekTest {
93
93
  carPlayLoadingTitle = null,
94
94
  resolveAlbumPath = null,
95
95
  formatNavigationError = null,
96
+ findTrack = null,
96
97
  )
97
98
  val browserManager = BrowserManager()
98
99
  player.browser =
@@ -51,6 +51,7 @@ class LiveSeekCommandTest {
51
51
  seekTo = seekTo,
52
52
  skipToNext = null,
53
53
  skipToPrevious = null,
54
+ skipToQueueItem = null,
54
55
  jumpForward = null,
55
56
  jumpBackward = null,
56
57
  favorite = null,
@@ -225,7 +225,6 @@ class PlaybackStateMachineTest {
225
225
  )
226
226
  assertEquals(listOf(PlaybackState.BUFFERING), on(resumed, from = PlaybackState.PAUSED))
227
227
  assertEquals(emptyList<PlaybackState>(), on(resumed, from = PlaybackState.LOADING))
228
- assertEquals(emptyList<PlaybackState>(), on(resumed, from = PlaybackState.STOPPED))
229
228
  // Exo READY: PLAYING follows from IsPlayingChanged.
230
229
  assertEquals(
231
230
  emptyList<PlaybackState>(),
@@ -247,4 +246,62 @@ class PlaybackStateMachineTest {
247
246
  )
248
247
  assertEquals(emptyList<PlaybackState>(), on(PlaybackEvent.IsPlayingChanged(isPlaying = false)))
249
248
  }
249
+
250
+ // MARK: stopped
251
+
252
+ @Test
253
+ fun `stopped holds against a late playing`() {
254
+ assertEquals(
255
+ emptyList<PlaybackState>(),
256
+ on(PlaybackEvent.IsPlayingChanged(isPlaying = true), from = PlaybackState.STOPPED),
257
+ )
258
+ }
259
+
260
+ @Test
261
+ fun `a prepare after a stop reports buffering`() {
262
+ // retry() or a controller's prepare: the engine loads without the play intent.
263
+ assertEquals(
264
+ listOf(PlaybackState.BUFFERING),
265
+ on(
266
+ PlaybackEvent.ExoPlaybackStateChanged(
267
+ MediaPlayer.STATE_BUFFERING,
268
+ mediaItemCount = 1,
269
+ shouldPlayWhenReady = false,
270
+ ),
271
+ from = PlaybackState.STOPPED,
272
+ ),
273
+ )
274
+ }
275
+
276
+ @Test
277
+ fun `a play after a stop reports buffering, then playing`() {
278
+ // The play's prepare, with the intent it raised.
279
+ assertEquals(
280
+ listOf(PlaybackState.BUFFERING),
281
+ on(
282
+ PlaybackEvent.ExoPlaybackStateChanged(
283
+ MediaPlayer.STATE_BUFFERING,
284
+ mediaItemCount = 1,
285
+ shouldPlayWhenReady = true,
286
+ ),
287
+ from = PlaybackState.STOPPED,
288
+ ),
289
+ )
290
+ // The intent rising over a buffering engine: nothing sends this today; it keeps the hold on
291
+ // IsPlayingChanged from stranding a play.
292
+ assertEquals(
293
+ listOf(PlaybackState.BUFFERING),
294
+ on(
295
+ PlaybackEvent.ShouldPlayWhenReadyChanged(
296
+ shouldPlayWhenReady = true,
297
+ exoState = MediaPlayer.STATE_BUFFERING,
298
+ ),
299
+ from = PlaybackState.STOPPED,
300
+ ),
301
+ )
302
+ assertEquals(
303
+ listOf(PlaybackState.PLAYING),
304
+ on(PlaybackEvent.IsPlayingChanged(isPlaying = true), from = PlaybackState.BUFFERING),
305
+ )
306
+ }
250
307
  }
@@ -6,11 +6,14 @@ import androidx.media3.common.Player as MediaPlayer
6
6
  import com.audiobrowser.Callbacks
7
7
  import com.audiobrowser.TestFixtures
8
8
  import com.audiobrowser.model.PlayerSetupOptions
9
+ import com.audiobrowser.model.RetryPolicy
9
10
  import com.audiobrowser.remote.FakeReceiver
10
11
  import com.audiobrowser.remote.FakeRemote
11
12
  import com.audiobrowser.util.TrackFactory
12
13
  import com.margelo.nitro.audiobrowser.PlaybackState
13
14
  import com.margelo.nitro.audiobrowser.RemoteOutputsOptions
15
+ import java.net.ServerSocket
16
+ import java.net.UnknownHostException
14
17
  import java.time.Duration
15
18
  import org.junit.After
16
19
  import org.junit.Assert.assertEquals
@@ -48,8 +51,9 @@ class PlayerCastTest {
48
51
  fun cast() {
49
52
  player.setup(
50
53
  PlayerSetupOptions(
54
+ retryPolicy = RetryPolicy.Infinite(),
51
55
  remoteOutputs =
52
- RemoteOutputsOptions(cast = true, castReceiverApplicationId = null, sonos = null)
56
+ RemoteOutputsOptions(cast = true, castReceiverApplicationId = null, sonos = null),
53
57
  )
54
58
  )
55
59
  player.setCallbacks(callbacks)
@@ -155,6 +159,41 @@ class PlayerCastTest {
155
159
  assertFalse(receiver.loads.last().autoplay)
156
160
  }
157
161
 
162
+ @Test
163
+ fun `a connection that fails before the hand-back is heard is retried, not an error`() {
164
+ // Answers nothing, so the only failure report is the one the listener below makes.
165
+ ServerSocket(0).use { silent ->
166
+ player.load(TestFixtures.track(title = "b", src = "http://127.0.0.1:${silent.localPort}/a"))
167
+ idleUntil("the track on the receiver") { receiver.loads.size == 2 }
168
+ // The playback thread can fail an offline load before the main thread hears of the
169
+ // hand-back that prepared it. Robolectric starts offline.
170
+ player.exoPlayer.addListener(
171
+ object : MediaPlayer.Listener {
172
+ override fun onPlaybackStateChanged(playbackState: Int) {
173
+ if (playbackState != MediaPlayer.STATE_BUFFERING) return
174
+ player.exoPlayer.removeListener(this)
175
+ player.onLoadFailure(UnknownHostException(), inPlace = false)
176
+ }
177
+ }
178
+ )
179
+
180
+ remote.endSession()
181
+ idle()
182
+ player.playerListener.onPlayerError(
183
+ PlaybackException(
184
+ "offline",
185
+ null,
186
+ PlaybackException.ERROR_CODE_IO_NETWORK_CONNECTION_FAILED,
187
+ )
188
+ )
189
+ idle()
190
+
191
+ assertNotEquals(PlaybackState.ERROR, player.playbackState)
192
+ assertEquals(true, player.getPlayback().error?.retrying)
193
+ assertTrue("the loop holds the engine to reconnect it", player.retryLoop!!.reconnecting)
194
+ }
195
+ }
196
+
158
197
  private fun calls(name: String) =
159
198
  mockingDetails(callbacks).invocations.filter { it.method.name == name }
160
199
 
@@ -26,6 +26,7 @@ import com.margelo.nitro.audiobrowser.Playback
26
26
  import com.margelo.nitro.audiobrowser.PlaybackState
27
27
  import java.io.IOException
28
28
  import java.net.ServerSocket
29
+ import java.net.Socket
29
30
  import java.time.Duration
30
31
  import java.util.concurrent.CopyOnWriteArrayList
31
32
  import java.util.concurrent.CountDownLatch
@@ -46,9 +47,11 @@ import org.junit.Rule
46
47
  import org.junit.Test
47
48
  import org.junit.rules.TemporaryFolder
48
49
  import org.junit.runner.RunWith
50
+ import org.mockito.ArgumentMatchers.notNull
49
51
  import org.mockito.Mockito.mock
50
52
  import org.mockito.Mockito.mockingDetails
51
53
  import org.mockito.Mockito.never
54
+ import org.mockito.Mockito.times
52
55
  import org.mockito.Mockito.verify
53
56
  import org.robolectric.RobolectricTestRunner
54
57
  import org.robolectric.RuntimeEnvironment
@@ -184,9 +187,15 @@ class PlayerRetryTest {
184
187
  shadowOf(Looper.getMainLooper()).idle()
185
188
 
186
189
  player.seekToLiveEdge()
187
- shadowOf(Looper.getMainLooper()).idle()
190
+ // ExoPlayer schedules its next step on the clock, which stands still unless advanced.
191
+ idleUntil("the edge loaded while paused") {
192
+ ShadowSystemClock.advanceBy(Duration.ofMillis(10))
193
+ // The player's state can still hold a READY from before the seek; the engine's drops to
194
+ // BUFFERING at once.
195
+ player.exoPlayer.playbackState == MediaPlayer.STATE_READY &&
196
+ player.playbackState == PlaybackState.READY
197
+ }
188
198
  assertEquals(edge, player.exoPlayer.currentPosition)
189
- assertPausedInPlace()
190
199
  }
191
200
 
192
201
  @Test
@@ -585,6 +594,87 @@ class PlayerRetryTest {
585
594
  server.close()
586
595
  }
587
596
 
597
+ @Test
598
+ fun `an engine error that arrives after a stop is not terminal`() {
599
+ goOnline(context)
600
+ play("https://127.0.0.1:9/stream", retryPolicy = RetryPolicy.Infinite())
601
+ awaitRetry("a pending retry")
602
+ player.stop()
603
+ shadowOf(Looper.getMainLooper()).idle()
604
+
605
+ deliverLateEngineError()
606
+
607
+ assertEquals(Playback(PlaybackState.STOPPED, null), player.getPlayback())
608
+ verify(callbacks, never()).onPlaybackError(notNull())
609
+ }
610
+
611
+ @Test
612
+ fun `an engine error that arrives after a live pause is not terminal`() {
613
+ goOnline(context)
614
+ play(
615
+ folder.silentWavUri(Duration.ofMinutes(1)),
616
+ retryPolicy = RetryPolicy.Infinite(),
617
+ live = true,
618
+ )
619
+ idleUntil("playing") { player.playbackState == PlaybackState.PLAYING }
620
+ player.pause()
621
+ shadowOf(Looper.getMainLooper()).idle()
622
+ assertEquals(MediaPlayer.STATE_IDLE, player.exoPlayer.playbackState)
623
+
624
+ deliverLateEngineError()
625
+
626
+ assertEquals(Playback(PlaybackState.PAUSED, null), player.getPlayback())
627
+ verify(callbacks, never()).onPlaybackError(notNull())
628
+ }
629
+
630
+ @Test
631
+ fun `an engine error that arrives after a pause cancelled its reconnect is not terminal`() {
632
+ goOnline(context)
633
+ val server = ServerSocket(0)
634
+ servers += server
635
+ val connections = AtomicInteger()
636
+ // Ends the first connection unanswered, then holds each reconnect open without an answer.
637
+ thread(isDaemon = true) {
638
+ val held = mutableListOf<Socket>()
639
+ while (!server.isClosed) {
640
+ try {
641
+ val socket = server.accept()
642
+ if (connections.incrementAndGet() == 1) socket.close() else held += socket
643
+ } catch (_: IOException) {
644
+ held.forEach { it.close() }
645
+ return@thread
646
+ }
647
+ }
648
+ }
649
+ play("http://127.0.0.1:${server.localPort}/live", retryPolicy = RetryPolicy.Infinite())
650
+ awaitRetry("a pending retry")
651
+ idleUntil("a reconnect in flight") {
652
+ ShadowSystemClock.advanceBy(Duration.ofMillis(100))
653
+ connections.get() >= 2
654
+ }
655
+
656
+ // The connection's failure report, posted before the pause and dropped by it.
657
+ player.onLoadFailure(IOException("refused"), inPlace = false)
658
+ player.pause()
659
+ shadowOf(Looper.getMainLooper()).idle()
660
+ assertEquals(MediaPlayer.STATE_IDLE, player.exoPlayer.playbackState)
661
+ deliverLateEngineError()
662
+
663
+ assertEquals(Playback(PlaybackState.PAUSED, null), player.getPlayback())
664
+ verify(callbacks, never()).onPlaybackError(notNull())
665
+ }
666
+
667
+ @Test
668
+ fun `an engine error that arrives after a give-up is not a second terminal error`() {
669
+ failTerminally()
670
+ val error = player.playbackError
671
+
672
+ deliverLateEngineError()
673
+
674
+ assertEquals(Playback(PlaybackState.ERROR, error), player.getPlayback())
675
+ verify(callbacks, times(1)).onPlaybackError(notNull())
676
+ }
677
+
588
678
  @Test
589
679
  fun `a failure report that arrives after a reconnect is not the new connection's`() {
590
680
  goOnline(context)
@@ -631,6 +721,22 @@ class PlayerRetryTest {
631
721
  assertEquals(null, player.playbackError)
632
722
  }
633
723
 
724
+ @Test
725
+ fun `a failure report that arrives after a new queue is not its track's`() {
726
+ goOnline(context)
727
+ val wav = folder.silentWavUri(Duration.ofMinutes(1))
728
+ play(wav, retryPolicy = RetryPolicy.Infinite())
729
+ idleUntil("playing") { player.playbackState == PlaybackState.PLAYING }
730
+
731
+ // Posted from the playback thread before the new queue, run after it.
732
+ player.onLoadFailure(IOException("dropped"), inPlace = false)
733
+ player.setQueue(arrayOf(TestFixtures.track(title = "next", src = wav)))
734
+ shadowOf(Looper.getMainLooper()).idle()
735
+
736
+ assertFalse(player.retryLoop!!.failurePending)
737
+ assertEquals(null, player.playbackError)
738
+ }
739
+
634
740
  @Test
635
741
  fun `with retry, a stuck engine reconnects and never ends in an error`() {
636
742
  goOnline(context)
@@ -673,6 +779,13 @@ class PlayerRetryTest {
673
779
  assertEquals("playback-stalled", player.playbackError?.code)
674
780
  }
675
781
 
782
+ private fun deliverLateEngineError() {
783
+ player.playerListener.onPlayerError(
784
+ PlaybackException("refused", null, PlaybackException.ERROR_CODE_IO_NETWORK_CONNECTION_FAILED)
785
+ )
786
+ shadowOf(Looper.getMainLooper()).idle()
787
+ }
788
+
676
789
  private fun stuck() =
677
790
  PlaybackException(
678
791
  "stuck",