Merge branch 'master' into migration_unit_tests

7 files changed, 324 insertions, 27 deletions

diff --git a/tests/lib/appconfig.php b/tests/lib/appconfig.php
index 23dd2549e32..6ae790a9edd 100644
--- a/tests/lib/appconfig.php
+++ b/tests/lib/appconfig.php
@@ -1,6 +1,7 @@
 <?php
 /**
  * Copyright (c) 2013 Christopher Schäpers <christopher@schaepers.it>
+ * Copyright (c) 2013 Bart Visscher <bartv@thisnet.nl>
  * This file is licensed under the Affero General Public License version 3 or
  * later.
  * See the COPYING-README file.
@@ -41,6 +42,7 @@ class Test_Appconfig extends PHPUnit_Framework_TestCase {
 		while ($row = $result->fetchRow()) {
 			$expected[] = $row['appid'];
 		}
+		sort($expected);
 		$apps = \OC_Appconfig::getApps();
 		$this->assertEquals($expected, $apps);
 	}
@@ -52,6 +54,7 @@ class Test_Appconfig extends PHPUnit_Framework_TestCase {
 		while($row = $result->fetchRow()) {
 			$expected[] = $row["configkey"];
 		}
+		sort($expected);
 		$keys = \OC_Appconfig::getKeys('testapp');
 		$this->assertEquals($expected, $keys);
 	}
diff --git a/tests/lib/backgroundjob/dummyjoblist.php b/tests/lib/backgroundjob/dummyjoblist.php
index e1579c273bb..7801269b27e 100644
--- a/tests/lib/backgroundjob/dummyjoblist.php
+++ b/tests/lib/backgroundjob/dummyjoblist.php
@@ -21,6 +21,8 @@ class DummyJobList extends \OC\BackgroundJob\JobList {
 
 	private $last = 0;
 
+	public function __construct(){}
+
 	/**
 	 * @param \OC\BackgroundJob\Job|string $job
 	 * @param mixed $argument
diff --git a/tests/lib/backgroundjob/job.php b/tests/lib/backgroundjob/job.php
index 7d66fa772d2..10a8f46462e 100644
--- a/tests/lib/backgroundjob/job.php
+++ b/tests/lib/backgroundjob/job.php
@@ -8,31 +8,6 @@
 
 namespace Test\BackgroundJob;
 
-
-class TestJob extends \OC\BackgroundJob\Job {
-	private $testCase;
-
-	/**
-	 * @var callable $callback
-	 */
-	private $callback;
-
-	/**
-	 * @param Job $testCase
-	 * @param callable $callback
-	 */
-	public function __construct($testCase, $callback) {
-		$this->testCase = $testCase;
-		$this->callback = $callback;
-	}
-
-	public function run($argument) {
-		$this->testCase->markRun();
-		$callback = $this->callback;
-		$callback($argument);
-	}
-}
-
 class Job extends \PHPUnit_Framework_TestCase {
 	private $run = false;
 
diff --git a/tests/lib/backgroundjob/joblist.php b/tests/lib/backgroundjob/joblist.php
new file mode 100644
index 00000000000..c3318f80cb2
--- /dev/null
+++ b/tests/lib/backgroundjob/joblist.php
@@ -0,0 +1,203 @@
+<?php
+/**
+ * Copyright (c) 2014 Robin Appelman <icewind@owncloud.com>
+ * This file is licensed under the Affero General Public License version 3 or
+ * later.
+ * See the COPYING-README file.
+ */
+
+namespace Test\BackgroundJob;
+
+class JobList extends \PHPUnit_Framework_TestCase {
+	/**
+	 * @var \OC\BackgroundJob\JobList
+	 */
+	protected $instance;
+
+	/**
+	 * @var \OCP\IConfig | \PHPUnit_Framework_MockObject_MockObject $config
+	 */
+	protected $config;
+
+	public function setUp() {
+		$conn = \OC::$server->getDatabaseConnection();
+		$this->config = $this->getMock('\OCP\IConfig');
+		$this->instance = new \OC\BackgroundJob\JobList($conn, $this->config);
+	}
+
+	public function argumentProvider() {
+		return array(
+			array(null),
+			array(false),
+			array('foobar'),
+			array(12),
+			array(array(
+				'asd' => 5,
+				'foo' => 'bar'
+			))
+		);
+	}
+
+	/**
+	 * @dataProvider argumentProvider
+	 * @param $argument
+	 */
+	public function testAddRemove($argument) {
+		$existingJobs = $this->instance->getAll();
+		$job = new TestJob();
+		$this->instance->add($job, $argument);
+
+		$jobs = $this->instance->getAll();
+
+		$this->assertCount(count($existingJobs) + 1, $jobs);
+		$addedJob = $jobs[count($jobs) - 1];
+		$this->assertInstanceOf('\Test\BackgroundJob\TestJob', $addedJob);
+		$this->assertEquals($argument, $addedJob->getArgument());
+
+		$this->instance->remove($job, $argument);
+
+		$jobs = $this->instance->getAll();
+		$this->assertEquals($existingJobs, $jobs);
+	}
+
+	/**
+	 * @dataProvider argumentProvider
+	 * @param $argument
+	 */
+	public function testRemoveDifferentArgument($argument) {
+		$existingJobs = $this->instance->getAll();
+		$job = new TestJob();
+		$this->instance->add($job, $argument);
+
+		$jobs = $this->instance->getAll();
+		$this->instance->remove($job, 10);
+		$jobs2 = $this->instance->getAll();
+
+		$this->assertEquals($jobs, $jobs2);
+
+		$this->instance->remove($job, $argument);
+
+		$jobs = $this->instance->getAll();
+		$this->assertEquals($existingJobs, $jobs);
+	}
+
+	/**
+	 * @dataProvider argumentProvider
+	 * @param $argument
+	 */
+	public function testHas($argument) {
+		$job = new TestJob();
+		$this->assertFalse($this->instance->has($job, $argument));
+		$this->instance->add($job, $argument);
+
+		$this->assertTrue($this->instance->has($job, $argument));
+
+		$this->instance->remove($job, $argument);
+
+		$this->assertFalse($this->instance->has($job, $argument));
+	}
+
+	/**
+	 * @dataProvider argumentProvider
+	 * @param $argument
+	 */
+	public function testHasDifferentArgument($argument) {
+		$job = new TestJob();
+		$this->instance->add($job, $argument);
+
+		$this->assertFalse($this->instance->has($job, 10));
+
+		$this->instance->remove($job, $argument);
+	}
+
+	public function testGetLastJob() {
+		$this->config->expects($this->once())
+			->method('getAppValue')
+			->with('backgroundjob', 'lastjob', 0)
+			->will($this->returnValue(15));
+
+		$this->assertEquals(15, $this->instance->getLastJob());
+	}
+
+	public function testGetNext() {
+		$job = new TestJob();
+		$this->instance->add($job, 1);
+		$this->instance->add($job, 2);
+
+		$jobs = $this->instance->getAll();
+
+		$savedJob1 = $jobs[count($jobs) - 2];
+		$savedJob2 = $jobs[count($jobs) - 1];
+
+		$this->config->expects($this->once())
+			->method('getAppValue')
+			->with('backgroundjob', 'lastjob', 0)
+			->will($this->returnValue($savedJob1->getId()));
+
+		$nextJob = $this->instance->getNext();
+
+		$this->assertEquals($savedJob2, $nextJob);
+
+		$this->instance->remove($job, 1);
+		$this->instance->remove($job, 2);
+	}
+
+	public function testGetNextWrapAround() {
+		$job = new TestJob();
+		$this->instance->add($job, 1);
+		$this->instance->add($job, 2);
+
+		$jobs = $this->instance->getAll();
+
+		$savedJob2 = $jobs[count($jobs) - 1];
+
+		$this->config->expects($this->once())
+			->method('getAppValue')
+			->with('backgroundjob', 'lastjob', 0)
+			->will($this->returnValue($savedJob2->getId()));
+
+		$nextJob = $this->instance->getNext();
+
+		$this->assertEquals($jobs[0], $nextJob);
+
+		$this->instance->remove($job, 1);
+		$this->instance->remove($job, 2);
+	}
+
+	/**
+	 * @dataProvider argumentProvider
+	 * @param $argument
+	 */
+	public function testGetById($argument) {
+		$job = new TestJob();
+		$this->instance->add($job, $argument);
+
+		$jobs = $this->instance->getAll();
+
+		$addedJob = $jobs[count($jobs) - 1];
+
+		$this->assertEquals($addedJob, $this->instance->getById($addedJob->getId()));
+
+		$this->instance->remove($job, $argument);
+	}
+
+	public function testSetLastRun() {
+		$job = new TestJob();
+		$this->instance->add($job);
+
+		$jobs = $this->instance->getAll();
+
+		$addedJob = $jobs[count($jobs) - 1];
+
+		$timeStart = time();
+		$this->instance->setLastRun($addedJob);
+		$timeEnd = time();
+
+		$addedJob = $this->instance->getById($addedJob->getId());
+
+		$this->assertGreaterThanOrEqual($timeStart, $addedJob->getLastRun());
+		$this->assertLessThanOrEqual($timeEnd, $addedJob->getLastRun());
+
+		$this->instance->remove($job);
+	}
+}
diff --git a/tests/lib/backgroundjob/testjob.php b/tests/lib/backgroundjob/testjob.php
new file mode 100644
index 00000000000..23fc4268d1a
--- /dev/null
+++ b/tests/lib/backgroundjob/testjob.php
@@ -0,0 +1,34 @@
+<?php
+/**
+ * Copyright (c) 2014 Robin Appelman <icewind@owncloud.com>
+ * This file is licensed under the Affero General Public License version 3 or
+ * later.
+ * See the COPYING-README file.
+ */
+
+namespace Test\BackgroundJob;
+
+
+class TestJob extends \OC\BackgroundJob\Job {
+	private $testCase;
+
+	/**
+	 * @var callable $callback
+	 */
+	private $callback;
+
+	/**
+	 * @param Job $testCase
+	 * @param callable $callback
+	 */
+	public function __construct($testCase = null, $callback = null) {
+		$this->testCase = $testCase;
+		$this->callback = $callback;
+	}
+
+	public function run($argument) {
+		$this->testCase->markRun();
+		$callback = $this->callback;
+		$callback($argument);
+	}
+}
diff --git a/tests/lib/group/manager.php b/tests/lib/group/manager.php
index 9d3adf51a0c..90f0e1b35e2 100644
--- a/tests/lib/group/manager.php
+++ b/tests/lib/group/manager.php
@@ -116,16 +116,22 @@ class Manager extends \PHPUnit_Framework_TestCase {
 		/**
 		 * @var \PHPUnit_Framework_MockObject_MockObject | \OC_Group_Backend $backend
 		 */
+		$backendGroupCreated = false;
 		$backend = $this->getMock('\OC_Group_Database');
 		$backend->expects($this->any())
 			->method('groupExists')
 			->with('group1')
-			->will($this->returnValue(false));
+			->will($this->returnCallback(function () use (&$backendGroupCreated) {
+				return $backendGroupCreated;
+			}));
 		$backend->expects($this->once())
 			->method('implementsActions')
 			->will($this->returnValue(true));
 		$backend->expects($this->once())
-			->method('createGroup');
+			->method('createGroup')
+			->will($this->returnCallback(function () use (&$backendGroupCreated) {
+				$backendGroupCreated = true;
+			}));;
 
 		/**
 		 * @var \OC\User\Manager $userManager
@@ -170,6 +176,10 @@ class Manager extends \PHPUnit_Framework_TestCase {
 			->method('getGroups')
 			->with('1')
 			->will($this->returnValue(array('group1')));
+		$backend->expects($this->once())
+			->method('groupExists')
+			->with('group1')
+			->will($this->returnValue(true));
 
 		/**
 		 * @var \OC\User\Manager $userManager
@@ -193,6 +203,9 @@ class Manager extends \PHPUnit_Framework_TestCase {
 			->method('getGroups')
 			->with('1')
 			->will($this->returnValue(array('group1')));
+		$backend1->expects($this->any())
+			->method('groupExists')
+			->will($this->returnValue(true));
 
 		/**
 		 * @var \PHPUnit_Framework_MockObject_MockObject | \OC_Group_Backend $backend2
@@ -202,6 +215,9 @@ class Manager extends \PHPUnit_Framework_TestCase {
 			->method('getGroups')
 			->with('1')
 			->will($this->returnValue(array('group12', 'group1')));
+		$backend2->expects($this->any())
+			->method('groupExists')
+			->will($this->returnValue(true));
 
 		/**
 		 * @var \OC\User\Manager $userManager
@@ -228,6 +244,9 @@ class Manager extends \PHPUnit_Framework_TestCase {
 			->method('getGroups')
 			->with('1', 2, 1)
 			->will($this->returnValue(array('group1')));
+		$backend1->expects($this->any())
+			->method('groupExists')
+			->will($this->returnValue(true));
 
 		/**
 		 * @var \PHPUnit_Framework_MockObject_MockObject | \OC_Group_Backend $backend2
@@ -237,6 +256,9 @@ class Manager extends \PHPUnit_Framework_TestCase {
 			->method('getGroups')
 			->with('1', 1, 0)
 			->will($this->returnValue(array('group12')));
+		$backend2->expects($this->any())
+			->method('groupExists')
+			->will($this->returnValue(true));
 
 		/**
 		 * @var \OC\User\Manager $userManager
@@ -263,6 +285,10 @@ class Manager extends \PHPUnit_Framework_TestCase {
 			->method('getUserGroups')
 			->with('user1')
 			->will($this->returnValue(array('group1')));
+		$backend->expects($this->any())
+			->method('groupExists')
+			->with('group1')
+			->will($this->returnValue(true));
 
 		/**
 		 * @var \OC\User\Manager $userManager
@@ -286,6 +312,10 @@ class Manager extends \PHPUnit_Framework_TestCase {
 			->method('getUserGroups')
 			->with('user1')
 			->will($this->returnValue(array('group1')));
+		$backend1->expects($this->any())
+			->method('groupExists')
+			->will($this->returnValue(true));
+
 		/**
 		 * @var \PHPUnit_Framework_MockObject_MockObject | \OC_Group_Backend $backend2
 		 */
@@ -294,6 +324,9 @@ class Manager extends \PHPUnit_Framework_TestCase {
 			->method('getUserGroups')
 			->with('user1')
 			->will($this->returnValue(array('group1', 'group2')));
+		$backend1->expects($this->any())
+			->method('groupExists')
+			->will($this->returnValue(true));
 
 		/**
 		 * @var \OC\User\Manager $userManager
diff --git a/tests/lib/share/searchresultsorter.php b/tests/lib/share/searchresultsorter.php
new file mode 100644
index 00000000000..eaf93400a7d
--- /dev/null
+++ b/tests/lib/share/searchresultsorter.php
@@ -0,0 +1,47 @@
+<?php
+/**
+* ownCloud
+*
+* @author Arthur Schiwon
+* @copyright 2014 Arthur Schiwon <blizzz@owncloud.com>
+*
+* This library is free software; you can redistribute it and/or
+* modify it under the terms of the GNU AFFERO GENERAL PUBLIC LICENSE
+* License as published by the Free Software Foundation; either
+* version 3 of the License, or any later version.
+*
+* This library is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU AFFERO GENERAL PUBLIC LICENSE for more details.
+*
+* You should have received a copy of the GNU Affero General Public
+* License along with this library.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+class Test_Share_Search extends \PHPUnit_Framework_TestCase {
+	public function testSort() {
+		$search = 'lin';
+		$sorter = new \OC\Share\SearchResultSorter($search, 'foobar');
+
+		$result = array(
+			array('foobar' => 'woot'),
+			array('foobar' => 'linux'),
+			array('foobar' => 'Linus'),
+			array('foobar' => 'Bicyclerepairwoman'),
+		);
+
+		usort($result, array($sorter, 'sort'));
+		$this->assertTrue($result[0]['foobar'] === 'Linus');
+		$this->assertTrue($result[1]['foobar'] === 'linux');
+		$this->assertTrue($result[2]['foobar'] === 'Bicyclerepairwoman');
+		$this->assertTrue($result[3]['foobar'] === 'woot');
+	}
+
+	/**
+     * @expectedException PHPUnit_Framework_Error
+     */
+	public function testSortWrongLog() {
+		$sorter = new \OC\Share\SearchResultSorter('foo', 'bar', 'UTF-8', 'foobar');
+	}
+}