composer/iTop
6
0
Fork 0
mirror of https://github.com/Combodo/iTop.git synced 2026-04-23 18:48:51 +02:00
Code Issues Packages Projects Releases Wiki Activity

module discovery classes renaming to avoid collision with customer DM definitions

Browse Source
This commit is contained in:
odain
2025-03-19 08:45:52 +01:00
parent 18a66e6884
commit 46d8591761
3 changed files with 25 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
tests/php-unit-tests/unitary-tests/setup/ModuleDependencyTest.php
View File

@@ -3,7 +3,7 @@
namespace Combodo\iTop\Test\UnitTest\Setup;
use Combodo\iTop\Test\UnitTest\ItopTestCase;
use ModuleDependency;
use iTopCoreModuleDependency;
class ModuleDependencyTest extends ItopTestCase
{
@@ -14,13 +14,13 @@ class ModuleDependencyTest extends ItopTestCase
public function testModuleDependencyInit_Invalid()
{
$oModuleDependency = new ModuleDependency('||');
$oModuleDependency = new iTopCoreModuleDependency('||');
$this->assertEquals(true, $this->GetNonPublicProperty($oModuleDependency, 'bAlwaysUnresolved'));
}
public function testModuleDependencyInit()
{
$oModuleDependency = new ModuleDependency('itop-config-mgmt/2.4.0');
$oModuleDependency = new iTopCoreModuleDependency('itop-config-mgmt/2.4.0');
$this->assertEquals(['itop-config-mgmt/2.4.0' => [ 'itop-config-mgmt', '>=', '2.4.0']], $this->GetNonPublicProperty($oModuleDependency, 'aParamsPerModuleId'));
$this->assertEquals(false, $this->GetNonPublicProperty($oModuleDependency, 'bAlwaysUnresolved'));
$this->assertEquals(['itop-config-mgmt'], $oModuleDependency->GetPotentialPrerequisiteModuleNames());
@@ -41,7 +41,7 @@ class ModuleDependencyTest extends ItopTestCase
public function testModuleDependencyInit_WithOperator($sOperator)
{
$sDepId = "itop-config-mgmt/{$sOperator}2.4.0";
$oModuleDependency = new ModuleDependency($sDepId);
$oModuleDependency = new iTopCoreModuleDependency($sDepId);
$this->assertEquals([$sDepId => [ 'itop-config-mgmt', $sOperator, '2.4.0']], $this->GetNonPublicProperty($oModuleDependency, 'aParamsPerModuleId'));
$this->assertEquals(false, $this->GetNonPublicProperty($oModuleDependency, 'bAlwaysUnresolved'));
$this->assertEquals(['itop-config-mgmt'], $oModuleDependency->GetPotentialPrerequisiteModuleNames());
@@ -63,7 +63,7 @@ class ModuleDependencyTest extends ItopTestCase
public function testModuleDependencyInit_WithOperand($sOperand, $sDepId)
{
$sDepId = "itop-structure/3.0.0 $sOperand itop-portal/<3.2.1";
$oModuleDependency = new ModuleDependency($sDepId);
$oModuleDependency = new iTopCoreModuleDependency($sDepId);
$this->assertEquals(['itop-structure/3.0.0' => [ 'itop-structure', ">=", '3.0.0'], 'itop-portal/<3.2.1' => [ 'itop-portal', "<", '3.2.1']], $this->GetNonPublicProperty($oModuleDependency, 'aParamsPerModuleId'));
$this->assertEquals(false, $this->GetNonPublicProperty($oModuleDependency, 'bAlwaysUnresolved'));
$this->assertEquals(['itop-structure', 'itop-portal'], $oModuleDependency->GetPotentialPrerequisiteModuleNames());
@@ -71,55 +71,55 @@ class ModuleDependencyTest extends ItopTestCase
public function testModuleIsDependencyResolved_SimpleCase_UnresolvedDueToMissingModule()
{
$oModuleDependency = new ModuleDependency('itop-config-mgmt/2.4.0');
$oModuleDependency = new iTopCoreModuleDependency('itop-config-mgmt/2.4.0');
$this->assertEquals(false, $oModuleDependency->IsDependencyResolved([], ['itop-config-mgmt' => true]));
}
public function testModuleIsDependencyResolved_SimpleCase_UnresolvedDueToWrongModuleVersion()
{
$oModuleDependency = new ModuleDependency('itop-config-mgmt/2.4.0');
$oModuleDependency = new iTopCoreModuleDependency('itop-config-mgmt/2.4.0');
$this->assertEquals(false, $oModuleDependency->IsDependencyResolved(['itop-config-mgmt' => '1.2.3'], ['itop-config-mgmt' => true]));
}
public function testModuleIsDependencyResolved_SimpleCase_ResolvedDue_MinorVersion()
{
$oModuleDependency = new ModuleDependency('itop-config-mgmt/2.4.1');
$oModuleDependency = new iTopCoreModuleDependency('itop-config-mgmt/2.4.1');
$this->assertEquals(true, $oModuleDependency->IsDependencyResolved(['itop-config-mgmt' => '2.4.1-1'], ['itop-config-mgmt' => true]));
}
public function testModuleIsDependencyResolved_SimpleCase_ResolvedDue_MinorVersion2()
{
$oModuleDependency = new ModuleDependency('itop-config-mgmt/2.4.1-1');
$oModuleDependency = new iTopCoreModuleDependency('itop-config-mgmt/2.4.1-1');
$this->assertEquals(true, $oModuleDependency->IsDependencyResolved(['itop-config-mgmt' => '2.4.1-2'], ['itop-config-mgmt' => true]));
}
public function testModuleIsDependencyResolved_SimpleCase_ResolvedDue_MinorVersion3()
{
$oModuleDependency = new ModuleDependency('itop-config-mgmt/2.4.1-1');
$oModuleDependency = new iTopCoreModuleDependency('itop-config-mgmt/2.4.1-1');
$this->assertEquals(true, $oModuleDependency->IsDependencyResolved(['itop-config-mgmt' => '2.4.2'], ['itop-config-mgmt' => true]));
}
public function testModuleIsDependencyResolved_SimpleCase_UnresolvedDueToWrongModuleVersion_MinorVersion()
{
$oModuleDependency = new ModuleDependency('itop-config-mgmt/2.4.1');
$oModuleDependency = new iTopCoreModuleDependency('itop-config-mgmt/2.4.1');
$this->assertEquals(false, $oModuleDependency->IsDependencyResolved(['itop-config-mgmt' => '2.4.0-1'], ['itop-config-mgmt' => true]));
}
public function testModuleIsDependencyResolved_SimpleCase_UnresolvedDueToWrongModuleVersion_MinorVersion2()
{
$oModuleDependency = new ModuleDependency('itop-config-mgmt/2.4.1-1');
$oModuleDependency = new iTopCoreModuleDependency('itop-config-mgmt/2.4.1-1');
$this->assertEquals(false, $oModuleDependency->IsDependencyResolved(['itop-config-mgmt' => '2.4.1'], ['itop-config-mgmt' => true]));
}
public function testModuleIsDependencyResolved_SimpleCase_UnresolvedDueToWrongModuleVersion_MinorVersion3()
{
$oModuleDependency = new ModuleDependency('itop-config-mgmt/2.4.1-1');
$oModuleDependency = new iTopCoreModuleDependency('itop-config-mgmt/2.4.1-1');
$this->assertEquals(false, $oModuleDependency->IsDependencyResolved(['itop-config-mgmt' => '2.4.1-0'], ['itop-config-mgmt' => true]));
}
public function testModuleIsDependencyResolved_SimpleCase_Resolved()
{
$oModuleDependency = new ModuleDependency('itop-config-mgmt/2.4.0');
$oModuleDependency = new iTopCoreModuleDependency('itop-config-mgmt/2.4.0');
$this->assertEquals(['itop-config-mgmt'], $oModuleDependency->GetPotentialPrerequisiteModuleNames());
$this->assertEquals(true, $oModuleDependency->IsDependencyResolved(['itop-config-mgmt' => '2.4.1'], ['itop-config-mgmt' => true]));
$this->assertEquals([], $oModuleDependency->GetPotentialPrerequisiteModuleNames());
@@ -128,7 +128,7 @@ class ModuleDependencyTest extends ItopTestCase
public function testIsDependencyResolved_AndOperand_UnresolvedDueToMissingModule()
{
$sDepId = "itop-structure/3.0.0 && itop-portal/3.2.1";
$oModuleDependency = new ModuleDependency($sDepId);
$oModuleDependency = new iTopCoreModuleDependency($sDepId);
$this->assertEquals(['itop-structure/3.0.0' => [ 'itop-structure', ">=", '3.0.0'], 'itop-portal/3.2.1' => [ 'itop-portal', ">=", '3.2.1']], $this->GetNonPublicProperty($oModuleDependency, 'aParamsPerModuleId'));
$this->assertEquals(false, $this->GetNonPublicProperty($oModuleDependency, 'bAlwaysUnresolved'));
$this->assertEquals(['itop-structure', 'itop-portal'], $oModuleDependency->GetPotentialPrerequisiteModuleNames());
@@ -140,7 +140,7 @@ class ModuleDependencyTest extends ItopTestCase
public function testIsDependencyResolved_AndOperand_UnresolvedDueToWrongModuleVersion()
{
$sDepId = "itop-structure/3.0.0 && itop-portal/3.2.1";
$oModuleDependency = new ModuleDependency($sDepId);
$oModuleDependency = new iTopCoreModuleDependency($sDepId);
$this->assertEquals(['itop-structure/3.0.0' => [ 'itop-structure', ">=", '3.0.0'], 'itop-portal/3.2.1' => [ 'itop-portal', ">=", '3.2.1']], $this->GetNonPublicProperty($oModuleDependency, 'aParamsPerModuleId'));
$this->assertEquals(false, $this->GetNonPublicProperty($oModuleDependency, 'bAlwaysUnresolved'));
$this->assertEquals(['itop-structure', 'itop-portal'], $oModuleDependency->GetPotentialPrerequisiteModuleNames());
@@ -152,7 +152,7 @@ class ModuleDependencyTest extends ItopTestCase
public function testIsDependencyResolved_AndOperand_Resolved()
{
$sDepId = "itop-structure/3.0.0 && itop-portal/3.2.1";
$oModuleDependency = new ModuleDependency($sDepId);
$oModuleDependency = new iTopCoreModuleDependency($sDepId);
$this->assertEquals(['itop-structure/3.0.0' => [ 'itop-structure', ">=", '3.0.0'], 'itop-portal/3.2.1' => [ 'itop-portal', ">=", '3.2.1']], $this->GetNonPublicProperty($oModuleDependency, 'aParamsPerModuleId'));
$this->assertEquals(false, $this->GetNonPublicProperty($oModuleDependency, 'bAlwaysUnresolved'));
$this->assertEquals(['itop-structure', 'itop-portal'], $oModuleDependency->GetPotentialPrerequisiteModuleNames());
@@ -164,7 +164,7 @@ class ModuleDependencyTest extends ItopTestCase
public function testIsDependencyResolved_OrOperand_ResolvedDueToMissingModule()
{
$sDepId = "itop-structure/3.0.0 || itop-portal/3.2.1";
$oModuleDependency = new ModuleDependency($sDepId);
$oModuleDependency = new iTopCoreModuleDependency($sDepId);
$this->assertEquals(['itop-structure/3.0.0' => [ 'itop-structure', ">=", '3.0.0'], 'itop-portal/3.2.1' => [ 'itop-portal', ">=", '3.2.1']], $this->GetNonPublicProperty($oModuleDependency, 'aParamsPerModuleId'));
$this->assertEquals(false, $this->GetNonPublicProperty($oModuleDependency, 'bAlwaysUnresolved'));
$this->assertEquals(['itop-structure', 'itop-portal'], $oModuleDependency->GetPotentialPrerequisiteModuleNames());

2
tests/php-unit-tests/unitary-tests/setup/ModuleDiscoveryTest.php
View File

@@ -270,7 +270,7 @@ MSG;
}
private function AddModule(array &$aUnresolvedDependencyModules, string $sModuleId, array $aDeps){
$oModule = new \Module($sModuleId);
$oModule = new \iTopCoreModule($sModuleId);
$oModule->SetDependencies($aDeps);
$aUnresolvedDependencyModules[$sModuleId]= $oModule;
}

12
tests/php-unit-tests/unitary-tests/setup/ModuleTest.php
View File

@@ -13,7 +13,7 @@ class ModuleTest extends ItopTestCase
public function testModuleInit()
{
$oModule = new \Module("itop-config-mgmt/2.4.0");
$oModule = new \iTopCoreModule("itop-config-mgmt/2.4.0");
$this->assertEquals("itop-config-mgmt", $oModule->GetModuleName());
$this->assertEquals("2.4.0", $oModule->GetVersion());
$this->assertEquals("itop-config-mgmt/2.4.0", $oModule->GetModuleId());
@@ -21,7 +21,7 @@ class ModuleTest extends ItopTestCase
public function testModuleInit_NoVersion()
{
$oModule = new \Module("itop-config-mgmt");
$oModule = new \iTopCoreModule("itop-config-mgmt");
$this->assertEquals("itop-config-mgmt", $oModule->GetModuleName());
$this->assertEquals("1.0.0", $oModule->GetVersion());
$this->assertEquals("itop-config-mgmt", $oModule->GetModuleId());
@@ -29,7 +29,7 @@ class ModuleTest extends ItopTestCase
public function testIsResolved_Unresolved()
{
$oModule = new \Module("itop-bridge-cmdb-ticket");
$oModule = new \iTopCoreModule("itop-bridge-cmdb-ticket");
$oModule->SetDependencies(['itop-config-mgmt/2.7.1', 'itop-tickets/2.7.0']);
$this->assertEquals(['itop-config-mgmt', 'itop-tickets'], $oModule->GetUnresolvedDependencyModuleNames());
@@ -40,7 +40,7 @@ class ModuleTest extends ItopTestCase
public function testSetDependencies()
{
$oModule = new \Module("itop-bridge-datacenter-mgmt-services");
$oModule = new \iTopCoreModule("itop-bridge-datacenter-mgmt-services");
$oModule->SetDependencies([
'itop-config-mgmt/2.7.1',
'itop-service-mgmt/2.7.1 || itop-service-mgmt-provider/2.7.1',
@@ -58,7 +58,7 @@ class ModuleTest extends ItopTestCase
public function testIsResolved_PartialResolution()
{
$oModule = new \Module("itop-bridge-cmdb-ticket");
$oModule = new \iTopCoreModule("itop-bridge-cmdb-ticket");
$oModule->SetDependencies(['itop-config-mgmt/2.7.1', 'itop-tickets/2.7.0']);
$this->assertEquals(['itop-config-mgmt', 'itop-tickets'], $oModule->GetUnresolvedDependencyModuleNames());
@@ -69,7 +69,7 @@ class ModuleTest extends ItopTestCase
public function testIsResolved_OK()
{
$oModule = new \Module("itop-bridge-cmdb-ticket");
$oModule = new \iTopCoreModule("itop-bridge-cmdb-ticket");
$oModule->SetDependencies(['itop-config-mgmt/2.7.1', 'itop-tickets/2.7.0']);
$this->assertEquals(['itop-config-mgmt', 'itop-tickets'], $oModule->GetUnresolvedDependencyModuleNames());