MAGETWO-69137: upgrading Magento2 Project PHPUnit version to latest

Igor Melnikov · Igor Melnikov · commit cca948859cbf · 2017-08-02T15:04:08.000-05:00
- refactor tests
diff --git a/dev/tests/integration/framework/Magento/TestFramework/TestCase/AbstractController.php b/dev/tests/integration/framework/Magento/TestFramework/TestCase/AbstractController.php
@@ -17,7 +17,7 @@
  * @SuppressWarnings(PHPMD.NumberOfChildren)
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
  */
-abstract class AbstractController extends \PHPUnit\Framework\DOMTestCase
+abstract class AbstractController extends \PHPUnit\Framework\TestCase
 {
     protected $_runCode = '';
 
@@ -289,56 +289,4 @@ protected function getCookieMessages($messageType = null)
 
         return $actualMessages;
     }
-
-    /**
-     * Assert count of elements found by XPath in XML/HTML string
-     *
-     * @param string $xpath
-     * @param int $count
-     * @param string $html
-     * @param string|null $message
-     */
-    public function assertXpathCount($xpath, $count, $html, $message = '')
-    {
-        $this->assertEquals(
-            $count,
-            $this->getElementsCountForXpath($xpath, $html),
-            $message
-        );
-    }
-
-    /**
-     * Assert count of elements found by XPath in XML/HTML string greater or equal to specified value
-     *
-     * @param string $xpath
-     * @param int $count
-     * @param string $html
-     * @param string|null $message
-     */
-    public function assertXpathCountGreaterThanOrEqual($xpath, $count, $html, $message = '')
-    {
-        $this->assertGreaterThanOrEqual(
-            $count,
-            $this->getElementsCountForXpath($xpath, $html),
-            $message
-        );
-    }
-
-    /**
-     * Get elements count for XPath
-     *
-     * @param string $xpath
-     * @param string $html
-     * @return int
-     */
-    private function getElementsCountForXpath($xpath, $html)
-    {
-        $domDocument = new \DOMDocument('1.0', 'UTF-8');
-        libxml_use_internal_errors(true);
-        $domDocument->loadHTML($html);
-        libxml_use_internal_errors(false);
-        $domXpath = new \DOMXPath($domDocument);
-        $nodes = $domXpath->query($xpath);
-        return $nodes->length;
-    }
 }
diff --git a/dev/tests/integration/testsuite/Magento/Catalog/Pricing/Render/FinalPriceBox/RenderingBasedOnIsProductListFlagTest.php b/dev/tests/integration/testsuite/Magento/Catalog/Pricing/Render/FinalPriceBox/RenderingBasedOnIsProductListFlagTest.php
@@ -16,7 +16,7 @@
 /**
  * Test price rendering according to is_product_list flag
  */
