From 477082a480769d878fc04d866c37475bc8be80fe Mon Sep 17 00:00:00 2001 From: AudricV <74829229+AudricV@users.noreply.github.com> Date: Wed, 3 Aug 2022 18:09:52 +0200 Subject: [PATCH] [MediaCCC] Apply changes in extractor tests Also remove some public test methods modifiers. --- .../MediaCCCConferenceExtractorTest.java | 29 +++++++++------- .../MediaCCCStreamExtractorTest.java | 33 ++++++++++++------- 2 files changed, 38 insertions(+), 24 deletions(-) diff --git a/extractor/src/test/java/org/schabi/newpipe/extractor/services/media_ccc/MediaCCCConferenceExtractorTest.java b/extractor/src/test/java/org/schabi/newpipe/extractor/services/media_ccc/MediaCCCConferenceExtractorTest.java index cc94f03af7..73443e0217 100644 --- a/extractor/src/test/java/org/schabi/newpipe/extractor/services/media_ccc/MediaCCCConferenceExtractorTest.java +++ b/extractor/src/test/java/org/schabi/newpipe/extractor/services/media_ccc/MediaCCCConferenceExtractorTest.java @@ -8,6 +8,7 @@ import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertTrue; +import static org.schabi.newpipe.extractor.ExtractorAsserts.assertContainsImageUrlInImageCollection; import static org.schabi.newpipe.extractor.ServiceList.MediaCCC; /** @@ -25,27 +26,29 @@ public static void setUpClass() throws Exception { } @Test - public void testName() throws Exception { + void testName() throws Exception { assertEquals("FrOSCon 2017", extractor.getName()); } @Test - public void testGetUrl() throws Exception { + void testGetUrl() throws Exception { assertEquals("https://media.ccc.de/c/froscon2017", extractor.getUrl()); } @Test - public void testGetOriginalUrl() throws Exception { + void testGetOriginalUrl() throws Exception { assertEquals("https://media.ccc.de/c/froscon2017", extractor.getOriginalUrl()); } @Test - public void testGetThumbnailUrl() throws Exception { - assertEquals("https://static.media.ccc.de/media/events/froscon/2017/logo.png", extractor.getAvatarUrl()); + void testGetThumbnails() { + assertContainsImageUrlInImageCollection( + "https://static.media.ccc.de/media/events/froscon/2017/logo.png", + extractor.getAvatars()); } @Test - public void testGetInitalPage() throws Exception { + void testGetInitalPage() { assertEquals(97, extractor.getInitialPage().getItems().size()); } } @@ -61,27 +64,29 @@ public static void setUpClass() throws Exception { } @Test - public void testName() throws Exception { + void testName() throws Exception { assertEquals("Open Source Conference Albania 2019", extractor.getName()); } @Test - public void testGetUrl() throws Exception { + void testGetUrl() throws Exception { assertEquals("https://media.ccc.de/c/oscal19", extractor.getUrl()); } @Test - public void testGetOriginalUrl() throws Exception { + void testGetOriginalUrl() throws Exception { assertEquals("https://media.ccc.de/c/oscal19", extractor.getOriginalUrl()); } @Test - public void testGetThumbnailUrl() throws Exception { - assertEquals("https://static.media.ccc.de/media/events/oscal/2019/oscal-19.png", extractor.getAvatarUrl()); + void testGetThumbnailUrl() { + assertContainsImageUrlInImageCollection( + "https://static.media.ccc.de/media/events/oscal/2019/oscal-19.png", + extractor.getAvatars()); } @Test - public void testGetInitalPage() throws Exception { + void testGetInitalPage() { assertTrue(extractor.getInitialPage().getItems().size() >= 21); } } diff --git a/extractor/src/test/java/org/schabi/newpipe/extractor/services/media_ccc/MediaCCCStreamExtractorTest.java b/extractor/src/test/java/org/schabi/newpipe/extractor/services/media_ccc/MediaCCCStreamExtractorTest.java index 458946ba3e..4a501c2a33 100644 --- a/extractor/src/test/java/org/schabi/newpipe/extractor/services/media_ccc/MediaCCCStreamExtractorTest.java +++ b/extractor/src/test/java/org/schabi/newpipe/extractor/services/media_ccc/MediaCCCStreamExtractorTest.java @@ -17,6 +17,7 @@ import java.util.Locale; import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.schabi.newpipe.extractor.ExtractorAsserts.assertContainsImageUrlInImageCollection; import static org.schabi.newpipe.extractor.ServiceList.MediaCCC; /** @@ -62,16 +63,20 @@ public static void setUp() throws Exception { @Override @Test - public void testThumbnailUrl() throws Exception { - super.testThumbnailUrl(); - assertEquals("https://static.media.ccc.de/media/events/gpn/gpn18/105-hd.jpg", extractor.getThumbnailUrl()); + public void testThumbnails() throws Exception { + super.testThumbnails(); + assertContainsImageUrlInImageCollection( + "https://static.media.ccc.de/media/events/gpn/gpn18/105-hd_preview.jpg", + extractor.getThumbnails()); } @Override @Test - public void testUploaderAvatarUrl() throws Exception { - super.testUploaderAvatarUrl(); - assertEquals("https://static.media.ccc.de/media/events/gpn/gpn18/logo.png", extractor.getUploaderAvatarUrl()); + public void testUploaderAvatars() throws Exception { + super.testUploaderAvatars(); + assertContainsImageUrlInImageCollection( + "https://static.media.ccc.de/media/events/gpn/gpn18/logo.png", + extractor.getUploaderAvatars()); } @Override @@ -132,16 +137,20 @@ public static void setUp() throws Exception { @Override @Test - public void testThumbnailUrl() throws Exception { - super.testThumbnailUrl(); - assertEquals("https://static.media.ccc.de/media/congress/2019/10565-hd.jpg", extractor.getThumbnailUrl()); + public void testThumbnails() throws Exception { + super.testThumbnails(); + assertContainsImageUrlInImageCollection( + "https://static.media.ccc.de/media/congress/2019/10565-hd_preview.jpg", + extractor.getThumbnails()); } @Override @Test - public void testUploaderAvatarUrl() throws Exception { - super.testUploaderAvatarUrl(); - assertEquals("https://static.media.ccc.de/media/congress/2019/logo.png", extractor.getUploaderAvatarUrl()); + public void testUploaderAvatars() throws Exception { + super.testUploaderAvatars(); + assertContainsImageUrlInImageCollection( + "https://static.media.ccc.de/media/congress/2019/logo.png", + extractor.getUploaderAvatars()); } @Override