3 files changed, 105 insertions, 3 deletions

diff --git a/tests/lib/DB/QueryBuilder/FunctionBuilderTest.php b/tests/lib/DB/QueryBuilder/FunctionBuilderTest.php
index 869faccc5cc..1b998287c98 100644
--- a/tests/lib/DB/QueryBuilder/FunctionBuilderTest.php
+++ b/tests/lib/DB/QueryBuilder/FunctionBuilderTest.php
@@ -21,6 +21,7 @@
 namespace Test\DB\QueryBuilder;
 
 use OC\DB\QueryBuilder\Literal;
+use OCP\DB\QueryBuilder\IQueryBuilder;
 use Test\TestCase;
 
 /**
@@ -89,4 +90,24 @@ class FunctionBuilderTest extends TestCase {
 
 		$this->assertEquals('foobar', $query->execute()->fetchColumn());
 	}
+
+	public function testAdd() {
+		$query = $this->connection->getQueryBuilder();
+
+		$query->select($query->func()->add($query->createNamedParameter(2, IQueryBuilder::PARAM_INT), new Literal(1)));
+		$query->from('appconfig')
+			->setMaxResults(1);
+
+		$this->assertEquals(3, $query->execute()->fetchColumn());
+	}
+
+	public function testSubtract() {
+		$query = $this->connection->getQueryBuilder();
+
+		$query->select($query->func()->subtract($query->createNamedParameter(2, IQueryBuilder::PARAM_INT), new Literal(1)));
+		$query->from('appconfig')
+			->setMaxResults(1);
+
+		$this->assertEquals(1, $query->execute()->fetchColumn());
+	}
 }
diff --git a/tests/lib/Lock/DBLockingProviderTest.php b/tests/lib/Lock/DBLockingProviderTest.php
index fb27f9957af..e8419815e31 100644
--- a/tests/lib/Lock/DBLockingProviderTest.php
+++ b/tests/lib/Lock/DBLockingProviderTest.php
@@ -40,14 +40,14 @@ class DBLockingProviderTest extends LockingProvider {
 	/**
 	 * @var \OCP\IDBConnection
 	 */
-	private $connection;
+	protected $connection;
 
 	/**
 	 * @var \OCP\AppFramework\Utility\ITimeFactory
 	 */
-	private $timeFactory;
+	protected $timeFactory;
 
-	private $currentTime;
+	protected $currentTime;
 
 	public function setUp() {
 		$this->currentTime = time();
@@ -96,4 +96,31 @@ class DBLockingProviderTest extends LockingProvider {
 		$query->execute();
 		return $query->fetchColumn();
 	}
+
+	protected function getLockValue($key) {
+		$query = $this->connection->getQueryBuilder();
+		$query->select('lock')
+			->from('file_locks')
+			->where($query->expr()->eq('key', $query->createNamedParameter($key)));
+		return $query->execute()->fetchColumn();
+	}
+
+	public function testDoubleShared() {
+		$this->instance->acquireLock('foo', ILockingProvider::LOCK_SHARED);
+		$this->instance->acquireLock('foo', ILockingProvider::LOCK_SHARED);
+
+		$this->assertEquals(1, $this->getLockValue('foo'));
+
+		$this->instance->releaseLock('foo', ILockingProvider::LOCK_SHARED);
+
+		$this->assertEquals(1, $this->getLockValue('foo'));
+
+		$this->instance->releaseLock('foo', ILockingProvider::LOCK_SHARED);
+
+		$this->assertEquals(1, $this->getLockValue('foo'));
+
+		$this->instance->releaseAll();
+
+		$this->assertEquals(0, $this->getLockValue('foo'));
+	}
 }
diff --git a/tests/lib/Lock/NonCachingDBLockingProviderTest.php b/tests/lib/Lock/NonCachingDBLockingProviderTest.php
new file mode 100644
index 00000000000..be5cd1600c8
--- /dev/null
+++ b/tests/lib/Lock/NonCachingDBLockingProviderTest.php
@@ -0,0 +1,54 @@
+<?php
+/**
+ * @copyright Copyright (c) 2018 Robin Appelman <robin@icewind.nl>
+ *
+ * @license GNU AGPL version 3 or any later version
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * This program 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 program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+
+namespace Test\Lock;
+
+use OCP\Lock\ILockingProvider;
+
+/**
+ * @group DB
+ *
+ * @package Test\Lock
+ */
+class NonCachingDBLockingProviderTest extends DBLockingProviderTest {
+	/**
+	 * @return \OCP\Lock\ILockingProvider
+	 */
+	protected function getInstance() {
+		$this->connection = \OC::$server->getDatabaseConnection();
+		return new \OC\Lock\DBLockingProvider($this->connection, \OC::$server->getLogger(), $this->timeFactory, 3600, false);
+	}
+
+	public function testDoubleShared() {
+		$this->instance->acquireLock('foo', ILockingProvider::LOCK_SHARED);
+		$this->instance->acquireLock('foo', ILockingProvider::LOCK_SHARED);
+
+		$this->assertEquals(2, $this->getLockValue('foo'));
+
+		$this->instance->releaseLock('foo', ILockingProvider::LOCK_SHARED);
+
+		$this->assertEquals(1, $this->getLockValue('foo'));
+
+		$this->instance->releaseLock('foo', ILockingProvider::LOCK_SHARED);
+
+		$this->assertEquals(0, $this->getLockValue('foo'));
+	}
+}
\ No newline at end of file