Update changelog unit tests

2 files changed, 56 insertions, 30 deletions

diff --git a/_test/tests/inc/changelog_getrevisioninfo.test.php b/_test/tests/inc/changelog_getrevisioninfo.test.php
index 9637d21c8..a2f0d808f 100644
--- a/_test/tests/inc/changelog_getrevisioninfo.test.php
+++ b/_test/tests/inc/changelog_getrevisioninfo.test.php
@@ -21,7 +21,7 @@ class changelog_getrevisionsinfo_test extends DokuWikiTest {
             unset($cache['nonexist']);
         }
         if(isset($cache['mailinglist'])) {
-            unset($cache['nonexist']);
+            unset($cache['mailinglist']);
         }
     }
 
@@ -33,7 +33,8 @@ class changelog_getrevisionsinfo_test extends DokuWikiTest {
         $id           = 'nonexist';
         $revsexpected = false;
 
-        $revs = getRevisionInfo($id, $rev, $chunk_size = 8192, $media = false);
+        $pagelog = new PageRevisionLog($id, $chunk_size = 8192);
+        $revs = $pagelog->getRevisionInfo($rev, $media = false);
         $this->assertEquals($revsexpected, $revs);
     }
 
@@ -44,10 +45,11 @@ class changelog_getrevisionsinfo_test extends DokuWikiTest {
         $rev          = 1362525899;
         $infoexpected = parseChangelogLine($this->logline);
 
-        $info = getRevisionInfo($this->pageid, $rev, $chunk_size = 8192, $media = false);
+        $pagelog = new PageRevisionLog($this->pageid, $chunk_size = 8192);
+        $info = $pagelog->getRevisionInfo($rev, $media = false);
         $this->assertEquals($infoexpected, $info);
         //returns cached value
-        $info = getRevisionInfo($this->pageid, $rev, $chunk_size = 8192, $media = false);
+        $info = $pagelog->getRevisionInfo($rev, $media = false);
         $this->assertEquals($infoexpected, $info);
     }
 
@@ -58,7 +60,8 @@ class changelog_getrevisionsinfo_test extends DokuWikiTest {
         $rev          = 1362525899;
         $infoexpected = parseChangelogLine($this->logline);
 
-        $info = getRevisionInfo($this->pageid, $rev, $chunk_size = 512, $media = false);
+        $pagelog = new PageRevisionLog($this->pageid, $chunk_size = 512);
+        $info = $pagelog->getRevisionInfo($rev, $media = false);
         $this->assertEquals($infoexpected, $info);
     }
 
@@ -69,10 +72,11 @@ class changelog_getrevisionsinfo_test extends DokuWikiTest {
         $rev          = 1374261194;
         $infoexpected = parseChangelogLine($this->firstlogline);
 
-        $info = getRevisionInfo($this->pageid, $rev, $chunk_size = 8192, $media = false);
+        $pagelog = new PageRevisionLog($this->pageid, $chunk_size = 8192);
+        $info = $pagelog->getRevisionInfo($rev, $media = false);
         $this->assertEquals($infoexpected, $info);
         //returns cached value
-        $info = getRevisionInfo($this->pageid, $rev, $chunk_size = 8192, $media = false);
+        $info = $pagelog->getRevisionInfo($rev, $media = false);
         $this->assertEquals($infoexpected, $info);
     }
 
@@ -83,7 +87,8 @@ class changelog_getrevisionsinfo_test extends DokuWikiTest {
         $rev          = 1374261194;
         $infoexpected = parseChangelogLine($this->firstlogline);
 
-        $info = getRevisionInfo($this->pageid, $rev, $chunk_size = 512, $media = false);
+        $pagelog = new PageRevisionLog($this->pageid, $chunk_size = 512);
+        $info = $pagelog->getRevisionInfo($rev, $media = false);
         $this->assertEquals($infoexpected, $info);
     }
 
