Merge pull request eugenp#5676 from rozagerardo/geroza/BAEL-10301_fix-unit-tests-in-core-java-module

lor6 · web-flow · commit b5907e06e7de · 2018-11-13T23:50:25.000+02:00
[BAEL-10301] core-java | fix unit tests
diff --git a/core-java/src/test/java/com/baeldung/abstractclasses/LowercaseFileReaderUnitTest.java b/core-java/src/test/java/com/baeldung/abstractclasses/LowercaseFileReaderUnitTest.java
@@ -2,17 +2,22 @@
 
 import com.baeldung.abstractclasses.filereaders.BaseFileReader;
 import com.baeldung.abstractclasses.filereaders.LowercaseFileReader;
+
+import java.net.URL;
+import java.nio.file.Paths;
 import java.util.List;
 import static org.assertj.core.api.Assertions.assertThat;
 import org.junit.Test;
 
 public class LowercaseFileReaderUnitTest {
-    
+
     @Test
     public void givenLowercaseFileReaderInstance_whenCalledreadFile_thenCorrect() throws Exception {
-        String filePath = getClass().getClassLoader().getResource("files/test.txt").getPath().substring(1);
+        // We'll transform the resource URL path to URI to load the file correctly in Windows
+        URL url = getClass().getClassLoader().getResource("files/test.txt");
+        String filePath = Paths.get(url.toURI()).toString();
         BaseFileReader lowercaseFileReader = new LowercaseFileReader(filePath);
-        
+
         assertThat(lowercaseFileReader.readFile()).isInstanceOf(List.class);
     }
 }
diff --git a/core-java/src/test/java/com/baeldung/abstractclasses/StandardFileReaderUnitTest.java b/core-java/src/test/java/com/baeldung/abstractclasses/StandardFileReaderUnitTest.java
@@ -1,16 +1,23 @@
 package com.baeldung.abstractclasses;
 
-import com.baeldung.abstractclasses.filereaders.BaseFileReader;
-import com.baeldung.abstractclasses.filereaders.StandardFileReader;
-import java.util.List;
 import static org.assertj.core.api.Assertions.assertThat;
+
+import java.net.URL;
+import java.nio.file.Paths;
+import java.util.List;
+
 import org.junit.Test;
 
+import com.baeldung.abstractclasses.filereaders.BaseFileReader;
+import com.baeldung.abstractclasses.filereaders.StandardFileReader;
+
 public class StandardFileReaderUnitTest {
 
     @Test
     public void givenStandardFileReaderInstance_whenCalledreadFile_thenCorrect() throws Exception {
-        String filePath = getClass().getClassLoader().getResource("files/test.txt").getPath().substring(1);
+        // We'll transform the resource URL path to URI to load the file correctly in Windows 
+        URL url = getClass().getClassLoader().getResource("files/test.txt");
+        String filePath = Paths.get(url.toURI()).toString();
         BaseFileReader standardFileReader = new StandardFileReader(filePath);
         
         assertThat(standardFileReader.readFile()).isInstanceOf(List.class);
diff --git a/core-java/src/test/java/com/baeldung/abstractclasses/UppercaseFileReaderUnitTest.java b/core-java/src/test/java/com/baeldung/abstractclasses/UppercaseFileReaderUnitTest.java
@@ -2,6 +2,9 @@
 
 import com.baeldung.abstractclasses.filereaders.BaseFileReader;
 import com.baeldung.abstractclasses.filereaders.UppercaseFileReader;
+
+import java.net.URL;
+import java.nio.file.Paths;
 import java.util.List;
 import static org.assertj.core.api.Assertions.assertThat;
 import org.junit.Test;
@@ -10,7 +13,9 @@ public class UppercaseFileReaderUnitTest {
 
     @Test
     public void givenUppercaseFileReaderInstance_whenCalledreadFile_thenCorrect() throws Exception {
-        String filePath = getClass().getClassLoader().getResource("files/test.txt").getPath().substring(1);
+        // We'll transform the resource URL path to URI to load the file correctly in Windows 
+        URL url = getClass().getClassLoader().getResource("files/test.txt");
+        String filePath = Paths.get(url.toURI()).toString();
         BaseFileReader uppercaseFileReader = new UppercaseFileReader(filePath);
         
         assertThat(uppercaseFileReader.readFile()).isInstanceOf(List.class);
diff --git a/core-java/src/test/java/com/baeldung/simpledateformat/SimpleDateFormatUnitTest.java b/core-java/src/test/java/com/baeldung/simpledateformat/SimpleDateFormatUnitTest.java
@@ -25,7 +25,7 @@ public void givenSpecificDate_whenFormatted_thenCheckFormatCorrect() throws Exce
 
   @Test
   public void givenSpecificDate_whenFormattedUsingDateFormat_thenCheckFormatCorrect() throws Exception {
-    DateFormat formatter = DateFormat.getDateInstance(DateFormat.SHORT);
+    DateFormat formatter = DateFormat.getDateInstance(DateFormat.SHORT, Locale.US);
     assertEquals("5/24/77", formatter.format(new Date(233345223232L)));
   }
 

Original file line number	Diff line number	Diff line change
`@@ -25,7 +25,7 @@ public void givenSpecificDate_whenFormatted_thenCheckFormatCorrect() throws Exce`
`25`	`25`
`26`	`26`	`@Test`
`27`	`27`	`public void givenSpecificDate_whenFormattedUsingDateFormat_thenCheckFormatCorrect() throws Exception {`
`28`		`- DateFormat formatter = DateFormat.getDateInstance(DateFormat.SHORT);`
	`28`	`+ DateFormat formatter = DateFormat.getDateInstance(DateFormat.SHORT, Locale.US);`
`29`	`29`	`assertEquals("5/24/77", formatter.format(new Date(233345223232L)));`
`30`	`30`	`}`
`31`	`31`