MAGETWO-90562: [Forwardport] Fix transaction level in integration tests framework

slopukhov · slopukhov · commit b21f09f6f173 · 2018-04-18T11:51:30.000+03:00
diff --git a/dev/tests/integration/testsuite/Magento/Catalog/Model/Indexer/FlatTest.php b/dev/tests/integration/testsuite/Magento/Catalog/Model/Indexer/FlatTest.php
@@ -5,10 +5,12 @@
  */
 namespace Magento\Catalog\Model\Indexer;
 
+use Magento\TestFramework\Helper\Bootstrap;
+
 /**
  * @magentoDbIsolation enabled
  */
-class FlatTest extends \PHPUnit\Framework\TestCase
+class FlatTest extends \Magento\TestFramework\Indexer\TestCase
 {
     /**
      * @var int
@@ -56,6 +58,16 @@ class FlatTest extends \PHPUnit\Framework\TestCase
     public static function setUpBeforeClass()
     {
         self::loadAttributeCodes();
+
+        $db = Bootstrap::getInstance()->getBootstrap()
+            ->getApplication()
+            ->getDbInstance();
+        if (!$db->isDbDumpExists()) {
+            throw new \LogicException('DB dump does not exist.');
+        }
+        $db->restoreFromDbDump();
+
+        parent::setUpBeforeClass();
     }
 
     public function testEntityItemsBefore()
@@ -71,6 +83,8 @@ public function testEntityItemsBefore()
      *
      * @magentoConfigFixture current_store catalog/frontend/flat_catalog_category true
      * @magentoAppArea frontend
+     *
+     * @magentoDbIsolation disabled
      */
     public function testReindexAll()
     {
@@ -105,6 +119,8 @@ public function testFlatItemsBefore()
      * Populate EAV category data`
      *
      * @magentoConfigFixture current_store catalog/frontend/flat_catalog_category true
+     *
+     * @magentoDbIsolation disabled
      */
     public function testCreateCategory()
     {
@@ -115,6 +131,8 @@ public function testCreateCategory()
 
         $this->assertEquals(self::$defaultCategoryId, $result[self::$categoryOne]->getParentId());
         $this->assertEquals(self::$categoryOne, $result[self::$categoryTwo]->getParentId());
+
+        $this->removeSubCategoriesInDefaultCategory();
     }
 
     /**
@@ -123,6 +141,8 @@ public function testCreateCategory()
      *
      * @magentoConfigFixture current_store catalog/frontend/flat_catalog_category true
      * @magentoAppArea frontend
+     *
+     * @magentoDbIsolation disabled
      */
     public function testFlatAfterCreate()
     {
@@ -150,18 +170,24 @@ public function testFlatAfterCreate()
 
         $this->assertEquals(self::$categoryOne, $categoryTwo->getParentId());
         $this->checkCategoryData($categoryTwo);
+
+        $this->removeSubCategoriesInDefaultCategory();
     }
 
     /**
      * Move category and populate EAV category data
      *
      * @magentoConfigFixture current_store catalog/frontend/flat_catalog_category true
+     *
+     * @magentoDbIsolation disabled
      */
     public function testMoveCategory()
     {
         $this->moveSubCategoriesInDefaultCategory();
         $categoryTwo = $this->getLoadedCategory(self::$categoryTwo);
         $this->assertEquals($categoryTwo->getData('parent_id'), self::$defaultCategoryId);
+
+        $this->removeSubCategoriesInDefaultCategory();
     }
 
     /**
@@ -170,6 +196,8 @@ public function testMoveCategory()
      *
      * @magentoConfigFixture current_store catalog/frontend/flat_catalog_category true
      * @magentoAppArea frontend
+     *
+     * @magentoDbIsolation disabled
      */
     public function testFlatAfterMove()
     {
@@ -188,6 +216,8 @@ public function testFlatAfterMove()
 
         $categoryTwo = $this->getLoadedCategory(self::$categoryTwo);
         $this->checkCategoryData($categoryTwo);
+
+        $this->removeSubCategoriesInDefaultCategory();
     }
 
     /**
@@ -357,7 +387,17 @@ private function deleteSubCategoriesInDefaultCategory()
     {
         $this->executeWithFlatEnabledInAdminArea(function () {
             $this->createSubCategoriesInDefaultCategory();
+            $this->removeSubCategoriesInDefaultCategory();
+        });
+    }
 
+    /**
+     * Invoke business logic:
+     * - delete created categories
+     */
+    private function removeSubCategoriesInDefaultCategory()
+    {
+        $this->executeWithFlatEnabledInAdminArea(function () {
             $category = $this->instantiateCategoryModel();
             $category->load(self::$categoryTwo);
             $category->delete();
@@ -427,4 +467,12 @@ private function getActiveConfigInstance()
             \Magento\Framework\App\Config\MutableScopeConfigInterface::class
         );
     }
+
+    /**
+     * teardown
+     */
+    public function tearDown()
+    {
+        parent::tearDown();
+    }
 }
diff --git a/dev/tests/integration/testsuite/Magento/Catalog/Model/Indexer/Product/Eav/Action/FullTest.php b/dev/tests/integration/testsuite/Magento/Catalog/Model/Indexer/Product/Eav/Action/FullTest.php
@@ -5,16 +5,31 @@
  */
 namespace Magento\Catalog\Model\Indexer\Product\Eav\Action;
 
+use Magento\TestFramework\Helper\Bootstrap;
+
 /**
  * Full reindex Test
  */
-class FullTest extends \PHPUnit\Framework\TestCase
+class FullTest extends \Magento\TestFramework\Indexer\TestCase
 {
     /**
      * @var \Magento\Catalog\Model\Indexer\Product\Eav\Processor
      */
     protected $_processor;
 
+    public static function setUpBeforeClass()
+    {
+        $db = Bootstrap::getInstance()->getBootstrap()
+            ->getApplication()
+            ->getDbInstance();
+        if (!$db->isDbDumpExists()) {
+            throw new \LogicException('DB dump does not exist.');
+        }
+        $db->restoreFromDbDump();
+
+        parent::setUpBeforeClass();
+    }
+
     protected function setUp()
     {
         $this->_processor = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->get(
@@ -61,4 +76,12 @@ public function testReindexAll()
             $this->assertEquals(1, $product->getWeight());
         }
     }
+
+    /**
+     * teardown
+     */
+    public function tearDown()
+    {
+        parent::tearDown();
+    }
 }
diff --git a/dev/tests/integration/testsuite/Magento/Framework/Backup/DbTest.php b/dev/tests/integration/testsuite/Magento/Framework/Backup/DbTest.php
@@ -16,12 +16,26 @@
 /**
  * Provide tests for \Magento\Framework\Backup\Db.
  */
-class DbTest extends TestCase
+class DbTest extends \Magento\TestFramework\Indexer\TestCase
 {
+    public static function setUpBeforeClass()
+    {
+        $db = Bootstrap::getInstance()->getBootstrap()
+            ->getApplication()
+            ->getDbInstance();
+        if (!$db->isDbDumpExists()) {
+            throw new \LogicException('DB dump does not exist.');
+        }
+        $db->restoreFromDbDump();
+
+        parent::setUpBeforeClass();
+    }
+
     /**
      * Test db backup includes triggers.
      *
      * @magentoDataFixture Magento/Framework/Backup/_files/trigger.php
+     * @magentoDbIsolation disabled
      */
     public function testBackupIncludesCustomTriggers()
     {
@@ -48,4 +62,12 @@ public function testBackupIncludesCustomTriggers()
         //Clean up.
         $write->delete('/backups/' . $time . '_db_testbackup.sql');
     }
+
+    /**
+     * teardown
+     */
+    public function tearDown()
+    {
+        parent::tearDown();
+    }
 }
diff --git a/dev/tests/integration/testsuite/Magento/GraphQl/Controller/GraphQlControllerTest.php b/dev/tests/integration/testsuite/Magento/GraphQl/Controller/GraphQlControllerTest.php
@@ -12,14 +12,16 @@
 use Magento\Framework\App\Request\Http;
 use Magento\Framework\EntityManager\MetadataPool;
 use Magento\Framework\Serialize\SerializerInterface;
+use Magento\TestFramework\Helper\Bootstrap;
 
 /**
  * Tests the dispatch method in the GraphQl Controller class using a simple product query
  *
  * @magentoAppArea graphql
  * @magentoDataFixture Magento/Catalog/_files/product_simple_with_url_key.php
+ * @magentoDbIsolation disabled
  */
-class GraphQlControllerTest extends \PHPUnit\Framework\TestCase
+class GraphQlControllerTest extends \Magento\TestFramework\Indexer\TestCase
 {
     const CONTENT_TYPE = 'application/json';
 
@@ -35,6 +37,19 @@ class GraphQlControllerTest extends \PHPUnit\Framework\TestCase
     /** @var MetadataPool */
     private $metadataPool;
 
+    public static function setUpBeforeClass()
+    {
+        $db = Bootstrap::getInstance()->getBootstrap()
+            ->getApplication()
+            ->getDbInstance();
+        if (!$db->isDbDumpExists()) {
+            throw new \LogicException('DB dump does not exist.');
+        }
+        $db->restoreFromDbDump();
+
+        parent::setUpBeforeClass();
+    }
+
     protected function setUp() : void
     {
         $this->objectManager = \Magento\TestFramework\Helper\Bootstrap::getObjectManager();
@@ -153,4 +168,12 @@ public function testError() : void
             }
         }
     }
+
+    /**
+     * teardown
+     */
+    public function tearDown()
+    {
+        parent::tearDown();
+    }
 }
diff --git a/dev/tests/integration/testsuite/Magento/Paypal/Model/Payment/Method/Billing/AbstractAgreementTest.php b/dev/tests/integration/testsuite/Magento/Paypal/Model/Payment/Method/Billing/AbstractAgreementTest.php
@@ -6,12 +6,26 @@
 namespace Magento\Paypal\Model\Payment\Method\Billing;
 
 use Magento\Quote\Api\Data\PaymentInterface;
+use Magento\TestFramework\Helper\Bootstrap;
 
-class AbstractAgreementTest extends \PHPUnit\Framework\TestCase
+class AbstractAgreementTest extends \Magento\TestFramework\Indexer\TestCase
 {
     /** @var \Magento\Paypal\Model\Method\Agreement */
     protected $_model;
 
+    public static function setUpBeforeClass()
+    {
+        $db = Bootstrap::getInstance()->getBootstrap()
+            ->getApplication()
+            ->getDbInstance();
+        if (!$db->isDbDumpExists()) {
+            throw new \LogicException('DB dump does not exist.');
+        }
+        $db->restoreFromDbDump();
+
+        parent::setUpBeforeClass();
+    }
+
     protected function setUp()
     {
         $config = $this->getMockBuilder(\Magento\Paypal\Model\Config::class)->disableOriginalConstructor()->getMock();
@@ -72,4 +86,12 @@ public function testAssignData()
             $info->getAdditionalInformation(AbstractAgreement::PAYMENT_INFO_REFERENCE_ID)
         );
     }
+
+    /**
+     * teardown
+     */
+    public function tearDown()
+    {
+        parent::tearDown();
+    }
 }
