Backup MDL-24906 Fixed unit test failures

diff --git a/backup/util/structure/backup_optigroup.class.php b/backup/util/structure/backup_optigroup.class.php
index 6d7b3ef..e4ee2c9 100644 (file)
--- a/backup/util/structure/backup_optigroup.class.php
+++ b/backup/util/structure/backup_optigroup.class.php
@@ -46,7 +46,9 @@ class backup_optigroup extends base_optigroup implements processable {
 
     public function add_child($element) {
         if (!($element instanceof backup_optigroup_element)) { // parameter must be backup_optigroup_element
-            if (!$found = get_class($element)) {
+            if (is_object($element)) {
+                   $found = get_class($element);
+            } else {
                 $found = 'non object';
             }
             throw new base_optigroup_exception('optigroup_element_incorrect', $found);

diff --git a/backup/util/xml/simpletest/testwriter.php b/backup/util/xml/simpletest/testwriter.php
index 1307b8c..f0aa868 100644 (file)
--- a/backup/util/xml/simpletest/testwriter.php
+++ b/backup/util/xml/simpletest/testwriter.php
@@ -303,6 +303,9 @@ class xml_writer_test extends UnitTestCase {
         $xw->stop();
         $result = $xo->get_allcontents();
         $fcontents = file_get_contents($CFG->dirroot . '/backup/util/xml/simpletest/fixtures/test1.xml');
+
+        // Normalise carriage return characters.
+        $fcontents = str_replace("\r\n", "\n", $fcontents);
         $this->assertEqual(trim($result), trim($fcontents));
     }
 }