Object constructors shouldn't require an id if passed a $oRow object. Gets rid of
objectGetInstanceFromRow() since we can pass the row into the constructor instead.
This commit is contained in:
Alexander Nicolaysen Sørnes
committed by
WineHQ
WineHQ
parent
d0022decd4
commit
f7b24fab9a
@@ -17,6 +17,8 @@ function test_class($sClassName, $aTestMethods)
|
||||
$oObject = new ObjectManager("");
|
||||
$oObject->sClass = $sClassName;
|
||||
|
||||
$iAppId = 65555;
|
||||
|
||||
/* Check whether the required methods are present */
|
||||
if(!$oObject->checkMethods($aTestMethods, false))
|
||||
{
|
||||
@@ -32,6 +34,82 @@ function test_class($sClassName, $aTestMethods)
|
||||
echo "Failed to create and log in user.\n";
|
||||
return FALSE;
|
||||
}
|
||||
|
||||
/* Test the class constructor */
|
||||
if(!$oTestObject = create_object($sClassName, $oUser, $iAppId))
|
||||
return FALSE;
|
||||
|
||||
/* Should return 1 or more, since there may be entries present already */
|
||||
$hResult = $oTestObject->objectGetEntries(false, false);
|
||||
|
||||
if(!$hResult)
|
||||
{
|
||||
echo "Got '$hResult' instead of a valid MySQL handle\n";
|
||||
echo "FAILED\t\t$sClassName::$sClassName\n";
|
||||
$oTestObject->delete();
|
||||
return FALSE;
|
||||
}
|
||||
|
||||
if(!($oRow = mysql_fetch_object($hResult)))
|
||||
{
|
||||
echo "Failed to fetch MySQL object\n";
|
||||
echo "FAILED\t\t$sClassName::$sClassName\n";
|
||||
$oTestObject->delete();
|
||||
return FALSE;
|
||||
}
|
||||
|
||||
$oNewTestObject = new $sClassName(null, $oRow);
|
||||
switch($sClassName)
|
||||
{
|
||||
case "application":
|
||||
$iReceived = $oNewTestObject->iAppId;
|
||||
break;
|
||||
case "application_queue":
|
||||
$iReceived = $oNewTestObject->oApp->iAppId;
|
||||
break;
|
||||
case "distribution":
|
||||
$iReceived = $oNewTestObject->iDistributionId;
|
||||
break;
|
||||
case "downloadurl":
|
||||
$iReceived = $oNewTestObject->iId;
|
||||
break;
|
||||
case "maintainer":
|
||||
$iReceived = $oNewTestObject->iMaintainerId;
|
||||
break;
|
||||
case "testData":
|
||||
$iReceived = $oNewTestObject->iTestingId;
|
||||
break;
|
||||
case "testData_queue":
|
||||
$iReceived = $oNewTestObject->oTestData->iTestingId;
|
||||
break;
|
||||
case "vendor":
|
||||
$iReceived = $oNewTestObject->iVendorId;
|
||||
break;
|
||||
case "version":
|
||||
$iReceived = $oNewTestObject->iVersionId;
|
||||
break;
|
||||
case "version_queue":
|
||||
$iReceived = $oNewTestObject->oVersion->iVersionId;
|
||||
break;
|
||||
case "screenshot":
|
||||
$iReceived = $oNewTestObject->iScreenshotId;
|
||||
break;
|
||||
}
|
||||
|
||||
if(!$iReceived || !is_numeric($iReceived))
|
||||
{
|
||||
echo "Got '$iReceived' instead of a valid id\n";
|
||||
echo "FAILED\t\t$sClassName::$sClassName()\n";
|
||||
$oTestObject->delete();
|
||||
return FALSE;
|
||||
}
|
||||
|
||||
echo "PASSED\t\t$sClassName::$sClassName\n";
|
||||
|
||||
$oTestObject->delete();
|
||||
|
||||
cleanup($sClassName, $iAppId);
|
||||
|
||||
/* Test the methods' functionality */
|
||||
foreach($aTestMethods as $sMethod)
|
||||
{
|
||||
@@ -40,58 +118,8 @@ function test_class($sClassName, $aTestMethods)
|
||||
/* Should also test for queued entries, but vendor does not support
|
||||
queueing yet */
|
||||
case "objectGetEntries":
|
||||
$oUser->addPriv("admin");
|
||||
$oTestObject = new $sClassName();
|
||||
/* Set up one test entry, depending on class */
|
||||
switch($sClassName)
|
||||
{
|
||||
case "distribution":
|
||||
$oTestObject->sName = "Silly test distribution";
|
||||
$oTestObject->sUrl = "http://appdb.winehq.org/";
|
||||
break;
|
||||
case "downloadurl":
|
||||
$oTestObject->sUrl = "http://appdb.winehq.org/";
|
||||
$oTestObject->sDescription = "DANGER";
|
||||
$oTestObject->iVersionId = 65000; // Just needs to be != 0
|
||||
case "maintainer":
|
||||
$iAppId = 65555;
|
||||
$oApp = new application();
|
||||
|
||||
if(!$oApp->create())
|
||||
{
|
||||
echo "Failed to create application";
|
||||
return FALSE;
|
||||
}
|
||||
$oApp->iAppId = $iAppId;
|
||||
$oApp->update();
|
||||
$oTestObject->iUserId = $oUser->iUserId;
|
||||
$oTestObject->iAppId = $iAppId;
|
||||
$oTestObject->sMaintainReason = "I need it";
|
||||
break;
|
||||
}
|
||||
|
||||
/* We cannot use screenshot::create() because it requires an image */
|
||||
if($sClassName != "screenshot")
|
||||
{
|
||||
if(!$oTestObject->create())
|
||||
{
|
||||
echo "FAILED\t\t$sClassName::create()\n";
|
||||
return FALSE;
|
||||
}
|
||||
} else
|
||||
{
|
||||
$sQuery = "INSERT INTO appData
|
||||
(versionId, type, description, queued, submitterId)
|
||||
VALUES('?','?','?','?','?')";
|
||||
$hResult = query_parameters($sQuery, 0, "screenshot", "", "false",
|
||||
$oUser->iUserId);
|
||||
if(!$hResult)
|
||||
{
|
||||
echo "FAILED\t\t$sClassName to create screenshot entry";
|
||||
returN FALSE;
|
||||
}
|
||||
$oTestObject->iScreenshotId = mysql_insert_id();
|
||||
}
|
||||
if(!$oTestObject = create_object($sClassName, $oUser, $iAppId))
|
||||
return FALSE;
|
||||
|
||||
/* Should return 1 or more, since there may be entries present already */
|
||||
$iExpected = 1;
|
||||
@@ -102,15 +130,13 @@ function test_class($sClassName, $aTestMethods)
|
||||
{
|
||||
echo "Got $iReceived instead of >= $iExpected\n";
|
||||
echo "FAILED\t\t$sClassName::$sMethod\n";
|
||||
$oTestObject->delete();
|
||||
return FALSE;
|
||||
}
|
||||
|
||||
/* Class specific clean-up */
|
||||
switch($sClassName)
|
||||
{
|
||||
case "maintainer":
|
||||
$oApp->delete();
|
||||
break;
|
||||
}
|
||||
cleanup($sClassName, $iAppId);
|
||||
|
||||
echo "PASSED\t\t$sClassName::$sMethod\n";
|
||||
break;
|
||||
}
|
||||
@@ -122,6 +148,75 @@ function test_class($sClassName, $aTestMethods)
|
||||
return TRUE;
|
||||
}
|
||||
|
||||
function cleanup($sClassName, $iAppId)
|
||||
{
|
||||
switch($sClassName)
|
||||
{
|
||||
case "maintainer":
|
||||
$oApp = new application($iAppId);
|
||||
$oApp->delete();
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
function create_object($sClassName, $oUser, $iAppId)
|
||||
{
|
||||
$oUser->addPriv("admin");
|
||||
$oTestObject = new $sClassName();
|
||||
/* Set up one test entry, depending on class */
|
||||
switch($sClassName)
|
||||
{
|
||||
case "distribution":
|
||||
$oTestObject->sName = "Silly test distribution";
|
||||
$oTestObject->sUrl = "http://appdb.winehq.org/";
|
||||
break;
|
||||
case "downloadurl":
|
||||
$oTestObject->sUrl = "http://appdb.winehq.org/";
|
||||
$oTestObject->sDescription = "DANGER";
|
||||
$oTestObject->iVersionId = 65000; // Just needs to be != 0
|
||||
break;
|
||||
case "maintainer":
|
||||
$oApp = new application();
|
||||
|
||||
if(!$oApp->create())
|
||||
{
|
||||
echo "Failed to create application";
|
||||
return FALSE;
|
||||
}
|
||||
$oApp->iAppId = $iAppId;
|
||||
$oApp->update();
|
||||
$oTestObject->iUserId = $oUser->iUserId;
|
||||
$oTestObject->iAppId = $iAppId;
|
||||
$oTestObject->sMaintainReason = "I need it";
|
||||
break;
|
||||
}
|
||||
|
||||
/* We cannot use screenshot::create() because it requires an image */
|
||||
if($sClassName != "screenshot")
|
||||
{
|
||||
if(!$oTestObject->create())
|
||||
{
|
||||
echo "FAILED\t\t$sClassName::create()\n";
|
||||
return FALSE;
|
||||
}
|
||||
} else
|
||||
{
|
||||
$sQuery = "INSERT INTO appData
|
||||
(versionId, type, description, queued, submitterId)
|
||||
VALUES('?','?','?','?','?')";
|
||||
$hResult = query_parameters($sQuery, 0, "screenshot", "", "false",
|
||||
$oUser->iUserId);
|
||||
if(!$hResult)
|
||||
{
|
||||
echo "FAILED\t\t$sClassName to create screenshot entry";
|
||||
return FALSE;
|
||||
}
|
||||
$oTestObject->iScreenshotId = mysql_insert_id();
|
||||
}
|
||||
|
||||
return $oTestObject;
|
||||
}
|
||||
|
||||
function test_object_methods()
|
||||
{
|
||||
test_start(__FUNCTION__);
|
||||
@@ -132,7 +227,6 @@ function test_object_methods()
|
||||
"getOutputEditorValues",
|
||||
"objectGetEntries",
|
||||
"objectGetHeader",
|
||||
"objectGetInstanceFromRow",
|
||||
"objectOutputTableRow",
|
||||
"objectMakeLink",
|
||||
"objectMakeUrl",
|
||||
|
||||
Reference in New Issue
Block a user