Skip to content

Commit a336a8c

Browse files
committed
[Soundcloud] Update SoundcloudStreamExtractorTest with latest changes
1 parent 7607688 commit a336a8c

1 file changed

Lines changed: 20 additions & 12 deletions

File tree

extractor/src/test/java/org/schabi/newpipe/extractor/services/soundcloud/SoundcloudStreamExtractorTest.java

Lines changed: 20 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@
2424

2525
import static org.junit.jupiter.api.Assertions.assertEquals;
2626
import static org.junit.jupiter.api.Assertions.assertSame;
27+
import static org.junit.jupiter.api.Assertions.fail;
2728
import static org.schabi.newpipe.extractor.ServiceList.SoundCloud;
2829

2930
public class SoundcloudStreamExtractorTest {
@@ -188,26 +189,33 @@ public static void setUp() throws Exception {
188189
public void testAudioStreams() throws Exception {
189190
super.testAudioStreams();
190191
final List<AudioStream> audioStreams = extractor.getAudioStreams();
191-
assertEquals(2, audioStreams.size());
192+
assertEquals(3, audioStreams.size()); // 2 MP3 streams (1 progressive, 1 HLS) and 1 OPUS
192193
audioStreams.forEach(audioStream -> {
193194
final DeliveryMethod deliveryMethod = audioStream.getDeliveryMethod();
194195
final String mediaUrl = audioStream.getContent();
195196
if (audioStream.getFormat() == MediaFormat.OPUS) {
196-
// Assert that it's an OPUS 64 kbps media URL with a single range which comes
197-
// from an HLS SoundCloud CDN
198-
ExtractorAsserts.assertContains("-hls-opus-media.sndcdn.com", mediaUrl);
199-
ExtractorAsserts.assertContains(".64.opus", mediaUrl);
200197
assertSame(DeliveryMethod.HLS, deliveryMethod,
201198
"Wrong delivery method for stream " + audioStream.getId() + ": "
202199
+ deliveryMethod);
203-
} else if (audioStream.getFormat() == MediaFormat.MP3) {
204-
// Assert that it's a MP3 128 kbps media URL which comes from a progressive
200+
// Assert it's an OPUS 64 kbps media playlist URL which comes from an HLS
205201
// SoundCloud CDN
206-
ExtractorAsserts.assertContains("-media.sndcdn.com/bKOA7Pwbut93.128.mp3",
207-
mediaUrl);
208-
assertSame(DeliveryMethod.PROGRESSIVE_HTTP, deliveryMethod,
209-
"Wrong delivery method for stream " + audioStream.getId() + ": "
210-
+ deliveryMethod);
202+
ExtractorAsserts.assertContains("-hls-opus-media.sndcdn.com", mediaUrl);
203+
ExtractorAsserts.assertContains(".64.opus", mediaUrl);
204+
} else if (audioStream.getFormat() == MediaFormat.MP3) {
205+
if (deliveryMethod == DeliveryMethod.PROGRESSIVE_HTTP) {
206+
// Assert it's a MP3 128 kbps media URL which comes from a progressive
207+
// SoundCloud CDN
208+
ExtractorAsserts.assertContains("-media.sndcdn.com/bKOA7Pwbut93.128.mp3",
209+
mediaUrl);
210+
} else if (deliveryMethod == DeliveryMethod.HLS) {
211+
// Assert it's a MP3 128 kbps media HLS playlist URL which comes from an HLS
212+
// SoundCloud CDN
213+
ExtractorAsserts.assertContains("-hls-media.sndcdn.com", mediaUrl);
214+
ExtractorAsserts.assertContains(".128.mp3", mediaUrl);
215+
} else {
216+
fail("Wrong delivery method for stream " + audioStream.getId() + ": "
217+
+ deliveryMethod);
218+
}
211219
}
212220
});
213221
}

0 commit comments

Comments
 (0)