Merge remote-tracking branch 'remotes/splitbrain/diff_navigation' into revisions

1 files changed, 58 insertions, 58 deletions

diff --git a/_test/tests/inc/changelog_getrevisions.test.php b/_test/tests/inc/changelog_getrevisions.test.php
index e2b9d115e..69315638f 100644
--- a/_test/tests/inc/changelog_getrevisions.test.php
+++ b/_test/tests/inc/changelog_getrevisions.test.php
@@ -45,11 +45,11 @@ class changelog_getrevisions_test extends DokuWikiTest {
      */
     function test_changemetadatanotexists() {
         $first = 0;
-        $num   = 1;
-        $id    = 'nonexist';
+        $num = 1;
+        $id = 'nonexist';
 
-        $pagelog = new PageRevisionLog($id, $chunk_size = 8192);
-        $revs         = $pagelog->getRevisions($first, $num, $media = false);
+        $pagelog = new PageChangeLog($id, $chunk_size = 8192);
+        $revs = $pagelog->getRevisions($first, $num);
         $revsexpected = array();
         $this->assertEquals($revsexpected, $revs);
     }
@@ -59,16 +59,16 @@ class changelog_getrevisions_test extends DokuWikiTest {
      * (so skips first line which belongs to the current existing page)
      */
     function test_requestlastrev() {
-        $first        = 0;
-        $num          = 1;
+        $first = 0;
+        $num = 1;
         $revsexpected = array($this->revsexpected[1]);
 
-        $pagelog = new PageRevisionLog($this->pageid, $chunk_size = 8192);
-        $revs = $pagelog->getRevisions($first, $num, $media = false);
+        $pagelog = new PageChangeLog($this->pageid, $chunk_size = 8192);
+        $revs = $pagelog->getRevisions($first, $num);
         $this->assertEquals($revsexpected, $revs);
 
-        $pagelog = new PageRevisionLog($this->pageid, $chunk_size = 512);
-        $revs = $pagelog->getRevisions($first, $num, $media = false);
+        $pagelog = new PageChangeLog($this->pageid, $chunk_size = 512);
+        $revs = $pagelog->getRevisions($first, $num);
         $this->assertEquals($revsexpected, $revs);
     }
 
@@ -77,16 +77,16 @@ class changelog_getrevisions_test extends DokuWikiTest {
      * (so skips first line which belongs to the current existing page)
      */
     function test_requestonebutlastrev() {
-        $first        = 1;
-        $num          = 1;
+        $first = 1;
+        $num = 1;
         $revsexpected = array($this->revsexpected[2]);
 
-        $pagelog = new PageRevisionLog($this->pageid, $chunk_size = 8192);
-        $revs = $pagelog->getRevisions($first, $num, $media = false);
+        $pagelog = new PageChangeLog($this->pageid, $chunk_size = 8192);
+        $revs = $pagelog->getRevisions($first, $num);
         $this->assertEquals($revsexpected, $revs);
 
-        $pagelog = new PageRevisionLog($this->pageid, $chunk_size = 512);
-        $revs = $pagelog->getRevisions($first, $num, $media = false);
+        $pagelog = new PageChangeLog($this->pageid, $chunk_size = 512);
+        $revs = $pagelog->getRevisions($first, $num);
         $this->assertEquals($revsexpected, $revs);
     }
 
@@ -95,16 +95,16 @@ class changelog_getrevisions_test extends DokuWikiTest {
      * (so skips first line of current existing page)
      */
     function test_requestrevswithoffset() {
-        $first        = 10;
-        $num          = 5;
+        $first = 10;
+        $num = 5;
         $revsexpected = array_slice($this->revsexpected, $first + 1, $num);
 
-        $pagelog = new PageRevisionLog($this->pageid, $chunk_size = 8192);
-        $revs = $pagelog->getRevisions($first, $num, $media = false);
+        $pagelog = new PageChangeLog($this->pageid, $chunk_size = 8192);
+        $revs = $pagelog->getRevisions($first, $num);
         $this->assertEquals($revsexpected, $revs);
 
-        $pagelog = new PageRevisionLog($this->pageid, $chunk_size = 512);
-        $revs = $pagelog->getRevisions($first, $num, $media = false);
+        $pagelog = new PageChangeLog($this->pageid, $chunk_size = 512);
+        $revs = $pagelog->getRevisions($first, $num);
         $this->assertEquals($revsexpected, $revs);
     }
 
@@ -112,16 +112,16 @@ class changelog_getrevisions_test extends DokuWikiTest {
      * first = -1 requests recentest logline, without skipping
      */
     function test_requestrecentestlogline() {
-        $first        = -1;
-        $num          = 1;
+        $first = -1;
+        $num = 1;
         $revsexpected = array($this->revsexpected[0]);
 
-        $pagelog = new PageRevisionLog($this->pageid, $chunk_size = 8192);
-        $revs = $pagelog->getRevisions($first, $num, $media = false);
+        $pagelog = new PageChangeLog($this->pageid, $chunk_size = 8192);
+        $revs = $pagelog->getRevisions($first, $num);
         $this->assertEquals($revsexpected, $revs);
 
-        $pagelog = new PageRevisionLog($this->pageid, $chunk_size = 512);
-        $revs = $pagelog->getRevisions($first, $num, $media = false);
+        $pagelog = new PageChangeLog($this->pageid, $chunk_size = 512);
+        $revs = $pagelog->getRevisions($first, $num);
         $this->assertEquals($revsexpected, $revs);
     }
 
@@ -129,12 +129,12 @@ class changelog_getrevisions_test extends DokuWikiTest {
      * chunck size = 0 skips chuncked loading
      */
     function test_wholefile() {
-        $first        = 0;
-        $num          = 1000;
+        $first = 0;
+        $num = 1000;
         $revsexpected = array_slice($this->revsexpected, 1);
 
-        $pagelog = new PageRevisionLog($this->pageid, $chunk_size = 0);
-        $revs = $pagelog->getRevisions($first, $num, $media = false);
+        $pagelog = new PageChangeLog($this->pageid, $chunk_size = 0);
+        $revs = $pagelog->getRevisions($first, $num);
         $this->assertEquals($revsexpected, $revs);
     }
 
@@ -142,16 +142,16 @@ class changelog_getrevisions_test extends DokuWikiTest {
      * Negative range returns no result
      */
     function test_negativenum() {
-        $first        = 0;
-        $num          = -10;
+        $first = 0;
+        $num = -10;
         $revsexpected = array();
 
-        $pagelog = new PageRevisionLog($this->pageid, $chunk_size = 8192);
-        $revs = $pagelog->getRevisions($first, $num, $media = false);
+        $pagelog = new PageChangeLog($this->pageid, $chunk_size = 8192);
+        $revs = $pagelog->getRevisions($first, $num);
         $this->assertEquals($revsexpected, $revs);
 
-        $pagelog = new PageRevisionLog($this->pageid, $chunk_size = 512);
-        $revs = $pagelog->getRevisions($first, $num, $media = false);
+        $pagelog = new PageChangeLog($this->pageid, $chunk_size = 512);
+        $revs = $pagelog->getRevisions($first, $num);
         $this->assertEquals($revsexpected, $revs);
     }
 
@@ -159,16 +159,16 @@ class changelog_getrevisions_test extends DokuWikiTest {
      * Negative range returns no result
      */
     function test_negativennumoffset() {
-        $first        = 2;
-        $num          = -10;
+        $first = 2;
+        $num = -10;
         $revsexpected = array();
 
-        $pagelog = new PageRevisionLog($this->pageid, $chunk_size = 8192);
-        $revs = $pagelog->getRevisions($this->pageid, $first, $num, $chunk_size = 8192, $media = false);
+        $pagelog = new PageChangeLog($this->pageid, $chunk_size = 8192);
+        $revs = $pagelog->getRevisions($first, $num);
         $this->assertEquals($revsexpected, $revs);
 
-        $pagelog = new PageRevisionLog($this->pageid, $chunk_size = 512);
-        $revs = $pagelog->getRevisions($first, $num, $media = false);
+        $pagelog = new PageChangeLog($this->pageid, $chunk_size = 512);
+        $revs = $pagelog->getRevisions($first, $num);
         $this->assertEquals($revsexpected, $revs);
     }
 
@@ -176,16 +176,16 @@ class changelog_getrevisions_test extends DokuWikiTest {
      * zero range returns no result
      */
     function test_zeronum() {
-        $first        = 5;
-        $num          = 0;
+        $first = 5;
+        $num = 0;
         $revsexpected = array();
 
-        $pagelog = new PageRevisionLog($this->pageid, $chunk_size = 8192);
-        $revs = $pagelog->getRevisions($first, $num, $media = false);
+        $pagelog = new PageChangeLog($this->pageid, $chunk_size = 8192);
+        $revs = $pagelog->getRevisions($first, $num);
         $this->assertEquals($revsexpected, $revs);
 
-        $pagelog = new PageRevisionLog($this->pageid, $chunk_size = 512);
-        $revs = $pagelog->getRevisions($first, $num, $media = false);
+        $pagelog = new PageChangeLog($this->pageid, $chunk_size = 512);
+        $revs = $pagelog->getRevisions($first, $num);
         $this->assertEquals($revsexpected, $revs);
     }
 
@@ -193,12 +193,12 @@ class changelog_getrevisions_test extends DokuWikiTest {
      * get oldest revisions
      */
     function test_requestlargeoffset() {
-        $first        = 22;
-        $num          = 50;
+        $first = 22;
+        $num = 50;
         $revsexpected = array_slice($this->revsexpected, $first + 1);
 
-        $pagelog = new PageRevisionLog($this->pageid, $chunk_size = 8192);
-        $revs = $pagelog->getRevisions($first, $num, $media = false);
+        $pagelog = new PageChangeLog($this->pageid, $chunk_size = 8192);
+        $revs = $pagelog->getRevisions($first, $num);
         $this->assertEquals($revsexpected, $revs);
     }
 
@@ -206,12 +206,12 @@ class changelog_getrevisions_test extends DokuWikiTest {
      * request with too large offset and range
      */
     function test_requesttoolargenumberrevs() {
-        $first        = 50;
-        $num          = 50;
+        $first = 50;
+        $num = 50;
         $revsexpected = array();
 
-        $pagelog = new PageRevisionLog($this->pageid, $chunk_size = 8192);
-        $revs = $pagelog->getRevisions($first, $num, $media = false);
+        $pagelog = new PageChangeLog($this->pageid, $chunk_size = 8192);
+        $revs = $pagelog->getRevisions($first, $num);
         $this->assertEquals($revsexpected, $revs);
     }