rename and move ApiTest to ApiTestCase

tests/src/Module/Api/ApiTest.php

@@ -1,215 +0,0 @@
-<?php
-
-// Copyright (C) 2010-2024, the Friendica project
-// SPDX-FileCopyrightText: 2010-2024 the Friendica project
-//
-// SPDX-License-Identifier: AGPL-3.0-or-later
-
-namespace Friendica\Test\src\Module\Api;
-
-use Friendica\App;
-use Friendica\Capabilities\ICanCreateResponses;
-use Friendica\Core\Addon;
-use Friendica\Core\Config\Capability\IManageConfigValues;
-use Friendica\Core\Hook;
-use Friendica\Database\Database;
-use Friendica\DI;
-use Friendica\Module\Special\HTTPException;
-use Friendica\Security\Authentication;
-use Friendica\Security\BasicAuth;
-use Friendica\Test\FixtureTestCase;
-use Friendica\Test\Util\AppDouble;
-use Friendica\Test\Util\AuthenticationDouble;
-use Friendica\Test\Util\AuthTestConfig;
-use Mockery\MockInterface;
-use Psr\Http\Message\ResponseInterface;
-
-abstract class ApiTest extends FixtureTestCase
-{
-	// User data that the test database is populated with
-	const SELF_USER = [
-		'id'   => 42,
-		'name' => 'Test user',
-		'nick' => 'selfcontact',
-		'nurl' => 'http://localhost/profile/selfcontact'
-	];
-
-	const FRIEND_USER = [
-		'id'   => 44,
-		'name' => 'Friend contact',
-		'nick' => 'friendcontact',
-		'nurl' => 'http://localhost/profile/friendcontact'
-	];
-
-	const OTHER_USER = [
-		'id'   => 43,
-		'name' => 'othercontact',
-		'nick' => 'othercontact',
-		'nurl' => 'http://localhost/profile/othercontact'
-	];
-
-	/** @var HTTPException */
-	protected $httpExceptionMock;
-
-	// User ID that we know is not in the database
-	const WRONG_USER_ID = 666;
-
-	/**
-	 * Assert that the string is XML and contain the root element.
-	 *
-	 * @param string $result       XML string
-	 * @param string $root_element Root element name
-	 *
-	 * @return void
-	 */
-	protected function assertXml(string $result = '', string $root_element = '')
-	{
-		self::assertStringStartsWith('<?xml version="1.0"?>', $result);
-		self::assertStringContainsString('<' . $root_element, $result);
-		// We could probably do more checks here.
-	}
-
-	/**
-	 * Assert that an user array contains expected keys.
-	 *
-	 * @param \stdClass $user User
-	 *
-	 * @return void
-	 */
-	protected function assertSelfUser(\stdClass $user)
-	{
-		self::assertEquals(self::SELF_USER['id'], $user->uid);
-		self::assertEquals(self::SELF_USER['id'], $user->cid);
-		self::assertEquals(1, $user->self);
-		self::assertEquals('DFRN', $user->location);
-		self::assertEquals(self::SELF_USER['name'], $user->name);
-		self::assertEquals(self::SELF_USER['nick'], $user->screen_name);
-		self::assertEquals('dfrn', $user->network);
-		self::assertTrue($user->verified);
-	}
-
-	/**
-	 * Assert that an user array contains expected keys.
-	 *
-	 * @param \stdClass $user User
-	 *
-	 * @return void
-	 */
-	protected function assertOtherUser(\stdClass $user)
-	{
-		self::assertEquals(self::OTHER_USER['id'], $user->id);
-		self::assertEquals(self::OTHER_USER['id'], $user->id_str);
-		self::assertEquals(self::OTHER_USER['name'], $user->name);
-		self::assertEquals(self::OTHER_USER['nick'], $user->screen_name);
-		self::assertFalse($user->verified);
-	}
-
-	/**
-	 * Assert that a status array contains expected keys.
-	 *
-	 * @param \stdClass $status Status
-	 *
-	 * @return void
-	 */
-	protected function assertStatus(\stdClass $status)
-	{
-		self::assertIsString($status->text);
-		self::assertIsInt($status->id);
-		// We could probably do more checks here.
-	}
-
-	/**
-	 * Get the path to a temporary empty PNG image.
-	 *
-	 * @return string Path
-	 */
-	protected function getTempImage()
-	{
-		$tmpFile = tempnam(sys_get_temp_dir(), 'tmp_file');
-		file_put_contents(
-			$tmpFile,
-			base64_decode(
-			// Empty 1x1 px PNG image
-				'iVBORw0KGgoAAAANSUhEUgAAAAEAAAABCAYAAAAfFcSJAAAADUlEQVR42mP8/5+hHgAHggJ/PchI7wAAAABJRU5ErkJggg=='
-			)
-		);
-
-		return $tmpFile;
-	}
-
-	/**
-	 * Transforms a response into a JSON class
-	 *
-	 * @param ResponseInterface $response
-	 *
-	 * @return mixed
-	 */
-	protected function toJson(ResponseInterface $response)
-	{
-		self::assertEquals(ICanCreateResponses::TYPE_JSON, $response->getHeaderLine(ICanCreateResponses::X_HEADER));
-
-		$body = (string)$response->getBody();
-
-		self::assertJson($body);
-
-		return json_decode($body);
-	}
-
-	protected function setUp(): void
-	{
-		parent::setUp(); // TODO: Change the autogenerated stub
-
-		$this->dice = $this->dice
-			->addRule(Authentication::class, ['instanceOf' => AuthenticationDouble::class, 'shared' => true])
-			->addRule(App::class, ['instanceOf' => AppDouble::class, 'shared' => true]);
-		DI::init($this->dice);
-
-		// Manual override to bypass API authentication
-		DI::app()->setIsLoggedIn(true);
-
-		$this->httpExceptionMock = $this->dice->create(HTTPException::class);
-
-		AuthTestConfig::$authenticated = true;
-		AuthTestConfig::$user_id       = 42;
-
-		$this->installAuthTest();
-	}
-
-	protected function tearDown(): void
-	{
-		BasicAuth::setCurrentUserID();
-
-		parent::tearDown(); // TODO: Change the autogenerated stub
-	}
-
-	/**
-	 * installs auththest.
-	 *
-	 * @throws \Exception
-	 */
-	public function installAuthTest()
-	{
-		$addon           = 'authtest';
-		$addon_file_path = __DIR__ . '/Util/authtest/authtest.php';
-		$t               = @filemtime($addon_file_path);
-
-		@include_once($addon_file_path);
-		if (function_exists($addon . '_install')) {
-			$func = $addon . '_install';
-			$func(DI::app());
-		}
-
-		/** @var $config IManageConfigValues */
-		$config = $this->dice->create(IManageConfigValues::class);
-
-		$config->set('addons', $addon, [
-			'name'         => $addon,
-			'installed'    => true,
-			'timestamp'    => $t,
-			'plugin_admin' => function_exists($addon . '_addon_admin'),
-		]);
-
-		Addon::loadAddons();
-		Hook::loadHooks();
-	}
-}

