Skip to content

Commit 7528eb2

Browse files
committed
[YouTube] Fix stream tests failures
- Fix testCheckAudioStreams test of YoutubeStreamExtractorDefaultTest.AudioTrackLanguage test class, by updating the excepted audio track name test to use the updated English audio track name (audio track type info has been added on the video tested); - Fix YoutubeStreamExtractorDefaultTest.PublicBroadcasterTest test class by using a different video from a French and German public broadcast channel, as the channel Dinge Erklärt – Kurzgesagt is not affiliated with a public broadcast channel anymore; - Fix YoutubeStreamExtractorLivestreamTest test class, by updating the excepted name of the livestream to the current one.
1 parent 164c8e3 commit 7528eb2

2 files changed

Lines changed: 22 additions & 23 deletions

File tree

extractor/src/test/java/org/schabi/newpipe/extractor/services/youtube/stream/YoutubeStreamExtractorDefaultTest.java

Lines changed: 21 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -380,7 +380,7 @@ public void testTags() {}
380380
}
381381

382382
public static class PublicBroadcasterTest extends DefaultStreamExtractorTest {
383-
private static final String ID = "q6fgbYWsMgw";
383+
private static final String ID = "cJ9to6EmElQ";
384384
private static final int TIMESTAMP = 0;
385385
private static final String URL = BASE_URL + ID;
386386
private static StreamExtractor extractor;
@@ -396,41 +396,39 @@ public static void setUp() throws Exception {
396396
// @formatter:off
397397
@Override public StreamExtractor extractor() { return extractor; }
398398
@Override public StreamingService expectedService() { return YouTube; }
399-
@Override public String expectedName() { return "Was verbirgt sich am tiefsten Punkt des Ozeans?"; }
399+
@Override public String expectedName() { return "Merci pour les 3 millions d'abonnés \uD83C\uDF89| ARTE"; }
400400
@Override public String expectedId() { return ID; }
401401
@Override public String expectedUrlContains() { return BASE_URL + ID; }
402402
@Override public String expectedOriginalUrlContains() { return URL; }
403403

404404
@Override public StreamType expectedStreamType() { return StreamType.VIDEO_STREAM; }
405-
@Override public String expectedUploaderName() { return "Dinge Erklärt – Kurzgesagt"; }
406-
@Override public String expectedUploaderUrl() { return "https://www.youtube.com/channel/UCwRH985XgMYXQ6NxXDo8npw"; }
407-
@Override public long expectedUploaderSubscriberCountAtLeast() { return 1_500_000; }
408-
@Override public List<String> expectedDescriptionContains() { return Arrays.asList("Lasst uns abtauchen!", "Angebot von funk", "Dinge"); }
409-
@Override public long expectedLength() { return 631; }
405+
@Override public String expectedUploaderName() { return "ARTE"; }
406+
@Override public String expectedUploaderUrl() { return "https://www.youtube.com/channel/UCwI-JbGNsojunnHbFAc0M4Q"; }
407+
@Override public long expectedUploaderSubscriberCountAtLeast() { return 3_000_000; }
408+
@Override public List<String> expectedDescriptionContains() { return Arrays.asList("sommets", "fans", "cadeau"); }
409+
@Override public long expectedLength() { return 45; }
410410
@Override public long expectedTimestamp() { return TIMESTAMP; }
411-
@Override public long expectedViewCountAtLeast() { return 1_600_000; }
412-
@Nullable @Override public String expectedUploadDate() { return "2019-06-12 00:00:00.000"; }
413-
@Nullable @Override public String expectedTextualUploadDate() { return "2019-06-12"; }
414-
@Override public long expectedLikeCountAtLeast() { return 70000; }
411+
@Override public long expectedViewCountAtLeast() { return 20_000; }
412+
@Nullable @Override public String expectedUploadDate() { return "2023-07-07 00:00:00.000"; }
413+
@Nullable @Override public String expectedTextualUploadDate() { return "2023-07-07"; }
414+
@Override public long expectedLikeCountAtLeast() { return 1000; }
415415
@Override public long expectedDislikeCountAtLeast() { return -1; }
416416
@Override public List<MetaInfo> expectedMetaInfo() throws MalformedURLException {
417417
return Collections.singletonList(new MetaInfo(
418418
"",
419-
new Description("Funk is a German public broadcast service.", Description.PLAIN_TEXT),
420-
Collections.singletonList(new URL("https://de.wikipedia.org/wiki/Funk_(Medienangebot)?wprov=yicw1")),
421-
Collections.singletonList("Wikipedia (German)")
419+
new Description("Arte is a French/German public broadcast service.",
420+
Description.PLAIN_TEXT),
421+
List.of(new URL(
422+
"https://en.wikipedia.org/wiki/Arte?wprov=yicw1")),
423+
List.of("Wikipedia")
422424
));
423425
}
424426
@Override public boolean expectedUploaderVerified() { return true; }
425427
@Override public String expectedLicence() { return YOUTUBE_LICENCE; }
426-
@Override public String expectedCategory() { return "Education"; }
428+
@Override public String expectedCategory() { return "News & Politics"; }
427429
@Override public List<String> expectedTags() {
428-
return Arrays.asList("Abgrund", "Algen", "Bakterien", "Challengertief", "Dumbooktopus",
429-
"Dunkel", "Dunkelheit", "Fische", "Flohkrebs", "Hadal-Zone", "Kontinentalschelf",
430-
"Licht", "Mariannengraben", "Meer", "Meeresbewohner", "Meeresschnee", "Mesopelagial",
431-
"Ozean", "Photosynthese", "Plankton", "Plastik", "Polypen", "Pottwale",
432-
"Staatsquelle", "Tauchen", "Tauchgang", "Tentakel", "Tiefe", "Tiefsee", "Tintenfische",
433-
"Titanic", "Vampirtintenfisch", "Verschmutzung", "Viperfisch", "Wale");
430+
return Arrays.asList("arte", "arte 3 millions", "arte remerciement",
431+
"documentaire arte", "arte documentaire", "fan d'arte", "arte youtube");
434432
}
435433
// @formatter:on
436434
}
@@ -559,7 +557,8 @@ void testCheckAudioStreams() throws Exception {
559557
}
560558

561559
assertTrue(audioStreams.stream()
562-
.anyMatch(audioStream -> "English".equals(audioStream.getAudioTrackName())));
560+
.anyMatch(audioStream ->
561+
"English original".equals(audioStream.getAudioTrackName())));
563562

564563
final Locale hindiLocale = LocaleCompat.forLanguageTag("hi");
565564
assertTrue(audioStreams.stream()

extractor/src/test/java/org/schabi/newpipe/extractor/services/youtube/stream/YoutubeStreamExtractorLivestreamTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ public void testUploaderName() throws Exception {
4040

4141
@Override public StreamExtractor extractor() { return extractor; }
4242
@Override public StreamingService expectedService() { return YouTube; }
43-
@Override public String expectedName() { return "lofi hip hop radio - beats to relax/study to"; }
43+
@Override public String expectedName() { return "lofi hip hop radio \uD83D\uDCDA - beats to relax/study to"; }
4444
@Override public String expectedId() { return ID; }
4545
@Override public String expectedUrlContains() { return YoutubeStreamExtractorDefaultTest.BASE_URL + ID; }
4646
@Override public String expectedOriginalUrlContains() { return URL; }

0 commit comments

Comments
 (0)