Skip to content

Commit 276c293

Browse files
StypoxStypox
committed
Rename assertTabsContain
1 parent 9d3761a commit 276c293

6 files changed

Lines changed: 21 additions & 21 deletions

File tree

‎extractor/src/test/java/org/schabi/newpipe/extractor/ExtractorAsserts.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -151,8 +151,8 @@ public static void assertContains(
151151
"'" + shouldBeContained + "' should be contained inside '" + container + "'");
152152
}
153153

154-
public static void assertTabsContained(@Nonnull final List<ListLinkHandler> tabs,
155-
@Nonnull final String... expectedTabs) {
154+
public static void assertTabsContain(@Nonnull final List<ListLinkHandler> tabs,
155+
@Nonnull final String... expectedTabs) {
156156
final Set<String> tabSet = tabs.stream()
157157
.map(linkHandler -> linkHandler.getContentFilters().get(0))
158158
.collect(Collectors.toUnmodifiableSet());

‎extractor/src/test/java/org/schabi/newpipe/extractor/services/bandcamp/BandcampChannelExtractorTest.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
import org.schabi.newpipe.extractor.services.BaseChannelExtractorTest;
1212

1313
import static org.junit.jupiter.api.Assertions.*;
14-
import static org.schabi.newpipe.extractor.ExtractorAsserts.assertTabsContained;
14+
import static org.schabi.newpipe.extractor.ExtractorAsserts.assertTabsContain;
1515
import static org.schabi.newpipe.extractor.ServiceList.Bandcamp;
1616

1717
public class BandcampChannelExtractorTest implements BaseChannelExtractorTest {
@@ -84,7 +84,7 @@ public void testOriginalUrl() throws Exception {
8484
@Test
8585
@Override
8686
public void testTabs() throws Exception {
87-
assertTabsContained(extractor.getTabs(), ChannelTabs.ALBUMS);
87+
assertTabsContain(extractor.getTabs(), ChannelTabs.ALBUMS);
8888
}
8989

9090
@Test

‎extractor/src/test/java/org/schabi/newpipe/extractor/services/peertube/PeertubeAccountExtractorTest.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
import static org.junit.jupiter.api.Assertions.assertNull;
1717
import static org.junit.jupiter.api.Assertions.assertTrue;
1818
import static org.schabi.newpipe.extractor.ExtractorAsserts.assertIsSecureUrl;
19-
import static org.schabi.newpipe.extractor.ExtractorAsserts.assertTabsContained;
19+
import static org.schabi.newpipe.extractor.ExtractorAsserts.assertTabsContain;
2020
import static org.schabi.newpipe.extractor.ServiceList.PeerTube;
2121

2222
/**
@@ -103,7 +103,7 @@ public void testVerified() throws Exception {
103103
@Test
104104
@Override
105105
public void testTabs() throws Exception {
106-
assertTabsContained(extractor.getTabs(), ChannelTabs.VIDEOS, ChannelTabs.CHANNELS);
106+
assertTabsContain(extractor.getTabs(), ChannelTabs.VIDEOS, ChannelTabs.CHANNELS);
107107
}
108108

109109
@Test
@@ -192,7 +192,7 @@ public void testVerified() throws Exception {
192192
@Test
193193
@Override
194194
public void testTabs() throws Exception {
195-
assertTabsContained(extractor.getTabs(), ChannelTabs.VIDEOS, ChannelTabs.CHANNELS);
195+
assertTabsContain(extractor.getTabs(), ChannelTabs.VIDEOS, ChannelTabs.CHANNELS);
196196
}
197197

198198
@Test

‎extractor/src/test/java/org/schabi/newpipe/extractor/services/peertube/PeertubeChannelExtractorTest.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
import static org.junit.jupiter.api.Assertions.assertNull;
1717
import static org.junit.jupiter.api.Assertions.assertTrue;
1818
import static org.schabi.newpipe.extractor.ExtractorAsserts.assertIsSecureUrl;
19-
import static org.schabi.newpipe.extractor.ExtractorAsserts.assertTabsContained;
19+
import static org.schabi.newpipe.extractor.ExtractorAsserts.assertTabsContain;
2020
import static org.schabi.newpipe.extractor.ServiceList.PeerTube;
2121

2222
/**
@@ -118,7 +118,7 @@ public void testVerified() throws Exception {
118118
@Test
119119
@Override
120120
public void testTabs() throws Exception {
121-
assertTabsContained(extractor.getTabs(), ChannelTabs.VIDEOS, ChannelTabs.PLAYLISTS);
121+
assertTabsContain(extractor.getTabs(), ChannelTabs.VIDEOS, ChannelTabs.PLAYLISTS);
122122
}
123123

124124
@Test
@@ -223,7 +223,7 @@ public void testVerified() throws Exception {
223223
@Test
224224
@Override
225225
public void testTabs() throws Exception {
226-
assertTabsContained(extractor.getTabs(), ChannelTabs.VIDEOS, ChannelTabs.PLAYLISTS);
226+
assertTabsContain(extractor.getTabs(), ChannelTabs.VIDEOS, ChannelTabs.PLAYLISTS);
227227
}
228228

229229
@Test

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
import static org.junit.jupiter.api.Assertions.*;
1313
import static org.schabi.newpipe.extractor.ExtractorAsserts.assertEmpty;
1414
import static org.schabi.newpipe.extractor.ExtractorAsserts.assertIsSecureUrl;
15-
import static org.schabi.newpipe.extractor.ExtractorAsserts.assertTabsContained;
15+
import static org.schabi.newpipe.extractor.ExtractorAsserts.assertTabsContain;
1616
import static org.schabi.newpipe.extractor.ServiceList.SoundCloud;
1717

1818
/**
@@ -96,7 +96,7 @@ public void testVerified() throws Exception {
9696
@Test
9797
@Override
9898
public void testTabs() throws Exception {
99-
assertTabsContained(extractor.getTabs(), ChannelTabs.TRACKS, ChannelTabs.PLAYLISTS,
99+
assertTabsContain(extractor.getTabs(), ChannelTabs.TRACKS, ChannelTabs.PLAYLISTS,
100100
ChannelTabs.ALBUMS);
101101
}
102102

@@ -184,7 +184,7 @@ public void testVerified() throws Exception {
184184
@Test
185185
@Override
186186
public void testTabs() throws Exception {
187-
assertTabsContained(extractor.getTabs(), ChannelTabs.TRACKS, ChannelTabs.PLAYLISTS,
187+
assertTabsContain(extractor.getTabs(), ChannelTabs.TRACKS, ChannelTabs.PLAYLISTS,
188188
ChannelTabs.ALBUMS);
189189
}
190190

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

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
import static org.junit.jupiter.api.Assertions.assertTrue;
88
import static org.schabi.newpipe.extractor.ExtractorAsserts.assertContains;
99
import static org.schabi.newpipe.extractor.ExtractorAsserts.assertIsSecureUrl;
10-
import static org.schabi.newpipe.extractor.ExtractorAsserts.assertTabsContained;
10+
import static org.schabi.newpipe.extractor.ExtractorAsserts.assertTabsContain;
1111
import static org.schabi.newpipe.extractor.ServiceList.YouTube;
1212
import static org.schabi.newpipe.extractor.services.DefaultTests.defaultTestGetPageInNewExtractor;
1313
import static org.schabi.newpipe.extractor.utils.Utils.isNullOrEmpty;
@@ -233,7 +233,7 @@ public void testVerified() throws Exception {
233233
@Test
234234
@Override
235235
public void testTabs() throws Exception {
236-
assertTabsContained(extractor.getTabs(), ChannelTabs.VIDEOS,
236+
assertTabsContain(extractor.getTabs(), ChannelTabs.VIDEOS,
237237
ChannelTabs.LIVESTREAMS, ChannelTabs.PLAYLISTS, ChannelTabs.CHANNELS);
238238
}
239239

@@ -327,7 +327,7 @@ public void testVerified() throws Exception {
327327
@Test
328328
@Override
329329
public void testTabs() throws Exception {
330-
assertTabsContained(extractor.getTabs(), ChannelTabs.VIDEOS, ChannelTabs.LIVESTREAMS,
330+
assertTabsContain(extractor.getTabs(), ChannelTabs.VIDEOS, ChannelTabs.LIVESTREAMS,
331331
ChannelTabs.SHORTS, ChannelTabs.PLAYLISTS, ChannelTabs.CHANNELS);
332332
}
333333

@@ -424,7 +424,7 @@ public void testVerified() throws Exception {
424424
@Test
425425
@Override
426426
public void testTabs() throws Exception {
427-
assertTabsContained(extractor.getTabs(), ChannelTabs.VIDEOS, ChannelTabs.SHORTS,
427+
assertTabsContain(extractor.getTabs(), ChannelTabs.VIDEOS, ChannelTabs.SHORTS,
428428
ChannelTabs.PLAYLISTS, ChannelTabs.CHANNELS);
429429
}
430430

@@ -545,7 +545,7 @@ public void testVerified() throws Exception {
545545
@Test
546546
@Override
547547
public void testTabs() throws Exception {
548-
assertTabsContained(extractor.getTabs(), ChannelTabs.VIDEOS, ChannelTabs.PLAYLISTS,
548+
assertTabsContain(extractor.getTabs(), ChannelTabs.VIDEOS, ChannelTabs.PLAYLISTS,
549549
ChannelTabs.CHANNELS);
550550
}
551551

@@ -639,7 +639,7 @@ public void testVerified() throws Exception {
639639
@Test
640640
@Override
641641
public void testTabs() throws Exception {
642-
assertTabsContained(extractor.getTabs(), ChannelTabs.VIDEOS, ChannelTabs.PLAYLISTS,
642+
assertTabsContain(extractor.getTabs(), ChannelTabs.VIDEOS, ChannelTabs.PLAYLISTS,
643643
ChannelTabs.CHANNELS);
644644
}
645645

@@ -730,7 +730,7 @@ public void testVerified() throws Exception {
730730
@Test
731731
@Override
732732
public void testTabs() throws Exception {
733-
assertTabsContained(extractor.getTabs(), ChannelTabs.VIDEOS, ChannelTabs.SHORTS,
733+
assertTabsContain(extractor.getTabs(), ChannelTabs.VIDEOS, ChannelTabs.SHORTS,
734734
ChannelTabs.LIVESTREAMS, ChannelTabs.PLAYLISTS, ChannelTabs.CHANNELS);
735735
}
736736

@@ -846,7 +846,7 @@ public void testVerified() throws Exception {
846846
public void testTabs() throws Exception {
847847
// Channel tabs which may be available and which will be extracted from channel system
848848
// uploads playlists
849-
assertTabsContained(extractor.getTabs(),
849+
assertTabsContain(extractor.getTabs(),
850850
ChannelTabs.VIDEOS, ChannelTabs.SHORTS, ChannelTabs.LIVESTREAMS);
851851

852852
// Check if all tabs are not classic tabs, so that link handlers are of the appropriate

0 commit comments

Comments
 (0)