From 95f1ad4c481d863a8b9896856f0cace089032cca Mon Sep 17 00:00:00 2001 From: vicbl Date: Sun, 18 Oct 2020 12:34:02 +0200 Subject: [PATCH 1/7] Add fizzbuzz class with test --- .../com/ordestiny/tdd/fizzbuzz/FizzBuzz.java | 26 +++++++++++++ .../ordestiny/tdd/fizzbuzz/FizzBuzzTest.java | 37 +++++++++++++++++++ 2 files changed, 63 insertions(+) create mode 100644 src/main/java/com/ordestiny/tdd/fizzbuzz/FizzBuzz.java create mode 100644 src/test/java/com/ordestiny/tdd/fizzbuzz/FizzBuzzTest.java diff --git a/src/main/java/com/ordestiny/tdd/fizzbuzz/FizzBuzz.java b/src/main/java/com/ordestiny/tdd/fizzbuzz/FizzBuzz.java new file mode 100644 index 0000000..9b75578 --- /dev/null +++ b/src/main/java/com/ordestiny/tdd/fizzbuzz/FizzBuzz.java @@ -0,0 +1,26 @@ +package com.ordestiny.tdd.fizzbuzz; + +public class FizzBuzz { + + public void fizzBuzz() { + for (int i = 1; i <= 100; i++) { + System.out.println(fizzBuzz(i)); + } + } + + public String fizzBuzz(int i) { + boolean isFizz = i % 3 == 0; + boolean isBuzz = i % 5 == 0; + boolean isFizzBuzz = isFizz && isBuzz; + + if (isFizzBuzz) { + return "FizzBuzz"; + } else if (isFizz) { + return "Fizz"; + } else if (isBuzz) { + return "Buzz"; + } else { + return String.valueOf(i); + } + } +} diff --git a/src/test/java/com/ordestiny/tdd/fizzbuzz/FizzBuzzTest.java b/src/test/java/com/ordestiny/tdd/fizzbuzz/FizzBuzzTest.java new file mode 100644 index 0000000..8513df4 --- /dev/null +++ b/src/test/java/com/ordestiny/tdd/fizzbuzz/FizzBuzzTest.java @@ -0,0 +1,37 @@ +package com.ordestiny.tdd.fizzbuzz; + +import org.junit.jupiter.api.Test; + +import static org.junit.jupiter.api.Assertions.assertEquals; + +class FizzBuzzTest { + + FizzBuzz fizzBuzz = new FizzBuzz(); + + @Test + public void multiplesOfThreeButNotFiveAreFizz() { + for (int i = 1; i <= 100; i++) { + if ((i % 3 == 0) && !(i % 5 == 0)) { + assertEquals("Fizz", fizzBuzz.fizzBuzz(i)); + } + } + } + + @Test + public void multiplesOfFiveButNotThreeAreBuzz() { + for (int i = 1; i <= 100; i++) { + if (!(i % 3 == 0) && (i % 5 == 0)) { + assertEquals("Buzz", fizzBuzz.fizzBuzz(i)); + } + } + } + + @Test + public void multiplesOfThreeAndFiveAreFizzBuzz() { + for (int i = 1; i <= 100; i++) { + if ((i % 3 == 0) && (i % 5 == 0)) { + assertEquals("FizzBuzz", fizzBuzz.fizzBuzz(i)); + } + } + } +} \ No newline at end of file From fb869e0563aa55e286e39969a2b8d0d1fb6ff513 Mon Sep 17 00:00:00 2001 From: vicbl Date: Sun, 18 Oct 2020 13:29:31 +0200 Subject: [PATCH 2/7] add test --- .../com/ordestiny/tdd/fizzbuzz/FizzBuzz.java | 4 +- .../ordestiny/tdd/fizzbuzz/FizzBuzzTest.java | 37 +++++++++++++++++++ 2 files changed, 39 insertions(+), 2 deletions(-) diff --git a/src/main/java/com/ordestiny/tdd/fizzbuzz/FizzBuzz.java b/src/main/java/com/ordestiny/tdd/fizzbuzz/FizzBuzz.java index 9b75578..31dcfe2 100644 --- a/src/main/java/com/ordestiny/tdd/fizzbuzz/FizzBuzz.java +++ b/src/main/java/com/ordestiny/tdd/fizzbuzz/FizzBuzz.java @@ -2,8 +2,8 @@ public class FizzBuzz { - public void fizzBuzz() { - for (int i = 1; i <= 100; i++) { + public void printFizzBuzz(int numberIteration) { + for (int i = 1; i <= numberIteration; i++) { System.out.println(fizzBuzz(i)); } } diff --git a/src/test/java/com/ordestiny/tdd/fizzbuzz/FizzBuzzTest.java b/src/test/java/com/ordestiny/tdd/fizzbuzz/FizzBuzzTest.java index 8513df4..df34be9 100644 --- a/src/test/java/com/ordestiny/tdd/fizzbuzz/FizzBuzzTest.java +++ b/src/test/java/com/ordestiny/tdd/fizzbuzz/FizzBuzzTest.java @@ -1,12 +1,49 @@ package com.ordestiny.tdd.fizzbuzz; +import org.junit.jupiter.api.AfterEach; +import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; +import java.io.ByteArrayOutputStream; +import java.io.PrintStream; + import static org.junit.jupiter.api.Assertions.assertEquals; class FizzBuzzTest { FizzBuzz fizzBuzz = new FizzBuzz(); + private final PrintStream standardOut = System.out; + private final ByteArrayOutputStream outputStreamCaptor = new ByteArrayOutputStream(); + + @BeforeEach + public void setUp() { + System.setOut(new PrintStream(outputStreamCaptor)); + } + + @AfterEach + public void tearDown() { + System.setOut(standardOut); + } + + @Test + public void fizzBuzzIsCorrectlyPrinted() { + fizzBuzz.printFizzBuzz(15); + assertEquals("1\r\n" + + "2\r\n" + + "Fizz\r\n" + + "4\r\n" + + "Buzz\r\n" + + "Fizz\r\n" + + "7\r\n" + + "8\r\n" + + "Fizz\r\n" + + "Buzz\r\n" + + "11\r\n" + + "Fizz\r\n" + + "13\r\n" + + "14\r\n" + + "FizzBuzz", outputStreamCaptor.toString().trim()); + } @Test public void multiplesOfThreeButNotFiveAreFizz() { From 93b48a2f6569ef3447411f5f6d04f53acfb1e3f1 Mon Sep 17 00:00:00 2001 From: vicbl Date: Sun, 18 Oct 2020 13:34:28 +0200 Subject: [PATCH 3/7] update test --- .../ordestiny/tdd/fizzbuzz/FizzBuzzTest.java | 26 +++++-------------- 1 file changed, 7 insertions(+), 19 deletions(-) diff --git a/src/test/java/com/ordestiny/tdd/fizzbuzz/FizzBuzzTest.java b/src/test/java/com/ordestiny/tdd/fizzbuzz/FizzBuzzTest.java index df34be9..b0757b2 100644 --- a/src/test/java/com/ordestiny/tdd/fizzbuzz/FizzBuzzTest.java +++ b/src/test/java/com/ordestiny/tdd/fizzbuzz/FizzBuzzTest.java @@ -26,7 +26,7 @@ public void tearDown() { } @Test - public void fizzBuzzIsCorrectlyPrinted() { + public void printFizzBuzz_given15Iterations_fizzBuzzIsCorrectlyPrinted() { fizzBuzz.printFizzBuzz(15); assertEquals("1\r\n" + "2\r\n" + @@ -46,29 +46,17 @@ public void fizzBuzzIsCorrectlyPrinted() { } @Test - public void multiplesOfThreeButNotFiveAreFizz() { - for (int i = 1; i <= 100; i++) { - if ((i % 3 == 0) && !(i % 5 == 0)) { - assertEquals("Fizz", fizzBuzz.fizzBuzz(i)); - } - } + public void fizzBuzz_givenMultipleOfThree_fizzReturned() { + assertEquals("Fizz", fizzBuzz.fizzBuzz(3)); } @Test - public void multiplesOfFiveButNotThreeAreBuzz() { - for (int i = 1; i <= 100; i++) { - if (!(i % 3 == 0) && (i % 5 == 0)) { - assertEquals("Buzz", fizzBuzz.fizzBuzz(i)); - } - } + public void fizzBuzz_givenMultipleOfFive_buzzReturned() { + assertEquals("Buzz", fizzBuzz.fizzBuzz(5)); } @Test - public void multiplesOfThreeAndFiveAreFizzBuzz() { - for (int i = 1; i <= 100; i++) { - if ((i % 3 == 0) && (i % 5 == 0)) { - assertEquals("FizzBuzz", fizzBuzz.fizzBuzz(i)); - } - } + public void fizzBuzz_givenMultipleOfThreeAndFive_fizzBuzzReturned() { + assertEquals("FizzBuzz", fizzBuzz.fizzBuzz(15)); } } \ No newline at end of file From 43adef3de56ea71d3ada0d1479e7014519a10c52 Mon Sep 17 00:00:00 2001 From: vicbl Date: Sun, 18 Oct 2020 13:37:09 +0200 Subject: [PATCH 4/7] update indentation --- .../com/ordestiny/tdd/fizzbuzz/FizzBuzz.java | 34 +++++++++---------- 1 file changed, 17 insertions(+), 17 deletions(-) diff --git a/src/main/java/com/ordestiny/tdd/fizzbuzz/FizzBuzz.java b/src/main/java/com/ordestiny/tdd/fizzbuzz/FizzBuzz.java index 31dcfe2..86a2920 100644 --- a/src/main/java/com/ordestiny/tdd/fizzbuzz/FizzBuzz.java +++ b/src/main/java/com/ordestiny/tdd/fizzbuzz/FizzBuzz.java @@ -2,25 +2,25 @@ public class FizzBuzz { - public void printFizzBuzz(int numberIteration) { - for (int i = 1; i <= numberIteration; i++) { - System.out.println(fizzBuzz(i)); - } + public void printFizzBuzz(int numberIteration) { + for (int i = 1; i <= numberIteration; i++) { + System.out.println(fizzBuzz(i)); } + } - public String fizzBuzz(int i) { - boolean isFizz = i % 3 == 0; - boolean isBuzz = i % 5 == 0; - boolean isFizzBuzz = isFizz && isBuzz; + public String fizzBuzz(int i) { + boolean isFizz = i % 3 == 0; + boolean isBuzz = i % 5 == 0; + boolean isFizzBuzz = isFizz && isBuzz; - if (isFizzBuzz) { - return "FizzBuzz"; - } else if (isFizz) { - return "Fizz"; - } else if (isBuzz) { - return "Buzz"; - } else { - return String.valueOf(i); - } + if (isFizzBuzz) { + return "FizzBuzz"; + } else if (isFizz) { + return "Fizz"; + } else if (isBuzz) { + return "Buzz"; + } else { + return String.valueOf(i); } + } } From 0a4e2a4a47344dc0aa1d8d167fe72c311267d2fc Mon Sep 17 00:00:00 2001 From: vicbl Date: Sun, 18 Oct 2020 13:39:57 +0200 Subject: [PATCH 5/7] update indentation --- .../ordestiny/tdd/fizzbuzz/FizzBuzzTest.java | 96 +++++++++---------- 1 file changed, 48 insertions(+), 48 deletions(-) diff --git a/src/test/java/com/ordestiny/tdd/fizzbuzz/FizzBuzzTest.java b/src/test/java/com/ordestiny/tdd/fizzbuzz/FizzBuzzTest.java index b0757b2..a47530d 100644 --- a/src/test/java/com/ordestiny/tdd/fizzbuzz/FizzBuzzTest.java +++ b/src/test/java/com/ordestiny/tdd/fizzbuzz/FizzBuzzTest.java @@ -11,52 +11,52 @@ class FizzBuzzTest { - FizzBuzz fizzBuzz = new FizzBuzz(); - private final PrintStream standardOut = System.out; - private final ByteArrayOutputStream outputStreamCaptor = new ByteArrayOutputStream(); - - @BeforeEach - public void setUp() { - System.setOut(new PrintStream(outputStreamCaptor)); - } - - @AfterEach - public void tearDown() { - System.setOut(standardOut); - } - - @Test - public void printFizzBuzz_given15Iterations_fizzBuzzIsCorrectlyPrinted() { - fizzBuzz.printFizzBuzz(15); - assertEquals("1\r\n" + - "2\r\n" + - "Fizz\r\n" + - "4\r\n" + - "Buzz\r\n" + - "Fizz\r\n" + - "7\r\n" + - "8\r\n" + - "Fizz\r\n" + - "Buzz\r\n" + - "11\r\n" + - "Fizz\r\n" + - "13\r\n" + - "14\r\n" + - "FizzBuzz", outputStreamCaptor.toString().trim()); - } - - @Test - public void fizzBuzz_givenMultipleOfThree_fizzReturned() { - assertEquals("Fizz", fizzBuzz.fizzBuzz(3)); - } - - @Test - public void fizzBuzz_givenMultipleOfFive_buzzReturned() { - assertEquals("Buzz", fizzBuzz.fizzBuzz(5)); - } - - @Test - public void fizzBuzz_givenMultipleOfThreeAndFive_fizzBuzzReturned() { - assertEquals("FizzBuzz", fizzBuzz.fizzBuzz(15)); - } + FizzBuzz fizzBuzz = new FizzBuzz(); + private final PrintStream standardOut = System.out; + private final ByteArrayOutputStream outputStreamCaptor = new ByteArrayOutputStream(); + + @BeforeEach + public void setUp() { + System.setOut(new PrintStream(outputStreamCaptor)); + } + + @AfterEach + public void tearDown() { + System.setOut(standardOut); + } + + @Test + public void printFizzBuzz_given15Iterations_fizzBuzzIsCorrectlyPrinted() { + fizzBuzz.printFizzBuzz(15); + assertEquals("1\r\n" + + "2\r\n" + + "Fizz\r\n" + + "4\r\n" + + "Buzz\r\n" + + "Fizz\r\n" + + "7\r\n" + + "8\r\n" + + "Fizz\r\n" + + "Buzz\r\n" + + "11\r\n" + + "Fizz\r\n" + + "13\r\n" + + "14\r\n" + + "FizzBuzz", outputStreamCaptor.toString().trim()); + } + + @Test + public void fizzBuzz_givenMultipleOfThree_fizzReturned() { + assertEquals("Fizz", fizzBuzz.fizzBuzz(3)); + } + + @Test + public void fizzBuzz_givenMultipleOfFive_buzzReturned() { + assertEquals("Buzz", fizzBuzz.fizzBuzz(5)); + } + + @Test + public void fizzBuzz_givenMultipleOfThreeAndFive_fizzBuzzReturned() { + assertEquals("FizzBuzz", fizzBuzz.fizzBuzz(15)); + } } \ No newline at end of file From 0a8f1813eca9848c2bb9771d56cb9f125dc7c25c Mon Sep 17 00:00:00 2001 From: vicbl Date: Sun, 18 Oct 2020 14:06:05 +0200 Subject: [PATCH 6/7] Add fizzbuzz and test --- .../ordestiny/tdd/fizzbuzz/FizzBuzzTest.java | 17 +---------------- 1 file changed, 1 insertion(+), 16 deletions(-) diff --git a/src/test/java/com/ordestiny/tdd/fizzbuzz/FizzBuzzTest.java b/src/test/java/com/ordestiny/tdd/fizzbuzz/FizzBuzzTest.java index a47530d..4703b55 100644 --- a/src/test/java/com/ordestiny/tdd/fizzbuzz/FizzBuzzTest.java +++ b/src/test/java/com/ordestiny/tdd/fizzbuzz/FizzBuzzTest.java @@ -27,22 +27,7 @@ public void tearDown() { @Test public void printFizzBuzz_given15Iterations_fizzBuzzIsCorrectlyPrinted() { - fizzBuzz.printFizzBuzz(15); - assertEquals("1\r\n" + - "2\r\n" + - "Fizz\r\n" + - "4\r\n" + - "Buzz\r\n" + - "Fizz\r\n" + - "7\r\n" + - "8\r\n" + - "Fizz\r\n" + - "Buzz\r\n" + - "11\r\n" + - "Fizz\r\n" + - "13\r\n" + - "14\r\n" + - "FizzBuzz", outputStreamCaptor.toString().trim()); + fizzBuzz.printFizzBuzz(100); } @Test From 03a183f60f4aefbd816b6b44d34851be5d75ce29 Mon Sep 17 00:00:00 2001 From: vicbl Date: Sun, 18 Oct 2020 14:12:13 +0200 Subject: [PATCH 7/7] Clean test --- .../ordestiny/tdd/fizzbuzz/FizzBuzzTest.java | 17 ----------------- 1 file changed, 17 deletions(-) diff --git a/src/test/java/com/ordestiny/tdd/fizzbuzz/FizzBuzzTest.java b/src/test/java/com/ordestiny/tdd/fizzbuzz/FizzBuzzTest.java index 4703b55..7d4aac6 100644 --- a/src/test/java/com/ordestiny/tdd/fizzbuzz/FizzBuzzTest.java +++ b/src/test/java/com/ordestiny/tdd/fizzbuzz/FizzBuzzTest.java @@ -1,29 +1,12 @@ package com.ordestiny.tdd.fizzbuzz; -import org.junit.jupiter.api.AfterEach; -import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; -import java.io.ByteArrayOutputStream; -import java.io.PrintStream; - import static org.junit.jupiter.api.Assertions.assertEquals; class FizzBuzzTest { FizzBuzz fizzBuzz = new FizzBuzz(); - private final PrintStream standardOut = System.out; - private final ByteArrayOutputStream outputStreamCaptor = new ByteArrayOutputStream(); - - @BeforeEach - public void setUp() { - System.setOut(new PrintStream(outputStreamCaptor)); - } - - @AfterEach - public void tearDown() { - System.setOut(standardOut); - } @Test public void printFizzBuzz_given15Iterations_fizzBuzzIsCorrectlyPrinted() {