MAGETWO-28256: Bundle Integration API Refactoring

    - Fix unit test failures

Author: Yu Tang

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

@@ -336,7 +336,9 @@ public function testUpdateIfOptionDoesNotExist()
 
         $existingOptionMock = $this->getMock('\Magento\Bundle\Model\Option', ['getOptionId'], [], '', false);
         $optCollectionMock->expects($this->once())->method('setIdFilter')->with($optionId)->willReturnSelf();
-        $optCollectionMock->expects($this->once())->method('getFirstItem')->willReturn($existingOptionMock);
+        $optCollectionMock->expects($this->once())->method('getItemById')
+            ->with($optionId)
+            ->willReturn($existingOptionMock);
         $existingOptionMock->expects($this->once())->method('getOptionId')->willReturn(null);
 
         $this->assertEquals($optionId, $this->model->save($productMock, $optionMock));
@@ -406,7 +408,9 @@ public function testSaveExistingOption()
             false
         );
         $optCollectionMock->expects($this->once())->method('setIdFilter')->with($optionId)->willReturnSelf();
-        $optCollectionMock->expects($this->once())->method('getFirstItem')->willReturn($existingOptionMock);
+        $optCollectionMock->expects($this->once())->method('getItemById')
+            ->with($optionId)
+            ->willReturn($existingOptionMock);
         $existingOptionMock->expects($this->any())->method('getOptionId')->willReturn($existingOptionId);
 
         $productLinkUpdate = $this->getMock('\Magento\Bundle\Api\Data\LinkInterface');
@@ -423,7 +427,7 @@ public function testSaveExistingOption()
             ->with($productMock, $optionId, $productLinkNew);
         $this->linkManagementMock->expects($this->once())
             ->method('saveChild')
-            ->with($productMock, $productLinkUpdate);
+            ->with($productSku, $productLinkUpdate);
         $this->linkManagementMock->expects($this->once())
             ->method('removeChild')
             ->with($productSku, $optionId, $productSkuToDelete);
@@ -476,7 +480,9 @@ public function testSaveExistingOptionNoSuchOption()
             false
         );
         $optCollectionMock->expects($this->once())->method('setIdFilter')->with($optionId)->willReturnSelf();
-        $optCollectionMock->expects($this->once())->method('getFirstItem')->willReturn($existingOptionMock);
+        $optCollectionMock->expects($this->once())->method('getItemById')
+            ->with($optionId)
+            ->willReturn($existingOptionMock);
         $existingOptionMock->expects($this->any())->method('getOptionId')->willReturn(null);
 
         $this->model->save($productMock, $optionMock);

app/code/Magento/Catalog/Test/Unit/Model/ProductLink/RepositoryTest.php

@@ -75,8 +75,8 @@ public function testSave()
         $linkedProductMock = $this->getMock('\Magento\Catalog\Model\Product', [], [], '', false);
         $this->productRepositoryMock->expects($this->exactly(2))->method('get')->will($this->returnValueMap(
             [
-                ['product', false, null, $productMock],
-                ['linkedProduct', false, null, $linkedProductMock],
+                ['product', false, null, false, $productMock],
+                ['linkedProduct', false, null, false, $linkedProductMock],
             ]
         ));
         $entityMock->expects($this->once())->method('getLinkedProductSku')->willReturn('linkedProduct');
@@ -102,8 +102,8 @@ public function testSaveWithException()
         $linkedProductMock = $this->getMock('\Magento\Catalog\Model\Product', [], [], '', false);
         $this->productRepositoryMock->expects($this->exactly(2))->method('get')->will($this->returnValueMap(
             [
-                ['product', false, null, $productMock],
-                ['linkedProduct', false, null, $linkedProductMock],
+                ['product', false, null, false, $productMock],
+                ['linkedProduct', false, null, false, $linkedProductMock],
             ]
         ));
         $entityMock->expects($this->once())->method('getLinkedProductSku')->willReturn('linkedProduct');
@@ -129,8 +129,8 @@ public function testDelete()
         $linkedProductMock = $this->getMock('\Magento\Catalog\Model\Product', [], [], '', false);
         $this->productRepositoryMock->expects($this->exactly(2))->method('get')->will($this->returnValueMap(
             [
-                ['product', false, null, $productMock],
-                ['linkedProduct', false, null, $linkedProductMock],
+                ['product', false, null, false, $productMock],
+                ['linkedProduct', false, null, false, $linkedProductMock],
             ]
         ));
         $entityMock->expects($this->once())->method('getLinkedProductSku')->willReturn('linkedProduct');
@@ -157,8 +157,8 @@ public function testDeleteWithInvalidDataException()
         $linkedProductMock = $this->getMock('\Magento\Catalog\Model\Product', [], [], '', false);
         $this->productRepositoryMock->expects($this->exactly(2))->method('get')->will($this->returnValueMap(
             [
-                ['product', false, null, $productMock],
-                ['linkedProduct', false, null, $linkedProductMock],
+                ['product', false, null, false, $productMock],
+                ['linkedProduct', false, null, false, $linkedProductMock],
             ]
         ));
         $entityMock->expects($this->once())->method('getLinkedProductSku')->willReturn('linkedProduct');
@@ -186,8 +186,8 @@ public function testDeleteWithNoSuchEntityException()
         $linkedProductMock = $this->getMock('\Magento\Catalog\Model\Product', [], [], '', false);
         $this->productRepositoryMock->expects($this->exactly(2))->method('get')->will($this->returnValueMap(
             [
-                ['product', false, null, $productMock],
-                ['linkedProduct', false, null, $linkedProductMock],
+                ['product', false, null, false, $productMock],
+                ['linkedProduct', false, null, false, $linkedProductMock],
             ]
         ));
         $entityMock->expects($this->exactly(2))->method('getLinkedProductSku')->willReturn('linkedProduct');