From 6556cf69fed60e750c3d32c106427cdfbbfdf384 Mon Sep 17 00:00:00 2001 From: Gerrit Uitslag Date: Wed, 20 Nov 2013 13:20:54 +0100 Subject: Update changelog unit tests --- _test/tests/inc/changelog_getrevisioninfo.test.php | 30 +++++++----- _test/tests/inc/changelog_getrevisions.test.php | 56 ++++++++++++++-------- 2 files changed, 56 insertions(+), 30 deletions(-) (limited to '_test') 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); } -- cgit v1.2.3 From 55545bcc9b8532818cc1fc8b920deb07cc3f2c61 Mon Sep 17 00:00:00 2001 From: Gerrit Uitslag Date: Wed, 20 Nov 2013 13:21:44 +0100 Subject: Add unit tests for getRelativerevision --- .../inc/changelog_getrelativerevision.test.php | 273 +++++++++++++++++++++ 1 file changed, 273 insertions(+) create mode 100644 _test/tests/inc/changelog_getrelativerevision.test.php (limited to '_test') diff --git a/_test/tests/inc/changelog_getrelativerevision.test.php b/_test/tests/inc/changelog_getrelativerevision.test.php new file mode 100644 index 000000000..7cd081eab --- /dev/null +++ b/_test/tests/inc/changelog_getrelativerevision.test.php @@ -0,0 +1,273 @@ +getRelativeRevision($rev, $dir, $media = false); + $this->assertEquals($revsexpected, $revs); + } + + /** + * no nonexist.changes meta file available + */ + function test_nodirection() { + $rev = 1362525899; + $dir = 0; + $revsexpected = false; + + $pagelog = new PageRevisionLog($this->pageid, $chunk_size = 8192); + $revs = $pagelog->getRelativeRevision($rev, $dir, $media = false); + $this->assertEquals($revsexpected, $revs); + } + + /** + * start at exact current revision of mailinglist page + * + */ + function test_startatexactcurrentrev() { + $rev = 1374261194; + $dir = 1; + $revsexpected = false; + +// global $INFO; +// $INFO = pageinfo(); +// var_dump($INFO); +// var_dump($INFO['meta']); +// 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); + $this->assertEquals($revsexpected, $revs); + } + + /** + * request existing rev + */ + function test_requestrev() { + $rev = 1362525359; + $dir = 1; + $revexpected = 1362525899; + $infoexpected = parseChangelogLine($this->logline); + + $pagelog = new PageRevisionLog($this->pageid, $chunk_size = 8192); + $revfound = $pagelog->getRelativeRevision($rev, $dir, $media = false); + $this->assertEquals($revexpected, $revfound); + //checked info returned from cache + $info = $pagelog->getRevisionInfo($revfound, $media = false); + $this->assertEquals($infoexpected, $info); + } + + /** + * request existing rev with chucked reading + */ + function test_requestnextrev_chuncked() { + $rev = 1362525899; + $dir = 1; + $revexpected = 1362525926; + + $pagelog = new PageRevisionLog($this->pageid, $chunk_size = 512); + $revfound = $pagelog->getRelativeRevision($rev, $dir, $media = false); + $this->assertEquals($revexpected, $revfound); + } + + /** + * request existing rev + */ + function test_requestnextfifthrev() { + $rev = 1362525899; + $dir = 5; + $revexpected = 1362526767; + + $pagelog = new PageRevisionLog($this->pageid, $chunk_size = 8192); + $revfound = $pagelog->getRelativeRevision($rev, $dir, $media = false); + $this->assertEquals($revexpected, $revfound); + } + + /** + * request existing rev with chucked reading + */ + function test_requestnextfifthrev_chuncked() { + $rev = 1362525899; + $dir = 5; + $revexpected = 1362526767; + + $pagelog = new PageRevisionLog($this->pageid, $chunk_size = 512); + $revfound = $pagelog->getRelativeRevision($rev, $dir, $media = false); + $this->assertEquals($revexpected, $revfound); + } + + /** + * request existing rev + */ + function test_requestprevrev() { + $rev = 1362525899; + $dir1 = -1; + $dir5 = -5; + $revexpected1 = 1362525359; + $revexpected5 = 1360110636; + + $pagelog = new PageRevisionLog($this->pageid, $chunk_size = 8192); + $revfound1 = $pagelog->getRelativeRevision($rev, $dir1, $media = false); + $this->assertEquals($revexpected1, $revfound1); + + $revfound5 = $pagelog->getRelativeRevision($rev, $dir5, $media = false); + $this->assertEquals($revexpected5, $revfound5); + } + + /** + * request existing rev with chucked reading + */ + function test_requestprevrev_chuncked() { + $rev = 1362525899; + $dir1 = -1; + $dir5 = -5; + $revexpected1 = 1362525359; + $revexpected5 = 1360110636; + + $pagelog = new PageRevisionLog($this->pageid, $chunk_size = 512); + $revfound1 = $pagelog->getRelativeRevision($rev, $dir1, $media = false); + $this->assertEquals($revexpected1, $revfound1); + + $revfound5 = $pagelog->getRelativeRevision($rev, $dir5, $media = false); + $this->assertEquals($revexpected5, $revfound5); + } + + /** + * request after recentest version in changelog + */ + function test_requestrecentestlogline_next() { + $rev = 1374261194; + $dir = 1; + $revexpected = false; + + $pagelog = new PageRevisionLog($this->pageid, $chunk_size = 8192); + $revfound = $pagelog->getRelativeRevision($rev, $dir, $media = false); + $this->assertEquals($revexpected, $revfound); + } + + /** + * request after recentest version in changelog, with chuncked reading + */ + function test_requestrecentestlogline_next_chuncked() { + $rev = 1374261194; + $dir = 1; + $revexpected = false; + + $pagelog = new PageRevisionLog($this->pageid, $chunk_size = 512); + $revfound = $pagelog->getRelativeRevision($rev, $dir, $media = false); + $this->assertEquals($revexpected, $revfound); + } + + + /** + * request before current version + */ + function test_requestrecentestlogline_prev() { + $rev = 1374261194; + $dir = -1; + $revexpected = 1371579614; + + $pagelog = new PageRevisionLog($this->pageid, $chunk_size = 8192); + $revfound = $pagelog->getRelativeRevision($rev, $dir, $media = false); + $this->assertEquals($revexpected, $revfound); + } + + /** + * request before current version, with chuncked reading + */ + function test_requestrecentestlogline_prev_chuncked() { + $rev = 1374261194; + $dir = -1; + $revexpected = 1371579614; + + $pagelog = new PageRevisionLog($this->pageid, $chunk_size = 512); + $revfound = $pagelog->getRelativeRevision($rev, $dir, $media = false); + $this->assertEquals($revexpected, $revfound); + } + + /** + * Request negative revision + * looks in positive direction, so it catches the oldest revision + */ + function test_negativerev_posdir() { + $rev = -10; + $dir = 1; + $revexpected = 1360110636; + + $pagelog = new PageRevisionLog($this->pageid, $chunk_size = 8192); + $revfound = $pagelog->getRelativeRevision($rev, $dir, $media = false); + $this->assertEquals($revexpected, $revfound); + } + + /** + * Request negative revision + * looks in negative direction, but there is nothing + */ + function test_negativerev_negdir() { + $rev = -10; + $dir = -1; + $revexpected = false; + + $pagelog = new PageRevisionLog($this->pageid, $chunk_size = 8192); + $revfound = $pagelog->getRelativeRevision($rev, $dir, $media = false); + $this->assertEquals($revexpected, $revfound); + } + + /** + * Start at non existing revision somewhere between existing revisions + */ + function test_startatnotexistingrev_next() { + $rev = 1362525890; + $dir = 1; + $revexpected = 1362525899; + + $pagelog = new PageRevisionLog($this->pageid, $chunk_size = 8192); + $revfound = $pagelog->getRelativeRevision($rev, $dir, $media = false); + $this->assertEquals($revexpected, $revfound); + } + + /** + * Start at non existing revision somewhere between existing revisions + */ + function test_startatnotexistingrev_prev() { + $rev = 1362525890; + $dir = -1; + $revexpected = 1362525359; + + $pagelog = new PageRevisionLog($this->pageid, $chunk_size = 8192); + $revfound = $pagelog->getRelativeRevision($rev, $dir, $media = false); + $this->assertEquals($revexpected, $revfound); + } +} \ No newline at end of file -- cgit v1.2.3 From 0f13c836f0ee71a3188a775b9ea64025e10d38f5 Mon Sep 17 00:00:00 2001 From: Gerrit Uitslag Date: Thu, 21 Nov 2013 18:02:12 +0100 Subject: Improved isCurrentRevision(), tests included --- .../inc/changelog_getrelativerevision.test.php | 35 ++++++++++++++++++++++ 1 file changed, 35 insertions(+) (limited to '_test') diff --git a/_test/tests/inc/changelog_getrelativerevision.test.php b/_test/tests/inc/changelog_getrelativerevision.test.php index 7cd081eab..588c424b1 100644 --- a/_test/tests/inc/changelog_getrelativerevision.test.php +++ b/_test/tests/inc/changelog_getrelativerevision.test.php @@ -270,4 +270,39 @@ class changelog_getrelativerevision_test extends DokuWikiTest { $revfound = $pagelog->getRelativeRevision($rev, $dir, $media = false); $this->assertEquals($revexpected, $revfound); } + + function test_iscurrentpagerevision() { + $rev = 1385051947; + $currentexpected = true; + + //set a known timestamp + touch(wikiFN($this->pageid), $rev); + + $pagelog = new PageRevisionLog($this->pageid, $chunk_size = 8192); + + $current = $pagelog->isCurrentRevision($rev, $media = false); + $this->assertEquals($currentexpected, $current); + } + + function test_isnotcurrentpagerevision() { + $rev = 1385051947; + $not_current_rev = $rev - 1; + $currentexpected = false; + + //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); + $this->assertEquals($currentexpected, $current); + } + + function test_notexistingcurrentpage() { + $rev = 1385051947; + $currentexpected = false; + + $pagelog = new PageRevisionLog('nonexistingpage', $chunk_size = 8192); + $current = $pagelog->isCurrentRevision($rev, $media = false); + $this->assertEquals($currentexpected, $current); + } } \ No newline at end of file -- cgit v1.2.3 From 047bad06fab8157452aa0dd04379a7c507b1f39f Mon Sep 17 00:00:00 2001 From: Gerrit Uitslag Date: Thu, 21 Nov 2013 21:07:08 +0100 Subject: refactor PageRevisionLog into Media- and PageChangelog extending Changelog --- .../inc/changelog_getrelativerevision.test.php | 87 +++++++++++----------- _test/tests/inc/changelog_getrevisioninfo.test.php | 34 ++++----- _test/tests/inc/changelog_getrevisions.test.php | 72 +++++++++--------- 3 files changed, 96 insertions(+), 97 deletions(-) (limited to '_test') 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 diff --git a/_test/tests/inc/changelog_getrevisioninfo.test.php b/_test/tests/inc/changelog_getrevisioninfo.test.php index a2f0d808f..c073bac79 100644 --- a/_test/tests/inc/changelog_getrevisioninfo.test.php +++ b/_test/tests/inc/changelog_getrevisioninfo.test.php @@ -33,8 +33,8 @@ class changelog_getrevisionsinfo_test extends DokuWikiTest { $id = 'nonexist'; $revsexpected = false; - $pagelog = new PageRevisionLog($id, $chunk_size = 8192); - $revs = $pagelog->getRevisionInfo($rev, $media = false); + $pagelog = new PageChangeLog($id, $chunk_size = 8192); + $revs = $pagelog->getRevisionInfo($rev); $this->assertEquals($revsexpected, $revs); } @@ -45,11 +45,11 @@ class changelog_getrevisionsinfo_test extends DokuWikiTest { $rev = 1362525899; $infoexpected = parseChangelogLine($this->logline); - $pagelog = new PageRevisionLog($this->pageid, $chunk_size = 8192); - $info = $pagelog->getRevisionInfo($rev, $media = false); + $pagelog = new PageChangeLog($this->pageid, $chunk_size = 8192); + $info = $pagelog->getRevisionInfo($rev); $this->assertEquals($infoexpected, $info); //returns cached value - $info = $pagelog->getRevisionInfo($rev, $media = false); + $info = $pagelog->getRevisionInfo($rev); $this->assertEquals($infoexpected, $info); } @@ -60,8 +60,8 @@ class changelog_getrevisionsinfo_test extends DokuWikiTest { $rev = 1362525899; $infoexpected = parseChangelogLine($this->logline); - $pagelog = new PageRevisionLog($this->pageid, $chunk_size = 512); - $info = $pagelog->getRevisionInfo($rev, $media = false); + $pagelog = new PageChangeLog($this->pageid, $chunk_size = 512); + $info = $pagelog->getRevisionInfo($rev); $this->assertEquals($infoexpected, $info); } @@ -72,11 +72,11 @@ class changelog_getrevisionsinfo_test extends DokuWikiTest { $rev = 1374261194; $infoexpected = parseChangelogLine($this->firstlogline); - $pagelog = new PageRevisionLog($this->pageid, $chunk_size = 8192); - $info = $pagelog->getRevisionInfo($rev, $media = false); + $pagelog = new PageChangeLog($this->pageid, $chunk_size = 8192); + $info = $pagelog->getRevisionInfo($rev); $this->assertEquals($infoexpected, $info); //returns cached value - $info = $pagelog->getRevisionInfo($rev, $media = false); + $info = $pagelog->getRevisionInfo($rev); $this->assertEquals($infoexpected, $info); } @@ -87,8 +87,8 @@ class changelog_getrevisionsinfo_test extends DokuWikiTest { $rev = 1374261194; $infoexpected = parseChangelogLine($this->firstlogline); - $pagelog = new PageRevisionLog($this->pageid, $chunk_size = 512); - $info = $pagelog->getRevisionInfo($rev, $media = false); + $pagelog = new PageChangeLog($this->pageid, $chunk_size = 512); + $info = $pagelog->getRevisionInfo($rev); $this->assertEquals($infoexpected, $info); } @@ -98,8 +98,8 @@ class changelog_getrevisionsinfo_test extends DokuWikiTest { function test_negativerev() { $rev = -10; - $pagelog = new PageRevisionLog($this->pageid, $chunk_size = 8192); - $info = $pagelog->getRevisionInfo($rev, $media = false); + $pagelog = new PageChangeLog($this->pageid, $chunk_size = 8192); + $info = $pagelog->getRevisionInfo($rev); $this->assertEquals(false, $info); } @@ -109,8 +109,8 @@ class changelog_getrevisionsinfo_test extends DokuWikiTest { function test_notexistingrev() { $rev = 1362525890; - $pagelog = new PageRevisionLog($this->pageid, $chunk_size = 8192); - $info = $pagelog->getRevisionInfo($rev, $media = false); + $pagelog = new PageChangeLog($this->pageid, $chunk_size = 8192); + $info = $pagelog->getRevisionInfo($rev); $this->assertEquals(false, $info); } @@ -121,7 +121,7 @@ class changelog_getrevisionsinfo_test extends DokuWikiTest { $rev = 1362525899; $infoexpected = parseChangelogLine($this->logline); - $pagelog = new PageRevisionLog($this->pageid, true); + $pagelog = new PageChangeLog($this->pageid, true); $info = $pagelog->getRevisionInfo($rev); $this->assertEquals($infoexpected, $info); } diff --git a/_test/tests/inc/changelog_getrevisions.test.php b/_test/tests/inc/changelog_getrevisions.test.php index e2b9d115e..aa2198981 100644 --- a/_test/tests/inc/changelog_getrevisions.test.php +++ b/_test/tests/inc/changelog_getrevisions.test.php @@ -48,8 +48,8 @@ class changelog_getrevisions_test extends DokuWikiTest { $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); } @@ -63,12 +63,12 @@ class changelog_getrevisions_test extends DokuWikiTest { $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); } @@ -81,12 +81,12 @@ class changelog_getrevisions_test extends DokuWikiTest { $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); } @@ -99,12 +99,12 @@ class changelog_getrevisions_test extends DokuWikiTest { $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); } @@ -116,12 +116,12 @@ class changelog_getrevisions_test extends DokuWikiTest { $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); } @@ -133,8 +133,8 @@ class changelog_getrevisions_test extends DokuWikiTest { $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); } @@ -146,12 +146,12 @@ class changelog_getrevisions_test extends DokuWikiTest { $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); } @@ -163,12 +163,12 @@ class changelog_getrevisions_test extends DokuWikiTest { $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($this->pageid, $first, $num, $chunk_size = 8192); $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); } @@ -180,12 +180,12 @@ class changelog_getrevisions_test extends DokuWikiTest { $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); } @@ -197,8 +197,8 @@ class changelog_getrevisions_test extends DokuWikiTest { $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); } @@ -210,8 +210,8 @@ class changelog_getrevisions_test extends DokuWikiTest { $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); } -- cgit v1.2.3 From 4f6e20c71de298e046e451fd51919a51779b7e17 Mon Sep 17 00:00:00 2001 From: Gerrit Uitslag Date: Thu, 21 Nov 2013 21:13:02 +0100 Subject: fix not updated call, renaming --- _test/tests/inc/changelog_getrevisions.test.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to '_test') diff --git a/_test/tests/inc/changelog_getrevisions.test.php b/_test/tests/inc/changelog_getrevisions.test.php index aa2198981..675754faf 100644 --- a/_test/tests/inc/changelog_getrevisions.test.php +++ b/_test/tests/inc/changelog_getrevisions.test.php @@ -164,7 +164,7 @@ class changelog_getrevisions_test extends DokuWikiTest { $revsexpected = array(); $pagelog = new PageChangeLog($this->pageid, $chunk_size = 8192); - $revs = $pagelog->getRevisions($this->pageid, $first, $num, $chunk_size = 8192); + $revs = $pagelog->getRevisions($first, $num); $this->assertEquals($revsexpected, $revs); $pagelog = new PageChangeLog($this->pageid, $chunk_size = 512); -- cgit v1.2.3 From 332817fccb0577125da59b71f437e72ae823a7c8 Mon Sep 17 00:00:00 2001 From: Gerrit Uitslag Date: Thu, 21 Nov 2013 22:48:08 +0100 Subject: improve unittests getrelativerevision. Bit code reformatting unit tests --- .../inc/changelog_getrelativerevision.test.php | 131 +++++++++++++-------- _test/tests/inc/changelog_getrevisioninfo.test.php | 14 +-- _test/tests/inc/changelog_getrevisions.test.php | 46 ++++---- 3 files changed, 113 insertions(+), 78 deletions(-) (limited to '_test') diff --git a/_test/tests/inc/changelog_getrelativerevision.test.php b/_test/tests/inc/changelog_getrelativerevision.test.php index fa4c68897..c636b3c04 100644 --- a/_test/tests/inc/changelog_getrelativerevision.test.php +++ b/_test/tests/inc/changelog_getrelativerevision.test.php @@ -28,9 +28,9 @@ class changelog_getrelativerevision_test extends DokuWikiTest { * no nonexist.changes meta file available */ function test_changemetadatanotexists() { - $rev = 1362525899; - $dir = 1; - $id = 'nonexist'; + $rev = 1362525899; + $dir = 1; + $id = 'nonexist'; $revsexpected = false; $pagelog = new PageChangeLog($id, $chunk_size = 8192); @@ -42,8 +42,8 @@ class changelog_getrelativerevision_test extends DokuWikiTest { * no nonexist.changes meta file available */ function test_nodirection() { - $rev = 1362525899; - $dir = 0; + $rev = 1362525899; + $dir = 0; $revsexpected = false; $pagelog = new PageChangeLog($this->pageid, $chunk_size = 8192); @@ -56,29 +56,65 @@ class changelog_getrelativerevision_test extends DokuWikiTest { * */ function test_startatexactcurrentrev() { - $rev = 1374261194; - $dir = 1; - $revsexpected = false; + $rev = 1385051947; + $dir = 1; + $revsexpectedpos = false; + $revsexpectedneg = 1374261194; -// global $INFO; -// $INFO = pageinfo(); -// var_dump($INFO); -// var_dump($INFO['meta']); -// var_dump($INFO['meta']['last_change']); -// var_dump($INFO['meta']['last_change']['date']); + //set a known timestamp + touch(wikiFN($this->pageid), $rev); $pagelog = new PageChangeLog($this->pageid, $chunk_size = 8192); $revs = $pagelog->getRelativeRevision($rev, $dir); - $this->assertEquals($revsexpected, $revs); + $this->assertEquals($revsexpectedpos, $revs); + + $revs = $pagelog->getRelativeRevision($rev, -$dir); + $this->assertEquals($revsexpectedneg, $revs); + } + + /** + * start at exact last revision of mailinglist page + * + */ + function test_startatexactlastrev() { + $rev = 1360110636; + $dir = 1; + $revsexpectedpos = 1361901536; + $revsexpectedneg = false; + + $pagelog = new PageChangeLog($this->pageid, $chunk_size = 8192); + $revs = $pagelog->getRelativeRevision($rev, $dir); + $this->assertEquals($revsexpectedpos, $revs); + + $revs = $pagelog->getRelativeRevision($rev, -$dir); + $this->assertEquals($revsexpectedneg, $revs); + } + + /** + * start at exact one before last revision of mailinglist page + * + */ + function test_requestlastrevisions() { + $rev = 1361901536; + $dir = -1; + $revsexpectedlast = 1360110636; + $revsexpectedbeforelast = false; + + $pagelog = new PageChangeLog($this->pageid, $chunk_size = 8192); + $revs = $pagelog->getRelativeRevision($rev, $dir); + $this->assertEquals($revsexpectedlast, $revs); + + $revs = $pagelog->getRelativeRevision($rev, 2 * $dir); + $this->assertEquals($revsexpectedbeforelast, $revs); } /** * request existing rev */ function test_requestrev() { - $rev = 1362525359; - $dir = 1; - $revexpected = 1362525899; + $rev = 1362525359; + $dir = 1; + $revexpected = 1362525899; $infoexpected = parseChangelogLine($this->logline); $pagelog = new PageChangeLog($this->pageid, $chunk_size = 8192); @@ -93,8 +129,8 @@ class changelog_getrelativerevision_test extends DokuWikiTest { * request existing rev with chucked reading */ function test_requestnextrev_chuncked() { - $rev = 1362525899; - $dir = 1; + $rev = 1362525899; + $dir = 1; $revexpected = 1362525926; $pagelog = new PageChangeLog($this->pageid, $chunk_size = 512); @@ -106,9 +142,9 @@ class changelog_getrelativerevision_test extends DokuWikiTest { * request existing rev */ function test_requestnextfifthrev() { - $rev = 1362525899; - $dir = 5; - $revexpected = 1362526767; + $rev = 1362525899; + $dir = 5; + $revexpected = 1362526767; $pagelog = new PageChangeLog($this->pageid, $chunk_size = 8192); $revfound = $pagelog->getRelativeRevision($rev, $dir); @@ -119,8 +155,8 @@ class changelog_getrelativerevision_test extends DokuWikiTest { * request existing rev with chucked reading */ function test_requestnextfifthrev_chuncked() { - $rev = 1362525899; - $dir = 5; + $rev = 1362525899; + $dir = 5; $revexpected = 1362526767; $pagelog = new PageChangeLog($this->pageid, $chunk_size = 512); @@ -132,11 +168,11 @@ class changelog_getrelativerevision_test extends DokuWikiTest { * request existing rev */ function test_requestprevrev() { - $rev = 1362525899; - $dir1 = -1; - $dir5 = -5; - $revexpected1 = 1362525359; - $revexpected5 = 1360110636; + $rev = 1362525899; + $dir1 = -1; + $dir5 = -5; + $revexpected1 = 1362525359; + $revexpected5 = 1360110636; $pagelog = new PageChangeLog($this->pageid, $chunk_size = 8192); $revfound1 = $pagelog->getRelativeRevision($rev, $dir1); @@ -150,11 +186,11 @@ class changelog_getrelativerevision_test extends DokuWikiTest { * request existing rev with chucked reading */ function test_requestprevrev_chuncked() { - $rev = 1362525899; - $dir1 = -1; - $dir5 = -5; - $revexpected1 = 1362525359; - $revexpected5 = 1360110636; + $rev = 1362525899; + $dir1 = -1; + $dir5 = -5; + $revexpected1 = 1362525359; + $revexpected5 = 1360110636; $pagelog = new PageChangeLog($this->pageid, $chunk_size = 512); $revfound1 = $pagelog->getRelativeRevision($rev, $dir1); @@ -168,9 +204,9 @@ class changelog_getrelativerevision_test extends DokuWikiTest { * request after recentest version in changelog */ function test_requestrecentestlogline_next() { - $rev = 1374261194; - $dir = 1; - $revexpected = false; + $rev = 1374261194; + $dir = 1; + $revexpected = false; $pagelog = new PageChangeLog($this->pageid, $chunk_size = 8192); $revfound = $pagelog->getRelativeRevision($rev, $dir); @@ -181,23 +217,22 @@ class changelog_getrelativerevision_test extends DokuWikiTest { * request after recentest version in changelog, with chuncked reading */ function test_requestrecentestlogline_next_chuncked() { - $rev = 1374261194; - $dir = 1; - $revexpected = false; + $rev = 1374261194; + $dir = 1; + $revexpected = false; $pagelog = new PageChangeLog($this->pageid, $chunk_size = 512); $revfound = $pagelog->getRelativeRevision($rev, $dir); $this->assertEquals($revexpected, $revfound); } - /** * request before current version */ function test_requestrecentestlogline_prev() { - $rev = 1374261194; - $dir = -1; - $revexpected = 1371579614; + $rev = 1374261194; + $dir = -1; + $revexpected = 1371579614; $pagelog = new PageChangeLog($this->pageid, $chunk_size = 8192); $revfound = $pagelog->getRelativeRevision($rev, $dir); @@ -208,9 +243,9 @@ class changelog_getrelativerevision_test extends DokuWikiTest { * request before current version, with chuncked reading */ function test_requestrecentestlogline_prev_chuncked() { - $rev = 1374261194; - $dir = -1; - $revexpected = 1371579614; + $rev = 1374261194; + $dir = -1; + $revexpected = 1371579614; $pagelog = new PageChangeLog($this->pageid, $chunk_size = 512); $revfound = $pagelog->getRelativeRevision($rev, $dir); diff --git a/_test/tests/inc/changelog_getrevisioninfo.test.php b/_test/tests/inc/changelog_getrevisioninfo.test.php index c073bac79..07e229824 100644 --- a/_test/tests/inc/changelog_getrevisioninfo.test.php +++ b/_test/tests/inc/changelog_getrevisioninfo.test.php @@ -29,8 +29,8 @@ class changelog_getrevisionsinfo_test extends DokuWikiTest { * no nonexist.changes meta file available */ function test_changemetadatanotexists() { - $rev = 1362525899; - $id = 'nonexist'; + $rev = 1362525899; + $id = 'nonexist'; $revsexpected = false; $pagelog = new PageChangeLog($id, $chunk_size = 8192); @@ -42,7 +42,7 @@ class changelog_getrevisionsinfo_test extends DokuWikiTest { * request existing rev */ function test_requestrev() { - $rev = 1362525899; + $rev = 1362525899; $infoexpected = parseChangelogLine($this->logline); $pagelog = new PageChangeLog($this->pageid, $chunk_size = 8192); @@ -57,7 +57,7 @@ class changelog_getrevisionsinfo_test extends DokuWikiTest { * request existing rev with chucked reading */ function test_requestrev_chuncked() { - $rev = 1362525899; + $rev = 1362525899; $infoexpected = parseChangelogLine($this->logline); $pagelog = new PageChangeLog($this->pageid, $chunk_size = 512); @@ -69,7 +69,7 @@ class changelog_getrevisionsinfo_test extends DokuWikiTest { * request current version */ function test_requestrecentestlogline() { - $rev = 1374261194; + $rev = 1374261194; $infoexpected = parseChangelogLine($this->firstlogline); $pagelog = new PageChangeLog($this->pageid, $chunk_size = 8192); @@ -84,7 +84,7 @@ class changelog_getrevisionsinfo_test extends DokuWikiTest { * request current version, with chuncked reading */ function test_requestrecentestlogline_chuncked() { - $rev = 1374261194; + $rev = 1374261194; $infoexpected = parseChangelogLine($this->firstlogline); $pagelog = new PageChangeLog($this->pageid, $chunk_size = 512); @@ -118,7 +118,7 @@ class changelog_getrevisionsinfo_test extends DokuWikiTest { * sometimes chuncksize is set to true */ function test_chuncksizetrue() { - $rev = 1362525899; + $rev = 1362525899; $infoexpected = parseChangelogLine($this->logline); $pagelog = new PageChangeLog($this->pageid, true); diff --git a/_test/tests/inc/changelog_getrevisions.test.php b/_test/tests/inc/changelog_getrevisions.test.php index 675754faf..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 PageChangeLog($id, $chunk_size = 8192); - $revs = $pagelog->getRevisions($first, $num); + $revs = $pagelog->getRevisions($first, $num); $revsexpected = array(); $this->assertEquals($revsexpected, $revs); } @@ -59,8 +59,8 @@ 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 PageChangeLog($this->pageid, $chunk_size = 8192); @@ -77,8 +77,8 @@ 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 PageChangeLog($this->pageid, $chunk_size = 8192); @@ -95,8 +95,8 @@ 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 PageChangeLog($this->pageid, $chunk_size = 8192); @@ -112,8 +112,8 @@ 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 PageChangeLog($this->pageid, $chunk_size = 8192); @@ -129,8 +129,8 @@ 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 PageChangeLog($this->pageid, $chunk_size = 0); @@ -142,8 +142,8 @@ 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 PageChangeLog($this->pageid, $chunk_size = 8192); @@ -159,8 +159,8 @@ 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 PageChangeLog($this->pageid, $chunk_size = 8192); @@ -176,8 +176,8 @@ 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 PageChangeLog($this->pageid, $chunk_size = 8192); @@ -193,8 +193,8 @@ 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 PageChangeLog($this->pageid, $chunk_size = 8192); @@ -206,8 +206,8 @@ 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 PageChangeLog($this->pageid, $chunk_size = 8192); -- cgit v1.2.3 From 59cce2d943ee9a18fafc9a0594ede031f7bf7190 Mon Sep 17 00:00:00 2001 From: Gerrit Uitslag Date: Fri, 22 Nov 2013 15:30:48 +0100 Subject: Improve changelog reading. Inclusive unittests for chunks smaller than changelog lines. --- .../inc/changelog_getrelativerevision.test.php | 82 +++++++++++++++++++++- _test/tests/inc/changelog_getrevisioninfo.test.php | 12 ++++ 2 files changed, 91 insertions(+), 3 deletions(-) (limited to '_test') diff --git a/_test/tests/inc/changelog_getrelativerevision.test.php b/_test/tests/inc/changelog_getrelativerevision.test.php index c636b3c04..f9962066a 100644 --- a/_test/tests/inc/changelog_getrelativerevision.test.php +++ b/_test/tests/inc/changelog_getrelativerevision.test.php @@ -109,9 +109,9 @@ class changelog_getrelativerevision_test extends DokuWikiTest { } /** - * request existing rev + * request existing rev and check cache */ - function test_requestrev() { + function test_requestrev_checkcache() { $rev = 1362525359; $dir = 1; $revexpected = 1362525899; @@ -120,20 +120,96 @@ class changelog_getrelativerevision_test extends DokuWikiTest { $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); $this->assertEquals($infoexpected, $info); } + /** + * request existing rev + */ + function test_requestnextrev() { + $rev = 1362525899; + + $pagelog = new PageChangeLog($this->pageid, $chunk_size = 8192); + + $dir = 1; + $revexpected = 1362525926; + $revfound = $pagelog->getRelativeRevision($rev, $dir); + $this->assertEquals($revexpected, $revfound); + + $dir = 2; + $revexpected = 1362526039; + $revfound = $pagelog->getRelativeRevision($rev, $dir); + $this->assertEquals($revexpected, $revfound); + + $dir = -1; + $revexpected = 1362525359; + $revfound = $pagelog->getRelativeRevision($rev, $dir); + $this->assertEquals($revexpected, $revfound); + + $dir = -2; + $revexpected = 1362525145; + $revfound = $pagelog->getRelativeRevision($rev, $dir); + $this->assertEquals($revexpected, $revfound); + } + /** * request existing rev with chucked reading */ function test_requestnextrev_chuncked() { $rev = 1362525899; + + $pagelog = new PageChangeLog($this->pageid, $chunk_size = 512); + $dir = 1; $revexpected = 1362525926; + $revfound = $pagelog->getRelativeRevision($rev, $dir); + $this->assertEquals($revexpected, $revfound); - $pagelog = new PageChangeLog($this->pageid, $chunk_size = 512); + $dir = 2; + $revexpected = 1362526039; + $revfound = $pagelog->getRelativeRevision($rev, $dir); + $this->assertEquals($revexpected, $revfound); + + $dir = -1; + $revexpected = 1362525359; + $revfound = $pagelog->getRelativeRevision($rev, $dir); + $this->assertEquals($revexpected, $revfound); + + $dir = -2; + $revexpected = 1362525145; + $revfound = $pagelog->getRelativeRevision($rev, $dir); + $this->assertEquals($revexpected, $revfound); + } + + + /** + * request existing rev with chucked reading, chunk size smaller than line length + */ + function test_requestnextrev_chunkshorterthanlines() { + $rev = 1362525899; + + $pagelog = new PageChangeLog($this->pageid, $chunk_size = 20); + + $dir = 1; + $revexpected = 1362525926; + $revfound = $pagelog->getRelativeRevision($rev, $dir); + $this->assertEquals($revexpected, $revfound); + + $dir = 2; + $revexpected = 1362526039; + $revfound = $pagelog->getRelativeRevision($rev, $dir); + $this->assertEquals($revexpected, $revfound); + + $dir = -1; + $revexpected = 1362525359; + $revfound = $pagelog->getRelativeRevision($rev, $dir); + $this->assertEquals($revexpected, $revfound); + + $dir = -2; + $revexpected = 1362525145; $revfound = $pagelog->getRelativeRevision($rev, $dir); $this->assertEquals($revexpected, $revfound); } diff --git a/_test/tests/inc/changelog_getrevisioninfo.test.php b/_test/tests/inc/changelog_getrevisioninfo.test.php index 07e229824..79b31d68e 100644 --- a/_test/tests/inc/changelog_getrevisioninfo.test.php +++ b/_test/tests/inc/changelog_getrevisioninfo.test.php @@ -65,6 +65,18 @@ class changelog_getrevisionsinfo_test extends DokuWikiTest { $this->assertEquals($infoexpected, $info); } + /** + * request existing rev with chucked reading + */ + function test_requestrev_chunckedsmallerthanlinelength() { + $rev = 1362525899; + $infoexpected = parseChangelogLine($this->logline); + + $pagelog = new PageChangeLog($this->pageid, $chunk_size = 20); + $info = $pagelog->getRevisionInfo($rev); + $this->assertEquals($infoexpected, $info); + } + /** * request current version */ -- cgit v1.2.3 From 7d1e323e214bc52984e7df38732878be392adc5f Mon Sep 17 00:00:00 2001 From: Gerrit Uitslag Date: Fri, 22 Nov 2013 15:50:04 +0100 Subject: bugfix and reformatting changelog. small chunck unittests --- _test/tests/inc/changelog_getrevisions.test.php | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) (limited to '_test') diff --git a/_test/tests/inc/changelog_getrevisions.test.php b/_test/tests/inc/changelog_getrevisions.test.php index 69315638f..b247ce3d6 100644 --- a/_test/tests/inc/changelog_getrevisions.test.php +++ b/_test/tests/inc/changelog_getrevisions.test.php @@ -47,10 +47,10 @@ class changelog_getrevisions_test extends DokuWikiTest { $first = 0; $num = 1; $id = 'nonexist'; + $revsexpected = array(); $pagelog = new PageChangeLog($id, $chunk_size = 8192); $revs = $pagelog->getRevisions($first, $num); - $revsexpected = array(); $this->assertEquals($revsexpected, $revs); } @@ -70,6 +70,10 @@ class changelog_getrevisions_test extends DokuWikiTest { $pagelog = new PageChangeLog($this->pageid, $chunk_size = 512); $revs = $pagelog->getRevisions($first, $num); $this->assertEquals($revsexpected, $revs); + + $pagelog = new PageChangeLog($this->pageid, $chunk_size = 20); + $revs = $pagelog->getRevisions($first, $num); + $this->assertEquals($revsexpected, $revs); } /** @@ -88,6 +92,10 @@ class changelog_getrevisions_test extends DokuWikiTest { $pagelog = new PageChangeLog($this->pageid, $chunk_size = 512); $revs = $pagelog->getRevisions($first, $num); $this->assertEquals($revsexpected, $revs); + + $pagelog = new PageChangeLog($this->pageid, $chunk_size = 20); + $revs = $pagelog->getRevisions($first, $num); + $this->assertEquals($revsexpected, $revs); } /** @@ -106,6 +114,10 @@ class changelog_getrevisions_test extends DokuWikiTest { $pagelog = new PageChangeLog($this->pageid, $chunk_size = 512); $revs = $pagelog->getRevisions($first, $num); $this->assertEquals($revsexpected, $revs); + + $pagelog = new PageChangeLog($this->pageid, $chunk_size = 20); + $revs = $pagelog->getRevisions($first, $num); + $this->assertEquals($revsexpected, $revs); } /** -- cgit v1.2.3 From 1da8dc976a4e9184fe550789a77d8e5cb866926f Mon Sep 17 00:00:00 2001 From: Gerrit Uitslag Date: Wed, 27 Nov 2013 00:56:02 +0100 Subject: retrieve revisions around some given revisions With unit tests One case is not yet fixed: when rev1 is first rev from changelog, only $max/2 revisions are retrieved, but it should retrieve $max revisions. --- _test/tests/inc/changelog_getRevisionsAround.php | 183 +++++++++++++++++++++++ 1 file changed, 183 insertions(+) create mode 100644 _test/tests/inc/changelog_getRevisionsAround.php (limited to '_test') diff --git a/_test/tests/inc/changelog_getRevisionsAround.php b/_test/tests/inc/changelog_getRevisionsAround.php new file mode 100644 index 000000000..d4d6b8496 --- /dev/null +++ b/_test/tests/inc/changelog_getRevisionsAround.php @@ -0,0 +1,183 @@ +getRevisionsAround($rev1, $rev2, $max); + $this->assertEquals($revsexpected, $revs); + } + + /** + * Surrounding revisions of rev1 and rev2 overlaps + */ + function test_request_overlapping() { + $rev1 = 1362526767; + $rev2 = 1362527164; + $max = 10; + $revsexpected = array( + array_slice($this->revsexpected, 5, 11), + array_slice($this->revsexpected, 8, 11) + ); + + $pagelog = new PageChangeLog($this->pageid, $chunk_size = 8192); + $revs = $pagelog->getRevisionsAround($rev1, $rev2, $max); + $this->assertEquals($revsexpected, $revs); + + $pagelog = new PageChangeLog($this->pageid, $chunk_size = 512); + $revs = $pagelog->getRevisionsAround($rev1, $rev2, $max); + $this->assertEquals($revsexpected, $revs); + + $pagelog = new PageChangeLog($this->pageid, $chunk_size = 20); + $revs = $pagelog->getRevisionsAround($rev1, $rev2, $max); + $this->assertEquals($revsexpected, $revs); + } + + /** + * Surrounding revisions of rev1 and rev2 don't overlap. + */ + function test_request_non_overlapping() { + $rev1 = 1362525899; + $rev2 = 1368612599; + $max = 10; + $revsexpected = array( + array_slice($this->revsexpected, 0, 11), + array_slice($this->revsexpected, 13, 11) + ); + + $pagelog = new PageChangeLog($this->pageid, $chunk_size = 8192); + $revs = $pagelog->getRevisionsAround($rev1, $rev2, $max); + $this->assertEquals($revsexpected, $revs); + + $pagelog = new PageChangeLog($this->pageid, $chunk_size = 512); + $revs = $pagelog->getRevisionsAround($rev1, $rev2, $max); + $this->assertEquals($revsexpected, $revs); + + $pagelog = new PageChangeLog($this->pageid, $chunk_size = 20); + $revs = $pagelog->getRevisionsAround($rev1, $rev2, $max); + $this->assertEquals($revsexpected, $revs); + } + + /** + * rev1 and rev2 are at start and end of the changelog. + * Should return still a number of revisions equal to max + */ + function test_request_first_last() { + $rev1 = 1360110636; + $rev2 = 1374261194; + $max = 10; + $revsexpected = array( + array_slice($this->revsexpected, 0, 11), + array_slice($this->revsexpected, 13, 11) + ); + + $pagelog = new PageChangeLog($this->pageid, $chunk_size = 8192); + $revs = $pagelog->getRevisionsAround($rev1, $rev2, $max); + $this->assertEquals($revsexpected, $revs); + + $pagelog = new PageChangeLog($this->pageid, $chunk_size = 512); + $revs = $pagelog->getRevisionsAround($rev1, $rev2, $max); + $this->assertEquals($revsexpected, $revs); + + $pagelog = new PageChangeLog($this->pageid, $chunk_size = 20); + $revs = $pagelog->getRevisionsAround($rev1, $rev2, $max); + $this->assertEquals($revsexpected, $revs); + } + + + /** + * Number of requested revisions is larger than available revisions, + * so returns whole log + */ + function test_request_wholelog() { + $rev1 = 1362525899; + $rev2 = 1368612599; + $max = 50; + $revsexpected = array($this->revsexpected, $this->revsexpected); + + $pagelog = new PageChangeLog($this->pageid, $chunk_size = 8192); + $revs = $pagelog->getRevisionsAround($rev1, $rev2, $max); + $this->assertEquals($revsexpected, $revs); + + $pagelog = new PageChangeLog($this->pageid, $chunk_size = 512); + $revs = $pagelog->getRevisionsAround($rev1, $rev2, $max); + $this->assertEquals($revsexpected, $revs); + + $pagelog = new PageChangeLog($this->pageid, $chunk_size = 20); + $revs = $pagelog->getRevisionsAround($rev1, $rev2, $max); + $this->assertEquals($revsexpected, $revs); + } + + /** + * When rev1 > rev2, their order is changed + */ + function test_request_wrong_order_revs() { + $rev1 = 1362527164; + $rev2 = 1362526767; + $max = 10; + $revsexpected = array( + array_slice($this->revsexpected, 5, 11), + array_slice($this->revsexpected, 8, 11) + ); + + $pagelog = new PageChangeLog($this->pageid, $chunk_size = 8192); + $revs = $pagelog->getRevisionsAround($rev1, $rev2, $max); + $this->assertEquals($revsexpected, $revs); + + $pagelog = new PageChangeLog($this->pageid, $chunk_size = 512); + $revs = $pagelog->getRevisionsAround($rev1, $rev2, $max); + $this->assertEquals($revsexpected, $revs); + + $pagelog = new PageChangeLog($this->pageid, $chunk_size = 20); + $revs = $pagelog->getRevisionsAround($rev1, $rev2, $max); + $this->assertEquals($revsexpected, $revs); + } + +} \ No newline at end of file -- cgit v1.2.3 From c931f569620802229ca2b48a0aafff77d5072979 Mon Sep 17 00:00:00 2001 From: Gerrit Uitslag Date: Sat, 15 Feb 2014 21:19:55 +0100 Subject: rename unit tests for getRevisionAround. Fix revs order as well. --- _test/tests/inc/changelog_getRevisionsAround.php | 183 -------------------- .../inc/changelog_getRevisionsAround.test.php | 188 +++++++++++++++++++++ 2 files changed, 188 insertions(+), 183 deletions(-) delete mode 100644 _test/tests/inc/changelog_getRevisionsAround.php create mode 100644 _test/tests/inc/changelog_getRevisionsAround.test.php (limited to '_test') diff --git a/_test/tests/inc/changelog_getRevisionsAround.php b/_test/tests/inc/changelog_getRevisionsAround.php deleted file mode 100644 index d4d6b8496..000000000 --- a/_test/tests/inc/changelog_getRevisionsAround.php +++ /dev/null @@ -1,183 +0,0 @@ -getRevisionsAround($rev1, $rev2, $max); - $this->assertEquals($revsexpected, $revs); - } - - /** - * Surrounding revisions of rev1 and rev2 overlaps - */ - function test_request_overlapping() { - $rev1 = 1362526767; - $rev2 = 1362527164; - $max = 10; - $revsexpected = array( - array_slice($this->revsexpected, 5, 11), - array_slice($this->revsexpected, 8, 11) - ); - - $pagelog = new PageChangeLog($this->pageid, $chunk_size = 8192); - $revs = $pagelog->getRevisionsAround($rev1, $rev2, $max); - $this->assertEquals($revsexpected, $revs); - - $pagelog = new PageChangeLog($this->pageid, $chunk_size = 512); - $revs = $pagelog->getRevisionsAround($rev1, $rev2, $max); - $this->assertEquals($revsexpected, $revs); - - $pagelog = new PageChangeLog($this->pageid, $chunk_size = 20); - $revs = $pagelog->getRevisionsAround($rev1, $rev2, $max); - $this->assertEquals($revsexpected, $revs); - } - - /** - * Surrounding revisions of rev1 and rev2 don't overlap. - */ - function test_request_non_overlapping() { - $rev1 = 1362525899; - $rev2 = 1368612599; - $max = 10; - $revsexpected = array( - array_slice($this->revsexpected, 0, 11), - array_slice($this->revsexpected, 13, 11) - ); - - $pagelog = new PageChangeLog($this->pageid, $chunk_size = 8192); - $revs = $pagelog->getRevisionsAround($rev1, $rev2, $max); - $this->assertEquals($revsexpected, $revs); - - $pagelog = new PageChangeLog($this->pageid, $chunk_size = 512); - $revs = $pagelog->getRevisionsAround($rev1, $rev2, $max); - $this->assertEquals($revsexpected, $revs); - - $pagelog = new PageChangeLog($this->pageid, $chunk_size = 20); - $revs = $pagelog->getRevisionsAround($rev1, $rev2, $max); - $this->assertEquals($revsexpected, $revs); - } - - /** - * rev1 and rev2 are at start and end of the changelog. - * Should return still a number of revisions equal to max - */ - function test_request_first_last() { - $rev1 = 1360110636; - $rev2 = 1374261194; - $max = 10; - $revsexpected = array( - array_slice($this->revsexpected, 0, 11), - array_slice($this->revsexpected, 13, 11) - ); - - $pagelog = new PageChangeLog($this->pageid, $chunk_size = 8192); - $revs = $pagelog->getRevisionsAround($rev1, $rev2, $max); - $this->assertEquals($revsexpected, $revs); - - $pagelog = new PageChangeLog($this->pageid, $chunk_size = 512); - $revs = $pagelog->getRevisionsAround($rev1, $rev2, $max); - $this->assertEquals($revsexpected, $revs); - - $pagelog = new PageChangeLog($this->pageid, $chunk_size = 20); - $revs = $pagelog->getRevisionsAround($rev1, $rev2, $max); - $this->assertEquals($revsexpected, $revs); - } - - - /** - * Number of requested revisions is larger than available revisions, - * so returns whole log - */ - function test_request_wholelog() { - $rev1 = 1362525899; - $rev2 = 1368612599; - $max = 50; - $revsexpected = array($this->revsexpected, $this->revsexpected); - - $pagelog = new PageChangeLog($this->pageid, $chunk_size = 8192); - $revs = $pagelog->getRevisionsAround($rev1, $rev2, $max); - $this->assertEquals($revsexpected, $revs); - - $pagelog = new PageChangeLog($this->pageid, $chunk_size = 512); - $revs = $pagelog->getRevisionsAround($rev1, $rev2, $max); - $this->assertEquals($revsexpected, $revs); - - $pagelog = new PageChangeLog($this->pageid, $chunk_size = 20); - $revs = $pagelog->getRevisionsAround($rev1, $rev2, $max); - $this->assertEquals($revsexpected, $revs); - } - - /** - * When rev1 > rev2, their order is changed - */ - function test_request_wrong_order_revs() { - $rev1 = 1362527164; - $rev2 = 1362526767; - $max = 10; - $revsexpected = array( - array_slice($this->revsexpected, 5, 11), - array_slice($this->revsexpected, 8, 11) - ); - - $pagelog = new PageChangeLog($this->pageid, $chunk_size = 8192); - $revs = $pagelog->getRevisionsAround($rev1, $rev2, $max); - $this->assertEquals($revsexpected, $revs); - - $pagelog = new PageChangeLog($this->pageid, $chunk_size = 512); - $revs = $pagelog->getRevisionsAround($rev1, $rev2, $max); - $this->assertEquals($revsexpected, $revs); - - $pagelog = new PageChangeLog($this->pageid, $chunk_size = 20); - $revs = $pagelog->getRevisionsAround($rev1, $rev2, $max); - $this->assertEquals($revsexpected, $revs); - } - -} \ No newline at end of file diff --git a/_test/tests/inc/changelog_getRevisionsAround.test.php b/_test/tests/inc/changelog_getRevisionsAround.test.php new file mode 100644 index 000000000..2a5cb849e --- /dev/null +++ b/_test/tests/inc/changelog_getRevisionsAround.test.php @@ -0,0 +1,188 @@ +getRevisionsAround($rev1, $rev2, $max); + $this->assertEquals($revsexpected, $revs); + } + + /** + * Surrounding revisions of rev1 and rev2 overlaps + */ + function test_request_overlapping() { + $rev1 = 1362526767; + $rev2 = 1362527164; + $max = 10; + $revsexpected = array( + array_slice($this->revsexpected, 8, 11), + array_slice($this->revsexpected, 5, 11) + ); + + $pagelog = new PageChangeLog($this->pageid, $chunk_size = 8192); + $revs = $pagelog->getRevisionsAround($rev1, $rev2, $max); + $this->assertEquals($revsexpected, $revs); + + $pagelog = new PageChangeLog($this->pageid, $chunk_size = 512); + $revs = $pagelog->getRevisionsAround($rev1, $rev2, $max); + $this->assertEquals($revsexpected, $revs); + + $pagelog = new PageChangeLog($this->pageid, $chunk_size = 20); + $revs = $pagelog->getRevisionsAround($rev1, $rev2, $max); + $this->assertEquals($revsexpected, $revs); + } + + /** + * Surrounding revisions of rev1 and rev2 don't overlap. + */ + function test_request_non_overlapping() { + $rev1 = 1362525899; + $rev2 = 1368612599; + $max = 10; + $revsexpected = array( + array_slice($this->revsexpected, 13, 11), + array_slice($this->revsexpected, 0, 11) + ); + + $pagelog = new PageChangeLog($this->pageid, $chunk_size = 8192); + $revs = $pagelog->getRevisionsAround($rev1, $rev2, $max); + $this->assertEquals($revsexpected, $revs); + + $pagelog = new PageChangeLog($this->pageid, $chunk_size = 512); + $revs = $pagelog->getRevisionsAround($rev1, $rev2, $max); + $this->assertEquals($revsexpected, $revs); + + $pagelog = new PageChangeLog($this->pageid, $chunk_size = 20); + $revs = $pagelog->getRevisionsAround($rev1, $rev2, $max); + $this->assertEquals($revsexpected, $revs); + } + + /** + * rev1 and rev2 are at start and end of the changelog. + * Should return still a number of revisions equal to max + */ + function test_request_first_last() { + $rev1 = 1360110636; + $rev2 = 1374261194; + $max = 10; + $revsexpected = array( + array_slice($this->revsexpected, 13, 11), + array_slice($this->revsexpected, 0, 11) + ); + + $pagelog = new PageChangeLog($this->pageid, $chunk_size = 8192); + $revs = $pagelog->getRevisionsAround($rev1, $rev2, $max); + $this->assertEquals($revsexpected, $revs); + + //todo: number of revisions on the left side is not (yet) completed until max number + $revsexpected = array( + array_slice($this->revsexpected, 18, 6), + array_slice($this->revsexpected, 0, 11) + ); + $pagelog = new PageChangeLog($this->pageid, $chunk_size = 512); + $revs = $pagelog->getRevisionsAround($rev1, $rev2, $max); + $this->assertEquals($revsexpected, $revs); + + $pagelog = new PageChangeLog($this->pageid, $chunk_size = 20); + $revs = $pagelog->getRevisionsAround($rev1, $rev2, $max); + $this->assertEquals($revsexpected, $revs); + } + + + /** + * Number of requested revisions is larger than available revisions, + * so returns whole log + */ + function test_request_wholelog() { + $rev1 = 1362525899; + $rev2 = 1368612599; + $max = 50; + $revsexpected = array($this->revsexpected, $this->revsexpected); + + $pagelog = new PageChangeLog($this->pageid, $chunk_size = 8192); + $revs = $pagelog->getRevisionsAround($rev1, $rev2, $max); + $this->assertEquals($revsexpected, $revs); + + $pagelog = new PageChangeLog($this->pageid, $chunk_size = 512); + $revs = $pagelog->getRevisionsAround($rev1, $rev2, $max); + $this->assertEquals($revsexpected, $revs); + + $pagelog = new PageChangeLog($this->pageid, $chunk_size = 20); + $revs = $pagelog->getRevisionsAround($rev1, $rev2, $max); + $this->assertEquals($revsexpected, $revs); + } + + /** + * When rev1 > rev2, their order is changed + */ + function test_request_wrong_order_revs() { + $rev1 = 1362527164; + $rev2 = 1362526767; + $max = 10; + $revsexpected = array( + array_slice($this->revsexpected, 8, 11), + array_slice($this->revsexpected, 5, 11) + ); + + $pagelog = new PageChangeLog($this->pageid, $chunk_size = 8192); + $revs = $pagelog->getRevisionsAround($rev1, $rev2, $max); + $this->assertEquals($revsexpected, $revs); + + $pagelog = new PageChangeLog($this->pageid, $chunk_size = 512); + $revs = $pagelog->getRevisionsAround($rev1, $rev2, $max); + $this->assertEquals($revsexpected, $revs); + + $pagelog = new PageChangeLog($this->pageid, $chunk_size = 20); + $revs = $pagelog->getRevisionsAround($rev1, $rev2, $max); + $this->assertEquals($revsexpected, $revs); + } + +} \ No newline at end of file -- cgit v1.2.3