diff options
| -rw-r--r-- | _test/core/DokuWikiTest.php | 36 |
1 files changed, 14 insertions, 22 deletions
diff --git a/_test/core/DokuWikiTest.php b/_test/core/DokuWikiTest.php index 4430b87a3..25311bbac 100644 --- a/_test/core/DokuWikiTest.php +++ b/_test/core/DokuWikiTest.php @@ -3,33 +3,12 @@ use dokuwiki\Extension\PluginController; use dokuwiki\Extension\Event; use dokuwiki\Extension\EventHandler; - -if(!class_exists('PHPUnit_Framework_TestCase')) { - /** - * phpunit 5/6 compatibility - */ - class PHPUnit_Framework_TestCase extends PHPUnit\Framework\TestCase { - /** - * setExpectedException is deprecated in PHPUnit 6 - * - * @param string $class - * @param null|string $message - */ - public function setExpectedException($class, $message=null) { - $this->expectException($class); - if(!is_null($message)) { - $this->expectExceptionMessage($message); - } - } - } -} - /** * Helper class to provide basic functionality for tests * * @uses PHPUnit_Framework_TestCase and thus PHPUnit 5.7+ is required */ -abstract class DokuWikiTest extends PHPUnit_Framework_TestCase { +abstract class DokuWikiTest extends PHPUnit\Framework\TestCase { /** * tests can override this @@ -46,6 +25,19 @@ abstract class DokuWikiTest extends PHPUnit_Framework_TestCase { protected $pluginsDisabled = array(); /** + * setExpectedException was deprecated in PHPUnit 6 + * + * @param string $class + * @param null|string $message + */ + public function setExpectedException($class, $message=null) { + $this->expectException($class); + if(!is_null($message)) { + $this->expectExceptionMessage($message); + } + } + + /** * Setup the data directory * * This is ran before each test class |