MAGETWO-35352: Move Unit-test According To New Design

Olga Kopylova · Olga Kopylova · commit adbc1cb66ab4 · 2015-03-20T11:16:40.000-05:00
diff --git a/app/code/Magento/Backend/Test/Unit/Setup/ConfigOptionsListTest.php b/app/code/Magento/Backend/Test/Unit/Setup/ConfigOptionsListTest.php
@@ -3,8 +3,9 @@
  * Copyright © 2015 Magento. All rights reserved.
  * See COPYING.txt for license details.
  */
-namespace Magento\Backend\Setup;
+namespace Magento\Backend\Test\Unit\Setup;
 
+use Magento\Backend\Setup\ConfigOptionsList;
 use Magento\Framework\Config\File\ConfigFilePool;
 
 class ConfigOptionsListTest extends \PHPUnit_Framework_TestCase
diff --git a/lib/internal/Magento/Framework/Config/Test/Unit/File/ConfigFilePoolTest.php b/lib/internal/Magento/Framework/Config/Test/Unit/File/ConfigFilePoolTest.php
@@ -4,7 +4,9 @@
  * See COPYING.txt for license details.
  */
 
-namespace Magento\Framework\Config\File;
+namespace Magento\Framework\Config\Test\Unit\File;
+
+use Magento\Framework\Config\File\ConfigFilePool;
 
 class ConfigFilePoolTest extends \PHPUnit_Framework_TestCase
 {
diff --git a/lib/internal/Magento/Framework/Setup/Test/Unit/Option/FlagConfigOptionTest.php b/lib/internal/Magento/Framework/Setup/Test/Unit/Option/FlagConfigOptionTest.php
@@ -3,7 +3,9 @@
  * Copyright © 2015 Magento. All rights reserved.
  * See COPYING.txt for license details.
  */
-namespace Magento\Framework\Setup\Option;
+namespace Magento\Framework\Setup\Test\Unit\Option;
+
+use Magento\Framework\Setup\Option\FlagConfigOption;
 
 class FlagConfigOptionTest extends \PHPUnit_Framework_TestCase
 {
diff --git a/lib/internal/Magento/Framework/Setup/Test/Unit/Option/MultiSelectConfigOptionTest.php b/lib/internal/Magento/Framework/Setup/Test/Unit/Option/MultiSelectConfigOptionTest.php
@@ -3,7 +3,11 @@
  * Copyright © 2015 Magento. All rights reserved.
  * See COPYING.txt for license details.
  */
-namespace Magento\Framework\Setup\Option;
+namespace Magento\Framework\Setup\Test\Unit\Option;
+
+use Magento\Framework\Setup\Option\MultiSelectConfigOption;
+use Magento\Framework\Setup\Option\SelectConfigOption;
+use Magento\Framework\Setup\Option\TextConfigOption;
 
 class MultiSelectConfigOptionTest extends \PHPUnit_Framework_TestCase
 {
diff --git a/lib/internal/Magento/Framework/Setup/Test/Unit/Option/SelectConfigOptionTest.php b/lib/internal/Magento/Framework/Setup/Test/Unit/Option/SelectConfigOptionTest.php
@@ -3,7 +3,10 @@
  * Copyright © 2015 Magento. All rights reserved.
  * See COPYING.txt for license details.
  */
-namespace Magento\Framework\Setup\Option;
+namespace Magento\Framework\Setup\Test\Unit\Option;
+
+use Magento\Framework\Setup\Option\SelectConfigOption;
+use Magento\Framework\Setup\Option\TextConfigOption;
 
 class SelectConfigOptionTest extends \PHPUnit_Framework_TestCase
 {
diff --git a/lib/internal/Magento/Framework/Setup/Test/Unit/Option/TextConfigOptionTest.php b/lib/internal/Magento/Framework/Setup/Test/Unit/Option/TextConfigOptionTest.php
@@ -3,7 +3,10 @@
  * Copyright © 2015 Magento. All rights reserved.
  * See COPYING.txt for license details.
  */
-namespace Magento\Framework\Setup\Option;
+namespace Magento\Framework\Setup\Test\Unit\Option;
+
+use Magento\Framework\Setup\Option\SelectConfigOption;
+use Magento\Framework\Setup\Option\TextConfigOption;
 
 class TextConfigOptionTest extends \PHPUnit_Framework_TestCase
 {
diff --git a/setup/src/Magento/Setup/Test/Unit/Console/Command/ConfigInstallCommandTest.php b/setup/src/Magento/Setup/Test/Unit/Console/Command/ConfigInstallCommandTest.php
@@ -4,10 +4,11 @@
  * See COPYING.txt for license details.
  */
 
-namespace Magento\Setup\Console\Command;
+namespace Magento\Setup\Test\Unit\Console\Command;
 
 use Magento\Framework\Config\File\ConfigFilePool;
 use Magento\Framework\Module\ModuleList;
+use Magento\Setup\Console\Command\ConfigInstallCommand;
 use Symfony\Component\Console\Input\InputInterface;
 use Symfony\Component\Console\Output\OutputInterface;
 
diff --git a/setup/src/Magento/Setup/Test/Unit/Model/ConfigGeneratorTest.php b/setup/src/Magento/Setup/Test/Unit/Model/ConfigGeneratorTest.php
@@ -3,9 +3,11 @@
  * Copyright © 2015 Magento. All rights reserved.
  * See COPYING.txt for license details.
  */
-namespace Magento\Setup\Model;
+namespace Magento\Setup\Test\Unit\Model;
 
 use Magento\Framework\Config\File\ConfigFilePool;
+use Magento\Setup\Model\ConfigGenerator;
+use Magento\Setup\Model\ConfigOptionsList;
 
 class ConfigGeneratorTest extends \PHPUnit_Framework_TestCase
 {
diff --git a/setup/src/Magento/Setup/Test/Unit/Model/ConfigModelTest.php b/setup/src/Magento/Setup/Test/Unit/Model/ConfigModelTest.php
@@ -4,9 +4,10 @@
  * See COPYING.txt for license details.
  */
 
-namespace Magento\Setup\Model;
+namespace Magento\Setup\Test\Unit\Model;
 
 use Magento\Framework\Config\File\ConfigFilePool;
+use Magento\Setup\Model\ConfigModel;
 
 class ConfigModelTest extends \PHPUnit_Framework_TestCase
 {
diff --git a/setup/src/Magento/Setup/Test/Unit/Model/ConfigOptionsListTest.php b/setup/src/Magento/Setup/Test/Unit/Model/ConfigOptionsListTest.php
@@ -3,7 +3,10 @@
  * Copyright © 2015 Magento. All rights reserved.
  * See COPYING.txt for license details.
  */
-namespace Magento\Setup\Model;
+namespace Magento\Setup\Test\Unit\Model;
+
+use Magento\Setup\Model\ConfigGenerator;
+use Magento\Setup\Model\ConfigOptionsList;
 
 class ConfigOptionsListTest extends \PHPUnit_Framework_TestCase
 {

Original file line number	Diff line number	Diff line change
`@@ -4,7 +4,9 @@`
`4`	`4`	`* See COPYING.txt for license details.`
`5`	`5`	`*/`
`6`	`6`
`7`		`-namespace Magento\Framework\Config\File;`
	`7`	`+namespace Magento\Framework\Config\Test\Unit\File;`
	`8`	`+`
	`9`	`+use Magento\Framework\Config\File\ConfigFilePool;`
`8`	`10`
`9`	`11`	`class ConfigFilePoolTest extends \PHPUnit_Framework_TestCase`
`10`	`12`	`{`
Original file line number	Diff line number	Diff line change
`@@ -4,9 +4,10 @@`
`4`	`4`	`* See COPYING.txt for license details.`
`5`	`5`	`*/`
`6`	`6`
`7`		`-namespace Magento\Setup\Model;`
	`7`	`+namespace Magento\Setup\Test\Unit\Model;`
`8`	`8`
`9`	`9`	`use Magento\Framework\Config\File\ConfigFilePool;`
	`10`	`+use Magento\Setup\Model\ConfigModel;`
`10`	`11`
`11`	`12`	`class ConfigModelTest extends \PHPUnit_Framework_TestCase`
`12`	`13`	`{`