this.middleware or occupying a legacy placeholder slot.
+ * Placeholder names are treated as known to avoid collisions in the execution order:
+ * a custom middleware named e.g. "testRunner" would otherwise clash with the
+ * placeholder inserted to preserve its original slot.
+ *
+ * @private
+ * @param {string} middlewareName Middleware name to check
+ * @returns {boolean}
+ */
+ #isMiddlewareNameKnown(middlewareName) {
+ return !!(this.middleware[middlewareName] || this.legacyMiddlewarePlaceholders.has(middlewareName));
+ }
}
export default MiddlewareManager;
diff --git a/packages/server/lib/middleware/middlewareRepository.js b/packages/server/lib/middleware/middlewareRepository.js
index 613af7a738e..a4a28fac5d0 100644
--- a/packages/server/lib/middleware/middlewareRepository.js
+++ b/packages/server/lib/middleware/middlewareRepository.js
@@ -7,7 +7,6 @@ const middlewareInfos = {
serveIndex: {path: "./serveIndex.js"},
discovery: {path: "./discovery.js"},
versionInfo: {path: "./versionInfo.js"},
- testRunner: {path: "./testRunner.js"},
nonReadRequests: {path: "./nonReadRequests.js"}
};
diff --git a/packages/server/lib/middleware/testRunner.js b/packages/server/lib/middleware/testRunner.js
deleted file mode 100644
index 71bb4f4b79b..00000000000
--- a/packages/server/lib/middleware/testRunner.js
+++ /dev/null
@@ -1,62 +0,0 @@
-import {promisify} from "node:util";
-import fs from "graceful-fs";
-const readFile = promisify(fs.readFile);
-import {fileURLToPath} from "node:url";
-import mime from "mime-types";
-import parseurl from "parseurl";
-import {getLogger} from "@ui5/logger";
-const log = getLogger("server:middleware:testRunner");
-
-const testRunnerResourceRegEx = /\/test-resources\/sap\/ui\/qunit\/(testrunner\.(html|css)|TestRunner.js)$/;
-const resourceCache = Object.create(null);
-
-function serveResource(res, resourcePath, resourceContent) {
- const type = mime.lookup(resourcePath) || "application/octet-stream";
- const charset = mime.charset(type);
- const contentType = type + (charset ? "; charset=" + charset : "");
-
- // resources served by this middleware do not change often
- res.setHeader("Cache-Control", "public, max-age=1800");
-
- res.setHeader("Content-Type", contentType);
- res.end(resourceContent);
-}
-
-/**
- * Creates and returns the middleware to serve a resource index.
- *
- * @module @ui5/server/middleware/testRunner
- * @param {object} parameters Parameters
- * @param {object} parameters.resources Contains the resource reader or collection to access project related files
- * @returns {Function} Returns a server middleware closure.
- */
-function createMiddleware({resources}) {
- return async function(req, res, next) {
- try {
- const pathname = parseurl(req).pathname;
- const parts = testRunnerResourceRegEx.exec(pathname);
- const resourceName = parts && parts[1];
-
- if (resourceName) { // either "testrunner.html", "testrunner.css" or "TestRunner.js" (case sensitive!)
- log.verbose(`Serving ${pathname}`);
- let pResource;
- if (!resourceCache[pathname]) {
- const filePath = fileURLToPath(new URL(`./testRunner/${resourceName}`, import.meta.url));
- pResource = readFile(filePath, {encoding: "utf8"});
- resourceCache[pathname] = pResource;
- } else {
- pResource = resourceCache[pathname];
- }
-
- const resourceContent = await pResource;
- serveResource(res, pathname, resourceContent);
- } else {
- next();
- }
- } catch (err) {
- next(err);
- }
- };
-}
-
-export default createMiddleware;
diff --git a/packages/server/lib/middleware/testRunner/TestRunner.js b/packages/server/lib/middleware/testRunner/TestRunner.js
deleted file mode 100644
index d7efe7ed8f9..00000000000
--- a/packages/server/lib/middleware/testRunner/TestRunner.js
+++ /dev/null
@@ -1,674 +0,0 @@
-(function(window) {
- "use strict";
-
- /*global CollectGarbage, Handlebars */
- /* eslint radix: 0 */
-
- /*
- * Simulate the JSUnit Testsuite to collect the available
- * test pages per Suite
- */
- window.jsUnitTestSuite = function() {};
- window.jsUnitTestSuite.prototype.getTestPages = function() {
- return this.aPages;
- };
- window.jsUnitTestSuite.prototype.addTestPage = function(sTestPage) {
- this.aPages = this.aPages || [];
- // in case of running in the root context the testsuites right now
- // generate an invalid URL because they assume that test-resources is
- // the context path - this section makes sure to remove the duplicate
- // test-resources segments in the path
- if (sTestPage.indexOf("/test-resources/test-resources") === 0 || sTestPage.indexOf("/test-resources/resources") === 0) {
- sTestPage = sTestPage.substr("/test-resources".length);
- }
- this.aPages.push(sTestPage);
- };
-
- function XHRQueue(iMaxParallelRequests, iWaitTime) {
- this.iLimit = iMaxParallelRequests === undefined ? Infinity : iMaxParallelRequests;
- this.iWaitTime = iWaitTime === undefined ? 0 : iWaitTime;
- this.aPendingTasks = [];
- this.oRunningTasks = new Set();
- this.iLastTaskExecution = -Infinity;
- }
-
- XHRQueue.prototype.ajax = function(sUrl, options) {
- var oTask = {
- url: sUrl,
- options: options
- };
- oTask.promise = new Promise(function(resolve, reject) {
- oTask.resolve = resolve;
- oTask.reject = reject;
- });
- this.aPendingTasks.push(oTask);
- this._processNext();
- return oTask.promise;
- };
-
- XHRQueue.prototype._processNext = function() {
- var iNow = Date.now();
- var iDelay = iNow - this.iLastTaskExecution;
- if ( iDelay < this.iWaitTime ) {
- setTimeout(function() {
- this._processNext();
- }.bind(this), iDelay);
- return;
- }
- if ( this.aPendingTasks.length > 0 && this.oRunningTasks.size < this.iLimit ) {
- var oTask = this.aPendingTasks.shift();
- this.oRunningTasks.add(oTask);
- this.iLastTaskExecution = iNow;
- Promise.resolve(jQuery.ajax(oTask.url, oTask.options))
- .then(oTask.resolve, oTask.reject)
- .finally(function() {
- this.oRunningTasks.delete(oTask);
- this._processNext();
- }.bind(this));
- }
- };
-
- var oXHRQueue = new XHRQueue(50, 2);
-
- /*
- * Template for test results
- */
- var sResultsTemplate = "{{#tests}}" +
- "{{header}}
" + - "{{result.TestName}} ({{result.Failed}} ,{{result.Passed}} ,{{result.All}})
" + - " Rerun" + - "