-class RenderingBasedOnIsProductListFlagTest extends \PHPUnit\Framework\DOMTestCase
+class RenderingBasedOnIsProductListFlagTest extends \PHPUnit\Framework\TestCase
 {
     /**
      * @var ProductInterface
diff --git a/dev/tests/integration/testsuite/Magento/Config/Block/System/Config/FormTest.php b/dev/tests/integration/testsuite/Magento/Config/Block/System/Config/FormTest.php
@@ -11,7 +11,7 @@
  * @magentoAppArea adminhtml
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
  */
-class FormTest extends \PHPUnit\Framework\DOMTestCase
+class FormTest extends \PHPUnit\Framework\TestCase
 {
     /**
      * @var \Magento\Framework\ObjectManagerInterface
diff --git a/dev/tests/integration/testsuite/Magento/ConfigurableProduct/Pricing/Render/FinalPriceBox/RenderingBasedOnIsProductListFlagTest.php b/dev/tests/integration/testsuite/Magento/ConfigurableProduct/Pricing/Render/FinalPriceBox/RenderingBasedOnIsProductListFlagTest.php
@@ -17,7 +17,7 @@
 /**
  * Test price rendering according to is_product_list flag for Configurable product
  */
-class RenderingBasedOnIsProductListFlagTest extends \PHPUnit\Framework\DOMTestCase
+class RenderingBasedOnIsProductListFlagTest extends \PHPUnit\Framework\TestCase
 {
     /**
      * @var ProductInterface
diff --git a/dev/tests/integration/testsuite/Magento/Multishipping/Block/Checkout/OverviewTest.php b/dev/tests/integration/testsuite/Magento/Multishipping/Block/Checkout/OverviewTest.php
@@ -11,7 +11,7 @@
 /**
  * @magentoDataFixture Magento/Catalog/_files/product_simple.php
  */
-class OverviewTest extends \PHPUnit\Framework\DOMTestCase
+class OverviewTest extends \PHPUnit\Framework\TestCase
 {
     /**
      * @var \Magento\Multishipping\Block\Checkout\Overview
diff --git a/dev/tests/integration/testsuite/Magento/Paypal/Block/Adminhtml/Billing/Agreement/View/Tab/InfoTest.php b/dev/tests/integration/testsuite/Magento/Paypal/Block/Adminhtml/Billing/Agreement/View/Tab/InfoTest.php
@@ -29,10 +29,12 @@ public function testCustomerGridAction()
             'Response for billing agreement info doesn\'t contain billing agreement info tab'
         );
 
-        $this->assertXpathCount(
-            '//a[contains(text(), "customer@example.com")]',
+        $this->assertEquals(
             1,
-            $this->getResponse()->getBody(),
+            \Magento\TestFramework\Helper\Xpath::getElementsCountForXpath(
+                '//a[contains(text(), "customer@example.com")]',
+                $this->getResponse()->getBody()
+            ),
             'Response for billing agreement info doesn\'t contain Customer info'
         );
     }
diff --git a/dev/tests/integration/testsuite/Magento/Paypal/Controller/Adminhtml/Billing/Agreement/ViewTest.php b/dev/tests/integration/testsuite/Magento/Paypal/Controller/Adminhtml/Billing/Agreement/ViewTest.php
@@ -43,10 +43,12 @@ public function testAclHasAccess()
             "Response for billing agreement info doesn't contain billing agreement info tab"
         );
 
-        $this->assertXpathCount(
-            '//a[contains(text(), "customer@example.com")]',
+        $this->assertEquals(
             1,
-            $this->getResponse()->getBody(),
+            \Magento\TestFramework\Helper\Xpath::getElementsCountForXpath(
+                '//a[contains(text(), "customer@example.com")]',
+                $this->getResponse()->getBody()
+            ),
             "Response for billing agreement info doesn't contain Customer info"
         );
     }
diff --git a/dev/tests/integration/testsuite/Magento/Paypal/Controller/Adminhtml/Billing/AgreementTest.php b/dev/tests/integration/testsuite/Magento/Paypal/Controller/Adminhtml/Billing/AgreementTest.php
@@ -29,10 +29,12 @@ public function testCustomerGrid()
             ),
             "Response for billing agreement orders doesn't contain billing agreement customers grid"
         );
-        $this->assertXpathCount(
-            '//td[contains(text(), "REF-ID-TEST-678")]',
+        $this->assertEquals(
             1,
-            $this->getResponse()->getBody(),
+            \Magento\TestFramework\Helper\Xpath::getElementsCountForXpath(
+                '//td[contains(text(), "REF-ID-TEST-678")]',
+                $this->getResponse()->getBody()
+            ),
             "Response for billing agreement info doesn't contain reference ID"
         );
     }
diff --git a/dev/tests/integration/testsuite/Magento/Sales/Block/Adminhtml/Order/Create/Form/AddressTest.php b/dev/tests/integration/testsuite/Magento/Sales/Block/Adminhtml/Order/Create/Form/AddressTest.php
@@ -10,7 +10,7 @@
  *
  * @magentoAppArea adminhtml
  */
-class AddressTest extends \PHPUnit\Framework\DOMTestCase
+class AddressTest extends \PHPUnit\Framework\TestCase
 {
     /** @var \Magento\Framework\ObjectManagerInterface */
     protected $_objectManager;
diff --git a/dev/tests/integration/testsuite/Magento/Sales/Controller/Adminhtml/Order/CreateTest.php b/dev/tests/integration/testsuite/Magento/Sales/Controller/Adminhtml/Order/CreateTest.php
@@ -113,10 +113,12 @@ public function testIndexAction()
                 $html
             )
         );
-        $this->assertXpathCountGreaterThanOrEqual(
-            '//*[@data-grid-id="sales_order_create_customer_grid"]',
+        $this->assertGreaterThanOrEqual(
             1,
-            $html
+            \Magento\TestFramework\Helper\Xpath::getElementsCountForXpath(
+                '//*[@data-grid-id="sales_order_create_customer_grid"]',
+                $html
+            )
         );
         $this->assertGreaterThanOrEqual(
             1,
@@ -140,10 +142,9 @@ public function testIndexAction()
             )
         );
 
-        $this->assertXpathCountGreaterThanOrEqual(
-            '//*[@id="coupons:code"]',
+        $this->assertGreaterThanOrEqual(
             1,
-            $html
+            \Magento\TestFramework\Helper\Xpath::getElementsCountForXpath('//*[@id="coupons:code"]', $html)
         );
     }
 
diff --git a/dev/tests/integration/testsuite/Magento/UrlRewrite/Block/Catalog/Category/EditTest.php b/dev/tests/integration/testsuite/Magento/UrlRewrite/Block/Catalog/Category/EditTest.php
@@ -9,7 +9,7 @@
  * Test for \Magento\UrlRewrite\Block\Catalog\Category\Edit
  * @magentoAppArea adminhtml
  */
-class EditTest extends \PHPUnit\Framework\DOMTestCase
+class EditTest extends \PHPUnit\Framework\TestCase
 {
     /**
      * Test prepare layout
@@ -123,10 +123,12 @@ private function _checkButtons($block, $expected)
         if (isset($expected['back_button'])) {
             if ($expected['back_button']) {
                 if ($block->getCategory()->getId()) {
-                    $this->assertXpathCount(
-                        '//button[contains(@class, "back") and contains(@onclick, "/category")]',
+                    $this->assertEquals(
                         1,
-                        $buttonsHtml,
+                        \Magento\TestFramework\Helper\Xpath::getElementsCountForXpath(
+                            '//button[contains(@class, "back") and contains(@onclick, "/category")]',
+                            $buttonsHtml
+                        ),
                         'Back button is not present in category URL rewrite edit block'
                     );
                 } else {
@@ -340,23 +342,4 @@ public function prepareLayoutDataProvider()
             ]
         ];
     }
-
-    /**
-     * Assert count of elements found by XPath in XML/HTML string
-     *
-     * @param string $xpath
-     * @param int $count
-     * @param string $html
-     * @param string|null $message
-     */
-    public function assertXpathCount($xpath, $count, $html, $message = '')
-    {
-        $domDocument = new \DOMDocument('1.0', 'UTF-8');
-        libxml_use_internal_errors(true);
-        $domDocument->loadHTML($html);
-        libxml_use_internal_errors(false);
-        $domXpath = new \DOMXPath($domDocument);
-        $nodes = $domXpath->query($xpath);
-        $this->assertEquals($count, $nodes->length, $message);
-    }
 }
diff --git a/dev/tests/integration/testsuite/Magento/UrlRewrite/Block/Catalog/Product/EditTest.php b/dev/tests/integration/testsuite/Magento/UrlRewrite/Block/Catalog/Product/EditTest.php
@@ -9,7 +9,7 @@
  * @magentoAppArea adminhtml
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
  */
-class EditTest extends \PHPUnit\Framework\DOMTestCase
+class EditTest extends \PHPUnit\Framework\TestCase
 {
     /**
      * Test prepare layout
@@ -155,10 +155,12 @@ private function _checkButtons($block, $expected)
         if (isset($expected['back_button'])) {
             if ($expected['back_button']) {
                 if ($block->getProduct()->getId()) {
-                    $this->assertXpathCount(
-                        '//button[contains(@class, "back") and contains(@onclick, "/product")]',
+                    $this->assertEquals(
                         1,
-                        $buttonsHtml,
+                        \Magento\TestFramework\Helper\Xpath::getElementsCountForXpath(
+                            '//button[contains(@class, "back") and contains(@onclick, "/product")]',
+                            $buttonsHtml
+                        ),
                         'Back button is not present in product URL rewrite edit block'
                     );
                 } else {
@@ -204,17 +206,21 @@ private function _checkButtons($block, $expected)
         }
 
         if ($expected['reset_button']) {
-            $this->assertXpathCount(
-                '//button[@title="Reset"]',
+            $this->assertEquals(
                 1,
-                $buttonsHtml,
+                \Magento\TestFramework\Helper\Xpath::getElementsCountForXpath(
+                    '//button[@title="Reset"]',
+                    $buttonsHtml
+                ),
                 'Reset button is not present in product URL rewrite edit block'
             );
         } else {
-            $this->assertXpathCount(
-                '//button[@title="Reset"]',
+            $this->assertEquals(
                 0,
-                $buttonsHtml,
+                \Magento\TestFramework\Helper\Xpath::getElementsCountForXpath(
+                    '//button[@title="Reset"]',
+                    $buttonsHtml
+                ),
                 'Reset button should not present in product URL rewrite edit block'
             );
         }
@@ -457,23 +463,4 @@ public function prepareLayoutDataProvider()
             ]
         ];
     }
-
-    /**
-     * Assert count of elements found by XPath in XML/HTML string
-     *
-     * @param string $xpath
-     * @param int $count
-     * @param string $html
-     * @param string|null $message
-     */
-    public function assertXpathCount($xpath, $count, $html, $message = '')
-    {
-        $domDocument = new \DOMDocument('1.0', 'UTF-8');
-        libxml_use_internal_errors(true);
-        $domDocument->loadHTML($html);
-        libxml_use_internal_errors(false);
-        $domXpath = new \DOMXPath($domDocument);
-        $nodes = $domXpath->query($xpath);
-        $this->assertEquals($count, $nodes->length, $message);
-    }
 }
diff --git a/dev/tests/integration/testsuite/Magento/UrlRewrite/Block/Cms/Page/EditTest.php b/dev/tests/integration/testsuite/Magento/UrlRewrite/Block/Cms/Page/EditTest.php
@@ -9,7 +9,7 @@
  * Test for \Magento\UrlRewrite\Block\Cms\Page\Edit
  * @magentoAppArea adminhtml
  */
-class EditTest extends \PHPUnit\Framework\DOMTestCase
+class EditTest extends \PHPUnit\Framework\TestCase
 {
     /**
      * Test prepare layout
@@ -123,10 +123,12 @@ private function _checkButtons($block, $expected)
         if (isset($expected['back_button'])) {
             if ($expected['back_button']) {
                 if ($block->getCmsPage()->getId()) {
-                    $this->assertXpathCount(
-                        '//button[contains(@class, "back") and contains(@onclick, "/cms_page")]',
+                    $this->assertEquals(
                         1,
-                        $buttonsHtml,
+                        \Magento\TestFramework\Helper\Xpath::getElementsCountForXpath(
+                            '//button[contains(@class, "back") and contains(@onclick, "/cms_page")]',
+                            $buttonsHtml
+                        ),
                         'Back button is not present in CMS page URL rewrite edit block'
                     );
                 } else {
@@ -172,17 +174,21 @@ private function _checkButtons($block, $expected)
         }
 
         if ($expected['reset_button']) {
-            $this->assertXpathCount(
-                '//button[@title="Reset"]',
+            $this->assertEquals(
                 1,
-                $buttonsHtml,
+                \Magento\TestFramework\Helper\Xpath::getElementsCountForXpath(
+                    '//button[@title="Reset"]',
+                    $buttonsHtml
+                ),
                 'Reset button is not present in CMS page URL rewrite edit block'
             );
         } else {
-            $this->assertXpathCount(
-                '//button[@title="Reset"]',
+            $this->assertEquals(
                 0,
-                $buttonsHtml,
+                \Magento\TestFramework\Helper\Xpath::getElementsCountForXpath(
+                    '//button[@title="Reset"]',
+                    $buttonsHtml
+                ),
                 'Reset button should not present in CMS page URL rewrite edit block'
             );
         }
@@ -336,23 +342,4 @@ public function prepareLayoutDataProvider()
             ]
         ];
     }
-
-    /**
-     * Assert count of elements found by XPath in XML/HTML string
-     *
-     * @param string $xpath
-     * @param int $count
-     * @param string $html
-     * @param string|null $message
-     */
-    public function assertXpathCount($xpath, $count, $html, $message = '')
-    {
-        $domDocument = new \DOMDocument('1.0', 'UTF-8');
-        libxml_use_internal_errors(true);
-        $domDocument->loadHTML($html);
-        libxml_use_internal_errors(false);
-        $domXpath = new \DOMXPath($domDocument);
-        $nodes = $domXpath->query($xpath);
-        $this->assertEquals($count, $nodes->length, $message);
-    }
 }
diff --git a/dev/tests/integration/testsuite/Magento/UrlRewrite/Block/EditTest.php b/dev/tests/integration/testsuite/Magento/UrlRewrite/Block/EditTest.php
@@ -9,7 +9,7 @@
  * Test for \Magento\UrlRewrite\Block\Edit
  * @magentoAppArea adminhtml
  */
-class EditTest extends \PHPUnit\Framework\DOMTestCase
+class EditTest extends \PHPUnit\Framework\TestCase
 {
     /**
      * Test prepare layout

Original file line number	Diff line number	Diff line change
`@@ -16,7 +16,7 @@`
`16`	`16`	`/**`
`17`	`17`	`* Test price rendering according to is_product_list flag`
`18`	`18`	`*/`
`19`		`-class RenderingBasedOnIsProductListFlagTest extends \PHPUnit\Framework\DOMTestCase`
	`19`	`+class RenderingBasedOnIsProductListFlagTest extends \PHPUnit\Framework\TestCase`
`20`	`20`	`{`
`21`	`21`	`/**`
`22`	`22`	`* @var ProductInterface`
Original file line number	Diff line number	Diff line change
`@@ -11,7 +11,7 @@`
`11`	`11`	`* @magentoAppArea adminhtml`
`12`	`12`	`* @SuppressWarnings(PHPMD.CouplingBetweenObjects)`
`13`	`13`	`*/`
`14`		`-class FormTest extends \PHPUnit\Framework\DOMTestCase`
	`14`	`+class FormTest extends \PHPUnit\Framework\TestCase`
`15`	`15`	`{`
`16`	`16`	`/**`
`17`	`17`	`* @var \Magento\Framework\ObjectManagerInterface`
Original file line number	Diff line number	Diff line change
`@@ -17,7 +17,7 @@`
`17`	`17`	`/**`
`18`	`18`	`* Test price rendering according to is_product_list flag for Configurable product`
`19`	`19`	`*/`
`20`		`-class RenderingBasedOnIsProductListFlagTest extends \PHPUnit\Framework\DOMTestCase`
	`20`	`+class RenderingBasedOnIsProductListFlagTest extends \PHPUnit\Framework\TestCase`
`21`	`21`	`{`
`22`	`22`	`/**`
`23`	`23`	`* @var ProductInterface`
Original file line number	Diff line number	Diff line change
`@@ -10,7 +10,7 @@`
`10`	`10`	`*`
`11`	`11`	`* @magentoAppArea adminhtml`
`12`	`12`	`*/`
`13`		`-class AddressTest extends \PHPUnit\Framework\DOMTestCase`
	`13`	`+class AddressTest extends \PHPUnit\Framework\TestCase`
`14`	`14`	`{`
`15`	`15`	`/** @var \Magento\Framework\ObjectManagerInterface */`
`16`	`16`	`protected $_objectManager;`