MAGETWO-87190: Test coverage for critical logic

Author: Sergii Kovalenko

dev/tests/setup-integration/_files/Magento/TestSetupDeclarationModule1/registration.php

@@ -6,4 +6,7 @@
 
 use Magento\Framework\Component\ComponentRegistrar;
 
-ComponentRegistrar::register(ComponentRegistrar::MODULE, 'Magento_TestSetupDeclarationModule1', __DIR__);
+$registrar = new ComponentRegistrar();
+if ($registrar->getPath(ComponentRegistrar::MODULE, 'Magento_TestSetupDeclarationModule1') === null) {
+    ComponentRegistrar::register(ComponentRegistrar::MODULE, 'Magento_TestSetupDeclarationModule1', __DIR__);
+}

dev/tests/setup-integration/framework/Magento/TestFramework/Annotation/CopyModules.php

@@ -6,7 +6,6 @@
 
 namespace Magento\TestFramework\Annotation;
 
-use Magento\Framework\Filesystem\Io\File;
 use Magento\TestFramework\Deploy\CliCommand;
 use Magento\TestFramework\Deploy\TestModuleManager;
 
@@ -45,7 +44,10 @@ public function startTest(\PHPUnit\Framework\TestCase $test)
         $annotations = $test->getAnnotations();
         //This annotation can be declared only on method level
         if (isset($annotations['method']['moduleName'])) {
-            $this->cliCommand->introduceModule($annotations['method']['moduleName'][0]);
+            $moduleName = $annotations['method']['moduleName'][0];
+            $this->cliCommand->introduceModule($moduleName);
+            $path = MAGENTO_MODULES_PATH . explode("_", $moduleName)[1] . '/registration.php';
+            include_once $path;
         }
     }
 }

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

@@ -73,6 +73,8 @@
         $application,
         new \Magento\TestFramework\Bootstrap\MemoryFactory($shell)
     );
+    //remove test modules files
+    include_once __DIR__ . '/../../setup-integration/framework/removeTestModules.php';
     $bootstrap->runBootstrap();
     $application->createInstallDir();
     //We do not want to install anything