magento
diff --git a/‎app/code/Magento/Inventory/Test/Integration/Indexer/GetSourceItemId.php
Copy file name to clipboard
+47Lines changed: 47 additions & 0 deletions b/‎app/code/Magento/Inventory/Test/Integration/Indexer/GetSourceItemId.php
Copy file name to clipboard
+47Lines changed: 47 additions & 0 deletions
diff --git a/‎app/code/Magento/Inventory/Test/Integration/Indexer/SourceIndexerTest.php
Copy file name to clipboard
+6Lines changed: 6 additions & 0 deletions b/‎app/code/Magento/Inventory/Test/Integration/Indexer/SourceIndexerTest.php
Copy file name to clipboard
+6Lines changed: 6 additions & 0 deletions
diff --git a/‎app/code/Magento/Inventory/Test/Integration/Indexer/SourceItemIndexerTest.php
Copy file name to clipboard
+18-2Lines changed: 18 additions & 2 deletions b/‎app/code/Magento/Inventory/Test/Integration/Indexer/SourceItemIndexerTest.php
Copy file name to clipboard
+18-2Lines changed: 18 additions & 2 deletions
diff --git a/‎app/code/Magento/Inventory/Test/Integration/Indexer/StockIndexerTest.php
Copy file name to clipboard
+6Lines changed: 6 additions & 0 deletions b/‎app/code/Magento/Inventory/Test/Integration/Indexer/StockIndexerTest.php
Copy file name to clipboard
+6Lines changed: 6 additions & 0 deletions
diff --git a/‎app/code/Magento/Inventory/Test/Integration/Model/ResourceModel/SourceItem/DeleteMultipleTest.php
Copy file name to clipboard
-63Lines changed: 0 additions & 63 deletions b/‎app/code/Magento/Inventory/Test/Integration/Model/ResourceModel/SourceItem/DeleteMultipleTest.php
Copy file name to clipboard
-63Lines changed: 0 additions & 63 deletions
diff --git a/‎app/code/Magento/Inventory/Test/Integration/Stock/GetProductQuantityInStockTest.php
Copy file name to clipboard
+6Lines changed: 6 additions & 0 deletions b/‎app/code/Magento/Inventory/Test/Integration/Stock/GetProductQuantityInStockTest.php
Copy file name to clipboard
+6Lines changed: 6 additions & 0 deletions
diff --git a/‎app/code/Magento/Inventory/Test/Integration/Stock/IsProductInStockTest.php
Copy file name to clipboard
+6Lines changed: 6 additions & 0 deletions b/‎app/code/Magento/Inventory/Test/Integration/Stock/IsProductInStockTest.php
Copy file name to clipboard
+6Lines changed: 6 additions & 0 deletions
diff --git a/‎app/code/Magento/InventoryApi/Test/_files/products.php
Copy file name to clipboard
+31Lines changed: 31 additions & 0 deletions b/‎app/code/Magento/InventoryApi/Test/_files/products.php
Copy file name to clipboard
+31Lines changed: 31 additions & 0 deletions
diff --git a/‎app/code/Magento/InventoryApi/Test/_files/products_rollback.php
Copy file name to clipboard
+33-15Lines changed: 33 additions & 15 deletions b/‎app/code/Magento/InventoryApi/Test/_files/products_rollback.php
Copy file name to clipboard
+33-15Lines changed: 33 additions & 15 deletions
diff --git a/‎app/code/Magento/InventoryApi/Test/_files/source_items.php
Copy file name to clipboard
+2-6Lines changed: 2 additions & 6 deletions b/‎app/code/Magento/InventoryApi/Test/_files/source_items.php
Copy file name to clipboard
+2-6Lines changed: 2 additions & 6 deletions
@@ -0,0 +1,47 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\Inventory\Test\Integration\Indexer;
+
+use Magento\Framework\App\ResourceConnection;
+use Magento\Inventory\Model\ResourceModel\SourceItem as SourceItemResourceModel;
+use Magento\InventoryApi\Api\Data\SourceItemInterface;
+
+class GetSourceItemId
+{
+    /**
+     * @var ResourceConnection
+     */
+    private $resourceConnection;
+
+    /**
+     * @param ResourceConnection $resourceConnection
+     */
+    public function __construct(ResourceConnection $resourceConnection)
+    {
+        $this->resourceConnection = $resourceConnection;
+    }
+
+    /**
+     * @param string $sku
+     * @param int $sourceId
+     * @return int
+     */
+    public function execute(string $sku, int $sourceId): int
+    {
+        $connection = $this->resourceConnection->getConnection();
+        $select = $connection->select()
+            ->from(
+                $this->resourceConnection->getTableName(SourceItemResourceModel::TABLE_NAME_SOURCE_ITEM),
+                [SourceItemResourceModel::ID_FIELD_NAME]
+            )
+            ->where(SourceItemInterface::SKU . ' = ?', $sku)
+            ->where(SourceItemInterface::SOURCE_ID . ' = ?', $sourceId);
+
+        return (int)$connection->fetchOne($select);
+    }
+}
@@ -30,6 +30,9 @@ class SourceIndexerTest extends TestCase
      */
     private $removeIndexData;
 
