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

Step1 string addition calculator #2

Open
wants to merge 8 commits into
base: woomin-Jeon
Choose a base branch
from
Open
Changes from 1 commit
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
Prev Previous commit
Next Next commit
Modify Constructor to FactoryMethod
Woomin-Jeon committed Jun 17, 2020
commit e7b9cf7bb3f28762ca2f0fb835a0b163c36f2141
4 changes: 4 additions & 0 deletions src/main/java/calculator/model/Calculator.java
Original file line number Diff line number Diff line change
@@ -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;
}
1 change: 0 additions & 1 deletion src/main/java/calculator/model/StringReader.java
Original file line number Diff line number Diff line change
@@ -3,7 +3,6 @@
import java.util.Arrays;

public class StringReader {

public int[] read(String str) {
String[] arr = str.split("n");

9 changes: 4 additions & 5 deletions src/test/java/calculator/CalculatorTest.java
Original file line number Diff line number Diff line change
@@ -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);
}
}