react-native-audio-browser 1.0.0-next.5 → 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.
- package/android/src/cast/java/com/audiobrowser/cast/CastSupport.kt +75 -10
- package/android/src/main/java/com/audiobrowser/AudioBrowser.kt +14 -2
- package/android/src/main/java/com/audiobrowser/browser/BrowseArtworkRegistry.kt +25 -9
- package/android/src/main/java/com/audiobrowser/browser/BrowserManager.kt +183 -122
- package/android/src/main/java/com/audiobrowser/http/HttpClient.kt +2 -59
- package/android/src/main/java/com/audiobrowser/http/RequestConfigBuilder.kt +3 -3
- package/android/src/main/java/com/audiobrowser/player/MediaSessionCallback.kt +201 -107
- package/android/src/main/java/com/audiobrowser/player/Player.kt +117 -20
- package/android/src/main/java/com/audiobrowser/player/PlayerListener.kt +14 -1
- package/android/src/main/java/com/audiobrowser/player/RetryLoop.kt +1 -1
- package/android/src/main/java/com/audiobrowser/remote/RemoteSwitchingPlayer.kt +52 -7
- package/android/src/main/java/com/audiobrowser/util/ArtworkContentProvider.kt +2 -3
- package/android/src/main/java/com/audiobrowser/util/ArtworkRoutes.kt +5 -5
- package/android/src/main/java/com/audiobrowser/util/ArtworkUris.kt +5 -0
- package/android/src/main/java/com/audiobrowser/util/AwaitCancellable.kt +35 -11
- package/android/src/main/java/com/audiobrowser/util/BrowserPathHelper.kt +11 -0
- package/android/src/main/java/com/audiobrowser/util/TrackFactory.kt +10 -7
- package/android/src/main/res/values/strings.xml +5 -2
- package/android/src/test/java/androidx/media3/session/SessionViews.kt +15 -0
- package/android/src/test/java/com/audiobrowser/ContentRefreshNavigationErrorTest.kt +1 -0
- package/android/src/test/java/com/audiobrowser/NavigateTrackTest.kt +1 -0
- package/android/src/test/java/com/audiobrowser/ResolveFormattedErrorTest.kt +1 -0
- package/android/src/test/java/com/audiobrowser/TestFixtures.kt +9 -6
- package/android/src/test/java/com/audiobrowser/browser/BrowseArtworkRegistryTest.kt +19 -0
- package/android/src/test/java/com/audiobrowser/browser/BrowserManagerSearchFailureTest.kt +168 -0
- package/android/src/test/java/com/audiobrowser/browser/BrowserManagerTest.kt +32 -0
- package/android/src/test/java/com/audiobrowser/http/RequestConfigBuilderTest.kt +43 -18
- package/android/src/test/java/com/audiobrowser/player/HandleTrackLoadSeekTest.kt +1 -0
- package/android/src/test/java/com/audiobrowser/player/PlayerCastTest.kt +40 -1
- package/android/src/test/java/com/audiobrowser/player/PlayerRetryTest.kt +115 -2
- package/android/src/test/java/com/audiobrowser/player/SessionBrowserNeverConfiguredTest.kt +98 -0
- package/android/src/test/java/com/audiobrowser/player/SessionUncachedIdTest.kt +396 -0
- package/android/src/test/java/com/audiobrowser/player/SessionViewTest.kt +6 -2
- package/android/src/test/java/com/audiobrowser/player/SessionVoiceSearchTest.kt +116 -14
- package/android/src/test/java/com/audiobrowser/remote/FakeRemote.kt +12 -1
- package/android/src/test/java/com/audiobrowser/remote/RemoteSwitchingPlayerTest.kt +241 -0
- package/android/src/test/java/com/audiobrowser/util/ArtworkContentProviderTest.kt +11 -0
- package/android/src/test/java/com/audiobrowser/util/ArtworkRoutesTest.kt +25 -0
- package/android/src/test/java/com/audiobrowser/util/AwaitCancellableTest.kt +43 -2
- package/android/src/test/java/com/audiobrowser/util/CoilArtworkLoaderTest.kt +38 -0
- package/android/src/test/java/com/audiobrowser/util/TrackFactoryRatingTest.kt +11 -0
- package/android/src/testCast/java/com/audiobrowser/cast/SdkCastRemoteTest.kt +187 -2
- package/ios/AVPlayerEngine.swift +2 -2
- package/ios/Browser/BrowserPathHelper.swift +3 -2
- package/ios/Browser/PageResolver.swift +1 -1
- package/ios/Extension/Promise+AwaitCallback.swift +13 -4
- package/ios/HybridAudioBrowser+Player.swift +3 -2
- package/ios/HybridAudioBrowser.swift +1 -1
- package/ios/Player/Player.swift +4 -2
- package/ios/Tests/AwaitCallbackTests.swift +8 -0
- package/ios/Tests/DataURLDecodingTests.swift +25 -0
- package/ios/Tests/GenerationMemoTests.swift +136 -0
- package/ios/Tests/JSCallbackErrorTests.swift +33 -0
- package/ios/Tests/PlayerPolicyTests.swift +19 -28
- package/ios/Tests/PlayerProgressTests.swift +0 -2
- package/ios/Tests/RequestLayerTests.swift +5 -0
- package/ios/Tests/RoutePickerSourceFrameTests.swift +30 -0
- package/ios/Tests/RoutePickerSourceLifetimeTests.swift +79 -0
- package/ios/Tests/Support/TestTypes.swift +14 -0
- package/ios/Util/ArtworkImageFetcher.swift +40 -16
- package/ios/Util/AwaitCallback.swift +16 -10
- package/ios/Util/GenerationMemo.swift +81 -17
- package/ios/Util/JSCallbackError.swift +23 -0
- package/ios/Util/OutputPicker.swift +25 -5
- package/ios/Util/RoutePickerSourceFrame.swift +17 -0
- package/ios/Util/RoutePickerSourceLifetime.swift +34 -0
- package/lib/commonjs/features/browser-config.js +3 -2
- package/lib/commonjs/features/browser-config.js.map +1 -1
- package/lib/commonjs/features/browser.js +7 -8
- package/lib/commonjs/features/browser.js.map +1 -1
- package/lib/commonjs/features/output.js +7 -3
- package/lib/commonjs/features/output.js.map +1 -1
- package/lib/commonjs/web/NativeAudioBrowser.js +43 -2
- package/lib/commonjs/web/NativeAudioBrowser.js.map +1 -1
- package/lib/commonjs/web/browser/BrowserManager.js +37 -65
- package/lib/commonjs/web/browser/BrowserManager.js.map +1 -1
- package/lib/commonjs/web/browser/SearchManager.js +1 -4
- package/lib/commonjs/web/browser/SearchManager.js.map +1 -1
- package/lib/commonjs/web/http/RequestConfigBuilder.js +53 -55
- package/lib/commonjs/web/http/RequestConfigBuilder.js.map +1 -1
- package/lib/commonjs/web/player/NowPlayingManager.js +3 -22
- package/lib/commonjs/web/player/NowPlayingManager.js.map +1 -1
- package/lib/commonjs/web/util/BrowserPathHelper.js +5 -7
- package/lib/commonjs/web/util/BrowserPathHelper.js.map +1 -1
- package/lib/commonjs/web/util/GenerationMemo.js +92 -0
- package/lib/commonjs/web/util/GenerationMemo.js.map +1 -0
- package/lib/module/features/browser-config.js +3 -2
- package/lib/module/features/browser-config.js.map +1 -1
- package/lib/module/features/browser.js +7 -8
- package/lib/module/features/browser.js.map +1 -1
- package/lib/module/features/output.js +7 -3
- package/lib/module/features/output.js.map +1 -1
- package/lib/module/web/NativeAudioBrowser.js +43 -2
- package/lib/module/web/NativeAudioBrowser.js.map +1 -1
- package/lib/module/web/browser/BrowserManager.js +37 -66
- package/lib/module/web/browser/BrowserManager.js.map +1 -1
- package/lib/module/web/browser/SearchManager.js +1 -5
- package/lib/module/web/browser/SearchManager.js.map +1 -1
- package/lib/module/web/http/RequestConfigBuilder.js +53 -55
- package/lib/module/web/http/RequestConfigBuilder.js.map +1 -1
- package/lib/module/web/player/NowPlayingManager.js +3 -22
- package/lib/module/web/player/NowPlayingManager.js.map +1 -1
- package/lib/module/web/util/BrowserPathHelper.js +5 -7
- package/lib/module/web/util/BrowserPathHelper.js.map +1 -1
- package/lib/module/web/util/GenerationMemo.js +87 -0
- package/lib/module/web/util/GenerationMemo.js.map +1 -0
- package/lib/typescript/src/features/browser-config.d.ts.map +1 -1
- package/lib/typescript/src/features/browser.d.ts +7 -8
- package/lib/typescript/src/features/browser.d.ts.map +1 -1
- package/lib/typescript/src/features/output.d.ts +8 -4
- package/lib/typescript/src/features/output.d.ts.map +1 -1
- package/lib/typescript/src/specs/audio-browser.nitro.d.ts +11 -0
- package/lib/typescript/src/specs/audio-browser.nitro.d.ts.map +1 -1
- package/lib/typescript/src/types/browser-native.d.ts +2 -1
- package/lib/typescript/src/types/browser-native.d.ts.map +1 -1
- package/lib/typescript/src/types/browser.d.ts +55 -8
- package/lib/typescript/src/types/browser.d.ts.map +1 -1
- package/nitrogen/generated/android/AudioBrowserOnLoad.cpp +2 -0
- package/nitrogen/generated/android/c++/JArtworkRequestConfig.hpp +3 -0
- package/nitrogen/generated/android/c++/JFindTrackParams.hpp +57 -0
- package/nitrogen/generated/android/c++/JFunc_std__shared_ptr_Promise_RequestConfig___MediaTransformParams.hpp +13 -1
- package/nitrogen/generated/android/c++/JFunc_std__shared_ptr_Promise_RequestConfig___RequestConfig_std__optional_std__unordered_map_std__string__std__string__.hpp +13 -1
- package/nitrogen/generated/android/c++/JFunc_std__shared_ptr_Promise_RequestConfig___Track.hpp +13 -1
- package/nitrogen/generated/android/c++/JFunc_std__shared_ptr_Promise_std__optional_FormattedNavigationError____FormatNavigationErrorParams.hpp +13 -1
- package/nitrogen/generated/android/c++/JFunc_std__shared_ptr_Promise_std__optional_NowPlayingUpdate____FormatNowPlayingParams.hpp +13 -1
- package/nitrogen/generated/android/c++/JFunc_std__shared_ptr_Promise_std__optional_std__string____Track.hpp +13 -1
- package/nitrogen/generated/android/c++/JFunc_std__shared_ptr_Promise_std__shared_ptr_Promise_GateDecision_____NativeGateRequest.hpp +23 -2
- package/nitrogen/generated/android/c++/JFunc_std__shared_ptr_Promise_std__shared_ptr_Promise_RequestConfig_____MediaTransformParams.hpp +23 -2
- 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
- package/nitrogen/generated/android/c++/JFunc_std__shared_ptr_Promise_std__shared_ptr_Promise_RequestConfig_____Track.hpp +23 -2
- package/nitrogen/generated/android/c++/JFunc_std__shared_ptr_Promise_std__shared_ptr_Promise_TransformableRequestConfig____.hpp +23 -2
- package/nitrogen/generated/android/c++/JFunc_std__shared_ptr_Promise_std__shared_ptr_Promise_std__optional_Track______FindTrackParams.hpp +171 -0
- package/nitrogen/generated/android/c++/JFunc_std__shared_ptr_Promise_std__shared_ptr_Promise_std__vector_Track______SearchParams.hpp +23 -2
- package/nitrogen/generated/android/c++/JFunc_std__shared_ptr_Promise_std__shared_ptr_Promise_void_____TrackLoadEvent.hpp +23 -2
- package/nitrogen/generated/android/c++/JFunc_std__shared_ptr_Promise_std__string__.hpp +13 -1
- 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
- package/nitrogen/generated/android/c++/JHybridAudioBrowserSpec.cpp +15 -3
- package/nitrogen/generated/android/c++/JHybridAudioBrowserSpec.hpp +1 -1
- package/nitrogen/generated/android/c++/JMediaRequestConfig.hpp +3 -0
- package/nitrogen/generated/android/c++/JNativeBrowserConfiguration.hpp +20 -2
- package/nitrogen/generated/android/c++/JNativeRouteEntry.hpp +3 -0
- package/nitrogen/generated/android/c++/JNativeSetupPlayerOptions.hpp +3 -0
- package/nitrogen/generated/android/c++/JOutputPickerAnchor.hpp +69 -0
- package/nitrogen/generated/android/c++/JTransformableRequestConfig.hpp +3 -0
- package/nitrogen/generated/android/c++/JVariant_ResolvedTrack_BrowseError_Promise_BrowseResult_.hpp +13 -1
- package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/FindTrackParams.kt +51 -0
- 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
- package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/HybridAudioBrowserSpec.kt +1 -1
- package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/NativeBrowserConfiguration.kt +11 -6
- package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/OutputPickerAnchor.kt +66 -0
- package/nitrogen/generated/ios/AudioBrowser-Swift-Cxx-Bridge.cpp +35 -1
- package/nitrogen/generated/ios/AudioBrowser-Swift-Cxx-Bridge.hpp +144 -15
- package/nitrogen/generated/ios/AudioBrowser-Swift-Cxx-Umbrella.hpp +8 -0
- package/nitrogen/generated/ios/c++/HybridAudioBrowserSpecSwift.hpp +8 -2
- package/nitrogen/generated/ios/swift/FindTrackParams.swift +29 -0
- package/nitrogen/generated/ios/swift/Func_std__shared_ptr_Promise_std__shared_ptr_Promise_std__optional_Track______FindTrackParams.swift +67 -0
- package/nitrogen/generated/ios/swift/Func_void_std__optional_Track_.swift +46 -0
- package/nitrogen/generated/ios/swift/Func_void_std__shared_ptr_Promise_std__optional_Track___.swift +66 -0
- package/nitrogen/generated/ios/swift/HybridAudioBrowserSpec.swift +1 -1
- package/nitrogen/generated/ios/swift/HybridAudioBrowserSpec_cxx.swift +2 -2
- package/nitrogen/generated/ios/swift/NativeBrowserConfiguration.swift +48 -1
- package/nitrogen/generated/ios/swift/OutputPickerAnchor.swift +44 -0
- package/nitrogen/generated/shared/c++/FindTrackParams.hpp +83 -0
- package/nitrogen/generated/shared/c++/HybridAudioBrowserSpec.hpp +4 -1
- package/nitrogen/generated/shared/c++/NativeBrowserConfiguration.hpp +10 -3
- package/nitrogen/generated/shared/c++/OutputPickerAnchor.hpp +95 -0
- package/package.json +1 -1
- package/src/codegen-js-error-message.test.ts +78 -0
- package/src/features/browser-config.test.ts +7 -0
- package/src/features/browser-config.ts +3 -2
- package/src/features/browser.ts +7 -8
- package/src/features/output.ts +13 -5
- package/src/specs/audio-browser.nitro.ts +16 -3
- package/src/types/browser-native.ts +4 -1
- package/src/types/browser.ts +60 -8
- package/src/web/NativeAudioBrowser.ts +43 -3
- package/src/web/__tests__/nowPlayingArtwork.test.ts +191 -0
- package/src/web/browser/BrowserManager.ts +50 -79
- package/src/web/browser/SearchManager.ts +1 -8
- package/src/web/browser/__tests__/artwork-resolution.test.ts +33 -0
- package/src/web/browser/__tests__/layer-resolver.test.ts +47 -1
- package/src/web/http/RequestConfigBuilder.test.ts +151 -1
- package/src/web/http/RequestConfigBuilder.ts +72 -57
- package/src/web/player/NowPlayingManager.test.ts +29 -0
- package/src/web/player/NowPlayingManager.ts +4 -27
- package/src/web/util/BrowserPathHelper.test.ts +23 -0
- package/src/web/util/BrowserPathHelper.ts +6 -7
- package/src/web/util/GenerationMemo.test.ts +148 -0
- package/src/web/util/GenerationMemo.ts +103 -0
- package/website/guide/audio-output.md +34 -7
- package/website/guide/browser.md +21 -0
- package/website/guide/gate.md +1 -1
|
@@ -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(
|
|
67
|
-
|
|
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 =
|
|
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
|
|
140
|
+
private fun requestFromSearch(
|
|
111
141
|
query: String,
|
|
112
142
|
extras: Bundle? = null,
|
|
113
|
-
|
|
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
|
-
|
|
125
|
-
|
|
126
|
-
|
|
127
|
-
|
|
128
|
-
|
|
129
|
-
|
|
130
|
-
|
|
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
|
-
|
|
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
|
}
|
|
@@ -142,6 +142,9 @@ internal class FakeReceiver(looper: Looper) : SimpleBasePlayer(looper) {
|
|
|
142
142
|
var item: MediaItem? = null
|
|
143
143
|
var positionMs = 0L
|
|
144
144
|
var durationMs = C.TIME_UNSET
|
|
145
|
+
var speed = 1f
|
|
146
|
+
/** Overrides the position of every state, earlier ones too, until a load or a seek. */
|
|
147
|
+
private var quietPositionMs: Long? = null
|
|
145
148
|
var intent = false
|
|
146
149
|
var readiness = STATE_IDLE
|
|
147
150
|
var volume = 10
|
|
@@ -177,6 +180,11 @@ internal class FakeReceiver(looper: Looper) : SimpleBasePlayer(looper) {
|
|
|
177
180
|
|
|
178
181
|
fun update() = invalidateState()
|
|
179
182
|
|
|
183
|
+
/** Moves the position without an event, as a speaker's poll finds a seek made elsewhere. */
|
|
184
|
+
fun positionQuietly(positionMs: Long) {
|
|
185
|
+
quietPositionMs = positionMs
|
|
186
|
+
}
|
|
187
|
+
|
|
180
188
|
/** Reports a stream title for whatever it plays, as a receiver's poll does; a load clears it. */
|
|
181
189
|
fun title(title: String) {
|
|
182
190
|
metadata = Metadata(0, IcyInfo(title.toByteArray(), title, null))
|
|
@@ -192,9 +200,10 @@ internal class FakeReceiver(looper: Looper) : SimpleBasePlayer(looper) {
|
|
|
192
200
|
}
|
|
193
201
|
)
|
|
194
202
|
.setCurrentMediaItemIndex(if (item == null) C.INDEX_UNSET else 0)
|
|
195
|
-
.setContentPositionMs(positionMs)
|
|
203
|
+
.setContentPositionMs(positionMs.let { at -> PositionSupplier { quietPositionMs ?: at } })
|
|
196
204
|
.setPlayWhenReady(intent, PLAY_WHEN_READY_CHANGE_REASON_USER_REQUEST)
|
|
197
205
|
.setPlaybackState(if (item == null) STATE_IDLE else readiness)
|
|
206
|
+
.setPlaybackParameters(PlaybackParameters(speed))
|
|
198
207
|
.setDeviceInfo(DEVICE_INFO)
|
|
199
208
|
.setDeviceVolume(volume)
|
|
200
209
|
.apply { metadata?.let(::setTimedMetadata) }
|
|
@@ -212,6 +221,7 @@ internal class FakeReceiver(looper: Looper) : SimpleBasePlayer(looper) {
|
|
|
212
221
|
uid = Any()
|
|
213
222
|
metadata = null
|
|
214
223
|
positionMs = if (startPositionMs == C.TIME_UNSET) 0 else startPositionMs
|
|
224
|
+
quietPositionMs = null
|
|
215
225
|
readiness = STATE_READY
|
|
216
226
|
if (lagging) held = loaded else item = loaded
|
|
217
227
|
return done()
|
|
@@ -240,6 +250,7 @@ internal class FakeReceiver(looper: Looper) : SimpleBasePlayer(looper) {
|
|
|
240
250
|
): ListenableFuture<*> {
|
|
241
251
|
seeks += positionMs
|
|
242
252
|
this.positionMs = positionMs
|
|
253
|
+
quietPositionMs = null
|
|
243
254
|
return done()
|
|
244
255
|
}
|
|
245
256
|
|
|
@@ -192,6 +192,207 @@ class RemoteSwitchingPlayerTest {
|
|
|
192
192
|
assertNull(player.playerError)
|
|
193
193
|
}
|
|
194
194
|
|
|
195
|
+
@Test
|
|
196
|
+
fun `after a failure whose status reads 0, the phone resumes where the receiver last played`() {
|
|
197
|
+
playOnReceiver(positionMs = 70_000)
|
|
198
|
+
|
|
199
|
+
failAsCastDoes()
|
|
200
|
+
remote.endSession()
|
|
201
|
+
idle()
|
|
202
|
+
|
|
203
|
+
assertEquals(70_000, local.positionMs)
|
|
204
|
+
assertTrue(local.playWhenReady)
|
|
205
|
+
assertEquals(2, local.prepares)
|
|
206
|
+
}
|
|
207
|
+
|
|
208
|
+
@Test
|
|
209
|
+
fun `the position a failure resumes from runs on from the receiver's last report while it played`() {
|
|
210
|
+
playOnReceiver(positionMs = 70_000)
|
|
211
|
+
shadowOf(looper).idleFor(Duration.ofSeconds(5))
|
|
212
|
+
|
|
213
|
+
failAsCastDoes()
|
|
214
|
+
remote.endSession()
|
|
215
|
+
idle()
|
|
216
|
+
|
|
217
|
+
assertEquals(75_000, local.positionMs)
|
|
218
|
+
}
|
|
219
|
+
|
|
220
|
+
@Test
|
|
221
|
+
fun `the position a failure resumes from stays put while the receiver was paused`() {
|
|
222
|
+
playOnReceiver(positionMs = 70_000)
|
|
223
|
+
player.pause()
|
|
224
|
+
idle()
|
|
225
|
+
shadowOf(looper).idleFor(Duration.ofSeconds(5))
|
|
226
|
+
|
|
227
|
+
failAsCastDoes()
|
|
228
|
+
remote.endSession()
|
|
229
|
+
idle()
|
|
230
|
+
|
|
231
|
+
assertEquals(70_000, local.positionMs)
|
|
232
|
+
assertFalse(local.playWhenReady)
|
|
233
|
+
}
|
|
234
|
+
|
|
235
|
+
@Test
|
|
236
|
+
fun `the position a failure resumes from runs on at the receiver's speed`() {
|
|
237
|
+
playOnReceiver(positionMs = 70_000, speed = 2f)
|
|
238
|
+
shadowOf(looper).idleFor(Duration.ofSeconds(5))
|
|
239
|
+
|
|
240
|
+
failAsCastDoes()
|
|
241
|
+
remote.endSession()
|
|
242
|
+
idle()
|
|
243
|
+
|
|
244
|
+
assertEquals(80_000, local.positionMs)
|
|
245
|
+
}
|
|
246
|
+
|
|
247
|
+
@Test
|
|
248
|
+
fun `the position a failure resumes from stops at the item's end`() {
|
|
249
|
+
playOnReceiver(positionMs = 70_000, durationMs = 72_000)
|
|
250
|
+
shadowOf(looper).idleFor(Duration.ofSeconds(5))
|
|
251
|
+
|
|
252
|
+
failAsCastDoes()
|
|
253
|
+
remote.endSession()
|
|
254
|
+
idle()
|
|
255
|
+
|
|
256
|
+
assertEquals(72_000, local.positionMs)
|
|
257
|
+
}
|
|
258
|
+
|
|
259
|
+
@Test
|
|
260
|
+
fun `a failure that drops the item from the receiver resumes where it last played`() {
|
|
261
|
+
playOnReceiver(positionMs = 70_000)
|
|
262
|
+
|
|
263
|
+
remote.player.item = null
|
|
264
|
+
failAsCastDoes()
|
|
265
|
+
remote.endSession()
|
|
266
|
+
idle()
|
|
267
|
+
|
|
268
|
+
assertEquals(70_000, local.positionMs)
|
|
269
|
+
}
|
|
270
|
+
|
|
271
|
+
@Test
|
|
272
|
+
fun `a Sonos failure resumes where its last poll found it, after a seek in its own app`() {
|
|
273
|
+
playOnReceiver(positionMs = 70_000)
|
|
274
|
+
|
|
275
|
+
// The poll reads the speaker after a seek made in the Sonos app, which sends no event.
|
|
276
|
+
remote.player.positionQuietly(100_000)
|
|
277
|
+
remote.playing()
|
|
278
|
+
idle()
|
|
279
|
+
// Sonos fails idle, keeping its frozen position.
|
|
280
|
+
remote.player.readiness = MediaPlayer.STATE_IDLE
|
|
281
|
+
remote.player.update()
|
|
282
|
+
idle()
|
|
283
|
+
remote.fail()
|
|
284
|
+
remote.endSession()
|
|
285
|
+
idle()
|
|
286
|
+
|
|
287
|
+
assertEquals(100_000, local.positionMs)
|
|
288
|
+
}
|
|
289
|
+
|
|
290
|
+
@Test
|
|
291
|
+
fun `a Cast failure resumes where a seek from another sender left the receiver`() {
|
|
292
|
+
playOnReceiver(positionMs = 70_000)
|
|
293
|
+
|
|
294
|
+
remote.player.positionMs = 100_000
|
|
295
|
+
remote.player.update()
|
|
296
|
+
idle()
|
|
297
|
+
failAsCastDoes()
|
|
298
|
+
remote.endSession()
|
|
299
|
+
idle()
|
|
300
|
+
|
|
301
|
+
assertEquals(100_000, local.positionMs)
|
|
302
|
+
}
|
|
303
|
+
|
|
304
|
+
@Test
|
|
305
|
+
fun `a load failing as it arrives on the receiver resumes where it was sent from`() {
|
|
306
|
+
playLocally(listOf("a"), positionMs = 45_000)
|
|
307
|
+
remote.startSession()
|
|
308
|
+
remote.player.lagging = true
|
|
309
|
+
idle()
|
|
310
|
+
|
|
311
|
+
// The receiver shows the item first in Cast's failed status, idle at 0.
|
|
312
|
+
remote.player.readiness = MediaPlayer.STATE_IDLE
|
|
313
|
+
remote.player.positionMs = 0
|
|
314
|
+
remote.player.catchUp()
|
|
315
|
+
idle()
|
|
316
|
+
remote.fail()
|
|
317
|
+
remote.endSession()
|
|
318
|
+
idle()
|
|
319
|
+
|
|
320
|
+
assertEquals(45_000, local.positionMs)
|
|
321
|
+
}
|
|
322
|
+
|
|
323
|
+
@Test
|
|
324
|
+
fun `a load failing while it first buffers on the receiver resumes where it was sent from`() {
|
|
325
|
+
playLocally(listOf("a"), positionMs = 45_000)
|
|
326
|
+
remote.startSession()
|
|
327
|
+
remote.player.lagging = true
|
|
328
|
+
idle()
|
|
329
|
+
|
|
330
|
+
// On a Streamer, a load to 46 s reported BUFFERING at 0.0 for about 0.3 s, then 46.3.
|
|
331
|
+
remote.player.readiness = MediaPlayer.STATE_BUFFERING
|
|
332
|
+
remote.player.positionMs = 0
|
|
333
|
+
remote.player.catchUp()
|
|
334
|
+
idle()
|
|
335
|
+
failAsCastDoes()
|
|
336
|
+
remote.endSession()
|
|
337
|
+
idle()
|
|
338
|
+
|
|
339
|
+
assertEquals(45_000, local.positionMs)
|
|
340
|
+
}
|
|
341
|
+
|
|
342
|
+
@Test
|
|
343
|
+
fun `the session ending after the receiver dropped the item resumes where it last played`() {
|
|
344
|
+
playOnReceiver(positionMs = 70_000)
|
|
345
|
+
|
|
346
|
+
remote.player.item = null
|
|
347
|
+
remote.player.update()
|
|
348
|
+
idle()
|
|
349
|
+
remote.endSession()
|
|
350
|
+
idle()
|
|
351
|
+
|
|
352
|
+
assertEquals(70_000, local.positionMs)
|
|
353
|
+
}
|
|
354
|
+
|
|
355
|
+
@Test
|
|
356
|
+
fun `a handback long after the receiver went idle resumes where it stopped`() {
|
|
357
|
+
playOnReceiver(positionMs = 70_000)
|
|
358
|
+
|
|
359
|
+
// Stopped from another sender: idle, which reports no failure.
|
|
360
|
+
remote.player.readiness = MediaPlayer.STATE_IDLE
|
|
361
|
+
remote.player.update()
|
|
362
|
+
idle()
|
|
363
|
+
shadowOf(looper).idleFor(Duration.ofSeconds(60))
|
|
364
|
+
remote.endSession()
|
|
365
|
+
idle()
|
|
366
|
+
|
|
367
|
+
assertEquals(70_000, local.positionMs)
|
|
368
|
+
}
|
|
369
|
+
|
|
370
|
+
@Test
|
|
371
|
+
fun `a prepare after the receiver dropped the item loads it where it last played`() {
|
|
372
|
+
playOnReceiver(positionMs = 70_000)
|
|
373
|
+
remote.player.item = null
|
|
374
|
+
remote.player.update()
|
|
375
|
+
idle()
|
|
376
|
+
assertEquals(70_000, player.currentPosition)
|
|
377
|
+
|
|
378
|
+
player.prepare()
|
|
379
|
+
idle()
|
|
380
|
+
|
|
381
|
+
assertEquals(70_000, remote.player.loads.last().positionMs)
|
|
382
|
+
}
|
|
383
|
+
|
|
384
|
+
@Test
|
|
385
|
+
fun `a live item failing on the receiver resumes at the phone's live edge`() {
|
|
386
|
+
live += "a"
|
|
387
|
+
playOnReceiver(positionMs = 70_000)
|
|
388
|
+
|
|
389
|
+
failAsCastDoes()
|
|
390
|
+
remote.endSession()
|
|
391
|
+
idle()
|
|
392
|
+
|
|
393
|
+
assertEquals(0, local.positionMs)
|
|
394
|
+
}
|
|
395
|
+
|
|
195
396
|
@Test
|
|
196
397
|
fun `the session ending after the item didn't resolve plays it on the phone`() {
|
|
197
398
|
unresolvable += "a"
|
|
@@ -520,6 +721,20 @@ class RemoteSwitchingPlayerTest {
|
|
|
520
721
|
assertEquals(8_000, remote.player.loads.last().positionMs)
|
|
521
722
|
}
|
|
522
723
|
|
|
724
|
+
@Test
|
|
725
|
+
fun `a receiver's failure after a stop is not the player error`() {
|
|
726
|
+
playLocally(listOf("a"))
|
|
727
|
+
remote.startSession()
|
|
728
|
+
idle()
|
|
729
|
+
|
|
730
|
+
player.stop()
|
|
731
|
+
idle()
|
|
732
|
+
remote.fail()
|
|
733
|
+
idle()
|
|
734
|
+
|
|
735
|
+
assertNull(player.playerError)
|
|
736
|
+
}
|
|
737
|
+
|
|
523
738
|
@Test
|
|
524
739
|
fun `a pause from elsewhere is the play intent`() {
|
|
525
740
|
playLocally(listOf("a"))
|
|
@@ -1146,6 +1361,32 @@ class RemoteSwitchingPlayerTest {
|
|
|
1146
1361
|
|
|
1147
1362
|
private fun idle() = shadowOf(looper).idle()
|
|
1148
1363
|
|
|
1364
|
+
/** Casts "a", which the receiver then reports playing at [positionMs]. */
|
|
1365
|
+
private fun playOnReceiver(positionMs: Long, speed: Float = 1f, durationMs: Long = C.TIME_UNSET) {
|
|
1366
|
+
playLocally(listOf("a"))
|
|
1367
|
+
remote.startSession()
|
|
1368
|
+
idle()
|
|
1369
|
+
remote.player.speed = speed
|
|
1370
|
+
remote.player.durationMs = durationMs
|
|
1371
|
+
remote.player.positionMs = positionMs
|
|
1372
|
+
remote.player.update()
|
|
1373
|
+
remote.playing()
|
|
1374
|
+
idle()
|
|
1375
|
+
}
|
|
1376
|
+
|
|
1377
|
+
/**
|
|
1378
|
+
* Fails as Cast's player does: it takes the failed status, idle at 0, before the session's
|
|
1379
|
+
* failure callback runs.
|
|
1380
|
+
*/
|
|
1381
|
+
private fun failAsCastDoes() {
|
|
1382
|
+
remote.player.readiness = MediaPlayer.STATE_IDLE
|
|
1383
|
+
remote.player.positionMs = 0
|
|
1384
|
+
remote.player.update()
|
|
1385
|
+
idle()
|
|
1386
|
+
remote.fail()
|
|
1387
|
+
idle()
|
|
1388
|
+
}
|
|
1389
|
+
|
|
1149
1390
|
private companion object {
|
|
1150
1391
|
val LIVE: MediaItem.LiveConfiguration =
|
|
1151
1392
|
MediaItem.LiveConfiguration.Builder().setTargetOffsetMs(5_000).build()
|
|
@@ -74,6 +74,17 @@ class ArtworkContentProviderTest {
|
|
|
74
74
|
assertTrue("Expected statSize >= 0 for a file FD, got ${pfd!!.statSize}", pfd.statSize >= 0)
|
|
75
75
|
}
|
|
76
76
|
|
|
77
|
+
@Test
|
|
78
|
+
fun `openFile serves a registered data token`() {
|
|
79
|
+
val url = "data:image/png;base64,AAAA"
|
|
80
|
+
val token = ArtworkUris.tokenFor(url)
|
|
81
|
+
registry.register(token, ResolvedArtwork(url, null, isSvg = false))
|
|
82
|
+
val pfd = provider.openFile(uri(token), "r")
|
|
83
|
+
assertNotNull(pfd)
|
|
84
|
+
val bytes = java.io.FileInputStream(pfd!!.fileDescriptor).readBytes()
|
|
85
|
+
assertNotNull(BitmapFactory.decodeByteArray(bytes, 0, bytes.size))
|
|
86
|
+
}
|
|
87
|
+
|
|
77
88
|
@Test
|
|
78
89
|
fun `openFile returns null for an unknown token`() {
|
|
79
90
|
assertNull(provider.openFile(uri("nope"), "r"))
|
|
@@ -0,0 +1,25 @@
|
|
|
1
|
+
package com.audiobrowser.util
|
|
2
|
+
|
|
3
|
+
import android.net.Uri
|
|
4
|
+
import com.audiobrowser.browser.BrowseArtworkRegistry
|
|
5
|
+
import org.junit.Assert.assertEquals
|
|
6
|
+
import org.junit.Test
|
|
7
|
+
import org.junit.runner.RunWith
|
|
8
|
+
import org.robolectric.RobolectricTestRunner
|
|
9
|
+
|
|
10
|
+
@RunWith(RobolectricTestRunner::class)
|
|
11
|
+
class ArtworkRoutesTest {
|
|
12
|
+
private val dataUrl =
|
|
13
|
+
"data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAQAAAAECAIAAAAmkwkpAAAAEElEQVR4nGP4z8AARwzEcQCukw/x0F8jngAAAABJRU5ErkJggg=="
|
|
14
|
+
|
|
15
|
+
@Test
|
|
16
|
+
fun `route serves a data URL through the provider`() {
|
|
17
|
+
val registry = BrowseArtworkRegistry()
|
|
18
|
+
val routes = ArtworkRoutes(registry, "app.artwork")
|
|
19
|
+
|
|
20
|
+
val routed = routes.route(dataUrl, null, isSvg = false, pinned = false)
|
|
21
|
+
|
|
22
|
+
assertEquals(ArtworkUris.contentUri("app.artwork", ArtworkUris.tokenFor(dataUrl)), routed)
|
|
23
|
+
assertEquals(dataUrl, routes.publicUrl(Uri.parse(routed)))
|
|
24
|
+
}
|
|
25
|
+
}
|
|
@@ -1,5 +1,6 @@
|
|
|
1
1
|
package com.audiobrowser.util
|
|
2
2
|
|
|
3
|
+
import com.margelo.nitro.core.Promise
|
|
3
4
|
import java.util.concurrent.TimeoutException
|
|
4
5
|
import kotlin.time.Duration.Companion.seconds
|
|
5
6
|
import kotlinx.coroutines.CancellationException
|
|
@@ -87,7 +88,7 @@ class AwaitCancellableTest {
|
|
|
87
88
|
@Test
|
|
88
89
|
fun `a nested promise's timeout covers both layers`() =
|
|
89
90
|
runTest(timeout = 5.seconds) {
|
|
90
|
-
val outer = JsPromise<
|
|
91
|
+
val outer = JsPromise<Promise<String>>()
|
|
91
92
|
val inner = JsPromise<String>()
|
|
92
93
|
val result = backgroundScope.async { runCatching { outer.promise.awaitNestedOrTimeout() } }
|
|
93
94
|
runCurrent()
|
|
@@ -104,7 +105,7 @@ class AwaitCancellableTest {
|
|
|
104
105
|
@Test
|
|
105
106
|
fun `a nested promise answers with the inner value`() =
|
|
106
107
|
runTest(timeout = 5.seconds) {
|
|
107
|
-
val outer = JsPromise<
|
|
108
|
+
val outer = JsPromise<Promise<String>>()
|
|
108
109
|
val inner = JsPromise<String>()
|
|
109
110
|
val result = backgroundScope.async { outer.promise.awaitNestedOrTimeout() }
|
|
110
111
|
runCurrent()
|
|
@@ -133,4 +134,44 @@ class AwaitCancellableTest {
|
|
|
133
134
|
assertTrue(result.isCompleted)
|
|
134
135
|
assertEquals(Result.success(null), result.await())
|
|
135
136
|
}
|
|
137
|
+
|
|
138
|
+
@Test
|
|
139
|
+
fun `a nested promise's rejection leaves out Nitro's error name`() =
|
|
140
|
+
runTest(timeout = 5.seconds) {
|
|
141
|
+
assertEquals("token expired", nestedRejection("Error: token expired"))
|
|
142
|
+
assertEquals("bad header", nestedRejection("TypeError: bad header"))
|
|
143
|
+
assertEquals("upstream: 503", nestedRejection("Error: upstream: 503"))
|
|
144
|
+
}
|
|
145
|
+
|
|
146
|
+
@Test
|
|
147
|
+
fun `a nested promise's rejection keeps a name that is not an error name`() =
|
|
148
|
+
runTest(timeout = 5.seconds) {
|
|
149
|
+
assertEquals("Timeout: took 30s", nestedRejection("Timeout: took 30s"))
|
|
150
|
+
assertEquals("ErrorCode: 7", nestedRejection("ErrorCode: 7"))
|
|
151
|
+
}
|
|
152
|
+
|
|
153
|
+
@Test
|
|
154
|
+
fun `a throw before the nested promise keeps its message whole`() =
|
|
155
|
+
runTest(timeout = 5.seconds) {
|
|
156
|
+
val outer = JsPromise<Promise<String>>()
|
|
157
|
+
outer.reject(RuntimeException("Error: thrown\n\nwith a blank line"))
|
|
158
|
+
val message = runCatching { outer.promise.awaitNested() }.exceptionOrNull()?.message
|
|
159
|
+
assertEquals("Error: thrown\n\nwith a blank line", message)
|
|
160
|
+
}
|
|
161
|
+
|
|
162
|
+
@Test
|
|
163
|
+
fun `a JS promise's rejection leaves out Nitro's error name`() =
|
|
164
|
+
runTest(timeout = 5.seconds) {
|
|
165
|
+
val js = JsPromise<String>().apply { reject(RuntimeException("RangeError: too far")) }
|
|
166
|
+
assertEquals(
|
|
167
|
+
"too far",
|
|
168
|
+
runCatching { js.promise.awaitJsPromise() }.exceptionOrNull()?.message,
|
|
169
|
+
)
|
|
170
|
+
}
|
|
171
|
+
|
|
172
|
+
private suspend fun nestedRejection(what: String): String? {
|
|
173
|
+
val inner = JsPromise<String>().apply { reject(RuntimeException(what)) }
|
|
174
|
+
val outer = JsPromise<Promise<String>>().apply { resolve(inner.promise) }
|
|
175
|
+
return runCatching { outer.promise.awaitNested() }.exceptionOrNull()?.message
|
|
176
|
+
}
|
|
136
177
|
}
|
|
@@ -1,10 +1,13 @@
|
|
|
1
1
|
package com.audiobrowser.util
|
|
2
2
|
|
|
3
3
|
import android.graphics.Bitmap
|
|
4
|
+
import android.graphics.Color
|
|
5
|
+
import coil3.ImageLoader
|
|
4
6
|
import coil3.network.httpHeaders
|
|
5
7
|
import coil3.request.ImageRequest
|
|
6
8
|
import coil3.size.Dimension
|
|
7
9
|
import coil3.size.Size
|
|
10
|
+
import coil3.svg.SvgDecoder
|
|
8
11
|
import kotlinx.coroutines.test.runTest
|
|
9
12
|
import org.junit.Assert.assertEquals
|
|
10
13
|
import org.junit.Assert.assertNotNull
|
|
@@ -12,6 +15,7 @@ import org.junit.Test
|
|
|
12
15
|
import org.junit.runner.RunWith
|
|
13
16
|
import org.robolectric.RobolectricTestRunner
|
|
14
17
|
import org.robolectric.RuntimeEnvironment
|
|
18
|
+
import org.robolectric.annotation.GraphicsMode
|
|
15
19
|
|
|
16
20
|
@RunWith(RobolectricTestRunner::class)
|
|
17
21
|
class CoilArtworkLoaderTest {
|
|
@@ -50,4 +54,38 @@ class CoilArtworkLoaderTest {
|
|
|
50
54
|
assertNotNull(captured)
|
|
51
55
|
assertEquals(Size(Dimension.Pixels(512), Dimension.Pixels(512)), captured!!.sizeResolver.size())
|
|
52
56
|
}
|
|
57
|
+
|
|
58
|
+
@Test
|
|
59
|
+
fun `load decodes a data URL through a real Coil loader`() = runTest {
|
|
60
|
+
val context = RuntimeEnvironment.getApplication()
|
|
61
|
+
val loader = CoilArtworkLoader(context, ImageLoader.Builder(context).build())
|
|
62
|
+
|
|
63
|
+
val bmp =
|
|
64
|
+
loader.load(
|
|
65
|
+
"data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAQAAAAECAIAAAAmkwkpAAAAEElEQVR4nGP4z8AARwzEcQCukw/x0F8jngAAAABJRU5ErkJggg==",
|
|
66
|
+
null,
|
|
67
|
+
null,
|
|
68
|
+
false,
|
|
69
|
+
)
|
|
70
|
+
|
|
71
|
+
assertEquals(Color.RED, bmp.getPixel(0, 0))
|
|
72
|
+
}
|
|
73
|
+
|
|
74
|
+
@Test
|
|
75
|
+
@GraphicsMode(GraphicsMode.Mode.NATIVE)
|
|
76
|
+
fun `load decodes an SVG data URL through the SVG decoder the service registers`() = runTest {
|
|
77
|
+
val context = RuntimeEnvironment.getApplication()
|
|
78
|
+
val imageLoader = ImageLoader.Builder(context).components { add(SvgDecoder.Factory()) }.build()
|
|
79
|
+
val loader = CoilArtworkLoader(context, imageLoader)
|
|
80
|
+
|
|
81
|
+
val bmp =
|
|
82
|
+
loader.load(
|
|
83
|
+
"data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHdpZHRoPSI0IiBoZWlnaHQ9IjQiPjxyZWN0IHdpZHRoPSI0IiBoZWlnaHQ9IjQiIGZpbGw9IiNmZjAwMDAiLz48L3N2Zz4=",
|
|
84
|
+
null,
|
|
85
|
+
16,
|
|
86
|
+
false,
|
|
87
|
+
)
|
|
88
|
+
|
|
89
|
+
assertEquals(Color.RED, bmp.getPixel(8, 8))
|
|
90
|
+
}
|
|
53
91
|
}
|