fix: Fix Autoloading of test classes with new autoloader

Signed-off-by: Côme Chilliet <come.chilliet@nextcloud.com>

Author: come-nc

lib/private/App/AppManager.php

@@ -606,6 +606,13 @@ public function registerAppsAutoloading(array $apps): void {
 					// FIXME needed?
 					require_once $path . '/composer/autoload.php';
 				}
+				// Register Test namespace only when testing
+				if ((defined('PHPUNIT_RUN') || defined('CLI_TEST_RUN')) && is_dir($path . '/tests')) {
+					\OC::$autoloader->addPsr4($appNamespace . '\\Tests', $path . '/tests');
+				}
+			}
+			if ((defined('PHPUNIT_RUN') || defined('CLI_TEST_RUN'))) {
+				\OC::$autoloader->rebuild();
 			}
 			$this->eventLogger->end('bootstrap:register_apps_autoloading:apply_cache');
 			$this->eventLogger->end('bootstrap:register_apps_autoloading');
@@ -655,11 +662,11 @@ public function registerAutoloading(string $app, string $path, bool $force = fal
 		}
 
 		// Register Test namespace only when testing
-		if ((defined('PHPUNIT_RUN') || defined('CLI_TEST_RUN')) && is_dir($path . '/tests/')) {
-			\OC::$autoloader->addPsr4($appNamespace . '\\Tests\\', $path . '/tests/');
+		if ((defined('PHPUNIT_RUN') || defined('CLI_TEST_RUN')) && is_dir($path . '/tests')) {
+			\OC::$autoloader->addPsr4($appNamespace . '\\Tests', $path . '/tests');
 		}
 		if ($force) {
-			\OC::$autoloader->triggerReload();
+			\OC::$autoloader->rebuild();
 		}
 	}
 

tests/autoload.php

@@ -13,5 +13,5 @@
  * This is a file that applications can require to be able to autoload the class Test\TestCase from Nextcloud tests
  */
 
-\OC::$autoloader->addPsr4('Test\\', OC::$SERVERROOT . '/tests/lib/');
-\OC::$autoloader->triggerReload();
+\OC::$autoloader->addPsr4('Test', OC::$SERVERROOT . '/tests/lib');
+\OC::$autoloader->rebuild();