@openui5/sap.ui.core 1.93.3 → 1.96.2

package/src/sap/ui/performance/trace/initTraces.js

@@ -42,7 +42,7 @@ sap.ui.define(["sap/ui/performance/trace/FESR", "sap/base/Log"], function(FESR,
 		// TODO this should be part of a Configuration
 		// *********** Include E2E-Trace Scripts *************
 		if (/sap-ui-xx-e2e-trace=(true|x|X)/.test(location.search)) {
-			sap.ui.requireSync("sap/ui/core/support/trace/E2eTraceLib");
+			sap.ui.require(["sap/ui/core/support/trace/E2eTraceLib"]);
 		}
 	};
 });

package/src/sap/ui/qunit/QUnitUtils.js

@@ -13,7 +13,8 @@
  * @name sap.ui.test
  * @public
  */
-
+// The module ID argument is given because QUnitUtils.js often was included as a script Element in the past.
+// It is now recommended to use it via a module dependency (sap.ui.define).
 sap.ui.define('sap/ui/qunit/QUnitUtils', [
 	'jquery.sap.global',
 	'sap/base/util/ObjectPath',
@@ -78,7 +79,7 @@ sap.ui.define('sap/ui/qunit/QUnitUtils', [
 					var QUnit = window.QUnit;
 					window.QUnit = undefined;
 					// load the blanket instance
-					sap.ui.requireSync("sap/ui/thirdparty/blanket");
+					sap.ui.requireSync("sap/ui/thirdparty/blanket"); // legacy-relevant
 					// restore the QUnit object
 					window.QUnit = QUnit;
 					// trigger blanket to display the coverage report

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

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

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

@@ -6,18 +6,16 @@
 
 /*global QUnit*/
 
-sap.ui.define([ 'jquery.sap.global', 'sap/ui/core/Element', 'sap/ui/core/Control', 'sap/ui/core/Core' /* provides sap.ui.getCore() */ ],
-		function(jQuery, Element, Control) {
+sap.ui.define([ 'sap/ui/core/Element', 'sap/ui/core/Control', 'sap/ui/core/Core' /* provides sap.ui.getCore() */ ],
+		function(Element, Control) {
 	"use strict";
 
-	//TODO: global jquery call found
-	jQuery.sap.require("sap.ui.qunit.qunit-css");
-	//TODO: global jquery call found
-	jQuery.sap.require("sap.ui.thirdparty.qunit");
-	//TODO: global jquery call found
-	jQuery.sap.require("sap.ui.qunit.qunit-junit");
-	//TODO: global jquery call found
-	jQuery.sap.require("sap.ui.qunit.qunit-coverage");
+	if ( typeof QUnit === "undefined" ) {
+		sap.ui.requireSync("sap/ui/qunit/qunit-css"); // legacy-relevant - sync fallback when caller did not load QUnit
+		sap.ui.requireSync("sap/ui/thirdparty/qunit"); // legacy-relevant - sync fallback when caller did not load QUnit
+		sap.ui.requireSync("sap/ui/qunit/qunit-junit"); // legacy-relevant - sync fallback when caller did not load QUnit
+		sap.ui.requireSync("sap/ui/qunit/qunit-coverage"); // legacy-relevant - sync fallback when caller did not load QUnit
+	}
 
 	QUnit.config.reorder = false;   // make sure results are consistent/stable and the "statistics" test in the end is actually run in the end
 
@@ -29,7 +27,7 @@ sap.ui.define([ 'jquery.sap.global', 'sap/ui/core/Element', 'sap/ui/core/Control
 	 * @namespace
 	 *
 	 * @author SAP SE
-	 * @version 1.93.3
+	 * @version 1.96.2
 	 *
 	 * @public
 	 * @since 1.48.0

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

@@ -272,8 +272,12 @@ sap.ui.define([
 		 *   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,
 		 *   PATCH, or POST. A missing URL is ignored.
+		 * @param {boolean} [bStrict]
+		 *   Whether responses are created from the given fixture only, without defaults per method.
+		 * @returns {object}
+		 *   The SinonJS fake server instance
 		 */
-		useFakeServer : function (oSandbox, sBase, mFixture, aRegExps, sServiceUrl) {
+		useFakeServer : function (oSandbox, sBase, mFixture, aRegExps, sServiceUrl, bStrict) {
 			// a map from "method path" incl. service URL to a list of response objects with
 			// properties code, headers, ifMatch and message
 			var aRegexpResponses, mUrlToResponses;
@@ -363,7 +367,8 @@ sap.ui.define([
 
 			// Logs and returns a response for the given error
 			function error(iCode, oRequest, sMessage) {
-				Log.error(oRequest.requestLine, sMessage, "sap.ui.test.TestUtils");
+				Log.error(oRequest.requestLine || oRequest.method + " " + oRequest.url, sMessage,
+					"sap.ui.test.TestUtils");
 
 				return {
 					code : iCode,
@@ -509,7 +514,7 @@ sap.ui.define([
 					if (oMatch.responses.length > 1) {
 						iAlternative = oMatch.responses.indexOf(oResponse);
 					}
-				} else {
+				} else if (!bStrict) {
 					switch (oRequest.method) {
 						case "HEAD":
 							oResponse = {code : 200};
@@ -711,12 +716,14 @@ sap.ui.define([
 					// must return true if the request is NOT processed by the fake server
 					return !bOurs;
 				});
+
+				return oServer;
 			}
 
 			// ensure to always search the fake data in test-resources, remove cache buster token
 			sBase = sap.ui.require.toUrl(sBase)
 				.replace(/(^|\/)resources\/(~[-a-zA-Z0-9_.]*~\/)?/, "$1test-resources/") + "/";
-			setupServer();
+			return setupServer();
 		},
 
 		/**

package/src/sap/ui/test/actions/Drag.js

@@ -18,8 +18,12 @@ sap.ui.define([
 	 *
 	 * The <code>Drag</code> action targets the DOM focus reference of the control.
 	 *
-	 * The <code>Drag</code> action is not supported in IE11!
-	 *
+	 * @param {string}
+	 *            [sId] Optional ID for the new instance; generated automatically if
+	 *            no non-empty ID is given. Note: this can be omitted, no matter
+	 *            whether <code>mSettings</code> are given or not!
+	 * @param {object}
+	 *            [mSettings] Optional object with initial settings for the new instance
 	 * @extends sap.ui.test.actions.Action
 	 * @public
 	 * @name sap.ui.test.actions.Drag

package/src/sap/ui/test/actions/Drop.js

@@ -25,8 +25,12 @@ sap.ui.define([
 	 * You can also set the traget to be the root DOM element of a given aggregation,
 	 * by specifying the aggregation name in the Drop constructor.
 	 *
-	 * * The <code>Drop</code> action is not supported in IE11!
-	 *
+	 * @param {string}
+	 *            [sId] Optional ID for the new instance; generated automatically if
+	 *            no non-empty ID is given. Note: this can be omitted, no matter
+	 *            whether <code>mSettings</code> are given or not!
+	 * @param {object}
+	 *            [mSettings] Optional object with initial settings for the new instance
 	 * @extends sap.ui.test.actions.Action
 	 * @public
 	 * @name sap.ui.test.actions.Drop

package/src/sap/ui/test/actions/EnterText.js

@@ -23,6 +23,12 @@ sap.ui.define([
 	 *     <li><code>sap.m.TextArea</code></li>
 	 * </ul>
 	 *
+	 * @param {string}
+	 *            [sId] Optional ID for the new instance; generated automatically if
+	 *            no non-empty ID is given. Note: this can be omitted, no matter
+	 *            whether <code>mSettings</code> are given or not!
+	 * @param {object}
+	 *            [mSettings] Optional object with initial settings for the new instance
 	 * @extends sap.ui.test.actions.Action
 	 * @public
 	 * @name sap.ui.test.actions.EnterText

package/src/sap/ui/test/actions/Press.js

@@ -27,6 +27,12 @@ sap.ui.define([
 	 * There are some basic controls for which OPA5 has defined <code>Press</code> control
 	 * adapters. For more information, see {@link sap.ui.test.actions.Press.controlAdapters}.
 	 *
+	 * @param {string}
+	 *            [sId] Optional ID for the new instance; generated automatically if
+	 *            no non-empty ID is given. Note: this can be omitted, no matter
+	 *            whether <code>mSettings</code> are given or not!
+	 * @param {object}
+	 *            [mSettings] Optional object with initial settings for the new instance
 	 * @extends sap.ui.test.actions.Action
 	 * @public
 	 * @name sap.ui.test.actions.Press

package/src/sap/ui/test/actions/Scroll.js

@@ -15,6 +15,12 @@ sap.ui.define([
 	 * The control should be scrollable and use a {@link sap.ui.core.delegate.ScrollEnablement} delegate.
 	 * Supported controls include: sap.uxap.ObjectPageLayout, sap.m.Dialog, sap.m.Page, sap.f.DynamicPage
 	 *
+	 * @param {string}
+	 *            [sId] Optional ID for the new instance; generated automatically if
+	 *            no non-empty ID is given. Note: this can be omitted, no matter
+	 *            whether <code>mSettings</code> are given or not!
+	 * @param {object}
+	 *            [mSettings] Optional object with initial settings for the new instance
 	 * @extends sap.ui.test.actions.Action
 	 * @public
 	 * @name sap.ui.test.actions.Scroll

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

@@ -18,7 +18,7 @@ sap.ui.define([
 	var ResourceWaiter = WaiterBase.extend("sap.ui.test.autowaiter._ResourceWaiter", {
 		constructor: function () {
 			WaiterBase.apply(this, arguments);
-			this._oLogger.setLevel("TRACE");
+			//this._oLogger.setLevel("TRACE");
 			this._aResources = [];
 			// observe for new img elements and for img elements with changed src attribute
 			var observer = new window.MutationObserver(function (mutations) {
@@ -71,9 +71,9 @@ sap.ui.define([
 
 			var bHasPendingResources = aPendingResources.length > 0;
 			if (bHasPendingResources) {
-				this._oHasPendingLogger.debug("There are " + aPendingResources.length + " resources still loading");
+				this._oHasPendingLogger.debug("There are " + aPendingResources.length + " images still loading");
 				aPendingResources.forEach(function (mResource) {
-					this._oHasPendingLogger.debug("Pending resource: " + mResource.src);
+					this._oHasPendingLogger.debug("Pending image: " + mResource.src);
 				}.bind(this));
 			}
 			return bHasPendingResources;
@@ -93,7 +93,7 @@ sap.ui.define([
 					element: oElement
 				};
 				this._aResources.push(mNewResource);
-				this._oLogger.trace("Image with src '" + oElement.src + "' is tracked");
+				this._oLogger.trace("Image with src '" + oElement.src + "' is pending");
 
 				oElement.addEventListener("load", function() {
 					mNewResource.state = STATE.LOADED;

package/src/sap/ui/test/launchers/componentLauncher.js

@@ -31,10 +31,6 @@ sap.ui.define([
 				throw new Error("sap.ui.test.launchers.componentLauncher: Start was called twice without teardown. Only one component can be started at a time.");
 			}
 
-			if ( mComponentConfig.manifest === undefined ) {
-				mComponentConfig.manifest = false;
-			}
-
 			var oPromise = Component.create(mComponentConfig);
 
 			_loadingStarted = true;

package/src/sap/ui/test/matchers/I18NText.js

@@ -13,7 +13,7 @@ sap.ui.define(['sap/ui/test/matchers/Matcher', "sap/base/strings/capitalize"], f
 	 * The matcher automatically:
 	 * <ul>
 	 *     <li>
-	 *         retrieves the text from the assigned 'i18n' model (name can be changed)
+	 *         retrieves the text from the assigned 'i18n' model (name can be changed) or library resource bundle
 	 *     </li>
 	 *     <li>
 	 *         checks that the I18N key does actually exist in the file
@@ -34,6 +34,9 @@ sap.ui.define(['sap/ui/test/matchers/Matcher', "sap/base/strings/capitalize"], f
 	 * }
 	 * </code></pre>
 	 *
+	 * As of version 1.95 if the <code>useLibraryBundle</code> flag is set to <code>true</code>, the library resource bundle
+	 * of the control is used to resolve the i18n key.
+	 *
 	 * @extends sap.ui.test.matchers.Matcher
 	 * @param {object} [mSettings] optional map/JSON-object with initial settings for the new I18NText
 	 * @public
@@ -70,6 +73,12 @@ sap.ui.define(['sap/ui/test/matchers/Matcher', "sap/base/strings/capitalize"], f
 				modelName: {
 					type: "string",
 					defaultValue: "i18n"
+				},
+				/**
+				 * The boolean flag to indicate whether to utiliize the library bundle of the control
+				 */
+				useLibraryBundle: {
+					type: "boolean"
 				}
 			}
 		},
@@ -88,6 +97,7 @@ sap.ui.define(['sap/ui/test/matchers/Matcher', "sap/base/strings/capitalize"], f
 				aParameters = this.getParameters(),
 				sModelName = this.getModelName(),
 				oModel = oControl.getModel(sModelName),
+				bUseLibraryBundle = this.getUseLibraryBundle(),
 				fnProperty = oControl["get" + capitalize(sPropertyName, 0)];
 
 			// check model existence
@@ -104,16 +114,24 @@ sap.ui.define(['sap/ui/test/matchers/Matcher', "sap/base/strings/capitalize"], f
 
 			// check resource bundle
 			var oAppWindow = this._getApplicationWindow();
-			var oBundle = oModel.getResourceBundle();
-			if (oBundle instanceof oAppWindow.Promise) {
-				if (oModel._oResourceBundle instanceof oAppWindow.Object && oModel._oResourceBundle.getText) {
-					// we access the loaded bundle from the internal variable of the resource model
-					// ... instead of using the asynchronous promises which is no option for a synchronous matcher
-					// !!! we have a qunit in place that ensures this internal implementation of the ResourceModel
-					oBundle = oModel._oResourceBundle;
-				} else {
-					this._oLogger.debug("The model '" + sModelName + "' of '" + oControl + "' is in async mode and not loaded yet");
-					return false;
+			var oBundle;
+			if (bUseLibraryBundle) {
+				var sLibraryName = oControl.getMetadata().getLibraryName();
+
+				oBundle = sap.ui.getCore().getLibraryResourceBundle(sLibraryName);
+			} else {
+				oBundle = oModel.getResourceBundle();
+
+				if (oBundle instanceof oAppWindow.Promise) {
+					if (oModel._oResourceBundle instanceof oAppWindow.Object && oModel._oResourceBundle.getText) {
+						// we access the loaded bundle from the internal variable of the resource model
+						// ... instead of using the asynchronous promises which is no option for a synchronous matcher
+						// !!! we have a qunit in place that ensures this internal implementation of the ResourceModel
+						oBundle = oModel._oResourceBundle;
+					} else {
+						this._oLogger.debug("The model '" + sModelName + "' of '" + oControl + "' is in async mode and not loaded yet");
+						return false;
+					}
 				}
 			}
 

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

@@ -16,6 +16,11 @@ sap.ui.define([
 	QUnitPause.setupAfterQUnit();
 
 	QUnit.begin(function (oDetails) {
+		// add ui5 version in the user agent string bar
+		if (sap && sap.ui && jQueryDOM('#qunit-userAgent').length > 0) {
+			jQueryDOM('#qunit-userAgent')[0].innerText += "; UI5: " + sap.ui.version;
+		}
+
 		Opa._usageReport.begin({uri: new URI().toString(), totalTests: oDetails.totalTests});
 	});
 

package/src/sap/ui/thirdparty/crossroads.js

@@ -553,14 +553,16 @@ var factory = function (signals) {
                 'RQ' : {
                     //required query string - everything in between `{? }`
                     rgx : /\{\?([^}]+)\}/g,
-                    //everything from `?` till `#` or end of string
-                    res : '\\?([^#]+)'
+                    // ##### BEGIN: MODIFIED BY SAP
+                    //everything from `?` till end of string
+                    res : '\\?(.+)'
                 },
                 'OQ' : {
                     //optional query string - everything in between `:? :`
                     rgx : /:\?([^:]+):/g,
-                    //everything from `?` till `#` or end of string
-                    res : '(?:\\?([^#]*))?'
+                    //everything from `?` till end of string
+                    res : '(?:\\?(.*))?'
+                    // ##### END: MODIFIED BY SAP
                 },
                 'OR' : {
                     //optional rest - everything in between `: *:`