L-electron-Rare/moodle
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

MDL-17412: Completion system unit tests were broken

Browse Source
This commit is contained in:
sam_marshall
2008-11-26 13:59:24 +00:00
parent 101cad083a
commit 002f56ef79
2 changed files with 14 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/completionlib.php
+1 -4
View File
@@ -623,7 +623,7 @@ class completion_info {
$users = $this->internal_get_tracked_users($sortfirstname, $groupid);
$resultobject->start=$start;
$resultobject->total=count($users);
$users=array_slice($users,$start,$pagesize);
$users=array_slice($users,$start,$pagesize==0 ? count($users)-$start : $pagesize);
// Get progress information for these users in groups of 1, 000 (if needed)
// to avoid making the SQL IN too long
@@ -649,9 +649,6 @@ FROM
WHERE
cm.course=? AND cmc.userid $insql
", $params);
if (!$rs) {
$this->internal_systemerror('Failed to obtain completion progress');
}
foreach ($rs as $progress) {
$resultobject->users[$progress->userid]->progress[$progress->coursemoduleid]=$progress;
}
lib/simpletest/testcompletionlib.php
+13 -10
View File
@@ -90,7 +90,7 @@ class TimeModifiedExpectation extends SimpleExpectation {
class completionlib_test extends MoodleUnitTestCase {
var $realdb,$realcfg,$realsession,$realuser;
function setUp() {
function setUp() {
global $DB,$CFG,$SESSION,$USER;
$this->realdb=$DB;
$this->realcfg=$CFG;
@@ -327,7 +327,8 @@ WHERE
$c=new completion_cutdown();
$c->__construct((object)array('id'=>42));
$cm=(object)array('id'=>13,'course'=>42);
$cm=(object)array('id'=>13,'course'=>42,
'completion'=>COMPLETION_TRACKING_AUTOMATIC);
$DB->setReturnValue('get_recordset',new fake_recordset(array(
(object)array('id'=>1,'userid'=>100),
@@ -525,12 +526,14 @@ WHERE
$progress1,$progress2
)));
$this->assertEqual(array(
100 => (object)array('id'=>100,'firstname'=>'Woot','lastname'=>'Plugh',
'progress'=>array(13=>$progress1)),
201 => (object)array('id'=>201,'firstname'=>'Vroom','lastname'=>'Xyzzy',
'progress'=>array(14=>$progress2)),
),$c->get_progress_all(false));
$this->assertEqual((object)array(
'start'=>0,'total'=>2,
'users'=>array(
100 => (object)array('id'=>100,'firstname'=>'Woot','lastname'=>'Plugh',
'progress'=>array(13=>$progress1)),
201 => (object)array('id'=>201,'firstname'=>'Vroom','lastname'=>'Xyzzy',
'progress'=>array(14=>$progress2)),
)),$c->get_progress_all(false));
// 2) With more than 1,000 results
$c->expectAt(1,'internal_get_tracked_users',array(true,3));
@@ -572,8 +575,8 @@ WHERE
$result=$c->get_progress_all(true,3);
$resultok=true;
$resultok = $resultok && ($ids==array_keys($result));
foreach($result as $userid => $data) {
$resultok = $resultok && ($ids==array_keys($result->users));
foreach($result->users as $userid => $data) {
$resultok = $resultok && $data->firstname=='frog';
$resultok = $resultok && $data->lastname==$userid;
$resultok = $resultok && $data->id==$userid;