mirror/Anki-Android
0
0
Fork 0
mirror of https://github.com/ankidroid/Anki-Android.git synced 2024-09-20 03:52:15 +02:00
Code

Fix unit test path issues on windows

Browse Source
This commit is contained in:
Mike Hardy 2019-11-03 19:43:16 -05:00
parent 4b7c26880a
commit 8e95e6885c
2 changed files with 11 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
AnkiDroid/src/test/java/com/ichi2/compat/CompatCopyFileTest.java
View File

@ -30,6 +30,7 @@ import java.io.FileOutputStream;
import java.io.IOException; import java.io.IOException;
import java.io.InputStream; import java.io.InputStream;
import java.net.URL; import java.net.URL;
import java.nio.file.Paths;
import java.util.Objects; import java.util.Objects;
import androidx.test.ext.junit.runners.AndroidJUnit4; import androidx.test.ext.junit.runners.AndroidJUnit4;
@ -40,29 +41,31 @@ public class CompatCopyFileTest {
@Test @Test
public void testCopyFileToStream() throws Exception { public void testCopyFileToStream() throws Exception {
URL resource = Objects.requireNonNull(getClass().getClassLoader()).getResource("path-traversal.zip"); String resourcePath = Paths.get(Objects.requireNonNull(getClass().getClassLoader()).getResource("path-traversal.zip").toURI()).toString();
File copy = File.createTempFile("testCopyFileToStream", ".zip"); File copy = File.createTempFile("testCopyFileToStream", ".zip");
copy.deleteOnExit(); copy.deleteOnExit();
FileOutputStream outputStream = new FileOutputStream(copy.getCanonicalPath()); FileOutputStream outputStream = new FileOutputStream(copy.getCanonicalPath());
CompatHelper.getCompat().copyFile(resource.getPath(), outputStream); CompatHelper.getCompat().copyFile(resourcePath, outputStream);
outputStream.close(); outputStream.close();
Assert.assertEquals(TestUtils.getMD5(resource.getPath()), TestUtils.getMD5(copy.getCanonicalPath())); Assert.assertEquals(TestUtils.getMD5(resourcePath), TestUtils.getMD5(copy.getCanonicalPath()));
} }
@Test @Test
public void testCopyStreamToFile() throws Exception { public void testCopyStreamToFile() throws Exception {
URL resource = Objects.requireNonNull(getClass().getClassLoader()).getResource("path-traversal.zip"); URL resource = Objects.requireNonNull(getClass().getClassLoader()).getResource("path-traversal.zip");
String resourcePath = Paths.get(Objects.requireNonNull(getClass().getClassLoader()).getResource("path-traversal.zip").toURI()).toString();
File copy = File.createTempFile("testCopyStreamToFile", ".zip"); File copy = File.createTempFile("testCopyStreamToFile", ".zip");
copy.deleteOnExit(); copy.deleteOnExit();
CompatHelper.getCompat().copyFile(resource.openStream(), copy.getCanonicalPath()); CompatHelper.getCompat().copyFile(resource.openStream(), copy.getCanonicalPath());
Assert.assertEquals(TestUtils.getMD5(resource.getPath()), TestUtils.getMD5(copy.getCanonicalPath())); Assert.assertEquals(TestUtils.getMD5(resourcePath), TestUtils.getMD5(copy.getCanonicalPath()));
} }
@Test @Test
public void testCopyErrors() throws Exception { public void testCopyErrors() throws Exception {
URL resource = Objects.requireNonNull(getClass().getClassLoader()).getResource("path-traversal.zip"); URL resource = Objects.requireNonNull(getClass().getClassLoader()).getResource("path-traversal.zip");
String resourcePath = Paths.get(Objects.requireNonNull(getClass().getClassLoader()).getResource("path-traversal.zip").toURI()).toString();
File copy = File.createTempFile("testCopyStreamToFile", ".zip"); File copy = File.createTempFile("testCopyStreamToFile", ".zip");
copy.deleteOnExit(); copy.deleteOnExit();
@ -78,7 +81,7 @@ public class CompatCopyFileTest {
try { try {
FileOutputStream outputStream = new FileOutputStream(copy.getCanonicalPath()); FileOutputStream outputStream = new FileOutputStream(copy.getCanonicalPath());
outputStream.close(); outputStream.close();
CompatHelper.getCompat().copyFile(resource.getPath(), outputStream); CompatHelper.getCompat().copyFile(resourcePath, outputStream);
Assert.fail("Should have caught an exception"); Assert.fail("Should have caught an exception");
} catch (IOException e) { } catch (IOException e) {
// this is expected // this is expected

4
AnkiDroid/src/test/java/com/ichi2/libanki/UtilsTest.java
View File

@ -24,6 +24,7 @@ import org.junit.Test;
import java.io.File; import java.io.File;
import java.io.IOException; import java.io.IOException;
import java.net.URL; import java.net.URL;
import java.nio.file.Paths;
import java.util.Enumeration; import java.util.Enumeration;
import java.util.Objects; import java.util.Objects;
import java.util.zip.ZipEntry; import java.util.zip.ZipEntry;
@ -76,10 +77,11 @@ public class UtilsTest {
@Test @Test
public void testCopyFile() throws Exception { public void testCopyFile() throws Exception {
String resourcePath = Paths.get(Objects.requireNonNull(getClass().getClassLoader()).getResource("path-traversal.zip").toURI()).toString();
URL resource = Objects.requireNonNull(getClass().getClassLoader()).getResource("path-traversal.zip"); URL resource = Objects.requireNonNull(getClass().getClassLoader()).getResource("path-traversal.zip");
File copy = File.createTempFile("testCopyFileToStream", ".zip"); File copy = File.createTempFile("testCopyFileToStream", ".zip");
copy.deleteOnExit(); copy.deleteOnExit();
Utils.copyFile(new File(resource.getFile()), copy); Utils.copyFile(new File(resource.getFile()), copy);
Assert.assertEquals(TestUtils.getMD5(resource.getPath()), TestUtils.getMD5(copy.getCanonicalPath())); Assert.assertEquals(TestUtils.getMD5(resourcePath), TestUtils.getMD5(copy.getCanonicalPath()));
} }
} }