Merge remote-tracking branch 'origin/MAGETWO-37481-Static-Method-Calls-And-Properties' into develop

Author: marcozheng

app/code/Magento/Email/Test/Unit/Model/BackendTemplateTest.php

@@ -37,6 +37,11 @@ class BackendTemplateTest extends \PHPUnit_Framework_TestCase
      */
     protected $resourceModelMock;
 
+    /**
+     * @var \Magento\Framework\App\ObjectManager
+     */
+    protected $objectManagerBackup;
+
     protected function setUp()
     {
         $helper = new \Magento\Framework\TestFramework\Unit\Helper\ObjectManager($this);
@@ -54,6 +59,7 @@ protected function setUp()
             ->method('get')
             ->with('Magento\Email\Model\Resource\Template')
             ->will($this->returnValue($this->resourceModelMock));
+        $this->objectManagerBackup = \Magento\Framework\App\ObjectManager::getInstance();
         \Magento\Framework\App\ObjectManager::setInstance($objectManagerMock);
 
         $this->model = $helper->getObject(
@@ -62,6 +68,12 @@ protected function setUp()
         );
     }
 
+    protected function tearDown()
+    {
+        parent::tearDown();
+        \Magento\Framework\App\ObjectManager::setInstance($this->objectManagerBackup);
+    }
+
     public function testGetSystemConfigPathsWhereUsedAsDefaultNoTemplateCode()
     {
         $this->assertEquals([], $this->model->getSystemConfigPathsWhereUsedAsDefault());

app/code/Magento/Sales/Test/Unit/Model/Email/TemplateTest.php

@@ -25,6 +25,11 @@ class TemplateTest extends \PHPUnit_Framework_TestCase
      */
     private $mockViewFilesystem;
 
+    /**
+     * @var \Magento\Framework\App\ObjectManager
+     */
+    protected $objectManagerBackup;
+
     public function setUp()
     {
         $this->mockViewFilesystem = $this->getMockBuilder('\Magento\Framework\View\FileSystem')
@@ -38,6 +43,7 @@ public function setUp()
             ->method('get')
             ->with('Magento\Email\Model\Resource\Template')
             ->will($this->returnValue($objectManagerHelper->getObject('Magento\Email\Model\Resource\Template')));
+        $this->objectManagerBackup = \Magento\Framework\App\ObjectManager::getInstance();
         \Magento\Framework\App\ObjectManager::setInstance($objectManagerMock);
 
         $this->template = $objectManagerHelper->getObject(
@@ -51,9 +57,7 @@ public function setUp()
     protected function tearDown()
     {
         parent::tearDown();
-        $magentoObjectManagerFactory = \Magento\Framework\App\Bootstrap::createObjectManagerFactory(BP, $_SERVER);
-        $objectManager = $magentoObjectManagerFactory->create($_SERVER);
-        \Magento\Framework\App\ObjectManager::setInstance($objectManager);
+        \Magento\Framework\App\ObjectManager::setInstance($this->objectManagerBackup);
     }
 
     public function testIncludeTemplate()

lib/internal/Magento/Framework/Model/Test/Unit/Resource/Db/Collection/AbstractCollectionTest.php

@@ -49,6 +49,11 @@ class AbstractCollectionTest extends \PHPUnit_Framework_TestCase
     /** @var \Magento\Framework\App\ObjectManager|\PHPUnit_Framework_MockObject_MockObject */
     protected $objectManagerMock;
 
+    /**
+     * @var \Magento\Framework\App\ObjectManager
+     */
+    protected $objectManagerBackup;
+
     protected function setUp()
     {
         $this->entityFactoryMock = $this->getMock('Magento\Framework\Data\Collection\EntityFactoryInterface');
@@ -75,6 +80,7 @@ protected function setUp()
             ->will($this->returnValue($this->selectMock));
 
         $this->objectManagerMock = $this->getMock('Magento\Framework\App\ObjectManager', [], [], '', false);
+        $this->objectManagerBackup = \Magento\Framework\App\ObjectManager::getInstance();
         \Magento\Framework\App\ObjectManager::setInstance($this->objectManagerMock);
 
         $this->objectManagerHelper = new ObjectManagerHelper($this);
@@ -84,9 +90,7 @@ protected function setUp()
     protected function tearDown()
     {
         parent::tearDown();
-        $magentoObjectManagerFactory = \Magento\Framework\App\Bootstrap::createObjectManagerFactory(BP, $_SERVER);
-        $objectManager = $magentoObjectManagerFactory->create($_SERVER);
-        \Magento\Framework\App\ObjectManager::setInstance($objectManager);
+        \Magento\Framework\App\ObjectManager::setInstance($this->objectManagerBackup);
     }
 
     protected function getUut()