Skip to content
Snippets Groups Projects
Commit 08f00c23 authored by Sami Kesäjärvi's avatar Sami Kesäjärvi
Browse files

testit luotu ja calculator korjattu

parent 8d69f4df
No related branches found
No related tags found
No related merge requests found
......@@ -20,6 +20,12 @@
<artifactId>junit-jupiter-api</artifactId>
<version>5.9.2</version>
</dependency>
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<version>4.12</version>
<scope>test</scope>
</dependency>
</dependencies>
......
......@@ -18,18 +18,15 @@ class Calculator {
}
public void subtract(int value) {
this.result += value;
this.result -= value;
}
public void multiply(int value) {
for (int i=1; i<value; i++) {
add(value);
}
}
public void multiply(int value) {this.result *= value;}
public void exponent(int value) {
int base = this.result;
for(int i=1; i<value; i++) {
multiply(value);
this.result *= base;
}
}
}
\ No newline at end of file
......@@ -2,27 +2,52 @@ import static org.junit.jupiter.api.Assertions.*;
class CalculatorTest {
private int result;
@org.junit.jupiter.api.Test
void reset() {
Calculator calculator = new Calculator();
calculator.reset();
assertEquals(0, this.result);
}
@org.junit.jupiter.api.Test
void getResult() {
Calculator calculator = new Calculator();
assertEquals(this.result, calculator.getResult());
}
@org.junit.jupiter.api.Test
void add() {
Calculator calculator = new Calculator();
calculator.add(10);
calculator.add(-5);
assertEquals(5, calculator.getResult());
}
@org.junit.jupiter.api.Test
void subtract() {
Calculator calculator = new Calculator();
calculator.subtract(10);
calculator.subtract(-5);
assertEquals(-5, calculator.getResult());
}
@org.junit.jupiter.api.Test
void multiply() {
Calculator calculator = new Calculator();
calculator.add(5);
calculator.multiply(2);
calculator.multiply(-3);
assertEquals(-30, calculator.getResult());
}
@org.junit.jupiter.api.Test
void exponent() {
Calculator calculator = new Calculator();
calculator.add(3);
calculator.exponent(3);
calculator.exponent(4);
assertEquals(531441, calculator.getResult());
}
}
\ No newline at end of file
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment