Merge branch 'Arrows_regression_issues_2_4_6_11jan22' of github.com:magento-gl/magento2ce into Arrows_regression_issues_2_4_6_11jan22

Author: mahesh-singh-rajawat

app/code/Magento/Catalog/Test/Unit/Model/CategoryTest.php

@@ -214,7 +214,7 @@ public function testMoveWhenCannotFindParentCategory(): void
     {
         $this->expectException('Magento\Framework\Exception\LocalizedException');
         $this->expectExceptionMessage('Sorry, but we can\'t find the new parent category you selected.');
-        $this->markTestIncomplete('MAGETWO-31165');
+        $this->markTestSkipped('MAGETWO-31165');
         $parentCategory = $this->createPartialMock(
             Category::class,
             ['getId', 'setStoreId', 'load']
@@ -260,7 +260,7 @@ public function testMoveWhenParentCategoryIsSameAsChildCategory(): void
         $this->expectExceptionMessage(
             'We can\'t move the category because the parent category name matches the child category name.'
         );
-        $this->markTestIncomplete('MAGETWO-31165');
+        $this->markTestSkipped('MAGETWO-31165');
         $parentCategory = $this->createPartialMock(
             Category::class,
             ['getId', 'setStoreId', 'load']

app/code/Magento/GroupedProduct/Test/Unit/Model/ProductTest.php

@@ -349,7 +349,7 @@ protected function setUp(): void
      */
     public function testGetProductLinks(): void
     {
-        $this->markTestIncomplete('Skipped due to https://jira.corp.x.com/browse/MAGETWO-36926');
+        $this->markTestSkipped('Skipped due to https://jira.corp.x.com/browse/MAGETWO-36926');
         $linkTypes = ['related' => 1, 'upsell' => 4, 'crosssell' => 5, 'associated' => 3];
         $this->linkTypeProviderMock->expects($this->once())->method('getLinkTypes')->willReturn($linkTypes);
 

app/code/Magento/ImportExport/Test/Unit/Block/Adminhtml/Export/FilterTest.php

@@ -333,6 +333,6 @@ private function getAttributeMock(array $data): Attribute
      */
     public function testPrepareForm()
     {
-        $this->markTestIncomplete('This test has not been implemented yet.');
+        $this->markTestSkipped('This test has not been implemented yet.');
     }
 }

app/code/Magento/ImportExport/Test/Unit/Block/Adminhtml/Import/Edit/FormTest.php

@@ -83,6 +83,6 @@ protected function setUp(): void
      */
     public function testPrepareForm()
     {
-        $this->markTestIncomplete('This test has not been implemented yet.');
+        $this->markTestSkipped('This test has not been implemented yet.');
     }
 }

app/code/Magento/ImportExport/Test/Unit/Helper/ReportTest.php

@@ -153,7 +153,7 @@ protected function setUp(): void
      */
     public function testGetExecutionTime()
     {
-        $this->markTestIncomplete('Invalid mocks used for DateTime object. Investigate later.');
+        $this->markTestSkipped('Invalid mocks used for DateTime object. Investigate later.');
 
         $startDate = '2000-01-01 01:01:01';
         $endDate = '2000-01-01 02:03:04';

app/code/Magento/ImportExport/Test/Unit/Model/Import/Source/ZipTest.php

@@ -42,7 +42,7 @@ protected function setUp(): void
      */
     public function testConstructorFileDestinationMatch($fileName, $expectedfileName): void
     {
-        $this->markTestIncomplete('The implementation of constructor has changed. Rewrite test to cover changes.');
+        $this->markTestSkipped('The implementation of constructor has changed. Rewrite test to cover changes.');
 
         $this->directory->method('getRelativePath')
             ->withConsecutive([$fileName], [$expectedfileName]);

app/code/Magento/ImportExport/Test/Unit/Model/ImportTest.php

@@ -363,7 +363,7 @@ public function testImportSourceException()
      */
     public function testGetOperationResultMessages()
     {
-        $this->markTestIncomplete('This test has not been implemented yet.');
+        $this->markTestSkipped('This test has not been implemented yet.');
     }
 
     /**
@@ -386,79 +386,79 @@ public function testGetAttributeType()
      */
     public function testGetEntity()
     {
-        $this->markTestIncomplete('This test has not been implemented yet.');
+        $this->markTestSkipped('This test has not been implemented yet.');
     }
 
     /**
      * @todo to implement it.
      */
     public function testGetErrorsCount()
     {
-        $this->markTestIncomplete('This test has not been implemented yet.');
+        $this->markTestSkipped('This test has not been implemented yet.');
     }
 
     /**
      * @todo to implement it.
      */
     public function testGetErrorsLimit()
     {
-        $this->markTestIncomplete('This test has not been implemented yet.');
+        $this->markTestSkipped('This test has not been implemented yet.');
     }
 
     /**
      * @todo to implement it.
      */
     public function testGetInvalidRowsCount()
     {
-        $this->markTestIncomplete('This test has not been implemented yet.');
+        $this->markTestSkipped('This test has not been implemented yet.');
     }
 
     /**
      * @todo to implement it.
      */
     public function testGetNotices()
     {
-        $this->markTestIncomplete('This test has not been implemented yet.');
+        $this->markTestSkipped('This test has not been implemented yet.');
     }
 
     /**
      * @todo to implement it.
      */
     public function testGetProcessedEntitiesCount()
     {
-        $this->markTestIncomplete('This test has not been implemented yet.');
+        $this->markTestSkipped('This test has not been implemented yet.');
     }
 
     /**
      * @todo to implement it.
      */
     public function testGetProcessedRowsCount()
     {
-        $this->markTestIncomplete('This test has not been implemented yet.');
+        $this->markTestSkipped('This test has not been implemented yet.');
     }
 
     /**
      * @todo to implement it.
      */
     public function testGetWorkingDir()
     {
-        $this->markTestIncomplete('This test has not been implemented yet.');
+        $this->markTestSkipped('This test has not been implemented yet.');
     }
 
     /**
      * @todo to implement it.
      */
     public function testIsImportAllowed()
     {
-        $this->markTestIncomplete('This test has not been implemented yet.');
+        $this->markTestSkipped('This test has not been implemented yet.');
     }
 
     /**
      * @todo to implement it.
      */
     public function testUploadSource()
     {
-        $this->markTestIncomplete('This test has not been implemented yet.');
+        $this->markTestSkipped('This test has not been implemented yet.');
     }
 
     /**
@@ -704,7 +704,7 @@ public function unknownEntitiesProvider()
      */
     public function testGetUniqueEntityBehaviors()
     {
-        $this->markTestIncomplete('This test has not been implemented yet.');
+        $this->markTestSkipped('This test has not been implemented yet.');
     }
 
     /**

app/code/Magento/Paypal/Test/Unit/Controller/ExpressTest.php

@@ -32,6 +32,7 @@ abstract class ExpressTest extends TestCase
     /** @var Express */
     protected $model;
 
+    /** @var string */
     protected $name = '';
 
     /** @var Session|MockObject */
@@ -75,7 +76,7 @@ abstract class ExpressTest extends TestCase
 
     protected function setUp(): void
     {
-        $this->markTestIncomplete();
+        $this->markTestSkipped();
         $this->messageManager = $this->getMockForAbstractClass(ManagerInterface::class);
         $this->config = $this->createMock(Config::class);
         $this->request = $this->createMock(Http::class);

app/code/Magento/Sales/Test/Unit/Block/Reorder/SidebarTest.php

@@ -83,7 +83,7 @@ class SidebarTest extends TestCase
      */
     protected function setUp(): void
     {
-        $this->markTestIncomplete('MAGETWO-36789');
+        $this->markTestSkipped('MAGETWO-36789');
         $this->objectManagerHelper = new ObjectManager($this);
         $this->context = $this->createMock(\Magento\Framework\View\Element\Template\Context::class);
         $this->httpContext = $this->createPartialMock(\Magento\Framework\App\Http\Context::class, ['getValue']);

app/code/Magento/Tax/Test/Unit/Model/Sales/Total/Quote/ShippingTest.php

@@ -134,7 +134,7 @@ public function testCollectDoesNotCalculateTaxIfThereIsNoItemsRelatedToGivenAddr
 
     public function testCollect()
     {
-        $this->markTestIncomplete('Target code is not unit testable. Refactoring is required.');
+        $this->markTestSkipped('Target code is not unit testable. Refactoring is required.');
     }
 
     /**