-
Notifications
You must be signed in to change notification settings - Fork 257
added solution #302
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
Open
YaroslavYarmoshyk
wants to merge
2
commits into
mate-academy:master
Choose a base branch
from
YaroslavYarmoshyk:hw-10
base: master
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
added solution #302
Changes from all commits
Commits
Show all changes
2 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,5 @@ | ||
| package core.basesyntax; | ||
|
|
||
| public interface Calculator { | ||
| double calculate(double a, double b, char ch); | ||
| } |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,37 @@ | ||
| package core.basesyntax; | ||
|
|
||
| public class CalculatorImpl implements Calculator { | ||
| @Override | ||
| public double calculate(double a, double b, char ch) throws ArithmeticException { | ||
| double result; | ||
| switch (ch) { | ||
| case '+': | ||
| result = a + b; | ||
| break; | ||
| case '-': | ||
| result = a - b; | ||
| break; | ||
| case '*': | ||
| result = a * b; | ||
| break; | ||
| case '/': | ||
| if (b == 0) { | ||
| throw new ArithmeticException(); | ||
| } else { | ||
| result = a / b; | ||
| break; | ||
| } | ||
| case '^' : | ||
| result = Math.pow(a,b); | ||
| break; | ||
| default: | ||
| result = 0; | ||
| } | ||
| if (ch != '+' && ch != '-' && ch != '*' | ||
| && ch != '/' && ch != '^') { | ||
| throw new IllegalOperationException("This operation is not thought " | ||
| + "out for this calculator"); | ||
| } | ||
| return result; | ||
| } | ||
| } | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,8 @@ | ||
| package core.basesyntax; | ||
|
|
||
| public class IllegalOperationException extends RuntimeException { | ||
| public IllegalOperationException(String message) { | ||
| super(message); | ||
| } | ||
|
|
||
| } |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change | ||||
|---|---|---|---|---|---|---|
| @@ -0,0 +1,209 @@ | ||||||
| package core.basesyntax; | ||||||
|
|
||||||
| import static org.junit.jupiter.api.Assertions.assertEquals; | ||||||
| import static org.junit.jupiter.api.Assertions.assertThrows; | ||||||
|
|
||||||
| import org.junit.jupiter.api.BeforeAll; | ||||||
| import org.junit.jupiter.api.Test; | ||||||
|
|
||||||
| class CalculatorImplTest { | ||||||
| private static Calculator calculator; | ||||||
|
|
||||||
| @BeforeAll | ||||||
| static void beforeAll() { | ||||||
| calculator = new CalculatorImpl(); | ||||||
| } | ||||||
|
|
||||||
| @Test | ||||||
| void calculate_AdditionTwoPositiveOperands_Ok() { | ||||||
| double operand1 = 6; | ||||||
| double operand2 = 7; | ||||||
| char operation = '+'; | ||||||
| double actual = calculator.calculate(operand1,operand2,operation); | ||||||
|
Contributor
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. а тут так, можна прередавати значення одразу в calculate |
||||||
| assertEquals(operand1 + operand2,actual); | ||||||
| } | ||||||
|
|
||||||
| @Test | ||||||
| void calculate_AdditionTwoNegativeOperands_Ok() { | ||||||
| double operand1 = -6; | ||||||
| double operand2 = -7; | ||||||
| char operation = '+'; | ||||||
| double actual = calculator.calculate(operand1,operand2,operation); | ||||||
| assertEquals(operand1 + operand2,actual); | ||||||
| } | ||||||
|
|
||||||
| @Test | ||||||
| void calculate_AdditionNegativeAndPositiveOperands_Ok() { | ||||||
| double operand1 = 6; | ||||||
| double operand2 = -7; | ||||||
| char operation = '+'; | ||||||
| double actual = calculator.calculate(operand1,operand2,operation); | ||||||
| assertEquals(operand1 + operand2,actual); | ||||||
| } | ||||||
|
|
||||||
| @Test | ||||||
| void calculate_AdditionZeroDifferentPlaces_Ok() { | ||||||
| double operand1 = 6; | ||||||
| double operand2 = 0; | ||||||
| char operation = '+'; | ||||||
| double actual = calculator.calculate(operand1,operand2,operation); | ||||||
| assertEquals(operand1 + operand2,actual); | ||||||
| operand1 = 0; | ||||||
| operand2 = -6; | ||||||
| actual = calculator.calculate(operand1,operand2,operation); | ||||||
| assertEquals(operand1 + operand2,actual); | ||||||
| } | ||||||
|
|
||||||
| @Test | ||||||
| void calculate_AdditionMaxAndMinDoubleValues_Ok() { | ||||||
| double operand1 = Double.MIN_VALUE; | ||||||
| double operand2 = Double.MAX_VALUE; | ||||||
| char operation = '+'; | ||||||
| double actual = calculator.calculate(operand1,operand2,operation); | ||||||
| assertEquals(operand1 + operand2,actual); | ||||||
| } | ||||||
|
|
||||||
| @Test | ||||||
| void calculate_SubtractionTwoPositiveOperands_Ok() { | ||||||
| double operand1 = 6; | ||||||
| double operand2 = 7; | ||||||
| char operation = '-'; | ||||||
| double actual = calculator.calculate(operand1,operand2,operation); | ||||||
| assertEquals(operand1 - operand2,actual); | ||||||
| } | ||||||
|
|
||||||
| @Test | ||||||
| void calculate_SubtractionTwoNegativeOperands_Ok() { | ||||||
| double operand1 = -6; | ||||||
| double operand2 = -7; | ||||||
| char operation = '-'; | ||||||
| double actual = calculator.calculate(operand1,operand2,operation); | ||||||
| assertEquals(operand1 - operand2,actual); | ||||||
| } | ||||||
|
|
||||||
| @Test | ||||||
| void calculate_SubtractionNegativeAndPositiveOperands_Ok() { | ||||||
| double operand1 = 6; | ||||||
| double operand2 = -7; | ||||||
| char operation = '-'; | ||||||
| double actual = calculator.calculate(operand1,operand2,operation); | ||||||
| assertEquals(operand1 - operand2,actual); | ||||||
| } | ||||||
|
|
||||||
| @Test | ||||||
| void calculate_SubtractionZeroDifferentPlaces_Ok() { | ||||||
| double operand1 = 6; | ||||||
| double operand2 = 0; | ||||||
| char operation = '-'; | ||||||
| double actual = calculator.calculate(operand1,operand2,operation); | ||||||
| assertEquals(operand1 - operand2,actual); | ||||||
| operand1 = 0; | ||||||
| operand2 = -6; | ||||||
| actual = calculator.calculate(operand1,operand2,operation); | ||||||
| assertEquals(operand1 - operand2,actual); | ||||||
| } | ||||||
|
|
||||||
| @Test | ||||||
| void calculate_SubtractionMaxAndMinDoubleValues_Ok() { | ||||||
| double operand1 = Double.MIN_VALUE; | ||||||
| double operand2 = Double.MAX_VALUE; | ||||||
| char operation = '-'; | ||||||
| double actual = calculator.calculate(operand1,operand2,operation); | ||||||
| assertEquals(operand1 - operand2,actual); | ||||||
| } | ||||||
|
|
||||||
| @Test | ||||||
| void calculate_MultiplicationTwoPositiveOperands() { | ||||||
| double operand1 = 5; | ||||||
| double operand2 = 6; | ||||||
| char operation = '*'; | ||||||
| double actual = calculator.calculate(operand1,operand2,operation); | ||||||
| assertEquals(operand1 * operand2,actual); | ||||||
| } | ||||||
|
|
||||||
| @Test | ||||||
| void calculate_MultiplicationTwoNegativeOperands() { | ||||||
| double operand1 = -5; | ||||||
| double operand2 = -6; | ||||||
| char operation = '*'; | ||||||
| double actual = calculator.calculate(operand1,operand2,operation); | ||||||
| assertEquals(operand1 * operand2,actual); | ||||||
| } | ||||||
|
|
||||||
| @Test | ||||||
| void calculate_MultiplicationZeroDifferentPlaces_Ok() { | ||||||
| double operand1 = 6; | ||||||
| double operand2 = 0; | ||||||
| char operation = '*'; | ||||||
| double actual = calculator.calculate(operand1,operand2,operation); | ||||||
| assertEquals(0,actual); | ||||||
| } | ||||||
|
|
||||||
| @Test | ||||||
| void calculate_MultiplicationMaxAndMinDoubleValues_Ok() { | ||||||
| double operand1 = Double.MIN_VALUE; | ||||||
| double operand2 = Double.MAX_VALUE; | ||||||
| char operation = '*'; | ||||||
| double actual = calculator.calculate(operand1,operand2,operation); | ||||||
| assertEquals(operand1 * operand2,actual); | ||||||
| } | ||||||
|
|
||||||
| @Test | ||||||
| void calculate_DivisionTwoPositiveOperands() { | ||||||
| double operand1 = 5; | ||||||
| double operand2 = 6; | ||||||
| char operation = '/'; | ||||||
| double actual = calculator.calculate(operand1,operand2,operation); | ||||||
| assertEquals(operand1 / operand2,actual); | ||||||
| } | ||||||
|
|
||||||
| @Test | ||||||
| void calculate_DivisionTwoNegativeOperands() { | ||||||
| double operand1 = -5; | ||||||
| double operand2 = -6; | ||||||
| char operation = '/'; | ||||||
| double actual = calculator.calculate(operand1,operand2,operation); | ||||||
| assertEquals(operand1 / operand2,actual); | ||||||
| } | ||||||
|
|
||||||
| @Test | ||||||
| void calculate_DivisionByZero() { | ||||||
| assertThrows(ArithmeticException.class, () -> { | ||||||
| calculator.calculate(5, 0, '/'); | ||||||
| }); | ||||||
| } | ||||||
|
|
||||||
| @Test | ||||||
| void calculate_DivisionZeroDifferentPlaces_Ok() { | ||||||
| double operand1 = 0; | ||||||
| double operand2 = 8; | ||||||
| char operation = '/'; | ||||||
| double actual = calculator.calculate(operand1,operand2,operation); | ||||||
| } | ||||||
|
|
||||||
| @Test | ||||||
| void calculate_DivisionMaxAndMinDoubleValues_Ok() { | ||||||
| double operand1 = Double.MAX_VALUE; | ||||||
| double operand2 = Double.MIN_VALUE; | ||||||
| char operation = '/'; | ||||||
| double actual = calculator.calculate(operand1,operand2,operation); | ||||||
| assertEquals(operand1 / operand2,actual); | ||||||
| } | ||||||
|
|
||||||
| @Test | ||||||
| void calculate_Raising_Ok() { | ||||||
| double operand1 = 4; | ||||||
| double operand2 = 5; | ||||||
| char operation = '^'; | ||||||
| double actual = calculator.calculate(operand1,operand2,operation); | ||||||
| assertEquals(Math.pow(operand1,operand2),actual); | ||||||
| } | ||||||
|
|
||||||
| @Test | ||||||
| void calculate_IllegalOperation_NotOk() { | ||||||
| char operation = ')'; | ||||||
|
Contributor
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more.
Suggested change
|
||||||
| assertThrows(Exception.class, () -> { | ||||||
| calculator.calculate(0, 5, operation); | ||||||
| }); | ||||||
| } | ||||||
| } | ||||||
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.