namespace Shaarli\Api\Controllers;
+use Shaarli\Bookmark\BookmarkFileService;
use Shaarli\Bookmark\LinkDB;
use Shaarli\Config\ConfigManager;
use Shaarli\History;
protected $refDB = null;
/**
- * @var LinkDB instance.
+ * @var BookmarkFileService instance.
*/
- protected $linkDB;
+ protected $bookmarkService;
/**
* @var HistoryController instance.
protected $controller;
/**
- * Before each test, instantiate a new Api with its config, plugins and links.
+ * Before each test, instantiate a new Api with its config, plugins and bookmarks.
*/
- public function setUp()
+ protected function setUp(): void
{
$this->conf = new ConfigManager('tests/utils/config/configJson');
+ $this->conf->set('resource.datastore', self::$testDatastore);
$this->refDB = new \ReferenceLinkDB();
$this->refDB->write(self::$testDatastore);
- $this->linkDB = new LinkDB(self::$testDatastore, true, false);
$refHistory = new \ReferenceHistory();
$refHistory->write(self::$testHistory);
$this->history = new History(self::$testHistory);
+ $this->bookmarkService = new BookmarkFileService($this->conf, $this->history, true);
+
$this->container = new Container();
$this->container['conf'] = $this->conf;
- $this->container['db'] = $this->linkDB;
+ $this->container['db'] = $this->bookmarkService;
$this->container['history'] = $this->history;
$this->controller = new Tags($this->container);
/**
* After each test, remove the test datastore.
*/
- public function tearDown()
+ protected function tearDown(): void
{
@unlink(self::$testDatastore);
@unlink(self::$testHistory);
public function testDeleteTagValid()
{
$tagName = 'gnu';
- $tags = $this->linkDB->linksCountPerTag();
+ $tags = $this->bookmarkService->bookmarksCountPerTag();
$this->assertTrue($tags[$tagName] > 0);
$env = Environment::mock([
'REQUEST_METHOD' => 'DELETE',
$this->assertEquals(204, $response->getStatusCode());
$this->assertEmpty((string) $response->getBody());
- $this->linkDB = new LinkDB(self::$testDatastore, true, false);
- $tags = $this->linkDB->linksCountPerTag();
+ $this->bookmarkService = new BookmarkFileService($this->conf, $this->history, true);
+ $tags = $this->bookmarkService->bookmarksCountPerTag();
$this->assertFalse(isset($tags[$tagName]));
- // 2 links affected
+ // 2 bookmarks affected
$historyEntry = $this->history->getHistory()[0];
$this->assertEquals(History::UPDATED, $historyEntry['event']);
$this->assertTrue(
public function testDeleteTagCaseSensitivity()
{
$tagName = 'sTuff';
- $tags = $this->linkDB->linksCountPerTag();
+ $tags = $this->bookmarkService->bookmarksCountPerTag();
$this->assertTrue($tags[$tagName] > 0);
$env = Environment::mock([
'REQUEST_METHOD' => 'DELETE',
$this->assertEquals(204, $response->getStatusCode());
$this->assertEmpty((string) $response->getBody());
- $this->linkDB = new LinkDB(self::$testDatastore, true, false);
- $tags = $this->linkDB->linksCountPerTag();
+ $this->bookmarkService = new BookmarkFileService($this->conf, $this->history, true);
+ $tags = $this->bookmarkService->bookmarksCountPerTag();
$this->assertFalse(isset($tags[$tagName]));
$this->assertTrue($tags[strtolower($tagName)] > 0);
/**
* Test DELETE tag endpoint: reach not existing tag.
- *
- * @expectedException Shaarli\Api\Exceptions\ApiTagNotFoundException
- * @expectedExceptionMessage Tag not found
*/
public function testDeleteLink404()
{
+ $this->expectException(\Shaarli\Api\Exceptions\ApiTagNotFoundException::class);
+ $this->expectExceptionMessage('Tag not found');
+
$tagName = 'nopenope';
- $tags = $this->linkDB->linksCountPerTag();
+ $tags = $this->bookmarkService->bookmarksCountPerTag();
$this->assertFalse(isset($tags[$tagName]));
$env = Environment::mock([
'REQUEST_METHOD' => 'DELETE',