mirror
/
NewPipeExtractor
kopia lustrzana https://github.com/TeamNewPipe/NewPipeExtractor
1
0
Forkuj 0
Kod Zgłoszenia Packages Projekty Wydania Wiki Aktywność

Use Files methods in tests.

pull/1065/head
Isira Seneviratne 2023-05-21 06:07:13 +05:30 zatwierdzone przez litetex
rodzic 6bf0110e38
commit 4f16112d6d
Nie znaleziono w bazie danych klucza dla tego podpisu
ID klucza GPG: 525B43E6039B3689
2 zmienionych plików z 22 dodań i 41 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

28
extractor/src/test/java/org/schabi/newpipe/downloader/MockDownloader.java
Wyświetl plik

@ -6,12 +6,9 @@ import org.schabi.newpipe.extractor.downloader.Downloader;
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.io.UncheckedIOException;
import java.nio.charset.StandardCharsets;
import java.nio.file.Files;
import java.nio.file.Paths;
import java.util.HashMap;
import java.util.Map;
@ -30,19 +27,14 @@ class MockDownloader extends Downloader {
public MockDownloader(@Nonnull final String path) {
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 TestRequestResponse response;
try(final InputStreamReader reader = new InputStreamReader(
new FileInputStream(file), StandardCharsets.UTF_8)) {
response = new GsonBuilder()
.create()
.fromJson(reader, TestRequestResponse.class);
} catch (IOException e) {
throw new UncheckedIOException(e);
}
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);
mocks.put(response.getRequest(), response.getResponse());
}
}

35
extractor/src/test/java/org/schabi/newpipe/downloader/RecordingDownloader.java
Wyświetl plik

@ -7,14 +7,9 @@ import org.schabi.newpipe.extractor.downloader.Request;
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.io.UncheckedIOException;
import java.nio.charset.StandardCharsets;
import java.nio.file.Files;
import java.nio.file.Path;
import java.nio.file.Paths;
import javax.annotation.Nonnull;
@ -54,12 +49,13 @@ class RecordingDownloader extends Downloader {
*/
public RecordingDownloader(final String stringPath) {
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 {
@ -84,20 +80,13 @@ class RecordingDownloader extends Downloader {
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();
try (final OutputStreamWriter writer = new OutputStreamWriter(
new FileOutputStream(outputFile), StandardCharsets.UTF_8)) {
try (final var writer = Files.newBufferedWriter(outputPath)) {
new GsonBuilder()
.setPrettyPrinting()
.create()
.toJson(new TestRequestResponse(request, response), writer);
writer.flush();
.setPrettyPrinting()
.create()
.toJson(new TestRequestResponse(request, response), writer);
}
return response;