Tests fix

Author: ilnytskyi

app/code/Magento/Swatches/Helper/Data.php

@@ -35,7 +35,7 @@ class Data
     const EMPTY_IMAGE_VALUE = 'no_selection';
 
     /**
-     * Default store ID
+     * The int value of the Default store ID
      */
     const DEFAULT_STORE_ID = 0;
 

app/code/Magento/Swatches/Test/Unit/Helper/DataTest.php

@@ -669,7 +669,8 @@ public function dataForGettingSwatchAsArray()
 
     public function testGetSwatchesByOptionsIdIf1()
     {
-        $swatchMock = $this->createMock(\Magento\Swatches\Model\Swatch::class);
+        //Simulate behaviour of \Magento\Swatches\Model\Swatch as array item
+        $swatchMock = $this->createMock(\ArrayAccess::class);
 
         $optionsData = [
             [
@@ -692,22 +693,18 @@ public function testGetSwatchesByOptionsIdIf1()
             ->willReturn($optionsData[0]['type']);
         $swatchMock->expects($this->at(1))->method('offsetGet')->with('option_id')
             ->willReturn($optionsData[0]['option_id']);
-        $swatchMock->expects($this->at(2))->method('getData')->with('')
-            ->willReturn($optionsData[0]);
-        $swatchMock->expects($this->at(3))->method('offsetGet')->with('type')
+        $swatchMock->expects($this->at(2))->method('offsetGet')->with('type')
             ->willReturn($optionsData[1]['type']);
-        $swatchMock->expects($this->at(4))->method('offsetGet')->with('store_id')
+        $swatchMock->expects($this->at(3))->method('offsetGet')->with('store_id')
             ->willReturn($optionsData[1]['store_id']);
-        $swatchMock->expects($this->at(5))->method('offsetGet')->with('store_id')
+        $swatchMock->expects($this->at(4))->method('offsetGet')->with('store_id')
             ->willReturn($optionsData[1]['store_id']);
-        $swatchMock->expects($this->at(6))->method('offsetGet')->with('option_id')
+        $swatchMock->expects($this->at(5))->method('offsetGet')->with('option_id')
             ->willReturn($optionsData[1]['option_id']);
-        $swatchMock->expects($this->at(7))->method('getData')->with('')
-            ->willReturn($optionsData[1]);
 
-        $swatchCollectionMock = $this->objectManager
-            ->getCollectionMock(Collection::class, [$swatchMock, $swatchMock]);
+        $swatchCollectionMock = $this->createMock(Collection::class);
         $swatchCollectionMock->method('addFilterByOptionsIds')->with([35])->will($this->returnSelf());
+        $swatchCollectionMock->expects($this->once())->method('getData')->willReturn([$swatchMock, $swatchMock]);
         $this->swatchCollectionFactoryMock->method('create')->willReturn($swatchCollectionMock);
 
         $storeMock = $this->createMock(\Magento\Store\Model\Store::class);
@@ -719,7 +716,8 @@ public function testGetSwatchesByOptionsIdIf1()
 
     public function testGetSwatchesByOptionsIdIf2()
     {
-        $swatchMock = $this->createMock(\Magento\Swatches\Model\Swatch::class);
+        //Simulate behaviour of \Magento\Swatches\Model\Swatch as array item
+        $swatchMock = $this->createMock(\ArrayAccess::class);
 
         $optionsData = [
             [
@@ -742,23 +740,16 @@ public function testGetSwatchesByOptionsIdIf2()
         $swatchMock->expects($this->at(1))->method('offsetGet')->with('store_id')->willReturn(1);
         $swatchMock->expects($this->at(2))->method('offsetGet')->with('value')->willReturn('test');
         $swatchMock->expects($this->at(3))->method('offsetGet')->with('option_id')->willReturn(35);
-        $swatchMock->expects($this->at(4))->method('getData')->with('')->willReturn($optionsData[0]);
-        $swatchMock->expects($this->at(5))->method('offsetGet')->with('type')->willReturn(0);
-        $swatchMock->expects($this->at(6))->method('offsetGet')->with('store_id')->willReturn(1);
-        $swatchMock->expects($this->at(7))->method('offsetGet')->with('value')->willReturn('test2');
-        $swatchMock->expects($this->at(8))->method('offsetGet')->with('option_id')->willReturn(36);
-        $swatchMock->expects($this->at(9))->method('getData')->with('')->willReturn($optionsData[1]);
-
-        $swatchCollectionMock = $this->objectManager->getCollectionMock(
-            Collection::class,
-            [
-                $swatchMock,
-                $swatchMock,
-            ]
-        );
+        $swatchMock->expects($this->at(4))->method('offsetGet')->with('type')->willReturn(0);
+        $swatchMock->expects($this->at(5))->method('offsetGet')->with('store_id')->willReturn(1);
+        $swatchMock->expects($this->at(6))->method('offsetGet')->with('value')->willReturn('test2');
+        $swatchMock->expects($this->at(7))->method('offsetGet')->with('option_id')->willReturn(36);
+
+        $swatchCollectionMock = $this->createMock(Collection::class);
         $this->swatchCollectionFactoryMock->method('create')->willReturn($swatchCollectionMock);
 
         $swatchCollectionMock->method('addFilterByOptionsIds')->with([35])->will($this->returnSelf());
+        $swatchCollectionMock->expects($this->once())->method('getData')->willReturn([$swatchMock, $swatchMock]);
 
         $storeMock = $this->createMock(\Magento\Store\Model\Store::class);
         $this->storeManagerMock->method('getStore')->willReturn($storeMock);
@@ -769,7 +760,8 @@ public function testGetSwatchesByOptionsIdIf2()
 
     public function testGetSwatchesByOptionsIdIf3()
     {
-        $swatchMock = $this->createMock(\Magento\Swatches\Model\Swatch::class);
+        //Simulate behaviour of \Magento\Swatches\Model\Swatch as array item
+        $swatchMock = $this->createMock(\ArrayAccess::class);
 
         $optionsData = [
             'type' => 0,
@@ -783,17 +775,12 @@ public function testGetSwatchesByOptionsIdIf3()
         $swatchMock->expects($this->at(1))->method('offsetGet')->with('store_id')->willReturn(0);
         $swatchMock->expects($this->at(2))->method('offsetGet')->with('store_id')->willReturn(0);
         $swatchMock->expects($this->at(3))->method('offsetGet')->with('option_id')->willReturn(35);
-        $swatchMock->expects($this->at(4))->method('getData')->with('')->willReturn($optionsData);
 
-        $swatchCollectionMock = $this->objectManager->getCollectionMock(
-            Collection::class,
-            [
-                $swatchMock,
-            ]
-        );
+        $swatchCollectionMock = $this->createMock(Collection::class);
         $this->swatchCollectionFactoryMock->method('create')->willReturn($swatchCollectionMock);
 
         $swatchCollectionMock->method('addFilterByOptionsIds')->with([35])->will($this->returnSelf());
+        $swatchCollectionMock->expects($this->once())->method('getData')->willReturn([$swatchMock]);
 
         $storeMock = $this->createMock(\Magento\Store\Model\Store::class);
         $this->storeManagerMock->method('getStore')->willReturn($storeMock);