Merge branch 'MDL-49954-master' of git://github.com/jleyva/moodle

This commit is contained in:
David Monllao 2015-05-04 15:16:01 +08:00
commit 119ff65c0e

View File

@ -278,7 +278,7 @@ class mod_forum_external_testcase extends externallib_advanced_testcase {
// Create what we expect to be returned when querying the forums.
$expecteddiscussions = array();
$expecteddiscussions[$discussion1->id] = array(
$expecteddiscussions[] = array(
'id' => $discussion1->id,
'course' => $discussion1->course,
'forum' => $discussion1->forum,
@ -305,7 +305,7 @@ class mod_forum_external_testcase extends externallib_advanced_testcase {
'lastuserpicture' => $user4->picture,
'lastuseremail' => $user4->email
);
$expecteddiscussions[$discussion2->id] = array(
$expecteddiscussions[] = array(
'id' => $discussion2->id,
'course' => $discussion2->course,
'forum' => $discussion2->forum,
@ -335,7 +335,7 @@ class mod_forum_external_testcase extends externallib_advanced_testcase {
// Call the external function passing forum ids.
$discussions = mod_forum_external::get_forum_discussions(array($forum1->id, $forum2->id));
external_api::clean_returnvalue(mod_forum_external::get_forum_discussions_returns(), $discussions);
$discussions = external_api::clean_returnvalue(mod_forum_external::get_forum_discussions_returns(), $discussions);
$this->assertEquals($expecteddiscussions, $discussions);
// Some debugging is going to be produced, this is because we switch PAGE contexts in the get_forum_discussions function,
// the switch happens when the validate_context function is called inside a foreach loop.