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

Test: fixed automated tests that were abusively failing due to a few new magic attributes

Browse Source 
SVN:trunk[4746]
This commit is contained in:
Romain Quetiez
2017-05-22 14:04:50 +00:00
parent 80121b89c3
commit ba0a9709f4
1 changed files with 39 additions and 153 deletions
Download Patch File Download Diff File Expand all files Collapse all files

192
test/testlist.inc.php
View File

@@ -3635,7 +3635,39 @@ class TestEmailAsynchronous extends TestBizModel
}
}
class TestLinkSetRecording_NN_WithDuplicates extends TestBizModel
abstract class TestLinkSet extends TestBizModel
{
protected function StandardizedDump($oSet, $sAttPrefixToIgnore)
{
if (!$oSet->m_bLoaded) $oSet->Load();
$oSet->Rewind();
$aRet = array();
while($oObject = $oSet->Fetch())
{
$aValues = array();
foreach(MetaModel::ListAttributeDefs(get_class($oObject)) as $sAttCode => $oAttDef)
{
//if (!$oAttDef->IsPartOfFingerprint()) continue;
//if ($oAttDef->IsMagic()) continue;
if ($sAttCode == 'friendlyname') continue;
if (substr($sAttCode, -strlen('_archive_flag')) == '_archive_flag') continue;
if (substr($sAttCode, -strlen('_obsolescence_flag')) == '_obsolescence_flag') continue;
if (substr($sAttCode, 0, strlen($sAttPrefixToIgnore)) == $sAttPrefixToIgnore) continue;
if ($oAttDef->IsScalar())
{
$aValues[] = $oObject->Get($sAttCode);
}
}
$aRet[] = implode(', ', $aValues);
}
sort($aRet);
return $aRet;
}
}
class TestLinkSetRecording_NN_WithDuplicates extends TestLinkSet
{
static public function GetName()
{
@@ -3916,69 +3948,19 @@ class TestLinkSetRecording_NN_WithDuplicates extends TestBizModel
array(
'networkdevice_id' => $iDev2,
'connectableci_id' => $iServer,
'network_port' => '',
'network_port' => 'portX',
'device_port' => '',
),
),
'expected-res' => array (
"$iDev2, test device B, unit test linkset, , , downlink, test device B",
"$iDev2, test device B, unit test linkset, portX, , downlink, test device B",
),
'history_added' => 1,
'history_removed' => 0,
'history_modified' => 0,
),
array(
'description' => 'Create a second link from scratch, pointing to the same server and no port, to prepare for the next test case',
'links' => array(
array(
'id' => "SELECT lnkConnectableCIToNetworkDevice WHERE networkdevice_id = $iDev2 AND connectableci_id = $iServer",
'networkdevice_id' => $iDev2,
'connectableci_id' => $iServer,
'network_port' => '',
'device_port' => '',
),
array(
'networkdevice_id' => $iDev2,
'connectableci_id' => $iServer,
'network_port' => 'X',
'device_port' => '',
),
),
'expected-res' => array (
"$iDev2, test device B, unit test linkset, , , downlink, test device B",
"$iDev2, test device B, unit test linkset, X, , downlink, test device B",
),
'history_added' => 1,
'history_removed' => 0,
'history_modified' => 0,
),
array(
'description' => 'Create a second link from scratch, pointing to the same server and no port, to prepare for the next test case',
'links' => array(
array(
'id' => "SELECT lnkConnectableCIToNetworkDevice WHERE networkdevice_id = $iDev2 AND connectableci_id = $iServer",
'networkdevice_id' => $iDev2,
'connectableci_id' => $iServer,
'network_port' => '',
'device_port' => '',
),
array(
'networkdevice_id' => $iDev2,
'connectableci_id' => $iServer,
'network_port' => 'X',
'device_port' => '',
),
),
'expected-res' => array (
"$iDev2, test device B, unit test linkset, , , downlink, test device B",
"$iDev2, test device B, unit test linkset, X, , downlink, test device B",
),
'history_added' => 1,
'history_removed' => 0,
'history_modified' => 0,
),
array(
'description' => 'Device B twice (same characteristics) - known issue #1145',
'description' => 'Device B twice (same characteristics) - known issue #1145 (test failing until we fix it)',
'links' => array(
array(
'networkdevice_id' => $iDev2,
@@ -4092,33 +4074,9 @@ class TestLinkSetRecording_NN_WithDuplicates extends TestBizModel
}
}
}
protected function StandardizedDump($oSet, $sAttPrefixToIgnore)
{
if (!$oSet->m_bLoaded) $oSet->Load();
$oSet->Rewind();
$aRet = array();
while($oObject = $oSet->Fetch())
{
$aValues = array();
foreach(MetaModel::ListAttributeDefs(get_class($oObject)) as $sAttCode => $oAttDef)
{
if ($sAttCode == 'friendlyname') continue;
if (substr($sAttCode, 0, strlen($sAttPrefixToIgnore)) == $sAttPrefixToIgnore) continue;
if ($oAttDef->IsScalar())
{
$aValues[] = $oObject->Get($sAttCode);
}
}
$aRet[] = implode(', ', $aValues);
}
sort($aRet);
return $aRet;
}
}
class TestLinkSetRecording_NN_NoDuplicates extends TestBizModel
class TestLinkSetRecording_NN_NoDuplicates extends TestLinkSet
{
static public function GetName()
{
@@ -4435,33 +4393,9 @@ class TestLinkSetRecording_NN_NoDuplicates extends TestBizModel
}
}
}
protected function StandardizedDump($oSet, $sAttPrefixToIgnore)
{
if (!$oSet->m_bLoaded) $oSet->Load();
$oSet->Rewind();
$aRet = array();
while($oObject = $oSet->Fetch())
{
$aValues = array();
foreach(MetaModel::ListAttributeDefs(get_class($oObject)) as $sAttCode => $oAttDef)
{
if ($sAttCode == 'friendlyname') continue;
if (substr($sAttCode, 0, strlen($sAttPrefixToIgnore)) == $sAttPrefixToIgnore) continue;
if ($oAttDef->IsScalar())
{
$aValues[] = $oObject->Get($sAttCode);
}
}
$aRet[] = implode(', ', $aValues);
}
sort($aRet);
return $aRet;
}
}
class TestLinkSetRecording_1N extends TestBizModel
class TestLinkSetRecording_1N extends TestLinkSet
{
static public function GetName()
{
@@ -4663,34 +4597,10 @@ class TestLinkSetRecording_1N extends TestBizModel
}
}
}
protected function StandardizedDump($oSet, $sAttPrefixToIgnore)
{
if (!$oSet->m_bLoaded) $oSet->Load();
$oSet->Rewind();
$aRet = array();
while($oObject = $oSet->Fetch())
{
$aValues = array();
foreach(MetaModel::ListAttributeDefs(get_class($oObject)) as $sAttCode => $oAttDef)
{
if ($sAttCode == 'friendlyname') continue;
if (substr($sAttCode, 0, strlen($sAttPrefixToIgnore)) == $sAttPrefixToIgnore) continue;
if ($oAttDef->IsScalar())
{
$aValues[] = $oObject->Get($sAttCode);
}
}
$aRet[] = implode(', ', $aValues);
}
sort($aRet);
return $aRet;
}
}
class TestLinkSetRecording_1NAdd_Remove extends TestBizModel
class TestLinkSetRecording_1NAdd_Remove extends TestLinkSet
{
static public function GetName()
{
@@ -4908,30 +4818,6 @@ class TestLinkSetRecording_1NAdd_Remove extends TestBizModel
}
}
}
protected function StandardizedDump($oSet, $sAttPrefixToIgnore)
{
if (!$oSet->m_bLoaded) $oSet->Load();
$oSet->Rewind();
$aRet = array();
while($oObject = $oSet->Fetch())
{
$aValues = array();
foreach(MetaModel::ListAttributeDefs(get_class($oObject)) as $sAttCode => $oAttDef)
{
if ($sAttCode == 'friendlyname') continue;
if (substr($sAttCode, 0, strlen($sAttPrefixToIgnore)) == $sAttPrefixToIgnore) continue;
if ($oAttDef->IsScalar())
{
$aValues[] = $oObject->Get($sAttCode);
}
}
$aRet[] = implode(', ', $aValues);
}
sort($aRet);
return $aRet;
}
}
class TestDateTimeFormats extends TestBizModel