Merge pull request #9 from antkorwin/feature/fix-dataset-path

Feature/fix dataset path
jupiter-tools · Dec 14, 2018 · 86d7e30 · 86d7e30
2 parents 1670ee3 + 0b1ff65
commit 86d7e30
Show file tree

Hide file tree

Showing 6 changed files with 40 additions and 16 deletions.
diff --git a/pom.xml b/pom.xml
@@ -5,7 +5,7 @@
 
     <groupId>com.antkorwin</groupId>
     <artifactId>spring-test-mongo</artifactId>
-    <version>0.7-SNAPSHOT</version>
+    <version>0.8-SNAPSHOT</version>
     <packaging>jar</packaging>
 
     <name>spring-test-mongo</name>

diff --git a/src/main/java/com/antkorwin/springtestmongo/internal/ImportFile.java b/src/main/java/com/antkorwin/springtestmongo/internal/ImportFile.java
@@ -1,13 +1,13 @@
 package com.antkorwin.springtestmongo.internal;
 
-import com.antkorwin.commonutils.exceptions.InternalException;
-import com.antkorwin.commonutils.validation.Guard;
-import org.apache.commons.io.IOUtils;
-
 import java.io.IOException;
 import java.io.InputStream;
 import java.nio.charset.StandardCharsets;
 
+import com.antkorwin.commonutils.exceptions.InternalException;
+import com.antkorwin.commonutils.validation.Guard;
+import org.apache.commons.io.IOUtils;
+
 import static com.antkorwin.springtestmongo.errorinfo.MongoDbErrorInfo.FILE_NOT_FOUND;
 import static com.antkorwin.springtestmongo.errorinfo.MongoDbErrorInfo.READ_DATASETS_FILE_ERROR;
 
@@ -29,16 +29,22 @@ public String read() {
         try (InputStream inputStream = getResourceStream()) {
             Guard.check(inputStream != null, InternalException.class, FILE_NOT_FOUND);
             return IOUtils.toString(inputStream, StandardCharsets.UTF_8);
-
-        } catch (IOException e) {
+        }
+        catch (IOException e) {
             e.printStackTrace();
             throw new InternalException(READ_DATASETS_FILE_ERROR, e);
         }
     }
 
     private InputStream getResourceStream() {
-        return ImportFile.class.getClass()
-                               .getResourceAsStream(this.fileName);
-    }
+        String dataFileName = (!fileName.startsWith("/"))
+                              ? "/" + fileName
+                              : fileName;
 
+        InputStream inputStream = getClass().getResourceAsStream(dataFileName);
+        if (inputStream == null) {
+            inputStream = getClass().getResourceAsStream("/dataset" + dataFileName);
+        }
+        return inputStream;
+    }
 }
diff --git a/src/test/java/com/antkorwin/springtestmongo/internal/ImportFileTest.java b/src/test/java/com/antkorwin/springtestmongo/internal/ImportFileTest.java
@@ -20,4 +20,24 @@ void read() {
         // Asserts
         assertThat(text).isEqualTo("secret-123");
     }
+
+    @Test
+    void readWithoutSlashInPath() {
+        // Arrange
+        Text fileText = new ImportFile("dataset/internal/test_file.txt");
+        // Act
+        String text = fileText.read();
+        // Asserts
+        assertThat(text).isEqualTo("secret-123");
+    }
+
+    @Test
+    void readWithoutDataSetInPath() {
+        // Arrange
+        Text fileText = new ImportFile("internal/test_file.txt");
+        // Act
+        String text = fileText.read();
+        // Asserts
+        assertThat(text).isEqualTo("secret-123");
+    }
 }
diff --git a/src/test/java/com/antkorwin/springtestmongo/internal/MongoDbTestIT.java b/src/test/java/com/antkorwin/springtestmongo/internal/MongoDbTestIT.java
@@ -73,7 +73,7 @@ void exportTest() throws IOException {
     }
 
     private String getExpectedResult() throws IOException {
-        try (InputStream inputStream = MongoDbTestIT.class.getResourceAsStream("/dataset/internal/json_expected.json")) {
+        try (InputStream inputStream = getClass().getResourceAsStream("/dataset/internal/json_expected.json")) {
             return IOUtils.toString(inputStream, StandardCharsets.UTF_8);
         }
     }

diff --git a/src/test/java/com/antkorwin/springtestmongo/junit4/MongoDbRuleExportDataSetIT.java b/src/test/java/com/antkorwin/springtestmongo/junit4/MongoDbRuleExportDataSetIT.java
@@ -55,8 +55,7 @@ protected void after() {
         }
 
         private String getExpectedJson() throws IOException {
-            try (InputStream inputStream = MongoDbRuleExportDataSetIT.class.getClass()
-                                                                           .getResourceAsStream(INPUT_DATA_SET_FILE)) {
+            try (InputStream inputStream = getClass().getResourceAsStream(INPUT_DATA_SET_FILE)) {
                 return IOUtils.toString(inputStream, StandardCharsets.UTF_8);
             }
         }

diff --git a/src/test/java/com/antkorwin/springtestmongo/junit5/MongoDbExtensionExportDataSetIT.java b/src/test/java/com/antkorwin/springtestmongo/junit5/MongoDbExtensionExportDataSetIT.java
@@ -59,7 +59,7 @@ static class ExportTestExtension implements Extension, AfterEachCallback, Before
 
         @Override
         public void afterEach(ExtensionContext context) throws Exception {
-            try (FileInputStream inputStream = FileUtils.openInputStream(new File(OUTPUT_FILE_NAME))){
+            try (FileInputStream inputStream = FileUtils.openInputStream(new File(OUTPUT_FILE_NAME))) {
                 assertThat(inputStream).isNotNull();
 
                 String stringDataSet = IOUtils.toString(inputStream, StandardCharsets.UTF_8);
@@ -76,8 +76,7 @@ public void beforeEach(ExtensionContext context) throws Exception {
         }
 
         private String getExpectedJson() throws IOException {
-            try (InputStream inputStream = ExportTestExtension.class.getClass()
-                                                                    .getResourceAsStream(INPUT_DATA_SET_FILE)){
+            try (InputStream inputStream = getClass().getResourceAsStream(INPUT_DATA_SET_FILE)) {
                 return IOUtils.toString(inputStream, StandardCharsets.UTF_8);
             }
         }