MAGETWO-56042: The module which do not have composer.json file shows on the grid with empty data

- Update unit test

Author: viktym

setup/src/Magento/Setup/Model/Grid/Module.php

@@ -19,6 +19,12 @@
  */
 class Module
 {
+    /**
+     * Const for unknown package name and version
+     */
+    const UNKNOWN_PACKAGE_NAME = 'unknown';
+    const UNKNOWN_VERSION = '—';
+
     /**
      * @var ComposerInformation
      */
@@ -128,11 +134,11 @@ private function getModuleRequiredBy($name)
         foreach ($modules as $moduleName) {
             $packageName = $this->packageInfo->getPackageName($moduleName);
             $result[] = [
-                'name' => $packageName ?: 'unknown',
+                'name' => $packageName ?: self::UNKNOWN_PACKAGE_NAME,
                 'moduleName' => $moduleName,
                 'type' => $this->typeMapper->map($packageName, ComposerInformation::MODULE_PACKAGE_TYPE),
                 'enable' => $this->moduleList->has($moduleName),
-                'version' => $this->packageInfo->getVersion($moduleName) ?: '—'
+                'version' => $this->packageInfo->getVersion($moduleName) ?: self::UNKNOWN_VERSION
             ];
         }
 
@@ -151,10 +157,10 @@ private function getInstalledModules()
         foreach ($allModules as $module) {
             $packageName = $this->packageInfo->getPackageName($module);
             $name = $packageName ?: $module;
-            $modules[$name]['name'] = $packageName ?: 'unknown';
+            $modules[$name]['name'] = $packageName ?: self::UNKNOWN_PACKAGE_NAME;
             $modules[$name]['moduleName'] = $module;
             $modules[$name]['type'] = ComposerInformation::MODULE_PACKAGE_TYPE;
-            $modules[$name]['version'] = $this->packageInfo->getVersion($module) ?: '—';
+            $modules[$name]['version'] = $this->packageInfo->getVersion($module) ?: self::UNKNOWN_VERSION;
         }
 
         return $modules;

setup/src/Magento/Setup/Test/Unit/Model/Grid/ModuleTest.php

@@ -91,19 +91,12 @@ public function setUp()
                 'version' => '1.0.0'
             ]
         ];
-        $this->allComponentData = [
-            'magento/sample-module-one' => [
-                'name' => 'magento/sample-module-one',
-                'type' => 'magento2-module',
-                'version' => '1.0.0'
-            ],
-            'magento/sample-module-two' => [
-                'name' => 'magento/sample-module-two',
-                'type' => 'magento2-module',
-                'version' => '1.0.0'
-            ]
+
+        $fullModuleList = [
+            'Sample_ModuleOne', 'Sample_ModuleTwo'
         ];
 
+
         $this->composerInformationMock = $this->getMockBuilder(ComposerInformation::class)
             ->disableOriginalConstructor()
             ->getMock();
@@ -126,7 +119,7 @@ public function setUp()
             ->getMock();
         $this->fullModuleListMock->expects(static::any())
             ->method('getNames')
-            ->willReturn(array_keys($this->allComponentData));
+            ->willReturn($fullModuleList);
 
         $this->packageInfoMock = $this->getMockBuilder(PackageInfo::class)
             ->disableOriginalConstructor()
@@ -165,18 +158,14 @@ public function testGetList()
             ->method('create')
             ->willReturn($this->packageInfoMock);
 
-        $this->packageInfoMock->expects(static::exactly(2))
-            ->method('getModuleName')
-            ->willReturnMap([
-                ['magento/sample-module-one', 'Sample_Module_One'],
-                ['magento/sample-module-two', 'Sample_Module_Two'],
-            ]);
+        $this->packageInfoMock->expects(static::never())
+            ->method('getModuleName');
 
         $this->typeMapperMock->expects(static::exactly(2))
             ->method('map')
             ->willReturnMap([
                 ['magento/sample-module-one', 'magento2-module', 'Module'],
-                ['magento/sample-module-two', 'magento2-module', 'Module'],
+                ['Sample_ModuleTwo', 'magento2-module', 'Module'],
             ]);
 
         $this->packageInfoMock->expects(static::exactly(2))
@@ -185,14 +174,14 @@ public function testGetList()
         $this->packageInfoMock->expects(static::exactly(2))
             ->method('getPackageName')
             ->willReturnMap([
-                    ['magento/sample-module-one', $this->allComponentData['magento/sample-module-one']['name']],
-                    ['magento/sample-module-two', $this->allComponentData['magento/sample-module-two']['name']],
+                    ['Sample_ModuleOne', 'magento/sample-module-one'],
+                    ['Sample_ModuleTwo', ''],
                 ]);
         $this->packageInfoMock->expects(static::exactly(2))
             ->method('getVersion')
             ->willReturnMap([
-                ['magento/sample-module-one', $this->allComponentData['magento/sample-module-one']['version']],
-                ['magento/sample-module-two', $this->allComponentData['magento/sample-module-two']['version']],
+                ['Sample_ModuleOne', '1.0.0'],
+                ['Sample_ModuleTwo', ''],
             ]);
         $this->moduleListMock->expects(static::exactly(2))
             ->method('has')
@@ -207,16 +196,16 @@ public function testGetList()
                 'type' => 'Module',
                 'version' => '1.0.0',
                 'vendor' => 'Magento',
-                'moduleName' => 'Sample_Module_One',
+                'moduleName' => 'Sample_ModuleOne',
                 'enable' => true,
                 'requiredBy' => []
             ],
             [
-                'name' => 'magento/sample-module-two',
+                'name' => Module::UNKNOWN_PACKAGE_NAME,
                 'type' => 'Module',
-                'version' => '1.0.0',
-                'vendor' => 'Magento',
-                'moduleName' => 'Sample_Module_Two',
+                'version' => Module::UNKNOWN_VERSION,
+                'vendor' => 'Sample',
+                'moduleName' => 'Sample_ModuleTwo',
                 'enable' => true,
                 'requiredBy' => []
             ]