aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
Diffstat
-rw-r--r--_test/core/DokuWikiTest.php29
-rw-r--r--_test/tests/inc/parser/lexer.test.php34
-rw-r--r--_test/tests/inc/remote.test.php2
3 files changed, 46 insertions, 19 deletions
diff --git a/_test/core/DokuWikiTest.php b/_test/core/DokuWikiTest.php
index 5f085a7c2..4e8c8fcef 100644
--- a/_test/core/DokuWikiTest.php
+++ b/_test/core/DokuWikiTest.php
@@ -127,4 +127,33 @@ abstract class DokuWikiTest extends PHPUnit_Framework_TestCase {
global $INPUT;
$INPUT = new Input();
}
+
+ /**
+ * Compatibility for older PHPUnit versions
+ *
+ * @param string $originalClassName
+ * @return PHPUnit_Framework_MockObject_MockObject
+ */
+ protected function createMock($originalClassName) {
+ if(is_callable(array('parent', 'createMock'))) {
+ return parent::createMock($originalClassName);
+ } else {
+ return $this->getMock($originalClassName);
+ }
+ }
+
+ /**
+ * Compatibility for older PHPUnit versions
+ *
+ * @param string $originalClassName
+ * @param array $methods
+ * @return PHPUnit_Framework_MockObject_MockObject
+ */
+ protected function createPartialMock($originalClassName, array $methods) {
+ if(is_callable(array('parent', 'createPartialMock'))) {
+ return parent::createPartialMock($originalClassName, $methods);
+ } else {
+ return $this->getMock($originalClassName, $methods);
+ }
+ }
}
diff --git a/_test/tests/inc/parser/lexer.test.php b/_test/tests/inc/parser/lexer.test.php
index c50665928..50b6548a4 100644
--- a/_test/tests/inc/parser/lexer.test.php
+++ b/_test/tests/inc/parser/lexer.test.php
@@ -158,20 +158,20 @@ class TestParser {
class TestOfLexer extends DokuWikiTest {
function testNoPatterns() {
- $handler = $this->getMock('TestParser');
+ $handler = $this->createMock('TestParser');
$handler->expects($this->never())->method('accept');
$lexer = new Doku_Lexer($handler);
$this->assertFalse($lexer->parse("abcdef"));
}
function testEmptyPage() {
- $handler = $this->getMock('TestParser');
+ $handler = $this->createMock('TestParser');
$handler->expects($this->never())->method('accept');
$lexer = new Doku_Lexer($handler);
$lexer->addPattern("a+");
$this->assertTrue($lexer->parse(""));
}
function testSinglePattern() {
- $handler = $this->getMock('TestParser');
+ $handler = $this->createMock('TestParser');
$handler->expects($this->at(0))->method('accept')
->with("aaa", DOKU_LEXER_MATCHED, 0)->will($this->returnValue(true));
$handler->expects($this->at(1))->method('accept')
@@ -194,7 +194,7 @@ class TestOfLexer extends DokuWikiTest {
$this->assertTrue($lexer->parse("aaaxayyyaxaaaz"));
}
function testMultiplePattern() {
- $handler = $this->getMock('TestParser', array('accept'));
+ $handler = $this->createPartialMock('TestParser', array('accept'));
$target = array("a", "b", "a", "bb", "x", "b", "a", "xxxxxx", "a", "x");
$positions = array(0, 1, 2, 3, 5, 6, 7, 8, 14, 15);
for ($i = 0; $i < count($target); $i++) {
@@ -210,7 +210,7 @@ class TestOfLexer extends DokuWikiTest {
class TestOfLexerModes extends DokuWikiTest {
function testIsolatedPattern() {
- $handler = $this->getMock('TestParser');
+ $handler = $this->createMock('TestParser');
$handler->expects($this->at(0))->method('a')
->with("a", DOKU_LEXER_MATCHED,0)->will($this->returnValue(true));
$handler->expects($this->at(1))->method('a')
@@ -233,7 +233,7 @@ class TestOfLexerModes extends DokuWikiTest {
$this->assertTrue($lexer->parse("abaabxbaaaxaaaax"));
}
function testModeChange() {
- $handler = $this->getMock('TestParser');
+ $handler = $this->createMock('TestParser');
$handler->expects($this->at(0))->method('a')
->with("a", DOKU_LEXER_MATCHED,0)->will($this->returnValue(true));
$handler->expects($this->at(1))->method('a')
@@ -268,7 +268,7 @@ class TestOfLexerModes extends DokuWikiTest {
$this->assertTrue($lexer->parse("abaabaaa:ababbabbba"));
}
function testNesting() {
- $handler = $this->getMock('TestParser');
+ $handler = $this->createMock('TestParser');
$handler->expects($this->at(0))->method('a')
->with("aa", DOKU_LEXER_MATCHED,0)->will($this->returnValue(true));
$handler->expects($this->at(1))->method('a')
@@ -301,7 +301,7 @@ class TestOfLexerModes extends DokuWikiTest {
$this->assertTrue($lexer->parse("aabaab(bbabb)aab"));
}
function testSingular() {
- $handler = $this->getMock('TestParser');
+ $handler = $this->createMock('TestParser');
$handler->expects($this->at(0))->method('a')
->with("aa", DOKU_LEXER_MATCHED,0)->will($this->returnValue(true));
$handler->expects($this->at(1))->method('b')
@@ -320,7 +320,7 @@ class TestOfLexerModes extends DokuWikiTest {
$this->assertTrue($lexer->parse("aabaaxxbbbxx"));
}
function testUnwindTooFar() {
- $handler = $this->getMock('TestParser');
+ $handler = $this->createMock('TestParser');
$handler->expects($this->at(0))->method('a')
->with("aa", DOKU_LEXER_MATCHED,0)->will($this->returnValue(true));
$handler->expects($this->at(1))->method('a')
@@ -335,7 +335,7 @@ class TestOfLexerModes extends DokuWikiTest {
class TestOfLexerHandlers extends DokuWikiTest {
function testModeMapping() {
- $handler = $this->getMock('TestParser');
+ $handler = $this->createMock('TestParser');
$handler->expects($this->at(0))->method('a')
->with("aa", DOKU_LEXER_MATCHED,0)->will($this->returnValue(true));
$handler->expects($this->at(1))->method('a')
@@ -376,7 +376,7 @@ class TestOfLexerByteIndices extends DokuWikiTest {
function testIndex() {
$doc = "aaa<file>bcd</file>eee";
- $handler = $this->getMock('TestParserByteIndex');
+ $handler = $this->createMock('TestParserByteIndex');
$handler->expects($this->any())->method('ignore')->will($this->returnValue(true));
$handler->expects($this->at(1))->method('caught')
->with("<file>", DOKU_LEXER_ENTER, strpos($doc,'<file>'))->will($this->returnValue(true));
@@ -402,7 +402,7 @@ class TestOfLexerByteIndices extends DokuWikiTest {
function testIndexLookaheadEqual() {
$doc = "aaa<file>bcd</file>eee";
- $handler = $this->getMock('TestParserByteIndex');
+ $handler = $this->createMock('TestParserByteIndex');
$handler->expects($this->any())->method('ignore')->will($this->returnValue(true));
$handler->expects($this->at(1))->method('caught')
->with("<file>", DOKU_LEXER_ENTER, strpos($doc,'<file>'))->will($this->returnValue(true));
@@ -428,7 +428,7 @@ class TestOfLexerByteIndices extends DokuWikiTest {
function testIndexLookaheadNotEqual() {
$doc = "aaa<file>bcd</file>eee";
- $handler = $this->getMock('TestParserByteIndex');
+ $handler = $this->createMock('TestParserByteIndex');
$handler->expects($this->any())->method('ignore')->will($this->returnValue(true));
$handler->expects($this->at(1))->method('caught')
->with("<file>", DOKU_LEXER_ENTER, strpos($doc,'<file>'))->will($this->returnValue(true));
@@ -454,7 +454,7 @@ class TestOfLexerByteIndices extends DokuWikiTest {
function testIndexLookbehindEqual() {
$doc = "aaa<file>bcd</file>eee";
- $handler = $this->getMock('TestParserByteIndex');
+ $handler = $this->createMock('TestParserByteIndex');
$handler->expects($this->any())->method('ignore')->will($this->returnValue(true));
$handler->expects($this->at(1))->method('caught')
->with("<file>", DOKU_LEXER_ENTER, strpos($doc,'<file>'))->will($this->returnValue(true));
@@ -480,7 +480,7 @@ class TestOfLexerByteIndices extends DokuWikiTest {
function testIndexLookbehindNotEqual() {
$doc = "aaa<file>bcd</file>eee";
- $handler = $this->getMock('TestParserByteIndex');
+ $handler = $this->createMock('TestParserByteIndex');
$handler->expects($this->any())->method('ignore')->will($this->returnValue(true));
$handler->expects($this->at(1))->method('caught')
->with("<file>", DOKU_LEXER_ENTER, strpos($doc,'<file>'))->will($this->returnValue(true));
@@ -511,7 +511,7 @@ class TestOfLexerByteIndices extends DokuWikiTest {
$doc = "ALL FOOLS ARE FOO";
$pattern = '\bFOO\b';
- $handler = $this->getMock('TestParserByteIndex');
+ $handler = $this->createMock('TestParserByteIndex');
$handler->expects($this->any())->method('ignore')->will($this->returnValue(true));
$matches = array();
@@ -527,5 +527,3 @@ class TestOfLexerByteIndices extends DokuWikiTest {
}
}
-
-?>
diff --git a/_test/tests/inc/remote.test.php b/_test/tests/inc/remote.test.php
index 3cbc14f6b..b5c3fda07 100644
--- a/_test/tests/inc/remote.test.php
+++ b/_test/tests/inc/remote.test.php
@@ -144,7 +144,7 @@ class remote_test extends DokuWikiTest {
parent::setUp();
// mock plugin controller to return our test plugins
- $pluginManager = $this->getMock('Doku_Plugin_Controller');
+ $pluginManager = $this->createMock('Doku_Plugin_Controller');
$pluginManager->method('getList')->willReturn(array('testplugin', 'testplugin2'));
$pluginManager->method('load')->willReturnCallback(
function($type, $plugin) {
generated by cgit v1.2.3 (git 2.39.1) at 2025-06-24 12:24:23 +0000