From 9c473682bc5221571e76d41fb16331ac044ae96a Mon Sep 17 00:00:00 2001 From: Mark Baker Date: Fri, 18 Feb 2022 21:37:26 +0100 Subject: [PATCH] Set precision for Database function unit tests, for RowColumnReference and Dimension Helper unit tests (#2604) --- .../Calculation/Functions/Database/DAverageTest.php | 2 +- .../Calculation/Functions/Database/DCountATest.php | 2 +- .../Calculation/Functions/Database/DCountTest.php | 2 +- .../Calculation/Functions/Database/DGetTest.php | 2 +- .../Calculation/Functions/Database/DMaxTest.php | 2 +- .../Calculation/Functions/Database/DMinTest.php | 2 +- .../Calculation/Functions/Database/DProductTest.php | 2 +- .../Calculation/Functions/Database/DStDevPTest.php | 2 +- .../Calculation/Functions/Database/DStDevTest.php | 2 +- .../Calculation/Functions/Database/DSumTest.php | 2 +- .../Calculation/Functions/Database/DVarPTest.php | 2 +- .../Calculation/Functions/Database/DVarTest.php | 2 +- .../PhpSpreadsheetTests/Calculation/RowColumnReferenceTest.php | 2 +- tests/PhpSpreadsheetTests/Helper/DimensionTest.php | 2 +- 14 files changed, 14 insertions(+), 14 deletions(-) diff --git a/tests/PhpSpreadsheetTests/Calculation/Functions/Database/DAverageTest.php b/tests/PhpSpreadsheetTests/Calculation/Functions/Database/DAverageTest.php index 2d8fb9f9c..8be895ebd 100644 --- a/tests/PhpSpreadsheetTests/Calculation/Functions/Database/DAverageTest.php +++ b/tests/PhpSpreadsheetTests/Calculation/Functions/Database/DAverageTest.php @@ -24,7 +24,7 @@ class DAverageTest extends TestCase public function testDAverage($expectedResult, $database, $field, $criteria): void { $result = Database::DAVERAGE($database, $field, $criteria); - self::assertSame($expectedResult, $result); + self::assertEqualsWithDelta($expectedResult, $result, 1.0e-12); } private function database1(): array diff --git a/tests/PhpSpreadsheetTests/Calculation/Functions/Database/DCountATest.php b/tests/PhpSpreadsheetTests/Calculation/Functions/Database/DCountATest.php index 2f7cad142..c7d704268 100644 --- a/tests/PhpSpreadsheetTests/Calculation/Functions/Database/DCountATest.php +++ b/tests/PhpSpreadsheetTests/Calculation/Functions/Database/DCountATest.php @@ -24,7 +24,7 @@ class DCountATest extends TestCase public function testDCountA($expectedResult, $database, $field, $criteria): void { $result = Database::DCOUNTA($database, $field, $criteria); - self::assertSame($expectedResult, $result); + self::assertEqualsWithDelta($expectedResult, $result, 1.0e-12); } private function database1(): array diff --git a/tests/PhpSpreadsheetTests/Calculation/Functions/Database/DCountTest.php b/tests/PhpSpreadsheetTests/Calculation/Functions/Database/DCountTest.php index 3f9d9966c..f1df35ae7 100644 --- a/tests/PhpSpreadsheetTests/Calculation/Functions/Database/DCountTest.php +++ b/tests/PhpSpreadsheetTests/Calculation/Functions/Database/DCountTest.php @@ -24,7 +24,7 @@ class DCountTest extends TestCase public function testDCount($expectedResult, $database, $field, $criteria): void { $result = Database::DCOUNT($database, $field, $criteria); - self::assertSame($expectedResult, $result); + self::assertEqualsWithDelta($expectedResult, $result, 1.0e-12); } private function database1(): array diff --git a/tests/PhpSpreadsheetTests/Calculation/Functions/Database/DGetTest.php b/tests/PhpSpreadsheetTests/Calculation/Functions/Database/DGetTest.php index 7853e0b6d..565588fc3 100644 --- a/tests/PhpSpreadsheetTests/Calculation/Functions/Database/DGetTest.php +++ b/tests/PhpSpreadsheetTests/Calculation/Functions/Database/DGetTest.php @@ -24,7 +24,7 @@ class DGetTest extends TestCase public function testDGet($expectedResult, $database, $field, $criteria): void { $result = Database::DGET($database, $field, $criteria); - self::assertSame($expectedResult, $result); + self::assertEqualsWithDelta($expectedResult, $result, 1.0e-12); } private function database1(): array diff --git a/tests/PhpSpreadsheetTests/Calculation/Functions/Database/DMaxTest.php b/tests/PhpSpreadsheetTests/Calculation/Functions/Database/DMaxTest.php index 94ac04259..25f957daf 100644 --- a/tests/PhpSpreadsheetTests/Calculation/Functions/Database/DMaxTest.php +++ b/tests/PhpSpreadsheetTests/Calculation/Functions/Database/DMaxTest.php @@ -24,7 +24,7 @@ class DMaxTest extends TestCase public function testDMax($expectedResult, $database, $field, $criteria): void { $result = Database::DMAX($database, $field, $criteria); - self::assertSame($expectedResult, $result); + self::assertEqualsWithDelta($expectedResult, $result, 1.0e-12); } private function database1(): array diff --git a/tests/PhpSpreadsheetTests/Calculation/Functions/Database/DMinTest.php b/tests/PhpSpreadsheetTests/Calculation/Functions/Database/DMinTest.php index a02ad2e19..ca32d2879 100644 --- a/tests/PhpSpreadsheetTests/Calculation/Functions/Database/DMinTest.php +++ b/tests/PhpSpreadsheetTests/Calculation/Functions/Database/DMinTest.php @@ -24,7 +24,7 @@ class DMinTest extends TestCase public function testDMin($expectedResult, $database, $field, $criteria): void { $result = Database::DMIN($database, $field, $criteria); - self::assertSame($expectedResult, $result); + self::assertEqualsWithDelta($expectedResult, $result, 1.0e-12); } private function database1(): array diff --git a/tests/PhpSpreadsheetTests/Calculation/Functions/Database/DProductTest.php b/tests/PhpSpreadsheetTests/Calculation/Functions/Database/DProductTest.php index 149625583..7567b44f2 100644 --- a/tests/PhpSpreadsheetTests/Calculation/Functions/Database/DProductTest.php +++ b/tests/PhpSpreadsheetTests/Calculation/Functions/Database/DProductTest.php @@ -25,7 +25,7 @@ class DProductTest extends TestCase public function testDProduct($expectedResult, $database, $field, $criteria): void { $result = Database::DPRODUCT($database, $field, $criteria); - self::assertSame($expectedResult, $result); + self::assertEqualsWithDelta($expectedResult, $result, 1.0e-12); } private function database1(): array diff --git a/tests/PhpSpreadsheetTests/Calculation/Functions/Database/DStDevPTest.php b/tests/PhpSpreadsheetTests/Calculation/Functions/Database/DStDevPTest.php index 669a694b3..e62602e32 100644 --- a/tests/PhpSpreadsheetTests/Calculation/Functions/Database/DStDevPTest.php +++ b/tests/PhpSpreadsheetTests/Calculation/Functions/Database/DStDevPTest.php @@ -24,7 +24,7 @@ class DStDevPTest extends TestCase public function testDStDevP($expectedResult, $database, $field, $criteria): void { $result = Database::DSTDEVP($database, $field, $criteria); - self::assertSame($expectedResult, $result); + self::assertEqualsWithDelta($expectedResult, $result, 1.0e-12); } private function database1(): array diff --git a/tests/PhpSpreadsheetTests/Calculation/Functions/Database/DStDevTest.php b/tests/PhpSpreadsheetTests/Calculation/Functions/Database/DStDevTest.php index a7975a11c..f0837e813 100644 --- a/tests/PhpSpreadsheetTests/Calculation/Functions/Database/DStDevTest.php +++ b/tests/PhpSpreadsheetTests/Calculation/Functions/Database/DStDevTest.php @@ -24,7 +24,7 @@ class DStDevTest extends TestCase public function testDStDev($expectedResult, $database, $field, $criteria): void { $result = Database::DSTDEV($database, $field, $criteria); - self::assertSame($expectedResult, $result); + self::assertEqualsWithDelta($expectedResult, $result, 1.0e-12); } private function database1(): array diff --git a/tests/PhpSpreadsheetTests/Calculation/Functions/Database/DSumTest.php b/tests/PhpSpreadsheetTests/Calculation/Functions/Database/DSumTest.php index 55edffe06..0cce63d81 100644 --- a/tests/PhpSpreadsheetTests/Calculation/Functions/Database/DSumTest.php +++ b/tests/PhpSpreadsheetTests/Calculation/Functions/Database/DSumTest.php @@ -24,7 +24,7 @@ class DSumTest extends TestCase public function testDSum($expectedResult, $database, $field, $criteria): void { $result = Database::DSUM($database, $field, $criteria); - self::assertSame($expectedResult, $result); + self::assertEqualsWithDelta($expectedResult, $result, 1.0e-12); } private function database1(): array diff --git a/tests/PhpSpreadsheetTests/Calculation/Functions/Database/DVarPTest.php b/tests/PhpSpreadsheetTests/Calculation/Functions/Database/DVarPTest.php index 60612db59..1e9a8e276 100644 --- a/tests/PhpSpreadsheetTests/Calculation/Functions/Database/DVarPTest.php +++ b/tests/PhpSpreadsheetTests/Calculation/Functions/Database/DVarPTest.php @@ -24,7 +24,7 @@ class DVarPTest extends TestCase public function testDVarP($expectedResult, $database, $field, $criteria): void { $result = Database::DVARP($database, $field, $criteria); - self::assertSame($expectedResult, $result); + self::assertEqualsWithDelta($expectedResult, $result, 1.0e-12); } private function database1(): array diff --git a/tests/PhpSpreadsheetTests/Calculation/Functions/Database/DVarTest.php b/tests/PhpSpreadsheetTests/Calculation/Functions/Database/DVarTest.php index 0015b7fb0..c62f13b48 100644 --- a/tests/PhpSpreadsheetTests/Calculation/Functions/Database/DVarTest.php +++ b/tests/PhpSpreadsheetTests/Calculation/Functions/Database/DVarTest.php @@ -24,7 +24,7 @@ class DVarTest extends TestCase public function testDVar($expectedResult, $database, $field, $criteria): void { $result = Database::DVAR($database, $field, $criteria); - self::assertSame($expectedResult, $result); + self::assertEqualsWithDelta($expectedResult, $result, 1.0e-12); } private function database1(): array diff --git a/tests/PhpSpreadsheetTests/Calculation/RowColumnReferenceTest.php b/tests/PhpSpreadsheetTests/Calculation/RowColumnReferenceTest.php index 8c9d23f76..235d62e7f 100644 --- a/tests/PhpSpreadsheetTests/Calculation/RowColumnReferenceTest.php +++ b/tests/PhpSpreadsheetTests/Calculation/RowColumnReferenceTest.php @@ -46,7 +46,7 @@ class RowColumnReferenceTest extends TestCase $worksheet->setCellValue('A1', $formula); $result = $worksheet->getCell('A1')->getCalculatedValue(); - self::assertSame($expectedResult, $result); + self::assertEqualsWithDelta($expectedResult, $result, 1.0e-12); } public function providerCurrentWorksheetFormulae(): array diff --git a/tests/PhpSpreadsheetTests/Helper/DimensionTest.php b/tests/PhpSpreadsheetTests/Helper/DimensionTest.php index 87bce3800..9ed9c4f2e 100644 --- a/tests/PhpSpreadsheetTests/Helper/DimensionTest.php +++ b/tests/PhpSpreadsheetTests/Helper/DimensionTest.php @@ -23,7 +23,7 @@ class DimensionTest extends TestCase public function testConvertDimension(float $expectedResult, string $dimension, string $unitOfMeasure): void { $result = (new Dimension($dimension))->toUnit($unitOfMeasure); - self::assertSame($expectedResult, $result); + self::assertEqualsWithDelta($expectedResult, $result, 1.0e-12); } public function testConvertDimensionInvalidUoM(): void