Merge branch 'MDL-56102-master' of https://github.com/xow/moodle

moodle · Sep 28, 2016 · 14d6945 · 14d6945
2 parents e1555a7 + 8e55ffc
commit 14d6945
Showing 1 changed file with 2 additions and 4 deletions.
diff --git a/enrol/lti/tests/helper_test.php b/enrol/lti/tests/helper_test.php
@@ -433,7 +433,6 @@ public function test_set_xpath($parameters, $expected) {
 
     /**
      * Test set_xpath when an incorrect xpath expression is given.
-     * @expectedException coding_exception
      */
     public function test_set_xpath_incorrect_xpath() {
         $parameters = [
@@ -451,10 +450,9 @@ public function test_set_xpath_incorrect_xpath() {
         $document = new \DOMDocument();
         $document->load(realpath(__DIR__ . '/fixtures/input.xml'));
         $xpath = new \DOMXpath($document);
+
+        $this->setExpectedException("coding_exception");
         $function->invokeArgs(null, [$xpath, $parameters]);
-        $result = $document->saveXML();
-        $expected = file_get_contents(realpath(__DIR__ . '/fixtures/' . $expected));
-        $this->assertEquals($expected, $result);
     }
 
     /**