@openui5/sap.ui.core 1.139.0 → 1.140.0

package/src/sap/ui/model/odata/v4/ODataParentBinding.js

@@ -205,12 +205,15 @@ sap.ui.define([
 			return (bIsProperty || !bInsideExpand
 				|| Object.keys(mAggregatedQueryOptions).every(function (sName) {
 					return sName in mQueryOptions0 || sName === "$count" || sName === "$expand"
-						|| sName === "$select";
+						|| sName === "$select" || sName === "$top";
 				}))
 				// merge $count, $expand and $select; check that all others equal the aggregate
 				&& Object.keys(mQueryOptions0).every(function (sName) {
 					switch (sName) {
 						case "$count":
+							if (mQueryOptions0.$top === 0 && mAggregatedQueryOptions.$select) {
+								return true; // see below: @see mCountQueryOptions => ignore
+							}
 							if (mQueryOptions0.$count) {
 								mAggregatedQueryOptions.$count = true;
 							}
@@ -220,7 +223,22 @@ sap.ui.define([
 							return Object.keys(mQueryOptions0.$expand).every(mergeExpandPath);
 						case "$select":
 							mAggregatedQueryOptions.$select ??= [];
+							if (mAggregatedQueryOptions.$top === 0) {
+								// Note: @see mCountQueryOptions => drop
+								// (w/o $top, all data is ready anyway, no $count needed)
+								delete mAggregatedQueryOptions.$count;
+								// ($select needs data and thus contradicts $top : 0)
+								delete mAggregatedQueryOptions.$top;
+							}
 							return mQueryOptions0.$select.every(mergeSelectPath);
+						case "$top":
+							if (mQueryOptions0.$top !== 0 || !mQueryOptions0.$count) {
+								return false; // not mCountQueryOptions => unsupported
+							}
+							if (!mAggregatedQueryOptions.$select) {
+								mAggregatedQueryOptions.$top = 0;
+							} // else: see above: @see mCountQueryOptions => ignore
+							return true;
 						default:
 							if (bAdd) {
 								mAggregatedQueryOptions[sName] = mQueryOptions0[sName];
@@ -848,6 +866,7 @@ sap.ui.define([
 		];
 		oCanUseCachePromise = SyncPromise.all(aPromises).then(function (aResult) {
 			var mChildQueryOptions = aResult[2] || {},
+				mCountQueryOptions,
 				mWrappedChildQueryOptions,
 				mLocalQueryOptions = aResult[0],
 				oProperty = aResult[1],
@@ -871,7 +890,14 @@ sap.ui.define([
 					mChildQueryOptions, bIsProperty);
 			}
 
-			if (bDependsOnOperation || sReducedChildMetaPath === "$count"
+			if (oProperty?.["@$ui5.$count"]
+					&& oContext !== oContext.getBinding().getHeaderContext?.()) {
+				mCountQueryOptions = {
+					$expand : {
+						[sChildPath.slice(0, -7)] : {$count : true, $top : 0}
+					}
+				};
+			} else if (bDependsOnOperation || sReducedChildMetaPath === "$count"
 					|| sReducedChildMetaPath.endsWith("/$count")
 					|| sReducedChildMetaPath === "$selectionCount") {
 				return sReducedPath;
@@ -892,9 +918,10 @@ sap.ui.define([
 			if (sReducedChildMetaPath === ""
 				|| oProperty
 				&& (oProperty.$kind === "Property" || oProperty.$kind === "NavigationProperty")) {
-				mWrappedChildQueryOptions = _Helper.wrapChildQueryOptions(sBaseMetaPath,
-					sReducedChildMetaPath, mChildQueryOptions,
-					that.oModel.oInterface.fetchMetadata);
+				mWrappedChildQueryOptions = mCountQueryOptions
+					?? _Helper.wrapChildQueryOptions(sBaseMetaPath,
+						sReducedChildMetaPath, mChildQueryOptions,
+						that.oModel.oInterface.fetchMetadata);
 				if (mWrappedChildQueryOptions) {
 					return that.aggregateQueryOptions(mWrappedChildQueryOptions, sBaseMetaPath,
 							bCacheImmutable, bIsProperty)

package/src/sap/ui/model/odata/v4/ODataPropertyBinding.js

@@ -42,7 +42,7 @@ sap.ui.define([
 		 * @mixes sap.ui.model.odata.v4.ODataBinding
 		 * @public
 		 * @since 1.37.0
-		 * @version 1.139.0
+		 * @version 1.140.0
 		 * @borrows sap.ui.model.odata.v4.ODataBinding#getGroupId as #getGroupId
 		 * @borrows sap.ui.model.odata.v4.ODataBinding#getRootBinding as #getRootBinding
 		 * @borrows sap.ui.model.odata.v4.ODataBinding#getUpdateGroupId as #getUpdateGroupId

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

@@ -1041,6 +1041,13 @@ sap.ui.define([
 
 		if (sPath === "$count") {
 			if (this.oCountPromise) {
+				if (this.oAggregation.hierarchyQualifier) {
+					// "$count" cannot be used as change listener path because e.g. #_delete calls
+					// indirectly _Helper.addCount with this.mChangeListeners to update the count of
+					// the root nodes. This count must not be propagated to the listeners. So use a
+					// name similar to "$count" which never conflicts with any other valid path.
+					this.registerChangeListener("./$count", oListener);
+				}
 				return this.oCountPromise;
 			}
 			if (this.oAggregation.hierarchyQualifier || this.oAggregation.groupLevels.length) {
@@ -1940,7 +1947,10 @@ sap.ui.define([
 				+ this.oRequestor.buildQueryString(/*sMetaPath*/null, mQueryOptions);
 
 			return this.oRequestor.request("GET", sResourcePath, oGroupLock.getUnlockedCopy())
-				.then(fnResolve) // Note: $count is already of type number here
+				.then((iCount) => { // Note: iCount is already of type number here
+					fnResolve(iCount);
+					_Helper.fireChange(this.mChangeListeners, "./$count", iCount);
+				})
 				.catch((oError) => {
 					this.oCountPromise.$restore();
 					throw oError;

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

@@ -1522,19 +1522,17 @@ sap.ui.define([
 				mQueryOptions.$select.push(sMessagesPath);
 				bKeepReportedMessagesPath = true;
 			}
-			// drop collection related system query options
-			delete mQueryOptions.$apply;
-			delete mQueryOptions.$count;
-			delete mQueryOptions.$filter;
-			delete mQueryOptions.$orderby;
-			delete mQueryOptions.$search;
-			sReadUrl += that.oRequestor.buildQueryString(that.sMetaPath, mQueryOptions, false,
-				that.bSortExpandSelect);
+			const mMergeableQueryOptions = _Helper.extractMergeableQueryOptions(mQueryOptions);
+			mMergeableQueryOptions.$$sortIfMerged = true;
+			sReadUrl += that.oRequestor.buildQueryString(that.sMetaPath, mQueryOptions,
+				// drop system query options to allow merging with late property requests
+				/*bDropSystemQueryOptions*/true, that.bSortExpandSelect);
 
 			that.bSentRequest = true;
 			return SyncPromise.all([
 				that.oRequestor
-					.request("GET", sReadUrl, oGroupLock, undefined, undefined, fnDataRequested),
+					.request("GET", sReadUrl, oGroupLock, undefined, undefined, fnDataRequested,
+						undefined, undefined, undefined, undefined, mMergeableQueryOptions),
 				that.fetchTypes()
 			]).then(function (aResult) {
 				var oElement = aResult[0];

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

@@ -303,7 +303,8 @@ sap.ui.define([
 		/**
 		 * Builds a query string from the given parameter map. Takes care of encoding, but ensures
 		 * that the characters "$", "(", ")", ";" and "=" are not encoded, so that OData queries
-		 * remain readable.
+		 * remain readable. A parameter starting with "$$" is meant to be internal and does not
+		 * become part of the query string.
 		 *
 		 * ';' is not encoded although RFC 1866 encourages its usage as separator between query
 		 * parameters. However OData Version 4.0 Part 2 specifies that only '&' is a valid
@@ -331,7 +332,7 @@ sap.ui.define([
 				return "";
 			}
 
-			aKeys = Object.keys(mParameters);
+			aKeys = Object.keys(mParameters).filter((sKey) => !sKey.startsWith("$$"));
 			if (aKeys.length === 0) {
 				return "";
 			}
@@ -1018,21 +1019,20 @@ sap.ui.define([
 		 * them as a new map while replacing their value with "~" in the old map.
 		 *
 		 * @param {object} mQueryOptions - The original query options to be MODIFIED
-		 * @returns {object} The extracted query options
+		 * @returns {object} The extracted query options in the same order
 		 *
 		 * @public
 		 */
 		extractMergeableQueryOptions : function (mQueryOptions) {
 			var mExtractedQueryOptions = {};
 
-			if ("$expand" in mQueryOptions) {
-				mExtractedQueryOptions.$expand = mQueryOptions.$expand;
-				mQueryOptions.$expand = "~";
-			}
-			if ("$select" in mQueryOptions) {
-				mExtractedQueryOptions.$select = mQueryOptions.$select;
-				mQueryOptions.$select = "~";
-			}
+			// ensure to keep the order of the query options
+			Object.keys(mQueryOptions).forEach(function (sKey) {
+				if (sKey === "$expand" || sKey === "$select") {
+					mExtractedQueryOptions[sKey] = mQueryOptions[sKey];
+					mQueryOptions[sKey] = "~";
+				}
+			});
 
 			return mExtractedQueryOptions;
 		},
@@ -2222,7 +2222,7 @@ sap.ui.define([
 			// The safe integers consist of all integers from -(2^53 - 1) inclusive to 2^53 - 1
 			// inclusive.
 			// 2^53 - 1 = 9007199254740991
-			return iNumber <= 9007199254740991 && Math.floor(iNumber) === iNumber;
+			return iNumber <= Number.MAX_SAFE_INTEGER && Math.floor(iNumber) === iNumber;
 		},
 
 		/**

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

@@ -192,11 +192,14 @@ sap.ui.define([
 	 * @param {string} sResourcePath The resource path with possible query options and placeholders
 	 * @param {string} sMetaPath The absolute meta path matching the resource path
 	 * @param {object} mQueryOptions Query options to add to the resource path
+	 * @param {boolean} [bSortSystemQueryOptions]
+	 *   Whether system query options are sorted alphabetically and moved to the query string's end
 	 * @returns {string} The resource path with the query options
 	 *
 	 * @private
 	 */
-	_Requestor.prototype.addQueryString = function (sResourcePath, sMetaPath, mQueryOptions) {
+	_Requestor.prototype.addQueryString = function (sResourcePath, sMetaPath, mQueryOptions,
+			bSortSystemQueryOptions) {
 		var sQueryString;
 
 		mQueryOptions = this.convertQueryOptions(sMetaPath, mQueryOptions, false, true);
@@ -209,7 +212,7 @@ sap.ui.define([
 				return _Helper.encodePair(sOption, sValue);
 			});
 
-		sQueryString = _Helper.buildQuery(mQueryOptions);
+		sQueryString = _Helper.buildQuery(mQueryOptions, bSortSystemQueryOptions);
 		if (!sQueryString) {
 			return sResourcePath;
 		}
@@ -1285,6 +1288,9 @@ sap.ui.define([
 					if (oCandidate.$mergeRequests && oRequest.$mergeRequests) {
 						oCandidate.$mergeRequests(oRequest.$mergeRequests());
 					}
+					oCandidate.$sortSystemQueryOptions
+						||= oCandidate.$queryOptions.$$sortIfMerged
+							|| oRequest.$queryOptions.$$sortIfMerged;
 
 					return true;
 				}
@@ -1302,10 +1308,12 @@ sap.ui.define([
 			var mQueryOptions = oRequest.$queryOptions;
 
 			if (mQueryOptions) {
-				if (mQueryOptions.$expand && !mQueryOptions.$select.length) {
+				// if there was no $select, don't introduce one
+				if (mQueryOptions.$expand && mQueryOptions.$select?.length === 0) {
 					mQueryOptions.$select = Object.keys(mQueryOptions.$expand).sort().slice(0, 1);
 				}
-				oRequest.url = that.addQueryString(oRequest.url, oRequest.$metaPath, mQueryOptions);
+				oRequest.url = that.addQueryString(oRequest.url, oRequest.$metaPath, mQueryOptions,
+					oRequest.$sortSystemQueryOptions);
 			}
 		});
 		aResultingRequests.iChangeSet = aRequests.iChangeSet;
@@ -1853,10 +1861,12 @@ sap.ui.define([
 	 *   contain $expand
 	 * @param {any} [vOwner]
 	 *   An additional precondition for the merging of GET requests: the owner must be identical.
+	 *   This is probably relevant when using parameter <code>fnMergeRequests</code> to ensure both
+	 *   functions work well together.
 	 * @param {function(string[]):string[]} [fnMergeRequests]
 	 *   Function which is called during merging of GET or PATCH requests. If a merged request has a
-	 *   function given, this function will be called and its return value is
-	 *   given to the one remaining request's function as a parameter.
+	 *   function given, this function will be called and its return value is given to the one
+	 *   remaining request's function as a parameter. See also <code>vOwner</code>.
 	 * @returns {Promise}
 	 *   A promise on the outcome of the HTTP request; it will be rejected with an error having the
 	 *   property <code>canceled = true</code> instead of sending a request if

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

@@ -227,7 +227,7 @@ sap.ui.define([
 	 *
 	 * @extends sap.ui.model.Model
 	 * @public
-	 * @version 1.139.0
+	 * @version 1.140.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.139.0
+	 * @version 1.140.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.139.0
+	 * @version 1.140.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.139.0
+	 * @version 1.140.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.139.0
+	 * @version 1.140.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.139.0
+	 * @version 1.140.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.139.0
+	 * @version 1.140.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.139.0
+	 * @version 1.140.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.139.0
+	 * @version 1.140.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.139.0
+	 * @version 1.140.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.139.0
+	 * @version 1.140.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.139.0
+	 * @version 1.140.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.139.0
+	 * @version 1.140.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.139.0
+	 * @version 1.140.0
 	 *
 	 * @public
 	 * @param {object} [oFormatOptions]
@@ -61,9 +61,16 @@ sap.ui.define([
 	 *   {@link sap.ui.model.Binding#supportsIgnoreMessages}, and the corresponding binding
 	 *   parameter is not set manually.
 	 * @param {object} [oFormatOptions.decimals]
-	 *   The number of decimals to be used for formatting the number part of the unit; defaults to <b>3</b> if none of
-	 *   the format options <code>maxFractionDigits</code>, <code>minFractionDigits</code> or <code>decimals</code>
-	 *   is given
+	 *   The number of decimals to be used for formatting the numerical value of the unit composite type; if none of the
+	 *   format options <code>maxFractionDigits</code>, <code>minFractionDigits</code> or <code>decimals</code> are
+	 *   given, the following defaults apply:
+	 *   <ul>
+	 *      <li> <b>0</b> if the numerical value is of an OData integer type, i.e. {@link sap.ui.model.odata.type.Int}
+	 *        or {@link sap.ui.model.odata.type.Int64} </li>
+	 *      <li> the <b>scale constraint of the numerical value's type</b> if this type is
+	 *        {@link sap.ui.model.odata.type.Decimal} and the scale is not "variable" </li>
+	 *      <li> <b>3</b> otherwise </li>
+	 *   </ul>
 	 * @param {boolean} [oFormatOptions.preserveDecimals=true]
 	 *   By default decimals are preserved, unless <code>oFormatOptions.style</code> is given as
 	 *   "short" or "long"; since 1.89.0
@@ -324,9 +331,16 @@ sap.ui.define([
 	 * @since 1.120.0
 	 */
 	Unit.prototype.processPartTypes = function (aPartTypes) {
+		this.iScale = undefined; // type of quantity binding part may be changed => reset scale
 		const oQuantityType = aPartTypes[0];
+		if (oQuantityType?.isA(["sap.ui.model.odata.type.Int", "sap.ui.model.odata.type.Int64"])) {
+			this.iScale = 0;
+		}
 		if (oQuantityType?.isA("sap.ui.model.odata.type.Decimal")) {
-			this.iScale = oQuantityType.oConstraints?.scale || 0;
+			const iScale = oQuantityType.oConstraints?.scale;
+			if (iScale !== Infinity) { // like in Decimal type, do not propagate scale "variable" to formatter
+				this.iScale = iScale || 0;
+			}
 		}
 	};
 

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.139.0
+	 * @version 1.140.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.139.0
+	 * @version 1.140.0
 	 *
 	 * @public
 	 * @since 1.48.0
@@ -63,7 +63,6 @@ sap.ui.define(['sap/ui/core/Core', "sap/ui/VersionInfo", "sap/ui/core/Lib"],
 
 	var aControlsThatCannotBeRenderedGenerically = [
 		"sap.chart.Chart",
-		"sap.m.ColumnHeaderPopover",
 		"sap.m.FacetFilterItem",
 		"sap.m.internal.NumericInput",
 		"sap.m.IconTabBarSelectList",

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.139.0
+	 * @version 1.140.0
 	 *
 	 * @public
 	 * @since 1.48.0

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

@@ -19,6 +19,7 @@ sap.ui.define([
 
 	var rBatch = /\/\$batch($|\?)/,
 		rContentId = /(?:^|\r\n)Content-Id\s*:\s*(\S+)/i,
+		rContentIdReference = / \$([^ ?\/]+)/,
 		rEndsWithJSON = /\.json$/i,
 		rEndsWithXML = /\.xml$/i,
 		rHeaderLine = /^(.*)?:\s*(.*)$/,
@@ -445,13 +446,14 @@ sap.ui.define([
 		 *       extension unless specified. This has precedence over <code>message</code>.
 		 *   </ul>
 		 * @param {object[]} [aRegExps]
-		 *    An array containing regular expressions in the regExp property and the corresponding
-		 *    response(s) objects in the response property. If no match for a request was found in
-		 *    the normal fixture, the regular expressions are checked. The response object looks
-		 *    exactly the same as in the fixture and may additionally contain a method
-		 *    <code>buildResponse(aMatch, oResponse, oRequest)</code> which gets passed the match
-		 *    object, the response, and the request in order to allow modification of the response
-		 *   before sending.
+		 *   An array containing regular expressions in the regExp property and the corresponding
+		 *   response(s) objects in the response property. If no match for a request was found in
+		 *   the normal fixture, the regular expressions are checked. The response object looks
+		 *   exactly the same as in the fixture and may additionally contain a method
+		 *   <code>buildResponse(aMatch, oResponse, oRequest, sReferencedMessage)</code> which gets
+		 *   passed the match object, the response, the request, and optionally the referenced
+		 *   response message in case of Content-ID referencing in order to allow modification of
+		 *   the response before sending.
 		 * @param {string} [sServiceUrl]
 		 *   The service URL which determines a prefix for all requests the fake server responds to;
 		 *   it responds with an error for requests not given in the fixture, except DELETE, MERGE,
@@ -689,9 +691,11 @@ sap.ui.define([
 			 * @param {boolean} [bTry]
 			 *   Whether to do nothing and return <code>undefined</code> if no fixture matches; also
 			 *   prevents defaulting for non-GET requests
+			 * @param {object} [mContentId2Response]
+			 *   A map which refers a content ID to a response message while processing a batch
 			 * @returns {object|undefined} The response object or <code>undefined</code>
 			 */
-			function getResponseFromFixture(oRequest, sContentId, bTry) {
+			function getResponseFromFixture(oRequest, sContentId, bTry, mContentId2Response) {
 				var iAlternative,
 					oMatch = getMatchingResponse(oRequest.method, oRequest.url),
 					oResponse,
@@ -708,7 +712,13 @@ sap.ui.define([
 					if (typeof oResponse.buildResponse === "function") {
 						oResponse = merge({}, oResponse);
 						try {
-							oResponse.buildResponse(oMatch.match, oResponse, oRequest);
+							const aMatches = rContentIdReference.exec(oRequest.requestLine);
+							let sReferencedMessage;
+							if (aMatches) {
+								sReferencedMessage = mContentId2Response[aMatches[1]];
+							}
+							oResponse.buildResponse(oMatch.match, oResponse, oRequest,
+								sReferencedMessage);
 						} catch (oError) {
 							oResponse = error(500, oRequest, oError);
 						}
@@ -758,6 +768,9 @@ sap.ui.define([
 				oResponse.headers = jQuery.extend({}, getODataHeaders(oRequest), oResponse.headers);
 				if (sContentId && oResponse.code < 300) {
 					oResponse.contentId = sContentId;
+					if (mContentId2Response) {
+						mContentId2Response[sContentId] = oResponse.message;
+					}
 				}
 				return oResponse;
 			}
@@ -767,14 +780,13 @@ sap.ui.define([
 			 *
 			 * @param {string} sServiceBase The service base URL
 			 * @param {string} sBody The body
+			 * @param {object} [oBatch] allows to keep state while processing a batch
 			 * @returns {object} An object with the properties boundary and parts
 			 */
-			function multipart(sServiceBase, sBody) {
-				var sBoundary;
-
+			function multipart(sServiceBase, sBody, oBatch = {}) {
 				// skip preamble consisting of whitespace (as sent by datajs)
 				sBody = sBody.replace(/^\s+/, "");
-				sBoundary = firstLine(sBody);
+				const sBoundary = firstLine(sBody);
 				return {
 					boundary : firstLine(sBody).slice(2),
 					parts : sBody.split(sBoundary).slice(1, -1).map(function (sRequestPart) {
@@ -784,7 +796,7 @@ sap.ui.define([
 						sFirstLine = firstLine(sRequestPart);
 						if (rMultipartHeader.test(sFirstLine)) {
 							oMultipart = multipart(sServiceBase,
-								sRequestPart.slice(sFirstLine.length + 4));
+								sRequestPart.slice(sFirstLine.length + 4), oBatch);
 							aFailures = oMultipart.parts.filter(function (oPart) {
 								return oPart.code >= 300;
 							});
@@ -793,7 +805,7 @@ sap.ui.define([
 						iRequestStart = sRequestPart.indexOf("\r\n\r\n") + 4;
 						oRequest = parseRequest(sServiceBase, sRequestPart.slice(iRequestStart));
 						aMatch = rContentId.exec(sRequestPart.slice(0, iRequestStart));
-						return getResponseFromFixture(oRequest, aMatch && aMatch[1]);
+						return getResponseFromFixture(oRequest, aMatch && aMatch[1], false, oBatch);
 					})
 				};
 			}

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.139.0
+	 * @version 1.140.0
 	 * @since 1.100
 	 */
 	return BaseObject.extend("sap.ui.test.generic.TestBase", {

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

@@ -150,13 +150,13 @@ sap.ui.define([
 		 * @param {sap.ui.test.generic.GenericTestCollection.ObjectCapabilities} oObjectCapabilities The capabilities of the corresponding control
 		 */
 		 fillControlProperties: function(oControl, oObjectCapabilities) {
-			var mProperties = oControl.getMetadata().getAllProperties(),
-				mPropertyCapabilities = oObjectCapabilities && oObjectCapabilities.properties || {},
-				vValueToSet = "test"; // just try a string as default, with some frequently happening exceptions
+			const mProperties = oControl.getMetadata().getAllProperties();
+			const mPropertyCapabilities = oObjectCapabilities && oObjectCapabilities.properties || {};
+			let vValueToSet = "test"; // just try a string as default, with some frequently happening exceptions
 
-			for (var sPropertyName in mProperties) {
-				var oProperty = mProperties[sPropertyName],
-					sPropertyCapability;
+			for (const sPropertyName in mProperties) {
+				const oProperty = mProperties[sPropertyName];
+				let sPropertyCapability;
 
 				// Check if property should be skipped because of known issues or if a specific value should be used for setting the property
 				if (mPropertyCapabilities[sPropertyName]) {

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

@@ -193,6 +193,9 @@ sap.ui.define([
 		}
 	}
 
+	opaTest.skip = opaSkip;
+	opaTest.todo = QUnit.todo ? opaTodo : opaTest;
+
 	// configure QUnit, modify test callback to include OPA start, and enqueue the test with QUnit
 	function callQUnit(sQUnitFn, aArgs, fnDone, fnFail) {
 		configQUnit();

package/src/sap/ui/thirdparty/qunit-2.js

@@ -2739,7 +2739,10 @@
   			started: 0,
   			updateRate: 1000,
   			autostart: true,
-  			filter: ""
+  			filter: "",
+			//### BEGIN MODIFIED BY SAP
+			testTimeout: 30000
+			//### END MODIFIED BY SAP
   		}, true);
 
   		if (!runStarted) {