Skip to content

Commit f3a2ef0

Browse files
Merge pull request #24 from peter279k/improve_tests
Improve assertion approaches
2 parents b5ef7c3 + 68e94c1 commit f3a2ef0

File tree

1 file changed

+21
-21
lines changed

1 file changed

+21
-21
lines changed

tests/calculatorTest.php

Lines changed: 21 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -10,47 +10,47 @@ class calculatorTest extends PHPUnit\Framework\TestCase
1010
*/
1111
public function testAdd()
1212
{
13-
$this->assertEquals(BasicCalculator::add(1, 2), 3.0);
14-
$this->assertEquals(BasicCalculator::add(1.0, 2.0), 3.0);
15-
$this->assertEquals(BasicCalculator::add(0, 2.0), 2.0);
16-
$this->assertEquals(BasicCalculator::add(2.0, 0), 2.0);
17-
$this->assertEquals(BasicCalculator::add(-4, 2.0), -2.0);
13+
$this->assertEquals(3.0, BasicCalculator::add(1, 2));
14+
$this->assertEquals(3.0, BasicCalculator::add(1.0, 2.0));
15+
$this->assertEquals(2.0, BasicCalculator::add(0, 2.0));
16+
$this->assertEquals(2.0, BasicCalculator::add(2.0, 0));
17+
$this->assertEquals(-2.0, BasicCalculator::add(-4, 2.0));
1818
}
1919

2020
/**
2121
* @covers Calculator\BasicCalculator
2222
*/
2323
public function testSubtract()
2424
{
25-
$this->assertEquals(BasicCalculator::subtract(1, 2), -1.0);
26-
$this->assertEquals(BasicCalculator::subtract(2, 1), 1.0);
27-
$this->assertEquals(BasicCalculator::subtract(1.0, 2.0), -1.0);
28-
$this->assertEquals(BasicCalculator::subtract(0, 2.0), -2.0);
29-
$this->assertEquals(BasicCalculator::subtract(2.0, 0), 2.0);
30-
$this->assertEquals(BasicCalculator::subtract(-4, 2.0), -6.0);
25+
$this->assertEquals(-1.0, BasicCalculator::subtract(1, 2));
26+
$this->assertEquals(1.0, BasicCalculator::subtract(2, 1));
27+
$this->assertEquals(-1.0, BasicCalculator::subtract(1.0, 2.0));
28+
$this->assertEquals(-2.0, BasicCalculator::subtract(0, 2.0));
29+
$this->assertEquals(2.0, BasicCalculator::subtract(2.0, 0));
30+
$this->assertEquals(-6.0, BasicCalculator::subtract(-4, 2.0));
3131
}
3232

3333
/**
3434
* @covers Calculator\BasicCalculator
3535
*/
3636
public function testMultiply()
3737
{
38-
$this->assertEquals(BasicCalculator::multiply(1, 2), 2.0);
39-
$this->assertEquals(BasicCalculator::multiply(1.0, 2.0), 2.0);
40-
$this->assertEquals(BasicCalculator::multiply(0, 2.0), 0.0);
41-
$this->assertEquals(BasicCalculator::multiply(2.0, 0), 0.0);
42-
$this->assertEquals(BasicCalculator::multiply(-4, 2.0), -8.0);
38+
$this->assertEquals(2.0, BasicCalculator::multiply(1, 2));
39+
$this->assertEquals(2.0, BasicCalculator::multiply(1.0, 2.0));
40+
$this->assertEquals(0.0, BasicCalculator::multiply(0, 2.0));
41+
$this->assertEquals(0.0, BasicCalculator::multiply(2.0, 0));
42+
$this->assertEquals(-8.0, BasicCalculator::multiply(-4, 2.0));
4343
}
4444

4545
/**
4646
* @covers Calculator\BasicCalculator
4747
*/
4848
public function testDivide()
4949
{
50-
$this->assertEquals(BasicCalculator::divide(1, 2), 0.5);
51-
$this->assertEquals(BasicCalculator::divide(1.0, 2.0), 0.5);
52-
$this->assertEquals(BasicCalculator::divide(0, 2.0), 0.0);
53-
$this->assertEquals(BasicCalculator::divide(-4, 2.0), -2.0);
54-
// $this->assertEquals(BasicCalculator::divide(2.0, 0), 'Cannot divide by 0');
50+
$this->assertEquals(0.5, BasicCalculator::divide(1, 2));
51+
$this->assertEquals(0.5, BasicCalculator::divide(1.0, 2.0));
52+
$this->assertEquals(0.0, BasicCalculator::divide(0, 2.0));
53+
$this->assertEquals(-2.0, BasicCalculator::divide(-4, 2.0));
54+
// $this->assertEquals('Cannot divide by 0', BasicCalculator::divide(2.0, 0));
5555
}
5656
}

0 commit comments

Comments
 (0)