MDL-19756 Updated unit tests

diff --git a/lib/outputlib.php b/lib/outputlib.php
index 22387bb4984aa201ce7d6feaac50603814f6e163..563d4bc4c5215c4ff429adf56dfe979eb3949096 100644 (file)
--- a/lib/outputlib.php
+++ b/lib/outputlib.php
@@ -2722,7 +2722,7 @@ class moodle_core_renderer extends moodle_renderer_base {
 
         foreach ($list->items as $listitem) {
             if ($listitem instanceof html_list) {
-                $output .= $this->output_start_tag('li');
+                $output .= $this->output_start_tag('li', array());
                 $output .= $this->htmllist($listitem);
                 $output .= $this->output_end_tag('li');
             } else if ($listitem instanceof html_list_item) {

diff --git a/lib/simpletest/testoutputlib.php b/lib/simpletest/testoutputlib.php
index e8ffc1286d2275a6066e312ef8f32def20c4abe3..5c1ecb3cc053a98954ac4718d2a007aaf8f3be7b 100644 (file)
--- a/lib/simpletest/testoutputlib.php
+++ b/lib/simpletest/testoutputlib.php
@@ -910,7 +910,7 @@ class moodle_core_renderer_test extends UnitTestCase {
         // Empty link object: link MUST have a text value
         $link = new html_link();
         $popupaction = new popup_action('click', 'http://test.com', 'my_popup');
-        $link->add_action_object($popupaction);
+        $link->add_action($popupaction);
         $this->expectException();
         $html = $this->renderer->link_to_popup($link);
     }
@@ -921,7 +921,7 @@ class moodle_core_renderer_test extends UnitTestCase {
         $link->url = 'http://test.com';
         $link->title = 'Popup window';
         $popupaction = new popup_action('click', 'http://test.com', 'my_popup');
-        $link->add_action_object($popupaction);
+        $link->add_action($popupaction);
 
         $html = $this->renderer->link_to_popup($link);
         $expectedattributes = array('title' => 'Popup window', 'href' => 'http://test.com');