MC-39898: Stabilize Integration Tests

    - PR Suggestions

Author: jcuerdo

dev/tests/integration/framework/tests/unit/testsuite/Magento/Test/Annotation/AppAreaTest.php

@@ -39,8 +39,8 @@ protected function setUp(): void
      */
     public function testGetTestAppArea($annotations, $expectedArea)
     {
-        $this->_testCaseMock->expects($this->once())->method('getAnnotations')->will($this->returnValue($annotations));
-        $this->_applicationMock->expects($this->any())->method('getArea')->will($this->returnValue(null));
+        $this->_testCaseMock->expects($this->once())->method('getAnnotations')->willReturn($annotations);
+        $this->_applicationMock->expects($this->any())->method('getArea')->willReturn(null);
         $this->_applicationMock->expects($this->once())->method('reinitialize');
         $this->_applicationMock->expects($this->once())->method('loadArea')->with($expectedArea);
         $this->_object->startTest($this->_testCaseMock);

dev/tests/integration/framework/tests/unit/testsuite/Magento/Test/Helper/BootstrapTest.php

@@ -92,7 +92,6 @@ public function testGetInstanceAllowed(\Magento\TestFramework\Helper\Bootstrap $
     /**
      * @depends testSetInstanceFirstAllowed
      *
-     *
      */
     public function testSetInstanceChangeProhibited()
     {

dev/tests/integration/testsuite/Magento/Backend/App/Request/BackendValidatorTest.php

@@ -269,8 +269,6 @@ public function testValidateWithValidKey()
     }
 
     /**
-     *
-     *
      * @magentoConfigFixture admin/security/use_form_key 1
      * @magentoAppArea adminhtml
      */
@@ -294,8 +292,6 @@ public function testValidateWithInvalidKey()
     }
 
     /**
-     *
-     *
      * @magentoConfigFixture admin/security/use_form_key 0
      * @magentoAppArea adminhtml
      */

dev/tests/integration/testsuite/Magento/Catalog/Model/ImageUploaderTest.php

@@ -98,8 +98,6 @@ public function testMoveFileFromTmp(): void
     }
 
     /**
-     *
-     *
      * @return void
      */
     public function testSaveFileToTmpDirWithWrongExtension(): void
@@ -126,8 +124,6 @@ public function testSaveFileToTmpDirWithWrongExtension(): void
     }
 
     /**
-     *
-     *
      * @return void
      */
     public function testSaveFileToTmpDirWithWrongFile(): void

dev/tests/integration/testsuite/Magento/Catalog/Model/Product/Gallery/CreateHandlerTest.php

@@ -103,8 +103,6 @@ public function testExecuteWithImageDuplicate(): void
      *
      * @param string $imageFileName
      *
-     *
-     *
      * @dataProvider illegalFilenameDataProvider
      * @return void
      */

dev/tests/integration/testsuite/Magento/Catalog/Model/ResourceModel/Eav/AttributeTest.php

@@ -66,9 +66,6 @@ public function testCRUD()
     /**
      * @magentoDataFixture Magento/Catalog/_files/product_attribute.php
      *
-     *
-     *
-     *
      * @return void
      */
     public function testAttributeSaveWithChangedEntityType(): void

dev/tests/integration/testsuite/Magento/CatalogImportExport/Model/Import/UploaderTest.php

@@ -137,8 +137,6 @@ public function testMoveWithFileOutsideTemp(): void
     /**
      * @magentoAppIsolation enabled
      * @return void
-     *
-     *
      */
     public function testMoveWithInvalidFile(): void
     {

dev/tests/integration/testsuite/Magento/CatalogInventory/Model/Quote/Item/QuantityValidatorTest.php

@@ -149,7 +149,6 @@ public function testQuoteWithOptionsWithErrors()
     /**
      * Set mock of Stock State Result to Quote Item Options.
      *
-     *
      * @param \Magento\Quote\Model\Quote\Item $quoteItem
      * @param \PHPUnit\Framework\MockObject\MockObject $resultMock
      */

dev/tests/integration/testsuite/Magento/CatalogRule/Model/ResourceModel/Product/ConditionsToCollectionApplierTest.php

@@ -83,9 +83,6 @@ function (Product $product) {
     }
 
     /**
-     *
-     *
-     *
      * @magentoDbIsolation disabled
      */
     public function testExceptionUndefinedRuleOperator()
@@ -114,9 +111,6 @@ public function testExceptionUndefinedRuleOperator()
     }
 
     /**
-     *
-     *
-     *
      * @magentoDbIsolation disabled
      */
     public function testExceptionUndefinedRuleAggregator()

dev/tests/integration/testsuite/Magento/CatalogSearch/Model/Search/FilterMapper/StockStatusFilterWithGeneralFilterTest.php

@@ -51,10 +51,7 @@ protected function setUp(): void
 
     /**
      * @return void
-     *
-     *
-     *
-     */
+     **/
     public function testApplyWithWrongType()
     {
         $this->expectExceptionMessage("Invalid filter type: some_wrong_type");