Skip to content

Commit 1b6f6e6

Browse files
author
Yurii Torbyk
committed
MAGETWO-35561: Stabilize story
1 parent a2adf9d commit 1b6f6e6

File tree

1 file changed

+27
-9
lines changed

1 file changed

+27
-9
lines changed

dev/tests/integration/testsuite/Magento/Framework/TranslateCachingTest.php

Lines changed: 27 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -6,14 +6,33 @@
66
namespace Magento\Framework;
77

88
use Magento\TestFramework\Helper\Bootstrap;
9+
use Magento\Framework\Phrase;
910

1011
class TranslateCachingTest extends \PHPUnit_Framework_TestCase
1112
{
12-
public static function tearDownAfterClass()
13+
/**
14+
* @var \Magento\Framework\Phrase\RendererInterface
15+
*/
16+
protected $renderer;
17+
18+
/**
19+
* @var \Magento\Framework\ObjectManagerInterface
20+
*/
21+
protected $objectManager;
22+
23+
protected function setUp()
1324
{
14-
$objectManager = Bootstrap::getObjectManager();
25+
$this->objectManager = Bootstrap::getObjectManager();
26+
$this->renderer = Phrase::getRenderer();
27+
Phrase::setRenderer($this->objectManager->get('\Magento\Framework\Phrase\RendererInterface'));
28+
}
29+
30+
protected function tearDown()
31+
{
32+
Phrase::setRenderer($this->renderer);
33+
1534
/** @var \Magento\Framework\App\Cache\Type\Translate $cache */
16-
$cache = $objectManager->get('Magento\Framework\App\Cache\Type\Translate');
35+
$cache = $this->objectManager->get('Magento\Framework\App\Cache\Type\Translate');
1736
$cache->clean();
1837
}
1938

@@ -22,27 +41,26 @@ public static function tearDownAfterClass()
2241
*/
2342
public function testLoadDataCaching()
2443
{
25-
$objectManager = Bootstrap::getObjectManager();
2644
/** @var \Magento\Framework\Translate $model */
27-
$model = $objectManager->get('Magento\Framework\Translate');
45+
$model = $this->objectManager->get('Magento\Framework\Translate');
2846

2947
$model->loadData(\Magento\Framework\App\Area::AREA_FRONTEND); // this is supposed to cache the fixture
30-
$this->assertEquals('Fixture Db Translation', new \Magento\Framework\Phrase('Fixture String'));
48+
$this->assertEquals('Fixture Db Translation', new Phrase('Fixture String'));
3149

3250
/** @var \Magento\Translation\Model\Resource\String $translateString */
33-
$translateString = $objectManager->create('Magento\Translation\Model\Resource\String');
51+
$translateString = $this->objectManager->create('Magento\Translation\Model\Resource\String');
3452
$translateString->saveTranslate('Fixture String', 'New Db Translation');
3553

3654
$this->assertEquals(
3755
'Fixture Db Translation',
38-
new \Magento\Framework\Phrase('Fixture String'),
56+
new Phrase('Fixture String'),
3957
'Translation is expected to be cached'
4058
);
4159

4260
$model->loadData(\Magento\Framework\App\Area::AREA_FRONTEND, true);
4361
$this->assertEquals(
4462
'New Db Translation',
45-
new \Magento\Framework\Phrase('Fixture String'),
63+
new Phrase('Fixture String'),
4664
'Forced load should not use cache'
4765
);
4866
}

0 commit comments

Comments
 (0)