MAGETWO-69717: Custom option value IDs changed after import

Author: Alex Paliarush

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

@@ -251,22 +251,15 @@ protected function setUp()
         $entityMetadataMock->expects($this->any())
             ->method('getLinkField')
             ->willReturn('entity_id');
-        $optionValueCollectionFactoryMock = $this->getMock(
-            \Magento\Catalog\Model\ResourceModel\Product\Option\Value\CollectionFactory::class,
-            [],
-            [],
-            '',
-            false
+        $optionValueCollectionFactoryMock = $this->createMock(
+            \Magento\Catalog\Model\ResourceModel\Product\Option\Value\CollectionFactory::class
         );
-        $optionValueCollectionMock = $this->getMock(
+        $optionValueCollectionMock = $this->createPartialMock(
             \Magento\Catalog\Model\ResourceModel\Product\Option\Value\Collection::class,
-            ['getIterator', 'addTitleToResult'],
-            [],
-            '',
-            false
+            ['getIterator', 'addTitleToResult']
         );
         $optionValueCollectionMock->expects($this->any())->method('getIterator')
-            ->willReturn($this->getMock(\Traversable::class, [], [], '', false));
+            ->willReturn($this->createMock(\Traversable::class));
         $optionValueCollectionFactoryMock->expects($this->any())
             ->method('create')->willReturn($optionValueCollectionMock);
         $modelClassArgs = [