namespace Shaarli\Api\Controllers;
-
-use PHPUnit\Framework\TestCase;
+use malkusch\lock\mutex\NoMutex;
+use Shaarli\Bookmark\Bookmark;
+use Shaarli\Bookmark\BookmarkFileService;
use Shaarli\Config\ConfigManager;
+use Shaarli\History;
+use Shaarli\TestCase;
use Slim\Container;
use Slim\Http\Environment;
use Slim\Http\Request;
protected $refDB = null;
/**
- * @var \History instance.
+ * @var BookmarkFileService instance.
+ */
+ protected $bookmarkService;
+
+ /**
+ * @var HistoryController instance.
*/
protected $history;
const NB_FIELDS_LINK = 9;
/**
- * Before every test, instantiate a new Api with its config, plugins and links.
+ * Before every 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.json.php');
+ $mutex = new NoMutex();
+ $this->conf = new ConfigManager('tests/utils/config/configJson');
+ $this->conf->set('resource.datastore', self::$testDatastore);
$this->refDB = new \ReferenceLinkDB();
$this->refDB->write(self::$testDatastore);
-
$refHistory = new \ReferenceHistory();
$refHistory->write(self::$testHistory);
- $this->history = new \History(self::$testHistory);
+ $this->history = new History(self::$testHistory);
+ $this->bookmarkService = new BookmarkFileService($this->conf, $this->history, $mutex, true);
$this->container = new Container();
$this->container['conf'] = $this->conf;
- $this->container['db'] = new \LinkDB(self::$testDatastore, true, false);
- $this->container['history'] = new \History(self::$testHistory);
+ $this->container['db'] = $this->bookmarkService;
+ $this->container['history'] = $this->history;
$this->controller = new Links($this->container);
$mock = $this->createMock(Router::class);
$mock->expects($this->any())
- ->method('relativePathFor')
- ->willReturn('api/v1/links/1');
+ ->method('pathFor')
+ ->willReturn('/api/v1/bookmarks/1');
// affect @property-read... seems to work
$this->controller->getCi()->router = $mock;
/**
* After every test, remove the test datastore.
*/
- public function tearDown()
+ protected function tearDown(): void
{
@unlink(self::$testDatastore);
@unlink(self::$testHistory);
$response = $this->controller->postLink($request, new Response());
$this->assertEquals(201, $response->getStatusCode());
- $this->assertEquals('api/v1/links/1', $response->getHeader('Location')[0]);
+ $this->assertEquals('/api/v1/bookmarks/1', $response->getHeader('Location')[0]);
$data = json_decode((string) $response->getBody(), true);
$this->assertEquals(self::NB_FIELDS_LINK, count($data));
$this->assertEquals(43, $data['id']);
- $this->assertRegExp('/[\w-_]{6}/', $data['shorturl']);
- $this->assertEquals('http://domain.tld/?' . $data['shorturl'], $data['url']);
- $this->assertEquals('?' . $data['shorturl'], $data['title']);
+ $this->assertRegExp('/[\w_-]{6}/', $data['shorturl']);
+ $this->assertEquals('http://domain.tld/shaare/' . $data['shorturl'], $data['url']);
+ $this->assertEquals('/shaare/' . $data['shorturl'], $data['title']);
$this->assertEquals('', $data['description']);
$this->assertEquals([], $data['tags']);
- $this->assertEquals(false, $data['private']);
- $this->assertTrue(new \DateTime('5 seconds ago') < \DateTime::createFromFormat(\DateTime::ATOM, $data['created']));
+ $this->assertEquals(true, $data['private']);
+ $this->assertTrue(
+ new \DateTime('5 seconds ago') < \DateTime::createFromFormat(\DateTime::ATOM, $data['created'])
+ );
$this->assertEquals('', $data['updated']);
$historyEntry = $this->history->getHistory()[0];
- $this->assertEquals(\History::CREATED, $historyEntry['event']);
+ $this->assertEquals(History::CREATED, $historyEntry['event']);
$this->assertTrue(
(new \DateTime())->add(\DateInterval::createFromDateString('-5 seconds')) < $historyEntry['datetime']
);
'description' => 'shaare description',
'tags' => ['one', 'two'],
'private' => true,
+ 'created' => '2015-05-05T12:30:00+03:00',
+ 'updated' => '2016-06-05T14:32:10+03:00',
];
$env = Environment::mock([
'REQUEST_METHOD' => 'POST',
$response = $this->controller->postLink($request, new Response());
$this->assertEquals(201, $response->getStatusCode());
- $this->assertEquals('api/v1/links/1', $response->getHeader('Location')[0]);
+ $this->assertEquals('/api/v1/bookmarks/1', $response->getHeader('Location')[0]);
$data = json_decode((string) $response->getBody(), true);
$this->assertEquals(self::NB_FIELDS_LINK, count($data));
$this->assertEquals(43, $data['id']);
- $this->assertRegExp('/[\w-_]{6}/', $data['shorturl']);
+ $this->assertRegExp('/[\w_-]{6}/', $data['shorturl']);
$this->assertEquals('http://' . $link['url'], $data['url']);
$this->assertEquals($link['title'], $data['title']);
$this->assertEquals($link['description'], $data['description']);
$this->assertEquals($link['tags'], $data['tags']);
$this->assertEquals(true, $data['private']);
- $this->assertTrue(new \DateTime('2 seconds ago') < \DateTime::createFromFormat(\DateTime::ATOM, $data['created']));
- $this->assertEquals('', $data['updated']);
+ $this->assertSame($link['created'], $data['created']);
+ $this->assertSame($link['updated'], $data['updated']);
}
/**
$this->assertEquals(['gnu', 'media', 'web', '.hidden', 'hashtag'], $data['tags']);
$this->assertEquals(false, $data['private']);
$this->assertEquals(
- \DateTime::createFromFormat(\LinkDB::LINK_DATE_FORMAT, '20130614_184135'),
+ \DateTime::createFromFormat(Bookmark::LINK_DATE_FORMAT, '20130614_184135'),
\DateTime::createFromFormat(\DateTime::ATOM, $data['created'])
);
$this->assertEquals(
- \DateTime::createFromFormat(\LinkDB::LINK_DATE_FORMAT, '20130615_184230'),
+ \DateTime::createFromFormat(Bookmark::LINK_DATE_FORMAT, '20130615_184230'),
\DateTime::createFromFormat(\DateTime::ATOM, $data['updated'])
);
}