From f8320287efbbb9c42088e7c9e400fef558ff1cfa Mon Sep 17 00:00:00 2001 From: ibaker Date: Mon, 21 Jun 2021 10:23:06 +0100 Subject: [PATCH] Simplify FileDataSourceContractTest #minor-release PiperOrigin-RevId: 380531272 --- .../upstream/FileDataSourceContractTest.java | 21 ++++++------------- 1 file changed, 6 insertions(+), 15 deletions(-) diff --git a/library/core/src/test/java/com/google/android/exoplayer2/upstream/FileDataSourceContractTest.java b/library/core/src/test/java/com/google/android/exoplayer2/upstream/FileDataSourceContractTest.java index 671235738c..940f4251a2 100644 --- a/library/core/src/test/java/com/google/android/exoplayer2/upstream/FileDataSourceContractTest.java +++ b/library/core/src/test/java/com/google/android/exoplayer2/upstream/FileDataSourceContractTest.java @@ -21,7 +21,6 @@ import com.google.android.exoplayer2.testutil.DataSourceContractTest; import com.google.android.exoplayer2.testutil.TestUtil; import com.google.common.collect.ImmutableList; import java.io.File; -import java.io.IOException; import java.nio.file.Files; import java.nio.file.Paths; import org.junit.Before; @@ -37,21 +36,19 @@ public class FileDataSourceContractTest extends DataSourceContractTest { @Rule public final TemporaryFolder tempFolder = new TemporaryFolder(); - private Uri simpleUri; + private Uri uri; @Before - public void writeFiles() throws Exception { - simpleUri = writeFile(DATA); + public void writeFile() throws Exception { + File file = tempFolder.newFile(); + Files.write(Paths.get(file.getAbsolutePath()), DATA); + uri = Uri.fromFile(file); } @Override protected ImmutableList getTestResources() { return ImmutableList.of( - new TestResource.Builder() - .setName("simple") - .setUri(simpleUri) - .setExpectedBytes(DATA) - .build()); + new TestResource.Builder().setName("simple").setUri(uri).setExpectedBytes(DATA).build()); } @Override @@ -63,10 +60,4 @@ public class FileDataSourceContractTest extends DataSourceContractTest { protected DataSource createDataSource() { return new FileDataSource(); } - - private Uri writeFile(byte[] data) throws IOException { - File file = tempFolder.newFile(); - Files.write(Paths.get(file.getAbsolutePath()), data); - return Uri.fromFile(file); - } }