@@ -93,7 +98,8 @@ class changelog_getrevisionsinfo_test extends DokuWikiTest {
     function test_negativerev() {
         $rev = -10;
 
-        $info = getRevisionInfo($this->pageid, $rev, $chunk_size = 8192, $media = false);
+        $pagelog = new PageRevisionLog($this->pageid, $chunk_size = 8192);
+        $info = $pagelog->getRevisionInfo($rev, $media = false);
         $this->assertEquals(false, $info);
     }
 
@@ -103,7 +109,8 @@ class changelog_getrevisionsinfo_test extends DokuWikiTest {
     function test_notexistingrev() {
         $rev = 1362525890;
 
-        $info = getRevisionInfo($this->pageid, $rev, $chunk_size = 8192, $media = false);
+        $pagelog = new PageRevisionLog($this->pageid, $chunk_size = 8192);
+        $info = $pagelog->getRevisionInfo($rev, $media = false);
         $this->assertEquals(false, $info);
     }
 
@@ -114,7 +121,8 @@ class changelog_getrevisionsinfo_test extends DokuWikiTest {
         $rev          = 1362525899;
         $infoexpected = parseChangelogLine($this->logline);
 
-        $info = getRevisionInfo($this->pageid, $rev, true);
+        $pagelog = new PageRevisionLog($this->pageid, true);
+        $info = $pagelog->getRevisionInfo($rev);
         $this->assertEquals($infoexpected, $info);
     }
 }
\ No newline at end of file
diff --git a/_test/tests/inc/changelog_getrevisions.test.php b/_test/tests/inc/changelog_getrevisions.test.php
index a9be26dae..e2b9d115e 100644
--- a/_test/tests/inc/changelog_getrevisions.test.php
+++ b/_test/tests/inc/changelog_getrevisions.test.php
@@ -36,7 +36,7 @@ class changelog_getrevisions_test extends DokuWikiTest {
             unset($cache['nonexist']);
         }
         if(isset($cache['mailinglist'])) {
-            unset($cache['nonexist']);
+            unset($cache['mailinglist']);
         }
     }
 
@@ -48,7 +48,8 @@ class changelog_getrevisions_test extends DokuWikiTest {
         $num   = 1;
         $id    = 'nonexist';
 
-        $revs         = getRevisions($id, $first, $num, $chunk_size = 8192, $media = false);
+        $pagelog = new PageRevisionLog($id, $chunk_size = 8192);
+        $revs         = $pagelog->getRevisions($first, $num, $media = false);
         $revsexpected = array();
         $this->assertEquals($revsexpected, $revs);
     }
@@ -62,10 +63,12 @@ class changelog_getrevisions_test extends DokuWikiTest {
         $num          = 1;
         $revsexpected = array($this->revsexpected[1]);
 
-        $revs = getRevisions($this->pageid, $first, $num, $chunk_size = 8192, $media = false);
+        $pagelog = new PageRevisionLog($this->pageid, $chunk_size = 8192);
+        $revs = $pagelog->getRevisions($first, $num, $media = false);
         $this->assertEquals($revsexpected, $revs);
 
-        $revs = getRevisions($this->pageid, $first, $num, $chunk_size = 512, $media = false);
+        $pagelog = new PageRevisionLog($this->pageid, $chunk_size = 512);
+        $revs = $pagelog->getRevisions($first, $num, $media = false);
         $this->assertEquals($revsexpected, $revs);
     }
 
@@ -78,10 +81,12 @@ class changelog_getrevisions_test extends DokuWikiTest {
         $num          = 1;
         $revsexpected = array($this->revsexpected[2]);
 
-        $revs = getRevisions($this->pageid, $first, $num, $chunk_size = 8192, $media = false);
+        $pagelog = new PageRevisionLog($this->pageid, $chunk_size = 8192);
+        $revs = $pagelog->getRevisions($first, $num, $media = false);
         $this->assertEquals($revsexpected, $revs);
 
-        $revs = getRevisions($this->pageid, $first, $num, $chunk_size = 512, $media = false);
+        $pagelog = new PageRevisionLog($this->pageid, $chunk_size = 512);
+        $revs = $pagelog->getRevisions($first, $num, $media = false);
         $this->assertEquals($revsexpected, $revs);
     }
 
@@ -94,10 +99,12 @@ class changelog_getrevisions_test extends DokuWikiTest {
         $num          = 5;
         $revsexpected = array_slice($this->revsexpected, $first + 1, $num);
 
-        $revs = getRevisions($this->pageid, $first, $num, $chunk_size = 8192, $media = false);
+        $pagelog = new PageRevisionLog($this->pageid, $chunk_size = 8192);
+        $revs = $pagelog->getRevisions($first, $num, $media = false);
         $this->assertEquals($revsexpected, $revs);
 
-        $revs = getRevisions($this->pageid, $first, $num, $chunk_size = 512, $media = false);
+        $pagelog = new PageRevisionLog($this->pageid, $chunk_size = 512);
+        $revs = $pagelog->getRevisions($first, $num, $media = false);
         $this->assertEquals($revsexpected, $revs);
     }
 
