MAGETWO-69137: upgrading Magento2 Project PHPUnit version to latest

- refactor tests

Author: Igor Melnikov

app/code/Magento/Backend/Test/Unit/Block/Widget/Grid/Column/Renderer/ConcatTest.php

@@ -17,7 +17,6 @@ class ConcatTest extends \PHPUnit\Framework\TestCase
 
     protected function setUp()
     {
-//        $this->markTestSkipped('Test needs to be refactored.');
         $this->objectManagerHelper = new \Magento\Framework\TestFramework\Unit\Helper\ObjectManager($this);
         $this->renderer = $this->objectManagerHelper->getObject(
             \Magento\Backend\Block\Widget\Grid\Column\Renderer\Concat::class

app/code/Magento/Bundle/Test/Unit/Model/LinkManagementTest.php

@@ -392,7 +392,6 @@ public function testAddChildLinkedProductIsComposite()
      */
     public function testAddChildProductAlreadyExistsInOption()
     {
-        $this->markTestSkipped('Test needs to be refactored.');
         $productLink = $this->getMockBuilder(\Magento\Bundle\Api\Data\LinkInterface::class)
             ->setMethods(['getSku', 'getOptionId', 'getSelectionId'])
             ->disableOriginalConstructor()
@@ -402,11 +401,14 @@ public function testAddChildProductAlreadyExistsInOption()
         $productLink->expects($this->any())->method('getSelectionId')->will($this->returnValue(1));
 
         $this->metadataMock->expects($this->once())->method('getLinkField')->willReturn($this->linkField);
-        $productMock = $this->createPartialMock(\Magento\Catalog\Model\Product::class,
-            ['getTypeId', 'getCopyFromView', 'getData']);
-        $productMock->expects($this->once())->method('getTypeId')->will($this->returnValue(
+        $productMock = $this->createPartialMock(
+            \Magento\Catalog\Model\Product::class,
+            ['getTypeId', 'getCopyFromView', 'getData', 'getTypeInstance', 'getSku']
+        );
+        $productMock->expects($this->once())->method('getTypeId')->willReturn(
             \Magento\Catalog\Model\Product\Type::TYPE_BUNDLE
-        ));
+        );
+
         $productMock->expects($this->any())
             ->method('getData')
             ->with($this->linkField)

app/code/Magento/Bundle/Test/Unit/Model/Product/OptionListTest.php

@@ -55,12 +55,9 @@ protected function setUp()
         );
         $this->dataObjectHelperMock = $this->createMock(\Magento\Framework\Api\DataObjectHelper::class);
         $this->linkListMock = $this->createMock(\Magento\Bundle\Model\Product\LinksList::class);
-        $this->extensionAttributesFactoryMock = $this->getMockBuilder(
+        $this->extensionAttributesFactoryMock = $this->createMock(
             \Magento\Framework\Api\ExtensionAttribute\JoinProcessorInterface::class
-        )
-            ->setMethods(['process'])
-            ->disableOriginalConstructor()
-            ->getMockforAbstractClass();
+        );
 
         $this->objectManager = new \Magento\Framework\TestFramework\Unit\Helper\ObjectManager($this);
         $this->model = $this->objectManager->getObject(
@@ -77,7 +74,6 @@ protected function setUp()
 
     public function testGetItems()
     {
-        $this->markTestSkipped('Test needs to be refactored.');
         $optionId = 1;
         $optionData = ['title' => 'test title'];
         $productSku = 'product_sku';
@@ -90,7 +86,11 @@ public function testGetItems()
             ['getOptionId', 'getData', 'getTitle', 'getDefaultTitle']
         );
         $optionsCollMock = $this->getMockBuilder(\Magento\Bundle\Model\ResourceModel\Option\Collection::class)
-            ->setConstructorArgs([$optionMock]);
+            ->disableOriginalConstructor()
+            ->getMock();
+        $optionsCollMock->expects($this->any())
+            ->method('getIterator')
+            ->willReturn(new \ArrayIterator([$optionMock]));
         $this->typeMock->expects($this->once())
             ->method('getOptionsCollection')
             ->with($productMock)

app/code/Magento/Customer/Test/Unit/Model/FileUploaderTest.php

@@ -57,6 +57,11 @@ protected function setUp()
             ->getMockForAbstractClass();
     }
 
+    protected function tearDown()
+    {
+        $_FILES = [];
+    }
+
     /**
      * @param string $entityTypeCode
      * @param string $scope

app/code/Magento/Integration/Test/Unit/Model/AdminTokenServiceTest.php

@@ -1,18 +1,16 @@
 <?php
 /**
- * Test for \Magento\Integration\Model\AdminTokenService
- *
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
-
-// @codingStandardsIgnoreFile
-
 namespace Magento\Integration\Test\Unit\Model;
 
 use Magento\Integration\Model\Integration;
 use Magento\Integration\Model\Oauth\Token;
 
+/**
+ * @codingStandardsIgnoreFile
+ */
 class AdminTokenServiceTest extends \PHPUnit\Framework\TestCase
 {
     /** \Magento\Integration\Model\AdminTokenService */
@@ -50,7 +48,7 @@ protected function setUp()
 
         $this->_tokenMock = $this->getMockBuilder(\Magento\Integration\Model\Oauth\Token::class)
             ->disableOriginalConstructor()
-            ->setMethods(['getToken', 'loadByAdminId', '__wakeup', 'delete'])->getMock();
+            ->setMethods(['getToken', 'loadByAdminId', 'delete', '__wakeup'])->getMock();
 
         $this->_tokenModelCollectionMock = $this->getMockBuilder(
             \Magento\Integration\Model\ResourceModel\Oauth\Token\Collection::class

app/code/Magento/Integration/Test/Unit/Model/CustomerTokenServiceTest.php

@@ -1,7 +1,5 @@
 <?php
 /**
- * Test for \Magento\Integration\Model\CustomerTokenService
- *
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */

app/code/Magento/Theme/Test/Unit/Controller/Adminhtml/Design/Config/FileUploader/SaveTest.php

@@ -47,9 +47,13 @@ public function setUp()
         $this->controller = new Save($this->context, $this->fileProcessor);
     }
 
+    protected function tearDown()
+    {
+        $_FILES = [];
+    }
+
     public function testExecute()
     {
-        $this->markTestSkipped('Test needs to be refactored.');
         $_FILES['test_key'] = [];
         $result = [
             'file' => '',

dev/tests/integration/framework/Magento/TestFramework/Annotation/AppIsolation.php

@@ -23,6 +23,11 @@ class AppIsolation
      */
     private $_application;
 
+    /**
+     * @var array
+     */
+    private $serverGlobalBackup;
+
     /**
      * Constructor
      *
@@ -52,9 +57,18 @@ protected function _isolateApp()
      */
     public function startTestSuite()
     {
+        $this->serverGlobalBackup = $_SERVER;
         $this->_isolateApp();
     }
 
+    /**
+     * Isolate application after running test case
+     */
+    public function endTestSuite()
+    {
+        $_SERVER = $this->serverGlobalBackup;
+    }
+
     /**
      * Handler for 'endTest' event
      *

dev/tests/integration/framework/Magento/TestFramework/Helper/Xpath.php

@@ -0,0 +1,27 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\TestFramework\Helper;
+
+class Xpath
+{
+    /**
+     * Get elements count for XPath
+     *
+     * @param string $xpath
+     * @param string $html
+     * @return int
+     */
+    public static 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;
+    }
+}

dev/tests/integration/framework/Magento/TestFramework/TestCase/AbstractController.php

@@ -289,4 +289,56 @@ 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;
+    }
 }