Merge remote-tracking branch 'remotes/tango-ce/MAGETWO-33853' into MAGETWO-33812

Author: Yuri Kovsher

dev/tests/unit/testsuite/Magento/Framework/View/Layout/Reader/PoolTest.php renamed to dev/tests/unit/testsuite/Magento/Framework/View/Layout/ReaderPoolTest.php

@@ -4,11 +4,11 @@
  * See COPYING.txt for license details.
  */
 
-namespace Magento\Framework\View\Layout\Reader;
+namespace Magento\Framework\View\Layout;
 
 use Magento\TestFramework\Helper\ObjectManager as ObjectManagerHelper;
 
-class PoolTest extends \PHPUnit_Framework_TestCase
+class ReaderPoolTest extends \PHPUnit_Framework_TestCase
 {
     /** @var ObjectManagerHelper */
     protected $objectManagerHelper;
@@ -39,7 +39,7 @@ protected function setUp()
 
     public function testInterpret()
     {
-        /** @var Context $contextMock */
+        /** @var Reader\Context $contextMock */
         $contextMock = $this->getMockBuilder('Magento\Framework\View\Layout\Reader\Context')
             ->disableOriginalConstructor()->getMock();
 
@@ -52,7 +52,7 @@ public function testInterpret()
          */
         $moveReaderMock = $this->getMockBuilder('Magento\Framework\View\Layout\Reader\Move')
             ->disableOriginalConstructor()->getMock();
-        $moveReaderMock->expects($this->once())->method('interpret')
+        $moveReaderMock->expects($this->exactly(2))->method('interpret')
             ->willReturn($this->returnSelf());
         $moveReaderMock->method('getSupportedNodes')
             ->willReturn(['move']);
@@ -62,13 +62,13 @@ public function testInterpret()
          */
         $removeReaderMock = $this->getMockBuilder('Magento\Framework\View\Layout\Reader\Remove')
             ->disableOriginalConstructor()->getMock();
-        $removeReaderMock->expects($this->once())->method('interpret')
+        $removeReaderMock->expects($this->exactly(2))->method('interpret')
             ->with()
             ->willReturn($this->returnSelf());
         $removeReaderMock->method('getSupportedNodes')
             ->willReturn(['remove']);
 
-        $this->readerFactoryMock->expects($this->any())
+        $this->readerFactoryMock->expects($this->exactly(2))
             ->method('create')
             ->will($this->returnValueMap(
                 [
@@ -78,5 +78,6 @@ public function testInterpret()
             ));
 
         $this->pool->interpret($contextMock, $currentElement);
+        $this->pool->interpret($contextMock, $currentElement);
     }
 }

lib/internal/Magento/Framework/View/Layout/ReaderPool.php

@@ -75,10 +75,12 @@ public function getSupportedNodes()
      */
     protected function prepareReader($readers)
     {
-        /** @var $reader Layout\ReaderInterface */
-        foreach ($readers as $readerClass) {
-            $reader = $this->readerFactory->create($readerClass);
-            $this->addReader($reader);
+        if (empty($this->nodeReaders)) {
+            /** @var $reader Layout\ReaderInterface */
+            foreach ($readers as $readerClass) {
+                $reader = $this->readerFactory->create($readerClass);
+                $this->addReader($reader);
+            }
         }
     }