MAGETWO-55193: Extension Management with Marketplace data

- CR fixes

Author: viktym

setup/src/Magento/Setup/Model/PackagesData.php

@@ -419,6 +419,7 @@ function ($item) {
     }
 
     /**
+     * Get MetaPackage for package
      *
      * @param array $packages
      * @return array

setup/src/Magento/Setup/Test/Unit/Model/PackagesDataTest.php

@@ -10,7 +10,6 @@
 use Magento\Framework\Composer\ComposerInformation;
 use Magento\Setup\Model\PackagesData;
 use PHPUnit_Framework_MockObject_MockObject as MockObject;
-use Magento\Setup\Model\Grid\TypeMapper;
 
 /**
  * Tests Magento\Setup\Model\PackagesData
@@ -23,44 +22,9 @@ class PackagesDataTest extends \PHPUnit_Framework_TestCase
      */
     private $packagesData;
 
-    /**
-     * @var ComposerInformation|MockObject
-     */
-    private $composerInformation;
-
     public function setUp()
     {
-        $this->composerInformation = $this->getMock(ComposerInformation::class, [], [], '', false);
-        $this->composerInformation->expects($this->any())->method('getInstalledMagentoPackages')->willReturn(
-            [
-                'magento/package-1' => [
-                    'name' => 'magento/package-1',
-                    'type' => 'magento2-module',
-                    'version'=> '1.0.0'
-                ],
-                'magento/package-2' => [
-                    'name' => 'magento/package-2',
-                    'type' => 'magento2-module',
-                    'version'=> '1.0.1'
-                ]
-            ]
-        );
-
-        $this->composerInformation->expects($this->any())->method('getRootRepositories')
-            ->willReturn(['repo1', 'repo2']);
-        $this->composerInformation->expects($this->any())->method('getPackagesTypes')
-            ->willReturn(['magento2-module']);
-        $rootPackage = $this->getMock(RootPackage::class, [], ['magento/project', '2.1.0', '2']);
-        $rootPackage->expects($this->any())
-            ->method('getRequires')
-            ->willReturn([
-                'magento/package-1' => '1.0.0',
-                'magento/package-2' => '1.0.1'
-            ]);
-        $this->composerInformation
-            ->expects($this->any())
-            ->method('getRootPackage')
-            ->willReturn($rootPackage);
+        $composerInformation = $this->getComposerInformation();
         $timeZoneProvider = $this->getMock(\Magento\Setup\Model\DateTime\TimeZoneProvider::class, [], [], '', false);
         $timeZone = $this->getMock(\Magento\Framework\Stdlib\DateTime\Timezone::class, [], [], '', false);
         $timeZoneProvider->expects($this->any())->method('get')->willReturn($timeZone);
@@ -117,18 +81,17 @@ public function setUp()
                 . '}}}'
             );
 
-        $typeMapper = $this->getMockBuilder(TypeMapper::class)
+        $typeMapper = $this->getMockBuilder(\Magento\Setup\Model\Grid\TypeMapper::class)
             ->disableOriginalConstructor()
             ->getMock();
         $typeMapper->expects(static::any())
             ->method('map')
             ->willReturnMap([
-                [ComposerInformation::MODULE_PACKAGE_TYPE, TypeMapper::MODULE_PACKAGE_TYPE],
+                [ComposerInformation::MODULE_PACKAGE_TYPE, \Magento\Setup\Model\Grid\TypeMapper::MODULE_PACKAGE_TYPE],
             ]);
 
-
         $this->packagesData = new PackagesData(
-            $this->composerInformation,
+            $composerInformation,
             $timeZoneProvider,
             $packagesAuth,
             $filesystem,
@@ -137,6 +100,45 @@ public function setUp()
         );
     }
 
+    /**
+     * @return ComposerInformation|MockObject
+     */
+    private function getComposerInformation()
+    {
+        $composerInformation = $this->getMock(ComposerInformation::class, [], [], '', false);
+        $composerInformation->expects($this->any())->method('getInstalledMagentoPackages')->willReturn(
+            [
+                'magento/package-1' => [
+                    'name' => 'magento/package-1',
+                    'type' => 'magento2-module',
+                    'version'=> '1.0.0'
+                ],
+                'magento/package-2' => [
+                    'name' => 'magento/package-2',
+                    'type' => 'magento2-module',
+                    'version'=> '1.0.1'
+                ]
+            ]
+        );
+
+        $composerInformation->expects($this->any())->method('getRootRepositories')
+            ->willReturn(['repo1', 'repo2']);
+        $composerInformation->expects($this->any())->method('getPackagesTypes')
+            ->willReturn(['magento2-module']);
+        $rootPackage = $this->getMock(RootPackage::class, [], ['magento/project', '2.1.0', '2']);
+        $rootPackage->expects($this->any())
+            ->method('getRequires')
+            ->willReturn([
+                'magento/package-1' => '1.0.0',
+                'magento/package-2' => '1.0.1'
+            ]);
+        $composerInformation->expects($this->any())
+            ->method('getRootPackage')
+            ->willReturn($rootPackage);
+
+        return $composerInformation;
+    }
+
     public function testSyncPackagesData()
     {
         $latestData = $this->packagesData->syncPackagesData();