From 1ea6c6ce543ae129423397f1e646abe2fee2a64d Mon Sep 17 00:00:00 2001
From: XiangRongLin <41164160+XiangRongLin@users.noreply.github.com>
Date: Sun, 10 Jan 2021 20:46:42 +0100
Subject: [PATCH] Prefix mock file from RecordingDownloader with
 "generated_mock_"

Only read those files in MockDownloader
---
 .../schabi/newpipe/downloader/MockDownloader.java  | 14 ++++++++------
 .../newpipe/downloader/RecordingDownloader.java    |  4 +++-
 .../newpipe/downloader/TestRequestResponse.java    |  6 ------
 3 files changed, 11 insertions(+), 13 deletions(-)

diff --git a/extractor/src/test/java/org/schabi/newpipe/downloader/MockDownloader.java b/extractor/src/test/java/org/schabi/newpipe/downloader/MockDownloader.java
index 1dfa78471..20395b3ce 100644
--- a/extractor/src/test/java/org/schabi/newpipe/downloader/MockDownloader.java
+++ b/extractor/src/test/java/org/schabi/newpipe/downloader/MockDownloader.java
@@ -24,12 +24,14 @@ class MockDownloader extends Downloader {
         this.mocks = new HashMap<>();
         File folder = new File(path);
         for (File file : folder.listFiles()) {
-            final FileReader reader = new FileReader(file);
-            final TestRequestResponse response = new GsonBuilder()
-                    .create()
-                    .fromJson(reader, TestRequestResponse.class);
-            reader.close();
-            mocks.put(response.getRequest(), response.getResponse());
+            if (file.getName().startsWith(RecordingDownloader.FILE_NAME_PREFIX)) {
+                final FileReader reader = new FileReader(file);
+                final TestRequestResponse response = new GsonBuilder()
+                        .create()
+                        .fromJson(reader, TestRequestResponse.class);
+                reader.close();
+                mocks.put(response.getRequest(), response.getResponse());
+            }
         }
     }
 
diff --git a/extractor/src/test/java/org/schabi/newpipe/downloader/RecordingDownloader.java b/extractor/src/test/java/org/schabi/newpipe/downloader/RecordingDownloader.java
index b836b8452..9988db8b6 100644
--- a/extractor/src/test/java/org/schabi/newpipe/downloader/RecordingDownloader.java
+++ b/extractor/src/test/java/org/schabi/newpipe/downloader/RecordingDownloader.java
@@ -19,6 +19,8 @@ import javax.annotation.Nonnull;
 
 class RecordingDownloader extends Downloader {
 
+    public final static String FILE_NAME_PREFIX = "generated_mock_";
+
     private int index = 0;
     private final String path;
 
@@ -37,7 +39,7 @@ class RecordingDownloader extends Downloader {
         Downloader downloader = DownloaderTestImpl.getInstance();
         Response response = downloader.execute(request);
 
-        File outputFile = new File(path + File.separator + index + ".json");
+        File outputFile = new File(path + File.separator + FILE_NAME_PREFIX + index + ".json");
         index++;
         outputFile.createNewFile();
         FileWriter writer = new FileWriter(outputFile);
diff --git a/extractor/src/test/java/org/schabi/newpipe/downloader/TestRequestResponse.java b/extractor/src/test/java/org/schabi/newpipe/downloader/TestRequestResponse.java
index 81f8843d8..d8fbde646 100644
--- a/extractor/src/test/java/org/schabi/newpipe/downloader/TestRequestResponse.java
+++ b/extractor/src/test/java/org/schabi/newpipe/downloader/TestRequestResponse.java
@@ -4,20 +4,14 @@ import org.schabi.newpipe.extractor.downloader.Request;
 import org.schabi.newpipe.extractor.downloader.Response;
 
 final class TestRequestResponse {
-    private final String comment;
     private final Request request;
     private final Response response;
 
     public TestRequestResponse(Request request, Response response) {
-        this.comment = "Auto-generated for tests. See RecordingDownloader";
         this.request = request;
         this.response = response;
     }
 
-    public String getComment() {
-        return comment;
-    }
-
     public Request getRequest() {
         return request;
     }