Skip to content

Commit 8280fd4

Browse files
evermind-zzStypox
evermind-zz
authored and
Stypox
committed
searchfilters: Test: adjust and extend YouTube tests
1 parent 019ef62 commit 8280fd4

4 files changed

Lines changed: 358 additions & 57 deletions

File tree

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

Lines changed: 23 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,10 @@
1010
import org.schabi.newpipe.extractor.NewPipe;
1111
import org.schabi.newpipe.extractor.StreamingService;
1212
import org.schabi.newpipe.extractor.search.SearchExtractor;
13+
import org.schabi.newpipe.extractor.search.filter.FilterItem;
1314
import org.schabi.newpipe.extractor.services.DefaultSearchExtractorTest;
1415
import org.schabi.newpipe.extractor.services.youtube.linkHandler.YoutubeSearchQueryHandlerFactory;
16+
import org.schabi.newpipe.extractor.services.youtube.search.filter.YoutubeFilters;
1517

1618
import java.net.URLEncoder;
1719

@@ -26,7 +28,9 @@ public static class MusicSongs extends DefaultSearchExtractorTest {
2628
@BeforeAll
2729
public static void setUp() throws Exception {
2830
NewPipe.init(DownloaderTestImpl.getInstance());
29-
extractor = YouTube.getSearchExtractor(QUERY, singletonList(YoutubeSearchQueryHandlerFactory.MUSIC_SONGS), "");
31+
final FilterItem item =
32+
getFilterItem(YouTube, YoutubeFilters.ID_CF_MAIN_YOUTUBE_MUSIC_SONGS);
33+
extractor = YouTube.getSearchExtractor(QUERY, singletonList(item), null);
3034
extractor.fetchPage();
3135
}
3236

@@ -48,7 +52,9 @@ public static class MusicVideos extends DefaultSearchExtractorTest {
4852
@BeforeAll
4953
public static void setUp() throws Exception {
5054
NewPipe.init(DownloaderTestImpl.getInstance());
51-
extractor = YouTube.getSearchExtractor(QUERY, singletonList(YoutubeSearchQueryHandlerFactory.MUSIC_VIDEOS), "");
55+
final FilterItem item =
56+
getFilterItem(YouTube, YoutubeFilters.ID_CF_MAIN_YOUTUBE_MUSIC_VIDEOS);
57+
extractor = YouTube.getSearchExtractor(QUERY, singletonList(item), null);
5258
extractor.fetchPage();
5359
}
5460

@@ -70,7 +76,9 @@ public static class MusicAlbums extends DefaultSearchExtractorTest {
7076
@BeforeAll
7177
public static void setUp() throws Exception {
7278
NewPipe.init(DownloaderTestImpl.getInstance());
73-
extractor = YouTube.getSearchExtractor(QUERY, singletonList(YoutubeSearchQueryHandlerFactory.MUSIC_ALBUMS), "");
79+
final FilterItem item =
80+
getFilterItem(YouTube, YoutubeFilters.ID_CF_MAIN_YOUTUBE_MUSIC_ALBUMS);
81+
extractor = YouTube.getSearchExtractor(QUERY, singletonList(item), null);
7482
extractor.fetchPage();
7583
}
7684

@@ -92,7 +100,9 @@ public static class MusicPlaylists extends DefaultSearchExtractorTest {
92100
@BeforeAll
93101
public static void setUp() throws Exception {
94102
NewPipe.init(DownloaderTestImpl.getInstance());
95-
extractor = YouTube.getSearchExtractor(QUERY, singletonList(YoutubeSearchQueryHandlerFactory.MUSIC_PLAYLISTS), "");
103+
final FilterItem item =
104+
getFilterItem(YouTube, YoutubeFilters.ID_CF_MAIN_YOUTUBE_MUSIC_PLAYLISTS);
105+
extractor = YouTube.getSearchExtractor(QUERY, singletonList(item), null);
96106
extractor.fetchPage();
97107
}
98108

@@ -115,7 +125,9 @@ public static class MusicArtists extends DefaultSearchExtractorTest {
115125
@BeforeAll
116126
public static void setUp() throws Exception {
117127
NewPipe.init(DownloaderTestImpl.getInstance());
118-
extractor = YouTube.getSearchExtractor(QUERY, singletonList(YoutubeSearchQueryHandlerFactory.MUSIC_ARTISTS), "");
128+
final FilterItem item =
129+
getFilterItem(YouTube, YoutubeFilters.ID_CF_MAIN_YOUTUBE_MUSIC_ARTISTS);
130+
extractor = YouTube.getSearchExtractor(QUERY, singletonList(item), null);
119131
extractor.fetchPage();
120132
}
121133

@@ -139,7 +151,9 @@ public static class Suggestion extends DefaultSearchExtractorTest {
139151
@BeforeAll
140152
public static void setUp() throws Exception {
141153
NewPipe.init(DownloaderTestImpl.getInstance());
142-
extractor = YouTube.getSearchExtractor(QUERY, singletonList(YoutubeSearchQueryHandlerFactory.MUSIC_SONGS), "");
154+
final FilterItem item =
155+
getFilterItem(YouTube, YoutubeFilters.ID_CF_MAIN_YOUTUBE_MUSIC_SONGS);
156+
extractor = YouTube.getSearchExtractor(QUERY, singletonList(item), null);
143157
extractor.fetchPage();
144158
}
145159

@@ -163,7 +177,9 @@ public static class CorrectedSearch extends DefaultSearchExtractorTest {
163177
@BeforeAll
164178
public static void setUp() throws Exception {
165179
NewPipe.init(DownloaderTestImpl.getInstance());
166-
extractor = YouTube.getSearchExtractor(QUERY, singletonList(YoutubeSearchQueryHandlerFactory.MUSIC_SONGS), "");
180+
final FilterItem item =
181+
getFilterItem(YouTube, YoutubeFilters.ID_CF_MAIN_YOUTUBE_MUSIC_SONGS);
182+
extractor = YouTube.getSearchExtractor(QUERY, singletonList(item), null);
167183
extractor.fetchPage();
168184
}
169185

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

Lines changed: 25 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,6 @@
77
import static org.schabi.newpipe.extractor.ExtractorAsserts.assertEmptyErrors;
88
import static org.schabi.newpipe.extractor.ServiceList.YouTube;
99
import static org.schabi.newpipe.extractor.services.DefaultTests.assertNoDuplicatedItems;
10-
import static org.schabi.newpipe.extractor.services.youtube.linkHandler.YoutubeSearchQueryHandlerFactory.CHANNELS;
11-
import static org.schabi.newpipe.extractor.services.youtube.linkHandler.YoutubeSearchQueryHandlerFactory.PLAYLISTS;
12-
import static org.schabi.newpipe.extractor.services.youtube.linkHandler.YoutubeSearchQueryHandlerFactory.VIDEOS;
1310
import static java.util.Collections.singletonList;
1411

1512
import org.junit.jupiter.api.BeforeAll;
@@ -23,8 +20,10 @@
2320
import org.schabi.newpipe.extractor.channel.ChannelInfoItem;
2421
import org.schabi.newpipe.extractor.exceptions.ExtractionException;
2522
import org.schabi.newpipe.extractor.search.SearchExtractor;
23+
import org.schabi.newpipe.extractor.search.filter.FilterItem;
2624
import org.schabi.newpipe.extractor.services.DefaultSearchExtractorTest;
2725
import org.schabi.newpipe.extractor.services.youtube.YoutubeTestsUtils;
26+
import org.schabi.newpipe.extractor.services.youtube.search.filter.YoutubeFilters;
2827
import org.schabi.newpipe.extractor.stream.Description;
2928
import org.schabi.newpipe.extractor.stream.StreamInfoItem;
3029
import org.schabi.newpipe.extractor.utils.Utils;
@@ -71,7 +70,8 @@ public static class Channel extends DefaultSearchExtractorTest {
7170
public static void setUp() throws Exception {
7271
YoutubeTestsUtils.ensureStateless();
7372
NewPipe.init(DownloaderFactory.getDownloader(RESOURCE_PATH + "channel"));
74-
extractor = YouTube.getSearchExtractor(QUERY, singletonList(CHANNELS), "");
73+
final FilterItem item = getFilterItem(YouTube, YoutubeFilters.ID_CF_MAIN_CHANNELS);
74+
extractor = YouTube.getSearchExtractor(QUERY, singletonList(item), null);
7575
extractor.fetchPage();
7676
}
7777

@@ -95,7 +95,8 @@ public static class Playlists extends DefaultSearchExtractorTest {
9595
public static void setUp() throws Exception {
9696
YoutubeTestsUtils.ensureStateless();
9797
NewPipe.init(DownloaderFactory.getDownloader(RESOURCE_PATH + "playlist"));
98-
extractor = YouTube.getSearchExtractor(QUERY, singletonList(PLAYLISTS), "");
98+
final FilterItem item = getFilterItem(YouTube, YoutubeFilters.ID_CF_MAIN_PLAYLISTS);
99+
extractor = YouTube.getSearchExtractor(QUERY, singletonList(item), null);
99100
extractor.fetchPage();
100101
}
101102

@@ -119,7 +120,8 @@ public static class Videos extends DefaultSearchExtractorTest {
119120
public static void setUp() throws Exception {
120121
YoutubeTestsUtils.ensureStateless();
121122
NewPipe.init(DownloaderFactory.getDownloader(RESOURCE_PATH + "videos"));
122-
extractor = YouTube.getSearchExtractor(QUERY, singletonList(VIDEOS), "");
123+
final FilterItem item = getFilterItem(YouTube, YoutubeFilters.ID_CF_MAIN_VIDEOS);
124+
extractor = YouTube.getSearchExtractor(QUERY, singletonList(item), null);
123125
extractor.fetchPage();
124126
}
125127

@@ -151,7 +153,8 @@ public static class Suggestion extends DefaultSearchExtractorTest {
151153
public static void setUp() throws Exception {
152154
YoutubeTestsUtils.ensureStateless();
153155
NewPipe.init(DownloaderFactory.getDownloader(RESOURCE_PATH + "suggestions"));
154-
extractor = YouTube.getSearchExtractor(QUERY, singletonList(VIDEOS), "");
156+
final FilterItem item = getFilterItem(YouTube, YoutubeFilters.ID_CF_MAIN_VIDEOS);
157+
extractor = YouTube.getSearchExtractor(QUERY, singletonList(item), null);
155158
extractor.fetchPage();
156159
}
157160

@@ -178,7 +181,8 @@ public static class CorrectedSearch extends DefaultSearchExtractorTest {
178181
public static void setUp() throws Exception {
179182
YoutubeTestsUtils.ensureStateless();
180183
NewPipe.init(DownloaderFactory.getDownloader(RESOURCE_PATH + "corrected"));
181-
extractor = YouTube.getSearchExtractor(QUERY, singletonList(VIDEOS), "");
184+
final FilterItem item = getFilterItem(YouTube, YoutubeFilters.ID_CF_MAIN_VIDEOS);
185+
extractor = YouTube.getSearchExtractor(QUERY, singletonList(item), null);
182186
extractor.fetchPage();
183187
}
184188

@@ -237,7 +241,10 @@ static class PagingTest {
237241
void duplicatedItemsCheck() throws Exception {
238242
YoutubeTestsUtils.ensureStateless();
239243
NewPipe.init(DownloaderFactory.getDownloader(RESOURCE_PATH + "paging"));
240-
final SearchExtractor extractor = YouTube.getSearchExtractor("cirque du soleil", singletonList(VIDEOS), "");
244+
245+
final FilterItem item = DefaultSearchExtractorTest.getFilterItem(
246+
YouTube, YoutubeFilters.ID_CF_MAIN_VIDEOS);
247+
final SearchExtractor extractor = YouTube.getSearchExtractor("cirque du soleil", singletonList(item), null);
241248
extractor.fetchPage();
242249

243250
final ListExtractor.InfoItemsPage<InfoItem> page1 = extractor.getInitialPage();
@@ -255,7 +262,8 @@ public static class MetaInfoTest extends DefaultSearchExtractorTest {
255262
public static void setUp() throws Exception {
256263
YoutubeTestsUtils.ensureStateless();
257264
NewPipe.init(DownloaderFactory.getDownloader(RESOURCE_PATH + "metaInfo"));
258-
extractor = YouTube.getSearchExtractor(QUERY, singletonList(VIDEOS), "");
265+
final FilterItem item = getFilterItem(YouTube, YoutubeFilters.ID_CF_MAIN_VIDEOS);
266+
extractor = YouTube.getSearchExtractor(QUERY, singletonList(item), null);
259267
extractor.fetchPage();
260268
}
261269

@@ -290,7 +298,9 @@ public static class ChannelVerified extends DefaultSearchExtractorTest {
290298
public static void setUp() throws Exception {
291299
YoutubeTestsUtils.ensureStateless();
292300
NewPipe.init(DownloaderFactory.getDownloader(RESOURCE_PATH + "verified"));
293-
extractor = YouTube.getSearchExtractor(QUERY, singletonList(CHANNELS), "");
301+
302+
final FilterItem item = getFilterItem(YouTube, YoutubeFilters.ID_CF_MAIN_CHANNELS);
303+
extractor = YouTube.getSearchExtractor(QUERY, singletonList(item), null);
294304
extractor.fetchPage();
295305
}
296306

@@ -327,7 +337,8 @@ public static class VideoUploaderAvatar extends DefaultSearchExtractorTest {
327337
public static void setUp() throws Exception {
328338
YoutubeTestsUtils.ensureStateless();
329339
NewPipe.init(DownloaderFactory.getDownloader(RESOURCE_PATH + "video_uploader_avatar"));
330-
extractor = YouTube.getSearchExtractor(QUERY, singletonList(VIDEOS), "");
340+
final FilterItem item = getFilterItem(YouTube, YoutubeFilters.ID_CF_MAIN_VIDEOS);
341+
extractor = YouTube.getSearchExtractor(QUERY, singletonList(item), null);
331342
extractor.fetchPage();
332343
}
333344

@@ -361,7 +372,8 @@ public static class VideoDescription extends DefaultSearchExtractorTest {
361372
public static void setUp() throws Exception {
362373
YoutubeTestsUtils.ensureStateless();
363374
NewPipe.init(DownloaderFactory.getDownloader(RESOURCE_PATH + "video_description"));
364-
extractor = YouTube.getSearchExtractor(QUERY, singletonList(VIDEOS), "");
375+
final FilterItem item = getFilterItem(YouTube, YoutubeFilters.ID_CF_MAIN_VIDEOS);
376+
extractor = YouTube.getSearchExtractor(QUERY, singletonList(item), null);
365377
extractor.fetchPage();
366378
}
367379

0 commit comments

Comments
 (0)