신재한 1주차 과제 1차 수정본

.gitignore

@@ -1,7 +1,7 @@
 .gradle
 build/
 !gradle/wrapper/gradle-wrapper.jar
-!**/src/main/**/build/
+!**/src/Calculator/**/build/
 !**/src/test/**/build/
 
 ### IntelliJ IDEA ###
@@ -10,7 +10,7 @@ build/
 *.iml
 *.ipr
 out/
-!**/src/main/**/out/
+!**/src/Calculator/**/out/
 !**/src/test/**/out/
 
 ### Eclipse ###
@@ -22,7 +22,7 @@ out/
 .springBeans
 .sts4-cache
 bin/
-!**/src/main/**/bin/
+!**/src/Calculator/**/bin/
 !**/src/test/**/bin/
 
 ### NetBeans ###

build.gradle

@@ -12,8 +12,10 @@ repositories {
 dependencies {
     testImplementation platform('org.junit:junit-bom:5.9.1')
     testImplementation('org.junit.jupiter:junit-jupiter')
+    testImplementation( 'org.assertj:assertj-core:3.20.2')
 }
 
 test {
     useJUnitPlatform()
 }
+

src/main/java/Calculator.java

@@ -0,0 +1,17 @@
+public class Calculator {
+    public int add(int a, int b) {
+        return a + b;
+    }
+
+    public int sub(int a, int b) {
+        return a - b;
+    }
+
+    public int mul(int a, int b) {
+        return a * b;
+    }
+
+    public int div(int a, int b) {
+        return a / b;
+    }
+}

src/main/java/String_Calculator.java

@@ -0,0 +1,68 @@
+import java.util.Arrays;
+
+public class String_Calculator {
+    public  int add(String String_nums) {
+        int[] nums = check(String_nums);
+
+        int sum = nums[0];
+        for (int token : Arrays.copyOfRange(nums, 1, nums.length)) {
+            sum += token;
+        }
+        return sum;
+    }
+
+
+    public static int sub(String String_nums) {
+        int[] nums = check(String_nums);
+
+        int sum = nums[0];
+        for (int token : Arrays.copyOfRange(nums, 1, nums.length)) {
+            sum -= token;
+        }
+        return sum;
+    }
+
+    public static int mul(String String_nums) {
+        int[] nums = check(String_nums);
+
+        int sum = nums[0];
+        for (int token : Arrays.copyOfRange(nums, 1, nums.length)) {
+            sum *= token;
+        }
+        return sum;
+    }
+
+    public static int div(String String_nums) {
+        int[] nums = check(String_nums);
+
+        int sum = nums[0];
+        for (int token : Arrays.copyOfRange(nums, 1, nums.length)) {
+            sum /= token;
+        }
+        return sum;
+    }
+
+    public static int[] check(String String_nums) {
+        String[] tokens = new String[String_nums.length()];
+
+        if (String_nums.contains(",") || String_nums.contains(";")) tokens = String_nums.split("[,|;]");
+        if (String_nums.contains("//")) {
+            String_nums = String_nums.substring(String_nums.indexOf("\n") + 1);
+            tokens = String_nums.split("[,|;]");
+        }
+
+        for (int i = 0; i < tokens.length; i++) {
+            if (!tokens[i].matches("-?\\d+")) {
+                throw new RuntimeException("양수가 아닌 값이 입력되었습니다.");
+            }
+        }
+
+        int[] nums = new int[tokens.length];
+
+        for (int i = 0; i < tokens.length; i++) {
+            nums[i] = Integer.parseInt(tokens[i]);
+        }
+
+        return nums;
+    }
+}

src/test/java/Cal_Test.java

@@ -0,0 +1,38 @@
+import org.junit.jupiter.api.DisplayName;
+import org.junit.jupiter.api.Nested;
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
+public class Cal_Test {
+
+    @Nested
+    @DisplayName("계산기 사칙연산 테스트")
+    class CalTest {
+
+        @Test
+        void AddTest() {
+            Calculator calc = new Calculator();
+            assertEquals(3, calc.add(1,2));
+        }
+
+        @Test
+        void SubTest() {
+            Calculator calc = new Calculator();
+            assertEquals(2, calc.sub(8,6));
+        }
+
+        @Test
+        void MulTest() {
+            Calculator calc = new Calculator();
+            assertEquals(2, calc.mul(1,2));
+        }
+
+        @Test
+        void DivTest() {
+            Calculator calc = new Calculator();
+            assertEquals(6, calc.div(12,2));
+        }
+
+    }
+}

src/test/java/StringCal_AssertJTest.java

@@ -0,0 +1,61 @@
+import org.junit.jupiter.api.DisplayName;
+import org.junit.jupiter.api.Nested;
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.assertj.core.api.Assertions.assertThat;
+
+public class StringCal_AssertJTest {
+    @Nested
+    @DisplayName("문자열 계산기 사칙연산 테스트")
+    class AssertJ_CalTest {
+
+        @Test
+        void AddTest() {
+            String_Calculator calc = new String_Calculator();
+            assertThat(7).isEqualTo(calc.add("3,4"));
+        }
+        @Test
+        void AddTest2() {
+            String_Calculator calc = new String_Calculator();
+            assertThat(6).isNotEqualTo(calc.add("//;\n1;2;4"));
+        }
+
+        @Test
+        void SubTest() {
+            String_Calculator calc = new String_Calculator();
+            assertThat(6).isEqualTo(calc.add("1;2;3"));
+        }
+
+        @Test
+        void SubTest2() {
+            String_Calculator calc = new String_Calculator();
+            assertThat(6).isNotEqualTo(calc.sub("//;\n8,6;1"));
+        }
+
+        @Test
+        void MulTest() {
+            String_Calculator calc = new String_Calculator();
+            assertThat(6).isEqualTo(calc.mul("2;3;1"));
+        }
+
+        @Test
+        void MulTest2() {
+            String_Calculator calc = new String_Calculator();
+            assertThat(6).isNotEqualTo(calc.mul("//;\n8;6;1"));
+        }
+
+        @Test
+        void DivTest() {
+            String_Calculator calc = new String_Calculator();
+            assertThat(1).isEqualTo(calc.div("10;2;5"));
+        }
+
+        @Test
+        void DivTest2() {
+            String_Calculator calc = new String_Calculator();
+            assertThat(6).isNotEqualTo(calc.div("//;\n10;2;5"));
+        }
+
+    }
+}

src/test/java/String_calTest.java

@@ -0,0 +1,61 @@
+import org.junit.jupiter.api.DisplayName;
+import org.junit.jupiter.api.Nested;
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
+public class String_calTest {
+
+    @Nested
+    @DisplayName("문자열 계산기 사칙연산 테스트")
+    class CalTest {
+
+        @Test
+        void AddTest() {
+            String_Calculator calc = new String_Calculator();
+            assertEquals(6, calc.add("1,2;3"));
+        }
+        @Test
+        void AddTest2() {
+            String_Calculator calc = new String_Calculator();
+            assertEquals(6, calc.add("//;\n1;2;3"));
+        }
+
+        @Test
+        void SubTest() {
+            String_Calculator calc = new String_Calculator();
+            assertEquals(1, calc.sub("8,6;1"));
+        }
+
+        @Test
+        void SubTest2() {
+            String_Calculator calc = new String_Calculator();
+            assertEquals(1, calc.sub("//;\n8,6;1"));
+        }
+
+        @Test
+        void MulTest() {
+            String_Calculator calc = new String_Calculator();
+            assertEquals(6, calc.mul("1,2;3"));
+        }
+
+        @Test
+        void MulTest2() {
+            String_Calculator calc = new String_Calculator();
+            assertEquals(6, calc.mul("//;\n1,2;3"));
+        }
+
+        @Test
+        void DivTest() {
+            String_Calculator calc = new String_Calculator();
+            assertEquals(2, calc.div("12,2;3"));
+        }
+
+        @Test
+        void DivTest2() {
+            String_Calculator calc = new String_Calculator();
+            assertEquals(2, calc.div("//;\n12,2;3"));
+        }
+
+    }
+}

untitled/.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