From 42b29e39c12fc4384b643216f9bc45a924af87cb Mon Sep 17 00:00:00 2001
From: Joas Schilling <nickvergessen@owncloud.com>
Date: Mon, 5 Oct 2015 10:13:45 +0200
Subject: [PATCH] Clear the shares after the test like storages and files
---
tests/lib/testcase.php | 35 +++++++++++++++++++++++------------
1 file changed, 23 insertions(+), 12 deletions(-)
diff --git a/tests/lib/testcase.php b/tests/lib/testcase.php
index 7e4890a46c..8cfa2a7259 100644
--- a/tests/lib/testcase.php
+++ b/tests/lib/testcase.php
@@ -24,6 +24,7 @@ namespace Test;
use OC\Command\QueueBus;
use OC\Files\Filesystem;
+use OCP\DB\QueryBuilder\IQueryBuilder;
use OCP\Security\ISecureRandom;
abstract class TestCase extends \PHPUnit_Framework_TestCase {
@@ -129,9 +130,11 @@ abstract class TestCase extends \PHPUnit_Framework_TestCase {
public static function tearDownAfterClass() {
$dataDir = \OC::$server->getConfig()->getSystemValue('datadirectory', \OC::$SERVERROOT . '/data-autotest');
+ $queryBuilder = \OC::$server->getDatabaseConnection()->getQueryBuilder();
- self::tearDownAfterClassCleanStorages();
- self::tearDownAfterClassCleanFileCache();
+ self::tearDownAfterClassCleanShares($queryBuilder);
+ self::tearDownAfterClassCleanStorages($queryBuilder);
+ self::tearDownAfterClassCleanFileCache($queryBuilder);
self::tearDownAfterClassCleanStrayDataFiles($dataDir);
self::tearDownAfterClassCleanStrayHooks();
self::tearDownAfterClassCleanStrayLocks();
@@ -139,26 +142,34 @@ abstract class TestCase extends \PHPUnit_Framework_TestCase {
parent::tearDownAfterClass();
}
+ /**
+ * Remove all entries from the share table
+ *
+ * @param IQueryBuilder $queryBuilder
+ */
+ static protected function tearDownAfterClassCleanShares(IQueryBuilder $queryBuilder) {
+ $queryBuilder->delete('share')
+ ->execute();
+ }
+
/**
* Remove all entries from the storages table
*
- * @throws \OC\DatabaseException
+ * @param IQueryBuilder $queryBuilder
*/
- static protected function tearDownAfterClassCleanStorages() {
- $sql = 'DELETE FROM `*PREFIX*storages`';
- $query = \OC_DB::prepare($sql);
- $query->execute();
+ static protected function tearDownAfterClassCleanStorages(IQueryBuilder $queryBuilder) {
+ $queryBuilder->delete('storages')
+ ->execute();
}
/**
* Remove all entries from the filecache table
*
- * @throws \OC\DatabaseException
+ * @param IQueryBuilder $queryBuilder
*/
- static protected function tearDownAfterClassCleanFileCache() {
- $sql = 'DELETE FROM `*PREFIX*filecache`';
- $query = \OC_DB::prepare($sql);
- $query->execute();
+ static protected function tearDownAfterClassCleanFileCache(IQueryBuilder $queryBuilder) {
+ $queryBuilder->delete('filecache')
+ ->execute();
}
/**
--
GitLab