@@ -109,10 +116,12 @@ class changelog_getrevisions_test extends DokuWikiTest {
         $num          = 1;
         $revsexpected = array($this->revsexpected[0]);
 
-        $revs = getRevisions($this->pageid, $first, $num, $chunk_size = 8192, $media = false);
+        $pagelog = new PageRevisionLog($this->pageid, $chunk_size = 8192);
+        $revs = $pagelog->getRevisions($first, $num, $media = false);
         $this->assertEquals($revsexpected, $revs);
 
-        $revs = getRevisions($this->pageid, $first, $num, $chunk_size = 512, $media = false);
+        $pagelog = new PageRevisionLog($this->pageid, $chunk_size = 512);
+        $revs = $pagelog->getRevisions($first, $num, $media = false);
         $this->assertEquals($revsexpected, $revs);
     }
 
@@ -124,7 +133,8 @@ class changelog_getrevisions_test extends DokuWikiTest {
         $num          = 1000;
         $revsexpected = array_slice($this->revsexpected, 1);
 
-        $revs = getRevisions($this->pageid, $first, $num, $chunk_size = 0, $media = false);
+        $pagelog = new PageRevisionLog($this->pageid, $chunk_size = 0);
+        $revs = $pagelog->getRevisions($first, $num, $media = false);
         $this->assertEquals($revsexpected, $revs);
     }
 
@@ -136,10 +146,12 @@ class changelog_getrevisions_test extends DokuWikiTest {
         $num          = -10;
         $revsexpected = array();
 
-        $revs = getRevisions($this->pageid, $first, $num, $chunk_size = 8192, $media = false);
+        $pagelog = new PageRevisionLog($this->pageid, $chunk_size = 8192);
+        $revs = $pagelog->getRevisions($first, $num, $media = false);
         $this->assertEquals($revsexpected, $revs);
 
-        $revs = getRevisions($this->pageid, $first, $num, $chunk_size = 512, $media = false);
+        $pagelog = new PageRevisionLog($this->pageid, $chunk_size = 512);
+        $revs = $pagelog->getRevisions($first, $num, $media = false);
         $this->assertEquals($revsexpected, $revs);
     }
 
@@ -151,10 +163,12 @@ class changelog_getrevisions_test extends DokuWikiTest {
         $num          = -10;
         $revsexpected = array();
 
-        $revs = getRevisions($this->pageid, $first, $num, $chunk_size = 8192, $media = false);
+        $pagelog = new PageRevisionLog($this->pageid, $chunk_size = 8192);
+        $revs = $pagelog->getRevisions($this->pageid, $first, $num, $chunk_size = 8192, $media = false);
         $this->assertEquals($revsexpected, $revs);
 
-        $revs = getRevisions($this->pageid, $first, $num, $chunk_size = 512, $media = false);
+        $pagelog = new PageRevisionLog($this->pageid, $chunk_size = 512);
+        $revs = $pagelog->getRevisions($first, $num, $media = false);
         $this->assertEquals($revsexpected, $revs);
     }
 
@@ -166,10 +180,12 @@ class changelog_getrevisions_test extends DokuWikiTest {
         $num          = 0;
         $revsexpected = array();
 
-        $revs = getRevisions($this->pageid, $first, $num, $chunk_size = 8192, $media = false);
+        $pagelog = new PageRevisionLog($this->pageid, $chunk_size = 8192);
+        $revs = $pagelog->getRevisions($first, $num, $media = false);
         $this->assertEquals($revsexpected, $revs);
 
-        $revs = getRevisions($this->pageid, $first, $num, $chunk_size = 512, $media = false);
+        $pagelog = new PageRevisionLog($this->pageid, $chunk_size = 512);
+        $revs = $pagelog->getRevisions($first, $num, $media = false);
         $this->assertEquals($revsexpected, $revs);
     }
 
@@ -181,7 +197,8 @@ class changelog_getrevisions_test extends DokuWikiTest {
         $num          = 50;
         $revsexpected = array_slice($this->revsexpected, $first + 1);
 
-        $revs = getRevisions($this->pageid, $first, $num, $chunk_size = 8192, $media = false);
+        $pagelog = new PageRevisionLog($this->pageid, $chunk_size = 8192);
+        $revs = $pagelog->getRevisions($first, $num, $media = false);
         $this->assertEquals($revsexpected, $revs);
     }
 
@@ -193,7 +210,8 @@ class changelog_getrevisions_test extends DokuWikiTest {
         $num          = 50;
         $revsexpected = array();
 
-        $revs = getRevisions($this->pageid, $first, $num, $chunk_size = 8192, $media = false);
+        $pagelog = new PageRevisionLog($this->pageid, $chunk_size = 8192);
+        $revs = $pagelog->getRevisions($first, $num, $media = false);
         $this->assertEquals($revsexpected, $revs);
     }