Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Step2 calculator #9

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 8 additions & 0 deletions src/main/java/SetCollection.java
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
import java.util.Set;

public class SetCollection {
public Integer getNumbersSize(Set<Integer> numbers) {
return numbers.size();
}

}
15 changes: 15 additions & 0 deletions src/main/java/StringPs.java
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
public class StringPs {

public String[] stringSplit(String s) {
String[] arr = s.split(",");
return arr;
}

public String stringSub(String s) {
return s.substring(1,4);
}

public String stringCharAt(int i, String abc) {
return Character.toString(abc.charAt(i));
}
}
89 changes: 89 additions & 0 deletions src/main/java/calculator/Calculator.java
Original file line number Diff line number Diff line change
@@ -0,0 +1,89 @@
package calculator;

import java.lang.reflect.Array;
import java.util.ArrayList;
import java.util.Arrays;

import static java.lang.Integer.parseInt;

public class Calculator {

public int getNumber(String s) {
String[] arr = s.split(" ");
ArrayList<String> arrayList = new ArrayList<>(Arrays.asList(arr));
if(arrayList.size() == 1) {
return Integer.parseInt(arrayList.get(0));
}
while (arrayList.size() > 0) {

if(arrayList.get(1).equals("+")) {
int number = addNumber(arrayList.get(0), arrayList.get(2));

for(int i =0; i<3; i++ ) {
arrayList.remove(0);
}
arrayList.add(0,Integer.toString(number));
}

if(arrayList.size()==1){
return Integer.parseInt(arrayList.get(0));
}

if(arrayList.get(1).equals("-")) {
int number = subTractionNumber(arrayList.get(0), arrayList.get(2));

for(int i =0; i<3; i++ ) {
arrayList.remove(0);
}
arrayList.add(0,Integer.toString(number));
}

if(arrayList.size()==1){
return Integer.parseInt(arrayList.get(0));
}

if(arrayList.get(1).equals("*")) {
int number = multiplicationNumber(arrayList.get(0), arrayList.get(2));

for(int i =0; i<3; i++ ) {
arrayList.remove(0);
}
arrayList.add(0,Integer.toString(number));
}

if(arrayList.size()==1){
return Integer.parseInt(arrayList.get(0));
}

if(arrayList.get(1).equals("/")) {
int number = divideNumber(arrayList.get(0), arrayList.get(2));

for(int i =0; i<3; i++ ) {
arrayList.remove(0);
}
arrayList.add(0,Integer.toString(number));
}

if(arrayList.size()==1){
return Integer.parseInt(arrayList.get(0));
}
}
return Integer.parseInt(arrayList.get(0));
}

public int addNumber(String s, String b) {
return Integer.parseInt(s) + Integer.parseInt(b);
}

public int subTractionNumber(String s, String b) {
return Integer.parseInt(s) - Integer.parseInt(b);
}

public int divideNumber(String s, String b) {
return Integer.parseInt(s) / Integer.parseInt(b);
}

public int multiplicationNumber(String s, String b) {
return Integer.parseInt(s) * Integer.parseInt(b);
}
}
20 changes: 20 additions & 0 deletions src/main/java/calculator/Computation.java
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
package calculator;

public class Computation {

public int addNumber(String s, String b) {
return Integer.parseInt(s) + Integer.parseInt(b);
}

public int subTractionNumber(String s, String b) {
return Integer.parseInt(s) - Integer.parseInt(b);
}

public int divideNumber(String s, String b) {
return Integer.parseInt(s) / Integer.parseInt(b);
}

public int multiplicationNumber(String s, String b) {
return Integer.parseInt(s) * Integer.parseInt(b);
}
}
57 changes: 57 additions & 0 deletions src/test/java/SetCollectionTest.java
Original file line number Diff line number Diff line change
@@ -0,0 +1,57 @@
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.DisplayName;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.params.ParameterizedTest;
import org.junit.jupiter.params.provider.CsvSource;
import org.junit.jupiter.params.provider.ValueSource;

import java.util.HashSet;
import java.util.Set;

import static org.assertj.core.api.Assertions.assertThat;
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertTrue;

