Use Paths.get() instead of Url.getfile() (#1184)

Fixes problem with failing test on Windows
JabRef · Apr 13, 2016 · 0c898bc · 0c898bc
1 parent 132a6c2
commit 0c898bc
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 9 deletions.
diff --git a/src/test/java/net/sf/jabref/importer/ImportDataTest.java b/src/test/java/net/sf/jabref/importer/ImportDataTest.java
@@ -4,26 +4,33 @@
 import org.junit.Test;
 
 import java.io.File;
+import java.nio.file.Paths;
 
 /**
  * @author Nosh&Dan
  * @version 09.11.2008 | 19:41:40
  */
 public class ImportDataTest {
 
-    public static final File FILE_IN_DATABASE = new File("src/test/resources/net/sf/jabref/importer/unlinkedFilesTestFolder/pdfInDatabase.pdf");
-    public static final File FILE_NOT_IN_DATABASE = new File("src/test/resources/net/sf/jabref/importer/unlinkedFilesTestFolder/pdfNotInDatabase.pdf");
-    public static final File EXISTING_FOLDER = new File("src/test/resources/net/sf/jabref/importer/unlinkedFilesTestFolder");
-    public static final File NOT_EXISTING_FOLDER = new File("notexistingfolder");
-    public static final File NOT_EXISTING_PDF = new File("src/test/resources/net/sf/jabref/importer/unlinkedFilesTestFolder/null.pdf");
-    public static final File UNLINKED_FILES_TEST_BIB = new File("src/test/resources/net/sf/jabref/util/unlinkedFilesTestBib.bib");
+    public static final File FILE_IN_DATABASE = Paths
+            .get("src/test/resources/net/sf/jabref/importer/unlinkedFilesTestFolder/pdfInDatabase.pdf").toFile();
+    public static final File FILE_NOT_IN_DATABASE = Paths
+            .get("src/test/resources/net/sf/jabref/importer/unlinkedFilesTestFolder/pdfNotInDatabase.pdf").toFile();
+    public static final File EXISTING_FOLDER = Paths
+            .get("src/test/resources/net/sf/jabref/importer/unlinkedFilesTestFolder").toFile();
+    public static final File NOT_EXISTING_FOLDER = Paths.get("notexistingfolder").toFile();
+    public static final File NOT_EXISTING_PDF = Paths
+            .get("src/test/resources/net/sf/jabref/importer/unlinkedFilesTestFolder/null.pdf").toFile();
+    public static final File UNLINKED_FILES_TEST_BIB = Paths
+            .get("src/test/resources/net/sf/jabref/util/unlinkedFilesTestBib.bib").toFile();
 
 
     /**
      * Tests the testing environment.
      */
     @Test
     public void testTestingEnvironment() {
+
         Assert.assertTrue(ImportDataTest.EXISTING_FOLDER.exists());
         Assert.assertTrue(ImportDataTest.EXISTING_FOLDER.isDirectory());
 

diff --git a/src/test/java/net/sf/jabref/importer/ImportFormatReaderTest.java b/src/test/java/net/sf/jabref/importer/ImportFormatReaderTest.java
@@ -3,6 +3,8 @@
 import static org.junit.Assert.*;
 
 import java.io.IOException;
+import java.net.URISyntaxException;
+import java.nio.file.Paths;
 import java.util.ArrayList;
 import java.util.Collection;
 
@@ -21,12 +23,15 @@ public class ImportFormatReaderTest {
     private final String resourceName;
     private final int count;
     public final String format;
+    private final String fileName;
 
 
-    public ImportFormatReaderTest(String resource, String format, int count) {
+    public ImportFormatReaderTest(String resource, String format, int count) throws URISyntaxException {
         this.resourceName = resource;
         this.format = format;
         this.count = count;
+        this.fileName = Paths.get(ImportFormatReaderTest.class.getResource(resourceName).toURI()).toString();
+
     }
 
     @Before
@@ -38,14 +43,12 @@ public void setUp() {
 
     @Test
     public void testImportUnknownFormat() {
-        String fileName = ImportFormatReaderTest.class.getResource(resourceName).getFile();
         ImportFormatReader.UnknownFormatImport unknownFormat = reader.importUnknownFormat(fileName);
         assertEquals(count, unknownFormat.parserResult.getDatabase().getEntryCount());
     }
 
     @Test
     public void testImportFormatFromFile() throws IOException {
-        String fileName = ImportFormatReaderTest.class.getResource(resourceName).getFile();
         OutputPrinter nullPrinter = new OutputPrinterToNull();
         assertEquals(count, reader.importFromFile(format, fileName, nullPrinter).size());
     }