summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThomas Müller <thomas.mueller@tmit.eu>2014-07-17 17:17:58 +0200
committerThomas Müller <thomas.mueller@tmit.eu>2014-07-17 17:17:58 +0200
commitd632b9e58e05d50e37ad7c5f2036caa6a5a83c9e (patch)
treecbd7765f54c141aba2a275d3341128e7a4042518
parente85f078d1798527c993083d3d91285727a66930f (diff)
parent9ee8c60b5ff66d605fe91cec428fd0e207e72881 (diff)
downloadnextcloud-server-d632b9e58e05d50e37ad7c5f2036caa6a5a83c9e.tar.gz
nextcloud-server-d632b9e58e05d50e37ad7c5f2036caa6a5a83c9e.zip
Merge pull request #9710 from owncloud/fix-failing-unit-test-on-MapperTestUtility.php-master
kill unused require of MapperTestUtility.php
-rw-r--r--tests/lib/appframework/db/mappertest.php (renamed from tests/lib/appframework/db/MapperTest.php)9
1 files changed, 5 insertions, 4 deletions
diff --git a/tests/lib/appframework/db/MapperTest.php b/tests/lib/appframework/db/mappertest.php
index 4ddc4ef0422..42aa1ade810 100644
--- a/tests/lib/appframework/db/MapperTest.php
+++ b/tests/lib/appframework/db/mappertest.php
@@ -25,9 +25,7 @@
namespace OCP\AppFramework\Db;
use \OCP\IDb;
-
-
-require_once __DIR__ . '/MapperTestUtility.php';
+use Test\AppFramework\Db\MapperTestUtility;
/**
* @method integer getId()
@@ -54,6 +52,9 @@ class ExampleMapper extends Mapper {
class MapperTest extends MapperTestUtility {
+ /**
+ * @var Mapper
+ */
private $mapper;
public function setUp(){
@@ -276,4 +277,4 @@ class MapperTest extends MapperTestUtility {
$result = $this->mapper->findAllEntities($sql);
$this->assertEquals(array($entity1, $entity2), $result);
}
-} \ No newline at end of file
+}