MAGETWO-64602: Sync config file with DB: Validation

Author: Bohdan Korablov

app/code/Magento/Deploy/Model/DeploymentConfig/Hash.php

@@ -79,7 +79,7 @@ public function regenerate()
             $config = $this->dataConfigCollector->getConfig();
             $hash = $this->configHashGenerator->generate($config);
             $this->writer->saveConfig([ConfigFilePool::APP_ENV => [self::CONFIG_KEY => $hash]]);
-        } catch (LocalizedException $exception) {
+        } catch (FileSystemException $exception) {
             throw new LocalizedException(__('Hash has not been saved'), $exception);
         }
     }

app/code/Magento/Deploy/Test/Unit/Model/DeploymentConfig/DataCollectorTest.php

@@ -0,0 +1,56 @@
+<?php
+/**
+ * Copyright © 2013-2017 Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Deploy\Test\Unit\Model\DeploymentConfig;
+
+use Magento\Deploy\Model\DeploymentConfig\DataCollector;
+use Magento\Deploy\Model\DeploymentConfig\ImporterPool;
+use Magento\Framework\App\DeploymentConfig;
+
+class DataCollectorTest extends \PHPUnit_Framework_TestCase
+{
+    /**
+     * @var ImporterPool|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $configImporterPoolMock;
+
+    /**
+     * @var DeploymentConfig|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $deploymentConfigMock;
+
+    /**
+     * @var DataCollector
+     */
+    private $dataCollector;
+
+    /**
+     * @return void
+     */
+    protected function setUp()
+    {
+        $this->configImporterPoolMock = $this->getMockBuilder(ImporterPool::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+        $this->deploymentConfigMock = $this->getMockBuilder(DeploymentConfig::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+
+        $this->dataCollector = new DataCollector($this->configImporterPoolMock, $this->deploymentConfigMock);
+    }
+
+    public function testGetConfig()
+    {
+        $sections = ['first', 'second'];
+        $this->configImporterPoolMock->expects($this->once())
+            ->method('getSections')
+            ->willReturn($sections);
+        $this->deploymentConfigMock->expects($this->any())
+            ->method('getConfigData')
+            ->willReturnMap([['first', 'some data']]);
+
+        $this->assertSame(['first' => 'some data'], $this->dataCollector->getConfig());
+    }
+}

dev/tests/integration/testsuite/Magento/Deploy/Console/Command/App/ApplicationDumpCommandTest.php

@@ -14,7 +14,7 @@
 use Symfony\Component\Console\Input\InputInterface;
 use Symfony\Component\Console\Output\OutputInterface;
 use Magento\Framework\Filesystem;
-use Magento\Framework\App\DeploymentConfig\ConfigHashManager;
+use Magento\Deploy\Model\DeploymentConfig\Hash;
 
 /**
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
@@ -62,7 +62,7 @@ public function setUp()
      */
     public function testExecute()
     {
-        $this->assertArrayNotHasKey(ConfigHashManager::CONFIG_KEY, $this->contentEnvFile);
+        $this->assertArrayNotHasKey(Hash::CONFIG_KEY, $this->contentEnvFile);
         $this->objectManager->configure([
             \Magento\Config\Model\Config\Export\ExcludeList::class => [
                 'arguments' => [
@@ -94,7 +94,7 @@ public function testExecute()
 
         $this->validateSystemSection($config);
         $this->validateThemesSection($config);
-        $this->assertArrayHasKey(ConfigHashManager::CONFIG_KEY, $this->getEnvFileContent());
+        $this->assertArrayHasKey(Hash::CONFIG_KEY, $this->getEnvFileContent());
     }
 
     /**