Merge pull request #7435 from annando/select-to-array

[friendica.git] / tests / src / BaseObjectTest.php

diff --git a/tests/src/BaseObjectTest.php b/tests/src/BaseObjectTest.php
index 39741eb9e1e4beef83473a35b954b014dd8d8841..cb980b47e90698639f71a1381ba7c19b046e2db5 100644 (file)
--- a/tests/src/BaseObjectTest.php
+++ b/tests/src/BaseObjectTest.php
@@ -3,7 +3,7 @@
  * BaseObjectTest class.
  */
 
-namespace Friendica\Test;
+namespace Friendica\Test\src;
 
 use Friendica\BaseObject;
 use Friendica\Test\Util\AppMockTrait;
@@ -31,10 +31,9 @@ class BaseObjectTest extends TestCase
        {
                $baseObject = new BaseObject();
                $this->setUpVfsDir();
-               $configMock = \Mockery::mock('Friendica\Core\Config\Configuration');
-               $this->mockApp($this->root, $configMock);
+               $this->mockApp($this->root);
 
-               $this->assertNull($baseObject->setApp($this->app));
+               $baseObject->setApp($this->app);
                $this->assertEquals($this->app, $baseObject->getApp());
        }
 
@@ -46,7 +45,6 @@ class BaseObjectTest extends TestCase
         */
        public function testGetAppFailed()
        {
-               $baseObject = new BaseObject();
-               $baseObject->getApp();
+               BaseObject::getApp();
        }
 }