Skip to content

Commit 73a8a1e

Browse files
committed
AC-7629:: 2.4.6-beta1-Composer Integration Test Failures
1 parent 868c337 commit 73a8a1e

File tree

3 files changed

+24
-9
lines changed

3 files changed

+24
-9
lines changed

dev/tests/integration/testsuite/Magento/SalesRule/Model/Rule/Action/Discount/CartFixedTest.php

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -47,6 +47,11 @@
4747
*/
4848
class CartFixedTest extends TestCase
4949
{
50+
/**
51+
* @var float
52+
*/
53+
private const EPSILON = 0.0000000001;
54+
5055
/**
5156
* @var GuestCartManagementInterface
5257
*/
@@ -521,11 +526,11 @@ public function testDiscountsWhenByPercentRuleAppliedFirstAndCartFixedRuleSecond
521526
$item = array_shift($items);
522527
$this->assertEquals('simple1', $item->getSku());
523528
$this->assertEquals(5.99, $item->getPrice());
524-
$this->assertEquals($expectedDiscounts[$item->getSku()], $item->getDiscountAmount());
529+
$this->assertEqualsWithDelta($expectedDiscounts[$item->getSku()], $item->getDiscountAmount(), self::EPSILON);
525530
$item = array_shift($items);
526531
$this->assertEquals('simple2', $item->getSku());
527532
$this->assertEquals(15.99, $item->getPrice());
528-
$this->assertEquals($expectedDiscounts[$item->getSku()], $item->getDiscountAmount());
533+
$this->assertEqualsWithDelta($expectedDiscounts[$item->getSku()], $item->getDiscountAmount(), self::EPSILON);
529534
}
530535

531536
public function discountByPercentDataProvider()

dev/tests/integration/testsuite/Magento/Tax/Model/Sales/Total/Quote/TaxTest.php

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,11 @@
2323
*/
2424
class TaxTest extends \Magento\TestFramework\Indexer\TestCase
2525
{
26+
/**
27+
* @var float
28+
*/
29+
private const EPSILON = 0.0000000001;
30+
2631
/**
2732
* Utility object for setting up tax rates, tax classes and tax rules
2833
*
@@ -176,7 +181,7 @@ public function testFullDiscountWithDeltaRoundingFix()
176181
protected function verifyItem($item, $expectedItemData)
177182
{
178183
foreach ($expectedItemData as $key => $value) {
179-
$this->assertEquals($value, $item->getData($key), 'item ' . $key . ' is incorrect');
184+
$this->assertEqualsWithDelta($value, $item->getData($key), self::EPSILON, 'item ' . $key . ' is incorrect');
180185
}
181186

182187
return $this;
@@ -247,7 +252,7 @@ protected function verifyQuoteAddress($quoteAddress, $expectedAddressData)
247252
if ($key == 'applied_taxes') {
248253
$this->verifyAppliedTaxes($quoteAddress->getAppliedTaxes(), $value);
249254
} else {
250-
$this->assertEquals($value, $quoteAddress->getData($key), 'Quote address ' . $key . ' is incorrect');
255+
$this->assertEqualsWithDelta($value, $quoteAddress->getData($key), self::EPSILON, 'Quote address ' . $key . ' is incorrect');
251256
}
252257
}
253258

dev/tests/integration/testsuite/Magento/Tax/Model/TaxCalculationTest.php

Lines changed: 10 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,11 @@
1515
*/
1616
class TaxCalculationTest extends \PHPUnit\Framework\TestCase
1717
{
18+
/**
19+
* @var float
20+
*/
21+
private const EPSILON = 0.0000000001;
22+
1823
/**
1924
* Object Manager
2025
*
@@ -108,7 +113,7 @@ public function testCalculateTaxUnitBased($quoteDetailsData, $expected)
108113
);
109114

110115
$taxDetails = $this->taxCalculationService->calculateTax($quoteDetails, 1);
111-
$this->assertEquals($expected, $this->convertObjectToArray($taxDetails));
116+
$this->assertEqualsWithDelta($expected, $this->convertObjectToArray($taxDetails), self::EPSILON);
112117
}
113118

114119
/**
@@ -1286,7 +1291,7 @@ public function testCalculateTaxRowBased($quoteDetailsData, $expectedTaxDetails)
12861291

12871292
$taxDetails = $this->taxCalculationService->calculateTax($quoteDetails);
12881293

1289-
$this->assertEquals($expectedTaxDetails, $this->convertObjectToArray($taxDetails));
1294+
$this->assertEqualsWithDelta($expectedTaxDetails, $this->convertObjectToArray($taxDetails), self::EPSILON);
12901295
}
12911296

12921297
/**
@@ -2387,7 +2392,7 @@ public function testMultiRulesRowBased($quoteDetailsData, $expectedTaxDetails)
23872392

23882393
$taxDetails = $this->taxCalculationService->calculateTax($quoteDetails);
23892394

2390-
$this->assertEquals($expectedTaxDetails, $this->convertObjectToArray($taxDetails));
2395+
$this->assertEqualsWithDelta($expectedTaxDetails, $this->convertObjectToArray($taxDetails), self::EPSILON);
23912396
}
23922397

23932398
/**
@@ -2424,7 +2429,7 @@ public function testMultiRulesTotalBased($quoteDetailsData, $expectedTaxDetails)
24242429

24252430
$taxDetails = $this->taxCalculationService->calculateTax($quoteDetails);
24262431

2427-
$this->assertEquals($expectedTaxDetails, $this->convertObjectToArray($taxDetails));
2432+
$this->assertEqualsWithDelta($expectedTaxDetails, $this->convertObjectToArray($taxDetails), self::EPSILON);
24282433
}
24292434

24302435
/**
@@ -2471,7 +2476,7 @@ public function testMultiRulesUnitBased($quoteDetailsData, $expectedTaxDetails)
24712476

24722477
$taxDetails = $this->taxCalculationService->calculateTax($quoteDetails);
24732478

2474-
$this->assertEquals($expectedTaxDetails, $this->convertObjectToArray($taxDetails));
2479+
$this->assertEqualsWithDelta($expectedTaxDetails, $this->convertObjectToArray($taxDetails), self::EPSILON);
24752480
}
24762481

24772482
/**

0 commit comments

Comments
 (0)