+    /**
+     * {@inheritdoc}
+     */
     protected function setUp()
     {
         $this->indexer = Bootstrap::getObjectManager()->get(IndexerInterface::class);
@@ -42,6 +45,9 @@ protected function setUp()
         $this->removeIndexData->execute([10, 20, 30]);
     }
 
+    /**
+     * {@inheritdoc}
+     */
     public function tearDown()
     {
         $this->removeIndexData->execute([10, 20, 30]);
 
@@ -30,6 +30,14 @@ class SourceItemIndexerTest extends TestCase
      */
     private $removeIndexData;
 
+    /**
+     * @var GetSourceItemId
+     */
+    private $getSourceItemId;
+
+    /**
+     * {@inheritdoc}
+     */
     protected function setUp()
     {
         $this->indexer = Bootstrap::getObjectManager()->get(IndexerInterface::class);
@@ -40,8 +48,13 @@ protected function setUp()
 
         $this->removeIndexData = Bootstrap::getObjectManager()->get(RemoveIndexData::class);
         $this->removeIndexData->execute([10, 20, 30]);
+
+        $this->getSourceItemId = Bootstrap::getObjectManager()->get(GetSourceItemId::class);
     }
 
+    /**
+     * {@inheritdoc}
+     */
     public function tearDown()
     {
         $this->removeIndexData->execute([10, 20, 30]);
@@ -56,7 +69,7 @@ public function tearDown()
      */
     public function testReindexRow()
     {
-        $this->indexer->reindexRow(1);
+        $this->indexer->reindexRow($this->getSourceItemId->execute('SKU-1', 10));
 
         self::assertEquals(8.5, $this->getProductQuantityInStock->execute('SKU-1', 10));
         self::assertEquals(8.5, $this->getProductQuantityInStock->execute('SKU-1', 30));
@@ -71,7 +84,10 @@ public function testReindexRow()
      */
     public function testReindexList()
     {
-        $this->indexer->reindexList([1, 5]);
+        $this->indexer->reindexList([
+            $this->getSourceItemId->execute('SKU-1', 10),
+            $this->getSourceItemId->execute('SKU-2', 50),
+        ]);
 
         self::assertEquals(8.5, $this->getProductQuantityInStock->execute('SKU-1', 10));
         self::assertEquals(8.5, $this->getProductQuantityInStock->execute('SKU-1', 30));
 
@@ -30,6 +30,9 @@ class StockIndexerTest extends TestCase
      */
     private $removeIndexData;
 
+    /**
+     * {@inheritdoc}
+     */
     protected function setUp()
     {
         $this->indexer = Bootstrap::getObjectManager()->get(IndexerInterface::class);
@@ -42,6 +45,9 @@ protected function setUp()
         $this->removeIndexData->execute([10, 20, 30]);
     }
 
+    /**
+     * {@inheritdoc}
+     */
     public function tearDown()
     {
         $this->removeIndexData->execute([10, 20, 30]);
 
@@ -49,6 +49,9 @@ class GetProductQuantityInStockTest extends TestCase
      */
     private $removeIndexData;
 
+    /**
+     * {@inheritdoc}
+     */
     protected function setUp()
     {
         $this->indexer = Bootstrap::getObjectManager()->create(IndexerInterface::class);
@@ -66,6 +69,9 @@ protected function setUp()
         $this->removeIndexData->execute([10]);
     }
 
+    /**
+     * {@inheritdoc}
+     */
     public function tearDown()
     {
         $this->removeIndexData->execute([10]);
 
@@ -49,6 +49,9 @@ class IsProductInStockTest extends TestCase
      */
     private $removeIndexData;
 
+    /**
+     * {@inheritdoc}
+     */
     protected function setUp()
     {
         $this->indexer = Bootstrap::getObjectManager()->create(IndexerInterface::class);
@@ -63,6 +66,9 @@ protected function setUp()
         $this->removeIndexData->execute([10]);
     }
 
+    /**
+     * {@inheritdoc}
+     */
     public function tearDown()
     {
         $this->removeIndexData->execute([10]);
 
@@ -3,10 +3,18 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+declare(strict_types=1);
+
 use Magento\Catalog\Api\Data\ProductInterfaceFactory;
 use Magento\Catalog\Api\ProductRepositoryInterface;
 use Magento\Catalog\Model\Product\Attribute\Source\Status;
 use Magento\Catalog\Model\Product\Type;
+use Magento\Framework\Api\SearchCriteriaBuilder;
+use Magento\Framework\Module\Manager;
+use Magento\InventoryApi\Api\Data\SourceItemInterface;
+use Magento\InventoryApi\Api\SourceItemRepositoryInterface;
+use Magento\InventoryApi\Api\SourceItemsDeleteInterface;
+use Magento\InventoryCatalog\Api\DefaultStockProviderInterface;
 use Magento\TestFramework\Helper\Bootstrap;
 
 $objectManager = Bootstrap::getObjectManager();
@@ -45,3 +53,26 @@
         ->setStatus(Status::STATUS_ENABLED);
     $productRepository->save($product);
 }
+
+/** @var Manager $moduleManager */
+$moduleManager = Bootstrap::getObjectManager()->get(Manager::class);
+// soft dependency in tests because we don't have possibility replace fixture from different modules
+if ($moduleManager->isEnabled('Magento_InventoryCatalog')) {
+    /** @var SearchCriteriaBuilder $searchCriteriaBuilder */
+    $searchCriteriaBuilder = Bootstrap::getObjectManager()->get(SearchCriteriaBuilder::class);
+    /** @var DefaultStockProviderInterface $defaultStockProvider */
+    $defaultStockProvider = $objectManager->get(DefaultStockProviderInterface::class);
+    /** @var SourceItemRepositoryInterface $sourceItemRepository */
+    $sourceItemRepository = $objectManager->get(SourceItemRepositoryInterface::class);
+    /** @var SourceItemsDeleteInterface $sourceItemsDelete */
+    $sourceItemsDelete = $objectManager->get(SourceItemsDeleteInterface::class);
+
+    $searchCriteria = $searchCriteriaBuilder
+        ->addFilter(SourceItemInterface::SKU, ['SKU-1', 'SKU-2', 'SKU-3'], 'in')
+        ->addFilter(SourceItemInterface::SOURCE_ID, $defaultStockProvider->getId())
+        ->create();
+    $sourceItems = $sourceItemRepository->getList($searchCriteria)->getItems();
+    if (count($sourceItems)) {
+        $sourceItemsDelete->execute($sourceItems);
+    }
+}
@@ -3,11 +3,15 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+declare(strict_types=1);
+
+use Magento\Framework\Api\SearchCriteriaBuilder;
 use Magento\Catalog\Api\ProductRepositoryInterface;
 use Magento\CatalogInventory\Api\StockStatusCriteriaInterfaceFactory;
 use Magento\CatalogInventory\Api\StockStatusRepositoryInterface;
 use Magento\Framework\Registry;
 use Magento\TestFramework\Helper\Bootstrap;
+use Magento\Catalog\Api\Data\ProductInterface;
 
 $objectManager = Bootstrap::getObjectManager();
 /** @var ProductRepositoryInterface $productRepository */
@@ -19,22 +23,36 @@
 /** @var StockStatusCriteriaInterfaceFactory $stockStatusCriteriaFactory */
 $stockStatusCriteriaFactory = $objectManager->create(StockStatusCriteriaInterfaceFactory::class);
 
-$currentArea = $registry->registry('isSecureArea');
-$registry->unregister('isSecureArea');
-$registry->register('isSecureArea', true);
+/** @var SearchCriteriaBuilder $searchCriteriaBuilder */
+$searchCriteriaBuilder = Bootstrap::getObjectManager()->get(SearchCriteriaBuilder::class);
+$searchCriteria = $searchCriteriaBuilder->addFilter(
+    ProductInterface::SKU,
+    ['SKU-1', 'SKU-2', 'SKU-3'],
+    'in'
+)->create();
+$products = $productRepository->getList($searchCriteria)->getItems();
+
+/**
+ * Tests which are wrapped with MySQL transaction clear all data by transaction rollback.
+ * In that case there is "if" which checks that SKU1, SKU2 and SKU3 still exists in database.
+ */
+if (!empty($products)) {
+    $currentArea = $registry->registry('isSecureArea');
+    $registry->unregister('isSecureArea');
+    $registry->register('isSecureArea', true);
+
+    foreach ($products as $product) {
+        /** @var \Magento\CatalogInventory\Api\StockStatusCriteriaInterfaceFactory $stockStatusCriteriaFactory */
+        $criteria = $stockStatusCriteriaFactory->create();
+        $criteria->setProductsFilter($product->getId());
 
-for ($i = 1; $i <= 3; $i++) {
-    $product = $productRepository->get('SKU-' . $i);
-    /** @var \Magento\CatalogInventory\Api\StockStatusCriteriaInterfaceFactory $stockStatusCriteriaFactory **/
-    $criteria = $stockStatusCriteriaFactory->create();
-    $criteria->setProductsFilter($product->getId());
+        $result = $stockStatusRepository->getList($criteria);
+        $stockStatus = current($result->getItems());
+        $stockStatusRepository->delete($stockStatus);
 
-    $result = $stockStatusRepository->getList($criteria);
-    $stockStatus = current($result->getItems());
-    $stockStatusRepository->delete($stockStatus);
+        $productRepository->delete($product);
+    }
 
-    $productRepository->deleteById('SKU-' . $i);
+    $registry->unregister('isSecureArea');
+    $registry->register('isSecureArea', $currentArea);
 }
-
-$registry->unregister('isSecureArea');
-$registry->register('isSecureArea', $currentArea);
 
@@ -3,12 +3,13 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+declare(strict_types=1);
+
 use Magento\Framework\Api\DataObjectHelper;
 use Magento\InventoryApi\Api\Data\SourceItemInterface;
 use Magento\InventoryApi\Api\Data\SourceItemInterfaceFactory;
 use Magento\InventoryApi\Api\SourceItemsSaveInterface;
 use Magento\TestFramework\Helper\Bootstrap;
-use Magento\Framework\App\ResourceConnection;
 
 /** @var DataObjectHelper $dataObjectHelper */
 $dataObjectHelper = Bootstrap::getObjectManager()->get(DataObjectHelper::class);
@@ -58,11 +59,6 @@
     ],
 ];
 
-$resourceConnection = Bootstrap::getObjectManager()->get(ResourceConnection::class);
-/** @var \Magento\Framework\DB\Adapter\AdapterInterface $connection */
-$connection = $resourceConnection->getConnection();
-$connection->query('ALTER TABLE ' . $resourceConnection->getTableName('inventory_source_item') . ' AUTO_INCREMENT 1;');
-
 $sourceItems = [];
 foreach ($sourcesItemsData as $sourceItemData) {
     /** @var SourceItemInterface $source */
Original file line number	Diff line number	Diff line change
`@@ -30,6 +30,9 @@ class SourceIndexerTest extends TestCase`
`30`	`30`	`*/`
`31`	`31`	`private $removeIndexData;`
`32`	`32`
	`33`	`+ /**`
	`34`	`+ * {@inheritdoc}`
	`35`	`+ */`
`33`	`36`	`protected function setUp()`
`34`	`37`	`{`
`35`	`38`	`$this->indexer = Bootstrap::getObjectManager()->get(IndexerInterface::class);`
`@@ -42,6 +45,9 @@ protected function setUp()`
`42`	`45`	`$this->removeIndexData->execute([10, 20, 30]);`
`43`	`46`	`}`
`44`	`47`
	`48`	`+ /**`
	`49`	`+ * {@inheritdoc}`
	`50`	`+ */`
`45`	`51`	`public function tearDown()`
`46`	`52`	`{`
`47`	`53`	`$this->removeIndexData->execute([10, 20, 30]);`
Original file line number	Diff line number	Diff line change
`@@ -30,6 +30,9 @@ class StockIndexerTest extends TestCase`
`30`	`30`	`*/`
`31`	`31`	`private $removeIndexData;`
`32`	`32`
	`33`	`+ /**`
	`34`	`+ * {@inheritdoc}`
	`35`	`+ */`
`33`	`36`	`protected function setUp()`
`34`	`37`	`{`
`35`	`38`	`$this->indexer = Bootstrap::getObjectManager()->get(IndexerInterface::class);`
`@@ -42,6 +45,9 @@ protected function setUp()`
`42`	`45`	`$this->removeIndexData->execute([10, 20, 30]);`
`43`	`46`	`}`
`44`	`47`
	`48`	`+ /**`
	`49`	`+ * {@inheritdoc}`
	`50`	`+ */`
`45`	`51`	`public function tearDown()`
`46`	`52`	`{`
`47`	`53`	`$this->removeIndexData->execute([10, 20, 30]);`
Original file line number	Diff line number	Diff line change
`@@ -49,6 +49,9 @@ class GetProductQuantityInStockTest extends TestCase`
`49`	`49`	`*/`
`50`	`50`	`private $removeIndexData;`
`51`	`51`
	`52`	`+ /**`
	`53`	`+ * {@inheritdoc}`
	`54`	`+ */`
`52`	`55`	`protected function setUp()`
`53`	`56`	`{`
`54`	`57`	`$this->indexer = Bootstrap::getObjectManager()->create(IndexerInterface::class);`
`@@ -66,6 +69,9 @@ protected function setUp()`
`66`	`69`	`$this->removeIndexData->execute([10]);`
`67`	`70`	`}`
`68`	`71`
	`72`	`+ /**`
	`73`	`+ * {@inheritdoc}`
	`74`	`+ */`
`69`	`75`	`public function tearDown()`
`70`	`76`	`{`
`71`	`77`	`$this->removeIndexData->execute([10]);`
Original file line number	Diff line number	Diff line change
`@@ -49,6 +49,9 @@ class IsProductInStockTest extends TestCase`
`49`	`49`	`*/`
`50`	`50`	`private $removeIndexData;`
`51`	`51`
	`52`	`+ /**`
	`53`	`+ * {@inheritdoc}`
	`54`	`+ */`
`52`	`55`	`protected function setUp()`
`53`	`56`	`{`
`54`	`57`	`$this->indexer = Bootstrap::getObjectManager()->create(IndexerInterface::class);`
`@@ -63,6 +66,9 @@ protected function setUp()`
`63`	`66`	`$this->removeIndexData->execute([10]);`
`64`	`67`	`}`
`65`	`68`
	`69`	`+ /**`
	`70`	`+ * {@inheritdoc}`
	`71`	`+ */`
`66`	`72`	`public function tearDown()`
`67`	`73`	`{`
`68`	`74`	`$this->removeIndexData->execute([10]);`