MAGETWO-32829: [GITHUB] Add tests for View\Layout\Reader\Block and slight refactoring #906

vpelipenko · vpelipenko · commit ee882bfe47ae · 2015-01-20T13:21:05.000+02:00
- fixed code style and added lost copyright blocks
diff --git a/dev/tests/integration/testsuite/Magento/Framework/View/Layout/Reader/BlockTest.php b/dev/tests/integration/testsuite/Magento/Framework/View/Layout/Reader/BlockTest.php
@@ -1,5 +1,8 @@
 <?php
-
+/**
+ * Copyright © 2015 Magento. All rights reserved.
+ * See COPYING.txt for license details.
+ */
 namespace Magento\Framework\View\Layout\Reader;
 
 class BlockTest extends \PHPUnit_Framework_TestCase
@@ -17,28 +20,35 @@ class BlockTest extends \PHPUnit_Framework_TestCase
      */
     private $readerContext;
 
+    /**
+     * @var string
+     */
     private $blockName = 'test.block';
+
+    /**
+     * @var string
+     */
     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);
+        $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);
         }
 
@@ -73,7 +83,6 @@ public function testInterpretReferenceBlockDirective()
 
         foreach ($pageXml->xpath('body/*') as $element) {
             $this->assertTrue(in_array($element->getName(), $this->block->getSupportedNodes()));
-
             $this->block->interpret($this->readerContext, $element, $parentElement);
         }
 
@@ -88,4 +97,4 @@ public function testInterpretReferenceBlockDirective()
             $resultElementData['arguments']
         );
     }
-} 
+}
diff --git a/dev/tests/integration/testsuite/Magento/Framework/View/Layout/Reader/_files/_layout_update_block.xml b/dev/tests/integration/testsuite/Magento/Framework/View/Layout/Reader/_files/_layout_update_block.xml
@@ -1,12 +1,13 @@
 <?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">
+<!--
+/**
+ * Copyright © 2015 Magento. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+-->
+<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">
+        <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>
diff --git a/dev/tests/integration/testsuite/Magento/Framework/View/Layout/Reader/_files/_layout_update_reference.xml b/dev/tests/integration/testsuite/Magento/Framework/View/Layout/Reader/_files/_layout_update_reference.xml
@@ -1,6 +1,11 @@
 <?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">
+<!--
+/**
+ * Copyright © 2015 Magento. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+-->
+<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">
