Laravel version update
Laravel version update
This commit is contained in:
@@ -1,6 +1,6 @@
|
||||
<?php
|
||||
/*
|
||||
* This file is part of the Comparator package.
|
||||
* This file is part of sebastian/comparator.
|
||||
*
|
||||
* (c) Sebastian Bergmann <sebastian@phpunit.de>
|
||||
*
|
||||
@@ -10,11 +10,16 @@
|
||||
|
||||
namespace SebastianBergmann\Comparator;
|
||||
|
||||
use PHPUnit\Framework\TestCase;
|
||||
|
||||
/**
|
||||
* @coversDefaultClass SebastianBergmann\Comparator\DoubleComparator
|
||||
*
|
||||
* @uses SebastianBergmann\Comparator\Comparator
|
||||
* @uses SebastianBergmann\Comparator\Factory
|
||||
* @uses SebastianBergmann\Comparator\ComparisonFailure
|
||||
*/
|
||||
class DoubleComparatorTest extends \PHPUnit_Framework_TestCase
|
||||
class DoubleComparatorTest extends TestCase
|
||||
{
|
||||
private $comparator;
|
||||
|
||||
@@ -25,59 +30,59 @@ class DoubleComparatorTest extends \PHPUnit_Framework_TestCase
|
||||
|
||||
public function acceptsSucceedsProvider()
|
||||
{
|
||||
return array(
|
||||
array(0, 5.0),
|
||||
array(5.0, 0),
|
||||
array('5', 4.5),
|
||||
array(1.2e3, 7E-10),
|
||||
array(3, acos(8)),
|
||||
array(acos(8), 3),
|
||||
array(acos(8), acos(8))
|
||||
);
|
||||
return [
|
||||
[0, 5.0],
|
||||
[5.0, 0],
|
||||
['5', 4.5],
|
||||
[1.2e3, 7E-10],
|
||||
[3, \acos(8)],
|
||||
[\acos(8), 3],
|
||||
[\acos(8), \acos(8)]
|
||||
];
|
||||
}
|
||||
|
||||
public function acceptsFailsProvider()
|
||||
{
|
||||
return array(
|
||||
array(5, 5),
|
||||
array('4.5', 5),
|
||||
array(0x539, 02471),
|
||||
array(5.0, false),
|
||||
array(null, 5.0)
|
||||
);
|
||||
return [
|
||||
[5, 5],
|
||||
['4.5', 5],
|
||||
[0x539, 02471],
|
||||
[5.0, false],
|
||||
[null, 5.0]
|
||||
];
|
||||
}
|
||||
|
||||
public function assertEqualsSucceedsProvider()
|
||||
{
|
||||
return array(
|
||||
array(2.3, 2.3),
|
||||
array('2.3', 2.3),
|
||||
array(5.0, 5),
|
||||
array(5, 5.0),
|
||||
array(5.0, '5'),
|
||||
array(1.2e3, 1200),
|
||||
array(2.3, 2.5, 0.5),
|
||||
array(3, 3.05, 0.05),
|
||||
array(1.2e3, 1201, 1),
|
||||
array((string)(1/3), 1 - 2/3),
|
||||
array(1/3, (string)(1 - 2/3))
|
||||
);
|
||||
return [
|
||||
[2.3, 2.3],
|
||||
['2.3', 2.3],
|
||||
[5.0, 5],
|
||||
[5, 5.0],
|
||||
[5.0, '5'],
|
||||
[1.2e3, 1200],
|
||||
[2.3, 2.5, 0.5],
|
||||
[3, 3.05, 0.05],
|
||||
[1.2e3, 1201, 1],
|
||||
[(string) (1 / 3), 1 - 2 / 3],
|
||||
[1 / 3, (string) (1 - 2 / 3)]
|
||||
];
|
||||
}
|
||||
|
||||
public function assertEqualsFailsProvider()
|
||||
{
|
||||
return array(
|
||||
array(2.3, 4.2),
|
||||
array('2.3', 4.2),
|
||||
array(5.0, '4'),
|
||||
array(5.0, 6),
|
||||
array(1.2e3, 1201),
|
||||
array(2.3, 2.5, 0.2),
|
||||
array(3, 3.05, 0.04),
|
||||
array(3, acos(8)),
|
||||
array(acos(8), 3),
|
||||
array(acos(8), acos(8))
|
||||
);
|
||||
return [
|
||||
[2.3, 4.2],
|
||||
['2.3', 4.2],
|
||||
[5.0, '4'],
|
||||
[5.0, 6],
|
||||
[1.2e3, 1201],
|
||||
[2.3, 2.5, 0.2],
|
||||
[3, 3.05, 0.04],
|
||||
[3, \acos(8)],
|
||||
[\acos(8), 3],
|
||||
[\acos(8), \acos(8)]
|
||||
];
|
||||
}
|
||||
|
||||
/**
|
||||
@@ -112,9 +117,7 @@ class DoubleComparatorTest extends \PHPUnit_Framework_TestCase
|
||||
|
||||
try {
|
||||
$this->comparator->assertEquals($expected, $actual, $delta);
|
||||
}
|
||||
|
||||
catch (ComparisonFailure $exception) {
|
||||
} catch (ComparisonFailure $exception) {
|
||||
}
|
||||
|
||||
$this->assertNull($exception, 'Unexpected ComparisonFailure');
|
||||
@@ -126,9 +129,9 @@ class DoubleComparatorTest extends \PHPUnit_Framework_TestCase
|
||||
*/
|
||||
public function testAssertEqualsFails($expected, $actual, $delta = 0.0)
|
||||
{
|
||||
$this->setExpectedException(
|
||||
'SebastianBergmann\\Comparator\\ComparisonFailure', 'matches expected'
|
||||
);
|
||||
$this->expectException(ComparisonFailure::class);
|
||||
$this->expectExceptionMessage('matches expected');
|
||||
|
||||
$this->comparator->assertEquals($expected, $actual, $delta);
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user