Merge remote-tracking branch 'jackalopes/MAGETWO-71024-unskip-unit-tests' into BundledPR-Sep8

Author: pdohogne-magento

app/code/Magento/Catalog/Test/Unit/Model/ProductRepositoryTest.php

@@ -193,9 +193,8 @@ protected function setUp()
                 'validate',
                 'save',
                 'getMediaGalleryEntries',
-                'setData',
-                'getStoreId'
-            ]);
+            ]
+        );
         $this->initializedProductMock->expects($this->any())
             ->method('hasGalleryAttribute')
             ->willReturn(true);
@@ -974,7 +973,6 @@ public function saveExistingWithOptionsDataProvider()
      */
     public function testSaveWithLinks(array $newLinks, array $existingLinks, array $expectedData)
     {
-        $this->markTestSkipped('Test needs to be refactored.');
         $this->storeManagerMock->expects($this->any())->method('getWebsites')->willReturn([1 => 'default']);
         $this->resourceModelMock->expects($this->any())->method('getIdBySku')->will($this->returnValue(100));
         $this->productFactoryMock->expects($this->any())
@@ -1022,7 +1020,7 @@ public function testSaveWithLinks(array $newLinks, array $existingLinks, array $
 
             $this->productData['product_links'] = [];
 
-            $this->initializedProductMock->setData("ignore_links_flag", true);
+            $this->initializedProductMock->setData('ignore_links_flag', true);
             $this->initializedProductMock->expects($this->never())
                 ->method('getProductLinks')
                 ->willReturn([]);
@@ -1157,7 +1155,6 @@ protected function setupProductMocksForSave()
 
     public function testSaveExistingWithNewMediaGalleryEntries()
     {
-        $this->markTestSkipped('Test needs to be refactored.');
         $this->storeManagerMock->expects($this->any())->method('getWebsites')->willReturn([1 => 'default']);
         $newEntriesData = [
             'images' => [
@@ -1287,7 +1284,6 @@ public function testSaveWithDifferentWebsites()
 
     public function testSaveExistingWithMediaGalleryEntries()
     {
-        $this->markTestSkipped('Test needs to be refactored.');
         $this->storeManagerMock->expects($this->any())->method('getWebsites')->willReturn([1 => 'default']);
         //update one entry, delete one entry
         $newEntries = [

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

@@ -13,8 +13,10 @@ class VirtualTest extends \PHPUnit\Framework\TestCase
      */
     public function testPrepareAttributesWithDefaultValueForSave()
     {
-        $this->markTestSkipped('Test needs to be refactored.');
-        $virtualModelMock = $this->createMock(\Magento\CatalogImportExport\Model\Import\Product\Type\Virtual::class);
+        $virtualModelMock = $this->createPartialMock(
+            \Magento\CatalogImportExport\Model\Import\Product\Type\Virtual::class,
+            []
+        );
 
         $this->setPropertyValue(
             $virtualModelMock,
@@ -64,7 +66,7 @@ public function testPrepareAttributesWithDefaultValueForSave()
         ];
 
         $result = $virtualModelMock->prepareAttributesWithDefaultValueForSave($rowData);
-        $this->assertEquals($result, $expectedResult);
+        $this->assertEquals($expectedResult, $result);
     }
 
     /**

app/code/Magento/CatalogWidget/Test/Unit/Model/Rule/Condition/ProductTest.php

@@ -3,7 +3,6 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
-
 namespace Magento\CatalogWidget\Test\Unit\Model\Rule\Condition;
 
 use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
@@ -29,11 +28,11 @@ protected function setUp()
 
         $eavConfig = $this->createMock(\Magento\Eav\Model\Config::class);
         $this->attributeMock = $this->createMock(\Magento\Catalog\Model\ResourceModel\Eav\Attribute::class);
-        $eavConfig->expects($this->once())->method('getAttribute')->willReturn($this->attributeMock);
+        $eavConfig->expects($this->any())->method('getAttribute')->willReturn($this->attributeMock);
         $ruleMock = $this->createMock(\Magento\SalesRule\Model\Rule::class);
         $storeManager = $this->createMock(\Magento\Store\Model\StoreManagerInterface::class);
         $storeMock = $this->createMock(\Magento\Store\Api\Data\StoreInterface::class);
-        $storeManager->expects($this->once())->method('getStore')->willReturn($storeMock);
+        $storeManager->expects($this->any())->method('getStore')->willReturn($storeMock);
         $productResource = $this->createMock(\Magento\Catalog\Model\ResourceModel\Product::class);
         $productResource->expects($this->once())->method('loadAllAttributes')->willReturnSelf();
         $productResource->expects($this->once())->method('getAttributesByCode')->willReturn([]);
@@ -73,7 +72,6 @@ public function testAddToCollection()
 
     public function testGetMappedSqlFieldSku()
     {
-        $this->markTestSkipped('Test needs to be refactored.');
         $this->model->setAttribute('sku');
         $this->assertEquals('e.sku', $this->model->getMappedSqlField());
     }