Knah-Tsaeb/MyShaarli
Knah-Tsaeb/MyShaarli
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Merge pull request #1352 from ArthurHoaro/hotfix/ut-error

Browse source 
Fix UT: LinkDBTest - make each tests independant
This commit is contained in:
ArthurHoaro 2019-08-10 12:46:41 +02:00 committed by GitHub
commit 5f1617a480
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 12 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

25
tests/bookmark/LinkDBTest.php
View file

@ -49,17 +49,7 @@ class LinkDBTest extends \PHPUnit\Framework\TestCase
* - by tag, * - by tag,
* - by text, * - by text,
* - etc. * - etc.
*/ *
public static function setUpBeforeClass()
{
self::$refDB = new ReferenceLinkDB();
self::$refDB->write(self::$testDatastore);
self::$publicLinkDB = new LinkDB(self::$testDatastore, false, false);
self::$privateLinkDB = new LinkDB(self::$testDatastore, true, false);
}
/**
* Resets test data for each test * Resets test data for each test
*/ */
protected function setUp() protected function setUp()
@ -67,6 +57,12 @@ protected function setUp()
if (file_exists(self::$testDatastore)) { if (file_exists(self::$testDatastore)) {
unlink(self::$testDatastore); unlink(self::$testDatastore);
} }
self::$refDB = new ReferenceLinkDB();
self::$refDB->write(self::$testDatastore);
self::$publicLinkDB = new LinkDB(self::$testDatastore, false, false);
self::$privateLinkDB = new LinkDB(self::$testDatastore, true, false);
} }
/** /**
@ -191,7 +187,7 @@ public function testSave()
$dbSize = sizeof($testDB); $dbSize = sizeof($testDB);
$link = array( $link = array(
'id' => 42, 'id' => 43,
'title' => 'an additional link', 'title' => 'an additional link',
'url' => 'http://dum.my', 'url' => 'http://dum.my',
'description' => 'One more', 'description' => 'One more',
@ -626,7 +622,7 @@ public function testCountLinkPerTagPrivateWithFilter()
*/ */
public function testConsistentOrder() public function testConsistentOrder()
{ {
$nextId = 42; $nextId = 43;
$creation = DateTime::createFromFormat('Ymd_His', '20190807_130444'); $creation = DateTime::createFromFormat('Ymd_His', '20190807_130444');
$linkDB = new LinkDB(self::$testDatastore, true, false); $linkDB = new LinkDB(self::$testDatastore, true, false);
for ($i = 0; $i < 4; ++$i) { for ($i = 0; $i < 4; ++$i) {
@ -646,6 +642,9 @@ public function testConsistentOrder()
$linkDB = new LinkDB(self::$testDatastore, true, false); $linkDB = new LinkDB(self::$testDatastore, true, false);
$count = 3; $count = 3;
foreach ($linkDB as $link) { foreach ($linkDB as $link) {
if ($link['sticky'] === true) {
continue;
}
$this->assertEquals($nextId + $count, $link['id']); $this->assertEquals($nextId + $count, $link['id']);
$this->assertEquals('http://'. $count, $link['url']); $this->assertEquals('http://'. $count, $link['url']);
if (--$count < 0) { if (--$count < 0) {