From a1fedaebdf9133afebbb4e75a6a67453d3f873ad Mon Sep 17 00:00:00 2001 From: Jigalee Puff Date: Thu, 12 Oct 2023 21:06:25 +0100 Subject: [PATCH 1/3] Calculator Junit5 tests --- .vscode/settings.json | 3 +++ .../codingblackfemales/CalculatorTests.java | 23 +++++++++++++++++++ 2 files changed, 26 insertions(+) create mode 100644 .vscode/settings.json diff --git a/.vscode/settings.json b/.vscode/settings.json new file mode 100644 index 0000000..c995aa5 --- /dev/null +++ b/.vscode/settings.json @@ -0,0 +1,3 @@ +{ + "java.debug.settings.onBuildFailureProceed": true +} \ No newline at end of file diff --git a/src/test/java/com/codingblackfemales/CalculatorTests.java b/src/test/java/com/codingblackfemales/CalculatorTests.java index 5f3ed11..30ee5dc 100644 --- a/src/test/java/com/codingblackfemales/CalculatorTests.java +++ b/src/test/java/com/codingblackfemales/CalculatorTests.java @@ -23,4 +23,27 @@ public void testSubtraction() { assertEquals(-2, difference); } + + + @Test + @DisplayName("multiply two numbers") + public void testmultiply() { + final Integer reduce = Calculator.multiply(2, 4); + + assertEquals(8, reduce); +} + + /** + * + */ +@Test + @DisplayName ("divide two numbers") + public void testdivide() { + final Integer deduce = Calculator.divide(4, 2); + + assertEquals(2, deduce); + //Expected results +} + + } From 679b1e72735e9686bec610d6b0575e603a89e46c Mon Sep 17 00:00:00 2001 From: Mor-gan Date: Thu, 12 Oct 2023 21:13:17 +0100 Subject: [PATCH 2/3] calc test --- .../com/codingblackfemales/CalculatorTests.java | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/src/test/java/com/codingblackfemales/CalculatorTests.java b/src/test/java/com/codingblackfemales/CalculatorTests.java index 5f3ed11..b51ca7a 100644 --- a/src/test/java/com/codingblackfemales/CalculatorTests.java +++ b/src/test/java/com/codingblackfemales/CalculatorTests.java @@ -23,4 +23,18 @@ public void testSubtraction() { assertEquals(-2, difference); } + @Test + @DisplayName("multiply two numbers") + public void testMultiply() { + final double multiply = Calculator.multiply(2, 4); + + assertEquals(8, multiply); + } +@Test + @DisplayName("multiply two numbers") + public void testDivide() { + final float reduce = Calculator.divide(4, 2); + + assertEquals(2, reduce); + } } From f8f5fcf198b61573378dad0896cd7cd17b699a88 Mon Sep 17 00:00:00 2001 From: Mor-gan Date: Thu, 12 Oct 2023 21:23:14 +0100 Subject: [PATCH 3/3] morgan branch --- src/test/java/com/codingblackfemales/CalculatorTests.java | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/test/java/com/codingblackfemales/CalculatorTests.java b/src/test/java/com/codingblackfemales/CalculatorTests.java index 5f3ed11..3e8886c 100644 --- a/src/test/java/com/codingblackfemales/CalculatorTests.java +++ b/src/test/java/com/codingblackfemales/CalculatorTests.java @@ -23,4 +23,6 @@ public void testSubtraction() { assertEquals(-2, difference); } + + //This is morgans branch }