refactor PageRevisionLog into Media- and PageChangelog extending Changelog

1 files changed, 43 insertions, 44 deletions

diff --git a/_test/tests/inc/changelog_getrelativerevision.test.php b/_test/tests/inc/changelog_getrelativerevision.test.php
index 588c424b1..fa4c68897 100644
--- a/_test/tests/inc/changelog_getrelativerevision.test.php
+++ b/_test/tests/inc/changelog_getrelativerevision.test.php
@@ -33,8 +33,8 @@ class changelog_getrelativerevision_test extends DokuWikiTest {
         $id           = 'nonexist';
         $revsexpected = false;
 
-        $pagelog = new PageRevisionLog($id, $chunk_size = 8192);
-        $revs = $pagelog->getRelativeRevision($rev, $dir, $media = false);
+        $pagelog = new PageChangeLog($id, $chunk_size = 8192);
+        $revs = $pagelog->getRelativeRevision($rev, $dir);
         $this->assertEquals($revsexpected, $revs);
     }
 
@@ -46,8 +46,8 @@ class changelog_getrelativerevision_test extends DokuWikiTest {
         $dir          = 0;
         $revsexpected = false;
 
-        $pagelog = new PageRevisionLog($this->pageid, $chunk_size = 8192);
-        $revs = $pagelog->getRelativeRevision($rev, $dir, $media = false);
+        $pagelog = new PageChangeLog($this->pageid, $chunk_size = 8192);
+        $revs = $pagelog->getRelativeRevision($rev, $dir);
         $this->assertEquals($revsexpected, $revs);
     }
 
@@ -67,8 +67,8 @@ class changelog_getrelativerevision_test extends DokuWikiTest {
 //        var_dump($INFO['meta']['last_change']);
 //        var_dump($INFO['meta']['last_change']['date']);
 
-        $pagelog = new PageRevisionLog($this->pageid, $chunk_size = 8192);
-        $revs = $pagelog->getRelativeRevision($rev, $dir, $media = false);
+        $pagelog = new PageChangeLog($this->pageid, $chunk_size = 8192);
+        $revs = $pagelog->getRelativeRevision($rev, $dir);
         $this->assertEquals($revsexpected, $revs);
     }
 
@@ -81,11 +81,11 @@ class changelog_getrelativerevision_test extends DokuWikiTest {
         $revexpected  = 1362525899;
         $infoexpected = parseChangelogLine($this->logline);
 
-        $pagelog = new PageRevisionLog($this->pageid, $chunk_size = 8192);
-        $revfound = $pagelog->getRelativeRevision($rev, $dir, $media = false);
+        $pagelog = new PageChangeLog($this->pageid, $chunk_size = 8192);
+        $revfound = $pagelog->getRelativeRevision($rev, $dir);
         $this->assertEquals($revexpected, $revfound);
         //checked info returned from cache
-        $info = $pagelog->getRevisionInfo($revfound, $media = false);
+        $info = $pagelog->getRevisionInfo($revfound);
         $this->assertEquals($infoexpected, $info);
     }
 
@@ -97,8 +97,8 @@ class changelog_getrelativerevision_test extends DokuWikiTest {
         $dir         = 1;
         $revexpected = 1362525926;
 
-        $pagelog = new PageRevisionLog($this->pageid, $chunk_size = 512);
-        $revfound = $pagelog->getRelativeRevision($rev, $dir, $media = false);
+        $pagelog = new PageChangeLog($this->pageid, $chunk_size = 512);
+        $revfound = $pagelog->getRelativeRevision($rev, $dir);
         $this->assertEquals($revexpected, $revfound);
     }
 
@@ -110,8 +110,8 @@ class changelog_getrelativerevision_test extends DokuWikiTest {
         $dir          = 5;
         $revexpected  = 1362526767;
 
-        $pagelog = new PageRevisionLog($this->pageid, $chunk_size = 8192);
-        $revfound = $pagelog->getRelativeRevision($rev, $dir, $media = false);
+        $pagelog = new PageChangeLog($this->pageid, $chunk_size = 8192);
+        $revfound = $pagelog->getRelativeRevision($rev, $dir);
         $this->assertEquals($revexpected, $revfound);
     }
 
