From 2d3ea1ba241de45e264d5bfe6cc4497dd20ad2a8 Mon Sep 17 00:00:00 2001 From: Ahmed Tawila Date: Thu, 16 Nov 2017 10:21:08 +0200 Subject: [PATCH 01/11] fix build fails --- .../java/com/baeldung/file/FileOutputStreamTest.java | 0 .../src/{main => test}/java/com/baeldung/file/FileUtilsTest.java | 0 .../src/{main => test}/java/com/baeldung/file/FileWriterTest.java | 0 .../src/{main => test}/java/com/baeldung/file/FilesTest.java | 0 .../src/{main => test}/java/com/baeldung/file/GuavaTest.java | 0 5 files changed, 0 insertions(+), 0 deletions(-) rename core-java/src/{main => test}/java/com/baeldung/file/FileOutputStreamTest.java (100%) rename core-java/src/{main => test}/java/com/baeldung/file/FileUtilsTest.java (100%) rename core-java/src/{main => test}/java/com/baeldung/file/FileWriterTest.java (100%) rename core-java/src/{main => test}/java/com/baeldung/file/FilesTest.java (100%) rename core-java/src/{main => test}/java/com/baeldung/file/GuavaTest.java (100%) diff --git a/core-java/src/main/java/com/baeldung/file/FileOutputStreamTest.java b/core-java/src/test/java/com/baeldung/file/FileOutputStreamTest.java similarity index 100% rename from core-java/src/main/java/com/baeldung/file/FileOutputStreamTest.java rename to core-java/src/test/java/com/baeldung/file/FileOutputStreamTest.java diff --git a/core-java/src/main/java/com/baeldung/file/FileUtilsTest.java b/core-java/src/test/java/com/baeldung/file/FileUtilsTest.java similarity index 100% rename from core-java/src/main/java/com/baeldung/file/FileUtilsTest.java rename to core-java/src/test/java/com/baeldung/file/FileUtilsTest.java diff --git a/core-java/src/main/java/com/baeldung/file/FileWriterTest.java b/core-java/src/test/java/com/baeldung/file/FileWriterTest.java similarity index 100% rename from core-java/src/main/java/com/baeldung/file/FileWriterTest.java rename to core-java/src/test/java/com/baeldung/file/FileWriterTest.java diff --git a/core-java/src/main/java/com/baeldung/file/FilesTest.java b/core-java/src/test/java/com/baeldung/file/FilesTest.java similarity index 100% rename from core-java/src/main/java/com/baeldung/file/FilesTest.java rename to core-java/src/test/java/com/baeldung/file/FilesTest.java diff --git a/core-java/src/main/java/com/baeldung/file/GuavaTest.java b/core-java/src/test/java/com/baeldung/file/GuavaTest.java similarity index 100% rename from core-java/src/main/java/com/baeldung/file/GuavaTest.java rename to core-java/src/test/java/com/baeldung/file/GuavaTest.java From 10fe3d060f79fa80180977d4fb3f2bd4cf1d6a87 Mon Sep 17 00:00:00 2001 From: Ahmed Tawila Date: Thu, 16 Nov 2017 10:32:06 +0200 Subject: [PATCH 02/11] fix test error --- core-java/src/test/java/com/baeldung/file/FileWriterTest.java | 1 - 1 file changed, 1 deletion(-) diff --git a/core-java/src/test/java/com/baeldung/file/FileWriterTest.java b/core-java/src/test/java/com/baeldung/file/FileWriterTest.java index 67e4dfaf20..5e1f2f35de 100644 --- a/core-java/src/test/java/com/baeldung/file/FileWriterTest.java +++ b/core-java/src/test/java/com/baeldung/file/FileWriterTest.java @@ -19,7 +19,6 @@ public class FileWriterTest { @Test public void whenAppendToFileUsingFileWriter_thenCorrect() throws IOException { - String fileName = "src/main/resources/countries.txt"; FileWriter fw = new FileWriter(fileName, true); BufferedWriter bw = new BufferedWriter(fw); bw.write("Spain"); From c901cb5fad3619d9baa7a977fbdc1cb3f0a85f4b Mon Sep 17 00:00:00 2001 From: Ahmed Tawila Date: Thu, 16 Nov 2017 10:39:51 +0200 Subject: [PATCH 03/11] fix build failures --- .../src/test/java/com/baeldung/file/FileOutputStreamTest.java | 1 - core-java/src/test/java/com/baeldung/file/FileWriterTest.java | 1 - core-java/src/test/java/com/baeldung/file/FilesTest.java | 1 - core-java/src/test/java/com/baeldung/file/GuavaTest.java | 1 - 4 files changed, 4 deletions(-) diff --git a/core-java/src/test/java/com/baeldung/file/FileOutputStreamTest.java b/core-java/src/test/java/com/baeldung/file/FileOutputStreamTest.java index d85c028dae..98984f9781 100644 --- a/core-java/src/test/java/com/baeldung/file/FileOutputStreamTest.java +++ b/core-java/src/test/java/com/baeldung/file/FileOutputStreamTest.java @@ -30,7 +30,6 @@ public class FileOutputStreamTest { @After public void revertFile() throws IOException { PrintWriter writer = new PrintWriter(fileName); - writer.print(""); writer.print("UK\r\n" + "US\r\n" + "Germany\r\n"); writer.close(); } diff --git a/core-java/src/test/java/com/baeldung/file/FileWriterTest.java b/core-java/src/test/java/com/baeldung/file/FileWriterTest.java index 5e1f2f35de..657593201b 100644 --- a/core-java/src/test/java/com/baeldung/file/FileWriterTest.java +++ b/core-java/src/test/java/com/baeldung/file/FileWriterTest.java @@ -34,7 +34,6 @@ public class FileWriterTest { @After public void revertFile() throws IOException { PrintWriter writer = new PrintWriter(fileName); - writer.print(""); writer.print("UK\r\n" + "US\r\n" + "Germany\r\n"); writer.close(); } diff --git a/core-java/src/test/java/com/baeldung/file/FilesTest.java b/core-java/src/test/java/com/baeldung/file/FilesTest.java index 0ca69db8ab..7da2d5ce7b 100644 --- a/core-java/src/test/java/com/baeldung/file/FilesTest.java +++ b/core-java/src/test/java/com/baeldung/file/FilesTest.java @@ -30,7 +30,6 @@ public class FilesTest { @After public void revertFile() throws IOException { PrintWriter writer = new PrintWriter(fileName); - writer.print(""); writer.print("UK\r\n" + "US\r\n" + "Germany\r\n"); writer.close(); } diff --git a/core-java/src/test/java/com/baeldung/file/GuavaTest.java b/core-java/src/test/java/com/baeldung/file/GuavaTest.java index 06379451f9..df6496b288 100644 --- a/core-java/src/test/java/com/baeldung/file/GuavaTest.java +++ b/core-java/src/test/java/com/baeldung/file/GuavaTest.java @@ -34,7 +34,6 @@ public class GuavaTest { @After public void revertFile() throws IOException { PrintWriter writer = new PrintWriter(fileName); - writer.print(""); writer.print("UK\r\n" + "US\r\n" + "Germany\r\n"); writer.close(); } From 1bbe9196eed2290185b7484461c7cc5457480b75 Mon Sep 17 00:00:00 2001 From: Ahmed Tawila Date: Thu, 16 Nov 2017 10:42:59 +0200 Subject: [PATCH 04/11] cleanup --- core-java/src/test/java/com/baeldung/file/FileUtilsTest.java | 1 - 1 file changed, 1 deletion(-) diff --git a/core-java/src/test/java/com/baeldung/file/FileUtilsTest.java b/core-java/src/test/java/com/baeldung/file/FileUtilsTest.java index 6147653976..aae3c9fa1f 100644 --- a/core-java/src/test/java/com/baeldung/file/FileUtilsTest.java +++ b/core-java/src/test/java/com/baeldung/file/FileUtilsTest.java @@ -31,7 +31,6 @@ public class FileUtilsTest { @After public void revertFile() throws IOException { PrintWriter writer = new PrintWriter(fileName); - writer.print(""); writer.print("UK\r\n" + "US\r\n" + "Germany\r\n"); writer.close(); } From afd142caa030c7e16fbf6b709c29ce18c1e7b4a1 Mon Sep 17 00:00:00 2001 From: Ahmed Tawila Date: Thu, 16 Nov 2017 10:50:25 +0200 Subject: [PATCH 05/11] fix Sneaky Runnable test --- .../com/baeldung/sneakythrows/SneakyRunnableTest.java | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/core-java/src/test/java/com/baeldung/sneakythrows/SneakyRunnableTest.java b/core-java/src/test/java/com/baeldung/sneakythrows/SneakyRunnableTest.java index cd31f545b9..794e70d475 100644 --- a/core-java/src/test/java/com/baeldung/sneakythrows/SneakyRunnableTest.java +++ b/core-java/src/test/java/com/baeldung/sneakythrows/SneakyRunnableTest.java @@ -6,12 +6,8 @@ import static junit.framework.TestCase.assertEquals; public class SneakyRunnableTest { - @Test + @Test(expected = InterruptedException.class) public void whenCallSneakyRunnableMethod_thenThrowException() { - try { - new SneakyRunnable().run(); - } catch (Exception e) { - assertEquals(InterruptedException.class, e.getStackTrace()); - } + new SneakyRunnable().run(); } } From 0ffa8c6c8cae687699c762f25c234b0d2942a5b6 Mon Sep 17 00:00:00 2001 From: Ahmed Tawila Date: Thu, 16 Nov 2017 11:08:27 +0200 Subject: [PATCH 06/11] revert sneaky runnable fix attempt --- .../com/baeldung/sneakythrows/SneakyRunnableTest.java | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/core-java/src/test/java/com/baeldung/sneakythrows/SneakyRunnableTest.java b/core-java/src/test/java/com/baeldung/sneakythrows/SneakyRunnableTest.java index 794e70d475..cd31f545b9 100644 --- a/core-java/src/test/java/com/baeldung/sneakythrows/SneakyRunnableTest.java +++ b/core-java/src/test/java/com/baeldung/sneakythrows/SneakyRunnableTest.java @@ -6,8 +6,12 @@ import static junit.framework.TestCase.assertEquals; public class SneakyRunnableTest { - @Test(expected = InterruptedException.class) + @Test public void whenCallSneakyRunnableMethod_thenThrowException() { - new SneakyRunnable().run(); + try { + new SneakyRunnable().run(); + } catch (Exception e) { + assertEquals(InterruptedException.class, e.getStackTrace()); + } } } From df3aa78d57ac6a3ba16133e336b18f3d37c679a5 Mon Sep 17 00:00:00 2001 From: Ahmed Tawila Date: Thu, 16 Nov 2017 11:31:05 +0200 Subject: [PATCH 07/11] fix test failure --- core-java/src/test/java/com/baeldung/file/GuavaTest.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/core-java/src/test/java/com/baeldung/file/GuavaTest.java b/core-java/src/test/java/com/baeldung/file/GuavaTest.java index df6496b288..f6bd71eb15 100644 --- a/core-java/src/test/java/com/baeldung/file/GuavaTest.java +++ b/core-java/src/test/java/com/baeldung/file/GuavaTest.java @@ -21,10 +21,10 @@ public class GuavaTest { public static final String fileName = "src/main/resources/countries.txt"; @Test - public void whenAppendToFileUsingFileWriter_thenCorrect() throws IOException { + public void whenAppendToFileUsingGuava_thenCorrect() throws IOException { File file = new File(fileName); CharSink chs = Files.asCharSink(file, Charsets.UTF_8, FileWriteMode.APPEND); - chs.write("Spain\r\n"); + chs.write("Spain\n"); assertThat(StreamUtils.getStringFromInputStream( new FileInputStream(fileName))) From f6ca36fa21fedac14324ac067d38f1ec1574672d Mon Sep 17 00:00:00 2001 From: Ahmed Tawila Date: Thu, 16 Nov 2017 11:38:58 +0200 Subject: [PATCH 08/11] fix test failure --- core-java/src/test/java/com/baeldung/file/FileWriterTest.java | 2 +- core-java/src/test/java/com/baeldung/file/GuavaTest.java | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/core-java/src/test/java/com/baeldung/file/FileWriterTest.java b/core-java/src/test/java/com/baeldung/file/FileWriterTest.java index 657593201b..b916f2b2c1 100644 --- a/core-java/src/test/java/com/baeldung/file/FileWriterTest.java +++ b/core-java/src/test/java/com/baeldung/file/FileWriterTest.java @@ -28,7 +28,7 @@ public class FileWriterTest { assertThat( StreamUtils.getStringFromInputStream( new FileInputStream(fileName))) - .isEqualTo("UK\r\n" + "US\r\n" + "Germany\r\n" + "Spain\r\n"); + .isEqualTo("UK\r\n" + "US\r\n" + "Germany\r\n" + "Spain\n"); } @After diff --git a/core-java/src/test/java/com/baeldung/file/GuavaTest.java b/core-java/src/test/java/com/baeldung/file/GuavaTest.java index f6bd71eb15..b17b12c464 100644 --- a/core-java/src/test/java/com/baeldung/file/GuavaTest.java +++ b/core-java/src/test/java/com/baeldung/file/GuavaTest.java @@ -24,11 +24,11 @@ public class GuavaTest { public void whenAppendToFileUsingGuava_thenCorrect() throws IOException { File file = new File(fileName); CharSink chs = Files.asCharSink(file, Charsets.UTF_8, FileWriteMode.APPEND); - chs.write("Spain\n"); + chs.write("Spain"); assertThat(StreamUtils.getStringFromInputStream( new FileInputStream(fileName))) - .isEqualTo("UK\r\n" + "US\r\n" + "Germany\r\n" + "Spain\r\n"); + .isEqualTo("UK\r\n" + "US\r\n" + "Germany\r\n" + "Spain"); } @After From 31a26aca25d08aa53b6ca53d810d5eb28a114687 Mon Sep 17 00:00:00 2001 From: Ahmed Tawila Date: Thu, 16 Nov 2017 12:01:08 +0200 Subject: [PATCH 09/11] fix all test failures --- core-java/src/main/resources/countries.properties | 3 +++ .../src/test/java/com/baeldung/file/FileOutputStreamTest.java | 2 +- core-java/src/test/java/com/baeldung/file/FileUtilsTest.java | 2 +- core-java/src/test/java/com/baeldung/file/FileWriterTest.java | 2 +- core-java/src/test/java/com/baeldung/file/FilesTest.java | 2 +- core-java/src/test/java/com/baeldung/file/GuavaTest.java | 2 +- 6 files changed, 8 insertions(+), 5 deletions(-) create mode 100644 core-java/src/main/resources/countries.properties diff --git a/core-java/src/main/resources/countries.properties b/core-java/src/main/resources/countries.properties new file mode 100644 index 0000000000..3c1f53aded --- /dev/null +++ b/core-java/src/main/resources/countries.properties @@ -0,0 +1,3 @@ +UK +US +Germany diff --git a/core-java/src/test/java/com/baeldung/file/FileOutputStreamTest.java b/core-java/src/test/java/com/baeldung/file/FileOutputStreamTest.java index 98984f9781..451c1b4c4d 100644 --- a/core-java/src/test/java/com/baeldung/file/FileOutputStreamTest.java +++ b/core-java/src/test/java/com/baeldung/file/FileOutputStreamTest.java @@ -14,7 +14,7 @@ import com.baeldung.util.StreamUtils; public class FileOutputStreamTest { - public static final String fileName = "src/main/resources/countries.txt"; + public static final String fileName = "src/main/resources/countries.properties"; @Test public void whenAppendToFileUsingFileOutputStream_thenCorrect() throws Exception { diff --git a/core-java/src/test/java/com/baeldung/file/FileUtilsTest.java b/core-java/src/test/java/com/baeldung/file/FileUtilsTest.java index aae3c9fa1f..9ee8726575 100644 --- a/core-java/src/test/java/com/baeldung/file/FileUtilsTest.java +++ b/core-java/src/test/java/com/baeldung/file/FileUtilsTest.java @@ -16,7 +16,7 @@ import com.baeldung.util.StreamUtils; public class FileUtilsTest { - public static final String fileName = "src/main/resources/countries.txt"; + public static final String fileName = "src/main/resources/countries.properties"; @Test public void whenAppendToFileUsingFiles_thenCorrect() throws IOException { diff --git a/core-java/src/test/java/com/baeldung/file/FileWriterTest.java b/core-java/src/test/java/com/baeldung/file/FileWriterTest.java index b916f2b2c1..8d2ce4310e 100644 --- a/core-java/src/test/java/com/baeldung/file/FileWriterTest.java +++ b/core-java/src/test/java/com/baeldung/file/FileWriterTest.java @@ -15,7 +15,7 @@ import com.baeldung.util.StreamUtils; public class FileWriterTest { - public static final String fileName = "src/main/resources/countries.txt"; + public static final String fileName = "src/main/resources/countries.properties"; @Test public void whenAppendToFileUsingFileWriter_thenCorrect() throws IOException { diff --git a/core-java/src/test/java/com/baeldung/file/FilesTest.java b/core-java/src/test/java/com/baeldung/file/FilesTest.java index 7da2d5ce7b..bd39d004d3 100644 --- a/core-java/src/test/java/com/baeldung/file/FilesTest.java +++ b/core-java/src/test/java/com/baeldung/file/FilesTest.java @@ -16,7 +16,7 @@ import com.baeldung.util.StreamUtils; public class FilesTest { - public static final String fileName = "src/main/resources/countries.txt"; + public static final String fileName = "src/main/resources/countries.properties"; @Test public void whenAppendToFileUsingFiles_thenCorrect() throws IOException { diff --git a/core-java/src/test/java/com/baeldung/file/GuavaTest.java b/core-java/src/test/java/com/baeldung/file/GuavaTest.java index b17b12c464..5caa59e596 100644 --- a/core-java/src/test/java/com/baeldung/file/GuavaTest.java +++ b/core-java/src/test/java/com/baeldung/file/GuavaTest.java @@ -18,7 +18,7 @@ import com.google.common.io.Files; public class GuavaTest { - public static final String fileName = "src/main/resources/countries.txt"; + public static final String fileName = "src/main/resources/countries.properties"; @Test public void whenAppendToFileUsingGuava_thenCorrect() throws IOException { From 53074cd7f01469884fa3f9271cc705d4f86ca476 Mon Sep 17 00:00:00 2001 From: Ahmed Tawila Date: Thu, 16 Nov 2017 12:07:48 +0200 Subject: [PATCH 10/11] fix test failure --- core-java/src/test/java/com/baeldung/file/GuavaTest.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/core-java/src/test/java/com/baeldung/file/GuavaTest.java b/core-java/src/test/java/com/baeldung/file/GuavaTest.java index 5caa59e596..acac9172b4 100644 --- a/core-java/src/test/java/com/baeldung/file/GuavaTest.java +++ b/core-java/src/test/java/com/baeldung/file/GuavaTest.java @@ -24,11 +24,11 @@ public class GuavaTest { public void whenAppendToFileUsingGuava_thenCorrect() throws IOException { File file = new File(fileName); CharSink chs = Files.asCharSink(file, Charsets.UTF_8, FileWriteMode.APPEND); - chs.write("Spain"); + chs.write("Spain\r\n"); assertThat(StreamUtils.getStringFromInputStream( new FileInputStream(fileName))) - .isEqualTo("UK\r\n" + "US\r\n" + "Germany\r\n" + "Spain"); + .isEqualTo("UK\r\n" + "US\r\n" + "Germany\r\n" + "Spain\r\n"); } @After From 1a368ca9f394cb37b9a5fa0408ff7ae70806495b Mon Sep 17 00:00:00 2001 From: Ahmed Tawila Date: Thu, 16 Nov 2017 12:22:12 +0200 Subject: [PATCH 11/11] fix test failures --- core-java/src/test/java/com/baeldung/file/GuavaTest.java | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/core-java/src/test/java/com/baeldung/file/GuavaTest.java b/core-java/src/test/java/com/baeldung/file/GuavaTest.java index acac9172b4..5a7ec6c4a8 100644 --- a/core-java/src/test/java/com/baeldung/file/GuavaTest.java +++ b/core-java/src/test/java/com/baeldung/file/GuavaTest.java @@ -8,6 +8,7 @@ import java.io.IOException; import java.io.PrintWriter; import org.junit.After; +import org.junit.Before; import org.junit.Test; import com.baeldung.util.StreamUtils; @@ -19,6 +20,13 @@ import com.google.common.io.Files; public class GuavaTest { public static final String fileName = "src/main/resources/countries.properties"; + + @Before + public void setup() throws Exception { + PrintWriter writer = new PrintWriter(fileName); + writer.print("UK\r\n" + "US\r\n" + "Germany\r\n"); + writer.close(); + } @Test public void whenAppendToFileUsingGuava_thenCorrect() throws IOException {