Skip to content

Commit 0a12300

Browse files
B0polB0pol
committed
polish tests
1 parent 01f49e8 commit 0a12300

4 files changed

Lines changed: 14 additions & 261 deletions

File tree

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

Lines changed: 12 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -19,9 +19,9 @@
1919

2020
public class SoundcloudStreamExtractorTest {
2121

22-
public static class LilUziVertDoWhatIWant extends DefaultStreamExtractorTest {
23-
private static final String ID = "do-what-i-want-produced-by-maaly-raw-don-cannon";
24-
private static final String UPLOADER = "https://soundcloud.com/liluzivert";
22+
public static class CreativeCommonsPlaysWellWithOthers extends DefaultStreamExtractorTest {
23+
private static final String ID = "plays-well-with-others-ep-2-what-do-an-army-of-ants-and-an-online-encyclopedia-have-in-common";
24+
private static final String UPLOADER = "https://soundcloud.com/wearecc";
2525
private static final int TIMESTAMP = 69;
2626
private static final String URL = UPLOADER + "/" + ID + "#t=" + TIMESTAMP;
2727
private static StreamExtractor extractor;
@@ -35,47 +35,26 @@ public static void setUp() throws Exception {
3535

3636
@Override public StreamExtractor extractor() { return extractor; }
3737
@Override public StreamingService expectedService() { return SoundCloud; }
38-
@Override public String expectedName() { return "Do What I Want [Produced By Maaly Raw + Don Cannon]"; }
39-
@Override public String expectedId() { return "276206960"; }
38+
@Override public String expectedName() { return "Plays Well with Others, Ep 2: What Do an Army of Ants and an Online Encyclopedia Have in Common?"; }
39+
@Override public String expectedId() { return "597253485"; }
4040
@Override public String expectedUrlContains() { return UPLOADER + "/" + ID; }
4141
@Override public String expectedOriginalUrlContains() { return URL; }
4242

4343
@Override public StreamType expectedStreamType() { return StreamType.AUDIO_STREAM; }
44-
@Override public String expectedUploaderName() { return "Lil Uzi Vert"; }
44+
@Override public String expectedUploaderName() { return "Creative Commons"; }
4545
@Override public String expectedUploaderUrl() { return UPLOADER; }
46-
@Override public List<String> expectedDescriptionContains() { return Arrays.asList("The Perfect LUV Tape®"); }
47-
@Override public long expectedLength() { return 175; }
46+
@Override public List<String> expectedDescriptionContains() { return Arrays.asList("Stigmergy is a mechanism of indirect coordination",
47+
"All original content in Plays Well with Others is available under a Creative Commons BY license."); }
48+
@Override public long expectedLength() { return 1400; }
4849
@Override public long expectedTimestamp() { return TIMESTAMP; }
49-
@Override public long expectedViewCountAtLeast() { return 75413600; }
50-
@Nullable @Override public String expectedUploadDate() { return "2016-07-31 18:18:07.000"; }
51-
@Nullable @Override public String expectedTextualUploadDate() { return "2016-07-31 18:18:07"; }
50+
@Override public long expectedViewCountAtLeast() { return 27000; }
51+
@Nullable @Override public String expectedUploadDate() { return "2019-03-28 13:36:18.000"; }
52+
@Nullable @Override public String expectedTextualUploadDate() { return "2019-03-28 13:36:18"; }
5253
@Override public long expectedLikeCountAtLeast() { return -1; }
5354
@Override public long expectedDislikeCountAtLeast() { return -1; }
5455
@Override public boolean expectedHasVideoStreams() { return false; }
5556
@Override public boolean expectedHasSubtitles() { return false; }
5657
@Override public boolean expectedHasFrames() { return false; }
5758
}
5859

59-
public static class ContentNotSupported {
60-
@BeforeClass
61-
public static void setUp() {
62-
NewPipe.init(DownloaderTestImpl.getInstance());
63-
}
64-
65-
@Test(expected = ContentNotSupportedException.class)
66-
public void hlsAudioStream() throws Exception {
67-
final StreamExtractor extractor =
68-
SoundCloud.getStreamExtractor("https://soundcloud.com/dualipa/cool");
69-
extractor.fetchPage();
70-
extractor.getAudioStreams();
71-
}
72-
73-
@Test(expected = ContentNotSupportedException.class)
74-
public void bothHlsAndOpusAudioStreams() throws Exception {
75-
final StreamExtractor extractor =
76-
SoundCloud.getStreamExtractor("https://soundcloud.com/lil-baby-4pf/no-sucker");
77-
extractor.fetchPage();
78-
extractor.getAudioStreams();
79-
}
80-
}
8160
}

‎extractor/src/test/java/org/schabi/newpipe/extractor/services/youtube/YoutubeChannelExtractorTest.java‎

Lines changed: 0 additions & 184 deletions
Original file line numberDiff line numberDiff line change
@@ -432,190 +432,6 @@ public void testSubscriberCount() throws Exception {
432432
}
433433
}
434434

435-
// this channel has no "Subscribe" button
436-
public static class EminemVEVO implements BaseChannelExtractorTest {
437-
private static YoutubeChannelExtractor extractor;
438-
439-
@BeforeClass
440-
public static void setUp() throws Exception {
441-
NewPipe.init(DownloaderTestImpl.getInstance());
442-
extractor = (YoutubeChannelExtractor) YouTube
443-
.getChannelExtractor("https://www.youtube.com/user/EminemVEVO/");
444-
extractor.fetchPage();
445-
}
446-
447-
/*//////////////////////////////////////////////////////////////////////////
448-
// Extractor
449-
//////////////////////////////////////////////////////////////////////////*/
450-
451-
@Test
452-
public void testServiceId() {
453-
assertEquals(YouTube.getServiceId(), extractor.getServiceId());
454-
}
455-
456-
@Test
457-
public void testName() throws Exception {
458-
assertEquals("EminemVEVO", extractor.getName());
459-
}
460-
461-
@Test
462-
public void testId() throws Exception {
463-
assertEquals("UC20vb-R_px4CguHzzBPhoyQ", extractor.getId());
464-
}
465-
466-
@Test
467-
public void testUrl() throws ParsingException {
468-
assertEquals("https://www.youtube.com/channel/UC20vb-R_px4CguHzzBPhoyQ", extractor.getUrl());
469-
}
470-
471-
@Test
472-
public void testOriginalUrl() throws ParsingException {
473-
assertEquals("https://www.youtube.com/user/EminemVEVO/", extractor.getOriginalUrl());
474-
}
475-
476-
/*//////////////////////////////////////////////////////////////////////////
477-
// ListExtractor
478-
//////////////////////////////////////////////////////////////////////////*/
479-
480-
@Test
481-
public void testRelatedItems() throws Exception {
482-
defaultTestRelatedItems(extractor);
483-
}
484-
485-
@Test
486-
public void testMoreRelatedItems() throws Exception {
487-
defaultTestMoreItems(extractor);
488-
}
489-
490-
/*//////////////////////////////////////////////////////////////////////////
491-
// ChannelExtractor
492-
//////////////////////////////////////////////////////////////////////////*/
493-
494-
@Test
495-
public void testDescription() throws Exception {
496-
final String description = extractor.getDescription();
497-
assertTrue(description, description.contains("Eminem on Vevo"));
498-
}
499-
500-
@Test
501-
public void testAvatarUrl() throws Exception {
502-
String avatarUrl = extractor.getAvatarUrl();
503-
assertIsSecureUrl(avatarUrl);
504-
assertTrue(avatarUrl, avatarUrl.contains("yt3"));
505-
}
506-
507-
@Test
508-
public void testBannerUrl() throws Exception {
509-
String bannerUrl = extractor.getBannerUrl();
510-
assertIsSecureUrl(bannerUrl);
511-
assertTrue(bannerUrl, bannerUrl.contains("yt3"));
512-
}
513-
514-
@Test
515-
public void testFeedUrl() throws Exception {
516-
assertEquals("https://www.youtube.com/feeds/videos.xml?channel_id=UC20vb-R_px4CguHzzBPhoyQ", extractor.getFeedUrl());
517-
}
518-
519-
@Test
520-
public void testSubscriberCount() throws Exception {
521-
// there is no "Subscribe" button
522-
long subscribers = extractor.getSubscriberCount();
523-
assertEquals("Wrong subscriber count", -1, subscribers);
524-
}
525-
}
526-
527-
/**
528-
* Some VEVO channels will redirect to a new page with a new channel id.
529-
* <p>
530-
* Though, it isn't a simple redirect, but a redirect instruction embed in the response itself, this
531-
* test assure that we account for that.
532-
*/
533-
public static class RedirectedChannel implements BaseChannelExtractorTest {
534-
private static YoutubeChannelExtractor extractor;
535-
536-
@BeforeClass
537-
public static void setUp() throws Exception {
538-
NewPipe.init(DownloaderTestImpl.getInstance());
539-
extractor = (YoutubeChannelExtractor) YouTube
540-
.getChannelExtractor("https://www.youtube.com/channel/UCITk7Ky4iE5_xISw9IaHqpQ");
541-
extractor.fetchPage();
542-
}
543-
544-
/*//////////////////////////////////////////////////////////////////////////
545-
// Extractor
546-
//////////////////////////////////////////////////////////////////////////*/
547-
548-
@Test
549-
public void testServiceId() {
550-
assertEquals(YouTube.getServiceId(), extractor.getServiceId());
551-
}
552-
553-
@Test
554-
public void testName() throws Exception {
555-
assertEquals("LordiVEVO", extractor.getName());
556-
}
557-
558-
@Test
559-
public void testId() throws Exception {
560-
assertEquals("UCrxkwepj7-4Wz1wHyfzw-sQ", extractor.getId());
561-
}
562-
563-
@Test
564-
public void testUrl() throws ParsingException {
565-
assertEquals("https://www.youtube.com/channel/UCrxkwepj7-4Wz1wHyfzw-sQ", extractor.getUrl());
566-
}
567-
568-
@Test
569-
public void testOriginalUrl() throws ParsingException {
570-
assertEquals("https://www.youtube.com/channel/UCITk7Ky4iE5_xISw9IaHqpQ", extractor.getOriginalUrl());
571-
}
572-
573-
/*//////////////////////////////////////////////////////////////////////////
574-
// ListExtractor
575-
//////////////////////////////////////////////////////////////////////////*/
576-
577-
@Test
578-
public void testRelatedItems() throws Exception {
579-
defaultTestRelatedItems(extractor);
580-
}
581-
582-
@Test
583-
public void testMoreRelatedItems() throws Exception {
584-
assertNoMoreItems(extractor);
585-
}
586-
587-
/*//////////////////////////////////////////////////////////////////////////
588-
// ChannelExtractor
589-
//////////////////////////////////////////////////////////////////////////*/
590-
591-
@Test
592-
public void testDescription() throws Exception {
593-
assertEmpty(extractor.getDescription());
594-
}
595-
596-
@Test
597-
public void testAvatarUrl() throws Exception {
598-
String avatarUrl = extractor.getAvatarUrl();
599-
assertIsSecureUrl(avatarUrl);
600-
assertTrue(avatarUrl, avatarUrl.contains("yt3"));
601-
}
602-
603-
@Test
604-
public void testBannerUrl() throws Exception {
605-
assertEmpty(extractor.getBannerUrl());
606-
}
607-
608-
@Test
609-
public void testFeedUrl() throws Exception {
610-
assertEquals("https://www.youtube.com/feeds/videos.xml?channel_id=UCrxkwepj7-4Wz1wHyfzw-sQ", extractor.getFeedUrl());
611-
}
612-
613-
@Test
614-
public void testSubscriberCount() throws Exception {
615-
assertEquals(-1, extractor.getSubscriberCount());
616-
}
617-
}
618-
619435
public static class RandomChannel implements BaseChannelExtractorTest {
620436
private static YoutubeChannelExtractor extractor;
621437

‎extractor/src/test/java/org/schabi/newpipe/extractor/services/youtube/search/YoutubeMusicSearchExtractorTest.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -153,8 +153,8 @@ public static void setUp() throws Exception {
153153

154154
public static class CorrectedSearch extends DefaultSearchExtractorTest {
155155
private static SearchExtractor extractor;
156-
private static final String QUERY = "duo lipa";
157-
private static final String EXPECTED_SUGGESTION = "dua lipa";
156+
private static final String QUERY = "nocopyrigh sounds";
157+
private static final String EXPECTED_SUGGESTION = "nocopyrightsounds";
158158

159159
@BeforeClass
160160
public static void setUp() throws Exception {

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

Lines changed: 0 additions & 42 deletions
Original file line numberDiff line numberDiff line change
@@ -62,48 +62,6 @@ public void invalidId() throws Exception {
6262
}
6363
}
6464

65-
public static class AdeleHello extends DefaultStreamExtractorTest {
66-
private static final String ID = "YQHsXMglC9A";
67-
private static final String URL = BASE_URL + ID;
68-
private static StreamExtractor extractor;
69-
70-
@BeforeClass
71-
public static void setUp() throws Exception {
72-
NewPipe.init(DownloaderTestImpl.getInstance());
73-
extractor = YouTube.getStreamExtractor(URL);
74-
extractor.fetchPage();
75-
}
76-
77-
@Test
78-
@Override
79-
public void testUploaderUrl() throws ParsingException {
80-
String url = extractor().getUploaderUrl();
81-
if (!url.equals("https://www.youtube.com/channel/UCsRM0YB_dabtEPGPTKo-gcw") &&
82-
!url.equals("https://www.youtube.com/channel/UComP_epzeKzvBX156r6pm1Q")) {
83-
fail("Uploader url is neither the music channel one nor the Vevo one");
84-
}
85-
}
86-
87-
@Override public StreamExtractor extractor() { return extractor; }
88-
@Override public StreamingService expectedService() { return YouTube; }
89-
@Override public String expectedName() { return "Adele - Hello"; }
90-
@Override public String expectedId() { return ID; }
91-
@Override public String expectedUrlContains() { return URL; }
92-
@Override public String expectedOriginalUrlContains() { return URL; }
93-
94-
@Override public StreamType expectedStreamType() { return StreamType.VIDEO_STREAM; }
95-
@Override public String expectedUploaderName() { return "Adele"; }
96-
@Override public String expectedUploaderUrl() { return null; } // overridden above
97-
@Override public List<String> expectedDescriptionContains() { return Arrays.asList("http://adele.com", "https://www.facebook.com/Adele"); }
98-
@Override public long expectedLength() { return 367; }
99-
@Override public long expectedViewCountAtLeast() { return 1220025784; }
100-
@Nullable @Override public String expectedUploadDate() { return "2015-10-22 00:00:00.000"; }
101-
@Nullable @Override public String expectedTextualUploadDate() { return "2015-10-22"; }
102-
@Override public long expectedLikeCountAtLeast() { return 15289000; }
103-
@Override public long expectedDislikeCountAtLeast() { return 826000; }
104-
@Override public boolean expectedHasSubtitles() { return false; }
105-
}
106-
10765
public static class DescriptionTestPewdiepie extends DefaultStreamExtractorTest {
10866
private static final String ID = "7PIMiDcwNvc";
10967
private static final int TIMESTAMP = 17;

0 commit comments

Comments
 (0)