Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add tests for View\Layout\Reader\Block and slight refactoring #906

Merged
merged 1 commit into from
Jan 20, 2015
Merged

Add tests for View\Layout\Reader\Block and slight refactoring #906

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
91 changes: 91 additions & 0 deletions dev/tests/integration/testsuite/Magento/Framework/View/Layout/Reader/BlockTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,91 @@
<?php

namespace Magento\Framework\View\Layout\Reader;

class BlockTest extends \PHPUnit_Framework_TestCase
{
const IDX_TYPE = 0;
const IDX_PARENT = 2;

/**
* @var Block
*/
private $block;

/**
* @var Context
*/
private $readerContext;

private $blockName = 'test.block';
private $childBlockName = 'test.child.block';

public function setUp()
{
$this->block = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->create(
'Magento\Framework\View\Layout\Reader\Block'
);

$this->readerContext = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->create(
'Magento\Framework\View\Layout\Reader\Context'
);
}

public function testInterpretBlockDirective()
{
$pageXml = new \Magento\Framework\View\Layout\Element(__DIR__ . '/_files/_layout_update_block.xml', 0, true);
$parentElement = new \Magento\Framework\View\Layout\Element('<page></page>');

foreach ($pageXml->xpath('body/block') as $blockElement) {
$this->assertTrue(in_array($blockElement->getName(), $this->block->getSupportedNodes()));

$this->block->interpret($this->readerContext, $blockElement, $parentElement);
}

$structure = $this->readerContext->getScheduledStructure();
$this->assertArrayHasKey($this->blockName, $structure->getStructure());
$this->assertEquals('block', $structure->getStructure()[$this->blockName][self::IDX_TYPE]);

$resultElementData = $structure->getStructureElementData($this->blockName);

$this->assertEquals(
['group' => 'test.group', 'class' => 'Dummy\Class', 'template' => 'test.phtml', 'ttl' => 3],
$resultElementData['attributes']
);
$this->assertEquals(
['test_arg' => ['name' => 'test_arg', 'xsi:type' => 'string', 'value' => 'test-argument-value']],
$resultElementData['arguments']
);

$this->assertEquals('block', $structure->getStructure()[$this->childBlockName][self::IDX_TYPE]);
$this->assertEquals($this->blockName, $structure->getStructure()[$this->childBlockName][self::IDX_PARENT]);
}

/**
* @depends testInterpretBlockDirective
*/
public function testInterpretReferenceBlockDirective()
{
$pageXml = new \Magento\Framework\View\Layout\Element(
__DIR__ . '/_files/_layout_update_reference.xml', 0, true
);
$parentElement = new \Magento\Framework\View\Layout\Element('<page></page>');

foreach ($pageXml->xpath('body/*') as $element) {
$this->assertTrue(in_array($element->getName(), $this->block->getSupportedNodes()));

$this->block->interpret($this->readerContext, $element, $parentElement);
}

$structure = $this->readerContext->getScheduledStructure();
$this->assertArrayHasKey($this->blockName, $structure->getStructure());
$this->assertEquals('block', $structure->getStructure()[$this->blockName][self::IDX_TYPE]);

$resultElementData = $structure->getStructureElementData($this->blockName);

$this->assertEquals(
['test_arg' => ['name' => 'test_arg', 'xsi:type' => 'string', 'value' => 'test-argument-value']],
$resultElementData['arguments']
);
}
}
16 changes: 16 additions & 0 deletions ...ntegration/testsuite/Magento/Framework/View/Layout/Reader/_files/_layout_update_block.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
<?xml version="1.0"?>
<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:noNamespaceSchemaLocation="../../../../../../../../../../lib/internal/Magento/Framework/View/Layout/etc/page_configuration.xsd">
<body>
<block class="Dummy\Class"
name="test.block"
group="test.group"
template="test.phtml"
ttl="3">
<arguments>
<argument name="test_arg" xsi:type="string">test-argument-value</argument>
</arguments>
<block class="Dummy\Class" name="test.child.block"/>
</block>
</body>
</page>
12 changes: 12 additions & 0 deletions ...ration/testsuite/Magento/Framework/View/Layout/Reader/_files/_layout_update_reference.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
<?xml version="1.0"?>
<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:noNamespaceSchemaLocation="../../../../../../../../../../lib/internal/Magento/Framework/View/Layout/etc/page_configuration.xsd">
<body>
<block class="Dummy\Class" name="test.block"/>
<referenceBlock name="test.block">
<arguments>
<argument name="test_arg" xsi:type="string">test-argument-value</argument>
</arguments>
</referenceBlock>
</body>
</page>
5 changes: 3 additions & 2 deletions lib/internal/Magento/Framework/View/Layout/Reader/Block.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -120,7 +120,8 @@ public function interpret(Context $readerContext, Layout\Element $currentElement
default:
break;
}
return $this->readerPool->interpret($readerContext, $currentElement);
$this->readerPool->interpret($readerContext, $currentElement);
return $this;
}

/**
Expand Down Expand Up @@ -173,7 +174,7 @@ protected function scheduleReference(
* Update data for scheduled element
*
* @param Layout\Element $currentElement
* @param array $data
* @param array &$data
* @return array
*/
protected function updateScheduledData($currentElement, array &$data)
Expand Down