Skip to content

Commit 25e30b7

Browse files
committed
[YouTube] Set running lives as new default kiosk
Also move YoutubeKioskExtractorTest.Trending at the bottom of the file and add deprecation notice on test class too.
1 parent 5c7abee commit 25e30b7

3 files changed

Lines changed: 56 additions & 55 deletions

File tree

extractor/src/main/java/org/schabi/newpipe/extractor/services/youtube/YoutubeService.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -228,7 +228,7 @@ public KioskList getKioskList() throws ExtractionException {
228228
trendingLHF,
229229
YoutubeTrendingExtractor.KIOSK_ID
230230
);
231-
list.setDefaultKiosk(YoutubeTrendingExtractor.KIOSK_ID);
231+
list.setDefaultKiosk(YoutubeLiveLinkHandlerFactory.KIOSK_ID);
232232
} catch (final Exception e) {
233233
throw new ExtractionException(e);
234234
}

extractor/src/test/java/org/schabi/newpipe/extractor/services/youtube/YoutubeKioskExtractorTest.java

Lines changed: 54 additions & 53 deletions
Original file line numberDiff line numberDiff line change
@@ -19,63 +19,11 @@
1919

2020
public class YoutubeKioskExtractorTest {
2121

22-
public static class Trending extends DefaultSimpleExtractorTest<YoutubeTrendingExtractor>
23-
implements BaseListExtractorTest, InitYoutubeTest {
24-
25-
@Override
26-
protected YoutubeTrendingExtractor createExtractor() throws Exception {
27-
return (YoutubeTrendingExtractor) YouTube.getKioskList().getDefaultKioskExtractor();
28-
}
29-
30-
@Override
31-
@Test
32-
public void testServiceId() {
33-
assertEquals(YouTube.getServiceId(), extractor().getServiceId());
34-
}
35-
36-
@Override
37-
@Test
38-
public void testName() throws Exception {
39-
assertEquals("Trending", extractor().getName());
40-
}
41-
42-
@Override
43-
@Test
44-
public void testId() throws Exception {
45-
assertEquals("Trending", extractor().getId());
46-
}
47-
48-
@Override
49-
@Test
50-
public void testUrl() throws ParsingException {
51-
assertEquals("https://www.youtube.com/feed/trending", extractor().getUrl());
52-
}
53-
54-
@Override
55-
@Test
56-
public void testOriginalUrl() throws ParsingException {
57-
assertEquals("https://www.youtube.com/feed/trending", extractor().getOriginalUrl());
58-
}
59-
60-
@Override
61-
@Test
62-
public void testRelatedItems() throws Exception {
63-
defaultTestRelatedItems(extractor());
64-
}
65-
66-
@Override
67-
@Test
68-
public void testMoreRelatedItems() throws Exception {
69-
assertNoMoreItems(extractor());
70-
}
71-
}
72-
7322
public static class Live extends DefaultSimpleExtractorTest<YoutubeLiveExtractor>
7423
implements BaseListExtractorTest, InitYoutubeTest {
7524
@Override
7625
protected YoutubeLiveExtractor createExtractor() throws Exception {
77-
return (YoutubeLiveExtractor) YouTube.getKioskList().getExtractorById(
78-
"live", null);
26+
return (YoutubeLiveExtractor) YouTube.getKioskList().getDefaultKioskExtractor();
7927
}
8028

8129
@Override
@@ -345,4 +293,57 @@ public void testMoreRelatedItems() throws Exception {
345293
assertNoMoreItems(extractor());
346294
}
347295
}
296+
297+
// Deprecated (i.e. removed from the interface of YouTube) since July 21, 2025
298+
public static class Trending extends DefaultSimpleExtractorTest<YoutubeTrendingExtractor>
299+
implements BaseListExtractorTest, InitYoutubeTest {
300+
301+
@Override
302+
protected YoutubeTrendingExtractor createExtractor() throws Exception {
303+
return (YoutubeTrendingExtractor) YouTube.getKioskList().getExtractorById(
304+
"Trending", null);
305+
}
306+
307+
@Override
308+
@Test
309+
public void testServiceId() {
310+
assertEquals(YouTube.getServiceId(), extractor().getServiceId());
311+
}
312+
313+
@Override
314+
@Test
315+
public void testName() throws Exception {
316+
assertEquals("Trending", extractor().getName());
317+
}
318+
319+
@Override
320+
@Test
321+
public void testId() throws Exception {
322+
assertEquals("Trending", extractor().getId());
323+
}
324+
325+
@Override
326+
@Test
327+
public void testUrl() throws ParsingException {
328+
assertEquals("https://www.youtube.com/feed/trending", extractor().getUrl());
329+
}
330+
331+
@Override
332+
@Test
333+
public void testOriginalUrl() throws ParsingException {
334+
assertEquals("https://www.youtube.com/feed/trending", extractor().getOriginalUrl());
335+
}
336+
337+
@Override
338+
@Test
339+
public void testRelatedItems() throws Exception {
340+
defaultTestRelatedItems(extractor());
341+
}
342+
343+
@Override
344+
@Test
345+
public void testMoreRelatedItems() throws Exception {
346+
assertNoMoreItems(extractor());
347+
}
348+
}
348349
}

extractor/src/test/java/org/schabi/newpipe/extractor/services/youtube/YoutubeServiceTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ void testGetKioskAvailableKiosks() {
6969

7070
@Test
7171
void testGetDefaultKiosk() throws Exception {
72-
assertEquals("Trending", kioskList.getDefaultKioskExtractor(null).getId());
72+
assertEquals("live", kioskList.getDefaultKioskExtractor(null).getId());
7373
}
7474

7575

0 commit comments

Comments
 (0)