Skip to content

Commit 0d11d3d

Browse files
committed
ACP2E-2037: fix unit tests
1 parent 231acd1 commit 0d11d3d

File tree

3 files changed

+19
-5
lines changed

3 files changed

+19
-5
lines changed

app/code/Magento/Eav/Model/Attribute/Data/Text.php

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -92,10 +92,10 @@ public function validateValue($value)
9292
return $errors;
9393
}
9494

95-
if (isset($this->allowDiacriticsForAttributes[$this->getAttribute()->getEntityType()->getEntityTypeCode()])
95+
if (isset($this->allowDiacriticsForAttributes[$attribute->getEntityType()->getEntityTypeCode()])
9696
&& in_array(
97-
$this->getAttribute()->getAttributeCode(),
98-
$this->allowDiacriticsForAttributes[$this->getAttribute()->getEntityType()->getEntityTypeCode()]
97+
$attribute->getAttributeCode(),
98+
$this->allowDiacriticsForAttributes[$attribute->getEntityType()->getEntityTypeCode()]
9999
)) {
100100
// if string with diacritics encode it.
101101
$value = $this->encodeDiacritics($value);

app/code/Magento/Eav/Test/Unit/Model/Attribute/Data/MultilineTest.php

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,8 @@
1010
use Magento\Eav\Model\Attribute;
1111
use Magento\Eav\Model\Attribute\Data\Multiline;
1212
use Magento\Eav\Model\AttributeDataFactory;
13+
use Magento\Eav\Model\Entity\Attribute\AbstractAttribute;
14+
use Magento\Eav\Model\Entity\Type;
1315
use Magento\Framework\App\RequestInterface;
1416
use Magento\Framework\Locale\ResolverInterface;
1517
use Magento\Framework\Model\AbstractModel;
@@ -109,7 +111,6 @@ public function testOutputValue($format, $expectedResult)
109111

110112
/** @var MockObject|Attribute $attributeMock */
111113
$attributeMock = $this->createMock(Attribute::class);
112-
113114
$this->model->setEntity($entityMock);
114115
$this->model->setAttribute($attributeMock);
115116
$this->assertEquals($expectedResult, $this->model->outputValue($format));
@@ -158,6 +159,8 @@ public function testValidateValue($value, $isAttributeRequired, $rules, $expecte
158159
->method('getDataUsingMethod')
159160
->willReturn("value1\nvalue2");
160161

162+
$entityTypeMock = $this->createMock(Type::class);
163+
161164
/** @var MockObject|Attribute $attributeMock */
162165
$attributeMock = $this->createMock(Attribute::class);
163166
$attributeMock->expects($this->any())->method('getMultilineCount')->willReturn(2);
@@ -170,6 +173,10 @@ public function testValidateValue($value, $isAttributeRequired, $rules, $expecte
170173
->method('getIsRequired')
171174
->willReturn($isAttributeRequired);
172175

176+
$attributeMock->expects($this->any())
177+
->method('getEntityType')
178+
->willReturn($entityTypeMock);
179+
173180
$this->stringMock->expects($this->any())->method('strlen')->willReturn(5);
174181

175182
$this->model->setEntity($entityMock);

app/code/Magento/Eav/Test/Unit/Model/Attribute/Data/TextTest.php

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@
1010
use Magento\Eav\Model\Attribute;
1111
use Magento\Eav\Model\Attribute\Data\Text;
1212
use Magento\Eav\Model\Entity\Attribute\AbstractAttribute;
13+
use Magento\Eav\Model\Entity\Type;
1314
use Magento\Eav\Model\Entity\TypeFactory;
1415
use Magento\Framework\Exception\LocalizedException;
1516
use Magento\Framework\Locale\ResolverInterface;
@@ -223,12 +224,18 @@ protected function createAttribute($attributeData): AbstractAttribute
223224
['eavTypeFactory' => $eavTypeFactory, 'data' => $attributeData]
224225
);
225226

227+
$entityTypeMock = $this->createMock(Type::class);
228+
226229
/** @var \Magento\Eav\Model\Entity\Attribute\AbstractAttribute|MockObject $attribute
227230
*/
228231
$attribute = $this->getMockBuilder($attributeClass)
229-
->setMethods(['_init'])
232+
->onlyMethods(['_init', 'getEntityType'])
230233
->setConstructorArgs($arguments)
231234
->getMock();
235+
236+
$attribute->expects($this->any())
237+
->method('getEntityType')
238+
->willReturn($entityTypeMock);
232239
return $attribute;
233240
}
234241
}

0 commit comments

Comments
 (0)