Revert "Revert "Replace Module::init() with Constructors""

This reverts commit 89d6c89b67.
This commit is contained in:
Philipp 2021-11-19 20:18:48 +01:00
parent 942001b04d
commit 645e4edc63
No known key found for this signature in database
GPG key ID: 24A7501396EB5432
43 changed files with 1226 additions and 922 deletions

View file

@ -67,7 +67,7 @@ class NotificationTest extends ApiTest
</notes>
XML;
$notification = new Notification(['extension' => 'xml']);
$notification = new Notification(DI::l10n(), ['extension' => 'xml']);
$notification->rawContent();
self::assertXmlStringEqualsXmlString($assertXml, ApiResponseDouble::getOutput());
@ -75,7 +75,7 @@ XML;
public function testWithJsonResult()
{
$notification = new Notification(['parameter' => 'json']);
$notification = new Notification(DI::l10n(),['parameter' => 'json']);
$notification->rawContent();
$result = json_encode(ApiResponseDouble::getOutput());

View file

@ -21,6 +21,7 @@
namespace Friendica\Test\src\Module\Api\Friendica\Photo;
use Friendica\DI;
use Friendica\Module\Api\Friendica\Photo\Delete;
use Friendica\Network\HTTPException\BadRequestException;
use Friendica\Test\src\Module\Api\ApiTest;
@ -30,7 +31,7 @@ class DeleteTest extends ApiTest
public function testEmpty()
{
$this->expectException(BadRequestException::class);
(new Delete())->rawContent();
(new Delete(DI::l10n()))->rawContent();
}
public function testWithoutAuthenticatedUser()
@ -41,7 +42,7 @@ class DeleteTest extends ApiTest
public function testWrong()
{
$this->expectException(BadRequestException::class);
(new Delete(['photo_id' => 1]))->rawContent();
(new Delete(DI::l10n(), ['photo_id' => 1]))->rawContent();
}
public function testWithCorrectPhotoId()

View file

@ -21,6 +21,7 @@
namespace Friendica\Test\src\Module\Api\Friendica\Photoalbum;
use Friendica\DI;
use Friendica\Module\Api\Friendica\Photoalbum\Delete;
use Friendica\Network\HTTPException\BadRequestException;
use Friendica\Test\src\Module\Api\ApiTest;
@ -30,13 +31,13 @@ class DeleteTest extends ApiTest
public function testEmpty()
{
$this->expectException(BadRequestException::class);
(new Delete())->rawContent();
(new Delete(DI::l10n()))->rawContent();
}
public function testWrong()
{
$this->expectException(BadRequestException::class);
(new Delete(['album' => 'album_name']))->rawContent();
(new Delete(DI::l10n(), ['album' => 'album_name']))->rawContent();
}
public function testValid()

View file

@ -21,6 +21,7 @@
namespace Friendica\Test\src\Module\Api\Friendica\Photoalbum;
use Friendica\DI;
use Friendica\Module\Api\Friendica\Photoalbum\Update;
use Friendica\Network\HTTPException\BadRequestException;
use Friendica\Test\src\Module\Api\ApiTest;
@ -30,19 +31,19 @@ class UpdateTest extends ApiTest
public function testEmpty()
{
$this->expectException(BadRequestException::class);
(new Update())->rawContent();
(new Update(DI::l10n()))->rawContent();
}
public function testTooFewArgs()
{
$this->expectException(BadRequestException::class);
(new Update(['album' => 'album_name']))->rawContent();
(new Update(DI::l10n(), ['album' => 'album_name']))->rawContent();
}
public function testWrongUpdate()
{
$this->expectException(BadRequestException::class);
(new Update(['album' => 'album_name', 'album_new' => 'album_name']))->rawContent();
(new Update(DI::l10n(), ['album' => 'album_name', 'album_new' => 'album_name']))->rawContent();
}
public function testWithoutAuthenticatedUser()

View file

@ -2,6 +2,7 @@
namespace Friendica\Test\src\Module\Api\GnuSocial\GnuSocial;
use Friendica\DI;
use Friendica\Module\Api\GNUSocial\GNUSocial\Version;
use Friendica\Test\src\Module\Api\ApiTest;
use Friendica\Test\Util\ApiResponseDouble;
@ -10,7 +11,7 @@ class VersionTest extends ApiTest
{
public function test()
{
$version = new Version(['extension' => 'json']);
$version = new Version(DI::l10n(), ['extension' => 'json']);
$version->rawContent();
$result = json_decode(ApiResponseDouble::getOutput());

View file

@ -2,6 +2,7 @@
namespace Friendica\Test\src\Module\Api\GnuSocial\Help;
use Friendica\DI;
use Friendica\Module\Api\GNUSocial\Help\Test;
use Friendica\Test\src\Module\Api\ApiTest;
use Friendica\Test\Util\ApiResponseDouble;
@ -10,7 +11,7 @@ class TestTest extends ApiTest
{
public function testJson()
{
$test = new Test(['extension' => 'json']);
$test = new Test(DI::l10n(), ['extension' => 'json']);
$test->rawContent();
self::assertEquals('"ok"', ApiResponseDouble::getOutput());
@ -18,7 +19,7 @@ class TestTest extends ApiTest
public function testXml()
{
$test = new Test(['extension' => 'xml']);
$test = new Test(DI::l10n(), ['extension' => 'xml']);
$test->rawContent();
self::assertxml(ApiResponseDouble::getOutput(), 'ok');

View file

@ -2,6 +2,7 @@
namespace Friendica\Test\src\Module\Api\Twitter\Account;
use Friendica\DI;
use Friendica\Module\Api\Twitter\Account\RateLimitStatus;
use Friendica\Test\src\Module\Api\ApiTest;
use Friendica\Test\Util\ApiResponseDouble;
@ -10,7 +11,7 @@ class RateLimitStatusTest extends ApiTest
{
public function testWithJson()
{
$rateLimitStatus = new RateLimitStatus(['extension' => 'json']);
$rateLimitStatus = new RateLimitStatus(DI::l10n(), ['extension' => 'json']);
$rateLimitStatus->rawContent();
$result = json_decode(ApiResponseDouble::getOutput());
@ -22,7 +23,7 @@ class RateLimitStatusTest extends ApiTest
public function testWithXml()
{
$rateLimitStatus = new RateLimitStatus(['extension' => 'xml']);
$rateLimitStatus = new RateLimitStatus(DI::l10n(),['extension' => 'xml']);
$rateLimitStatus->rawContent();
self::assertXml(ApiResponseDouble::getOutput(), 'hash');

View file

@ -2,6 +2,7 @@
namespace Friendica\Test\src\Module\Api\Twitter;
use Friendica\DI;
use Friendica\Module\Api\Twitter\SavedSearches;
use Friendica\Test\src\Module\Api\ApiTest;
use Friendica\Test\Util\ApiResponseDouble;
@ -10,7 +11,7 @@ class SavedSearchesTest extends ApiTest
{
public function test()
{
$savedSearch = new SavedSearches(['extension' => 'json']);
$savedSearch = new SavedSearches(DI::l10n(), ['extension' => 'json']);
$savedSearch->rawContent();
$result = json_decode(ApiResponseDouble::getOutput());