From 3d633808b218afb08ca5c4fea40781531164155e Mon Sep 17 00:00:00 2001 From: Champ Date: Fri, 21 Feb 2025 10:02:36 +0700 Subject: [PATCH 1/4] Update Branch --- FizzBuzz-Challenge.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/FizzBuzz-Challenge.md b/FizzBuzz-Challenge.md index 149ab7d..59df3b0 100644 --- a/FizzBuzz-Challenge.md +++ b/FizzBuzz-Challenge.md @@ -42,7 +42,7 @@ fizzBuzz(8) // "8" 3. **เขียนโค้ดและ Unit Test ให้ครอบคลุม** 4. **Commit โดยใช้ข้อความที่สื่อความหมาย** เช่น `feat: implement fizzbuzz logic` 5. **Push และเปิด PR** พร้อมอธิบายโค้ด และ Test Case ที่รองรับ -6. **รอการรีวิว** และปรับแก้ตาม feedback ถ้ามี +6. **รอการรีวิว** --- From f62277f257bb4b5c68953ded49ae5b40f127ea7e Mon Sep 17 00:00:00 2001 From: SuperTop Date: Sun, 9 Mar 2025 17:09:03 +0700 Subject: [PATCH 2/4] Create function FizzBuzz Create function FizzBuzz for Programming Assignment test --- Programming Assignment/.gitignore | 29 +++++++++++++++++ Programming Assignment/.idea/.gitignore | 3 ++ Programming Assignment/.idea/misc.xml | 6 ++++ Programming Assignment/.idea/modules.xml | 8 +++++ Programming Assignment/.idea/vcs.xml | 6 ++++ .../Programming Assignment.iml | 11 +++++++ Programming Assignment/src/Main.java | 26 ++++++++++++++++ Programming Assignment/src/TestOdde.java | 31 +++++++++++++++++++ 8 files changed, 120 insertions(+) create mode 100644 Programming Assignment/.gitignore create mode 100644 Programming Assignment/.idea/.gitignore create mode 100644 Programming Assignment/.idea/misc.xml create mode 100644 Programming Assignment/.idea/modules.xml create mode 100644 Programming Assignment/.idea/vcs.xml create mode 100644 Programming Assignment/Programming Assignment.iml create mode 100644 Programming Assignment/src/Main.java create mode 100644 Programming Assignment/src/TestOdde.java diff --git a/Programming Assignment/.gitignore b/Programming Assignment/.gitignore new file mode 100644 index 0000000..f68d109 --- /dev/null +++ b/Programming Assignment/.gitignore @@ -0,0 +1,29 @@ +### IntelliJ IDEA ### +out/ +!**/src/main/**/out/ +!**/src/test/**/out/ + +### Eclipse ### +.apt_generated +.classpath +.factorypath +.project +.settings +.springBeans +.sts4-cache +bin/ +!**/src/main/**/bin/ +!**/src/test/**/bin/ + +### NetBeans ### +/nbproject/private/ +/nbbuild/ +/dist/ +/nbdist/ +/.nb-gradle/ + +### VS Code ### +.vscode/ + +### Mac OS ### +.DS_Store \ No newline at end of file diff --git a/Programming Assignment/.idea/.gitignore b/Programming Assignment/.idea/.gitignore new file mode 100644 index 0000000..26d3352 --- /dev/null +++ b/Programming Assignment/.idea/.gitignore @@ -0,0 +1,3 @@ +# Default ignored files +/shelf/ +/workspace.xml diff --git a/Programming Assignment/.idea/misc.xml b/Programming Assignment/.idea/misc.xml new file mode 100644 index 0000000..c3aa11c --- /dev/null +++ b/Programming Assignment/.idea/misc.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/Programming Assignment/.idea/modules.xml b/Programming Assignment/.idea/modules.xml new file mode 100644 index 0000000..d7dc1dd --- /dev/null +++ b/Programming Assignment/.idea/modules.xml @@ -0,0 +1,8 @@ + + + + + + + + \ No newline at end of file diff --git a/Programming Assignment/.idea/vcs.xml b/Programming Assignment/.idea/vcs.xml new file mode 100644 index 0000000..6c0b863 --- /dev/null +++ b/Programming Assignment/.idea/vcs.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/Programming Assignment/Programming Assignment.iml b/Programming Assignment/Programming Assignment.iml new file mode 100644 index 0000000..c90834f --- /dev/null +++ b/Programming Assignment/Programming Assignment.iml @@ -0,0 +1,11 @@ + + + + + + + + + + + \ No newline at end of file diff --git a/Programming Assignment/src/Main.java b/Programming Assignment/src/Main.java new file mode 100644 index 0000000..752c7d4 --- /dev/null +++ b/Programming Assignment/src/Main.java @@ -0,0 +1,26 @@ +import java.util.Scanner; + +public class Main { + public static void main(String[] args) { + Scanner scanner = new Scanner(System.in); + System.out.println("กรุณาใส่จำนวน: "); + int number = scanner.nextInt(); + String result = ""; + if(number % 3 == 0 && number % 5 == 0 && number % 7 == 0){ + result += "FizzBuzzBazz" ; + }else if(number % 3 == 0 && number % 5 == 0 ){ + result += "FizzBuzz"; + }else if(number % 3 == 0){ + result += "Fizz"; + }else if(number % 5 == 0 ){ + result += "Buzz"; + }else if(number % 7 == 0){ + result += "Bazz"; + }else{ + result += Integer.toString(number); + } + System.out.print("result : "+result); + scanner.close(); + } + +} \ No newline at end of file diff --git a/Programming Assignment/src/TestOdde.java b/Programming Assignment/src/TestOdde.java new file mode 100644 index 0000000..99b9703 --- /dev/null +++ b/Programming Assignment/src/TestOdde.java @@ -0,0 +1,31 @@ +public class TestOdde { + public static String fizzBuzzBazz(int number) { + StringBuilder result = new StringBuilder(); + + if (number % 3 == 0) { + result.append("Fizz"); + } + if (number % 5 == 0) { + result.append("Buzz"); + } + if (number % 7 == 0) { + result.append("Bazz"); + } + if (result.length() == 0) { + return String.valueOf(number); + } + return result.toString(); + } + + public static void main(String[] args) { + // test + System.out.println(fizzBuzzBazz(3)); // Fizz + System.out.println(fizzBuzzBazz(5)); // Buzz + System.out.println(fizzBuzzBazz(7)); // Bazz + System.out.println(fizzBuzzBazz(15)); // FizzBuzz + System.out.println(fizzBuzzBazz(21)); // FizzBazz + System.out.println(fizzBuzzBazz(35)); // BuzzBazz + System.out.println(fizzBuzzBazz(105)); // FizzBuzzBazz + System.out.println(fizzBuzzBazz(8)); // 8 + } +} From 2e9ad7d21f53a39d0aed7c7885bd71fbea92418a Mon Sep 17 00:00:00 2001 From: SuperTop Date: Mon, 10 Mar 2025 13:25:04 +0700 Subject: [PATCH 3/4] Update Programming Assignment Update Code fizzbuzz and refator code --- .../.gitignore | 21 ++++-- .../.idea/.gitignore | 0 Fizzbuzz/.idea/encodings.xml | 7 ++ Fizzbuzz/.idea/misc.xml | 14 ++++ Fizzbuzz/pom.xml | 32 +++++++++ Fizzbuzz/src/main/java/org/example/Main.java | 9 +++ .../src/main/java/org/example}/TestOdde.java | 6 ++ Fizzbuzz/src/test/java/FizzbuzzTest.java | 71 +++++++++++++++++++ Programming Assignment/.idea/misc.xml | 6 -- Programming Assignment/.idea/modules.xml | 8 --- Programming Assignment/.idea/vcs.xml | 6 -- .../Programming Assignment.iml | 11 --- Programming Assignment/src/Main.java | 26 ------- 13 files changed, 154 insertions(+), 63 deletions(-) rename {Programming Assignment => Fizzbuzz}/.gitignore (51%) rename {Programming Assignment => Fizzbuzz}/.idea/.gitignore (100%) create mode 100644 Fizzbuzz/.idea/encodings.xml create mode 100644 Fizzbuzz/.idea/misc.xml create mode 100644 Fizzbuzz/pom.xml create mode 100644 Fizzbuzz/src/main/java/org/example/Main.java rename {Programming Assignment/src => Fizzbuzz/src/main/java/org/example}/TestOdde.java (85%) create mode 100644 Fizzbuzz/src/test/java/FizzbuzzTest.java delete mode 100644 Programming Assignment/.idea/misc.xml delete mode 100644 Programming Assignment/.idea/modules.xml delete mode 100644 Programming Assignment/.idea/vcs.xml delete mode 100644 Programming Assignment/Programming Assignment.iml delete mode 100644 Programming Assignment/src/Main.java diff --git a/Programming Assignment/.gitignore b/Fizzbuzz/.gitignore similarity index 51% rename from Programming Assignment/.gitignore rename to Fizzbuzz/.gitignore index f68d109..5ff6309 100644 --- a/Programming Assignment/.gitignore +++ b/Fizzbuzz/.gitignore @@ -1,7 +1,16 @@ +target/ +!.mvn/wrapper/maven-wrapper.jar +!**/src/main/**/target/ +!**/src/test/**/target/ + ### IntelliJ IDEA ### -out/ -!**/src/main/**/out/ -!**/src/test/**/out/ +.idea/modules.xml +.idea/jarRepositories.xml +.idea/compiler.xml +.idea/libraries/ +*.iws +*.iml +*.ipr ### Eclipse ### .apt_generated @@ -11,9 +20,6 @@ out/ .settings .springBeans .sts4-cache -bin/ -!**/src/main/**/bin/ -!**/src/test/**/bin/ ### NetBeans ### /nbproject/private/ @@ -21,6 +27,9 @@ bin/ /dist/ /nbdist/ /.nb-gradle/ +build/ +!**/src/main/**/build/ +!**/src/test/**/build/ ### VS Code ### .vscode/ diff --git a/Programming Assignment/.idea/.gitignore b/Fizzbuzz/.idea/.gitignore similarity index 100% rename from Programming Assignment/.idea/.gitignore rename to Fizzbuzz/.idea/.gitignore diff --git a/Fizzbuzz/.idea/encodings.xml b/Fizzbuzz/.idea/encodings.xml new file mode 100644 index 0000000..aa00ffa --- /dev/null +++ b/Fizzbuzz/.idea/encodings.xml @@ -0,0 +1,7 @@ + + + + + + + \ No newline at end of file diff --git a/Fizzbuzz/.idea/misc.xml b/Fizzbuzz/.idea/misc.xml new file mode 100644 index 0000000..e122dea --- /dev/null +++ b/Fizzbuzz/.idea/misc.xml @@ -0,0 +1,14 @@ + + + + + + + + + + \ No newline at end of file diff --git a/Fizzbuzz/pom.xml b/Fizzbuzz/pom.xml new file mode 100644 index 0000000..da58c80 --- /dev/null +++ b/Fizzbuzz/pom.xml @@ -0,0 +1,32 @@ + + + 4.0.0 + + org.example + Fizzbuzz + 1.0-SNAPSHOT + + + 23 + 23 + UTF-8 + + + + org.junit.jupiter + junit-jupiter + 5.8.1 + test + + + junit + junit + 4.13.1 + test + + + + + \ No newline at end of file diff --git a/Fizzbuzz/src/main/java/org/example/Main.java b/Fizzbuzz/src/main/java/org/example/Main.java new file mode 100644 index 0000000..b964b42 --- /dev/null +++ b/Fizzbuzz/src/main/java/org/example/Main.java @@ -0,0 +1,9 @@ +package org.example; + +//TIP To Run code, press or +// click the icon in the gutter. +public class Main { + public static void main(String[] args) { + + } +} \ No newline at end of file diff --git a/Programming Assignment/src/TestOdde.java b/Fizzbuzz/src/main/java/org/example/TestOdde.java similarity index 85% rename from Programming Assignment/src/TestOdde.java rename to Fizzbuzz/src/main/java/org/example/TestOdde.java index 99b9703..b6a6ef9 100644 --- a/Programming Assignment/src/TestOdde.java +++ b/Fizzbuzz/src/main/java/org/example/TestOdde.java @@ -1,4 +1,8 @@ +package org.example; + public class TestOdde { + public String fizzBuzzBazz; + public static String fizzBuzzBazz(int number) { StringBuilder result = new StringBuilder(); @@ -27,5 +31,7 @@ public static void main(String[] args) { System.out.println(fizzBuzzBazz(35)); // BuzzBazz System.out.println(fizzBuzzBazz(105)); // FizzBuzzBazz System.out.println(fizzBuzzBazz(8)); // 8 + System.out.println(fizzBuzzBazz(0)); // FizzBuzzBazz + System.out.println(fizzBuzzBazz(-3)); // Fizz } } diff --git a/Fizzbuzz/src/test/java/FizzbuzzTest.java b/Fizzbuzz/src/test/java/FizzbuzzTest.java new file mode 100644 index 0000000..8c2a6fc --- /dev/null +++ b/Fizzbuzz/src/test/java/FizzbuzzTest.java @@ -0,0 +1,71 @@ +import org.example.TestOdde; +import org.junit.Test; + +import static org.junit.Assert.assertEquals; + +public class FizzbuzzTest { + @Test + public void testFizz() { + TestOdde calculator = new TestOdde(); + String result = calculator.fizzBuzzBazz(3); + assertEquals("3 should equal Fizz", result, "Fizz"); + } + + @Test + public void testBuzz() { + TestOdde calculator = new TestOdde(); + String result = calculator.fizzBuzzBazz(5); + assertEquals("5 should equal Buzz", result, "Buzz"); + } + + @Test + public void testFizzBuzz() { + TestOdde calculator = new TestOdde(); + String result = calculator.fizzBuzzBazz(15); + assertEquals("15 should equal FizzBuzz", result, "FizzBuzz"); + } + + @Test + public void testBazz() { + TestOdde calculator = new TestOdde(); + String result = calculator.fizzBuzzBazz(7); + assertEquals("7 should equal Bazz", result, "Bazz"); + } + + @Test + public void testNumber() { + TestOdde calculator = new TestOdde(); + String result = calculator.fizzBuzzBazz(8); + assertEquals("8 should equal 8", result, "8"); + } + + @Test + public void testZero() { + TestOdde calculator = new TestOdde(); + String result = calculator.fizzBuzzBazz(0); + assertEquals("0 should equal FizzBuzzBazz", result, "FizzBuzzBazz"); + } + + @Test + public void testNegativeNumber() { + TestOdde calculator = new TestOdde(); + String result = calculator.fizzBuzzBazz(-3); + assertEquals("-3 should equal Fizz", result, "Fizz"); + } + + @Test + public void testBuzzBazz() { + TestOdde calculator = new TestOdde(); + String result = calculator.fizzBuzzBazz(35); + assertEquals("35 should equal BuzzBazz", result, "BuzzBazz"); + } + + @Test + public void testFizzBazz() { + TestOdde calculator = new TestOdde(); + String result = calculator.fizzBuzzBazz(21); + assertEquals("21 should equal FizzBazz", result, "FizzBazz"); + } + + +} diff --git a/Programming Assignment/.idea/misc.xml b/Programming Assignment/.idea/misc.xml deleted file mode 100644 index c3aa11c..0000000 --- a/Programming Assignment/.idea/misc.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/Programming Assignment/.idea/modules.xml b/Programming Assignment/.idea/modules.xml deleted file mode 100644 index d7dc1dd..0000000 --- a/Programming Assignment/.idea/modules.xml +++ /dev/null @@ -1,8 +0,0 @@ - - - - - - - - \ No newline at end of file diff --git a/Programming Assignment/.idea/vcs.xml b/Programming Assignment/.idea/vcs.xml deleted file mode 100644 index 6c0b863..0000000 --- a/Programming Assignment/.idea/vcs.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/Programming Assignment/Programming Assignment.iml b/Programming Assignment/Programming Assignment.iml deleted file mode 100644 index c90834f..0000000 --- a/Programming Assignment/Programming Assignment.iml +++ /dev/null @@ -1,11 +0,0 @@ - - - - - - - - - - - \ No newline at end of file diff --git a/Programming Assignment/src/Main.java b/Programming Assignment/src/Main.java deleted file mode 100644 index 752c7d4..0000000 --- a/Programming Assignment/src/Main.java +++ /dev/null @@ -1,26 +0,0 @@ -import java.util.Scanner; - -public class Main { - public static void main(String[] args) { - Scanner scanner = new Scanner(System.in); - System.out.println("กรุณาใส่จำนวน: "); - int number = scanner.nextInt(); - String result = ""; - if(number % 3 == 0 && number % 5 == 0 && number % 7 == 0){ - result += "FizzBuzzBazz" ; - }else if(number % 3 == 0 && number % 5 == 0 ){ - result += "FizzBuzz"; - }else if(number % 3 == 0){ - result += "Fizz"; - }else if(number % 5 == 0 ){ - result += "Buzz"; - }else if(number % 7 == 0){ - result += "Bazz"; - }else{ - result += Integer.toString(number); - } - System.out.print("result : "+result); - scanner.close(); - } - -} \ No newline at end of file From 3ac3a24f4652e19def2c9014634ba3084cfd6cab Mon Sep 17 00:00:00 2001 From: SuperTop Date: Mon, 10 Mar 2025 14:03:01 +0700 Subject: [PATCH 4/4] Refator code --- Programming Assignment/.idea/workspace.xml | 74 ++++++++++++++++++++++ 1 file changed, 74 insertions(+) create mode 100644 Programming Assignment/.idea/workspace.xml diff --git a/Programming Assignment/.idea/workspace.xml b/Programming Assignment/.idea/workspace.xml new file mode 100644 index 0000000..ffb4575 --- /dev/null +++ b/Programming Assignment/.idea/workspace.xml @@ -0,0 +1,74 @@ + + + + + + + + + + + + + { + "associatedIndex": 4 +} + + + + + + + + + + + + + + + + + + 1741315442280 + + + + \ No newline at end of file