MAGETWO-71024: [Tech Debt] Skipped unit/integration tests needs to be re-examined.

- Fix unit tests in framework
- Fix failing code style checks

Author: danielrenaud

app/code/Magento/CatalogImportExport/Test/Unit/Model/Import/Product/Type/VirtualTest.php

@@ -13,7 +13,10 @@ class VirtualTest extends \PHPUnit\Framework\TestCase
      */
     public function testPrepareAttributesWithDefaultValueForSave()
     {
-        $virtualModelMock = $this->createPartialMock(\Magento\CatalogImportExport\Model\Import\Product\Type\Virtual::class, []);
+        $virtualModelMock = $this->createPartialMock(
+            \Magento\CatalogImportExport\Model\Import\Product\Type\Virtual::class,
+            []
+        );
 
         $this->setPropertyValue(
             $virtualModelMock,

app/code/Magento/Cron/Test/Unit/Observer/ProcessCronQueueObserverTest.php

@@ -88,11 +88,6 @@ class ProcessCronQueueObserverTest extends \PHPUnit\Framework\TestCase
      */
     protected $scheduleResource;
 
-    /**
-     * @var \Magento\Framework\DB\Adapter\AdapterInterface|\PHPUnit_Framework_MockObject_MockObject
-     */
-    protected $connection;
-
     /**
      * Prepare parameters
      */
@@ -151,12 +146,12 @@ protected function setUp()
         $this->scheduleResource = $this->getMockBuilder(\Magento\Cron\Model\ResourceModel\Schedule::class)
             ->disableOriginalConstructor()
             ->getMock();
-        $this->connection = $this->getMockBuilder(\Magento\Framework\DB\Adapter\AdapterInterface::class)
+        $connection = $this->getMockBuilder(\Magento\Framework\DB\Adapter\AdapterInterface::class)
             ->disableOriginalConstructor()
             ->getMock();
 
-        $this->scheduleResource->method('getConnection')->willReturn($this->connection);
-        $this->connection->method('delete')->willReturn(1);
+        $this->scheduleResource->method('getConnection')->willReturn($connection);
+        $connection->method('delete')->willReturn(1);
 
         $this->_observer = new ProcessCronQueueObserver(
             $this->_objectManager,

app/code/Magento/ImportExport/Test/Unit/Model/ImportTest.php

@@ -429,7 +429,6 @@ public function testUploadSource()
      */
     public function testValidateSource()
     {
-        $this->markTestSkipped('Test needs to be refacotred,');
         $validationStrategy = ProcessingErrorAggregatorInterface::VALIDATION_STRATEGY_STOP_ON_ERROR;
         $allowedErrorCount = 1;
 

app/code/Magento/Sales/Test/Unit/Model/Order/Invoice/Total/ShippingTest.php

@@ -134,7 +134,10 @@ private function getInvoiceCollection(array $invoicesData)
             $arguments['data'] = $oneInvoiceData;
             $arguments = $objectManagerHelper->getConstructArguments($className, $arguments);
             /** @var $prevInvoice \Magento\Sales\Model\Order\Invoice */
-            $prevInvoice = $this->getMockBuilder($className)->setMethods(['_init'])->setConstructorArgs($arguments)->getMock();
+            $prevInvoice = $this->getMockBuilder($className)
+                ->setMethods(['_init'])
+                ->setConstructorArgs($arguments)
+                ->getMock();
             $result->addItem($prevInvoice);
         }
         return $result;

app/code/Magento/Sitemap/Test/Unit/Model/SitemapTest.php

@@ -227,9 +227,9 @@ public static function sitemapDataProvider()
         ];
 
         return [
-            [50000, 10485760, $expectedSingleFile, 1],
-            [1, 10485760, $expectedMultiFile, 5],
-            [50000, 264, $expectedMultiFile, 5]
+            [50000, 10485760, $expectedSingleFile, 6],
+            [1, 10485760, $expectedMultiFile, 18],
+            [50000, 264, $expectedMultiFile, 18]
         ];
     }
 
@@ -289,7 +289,7 @@ public static function robotsDataProvider()
                 50000,
                 10485760,
                 $expectedSingleFile,
-                2,
+                6,
                 [
                     'robotsStart' => '',
                     'robotsFinish' => 'Sitemap: http://store.com/sitemap.xml',
@@ -300,7 +300,7 @@ public static function robotsDataProvider()
                 50000,
                 10485760,
                 $expectedSingleFile,
-                2,
+                6,
                 [
                     'robotsStart' => "User-agent: *",
                     'robotsFinish' => "User-agent: *" . PHP_EOL . 'Sitemap: http://store.com/sitemap.xml',
@@ -311,7 +311,7 @@ public static function robotsDataProvider()
                 1,
                 10485760,
                 $expectedMultiFile,
-                6,
+                18,
                 [
                     'robotsStart' => "User-agent: *\r\n",
                     'robotsFinish' => "User-agent: *\r\n\r\nSitemap: http://store.com/sitemap.xml",
@@ -322,7 +322,7 @@ public static function robotsDataProvider()
                 50000,
                 264,
                 $expectedMultiFile,
-                6,
+                18,
                 [
                     'robotsStart' => "User-agent: *\n",
                     'robotsFinish' => "User-agent: *\n\nSitemap: http://store.com/sitemap.xml",
@@ -333,7 +333,7 @@ public static function robotsDataProvider()
                 50000,
                 10485760,
                 $expectedSingleFile,
-                1,
+                6,
                 ['robotsStart' => '', 'robotsFinish' => '', 'pushToRobots' => 0]
             ] // empty robots file
         ];
@@ -395,7 +395,7 @@ protected function _prepareSitemapModelMock(
 
         // Check that all expected lines were written
         $this->_fileMock->expects(
-            $this->any()
+            $this->exactly($expectedWrites)
         )->method(
             'write'
         )->will(

lib/internal/Magento/Framework/App/Test/Unit/ObjectManagerFactoryTest.php

@@ -45,7 +45,6 @@ public static function tearDownAfterClass()
      */
     public function testCreateObjectManagerFactoryCouldBeOverridden()
     {
-        $this->markTestSkipped('Test needs to be refactored.');
         $rootPath = __DIR__ . '/_files/';
         $factory = Bootstrap::createObjectManagerFactory($rootPath, []);
         $factory->create([], false);

lib/internal/Magento/Framework/Data/Test/Unit/Collection/DbTest.php

@@ -58,9 +58,6 @@ protected function tearDown()
         unset($this->collection);
     }
 
-    /**
-     * @return \PHPUnit_Framework_MockObject_MockObject|\Magento\Framework\DB\Adapter\Pdo\Mysql
-     */
     public function testSetAddOrder()
     {
         $adapter = $this->createPartialMock(\Magento\Framework\DB\Adapter\Pdo\Mysql::class, ['fetchAll', 'select']);
@@ -87,17 +84,11 @@ public function testSetAddOrder()
         $this->assertEquals('some_field ASC', (string)array_shift($selectOrders));
         $this->assertEquals('other_field DESC', (string)array_shift($selectOrders));
         $this->assertEmpty(array_shift($selectOrders));
-
-        return $adapter;
     }
 
-    /**
-     * @param \PHPUnit_Framework_MockObject_MockObject|\Magento\Framework\DB\Adapter\Pdo\Mysql $adapter
-     * @depends testSetAddOrder
-     */
-    public function testUnshiftOrder($adapter)
+    public function testUnshiftOrder()
     {
-        $this->markTestSkipped('Test needs to be refacotred.');
+        $adapter = $this->createPartialMock(\Magento\Framework\DB\Adapter\Pdo\Mysql::class, ['fetchAll', 'select']);
         $renderer = $this->getSelectRenderer($this->objectManager);
         $select = new \Magento\Framework\DB\Select($adapter, $renderer);
         $adapter

lib/internal/Magento/Framework/View/Test/Unit/Element/Text/TextList/ItemTest.php

@@ -42,35 +42,27 @@ public function testSetLink()
      * @dataProvider toHtmlDataProvider
      *
      * @param array $liParams
-     * @param string $attrName
-     * @param string $attrValue
      * @param string $innerText
      */
-    public function testToHtml($liParams, $attrName, $attrValue, $innerText)
+    public function testToHtml($liParams, $innerText, $expectedHtml)
     {
-        $this->markTestSkipped('Test needs to be refactored.');
         $this->item->setLink($liParams, $innerText);
-        $this->assertTag([
-            'tag' => 'li',
-            'attributes' => [$attrName => $attrValue],
-            'content' => $innerText,
-        ], $this->item->toHtml());
+
+        $this->assertEquals($expectedHtml, $this->item->toHtml());
     }
 
     public function toHtmlDataProvider()
     {
         return [
             [
                 'liParams' => ['class' => 'some-css-class'],
-                'attrName' => 'class',
-                'attrValue' => 'some-css-class',
                 'innerText' => 'text',
+                'expectedHtml' => '<li class="some-css-class">text</li>' . "\r\n"
             ],
             [
                 'liParams' => 'class="some-css-class"',
-                'attrName' => 'class',
-                'attrValue' => 'some-css-class',
                 'innerText' => 'text',
+                'expectedHtml' => '<li class="some-css-class">text</li>' . "\r\n"
             ]
         ];
     }

lib/internal/Magento/Framework/View/Test/Unit/Element/Text/TextList/LinkTest.php

@@ -47,40 +47,29 @@ public function testSetLink()
     /**
      * @dataProvider toHtmlDataProvider
      */
-    public function testToHtml($liParams, $liAttr, $aParams, $aAttr, $innerText, $afterText)
+    public function testToHtml($liParams, $aParams, $innerText, $afterText, $expectedHtml)
     {
-        $this->markTestSkipped('Test needs to be refactored.');
         $this->link->setLink($liParams, $aParams, $innerText, $afterText);
-        $this->assertTag([
-            'tag' => 'li',
-            'attributes' => [$liAttr['name'] => $liAttr['value']],
-            'child' => [
-                'tag' => 'a',
-                'attributes' => [$aAttr['name'] => $aAttr['value']],
-                'content' => $innerText,
-            ],
-            'content' => $afterText,
-        ], $this->link->toHtml());
+
+        $this->assertEquals($expectedHtml, $this->link->toHtml());
     }
 
     public function toHtmlDataProvider()
     {
         return [
             [
                 'liParams' => ['class' => 'some-css-class'],
-                'liAttr' => ['name' => 'class', 'value' => 'some-css-class'],
                 'aParams' => ['href' => 'url'],
-                'aAttr' => ['name' => 'href', 'value' => 'url'],
                 'innerText' => 'text',
                 'afterText' => 'afterText',
+                'expectedHtml' => '<li class="some-css-class"><a href="url">text</a>afterText</li>' . "\r\n"
             ],
             [
                 'liParams' => 'class="some-css-class"',
-                'liAttr' => ['name' => 'class', 'value' => 'some-css-class'],
                 'aParams' => 'href="url"',
-                'aAttr' => ['name' => 'href', 'value' => 'url'],
                 'innerText' => 'text',
                 'afterText' => 'afterText',
+                'expectedHtml' => '<li class="some-css-class"><a href="url">text</a>afterText</li>' . "\r\n"
             ]
         ];
     }