Skip to content

Commit e1604d4

Browse files
author
Ji Lu
committed
MAGETWO-36450: Set placeholder as default render for \Magento\Framework\Phrase if no renderer is set.
1 parent eca2e2c commit e1604d4

File tree

1 file changed

+31
-6
lines changed

1 file changed

+31
-6
lines changed

lib/internal/Magento/Framework/Test/Unit/PhraseTest.php

Lines changed: 31 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,11 @@ class PhraseTest extends \PHPUnit_Framework_TestCase
1919
*/
2020
protected $rendererMock;
2121

22+
/**
23+
* @var \Magento\Framework\TestFramework\Unit\Helper\ObjectManager
24+
*/
25+
protected $objectManager;
26+
2227
/**
2328
* SetUp method
2429
*
@@ -29,6 +34,7 @@ protected function setUp()
2934
$this->defaultRenderer = Phrase::getRenderer();
3035
$this->rendererMock = $this->getMockBuilder('Magento\Framework\Phrase\RendererInterface')
3136
->getMock();
37+
$this->objectManager = new \Magento\Framework\TestFramework\Unit\Helper\ObjectManager($this);
3238
}
3339

3440
/**
@@ -51,7 +57,10 @@ public function testRendering()
5157
$text = 'some text';
5258
$arguments = ['arg1', 'arg2'];
5359
$result = 'rendered text';
54-
$phrase = new Phrase($text, $arguments);
60+
$phrase = $this->objectManager->getObject('Magento\Framework\Phrase', [
61+
'text' => $text,
62+
'arguments' => $arguments,
63+
]);
5564
Phrase::setRenderer($this->rendererMock);
5665

5766
$this->rendererMock->expects($this->once())
@@ -72,7 +81,9 @@ public function testDefersRendering()
7281
$this->rendererMock->expects($this->never())
7382
->method('render');
7483

75-
new Phrase('some text');
84+
$this->objectManager->getObject('Magento\Framework\Phrase', [
85+
'text' => 'some text',
86+
]);
7687
}
7788

7889
/**
@@ -85,7 +96,10 @@ public function testThatToStringIsAliasToRender()
8596
$text = 'some text';
8697
$arguments = ['arg1', 'arg2'];
8798
$result = 'rendered text';
88-
$phrase = new Phrase($text, $arguments);
99+
$phrase = $this->objectManager->getObject('Magento\Framework\Phrase', [
100+
'text' => $text,
101+
'arguments' => $arguments,
102+
]);
89103
Phrase::setRenderer($this->rendererMock);
90104

91105
$this->rendererMock->expects($this->once())
@@ -105,6 +119,9 @@ public function testGetText()
105119
{
106120
$text = 'some text';
107121
$phrase = new Phrase($text);
122+
$phrase = $this->objectManager->getObject('Magento\Framework\Phrase', [
123+
'text' => $text,
124+
]);
108125

109126
$this->assertEquals($text, $phrase->getText());
110127
}
@@ -118,8 +135,13 @@ public function testGetArguments()
118135
{
119136
$text = 'some text';
120137
$arguments = ['arg1', 'arg2'];
121-
$phrase1 = new Phrase($text);
122-
$phrase2 = new Phrase($text, $arguments);
138+
$phrase1 = $this->objectManager->getObject('Magento\Framework\Phrase', [
139+
'text' => $text,
140+
]);
141+
$phrase2 = $this->objectManager->getObject('Magento\Framework\Phrase', [
142+
'text' => $text,
143+
'arguments' => $arguments,
144+
]);
123145

124146
$this->assertEquals([], $phrase1->getArguments());
125147
$this->assertEquals($arguments, $phrase2->getArguments());
@@ -135,7 +157,10 @@ public function testDefaultRendering()
135157
$text = 'parameter1 is replaced by %1 parameter2 is replaced by %2';
136158
$arguments = ['arg1', 'arg2'];
137159
$result = 'parameter1 is replaced by arg1 parameter2 is replaced by arg2';
138-
$phrase = new Phrase($text, $arguments);
160+
$phrase = $this->objectManager->getObject('Magento\Framework\Phrase', [
161+
'text' => $text,
162+
'arguments' => $arguments,
163+
]);
139164

140165
$this->assertEquals($text, $phrase->getText());
141166
$this->assertEquals($arguments, $phrase->getArguments());

0 commit comments

Comments
 (0)