MAGETWO-36484: Unit test code coverage in MLS10

Maksym Savich · Maksym Savich · commit a67f7e22999b · 2015-06-05T13:57:06.000-05:00
- CR fixes
diff --git a/app/code/Magento/Config/Test/Unit/Block/System/Config/Form/Field/FileTest.php b/app/code/Magento/Config/Test/Unit/Block/System/Config/Form/Field/FileTest.php
@@ -16,47 +16,57 @@ class FileTest extends \PHPUnit_Framework_TestCase
      */
     protected $file;
 
+    /**
+     * @var array
+     */
+    protected $testData;
+
     protected function setUp()
     {
         $objectManager = new \Magento\Framework\TestFramework\Unit\Helper\ObjectManager($this);
 
+        $this->testData = [
+            'before_element_html' => 'test_before_element_html',
+            'html_id'             => 'test_id',
+            'name'                => 'test_name',
+            'value'               => 'test_value',
+            'title'               => 'test_title',
+            'disabled'            => true,
+            'after_element_js'    => 'test_after_element_js',
+            'after_element_html'  => 'test_after_element_html',
+            'html_id_prefix'      => 'test_id_prefix_',
+            'html_id_suffix'      => '_test_id_suffix',
+        ];
+
         $this->file = $objectManager->getObject(
             'Magento\Config\Block\System\Config\Form\Field\File',
-            [
-                'data'              =>
-                [
-                    'before_element_html' => 'test_before_element_html',
-                    'html_id'             => 'test_id',
-                    'name'                => 'test_name',
-                    'value'               => 'test_value',
-                    'title'               => 'test_title',
-                    'disabled'            => true,
-                    'after_element_js'    => 'test_after_element_js',
-                    'after_element_html'  => 'test_after_element_html',
-                ]
-            ]
+            ['data' => $this->testData]
         );
 
         $formMock = new \Magento\Framework\Object();
-        $formMock->getHtmlIdPrefix('id_prefix');
-        $formMock->getHtmlIdPrefix('id_suffix');
+        $formMock->setHtmlIdPrefix($this->testData['html_id_prefix']);
+        $formMock->setHtmlIdSuffix($this->testData['html_id_suffix']);
         $this->file->setForm($formMock);
     }
 
     public function testGetElementHtml()
     {
         $html = $this->file->getElementHtml();
 
-        $this->assertContains('<label class="addbefore" for="test_id"', $html);
-        $this->assertContains('test_before_element_html', $html);
-        $this->assertContains('<input id="test_id"', $html);
-        $this->assertContains('name="test_name"', $html);
-        $this->assertContains('value="test_value"', $html);
+        $expectedHtmlId = $this->testData['html_id_prefix']
+            . $this->testData['html_id']
+            . $this->testData['html_id_suffix'];
+
+        $this->assertContains('<label class="addbefore" for="' . $expectedHtmlId . '"', $html);
+        $this->assertContains($this->testData['before_element_html'], $html);
+        $this->assertContains('<input id="' . $expectedHtmlId . '"', $html);
+        $this->assertContains('name="' . $this->testData['name'] . '"', $html);
+        $this->assertContains('value="' . $this->testData['value'] . '"', $html);
         $this->assertContains('disabled="disabled"', $html);
         $this->assertContains('type="file"', $html);
-        $this->assertContains('test_after_element_js', $html);
-        $this->assertContains('<label class="addafter" for="test_id"', $html);
-        $this->assertContains('test_after_element_html', $html);
-        $this->assertContains('<input type="checkbox" name="test_name[delete]"', $html);
+        $this->assertContains($this->testData['after_element_js'], $html);
+        $this->assertContains('<label class="addafter" for="' . $expectedHtmlId . '"', $html);
+        $this->assertContains($this->testData['after_element_html'], $html);
+        $this->assertContains('<input type="checkbox" name="' . $this->testData['name'] . '[delete]"', $html);
     }
 }
diff --git a/app/code/Magento/Config/Test/Unit/Block/System/Config/Form/Field/HeadingTest.php b/app/code/Magento/Config/Test/Unit/Block/System/Config/Form/Field/HeadingTest.php
@@ -18,7 +18,7 @@ public function testRender()
 
         $elementMock = $this->getMockBuilder('Magento\Framework\Data\Form\Element\AbstractElement')
             ->disableOriginalConstructor()
-                ->setMethods(['getHtmlId', 'getLabel'])
+            ->setMethods(['getHtmlId', 'getLabel'])
             ->getMock();
         $elementMock->expects($this->any())->method('getHtmlId')->willReturn($htmlId);
         $elementMock->expects($this->any())->method('getLabel')->willReturn($label);
diff --git a/app/code/Magento/Config/Test/Unit/Block/System/Config/Form/Field/ImageTest.php b/app/code/Magento/Config/Test/Unit/Block/System/Config/Form/Field/ImageTest.php
@@ -23,6 +23,11 @@ class ImageTest extends \PHPUnit_Framework_TestCase
      */
     protected $image;
 
+    /**
+     * @var array
+     */
+    protected $testData;
+
     protected function setUp()
     {
         $objectManager = new \Magento\Framework\TestFramework\Unit\Helper\ObjectManager($this);
@@ -34,9 +39,17 @@ protected function setUp()
             ]
         );
 
+        $this->testData = [
+            'html_id_prefix' => 'test_id_prefix_',
+            'html_id'        => 'test_id',
+            'html_id_suffix' => '_test_id_suffix',
+            'path'           => 'catalog/product/placeholder',
+            'value'          => 'test_value',
+        ];
+
         $formMock = new \Magento\Framework\Object();
