@openui5/sap.ui.core 1.130.0 → 1.131.0

package/src/sap/ui/model/odata/v4/lib/_Cache.js

@@ -3240,6 +3240,9 @@ sap.ui.define([
 	 *   If no back-end request is needed, the function is not called.
 	 * @param {boolean} [bIndexIsSkip]
 	 *   Whether <code>iIndex</code> is a raw $skip index
+	 * @param {function} [fnSeparateReceived]
+	 *   The function is called for each completed separate property request; may be omitted only if
+	 *   there are no separate properties
 	 * @returns {sap.ui.base.SyncPromise}
 	 *   A promise to be resolved with the requested range given as an OData response object (with
 	 *   "@odata.context" and the rows as an array in the property <code>value</code>, enhanced
@@ -3254,7 +3257,7 @@ sap.ui.define([
 	 * @see sap.ui.model.odata.v4.lib._Requestor#request
 	 */
 	_CollectionCache.prototype.read = function (iIndex, iLength, iPrefetchLength, oGroupLock,
-			fnDataRequested, bIndexIsSkip) {
+			fnDataRequested, bIndexIsSkip, fnSeparateReceived) {
 		var iCreatedPersisted = 0,
 			oElement,
 			aElementsRange,
@@ -3275,7 +3278,7 @@ sap.ui.define([
 		if (oPromise) {
 			return oPromise.then(function () {
 				return that.read(iIndex, iLength, iPrefetchLength, oGroupLock, fnDataRequested,
-					bIndexIsSkip);
+					bIndexIsSkip, fnSeparateReceived);
 			});
 		}
 
@@ -3316,7 +3319,7 @@ sap.ui.define([
 
 		aReadIntervals.forEach(function (oInterval) {
 				that.requestElements(oInterval.start, oInterval.end, oGroupLock.getUnlockedCopy(),
-					iTransientElements, fnDataRequested);
+					iTransientElements, fnDataRequested, fnSeparateReceived);
 				fnDataRequested = undefined;
 			});
 
@@ -3484,6 +3487,9 @@ sap.ui.define([
 	 *   The number of transient elements within the given group
 	 * @param {function} [fnDataRequested]
 	 *   The function is called when the back-end requests have been sent.
+	 * @param {function} [fnSeparateReceived]
+	 *   The function is called for each completed separate property request; may be omitted only if
+	 *   there are no separate properties
 	 * @returns {sap.ui.base.SyncPromise}
 	 *   A promise which is resolved without a defined result when the request is finished and
 	 *   rejected in case of error; if the request has been obsoleted by a {@link #reset} the error
@@ -3494,7 +3500,7 @@ sap.ui.define([
 	 * @private
 	 */
 	_CollectionCache.prototype.requestElements = function (iStart, iEnd, oGroupLock,
-			iTransientElements, fnDataRequested) {
+			iTransientElements, fnDataRequested, fnSeparateReceived) {
 		var oPromise,
 			oReadRequest = {
 				iEnd : iEnd,
@@ -3544,7 +3550,7 @@ sap.ui.define([
 			that.aReadRequests.splice(that.aReadRequests.indexOf(oReadRequest), 1);
 		});
 
-		this.requestSeparateProperties(iStart, iEnd, oPromise);
+		this.requestSeparateProperties(iStart, iEnd, oPromise, fnSeparateReceived);
 
 		// Note: oPromise MUST be a SyncPromise for performance reasons, see SyncPromise#all
 		this.fill(oPromise, iStart, iEnd);
@@ -3560,46 +3566,61 @@ sap.ui.define([
 	 * @param {number} iEnd
 	 *   The index after the last element
 	 * @param {sap.ui.base.SyncPromise} oMainPromise
-	 *   A promise which is resolved when the main request is finished
+	 *   A promise which is resolved when the main request is finished; the caller must take care of
+	 *   error handling
+	 * @param {function} [fnSeparateReceived]
+	 *   The function is called for each completed separate property request; may be omitted only if
+	 *   there are no separate properties
 	 * @returns {Promise<void>}
 	 *   A promise which is resolved without a defined result at no defined point in time
 	 *
 	 * @private
 	 */
 	_CollectionCache.prototype.requestSeparateProperties = async function (iStart, iEnd,
-			oMainPromise) {
+			oMainPromise, fnSeparateReceived) {
 		if (!this.aSeparateProperties.length) {
 			return;
 		}
 
 		// types are needed for selecting the key properties, see #getQueryString called by
 		// #getResourcePathWithQuery
-		const oTypes = await this.fetchTypes();
+		const mTypeForMetaPath = await this.fetchTypes();
 		const oReadRange = {start : iStart, end : iEnd};
-		const aRequestPromises = this.aSeparateProperties.map((sProperty) => {
-			this.mSeparateProperty2ReadRequest[sProperty].push(oReadRange);
-			return this.oRequestor.request("GET",
-				this.getResourcePathWithQuery(iStart, iEnd, sProperty),
-				this.oRequestor.lockGroup("$single", this));
-		});
+		this.aSeparateProperties.forEach(async (sProperty) => {
+			try {
+				this.mSeparateProperty2ReadRequest[sProperty].push(oReadRange);
+				const oResult = await this.oRequestor.request("GET",
+					this.getResourcePathWithQuery(iStart, iEnd, sProperty),
+					this.oRequestor.lockGroup("$single", this));
+
+				let bMainFailed;
+				await oMainPromise.catch(() => { /* handled by caller */
+					bMainFailed = true;
+				});
 
-		await oMainPromise;
-		aRequestPromises.forEach(async (oRequestPromise, i) => {
-			const oResult = await oRequestPromise;
-			const sProperty = this.aSeparateProperties[i];
-			const iRangeIndex = this.mSeparateProperty2ReadRequest[sProperty].indexOf(oReadRange);
-			if (iRangeIndex < 0) { // stop import after #reset
-				return;
-			}
-			this.mSeparateProperty2ReadRequest[sProperty].splice(iRangeIndex, 1);
-			this.visitResponse(oResult, oTypes, undefined, undefined, iStart);
-			for (const oSeparateData of oResult.value) {
-				const sPredicate = _Helper.getPrivateAnnotation(oSeparateData, "predicate");
-				const oElement = this.aElements.$byPredicate[sPredicate];
-				if (oElement) {
-					_Helper.updateSelected(this.mChangeListeners, sPredicate, oElement,
-						oSeparateData, [sProperty]);
+				const iIndex = this.mSeparateProperty2ReadRequest[sProperty].indexOf(oReadRange);
+				if (iIndex < 0) { // stop import after #reset
+					return;
+				}
+
+				this.mSeparateProperty2ReadRequest[sProperty].splice(iIndex, 1);
+				if (bMainFailed) {
+					return;
+				}
+
+				this.visitResponse(oResult, mTypeForMetaPath, undefined, undefined, iStart);
+				for (const oSeparateData of oResult.value) {
+					const sPredicate = _Helper.getPrivateAnnotation(oSeparateData, "predicate");
+					const oElement = this.aElements.$byPredicate[sPredicate];
+					if (oElement) {
+						_Helper.updateSelected(this.mChangeListeners, sPredicate, oElement,
+							oSeparateData, [sProperty]);
+					}
 				}
+				fnSeparateReceived(sProperty, iStart, iEnd);
+			} catch (oError) {
+				// do not clean up mSeparateProperty2ReadRequest to avoid late property requests
+				fnSeparateReceived(sProperty, iStart, iEnd, oError);
 			}
 		});
 	};

package/src/sap/ui/model/odata/v4/lib/_MetadataRequestor.js

@@ -30,17 +30,20 @@ sap.ui.define([
 		 *   is deleted(!) after the first <code>read</code> for a metadata document.
 		 * @param {boolean} [bWithCredentials]
 		 *   Whether the XHR should be called with <code>withCredentials</code>
+		 * @param {function} fnGetOrCreateRetryAfterPromise
+		 *   A function that returns or creates the "Retry-After" promise
 		 * @returns {object}
 		 *   A new MetadataRequestor object
 		 */
 		create : function (mHeaders, sODataVersion, bIgnoreAnnotationsFromMetadata, mQueryParams,
-			bWithCredentials) {
+				bWithCredentials, fnGetOrCreateRetryAfterPromise) {
 			var mUrl2Promise = {},
 				sQuery = _Helper.buildQuery(mQueryParams);
 
 			return {
 				/**
-				 * Reads a metadata document from the given URL.
+				 * Reads a metadata document from the given URL, taking care of "Retry-After".
+				 *
 				 * @param {string} sUrl
 				 *   The URL of a metadata document, it must not contain a query string or a
 				 *   fragment part
@@ -86,38 +89,53 @@ sap.ui.define([
 						delete mUrl2Promise[sUrl];
 					} else {
 						oPromise = new Promise(function (fnResolve, fnReject) {
-							const oAjaxSettings = {
-									method : "GET",
-									headers : mHeaders
-								};
-							if (bWithCredentials) {
-								oAjaxSettings.xhrFields = {withCredentials : true};
-							}
+							function send() {
+								const oAjaxSettings = {
+										method : "GET",
+										headers : mHeaders
+									};
+								if (bWithCredentials) {
+									oAjaxSettings.xhrFields = {withCredentials : true};
+								}
+								jQuery.ajax(bAnnotations ? sUrl : sUrl + sQuery, oAjaxSettings)
+								.then(function (oData, _sTextStatus, jqXHR) {
+									var sDate = jqXHR.getResponseHeader("Date"),
+										sETag = jqXHR.getResponseHeader("ETag"),
+										oJSON = {$XML : oData},
+										sLastModified = jqXHR.getResponseHeader("Last-Modified");
 
-							jQuery.ajax(bAnnotations ? sUrl : sUrl + sQuery, oAjaxSettings)
-							.then(function (oData, _sTextStatus, jqXHR) {
-								var sDate = jqXHR.getResponseHeader("Date"),
-									sETag = jqXHR.getResponseHeader("ETag"),
-									oJSON = {$XML : oData},
-									sLastModified = jqXHR.getResponseHeader("Last-Modified");
+									if (sDate) {
+										oJSON.$Date = sDate;
+									}
+									if (sETag) {
+										oJSON.$ETag = sETag;
+									}
+									if (sLastModified) {
+										oJSON.$LastModified = sLastModified;
+									}
+									fnResolve(oJSON);
+								}, function (jqXHR) {
+									var oError
+										= _Helper.createError(jqXHR, "Could not load metadata");
 
-								if (sDate) {
-									oJSON.$Date = sDate;
-								}
-								if (sETag) {
-									oJSON.$ETag = sETag;
-								}
-								if (sLastModified) {
-									oJSON.$LastModified = sLastModified;
-								}
-								fnResolve(oJSON);
-							}, function (jqXHR, _sTextStatus, _sErrorMessage) {
-								var oError = _Helper.createError(jqXHR, "Could not load metadata");
+									if (jqXHR.status === 503
+											&& jqXHR.getResponseHeader("Retry-After")
+											&& fnGetOrCreateRetryAfterPromise(oError)) {
+										fnGetOrCreateRetryAfterPromise().then(send, fnReject);
+									} else {
+										Log.error("GET " + sUrl, oError.message,
+											"sap.ui.model.odata.v4.lib._MetadataRequestor");
+										fnReject(oError);
+									}
+								});
+							}
 
-								Log.error("GET " + sUrl, oError.message,
-									"sap.ui.model.odata.v4.lib._MetadataRequestor");
-								fnReject(oError);
-							});
+							const oRetryAfterPromise = fnGetOrCreateRetryAfterPromise();
+							if (oRetryAfterPromise) {
+								oRetryAfterPromise.then(send, fnReject);
+							} else {
+								send();
+							}
 							if (!bAnnotations
 								&& mQueryParams && "sap-context-token" in mQueryParams) {
 								delete mQueryParams["sap-context-token"];

package/src/sap/ui/model/odata/v4/lib/_Requestor.js

@@ -91,7 +91,6 @@ sap.ui.define([
 		this.oModelInterface = oModelInterface;
 		this.oOptimisticBatch = null; // optimistic batch processing off
 		this.sQueryParams = _Helper.buildQuery(mQueryParams); // Used for $batch and CSRF token only
-		this.oRetryAfterPromise = null;
 		this.mRunningChangeRequests = {}; // map from group ID to a SyncPromise[]
 		this.iSessionTimer = 0;
 		this.iSerialNumber = 0;
@@ -2082,26 +2081,9 @@ sap.ui.define([
 							send(true);
 						}, fnReject);
 					} else if (jqXHR.status === 503 && jqXHR.getResponseHeader("Retry-After")
-							&& (that.oRetryAfterPromise
-								|| that.oModelInterface.getRetryAfterHandler())) {
-						if (!that.oRetryAfterPromise) {
-							const oRetryAfterError = _Helper.createError(jqXHR, "");
-							that.oRetryAfterPromise = that.oModelInterface.getRetryAfterHandler()(
-								oRetryAfterError);
-							that.oRetryAfterPromise.finally(() => {
-								that.oRetryAfterPromise = null;
-							}).catch(() => { /* catch is only needed due to finally */ });
-							that.oRetryAfterPromise.catch((oError) => {
-								// own error reason is not reported to the message model
-								if (oError === oRetryAfterError) {
-									that.oModelInterface
-										.reportError(oError.message, sClassName, oError);
-								} else {
-									oError.$reported = true;
-								}
-							});
-						}
-						that.oRetryAfterPromise.then(send, fnReject);
+							&& that.oModelInterface.getOrCreateRetryAfterPromise(
+								_Helper.createError(jqXHR, ""))) {
+						that.oModelInterface.getOrCreateRetryAfterPromise().then(send, fnReject);
 					} else {
 						sMessage = "Communication error";
 						if (sContextId) {
@@ -2121,8 +2103,9 @@ sap.ui.define([
 				});
 			}
 
-			if (that.oRetryAfterPromise) {
-				that.oRetryAfterPromise.then(send, fnReject);
+			const oRetryAfterPromise = that.oModelInterface.getOrCreateRetryAfterPromise();
+			if (oRetryAfterPromise) {
+				oRetryAfterPromise.then(send, fnReject);
 			} else if (that.oSecurityTokenPromise && sMethod !== "GET") {
 				that.oSecurityTokenPromise.then(send);
 			} else {
@@ -2337,13 +2320,12 @@ sap.ui.define([
 	 * @param {function} oModelInterface.getOptimisticBatchEnabler
 	 *   A function that returns a callback function which controls the optimistic batch handling,
 	 *   see also {@link sap.ui.model.odata.v4.ODataModel#setOptimisticBatchEnabler}
+	 * @param {function} oModelInterface.getOrCreateRetryAfterPromise
+	 *   A function that returns or creates the "Retry-After" promise
 	 * @param {function} oModelInterface.getReporter
 	 *   A catch handler function expecting an <code>Error</code> instance. This function will call
 	 *   {@link sap.ui.model.odata.v4.ODataModel#reportError} if the error has not been reported
 	 *   yet
-	 * @param {function} oModelInterface.getRetryAfterHandler
-	 *   A function that returns the "Retry-After" handler,
-	 *   see also {@link sap.ui.model.odata.v4.ODataModel#setRetryAfterHandler}
 	 * @param {function():boolean} oModelInterface.isIgnoreETag
 	 *   Tells whether an entity's ETag should be actively ignored (If-Match:*) for PATCH requests.
 	 * @param {function} oModelInterface.onCreateGroup

package/src/sap/ui/model/resource/ResourceModel.js

@@ -227,7 +227,7 @@ sap.ui.define([
 	 *
 	 * @extends sap.ui.model.Model
 	 * @public
-	 * @version 1.130.0
+	 * @version 1.131.0
 	 */
 	var ResourceModel = Model.extend("sap.ui.model.resource.ResourceModel", /** @lends sap.ui.model.resource.ResourceModel.prototype */ {
 

package/src/sap/ui/model/type/Boolean.js

@@ -19,7 +19,7 @@ sap.ui.define(["sap/ui/core/Lib", 'sap/ui/model/SimpleType', 'sap/ui/model/Forma
 	 * @extends sap.ui.model.SimpleType
 	 *
 	 * @author SAP SE
-	 * @version 1.130.0
+	 * @version 1.131.0
 	 *
 	 * @public
 	 * @param {object} [oFormatOptions]

package/src/sap/ui/model/type/Currency.js

@@ -34,7 +34,7 @@ sap.ui.define([
 	 * @extends sap.ui.model.CompositeType
 	 *
 	 * @author SAP SE
-	 * @version 1.130.0
+	 * @version 1.131.0
 	 *
 	 * @public
 	 * @param {object} [oFormatOptions]

package/src/sap/ui/model/type/Date.js

@@ -27,7 +27,7 @@ sap.ui.define([
 	 * @extends sap.ui.model.SimpleType
 	 *
 	 * @author SAP SE
-	 * @version 1.130.0
+	 * @version 1.131.0
 	 *
 	 * @public
 	 * @param {object} [oFormatOptions] Formatting options. For a list of all available options, see {@link sap.ui.core.format.DateFormat.getDateInstance DateFormat}.

package/src/sap/ui/model/type/DateInterval.js

@@ -25,7 +25,7 @@ sap.ui.define([
 	 * @extends sap.ui.model.CompositeType
 	 *
 	 * @author SAP SE
-	 * @version 1.130.0
+	 * @version 1.131.0
 	 *
 	 * @alias sap.ui.model.type.DateInterval
 	 * @param {object} [oFormatOptions]

package/src/sap/ui/model/type/DateTime.js

@@ -19,7 +19,7 @@ sap.ui.define(['./Date', 'sap/ui/core/format/DateFormat'],
 	 * @extends sap.ui.model.type.Date
 	 *
 	 * @author SAP SE
-	 * @version 1.130.0
+	 * @version 1.131.0
 	 *
 	 * @public
 	 * @param {object} [oFormatOptions] Formatting options. For a list of all available options, see {@link sap.ui.core.format.DateFormat.getDateTimeInstance DateFormat}.

package/src/sap/ui/model/type/DateTimeInterval.js

@@ -19,7 +19,7 @@ sap.ui.define(['./DateInterval', 'sap/ui/core/format/DateFormat'],
 	 * @extends sap.ui.model.type.DateInterval
 	 *
 	 * @author SAP SE
-	 * @version 1.130.0
+	 * @version 1.131.0
 	 *
 	 * @public
 	 * @param {object} [oFormatOptions] Formatting options. For a list of all available options, see {@link sap.ui.core.format.DateFormat.getDateTimeInstance DateFormat}.

package/src/sap/ui/model/type/FileSize.js

@@ -25,7 +25,7 @@ sap.ui.define([
 	 * @extends sap.ui.model.SimpleType
 	 *
 	 * @author SAP SE
-	 * @version 1.130.0
+	 * @version 1.131.0
 	 *
 	 * @public
 	 * @param {object} [oFormatOptions]

package/src/sap/ui/model/type/Float.js

@@ -26,7 +26,7 @@ sap.ui.define([
 	 * @extends sap.ui.model.SimpleType
 	 *
 	 * @author SAP SE
-	 * @version 1.130.0
+	 * @version 1.131.0
 	 *
 	 * @public
 	 * @param {object} [oFormatOptions]

package/src/sap/ui/model/type/Integer.js

@@ -26,7 +26,7 @@ sap.ui.define([
 	 * @extends sap.ui.model.SimpleType
 	 *
 	 * @author SAP SE
-	 * @version 1.130.0
+	 * @version 1.131.0
 	 *
 	 * @public
 	 * @param {object} [oFormatOptions]

package/src/sap/ui/model/type/String.js

@@ -25,7 +25,7 @@ sap.ui.define([
 	 * @extends sap.ui.model.SimpleType
 	 *
 	 * @author SAP SE
-	 * @version 1.130.0
+	 * @version 1.131.0
 	 *
 	 * @alias sap.ui.model.type.String
 	 * @param {object} [oFormatOptions]

package/src/sap/ui/model/type/Time.js

@@ -19,7 +19,7 @@ sap.ui.define(['./Date', 'sap/ui/core/format/DateFormat'],
 	 * @extends sap.ui.model.type.Date
 	 *
 	 * @author SAP SE
-	 * @version 1.130.0
+	 * @version 1.131.0
 	 *
 	 * @public
 	 * @param {object} [oFormatOptions] Formatting options. For a list of all available options, see {@link sap.ui.core.format.DateFormat.getTimeInstance DateFormat}.

package/src/sap/ui/model/type/TimeInterval.js

@@ -19,7 +19,7 @@ sap.ui.define(['./DateInterval', 'sap/ui/core/format/DateFormat'],
 	 * @extends sap.ui.model.type.DateInterval
 	 *
 	 * @author SAP SE
-	 * @version 1.130.0
+	 * @version 1.131.0
 	 *
 	 * @public
 	 * @param {object} [oFormatOptions] Formatting options. For a list of all available options, see {@link sap.ui.core.format.DateFormat.getTimeInstance DateFormat}.

package/src/sap/ui/model/type/Unit.js

@@ -49,7 +49,7 @@ sap.ui.define([
 	 *
 	 *
 	 * @author SAP SE
-	 * @version 1.130.0
+	 * @version 1.131.0
 	 *
 	 * @public
 	 * @param {object} [oFormatOptions]

package/src/sap/ui/model/xml/XMLModel.js

@@ -47,7 +47,7 @@ sap.ui.define([
 	 * @extends sap.ui.model.ClientModel
 	 *
 	 * @author SAP SE
-	 * @version 1.130.0
+	 * @version 1.131.0
 	 *
 	 * @param {XMLDocument|string} oData
 	 *   Either the URL where to load the XML from or an XML document

package/src/sap/ui/qunit/utils/ControlIterator.js

@@ -53,7 +53,7 @@ sap.ui.define(['sap/ui/core/Core', "sap/ui/VersionInfo", "sap/ui/core/Lib"],
 	 * @namespace
 	 *
 	 * @author SAP SE
-	 * @version 1.130.0
+	 * @version 1.131.0
 	 *
 	 * @public
 	 * @since 1.48.0

package/src/sap/ui/qunit/utils/MemoryLeakCheck.js

@@ -30,7 +30,7 @@ sap.ui.define([ 'sap/ui/core/ElementRegistry', 'sap/ui/core/Control', "sap/ui/qu
 	 * @namespace
 	 *
 	 * @author SAP SE
-	 * @version 1.130.0
+	 * @version 1.131.0
 	 *
 	 * @public
 	 * @since 1.48.0

package/src/sap/ui/test/OpaBuilder.js

@@ -785,7 +785,7 @@ sap.ui.define(
          * Executes the definition on the given or previously defined Opa5 instance.
          *
          * @param {sap.ui.test.Opa5} [oOpaInstance] the Opa5 instance to call {@link sap.ui.test.Opa5#waitFor} on
-         * @returns {sap.ui.test.Opa5.Chain} an object extending a jQuery promise, corresponding to the result of {@link sap.ui.test.Opa5#waitFor}
+         * @returns {sap.ui.test.Opa5} an object extending a jQuery promise, corresponding to the result of {@link sap.ui.test.Opa5#waitFor}
          * @public
          */
         OpaBuilder.prototype.execute = function (oOpaInstance) {

package/src/sap/ui/test/autowaiter/_promiseWaiter.js

@@ -193,6 +193,27 @@ sap.ui.define([
 		}
 	});
 
+	const fnOriginalWithResolvers = OriginalPromise.withResolvers;
+	WrappedPromise.withResolvers = function () {
+		const { promise, resolve, reject, ...rest } = fnOriginalWithResolvers.apply(this, arguments);
+		const mPendingPromise = _trackPromise(""); // withResolvers API does not take any arguments
+		const fnWrappedResolve = function wrappedResolve () {
+			_untrackPromise(mPendingPromise);
+			resolve.apply(this, arguments);
+		};
+		const fnWrappedReject = function wrappedReject() {
+			_untrackPromise(mPendingPromise);
+			reject.apply(this, arguments);
+		};
+
+		return {
+			promise,
+			resolve: fnWrappedResolve,
+			reject: fnWrappedReject,
+			...rest
+		};
+	};
+
 	// overwrite the global Promise object
 	window.Promise = WrappedPromise;
 

package/src/sap/ui/test/generic/TestBase.js

@@ -26,7 +26,7 @@ sap.ui.define([
 	 * @extends sap.ui.base.Object
 	 * @abstract
 	 * @author SAP SE
-	 * @version 1.130.0
+	 * @version 1.131.0
 	 * @since 1.100
 	 */
 	return BaseObject.extend("sap.ui.test.generic.TestBase", {

package/src/sap/ui/test/starter/_utils.js

@@ -32,7 +32,14 @@ sap.ui.define([
 	}
 
 	function getDefaultSuiteName() {
-		var sName = sap.ui.loader._.guessResourceName(location.href);
+		var sName = sap.ui.loader._.guessResourceName(window.location.href);
+
+		// special handling for karma runner: paths starting with /base/test/ should be /base/test-resources/
+		if ( sName == null && window.location.pathname.startsWith("/base/test/") ) {
+			const altPath = window.location.origin + window.location.pathname.replace("/base/test/", "/base/test-resources/");
+			sName = sap.ui.loader._.guessResourceName(altPath);
+		}
+
 		return sName ? sName.replace(/\.html$/, "") : null;
 	}
 

package/src/sap/ui/test/starter/createSuite.js

@@ -134,7 +134,7 @@
 
 		render(sLinkHTML).then(function() {
 			// Note: we use a 0.1 second timer resolution so that the blocking div disappears quickly
-			var count = 10 * (parseInt(utils.getAttribute("data-sap-ui-delay")) || 2) + 9;
+			var count = 10 * (parseInt(utils.getAttribute("data-sap-ui-delay")) || -1) + 9;
 
 			function countDown() {
 				if ( count === 6 ) {