PHPUnit - use expectExpectation in last cases

cakephp · Nov 16, 2017 · 74a9d8d · 74a9d8d
1 parent e7a15f8
commit 74a9d8d
Showing 1 changed file with 6 additions and 4 deletions.
diff --git a/tests/TestCase/View/ViewTest.php b/tests/TestCase/View/ViewTest.php
@@ -934,24 +934,26 @@ public function testPrefixElement()
     /**
      * Test loading non-existent view element
      *
-     * @expectedException \Cake\View\Exception\MissingElementException
-     * @expectedExceptionMessageRegExp $Element file \"Element[\\|/]non_existent_element\.ctp\" is missing$
      * @return void
      */
     public function testElementNonExistent()
     {
+        $this->expectException(\Cake\View\Exception\MissingElementException::class);
+        $this->expectExceptionMessageRegExp('$Element file \"Element[\\|/]non_existent_element\.ctp\" is missing$');
+
         $this->View->element('non_existent_element');
     }
 
     /**
      * Test loading non-existent plugin view element
      *
-     * @expectedException \Cake\View\Exception\MissingElementException
-     * @expectedExceptionMessageRegExp $Element file "test_plugin\.Element[\\|/]plugin_element\.ctp\" is missing$
      * @return void
      */
     public function testElementInexistentPluginElement()
     {
+        $this->expectException(\Cake\View\Exception\MissingElementException::class);
+        $this->expectExceptionMessageRegExp('$Element file "test_plugin\.Element[\\|/]plugin_element\.ctp\" is missing$');
+
         $this->View->element('test_plugin.plugin_element');
     }