claunia/qemudb
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

test_om_objects: Cleanup properly when testing objectGetEntries

Browse Source
This commit is contained in:
Alexander Nicolaysen Sørnes
2008-01-23 14:28:19 +01:00
committed by Chris Morgan
parent 1f081f4be1
commit 55d9f32c0a
1 changed files with 14 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
unit_test/test_om_objects.php
View File

@@ -111,13 +111,12 @@ function test_class($sClassName, $aTestMethods)
{ {
error("Got $iReceived instead of >= $iExpected"); error("Got $iReceived instead of >= $iExpected");
error("FAILED\t\t$sClassName::$sMethod"); error("FAILED\t\t$sClassName::$sMethod");
$oTestObject->purge(); cleanup_and_purge($oTestObject, $oUser);
return FALSE; return FALSE;
} }
/* Class specific clean-up */ /* Class specific clean-up */
cleanup($oTestObject); cleanup_and_purge($oTestObject, $oUser);
$oTestObject->purge();
echo "PASSED\t\t$sClassName::$sMethod\n"; echo "PASSED\t\t$sClassName::$sMethod\n";
break; break;
@@ -183,6 +182,18 @@ function cleanup($oObject)
} }
} }
function cleanup_and_purge($oObject, $oUser)
{
$bWasAdmin = $oUser->hasPriv('admin');
$oUser->addPriv('admin');
cleanup($oObject);
$oObject->purge();
if(!$bWasAdmin)
$oUser->delPriv('admin');
}
function create_object($sClassName, $oUser, $bAsAdmin = true) function create_object($sClassName, $oUser, $bAsAdmin = true)
{ {
if($bAsAdmin) if($bAsAdmin)