Merge branch 'dev' into hebrew-i18n

6 files changed, 539 insertions, 250 deletions

diff --git a/tests/README.md b/tests/README.md
new file mode 100644
index 000000000..3dd9602be
--- /dev/null
+++ b/tests/README.md
@@ -0,0 +1,7 @@
+# FreshRSS tests
+
+```sh
+cd ./tests/
+wget https://phar.phpunit.de/phpunit.phar
+php phpunit.phar --bootstrap bootstrap.php
+```
diff --git a/tests/app/Models/CategoryTest.php b/tests/app/Models/CategoryTest.php
index da439b785..a1edb17b6 100644
--- a/tests/app/Models/CategoryTest.php
+++ b/tests/app/Models/CategoryTest.php
@@ -1,6 +1,6 @@
 <?php
 
-class FreshRSS_CategoryTest extends \PHPUnit_Framework_TestCase {
+class FreshRSS_CategoryTest extends PHPUnit\Framework\TestCase {
 
 	public function test__construct_whenNoParameters_createsObjectWithDefaultValues() {
 		$category = new FreshRSS_Category();
@@ -20,12 +20,12 @@ class FreshRSS_CategoryTest extends \PHPUnit_Framework_TestCase {
 
 	public function provideValidNames() {
 		return array(
-		    array('', ''),
-		    array('this string does not need trimming', 'this string does not need trimming'),
-		    array('  this string needs trimming on left', 'this string needs trimming on left'),
-		    array('this string needs trimming on right  ', 'this string needs trimming on right'),
-		    array('  this string needs trimming on both ends  ', 'this string needs trimming on both ends'),
-		    array(str_repeat('This string needs to be shortened because its length is way too long. ', 4), str_repeat('This string needs to be shortened because its length is way too long. ', 3) . 'This string needs to be shortened because its'),
+			array('', ''),
+			array('this string does not need trimming', 'this string does not need trimming'),
+			array('  this string needs trimming on left', 'this string needs trimming on left'),
+			array('this string needs trimming on right  ', 'this string needs trimming on right'),
+			array('  this string needs trimming on both ends  ', 'this string needs trimming on both ends'),
+			array(str_repeat('This string needs to be shortened because its length is way too long. ', 4), str_repeat('This string needs to be shortened because its length is way too long. ', 3) . 'This string needs to be shortened because its'),
 		);
 	}
 
diff --git a/tests/app/Models/ContextTest.php b/tests/app/Models/ContextTest.php
deleted file mode 100644
index c5da6f667..000000000
--- a/tests/app/Models/ContextTest.php
+++ /dev/null
@@ -1,241 +0,0 @@
-<?php
-
-require_once(LIB_PATH . '/lib_date.php');
-
-class ContextTest extends \PHPUnit_Framework_TestCase {
-
-	private $context;
-
-	public function setUp() {
-		$this->context = new FreshRSS_Context();
-	}
-
-	public function testParseSearch_whenEmpty_returnsEmptyArray() {
-		$this->assertCount(0, $this->context->parseSearch());
-	}
-
-	/**
-	 * @dataProvider provideMultipleKeywordSearch
-	 * @param string $search
-	 * @param string $expected_values
-	 */
-	public function testParseSearch_whenMultipleKeywords_returnArrayWithMultipleValues($search, $expected_values) {
-		FreshRSS_Context::$search = $search;
-		$parsed_search = $this->context->parseSearch();
-		$this->assertEquals($expected_values, $parsed_search);
-	}
-
-	/**
-	 * @return array
-	 */
-	public function provideMultipleKeywordSearch() {
-		return array(
-		    array(
-			'intitle:word1 author:word2',
-			array(
-			    'intitle' => 'word1',
-			    'author' => 'word2',
-			),
-		    ),
-		    array(
-			'author:word2 intitle:word1',
-			array(
-			    'intitle' => 'word1',
-			    'author' => 'word2',
-			),
-		    ),
-		    array(
-			'author:word1 inurl:word2',
-			array(
-			    'author' => 'word1',
-			    'inurl' => 'word2',
-			),
-		    ),
-		    array(
-			'inurl:word2 author:word1',
-			array(
-			    'author' => 'word1',
-			    'inurl' => 'word2',
-			),
-		    ),
-		    array(
-			'date:2008-01-01/2008-02-01 pubdate:2007-01-01/2007-02-01',
-			array(
-			    'min_date' => '1199163600',
-			    'max_date' => '1201928399',
-			    'min_pubdate' => '1167627600',
-			    'max_pubdate' => '1170392399',
-			),
-		    ),
-		    array(
-			'pubdate:2007-01-01/2007-02-01 date:2008-01-01/2008-02-01',
-			array(
-			    'min_date' => '1199163600',
-			    'max_date' => '1201928399',
-			    'min_pubdate' => '1167627600',
-			    'max_pubdate' => '1170392399',
-			),
-		    ),
-		    array(
-			'inurl:word1 author:word2 intitle:word3 pubdate:2007-01-01/2007-02-01 date:2008-01-01/2008-02-01 hello world',
-			array(
-			    'inurl' => 'word1',
-			    'author' => 'word2',
-			    'intitle' => 'word3',
-			    'min_date' => '1199163600',
-			    'max_date' => '1201928399',
-			    'min_pubdate' => '1167627600',
-			    'max_pubdate' => '1170392399',
-			    'search' => 'hello world',
-			),
-		    ),
-		);
-	}
-
-	/**
-	 * @dataProvider provideIntitleSearch
-	 * @param string $search
-	 * @param string $expected_value
-	 */
-	public function testParseSearch_whenIntitleKeyword_returnArrayWithIntitleValue($search, $expected_value) {
-		FreshRSS_Context::$search = $search;
-		$parsed_search = $this->context->parseSearch();
-		$this->assertEquals($expected_value, $parsed_search['intitle']);
-	}
-
-	/**
-	 * @return array
-	 */
-	public function provideIntitleSearch() {
-		return array(
-		    array('intitle:word1', 'word1'),
-		    array('intitle:word1 word2', 'word1'),
-		    array('intitle:"word1 word2"', 'word1 word2'),
-		    array("intitle:'word1 word2'", 'word1 word2'),
-		    array('word1 intitle:word2', 'word2'),
-		    array('word1 intitle:word2 word3', 'word2'),
-		    array('word1 intitle:"word2 word3"', 'word2 word3'),
-		    array("word1 intitle:'word2 word3'", 'word2 word3'),
-		    array('intitle:word1 intitle:word2', 'word1'),
-		    array('intitle: word1 word2', ''),
-		    array('intitle:123', '123'),
-		    array('intitle:"word1 word2" word3"', 'word1 word2'),
-		    array("intitle:'word1 word2' word3'", 'word1 word2'),
-		    array('intitle:"word1 word2\' word3"', "word1 word2' word3"),
-		    array("intitle:'word1 word2\" word3'", 'word1 word2" word3'),
-		);
-	}
-
-	/**
-	 * @dataProvider provideAuthorSearch
-	 * @param string $search
-	 * @param string $expected_value
-	 */
-	public function testParseSearch_whenAuthorKeyword_returnArrayWithAuthorValue($search, $expected_value) {
-		FreshRSS_Context::$search = $search;
-		$parsed_search = $this->context->parseSearch();
-		$this->assertEquals($expected_value, $parsed_search['author']);
-	}
-
-	/**
-	 * @return array
-	 */
-	public function provideAuthorSearch() {
-		return array(
-		    array('author:word1', 'word1'),
-		    array('author:word1 word2', 'word1'),
-		    array('author:"word1 word2"', 'word1 word2'),
-		    array("author:'word1 word2'", 'word1 word2'),
-		    array('word1 author:word2', 'word2'),
-		    array('word1 author:word2 word3', 'word2'),
-		    array('word1 author:"word2 word3"', 'word2 word3'),
-		    array("word1 author:'word2 word3'", 'word2 word3'),
-		    array('author:word1 author:word2', 'word1'),
-		    array('author: word1 word2', ''),
-		    array('author:123', '123'),
-		    array('author:"word1 word2" word3"', 'word1 word2'),
-		    array("author:'word1 word2' word3'", 'word1 word2'),
-		    array('author:"word1 word2\' word3"', "word1 word2' word3"),
-		    array("author:'word1 word2\" word3'", 'word1 word2" word3'),
-		);
-	}
-
-	/**
-	 * @dataProvider provideInurlSearch
-	 * @param string $search
-	 * @param string $expected_value
-	 */
-	public function testParseSearch_whenInurlKeyword_returnArrayWithInurlValue($search, $expected_value) {
-		FreshRSS_Context::$search = $search;
-		$parsed_search = $this->context->parseSearch();
-		$this->assertEquals($expected_value, $parsed_search['inurl']);
-	}
-
-	/**
-	 * @return array
-	 */
-	public function provideInurlSearch() {
-		return array(
-		    array('inurl:word1', 'word1'),
-		    array('inurl: word1', ''),
-		    array('inurl:123', '123'),
-		    array('inurl:word1 word2', 'word1'),
-		    array('inurl:"word1 word2"', '"word1'),
-		);
-	}
-
-	/**
-	 * @dataProvider provideDateSearch
-	 * @param string $search
-	 * @param string $expected_min_value
-	 * @param string $expected_max_value
-	 */
-	public function testParseSearch_whenDateKeyword_returnArrayWithDateValues($search, $expected_min_value, $expected_max_value) {
-		FreshRSS_Context::$search = $search;
-		$parsed_search = $this->context->parseSearch();
-		$this->assertEquals($expected_min_value, $parsed_search['min_date']);
-		$this->assertEquals($expected_max_value, $parsed_search['max_date']);
-	}
-
-	/**
-	 * @return array
-	 */
-	public function provideDateSearch() {
-		return array(
-		    array('date:2007-03-01T13:00:00Z/2008-05-11T15:30:00Z', '1172754000', '1210519800'),
-		    array('date:2007-03-01T13:00:00Z/P1Y2M10DT2H30M', '1172754000', '1210516199'),
-		    array('date:P1Y2M10DT2H30M/2008-05-11T15:30:00Z', '1172757601', '1210519800'),
-		    array('date:2007-03-01/2008-05-11', '1172725200', '1210564799'),
-		    array('date:2007-03-01/', '1172725200', ''),
-		    array('date:/2008-05-11', '', '1210564799'),
-		);
-	}
-
-	/**
-	 * @dataProvider providePubdateSearch
-	 * @param string $search
-	 * @param string $expected_min_value
-	 * @param string $expected_max_value
-	 */
-	public function testParseSearch_whenPubdateKeyword_returnArrayWithPubdateValues($search, $expected_min_value, $expected_max_value) {
-		FreshRSS_Context::$search = $search;
-		$parsed_search = $this->context->parseSearch();
-		$this->assertEquals($expected_min_value, $parsed_search['min_pubdate']);
-		$this->assertEquals($expected_max_value, $parsed_search['max_pubdate']);
-	}
-
-	/**
-	 * @return array
-	 */
-	public function providePubdateSearch() {
-		return array(
-		    array('pubdate:2007-03-01T13:00:00Z/2008-05-11T15:30:00Z', '1172754000', '1210519800'),
-		    array('pubdate:2007-03-01T13:00:00Z/P1Y2M10DT2H30M', '1172754000', '1210516199'),
-		    array('pubdate:P1Y2M10DT2H30M/2008-05-11T15:30:00Z', '1172757601', '1210519800'),
-		    array('pubdate:2007-03-01/2008-05-11', '1172725200', '1210564799'),
-		    array('pubdate:2007-03-01/', '1172725200', ''),
-		    array('pubdate:/2008-05-11', '', '1210564799'),
-		);
-	}
-
-}
diff --git a/tests/app/Models/SearchTest.php b/tests/app/Models/SearchTest.php
new file mode 100644
index 000000000..5c0469a48
--- /dev/null
+++ b/tests/app/Models/SearchTest.php
@@ -0,0 +1,294 @@
+<?php
+
+require_once(LIB_PATH . '/lib_date.php');
+
+class SearchTest extends PHPUnit\Framework\TestCase {
+
+	/**
+	 * @dataProvider provideEmptyInput
+	 * @param string|null $input
+	 */
+	public function test__construct_whenInputIsEmpty_getsOnlyNullValues($input) {
+		$search = new FreshRSS_Search($input);
+		$this->assertEquals('', $search->getRawInput());
+		$this->assertNull($search->getIntitle());
+		$this->assertNull($search->getMinDate());
+		$this->assertNull($search->getMaxDate());
+		$this->assertNull($search->getMinPubdate());
+		$this->assertNull($search->getMaxPubdate());
+		$this->assertNull($search->getAuthor());
+		$this->assertNull($search->getTags());
+		$this->assertNull($search->getSearch());
+	}
+
+	/**
+	 * Return an array of values for the search object.
+	 * Here is the description of the values
+	 * @return array
+	 */
+	public function provideEmptyInput() {
+		return array(
+			array(''),
+			array(null),
+		);
+	}
+
+	/**
+	 * @dataProvider provideIntitleSearch
+	 * @param string $input
+	 * @param string $intitle_value
+	 * @param string|null $search_value
+	 */
+	public function test__construct_whenInputContainsIntitle_setsIntitlePropery($input, $intitle_value, $search_value) {
+		$search = new FreshRSS_Search($input);
+		$this->assertEquals($intitle_value, $search->getIntitle());
+		$this->assertEquals($search_value, $search->getSearch());
+	}
+
+	/**
+	 * @return array
+	 */
+	public function provideIntitleSearch() {
+		return array(
+			array('intitle:word1', array('word1'), null),
+			array('intitle:word1 word2', array('word1'), array('word2')),
+			array('intitle:"word1 word2"', array('word1 word2'), null),
+			array("intitle:'word1 word2'", array('word1 word2'), null),
+			array('word1 intitle:word2', array('word2'), array('word1')),
+			array('word1 intitle:word2 word3', array('word2'), array('word1', 'word3')),
+			array('word1 intitle:"word2 word3"', array('word2 word3'), array('word1')),
+			array("word1 intitle:'word2 word3'", array('word2 word3'), array('word1')),
+			array('intitle:word1 intitle:word2', array('word1', 'word2'), null),
+			array('intitle: word1 word2', array(), array('word1', 'word2')),
+			array('intitle:123', array('123'), null),
+			array('intitle:"word1 word2" word3"', array('word1 word2'), array('word3"')),
+			array("intitle:'word1 word2' word3'", array('word1 word2'), array("word3'")),
+			array('intitle:"word1 word2\' word3"', array("word1 word2' word3"), null),
+			array("intitle:'word1 word2\" word3'", array('word1 word2" word3'), null),
+			array("intitle:word1 'word2 word3' word4", array('word1'), array('word2 word3', 'word4')),
+		);
+	}
+
+	/**
+	 * @dataProvider provideAuthorSearch
+	 * @param string $input
+	 * @param string $author_value
+	 * @param string|null $search_value
+	 */
+	public function test__construct_whenInputContainsAuthor_setsAuthorValue($input, $author_value, $search_value) {
+		$search = new FreshRSS_Search($input);
+		$this->assertEquals($author_value, $search->getAuthor());
+		$this->assertEquals($search_value, $search->getSearch());
+	}
+
+	/**
+	 * @return array
+	 */
+	public function provideAuthorSearch() {
+		return array(
+			array('author:word1', array('word1'), null),
+			array('author:word1 word2', array('word1'), array('word2')),
+			array('author:"word1 word2"', array('word1 word2'), null),
+			array("author:'word1 word2'", array('word1 word2'), null),
+			array('word1 author:word2', array('word2'), array('word1')),
+			array('word1 author:word2 word3', array('word2'), array('word1', 'word3')),
+			array('word1 author:"word2 word3"', array('word2 word3'), array('word1')),
+			array("word1 author:'word2 word3'", array('word2 word3'), array('word1')),
+			array('author:word1 author:word2', array('word1', 'word2'), null),
+			array('author: word1 word2', array(), array('word1', 'word2')),
+			array('author:123', array('123'), null),
+			array('author:"word1 word2" word3"', array('word1 word2'), array('word3"')),
+			array("author:'word1 word2' word3'", array('word1 word2'), array("word3'")),
+			array('author:"word1 word2\' word3"', array("word1 word2' word3"), null),
+			array("author:'word1 word2\" word3'", array('word1 word2" word3'), null),
+			array("author:word1 'word2 word3' word4", array('word1'), array('word2 word3', 'word4')),
+		);
+	}
+
+	/**
+	 * @dataProvider provideInurlSearch
+	 * @param string $input
+	 * @param string $inurl_value
+	 * @param string|null $search_value
+	 */
+	public function test__construct_whenInputContainsInurl_setsInurlValue($input, $inurl_value, $search_value) {
+		$search = new FreshRSS_Search($input);
+		$this->assertEquals($inurl_value, $search->getInurl());
+		$this->assertEquals($search_value, $search->getSearch());
+	}
+
+	/**
+	 * @return array
+	 */
+	public function provideInurlSearch() {
+		return array(
+			array('inurl:word1', array('word1'), null),
+			array('inurl: word1', array(), array('word1')),
+			array('inurl:123', array('123'), null),
+			array('inurl:word1 word2', array('word1'), array('word2')),
+			array('inurl:"word1 word2"', array('"word1'), array('word2"')),
+			array('inurl:word1 word2 inurl:word3', array('word1', 'word3'), array('word2')),
+			array("inurl:word1 'word2 word3' word4", array('word1'), array('word2 word3', 'word4')),
+		);
+	}
+
+	/**
+	 * @dataProvider provideDateSearch
+	 * @param string $input
+	 * @param string $min_date_value
+	 * @param string $max_date_value
+	 */
+	public function test__construct_whenInputContainsDate_setsDateValues($input, $min_date_value, $max_date_value) {
+		$search = new FreshRSS_Search($input);
+		$this->assertEquals($min_date_value, $search->getMinDate());
+		$this->assertEquals($max_date_value, $search->getMaxDate());
+	}
+
+	/**
+	 * @return array
+	 */
+	public function provideDateSearch() {
+		return array(
+			array('date:2007-03-01T13:00:00Z/2008-05-11T15:30:00Z', '1172754000', '1210519800'),
+			array('date:2007-03-01T13:00:00Z/P1Y2M10DT2H30M', '1172754000', '1210516199'),
+			array('date:P1Y2M10DT2H30M/2008-05-11T15:30:00Z', '1172757601', '1210519800'),
+			array('date:2007-03-01/2008-05-11', strtotime('2007-03-01'), strtotime('2008-05-12') - 1),
+			array('date:2007-03-01/', strtotime('2007-03-01'), ''),
+			array('date:/2008-05-11', '', strtotime('2008-05-12') - 1),
+		);
+	}
+
+	/**
+	 * @dataProvider providePubdateSearch
+	 * @param string $input
+	 * @param string $min_pubdate_value
+	 * @param string $max_pubdate_value
+	 */
+	public function test__construct_whenInputContainsPubdate_setsPubdateValues($input, $min_pubdate_value, $max_pubdate_value) {
+		$search = new FreshRSS_Search($input);
+		$this->assertEquals($min_pubdate_value, $search->getMinPubdate());
+		$this->assertEquals($max_pubdate_value, $search->getMaxPubdate());
+	}
+
+	/**
+	 * @return array
+	 */
+	public function providePubdateSearch() {
+		return array(
+			array('pubdate:2007-03-01T13:00:00Z/2008-05-11T15:30:00Z', '1172754000', '1210519800'),
+			array('pubdate:2007-03-01T13:00:00Z/P1Y2M10DT2H30M', '1172754000', '1210516199'),
+			array('pubdate:P1Y2M10DT2H30M/2008-05-11T15:30:00Z', '1172757601', '1210519800'),
+			array('pubdate:2007-03-01/2008-05-11', strtotime('2007-03-01'), strtotime('2008-05-12') - 1),
+			array('pubdate:2007-03-01/', strtotime('2007-03-01'), ''),
+			array('pubdate:/2008-05-11', '', strtotime('2008-05-12') - 1),
+		);
+	}
+
+	/**
+	 * @dataProvider provideTagsSearch
+	 * @param string $input
+	 * @param string $tags_value
+	 * @param string|null $search_value
+	 */
+	public function test__construct_whenInputContainsTags_setsTagsValue($input, $tags_value, $search_value) {
+		$search = new FreshRSS_Search($input);
+		$this->assertEquals($tags_value, $search->getTags());
+		$this->assertEquals($search_value, $search->getSearch());
+	}
+
+	/**
+	 * @return array
+	 */
+	public function provideTagsSearch() {
+		return array(
+			array('#word1', array('word1'), null),
+			array('# word1', array(), array('#', 'word1')),
+			array('#123', array('123'), null),
+			array('#word1 word2', array('word1'), array('word2')),
+			array('#"word1 word2"', array('"word1'), array('word2"')),
+			array('#word1 #word2', array('word1', 'word2'), null),
+			array("#word1 'word2 word3' word4", array('word1'), array('word2 word3', 'word4')),
+		);
+	}
+
+	/**
+	 * @dataProvider provideMultipleSearch
+	 * @param string $input
+	 * @param string $author_value
+	 * @param string $min_date_value
+	 * @param string $max_date_value
+	 * @param string $intitle_value
+	 * @param string $inurl_value
+	 * @param string $min_pubdate_value
+	 * @param string $max_pubdate_value
+	 * @param array $tags_value
+	 * @param string|null $search_value
+	 */
+	public function test__construct_whenInputContainsMultipleKeywords_setsValues($input, $author_value, $min_date_value, $max_date_value, $intitle_value, $inurl_value, $min_pubdate_value, $max_pubdate_value, $tags_value, $search_value) {
+		$search = new FreshRSS_Search($input);
+		$this->assertEquals($author_value, $search->getAuthor());
+		$this->assertEquals($min_date_value, $search->getMinDate());
+		$this->assertEquals($max_date_value, $search->getMaxDate());
+		$this->assertEquals($intitle_value, $search->getIntitle());
+		$this->assertEquals($inurl_value, $search->getInurl());
+		$this->assertEquals($min_pubdate_value, $search->getMinPubdate());
+		$this->assertEquals($max_pubdate_value, $search->getMaxPubdate());
+		$this->assertEquals($tags_value, $search->getTags());
+		$this->assertEquals($search_value, $search->getSearch());
+		$this->assertEquals($input, $search->getRawInput());
+	}
+
+	public function provideMultipleSearch() {
+		return array(
+			array(
+				'author:word1 date:2007-03-01/2008-05-11 intitle:word2 inurl:word3 pubdate:2007-03-01/2008-05-11 #word4 #word5',
+				array('word1'),
+				strtotime('2007-03-01'),
+				strtotime('2008-05-12') - 1,
+				array('word2'),
+				array('word3'),
+				strtotime('2007-03-01'),
+				strtotime('2008-05-12') - 1,
+				array('word4', 'word5'),
+				null,
+			),
+			array(
+				'word6 intitle:word2 inurl:word3 pubdate:2007-03-01/2008-05-11 #word4 author:word1 #word5 date:2007-03-01/2008-05-11',
+				array('word1'),
+				strtotime('2007-03-01'),
+				strtotime('2008-05-12') - 1,
+				array('word2'),
+				array('word3'),
+				strtotime('2007-03-01'),
+				strtotime('2008-05-12') - 1,
+				array('word4', 'word5'),
+				array('word6'),
+			),
+			array(
+				'word6 intitle:word2 inurl:word3 pubdate:2007-03-01/2008-05-11 #word4 author:word1 #word5 word7 date:2007-03-01/2008-05-11',
+				array('word1'),
+				strtotime('2007-03-01'),
+				strtotime('2008-05-12') - 1,
+				array('word2'),
+				array('word3'),
+				strtotime('2007-03-01'),
+				strtotime('2008-05-12') - 1,
+				array('word4', 'word5'),
+				array('word6', 'word7'),
+			),
+			array(
+				'word6 intitle:word2 inurl:word3 pubdate:2007-03-01/2008-05-11 #word4 author:word1 #word5 "word7 word8" date:2007-03-01/2008-05-11',
+				array('word1'),
+				strtotime('2007-03-01'),
+				strtotime('2008-05-12') - 1,
+				array('word2'),
+				array('word3'),
+				strtotime('2007-03-01'),
+				strtotime('2008-05-12') - 1,
+				array('word4', 'word5'),
+				array('word7 word8', 'word6'),
+			),
+		);
+	}
+
+}
diff --git a/tests/app/Models/UserQueryTest.php b/tests/app/Models/UserQueryTest.php
new file mode 100644
index 000000000..1959fd492
--- /dev/null
+++ b/tests/app/Models/UserQueryTest.php
@@ -0,0 +1,229 @@
+<?php
+
+/**
+ * Description of UserQueryTest
+ */
+class UserQueryTest extends PHPUnit\Framework\TestCase {
+
+	public function test__construct_whenAllQuery_storesAllParameters() {
+		$query = array('get' => 'a');
+		$user_query = new FreshRSS_UserQuery($query);
+		$this->assertEquals('all', $user_query->getGetName());
+		$this->assertEquals('all', $user_query->getGetType());
+	}
+
+	public function test__construct_whenFavoriteQuery_storesFavoriteParameters() {
+		$query = array('get' => 's');
+		$user_query = new FreshRSS_UserQuery($query);
+		$this->assertEquals('favorite', $user_query->getGetName());
+		$this->assertEquals('favorite', $user_query->getGetType());
+	}
+
+	/**
+	 * @expectedException Exceptions/FreshRSS_DAO_Exception
+	 * @expectedExceptionMessage Category DAO is not loaded in UserQuery
+	 */
+	public function test__construct_whenCategoryQueryAndNoDao_throwsException() {
+		$this->markTestIncomplete('There is a problem with the exception autoloading. We need to make a better autoloading process');
+		$query = array('get' => 'c_1');
+		new FreshRSS_UserQuery($query);
+	}
+
+	public function test__construct_whenCategoryQuery_storesCategoryParameters() {
+		$category_name = 'some category name';
+		$cat = $this->getMock('FreshRSS_Category');
+		$cat->expects($this->atLeastOnce())
+			->method('name')
+			->withAnyParameters()
+			->willReturn($category_name);
+		$cat_dao = $this->getMock('FreshRSS_Searchable');
+		$cat_dao->expects($this->atLeastOnce())
+			->method('searchById')
+			->withAnyParameters()
+			->willReturn($cat);
+		$query = array('get' => 'c_1');
+		$user_query = new FreshRSS_UserQuery($query, null, $cat_dao);
+		$this->assertEquals($category_name, $user_query->getGetName());
+		$this->assertEquals('category', $user_query->getGetType());
+	}
+
+	/**
+	 * @expectedException Exceptions/FreshRSS_DAO_Exception
+	 * @expectedExceptionMessage Feed DAO is not loaded in UserQuery
+	 */
+	public function test__construct_whenFeedQueryAndNoDao_throwsException() {
+		$this->markTestIncomplete('There is a problem with the exception autoloading. We need to make a better autoloading process');
+		$query = array('get' => 'c_1');
+		new FreshRSS_UserQuery($query);
+	}
+
+	public function test__construct_whenFeedQuery_storesFeedParameters() {
+		$feed_name = 'some feed name';
+		$feed = $this->getMock('FreshRSS_Feed', array(), array('', false));
+		$feed->expects($this->atLeastOnce())
+			->method('name')
+			->withAnyParameters()
+			->willReturn($feed_name);
+		$feed_dao = $this->getMock('FreshRSS_Searchable');
+		$feed_dao->expects($this->atLeastOnce())
+			->method('searchById')
+			->withAnyParameters()
+			->willReturn($feed);
+		$query = array('get' => 'f_1');
+		$user_query = new FreshRSS_UserQuery($query, $feed_dao, null);
+		$this->assertEquals($feed_name, $user_query->getGetName());
+		$this->assertEquals('feed', $user_query->getGetType());
+	}
+
+	public function test__construct_whenUnknownQuery_doesStoreParameters() {
+		$query = array('get' => 'q');
+		$user_query = new FreshRSS_UserQuery($query);
+		$this->assertNull($user_query->getGetName());
+		$this->assertNull($user_query->getGetType());
+	}
+
+	public function test__construct_whenName_storesName() {
+		$name = 'some name';
+		$query = array('name' => $name);
+		$user_query = new FreshRSS_UserQuery($query);
+		$this->assertEquals($name, $user_query->getName());
+	}
+
+	public function test__construct_whenOrder_storesOrder() {
+		$order = 'some order';
+		$query = array('order' => $order);
+		$user_query = new FreshRSS_UserQuery($query);
+		$this->assertEquals($order, $user_query->getOrder());
+	}
+
+	public function test__construct_whenState_storesState() {
+		$state = 'some state';
+		$query = array('state' => $state);
+		$user_query = new FreshRSS_UserQuery($query);
+		$this->assertEquals($state, $user_query->getState());
+	}
+
+	public function test__construct_whenUrl_storesUrl() {
+		$url = 'some url';
+		$query = array('url' => $url);
+		$user_query = new FreshRSS_UserQuery($query);
+		$this->assertEquals($url, $user_query->getUrl());
+	}
+
+	public function testToArray_whenNoData_returnsEmptyArray() {
+		$user_query = new FreshRSS_UserQuery(array());
+		$this->assertInternalType('array', $user_query->toArray());
+		$this->assertCount(0, $user_query->toArray());
+	}
+
+	public function testToArray_whenData_returnsArray() {
+		$query = array(
+			'get' => 's',
+			'name' => 'some name',
+			'order' => 'some order',
+			'search' => 'some search',
+			'state' => 'some state',
+			'url' => 'some url',
+		);
+		$user_query = new FreshRSS_UserQuery($query);
+		$this->assertInternalType('array', $user_query->toArray());
+		$this->assertCount(6, $user_query->toArray());
+		$this->assertEquals($query, $user_query->toArray());
+	}
+
+	public function testHasSearch_whenSearch_returnsTrue() {
+		$query = array(
+			'search' => 'some search',
+		);
+		$user_query = new FreshRSS_UserQuery($query);
+		$this->assertTrue($user_query->hasSearch());
+	}
+
+	public function testHasSearch_whenNoSearch_returnsFalse() {
+		$user_query = new FreshRSS_UserQuery(array());
+		$this->assertFalse($user_query->hasSearch());
+	}
+
+	public function testHasParameters_whenAllQuery_returnsFalse() {
+		$query = array('get' => 'a');
+		$user_query = new FreshRSS_UserQuery($query);
+		$this->assertFalse($user_query->hasParameters());
+	}
+
+	public function testHasParameters_whenNoParameter_returnsFalse() {
+		$query = array();
+		$user_query = new FreshRSS_UserQuery($query);
+		$this->assertFalse($user_query->hasParameters());
+	}
+
+	public function testHasParameters_whenParameter_returnTrue() {
+		$query = array('get' => 's');
+		$user_query = new FreshRSS_UserQuery($query);
+		$this->assertTrue($user_query->hasParameters());
+	}
+
+	public function testIsDeprecated_whenCategoryExists_returnFalse() {
+		$cat = $this->getMock('FreshRSS_Category');
+		$cat_dao = $this->getMock('FreshRSS_Searchable');
+		$cat_dao->expects($this->atLeastOnce())
+			->method('searchById')
+			->withAnyParameters()
+			->willReturn($cat);
+		$query = array('get' => 'c_1');
+		$user_query = new FreshRSS_UserQuery($query, null, $cat_dao);
+		$this->assertFalse($user_query->isDeprecated());
+	}
+
+	public function testIsDeprecated_whenCategoryDoesNotExist_returnTrue() {
+		$cat_dao = $this->getMock('FreshRSS_Searchable');
+		$cat_dao->expects($this->atLeastOnce())
+			->method('searchById')
+			->withAnyParameters()
+			->willReturn(null);
+		$query = array('get' => 'c_1');
+		$user_query = new FreshRSS_UserQuery($query, null, $cat_dao);
+		$this->assertTrue($user_query->isDeprecated());
+	}
+
+	public function testIsDeprecated_whenFeedExists_returnFalse() {
+		$feed = $this->getMock('FreshRSS_Feed', array(), array('', false));
+		$feed_dao = $this->getMock('FreshRSS_Searchable');
+		$feed_dao->expects($this->atLeastOnce())
+			->method('searchById')
+			->withAnyParameters()
+			->willReturn($feed);
+		$query = array('get' => 'f_1');
+		$user_query = new FreshRSS_UserQuery($query, $feed_dao, null);
+		$this->assertFalse($user_query->isDeprecated());
+	}
+
+	public function testIsDeprecated_whenFeedDoesNotExist_returnTrue() {
+		$feed_dao = $this->getMock('FreshRSS_Searchable');
+		$feed_dao->expects($this->atLeastOnce())
+			->method('searchById')
+			->withAnyParameters()
+			->willReturn(null);
+		$query = array('get' => 'f_1');
+		$user_query = new FreshRSS_UserQuery($query, $feed_dao, null);
+		$this->assertTrue($user_query->isDeprecated());
+	}
+
+	public function testIsDeprecated_whenAllQuery_returnFalse() {
+		$query = array('get' => 'a');
+		$user_query = new FreshRSS_UserQuery($query);
+		$this->assertFalse($user_query->isDeprecated());
+	}
+
+	public function testIsDeprecated_whenFavoriteQuery_returnFalse() {
+		$query = array('get' => 's');
+		$user_query = new FreshRSS_UserQuery($query);
+		$this->assertFalse($user_query->isDeprecated());
+	}
+
+	public function testIsDeprecated_whenUnknownQuery_returnFalse() {
+		$query = array('get' => 'q');
+		$user_query = new FreshRSS_UserQuery($query);
+		$this->assertFalse($user_query->isDeprecated());
+	}
+
+}
diff --git a/tests/bootstrap.php b/tests/bootstrap.php
index 24340b15c..5c42f12f7 100644
--- a/tests/bootstrap.php
+++ b/tests/bootstrap.php
@@ -3,5 +3,5 @@
 error_reporting(E_ALL);
 ini_set('display_errors', 1);
 
-require('../constants.php');
-require(LIB_PATH . '/lib_rss.php');	//Includes class autoloader
\ No newline at end of file
+require(__DIR__ . '/../constants.php');
+require(LIB_PATH . '/lib_rss.php');	//Includes class autoloader