Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Use Files methods in tests. #1065

Open
wants to merge 1 commit into
base: dev
Choose a base branch
from
+22 −34
Open

Use Files methods in tests. #1065

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 8 additions & 12 deletions extractor/src/test/java/org/schabi/newpipe/downloader/MockDownloader.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,11 +6,9 @@
import org.schabi.newpipe.extractor.downloader.Request;
import org.schabi.newpipe.extractor.downloader.Response;

import java.io.File;
import java.io.FileInputStream;
import java.io.InputStreamReader;
import java.io.IOException;
import java.nio.charset.StandardCharsets;
import java.nio.file.Files;
import java.nio.file.Paths;
import java.util.HashMap;
import java.util.Map;

Expand All @@ -29,16 +27,14 @@ class MockDownloader extends Downloader {
public MockDownloader(@Nonnull final String path) throws IOException {
this.path = path;
this.mocks = new HashMap<>();
final File[] files = new File(path).listFiles();
if (files != null) {
for (final File file : files) {
if (file.getName().startsWith(RecordingDownloader.FILE_NAME_PREFIX)) {
final InputStreamReader reader = new InputStreamReader(new FileInputStream(
file), StandardCharsets.UTF_8);
final TestRequestResponse response = new GsonBuilder()
try (final var directoryStream = Files.newDirectoryStream(Paths.get(path),
entry -> entry.getFileName().toString()
.startsWith(RecordingDownloader.FILE_NAME_PREFIX))) {
for (final var entry : directoryStream) {
try (final var reader = Files.newBufferedReader(entry)) {
final var response = new GsonBuilder()
.create()
.fromJson(reader, TestRequestResponse.class);
reader.close();
mocks.put(response.getRequest(), response.getResponse());
}
}
Expand Down
36 changes: 14 additions & 22 deletions extractor/src/test/java/org/schabi/newpipe/downloader/RecordingDownloader.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,13 +7,8 @@
import org.schabi.newpipe.extractor.downloader.Response;
import org.schabi.newpipe.extractor.exceptions.ReCaptchaException;

import java.io.File;
import java.io.FileOutputStream;
import java.io.IOException;
import java.io.OutputStreamWriter;
import java.nio.charset.StandardCharsets;
import java.nio.file.Files;
import java.nio.file.Path;
import java.nio.file.Paths;

import javax.annotation.Nonnull;
Expand Down Expand Up @@ -53,12 +48,13 @@ class RecordingDownloader extends Downloader {
*/
public RecordingDownloader(final String stringPath) throws IOException {
this.path = stringPath;
final Path path = Paths.get(stringPath);
final File folder = path.toFile();
if (folder.exists()) {
for (final File file : folder.listFiles()) {
if (file.getName().startsWith(RecordingDownloader.FILE_NAME_PREFIX)) {
file.delete();
final var path = Paths.get(stringPath);
if (Files.exists(path)) {
try (final var directoryStream = Files.newDirectoryStream(path,
entry -> entry.getFileName().toString()
.startsWith(RecordingDownloader.FILE_NAME_PREFIX))) {
for (final var entry : directoryStream) {
Files.delete(entry);
}
}
} else {
Expand All @@ -80,18 +76,14 @@ public Response execute(@Nonnull final Request request) throws IOException,
response.latestUrl()
);

final File outputFile = new File(path + File.separator + FILE_NAME_PREFIX + index
+ ".json");
final var outputPath = Paths.get(path).resolve(FILE_NAME_PREFIX + index + ".json");
index++;
outputFile.createNewFile();
final OutputStreamWriter writer = new OutputStreamWriter(new FileOutputStream(outputFile),
StandardCharsets.UTF_8);
new GsonBuilder()
.setPrettyPrinting()
.create()
.toJson(new TestRequestResponse(request, response), writer);
writer.flush();
writer.close();
try (final var writer = Files.newBufferedWriter(outputPath)) {
new GsonBuilder()
.setPrettyPrinting()
.create()
.toJson(new TestRequestResponse(request, response), writer);
}

return response;
}
Expand Down
Loading