Use dedicated methods to fetch extractor related data

Author: litetex

extractor/src/test/java/org/schabi/newpipe/extractor/services/media_ccc/MediaCCCConferenceExtractorTest.java

@@ -19,7 +19,7 @@
 public class MediaCCCConferenceExtractorTest {
 
     abstract static class Base extends DefaultSimpleExtractorTest<ChannelExtractor> {
-        protected ChannelTabExtractor tabExtractor;
+        private ChannelTabExtractor tabExtractor;
 
         @Override
         protected void fetchExtractor(final ChannelExtractor extractor) throws Exception {
@@ -28,6 +28,13 @@ protected void fetchExtractor(final ChannelExtractor extractor) throws Exception
             tabExtractor = MediaCCC.getChannelTabExtractor(extractor.getTabs().get(0));
             tabExtractor.fetchPage();
         }
+
+        protected ChannelTabExtractor tabExtractor() {
+            if (tabExtractor == null) {
+                extractor(); // Initialize extractor to also init TabExtractor
+            }
+            return tabExtractor;
+        }
     }
 
     public static class FrOSCon2017 extends Base {
@@ -60,8 +67,7 @@ void testGetThumbnails() throws ParsingException {
 
         @Test
         void testGetInitalPage() throws Exception {
-            extractor(); // Init extractor
-            assertEquals(97, tabExtractor.getInitialPage().getItems().size());
+            assertEquals(97, tabExtractor().getInitialPage().getItems().size());
         }
     }
 
@@ -95,8 +101,7 @@ void testGetThumbnailUrl() throws ParsingException {
 
         @Test
         void testGetInitalPage() throws Exception {
-            extractor(); // Init extractor
-            assertTrue(tabExtractor.getInitialPage().getItems().size() >= 21);
+            assertTrue(tabExtractor().getInitialPage().getItems().size() >= 21);
         }
     }
 }

extractor/src/test/java/org/schabi/newpipe/extractor/services/peertube/PeertubeCommentsExtractorTest.java

@@ -6,7 +6,6 @@
 import static org.schabi.newpipe.extractor.ServiceList.PeerTube;
 import static org.schabi.newpipe.extractor.services.DefaultTests.defaultTestImageCollection;
 
-import org.junit.jupiter.api.BeforeAll;
 import org.junit.jupiter.api.Test;
 import org.schabi.newpipe.extractor.ListExtractor.InfoItemsPage;
 import org.schabi.newpipe.extractor.Page;
@@ -121,15 +120,7 @@ void testGetCommentsFromCommentsInfo() throws IOException, ExtractionException {
      * Test a video that has comments with nested replies.
      */
     public static class NestedComments extends DefaultSimpleExtractorTest<PeertubeCommentsExtractor> {
-        private InfoItemsPage<CommentsInfoItem> comments = null;
-
-        @BeforeAll
-        @Override
-        public void setUp() throws Exception {
-            super.setUp();
-
-            extractor(); // Initialize
-        }
+        private InfoItemsPage<CommentsInfoItem> comments;
 
         @Override
         protected PeertubeCommentsExtractor createExtractor() throws Exception {
@@ -142,11 +133,18 @@ protected void fetchExtractor(final PeertubeCommentsExtractor extractor) throws
             comments = extractor.getInitialPage();
         }
 
+        protected InfoItemsPage<CommentsInfoItem> comments() {
+            if (comments == null) {
+                extractor(); // Initialize extractor to also init Comments
+            }
+            return comments;
+        }
+
         @Test
         void testGetComments() throws IOException, ExtractionException {
-            assertFalse(comments.getItems().isEmpty());
+            assertFalse(comments().getItems().isEmpty());
             final Optional<CommentsInfoItem> nestedCommentHeadOpt =
-                findCommentWithId("34293", comments.getItems());
+                findCommentWithId("34293", comments().getItems());
             assertTrue(nestedCommentHeadOpt.isPresent());
             assertTrue(findNestedCommentWithId("34294", nestedCommentHeadOpt.get()), "The nested " +
                 "comment replies were not found");
@@ -160,7 +158,7 @@ void testHasCreatorReply() {
 
         private void assertCreatorReply(final String id, final boolean expected) {
             final Optional<CommentsInfoItem> comment =
-                    findCommentWithId(id, comments.getItems());
+                findCommentWithId(id, comments().getItems());
             assertTrue(comment.isPresent());
             assertEquals(expected, comment.get().hasCreatorReply());
         }