public class SetCollectionTest {
private Set<Integer> numbers;

@BeforeEach
void setUp() {
numbers = new HashSet<>();
numbers.add(1);
numbers.add(1);
numbers.add(2);
numbers.add(3);
}

@DisplayName("Hash 사이즈 검사 테스트")
@Test
public void testCheckSizeTest() {
SetCollection checkSize = new SetCollection();
Integer result = checkSize.getNumbersSize(this.numbers);
assertEquals(3, result);
}

@DisplayName("Hash안에 포함되어있는지 검사 테스트")
@Test
public void contains() {
assertThat(numbers.contains(1)).isTrue();
assertThat(numbers.contains(2)).isTrue();
assertThat(numbers.contains(3)).isTrue();
}

@DisplayName("중복된 메소드 제거 테스")
@ParameterizedTest
@ValueSource(ints= {1, 2, 3})
public void testContaionsTrueTes트t(int number) {
assertTrue(numbers.contains(number));
}

@DisplayName("포함된 값이 없으면 false 반환하는 테스트")
@ParameterizedTest
@CsvSource(value= {"1:true", "2:true", "3:true", "4:false", "5:false"}, delimiter = ':')
public void testContaionsTest(int input,boolean expected) {
boolean result = numbers.contains(input);
assertEquals(expected, result);
}
}
44 changes: 44 additions & 0 deletions src/test/java/StringTest.java
Original file line number Diff line number Diff line change
@@ -0,0 +1,44 @@
import org.junit.jupiter.api.DisplayName;
import org.junit.jupiter.api.Test;


import static org.assertj.core.api.Assertions.*;
import static org.junit.jupiter.api.Assertions.assertArrayEquals;
import static org.junit.jupiter.api.Assertions.assertEquals;

public class StringTest {

@DisplayName("배열의 숫자값들을트 ,을 기준으로 분리하는 테스트")
@Test
public void testSplitStringTest() {
String[] arr = {"1","2"};
StringPs splitString = new StringPs();
String[] result1 = splitString.stringSplit("1,2");
assertArrayEquals(arr,result1);
String[] arr2 = {"1"};
String[] result2 = splitString.stringSplit("1");
assertArrayEquals(arr2,result2);
}

@DisplayName("()를 제거하는 테스트")
@Test
public void testSubStringTest() {
String str = "1,2";
StringPs removeString = new StringPs();
String result = removeString.stringSub("(1,2)");
assertEquals(str, result);
}

@DisplayName("문자를 가져올때 위치값을 벗어나면 메세지가 발생하는 부분에 대한 테스트")
@Test
public void testCharAtStringTest() {
String str = "b";
StringPs charAtString = new StringPs();
String result = charAtString.stringCharAt(1,"abc");
assertEquals(str,result);
assertThatThrownBy(() -> {
charAtString.stringCharAt(50,"abc");
}).isInstanceOf(IndexOutOfBoundsException.class).hasMessageContaining("String index out of range:");
}

}
76 changes: 76 additions & 0 deletions src/test/java/calculator/CalculatorTest.java
Original file line number Diff line number Diff line change
@@ -0,0 +1,76 @@
package calculator;

import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.DisplayName;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.params.ParameterizedTest;
import org.junit.jupiter.params.provider.CsvSource;
import org.junit.jupiter.params.provider.ValueSource;

import static org.assertj.core.api.Assertions.*;
import static org.junit.jupiter.api.Assertions.assertArrayEquals;
import static org.junit.jupiter.api.Assertions.assertEquals;

public class CalculatorTest {
private Calculator calculator;

@BeforeEach
void setUp() {
calculator = new Calculator();
}
@DisplayName("계산기")
@ParameterizedTest
@CsvSource(value = {"2 + 3 * 4 / 2 :10","1:1", "0 * 10 * 11 + 3 :3"}, delimiter = ':')
public void testCalculator(String input, int result) {
assertThat(calculator.getNumber(input)).isEqualTo(result);
}

@DisplayName("계산기의 합을 테스트한다.")
@Test
public void testAddCalculator() {
Calculator addTest = new Calculator();
int result = addTest.addNumber("2","3");
assertEquals(5,result);
}

@DisplayName("계산기의 뺄셈을 테스트한다.")
@Test
public void testSubtractionCalculator() {
Calculator subTractionTest = new Calculator();
int result = subTractionTest.subTractionNumber("4","3");
assertEquals(1,result);
}

@DisplayName("계산기의 나눗셈을 테스트한다.")
@Test
public void testDivideCalculator() {
Calculator divideTest = new Calculator();
int result = divideTest.divideNumber("4","2");
assertEquals(2,result);
}

@DisplayName("계산기의 셈을 테스트한다.")
@Test
public void testMultiplicationCalculator() {
Calculator multiplication = new Calculator();
int result = multiplication.multiplicationNumber("4","3");
assertEquals(12,result);
}

@DisplayName("not Null")
@Test
public void testNotnull() {
assertThatIllegalArgumentException().isThrownBy(() -> {
calculator.getNumber("null");
});
}

@DisplayName("not Null")
@Test
public void testNotContribution() {
assertThatIllegalArgumentException().isThrownBy(() -> {
calculator.getNumber("!");
});
}

}