Merge pull request #673 from XiangRongLin/recording_downloader

Remove IPv4 addresses from response during mock recording

Author: TobiGr

extractor/src/test/java/org/schabi/newpipe/downloader/RecordingDownloader.java

@@ -39,6 +39,10 @@ class RecordingDownloader extends Downloader {
 
     public final static String FILE_NAME_PREFIX = "generated_mock_";
 
+    // From https://stackoverflow.com/a/15875500/13516981
+    private final static String IP_V4_PATTERN =
+            "(?:(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\\.){3}(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)";
+
     private int index = 0;
     private final String path;
 
@@ -66,7 +70,15 @@ public RecordingDownloader(final String stringPath) throws IOException {
     public Response execute(@Nonnull final Request request) throws IOException,
             ReCaptchaException {
         final Downloader downloader = DownloaderTestImpl.getInstance();
-        final Response response = downloader.execute(request);
+        Response response = downloader.execute(request);
+        String cleanedResponseBody = response.responseBody().replaceAll(IP_V4_PATTERN, "127.0.0.1");
+        response = new Response(
+                response.responseCode(),
+                response.responseMessage(),
+                response.responseHeaders(),
+                cleanedResponseBody,
+                response.latestUrl()
+        );
 
         final File outputFile = new File(path + File.separator + FILE_NAME_PREFIX + index
                 + ".json");

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

@@ -124,6 +124,7 @@ public void getStreamCount() {
         }
     }
 
+    @Ignore
     public static class MixWithIndex {
 
         private static final String INDEX = "&index=13";

extractor/src/test/java/org/schabi/newpipe/extractor/services/youtube/stream/YoutubeStreamExtractorLivestreamTest.java

@@ -53,7 +53,7 @@ public void testUploaderName() throws Exception {
     @Override public String expectedUploaderName() { return "Lofi Girl"; }
     @Override public String expectedUploaderUrl() { return "https://www.youtube.com/channel/UCSJ4gkVC6NrvII8umztf0Ow"; }
     @Override public List<String> expectedDescriptionContains() {
-        return Arrays.asList("https://bit.ly/lofigirl-merch",
+        return Arrays.asList("https://bit.ly/lofigirI-merch",
                 "Thank you for listening, I hope you will have a good time here");
     }
     @Override public boolean expectedUploaderVerified() { return true; }