@@ -123,8 +123,8 @@ class changelog_getrelativerevision_test extends DokuWikiTest {
         $dir         = 5;
         $revexpected = 1362526767;
 
-        $pagelog = new PageRevisionLog($this->pageid, $chunk_size = 512);
-        $revfound = $pagelog->getRelativeRevision($rev, $dir, $media = false);
+        $pagelog = new PageChangeLog($this->pageid, $chunk_size = 512);
+        $revfound = $pagelog->getRelativeRevision($rev, $dir);
         $this->assertEquals($revexpected, $revfound);
     }
 
@@ -138,11 +138,11 @@ class changelog_getrelativerevision_test extends DokuWikiTest {
         $revexpected1  = 1362525359;
         $revexpected5  = 1360110636;
 
-        $pagelog = new PageRevisionLog($this->pageid, $chunk_size = 8192);
-        $revfound1 = $pagelog->getRelativeRevision($rev, $dir1, $media = false);
+        $pagelog = new PageChangeLog($this->pageid, $chunk_size = 8192);
+        $revfound1 = $pagelog->getRelativeRevision($rev, $dir1);
         $this->assertEquals($revexpected1, $revfound1);
 
-        $revfound5 = $pagelog->getRelativeRevision($rev, $dir5, $media = false);
+        $revfound5 = $pagelog->getRelativeRevision($rev, $dir5);
         $this->assertEquals($revexpected5, $revfound5);
     }
 
@@ -156,11 +156,11 @@ class changelog_getrelativerevision_test extends DokuWikiTest {
         $revexpected1  = 1362525359;
         $revexpected5  = 1360110636;
 
-        $pagelog = new PageRevisionLog($this->pageid, $chunk_size = 512);
-        $revfound1 = $pagelog->getRelativeRevision($rev, $dir1, $media = false);
+        $pagelog = new PageChangeLog($this->pageid, $chunk_size = 512);
+        $revfound1 = $pagelog->getRelativeRevision($rev, $dir1);
         $this->assertEquals($revexpected1, $revfound1);
 
-        $revfound5 = $pagelog->getRelativeRevision($rev, $dir5, $media = false);
+        $revfound5 = $pagelog->getRelativeRevision($rev, $dir5);
         $this->assertEquals($revexpected5, $revfound5);
     }
 
@@ -172,8 +172,8 @@ class changelog_getrelativerevision_test extends DokuWikiTest {
         $dir          = 1;
         $revexpected  = false;
 
-        $pagelog = new PageRevisionLog($this->pageid, $chunk_size = 8192);
-        $revfound = $pagelog->getRelativeRevision($rev, $dir, $media = false);
+        $pagelog = new PageChangeLog($this->pageid, $chunk_size = 8192);
+        $revfound = $pagelog->getRelativeRevision($rev, $dir);
         $this->assertEquals($revexpected, $revfound);
     }
 
@@ -185,8 +185,8 @@ class changelog_getrelativerevision_test extends DokuWikiTest {
         $dir          = 1;
         $revexpected  = false;
 
-        $pagelog = new PageRevisionLog($this->pageid, $chunk_size = 512);
-        $revfound = $pagelog->getRelativeRevision($rev, $dir, $media = false);
+        $pagelog = new PageChangeLog($this->pageid, $chunk_size = 512);
+        $revfound = $pagelog->getRelativeRevision($rev, $dir);
         $this->assertEquals($revexpected, $revfound);
     }
 
@@ -199,8 +199,8 @@ class changelog_getrelativerevision_test extends DokuWikiTest {
         $dir          = -1;
         $revexpected  = 1371579614;
 
-        $pagelog = new PageRevisionLog($this->pageid, $chunk_size = 8192);
-        $revfound = $pagelog->getRelativeRevision($rev, $dir, $media = false);
+        $pagelog = new PageChangeLog($this->pageid, $chunk_size = 8192);
+        $revfound = $pagelog->getRelativeRevision($rev, $dir);
         $this->assertEquals($revexpected, $revfound);
     }
 
@@ -212,8 +212,8 @@ class changelog_getrelativerevision_test extends DokuWikiTest {
         $dir          = -1;
         $revexpected  = 1371579614;
 
-        $pagelog = new PageRevisionLog($this->pageid, $chunk_size = 512);
-        $revfound = $pagelog->getRelativeRevision($rev, $dir, $media = false);
+        $pagelog = new PageChangeLog($this->pageid, $chunk_size = 512);
+        $revfound = $pagelog->getRelativeRevision($rev, $dir);
         $this->assertEquals($revexpected, $revfound);
     }
 
