Fix Api and BaseObject tests

diff --git a/tests/include/ApiTest.php b/tests/include/ApiTest.php
index 8dc3304f2bd7341451bcce63aab382393404a68f..6f1172666ac69613081fb7be7f76880c6a7f57b1 100644 (file)
--- a/tests/include/ApiTest.php
+++ b/tests/include/ApiTest.php
@@ -610,8 +610,8 @@ class ApiTest extends DatabaseTest
        public function testApiErrorWithJson()
        {
                $this->assertEquals(
-                       '{"status":{"error":"error_message","code":"200 Friendica\\\\Network\\\\HTTP","request":""}}',
-                       api_error('json', new HTTPException('error_message'))
+                       '{"status":{"error":"error_message","code":"200 OK","request":""}}',
+                       api_error('json', new HTTPException\OKException('error_message'))
                );
        }
 
@@ -628,10 +628,10 @@ class ApiTest extends DatabaseTest
                                'xmlns:friendica="http://friendi.ca/schema/api/1/" '.
                                'xmlns:georss="http://www.georss.org/georss">'."\n".
                        '  <error>error_message</error>'."\n".
-                       '  <code>200 Friendica\Network\HTTP</code>'."\n".
+                       '  <code>200 OK</code>'."\n".
                        '  <request/>'."\n".
                        '</status>'."\n",
-                       api_error('xml', new HTTPException('error_message'))
+                       api_error('xml', new HTTPException\OKException('error_message'))
                );
        }
 
@@ -648,10 +648,10 @@ class ApiTest extends DatabaseTest
                                'xmlns:friendica="http://friendi.ca/schema/api/1/" '.
                                'xmlns:georss="http://www.georss.org/georss">'."\n".
                        '  <error>error_message</error>'."\n".
-                       '  <code>200 Friendica\Network\HTTP</code>'."\n".
+                       '  <code>200 OK</code>'."\n".
                        '  <request/>'."\n".
                        '</status>'."\n",
-                       api_error('rss', new HTTPException('error_message'))
+                       api_error('rss', new HTTPException\OKException('error_message'))
                );
        }
 
@@ -668,10 +668,10 @@ class ApiTest extends DatabaseTest
                                'xmlns:friendica="http://friendi.ca/schema/api/1/" '.
                                'xmlns:georss="http://www.georss.org/georss">'."\n".
                        '  <error>error_message</error>'."\n".
-                       '  <code>200 Friendica\Network\HTTP</code>'."\n".
+                       '  <code>200 OK</code>'."\n".
                        '  <request/>'."\n".
                        '</status>'."\n",
-                       api_error('atom', new HTTPException('error_message'))
+                       api_error('atom', new HTTPException\OKException('error_message'))
                );
        }
 

diff --git a/tests/src/BaseObjectTest.php b/tests/src/BaseObjectTest.php
index 749ae77c2a2554416600e24a485c3c7b73ef50ec..cb980b47e90698639f71a1381ba7c19b046e2db5 100644 (file)
--- a/tests/src/BaseObjectTest.php
+++ b/tests/src/BaseObjectTest.php
@@ -33,7 +33,7 @@ class BaseObjectTest extends TestCase
                $this->setUpVfsDir();
                $this->mockApp($this->root);
 
-               $this->assertNull($baseObject->setApp($this->app));
+               $baseObject->setApp($this->app);
                $this->assertEquals($this->app, $baseObject->getApp());
        }
 
@@ -45,7 +45,6 @@ class BaseObjectTest extends TestCase
         */
        public function testGetAppFailed()
        {
-               $baseObject = new BaseObject();
-               $baseObject->getApp();
+               BaseObject::getApp();
        }
 }