MAGETWO-87551: Convert existing data install/upgrade scripts

--fix SVC

Author: Sergii Kovalenko

dev/tests/setup-integration/framework/Magento/TestFramework/Deploy/CliCommand.php

@@ -72,14 +72,18 @@ public function enableModule($moduleName)
     /**
      * Execute upgrade magento command.
      *
+     * @param array $installParams
      * @return string
      */
-    public function upgrade()
+    public function upgrade($installParams = [])
     {
         $initParams = $this->parametersHolder->getInitParams();
-        $enableModuleCommand = 'php -f ' . BP . '/bin/magento setup:upgrade -vvv -n --magento-init-params='
+        $upgradeCommand = 'php -f ' . BP . '/bin/magento setup:upgrade -vvv -n --magento-init-params='
             . $initParams['magento-init-params'];
-        return $this->shell->execute($enableModuleCommand);
+
+        $upgradeCommand .= ' ' . implode(" ", $this->toCliArguments(array_keys($installParams)));
+
+        return $this->shell->execute($upgradeCommand, array_values($installParams));
     }
 
     /**

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

@@ -53,9 +53,7 @@ public function testInstallation()
     {
         $testTableData = $this->getData();
         $row = reset($testTableData);
-        $this->cliCommad->install(
-            ['Magento_TestSetupDeclarationModule4']
-        );
+        $this->cliCommad->install(['Magento_TestSetupDeclarationModule4']);
         $adapter = $this->resourceConnection->getConnection();
         $testTableName = $this->resourceConnection->getTableName('test_table');
         $adapter->insertArray(
@@ -70,15 +68,23 @@ public function testInstallation()
             'db_schema.xml',
             'etc'
         );
-        $this->cliCommad->upgrade();
+        $this->cliCommad->upgrade(
+            [
+                '--safe-mode' => true,
+            ]
+        );
         //Move new db_schema.xml with restored title field
         $this->moduleManager->updateRevision(
             'Magento_TestSetupDeclarationModule4',
             'restore_title_column',
             'db_schema.xml',
             'etc'
         );
-        $this->cliCommad->upgrade();
+        $this->cliCommad->upgrade(
+            [
+                '--data-restore' => true,
+            ]
+        );
         $testTableSelect = $adapter->select()->from($testTableName);
         self::assertEquals($testTableData, $adapter->fetchAll($testTableSelect));
     }