3 files changed, 89 insertions, 7 deletions

diff --git a/tests/LinkDBTest.php b/tests/LinkDBTest.php
index 765f771e..b6a273b3 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()
         );
@@ -297,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 164af0d4..31fd4cf4 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('', ''))
         );
 
@@ -165,6 +165,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
      */
     public function testFilterFullTextURL()
@@ -222,7 +233,7 @@ class LinkFilterTest extends PHPUnit_Framework_TestCase
         );
         
         $this->assertEquals(
-            2,
+            3,
             count(self::$linkFilter->filter(LinkFilter::$FILTER_TEXT, '"free software"'))
         );        
     }
@@ -250,12 +261,72 @@ 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 -gnu'))
+        );
+
+        $this->assertEquals(
+            6,
+            count(self::$linkFilter->filter(LinkFilter::$FILTER_TEXT, '-revolution'))
+        );
+    }
+
+    /**
+     * 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" @website stuff'
+            ))
+        );
+
+        $this->assertEquals(
+            1,
+            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"'
+            ))
+        );
+    }
+
+    /**
      * Tag search with exclusion.
      */
     public function testTagFilterWithExclusion()
@@ -266,7 +337,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..61faef05 100644
--- a/tests/utils/ReferenceLinkDB.php
+++ b/tests/utils/ReferenceLinkDB.php
@@ -14,12 +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',
+            '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(
+            '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(