Skip to content

Skwirblies, Mattern #28

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.

Sign up for GitHub

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

Open
Smarti92 wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Skwirblies, Mattern #28

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c44f1de
Update Calculate.java
Smarti92 Jun 14, 2014
92555b5
Update CalculateTest.java
Smarti92 Jun 14, 2014
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
6 changes: 6 additions & 0 deletions Calculate.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,4 +11,10 @@ public double sub(double x, double y) {
public double mult(double x, double y){
return x * y;
}
public double div(double x, double y) {
return x / y;
}
public double pow(double x, double y) {
return Math.pow(x, y);
}
}
4 changes: 4 additions & 0 deletions CalculateTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,4 +16,8 @@ public void mult() {
assertEquals(3, calc.mult(1, 3));
assertEquals(6, calc.div(120, 20) );
}
@Test
public void pow() {
assertEquals(8, calc.pow(2, 3));
}
}