From f6225a85f8c0a208f1402a0232cc0fbb48bcd973 Mon Sep 17 00:00:00 2001 From: Arsenii Marshinin Date: Wed, 13 Oct 2021 12:03:25 +0300 Subject: [PATCH 1/4] Test fix --- .../java/com/acme/edu/iteration01/LoggerTest.java | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/src/test/java/com/acme/edu/iteration01/LoggerTest.java b/src/test/java/com/acme/edu/iteration01/LoggerTest.java index b9bacdb90..eebf49e39 100644 --- a/src/test/java/com/acme/edu/iteration01/LoggerTest.java +++ b/src/test/java/com/acme/edu/iteration01/LoggerTest.java @@ -9,6 +9,9 @@ import java.io.*; public class LoggerTest implements SysoutCaptureAndAssertionAbility { + + private final String sep = System.lineSeparator(); + //region given @Before public void setUpSystemOut() throws IOException { @@ -32,16 +35,18 @@ public void shouldLogInteger() throws IOException { //region then assertSysoutContains("primitive: "); - assertSysoutEquals("primitive: 1\nprimitive: 0\nprimitive: -1\n"); + assertSysoutEquals("primitive: 1" + sep + + "primitive: 0" + sep + + "primitive: -1" + sep); //endregion } @Test public void shouldLogByte() throws IOException { //region when - Logger.log((byte)1); - Logger.log((byte)0); - Logger.log((byte)-1); + Logger.log((byte) 1); + Logger.log((byte) 0); + Logger.log((byte) -1); //endregion //region then From 1eefe3b38cb44ec1bb059c547c0b61a5e23909a8 Mon Sep 17 00:00:00 2001 From: Arsenii Marshinin Date: Wed, 13 Oct 2021 12:11:43 +0300 Subject: [PATCH 2/4] README.md fix --- README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/README.md b/README.md index dbbdfc720..8bc879762 100644 --- a/README.md +++ b/README.md @@ -1,3 +1,4 @@ +##Marshinin Arsenii # Java Junior Developer Training Course. 88 hours training + 32 hours work project = 120 hr. From dd0151cccd6e26b3192c2bd33bf9e93f40c844f1 Mon Sep 17 00:00:00 2001 From: Arsenii Marshinin Date: Wed, 13 Oct 2021 12:26:35 +0300 Subject: [PATCH 3/4] README.md change --- README.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index 8bc879762..529e608d6 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,5 @@ -##Marshinin Arsenii +#Marshinin Arsenii + # Java Junior Developer Training Course. 88 hours training + 32 hours work project = 120 hr. From 29b607874452e748bdfa319e4c0ee3ccb4e85ea8 Mon Sep 17 00:00:00 2001 From: Arsenii Marshinin Date: Thu, 14 Oct 2021 12:28:57 +0300 Subject: [PATCH 4/4] Logger methods overloaded --- src/main/java/com/acme/edu/Logger.java | 24 +++++++++++++++-- src/main/java/com/acme/edu/Printer.java | 27 +++++++++++++++++++ .../com/acme/edu/iteration01/LoggerTest.java | 4 --- 3 files changed, 49 insertions(+), 6 deletions(-) create mode 100644 src/main/java/com/acme/edu/Printer.java diff --git a/src/main/java/com/acme/edu/Logger.java b/src/main/java/com/acme/edu/Logger.java index f0b274045..8717abbb5 100644 --- a/src/main/java/com/acme/edu/Logger.java +++ b/src/main/java/com/acme/edu/Logger.java @@ -2,10 +2,30 @@ public class Logger { public static void log(int message) { - System.out.println("primitive: " + message); + Printer printer = new Printer("primitive: ", message); + printer.print(); } public static void log(byte message) { - System.out.println("primitive: " + message); + Printer printer = new Printer("primitive: ", message); + printer.print(); + } + + public static void log(char ch) { + System.out.println("char: " + ch); + } + + public static void log(String s) { + System.out.println("string: " + s); + } + + public static void log(boolean message) { + Printer printer = new Printer("primitive: ", message); + printer.print(); + } + + public static void log(Object message) { + Printer printer= new Printer("reference: ", message); + printer.print(); } } diff --git a/src/main/java/com/acme/edu/Printer.java b/src/main/java/com/acme/edu/Printer.java new file mode 100644 index 000000000..438dbf01f --- /dev/null +++ b/src/main/java/com/acme/edu/Printer.java @@ -0,0 +1,27 @@ +package com.acme.edu; + +public class Printer { + private final String prefix; + private final String message; + + public Printer(String prefix, String message) { + this.prefix = prefix; + this.message = message; + } + + public Printer(String prefix, int message) { + this(prefix, "" + message); + } + + public Printer(String prefix, boolean message) { + this(prefix, "" + message); + } + + public Printer(String prefix, Object message) { + this(prefix, message.toString()); + } + + public void print() { + System.out.println(prefix + message); + } +} diff --git a/src/test/java/com/acme/edu/iteration01/LoggerTest.java b/src/test/java/com/acme/edu/iteration01/LoggerTest.java index eebf49e39..c123ef4be 100644 --- a/src/test/java/com/acme/edu/iteration01/LoggerTest.java +++ b/src/test/java/com/acme/edu/iteration01/LoggerTest.java @@ -57,9 +57,6 @@ public void shouldLogByte() throws IOException { //endregion } - /* - TODO: implement Logger solution to match specification as tests - @Test public void shouldLogChar() throws IOException { //region when @@ -114,5 +111,4 @@ public void shouldLogReference() throws IOException { //endregion } - */ } \ No newline at end of file