Skip to content

Commit b8b1c4e

Browse files
committed
MAGETWO-37481: Static method calls and properties assignment in unit tests
- Added changes to catch runtime exception when object manager is not initialized
1 parent 458eee8 commit b8b1c4e

File tree

3 files changed

+21
-3
lines changed

3 files changed

+21
-3
lines changed

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

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,13 @@ protected function setUp()
5959
->method('get')
6060
->with('Magento\Email\Model\Resource\Template')
6161
->will($this->returnValue($this->resourceModelMock));
62-
$this->objectManagerBackup = \Magento\Framework\App\ObjectManager::getInstance();
62+
63+
try {
64+
$this->objectManagerBackup = \Magento\Framework\App\ObjectManager::getInstance();
65+
} catch (\RuntimeException $e) {
66+
$this->objectManagerBackup = \Magento\Framework\App\Bootstrap::createObjectManagerFactory(BP, $_SERVER)
67+
->create($_SERVER);
68+
}
6369
\Magento\Framework\App\ObjectManager::setInstance($objectManagerMock);
6470

6571
$this->model = $helper->getObject(

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

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,13 @@ public function setUp()
4343
->method('get')
4444
->with('Magento\Email\Model\Resource\Template')
4545
->will($this->returnValue($objectManagerHelper->getObject('Magento\Email\Model\Resource\Template')));
46-
$this->objectManagerBackup = \Magento\Framework\App\ObjectManager::getInstance();
46+
47+
try {
48+
$this->objectManagerBackup = \Magento\Framework\App\ObjectManager::getInstance();
49+
} catch (\RuntimeException $e) {
50+
$this->objectManagerBackup = \Magento\Framework\App\Bootstrap::createObjectManagerFactory(BP, $_SERVER)
51+
->create($_SERVER);
52+
}
4753
\Magento\Framework\App\ObjectManager::setInstance($objectManagerMock);
4854

4955
$this->template = $objectManagerHelper->getObject(

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

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,13 @@ protected function setUp()
8080
->will($this->returnValue($this->selectMock));
8181

8282
$this->objectManagerMock = $this->getMock('Magento\Framework\App\ObjectManager', [], [], '', false);
83-
$this->objectManagerBackup = \Magento\Framework\App\ObjectManager::getInstance();
83+
84+
try {
85+
$this->objectManagerBackup = \Magento\Framework\App\ObjectManager::getInstance();
86+
} catch (\RuntimeException $e) {
87+
$this->objectManagerBackup = \Magento\Framework\App\Bootstrap::createObjectManagerFactory(BP, $_SERVER)
88+
->create($_SERVER);
89+
}
8490
\Magento\Framework\App\ObjectManager::setInstance($this->objectManagerMock);
8591

8692
$this->objectManagerHelper = new ObjectManagerHelper($this);

0 commit comments

Comments
 (0)