From 41a87dd8afcb15a34da4cf661bc60cc15ff6e4e2 Mon Sep 17 00:00:00 2001
From: Dmytro Kvashnin <dkvashnin@ebay.com>
Date: Tue, 17 Mar 2015 15:50:32 +0200
Subject: [PATCH] MAGETWO-33631: Advanced Developer Workflow
- fixed integration test
---
.../Framework/Interception/AbstractPlugin.php | 31 +++++++------------
1 file changed, 11 insertions(+), 20 deletions(-)
diff --git a/dev/tests/integration/testsuite/Magento/Framework/Interception/AbstractPlugin.php b/dev/tests/integration/testsuite/Magento/Framework/Interception/AbstractPlugin.php
index 1945049d807..217d35cbc48 100644
--- a/dev/tests/integration/testsuite/Magento/Framework/Interception/AbstractPlugin.php
+++ b/dev/tests/integration/testsuite/Magento/Framework/Interception/AbstractPlugin.php
@@ -5,15 +5,6 @@
*/
namespace Magento\Framework\Interception;
-use Magento\Framework\App;
-use Magento\Framework\Config\Scope;
-use Magento\Framework\Interception\ObjectManager\Config\Developer;
-use Magento\Framework\ObjectManager\Definition;
-use Magento\Framework\ObjectManager\Factory\Dynamic\Developer as DeveloperFactory;
-use Magento\Framework\ObjectManager\ObjectManager;
-use Magento\Framework\ObjectManager\Relations;
-use Magento\Framework\ObjectManagerInterface;
-
/**
* Class GeneralTest
* @SuppressWarnings(PHPMD.CouplingBetweenObjects)
@@ -26,12 +17,12 @@ abstract class AbstractPlugin extends \PHPUnit_Framework_TestCase
protected $_configReader;
/**
- * @var ObjectManagerInterface
+ * @var \Magento\Framework\ObjectManagerInterface
*/
protected $_objectManager;
/**
- * @var ObjectManagerInterface
+ * @var \Magento\Framework\ObjectManagerInterface
*/
private $applicationObjectManager;
@@ -41,19 +32,19 @@ abstract class AbstractPlugin extends \PHPUnit_Framework_TestCase
return;
}
- $this->applicationObjectManager = App\ObjectManager::getInstance();
- App\ObjectManager::setInstance($this->_objectManager);
+ $this->applicationObjectManager = \Magento\Framework\App\ObjectManager::getInstance();
+ \Magento\Framework\App\ObjectManager::setInstance($this->_objectManager);
}
public function tearDown()
{
- App\ObjectManager::setInstance($this->applicationObjectManager);
+ \Magento\Framework\App\ObjectManager::setInstance($this->applicationObjectManager);
}
public function setUpInterceptionConfig($pluginConfig)
{
- $config = new Developer();
- $factory = new DeveloperFactory($config, null);
+ $config = new \Magento\Framework\Interception\ObjectManager\Config\Developer();
+ $factory = new \Magento\Framework\ObjectManager\Factory\Dynamic\Developer($config, null);
$this->_configReader = $this->getMock('Magento\Framework\Config\ReaderInterface');
$this->_configReader->expects(
@@ -66,11 +57,11 @@ abstract class AbstractPlugin extends \PHPUnit_Framework_TestCase
$areaList = $this->getMock('Magento\Framework\App\AreaList', [], [], '', false);
$areaList->expects($this->any())->method('getCodes')->will($this->returnValue([]));
- $configScope = new Scope($areaList, 'global');
+ $configScope = new \Magento\Framework\Config\Scope($areaList, 'global');
$cache = $this->getMock('Magento\Framework\Config\CacheInterface');
$cache->expects($this->any())->method('load')->will($this->returnValue(false));
- $definitions = new Definition\Runtime();
- $relations = new Relations\Runtime();
+ $definitions = new \Magento\Framework\ObjectManager\Definition\Runtime();
+ $relations = new \Magento\Framework\ObjectManager\Relations\Runtime();
$interceptionConfig = new Config\Config(
$this->_configReader,
$configScope,
@@ -90,7 +81,7 @@ abstract class AbstractPlugin extends \PHPUnit_Framework_TestCase
'Magento\Framework\ObjectManager\DefinitionInterface' => $definitions,
'Magento\Framework\Interception\DefinitionInterface' => $interceptionDefinitions
];
- $this->_objectManager = new ObjectManager(
+ $this->_objectManager = new \Magento\Framework\ObjectManager\ObjectManager(
$factory,
$config,
$sharedInstances
--
GitLab