@@ -226,8 +226,8 @@ class changelog_getrelativerevision_test extends DokuWikiTest {
         $dir = 1;
         $revexpected = 1360110636;
 
-        $pagelog = new PageRevisionLog($this->pageid, $chunk_size = 8192);
-        $revfound = $pagelog->getRelativeRevision($rev, $dir, $media = false);
+        $pagelog = new PageChangeLog($this->pageid, $chunk_size = 8192);
+        $revfound = $pagelog->getRelativeRevision($rev, $dir);
         $this->assertEquals($revexpected, $revfound);
     }
 
@@ -240,8 +240,8 @@ class changelog_getrelativerevision_test extends DokuWikiTest {
         $dir = -1;
         $revexpected = false;
 
-        $pagelog = new PageRevisionLog($this->pageid, $chunk_size = 8192);
-        $revfound = $pagelog->getRelativeRevision($rev, $dir, $media = false);
+        $pagelog = new PageChangeLog($this->pageid, $chunk_size = 8192);
+        $revfound = $pagelog->getRelativeRevision($rev, $dir);
         $this->assertEquals($revexpected, $revfound);
     }
 
@@ -253,8 +253,8 @@ class changelog_getrelativerevision_test extends DokuWikiTest {
         $dir = 1;
         $revexpected = 1362525899;
 
-        $pagelog = new PageRevisionLog($this->pageid, $chunk_size = 8192);
-        $revfound = $pagelog->getRelativeRevision($rev, $dir, $media = false);
+        $pagelog = new PageChangeLog($this->pageid, $chunk_size = 8192);
+        $revfound = $pagelog->getRelativeRevision($rev, $dir);
         $this->assertEquals($revexpected, $revfound);
     }
 
@@ -266,8 +266,8 @@ class changelog_getrelativerevision_test extends DokuWikiTest {
         $dir = -1;
         $revexpected = 1362525359;
 
-        $pagelog = new PageRevisionLog($this->pageid, $chunk_size = 8192);
-        $revfound = $pagelog->getRelativeRevision($rev, $dir, $media = false);
+        $pagelog = new PageChangeLog($this->pageid, $chunk_size = 8192);
+        $revfound = $pagelog->getRelativeRevision($rev, $dir);
         $this->assertEquals($revexpected, $revfound);
     }
 
@@ -278,9 +278,8 @@ class changelog_getrelativerevision_test extends DokuWikiTest {
         //set a known timestamp
         touch(wikiFN($this->pageid), $rev);
 
-        $pagelog = new PageRevisionLog($this->pageid, $chunk_size = 8192);
-
-        $current = $pagelog->isCurrentRevision($rev, $media = false);
+        $pagelog = new PageChangeLog($this->pageid, $chunk_size = 8192);
+        $current = $pagelog->isCurrentRevision($rev);
         $this->assertEquals($currentexpected, $current);
     }
 
@@ -292,8 +291,8 @@ class changelog_getrelativerevision_test extends DokuWikiTest {
         //set a known timestamp
         touch(wikiFN($this->pageid), $rev);
 
-        $pagelog = new PageRevisionLog($this->pageid, $chunk_size = 8192);
-        $current = $pagelog->isCurrentRevision($not_current_rev, $media = false);
+        $pagelog = new PageChangeLog($this->pageid, $chunk_size = 8192);
+        $current = $pagelog->isCurrentRevision($not_current_rev);
         $this->assertEquals($currentexpected, $current);
     }
 
@@ -301,8 +300,8 @@ class changelog_getrelativerevision_test extends DokuWikiTest {
         $rev = 1385051947;
         $currentexpected = false;
 
-        $pagelog = new PageRevisionLog('nonexistingpage', $chunk_size = 8192);
-        $current = $pagelog->isCurrentRevision($rev, $media = false);
+        $pagelog = new PageChangeLog('nonexistingpage', $chunk_size = 8192);
+        $current = $pagelog->isCurrentRevision($rev);
         $this->assertEquals($currentexpected, $current);
     }
 }
\ No newline at end of file