MC-37364: Unit Test and JSUnit Test fails to start on Magento composer 2.4.0. Revert integration tests suites. Add correct exception class to unit tests.

nmalevanec · nmalevanec · commit 16629107cda6 · 2020-11-17T19:05:56.000+02:00
diff --git a/app/code/Magento/Checkout/Test/Unit/Model/ShippingInformationManagementTest.php b/app/code/Magento/Checkout/Test/Unit/Model/ShippingInformationManagementTest.php
@@ -32,6 +32,7 @@
 use Magento\Quote\Model\ShippingAssignmentFactory;
 use Magento\Quote\Model\ShippingFactory;
 use PHPUnit\Framework\MockObject\MockObject;
+use PHPUnit\Framework\MockObject\RuntimeException;
 use PHPUnit\Framework\TestCase;
 
 /**
@@ -631,7 +632,7 @@ private function getCartExtensionMock(): MockObject
         $mockBuilder = $this->getMockBuilder(CartExtension::class);
         try {
             $mockBuilder->addMethods(['getShippingAssignments', 'setShippingAssignments']);
-        } catch (\RuntimeException $e) {
+        } catch (RuntimeException $e) {
             // CartExtension already generated.
         }
 
diff --git a/app/code/Magento/CheckoutAgreements/Test/Unit/Model/Checkout/Plugin/GuestValidationTest.php b/app/code/Magento/CheckoutAgreements/Test/Unit/Model/Checkout/Plugin/GuestValidationTest.php
@@ -20,6 +20,7 @@
 use Magento\Quote\Api\Data\PaymentInterface;
 use Magento\Store\Model\ScopeInterface;
 use PHPUnit\Framework\MockObject\MockObject;
+use PHPUnit\Framework\MockObject\RuntimeException;
 use PHPUnit\Framework\TestCase;
 
 /**
@@ -174,7 +175,7 @@ private function getPaymentExtension(): MockObject
         $mockBuilder = $this->getMockBuilder(PaymentExtension::class);
         try {
             $mockBuilder->addMethods(['getAgreementIds']);
-        } catch (\RuntimeException $e) {
+        } catch (RuntimeException $e) {
             // Payment extension already generated.
         }
 
diff --git a/app/code/Magento/CheckoutAgreements/Test/Unit/Model/Checkout/Plugin/ValidationTest.php b/app/code/Magento/CheckoutAgreements/Test/Unit/Model/Checkout/Plugin/ValidationTest.php
@@ -22,6 +22,7 @@
 use Magento\Quote\Model\Quote;
 use Magento\Store\Model\ScopeInterface;
 use PHPUnit\Framework\MockObject\MockObject;
+use PHPUnit\Framework\MockObject\RuntimeException;
 use PHPUnit\Framework\TestCase;
 
 /**
@@ -241,7 +242,7 @@ private function getPaymentExtension(): MockObject
         $mockBuilder = $this->getMockBuilder(PaymentExtension::class);
         try {
             $mockBuilder->addMethods(['getAgreementIds']);
-        } catch (\RuntimeException $e) {
+        } catch (RuntimeException $e) {
             // Payment extension already generated.
         }
 
diff --git a/app/code/Magento/Downloadable/Test/Unit/Model/Link/UpdateHandlerTest.php b/app/code/Magento/Downloadable/Test/Unit/Model/Link/UpdateHandlerTest.php
@@ -15,6 +15,7 @@
 use Magento\Downloadable\Model\Link\UpdateHandler;
 use Magento\Downloadable\Model\Product\Type;
 use PHPUnit\Framework\MockObject\MockObject;
+use PHPUnit\Framework\MockObject\RuntimeException;
 use PHPUnit\Framework\TestCase;
 
 /**
@@ -157,7 +158,7 @@ private function getProductExtensionMock(): MockObject
             ->disableOriginalConstructor();
         try {
             $mockBuilder->addMethods(['getDownloadableProductLinks']);
-        } catch (\RuntimeException $e) {
+        } catch (RuntimeException $e) {
             // ProductExtension already generated.
         }
 
diff --git a/app/code/Magento/Downloadable/Test/Unit/Model/Quote/Item/CartItemProcessorTest.php b/app/code/Magento/Downloadable/Test/Unit/Model/Quote/Item/CartItemProcessorTest.php
@@ -21,6 +21,7 @@
 use Magento\Quote\Model\Quote\Item;
 use Magento\Quote\Model\Quote\ProductOptionFactory;
 use PHPUnit\Framework\MockObject\MockObject;
+use PHPUnit\Framework\MockObject\RuntimeException;
 use PHPUnit\Framework\TestCase;
 
 /**
@@ -250,7 +251,7 @@ private function getProductOptionExtensionMock(): MockObject
         $mockBuilder = $this->getMockBuilder(ProductOptionExtension::class);
         try {
             $mockBuilder->addMethods(['setDownloadableOption']);
-        } catch (\RuntimeException $e) {
+        } catch (RuntimeException $e) {
             // ProductOptionExtension already generated.
         }
 
diff --git a/app/code/Magento/Downloadable/Test/Unit/Model/Sample/UpdateHandlerTest.php b/app/code/Magento/Downloadable/Test/Unit/Model/Sample/UpdateHandlerTest.php
@@ -15,6 +15,7 @@
 use Magento\Downloadable\Model\Product\Type;
 use Magento\Downloadable\Model\Sample\UpdateHandler;
 use PHPUnit\Framework\MockObject\MockObject;
+use PHPUnit\Framework\MockObject\RuntimeException;
 use PHPUnit\Framework\TestCase;
 
 /**
@@ -157,7 +158,7 @@ private function getProductExtensionMock(): MockObject
             ->disableOriginalConstructor();
         try {
             $mockBuilder->addMethods(['getDownloadableProductSamples']);
-        } catch (\RuntimeException $e) {
+        } catch (RuntimeException $e) {
             // Product extension already generated.
         }
 
diff --git a/app/code/Magento/GiftMessage/Test/Unit/Model/Plugin/OrderGetTest.php b/app/code/Magento/GiftMessage/Test/Unit/Model/Plugin/OrderGetTest.php
@@ -20,6 +20,7 @@
 use Magento\Sales\Api\Data\OrderItemInterface;
 use Magento\Sales\Model\ResourceModel\Order\Collection;
 use PHPUnit\Framework\MockObject\MockObject;
+use PHPUnit\Framework\MockObject\RuntimeException;
 use PHPUnit\Framework\TestCase;
 
 /**
@@ -279,7 +280,7 @@ private function getOrderExtensionMock(): MockObject
         $mockObject = $this->getMockBuilder(OrderExtension::class);
         try {
             $mockObject->addMethods(['getGiftMessage', 'setGiftMessage']);
-        } catch (\RuntimeException $e) {
+        } catch (RuntimeException $e) {
             // Order extension already generated.
         }
 
@@ -296,7 +297,7 @@ private function getOrderItemExtensionMock(): MockObject
         $mockObject = $this->getMockBuilder(OrderItemExtension::class);
         try {
             $mockObject->addMethods(['getGiftMessage', 'setGiftMessage']);
-        } catch (\RuntimeException $e) {
+        } catch (RuntimeException $e) {
             // Order extension already generated.
         }
 
diff --git a/app/code/Magento/GiftMessage/Test/Unit/Model/Plugin/OrderSaveTest.php b/app/code/Magento/GiftMessage/Test/Unit/Model/Plugin/OrderSaveTest.php
@@ -16,6 +16,7 @@
 use Magento\Sales\Api\Data\OrderItemExtension;
 use Magento\Sales\Api\Data\OrderItemInterface;
 use PHPUnit\Framework\MockObject\MockObject;
+use PHPUnit\Framework\MockObject\RuntimeException;
 use PHPUnit\Framework\TestCase;
 
 class OrderSaveTest extends TestCase
@@ -199,7 +200,7 @@ private function getOrderExtensionMock(): MockObject
         $mockBuilder = $this->getMockBuilder(OrderExtension::class);
         try {
             $mockBuilder->addMethods(['getGiftMessage', 'setGiftMessage']);
-        } catch (\RuntimeException $e) {
+        } catch (RuntimeException $e) {
             // OrderExtension already generated.
         }
 
@@ -216,7 +217,7 @@ private function getOrderItemExtensionMock(): MockObject
         $mockBuilder = $this->getMockBuilder(OrderItemExtension::class);
         try {
             $mockBuilder->addMethods(['getGiftMessage', 'setGiftMessage']);
-        } catch (\RuntimeException $e) {
+        } catch (RuntimeException $e) {
             // OrderItemExtension already generated.
         }
 
diff --git a/app/code/Magento/Multishipping/Test/Unit/Model/DisableMultishippingTest.php b/app/code/Magento/Multishipping/Test/Unit/Model/DisableMultishippingTest.php
@@ -11,6 +11,7 @@
 use Magento\Quote\Api\Data\CartExtensionInterface;
 use Magento\Quote\Api\Data\CartInterface;
 use PHPUnit\Framework\MockObject\MockObject;
+use PHPUnit\Framework\MockObject\RuntimeException;
 use PHPUnit\Framework\TestCase;
 
 /**
@@ -121,7 +122,7 @@ private function getCartExtensionMock(): MockObject
             ->disableOriginalConstructor();
         try {
             $mockBuilder->addMethods(['getShippingAssignments', 'setShippingAssignments']);
-        } catch (\RuntimeException $e) {
+        } catch (RuntimeException $e) {
             // CartExtension already generated.
         }
 
diff --git a/app/code/Magento/Persistent/Test/Unit/Model/QuoteManagerTest.php b/app/code/Magento/Persistent/Test/Unit/Model/QuoteManagerTest.php
@@ -392,7 +392,7 @@ private function getExtensionAttributesMock(): MockObject
         $extensionMockBuilder = $this->getMockBuilder(CartExtensionInterface::class);
         try {
             $extensionMockBuilder->addMethods(['setShippingAssignments']);
-        } catch (\RuntimeException $e) {
+        } catch (RuntimeException $e) {
             // do nothing as CartExtensionInterface already generated and has 'setShippingAssignments' method.
         }
 
diff --git a/app/code/Magento/ProductVideo/Test/Unit/Model/Product/Attribute/Media/ExternalVideoEntryConverterTest.php b/app/code/Magento/ProductVideo/Test/Unit/Model/Product/Attribute/Media/ExternalVideoEntryConverterTest.php
@@ -20,6 +20,7 @@
 use Magento\ProductVideo\Model\Product\Attribute\Media\ExternalVideoEntryConverter;
 use Magento\ProductVideo\Model\Product\Attribute\Media\VideoEntry;
 use PHPUnit\Framework\MockObject\MockObject;
+use PHPUnit\Framework\MockObject\RuntimeException;
 use PHPUnit\Framework\TestCase;
 
 /**
@@ -232,7 +233,7 @@ private function getProductAttributeMediaGalleryEntryExtensionMock(): MockObject
                     'getVideoContent',
                 ]
             );
-        } catch (\Exception $e) {
+        } catch (RuntimeException $e) {
             // ProductAttributeMediaGalleryEntryExtension already generated and has all necessary methods.
         }
 
diff --git a/app/code/Magento/Quote/Test/Unit/Model/ShippingAddressAssignmentTest.php b/app/code/Magento/Quote/Test/Unit/Model/ShippingAddressAssignmentTest.php
@@ -16,6 +16,7 @@
 use Magento\Quote\Model\Quote\ShippingAssignment\ShippingAssignmentProcessor;
 use Magento\Quote\Model\ShippingAddressAssignment;
 use PHPUnit\Framework\MockObject\MockObject;
+use PHPUnit\Framework\MockObject\RuntimeException;
 use PHPUnit\Framework\TestCase;
 
 class ShippingAddressAssignmentTest extends TestCase
@@ -122,7 +123,7 @@ private function getCartExtensionMock(): MockObject
         $mockBuilder = $this->getMockBuilder(CartExtension::class);
         try {
             $mockBuilder->addMethods(['setShippingAssignments']);
-        } catch (\RuntimeException $e) {
+        } catch (RuntimeException $e) {
             // CartExtension already generated.
         }
 
diff --git a/app/code/Magento/Sales/Test/Unit/Model/OrderRepositoryTest.php b/app/code/Magento/Sales/Test/Unit/Model/OrderRepositoryTest.php
@@ -29,6 +29,7 @@
 use Magento\Tax\Api\Data\OrderTaxDetailsInterface;
 use Magento\Tax\Api\OrderTaxManagementInterface;
 use PHPUnit\Framework\MockObject\MockObject;
+use PHPUnit\Framework\MockObject\RuntimeException;
 use PHPUnit\Framework\TestCase;
 
 /**
@@ -261,7 +262,7 @@ private function getOrderExtensionMock(): MockObject
                     'setPaymentAdditionalInfo',
                 ]
             );
-        } catch (\RuntimeException $e) {
+        } catch (RuntimeException $e) {
             // Order extension already generated.
         }
 
diff --git a/dev/tests/integration/phpunit.xml.dist b/dev/tests/integration/phpunit.xml.dist
@@ -17,14 +17,14 @@
 >
     <!-- Test suites definition -->
     <testsuites>
-        <testsuite name="Magento_Integration_Tests">
+        <testsuite name="Magento Integration Tests">
             <file>testsuite/Magento/IntegrationTest.php</file>
         </testsuite>
         <!-- Memory tests run first to prevent influence of other tests on accuracy of memory measurements -->
-        <testsuite name="Memory_Usage_Tests">
+        <testsuite name="Memory Usage Tests">
             <file>testsuite/Magento/MemoryUsageTest.php</file>
         </testsuite>
-        <testsuite name="Magento_Integration_Tests_Real_Suite">
+        <testsuite name="Magento Integration Tests Real Suite">
             <directory>testsuite</directory>
             <directory>../../../app/code/*/*/Test/Integration</directory>
             <exclude>testsuite/Magento/MemoryUsageTest.php</exclude>
diff --git a/dev/tests/integration/testsuite/Magento/IntegrationTest.php b/dev/tests/integration/testsuite/Magento/IntegrationTest.php
@@ -41,7 +41,7 @@ public static function suite($className)
         $suitesConfig = $configuration->testSuite();
         $suite = new TestSuite();
         foreach ($suitesConfig as $suiteConfig) {
-            if ($suiteConfig->name() === 'Magento_Integration_Tests') {
+            if ($suiteConfig->name() === 'Magento Integration Tests') {
                 continue;
             }
             $suites = self::getSuites($suiteConfig);

Original file line number	Diff line number	Diff line change
`@@ -392,7 +392,7 @@ private function getExtensionAttributesMock(): MockObject`
`392`	`392`	`$extensionMockBuilder = $this->getMockBuilder(CartExtensionInterface::class);`
`393`	`393`	`try {`
`394`	`394`	`$extensionMockBuilder->addMethods(['setShippingAssignments']);`
`395`		`- } catch (\RuntimeException $e) {`
	`395`	`+ } catch (RuntimeException $e) {`
`396`	`396`	`// do nothing as CartExtensionInterface already generated and has 'setShippingAssignments' method.`
`397`	`397`	`}`
`398`	`398`