From faf558c97e95156d60ce3ba6a68c5f675eae3ec4 Mon Sep 17 00:00:00 2001
From: Dmytro Kvashnin <dkvashnin@ebay.com>
Date: Mon, 16 Mar 2015 16:36:48 +0200
Subject: [PATCH] MAGETWO-33631: Advanced Developer Workflow
- unit tests namespaces resolved
---
.../Unit/Model/Config/Source/WorkflowTypeTest.php | 4 +++-
.../VIew/Asset/PreProcessor/DeveloperChainTest.php | 2 +-
.../framework/Magento/Sniffs/Annotations/Helper.php | 2 ++
.../Magento/Tools/Di/Test/Unit/App/CompilerTest.php | 12 ++++++++----
.../Di/Test/Unit/App/Task/InterceptionCacheTest.php | 3 +--
.../Di/Test/Unit/App/Task/OperationFactoryTest.php | 5 ++++-
.../InterceptionConfigurationBuilderTest.php | 2 +-
.../Config/Chain/InterceptorSubstitutionTest.php | 4 +++-
.../Config/Chain/PreferencesResolvingTest.php | 4 +++-
.../Unit/ObjectManager/Environment/CompiledTest.php | 6 +++---
.../Unit/ObjectManager/Environment/DeveloperTest.php | 8 +++++---
.../Css/Test/Unit/PreProcessor/LessTest.php | 2 +-
.../Magento/Framework/Less/FileGenerator.php | 2 +-
.../Framework/Less/Test/Unit/FileGeneratorTest.php | 4 +---
.../Framework/View/Test/Unit/Asset/SourceTest.php | 3 ++-
.../View/Test/Unit/Page/Config/RendererTest.php | 1 +
16 files changed, 40 insertions(+), 24 deletions(-)
diff --git a/app/code/Magento/Developer/Test/Unit/Model/Config/Source/WorkflowTypeTest.php b/app/code/Magento/Developer/Test/Unit/Model/Config/Source/WorkflowTypeTest.php
index 88e5ad2ad70..185d1f84c4c 100644
--- a/app/code/Magento/Developer/Test/Unit/Model/Config/Source/WorkflowTypeTest.php
+++ b/app/code/Magento/Developer/Test/Unit/Model/Config/Source/WorkflowTypeTest.php
@@ -3,7 +3,9 @@
* Copyright © 2015 Magento. All rights reserved.
* See COPYING.txt for license details.
*/
-namespace Magento\Developer\Model\Config\Source;
+namespace Magento\Developer\Test\Unit\Model\Config\Source;
+
+use Magento\Developer\Model\Config\Source\WorkflowType;
/**
* Class WorkflowTypeTest
diff --git a/app/code/Magento/Developer/Test/Unit/Model/VIew/Asset/PreProcessor/DeveloperChainTest.php b/app/code/Magento/Developer/Test/Unit/Model/VIew/Asset/PreProcessor/DeveloperChainTest.php
index f16153904e6..16a9f8a78c4 100644
--- a/app/code/Magento/Developer/Test/Unit/Model/VIew/Asset/PreProcessor/DeveloperChainTest.php
+++ b/app/code/Magento/Developer/Test/Unit/Model/VIew/Asset/PreProcessor/DeveloperChainTest.php
@@ -3,7 +3,7 @@
* Copyright © 2015 Magento. All rights reserved.
* See COPYING.txt for license details.
*/
-namespace Magento\Developer\Test\View\Model\View\Asset\PreProcessor;
+namespace Magento\Developer\Test\Unit\Model\View\Asset\PreProcessor;
use Magento\Framework\View\Asset\LocalInterface;
use Magento\Developer\Model\View\Asset\PreProcessor\DeveloperChain;
diff --git a/dev/tests/static/framework/Magento/Sniffs/Annotations/Helper.php b/dev/tests/static/framework/Magento/Sniffs/Annotations/Helper.php
index 42abd3ab3f4..88e9844a0ad 100644
--- a/dev/tests/static/framework/Magento/Sniffs/Annotations/Helper.php
+++ b/dev/tests/static/framework/Magento/Sniffs/Annotations/Helper.php
@@ -499,6 +499,8 @@ class Helper
} elseif (preg_match('/\\.phtml$/', $filename)) {
// Skip all phtml files
$shouldFilter = true;
+ } elseif (preg_match('#(?:/|\\\\)Test(?:/|\\\\)Unit(?:/|\\\\)#', $filename)) {
+
}
return $shouldFilter;
}
diff --git a/dev/tools/Magento/Tools/Di/Test/Unit/App/CompilerTest.php b/dev/tools/Magento/Tools/Di/Test/Unit/App/CompilerTest.php
index 4160b0f927c..aad0c51d60f 100644
--- a/dev/tools/Magento/Tools/Di/Test/Unit/App/CompilerTest.php
+++ b/dev/tools/Magento/Tools/Di/Test/Unit/App/CompilerTest.php
@@ -3,7 +3,11 @@
* Copyright © 2015 Magento. All rights reserved.
* See COPYING.txt for license details.
*/
-namespace Magento\Tools\Di\App;
+namespace Magento\Tools\Di\Test\Unit\App;
+
+use Magento\Framework\App\Console\Response;
+use Magento\Tools\Di\App\Compiler;
+use Magento\Tools\Di\App\Task;
class CompilerTest extends \PHPUnit_Framework_TestCase
{
@@ -23,7 +27,7 @@ class CompilerTest extends \PHPUnit_Framework_TestCase
private $taskManagerMock;
/**
- * @var \Magento\Framework\App\Console\Response | \PHPUnit_Framework_MockObject_MockObject
+ * @var Response | \PHPUnit_Framework_MockObject_MockObject
*/
private $responseMock;
@@ -62,7 +66,7 @@ class CompilerTest extends \PHPUnit_Framework_TestCase
$this->taskManagerMock->expects($this->at($index))->method('process');
$this->responseMock->expects($this->once())
->method('setCode')
- ->with(\Magento\Framework\App\Console\Response::SUCCESS);
+ ->with(Response::SUCCESS);
$this->assertInstanceOf('\Magento\Framework\App\Console\Response', $this->application->launch());
}
@@ -87,7 +91,7 @@ class CompilerTest extends \PHPUnit_Framework_TestCase
$this->taskManagerMock->expects($this->never())->method('process');
$this->responseMock->expects($this->once())
->method('setCode')
- ->with(\Magento\Framework\App\Console\Response::ERROR);
+ ->with(Response::ERROR);
$this->assertInstanceOf('\Magento\Framework\App\Console\Response', $this->application->launch());
}
diff --git a/dev/tools/Magento/Tools/Di/Test/Unit/App/Task/InterceptionCacheTest.php b/dev/tools/Magento/Tools/Di/Test/Unit/App/Task/InterceptionCacheTest.php
index 7a99c3d19f9..dadc3124934 100644
--- a/dev/tools/Magento/Tools/Di/Test/Unit/App/Task/InterceptionCacheTest.php
+++ b/dev/tools/Magento/Tools/Di/Test/Unit/App/Task/InterceptionCacheTest.php
@@ -3,9 +3,8 @@
* Copyright © 2015 Magento. All rights reserved.
* See COPYING.txt for license details.
*/
-namespace Magento\Tools\Di\App\Task;
+namespace Magento\Tools\Di\Test\Unit\App\Task;
-use Magento\Tools\Di\App\Task\Operation\Interception;
use Magento\Tools\Di\App\Task\Operation\InterceptionCache;
class InterceptionCacheTest extends \PHPUnit_Framework_TestCase
diff --git a/dev/tools/Magento/Tools/Di/Test/Unit/App/Task/OperationFactoryTest.php b/dev/tools/Magento/Tools/Di/Test/Unit/App/Task/OperationFactoryTest.php
index 450f3c187a5..0e9645a9782 100644
--- a/dev/tools/Magento/Tools/Di/Test/Unit/App/Task/OperationFactoryTest.php
+++ b/dev/tools/Magento/Tools/Di/Test/Unit/App/Task/OperationFactoryTest.php
@@ -6,7 +6,10 @@
// @codingStandardsIgnoreFile
-namespace Magento\Tools\Di\App\Task;
+namespace Magento\Tools\Di\Test\Unit\App\Task;
+
+use Magento\Tools\Di\App\Task\OperationFactory;
+use Magento\Tools\Di\App\Task\OperationException;
class OperationFactoryTest extends \PHPUnit_Framework_TestCase
{
diff --git a/dev/tools/Magento/Tools/Di/Test/Unit/Code/Generator/InterceptionConfigurationBuilderTest.php b/dev/tools/Magento/Tools/Di/Test/Unit/Code/Generator/InterceptionConfigurationBuilderTest.php
index c7b69e58ed1..a8196935b92 100644
--- a/dev/tools/Magento/Tools/Di/Test/Unit/Code/Generator/InterceptionConfigurationBuilderTest.php
+++ b/dev/tools/Magento/Tools/Di/Test/Unit/Code/Generator/InterceptionConfigurationBuilderTest.php
@@ -3,7 +3,7 @@
* Copyright © 2015 Magento. All rights reserved.
* See COPYING.txt for license details.
*/
-namespace Magento\Tools\Di\Code\Generator;
+namespace Magento\Tools\Di\Test\Unit\Code\Generator;
use Magento\Framework\App\Interception\Cache\CompiledConfig;
diff --git a/dev/tools/Magento/Tools/Di/Test/Unit/Compiler/Config/Chain/InterceptorSubstitutionTest.php b/dev/tools/Magento/Tools/Di/Test/Unit/Compiler/Config/Chain/InterceptorSubstitutionTest.php
index af2179d4b59..d30437d6eef 100644
--- a/dev/tools/Magento/Tools/Di/Test/Unit/Compiler/Config/Chain/InterceptorSubstitutionTest.php
+++ b/dev/tools/Magento/Tools/Di/Test/Unit/Compiler/Config/Chain/InterceptorSubstitutionTest.php
@@ -3,7 +3,9 @@
* Copyright © 2015 Magento. All rights reserved.
* See COPYING.txt for license details.
*/
-namespace Magento\Tools\Di\Compiler\Config\Chain;
+namespace Magento\Tools\Di\Test\Unit\Compiler\Config\Chain;
+
+use Magento\Tools\Di\Compiler\Config\Chain\InterceptorSubstitution;
class InterceptorSubstitutionTest extends \PHPUnit_Framework_TestCase
{
diff --git a/dev/tools/Magento/Tools/Di/Test/Unit/Compiler/Config/Chain/PreferencesResolvingTest.php b/dev/tools/Magento/Tools/Di/Test/Unit/Compiler/Config/Chain/PreferencesResolvingTest.php
index 3718cbd1a2c..c4cdc2f672e 100644
--- a/dev/tools/Magento/Tools/Di/Test/Unit/Compiler/Config/Chain/PreferencesResolvingTest.php
+++ b/dev/tools/Magento/Tools/Di/Test/Unit/Compiler/Config/Chain/PreferencesResolvingTest.php
@@ -4,7 +4,9 @@
* See COPYING.txt for license details.
*/
-namespace Magento\Tools\Di\Compiler\Config\Chain;
+namespace Magento\Tools\Di\Test\Unit\Compiler\Config\Chain;
+
+use Magento\Tools\Di\Compiler\Config\Chain\PreferencesResolving;
class PreferencesResolvingTest extends \PHPUnit_Framework_TestCase
{
diff --git a/lib/internal/Magento/Framework/App/Test/Unit/ObjectManager/Environment/CompiledTest.php b/lib/internal/Magento/Framework/App/Test/Unit/ObjectManager/Environment/CompiledTest.php
index 33e19db9849..fbd182148fa 100644
--- a/lib/internal/Magento/Framework/App/Test/Unit/ObjectManager/Environment/CompiledTest.php
+++ b/lib/internal/Magento/Framework/App/Test/Unit/ObjectManager/Environment/CompiledTest.php
@@ -3,14 +3,14 @@
* Copyright © 2015 Magento. All rights reserved.
* See COPYING.txt for license details.
*/
-namespace Magento\Framework\Test\Unit\App\ObjectManager\Environment;
+namespace Magento\Framework\App\Test\Unit\ObjectManager\Environment;
-use Magento\Framework\App\Test\Unit\ObjectManager\Environment\CompiledTesting;
+use Magento\Framework\App\ObjectManager\Environment\Compiled;
class CompiledTest extends \PHPUnit_Framework_TestCase
{
/**
- * @var \Magento\Framework\App\ObjectManager\Environment\Compiled
+ * @var Compiled
*/
protected $_compiled;
diff --git a/lib/internal/Magento/Framework/App/Test/Unit/ObjectManager/Environment/DeveloperTest.php b/lib/internal/Magento/Framework/App/Test/Unit/ObjectManager/Environment/DeveloperTest.php
index 55dba66fe2b..c86318181a2 100644
--- a/lib/internal/Magento/Framework/App/Test/Unit/ObjectManager/Environment/DeveloperTest.php
+++ b/lib/internal/Magento/Framework/App/Test/Unit/ObjectManager/Environment/DeveloperTest.php
@@ -3,19 +3,21 @@
* Copyright © 2015 Magento. All rights reserved.
* See COPYING.txt for license details.
*/
-namespace Magento\Framework\App\ObjectManager\Environment;
+namespace Magento\Framework\App\Test\Unit\ObjectManager\Environment;
+
+use Magento\Framework\App\ObjectManager\Environment\Developer;
class DeveloperTest extends \PHPUnit_Framework_TestCase
{
/**
- * @var \Magento\Framework\App\ObjectManager\Environment\Developer
+ * @var Developer
*/
protected $_developer;
protected function setUp()
{
$envFactoryMock = $this->getMock('Magento\Framework\App\EnvironmentFactory', [], [], '', false);
- $this->_developer = new \Magento\Framework\App\ObjectManager\Environment\Developer($envFactoryMock);
+ $this->_developer = new Developer($envFactoryMock);
}
public function testGetMode()
diff --git a/lib/internal/Magento/Framework/Css/Test/Unit/PreProcessor/LessTest.php b/lib/internal/Magento/Framework/Css/Test/Unit/PreProcessor/LessTest.php
index 9d7ca68189c..a889a4320f3 100644
--- a/lib/internal/Magento/Framework/Css/Test/Unit/PreProcessor/LessTest.php
+++ b/lib/internal/Magento/Framework/Css/Test/Unit/PreProcessor/LessTest.php
@@ -3,7 +3,7 @@
* Copyright © 2015 Magento. All rights reserved.
* See COPYING.txt for license details.
*/
-namespace Magento\Framework\Css\PreProcessor;
+namespace Magento\Framework\Css\Test\Unit\PreProcessor;
class LessTest extends \PHPUnit_Framework_TestCase
{
diff --git a/lib/internal/Magento/Framework/Less/FileGenerator.php b/lib/internal/Magento/Framework/Less/FileGenerator.php
index 5d1e199170f..f45d462e7ea 100644
--- a/lib/internal/Magento/Framework/Less/FileGenerator.php
+++ b/lib/internal/Magento/Framework/Less/FileGenerator.php
@@ -99,7 +99,7 @@ class FileGenerator implements SourceFileGeneratorInterface
public function generateFileTree(Chain $chain)
{
/**
- * @bug This logic is duplicated at \Magento\Framework\View\Asset\PreProcessor\Pool::getPreProcessors()
+ * @bug This logic is duplicated at \Magento\Framework\View\Asset\PreProcessor\Pool
* If you need to extend or modify behavior of LESS preprocessing, you must account for both places
*/
diff --git a/lib/internal/Magento/Framework/Less/Test/Unit/FileGeneratorTest.php b/lib/internal/Magento/Framework/Less/Test/Unit/FileGeneratorTest.php
index a249ca827b4..60293981b8f 100644
--- a/lib/internal/Magento/Framework/Less/Test/Unit/FileGeneratorTest.php
+++ b/lib/internal/Magento/Framework/Less/Test/Unit/FileGeneratorTest.php
@@ -6,9 +6,7 @@
// @codingStandardsIgnoreFile
-namespace Magento\Framework\Less;
-
-use Magento\Framework\App\Filesystem\DirectoryList;
+namespace Magento\Framework\Less\Test\Unit;
class FileGeneratorTest extends \PHPUnit_Framework_TestCase
{
diff --git a/lib/internal/Magento/Framework/View/Test/Unit/Asset/SourceTest.php b/lib/internal/Magento/Framework/View/Test/Unit/Asset/SourceTest.php
index 3d5a2b95063..5668a0dde6b 100644
--- a/lib/internal/Magento/Framework/View/Test/Unit/Asset/SourceTest.php
+++ b/lib/internal/Magento/Framework/View/Test/Unit/Asset/SourceTest.php
@@ -6,12 +6,13 @@
// @codingStandardsIgnoreFile
-namespace Magento\Framework\View\Asset;
+namespace Magento\Framework\View\Test\Unit\Asset;
use Magento\Framework\App\Filesystem\DirectoryList;
use Magento\Framework\Filesystem\DriverPool;
use Magento\Framework\View\Asset\PreProcessor\ChainFactoryInterface;
use Magento\Framework\View\Asset\PreProcessor\Chain;
+use Magento\Framework\View\Asset\Source;
/**
* @SuppressWarnings(PHPMD.CouplingBetweenObjects)
diff --git a/lib/internal/Magento/Framework/View/Test/Unit/Page/Config/RendererTest.php b/lib/internal/Magento/Framework/View/Test/Unit/Page/Config/RendererTest.php
index 9d4cc9ffb80..e8779e6c6e5 100644
--- a/lib/internal/Magento/Framework/View/Test/Unit/Page/Config/RendererTest.php
+++ b/lib/internal/Magento/Framework/View/Test/Unit/Page/Config/RendererTest.php
@@ -9,6 +9,7 @@ namespace Magento\Framework\View\Test\Unit\Page\Config;
use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
use Magento\Framework\View\Asset\GroupedCollection;
use Magento\Framework\View\Page\Config\Renderer;
+use Magento\Framework\View\Page\Config\Generator;
/**
* Test for page config renderer model
--
GitLab