Merge pull request phpmyadmin#19074 from kamil-tekiela/testing-phpunit

Fixing PHPUnit performance
liviuconcioiu · Mar 25, 2024 · c0e4d31 · c0e4d31
2 parents 7d6bddd + abdaefc
commit c0e4d31
Show file tree

Hide file tree

Showing 14 changed files with 0 additions and 98 deletions.
diff --git a/tests/unit/Controllers/JavaScriptMessagesControllerTest.php b/tests/unit/Controllers/JavaScriptMessagesControllerTest.php
@@ -8,7 +8,6 @@
 use PhpMyAdmin\Controllers\JavaScriptMessagesController;
 use PhpMyAdmin\Http\Factory\ResponseFactory;
 use PHPUnit\Framework\Attributes\CoversClass;
-use PHPUnit\Framework\Attributes\RunInSeparateProcess;
 use PHPUnit\Framework\TestCase;
 
 use function json_decode;
@@ -18,7 +17,6 @@
 #[CoversClass(JavaScriptMessagesController::class)]
 class JavaScriptMessagesControllerTest extends TestCase
 {
-    #[RunInSeparateProcess]
     public function testIndex(): void
     {
         $response = (new JavaScriptMessagesController(ResponseFactory::create()))();

diff --git a/tests/unit/Controllers/SchemaExportControllerTest.php b/tests/unit/Controllers/SchemaExportControllerTest.php
@@ -11,12 +11,10 @@
 use PhpMyAdmin\Tests\AbstractTestCase;
 use PhpMyAdmin\Tests\Stubs\ResponseRenderer;
 use PHPUnit\Framework\Attributes\CoversClass;
-use PHPUnit\Framework\Attributes\RunInSeparateProcess;
 
 #[CoversClass(SchemaExportController::class)]
 class SchemaExportControllerTest extends AbstractTestCase
 {
-    #[RunInSeparateProcess]
     public function testExport(): void
     {
         DatabaseInterface::$instance = $this->createDatabaseInterface();

diff --git a/tests/unit/Controllers/Table/GetFieldControllerTest.php b/tests/unit/Controllers/Table/GetFieldControllerTest.php
@@ -13,16 +13,12 @@
 use PhpMyAdmin\Tests\AbstractTestCase;
 use PhpMyAdmin\Tests\Stubs\ResponseRenderer;
 use PHPUnit\Framework\Attributes\CoversClass;
-use PHPUnit\Framework\Attributes\PreserveGlobalState;
-use PHPUnit\Framework\Attributes\RunInSeparateProcess;
 
 use function bin2hex;
 
 #[CoversClass(GetFieldController::class)]
 class GetFieldControllerTest extends AbstractTestCase
 {
-    #[PreserveGlobalState(false)]
-    #[RunInSeparateProcess]
     public function testGetFieldController(): void
     {
         Current::$database = 'test_db';

diff --git a/tests/unit/Controllers/ThemeSetControllerTest.php b/tests/unit/Controllers/ThemeSetControllerTest.php
@@ -15,8 +15,6 @@
 use PhpMyAdmin\UserPreferences;
 use PHPUnit\Framework\Attributes\CoversClass;
 use PHPUnit\Framework\Attributes\DataProvider;
-use PHPUnit\Framework\Attributes\PreserveGlobalState;
-use PHPUnit\Framework\Attributes\RunInSeparateProcess;
 
 #[CoversClass(ThemeSetController::class)]
 class ThemeSetControllerTest extends AbstractTestCase
@@ -28,8 +26,6 @@ protected function setUp(): void
         DatabaseInterface::$instance = $this->createDatabaseInterface();
     }
 
-    #[PreserveGlobalState(false)]
-    #[RunInSeparateProcess]
     public function testSetTheme(): void
     {
         Config::getInstance()->settings['ThemeManager'] = true;
@@ -52,8 +48,6 @@ public function testSetTheme(): void
 
     /** @param string[]|string|null $themeName */
     #[DataProvider('providerForTestWithoutTheme')]
-    #[PreserveGlobalState(false)]
-    #[RunInSeparateProcess]
     public function testWithoutTheme(bool $hasThemes, array|string|null $themeName): void
     {
         Config::getInstance()->settings['ThemeManager'] = $hasThemes;

diff --git a/tests/unit/Http/Factory/ServerRequestFactoryTest.php b/tests/unit/Http/Factory/ServerRequestFactoryTest.php
@@ -110,8 +110,6 @@ public function testCreateWithoutProvider(): void
      * @psalm-param class-string<UriInterface> $expectedUri
      */
     #[DataProvider('providerForTestFromGlobals')]
-    #[RunInSeparateProcess]
-    #[PreserveGlobalState(false)]
     public function testFromGlobals(string $provider, string $uriFactoryProvider, string $expectedUri): void
     {
         $this->skipIfNotAvailable($provider);
@@ -149,8 +147,6 @@ public function testFromGlobals(string $provider, string $uriFactoryProvider, st
      * @psalm-param class-string<UriInterface> $expectedUri
      */
     #[DataProvider('providerForTestFromGlobals')]
-    #[RunInSeparateProcess]
-    #[PreserveGlobalState(false)]
     public function testFromGlobals2(string $provider, string $uriFactoryProvider, string $expectedUri): void
     {
         $this->skipIfNotAvailable($provider);
@@ -203,8 +199,6 @@ public function testFromGlobals2(string $provider, string $uriFactoryProvider, s
      * @psalm-param class-string<UriInterface> $expectedUri
      */
     #[DataProvider('providerForTestFromGlobals')]
-    #[RunInSeparateProcess]
-    #[PreserveGlobalState(false)]
     public function testFromGlobals3(string $provider, string $uriFactoryProvider, string $expectedUri): void
     {
         $this->skipIfNotAvailable($provider);

diff --git a/tests/unit/Plugins/Auth/AuthenticationConfigTest.php b/tests/unit/Plugins/Auth/AuthenticationConfigTest.php
@@ -13,8 +13,6 @@
 use PhpMyAdmin\Tests\AbstractTestCase;
 use PHPUnit\Framework\Attributes\CoversClass;
 use PHPUnit\Framework\Attributes\Medium;
-use PHPUnit\Framework\Attributes\PreserveGlobalState;
-use PHPUnit\Framework\Attributes\RunInSeparateProcess;
 use ReflectionProperty;
 use Throwable;
 
@@ -57,8 +55,6 @@ protected function tearDown(): void
         unset($this->object);
     }
 
-    #[RunInSeparateProcess]
-    #[PreserveGlobalState(false)]
     public function testAuth(): void
     {
         (new ReflectionProperty(ResponseRenderer::class, 'instance'))->setValue(null, null);
@@ -82,8 +78,6 @@ public function testAuthSetUser(): void
         );
     }
 
-    #[RunInSeparateProcess]
-    #[PreserveGlobalState(false)]
     public function testAuthFails(): void
     {
         Config::getInstance()->settings['Servers'] = [1];

diff --git a/tests/unit/Plugins/Auth/AuthenticationCookieTest.php b/tests/unit/Plugins/Auth/AuthenticationCookieTest.php
@@ -16,8 +16,6 @@
 use PHPUnit\Framework\Attributes\CoversClass;
 use PHPUnit\Framework\Attributes\DataProvider;
 use PHPUnit\Framework\Attributes\Medium;
-use PHPUnit\Framework\Attributes\PreserveGlobalState;
-use PHPUnit\Framework\Attributes\RunInSeparateProcess;
 use ReflectionException;
 use ReflectionMethod;
 use ReflectionProperty;
@@ -74,8 +72,6 @@ protected function tearDown(): void
         unset($this->object);
     }
 
-    #[RunInSeparateProcess]
-    #[PreserveGlobalState(false)]
     public function testAuthErrorAJAX(): void
     {
         $GLOBALS['conn_error'] = true;
@@ -113,8 +109,6 @@ private function getAuthErrorMockResponse(): void
         ErrorHandler::$instance = $mockErrorHandler;
     }
 
-    #[RunInSeparateProcess]
-    #[PreserveGlobalState(false)]
     public function testAuthError(): void
     {
         $_REQUEST = [];
@@ -189,8 +183,6 @@ public function testAuthError(): void
         self::assertStringContainsString('<input type="hidden" name="table" value="testTable">', $result);
     }
 
-    #[RunInSeparateProcess]
-    #[PreserveGlobalState(false)]
     public function testAuthCaptcha(): void
     {
         $_REQUEST['old_usr'] = '';
@@ -251,8 +243,6 @@ public function testAuthCaptcha(): void
         );
     }
 
-    #[RunInSeparateProcess]
-    #[PreserveGlobalState(false)]
     public function testAuthCaptchaCheckbox(): void
     {
         $_REQUEST['old_usr'] = '';
@@ -315,8 +305,6 @@ public function testAuthCaptchaCheckbox(): void
         );
     }
 
-    #[RunInSeparateProcess]
-    #[PreserveGlobalState(false)]
     public function testAuthHeader(): void
     {
         $config = Config::getInstance();
@@ -336,8 +324,6 @@ public function testAuthHeader(): void
         self::assertSame(302, $response->getStatusCode());
     }
 
-    #[RunInSeparateProcess]
-    #[PreserveGlobalState(false)]
     public function testAuthHeaderPartial(): void
     {
         $config = Config::getInstance();
@@ -377,8 +363,6 @@ public function testAuthCheckCaptcha(): void
         self::assertSame('Missing Captcha verification, maybe it has been blocked by adblock?', $GLOBALS['conn_error']);
     }
 
-    #[RunInSeparateProcess]
-    #[PreserveGlobalState(false)]
     public function testLogoutDelete(): void
     {
         $responseStub = new ResponseRendererStub();
@@ -406,8 +390,6 @@ public function testLogoutDelete(): void
         self::assertArrayNotHasKey('pmaAuth-0', $_COOKIE);
     }
 
-    #[RunInSeparateProcess]
-    #[PreserveGlobalState(false)]
     public function testLogout(): void
     {
         $responseStub = new ResponseRendererStub();
@@ -657,8 +639,6 @@ public function testAuthSetUserWithHeaders(): void
         $this->object->rememberCredentials();
     }
 
-    #[RunInSeparateProcess]
-    #[PreserveGlobalState(false)]
     public function testAuthFailsNoPass(): void
     {
         $this->object = $this->getMockBuilder(AuthenticationCookie::class)
@@ -727,8 +707,6 @@ public function testAuthFailsTooLongPass(string $password, bool $expected, strin
         self::assertSame($GLOBALS['conn_error'], $connError);
     }
 
-    #[RunInSeparateProcess]
-    #[PreserveGlobalState(false)]
     public function testAuthFailsDeny(): void
     {
         $this->object = $this->getMockBuilder(AuthenticationCookie::class)
@@ -759,8 +737,6 @@ public function testAuthFailsDeny(): void
         self::assertSame($GLOBALS['conn_error'], 'Access denied!');
     }
 
-    #[RunInSeparateProcess]
-    #[PreserveGlobalState(false)]
     public function testAuthFailsActivity(): void
     {
         $this->object = $this->getMockBuilder(AuthenticationCookie::class)
@@ -798,8 +774,6 @@ public function testAuthFailsActivity(): void
         );
     }
 
-    #[RunInSeparateProcess]
-    #[PreserveGlobalState(false)]
     public function testAuthFailsDBI(): void
     {
         $this->object = $this->getMockBuilder(AuthenticationCookie::class)
@@ -841,8 +815,6 @@ public function testAuthFailsDBI(): void
         self::assertSame($GLOBALS['conn_error'], '#42 Cannot log in to the MySQL server');
     }
 
-    #[RunInSeparateProcess]
-    #[PreserveGlobalState(false)]
     public function testAuthFailsErrno(): void
     {
         $this->object = $this->getMockBuilder(AuthenticationCookie::class)
@@ -1007,8 +979,6 @@ public function testAuthenticate(): void
      * @param mixed[] $rules    rules
      * @param string  $expected expected result
      */
-    #[RunInSeparateProcess]
-    #[PreserveGlobalState(false)]
     #[DataProvider('checkRulesProvider')]
     public function testCheckRules(
         string $user,

diff --git a/tests/unit/Plugins/Auth/AuthenticationHttpTest.php b/tests/unit/Plugins/Auth/AuthenticationHttpTest.php
@@ -15,8 +15,6 @@
 use PHPUnit\Framework\Attributes\CoversClass;
 use PHPUnit\Framework\Attributes\DataProvider;
 use PHPUnit\Framework\Attributes\Medium;
-use PHPUnit\Framework\Attributes\PreserveGlobalState;
-use PHPUnit\Framework\Attributes\RunInSeparateProcess;
 use ReflectionProperty;
 use Throwable;
 
@@ -59,8 +57,6 @@ protected function tearDown(): void
         unset($this->object);
     }
 
-    #[RunInSeparateProcess]
-    #[PreserveGlobalState(false)]
     public function testAuthLogoutUrl(): void
     {
         $config = Config::getInstance();
@@ -77,8 +73,6 @@ public function testAuthLogoutUrl(): void
         self::assertSame(302, $response->getStatusCode());
     }
 
-    #[RunInSeparateProcess]
-    #[PreserveGlobalState(false)]
     public function testAuthVerbose(): void
     {
         $config = Config::getInstance();
@@ -99,8 +93,6 @@ public function testAuthVerbose(): void
         self::assertSame(401, $response->getStatusCode());
     }
 
-    #[RunInSeparateProcess]
-    #[PreserveGlobalState(false)]
     public function testAuthHost(): void
     {
         $config = Config::getInstance();
@@ -122,8 +114,6 @@ public function testAuthHost(): void
         self::assertSame(401, $response->getStatusCode());
     }
 
-    #[RunInSeparateProcess]
-    #[PreserveGlobalState(false)]
     public function testAuthRealm(): void
     {
         $config = Config::getInstance();
@@ -276,8 +266,6 @@ public function testAuthSetUser(): void
         self::assertSame(3, Current::$server);
     }
 
-    #[RunInSeparateProcess]
-    #[PreserveGlobalState(false)]
     public function testAuthFails(): void
     {
         $config = Config::getInstance();

diff --git a/tests/unit/Plugins/Auth/AuthenticationSignonTest.php b/tests/unit/Plugins/Auth/AuthenticationSignonTest.php
@@ -14,8 +14,6 @@
 use PhpMyAdmin\Tests\AbstractTestCase;
 use PhpMyAdmin\Tests\Stubs\ResponseRenderer as ResponseRendererStub;
 use PHPUnit\Framework\Attributes\CoversClass;
-use PHPUnit\Framework\Attributes\PreserveGlobalState;
-use PHPUnit\Framework\Attributes\RunInSeparateProcess;
 use ReflectionProperty;
 use Throwable;
 
@@ -57,8 +55,6 @@ protected function tearDown(): void
         unset($this->object);
     }
 
-    #[RunInSeparateProcess]
-    #[PreserveGlobalState(false)]
     public function testAuth(): void
     {
         (new ReflectionProperty(ResponseRenderer::class, 'instance'))->setValue(null, null);
@@ -81,8 +77,6 @@ public function testAuth(): void
         self::assertStringContainsString('You must set SignonURL!', $result);
     }
 
-    #[RunInSeparateProcess]
-    #[PreserveGlobalState(false)]
     public function testAuthLogoutURL(): void
     {
         $responseStub = new ResponseRendererStub();
@@ -99,8 +93,6 @@ public function testAuthLogoutURL(): void
         self::assertSame(302, $response->getStatusCode());
     }
 
-    #[RunInSeparateProcess]
-    #[PreserveGlobalState(false)]
     public function testAuthLogout(): void
     {
         $responseStub = new ResponseRendererStub();
@@ -151,8 +143,6 @@ public function testAuthCheckSession(): void
         self::assertSame('https://example.com/SignonURL', $_SESSION['LAST_SIGNON_URL']);
     }
 
-    #[RunInSeparateProcess]
-    #[PreserveGlobalState(false)]
     public function testAuthCheckToken(): void
     {
         $_SESSION = [' PMA_token ' => 'eefefef'];

diff --git a/tests/unit/SessionTest.php b/tests/unit/SessionTest.php
@@ -6,15 +6,11 @@
 
 use PhpMyAdmin\Session;
 use PHPUnit\Framework\Attributes\CoversClass;
-use PHPUnit\Framework\Attributes\PreserveGlobalState;
-use PHPUnit\Framework\Attributes\RunInSeparateProcess;
 use PHPUnit\Framework\TestCase;
 
 #[CoversClass(Session::class)]
 final class SessionTest extends TestCase
 {
-    #[RunInSeparateProcess]
-    #[PreserveGlobalState(false)]
     public function testSecure(): void
     {
         $_SESSION[' PMA_token '] = null;

diff --git a/tests/unit/Setup/FormProcessingTest.php b/tests/unit/Setup/FormProcessingTest.php
@@ -14,8 +14,6 @@
 use PhpMyAdmin\Tests\AbstractTestCase;
 use PhpMyAdmin\Tests\Stubs\ResponseRenderer as ResponseRendererStub;
 use PHPUnit\Framework\Attributes\CoversClass;
-use PHPUnit\Framework\Attributes\PreserveGlobalState;
-use PHPUnit\Framework\Attributes\RunInSeparateProcess;
 use ReflectionProperty;
 use Throwable;
 
@@ -39,8 +37,6 @@ protected function setUp(): void
         Config::getInstance()->settings['ServerDefault'] = 1;
     }
 
-    #[RunInSeparateProcess]
-    #[PreserveGlobalState(false)]
     public function testProcessFormSet(): void
     {
         DatabaseInterface::$instance = $this->createDatabaseInterface();