MDL-81581 phpunit: Move multiple assert_same_xml() to common one

question/engine/tests/helpers.php

@@ -602,6 +602,19 @@ public function assert_select_options($expectation, $html) {
         }
         return;
     }
+
+    /**
+     * Check that 2 XML strings are the same, ignoring differences in line endings.
+     *
+     * @param string $expectedxml The expected XML string
+     * @param string $xml The XML string to check
+     */
+    public function assert_same_xml($expectedxml, $xml) {
+        $this->assertEquals(
+            str_replace("\r\n", "\n", $expectedxml),
+            str_replace("\r\n", "\n", $xml)
+        );
+    }
 }
 
 

question/format/xml/tests/xmlformat_test.php

@@ -47,11 +47,6 @@
  * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
 class xmlformat_test extends \question_testcase {
-    public function assert_same_xml($expectedxml, $xml) {
-        $this->assertEquals(str_replace("\r\n", "\n", $expectedxml),
-                str_replace("\r\n", "\n", $xml));
-    }
-
     public function make_test_question() {
         global $USER;
         $q = new \stdClass();

question/type/ddwtos/tests/question_type_test.php

@@ -47,11 +47,6 @@ protected function tearDown(): void {
         $this->qtype = null;
     }
 
-    public function assert_same_xml($expectedxml, $xml) {
-        $this->assertEquals(str_replace("\r\n", "\n", $expectedxml),
-                str_replace("\r\n", "\n", $xml));
-    }
-
     /**
      * Get some test question data.
      *

question/type/gapselect/tests/question_type_test.php

@@ -46,17 +46,6 @@ protected function tearDown(): void {
         $this->qtype = null;
     }
 
-    /**
-     * Asserts that two strings containing XML are the same ignoring the line-endings.
-     *
-     * @param string $expectedxml
-     * @param string $xml
-     */
-    public function assert_same_xml($expectedxml, $xml) {
-        $this->assertEquals(str_replace("\r\n", "\n", $expectedxml),
-                str_replace("\r\n", "\n", $xml));
-    }
-
     public function test_save_question() {
         $this->resetAfterTest();
 

question/type/ordering/tests/questiontype_test.php

@@ -72,17 +72,6 @@ private static function expectedimport(): object {
         ];
     }
 
-    /**
-     * Asserts that two XML strings are the same, ignoring differences in line endings.
-     *
-     * @param string $expectedxml
-     * @param string $xml
-     */
-    public function assert_same_xml(string $expectedxml, string $xml): void {
-        $this->assertEquals(str_replace("\r\n", "\n", $expectedxml),
-            str_replace("\r\n", "\n", $xml));
-    }
-
     public function test_name(): void {
         $ordering = new qtype_ordering();
         $this->assertEquals('ordering', $ordering->name());