From 1efa085c1f8c0b8b1894e0c09a7b177808fb7ec8 Mon Sep 17 00:00:00 2001 From: woomin Date: Tue, 16 Jun 2020 18:21:42 +0900 Subject: [PATCH 01/25] Add Calculator and StringReader with TDD --- .../controller/StringCalculatorApp.java | 7 ++++ .../java/calculator/model/Calculator.java | 20 ++++++++++ .../java/calculator/model/StringReader.java | 11 ++++++ src/main/java/empty.txt | 0 src/test/java/calculator/CalculatorTest.java | 38 +++++++++++++++++++ .../java/calculator/StringReaderTest.java | 24 ++++++++++++ src/test/java/empty.txt | 0 7 files changed, 100 insertions(+) create mode 100644 src/main/java/calculator/controller/StringCalculatorApp.java create mode 100644 src/main/java/calculator/model/Calculator.java create mode 100644 src/main/java/calculator/model/StringReader.java delete mode 100644 src/main/java/empty.txt create mode 100644 src/test/java/calculator/CalculatorTest.java create mode 100644 src/test/java/calculator/StringReaderTest.java delete mode 100644 src/test/java/empty.txt diff --git a/src/main/java/calculator/controller/StringCalculatorApp.java b/src/main/java/calculator/controller/StringCalculatorApp.java new file mode 100644 index 0000000..89e2851 --- /dev/null +++ b/src/main/java/calculator/controller/StringCalculatorApp.java @@ -0,0 +1,7 @@ +package calculator.controller; + +public class StringCalculatorApp { + public static void main(String[] args) { + System.out.println("hello"); + } +} diff --git a/src/main/java/calculator/model/Calculator.java b/src/main/java/calculator/model/Calculator.java new file mode 100644 index 0000000..4970bb8 --- /dev/null +++ b/src/main/java/calculator/model/Calculator.java @@ -0,0 +1,20 @@ +package calculator.model; + +import java.util.Arrays; + +public class Calculator { + private final int result; + + public Calculator(int[] numbers) { + int minusCount = Arrays.stream(numbers).filter(v -> v < 0).toArray().length; + if (minusCount > 0) { + throw new RuntimeException(); + } + + this.result = Arrays.stream(numbers).reduce(Integer::sum).orElse(0); + } + + public int executeAddition() { + return this.result; + } +} diff --git a/src/main/java/calculator/model/StringReader.java b/src/main/java/calculator/model/StringReader.java new file mode 100644 index 0000000..d145eab --- /dev/null +++ b/src/main/java/calculator/model/StringReader.java @@ -0,0 +1,11 @@ +package calculator.model; + +import java.util.Arrays; + +public class StringReader { + + public int[] read(String str) { + String[] arr = str.split("[:,]"); + return Arrays.stream(arr).mapToInt(Integer::parseInt).toArray(); + } +} diff --git a/src/main/java/empty.txt b/src/main/java/empty.txt deleted file mode 100644 index e69de29..0000000 diff --git a/src/test/java/calculator/CalculatorTest.java b/src/test/java/calculator/CalculatorTest.java new file mode 100644 index 0000000..3817631 --- /dev/null +++ b/src/test/java/calculator/CalculatorTest.java @@ -0,0 +1,38 @@ +package calculator; + +import calculator.model.Calculator; +import org.junit.jupiter.api.DisplayName; +import org.junit.jupiter.api.Test; + +import static org.assertj.core.api.Assertions.assertThat; +import static org.assertj.core.api.Assertions.assertThatThrownBy; + +public class CalculatorTest { + + @Test + @DisplayName("with zero parameter") + public void nullParameter() { + Calculator calculator = new Calculator(new int[] { 0 }); + assertThat(calculator.executeAddition()).isEqualTo(0); + } + + @Test + @DisplayName("with only one number parameter") + public void oneParameter() { + Calculator calculator = new Calculator(new int[] { 3 }); + assertThat(calculator.executeAddition()).isEqualTo(3); + } + + @Test + @DisplayName("with array parameter") + public void arrayParameter() { + Calculator calculator = new Calculator(new int[] { 1, 2, 3, 4 }); + assertThat(calculator.executeAddition()).isEqualTo(10); + } + + @Test + @DisplayName("with minus parameter") + public void minusParameter() { + assertThatThrownBy(() -> new Calculator(new int[] { -5 })).isInstanceOf(RuntimeException.class); + } +} diff --git a/src/test/java/calculator/StringReaderTest.java b/src/test/java/calculator/StringReaderTest.java new file mode 100644 index 0000000..590c4d9 --- /dev/null +++ b/src/test/java/calculator/StringReaderTest.java @@ -0,0 +1,24 @@ +package calculator; + +import calculator.model.StringReader; +import org.junit.jupiter.api.DisplayName; +import org.junit.jupiter.api.Test; + +import static org.assertj.core.api.Assertions.assertThat; + +public class StringReaderTest { + + @Test + @DisplayName("with multiple numbers parameter") + public void multipleNumbers() { + StringReader stringReader = new StringReader(); + assertThat(stringReader.read("1,2,3,4")).isEqualTo(new int[] { 1, 2, 3, 4 }); + } + + @Test + @DisplayName("with only one number parameter") + public void onlyOneNumber() { + StringReader stringReader = new StringReader(); + assertThat(stringReader.read("5")).isEqualTo(new int[] { 5 }); + } +} diff --git a/src/test/java/empty.txt b/src/test/java/empty.txt deleted file mode 100644 index e69de29..0000000 From 8bfa08fcede86bfd4c8195e23bd9392bc51101b4 Mon Sep 17 00:00:00 2001 From: woomin Date: Tue, 16 Jun 2020 18:24:17 +0900 Subject: [PATCH 02/25] Add view and make getUserInput() --- .../calculator/controller/StringCalculatorApp.java | 2 +- src/main/java/calculator/view/Input.java | 11 +++++++++++ src/main/java/calculator/view/Result.java | 4 ++++ 3 files changed, 16 insertions(+), 1 deletion(-) create mode 100644 src/main/java/calculator/view/Input.java create mode 100644 src/main/java/calculator/view/Result.java diff --git a/src/main/java/calculator/controller/StringCalculatorApp.java b/src/main/java/calculator/controller/StringCalculatorApp.java index 89e2851..8cf2afc 100644 --- a/src/main/java/calculator/controller/StringCalculatorApp.java +++ b/src/main/java/calculator/controller/StringCalculatorApp.java @@ -2,6 +2,6 @@ public class StringCalculatorApp { public static void main(String[] args) { - System.out.println("hello"); + } } diff --git a/src/main/java/calculator/view/Input.java b/src/main/java/calculator/view/Input.java new file mode 100644 index 0000000..90622e3 --- /dev/null +++ b/src/main/java/calculator/view/Input.java @@ -0,0 +1,11 @@ +package calculator.view; + +import java.util.Scanner; + +public class Input { + + public static String getUserInput() { + Scanner scanner = new Scanner(System.in); + return scanner.nextLine(); + } +} diff --git a/src/main/java/calculator/view/Result.java b/src/main/java/calculator/view/Result.java new file mode 100644 index 0000000..aa35fd5 --- /dev/null +++ b/src/main/java/calculator/view/Result.java @@ -0,0 +1,4 @@ +package calculator.view; + +public class Result { +} From a28e91933d54040daf00ef07431d879f31a9efda Mon Sep 17 00:00:00 2001 From: woomin Date: Tue, 16 Jun 2020 18:30:37 +0900 Subject: [PATCH 03/25] Make StringCalculationApp.java --- .../calculator/controller/StringCalculatorApp.java | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/src/main/java/calculator/controller/StringCalculatorApp.java b/src/main/java/calculator/controller/StringCalculatorApp.java index 8cf2afc..60927e2 100644 --- a/src/main/java/calculator/controller/StringCalculatorApp.java +++ b/src/main/java/calculator/controller/StringCalculatorApp.java @@ -1,7 +1,18 @@ package calculator.controller; +import calculator.model.Calculator; +import calculator.model.StringReader; +import calculator.view.Input; + public class StringCalculatorApp { public static void main(String[] args) { + System.out.println("수식을 입력해주세요"); + String userInput = Input.getUserInput(); + + StringReader stringReader = new StringReader(); + int[] arr = stringReader.read(userInput); + Calculator calculator = new Calculator(arr); + System.out.println(calculator.executeAddition()); } } From 0811c66dd186a281af19ed748f76fffe0927cc17 Mon Sep 17 00:00:00 2001 From: woomin Date: Tue, 16 Jun 2020 18:34:39 +0900 Subject: [PATCH 04/25] Seperate view logic from controller --- .../java/calculator/controller/StringCalculatorApp.java | 5 +++-- src/main/java/calculator/view/Result.java | 8 ++++++++ 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/src/main/java/calculator/controller/StringCalculatorApp.java b/src/main/java/calculator/controller/StringCalculatorApp.java index 60927e2..7eb3637 100644 --- a/src/main/java/calculator/controller/StringCalculatorApp.java +++ b/src/main/java/calculator/controller/StringCalculatorApp.java @@ -3,16 +3,17 @@ import calculator.model.Calculator; import calculator.model.StringReader; import calculator.view.Input; +import calculator.view.Result; public class StringCalculatorApp { public static void main(String[] args) { - System.out.println("수식을 입력해주세요"); + Result.showStartMessage(); String userInput = Input.getUserInput(); StringReader stringReader = new StringReader(); int[] arr = stringReader.read(userInput); Calculator calculator = new Calculator(arr); - System.out.println(calculator.executeAddition()); + Result.showResult(calculator.executeAddition()); } } diff --git a/src/main/java/calculator/view/Result.java b/src/main/java/calculator/view/Result.java index aa35fd5..5c9a8dd 100644 --- a/src/main/java/calculator/view/Result.java +++ b/src/main/java/calculator/view/Result.java @@ -1,4 +1,12 @@ package calculator.view; public class Result { + + public static void showStartMessage() { + System.out.println("숫자들을 입력해주세요"); + } + + public static void showResult(int result) { + System.out.printf("합계: %d", result); + } } From 5d9321caa6f5dc4cc1cf932e0e9788c07fdea2c0 Mon Sep 17 00:00:00 2001 From: woomin Date: Tue, 16 Jun 2020 20:02:37 +0900 Subject: [PATCH 05/25] Add custom separator logic --- .../controller/StringCalculatorApp.java | 2 ++ src/main/java/calculator/model/StringReader.java | 15 +++++++++++++-- src/test/java/calculator/StringReaderTest.java | 16 ++++++++++++++-- 3 files changed, 29 insertions(+), 4 deletions(-) diff --git a/src/main/java/calculator/controller/StringCalculatorApp.java b/src/main/java/calculator/controller/StringCalculatorApp.java index 7eb3637..4e60a94 100644 --- a/src/main/java/calculator/controller/StringCalculatorApp.java +++ b/src/main/java/calculator/controller/StringCalculatorApp.java @@ -10,6 +10,8 @@ public static void main(String[] args) { Result.showStartMessage(); String userInput = Input.getUserInput(); + System.out.println(userInput); + StringReader stringReader = new StringReader(); int[] arr = stringReader.read(userInput); diff --git a/src/main/java/calculator/model/StringReader.java b/src/main/java/calculator/model/StringReader.java index d145eab..7ebbe98 100644 --- a/src/main/java/calculator/model/StringReader.java +++ b/src/main/java/calculator/model/StringReader.java @@ -5,7 +5,18 @@ public class StringReader { public int[] read(String str) { - String[] arr = str.split("[:,]"); - return Arrays.stream(arr).mapToInt(Integer::parseInt).toArray(); + String[] arr = str.split("n"); + + if (arr.length == 1) { + String[] numbers = arr[0].split("[:,]"); + + return Arrays.stream(numbers).mapToInt(Integer::parseInt).toArray(); + } + + String customSeparator = Character.toString(arr[0].charAt(2)); + String regex = "[:," + customSeparator + "]"; + String[] numbers = arr[1].split(regex); + + return Arrays.stream(numbers).mapToInt(Integer::parseInt).toArray(); } } diff --git a/src/test/java/calculator/StringReaderTest.java b/src/test/java/calculator/StringReaderTest.java index 590c4d9..5e642fb 100644 --- a/src/test/java/calculator/StringReaderTest.java +++ b/src/test/java/calculator/StringReaderTest.java @@ -1,6 +1,7 @@ package calculator; import calculator.model.StringReader; +import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.api.Test; @@ -8,17 +9,28 @@ public class StringReaderTest { + StringReader stringReader; + + @BeforeEach + void init() { + stringReader = new StringReader(); + } + @Test @DisplayName("with multiple numbers parameter") public void multipleNumbers() { - StringReader stringReader = new StringReader(); assertThat(stringReader.read("1,2,3,4")).isEqualTo(new int[] { 1, 2, 3, 4 }); } @Test @DisplayName("with only one number parameter") public void onlyOneNumber() { - StringReader stringReader = new StringReader(); assertThat(stringReader.read("5")).isEqualTo(new int[] { 5 }); } + + @Test + @DisplayName("with custom separator") + public void withSeparator() { + assertThat(stringReader.read("//;\\n1:2;3,4")).isEqualTo(new int[] { 1, 2, 3, 4 }); + } } From 145a4c47a6cdb0460977ee0cb749cf6a81d23495 Mon Sep 17 00:00:00 2001 From: woomin Date: Tue, 16 Jun 2020 20:10:39 +0900 Subject: [PATCH 06/25] Do refactoring to StringReader --- .../java/calculator/model/StringReader.java | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-) diff --git a/src/main/java/calculator/model/StringReader.java b/src/main/java/calculator/model/StringReader.java index 7ebbe98..f2d1f98 100644 --- a/src/main/java/calculator/model/StringReader.java +++ b/src/main/java/calculator/model/StringReader.java @@ -7,15 +7,21 @@ public class StringReader { public int[] read(String str) { String[] arr = str.split("n"); - if (arr.length == 1) { - String[] numbers = arr[0].split("[:,]"); + return arr.length == 1 + ? withNoCustomSeparator(arr[0]) + : withCustomSeparator(arr[0], arr[1]); + } + + private int[] withNoCustomSeparator(String str) { + String[] numbers = str.split("[:,]"); - return Arrays.stream(numbers).mapToInt(Integer::parseInt).toArray(); - } + return Arrays.stream(numbers).mapToInt(Integer::parseInt).toArray(); + } - String customSeparator = Character.toString(arr[0].charAt(2)); + private int[] withCustomSeparator(String separatorPart, String numberPart) { + String customSeparator = Character.toString(separatorPart.charAt(2)); String regex = "[:," + customSeparator + "]"; - String[] numbers = arr[1].split(regex); + String[] numbers = numberPart.split(regex); return Arrays.stream(numbers).mapToInt(Integer::parseInt).toArray(); } From e7b9cf7bb3f28762ca2f0fb835a0b163c36f2141 Mon Sep 17 00:00:00 2001 From: woomin Date: Wed, 17 Jun 2020 17:56:34 +0900 Subject: [PATCH 07/25] Modify Constructor to FactoryMethod --- src/main/java/calculator/model/Calculator.java | 4 ++++ src/main/java/calculator/model/StringReader.java | 1 - src/test/java/calculator/CalculatorTest.java | 9 ++++----- 3 files changed, 8 insertions(+), 6 deletions(-) diff --git a/src/main/java/calculator/model/Calculator.java b/src/main/java/calculator/model/Calculator.java index 4970bb8..f7fc0df 100644 --- a/src/main/java/calculator/model/Calculator.java +++ b/src/main/java/calculator/model/Calculator.java @@ -14,6 +14,10 @@ public Calculator(int[] numbers) { this.result = Arrays.stream(numbers).reduce(Integer::sum).orElse(0); } + public static Calculator newCalculator(int[] numbers) { + return new Calculator(numbers); + } + public int executeAddition() { return this.result; } diff --git a/src/main/java/calculator/model/StringReader.java b/src/main/java/calculator/model/StringReader.java index f2d1f98..d0fe7d6 100644 --- a/src/main/java/calculator/model/StringReader.java +++ b/src/main/java/calculator/model/StringReader.java @@ -3,7 +3,6 @@ import java.util.Arrays; public class StringReader { - public int[] read(String str) { String[] arr = str.split("n"); diff --git a/src/test/java/calculator/CalculatorTest.java b/src/test/java/calculator/CalculatorTest.java index 3817631..0584bf1 100644 --- a/src/test/java/calculator/CalculatorTest.java +++ b/src/test/java/calculator/CalculatorTest.java @@ -8,31 +8,30 @@ import static org.assertj.core.api.Assertions.assertThatThrownBy; public class CalculatorTest { - @Test @DisplayName("with zero parameter") public void nullParameter() { - Calculator calculator = new Calculator(new int[] { 0 }); + Calculator calculator = Calculator.newCalculator(new int[] { 0 }); assertThat(calculator.executeAddition()).isEqualTo(0); } @Test @DisplayName("with only one number parameter") public void oneParameter() { - Calculator calculator = new Calculator(new int[] { 3 }); + Calculator calculator = Calculator.newCalculator(new int[] { 3 }); assertThat(calculator.executeAddition()).isEqualTo(3); } @Test @DisplayName("with array parameter") public void arrayParameter() { - Calculator calculator = new Calculator(new int[] { 1, 2, 3, 4 }); + Calculator calculator = Calculator.newCalculator(new int[] { 1, 2, 3, 4 }); assertThat(calculator.executeAddition()).isEqualTo(10); } @Test @DisplayName("with minus parameter") public void minusParameter() { - assertThatThrownBy(() -> new Calculator(new int[] { -5 })).isInstanceOf(RuntimeException.class); + assertThatThrownBy(() -> Calculator.newCalculator(new int[] { -5 })).isInstanceOf(RuntimeException.class); } } From 6f42552ae09c706b4633654c9db07b1bfe91ec96 Mon Sep 17 00:00:00 2001 From: woomin Date: Wed, 17 Jun 2020 17:58:28 +0900 Subject: [PATCH 08/25] Do refactoring to test code. given-when-then --- src/test/java/calculator/CalculatorTest.java | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) diff --git a/src/test/java/calculator/CalculatorTest.java b/src/test/java/calculator/CalculatorTest.java index 0584bf1..d5f3278 100644 --- a/src/test/java/calculator/CalculatorTest.java +++ b/src/test/java/calculator/CalculatorTest.java @@ -12,21 +12,30 @@ public class CalculatorTest { @DisplayName("with zero parameter") public void nullParameter() { Calculator calculator = Calculator.newCalculator(new int[] { 0 }); - assertThat(calculator.executeAddition()).isEqualTo(0); + + int answer = calculator.executeAddition(); + + assertThat(answer).isEqualTo(0); } @Test @DisplayName("with only one number parameter") public void oneParameter() { Calculator calculator = Calculator.newCalculator(new int[] { 3 }); - assertThat(calculator.executeAddition()).isEqualTo(3); + + int answer = calculator.executeAddition(); + + assertThat(answer).isEqualTo(3); } @Test @DisplayName("with array parameter") public void arrayParameter() { Calculator calculator = Calculator.newCalculator(new int[] { 1, 2, 3, 4 }); - assertThat(calculator.executeAddition()).isEqualTo(10); + + int answer = calculator.executeAddition(); + + assertThat(answer).isEqualTo(10); } @Test From 02db90cdd0aad5c343689581739c0397e00f372e Mon Sep 17 00:00:00 2001 From: woomin Date: Fri, 19 Jun 2020 13:23:43 +0900 Subject: [PATCH 09/25] Add getLottoNumbers() in LottoTicket by TDD --- src/main/java/lotto/domain/LottoTicket.java | 20 ++++++++++++++++++++ src/test/java/lotto/LottoTicketTest.java | 19 +++++++++++++++++++ 2 files changed, 39 insertions(+) create mode 100644 src/main/java/lotto/domain/LottoTicket.java create mode 100644 src/test/java/lotto/LottoTicketTest.java diff --git a/src/main/java/lotto/domain/LottoTicket.java b/src/main/java/lotto/domain/LottoTicket.java new file mode 100644 index 0000000..3216437 --- /dev/null +++ b/src/main/java/lotto/domain/LottoTicket.java @@ -0,0 +1,20 @@ +package lotto.domain; + +import java.util.List; + +public class LottoTicket { + + private final List lottoNumbers; + + public LottoTicket(List numbers) { + this.lottoNumbers = numbers; + } + + public static LottoTicket newLotto(List numbers) { + return new LottoTicket(numbers); + } + + public List getLottoNumbers() { + return this.lottoNumbers; + } +} diff --git a/src/test/java/lotto/LottoTicketTest.java b/src/test/java/lotto/LottoTicketTest.java new file mode 100644 index 0000000..f65648f --- /dev/null +++ b/src/test/java/lotto/LottoTicketTest.java @@ -0,0 +1,19 @@ +package lotto; + +import lotto.domain.LottoTicket; +import org.junit.jupiter.api.Test; + +import java.util.ArrayList; +import java.util.List; + +import static org.assertj.core.api.Assertions.assertThat; + +public class LottoTicketTest { + @Test + void getLottoNumbers() { + List numbers = new ArrayList<>(List.of(1, 2, 3, 4, 5, 6)); + LottoTicket lottoTicket = LottoTicket.newLotto(numbers); + + assertThat(lottoTicket.getLottoNumbers()).isEqualTo(numbers); + } +} From 0f4a39af2a748b9b17698821b324124a561fd4e5 Mon Sep 17 00:00:00 2001 From: woomin Date: Fri, 19 Jun 2020 13:39:52 +0900 Subject: [PATCH 10/25] Add makeLottoTicket() in LottoMachine by TDD --- src/main/java/lotto/domain/LottoMachine.java | 26 ++++++++++++++++++++ src/test/java/lotto/LottoMachineTest.java | 23 +++++++++++++++++ src/test/java/lotto/LottoTicketTest.java | 1 + 3 files changed, 50 insertions(+) create mode 100644 src/main/java/lotto/domain/LottoMachine.java create mode 100644 src/test/java/lotto/LottoMachineTest.java diff --git a/src/main/java/lotto/domain/LottoMachine.java b/src/main/java/lotto/domain/LottoMachine.java new file mode 100644 index 0000000..6780532 --- /dev/null +++ b/src/main/java/lotto/domain/LottoMachine.java @@ -0,0 +1,26 @@ +package lotto.domain; + +import java.util.ArrayList; +import java.util.List; + +public class LottoMachine { + + private final List lottoTickets; + + public LottoMachine() { + lottoTickets = new ArrayList<>(); + } + + public static LottoMachine newMachine() { + return new LottoMachine(); + } + + public List getLottoTickets() { + return this.lottoTickets; + } + + public void makeLottoTicket(List numbers) { + LottoTicket newTicket = LottoTicket.newLotto(numbers); + lottoTickets.add(newTicket); + } +} diff --git a/src/test/java/lotto/LottoMachineTest.java b/src/test/java/lotto/LottoMachineTest.java new file mode 100644 index 0000000..128739b --- /dev/null +++ b/src/test/java/lotto/LottoMachineTest.java @@ -0,0 +1,23 @@ +package lotto; + +import lotto.domain.LottoMachine; +import lotto.domain.LottoTicket; +import org.junit.jupiter.api.Test; + +import java.util.ArrayList; +import java.util.List; + +import static org.assertj.core.api.Assertions.assertThat; + +public class LottoMachineTest { + @Test + void makeLottoTicket() { + LottoMachine lottoMachine = LottoMachine.newMachine(); + List numbers = new ArrayList<>(List.of(1, 2, 3, 4, 5, 6)); + lottoMachine.makeLottoTicket(numbers); + + LottoTicket firstTicket = lottoMachine.getLottoTickets().get(0); + + assertThat(firstTicket.getLottoNumbers()).isEqualTo(numbers); + } +} diff --git a/src/test/java/lotto/LottoTicketTest.java b/src/test/java/lotto/LottoTicketTest.java index f65648f..90b1d14 100644 --- a/src/test/java/lotto/LottoTicketTest.java +++ b/src/test/java/lotto/LottoTicketTest.java @@ -12,6 +12,7 @@ public class LottoTicketTest { @Test void getLottoNumbers() { List numbers = new ArrayList<>(List.of(1, 2, 3, 4, 5, 6)); + LottoTicket lottoTicket = LottoTicket.newLotto(numbers); assertThat(lottoTicket.getLottoNumbers()).isEqualTo(numbers); From 5394c14c6db7f1e0599cdf7718055d9f4b7b1eb5 Mon Sep 17 00:00:00 2001 From: woomin Date: Fri, 19 Jun 2020 13:44:00 +0900 Subject: [PATCH 11/25] Add test case to makeLottoTicket() --- src/test/java/lotto/LottoMachineTest.java | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/src/test/java/lotto/LottoMachineTest.java b/src/test/java/lotto/LottoMachineTest.java index 128739b..2c7148e 100644 --- a/src/test/java/lotto/LottoMachineTest.java +++ b/src/test/java/lotto/LottoMachineTest.java @@ -13,11 +13,15 @@ public class LottoMachineTest { @Test void makeLottoTicket() { LottoMachine lottoMachine = LottoMachine.newMachine(); - List numbers = new ArrayList<>(List.of(1, 2, 3, 4, 5, 6)); - lottoMachine.makeLottoTicket(numbers); + List numbers1 = new ArrayList<>(List.of(1, 3, 5, 7, 9, 11)); + List numbers2 = new ArrayList<>(List.of(2, 4, 6, 8, 10, 12)); + lottoMachine.makeLottoTicket(numbers1); + lottoMachine.makeLottoTicket(numbers2); LottoTicket firstTicket = lottoMachine.getLottoTickets().get(0); + assertThat(firstTicket.getLottoNumbers()).isEqualTo(numbers1); - assertThat(firstTicket.getLottoNumbers()).isEqualTo(numbers); + LottoTicket secondTicket = lottoMachine.getLottoTickets().get(1); + assertThat(secondTicket.getLottoNumbers()).isEqualTo(numbers2); } } From ce252d018ab1d1b2042dccc7ec678a09087b2c2d Mon Sep 17 00:00:00 2001 From: woomin Date: Fri, 19 Jun 2020 13:52:53 +0900 Subject: [PATCH 12/25] Add makeTicketsWithMoney() in LottoMachin by TDD --- src/main/java/lotto/domain/LottoMachine.java | 8 +++++++- src/test/java/lotto/LottoMachineTest.java | 9 +++++++++ 2 files changed, 16 insertions(+), 1 deletion(-) diff --git a/src/main/java/lotto/domain/LottoMachine.java b/src/main/java/lotto/domain/LottoMachine.java index 6780532..964907b 100644 --- a/src/main/java/lotto/domain/LottoMachine.java +++ b/src/main/java/lotto/domain/LottoMachine.java @@ -21,6 +21,12 @@ public List getLottoTickets() { public void makeLottoTicket(List numbers) { LottoTicket newTicket = LottoTicket.newLotto(numbers); - lottoTickets.add(newTicket); + this.lottoTickets.add(newTicket); + } + + public void makeTicketsWithMoney(int money) { + for (int i = 0; i < money / 1000; i += 1) { + this.makeLottoTicket(List.of(1, 2, 3, 4, 5, 6)); + } } } diff --git a/src/test/java/lotto/LottoMachineTest.java b/src/test/java/lotto/LottoMachineTest.java index 2c7148e..389f6c0 100644 --- a/src/test/java/lotto/LottoMachineTest.java +++ b/src/test/java/lotto/LottoMachineTest.java @@ -24,4 +24,13 @@ void makeLottoTicket() { LottoTicket secondTicket = lottoMachine.getLottoTickets().get(1); assertThat(secondTicket.getLottoNumbers()).isEqualTo(numbers2); } + + @Test + void makeLottoTicketsWithMoney() { + int money = 14_000; + LottoMachine lottoMachine = LottoMachine.newMachine(); + lottoMachine.makeTicketsWithMoney(money); + + assertThat(lottoMachine.getLottoTickets()).hasSize(14); + } } From 4351be97b9624a80e6d7be777e4fd260f4cf5317 Mon Sep 17 00:00:00 2001 From: woomin Date: Fri, 19 Jun 2020 13:53:40 +0900 Subject: [PATCH 13/25] Change the method name short --- src/main/java/lotto/domain/LottoMachine.java | 6 +++--- src/test/java/lotto/LottoMachineTest.java | 10 +++++----- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/src/main/java/lotto/domain/LottoMachine.java b/src/main/java/lotto/domain/LottoMachine.java index 964907b..5ab0b2f 100644 --- a/src/main/java/lotto/domain/LottoMachine.java +++ b/src/main/java/lotto/domain/LottoMachine.java @@ -15,18 +15,18 @@ public static LottoMachine newMachine() { return new LottoMachine(); } - public List getLottoTickets() { + public List getTickets() { return this.lottoTickets; } - public void makeLottoTicket(List numbers) { + public void makeTicket(List numbers) { LottoTicket newTicket = LottoTicket.newLotto(numbers); this.lottoTickets.add(newTicket); } public void makeTicketsWithMoney(int money) { for (int i = 0; i < money / 1000; i += 1) { - this.makeLottoTicket(List.of(1, 2, 3, 4, 5, 6)); + this.makeTicket(List.of(1, 2, 3, 4, 5, 6)); } } } diff --git a/src/test/java/lotto/LottoMachineTest.java b/src/test/java/lotto/LottoMachineTest.java index 389f6c0..3058b09 100644 --- a/src/test/java/lotto/LottoMachineTest.java +++ b/src/test/java/lotto/LottoMachineTest.java @@ -15,13 +15,13 @@ void makeLottoTicket() { LottoMachine lottoMachine = LottoMachine.newMachine(); List numbers1 = new ArrayList<>(List.of(1, 3, 5, 7, 9, 11)); List numbers2 = new ArrayList<>(List.of(2, 4, 6, 8, 10, 12)); - lottoMachine.makeLottoTicket(numbers1); - lottoMachine.makeLottoTicket(numbers2); + lottoMachine.makeTicket(numbers1); + lottoMachine.makeTicket(numbers2); - LottoTicket firstTicket = lottoMachine.getLottoTickets().get(0); + LottoTicket firstTicket = lottoMachine.getTickets().get(0); assertThat(firstTicket.getLottoNumbers()).isEqualTo(numbers1); - LottoTicket secondTicket = lottoMachine.getLottoTickets().get(1); + LottoTicket secondTicket = lottoMachine.getTickets().get(1); assertThat(secondTicket.getLottoNumbers()).isEqualTo(numbers2); } @@ -31,6 +31,6 @@ void makeLottoTicketsWithMoney() { LottoMachine lottoMachine = LottoMachine.newMachine(); lottoMachine.makeTicketsWithMoney(money); - assertThat(lottoMachine.getLottoTickets()).hasSize(14); + assertThat(lottoMachine.getTickets()).hasSize(14); } } From ec3449f83cb3f25ae1ce5a28ded9e03fc6d8a68c Mon Sep 17 00:00:00 2001 From: woomin Date: Fri, 19 Jun 2020 14:19:39 +0900 Subject: [PATCH 14/25] Add getNumbers() in RandomGenerator by TDD --- src/main/java/lotto/domain/LottoTicket.java | 2 +- .../java/lotto/domain/RandomGenerator.java | 29 +++++++++++++++++++ src/test/java/lotto/RandomGeneratorTest.java | 19 ++++++++++++ 3 files changed, 49 insertions(+), 1 deletion(-) create mode 100644 src/main/java/lotto/domain/RandomGenerator.java create mode 100644 src/test/java/lotto/RandomGeneratorTest.java diff --git a/src/main/java/lotto/domain/LottoTicket.java b/src/main/java/lotto/domain/LottoTicket.java index 3216437..65f598f 100644 --- a/src/main/java/lotto/domain/LottoTicket.java +++ b/src/main/java/lotto/domain/LottoTicket.java @@ -17,4 +17,4 @@ public static LottoTicket newLotto(List numbers) { public List getLottoNumbers() { return this.lottoNumbers; } -} +} \ No newline at end of file diff --git a/src/main/java/lotto/domain/RandomGenerator.java b/src/main/java/lotto/domain/RandomGenerator.java new file mode 100644 index 0000000..a70da35 --- /dev/null +++ b/src/main/java/lotto/domain/RandomGenerator.java @@ -0,0 +1,29 @@ +package lotto.domain; + +import java.util.ArrayList; +import java.util.Collections; +import java.util.List; + +public class RandomGenerator { + + private final List numbers; + + public RandomGenerator() { + this.numbers = new ArrayList<>(); + for (int i = 1; i <= 45; i += 1) { + numbers.add(i); + } + } + + public static RandomGenerator newGenerator() { + return new RandomGenerator(); + } + + public List getNumbers() { + Collections.shuffle(numbers); + List sixNumbers = numbers.subList(0, 6); + Collections.sort(sixNumbers); + + return sixNumbers; + } +} diff --git a/src/test/java/lotto/RandomGeneratorTest.java b/src/test/java/lotto/RandomGeneratorTest.java new file mode 100644 index 0000000..c62805a --- /dev/null +++ b/src/test/java/lotto/RandomGeneratorTest.java @@ -0,0 +1,19 @@ +package lotto; + +import lotto.domain.RandomGenerator; +import org.junit.jupiter.api.Test; + +import java.util.List; + +import static org.assertj.core.api.Assertions.assertThat; + +public class RandomGeneratorTest { + @Test + void getNumbers() { + RandomGenerator randomGenerator = RandomGenerator.newGenerator(); + + List numbers = randomGenerator.getNumbers(); + + assertThat(numbers).hasSize(6); + } +} From 8ac2e1e552cda1960d69f9b62c9a57fd4fcd1efd Mon Sep 17 00:00:00 2001 From: woomin Date: Fri, 19 Jun 2020 14:20:59 +0900 Subject: [PATCH 15/25] Fix makeTicketsWithMoney() => inject randomNumbers --- src/main/java/lotto/domain/LottoMachine.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/main/java/lotto/domain/LottoMachine.java b/src/main/java/lotto/domain/LottoMachine.java index 5ab0b2f..671f071 100644 --- a/src/main/java/lotto/domain/LottoMachine.java +++ b/src/main/java/lotto/domain/LottoMachine.java @@ -26,7 +26,8 @@ public void makeTicket(List numbers) { public void makeTicketsWithMoney(int money) { for (int i = 0; i < money / 1000; i += 1) { - this.makeTicket(List.of(1, 2, 3, 4, 5, 6)); + List randomNumbers = RandomGenerator.newGenerator().getNumbers(); + this.makeTicket(randomNumbers); } } } From a52d76445fc3c77879f7603327bad8f74c05bac2 Mon Sep 17 00:00:00 2001 From: woomin Date: Fri, 19 Jun 2020 14:30:06 +0900 Subject: [PATCH 16/25] Add getUserInputMoney() in Input --- .../java/lotto/controller/LottoApplication.java | 10 ++++++++++ src/main/java/lotto/view/Input.java | 15 +++++++++++++++ src/main/java/lotto/view/Output.java | 4 ++++ 3 files changed, 29 insertions(+) create mode 100644 src/main/java/lotto/controller/LottoApplication.java create mode 100644 src/main/java/lotto/view/Input.java create mode 100644 src/main/java/lotto/view/Output.java diff --git a/src/main/java/lotto/controller/LottoApplication.java b/src/main/java/lotto/controller/LottoApplication.java new file mode 100644 index 0000000..ae57681 --- /dev/null +++ b/src/main/java/lotto/controller/LottoApplication.java @@ -0,0 +1,10 @@ +package lotto.controller; + +import lotto.view.Input; + +public class LottoApplication { + public static void main(String[] args) { + int money = Input.getUserInputMoney(); + + } +} diff --git a/src/main/java/lotto/view/Input.java b/src/main/java/lotto/view/Input.java new file mode 100644 index 0000000..b2e037a --- /dev/null +++ b/src/main/java/lotto/view/Input.java @@ -0,0 +1,15 @@ +package lotto.view; + +import java.util.Scanner; + +public class Input { + public static int getUserInputMoney() { + System.out.println("로또 구입 금액을 입력해주세요"); + Scanner scanner = new Scanner(System.in); + + int money = scanner.nextInt(); + System.out.printf("%d개를 구매하셨습니다.", money / 1000); + + return money; + } +} diff --git a/src/main/java/lotto/view/Output.java b/src/main/java/lotto/view/Output.java new file mode 100644 index 0000000..df86694 --- /dev/null +++ b/src/main/java/lotto/view/Output.java @@ -0,0 +1,4 @@ +package lotto.view; + +public class Output { +} From 58d6ae1365d04931894e9316c7181b9cf39b5fe0 Mon Sep 17 00:00:00 2001 From: woomin Date: Fri, 19 Jun 2020 14:36:24 +0900 Subject: [PATCH 17/25] Add showLottoTickets() in Output --- src/main/java/lotto/controller/LottoApplication.java | 6 ++++++ src/main/java/lotto/view/Input.java | 2 +- src/main/java/lotto/view/Output.java | 8 ++++++++ 3 files changed, 15 insertions(+), 1 deletion(-) diff --git a/src/main/java/lotto/controller/LottoApplication.java b/src/main/java/lotto/controller/LottoApplication.java index ae57681..c779fa4 100644 --- a/src/main/java/lotto/controller/LottoApplication.java +++ b/src/main/java/lotto/controller/LottoApplication.java @@ -1,10 +1,16 @@ package lotto.controller; +import lotto.domain.LottoMachine; import lotto.view.Input; +import lotto.view.Output; public class LottoApplication { public static void main(String[] args) { int money = Input.getUserInputMoney(); + LottoMachine lottoMachine = LottoMachine.newMachine(); + lottoMachine.makeTicketsWithMoney(money); + + Output.showLottoTickets(lottoMachine.getTickets()); } } diff --git a/src/main/java/lotto/view/Input.java b/src/main/java/lotto/view/Input.java index b2e037a..ee51d59 100644 --- a/src/main/java/lotto/view/Input.java +++ b/src/main/java/lotto/view/Input.java @@ -8,7 +8,7 @@ public static int getUserInputMoney() { Scanner scanner = new Scanner(System.in); int money = scanner.nextInt(); - System.out.printf("%d개를 구매하셨습니다.", money / 1000); + System.out.printf("%d개를 구매하셨습니다.\n", money / 1000); return money; } diff --git a/src/main/java/lotto/view/Output.java b/src/main/java/lotto/view/Output.java index df86694..3d12b58 100644 --- a/src/main/java/lotto/view/Output.java +++ b/src/main/java/lotto/view/Output.java @@ -1,4 +1,12 @@ package lotto.view; +import lotto.domain.LottoTicket; + +import java.util.List; + public class Output { + public static void showLottoTickets(List tickets) { + System.out.println(""); + tickets.forEach(ticket -> System.out.println(ticket.getLottoNumbers())); + } } From 8e0bae198aed8baa1a0a970975cebfc08b597db2 Mon Sep 17 00:00:00 2001 From: woomin Date: Fri, 19 Jun 2020 14:38:15 +0900 Subject: [PATCH 18/25] Add getWinningNumbers() in Input --- src/main/java/lotto/controller/LottoApplication.java | 3 +++ src/main/java/lotto/view/Input.java | 9 ++++++++- 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/src/main/java/lotto/controller/LottoApplication.java b/src/main/java/lotto/controller/LottoApplication.java index c779fa4..b71c3c9 100644 --- a/src/main/java/lotto/controller/LottoApplication.java +++ b/src/main/java/lotto/controller/LottoApplication.java @@ -12,5 +12,8 @@ public static void main(String[] args) { lottoMachine.makeTicketsWithMoney(money); Output.showLottoTickets(lottoMachine.getTickets()); + + String winning = Input.getWinningNumbers(); + } } diff --git a/src/main/java/lotto/view/Input.java b/src/main/java/lotto/view/Input.java index ee51d59..3194430 100644 --- a/src/main/java/lotto/view/Input.java +++ b/src/main/java/lotto/view/Input.java @@ -4,7 +4,7 @@ public class Input { public static int getUserInputMoney() { - System.out.println("로또 구입 금액을 입력해주세요"); + System.out.println("로또 구입 금액을 입력해주세요."); Scanner scanner = new Scanner(System.in); int money = scanner.nextInt(); @@ -12,4 +12,11 @@ public static int getUserInputMoney() { return money; } + + public static String getWinningNumbers() { + System.out.println("당첨 번호를 입력해주세요."); + Scanner scanner = new Scanner(System.in); + + return scanner.nextLine(); + } } From d1a06e9277e4db15bad902d2bf48c5e3d0f37ce8 Mon Sep 17 00:00:00 2001 From: woomin Date: Fri, 19 Jun 2020 14:57:48 +0900 Subject: [PATCH 19/25] Add converToLottoNumber() in LottoChecker by TDD --- src/main/java/lotto/domain/LottoChecker.java | 19 +++++++++++++++++++ src/test/java/lotto/LottoCheckerTest.java | 20 ++++++++++++++++++++ 2 files changed, 39 insertions(+) create mode 100644 src/main/java/lotto/domain/LottoChecker.java create mode 100644 src/test/java/lotto/LottoCheckerTest.java diff --git a/src/main/java/lotto/domain/LottoChecker.java b/src/main/java/lotto/domain/LottoChecker.java new file mode 100644 index 0000000..cab7e8e --- /dev/null +++ b/src/main/java/lotto/domain/LottoChecker.java @@ -0,0 +1,19 @@ +package lotto.domain; + +import java.util.Arrays; +import java.util.List; + +public class LottoChecker { + public static LottoChecker newChecker() { + return new LottoChecker(); + } + + public List convertToLottoNumber(String input) { + return Arrays.asList( + Arrays.stream(input.split(",")) + .mapToInt(Integer::parseInt) + .boxed() + .toArray(Integer[]::new) + ); + } +} diff --git a/src/test/java/lotto/LottoCheckerTest.java b/src/test/java/lotto/LottoCheckerTest.java new file mode 100644 index 0000000..7215eb0 --- /dev/null +++ b/src/test/java/lotto/LottoCheckerTest.java @@ -0,0 +1,20 @@ +package lotto; + +import lotto.domain.LottoChecker; +import org.junit.jupiter.api.Test; + +import java.util.List; + +import static org.assertj.core.api.Assertions.assertThat; + +public class LottoCheckerTest { + @Test + void convertToLottoNumber() { + LottoChecker lottoChecker = LottoChecker.newChecker(); + String input = "1,2,3,4,5,6"; + + List lottoNumbers = lottoChecker.convertToLottoNumber(input); + + assertThat(lottoNumbers).containsExactly(1, 2, 3, 4, 5, 6); + } +} From 94c6b1b877abe5e641766f8c2f428805e8fe4660 Mon Sep 17 00:00:00 2001 From: woomin Date: Fri, 19 Jun 2020 15:01:18 +0900 Subject: [PATCH 20/25] Modify convertToLottoNumbers() to constructor --- src/main/java/lotto/domain/LottoChecker.java | 19 ++++++++++++------- src/test/java/lotto/LottoCheckerTest.java | 8 -------- 2 files changed, 12 insertions(+), 15 deletions(-) diff --git a/src/main/java/lotto/domain/LottoChecker.java b/src/main/java/lotto/domain/LottoChecker.java index cab7e8e..5b8e4cc 100644 --- a/src/main/java/lotto/domain/LottoChecker.java +++ b/src/main/java/lotto/domain/LottoChecker.java @@ -4,16 +4,21 @@ import java.util.List; public class LottoChecker { - public static LottoChecker newChecker() { - return new LottoChecker(); - } - public List convertToLottoNumber(String input) { - return Arrays.asList( - Arrays.stream(input.split(",")) + private final List winningNumbers; + + public LottoChecker(String winnings) { + this.winningNumbers = + Arrays.asList( + Arrays.stream(winnings.split(",")) .mapToInt(Integer::parseInt) .boxed() .toArray(Integer[]::new) - ); + ); } + + public static LottoChecker newChecker(String winnings) { + return new LottoChecker(winnings); + } + } diff --git a/src/test/java/lotto/LottoCheckerTest.java b/src/test/java/lotto/LottoCheckerTest.java index 7215eb0..05c5d1c 100644 --- a/src/test/java/lotto/LottoCheckerTest.java +++ b/src/test/java/lotto/LottoCheckerTest.java @@ -8,13 +8,5 @@ import static org.assertj.core.api.Assertions.assertThat; public class LottoCheckerTest { - @Test - void convertToLottoNumber() { - LottoChecker lottoChecker = LottoChecker.newChecker(); - String input = "1,2,3,4,5,6"; - List lottoNumbers = lottoChecker.convertToLottoNumber(input); - - assertThat(lottoNumbers).containsExactly(1, 2, 3, 4, 5, 6); - } } From 6ad8d9bb74e6e71766cb3021266c0eb77efc9bfb Mon Sep 17 00:00:00 2001 From: woomin Date: Fri, 19 Jun 2020 15:11:13 +0900 Subject: [PATCH 21/25] Add checkTicket() in LottoChecker by TDD --- src/main/java/lotto/domain/LottoChecker.java | 19 +++++++++++++++++++ src/test/java/lotto/LottoCheckerTest.java | 10 ++++++++++ 2 files changed, 29 insertions(+) diff --git a/src/main/java/lotto/domain/LottoChecker.java b/src/main/java/lotto/domain/LottoChecker.java index 5b8e4cc..67eb078 100644 --- a/src/main/java/lotto/domain/LottoChecker.java +++ b/src/main/java/lotto/domain/LottoChecker.java @@ -1,5 +1,6 @@ package lotto.domain; +import java.lang.reflect.WildcardType; import java.util.Arrays; import java.util.List; @@ -21,4 +22,22 @@ public static LottoChecker newChecker(String winnings) { return new LottoChecker(winnings); } + public int checkTicket(LottoTicket ticket) { + List ticketNumbers = ticket.getLottoNumbers(); + + int count = 0; + for (Integer number : winningNumbers) { + count = getCount(ticketNumbers, count, number); + } + + return count; + } + + private int getCount(List ticketNumbers, int count, Integer number) { + if (ticketNumbers.contains(number)) { + count += 1; + } + + return count; + } } diff --git a/src/test/java/lotto/LottoCheckerTest.java b/src/test/java/lotto/LottoCheckerTest.java index 05c5d1c..19cdd07 100644 --- a/src/test/java/lotto/LottoCheckerTest.java +++ b/src/test/java/lotto/LottoCheckerTest.java @@ -1,6 +1,7 @@ package lotto; import lotto.domain.LottoChecker; +import lotto.domain.LottoTicket; import org.junit.jupiter.api.Test; import java.util.List; @@ -8,5 +9,14 @@ import static org.assertj.core.api.Assertions.assertThat; public class LottoCheckerTest { + @Test + void checkTicket() { + String winningNumbers = "1,2,3,4,5,6"; + LottoChecker lottoChecker = LottoChecker.newChecker(winningNumbers); + LottoTicket ticket = LottoTicket.newLotto(List.of(1, 2, 3, 4, 11, 12)); + int count = lottoChecker.checkTicket(ticket); + + assertThat(count).isEqualTo(4); + } } From fc8691e6fc5c8c24fb8b4f482080862576ceb3ba Mon Sep 17 00:00:00 2001 From: woomin Date: Fri, 19 Jun 2020 15:24:27 +0900 Subject: [PATCH 22/25] Add checkAllTickets() in LottoChecker by TDD --- src/main/java/lotto/domain/LottoChecker.java | 22 +++++++++++++++ src/test/java/lotto/LottoCheckerTest.java | 28 ++++++++++++++++++++ 2 files changed, 50 insertions(+) diff --git a/src/main/java/lotto/domain/LottoChecker.java b/src/main/java/lotto/domain/LottoChecker.java index 67eb078..702c0e2 100644 --- a/src/main/java/lotto/domain/LottoChecker.java +++ b/src/main/java/lotto/domain/LottoChecker.java @@ -3,12 +3,16 @@ import java.lang.reflect.WildcardType; import java.util.Arrays; import java.util.List; +import java.util.Map; +import java.util.TreeMap; public class LottoChecker { + private final Map checkCounter; private final List winningNumbers; public LottoChecker(String winnings) { + this.checkCounter = new TreeMap<>(); this.winningNumbers = Arrays.asList( Arrays.stream(winnings.split(",")) @@ -40,4 +44,22 @@ private int getCount(List ticketNumbers, int count, Integer number) { return count; } + + public Map checkAllTickets(List tickets) { + for (LottoTicket ticket : tickets) { + addCheckCounter(this.checkTicket(ticket)); + } + + return this.checkCounter; + } + + private void addCheckCounter(int count) { + if (this.checkCounter.containsKey(count)) { + this.checkCounter.put(count, this.checkCounter.get(count) + 1); + + return; + } + + this.checkCounter.put(count, 1); + } } diff --git a/src/test/java/lotto/LottoCheckerTest.java b/src/test/java/lotto/LottoCheckerTest.java index 19cdd07..71c193c 100644 --- a/src/test/java/lotto/LottoCheckerTest.java +++ b/src/test/java/lotto/LottoCheckerTest.java @@ -1,10 +1,14 @@ package lotto; import lotto.domain.LottoChecker; +import lotto.domain.LottoMachine; import lotto.domain.LottoTicket; import org.junit.jupiter.api.Test; +import org.junit.jupiter.params.ParameterizedTest; +import org.junit.jupiter.params.provider.CsvSource; import java.util.List; +import java.util.Map; import static org.assertj.core.api.Assertions.assertThat; @@ -19,4 +23,28 @@ void checkTicket() { assertThat(count).isEqualTo(4); } + + @ParameterizedTest + @CsvSource(value = { + "1,0", + "2,1", + "3,1", + "4,0", + "5,0", + "6,0", + }) + void checkAllTickets(Integer key, Integer value) { + LottoMachine lottoMachine = LottoMachine.newMachine(); + lottoMachine.makeTicket(List.of(1, 2, 3, 11, 12, 13)); + lottoMachine.makeTicket(List.of(1, 2, 11, 12, 13, 14)); + lottoMachine.makeTicket(List.of(11, 12, 13, 14, 15, 16)); + + List tickets = lottoMachine.getTickets(); + + String winningNumbers = "1,2,3,4,5,6"; + LottoChecker lottoChecker = LottoChecker.newChecker(winningNumbers); + Map checkCounter = lottoChecker.checkAllTickets(tickets); + + assertThat(checkCounter.getOrDefault(key, 0)).isEqualTo(value); + } } From bd9d719a67998adc81f8ab21fe2a71ef5574da73 Mon Sep 17 00:00:00 2001 From: woomin Date: Fri, 19 Jun 2020 15:33:06 +0900 Subject: [PATCH 23/25] Add result view --- .../java/lotto/controller/LottoApplication.java | 8 +++++++- src/main/java/lotto/view/Output.java | 14 ++++++++++++++ 2 files changed, 21 insertions(+), 1 deletion(-) diff --git a/src/main/java/lotto/controller/LottoApplication.java b/src/main/java/lotto/controller/LottoApplication.java index b71c3c9..6151623 100644 --- a/src/main/java/lotto/controller/LottoApplication.java +++ b/src/main/java/lotto/controller/LottoApplication.java @@ -1,9 +1,12 @@ package lotto.controller; +import lotto.domain.LottoChecker; import lotto.domain.LottoMachine; import lotto.view.Input; import lotto.view.Output; +import java.util.Map; + public class LottoApplication { public static void main(String[] args) { int money = Input.getUserInputMoney(); @@ -13,7 +16,10 @@ public static void main(String[] args) { Output.showLottoTickets(lottoMachine.getTickets()); - String winning = Input.getWinningNumbers(); + String winningNumbers = Input.getWinningNumbers(); + LottoChecker lottoChecker = LottoChecker.newChecker(winningNumbers); + Map counter = lottoChecker.checkAllTickets(lottoMachine.getTickets()); + Output.showResult(counter, money); } } diff --git a/src/main/java/lotto/view/Output.java b/src/main/java/lotto/view/Output.java index 3d12b58..3fe130b 100644 --- a/src/main/java/lotto/view/Output.java +++ b/src/main/java/lotto/view/Output.java @@ -3,10 +3,24 @@ import lotto.domain.LottoTicket; import java.util.List; +import java.util.Map; public class Output { public static void showLottoTickets(List tickets) { System.out.println(""); tickets.forEach(ticket -> System.out.println(ticket.getLottoNumbers())); } + + public static void showResult(Map counter, int money) { + System.out.println(""); + System.out.println("당첨 통계"); + System.out.println("----------------------------"); + System.out.printf("3개 일치 (5,000원) - %d개\n", counter.getOrDefault(3, 0)); + System.out.printf("4개 일치 (50,000원) - %d개\n", counter.getOrDefault(4, 0)); + System.out.printf("5개 일치 (1,500,000원) - %d개\n", counter.getOrDefault(5, 0)); + System.out.printf("모두 일치 (2,000,000,000원) - %d개\n", counter.getOrDefault(6, 0)); + System.out.println(""); + + System.out.printf("총 수익률은 %.2f입니다.", ); + } } From 5f818e211900542866f3c7c599d762a1a3bb7484 Mon Sep 17 00:00:00 2001 From: woomin Date: Fri, 19 Jun 2020 15:48:33 +0900 Subject: [PATCH 24/25] Add getting totalWinning logic to checkAllTickets --- src/main/java/lotto/domain/LottoChecker.java | 11 +++++++++ src/main/java/lotto/view/Output.java | 3 ++- src/test/java/lotto/LottoCheckerTest.java | 24 +++++++++++++------- 3 files changed, 29 insertions(+), 9 deletions(-) diff --git a/src/main/java/lotto/domain/LottoChecker.java b/src/main/java/lotto/domain/LottoChecker.java index 702c0e2..31df5cc 100644 --- a/src/main/java/lotto/domain/LottoChecker.java +++ b/src/main/java/lotto/domain/LottoChecker.java @@ -50,6 +50,8 @@ public Map checkAllTickets(List tickets) { addCheckCounter(this.checkTicket(ticket)); } + addTotalWinningMoney(); + return this.checkCounter; } @@ -62,4 +64,13 @@ private void addCheckCounter(int count) { this.checkCounter.put(count, 1); } + + private void addTotalWinningMoney() { + int totalWinningMoney = (5_000 * this.checkCounter.getOrDefault(3, 0)) + + (50_000 * this.checkCounter.getOrDefault(4, 0)) + + (1_500_000 * this.checkCounter.getOrDefault(5, 0)) + + (2_000_000_000 * this.checkCounter.getOrDefault(6, 0)); + + this.checkCounter.put(7, totalWinningMoney); + } } diff --git a/src/main/java/lotto/view/Output.java b/src/main/java/lotto/view/Output.java index 3fe130b..c4fbff6 100644 --- a/src/main/java/lotto/view/Output.java +++ b/src/main/java/lotto/view/Output.java @@ -21,6 +21,7 @@ public static void showResult(Map counter, int money) { System.out.printf("모두 일치 (2,000,000,000원) - %d개\n", counter.getOrDefault(6, 0)); System.out.println(""); - System.out.printf("총 수익률은 %.2f입니다.", ); + + System.out.printf("총 수익률은 %.2f입니다."); } } diff --git a/src/test/java/lotto/LottoCheckerTest.java b/src/test/java/lotto/LottoCheckerTest.java index 71c193c..14f9b26 100644 --- a/src/test/java/lotto/LottoCheckerTest.java +++ b/src/test/java/lotto/LottoCheckerTest.java @@ -3,6 +3,7 @@ import lotto.domain.LottoChecker; import lotto.domain.LottoMachine; import lotto.domain.LottoTicket; +import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; import org.junit.jupiter.params.ParameterizedTest; import org.junit.jupiter.params.provider.CsvSource; @@ -24,6 +25,20 @@ void checkTicket() { assertThat(count).isEqualTo(4); } + LottoMachine lottoMachine; + LottoChecker lottoChecker; + + @BeforeEach + void init() { + lottoMachine = LottoMachine.newMachine(); + lottoMachine.makeTicket(List.of(1, 2, 3, 11, 12, 13)); + lottoMachine.makeTicket(List.of(1, 2, 11, 12, 13, 14)); + lottoMachine.makeTicket(List.of(11, 12, 13, 14, 15, 16)); + + String winningNumbers = "1,2,3,4,5,6"; + lottoChecker = LottoChecker.newChecker(winningNumbers); + } + @ParameterizedTest @CsvSource(value = { "1,0", @@ -32,17 +47,10 @@ void checkTicket() { "4,0", "5,0", "6,0", + "7,5000" }) void checkAllTickets(Integer key, Integer value) { - LottoMachine lottoMachine = LottoMachine.newMachine(); - lottoMachine.makeTicket(List.of(1, 2, 3, 11, 12, 13)); - lottoMachine.makeTicket(List.of(1, 2, 11, 12, 13, 14)); - lottoMachine.makeTicket(List.of(11, 12, 13, 14, 15, 16)); - List tickets = lottoMachine.getTickets(); - - String winningNumbers = "1,2,3,4,5,6"; - LottoChecker lottoChecker = LottoChecker.newChecker(winningNumbers); Map checkCounter = lottoChecker.checkAllTickets(tickets); assertThat(checkCounter.getOrDefault(key, 0)).isEqualTo(value); From 0d0cbf780f0fd050a35ebee375e7e79b2048f505 Mon Sep 17 00:00:00 2001 From: woomin Date: Fri, 19 Jun 2020 15:53:16 +0900 Subject: [PATCH 25/25] End --- src/main/java/lotto/domain/LottoChecker.java | 3 ++- src/main/java/lotto/view/Output.java | 3 +-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/main/java/lotto/domain/LottoChecker.java b/src/main/java/lotto/domain/LottoChecker.java index 31df5cc..4700363 100644 --- a/src/main/java/lotto/domain/LottoChecker.java +++ b/src/main/java/lotto/domain/LottoChecker.java @@ -66,7 +66,8 @@ private void addCheckCounter(int count) { } private void addTotalWinningMoney() { - int totalWinningMoney = (5_000 * this.checkCounter.getOrDefault(3, 0)) + int totalWinningMoney = + (5_000 * this.checkCounter.getOrDefault(3, 0)) + (50_000 * this.checkCounter.getOrDefault(4, 0)) + (1_500_000 * this.checkCounter.getOrDefault(5, 0)) + (2_000_000_000 * this.checkCounter.getOrDefault(6, 0)); diff --git a/src/main/java/lotto/view/Output.java b/src/main/java/lotto/view/Output.java index c4fbff6..12a1a98 100644 --- a/src/main/java/lotto/view/Output.java +++ b/src/main/java/lotto/view/Output.java @@ -21,7 +21,6 @@ public static void showResult(Map counter, int money) { System.out.printf("모두 일치 (2,000,000,000원) - %d개\n", counter.getOrDefault(6, 0)); System.out.println(""); - - System.out.printf("총 수익률은 %.2f입니다."); + System.out.printf("총 수익률은 %.2f입니다.\n\n\n", (double) counter.get(7) / money); } }