Merge pull request #6610 from magento-lynx/MC-39900

svera · web-flow · commit 90bacacba22d · 2021-02-09T08:18:00.000+01:00
[MC-39900] Stabilize unit tests
diff --git a/app/code/Magento/AdminAnalytics/Test/Unit/Condition/CanViewNotificationTest.php b/app/code/Magento/AdminAnalytics/Test/Unit/Condition/CanViewNotificationTest.php
@@ -13,7 +13,7 @@
 use Magento\Framework\App\CacheInterface;
 
 /**
- * Class CanViewNotificationTest
+ * Test of CanViewNotification
  */
 class CanViewNotificationTest extends \PHPUnit\Framework\TestCase
 {
diff --git a/app/code/Magento/AdvancedPricingImportExport/Test/Unit/Model/Import/AdvancedPricing/Validator/TierPriceTypeTest.php b/app/code/Magento/AdvancedPricingImportExport/Test/Unit/Model/Import/AdvancedPricing/Validator/TierPriceTypeTest.php
@@ -9,7 +9,7 @@
 use \Magento\AdvancedPricingImportExport\Model\Import\AdvancedPricing as AdvancedPricing;
 
 /**
- * Class TierPriceTypeTest.
+ * Test of TierPriceType.
  */
 class TierPriceTypeTest extends \PHPUnit\Framework\TestCase
 {
diff --git a/app/code/Magento/AdvancedSearch/Test/Unit/Controller/Adminhtml/Search/System/Config/TestConnectionTest.php b/app/code/Magento/AdvancedSearch/Test/Unit/Controller/Adminhtml/Search/System/Config/TestConnectionTest.php
@@ -10,7 +10,7 @@
 use Magento\AdvancedSearch\Model\Client\ClientInterface;
 
 /**
- * Class TestConnectionTest
+ * Test of TestConnection
  *
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
  */
diff --git a/app/code/Magento/Analytics/Test/Unit/Cron/SignUpTest.php b/app/code/Magento/Analytics/Test/Unit/Cron/SignUpTest.php
@@ -74,7 +74,7 @@ public function testExecute()
             ->with(SubscriptionHandler::ATTEMPTS_REVERSE_COUNTER_FLAG_CODE)
             ->willReturn($attemptsCount);
 
-        $attemptsCount -= 1;
+        --$attemptsCount;
         $this->flagManagerMock->expects($this->once())
             ->method('saveFlag')
             ->with(SubscriptionHandler::ATTEMPTS_REVERSE_COUNTER_FLAG_CODE, $attemptsCount);
diff --git a/app/code/Magento/Analytics/Test/Unit/Model/ReportXml/ModuleIteratorTest.php b/app/code/Magento/Analytics/Test/Unit/Model/ReportXml/ModuleIteratorTest.php
@@ -11,7 +11,7 @@
 use Magento\Framework\TestFramework\Unit\Helper\ObjectManager as ObjectManagerHelper;
 
 /**
- * Module iterator test.
+ * Test for ModuleIterator.
  */
 class ModuleIteratorTest extends \PHPUnit\Framework\TestCase
 {
diff --git a/app/code/Magento/AsynchronousOperations/Test/Unit/Model/Entity/BulkSummaryMapperTest.php b/app/code/Magento/AsynchronousOperations/Test/Unit/Model/Entity/BulkSummaryMapperTest.php
@@ -9,7 +9,7 @@
 use Magento\AsynchronousOperations\Model\Entity\BulkSummaryMapper;
 
 /**
- * Class BulkSummaryMapperTest
+ * Test for BulkSummaryMapper
  */
 class BulkSummaryMapperTest extends \PHPUnit\Framework\TestCase
 {
@@ -91,7 +91,7 @@ public function testEntityToDatabase($identifier, $result)
             ->method('fetchOne')
             ->with($this->selectMock)
             ->willReturn($identifier);
-        
+
         $this->assertEquals($result, $this->model->entityToDatabase($entityType, $data));
     }
 
diff --git a/app/code/Magento/AsynchronousOperations/Test/Unit/Model/ResourceModel/System/Message/Collection/Synchronized/PluginTest.php b/app/code/Magento/AsynchronousOperations/Test/Unit/Model/ResourceModel/System/Message/Collection/Synchronized/PluginTest.php
@@ -14,7 +14,7 @@
 use Magento\AdminNotification\Model\ResourceModel\System\Message\Collection\Synchronized;
 
 /**
- * Class PluginTest
+ * Test for Plugin
  *
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
  */
diff --git a/app/code/Magento/AsynchronousOperations/Test/Unit/Model/StatusMapperTest.php b/app/code/Magento/AsynchronousOperations/Test/Unit/Model/StatusMapperTest.php
@@ -10,7 +10,7 @@
 use Magento\Framework\Bulk\BulkSummaryInterface;
 
 /**
- * Class StatusMapperTest
+ * Test for StatusMapper
  */
 class StatusMapperTest extends \PHPUnit\Framework\TestCase
 {
diff --git a/app/code/Magento/Authorization/Test/Unit/Model/Acl/Loader/RoleTest.php b/app/code/Magento/Authorization/Test/Unit/Model/Acl/Loader/RoleTest.php
@@ -73,21 +73,17 @@ protected function setUp(): void
         $this->serializerMock->expects($this->any())
             ->method('serialize')
             ->willReturnCallback(
-                
-                    function ($value) {
-                        return json_encode($value);
-                    }
-                
+                function ($value) {
+                    return json_encode($value);
+                }
             );
 
         $this->serializerMock->expects($this->any())
             ->method('unserialize')
             ->willReturnCallback(
-                
-                    function ($value) {
-                        return json_decode($value, true);
-                    }
-                
+                function ($value) {
+                    return json_decode($value, true);
+                }
             );
 
         $this->aclDataCacheMock = $this->createMock(\Magento\Framework\Acl\Data\CacheInterface::class);
@@ -119,12 +115,10 @@ public function testPopulateAclAddsRolesAndTheirChildren()
         $this->_adapterMock->expects($this->once())
             ->method('fetchAll')
             ->willReturn(
-                
-                    [
-                        ['role_id' => 1, 'role_type' => 'G', 'parent_id' => null],
-                        ['role_id' => 2, 'role_type' => 'U', 'parent_id' => 1, 'user_id' => 1],
-                    ]
-                
+                [
+                    ['role_id' => 1, 'role_type' => 'G', 'parent_id' => null],
+                    ['role_id' => 2, 'role_type' => 'U', 'parent_id' => 1, 'user_id' => 1],
+                ]
             );
 
         $this->_groupFactoryMock->expects($this->once())->method('create')->with(['roleId' => '1']);
@@ -175,18 +169,16 @@ public function testPopulateAclFromCache()
             ->method('load')
             ->with(\Magento\Authorization\Model\Acl\Loader\Role::ACL_ROLES_CACHE_KEY)
             ->willReturn(
-                
-                    json_encode(
+                json_encode(
+                    [
                         [
-                            [
-                                'role_id' => 1,
-                                'role_type' => 'U',
-                                'parent_id' => 2,
-                                'user_id' => 3
-                            ]
+                            'role_id' => 1,
+                            'role_type' => 'U',
+                            'parent_id' => 2,
+                            'user_id' => 3
                         ]
-                    )
-                
+                    ]
+                )
             );
 
         $this->_roleFactoryMock->expects($this->never())->method('getModelInstance');
diff --git a/app/code/Magento/Authorization/Test/Unit/Model/Acl/Loader/RuleTest.php b/app/code/Magento/Authorization/Test/Unit/Model/Acl/Loader/RuleTest.php
@@ -45,21 +45,17 @@ protected function setUp(): void
         $this->serializerMock->expects($this->any())
             ->method('serialize')
             ->willReturnCallback(
-                
-                    function ($value) {
-                        return json_encode($value);
-                    }
-                
+                function ($value) {
+                    return json_encode($value);
+                }
             );
 
         $this->serializerMock->expects($this->any())
             ->method('unserialize')
             ->willReturnCallback(
-                
-                    function ($value) {
-                        return json_decode($value, true);
-                    }
-                
+                function ($value) {
+                    return json_decode($value, true);
+                }
             );
 
         $this->aclDataCacheMock = $this->createMock(\Magento\Framework\Acl\Data\CacheInterface::class);
@@ -84,15 +80,13 @@ public function testPopulateAclFromCache()
             ->method('load')
             ->with(\Magento\Authorization\Model\Acl\Loader\Rule::ACL_RULE_CACHE_KEY)
             ->willReturn(
-                
-                    json_encode(
-                        [
-                            ['role_id' => 1, 'resource_id' => 'Magento_Backend::all', 'permission' => 'allow'],
-                            ['role_id' => 2, 'resource_id' => 1, 'permission' => 'allow'],
-                            ['role_id' => 3, 'resource_id' => 1, 'permission' => 'deny'],
-                        ]
-                    )
-                
+                json_encode(
+                    [
+                        ['role_id' => 1, 'resource_id' => 'Magento_Backend::all', 'permission' => 'allow'],
+                        ['role_id' => 2, 'resource_id' => 1, 'permission' => 'allow'],
+                        ['role_id' => 3, 'resource_id' => 1, 'permission' => 'deny'],
+                    ]
+                )
             );
 
         $aclMock = $this->createMock(\Magento\Framework\Acl::class);
diff --git a/app/code/Magento/Authorizenet/Test/Unit/Controller/Directpost/Payment/PlaceTest.php b/app/code/Magento/Authorizenet/Test/Unit/Controller/Directpost/Payment/PlaceTest.php
@@ -24,7 +24,7 @@
 use Magento\Quote\Model\Quote;
 
 /**
- * Class PlaceTest
+ * Test for Place
  *
  * @SuppressWarnings(PHPMD.TooManyFields)
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
diff --git a/app/code/Magento/Authorizenet/Test/Unit/Controller/Directpost/Payment/RedirectTest.php b/app/code/Magento/Authorizenet/Test/Unit/Controller/Directpost/Payment/RedirectTest.php
@@ -14,7 +14,7 @@
 use PHPUnit\Framework\MockObject\MockObject as MockObject;
 
 /**
- * Class RedirectTest
+ * Test for Redirect
  */
 class RedirectTest extends \PHPUnit\Framework\TestCase
 {
diff --git a/app/code/Magento/Authorizenet/Test/Unit/Helper/Backend/DataTest.php b/app/code/Magento/Authorizenet/Test/Unit/Helper/Backend/DataTest.php
@@ -6,7 +6,7 @@
 namespace Magento\Authorizenet\Test\Unit\Helper\Backend;
 
 /**
- * Class DataTest
+ * Test for Data
  */
 class DataTest extends \PHPUnit\Framework\TestCase
 {
diff --git a/app/code/Magento/Authorizenet/Test/Unit/Model/Directpost/ResponseTest.php b/app/code/Magento/Authorizenet/Test/Unit/Model/Directpost/ResponseTest.php
@@ -32,7 +32,7 @@ protected function setUp(): void
      */
     protected function generateHash($merchantMd5, $merchantApiLogin, $amount, $transactionId)
     {
-        return strtoupper(md5($merchantMd5 . $merchantApiLogin . $transactionId . $amount));
+        return strtoupper(md5($merchantMd5 . $merchantApiLogin . $transactionId . $amount));//phpcs:ignore
     }
 
     /**
diff --git a/app/code/Magento/Authorizenet/Test/Unit/Model/DirectpostTest.php b/app/code/Magento/Authorizenet/Test/Unit/Model/DirectpostTest.php
@@ -33,7 +33,7 @@
 use ReflectionClass;
 
 /**
- * Class DirectpostTest
+ * Test for Directpost
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
  */
 class DirectpostTest extends TestCase
diff --git a/app/code/Magento/Authorizenet/Test/Unit/Observer/AddFieldsToResponseObserverTest.php b/app/code/Magento/Authorizenet/Test/Unit/Observer/AddFieldsToResponseObserverTest.php
@@ -8,7 +8,7 @@
 use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
 
 /**
- * Class AddFieldsToResponseObserverTest
+ * Test for AddFieldsToResponseObserver
  *
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
  */
diff --git a/app/code/Magento/AuthorizenetCardinal/Test/Unit/Observer/DataAssignObserverTest.php b/app/code/Magento/AuthorizenetCardinal/Test/Unit/Observer/DataAssignObserverTest.php
@@ -19,7 +19,7 @@
 use PHPUnit\Framework\TestCase;
 
 /**
- * Class DataAssignObserverTest
+ * Class for DataAssignObserver
  */
 class DataAssignObserverTest extends TestCase
 {
diff --git a/app/code/Magento/Backend/Test/Unit/App/Action/Plugin/AuthenticationTest.php b/app/code/Magento/Backend/Test/Unit/App/Action/Plugin/AuthenticationTest.php
@@ -9,7 +9,7 @@
 use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
 
 /**
- * Class AuthenticationTest
+ * Test for Authentication
  */
 class AuthenticationTest extends \PHPUnit\Framework\TestCase
 {
diff --git a/app/code/Magento/Backend/Test/Unit/App/Area/FrontNameResolverTest.php b/app/code/Magento/Backend/Test/Unit/App/Area/FrontNameResolverTest.php
@@ -116,23 +116,21 @@ public function testIsHostBackend($url, $host, $useCustomAdminUrl, $customAdminU
         $this->scopeConfigMock->expects($this->exactly(2))
             ->method('getValue')
             ->willReturnMap(
-                
+                [
+                    [Store::XML_PATH_UNSECURE_BASE_URL, ScopeInterface::SCOPE_STORE, null, $url],
                     [
-                        [Store::XML_PATH_UNSECURE_BASE_URL, ScopeInterface::SCOPE_STORE, null, $url],
-                        [
-                            FrontNameResolver::XML_PATH_USE_CUSTOM_ADMIN_URL,
-                            ScopeInterface::SCOPE_STORE,
-                            null,
-                            $useCustomAdminUrl
-                        ],
-                        [
-                            FrontNameResolver::XML_PATH_CUSTOM_ADMIN_URL,
-                            ScopeInterface::SCOPE_STORE,
-                            null,
-                            $customAdminUrl
-                        ],
-                    ]
-                
+                        FrontNameResolver::XML_PATH_USE_CUSTOM_ADMIN_URL,
+                        ScopeInterface::SCOPE_STORE,
+                        null,
+                        $useCustomAdminUrl
+                    ],
+                    [
+                        FrontNameResolver::XML_PATH_CUSTOM_ADMIN_URL,
+                        ScopeInterface::SCOPE_STORE,
+                        null,
+                        $customAdminUrl
+                    ],
+                ]
             );
 
         $this->request->expects($this->any())
diff --git a/app/code/Magento/Backend/Test/Unit/App/ConfigTest.php b/app/code/Magento/Backend/Test/Unit/App/ConfigTest.php
@@ -11,7 +11,6 @@
  * Test reading by path and reading flag from config
  *
  * @see \Magento\Backend\App\Config
- * @package Magento\Backend\Test\Unit\App
  */
 class ConfigTest extends \PHPUnit\Framework\TestCase
 {
diff --git a/app/code/Magento/Backend/Test/Unit/Block/Cache/PermissionsTest.php b/app/code/Magento/Backend/Test/Unit/Block/Cache/PermissionsTest.php
@@ -13,7 +13,7 @@
 use PHPUnit\Framework\TestCase;
 
 /**
- * Class PermissionsTest
+ * Test for Permissions
  */
 class PermissionsTest extends TestCase
 {
diff --git a/app/code/Magento/Backend/Test/Unit/Block/Page/System/Config/Robots/ResetTest.php b/app/code/Magento/Backend/Test/Unit/Block/Page/System/Config/Robots/ResetTest.php
@@ -10,9 +10,8 @@
 namespace Magento\Backend\Test\Unit\Block\Page\System\Config\Robots;
 
 /**
- * Class ResetTest
- * @deprecated
- * @package Magento\Backend\Test\Unit\Block\Page\System\Config\Robots
+ * Test for Reset
+ * @deprecated no alternative defined
  */
 class ResetTest extends \PHPUnit\Framework\TestCase
 {
diff --git a/app/code/Magento/Backend/Test/Unit/Model/AuthTest.php b/app/code/Magento/Backend/Test/Unit/Model/AuthTest.php
@@ -8,7 +8,7 @@
 use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
 
 /**
- * Class AuthTest
+ * Test for Auth
  */
 class AuthTest extends \PHPUnit\Framework\TestCase
 {
diff --git a/app/code/Magento/Backend/Test/Unit/Model/Session/QuoteTest.php b/app/code/Magento/Backend/Test/Unit/Model/Session/QuoteTest.php
@@ -6,7 +6,7 @@
 namespace Magento\Backend\Test\Unit\Model\Session;
 
 /**
- * Class QuoteTest
+ * Test for Quote
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
  * @SuppressWarnings(PHPMD.TooManyFields)
  */
diff --git a/app/code/Magento/Backend/Test/Unit/Model/UrlTest.php b/app/code/Magento/Backend/Test/Unit/Model/UrlTest.php
@@ -154,11 +154,9 @@ protected function setUp(): void
         $this->serializerMock->expects($this->any())
             ->method('serialize')
             ->willReturnCallback(
-                
-                    function ($value) {
-                        return json_encode($value);
-                    }
-                
+                function ($value) {
+                    return json_encode($value);
+                }
             );
         $this->_model = $objectManager->getObject(
             \Magento\Backend\Model\Url::class,
diff --git a/app/code/Magento/Backend/Test/Unit/Model/View/Layout/StructureManagerTest.php b/app/code/Magento/Backend/Test/Unit/Model/View/Layout/StructureManagerTest.php
@@ -12,7 +12,7 @@
 use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
 
 /**
- * Class StructureManagerTest
+ * Test for StructureManager
  */
 class StructureManagerTest extends \PHPUnit\Framework\TestCase
 {
diff --git a/app/code/Magento/Braintree/Test/Unit/Controller/Paypal/PlaceOrderTest.php b/app/code/Magento/Braintree/Test/Unit/Controller/Paypal/PlaceOrderTest.php
@@ -21,7 +21,7 @@
 use Psr\Log\LoggerInterface;
 
 /**
- * Class PlaceOrderTest
+ * Test for PlaceOrder
  *
  * @see \Magento\Braintree\Controller\Paypal\PlaceOrder
  *
diff --git a/app/code/Magento/Braintree/Test/Unit/Controller/Paypal/ReviewTest.php b/app/code/Magento/Braintree/Test/Unit/Controller/Paypal/ReviewTest.php
diff --git a/app/code/Magento/Braintree/Test/Unit/Controller/Paypal/SaveShippingMethodTest.php b/app/code/Magento/Braintree/Test/Unit/Controller/Paypal/SaveShippingMethodTest.php
diff --git a/app/code/Magento/Braintree/Test/Unit/Gateway/Command/GetPaymentNonceCommandTest.php b/app/code/Magento/Braintree/Test/Unit/Gateway/Command/GetPaymentNonceCommandTest.php
diff --git a/app/code/Magento/Braintree/Test/Unit/Gateway/Config/ConfigTest.php b/app/code/Magento/Braintree/Test/Unit/Gateway/Config/ConfigTest.php
diff --git a/app/code/Magento/Braintree/Test/Unit/Gateway/Http/TransferFactoryTest.php b/app/code/Magento/Braintree/Test/Unit/Gateway/Http/TransferFactoryTest.php
diff --git a/app/code/Magento/Braintree/Test/Unit/Gateway/Request/DescriptorDataBuilderTest.php b/app/code/Magento/Braintree/Test/Unit/Gateway/Request/DescriptorDataBuilderTest.php

Original file line number	Diff line number	Diff line change
`@@ -13,7 +13,7 @@`
`13`	`13`	`use Magento\Framework\App\CacheInterface;`
`14`	`14`
`15`	`15`	`/**`
`16`		`- * Class CanViewNotificationTest`
	`16`	`+ * Test of CanViewNotification`
`17`	`17`	`*/`
`18`	`18`	`class CanViewNotificationTest extends \PHPUnit\Framework\TestCase`
`19`	`19`	`{`
Original file line number	Diff line number	Diff line change
`@@ -9,7 +9,7 @@`
`9`	`9`	`use \Magento\AdvancedPricingImportExport\Model\Import\AdvancedPricing as AdvancedPricing;`
`10`	`10`
`11`	`11`	`/**`
`12`		`- * Class TierPriceTypeTest.`
	`12`	`+ * Test of TierPriceType.`
`13`	`13`	`*/`
`14`	`14`	`class TierPriceTypeTest extends \PHPUnit\Framework\TestCase`
`15`	`15`	`{`
Original file line number	Diff line number	Diff line change
`@@ -10,7 +10,7 @@`
`10`	`10`	`use Magento\AdvancedSearch\Model\Client\ClientInterface;`
`11`	`11`
`12`	`12`	`/**`
`13`		`- * Class TestConnectionTest`
	`13`	`+ * Test of TestConnection`
`14`	`14`	`*`
`15`	`15`	`* @SuppressWarnings(PHPMD.CouplingBetweenObjects)`
`16`	`16`	`*/`
Original file line number	Diff line number	Diff line change
`@@ -11,7 +11,7 @@`
`11`	`11`	`use Magento\Framework\TestFramework\Unit\Helper\ObjectManager as ObjectManagerHelper;`
`12`	`12`
`13`	`13`	`/**`
`14`		`- * Module iterator test.`
	`14`	`+ * Test for ModuleIterator.`
`15`	`15`	`*/`
`16`	`16`	`class ModuleIteratorTest extends \PHPUnit\Framework\TestCase`
`17`	`17`	`{`
Original file line number	Diff line number	Diff line change
`@@ -14,7 +14,7 @@`
`14`	`14`	`use Magento\AdminNotification\Model\ResourceModel\System\Message\Collection\Synchronized;`
`15`	`15`
`16`	`16`	`/**`
`17`		`- * Class PluginTest`
	`17`	`+ * Test for Plugin`
`18`	`18`	`*`
`19`	`19`	`* @SuppressWarnings(PHPMD.CouplingBetweenObjects)`
`20`	`20`	`*/`