Skip to content

Commit 4a7a7bb

Browse files
evermind-zzevermind-zz
committed
searchfilters: Test: adjust and extend YouTube tests
1 parent 05a6abe commit 4a7a7bb

File tree

4 files changed

+375
-58
lines changed

4 files changed

+375
-58
lines changed

‎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;
@@ -24,8 +21,10 @@
2421
import org.schabi.newpipe.extractor.channel.ChannelInfoItem;
2522
import org.schabi.newpipe.extractor.exceptions.ExtractionException;
2623
import org.schabi.newpipe.extractor.search.SearchExtractor;
24+
import org.schabi.newpipe.extractor.search.filter.FilterItem;
2725
import org.schabi.newpipe.extractor.services.DefaultSearchExtractorTest;
2826
import org.schabi.newpipe.extractor.services.youtube.YoutubeTestsUtils;
27+
import org.schabi.newpipe.extractor.services.youtube.search.filter.YoutubeFilters;
2928
import org.schabi.newpipe.extractor.stream.Description;
3029
import org.schabi.newpipe.extractor.stream.StreamInfoItem;
3130

@@ -72,7 +71,8 @@ public static class Channel extends DefaultSearchExtractorTest {
7271
public static void setUp() throws Exception {
7372
YoutubeTestsUtils.ensureStateless();
7473
NewPipe.init(DownloaderFactory.getDownloader(RESOURCE_PATH + "channel"));
75-
extractor = YouTube.getSearchExtractor(QUERY, singletonList(CHANNELS), "");
74+
final FilterItem item = getFilterItem(YouTube, YoutubeFilters.ID_CF_MAIN_CHANNELS);
75+
extractor = YouTube.getSearchExtractor(QUERY, singletonList(item), null);
7676
extractor.fetchPage();
7777
}
7878

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

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

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

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

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

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

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

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

@@ -359,7 +370,8 @@ public static class VideoDescription extends DefaultSearchExtractorTest {
359370
public static void setUp() throws Exception {
360371
YoutubeTestsUtils.ensureStateless();
361372
NewPipe.init(DownloaderFactory.getDownloader(RESOURCE_PATH + "video_description"));
362-
extractor = YouTube.getSearchExtractor(QUERY, singletonList(VIDEOS), "");
373+
final FilterItem item = getFilterItem(YouTube, YoutubeFilters.ID_CF_MAIN_VIDEOS);
374+
extractor = YouTube.getSearchExtractor(QUERY, singletonList(item), null);
363375
extractor.fetchPage();
364376
}
365377

0 commit comments

Comments
 (0)