MC-36430: Invalid usage of requireDataFixture in integration tests

Author: mykhailomatiola

…to/Checkout/_files/ValidatorFileMock.php …t/Option/Type/File/ValidatorFileMock.phpdev/tests/integration/testsuite/Magento/Checkout/_files/ValidatorFileMock.php renamed to dev/tests/integration/framework/Magento/TestFramework/Catalog/Model/Product/Option/Type/File/ValidatorFileMock.php dev/tests/integration/testsuite/Magento/Checkout/_files/ValidatorFileMock.php renamed to dev/tests/integration/framework/Magento/TestFramework/Catalog/Model/Product/Option/Type/File/ValidatorFileMock.php

@@ -5,19 +5,22 @@
  */
 declare(strict_types=1);
 
-namespace Magento\Checkout\_files;
+namespace Magento\TestFramework\Catalog\Model\Product\Option\Type\File;
 
 use Magento\Catalog\Model\Product\Option\Type\File\ValidatorFile;
+use PHPUnit\Framework\MockObject\MockObject;
+use PHPUnit\Framework\TestCase;
 
 /**
  * Creates mock for ValidatorFile to replace real instance in fixtures.
  */
-class ValidatorFileMock extends \PHPUnit\Framework\TestCase
+class ValidatorFileMock extends TestCase
 {
     /**
      * Returns mock.
+     *
      * @param array|null $fileData
-     * @return ValidatorFile|\PHPUnit_Framework_MockObject_MockObject
+     * @return ValidatorFile|MockObject
      */
     public function getInstance($fileData = null)
     {

dev/tests/integration/testsuite/Magento/Catalog/_files/products_with_multiselect_attribute_with_source_model.php

@@ -8,7 +8,6 @@
 use Magento\TestFramework\Workaround\Override\Fixture\Resolver;
 
 Resolver::getInstance()->requireDataFixture('Magento/Catalog/_files/multiselect_attribute_with_source_model.php');
-Resolver::getInstance()->requireDataFixture('Magento/Checkout/_files/ValidatorFileMock.php');
 
 /** Create product with options and multiselect attribute */
 

dev/tests/integration/testsuite/Magento/Checkout/_files/customer_quote_with_items_simple_product_options.php

@@ -10,7 +10,7 @@
 use Magento\Catalog\Model\Product\Option;
 use Magento\Catalog\Model\Product\Option\Type\File\ValidatorFile;
 use Magento\Catalog\Model\Product\Option\Value;
-use Magento\Checkout\_files\ValidatorFileMock;
+use Magento\TestFramework\Catalog\Model\Product\Option\Type\File\ValidatorFileMock;
 use Magento\Customer\Api\CustomerRepositoryInterface;
 use Magento\Framework\DataObject;
 use Magento\Quote\Api\CartRepositoryInterface;
@@ -83,7 +83,7 @@
     $itemsOptions[$dropDownValue->getTitle()] = $options;
 }
 
-$validatorFileMock = (new ValidatorFileMock())->getInstance();
+$validatorFileMock = $objectManager->get(ValidatorFileMock::class)->getInstance();
 $objectManager->addSharedInstance($validatorFileMock, ValidatorFile::class);
 
 $quote->setStoreId($storeManager->getStore()->getId())

dev/tests/integration/testsuite/Magento/Checkout/_files/quote_with_items_and_custom_options_saved.php

@@ -4,15 +4,19 @@
  * See COPYING.txt for license details.
  */
 
-use Magento\Checkout\_files\ValidatorFileMock;
+use Magento\Catalog\Model\Product\Option\Type\File\ValidatorFile;
+use Magento\Framework\DataObject;
+use Magento\Quote\Model\QuoteIdMask;
+use Magento\Quote\Model\QuoteIdMaskFactory;
+use Magento\Quote\Model\QuoteRepository;
+use Magento\TestFramework\Catalog\Model\Product\Option\Type\File\ValidatorFileMock;
 use Magento\Quote\Model\QuoteFactory;
 use Magento\Quote\Model\ResourceModel\Quote as QuoteResource;
 use Magento\TestFramework\Helper\Bootstrap;
 use Magento\TestFramework\Workaround\Override\Fixture\Resolver;
 
 Resolver::getInstance()->requireDataFixture('Magento/Checkout/_files/quote_with_address.php');
 Resolver::getInstance()->requireDataFixture('Magento/Catalog/_files/product_with_options.php');
-Resolver::getInstance()->requireDataFixture('Magento/Checkout/_files/ValidatorFileMock.php');
 
 $objectManager = Bootstrap::getObjectManager();
 /** @var QuoteFactory $quoteFactory */
@@ -45,18 +49,18 @@
     $options[$option->getId()] = $value;
 }
 
-$requestInfo = new \Magento\Framework\DataObject(['qty' => 1, 'options' => $options]);
-$validatorFile = (new ValidatorFileMock())->getInstance();
-$objectManager->addSharedInstance($validatorFile, \Magento\Catalog\Model\Product\Option\Type\File\ValidatorFile::class);
+$requestInfo = new DataObject(['qty' => 1, 'options' => $options]);
+$validatorFile = $objectManager->get(ValidatorFileMock::class)->getInstance();
+$objectManager->addSharedInstance($validatorFile, ValidatorFile::class);
 
 $quote->setReservedOrderId('test_order_item_with_items_and_custom_options');
 $quote->addProduct($product, $requestInfo);
 $quote->collectTotals();
-$objectManager->get(\Magento\Quote\Model\QuoteRepository::class)->save($quote);
+$objectManager->get(QuoteRepository::class)->save($quote);
 
-/** @var \Magento\Quote\Model\QuoteIdMask $quoteIdMask */
+/** @var QuoteIdMask $quoteIdMask */
 $quoteIdMask = Bootstrap::getObjectManager()
-    ->create(\Magento\Quote\Model\QuoteIdMaskFactory::class)
+    ->create(QuoteIdMaskFactory::class)
     ->create();
 $quoteIdMask->setQuoteId($quote->getId());
 $quoteIdMask->setDataChanges(true);