From 25e30b745a73eb5f90ccb1d84a05568aa8f5830c Mon Sep 17 00:00:00 2001
From: AudricV <74829229+AudricV@users.noreply.github.com>
Date: Mon, 28 Jul 2025 21:45:19 +0200
Subject: [PATCH] [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.
---
 .../services/youtube/YoutubeService.java      |   2 +-
 .../youtube/YoutubeKioskExtractorTest.java    | 107 +++++++++---------
 .../services/youtube/YoutubeServiceTest.java  |   2 +-
 3 files changed, 56 insertions(+), 55 deletions(-)

diff --git a/extractor/src/main/java/org/schabi/newpipe/extractor/services/youtube/YoutubeService.java b/extractor/src/main/java/org/schabi/newpipe/extractor/services/youtube/YoutubeService.java
index 08d8c5a0f..128fbfdb9 100644
--- a/extractor/src/main/java/org/schabi/newpipe/extractor/services/youtube/YoutubeService.java
+++ b/extractor/src/main/java/org/schabi/newpipe/extractor/services/youtube/YoutubeService.java
@@ -228,7 +228,7 @@ public class YoutubeService extends StreamingService {
                     trendingLHF,
                     YoutubeTrendingExtractor.KIOSK_ID
             );
-            list.setDefaultKiosk(YoutubeTrendingExtractor.KIOSK_ID);
+            list.setDefaultKiosk(YoutubeLiveLinkHandlerFactory.KIOSK_ID);
         } catch (final Exception e) {
             throw new ExtractionException(e);
         }
diff --git a/extractor/src/test/java/org/schabi/newpipe/extractor/services/youtube/YoutubeKioskExtractorTest.java b/extractor/src/test/java/org/schabi/newpipe/extractor/services/youtube/YoutubeKioskExtractorTest.java
index df63a62c2..450fe427a 100644
--- a/extractor/src/test/java/org/schabi/newpipe/extractor/services/youtube/YoutubeKioskExtractorTest.java
+++ b/extractor/src/test/java/org/schabi/newpipe/extractor/services/youtube/YoutubeKioskExtractorTest.java
@@ -19,63 +19,11 @@ import org.schabi.newpipe.extractor.services.youtube.extractors.kiosk.YoutubeTre
 
 public class YoutubeKioskExtractorTest {
 
-    public static class Trending extends DefaultSimpleExtractorTest<YoutubeTrendingExtractor>
-        implements BaseListExtractorTest, InitYoutubeTest {
-
-        @Override
-        protected YoutubeTrendingExtractor createExtractor() throws Exception {
-            return (YoutubeTrendingExtractor) YouTube.getKioskList().getDefaultKioskExtractor();
-        }
-
-        @Override
-        @Test
-        public void testServiceId() {
-            assertEquals(YouTube.getServiceId(), extractor().getServiceId());
-        }
-
-        @Override
-        @Test
-        public void testName() throws Exception {
-            assertEquals("Trending", extractor().getName());
-        }
-
-        @Override
-        @Test
-        public void testId() throws Exception {
-            assertEquals("Trending", extractor().getId());
-        }
-
-        @Override
-        @Test
-        public void testUrl() throws ParsingException {
-            assertEquals("https://www.youtube.com/feed/trending", extractor().getUrl());
-        }
-
-        @Override
-        @Test
-        public void testOriginalUrl() throws ParsingException {
-            assertEquals("https://www.youtube.com/feed/trending", extractor().getOriginalUrl());
-        }
-
-        @Override
-        @Test
-        public void testRelatedItems() throws Exception {
-            defaultTestRelatedItems(extractor());
-        }
-
-        @Override
-        @Test
-        public void testMoreRelatedItems() throws Exception {
-            assertNoMoreItems(extractor());
-        }
-    }
-
     public static class Live extends DefaultSimpleExtractorTest<YoutubeLiveExtractor>
             implements BaseListExtractorTest, InitYoutubeTest {
         @Override
         protected YoutubeLiveExtractor createExtractor() throws Exception {
-            return (YoutubeLiveExtractor) YouTube.getKioskList().getExtractorById(
-                    "live", null);
+            return (YoutubeLiveExtractor) YouTube.getKioskList().getDefaultKioskExtractor();
         }
 
         @Override
@@ -345,4 +293,57 @@ public class YoutubeKioskExtractorTest {
             assertNoMoreItems(extractor());
         }
     }
+
+    // Deprecated (i.e. removed from the interface of YouTube) since July 21, 2025
+    public static class Trending extends DefaultSimpleExtractorTest<YoutubeTrendingExtractor>
+            implements BaseListExtractorTest, InitYoutubeTest {
+
+        @Override
+        protected YoutubeTrendingExtractor createExtractor() throws Exception {
+            return (YoutubeTrendingExtractor) YouTube.getKioskList().getExtractorById(
+                    "Trending", null);
+        }
+
+        @Override
+        @Test
+        public void testServiceId() {
+            assertEquals(YouTube.getServiceId(), extractor().getServiceId());
+        }
+
+        @Override
+        @Test
+        public void testName() throws Exception {
+            assertEquals("Trending", extractor().getName());
+        }
+
+        @Override
+        @Test
+        public void testId() throws Exception {
+            assertEquals("Trending", extractor().getId());
+        }
+
+        @Override
+        @Test
+        public void testUrl() throws ParsingException {
+            assertEquals("https://www.youtube.com/feed/trending", extractor().getUrl());
+        }
+
+        @Override
+        @Test
+        public void testOriginalUrl() throws ParsingException {
+            assertEquals("https://www.youtube.com/feed/trending", extractor().getOriginalUrl());
+        }
+
+        @Override
+        @Test
+        public void testRelatedItems() throws Exception {
+            defaultTestRelatedItems(extractor());
+        }
+
+        @Override
+        @Test
+        public void testMoreRelatedItems() throws Exception {
+            assertNoMoreItems(extractor());
+        }
+    }
 }
diff --git a/extractor/src/test/java/org/schabi/newpipe/extractor/services/youtube/YoutubeServiceTest.java b/extractor/src/test/java/org/schabi/newpipe/extractor/services/youtube/YoutubeServiceTest.java
index 000222810..2aad45037 100644
--- a/extractor/src/test/java/org/schabi/newpipe/extractor/services/youtube/YoutubeServiceTest.java
+++ b/extractor/src/test/java/org/schabi/newpipe/extractor/services/youtube/YoutubeServiceTest.java
@@ -69,7 +69,7 @@ public class YoutubeServiceTest {
 
     @Test
     void testGetDefaultKiosk() throws Exception {
-        assertEquals("Trending", kioskList.getDefaultKioskExtractor(null).getId());
+        assertEquals("live", kioskList.getDefaultKioskExtractor(null).getId());
     }