From bedd176a5406003631da42366736fd5ebae29135 Mon Sep 17 00:00:00 2001 From: ArthurHoaro Date: Mon, 1 Feb 2016 20:33:58 +0100 Subject: Improved search: combine AND, exact terms and exclude search. --- tests/LinkDBTest.php | 1 + tests/LinkFilterTest.php | 40 ++++++++++++++++++++++++++++++++++++---- tests/utils/ReferenceLinkDB.php | 11 ++++++++++- 3 files changed, 47 insertions(+), 5 deletions(-) (limited to 'tests') diff --git a/tests/LinkDBTest.php b/tests/LinkDBTest.php index 765f771e..78f42e56 100644 --- a/tests/LinkDBTest.php +++ b/tests/LinkDBTest.php @@ -278,6 +278,7 @@ class LinkDBTest extends PHPUnit_Framework_TestCase 'stallman' => 1, 'free' => 1, '-exclude' => 1, + 'stuff' => 2, ), self::$publicLinkDB->allTags() ); diff --git a/tests/LinkFilterTest.php b/tests/LinkFilterTest.php index 164af0d4..4d754d25 100644 --- a/tests/LinkFilterTest.php +++ b/tests/LinkFilterTest.php @@ -27,7 +27,7 @@ class LinkFilterTest extends PHPUnit_Framework_TestCase public function testFilter() { $this->assertEquals( - 6, + 7, count(self::$linkFilter->filter('', '')) ); @@ -222,7 +222,7 @@ class LinkFilterTest extends PHPUnit_Framework_TestCase ); $this->assertEquals( - 2, + 3, count(self::$linkFilter->filter(LinkFilter::$FILTER_TEXT, '"free software"')) ); } @@ -250,11 +250,43 @@ class LinkFilterTest extends PHPUnit_Framework_TestCase public function testFilterFullTextMixed() { $this->assertEquals( - 2, + 3, count(self::$linkFilter->filter(LinkFilter::$FILTER_TEXT, 'free software')) ); } + /** + * Full-text search - test exclusion with '-'. + */ + public function testExcludeSearch() + { + $this->assertEquals( + 1, + count(self::$linkFilter->filter(LinkFilter::$FILTER_TEXT, 'free -software')) + ); + + $this->assertEquals( + 7, + count(self::$linkFilter->filter(LinkFilter::$FILTER_TEXT, '-software')) + ); + } + + /** + * Full-text search - test AND, exact terms and exclusion combined. + */ + public function testMultiSearch() + { + $this->assertEquals( + 2, + count(self::$linkFilter->filter(LinkFilter::$FILTER_TEXT, '"Free Software " stallman "read this"')) + ); + + $this->assertEquals( + 1, + count(self::$linkFilter->filter(LinkFilter::$FILTER_TEXT, '"free software " stallman "read this" -beard')) + ); + } + /** * Tag search with exclusion. */ @@ -266,7 +298,7 @@ class LinkFilterTest extends PHPUnit_Framework_TestCase ); $this->assertEquals( - 5, + 6, count(self::$linkFilter->filter(LinkFilter::$FILTER_TAG, '-free')) ); } diff --git a/tests/utils/ReferenceLinkDB.php b/tests/utils/ReferenceLinkDB.php index da3e8c65..b64b58bf 100644 --- a/tests/utils/ReferenceLinkDB.php +++ b/tests/utils/ReferenceLinkDB.php @@ -16,12 +16,21 @@ class ReferenceLinkDB $this->addLink( 'Free as in Freedom 2.0', 'https://static.fsf.org/nosvn/faif-2.0.pdf', - 'Richard Stallman and the Free Software Revolution', + 'Richard Stallman and the Free Software Revolution. Read this.', 0, '20150310_114633', 'free gnu software stallman -exclude' ); + $this->addLink( + 'Note:', + 'local', + 'Stallman has a beard and is part of the Free Software Foundation (or not). Seriously, read this.', + 0, + '20150310_114651', + '' + ); + $this->addLink( 'MediaGoblin', 'http://mediagoblin.org/', -- cgit v1.2.3 From 522b278b03280ed809025ebbeb3eac284b68bf81 Mon Sep 17 00:00:00 2001 From: ArthurHoaro Date: Tue, 2 Feb 2016 19:42:48 +0100 Subject: Support text search across link fields. --- tests/LinkDBTest.php | 1 + tests/LinkFilterTest.php | 51 ++++++++++++++++++++++++++++++++++++----- tests/utils/ReferenceLinkDB.php | 8 +++---- 3 files changed, 50 insertions(+), 10 deletions(-) (limited to 'tests') diff --git a/tests/LinkDBTest.php b/tests/LinkDBTest.php index 78f42e56..b6a273b3 100644 --- a/tests/LinkDBTest.php +++ b/tests/LinkDBTest.php @@ -298,6 +298,7 @@ class LinkDBTest extends PHPUnit_Framework_TestCase 'w3c' => 1, 'css' => 1, 'Mercurial' => 1, + 'stuff' => 2, '-exclude' => 1, '.hidden' => 1, ), diff --git a/tests/LinkFilterTest.php b/tests/LinkFilterTest.php index 4d754d25..31fd4cf4 100644 --- a/tests/LinkFilterTest.php +++ b/tests/LinkFilterTest.php @@ -164,6 +164,17 @@ class LinkFilterTest extends PHPUnit_Framework_TestCase ); } + /** + * Full-text search - no result found. + */ + public function testFilterFullTextNoResult() + { + $this->assertEquals( + 0, + count(self::$linkFilter->filter(LinkFilter::$FILTER_TEXT, 'azertyuiop')) + ); + } + /** * Full-text search - result from a link's URL */ @@ -262,28 +273,56 @@ class LinkFilterTest extends PHPUnit_Framework_TestCase { $this->assertEquals( 1, - count(self::$linkFilter->filter(LinkFilter::$FILTER_TEXT, 'free -software')) + count(self::$linkFilter->filter(LinkFilter::$FILTER_TEXT, 'free -gnu')) ); $this->assertEquals( - 7, - count(self::$linkFilter->filter(LinkFilter::$FILTER_TEXT, '-software')) + 6, + count(self::$linkFilter->filter(LinkFilter::$FILTER_TEXT, '-revolution')) ); } /** - * Full-text search - test AND, exact terms and exclusion combined. + * Full-text search - test AND, exact terms and exclusion combined, across fields. */ public function testMultiSearch() { $this->assertEquals( 2, - count(self::$linkFilter->filter(LinkFilter::$FILTER_TEXT, '"Free Software " stallman "read this"')) + count(self::$linkFilter->filter( + LinkFilter::$FILTER_TEXT, + '"Free Software " stallman "read this" @website stuff' + )) ); $this->assertEquals( 1, - count(self::$linkFilter->filter(LinkFilter::$FILTER_TEXT, '"free software " stallman "read this" -beard')) + count(self::$linkFilter->filter( + LinkFilter::$FILTER_TEXT, + '"free software " stallman "read this" -beard @website stuff' + )) + ); + } + + /** + * Full-text search - make sure that exact search won't work across fields. + */ + public function testSearchExactTermMultiFieldsKo() + { + $this->assertEquals( + 0, + count(self::$linkFilter->filter( + LinkFilter::$FILTER_TEXT, + '"designer naming"' + )) + ); + + $this->assertEquals( + 0, + count(self::$linkFilter->filter( + LinkFilter::$FILTER_TEXT, + '"designernaming"' + )) ); } diff --git a/tests/utils/ReferenceLinkDB.php b/tests/utils/ReferenceLinkDB.php index b64b58bf..61faef05 100644 --- a/tests/utils/ReferenceLinkDB.php +++ b/tests/utils/ReferenceLinkDB.php @@ -14,21 +14,21 @@ class ReferenceLinkDB function __construct() { $this->addLink( - 'Free as in Freedom 2.0', + 'Free as in Freedom 2.0 @website', 'https://static.fsf.org/nosvn/faif-2.0.pdf', 'Richard Stallman and the Free Software Revolution. Read this.', 0, '20150310_114633', - 'free gnu software stallman -exclude' + 'free gnu software stallman -exclude stuff' ); $this->addLink( - 'Note:', + 'Link title: @website', 'local', 'Stallman has a beard and is part of the Free Software Foundation (or not). Seriously, read this.', 0, '20150310_114651', - '' + 'stuff' ); $this->addLink( -- cgit v1.2.3