From 3fb204a33d5bd7c05930d3dac66298cb387344d6 Mon Sep 17 00:00:00 2001 From: peter279k Date: Fri, 22 Sep 2023 19:09:52 +0800 Subject: [PATCH 1/2] Improve assertion approaches --- tests/calculatorTest.php | 42 ++++++++++++++++++++-------------------- 1 file changed, 21 insertions(+), 21 deletions(-) diff --git a/tests/calculatorTest.php b/tests/calculatorTest.php index 3c41ed4..f4859f8 100644 --- a/tests/calculatorTest.php +++ b/tests/calculatorTest.php @@ -10,11 +10,11 @@ class calculatorTest extends PHPUnit\Framework\TestCase */ public function testAdd() { - $this->assertEquals(BasicCalculator::add(1, 2), 3.0); - $this->assertEquals(BasicCalculator::add(1.0, 2.0), 3.0); - $this->assertEquals(BasicCalculator::add(0, 2.0), 2.0); - $this->assertEquals(BasicCalculator::add(2.0, 0), 2.0); - $this->assertEquals(BasicCalculator::add(-4, 2.0), -2.0); + $this->assertEquals(3.0, BasicCalculator::add(1, 2)); + $this->assertEquals(3.0, BasicCalculator::add(1.0, 2.0)); + $this->assertEquals(2.0, BasicCalculator::add(0, 2.0)); + $this->assertEquals(2.0, BasicCalculator::add(2.0, 0)); + $this->assertEquals(-2.0, BasicCalculator::add(-4, 2.0)); } /** @@ -22,12 +22,12 @@ public function testAdd() */ public function testSubtract() { - $this->assertEquals(BasicCalculator::subtract(1, 2), -1.0); - $this->assertEquals(BasicCalculator::subtract(2, 1), 1.0); - $this->assertEquals(BasicCalculator::subtract(1.0, 2.0), -1.0); - $this->assertEquals(BasicCalculator::subtract(0, 2.0), -2.0); - $this->assertEquals(BasicCalculator::subtract(2.0, 0), 2.0); - $this->assertEquals(BasicCalculator::subtract(-4, 2.0), -6.0); + $this->assertEquals(-1.0, BasicCalculator::subtract(1, 2)); + $this->assertEquals(1.0, BasicCalculator::subtract(2, 1)); + $this->assertEquals(-1.0, BasicCalculator::subtract(1.0, 2.0)); + $this->assertEquals(-2.0, BasicCalculator::subtract(0, 2.0)); + $this->assertEquals(2.0, BasicCalculator::subtract(2.0, 0)); + $this->assertEquals(-6.0, BasicCalculator::subtract(-4, 2.0)); } /** @@ -35,11 +35,11 @@ public function testSubtract() */ public function testMultiply() { - $this->assertEquals(BasicCalculator::multiply(1, 2), 2.0); - $this->assertEquals(BasicCalculator::multiply(1.0, 2.0), 2.0); - $this->assertEquals(BasicCalculator::multiply(0, 2.0), 0.0); - $this->assertEquals(BasicCalculator::multiply(2.0, 0), 0.0); - $this->assertEquals(BasicCalculator::multiply(-4, 2.0), -8.0); + $this->assertEquals(2.0, BasicCalculator::multiply(1, 2)); + $this->assertEquals(2.0, BasicCalculator::multiply(1.0, 2.0)); + $this->assertEquals(0.0, BasicCalculator::multiply(0, 2.0)); + $this->assertEquals(0.0, BasicCalculator::multiply(2.0, 0)); + $this->assertEquals(-8.0, BasicCalculator::multiply(-4, 2.0)); } /** @@ -47,10 +47,10 @@ public function testMultiply() */ public function testDivide() { - $this->assertEquals(BasicCalculator::divide(1, 2), 0.5); - $this->assertEquals(BasicCalculator::divide(1.0, 2.0), 0.5); - $this->assertEquals(BasicCalculator::divide(0, 2.0), 0.0); - $this->assertEquals(BasicCalculator::divide(-4, 2.0), -2.0); - // $this->assertEquals(BasicCalculator::divide(2.0, 0), 'Cannot divide by 0'); + $this->assertEquals(0.5, BasicCalculator::divide(1, 2)); + $this->assertEquals(0.5, BasicCalculator::divide(1.0, 2.0)); + $this->assertEquals(0.0, BasicCalculator::divide(0, 2.0)); + $this->assertEquals(-2.0, BasicCalculator::divide(-4, 2.0)); + $this->assertEquals('Cannot divide by 0', BasicCalculator::divide(2.0, 0)); } } From 68e94c15f7e2bec14a153d52a1ec41ba6147c1dd Mon Sep 17 00:00:00 2001 From: Tom Hu <88201630+thomasrockhu-codecov@users.noreply.github.com> Date: Mon, 25 Sep 2023 14:57:19 -0500 Subject: [PATCH 2/2] Update tests/calculatorTest.php --- tests/calculatorTest.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/calculatorTest.php b/tests/calculatorTest.php index f4859f8..9713e02 100644 --- a/tests/calculatorTest.php +++ b/tests/calculatorTest.php @@ -51,6 +51,6 @@ public function testDivide() $this->assertEquals(0.5, BasicCalculator::divide(1.0, 2.0)); $this->assertEquals(0.0, BasicCalculator::divide(0, 2.0)); $this->assertEquals(-2.0, BasicCalculator::divide(-4, 2.0)); - $this->assertEquals('Cannot divide by 0', BasicCalculator::divide(2.0, 0)); + // $this->assertEquals('Cannot divide by 0', BasicCalculator::divide(2.0, 0)); } }