react-native-audio-browser 1.0.0-next.3 → 1.0.0-next.4
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 +37 -14
- package/android/src/main/java/com/audiobrowser/AudioBrowser.kt +19 -8
- package/android/src/main/java/com/audiobrowser/Service.kt +6 -41
- package/android/src/main/java/com/audiobrowser/browser/BrowserManager.kt +12 -27
- package/android/src/main/java/com/audiobrowser/browser/BrowserUrlResolution.kt +6 -5
- package/android/src/main/java/com/audiobrowser/browser/JsonModels.kt +12 -7
- package/android/src/main/java/com/audiobrowser/extension/QueueIndex.kt +19 -0
- package/android/src/main/java/com/audiobrowser/http/HttpClient.kt +2 -1
- package/android/src/main/java/com/audiobrowser/http/RequestConfigBuilder.kt +24 -8
- package/android/src/main/java/com/audiobrowser/player/MediaFactory.kt +5 -1
- package/android/src/main/java/com/audiobrowser/player/MediaSessionCallback.kt +28 -21
- package/android/src/main/java/com/audiobrowser/player/Player.kt +33 -27
- package/android/src/main/java/com/audiobrowser/player/PlayerListener.kt +4 -0
- package/android/src/main/java/com/audiobrowser/player/ResolvingOnReloadSource.kt +38 -0
- package/android/src/main/java/com/audiobrowser/player/TransformingDataSource.kt +34 -19
- package/android/src/main/java/com/audiobrowser/remote/RemotePlayback.kt +10 -1
- package/android/src/main/java/com/audiobrowser/remote/RemoteSwitchingPlayer.kt +48 -4
- package/android/src/main/java/com/audiobrowser/util/BrowserPathHelper.kt +32 -34
- package/android/src/main/java/com/audiobrowser/util/SearchParamsFactory.kt +64 -0
- package/android/src/test/java/com/audiobrowser/NavigateTrackTest.kt +116 -0
- package/android/src/test/java/com/audiobrowser/TestFixtures.kt +41 -0
- package/android/src/test/java/com/audiobrowser/browser/BrowserManagerBuildApiRequestTest.kt +21 -4
- package/android/src/test/java/com/audiobrowser/browser/BrowserManagerFavoritesTest.kt +49 -0
- package/android/src/test/java/com/audiobrowser/browser/BrowserManagerPageShapeTest.kt +93 -0
- package/android/src/test/java/com/audiobrowser/browser/BrowserUrlResolutionTest.kt +12 -0
- package/android/src/test/java/com/audiobrowser/browser/JsonArtworkTest.kt +7 -1
- package/android/src/test/java/com/audiobrowser/browser/JsonFavoritedTest.kt +34 -0
- package/android/src/test/java/com/audiobrowser/browser/JsonStyleTest.kt +6 -6
- package/android/src/test/java/com/audiobrowser/extension/QueueIndexTest.kt +44 -0
- package/android/src/test/java/com/audiobrowser/http/HttpClientTest.kt +34 -0
- package/android/src/test/java/com/audiobrowser/http/RequestConfigBuilderTest.kt +64 -7
- package/android/src/test/java/com/audiobrowser/player/FavoriteCapabilityTest.kt +41 -0
- package/android/src/test/java/com/audiobrowser/player/MediaFactoryTest.kt +39 -0
- package/android/src/test/java/com/audiobrowser/player/MediaUrlReloadTest.kt +212 -0
- package/android/src/test/java/com/audiobrowser/player/PlayerSeekSnapshotTest.kt +45 -0
- package/android/src/test/java/com/audiobrowser/player/SessionVoiceSearchTest.kt +173 -0
- package/android/src/test/java/com/audiobrowser/player/TransformingDataSourceTest.kt +127 -1
- package/android/src/test/java/com/audiobrowser/remote/FakeRemote.kt +28 -0
- package/android/src/test/java/com/audiobrowser/remote/RemoteSwitchingPlayerTest.kt +116 -0
- package/android/src/test/java/com/audiobrowser/util/BrowserPathHelperTest.kt +44 -0
- package/android/src/testCast/java/com/audiobrowser/cast/SdkCastRemoteTest.kt +188 -0
- package/lib/commonjs/features/playback/controls.js +1 -2
- package/lib/commonjs/features/playback/controls.js.map +1 -1
- package/lib/module/features/playback/controls.js +1 -2
- package/lib/module/features/playback/controls.js.map +1 -1
- package/lib/typescript/src/features/playback/controls.d.ts +1 -2
- package/lib/typescript/src/features/playback/controls.d.ts.map +1 -1
- package/package.json +1 -1
- package/src/features/playback/controls.ts +1 -2
- package/website/guide/live-streams.md +22 -20
|
@@ -0,0 +1,116 @@
|
|
|
1
|
+
package com.audiobrowser
|
|
2
|
+
|
|
3
|
+
import android.os.Looper
|
|
4
|
+
import com.audiobrowser.TestFixtures.resolvedTrack
|
|
5
|
+
import com.audiobrowser.TestFixtures.staticRoute
|
|
6
|
+
import com.audiobrowser.browser.BrowserConfig
|
|
7
|
+
import com.audiobrowser.browser.BrowserManager
|
|
8
|
+
import com.audiobrowser.util.BrowserPathHelper
|
|
9
|
+
import com.margelo.nitro.audiobrowser.NativeBrowserConfiguration
|
|
10
|
+
import com.margelo.nitro.audiobrowser.Track
|
|
11
|
+
import java.time.Duration
|
|
12
|
+
import kotlinx.coroutines.MainScope
|
|
13
|
+
import org.junit.After
|
|
14
|
+
import org.junit.Assert.assertEquals
|
|
15
|
+
import org.junit.Assert.assertFalse
|
|
16
|
+
import org.junit.Assert.assertTrue
|
|
17
|
+
import org.junit.Rule
|
|
18
|
+
import org.junit.Test
|
|
19
|
+
import org.junit.rules.TemporaryFolder
|
|
20
|
+
import org.junit.runner.RunWith
|
|
21
|
+
import org.mockito.Mockito.CALLS_REAL_METHODS
|
|
22
|
+
import org.mockito.Mockito.mock
|
|
23
|
+
import org.robolectric.RobolectricTestRunner
|
|
24
|
+
import org.robolectric.Shadows.shadowOf
|
|
25
|
+
import org.robolectric.annotation.Config
|
|
26
|
+
|
|
27
|
+
/** Selecting a Playable track through `navigate(track)` plays it, whatever its path. */
|
|
28
|
+
@RunWith(RobolectricTestRunner::class)
|
|
29
|
+
@Config(sdk = [28])
|
|
30
|
+
class NavigateTrackTest {
|
|
31
|
+
|
|
32
|
+
@get:Rule val folder = TemporaryFolder()
|
|
33
|
+
|
|
34
|
+
private val service = buildService()
|
|
35
|
+
private val player = service.get().player
|
|
36
|
+
private val browserManager = BrowserManager()
|
|
37
|
+
|
|
38
|
+
@After
|
|
39
|
+
fun destroy() {
|
|
40
|
+
service.destroy()
|
|
41
|
+
}
|
|
42
|
+
|
|
43
|
+
// AudioBrowser's constructor needs JNI: a mock running its real methods, with the fields
|
|
44
|
+
// navigateTrack reads written as the constructor and the service connection write them.
|
|
45
|
+
private val browser =
|
|
46
|
+
mock(AudioBrowser::class.java, CALLS_REAL_METHODS).apply {
|
|
47
|
+
set("mainScope", MainScope())
|
|
48
|
+
set("connectedService", service.get())
|
|
49
|
+
set("browserManager", this@NavigateTrackTest.browserManager)
|
|
50
|
+
set(
|
|
51
|
+
"_configuration",
|
|
52
|
+
NativeBrowserConfiguration(
|
|
53
|
+
path = null,
|
|
54
|
+
request = null,
|
|
55
|
+
requestResolver = null,
|
|
56
|
+
browse = null,
|
|
57
|
+
browseResolver = null,
|
|
58
|
+
media = null,
|
|
59
|
+
artwork = null,
|
|
60
|
+
nowPlayingArtwork = null,
|
|
61
|
+
routes = null,
|
|
62
|
+
singleTrack = null,
|
|
63
|
+
handleTrackLoad = null,
|
|
64
|
+
androidControllerOfflineError = null,
|
|
65
|
+
viewMoreTitle = null,
|
|
66
|
+
carPlayLoadingTitle = null,
|
|
67
|
+
resolveAlbumPath = null,
|
|
68
|
+
formatNavigationError = null,
|
|
69
|
+
),
|
|
70
|
+
)
|
|
71
|
+
}
|
|
72
|
+
|
|
73
|
+
private fun AudioBrowser.set(field: String, value: Any) {
|
|
74
|
+
AudioBrowser::class.java.getDeclaredField(field).apply { isAccessible = true }.set(this, value)
|
|
75
|
+
}
|
|
76
|
+
|
|
77
|
+
private fun navigate(track: Track) {
|
|
78
|
+
browser.navigateTrack(track)
|
|
79
|
+
shadowOf(Looper.getMainLooper()).idle()
|
|
80
|
+
}
|
|
81
|
+
|
|
82
|
+
private fun silentTrack() =
|
|
83
|
+
TestFixtures.track(id = "a", src = folder.silentWavUri(Duration.ofMinutes(2)))
|
|
84
|
+
|
|
85
|
+
@Test
|
|
86
|
+
fun `a track with only a src plays`() {
|
|
87
|
+
val track = silentTrack()
|
|
88
|
+
assertFalse(player.playWhenReady)
|
|
89
|
+
|
|
90
|
+
navigate(track)
|
|
91
|
+
|
|
92
|
+
assertEquals(listOf(track.src), player.tracks.map { it.src })
|
|
93
|
+
assertTrue(player.playWhenReady)
|
|
94
|
+
}
|
|
95
|
+
|
|
96
|
+
@Test
|
|
97
|
+
fun `a track whose contextual path does not expand plays alone`() {
|
|
98
|
+
// The page no longer lists the track, so the expansion returns nothing.
|
|
99
|
+
browserManager.config =
|
|
100
|
+
BrowserConfig(
|
|
101
|
+
routes =
|
|
102
|
+
arrayOf(
|
|
103
|
+
staticRoute(
|
|
104
|
+
"/stations",
|
|
105
|
+
resolvedTrack(path = "/stations", children = arrayOf(TestFixtures.track(id = "b"))),
|
|
106
|
+
)
|
|
107
|
+
)
|
|
108
|
+
)
|
|
109
|
+
val track = silentTrack().copy(path = BrowserPathHelper.build("/stations", "a"))
|
|
110
|
+
|
|
111
|
+
navigate(track)
|
|
112
|
+
|
|
113
|
+
assertEquals(listOf(track.src), player.tracks.map { it.src })
|
|
114
|
+
assertTrue(player.playWhenReady)
|
|
115
|
+
}
|
|
116
|
+
}
|
|
@@ -1,14 +1,18 @@
|
|
|
1
1
|
package com.audiobrowser
|
|
2
2
|
|
|
3
|
+
import com.audiobrowser.util.JsPromise
|
|
3
4
|
import com.audiobrowser.util.artworkOf
|
|
4
5
|
import com.margelo.nitro.audiobrowser.ArtworkRendering
|
|
5
6
|
import com.margelo.nitro.audiobrowser.ArtworkRequestConfig
|
|
6
7
|
import com.margelo.nitro.audiobrowser.CardImage
|
|
8
|
+
import com.margelo.nitro.audiobrowser.Func_std__shared_ptr_Promise_RequestConfig___RequestConfig_std__optional_std__unordered_map_std__string__std__string__
|
|
9
|
+
import com.margelo.nitro.audiobrowser.Func_std__shared_ptr_Promise_std__shared_ptr_Promise_RequestConfig_____RequestConfig_std__optional_std__unordered_map_std__string__std__string__
|
|
7
10
|
import com.margelo.nitro.audiobrowser.GridTile
|
|
8
11
|
import com.margelo.nitro.audiobrowser.ImageQueryParams
|
|
9
12
|
import com.margelo.nitro.audiobrowser.ImageShape
|
|
10
13
|
import com.margelo.nitro.audiobrowser.ImageSource
|
|
11
14
|
import com.margelo.nitro.audiobrowser.MediaRequestConfig
|
|
15
|
+
import com.margelo.nitro.audiobrowser.NativeBrowserConfiguration
|
|
12
16
|
import com.margelo.nitro.audiobrowser.NativeRouteEntry
|
|
13
17
|
import com.margelo.nitro.audiobrowser.RequestConfig
|
|
14
18
|
import com.margelo.nitro.audiobrowser.ResolvedTrack
|
|
@@ -86,6 +90,23 @@ object TestFixtures {
|
|
|
86
90
|
userAgent = null,
|
|
87
91
|
)
|
|
88
92
|
|
|
93
|
+
/** A layer `transform` whose JS promise rejects with [message]. */
|
|
94
|
+
fun throwingTransform(message: String) =
|
|
95
|
+
Func_std__shared_ptr_Promise_std__shared_ptr_Promise_RequestConfig_____RequestConfig_std__optional_std__unordered_map_std__string__std__string__ {
|
|
96
|
+
_,
|
|
97
|
+
_ ->
|
|
98
|
+
val js = JsPromise<RequestConfig>().apply { reject(Exception(message)) }
|
|
99
|
+
JsPromise<Promise<RequestConfig>>().apply { resolve(js.promise) }.promise
|
|
100
|
+
}
|
|
101
|
+
|
|
102
|
+
/** A layer `transformSync` whose JS call throws: Nitro rejects with the JSError's `what()`. */
|
|
103
|
+
fun throwingTransformSync(what: String) =
|
|
104
|
+
Func_std__shared_ptr_Promise_RequestConfig___RequestConfig_std__optional_std__unordered_map_std__string__std__string__ {
|
|
105
|
+
_,
|
|
106
|
+
_ ->
|
|
107
|
+
JsPromise<RequestConfig>().apply { reject(Exception(what)) }.promise
|
|
108
|
+
}
|
|
109
|
+
|
|
89
110
|
fun mediaConfig(
|
|
90
111
|
baseUrl: String? = null,
|
|
91
112
|
path: String? = null,
|
|
@@ -169,6 +190,26 @@ object TestFixtures {
|
|
|
169
190
|
icyCharset = null,
|
|
170
191
|
)
|
|
171
192
|
|
|
193
|
+
fun browserConfiguration() =
|
|
194
|
+
NativeBrowserConfiguration(
|
|
195
|
+
path = null,
|
|
196
|
+
request = null,
|
|
197
|
+
requestResolver = null,
|
|
198
|
+
browse = null,
|
|
199
|
+
browseResolver = null,
|
|
200
|
+
media = null,
|
|
201
|
+
artwork = null,
|
|
202
|
+
nowPlayingArtwork = null,
|
|
203
|
+
routes = null,
|
|
204
|
+
singleTrack = null,
|
|
205
|
+
handleTrackLoad = null,
|
|
206
|
+
androidControllerOfflineError = null,
|
|
207
|
+
viewMoreTitle = null,
|
|
208
|
+
carPlayLoadingTitle = null,
|
|
209
|
+
resolveAlbumPath = null,
|
|
210
|
+
formatNavigationError = null,
|
|
211
|
+
)
|
|
212
|
+
|
|
172
213
|
/**
|
|
173
214
|
* A route serving [browseStatic] verbatim: the one browse arm that needs neither the JNI bridge
|
|
174
215
|
* nor HTTP.
|
|
@@ -1,6 +1,9 @@
|
|
|
1
1
|
package com.audiobrowser.browser
|
|
2
2
|
|
|
3
|
+
import com.audiobrowser.TestFixtures.throwingTransform
|
|
3
4
|
import com.audiobrowser.TestFixtures.transformableConfig
|
|
5
|
+
import com.audiobrowser.navigationErrorFor
|
|
6
|
+
import com.margelo.nitro.audiobrowser.NavigationErrorType
|
|
4
7
|
import kotlinx.coroutines.test.runTest
|
|
5
8
|
import org.junit.Assert.assertEquals
|
|
6
9
|
import org.junit.Assert.assertTrue
|
|
@@ -8,10 +11,6 @@ import org.junit.Assert.fail
|
|
|
8
11
|
import org.junit.Before
|
|
9
12
|
import org.junit.Test
|
|
10
13
|
|
|
11
|
-
/**
|
|
12
|
-
* Static layers only: Nitro Promises (transforms, resolvers) cannot be constructed on the JVM, so
|
|
13
|
-
* transforms are covered by RequestConfigBuilderTest and the Swift suite.
|
|
14
|
-
*/
|
|
15
14
|
class BrowserManagerBuildApiRequestTest {
|
|
16
15
|
|
|
17
16
|
private lateinit var bm: BrowserManager
|
|
@@ -105,4 +104,22 @@ class BrowserManagerBuildApiRequestTest {
|
|
|
105
104
|
assertEquals("/nowhere", e.path)
|
|
106
105
|
}
|
|
107
106
|
}
|
|
107
|
+
|
|
108
|
+
@Test
|
|
109
|
+
fun `a route transform that throws fails with callback-error`() = runTest {
|
|
110
|
+
bm.config = BrowserConfig(request = transformableConfig(baseUrl = "https://api.example.com"))
|
|
111
|
+
try {
|
|
112
|
+
bm.buildApiRequest(
|
|
113
|
+
kindConfig = null,
|
|
114
|
+
routeConfig = transformableConfig().copy(transform = throwingTransform("token expired")),
|
|
115
|
+
path = "/library",
|
|
116
|
+
params = emptyMap(),
|
|
117
|
+
)
|
|
118
|
+
fail("expected CallbackException")
|
|
119
|
+
} catch (e: CallbackException) {
|
|
120
|
+
val error = navigationErrorFor(e)
|
|
121
|
+
assertEquals(NavigationErrorType.CALLBACK_ERROR, error.code)
|
|
122
|
+
assertEquals("token expired", error.message)
|
|
123
|
+
}
|
|
124
|
+
}
|
|
108
125
|
}
|
|
@@ -3,7 +3,11 @@ package com.audiobrowser.browser
|
|
|
3
3
|
import com.audiobrowser.TestFixtures.resolvedTrack
|
|
4
4
|
import com.audiobrowser.TestFixtures.staticRoute
|
|
5
5
|
import com.audiobrowser.TestFixtures.track
|
|
6
|
+
import com.audiobrowser.TestFixtures.transformableConfig
|
|
7
|
+
import com.margelo.nitro.audiobrowser.NativeRouteEntry
|
|
6
8
|
import kotlinx.coroutines.runBlocking
|
|
9
|
+
import okhttp3.mockwebserver.MockResponse
|
|
10
|
+
import okhttp3.mockwebserver.MockWebServer
|
|
7
11
|
import org.junit.Assert.assertEquals
|
|
8
12
|
import org.junit.Before
|
|
9
13
|
import org.junit.Test
|
|
@@ -93,6 +97,51 @@ class BrowserManagerFavoritesTest {
|
|
|
93
97
|
assertEquals(mapOf("A" to false), favoritedByTitle(resolved.flattenedChildren?.toTypedArray()))
|
|
94
98
|
}
|
|
95
99
|
|
|
100
|
+
@Test
|
|
101
|
+
fun `favorited in an HTTP route's response wins over hydration`() = runBlocking {
|
|
102
|
+
val server = MockWebServer()
|
|
103
|
+
server.enqueue(
|
|
104
|
+
MockResponse()
|
|
105
|
+
.setBody(
|
|
106
|
+
"""{"path":"/home","title":"Home","children":[
|
|
107
|
+
{"title":"A","src":"https://s/a.mp3","favorited":true},
|
|
108
|
+
{"title":"B","src":"https://s/b.mp3","favorited":false}
|
|
109
|
+
]}"""
|
|
110
|
+
)
|
|
111
|
+
)
|
|
112
|
+
server.start()
|
|
113
|
+
try {
|
|
114
|
+
browserManager.config =
|
|
115
|
+
BrowserConfig(
|
|
116
|
+
request = transformableConfig(baseUrl = server.url("/").toString().trimEnd('/')),
|
|
117
|
+
routes =
|
|
118
|
+
arrayOf(
|
|
119
|
+
NativeRouteEntry(
|
|
120
|
+
path = "/home",
|
|
121
|
+
browseCallback = null,
|
|
122
|
+
browseConfig = transformableConfig(),
|
|
123
|
+
browseStatic = null,
|
|
124
|
+
searchCallback = null,
|
|
125
|
+
searchConfig = null,
|
|
126
|
+
media = null,
|
|
127
|
+
artwork = null,
|
|
128
|
+
)
|
|
129
|
+
),
|
|
130
|
+
)
|
|
131
|
+
browserManager.setFavoriteEnabled(true)
|
|
132
|
+
browserManager.setFavorites(listOf("https://s/b.mp3"))
|
|
133
|
+
|
|
134
|
+
val resolved = browserManager.resolve("/home")
|
|
135
|
+
|
|
136
|
+
assertEquals(
|
|
137
|
+
mapOf("A" to true, "B" to false),
|
|
138
|
+
favoritedByTitle(resolved.flattenedChildren?.toTypedArray()),
|
|
139
|
+
)
|
|
140
|
+
} finally {
|
|
141
|
+
server.shutdown()
|
|
142
|
+
}
|
|
143
|
+
}
|
|
144
|
+
|
|
96
145
|
@Test
|
|
97
146
|
fun `disabled favoriting leaves tracks untouched`() = runBlocking {
|
|
98
147
|
servePage("/home", track(title = "A", id = "stable-a", src = "https://s/a.mp3"))
|
|
@@ -0,0 +1,93 @@
|
|
|
1
|
+
package com.audiobrowser.browser
|
|
2
|
+
|
|
3
|
+
import com.audiobrowser.TestFixtures.transformableConfig
|
|
4
|
+
import com.margelo.nitro.audiobrowser.NativeRouteEntry
|
|
5
|
+
import kotlinx.coroutines.runBlocking
|
|
6
|
+
import okhttp3.mockwebserver.MockResponse
|
|
7
|
+
import okhttp3.mockwebserver.MockWebServer
|
|
8
|
+
import org.junit.After
|
|
9
|
+
import org.junit.Assert.assertEquals
|
|
10
|
+
import org.junit.Assert.assertThrows
|
|
11
|
+
import org.junit.Before
|
|
12
|
+
import org.junit.Test
|
|
13
|
+
import org.junit.runner.RunWith
|
|
14
|
+
import org.robolectric.RobolectricTestRunner
|
|
15
|
+
|
|
16
|
+
/** The page an endpoint answers: `BrowserSource` and `TabsSource` in `src/types/browser.ts`. */
|
|
17
|
+
@RunWith(RobolectricTestRunner::class)
|
|
18
|
+
class BrowserManagerPageShapeTest {
|
|
19
|
+
|
|
20
|
+
private lateinit var server: MockWebServer
|
|
21
|
+
private lateinit var browserManager: BrowserManager
|
|
22
|
+
|
|
23
|
+
@Before
|
|
24
|
+
fun setup() {
|
|
25
|
+
server = MockWebServer()
|
|
26
|
+
server.start()
|
|
27
|
+
browserManager = BrowserManager()
|
|
28
|
+
browserManager.config =
|
|
29
|
+
BrowserConfig(
|
|
30
|
+
request = transformableConfig(baseUrl = server.url("/").toString().trimEnd('/')),
|
|
31
|
+
routes =
|
|
32
|
+
arrayOf(
|
|
33
|
+
NativeRouteEntry(
|
|
34
|
+
path = BrowserManager.TABS_ROUTE_PATH,
|
|
35
|
+
browseCallback = null,
|
|
36
|
+
browseConfig = transformableConfig(),
|
|
37
|
+
browseStatic = null,
|
|
38
|
+
searchCallback = null,
|
|
39
|
+
searchConfig = null,
|
|
40
|
+
media = null,
|
|
41
|
+
artwork = null,
|
|
42
|
+
)
|
|
43
|
+
),
|
|
44
|
+
)
|
|
45
|
+
}
|
|
46
|
+
|
|
47
|
+
@After
|
|
48
|
+
fun tearDown() {
|
|
49
|
+
server.shutdown()
|
|
50
|
+
}
|
|
51
|
+
|
|
52
|
+
private fun answer(body: String) {
|
|
53
|
+
server.enqueue(MockResponse().setBody(body))
|
|
54
|
+
}
|
|
55
|
+
|
|
56
|
+
@Test
|
|
57
|
+
fun `a browse page without a path takes the requested path`() {
|
|
58
|
+
answer("""{"title":"Jazz","children":[{"title":"C","src":"https://s/c.mp3"}]}""")
|
|
59
|
+
|
|
60
|
+
val page = runBlocking { browserManager.resolve("/genres/jazz") }
|
|
61
|
+
|
|
62
|
+
assertEquals("/genres/jazz", page.path)
|
|
63
|
+
assertEquals("Jazz", page.title)
|
|
64
|
+
assertEquals(listOf("C"), page.flattenedChildren?.map { it.title })
|
|
65
|
+
}
|
|
66
|
+
|
|
67
|
+
@Test
|
|
68
|
+
fun `a page's own path wins`() {
|
|
69
|
+
answer("""{"path":"/jazz","title":"Jazz"}""")
|
|
70
|
+
|
|
71
|
+
val page = runBlocking { browserManager.resolve("/genres/jazz") }
|
|
72
|
+
|
|
73
|
+
assertEquals("/jazz", page.path)
|
|
74
|
+
}
|
|
75
|
+
|
|
76
|
+
@Test
|
|
77
|
+
fun `a tabs page needs neither title nor path`() {
|
|
78
|
+
answer("""{"children":[{"title":"Home","path":"/home"}]}""")
|
|
79
|
+
|
|
80
|
+
val tabs = runBlocking { browserManager.queryTabs() }
|
|
81
|
+
|
|
82
|
+
assertEquals(listOf("/home"), tabs.map { it.path })
|
|
83
|
+
}
|
|
84
|
+
|
|
85
|
+
@Test
|
|
86
|
+
fun `a browse page without a title does not resolve`() {
|
|
87
|
+
answer("""{"path":"/genres/jazz","children":[]}""")
|
|
88
|
+
|
|
89
|
+
assertThrows(HttpStatusException::class.java) {
|
|
90
|
+
runBlocking { browserManager.resolve("/genres/jazz") }
|
|
91
|
+
}
|
|
92
|
+
}
|
|
93
|
+
}
|
|
@@ -240,6 +240,18 @@ class BrowserUrlResolutionTest {
|
|
|
240
240
|
assertEquals("1", source?.headers?.get("x-art"))
|
|
241
241
|
}
|
|
242
242
|
|
|
243
|
+
@Test
|
|
244
|
+
fun `a user-agent or content-type header in any case wins over the field`() = runTest {
|
|
245
|
+
bm.config =
|
|
246
|
+
BrowserConfig(
|
|
247
|
+
request =
|
|
248
|
+
transformableConfig(headers = mapOf("user-agent" to "mine", "CONTENT-TYPE" to "mine"))
|
|
249
|
+
.copy(userAgent = "UA", contentType = "image/png")
|
|
250
|
+
)
|
|
251
|
+
val source = bm.unattributedArtworkSource("https://img.example.com/a.png")
|
|
252
|
+
assertEquals(mapOf("user-agent" to "mine", "CONTENT-TYPE" to "mine"), source?.headers)
|
|
253
|
+
}
|
|
254
|
+
|
|
243
255
|
@Test
|
|
244
256
|
fun `unattributedArtworkSource returns null when there are no static headers`() = runTest {
|
|
245
257
|
bm.config = BrowserConfig()
|
|
@@ -39,7 +39,13 @@ class JsonArtworkTest {
|
|
|
39
39
|
)
|
|
40
40
|
assertEquals(
|
|
41
41
|
"https://e.example/d.png",
|
|
42
|
-
resolved
|
|
42
|
+
resolved
|
|
43
|
+
.toNitro(requestedPath = "/requested")
|
|
44
|
+
.children
|
|
45
|
+
?.first()
|
|
46
|
+
?.artwork
|
|
47
|
+
?.asSecondOrNull()
|
|
48
|
+
?.dark,
|
|
43
49
|
)
|
|
44
50
|
}
|
|
45
51
|
|
|
@@ -0,0 +1,34 @@
|
|
|
1
|
+
package com.audiobrowser.browser
|
|
2
|
+
|
|
3
|
+
import kotlinx.serialization.json.Json
|
|
4
|
+
import org.junit.Assert.assertEquals
|
|
5
|
+
import org.junit.Assert.assertNull
|
|
6
|
+
import org.junit.Test
|
|
7
|
+
|
|
8
|
+
/** A `favorited` that a route's response carries on a track or a page. */
|
|
9
|
+
class JsonFavoritedTest {
|
|
10
|
+
private val json = Json { ignoreUnknownKeys = true }
|
|
11
|
+
|
|
12
|
+
private fun track(body: String) = json.decodeFromString<JsonTrack>(body).toNitro()
|
|
13
|
+
|
|
14
|
+
@Test
|
|
15
|
+
fun `decodes the value the response carries`() {
|
|
16
|
+
assertEquals(true, track("""{"title":"X","src":"a","favorited":true}""").favorited)
|
|
17
|
+
assertEquals(false, track("""{"title":"X","src":"a","favorited":false}""").favorited)
|
|
18
|
+
assertNull(track("""{"title":"X","src":"a"}""").favorited)
|
|
19
|
+
}
|
|
20
|
+
|
|
21
|
+
@Test
|
|
22
|
+
fun `decodes on a page and on its tracks`() {
|
|
23
|
+
val page =
|
|
24
|
+
json
|
|
25
|
+
.decodeFromString<JsonResolvedTrack>(
|
|
26
|
+
"""{"path":"/track/1","title":"Page","src":"p","favorited":true,"sections":[
|
|
27
|
+
{"children":[{"title":"A","src":"a","favorited":true},{"title":"B","src":"b"}]}
|
|
28
|
+
]}"""
|
|
29
|
+
)
|
|
30
|
+
.toNitro(requestedPath = "/requested")
|
|
31
|
+
assertEquals(true, page.favorited)
|
|
32
|
+
assertEquals(listOf(true, null), page.sections?.first()?.children?.map { it.favorited })
|
|
33
|
+
}
|
|
34
|
+
}
|
|
@@ -35,7 +35,7 @@ class JsonStyleTest {
|
|
|
35
35
|
{"style":{"display":"grid","gridWrap":false},"children":[{"title":"C","src":"s"}]}
|
|
36
36
|
]}"""
|
|
37
37
|
)
|
|
38
|
-
val style = resolved.toNitro().sections?.first()?.style
|
|
38
|
+
val style = resolved.toNitro(requestedPath = "/requested").sections?.first()?.style
|
|
39
39
|
assertEquals(StyleDisplay.GRID, style?.display)
|
|
40
40
|
assertEquals(false, style?.gridWrap)
|
|
41
41
|
}
|
|
@@ -48,7 +48,7 @@ class JsonStyleTest {
|
|
|
48
48
|
{"title":"C","src":"s","style":"grid"}
|
|
49
49
|
]}"""
|
|
50
50
|
)
|
|
51
|
-
val nitro = resolved.toNitro()
|
|
51
|
+
val nitro = resolved.toNitro(requestedPath = "/requested")
|
|
52
52
|
assertNull(nitro.style)
|
|
53
53
|
assertNull(nitro.children?.first()?.style)
|
|
54
54
|
}
|
|
@@ -79,7 +79,7 @@ class JsonStyleTest {
|
|
|
79
79
|
{"style":{"display":"grid","gridWrap":"false"},"children":[{"title":"C","src":"s"}]}
|
|
80
80
|
]}"""
|
|
81
81
|
)
|
|
82
|
-
val style = resolved.toNitro().sections?.first()?.style
|
|
82
|
+
val style = resolved.toNitro(requestedPath = "/requested").sections?.first()?.style
|
|
83
83
|
assertEquals(StyleDisplay.GRID, style?.display)
|
|
84
84
|
assertNull(style?.gridWrap)
|
|
85
85
|
}
|
|
@@ -125,7 +125,7 @@ class JsonStyleTest {
|
|
|
125
125
|
"children":[{"title":"C","src":"s"}]}
|
|
126
126
|
]}"""
|
|
127
127
|
)
|
|
128
|
-
val style = resolved.toNitro().sections?.first()?.style
|
|
128
|
+
val style = resolved.toNitro(requestedPath = "/requested").sections?.first()?.style
|
|
129
129
|
assertEquals(GridTile.CARD, style?.gridTile)
|
|
130
130
|
assertEquals("#1e3a8a", style?.cardTint)
|
|
131
131
|
assertEquals(CardImage.BACKGROUND, style?.cardImage)
|
|
@@ -140,7 +140,7 @@ class JsonStyleTest {
|
|
|
140
140
|
"children":[{"title":"C","src":"s"}]}
|
|
141
141
|
]}"""
|
|
142
142
|
)
|
|
143
|
-
val style = resolved.toNitro().sections?.first()?.style
|
|
143
|
+
val style = resolved.toNitro(requestedPath = "/requested").sections?.first()?.style
|
|
144
144
|
assertEquals(GridTile.IMAGE, style?.gridTile)
|
|
145
145
|
assertEquals(ImageShape.CIRCULAR, style?.imageShape)
|
|
146
146
|
}
|
|
@@ -158,6 +158,6 @@ class JsonStyleTest {
|
|
|
158
158
|
{"style":{"gridTile":"hexagon"},"children":[{"title":"C","src":"s"}]}
|
|
159
159
|
]}"""
|
|
160
160
|
)
|
|
161
|
-
assertNull(resolved.toNitro().sections?.first()?.style)
|
|
161
|
+
assertNull(resolved.toNitro(requestedPath = "/requested").sections?.first()?.style)
|
|
162
162
|
}
|
|
163
163
|
}
|
|
@@ -0,0 +1,44 @@
|
|
|
1
|
+
package com.audiobrowser.extension
|
|
2
|
+
|
|
3
|
+
import org.junit.Assert.assertEquals
|
|
4
|
+
import org.junit.Assert.assertThrows
|
|
5
|
+
import org.junit.Test
|
|
6
|
+
|
|
7
|
+
class QueueIndexTest {
|
|
8
|
+
|
|
9
|
+
@Test
|
|
10
|
+
fun `a number no Int holds throws`() {
|
|
11
|
+
listOf(
|
|
12
|
+
Double.NaN,
|
|
13
|
+
Double.POSITIVE_INFINITY,
|
|
14
|
+
Double.NEGATIVE_INFINITY,
|
|
15
|
+
1e19,
|
|
16
|
+
-1e19,
|
|
17
|
+
Int.MAX_VALUE + 1.0,
|
|
18
|
+
Int.MIN_VALUE - 1.0,
|
|
19
|
+
)
|
|
20
|
+
.forEach { number ->
|
|
21
|
+
assertThrows("$number", IllegalArgumentException::class.java) { number.toQueueIndex() }
|
|
22
|
+
}
|
|
23
|
+
}
|
|
24
|
+
|
|
25
|
+
@Test
|
|
26
|
+
fun `a number an Int holds drops its fraction`() {
|
|
27
|
+
assertEquals(0, 0.0.toQueueIndex())
|
|
28
|
+
assertEquals(2, 2.0.toQueueIndex())
|
|
29
|
+
assertEquals(1, 1.7.toQueueIndex())
|
|
30
|
+
assertEquals(0, (-0.5).toQueueIndex())
|
|
31
|
+
assertEquals(-1, (-1.0).toQueueIndex())
|
|
32
|
+
assertEquals(Int.MAX_VALUE, (Int.MAX_VALUE + 0.5).toQueueIndex())
|
|
33
|
+
assertEquals(Int.MIN_VALUE, (Int.MIN_VALUE - 0.5).toQueueIndex())
|
|
34
|
+
}
|
|
35
|
+
|
|
36
|
+
@Test
|
|
37
|
+
fun `the message names the number`() {
|
|
38
|
+
val error = assertThrows(IllegalArgumentException::class.java) { Double.NaN.toQueueIndex() }
|
|
39
|
+
assertEquals(
|
|
40
|
+
"Invalid track index: index must be a finite number within the range of Int, got NaN",
|
|
41
|
+
error.message,
|
|
42
|
+
)
|
|
43
|
+
}
|
|
44
|
+
}
|
|
@@ -0,0 +1,34 @@
|
|
|
1
|
+
package com.audiobrowser.http
|
|
2
|
+
|
|
3
|
+
import kotlinx.coroutines.test.runTest
|
|
4
|
+
import okhttp3.mockwebserver.MockResponse
|
|
5
|
+
import okhttp3.mockwebserver.MockWebServer
|
|
6
|
+
import org.junit.Assert.assertEquals
|
|
7
|
+
import org.junit.Test
|
|
8
|
+
|
|
9
|
+
class HttpClientTest {
|
|
10
|
+
|
|
11
|
+
/** Every User-Agent line a GET with [headers] and the default `userAgent` carries. */
|
|
12
|
+
private fun sentUserAgents(headers: Map<String, String>): List<String> =
|
|
13
|
+
MockWebServer().use { server ->
|
|
14
|
+
server.enqueue(MockResponse().setBody("{}"))
|
|
15
|
+
runTest {
|
|
16
|
+
HttpClient()
|
|
17
|
+
.request(HttpClient.HttpRequest(url = server.url("/").toString(), headers = headers))
|
|
18
|
+
.getOrThrow()
|
|
19
|
+
}
|
|
20
|
+
server.takeRequest().headers.values("User-Agent")
|
|
21
|
+
}
|
|
22
|
+
|
|
23
|
+
@Test
|
|
24
|
+
fun `a user-agent header in any case is sent alone, in place of the default`() {
|
|
25
|
+
for (name in listOf("User-Agent", "user-agent", "USER-AGENT")) {
|
|
26
|
+
assertEquals(name, listOf("MyApp/1.0"), sentUserAgents(mapOf(name to "MyApp/1.0")))
|
|
27
|
+
}
|
|
28
|
+
}
|
|
29
|
+
|
|
30
|
+
@Test
|
|
31
|
+
fun `without a user-agent header the default is sent`() {
|
|
32
|
+
assertEquals(listOf(HttpClient.DEFAULT_USER_AGENT), sentUserAgents(emptyMap()))
|
|
33
|
+
}
|
|
34
|
+
}
|