tests/src/Module/Api/Friendica/DirectMessages/SearchTest.php

@@ -11,10 +11,10 @@ use Friendica\App\Router;
 use Friendica\DI;
 use Friendica\Factory\Api\Twitter\DirectMessage;
 use Friendica\Module\Api\Friendica\DirectMessages\Search;
-use Friendica\Test\src\Module\Api\ApiTest;
+use Friendica\Test\ApiTestCase;
 use Psr\Log\NullLogger;
 
-class SearchTest extends ApiTest
+class SearchTest extends ApiTestCase
 {
 	public function testEmpty()
 	{

tests/src/Module/Api/Friendica/NotificationTest.php

@@ -10,11 +10,11 @@ namespace Friendica\Test\src\Module\Api\Friendica;
 use Friendica\Capabilities\ICanCreateResponses;
 use Friendica\DI;
 use Friendica\Module\Api\Friendica\Notification;
-use Friendica\Test\src\Module\Api\ApiTest;
+use Friendica\Test\ApiTestCase;
 use Friendica\Util\DateTimeFormat;
 use Friendica\Util\Temporal;
 
-class NotificationTest extends ApiTest
+class NotificationTest extends ApiTestCase
 {
 	public function testEmpty()
 	{

tests/src/Module/Api/Friendica/Photo/DeleteTest.php

@@ -11,9 +11,9 @@ use Friendica\App\Router;
 use Friendica\DI;
 use Friendica\Module\Api\Friendica\Photo\Delete;
 use Friendica\Network\HTTPException\BadRequestException;
-use Friendica\Test\src\Module\Api\ApiTest;
+use Friendica\Test\ApiTestCase;
 
-class DeleteTest extends ApiTest
+class DeleteTest extends ApiTestCase
 {
 	protected function setUp(): void
 	{

tests/src/Module/Api/Friendica/Photoalbum/DeleteTest.php

@@ -11,9 +11,9 @@ use Friendica\App\Router;
 use Friendica\DI;
 use Friendica\Module\Api\Friendica\Photoalbum\Delete;
 use Friendica\Network\HTTPException\BadRequestException;
-use Friendica\Test\src\Module\Api\ApiTest;
+use Friendica\Test\ApiTestCase;
 
-class DeleteTest extends ApiTest
+class DeleteTest extends ApiTestCase
 {
 	protected function setUp(): void
 	{

tests/src/Module/Api/Friendica/Photoalbum/UpdateTest.php

@@ -11,9 +11,9 @@ use Friendica\App\Router;
 use Friendica\DI;
 use Friendica\Module\Api\Friendica\Photoalbum\Update;
 use Friendica\Network\HTTPException\BadRequestException;
-use Friendica\Test\src\Module\Api\ApiTest;
+use Friendica\Test\ApiTestCase;
 
-class UpdateTest extends ApiTest
+class UpdateTest extends ApiTestCase
 {
 	protected function setUp(): void
 	{

tests/src/Module/Api/GnuSocial/GnuSocial/ConfigTest.php

@@ -9,9 +9,9 @@ namespace Friendica\Test\src\Module\Api\GnuSocial\GnuSocial;
 
 use Friendica\DI;
 use Friendica\Module\Api\GNUSocial\GNUSocial\Config;
-use Friendica\Test\src\Module\Api\ApiTest;
+use Friendica\Test\ApiTestCase;
 
-class ConfigTest extends ApiTest
+class ConfigTest extends ApiTestCase
 {
 	/**
 	 * Test the api_statusnet_config() function.

tests/src/Module/Api/GnuSocial/GnuSocial/VersionTest.php

@@ -10,9 +10,9 @@ namespace Friendica\Test\src\Module\Api\GnuSocial\GnuSocial;
 use Friendica\Capabilities\ICanCreateResponses;
 use Friendica\DI;
 use Friendica\Module\Api\GNUSocial\GNUSocial\Version;
-use Friendica\Test\src\Module\Api\ApiTest;
+use Friendica\Test\ApiTestCase;
 
-class VersionTest extends ApiTest
+class VersionTest extends ApiTestCase
 {
 	public function test()
 	{

tests/src/Module/Api/GnuSocial/Help/TestTest.php

@@ -10,9 +10,9 @@ namespace Friendica\Test\src\Module\Api\GnuSocial\Help;
 use Friendica\Capabilities\ICanCreateResponses;
 use Friendica\DI;
 use Friendica\Module\Api\GNUSocial\Help\Test;
-use Friendica\Test\src\Module\Api\ApiTest;
+use Friendica\Test\ApiTestCase;
 
-class TestTest extends ApiTest
+class TestTest extends ApiTestCase
 {
 	public function testJson()
 	{

tests/src/Module/Api/Mastodon/Accounts/StatusesTest.php

@@ -7,9 +7,9 @@
 
 namespace Friendica\Test\src\Module\Api\Mastodon\Accounts;
 
-use Friendica\Test\src\Module\Api\ApiTest;
+use Friendica\Test\ApiTestCase;
 
-class StatusesTest extends ApiTest
+class StatusesTest extends ApiTestCase
 {
 	/**
 	 * Test the api_status_show() function.

tests/src/Module/Api/Mastodon/Accounts/VerifyCredentialsTest.php

@@ -10,9 +10,9 @@ namespace Friendica\Test\src\Module\Api\Mastodon\Accounts;
 use Friendica\App\Router;
 use Friendica\DI;
 use Friendica\Module\Api\Mastodon\Accounts\VerifyCredentials;
-use Friendica\Test\src\Module\Api\ApiTest;
+use Friendica\Test\ApiTestCase;
 
-class VerifyCredentialsTest extends ApiTest
+class VerifyCredentialsTest extends ApiTestCase
 {
 	/**
 	 * Test the api_account_verify_credentials() function.

tests/src/Module/Api/Mastodon/ConversationsTest.php

@@ -7,9 +7,9 @@
 
 namespace Friendica\Test\src\Module\Api\Mastodon;
 
-use Friendica\Test\src\Module\Api\ApiTest;
+use Friendica\Test\ApiTestCase;
 
-class ConversationsTest extends ApiTest
+class ConversationsTest extends ApiTestCase
 {
 	/**
 	 * Test the api_conversation_show() function.

tests/src/Module/Api/Mastodon/PushSubscriptionTest.php

@@ -7,9 +7,9 @@
 
 namespace Friendica\Test\src\Module\Api\Mastodon;
 
-use Friendica\Test\src\Module\Api\ApiTest;
+use Friendica\Test\ApiTestCase;
 
-class PushSubscriptionTest extends ApiTest
+class PushSubscriptionTest extends ApiTestCase
 {
 	/**
 	 * Test the api_account_verify_credentials() function.

tests/src/Module/Api/Mastodon/SearchTest.php

@@ -7,9 +7,9 @@
 
 namespace Friendica\Test\src\Module\Api\Mastodon;
 
-use Friendica\Test\src\Module\Api\ApiTest;
+use Friendica\Test\ApiTestCase;
 
-class SearchTest extends ApiTest
+class SearchTest extends ApiTestCase
 {
 	/**
 	 * Test the api_search() function.

tests/src/Module/Api/Mastodon/Timelines/HomeTest.php

@@ -7,9 +7,9 @@
 
 namespace Friendica\Test\src\Module\Api\Mastodon\Timelines;
 
-use Friendica\Test\src\Module\Api\ApiTest;
+use Friendica\Test\ApiTestCase;
 
-class HomeTest extends ApiTest
+class HomeTest extends ApiTestCase
 {
 	/**
 	 * Test the api_statuses_home_timeline() function.

tests/src/Module/Api/Mastodon/Timelines/PublicTimelineTest.php

@@ -7,9 +7,9 @@
 
 namespace Friendica\Test\src\Module\Api\Mastodon\Timelines;
 
-use Friendica\Test\src\Module\Api\ApiTest;
+use Friendica\Test\ApiTestCase;
 
-class PublicTimelineTest extends ApiTest
+class PublicTimelineTest extends ApiTestCase
 {
 	/**
 	 * Test the api_statuses_public_timeline() function.

tests/src/Module/Api/Twitter/Account/RateLimitStatusTest.php

@@ -11,9 +11,9 @@ use Friendica\App\Router;
 use Friendica\Capabilities\ICanCreateResponses;
 use Friendica\DI;
 use Friendica\Module\Api\Twitter\Account\RateLimitStatus;
-use Friendica\Test\src\Module\Api\ApiTest;
+use Friendica\Test\ApiTestCase;
 
-class RateLimitStatusTest extends ApiTest
+class RateLimitStatusTest extends ApiTestCase
 {
 	public function testWithJson()
 	{

tests/src/Module/Api/Twitter/Account/UpdateProfileTest.php

@@ -10,9 +10,9 @@ namespace Friendica\Test\src\Module\Api\Twitter\Account;
 use Friendica\App\Router;
 use Friendica\DI;
 use Friendica\Module\Api\Twitter\Account\UpdateProfile;
-use Friendica\Test\src\Module\Api\ApiTest;
+use Friendica\Test\ApiTestCase;
 
-class UpdateProfileTest extends ApiTest
+class UpdateProfileTest extends ApiTestCase
 {
 	/**
 	 * Test the api_account_update_profile() function.

tests/src/Module/Api/Twitter/Blocks/ListsTest.php

@@ -10,9 +10,9 @@ namespace Friendica\Test\src\Module\Api\Twitter\Blocks;
 use Friendica\App\Router;
 use Friendica\DI;
 use Friendica\Module\Api\Twitter\Blocks\Lists;
-use Friendica\Test\src\Module\Api\ApiTest;
+use Friendica\Test\ApiTestCase;
 
-class ListsTest extends ApiTest
+class ListsTest extends ApiTestCase
 {
 	/**
 	 * Test the api_statuses_f() function.

tests/src/Module/Api/Twitter/DirectMessages/AllTest.php

@@ -10,9 +10,9 @@ namespace Friendica\Test\src\Module\Api\Twitter\DirectMessages;
 use Friendica\DI;
 use Friendica\Module\Api\Twitter\DirectMessages\All;
 use Friendica\Factory\Api\Twitter\DirectMessage;
-use Friendica\Test\src\Module\Api\ApiTest;
+use Friendica\Test\ApiTestCase;
 
-class AllTest extends ApiTest
+class AllTest extends ApiTestCase
 {
 	/**
 	 * Test the api_direct_messages_box() function.

tests/src/Module/Api/Twitter/DirectMessages/ConversationTest.php

@@ -11,9 +11,9 @@ use Friendica\App\Router;
 use Friendica\DI;
 use Friendica\Factory\Api\Twitter\DirectMessage;
 use Friendica\Module\Api\Twitter\DirectMessages\Conversation;
-use Friendica\Test\src\Module\Api\ApiTest;
+use Friendica\Test\ApiTestCase;
 
-class ConversationTest extends ApiTest
+class ConversationTest extends ApiTestCase
 {
 	/**
 	 * Test the api_direct_messages_box() function.

tests/src/Module/Api/Twitter/DirectMessages/DestroyTest.php

@@ -11,9 +11,9 @@ use Friendica\App\Router;
 use Friendica\Database\DBA;
 use Friendica\DI;
 use Friendica\Module\Api\Twitter\DirectMessages\Destroy;
-use Friendica\Test\src\Module\Api\ApiTest;
+use Friendica\Test\ApiTestCase;
 
-class DestroyTest extends ApiTest
+class DestroyTest extends ApiTestCase
 {
 	protected function setUp(): void
 	{

tests/src/Module/Api/Twitter/DirectMessages/InboxTest.php

@@ -11,9 +11,9 @@ use Friendica\App\Router;
 use Friendica\DI;
 use Friendica\Factory\Api\Twitter\DirectMessage;
 use Friendica\Module\Api\Twitter\DirectMessages\Inbox;
-use Friendica\Test\src\Module\Api\ApiTest;
+use Friendica\Test\ApiTestCase;
 
-class InboxTest extends ApiTest
+class InboxTest extends ApiTestCase
 {
 	/**
 	 * Test the api_direct_messages_box() function.

tests/src/Module/Api/Twitter/DirectMessages/NewDMTest.php

@@ -11,9 +11,9 @@ use Friendica\App\Router;
 use Friendica\DI;
 use Friendica\Factory\Api\Twitter\DirectMessage;
 use Friendica\Module\Api\Twitter\DirectMessages\NewDM;
-use Friendica\Test\src\Module\Api\ApiTest;
+use Friendica\Test\ApiTestCase;
 
-class NewDMTest extends ApiTest
+class NewDMTest extends ApiTestCase
 {
 	protected function setUp(): void
 	{

tests/src/Module/Api/Twitter/DirectMessages/SentTest.php

@@ -11,9 +11,9 @@ use Friendica\App\Router;
 use Friendica\DI;
 use Friendica\Factory\Api\Twitter\DirectMessage;
 use Friendica\Module\Api\Twitter\DirectMessages\Sent;
-use Friendica\Test\src\Module\Api\ApiTest;
+use Friendica\Test\ApiTestCase;
 
-class SentTest extends ApiTest
+class SentTest extends ApiTestCase
 {
 	/**
 	 * Test the api_direct_messages_box() function.

tests/src/Module/Api/Twitter/Favorites/CreateTest.php

@@ -12,9 +12,9 @@ use Friendica\Capabilities\ICanCreateResponses;
 use Friendica\DI;
 use Friendica\Module\Api\Twitter\Favorites\Create;
 use Friendica\Network\HTTPException\BadRequestException;
-use Friendica\Test\src\Module\Api\ApiTest;
+use Friendica\Test\ApiTestCase;
 
-class CreateTest extends ApiTest
+class CreateTest extends ApiTestCase
 {
 	protected function setUp(): void
 	{

tests/src/Module/Api/Twitter/Favorites/DestroyTest.php

@@ -11,9 +11,9 @@ use Friendica\App\Router;
 use Friendica\DI;
 use Friendica\Module\Api\Twitter\Favorites\Destroy;
 use Friendica\Network\HTTPException\BadRequestException;
-use Friendica\Test\src\Module\Api\ApiTest;
+use Friendica\Test\ApiTestCase;
 
-class DestroyTest extends ApiTest
+class DestroyTest extends ApiTestCase
 {
 	protected function setUp(): void
 	{

tests/src/Module/Api/Twitter/FavoritesTest.php

@@ -11,9 +11,9 @@ use Friendica\App\Router;
 use Friendica\Capabilities\ICanCreateResponses;
 use Friendica\DI;
 use Friendica\Module\Api\Twitter\Favorites;
-use Friendica\Test\src\Module\Api\ApiTest;
+use Friendica\Test\ApiTestCase;
 
-class FavoritesTest extends ApiTest
+class FavoritesTest extends ApiTestCase
 {
 	/**
 	 * Test the api_favorites() function.

tests/src/Module/Api/Twitter/Followers/ListsTest.php

@@ -10,9 +10,9 @@ namespace Friendica\Test\src\Module\Api\Twitter\Followers;
 use Friendica\App\Router;
 use Friendica\DI;
 use Friendica\Module\Api\Twitter\Followers\Lists;
-use Friendica\Test\src\Module\Api\ApiTest;
+use Friendica\Test\ApiTestCase;
 
-class ListsTest extends ApiTest
+class ListsTest extends ApiTestCase
 {
 	/**
 	 * Test the api_statuses_f() function.

tests/src/Module/Api/Twitter/Friends/ListsTest.php

@@ -10,9 +10,9 @@ namespace Friendica\Test\src\Module\Api\Twitter\Friends;
 use Friendica\App\Router;
 use Friendica\DI;
 use Friendica\Module\Api\Twitter\Friends\Lists;
-use Friendica\Test\src\Module\Api\ApiTest;
+use Friendica\Test\ApiTestCase;
 
-class ListsTest extends ApiTest
+class ListsTest extends ApiTestCase
 {
 	/**
 	 * Test the api_statuses_f() function.

tests/src/Module/Api/Twitter/Friendships/IncomingTest.php

@@ -10,9 +10,9 @@ namespace Friendica\Test\src\Module\Api\Twitter\Friendships;
 use Friendica\App\Router;
 use Friendica\DI;
 use Friendica\Module\Api\Twitter\Friendships\Incoming;
-use Friendica\Test\src\Module\Api\ApiTest;
+use Friendica\Test\ApiTestCase;
 
-class IncomingTest extends ApiTest
+class IncomingTest extends ApiTestCase
 {
 	/**
 	 * Test the api_friendships_incoming() function.

tests/src/Module/Api/Twitter/Lists/StatusesTest.php

@@ -11,9 +11,9 @@ use Friendica\App\Router;
 use Friendica\DI;
 use Friendica\Module\Api\Twitter\Lists\Statuses;
 use Friendica\Network\HTTPException\BadRequestException;
-use Friendica\Test\src\Module\Api\ApiTest;
+use Friendica\Test\ApiTestCase;
 
-class StatusesTest extends ApiTest
+class StatusesTest extends ApiTestCase
 {
 	/**
 	 * Test the api_lists_statuses() function.

tests/src/Module/Api/Twitter/Media/UploadTest.php

@@ -13,10 +13,10 @@ use Friendica\Module\Api\Twitter\Media\Upload;
 use Friendica\Network\HTTPException\BadRequestException;
 use Friendica\Network\HTTPException\InternalServerErrorException;
 use Friendica\Network\HTTPException\UnauthorizedException;
-use Friendica\Test\src\Module\Api\ApiTest;
+use Friendica\Test\ApiTestCase;
 use Friendica\Test\Util\AuthTestConfig;
 
-class UploadTest extends ApiTest
+class UploadTest extends ApiTestCase
 {
 	protected function setUp(): void
 	{

tests/src/Module/Api/Twitter/SavedSearchesTest.php

@@ -10,9 +10,9 @@ namespace Friendica\Test\src\Module\Api\Twitter;
 use Friendica\Capabilities\ICanCreateResponses;
 use Friendica\DI;
 use Friendica\Module\Api\Twitter\SavedSearches;
-use Friendica\Test\src\Module\Api\ApiTest;
+use Friendica\Test\ApiTestCase;
 
-class SavedSearchesTest extends ApiTest
+class SavedSearchesTest extends ApiTestCase
 {
 	public function test()
 	{

tests/src/Module/Api/Twitter/Statuses/DestroyTest.php

@@ -11,9 +11,9 @@ use Friendica\App\Router;
 use Friendica\DI;
 use Friendica\Module\Api\Twitter\Statuses\Destroy;
 use Friendica\Network\HTTPException\BadRequestException;
-use Friendica\Test\src\Module\Api\ApiTest;
+use Friendica\Test\ApiTestCase;
 
-class DestroyTest extends ApiTest
+class DestroyTest extends ApiTestCase
 {
 	protected function setUp(): void
 	{

tests/src/Module/Api/Twitter/Statuses/MentionsTest.php

@@ -11,9 +11,9 @@ use Friendica\App\Router;
 use Friendica\Capabilities\ICanCreateResponses;
 use Friendica\DI;
 use Friendica\Module\Api\Twitter\Statuses\Mentions;
-use Friendica\Test\src\Module\Api\ApiTest;
+use Friendica\Test\ApiTestCase;
 
-class MentionsTest extends ApiTest
+class MentionsTest extends ApiTestCase
 {
 	/**
 	 * Test the api_statuses_mentions() function.

tests/src/Module/Api/Twitter/Statuses/NetworkPublicTimelineTest.php

@@ -11,9 +11,9 @@ use Friendica\App\Router;
 use Friendica\Capabilities\ICanCreateResponses;
 use Friendica\DI;
 use Friendica\Module\Api\Twitter\Statuses\NetworkPublicTimeline;
-use Friendica\Test\src\Module\Api\ApiTest;
+use Friendica\Test\ApiTestCase;
 
-class NetworkPublicTimelineTest extends ApiTest
+class NetworkPublicTimelineTest extends ApiTestCase
 {
 	/**
 	 * Test the api_statuses_networkpublic_timeline() function.

tests/src/Module/Api/Twitter/Statuses/RetweetTest.php

@@ -11,9 +11,9 @@ use Friendica\App\Router;
 use Friendica\DI;
 use Friendica\Module\Api\Twitter\Statuses\Retweet;
 use Friendica\Network\HTTPException\BadRequestException;
-use Friendica\Test\src\Module\Api\ApiTest;
+use Friendica\Test\ApiTestCase;
 
-class RetweetTest extends ApiTest
+class RetweetTest extends ApiTestCase
 {
 	protected function setUp(): void
 	{

tests/src/Module/Api/Twitter/Statuses/ShowTest.php

@@ -11,9 +11,9 @@ use Friendica\App\Router;
 use Friendica\DI;
 use Friendica\Module\Api\Twitter\Statuses\Show;
 use Friendica\Network\HTTPException\BadRequestException;
-use Friendica\Test\src\Module\Api\ApiTest;
+use Friendica\Test\ApiTestCase;
 
-class ShowTest extends ApiTest
+class ShowTest extends ApiTestCase
 {
 	/**
 	 * Test the api_statuses_show() function.

tests/src/Module/Api/Twitter/Statuses/UpdateTest.php

@@ -10,9 +10,9 @@ namespace Friendica\Test\src\Module\Api\Twitter\Statuses;
 use Friendica\App\Router;
 use Friendica\DI;
 use Friendica\Module\Api\Twitter\Statuses\Update;
-use Friendica\Test\src\Module\Api\ApiTest;
+use Friendica\Test\ApiTestCase;
 
-class UpdateTest extends ApiTest
+class UpdateTest extends ApiTestCase
 {
 	protected function setUp(): void
 	{

tests/src/Module/Api/Twitter/Statuses/UserTimelineTest.php

@@ -11,9 +11,9 @@ use Friendica\App\Router;
 use Friendica\Capabilities\ICanCreateResponses;
 use Friendica\DI;
 use Friendica\Module\Api\Twitter\Statuses\UserTimeline;
-use Friendica\Test\src\Module\Api\ApiTest;
+use Friendica\Test\ApiTestCase;
 
-class UserTimelineTest extends ApiTest
+class UserTimelineTest extends ApiTestCase
 {
 	/**
 	 * Test the api_statuses_user_timeline() function.

tests/src/Module/Api/Twitter/Users/LookupTest.php

@@ -11,9 +11,9 @@ use Friendica\App\Router;
 use Friendica\DI;
 use Friendica\Module\Api\Twitter\Users\Lookup;
 use Friendica\Network\HTTPException\NotFoundException;
-use Friendica\Test\src\Module\Api\ApiTest;
+use Friendica\Test\ApiTestCase;
 
-class LookupTest extends ApiTest
+class LookupTest extends ApiTestCase
 {
 	/**
 	 * Test the api_users_lookup() function.

tests/src/Module/Api/Twitter/Users/SearchTest.php

@@ -12,9 +12,9 @@ use Friendica\Capabilities\ICanCreateResponses;
 use Friendica\DI;
 use Friendica\Module\Api\Twitter\Users\Search;
 use Friendica\Network\HTTPException\BadRequestException;
-use Friendica\Test\src\Module\Api\ApiTest;
+use Friendica\Test\ApiTestCase;
 
-class SearchTest extends ApiTest
+class SearchTest extends ApiTestCase
 {
 	/**
 	 * Test the api_users_search() function.

tests/src/Module/Api/Twitter/Users/ShowTest.php

@@ -11,9 +11,9 @@ use Friendica\App\Router;
 use Friendica\Capabilities\ICanCreateResponses;
 use Friendica\DI;
 use Friendica\Module\Api\Twitter\Users\Show;
-use Friendica\Test\src\Module\Api\ApiTest;
+use Friendica\Test\ApiTestCase;
 
-class ShowTest extends ApiTest
+class ShowTest extends ApiTestCase
 {
 	/**
 	 * Test the api_users_show() function.

tests/src/Module/BaseApiTest.php

@@ -8,9 +8,9 @@
 namespace Friendica\Test\src\Module;
 
 use Friendica\Module\BaseApi;
-use Friendica\Test\src\Module\Api\ApiTest;
+use Friendica\Test\ApiTestCase;
 
-class BaseApiTest extends ApiTest
+class BaseApiTest extends ApiTestCase
 {
 	public function testWithWrongAuth()
 	{