X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;ds=sidebyside;f=tests%2Fsrc%2FBaseObjectTest.php;h=749ae77c2a2554416600e24a485c3c7b73ef50ec;hb=854cc3e47296d4a1b01b893376064cf254d84f79;hp=b2c73780a4499247544524f0f515636a1979f298;hpb=a0b14a46cb83b93ea5f42437bc78aafd20eec70c;p=friendica.git

diff --git a/tests/src/BaseObjectTest.php b/tests/src/BaseObjectTest.php
index b2c73780a4..749ae77c2a 100644
--- a/tests/src/BaseObjectTest.php
+++ b/tests/src/BaseObjectTest.php
@@ -3,9 +3,8 @@
  * BaseObjectTest class.
  */
 
-namespace Friendica\Test;
+namespace Friendica\Test\src;
 
-use Friendica\App;
 use Friendica\BaseObject;
 use Friendica\Test\Util\AppMockTrait;
 use Friendica\Test\Util\VFSTrait;
@@ -13,8 +12,6 @@ use PHPUnit\Framework\TestCase;
 
 /**
  * Tests for the BaseObject class.
- * @runTestsInSeparateProcesses
- * @preserveGlobalState disabled
  */
 class BaseObjectTest extends TestCase
 {
@@ -27,46 +24,28 @@ class BaseObjectTest extends TestCase
 	private $baseObject;
 
 	/**
-	 * Create variables used in tests.
-	 */
-	protected function setUp()
-	{
-		$this->baseObject = new BaseObject();
-	}
-
-	/**
-	 * Test the getApp() function.
-	 * @return void
-	 */
-	public function testGetApp()
-	{
-		$this->setUpVfsDir();
-		$configMock = \Mockery::mock('Friendica\Core\Config\ConfigCache');
-		$this->mockApp($this->root, $configMock);
-
-		$this->assertInstanceOf(App::class, $this->baseObject->getApp());
-	}
-
-	/**
-	 * Test the setApp() function.
+	 * Test the setApp() and getApp() function.
 	 * @return void
 	 */
-	public function testSetApp()
+	public function testGetSetApp()
 	{
+		$baseObject = new BaseObject();
 		$this->setUpVfsDir();
-		$configMock = \Mockery::mock('Friendica\Core\Config\ConfigCache');
-		$this->mockApp($this->root, $configMock);
+		$this->mockApp($this->root);
 
-		$this->assertNull($this->baseObject->setApp($this->app));
-		$this->assertEquals($this->app, $this->baseObject->getApp());
+		$this->assertNull($baseObject->setApp($this->app));
+		$this->assertEquals($this->app, $baseObject->getApp());
 	}
 
 	/**
 	 * Test the getApp() function without App
 	 * @expectedException Friendica\Network\HTTPException\InternalServerErrorException
+	 * @runInSeparateProcess
+	 * @preserveGlobalState disabled
 	 */
 	public function testGetAppFailed()
 	{
-		BaseObject::getApp();
+		$baseObject = new BaseObject();
+		$baseObject->getApp();
 	}
 }