From d2e0d446b1a72be0b473562f732d15c5446eaf10 Mon Sep 17 00:00:00 2001
From: Fabian Schmengler <fs@integer-net.de>
Date: Tue, 26 Sep 2017 16:13:12 +0200
Subject: [PATCH] Replace expectException(, ) in unit tests
expectException(); expectExceptionMessage()
---
.../Config/SessionLifetime/BackendModelTest.php | 3 ++-
.../Test/Unit/Model/CategoryRepositoryTest.php | 3 ++-
.../Model/Indexer/Product/Eav/Action/FullTest.php | 3 ++-
.../Unit/Model/Indexer/Stock/Action/FullTest.php | 3 ++-
.../System/Config/Form/Field/RegexceptionsTest.php | 3 ++-
.../Command/ConfigSet/ProcessorFacadeTest.php | 3 ++-
.../Mapper/Helper/RelativePathConverterTest.php | 6 ++++--
.../Magento/Config/Test/Unit/Model/ConfigTest.php | 3 ++-
.../Test/Unit/Model/OptionRepositoryTest.php | 3 ++-
.../Model/Product/Cache/Tag/ConfigurableTest.php | 6 ++++--
.../Magento/Customer/Test/Unit/Model/LoggerTest.php | 3 ++-
.../Test/Unit/Model/Currency/Import/ConfigTest.php | 3 ++-
.../Eav/Test/Unit/Model/Entity/Attribute/SetTest.php | 3 ++-
.../Email/Test/Unit/Model/Template/ConfigTest.php | 3 ++-
.../Integration/Test/Unit/Model/Oauth/TokenTest.php | 12 ++++++++----
.../Magento/Paypal/Test/Unit/Model/Api/NvpTest.php | 3 ++-
.../Rule/Test/Unit/Model/ConditionFactoryTest.php | 6 ++++--
.../Test/Unit/Model/CouponRepositoryTest.php | 3 ++-
.../Unit/Model/Calculation/RateRepositoryTest.php | 3 ++-
.../Tax/Test/Unit/Model/Calculation/RateTest.php | 3 ++-
.../Tax/Test/Unit/Model/TaxRuleRepositoryTest.php | 3 ++-
.../CleanThemeRelatedContentObserverTest.php | 3 ++-
app/code/Magento/Webapi/Test/Unit/ExceptionTest.php | 3 ++-
.../Unit/Model/Attribute/Backend/Weee/TaxTest.php | 3 ++-
24 files changed, 60 insertions(+), 30 deletions(-)
diff --git a/app/code/Magento/Backend/Test/Unit/Model/Config/SessionLifetime/BackendModelTest.php b/app/code/Magento/Backend/Test/Unit/Model/Config/SessionLifetime/BackendModelTest.php
index 31a13191750..2f0102ffd41 100755
--- a/app/code/Magento/Backend/Test/Unit/Model/Config/SessionLifetime/BackendModelTest.php
+++ b/app/code/Magento/Backend/Test/Unit/Model/Config/SessionLifetime/BackendModelTest.php
@@ -20,7 +20,8 @@ class BackendModelTest extends \PHPUnit\Framework\TestCase
\Magento\Backend\Model\Config\SessionLifetime\BackendModel::class
);
if ($errorMessage !== null) {
- $this->expectException(\Magento\Framework\Exception\LocalizedException::class, $errorMessage);
+ $this->expectException(\Magento\Framework\Exception\LocalizedException::class);
+ $this->expectExceptionMessage($errorMessage);
}
$model->setValue($value);
$object = $model->beforeSave();
diff --git a/app/code/Magento/Catalog/Test/Unit/Model/CategoryRepositoryTest.php b/app/code/Magento/Catalog/Test/Unit/Model/CategoryRepositoryTest.php
index 1bc5e450ae1..f77a6fec283 100644
--- a/app/code/Magento/Catalog/Test/Unit/Model/CategoryRepositoryTest.php
+++ b/app/code/Magento/Catalog/Test/Unit/Model/CategoryRepositoryTest.php
@@ -255,7 +255,8 @@ class CategoryRepositoryTest extends \PHPUnit\Framework\TestCase
*/
public function testSaveWithValidateCategoryException($error, $expectedException, $expectedExceptionMessage)
{
- $this->expectException($expectedException, $expectedExceptionMessage);
+ $this->expectException($expectedException);
+ $this->expectExceptionMessage($expectedExceptionMessage);
$categoryId = 5;
$categoryMock = $this->createMock(\Magento\Catalog\Model\Category::class);
$this->extensibleDataObjectConverterMock
diff --git a/app/code/Magento/Catalog/Test/Unit/Model/Indexer/Product/Eav/Action/FullTest.php b/app/code/Magento/Catalog/Test/Unit/Model/Indexer/Product/Eav/Action/FullTest.php
index eb5fdabe533..c254557904d 100644
--- a/app/code/Magento/Catalog/Test/Unit/Model/Indexer/Product/Eav/Action/FullTest.php
+++ b/app/code/Magento/Catalog/Test/Unit/Model/Indexer/Product/Eav/Action/FullTest.php
@@ -48,7 +48,8 @@ class FullTest extends \PHPUnit\Framework\TestCase
$tableSwitcherMock
);
- $this->expectException(\Magento\Framework\Exception\LocalizedException::class, $exceptionMessage);
+ $this->expectException(\Magento\Framework\Exception\LocalizedException::class);
+ $this->expectExceptionMessage($exceptionMessage);
$model->execute();
}
diff --git a/app/code/Magento/CatalogInventory/Test/Unit/Model/Indexer/Stock/Action/FullTest.php b/app/code/Magento/CatalogInventory/Test/Unit/Model/Indexer/Stock/Action/FullTest.php
index e1a19bf10ec..3590c96bd15 100644
--- a/app/code/Magento/CatalogInventory/Test/Unit/Model/Indexer/Stock/Action/FullTest.php
+++ b/app/code/Magento/CatalogInventory/Test/Unit/Model/Indexer/Stock/Action/FullTest.php
@@ -44,7 +44,8 @@ class FullTest extends \PHPUnit\Framework\TestCase
]
);
- $this->expectException(\Magento\Framework\Exception\LocalizedException::class, $exceptionMessage);
+ $this->expectException(\Magento\Framework\Exception\LocalizedException::class);
+ $this->expectExceptionMessage($exceptionMessage);
$model->execute();
}
diff --git a/app/code/Magento/Config/Test/Unit/Block/System/Config/Form/Field/RegexceptionsTest.php b/app/code/Magento/Config/Test/Unit/Block/System/Config/Form/Field/RegexceptionsTest.php
index 4f53f1072e0..0b4d5f7ef15 100644
--- a/app/code/Magento/Config/Test/Unit/Block/System/Config/Form/Field/RegexceptionsTest.php
+++ b/app/code/Magento/Config/Test/Unit/Block/System/Config/Form/Field/RegexceptionsTest.php
@@ -128,7 +128,8 @@ class RegexceptionsTest extends \PHPUnit\Framework\TestCase
$this->object->addColumn($wrongColumnName, $this->cellParameters);
- $this->expectException('\Exception', 'Wrong column name specified.');
+ $this->expectException('\Exception');
+ $this->expectExceptionMessage('Wrong column name specified.');
$this->object->renderCellTemplate($columnName);
}
diff --git a/app/code/Magento/Config/Test/Unit/Console/Command/ConfigSet/ProcessorFacadeTest.php b/app/code/Magento/Config/Test/Unit/Console/Command/ConfigSet/ProcessorFacadeTest.php
index 4e65ab3f4cc..0f5852c322b 100644
--- a/app/code/Magento/Config/Test/Unit/Console/Command/ConfigSet/ProcessorFacadeTest.php
+++ b/app/code/Magento/Config/Test/Unit/Console/Command/ConfigSet/ProcessorFacadeTest.php
@@ -132,7 +132,8 @@ class ProcessorFacadeTest extends \PHPUnit\Framework\TestCase
*/
public function testProcessWithValidatorException(LocalizedException $exception)
{
- $this->expectException(ValidatorException::class, 'Some error');
+ $this->expectException(ValidatorException::class);
+ $this->expectExceptionMessage('Some error');
$this->scopeValidatorMock->expects($this->once())
->method('isValid')
->willThrowException($exception);
diff --git a/app/code/Magento/Config/Test/Unit/Model/Config/Structure/Mapper/Helper/RelativePathConverterTest.php b/app/code/Magento/Config/Test/Unit/Model/Config/Structure/Mapper/Helper/RelativePathConverterTest.php
index c671a5326c4..058f9a380a2 100644
--- a/app/code/Magento/Config/Test/Unit/Model/Config/Structure/Mapper/Helper/RelativePathConverterTest.php
+++ b/app/code/Magento/Config/Test/Unit/Model/Config/Structure/Mapper/Helper/RelativePathConverterTest.php
@@ -24,7 +24,8 @@ class RelativePathConverterTest extends \PHPUnit\Framework\TestCase
$exceptionMessage = sprintf('Invalid relative path %s in %s node', $relativePath, $nodePath);
- $this->expectException('InvalidArgumentException', $exceptionMessage);
+ $this->expectException('InvalidArgumentException');
+ $this->expectExceptionMessage($exceptionMessage);
$this->_sut->convert($nodePath, $relativePath);
}
@@ -35,7 +36,8 @@ class RelativePathConverterTest extends \PHPUnit\Framework\TestCase
*/
public function testConvertWithInvalidArguments($nodePath, $relativePath)
{
- $this->expectException('InvalidArgumentException', 'Invalid arguments');
+ $this->expectException('InvalidArgumentException');
+ $this->expectExceptionMessage('Invalid arguments');
$this->_sut->convert($nodePath, $relativePath);
}
diff --git a/app/code/Magento/Config/Test/Unit/Model/ConfigTest.php b/app/code/Magento/Config/Test/Unit/Model/ConfigTest.php
index 2832e8e54e5..2ddbbd5ffe1 100644
--- a/app/code/Magento/Config/Test/Unit/Model/ConfigTest.php
+++ b/app/code/Magento/Config/Test/Unit/Model/ConfigTest.php
@@ -280,7 +280,8 @@ class ConfigTest extends \PHPUnit\Framework\TestCase
public function testSetDataByPathWrongDepth($path, $expectedException)
{
$expectedException = 'Allowed depth of configuration is 3 (<section>/<group>/<field>). ' . $expectedException;
- $this->expectException('\UnexpectedValueException', $expectedException);
+ $this->expectException('\UnexpectedValueException');
+ $this->expectExceptionMessage($expectedException);
$value = 'value';
$this->_model->setDataByPath($path, $value);
}
diff --git a/app/code/Magento/ConfigurableProduct/Test/Unit/Model/OptionRepositoryTest.php b/app/code/Magento/ConfigurableProduct/Test/Unit/Model/OptionRepositoryTest.php
index 2d824e52c72..ab3fd33322a 100644
--- a/app/code/Magento/ConfigurableProduct/Test/Unit/Model/OptionRepositoryTest.php
+++ b/app/code/Magento/ConfigurableProduct/Test/Unit/Model/OptionRepositoryTest.php
@@ -356,7 +356,8 @@ class OptionRepositoryTest extends \PHPUnit\Framework\TestCase
*/
public function testValidateNewOptionData($attributeId, $label, $optionValues, $msg)
{
- $this->expectException(\Magento\Framework\Exception\InputException::class, $msg);
+ $this->expectException(\Magento\Framework\Exception\InputException::class);
+ $this->expectExceptionMessage($msg);
$optionValueMock = $this->getMockBuilder(\Magento\ConfigurableProduct\Api\Data\OptionValueInterface::class)
->setMethods(['getValueIndex', 'getPricingValue', 'getIsPercent'])
->getMockForAbstractClass();
diff --git a/app/code/Magento/ConfigurableProduct/Test/Unit/Model/Product/Cache/Tag/ConfigurableTest.php b/app/code/Magento/ConfigurableProduct/Test/Unit/Model/Product/Cache/Tag/ConfigurableTest.php
index 519288a50c8..958b75a2285 100644
--- a/app/code/Magento/ConfigurableProduct/Test/Unit/Model/Product/Cache/Tag/ConfigurableTest.php
+++ b/app/code/Magento/ConfigurableProduct/Test/Unit/Model/Product/Cache/Tag/ConfigurableTest.php
@@ -32,13 +32,15 @@ class ConfigurableTest extends \PHPUnit\Framework\TestCase
public function testGetWithScalar()
{
- $this->expectException(\InvalidArgumentException::class, 'Provided argument is not an object');
+ $this->expectException(\InvalidArgumentException::class);
+ $this->expectExceptionMessage('Provided argument is not an object');
$this->model->getTags('scalar');
}
public function testGetTagsWithObject()
{
- $this->expectException(\InvalidArgumentException::class, 'Provided argument must be a product');
+ $this->expectException(\InvalidArgumentException::class);
+ $this->expectExceptionMessage('Provided argument must be a product');
$this->model->getTags(new \StdClass());
}
diff --git a/app/code/Magento/Customer/Test/Unit/Model/LoggerTest.php b/app/code/Magento/Customer/Test/Unit/Model/LoggerTest.php
index 4cea7ee2283..408389182ae 100644
--- a/app/code/Magento/Customer/Test/Unit/Model/LoggerTest.php
+++ b/app/code/Magento/Customer/Test/Unit/Model/LoggerTest.php
@@ -71,7 +71,8 @@ class LoggerTest extends \PHPUnit\Framework\TestCase
$data = array_filter($data);
if (!$data) {
- $this->expectException('\InvalidArgumentException', 'Log data is empty');
+ $this->expectException('\InvalidArgumentException');
+ $this->expectExceptionMessage('Log data is empty');
$this->logger->log($customerId, $data);
return;
}
diff --git a/app/code/Magento/Directory/Test/Unit/Model/Currency/Import/ConfigTest.php b/app/code/Magento/Directory/Test/Unit/Model/Currency/Import/ConfigTest.php
index 54ec26386f3..76b23e4e79e 100644
--- a/app/code/Magento/Directory/Test/Unit/Model/Currency/Import/ConfigTest.php
+++ b/app/code/Magento/Directory/Test/Unit/Model/Currency/Import/ConfigTest.php
@@ -29,7 +29,8 @@ class ConfigTest extends \PHPUnit\Framework\TestCase
*/
public function testConstructorException(array $configData, $expectedException)
{
- $this->expectException('InvalidArgumentException', $expectedException);
+ $this->expectException('InvalidArgumentException');
+ $this->expectExceptionMessage($expectedException);
new \Magento\Directory\Model\Currency\Import\Config($configData);
}
diff --git a/app/code/Magento/Eav/Test/Unit/Model/Entity/Attribute/SetTest.php b/app/code/Magento/Eav/Test/Unit/Model/Entity/Attribute/SetTest.php
index 78465e57c62..e976d031e96 100644
--- a/app/code/Magento/Eav/Test/Unit/Model/Entity/Attribute/SetTest.php
+++ b/app/code/Magento/Eav/Test/Unit/Model/Entity/Attribute/SetTest.php
@@ -44,7 +44,8 @@ class SetTest extends \PHPUnit\Framework\TestCase
{
$this->_model->getResource()->expects($this->any())->method('validate')->will($this->returnValue(false));
- $this->expectException(\Magento\Framework\Exception\LocalizedException::class, $exceptionMessage);
+ $this->expectException(\Magento\Framework\Exception\LocalizedException::class);
+ $this->expectExceptionMessage($exceptionMessage);
$this->_model->setAttributeSetName($attributeSetName);
$this->_model->validate();
}
diff --git a/app/code/Magento/Email/Test/Unit/Model/Template/ConfigTest.php b/app/code/Magento/Email/Test/Unit/Model/Template/ConfigTest.php
index 6ec3905fe46..47c3ac1e7e4 100644
--- a/app/code/Magento/Email/Test/Unit/Model/Template/ConfigTest.php
+++ b/app/code/Magento/Email/Test/Unit/Model/Template/ConfigTest.php
@@ -311,7 +311,8 @@ class ConfigTest extends \PHPUnit\Framework\TestCase
array $fixtureFields = [],
$argument = null
) {
- $this->expectException('UnexpectedValueException', $expectedException);
+ $this->expectException('UnexpectedValueException');
+ $this->expectExceptionMessage($expectedException);
$dataStorage = $this->createPartialMock(\Magento\Email\Model\Template\Config\Data::class, ['get']);
$dataStorage->expects(
$this->atLeastOnce()
diff --git a/app/code/Magento/Integration/Test/Unit/Model/Oauth/TokenTest.php b/app/code/Magento/Integration/Test/Unit/Model/Oauth/TokenTest.php
index 36b0d77d1e1..badb69aa19f 100644
--- a/app/code/Magento/Integration/Test/Unit/Model/Oauth/TokenTest.php
+++ b/app/code/Magento/Integration/Test/Unit/Model/Oauth/TokenTest.php
@@ -384,7 +384,8 @@ class TokenTest extends \PHPUnit\Framework\TestCase
$this->validatorMock->expects($this->once())->method('isValid')->willReturn(false);
$this->validatorMock->expects($this->once())->method('getMessages')->willReturn([$exceptionMessage]);
- $this->expectException(\Magento\Framework\Oauth\Exception::class, $exceptionMessage);
+ $this->expectException(\Magento\Framework\Oauth\Exception::class);
+ $this->expectExceptionMessage($exceptionMessage);
$this->tokenModel->validate();
}
@@ -402,7 +403,8 @@ class TokenTest extends \PHPUnit\Framework\TestCase
$this->validatorKeyLengthMock->expects($this->once())->method('isValid')->willReturn(false);
$this->validatorKeyLengthMock->expects($this->once())->method('getMessages')->willReturn([$exceptionMessage]);
- $this->expectException(\Magento\Framework\Oauth\Exception::class, $exceptionMessage);
+ $this->expectException(\Magento\Framework\Oauth\Exception::class);
+ $this->expectExceptionMessage($exceptionMessage);
$this->tokenModel->validate();
}
@@ -429,7 +431,8 @@ class TokenTest extends \PHPUnit\Framework\TestCase
]
);
$this->validatorKeyLengthMock->expects($this->once())->method('getMessages')->willReturn([$exceptionMessage]);
- $this->expectException(\Magento\Framework\Oauth\Exception::class, $exceptionMessage);
+ $this->expectException(\Magento\Framework\Oauth\Exception::class);
+ $this->expectExceptionMessage($exceptionMessage);
$this->tokenModel->validate();
}
@@ -459,7 +462,8 @@ class TokenTest extends \PHPUnit\Framework\TestCase
]
);
$this->validatorKeyLengthMock->expects($this->once())->method('getMessages')->willReturn([$exceptionMessage]);
- $this->expectException(\Magento\Framework\Oauth\Exception::class, $exceptionMessage);
+ $this->expectException(\Magento\Framework\Oauth\Exception::class);
+ $this->expectExceptionMessage($exceptionMessage);
$this->tokenModel->validate();
}
diff --git a/app/code/Magento/Paypal/Test/Unit/Model/Api/NvpTest.php b/app/code/Magento/Paypal/Test/Unit/Model/Api/NvpTest.php
index 8b270fe24ab..c0b2bb4fc1d 100644
--- a/app/code/Magento/Paypal/Test/Unit/Model/Api/NvpTest.php
+++ b/app/code/Magento/Paypal/Test/Unit/Model/Api/NvpTest.php
@@ -126,7 +126,8 @@ class NvpTest extends \PHPUnit\Framework\TestCase
public function testCall($response, $processableErrors, $exception, $exceptionMessage = '', $exceptionCode = null)
{
if (isset($exception)) {
- $this->expectException($exception, $exceptionMessage, $exceptionCode);
+ $this->expectException($exception);
+ $this->expectExceptionMessage($exceptionMessage, $exceptionCode);
}
$this->curl->expects($this->once())
->method('read')
diff --git a/app/code/Magento/Rule/Test/Unit/Model/ConditionFactoryTest.php b/app/code/Magento/Rule/Test/Unit/Model/ConditionFactoryTest.php
index d8c0cc470f5..f78ee4f345d 100644
--- a/app/code/Magento/Rule/Test/Unit/Model/ConditionFactoryTest.php
+++ b/app/code/Magento/Rule/Test/Unit/Model/ConditionFactoryTest.php
@@ -78,7 +78,8 @@ class ConditionFactoryTest extends \PHPUnit\Framework\TestCase
->expects($this->never())
->method('create');
- $this->expectException(\InvalidArgumentException::class, 'Class does not exist');
+ $this->expectException(\InvalidArgumentException::class);
+ $this->expectExceptionMessage('Class does not exist');
$this->conditionFactory->create($type);
}
@@ -92,7 +93,8 @@ class ConditionFactoryTest extends \PHPUnit\Framework\TestCase
->method('create')
->with($type)
->willReturn(new \stdClass());
- $this->expectException(\InvalidArgumentException::class, 'Class does not implement condition interface');
+ $this->expectException(\InvalidArgumentException::class);
+ $this->expectExceptionMessage('Class does not implement condition interface');
$this->conditionFactory->create($type);
}
}
diff --git a/app/code/Magento/SalesRule/Test/Unit/Model/CouponRepositoryTest.php b/app/code/Magento/SalesRule/Test/Unit/Model/CouponRepositoryTest.php
index ebdc10830f3..31536e1be3d 100644
--- a/app/code/Magento/SalesRule/Test/Unit/Model/CouponRepositoryTest.php
+++ b/app/code/Magento/SalesRule/Test/Unit/Model/CouponRepositoryTest.php
@@ -150,7 +150,8 @@ class CouponRepositoryTest extends \PHPUnit\Framework\TestCase
$this->resource->expects($this->once())->method('save')->with($coupon)
->willThrowException($exceptionObject);
}
- $this->expectException($exceptionName, $exceptionMessage);
+ $this->expectException($exceptionName);
+ $this->expectExceptionMessage($exceptionMessage);
$this->model->save($coupon);
}
diff --git a/app/code/Magento/Tax/Test/Unit/Model/Calculation/RateRepositoryTest.php b/app/code/Magento/Tax/Test/Unit/Model/Calculation/RateRepositoryTest.php
index db2053efd41..e6a29177301 100644
--- a/app/code/Magento/Tax/Test/Unit/Model/Calculation/RateRepositoryTest.php
+++ b/app/code/Magento/Tax/Test/Unit/Model/Calculation/RateRepositoryTest.php
@@ -307,7 +307,8 @@ class RateRepositoryTest extends \PHPUnit\Framework\TestCase
->with($rateTitles)
->willThrowException($expectedException);
$this->rateRegistryMock->expects($this->never())->method('registerTaxRate')->with($rateMock);
- $this->expectException($exceptionType, $exceptionMessage);
+ $this->expectException($exceptionType);
+ $this->expectExceptionMessage($exceptionMessage);
$this->model->save($rateMock);
}
diff --git a/app/code/Magento/Tax/Test/Unit/Model/Calculation/RateTest.php b/app/code/Magento/Tax/Test/Unit/Model/Calculation/RateTest.php
index 5a5abfd828d..c0a04a3fb45 100644
--- a/app/code/Magento/Tax/Test/Unit/Model/Calculation/RateTest.php
+++ b/app/code/Magento/Tax/Test/Unit/Model/Calculation/RateTest.php
@@ -46,7 +46,8 @@ class RateTest extends \PHPUnit\Framework\TestCase
*/
public function testExceptionOfValidation($exceptionMessage, $data)
{
- $this->expectException(\Magento\Framework\Exception\LocalizedException::class, $exceptionMessage);
+ $this->expectException(\Magento\Framework\Exception\LocalizedException::class);
+ $this->expectExceptionMessage($exceptionMessage);
$rate = $this->objectHelper->getObject(
\Magento\Tax\Model\Calculation\Rate::class,
['resource' => $this->resourceMock]
diff --git a/app/code/Magento/Tax/Test/Unit/Model/TaxRuleRepositoryTest.php b/app/code/Magento/Tax/Test/Unit/Model/TaxRuleRepositoryTest.php
index 182e1b43d78..f4151cd18ba 100644
--- a/app/code/Magento/Tax/Test/Unit/Model/TaxRuleRepositoryTest.php
+++ b/app/code/Magento/Tax/Test/Unit/Model/TaxRuleRepositoryTest.php
@@ -163,7 +163,8 @@ class TaxRuleRepositoryTest extends \PHPUnit\Framework\TestCase
->willThrowException($exceptionObject);
$this->taxRuleRegistry->expects($this->never())->method('registerTaxRule');
- $this->expectException($exceptionName, $exceptionMessage);
+ $this->expectException($exceptionName);
+ $this->expectExceptionMessage($exceptionMessage);
$this->model->save($rule);
}
diff --git a/app/code/Magento/Theme/Test/Unit/Observer/CleanThemeRelatedContentObserverTest.php b/app/code/Magento/Theme/Test/Unit/Observer/CleanThemeRelatedContentObserverTest.php
index 0eaa5096856..f1f4664c854 100644
--- a/app/code/Magento/Theme/Test/Unit/Observer/CleanThemeRelatedContentObserverTest.php
+++ b/app/code/Magento/Theme/Test/Unit/Observer/CleanThemeRelatedContentObserverTest.php
@@ -105,7 +105,8 @@ class CleanThemeRelatedContentObserverTest extends \PHPUnit\Framework\TestCase
$this->themeConfig->expects($this->any())->method('isThemeAssignedToStore')->with($themeMock)->willReturn(true);
- $this->expectException(\Magento\Framework\Exception\LocalizedException::class, 'Theme isn\'t deletable.');
+ $this->expectException(\Magento\Framework\Exception\LocalizedException::class);
+ $this->expectExceptionMessage('Theme isn\'t deletable.');
$this->themeObserver->execute($observerMock);
}
diff --git a/app/code/Magento/Webapi/Test/Unit/ExceptionTest.php b/app/code/Magento/Webapi/Test/Unit/ExceptionTest.php
index f4ba3519472..c3761c4e248 100644
--- a/app/code/Magento/Webapi/Test/Unit/ExceptionTest.php
+++ b/app/code/Magento/Webapi/Test/Unit/ExceptionTest.php
@@ -43,7 +43,8 @@ class ExceptionTest extends \PHPUnit\Framework\TestCase
*/
public function testConstructInvalidHttpCode($httpCode)
{
- $this->expectException('InvalidArgumentException', "The specified HTTP code \"{$httpCode}\" is invalid.");
+ $this->expectException('InvalidArgumentException');
+ $this->expectExceptionMessage("The specified HTTP code \"{$httpCode}\" is invalid.");
/** Create \Magento\Framework\Webapi\Exception object with invalid code. */
/** Valid codes range is from 400 to 599. */
new \Magento\Framework\Webapi\Exception(__('Message'), 0, $httpCode);
diff --git a/app/code/Magento/Weee/Test/Unit/Model/Attribute/Backend/Weee/TaxTest.php b/app/code/Magento/Weee/Test/Unit/Model/Attribute/Backend/Weee/TaxTest.php
index 9e220091d6c..8ba8afaa1a8 100644
--- a/app/code/Magento/Weee/Test/Unit/Model/Attribute/Backend/Weee/TaxTest.php
+++ b/app/code/Magento/Weee/Test/Unit/Model/Attribute/Backend/Weee/TaxTest.php
@@ -82,7 +82,8 @@ class TaxTest extends \PHPUnit\Framework\TestCase
->will($this->returnValue($taxes));
// Exception caught
- $this->expectException('Exception', $expected);
+ $this->expectException('Exception');
+ $this->expectExceptionMessage($expected);
$modelMock->validate($productMock);
}
--
GitLab