Skip to content

Commit 99d8542

Browse files
author
Oleksii Korshenko
committed
MAGETWO-70866: Enabling the use of looping (for in ..) into Template.php #9401
- reverted code shuffling
1 parent 7680729 commit 99d8542

File tree

2 files changed

+182
-179
lines changed

2 files changed

+182
-179
lines changed

dev/tests/integration/testsuite/Magento/Framework/Filter/TemplateTest.php

Lines changed: 4 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -3,23 +3,19 @@
33
* Copyright © 2013-2017 Magento, Inc. All rights reserved.
44
* See COPYING.txt for license details.
55
*/
6+
67
namespace Magento\Framework\Filter;
78

8-
/**
9-
* Class TemplateTest
10-
* @package Magento\Framework\Filter
11-
*/
129
class TemplateTest extends \PHPUnit_Framework_TestCase
1310
{
1411
/**
15-
* @var \Magento\Framework\Filter\Template
12+
* @var Template
1613
*/
1714
private $templateFilter;
1815

1916
protected function setUp()
2017
{
21-
$objectManager = new \Magento\Framework\TestFramework\Unit\Helper\ObjectManager($this);
22-
$this->templateFilter = $objectManager->getObject('Magento\Framework\Filter\Template');
18+
$this->templateFilter = \Magento\TestFramework\ObjectManager::getInstance()->create(Template::class);
2319
}
2420

2521
/**
@@ -29,10 +25,8 @@ protected function setUp()
2925
*/
3026
public function testFilterFor($results, $values)
3127
{
32-
33-
$this->templateFilter->setVariables(array('order' => $this->getOrder(), 'things' => $this->getThings()));
28+
$this->templateFilter->setVariables(['order' => $this->getOrder(), 'things' => $this->getThings()]);
3429
$this->assertEquals($results, $this->invokeMethod($this->templateFilter, 'filterFor', [$values]));
35-
3630
}
3731

3832
/**
@@ -41,7 +35,6 @@ public function testFilterFor($results, $values)
4135
private function getOrder()
4236
{
4337
$order = new \Magento\Framework\DataObject();
44-
4538
$visibleItems = [
4639
[
4740
'sku' => 'ABC123',
@@ -50,10 +43,8 @@ private function getOrder()
5043
'ordered_qty' => '2'
5144
]
5245
];
53-
5446
$order->setAllVisibleItems($visibleItems);
5547
return $order;
56-
5748
}
5849

5950
public function getThings()
@@ -130,7 +121,6 @@ public function getFilterForDataProvider()
130121
];
131122
}
132123

133-
134124
/**
135125
* Call protected/private method of a class.
136126
*
@@ -145,7 +135,6 @@ private function invokeMethod(&$object, $methodName, array $parameters = [])
145135
$reflection = new \ReflectionClass(get_class($object));
146136
$method = $reflection->getMethod($methodName);
147137
$method->setAccessible(true);
148-
149138
return $method->invokeArgs($object, $parameters);
150139
}
151140
}

0 commit comments

Comments
 (0)