From e26e2060f5470ce8bf4c5973284bae07b8af170a Mon Sep 17 00:00:00 2001 From: ArthurHoaro Date: Fri, 17 Jan 2020 21:34:12 +0100 Subject: Add and update unit test for the new system (Bookmark + Service) See #1307 --- tests/plugins/PluginIssoTest.php | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'tests/plugins/PluginIssoTest.php') diff --git a/tests/plugins/PluginIssoTest.php b/tests/plugins/PluginIssoTest.php index bdfab439..99477205 100644 --- a/tests/plugins/PluginIssoTest.php +++ b/tests/plugins/PluginIssoTest.php @@ -2,7 +2,7 @@ namespace Shaarli\Plugin\Isso; use DateTime; -use Shaarli\Bookmark\LinkDB; +use Shaarli\Bookmark\Bookmark; use Shaarli\Config\ConfigManager; use Shaarli\Plugin\PluginManager; @@ -60,7 +60,7 @@ class PluginIssoTest extends \PHPUnit\Framework\TestCase array( 'id' => 12, 'url' => $str, - 'created' => DateTime::createFromFormat(LinkDB::LINK_DATE_FORMAT, $date), + 'created' => DateTime::createFromFormat(Bookmark::LINK_DATE_FORMAT, $date), ) ) ); @@ -85,7 +85,7 @@ class PluginIssoTest extends \PHPUnit\Framework\TestCase } /** - * Test isso plugin when multiple links are displayed (shouldn't be displayed). + * Test isso plugin when multiple bookmarks are displayed (shouldn't be displayed). */ public function testIssoMultipleLinks() { @@ -102,13 +102,13 @@ class PluginIssoTest extends \PHPUnit\Framework\TestCase 'id' => 12, 'url' => $str, 'shorturl' => $short1 = 'abcd', - 'created' => DateTime::createFromFormat(LinkDB::LINK_DATE_FORMAT, $date1), + 'created' => DateTime::createFromFormat(Bookmark::LINK_DATE_FORMAT, $date1), ), array( 'id' => 13, 'url' => $str . '2', 'shorturl' => $short2 = 'efgh', - 'created' => DateTime::createFromFormat(LinkDB::LINK_DATE_FORMAT, $date2), + 'created' => DateTime::createFromFormat(Bookmark::LINK_DATE_FORMAT, $date2), ), ) ); @@ -136,7 +136,7 @@ class PluginIssoTest extends \PHPUnit\Framework\TestCase 'id' => 12, 'url' => $str, 'shorturl' => $short1 = 'abcd', - 'created' => DateTime::createFromFormat(LinkDB::LINK_DATE_FORMAT, $date), + 'created' => DateTime::createFromFormat(Bookmark::LINK_DATE_FORMAT, $date), ) ), 'search_term' => $str -- cgit v1.2.3 From 76fe68d924d424283d0a1784c5f5e7582dda3a00 Mon Sep 17 00:00:00 2001 From: ArthurHoaro Date: Tue, 22 Sep 2020 12:44:08 +0200 Subject: Fix plugin base path in core plugins Also fix note check in archiveorg plugin, and regression on vintage template. Documentation regarding relative path has been added. Fixes #1548 --- tests/plugins/PluginIssoTest.php | 23 ++++++++++++----------- 1 file changed, 12 insertions(+), 11 deletions(-) (limited to 'tests/plugins/PluginIssoTest.php') diff --git a/tests/plugins/PluginIssoTest.php b/tests/plugins/PluginIssoTest.php index 99477205..2bbb93d2 100644 --- a/tests/plugins/PluginIssoTest.php +++ b/tests/plugins/PluginIssoTest.php @@ -2,6 +2,7 @@ namespace Shaarli\Plugin\Isso; use DateTime; +use PHPUnit\Framework\TestCase; use Shaarli\Bookmark\Bookmark; use Shaarli\Config\ConfigManager; use Shaarli\Plugin\PluginManager; @@ -13,12 +14,12 @@ require_once 'plugins/isso/isso.php'; * * Test the Isso plugin (comment system). */ -class PluginIssoTest extends \PHPUnit\Framework\TestCase +class PluginIssoTest extends TestCase { /** * Reset plugin path */ - public function setUp() + public function setUp(): void { PluginManager::$PLUGINS_PATH = 'plugins'; } @@ -26,7 +27,7 @@ class PluginIssoTest extends \PHPUnit\Framework\TestCase /** * Test Isso init without errors. */ - public function testIssoInitNoError() + public function testIssoInitNoError(): void { $conf = new ConfigManager(''); $conf->set('plugins.ISSO_SERVER', 'value'); @@ -37,7 +38,7 @@ class PluginIssoTest extends \PHPUnit\Framework\TestCase /** * Test Isso init with errors. */ - public function testIssoInitError() + public function testIssoInitError(): void { $conf = new ConfigManager(''); $errors = isso_init($conf); @@ -47,7 +48,7 @@ class PluginIssoTest extends \PHPUnit\Framework\TestCase /** * Test render_linklist hook with valid settings to display the comment form. */ - public function testIssoDisplayed() + public function testIssoDisplayed(): void { $conf = new ConfigManager(''); $conf->set('plugins.ISSO_SERVER', 'value'); @@ -87,7 +88,7 @@ class PluginIssoTest extends \PHPUnit\Framework\TestCase /** * Test isso plugin when multiple bookmarks are displayed (shouldn't be displayed). */ - public function testIssoMultipleLinks() + public function testIssoMultipleLinks(): void { $conf = new ConfigManager(''); $conf->set('plugins.ISSO_SERVER', 'value'); @@ -115,14 +116,14 @@ class PluginIssoTest extends \PHPUnit\Framework\TestCase $processed = hook_isso_render_linklist($data, $conf); // link_plugin should be added for the icon - $this->assertContains('', $processed['links'][0]['link_plugin'][0]); - $this->assertContains('', $processed['links'][1]['link_plugin'][0]); + $this->assertContains('', $processed['links'][0]['link_plugin'][0]); + $this->assertContains('', $processed['links'][1]['link_plugin'][0]); } /** * Test isso plugin when using search (shouldn't be displayed). */ - public function testIssoNotDisplayedWhenSearch() + public function testIssoNotDisplayedWhenSearch(): void { $conf = new ConfigManager(''); $conf->set('plugins.ISSO_SERVER', 'value'); @@ -145,13 +146,13 @@ class PluginIssoTest extends \PHPUnit\Framework\TestCase $processed = hook_isso_render_linklist($data, $conf); // link_plugin should be added for the icon - $this->assertContains('', $processed['links'][0]['link_plugin'][0]); + $this->assertContains('', $processed['links'][0]['link_plugin'][0]); } /** * Test isso plugin without server configuration (shouldn't be displayed). */ - public function testIssoWithoutConf() + public function testIssoWithoutConf(): void { $data = 'abc'; $conf = new ConfigManager(''); -- cgit v1.2.3 From a5a9cf23acd1248585173aa32757d9720b5f2d62 Mon Sep 17 00:00:00 2001 From: ArthurHoaro Date: Tue, 29 Sep 2020 14:41:40 +0200 Subject: Compatibility with PHPUnit 9 --- tests/plugins/PluginIssoTest.php | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'tests/plugins/PluginIssoTest.php') diff --git a/tests/plugins/PluginIssoTest.php b/tests/plugins/PluginIssoTest.php index 2bbb93d2..16ecf357 100644 --- a/tests/plugins/PluginIssoTest.php +++ b/tests/plugins/PluginIssoTest.php @@ -2,10 +2,10 @@ namespace Shaarli\Plugin\Isso; use DateTime; -use PHPUnit\Framework\TestCase; use Shaarli\Bookmark\Bookmark; use Shaarli\Config\ConfigManager; use Shaarli\Plugin\PluginManager; +use Shaarli\TestCase; require_once 'plugins/isso/isso.php'; @@ -116,8 +116,8 @@ class PluginIssoTest extends TestCase $processed = hook_isso_render_linklist($data, $conf); // link_plugin should be added for the icon - $this->assertContains('', $processed['links'][0]['link_plugin'][0]); - $this->assertContains('', $processed['links'][1]['link_plugin'][0]); + $this->assertContainsPolyfill('', $processed['links'][0]['link_plugin'][0]); + $this->assertContainsPolyfill('', $processed['links'][1]['link_plugin'][0]); } /** @@ -146,7 +146,7 @@ class PluginIssoTest extends TestCase $processed = hook_isso_render_linklist($data, $conf); // link_plugin should be added for the icon - $this->assertContains('', $processed['links'][0]['link_plugin'][0]); + $this->assertContainsPolyfill('', $processed['links'][0]['link_plugin'][0]); } /** -- cgit v1.2.3