MAGETWO-87190: Test coverage for critical logic

Author: Sergii Kovalenko

dev/tests/setup-integration/framework/Magento/TestFramework/TestCase/SetupTestCase.php

@@ -11,7 +11,7 @@
 /**
  * Instance of Setup test case. Used in order to tweak dataProviders functionality.
  */
-class SetupTestCase extends \PHPUnit_Framework_TestCase implements MutableDataInterface
+class SetupTestCase extends \PHPUnit\Framework\TestCase implements MutableDataInterface
 {
     /**
      * @var array

dev/tests/setup-integration/framework/bootstrap.php

@@ -74,11 +74,9 @@
         new \Magento\TestFramework\Bootstrap\MemoryFactory($shell)
     );
     $bootstrap->runBootstrap();
-    if ($settings->getAsBoolean('TESTS_CLEANUP')) {
-        $application->cleanup();
-        //remove test modules files
-        include_once __DIR__ . '/../../setup-integration/framework/removeTestModules.php';
-    }
+    $application->cleanup();
+    //remove test modules files
+    include_once __DIR__ . '/../../setup-integration/framework/removeTestModules.php';
     //We do not want to install anything
     $application->initialize([]);
 

dev/tests/setup-integration/testsuite/Magento/Setup/DeclarativeInstallerTest.php

@@ -109,9 +109,9 @@ public function testInstallationWithColumnsModification()
             $this->schemaConfig->getDeclarationConfig(),
             $this->schemaConfig->getDbConfig()
         );
-        $this->assertNull($diff->getAll());
+        self::assertNull($diff->getAll());
         $shardData = $this->describeTable->describeShard(Sharding::DEFAULT_CONNECTION);
-        $this->assertEquals($this->getData(), $shardData);
+        self::assertEquals($this->getData(), $shardData);
     }
 
     /**