From 11858be4e8d5aba983700c6cba1c4d0a33ea8e9d Mon Sep 17 00:00:00 2001
From: Frederic Guillot <fred@kanboard.net>
Date: Sat, 9 Apr 2016 22:42:17 -0400
Subject: Filter refactoring

---
 tests/units/Core/Filter/LexerBuilderTest.php | 106 ++++++
 tests/units/Core/Filter/LexerTest.php        | 100 ++++++
 tests/units/Core/Filter/OrCriteriaTest.php   |  58 ++++
 tests/units/Core/LexerTest.php               | 468 ---------------------------
 4 files changed, 264 insertions(+), 468 deletions(-)
 create mode 100644 tests/units/Core/Filter/LexerBuilderTest.php
 create mode 100644 tests/units/Core/Filter/LexerTest.php
 create mode 100644 tests/units/Core/Filter/OrCriteriaTest.php
 delete mode 100644 tests/units/Core/LexerTest.php

(limited to 'tests/units/Core')

diff --git a/tests/units/Core/Filter/LexerBuilderTest.php b/tests/units/Core/Filter/LexerBuilderTest.php
new file mode 100644
index 00000000..ac5315bb
--- /dev/null
+++ b/tests/units/Core/Filter/LexerBuilderTest.php
@@ -0,0 +1,106 @@
+<?php
+
+require_once __DIR__.'/../../Base.php';
+
+use Kanboard\Core\Filter\LexerBuilder;
+use Kanboard\Filter\TaskAssigneeFilter;
+use Kanboard\Filter\TaskTitleFilter;
+use Kanboard\Model\Project;
+use Kanboard\Model\TaskCreation;
+use Kanboard\Model\TaskFinder;
+
+class LexerBuilderTest extends Base
+{
+    public function testBuilderThatReturnResult()
+    {
+        $project = new Project($this->container);
+        $taskCreation = new TaskCreation($this->container);
+        $taskFinder = new TaskFinder($this->container);
+        $query = $taskFinder->getExtendedQuery();
+
+        $this->assertEquals(1, $project->create(array('name' => 'Project')));
+        $this->assertNotFalse($taskCreation->create(array('project_id' => 1, 'title' => 'Test')));
+
+        $builder = new LexerBuilder();
+        $builder->withFilter(new TaskAssigneeFilter());
+        $builder->withFilter(new TaskTitleFilter(), true);
+        $builder->withQuery($query);
+        $tasks = $builder->build('assignee:nobody')->toArray();
+
+        $this->assertCount(1, $tasks);
+        $this->assertEquals('Test', $tasks[0]['title']);
+    }
+
+    public function testBuilderThatReturnNothing()
+    {
+        $project = new Project($this->container);
+        $taskCreation = new TaskCreation($this->container);
+        $taskFinder = new TaskFinder($this->container);
+        $query = $taskFinder->getExtendedQuery();
+
+        $this->assertEquals(1, $project->create(array('name' => 'Project')));
+        $this->assertNotFalse($taskCreation->create(array('project_id' => 1, 'title' => 'Test')));
+
+        $builder = new LexerBuilder();
+        $builder->withFilter(new TaskAssigneeFilter());
+        $builder->withFilter(new TaskTitleFilter(), true);
+        $builder->withQuery($query);
+        $tasks = $builder->build('something')->toArray();
+
+        $this->assertCount(0, $tasks);
+    }
+
+    public function testBuilderWithEmptyInput()
+    {
+        $project = new Project($this->container);
+        $taskCreation = new TaskCreation($this->container);
+        $taskFinder = new TaskFinder($this->container);
+        $query = $taskFinder->getExtendedQuery();
+
+        $this->assertEquals(1, $project->create(array('name' => 'Project')));
+        $this->assertNotFalse($taskCreation->create(array('project_id' => 1, 'title' => 'Test')));
+
+        $builder = new LexerBuilder();
+        $builder->withFilter(new TaskAssigneeFilter());
+        $builder->withFilter(new TaskTitleFilter(), true);
+        $builder->withQuery($query);
+        $tasks = $builder->build('')->toArray();
+
+        $this->assertCount(1, $tasks);
+    }
+
+    public function testBuilderWithMultipleMatches()
+    {
+        $project = new Project($this->container);
+        $taskCreation = new TaskCreation($this->container);
+        $taskFinder = new TaskFinder($this->container);
+        $query = $taskFinder->getExtendedQuery();
+
+        $this->assertEquals(1, $project->create(array('name' => 'Project')));
+        $this->assertNotFalse($taskCreation->create(array('project_id' => 1, 'title' => 'ABC', 'owner_id' => 1)));
+        $this->assertNotFalse($taskCreation->create(array('project_id' => 1, 'title' => 'DEF')));
+
+        $builder = new LexerBuilder();
+        $builder->withFilter(new TaskAssigneeFilter());
+        $builder->withFilter(new TaskTitleFilter(), true);
+        $builder->withQuery($query);
+        $tasks = $builder->build('assignee:nobody assignee:1')->toArray();
+
+        $this->assertCount(2, $tasks);
+    }
+
+    public function testClone()
+    {
+        $taskFinder = new TaskFinder($this->container);
+        $query = $taskFinder->getExtendedQuery();
+
+        $builder = new LexerBuilder();
+        $builder->withFilter(new TaskAssigneeFilter());
+        $builder->withFilter(new TaskTitleFilter());
+        $builder->withQuery($query);
+
+        $clone = clone($builder);
+        $this->assertFalse($builder === $clone);
+        $this->assertFalse($builder->build('test')->getQuery() === $clone->build('test')->getQuery());
+    }
+}
diff --git a/tests/units/Core/Filter/LexerTest.php b/tests/units/Core/Filter/LexerTest.php
new file mode 100644
index 00000000..3f3e368e
--- /dev/null
+++ b/tests/units/Core/Filter/LexerTest.php
@@ -0,0 +1,100 @@
+<?php
+
+require_once __DIR__.'/../../Base.php';
+
+use Kanboard\Core\Filter\Lexer;
+
+class LexerTest extends Base
+{
+    public function testTokenizeWithNoDefaultToken()
+    {
+        $lexer = new Lexer();
+        $this->assertSame(array(), $lexer->tokenize('This is Kanboard'));
+    }
+
+    public function testTokenizeWithDefaultToken()
+    {
+        $lexer = new Lexer();
+        $lexer->setDefaultToken('myDefaultToken');
+
+        $expected = array(
+            'myDefaultToken' => array('This is Kanboard'),
+        );
+
+        $this->assertSame($expected, $lexer->tokenize('This is Kanboard'));
+    }
+
+    public function testTokenizeWithCustomToken()
+    {
+        $lexer = new Lexer();
+        $lexer->addToken("/^(assignee:)/", 'T_USER');
+
+        $expected = array(
+            'T_USER' => array('admin'),
+        );
+
+        $this->assertSame($expected, $lexer->tokenize('assignee:admin something else'));
+    }
+
+    public function testTokenizeWithCustomTokenAndDefaultToken()
+    {
+        $lexer = new Lexer();
+        $lexer->setDefaultToken('myDefaultToken');
+        $lexer->addToken("/^(assignee:)/", 'T_USER');
+
+        $expected = array(
+            'T_USER' => array('admin'),
+            'myDefaultToken' => array('something else'),
+        );
+
+        $this->assertSame($expected, $lexer->tokenize('assignee:admin something else'));
+    }
+
+    public function testTokenizeWithQuotedString()
+    {
+        $lexer = new Lexer();
+        $lexer->addToken("/^(assignee:)/", 'T_USER');
+
+        $expected = array(
+            'T_USER' => array('Foo Bar'),
+        );
+
+        $this->assertSame($expected, $lexer->tokenize('assignee:"Foo Bar" something else'));
+    }
+
+    public function testTokenizeWithNumber()
+    {
+        $lexer = new Lexer();
+        $lexer->setDefaultToken('myDefaultToken');
+
+        $expected = array(
+            'myDefaultToken' => array('#123'),
+        );
+
+        $this->assertSame($expected, $lexer->tokenize('#123'));
+    }
+
+    public function testTokenizeWithStringDate()
+    {
+        $lexer = new Lexer();
+        $lexer->addToken("/^(date:)/", 'T_DATE');
+
+        $expected = array(
+            'T_DATE' => array('today'),
+        );
+
+        $this->assertSame($expected, $lexer->tokenize('date:today something else'));
+    }
+
+    public function testTokenizeWithIsoDate()
+    {
+        $lexer = new Lexer();
+        $lexer->addToken("/^(date:)/", 'T_DATE');
+
+        $expected = array(
+            'T_DATE' => array('<=2016-01-01'),
+        );
+
+        $this->assertSame($expected, $lexer->tokenize('date:<=2016-01-01 something else'));
+    }
+}
diff --git a/tests/units/Core/Filter/OrCriteriaTest.php b/tests/units/Core/Filter/OrCriteriaTest.php
new file mode 100644
index 00000000..787d3461
--- /dev/null
+++ b/tests/units/Core/Filter/OrCriteriaTest.php
@@ -0,0 +1,58 @@
+<?php
+
+use Kanboard\Core\Filter\OrCriteria;
+use Kanboard\Filter\TaskAssigneeFilter;
+use Kanboard\Filter\TaskTitleFilter;
+use Kanboard\Model\Project;
+use Kanboard\Model\TaskCreation;
+use Kanboard\Model\TaskFinder;
+use Kanboard\Model\User;
+
+require_once __DIR__.'/../../Base.php';
+
+class OrCriteriaTest extends Base
+{
+    public function testWithSameFilter()
+    {
+        $taskFinder = new TaskFinder($this->container);
+        $taskCreation = new TaskCreation($this->container);
+        $projectModel = new Project($this->container);
+        $userModel = new User($this->container);
+        $query = $taskFinder->getExtendedQuery();
+
+        $this->assertEquals(2, $userModel->create(array('username' => 'foobar', 'name' => 'Foo Bar')));
+        $this->assertEquals(1, $projectModel->create(array('name' => 'Test')));
+        $this->assertEquals(1, $taskCreation->create(array('title' => 'Test', 'project_id' => 1, 'owner_id' => 2)));
+        $this->assertEquals(2, $taskCreation->create(array('title' => 'Test', 'project_id' => 1, 'owner_id' => 1)));
+
+        $criteria = new OrCriteria();
+        $criteria->withQuery($query);
+        $criteria->withFilter(TaskAssigneeFilter::getInstance(1));
+        $criteria->withFilter(TaskAssigneeFilter::getInstance(2));
+        $criteria->apply();
+
+        $this->assertCount(2, $query->findAll());
+    }
+
+    public function testWithDifferentFilter()
+    {
+        $taskFinder = new TaskFinder($this->container);
+        $taskCreation = new TaskCreation($this->container);
+        $projectModel = new Project($this->container);
+        $userModel = new User($this->container);
+        $query = $taskFinder->getExtendedQuery();
+
+        $this->assertEquals(2, $userModel->create(array('username' => 'foobar', 'name' => 'Foo Bar')));
+        $this->assertEquals(1, $projectModel->create(array('name' => 'Test')));
+        $this->assertEquals(1, $taskCreation->create(array('title' => 'ABC', 'project_id' => 1, 'owner_id' => 2)));
+        $this->assertEquals(2, $taskCreation->create(array('title' => 'DEF', 'project_id' => 1, 'owner_id' => 1)));
+
+        $criteria = new OrCriteria();
+        $criteria->withQuery($query);
+        $criteria->withFilter(TaskAssigneeFilter::getInstance(1));
+        $criteria->withFilter(TaskTitleFilter::getInstance('ABC'));
+        $criteria->apply();
+
+        $this->assertCount(2, $query->findAll());
+    }
+}
diff --git a/tests/units/Core/LexerTest.php b/tests/units/Core/LexerTest.php
deleted file mode 100644
index 55370aab..00000000
--- a/tests/units/Core/LexerTest.php
+++ /dev/null
@@ -1,468 +0,0 @@
-<?php
-
-require_once __DIR__.'/../Base.php';
-
-use Kanboard\Core\Lexer;
-
-class LexerTest extends Base
-{
-    public function testSwimlaneQuery()
-    {
-        $lexer = new Lexer;
-
-        $this->assertEquals(
-            array(array('match' => 'swimlane:', 'token' => 'T_SWIMLANE'), array('match' => 'Version 42', 'token' => 'T_STRING')),
-            $lexer->tokenize('swimlane:"Version 42"')
-        );
-
-        $this->assertEquals(
-            array(array('match' => 'swimlane:', 'token' => 'T_SWIMLANE'), array('match' => 'v3', 'token' => 'T_STRING')),
-            $lexer->tokenize('swimlane:v3')
-        );
-
-        $this->assertEquals(
-            array('T_SWIMLANE' => array('v3')),
-            $lexer->map($lexer->tokenize('swimlane:v3'))
-        );
-
-        $this->assertEquals(
-            array('T_SWIMLANE' => array('Version 42', 'v3')),
-            $lexer->map($lexer->tokenize('swimlane:"Version 42" swimlane:v3'))
-        );
-    }
-
-    public function testAssigneeQuery()
-    {
-        $lexer = new Lexer;
-
-        $this->assertEquals(
-            array(array('match' => 'assignee:', 'token' => 'T_ASSIGNEE'), array('match' => 'me', 'token' => 'T_STRING')),
-            $lexer->tokenize('assignee:me')
-        );
-
-        $this->assertEquals(
-            array(array('match' => 'assignee:', 'token' => 'T_ASSIGNEE'), array('match' => 'everybody', 'token' => 'T_STRING')),
-            $lexer->tokenize('assignee:everybody')
-        );
-
-        $this->assertEquals(
-            array(array('match' => 'assignee:', 'token' => 'T_ASSIGNEE'), array('match' => 'nobody', 'token' => 'T_STRING')),
-            $lexer->tokenize('assignee:nobody')
-        );
-
-        $this->assertEquals(
-            array('T_ASSIGNEE' => array('nobody')),
-            $lexer->map($lexer->tokenize('assignee:nobody'))
-        );
-
-        $this->assertEquals(
-            array('T_ASSIGNEE' => array('John Doe', 'me')),
-            $lexer->map($lexer->tokenize('assignee:"John Doe" assignee:me'))
-        );
-    }
-
-    public function testColorQuery()
-    {
-        $lexer = new Lexer;
-
-        $this->assertEquals(
-            array(array('match' => 'color:', 'token' => 'T_COLOR'), array('match' => 'Blue', 'token' => 'T_STRING')),
-            $lexer->tokenize('color:Blue')
-        );
-
-        $this->assertEquals(
-            array(array('match' => 'color:', 'token' => 'T_COLOR'), array('match' => 'Dark Grey', 'token' => 'T_STRING')),
-            $lexer->tokenize('color:"Dark Grey"')
-        );
-
-        $this->assertEquals(
-            array('T_COLOR' => array('Blue')),
-            $lexer->map($lexer->tokenize('color:Blue'))
-        );
-
-        $this->assertEquals(
-            array('T_COLOR' => array('Dark Grey')),
-            $lexer->map($lexer->tokenize('color:"Dark Grey"'))
-        );
-
-        $this->assertEquals(
-            array(),
-            $lexer->map($lexer->tokenize('color: '))
-        );
-    }
-
-    public function testCategoryQuery()
-    {
-        $lexer = new Lexer;
-
-        $this->assertEquals(
-            array(array('match' => 'category:', 'token' => 'T_CATEGORY'), array('match' => 'Feature Request', 'token' => 'T_STRING')),
-            $lexer->tokenize('category:"Feature Request"')
-        );
-
-        $this->assertEquals(
-            array('T_CATEGORY' => array('Feature Request')),
-            $lexer->map($lexer->tokenize('category:"Feature Request"'))
-        );
-
-        $this->assertEquals(
-            array('T_CATEGORY' => array('Feature Request', 'Bug')),
-            $lexer->map($lexer->tokenize('category:"Feature Request" category:Bug'))
-        );
-
-        $this->assertEquals(
-            array(),
-            $lexer->map($lexer->tokenize('category: '))
-        );
-    }
-
-    public function testLinkQuery()
-    {
-        $lexer = new Lexer;
-    
-        $this->assertEquals(
-            array(array('match' => 'link:', 'token' => 'T_LINK'), array('match' => 'is a milestone of', 'token' => 'T_STRING')),
-            $lexer->tokenize('link:"is a milestone of"')
-            );
-
-        $this->assertEquals(
-            array('T_LINK' => array('is a milestone of')),
-            $lexer->map($lexer->tokenize('link:"is a milestone of"'))
-            );
-
-        $this->assertEquals(
-            array('T_LINK' => array('is a milestone of', 'fixes')),
-            $lexer->map($lexer->tokenize('link:"is a milestone of" link:fixes'))
-            );
-
-        $this->assertEquals(
-            array(),
-            $lexer->map($lexer->tokenize('link: '))
-            );
-    }
-
-    public function testColumnQuery()
-    {
-        $lexer = new Lexer;
-
-        $this->assertEquals(
-            array(array('match' => 'column:', 'token' => 'T_COLUMN'), array('match' => 'Feature Request', 'token' => 'T_STRING')),
-            $lexer->tokenize('column:"Feature Request"')
-        );
-
-        $this->assertEquals(
-            array('T_COLUMN' => array('Feature Request')),
-            $lexer->map($lexer->tokenize('column:"Feature Request"'))
-        );
-
-        $this->assertEquals(
-            array('T_COLUMN' => array('Feature Request', 'Bug')),
-            $lexer->map($lexer->tokenize('column:"Feature Request" column:Bug'))
-        );
-
-        $this->assertEquals(
-            array(),
-            $lexer->map($lexer->tokenize('column: '))
-        );
-    }
-
-    public function testProjectQuery()
-    {
-        $lexer = new Lexer;
-
-        $this->assertEquals(
-            array(array('match' => 'project:', 'token' => 'T_PROJECT'), array('match' => 'My project', 'token' => 'T_STRING')),
-            $lexer->tokenize('project:"My project"')
-        );
-
-        $this->assertEquals(
-            array('T_PROJECT' => array('My project')),
-            $lexer->map($lexer->tokenize('project:"My project"'))
-        );
-
-        $this->assertEquals(
-            array('T_PROJECT' => array('My project', 'plop')),
-            $lexer->map($lexer->tokenize('project:"My project" project:plop'))
-        );
-
-        $this->assertEquals(
-            array(),
-            $lexer->map($lexer->tokenize('project: '))
-        );
-    }
-
-    public function testStatusQuery()
-    {
-        $lexer = new Lexer;
-
-        $this->assertEquals(
-            array(array('match' => 'status:', 'token' => 'T_STATUS'), array('match' => 'open', 'token' => 'T_STRING')),
-            $lexer->tokenize('status:open')
-        );
-
-        $this->assertEquals(
-            array(array('match' => 'status:', 'token' => 'T_STATUS'), array('match' => 'closed', 'token' => 'T_STRING')),
-            $lexer->tokenize('status:closed')
-        );
-
-        $this->assertEquals(
-            array('T_STATUS' => 'open'),
-            $lexer->map($lexer->tokenize('status:open'))
-        );
-
-        $this->assertEquals(
-            array('T_STATUS' => 'closed'),
-            $lexer->map($lexer->tokenize('status:closed'))
-        );
-
-        $this->assertEquals(
-            array(),
-            $lexer->map($lexer->tokenize('status: '))
-        );
-    }
-
-    public function testReferenceQuery()
-    {
-        $lexer = new Lexer;
-
-        $this->assertEquals(
-            array(array('match' => 'ref:', 'token' => 'T_REFERENCE'), array('match' => '123', 'token' => 'T_STRING')),
-            $lexer->tokenize('ref:123')
-        );
-
-        $this->assertEquals(
-            array(array('match' => 'reference:', 'token' => 'T_REFERENCE'), array('match' => '456', 'token' => 'T_STRING')),
-            $lexer->tokenize('reference:456')
-        );
-
-        $this->assertEquals(
-            array('T_REFERENCE' => '123'),
-            $lexer->map($lexer->tokenize('reference:123'))
-        );
-
-        $this->assertEquals(
-            array('T_REFERENCE' => '456'),
-            $lexer->map($lexer->tokenize('ref:456'))
-        );
-
-        $this->assertEquals(
-            array(),
-            $lexer->map($lexer->tokenize('ref: '))
-        );
-    }
-
-    public function testDescriptionQuery()
-    {
-        $lexer = new Lexer;
-
-        $this->assertEquals(
-            array(array('match' => 'description:', 'token' => 'T_DESCRIPTION'), array('match' => 'my text search', 'token' => 'T_STRING')),
-            $lexer->tokenize('description:"my text search"')
-        );
-
-        $this->assertEquals(
-            array('T_DESCRIPTION' => 'my text search'),
-            $lexer->map($lexer->tokenize('description:"my text search"'))
-        );
-
-        $this->assertEquals(
-            array(),
-            $lexer->map($lexer->tokenize('description: '))
-        );
-    }
-
-    public function testDueDateQuery()
-    {
-        $lexer = new Lexer;
-
-        $this->assertEquals(
-            array(array('match' => 'due:', 'token' => 'T_DUE'), array('match' => '2015-05-01', 'token' => 'T_DATE')),
-            $lexer->tokenize('due:2015-05-01')
-        );
-
-        $this->assertEquals(
-            array(array('match' => 'due:', 'token' => 'T_DUE'), array('match' => '<2015-05-01', 'token' => 'T_DATE')),
-            $lexer->tokenize('due:<2015-05-01')
-        );
-
-        $this->assertEquals(
-            array(array('match' => 'due:', 'token' => 'T_DUE'), array('match' => '>2015-05-01', 'token' => 'T_DATE')),
-            $lexer->tokenize('due:>2015-05-01')
-        );
-
-        $this->assertEquals(
-            array(array('match' => 'due:', 'token' => 'T_DUE'), array('match' => '<=2015-05-01', 'token' => 'T_DATE')),
-            $lexer->tokenize('due:<=2015-05-01')
-        );
-
-        $this->assertEquals(
-            array(array('match' => 'due:', 'token' => 'T_DUE'), array('match' => '>=2015-05-01', 'token' => 'T_DATE')),
-            $lexer->tokenize('due:>=2015-05-01')
-        );
-
-        $this->assertEquals(
-            array(array('match' => 'due:', 'token' => 'T_DUE'), array('match' => 'yesterday', 'token' => 'T_DATE')),
-            $lexer->tokenize('due:yesterday')
-        );
-
-        $this->assertEquals(
-            array(array('match' => 'due:', 'token' => 'T_DUE'), array('match' => 'tomorrow', 'token' => 'T_DATE')),
-            $lexer->tokenize('due:tomorrow')
-        );
-
-        $this->assertEquals(
-            array(),
-            $lexer->tokenize('due:#2015-05-01')
-        );
-
-        $this->assertEquals(
-            array(),
-            $lexer->tokenize('due:01-05-1024')
-        );
-
-        $this->assertEquals(
-            array('T_DUE' => '2015-05-01'),
-            $lexer->map($lexer->tokenize('due:2015-05-01'))
-        );
-
-        $this->assertEquals(
-            array('T_DUE' => '<2015-05-01'),
-            $lexer->map($lexer->tokenize('due:<2015-05-01'))
-        );
-
-        $this->assertEquals(
-            array('T_DUE' => 'today'),
-            $lexer->map($lexer->tokenize('due:today'))
-        );
-    }
-
-    public function testModifiedQuery()
-    {
-        $lexer = new Lexer;
-
-        $this->assertEquals(
-            array(array('match' => 'modified:', 'token' => 'T_UPDATED'), array('match' => '2015-05-01', 'token' => 'T_DATE')),
-            $lexer->tokenize('modified:2015-05-01')
-        );
-
-        $this->assertEquals(
-            array(array('match' => 'modified:', 'token' => 'T_UPDATED'), array('match' => '<2015-05-01', 'token' => 'T_DATE')),
-            $lexer->tokenize('modified:<2015-05-01')
-        );
-
-        $this->assertEquals(
-            array(array('match' => 'modified:', 'token' => 'T_UPDATED'), array('match' => '>2015-05-01', 'token' => 'T_DATE')),
-            $lexer->tokenize('modified:>2015-05-01')
-        );
-
-        $this->assertEquals(
-            array(array('match' => 'updated:', 'token' => 'T_UPDATED'), array('match' => '<=2015-05-01', 'token' => 'T_DATE')),
-            $lexer->tokenize('updated:<=2015-05-01')
-        );
-
-        $this->assertEquals(
-            array(array('match' => 'updated:', 'token' => 'T_UPDATED'), array('match' => '>=2015-05-01', 'token' => 'T_DATE')),
-            $lexer->tokenize('updated:>=2015-05-01')
-        );
-
-        $this->assertEquals(
-            array(array('match' => 'updated:', 'token' => 'T_UPDATED'), array('match' => 'yesterday', 'token' => 'T_DATE')),
-            $lexer->tokenize('updated:yesterday')
-        );
-
-        $this->assertEquals(
-            array(array('match' => 'updated:', 'token' => 'T_UPDATED'), array('match' => 'tomorrow', 'token' => 'T_DATE')),
-            $lexer->tokenize('updated:tomorrow')
-        );
-
-        $this->assertEquals(
-            array(),
-            $lexer->tokenize('updated:#2015-05-01')
-        );
-
-        $this->assertEquals(
-            array(),
-            $lexer->tokenize('modified:01-05-1024')
-        );
-
-        $this->assertEquals(
-            array('T_UPDATED' => '2015-05-01'),
-            $lexer->map($lexer->tokenize('modified:2015-05-01'))
-        );
-
-        $this->assertEquals(
-            array('T_UPDATED' => '<2015-05-01'),
-            $lexer->map($lexer->tokenize('modified:<2015-05-01'))
-        );
-
-        $this->assertEquals(
-            array('T_UPDATED' => 'today'),
-            $lexer->map($lexer->tokenize('modified:today'))
-        );
-    }
-
-    public function testMultipleCriterias()
-    {
-        $lexer = new Lexer;
-
-        $this->assertEquals(
-            array('T_COLOR' => array('Dark Grey'), 'T_ASSIGNEE' => array('Fred G'), 'T_TITLE' => 'my task title'),
-            $lexer->map($lexer->tokenize('color:"Dark Grey" assignee:"Fred G" my task title'))
-        );
-
-        $this->assertEquals(
-            array('T_TITLE' => 'my title', 'T_COLOR' => array('yellow')),
-            $lexer->map($lexer->tokenize('my title color:yellow'))
-        );
-
-        $this->assertEquals(
-            array('T_TITLE' => 'my title', 'T_DUE' => '2015-04-01'),
-            $lexer->map($lexer->tokenize('my title due:2015-04-01'))
-        );
-
-        $this->assertEquals(
-            array('T_TITLE' => 'awesome', 'T_DUE' => '<=2015-04-01'),
-            $lexer->map($lexer->tokenize('due:<=2015-04-01 awesome'))
-        );
-
-        $this->assertEquals(
-            array('T_TITLE' => 'awesome', 'T_DUE' => 'today'),
-            $lexer->map($lexer->tokenize('due:today awesome'))
-        );
-
-        $this->assertEquals(
-            array('T_TITLE' => 'my title', 'T_COLOR' => array('yellow'), 'T_DUE' => '2015-04-01'),
-            $lexer->map($lexer->tokenize('my title color:yellow due:2015-04-01'))
-        );
-
-        $this->assertEquals(
-            array('T_TITLE' => 'my title', 'T_COLOR' => array('yellow'), 'T_DUE' => '2015-04-01', 'T_ASSIGNEE' => array('John Doe')),
-            $lexer->map($lexer->tokenize('my title color:yellow due:2015-04-01 assignee:"John Doe"'))
-        );
-
-        $this->assertEquals(
-            array('T_TITLE' => 'my title'),
-            $lexer->map($lexer->tokenize('my title color:'))
-        );
-
-        $this->assertEquals(
-            array('T_TITLE' => 'my title'),
-            $lexer->map($lexer->tokenize('my title color:assignee:'))
-        );
-
-        $this->assertEquals(
-            array('T_TITLE' => 'my title'),
-            $lexer->map($lexer->tokenize('my title '))
-        );
-
-        $this->assertEquals(
-            array('T_TITLE' => '#123'),
-            $lexer->map($lexer->tokenize('#123'))
-        );
-
-        $this->assertEquals(
-            array(),
-            $lexer->map($lexer->tokenize('color:assignee:'))
-        );
-    }
-}
-- 
cgit v1.2.3