-        $formMock->getHtmlIdPrefix('id_prefix');
-        $formMock->getHtmlIdPrefix('id_suffix');
+        $formMock->setHtmlIdPrefix($this->testData['html_id_prefix']);
+        $formMock->setHtmlIdSuffix($this->testData['html_id_suffix']);
         $this->image->setForm($formMock);
     }
 
@@ -50,7 +63,8 @@ public function testGetElementHtmlWithValue()
         $this->urlBuilderMock->expects($this->once())->method('getBaseUrl')
             ->with(['_type' => $type])->will($this->returnValue($url));
 
-        $this->image->setValue('test_value');
+        $this->image->setValue($this->testData['value']);
+        $this->image->setHtmlId($this->testData['html_id']);
         $this->image->setFieldConfig(
             [
                 'id' => 'placeholder',
@@ -64,25 +78,33 @@ public function testGetElementHtmlWithValue()
                 'upload_dir' => [
                     'config' => 'system/filesystem/media',
                     'scope_info' => '1',
-                    'value' => 'catalog/product/placeholder',
+                    'value' => $this->testData['path'],
                 ],
                 'base_url' => [
                     'type' => $type,
                     'scope_info' => '1',
-                    'value' => 'catalog/product/placeholder',
+                    'value' => $this->testData['path'],
                 ],
                 '_elementType' => 'field',
                 'path' => 'catalog/placeholder',
             ]);
 
+        $expectedHtmlId = $this->testData['html_id_prefix']
+            . $this->testData['html_id']
+            . $this->testData['html_id_suffix'];
+
         $html = $this->image->getElementHtml();
         $this->assertContains('class="input-file"', $html);
         $this->assertContains('<input', $html);
         $this->assertContains('type="file"', $html);
         $this->assertContains('value="test_value"', $html);
         $this->assertContains(
-            '<a href="' . $url
-                . 'catalog/product/placeholder/test_value" onclick="imagePreview(\'_image\'); return false;"',
+            '<a href="'
+            . $url
+            . $this->testData['path']
+            . '/'
+            . $this->testData['value']
+            . '" onclick="imagePreview(\'' . $expectedHtmlId . '_image\'); return false;"',
             $html
         );
         $this->assertContains('<input type="checkbox"', $html);
diff --git a/app/code/Magento/Config/Test/Unit/Block/System/Config/Form/Field/NotificationTest.php b/app/code/Magento/Config/Test/Unit/Block/System/Config/Form/Field/NotificationTest.php
@@ -27,30 +27,13 @@ public function testRender()
 
         $localeDateMock = $this->getMockBuilder('Magento\Framework\Stdlib\DateTime\TimezoneInterface')
             ->disableOriginalConstructor()
-            ->setMethods(
-                [
-                    'date',
-                    'getDefaultTimezonePath',
-                    'getDefaultTimezone',
-                    'getDateFormat',
-                    'getDateFormatWithLongYear',
-                    'getTimeFormat',
-                    'getDateTimeFormat',
-                    'scopeDate',
-                    'formatDate',
-                    'scopeTimeStamp',
-                    'getConfigTimezone',
-                    'isScopeDateInInterval',
-                    'formatDateTime',
-                ]
-            )
             ->getMock();
         $localeDateMock->expects($this->any())->method('date')->willReturn($testDatetime);
         $localeDateMock->expects($this->any())->method('getDateTimeFormat')->willReturn(null);
 
         $elementMock = $this->getMockBuilder('Magento\Framework\Data\Form\Element\AbstractElement')
             ->disableOriginalConstructor()
-                ->setMethods(['getHtmlId', 'getLabel'])
+            ->setMethods(['getHtmlId', 'getLabel'])
             ->getMock();
         $elementMock->expects($this->any())->method('getHtmlId')->willReturn($htmlId);
         $elementMock->expects($this->any())->method('getLabel')->willReturn($label);
@@ -68,9 +51,9 @@ public function testRender()
         $html = $notification->render($elementMock);
 
         $this->assertEquals(
-            '<tr id="row_test_HTML_id">' .
+            '<tr id="row_' . $htmlId . '">' .
                 '<td class="label">' .
-                    '<label for="test_HTML_id">test_label</label>' .
+                    '<label for="' . $htmlId . '">' . $label . '</label>' .
                 '</td>' .
                 '<td class="value">' .
                     $formattedDate .
diff --git a/app/code/Magento/Config/Test/Unit/Block/System/Config/Form/Fieldset/Modules/DisableOutputTest.php b/app/code/Magento/Config/Test/Unit/Block/System/Config/Form/Fieldset/Modules/DisableOutputTest.php
@@ -48,8 +48,7 @@ public function testRender()
                     'getHtmlId', 'getExpanded', 'getElements','getLegend',
                     'getComment', 'addField', 'setRenderer', 'toHtml'
                 ]
-            )
-            ->getMock();
+            )->getMock();
 
         $elementMock->expects($this->any())
             ->method('getHtmlId')
@@ -66,7 +65,7 @@ public function testRender()
             ->disableOriginalConstructor()
             ->getMock();
         $moduleListMock->expects($this->any())->method('getNames')->willReturn(
-                array_merge(['Magento_Backend'], $testModuleList)
+            array_merge(['Magento_Backend'], $testModuleList)
         );
 
         $factory = $this->getMockBuilder('Magento\Framework\Data\Form\Element\Factory')
