diff --git a/.github/workflows/coverage-prs-all-components.yml b/.github/workflows/coverage-prs-all-components.yml index cbc9ff2..76efe65 100644 --- a/.github/workflows/coverage-prs-all-components.yml +++ b/.github/workflows/coverage-prs-all-components.yml @@ -6,13 +6,13 @@ name: Coverage PRs - ALL components on: # NOTE: don't activate this by default because it could conflict with the other job ('only changed components') - # pull_request: - # branches: - # - master - # paths: - # - 'calculator-1/src/**' - # - 'calculator-2/src/**' - # - 'calculator-3/src/**' + pull_request: + branches: + - master + paths: + - 'calculator-1/src/**' + - 'calculator-2/src/**' + - 'calculator-3/src/**' jobs: diff --git a/.github/workflows/coverage-prs-only-changed-components.yml b/.github/workflows/coverage-prs-only-changed-components.yml index 7d558d4..f5bca30 100644 --- a/.github/workflows/coverage-prs-only-changed-components.yml +++ b/.github/workflows/coverage-prs-only-changed-components.yml @@ -1,13 +1,14 @@ name: Coverage PRs - only changed components on: - pull_request: - branches: - - master - paths: - - 'calculator-1/src/**' - - 'calculator-2/src/**' - - 'calculator-3/src/**' + # NOTE: disabled only in this branch/PR to be able to exercise the "ALL components" workflow. + # pull_request: + # branches: + # - master + # paths: + # - 'calculator-1/src/**' + # - 'calculator-2/src/**' + # - 'calculator-3/src/**' jobs: diff --git a/calculator-1/src/main/java/com/codescene/calculator1/Calculator.java b/calculator-1/src/main/java/com/codescene/calculator1/Calculator.java index 0ff2fbe..35f2ce3 100644 --- a/calculator-1/src/main/java/com/codescene/calculator1/Calculator.java +++ b/calculator-1/src/main/java/com/codescene/calculator1/Calculator.java @@ -15,6 +15,9 @@ public double calculate(double firstOperand, double secondOperand, char operator case ':':{ return divide(firstOperand,secondOperand); } + case '^':{ + return square(firstOperand); + } default: throw new IllegalArgumentException("Unsupported operation :"+operator); } @@ -37,4 +40,7 @@ private double subtract(double firstOperand, double secondOperand) { private double add(double firstOperand, double secondOperand) { return firstOperand + secondOperand; } + private double square(double x) { + return x * x; + } } diff --git a/calculator-1/src/test/java/com/codescene/calculator1/CalculatorTest.java b/calculator-1/src/test/java/com/codescene/calculator1/CalculatorTest.java index 66c413a..258ab32 100644 --- a/calculator-1/src/test/java/com/codescene/calculator1/CalculatorTest.java +++ b/calculator-1/src/test/java/com/codescene/calculator1/CalculatorTest.java @@ -30,4 +30,11 @@ void divideSimple(){ double result = calculator.calculate(1,1,':'); Assertions.assertEquals(1,result); } + + @Test + void squareSimple(){ + // the signature isn't flexible so we repeat the same number twice + double result = calculator.calculate(10, 10, '^'); + Assertions.assertEquals(100.0,result); + } }