From 276c29388985d0c1ed24443a383d0a13c45f331d Mon Sep 17 00:00:00 2001 From: Stypox Date: Sun, 6 Aug 2023 13:14:51 +0200 Subject: [PATCH] Rename assertTabsContain --- .../newpipe/extractor/ExtractorAsserts.java | 4 ++-- .../bandcamp/BandcampChannelExtractorTest.java | 4 ++-- .../peertube/PeertubeAccountExtractorTest.java | 6 +++--- .../peertube/PeertubeChannelExtractorTest.java | 6 +++--- .../SoundcloudChannelExtractorTest.java | 6 +++--- .../youtube/YoutubeChannelExtractorTest.java | 16 ++++++++-------- 6 files changed, 21 insertions(+), 21 deletions(-) diff --git a/extractor/src/test/java/org/schabi/newpipe/extractor/ExtractorAsserts.java b/extractor/src/test/java/org/schabi/newpipe/extractor/ExtractorAsserts.java index 2423c6e5b..07e58f4aa 100644 --- a/extractor/src/test/java/org/schabi/newpipe/extractor/ExtractorAsserts.java +++ b/extractor/src/test/java/org/schabi/newpipe/extractor/ExtractorAsserts.java @@ -151,8 +151,8 @@ public class ExtractorAsserts { "'" + shouldBeContained + "' should be contained inside '" + container + "'"); } - public static void assertTabsContained(@Nonnull final List tabs, - @Nonnull final String... expectedTabs) { + public static void assertTabsContain(@Nonnull final List tabs, + @Nonnull final String... expectedTabs) { final Set tabSet = tabs.stream() .map(linkHandler -> linkHandler.getContentFilters().get(0)) .collect(Collectors.toUnmodifiableSet()); diff --git a/extractor/src/test/java/org/schabi/newpipe/extractor/services/bandcamp/BandcampChannelExtractorTest.java b/extractor/src/test/java/org/schabi/newpipe/extractor/services/bandcamp/BandcampChannelExtractorTest.java index 3d34bd062..066c7a5ae 100644 --- a/extractor/src/test/java/org/schabi/newpipe/extractor/services/bandcamp/BandcampChannelExtractorTest.java +++ b/extractor/src/test/java/org/schabi/newpipe/extractor/services/bandcamp/BandcampChannelExtractorTest.java @@ -11,7 +11,7 @@ import org.schabi.newpipe.extractor.channel.tabs.ChannelTabs; import org.schabi.newpipe.extractor.services.BaseChannelExtractorTest; import static org.junit.jupiter.api.Assertions.*; -import static org.schabi.newpipe.extractor.ExtractorAsserts.assertTabsContained; +import static org.schabi.newpipe.extractor.ExtractorAsserts.assertTabsContain; import static org.schabi.newpipe.extractor.ServiceList.Bandcamp; public class BandcampChannelExtractorTest implements BaseChannelExtractorTest { @@ -84,7 +84,7 @@ public class BandcampChannelExtractorTest implements BaseChannelExtractorTest { @Test @Override public void testTabs() throws Exception { - assertTabsContained(extractor.getTabs(), ChannelTabs.ALBUMS); + assertTabsContain(extractor.getTabs(), ChannelTabs.ALBUMS); } @Test diff --git a/extractor/src/test/java/org/schabi/newpipe/extractor/services/peertube/PeertubeAccountExtractorTest.java b/extractor/src/test/java/org/schabi/newpipe/extractor/services/peertube/PeertubeAccountExtractorTest.java index 4bedb0b07..63397c6ba 100644 --- a/extractor/src/test/java/org/schabi/newpipe/extractor/services/peertube/PeertubeAccountExtractorTest.java +++ b/extractor/src/test/java/org/schabi/newpipe/extractor/services/peertube/PeertubeAccountExtractorTest.java @@ -16,7 +16,7 @@ import static org.junit.jupiter.api.Assertions.assertNotNull; import static org.junit.jupiter.api.Assertions.assertNull; import static org.junit.jupiter.api.Assertions.assertTrue; import static org.schabi.newpipe.extractor.ExtractorAsserts.assertIsSecureUrl; -import static org.schabi.newpipe.extractor.ExtractorAsserts.assertTabsContained; +import static org.schabi.newpipe.extractor.ExtractorAsserts.assertTabsContain; import static org.schabi.newpipe.extractor.ServiceList.PeerTube; /** @@ -103,7 +103,7 @@ public class PeertubeAccountExtractorTest { @Test @Override public void testTabs() throws Exception { - assertTabsContained(extractor.getTabs(), ChannelTabs.VIDEOS, ChannelTabs.CHANNELS); + assertTabsContain(extractor.getTabs(), ChannelTabs.VIDEOS, ChannelTabs.CHANNELS); } @Test @@ -192,7 +192,7 @@ public class PeertubeAccountExtractorTest { @Test @Override public void testTabs() throws Exception { - assertTabsContained(extractor.getTabs(), ChannelTabs.VIDEOS, ChannelTabs.CHANNELS); + assertTabsContain(extractor.getTabs(), ChannelTabs.VIDEOS, ChannelTabs.CHANNELS); } @Test diff --git a/extractor/src/test/java/org/schabi/newpipe/extractor/services/peertube/PeertubeChannelExtractorTest.java b/extractor/src/test/java/org/schabi/newpipe/extractor/services/peertube/PeertubeChannelExtractorTest.java index 48d1e62fc..72ce04839 100644 --- a/extractor/src/test/java/org/schabi/newpipe/extractor/services/peertube/PeertubeChannelExtractorTest.java +++ b/extractor/src/test/java/org/schabi/newpipe/extractor/services/peertube/PeertubeChannelExtractorTest.java @@ -16,7 +16,7 @@ import static org.junit.jupiter.api.Assertions.assertNotNull; import static org.junit.jupiter.api.Assertions.assertNull; import static org.junit.jupiter.api.Assertions.assertTrue; import static org.schabi.newpipe.extractor.ExtractorAsserts.assertIsSecureUrl; -import static org.schabi.newpipe.extractor.ExtractorAsserts.assertTabsContained; +import static org.schabi.newpipe.extractor.ExtractorAsserts.assertTabsContain; import static org.schabi.newpipe.extractor.ServiceList.PeerTube; /** @@ -118,7 +118,7 @@ public class PeertubeChannelExtractorTest { @Test @Override public void testTabs() throws Exception { - assertTabsContained(extractor.getTabs(), ChannelTabs.VIDEOS, ChannelTabs.PLAYLISTS); + assertTabsContain(extractor.getTabs(), ChannelTabs.VIDEOS, ChannelTabs.PLAYLISTS); } @Test @@ -223,7 +223,7 @@ public class PeertubeChannelExtractorTest { @Test @Override public void testTabs() throws Exception { - assertTabsContained(extractor.getTabs(), ChannelTabs.VIDEOS, ChannelTabs.PLAYLISTS); + assertTabsContain(extractor.getTabs(), ChannelTabs.VIDEOS, ChannelTabs.PLAYLISTS); } @Test diff --git a/extractor/src/test/java/org/schabi/newpipe/extractor/services/soundcloud/SoundcloudChannelExtractorTest.java b/extractor/src/test/java/org/schabi/newpipe/extractor/services/soundcloud/SoundcloudChannelExtractorTest.java index 26351fc0e..bd94dfd26 100644 --- a/extractor/src/test/java/org/schabi/newpipe/extractor/services/soundcloud/SoundcloudChannelExtractorTest.java +++ b/extractor/src/test/java/org/schabi/newpipe/extractor/services/soundcloud/SoundcloudChannelExtractorTest.java @@ -12,7 +12,7 @@ import org.schabi.newpipe.extractor.services.soundcloud.extractors.SoundcloudCha import static org.junit.jupiter.api.Assertions.*; import static org.schabi.newpipe.extractor.ExtractorAsserts.assertEmpty; import static org.schabi.newpipe.extractor.ExtractorAsserts.assertIsSecureUrl; -import static org.schabi.newpipe.extractor.ExtractorAsserts.assertTabsContained; +import static org.schabi.newpipe.extractor.ExtractorAsserts.assertTabsContain; import static org.schabi.newpipe.extractor.ServiceList.SoundCloud; /** @@ -96,7 +96,7 @@ public class SoundcloudChannelExtractorTest { @Test @Override public void testTabs() throws Exception { - assertTabsContained(extractor.getTabs(), ChannelTabs.TRACKS, ChannelTabs.PLAYLISTS, + assertTabsContain(extractor.getTabs(), ChannelTabs.TRACKS, ChannelTabs.PLAYLISTS, ChannelTabs.ALBUMS); } @@ -184,7 +184,7 @@ public class SoundcloudChannelExtractorTest { @Test @Override public void testTabs() throws Exception { - assertTabsContained(extractor.getTabs(), ChannelTabs.TRACKS, ChannelTabs.PLAYLISTS, + assertTabsContain(extractor.getTabs(), ChannelTabs.TRACKS, ChannelTabs.PLAYLISTS, ChannelTabs.ALBUMS); } diff --git a/extractor/src/test/java/org/schabi/newpipe/extractor/services/youtube/YoutubeChannelExtractorTest.java b/extractor/src/test/java/org/schabi/newpipe/extractor/services/youtube/YoutubeChannelExtractorTest.java index 27d50ca87..a791d1510 100644 --- a/extractor/src/test/java/org/schabi/newpipe/extractor/services/youtube/YoutubeChannelExtractorTest.java +++ b/extractor/src/test/java/org/schabi/newpipe/extractor/services/youtube/YoutubeChannelExtractorTest.java @@ -7,7 +7,7 @@ import static org.junit.jupiter.api.Assertions.assertThrows; import static org.junit.jupiter.api.Assertions.assertTrue; import static org.schabi.newpipe.extractor.ExtractorAsserts.assertContains; import static org.schabi.newpipe.extractor.ExtractorAsserts.assertIsSecureUrl; -import static org.schabi.newpipe.extractor.ExtractorAsserts.assertTabsContained; +import static org.schabi.newpipe.extractor.ExtractorAsserts.assertTabsContain; import static org.schabi.newpipe.extractor.ServiceList.YouTube; import static org.schabi.newpipe.extractor.services.DefaultTests.defaultTestGetPageInNewExtractor; import static org.schabi.newpipe.extractor.utils.Utils.isNullOrEmpty; @@ -233,7 +233,7 @@ public class YoutubeChannelExtractorTest { @Test @Override public void testTabs() throws Exception { - assertTabsContained(extractor.getTabs(), ChannelTabs.VIDEOS, + assertTabsContain(extractor.getTabs(), ChannelTabs.VIDEOS, ChannelTabs.LIVESTREAMS, ChannelTabs.PLAYLISTS, ChannelTabs.CHANNELS); } @@ -327,7 +327,7 @@ public class YoutubeChannelExtractorTest { @Test @Override public void testTabs() throws Exception { - assertTabsContained(extractor.getTabs(), ChannelTabs.VIDEOS, ChannelTabs.LIVESTREAMS, + assertTabsContain(extractor.getTabs(), ChannelTabs.VIDEOS, ChannelTabs.LIVESTREAMS, ChannelTabs.SHORTS, ChannelTabs.PLAYLISTS, ChannelTabs.CHANNELS); } @@ -424,7 +424,7 @@ public class YoutubeChannelExtractorTest { @Test @Override public void testTabs() throws Exception { - assertTabsContained(extractor.getTabs(), ChannelTabs.VIDEOS, ChannelTabs.SHORTS, + assertTabsContain(extractor.getTabs(), ChannelTabs.VIDEOS, ChannelTabs.SHORTS, ChannelTabs.PLAYLISTS, ChannelTabs.CHANNELS); } @@ -545,7 +545,7 @@ public class YoutubeChannelExtractorTest { @Test @Override public void testTabs() throws Exception { - assertTabsContained(extractor.getTabs(), ChannelTabs.VIDEOS, ChannelTabs.PLAYLISTS, + assertTabsContain(extractor.getTabs(), ChannelTabs.VIDEOS, ChannelTabs.PLAYLISTS, ChannelTabs.CHANNELS); } @@ -639,7 +639,7 @@ public class YoutubeChannelExtractorTest { @Test @Override public void testTabs() throws Exception { - assertTabsContained(extractor.getTabs(), ChannelTabs.VIDEOS, ChannelTabs.PLAYLISTS, + assertTabsContain(extractor.getTabs(), ChannelTabs.VIDEOS, ChannelTabs.PLAYLISTS, ChannelTabs.CHANNELS); } @@ -730,7 +730,7 @@ public class YoutubeChannelExtractorTest { @Test @Override public void testTabs() throws Exception { - assertTabsContained(extractor.getTabs(), ChannelTabs.VIDEOS, ChannelTabs.SHORTS, + assertTabsContain(extractor.getTabs(), ChannelTabs.VIDEOS, ChannelTabs.SHORTS, ChannelTabs.LIVESTREAMS, ChannelTabs.PLAYLISTS, ChannelTabs.CHANNELS); } @@ -846,7 +846,7 @@ public class YoutubeChannelExtractorTest { public void testTabs() throws Exception { // Channel tabs which may be available and which will be extracted from channel system // uploads playlists - assertTabsContained(extractor.getTabs(), + assertTabsContain(extractor.getTabs(), ChannelTabs.VIDEOS, ChannelTabs.SHORTS, ChannelTabs.LIVESTREAMS); // Check if all tabs are not classic tabs, so that link handlers are of the appropriate