diff --git a/availability/tests/tree_test.php b/availability/tests/tree_test.php index b19d62c8b2b..ebabc088e58 100644 --- a/availability/tests/tree_test.php +++ b/availability/tests/tree_test.php @@ -341,9 +341,15 @@ class tree_testcase extends \advanced_testcase { * @param int $userid User id */ protected function get_available_results($structure, \core_availability\info $info, $userid) { + global $PAGE; $tree = new tree($structure); $result = $tree->check_available(false, $info, true, $userid); - return array($result->is_available(), $tree->get_result_information($info, $result)); + $information = $tree->get_result_information($info, $result); + if (!is_string($information)) { + $renderer = $PAGE->get_renderer('core', 'availability'); + $information = $renderer->render($information); + } + return array($result->is_available(), $information); } /** @@ -389,6 +395,8 @@ class tree_testcase extends \advanced_testcase { * Tests the get_full_information() function. */ public function test_get_full_information() { + global $PAGE; + $renderer = $PAGE->get_renderer('core', 'availability'); // Setup. $info = new \core_availability\mock_info(); @@ -417,7 +425,7 @@ class tree_testcase extends \advanced_testcase { self::mock(array('m' => 3))); $tree = new tree($structure); $this->assertRegExp('~.*get_full_information($info)); + $renderer->render($tree->get_full_information($info))); // Test intro messages before list. First, OR message. $structure->c = array( @@ -426,13 +434,13 @@ class tree_testcase extends \advanced_testcase { ); $tree = new tree($structure); $this->assertRegExp('~Not available unless any of:.*