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

💚 Fix unit tests

Browse Source
This commit is contained in:
Eric
2019-10-17 12:19:23 +02:00
parent 36b325f71d
commit 5a1a6cf6f0
2 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
test/core/OQLToSQLAllClassesTest.php
View File

@@ -301,11 +301,7 @@ class OQLToSQLAllCLassesTest extends ItopDataTestCase
continue;
}
$sOQL = "SELECT $sClass";
$aOrderBy = array();
if (MetaModel::IsValidAttCode($sClass, 'friendlyname'))
{
$aOrderBy["$sClass.friendlyname"] = true;
}
$aOrderBy = MetaModel::GetOrderByDefault($sClass);
$aData[$sOQL] = array($sOQL, $aOrderBy, array(), null, null, 10, 0);
}

5
test/core/OQLToSQLTest.php
View File

@@ -205,6 +205,11 @@ class OQLToSQLTest extends ItopDataTestCase
}
$oSearch = DBSearch::FromOQL($sOQL);
$sClass = $oSearch->GetClass();
if (empty($aOrderBy))
{
$aOrderBy = MetaModel::GetOrderByDefault($sClass);
}
$sSQLCount = $oSearch->MakeSelectQuery($aOrderBy, $aArgs, $aAttToLoad, $aExtendedDataSpec, 0, 0, true);
$fStart = $this->GetMicroTime();