@openui5/sap.ui.core 1.119.1 → 1.120.1

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

@@ -29,6 +29,7 @@ sap.ui.define([
 
 	var _BrowserLogCollector = UI5Object.extend("sap.ui.test._BrowserLogCollector", {
 		constructor: function () {
+			UI5Object.call(this);
 			this._console = {};
 			this._logs = [];
 		},

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

@@ -9,12 +9,13 @@ sap.ui.define([
 	"sap/base/util/isEmptyObject",
 	"sap/ui/base/Object",
 	"sap/ui/core/Element",
+	"sap/ui/core/StaticArea",
 	"sap/ui/test/OpaPlugin",
 	"sap/ui/test/actions/Press",
 	"sap/ui/test/_LogCollector",
 	"sap/ui/test/_OpaLogger",
 	"sap/ui/thirdparty/jquery"
-], function(extend, isEmptyObject, UI5Object, UI5Element, OpaPlugin, Press, _LogCollector, _OpaLogger, $) {
+], function(extend, isEmptyObject, UI5Object, UI5Element, StaticArea, OpaPlugin, Press, _LogCollector, _OpaLogger, $) {
 	"use strict";
 
 	var oPlugin = new OpaPlugin();
@@ -183,7 +184,7 @@ sap.ui.define([
 	 * @private
 	 */
 	_ControlFinder._isControlInStaticArea = function (oControl) {
-		var oStaticArea = sap.ui.getCore().getStaticAreaRef();
+		var oStaticArea = StaticArea.getDomRef();
 		return $.contains(oStaticArea, oControl.getDomRef());
 	};
 

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

@@ -28,6 +28,7 @@ sap.ui.define([
 	*/
 	var _LogCollector = UI5Object.extend("sap.ui.test._LogCollector", {
 		constructor: function (sMessagePattern) {
+			UI5Object.call(this);
 			this._aLogs = [];
 			if (sMessagePattern) {
 				this._oListener = getCustomListener(sMessagePattern, this._aLogs);

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

@@ -6,124 +6,125 @@
 
 // private
 sap.ui.define([
-    "sap/ui/base/Object",
-    "sap/ui/test/_OpaLogger",
-    "sap/ui/thirdparty/jquery"
+	"sap/ui/base/Object",
+	"sap/ui/test/_OpaLogger",
+	"sap/ui/thirdparty/jquery"
 ], function(Ui5Object, _OpaLogger, jQuery) {
-    "use strict";
+	"use strict";
 
-    var DEFAULT_URL = "http://localhost:8090";
-    var oLogger = _OpaLogger.getLogger("sap.ui.test._UsageReport");
+	var DEFAULT_URL = "http://localhost:8090";
+	var oLogger = _OpaLogger.getLogger("sap.ui.test._UsageReport");
 
-    var _UsageReport = Ui5Object.extend("sap.ui.test._UsageReport", {
-        constructor: function (oConfig) {
-            this.enabled = oConfig && oConfig.enableUsageReport;
-            this.baseUrl = (oConfig && oConfig.usageReportUrl || DEFAULT_URL) + "/api/opa/suites/";
-            if (this.enabled) {
-                oLogger.info("Enabled OPA usage report");
-            }
+	var _UsageReport = Ui5Object.extend("sap.ui.test._UsageReport", {
+		constructor: function (oConfig) {
+			Ui5Object.call(this);
+			this.enabled = oConfig && oConfig.enableUsageReport;
+			this.baseUrl = (oConfig && oConfig.usageReportUrl || DEFAULT_URL) + "/api/opa/suites/";
+			if (this.enabled) {
+				oLogger.info("Enabled OPA usage report");
+			}
 
-            // separate report enablement from the report logic: conditionally send XHRs if reporting is explicitly enabled
-            var oPrototype = _UsageReport.prototype;
-            Object.keys(oPrototype).forEach(function (sKey) {
-                var bIsSpecialFunction = ["constructor", "getMetadata"].indexOf(sKey) > -1;
-                if (oPrototype.hasOwnProperty(sKey) && typeof oPrototype[sKey] === "function" && !bIsSpecialFunction) {
-                    var fnOriginal = oPrototype[sKey];
-                    oPrototype[sKey] = function () {
-                        if (this.enabled) {
-                            return fnOriginal.apply(this, arguments);
-                        }
-                    };
-                }
-            });
-        },
-        begin: function (oDetails) {
-            this._beginSuitePromise = postJson(this.baseUrl + "begin", oDetails)
-                .done(function (data) {
-                    this._id = data.id;
-                    oLogger.debug("Begin report with ID " + data.id);
-                }.bind(this))
-                .fail(function (err) {
-                    oLogger.debug("Failed to begin report. Error: " + JSON.stringify(err));
-                });
-        },
-        moduleStart: function (oDetails) {
-            this._moduleUpdate(oDetails);
-        },
-        testStart: function () {
-            this._isOpaEmpty = false;
-            this._QUnitTimeoutDetails = null;
-        },
-        testDone: function (oDetails) {
-            // the details available depend on whether a QUnit timeout occurred:
-            // - no QUnit timeout: OPA queue is emptied and then the test finishes (call opaEmpty, then testDone)
-            // - with QUnit timeout: the test finishes, then the OPA queue is stopped and an error message is formed (call testDone, then opaEmpty)
-            // details for tests without an OPA queue will NOT be reported
-            if (this._isOpaEmpty) {
-                this._reportOpaTest(oDetails);
-                this._isOpaEmpty = false;
-            } else {
-                this._QUnitTimeoutDetails = oDetails;
-            }
-        },
-        opaEmpty: function (oOptions) {
-            this._isOpaEmpty = true;
-            if (oOptions && oOptions.qunitTimeout) {
-                var oLastAssertion = this._QUnitTimeoutDetails.assertions.slice(-1)[0];
-                oLastAssertion.message += "\n" + oOptions.errorMessage;
-                this._reportOpaTest(this._QUnitTimeoutDetails);
-            }
-        },
-        moduleDone: function (oDetails) {
-            this._moduleUpdate(oDetails);
-        },
-        done: function (oDetails) {
-            this._postSuiteJson("/done", oDetails)
-                .done(function (data) {
-                    oLogger.debug("Completed report with ID " + this._id);
-                }.bind(this))
-                .fail(function (err) {
-                    oLogger.debug("Failed to complete report with ID " + this._id + ". Error: " + JSON.stringify(err));
-                }.bind(this))
-                .always(function () {
-                    this._beginSuitePromise = null;
-                }.bind(this));
-        },
-        _moduleUpdate: function (oDetails) {
-            this._postSuiteJson("/modules", oDetails)
-            .done(function (data) {
-                oLogger.debug("Sent report for module " + oDetails.name);
-            })
-            .fail(function (err) {
-                oLogger.debug("Failed to send report for module '" + oDetails.name + "'. Error: " + JSON.stringify(err));
-            });
-        },
-        _reportOpaTest: function (oDetails) {
-            this._postSuiteJson("/tests", oDetails)
-                .done(function (data) {
-                    oLogger.debug("Sent report for test " + oDetails.name);
-                })
-                .fail(function (err) {
-                    oLogger.debug("Failed send report for test '" + oDetails.name + "'. Error: " + JSON.stringify(err));
-                });
-        },
-        _postSuiteJson: function (sUrlSuffix, oData) {
-            // wait for begin suite request
-            var oPromise = this._beginSuitePromise || new jQuery.Deferred().resolve().promise();
-            return oPromise.done(function () {
-                return postJson.call(this, this.baseUrl + this._id + sUrlSuffix, oData);
-            }.bind(this));
-        }
-    });
+			// separate report enablement from the report logic: conditionally send XHRs if reporting is explicitly enabled
+			var oPrototype = _UsageReport.prototype;
+			Object.keys(oPrototype).forEach(function (sKey) {
+				var bIsSpecialFunction = ["constructor", "getMetadata"].indexOf(sKey) > -1;
+				if (oPrototype.hasOwnProperty(sKey) && typeof oPrototype[sKey] === "function" && !bIsSpecialFunction) {
+					var fnOriginal = oPrototype[sKey];
+					oPrototype[sKey] = function () {
+						if (this.enabled) {
+							return fnOriginal.apply(this, arguments);
+						}
+					};
+				}
+			});
+		},
+		begin: function (oDetails) {
+			this._beginSuitePromise = postJson(this.baseUrl + "begin", oDetails)
+				.done(function (data) {
+					this._id = data.id;
+					oLogger.debug("Begin report with ID " + data.id);
+				}.bind(this))
+				.fail(function (err) {
+					oLogger.debug("Failed to begin report. Error: " + JSON.stringify(err));
+				});
+		},
+		moduleStart: function (oDetails) {
+			this._moduleUpdate(oDetails);
+		},
+		testStart: function () {
+			this._isOpaEmpty = false;
+			this._QUnitTimeoutDetails = null;
+		},
+		testDone: function (oDetails) {
+			// the details available depend on whether a QUnit timeout occurred:
+			// - no QUnit timeout: OPA queue is emptied and then the test finishes (call opaEmpty, then testDone)
+			// - with QUnit timeout: the test finishes, then the OPA queue is stopped and an error message is formed (call testDone, then opaEmpty)
+			// details for tests without an OPA queue will NOT be reported
+			if (this._isOpaEmpty) {
+				this._reportOpaTest(oDetails);
+				this._isOpaEmpty = false;
+			} else {
+				this._QUnitTimeoutDetails = oDetails;
+			}
+		},
+		opaEmpty: function (oOptions) {
+			this._isOpaEmpty = true;
+			if (oOptions && oOptions.qunitTimeout) {
+				var oLastAssertion = this._QUnitTimeoutDetails.assertions.slice(-1)[0];
+				oLastAssertion.message += "\n" + oOptions.errorMessage;
+				this._reportOpaTest(this._QUnitTimeoutDetails);
+			}
+		},
+		moduleDone: function (oDetails) {
+			this._moduleUpdate(oDetails);
+		},
+		done: function (oDetails) {
+			this._postSuiteJson("/done", oDetails)
+				.done(function (data) {
+					oLogger.debug("Completed report with ID " + this._id);
+				}.bind(this))
+				.fail(function (err) {
+					oLogger.debug("Failed to complete report with ID " + this._id + ". Error: " + JSON.stringify(err));
+				}.bind(this))
+				.always(function () {
+					this._beginSuitePromise = null;
+				}.bind(this));
+		},
+		_moduleUpdate: function (oDetails) {
+			this._postSuiteJson("/modules", oDetails)
+			.done(function (data) {
+				oLogger.debug("Sent report for module " + oDetails.name);
+			})
+			.fail(function (err) {
+				oLogger.debug("Failed to send report for module '" + oDetails.name + "'. Error: " + JSON.stringify(err));
+			});
+		},
+		_reportOpaTest: function (oDetails) {
+			this._postSuiteJson("/tests", oDetails)
+				.done(function (data) {
+					oLogger.debug("Sent report for test " + oDetails.name);
+				})
+				.fail(function (err) {
+					oLogger.debug("Failed send report for test '" + oDetails.name + "'. Error: " + JSON.stringify(err));
+				});
+		},
+		_postSuiteJson: function (sUrlSuffix, oData) {
+			// wait for begin suite request
+			var oPromise = this._beginSuitePromise || new jQuery.Deferred().resolve().promise();
+			return oPromise.done(function () {
+				return postJson.call(this, this.baseUrl + this._id + sUrlSuffix, oData);
+			}.bind(this));
+		}
+	});
 
-    function postJson(sUrl, oData) {
-        return jQuery.ajax({
-            url: sUrl,
-            type: "XHR_WAITER_IGNORE:POST",
-            data: oData,
-            dataType: "json"
-        });
-    }
+	function postJson(sUrl, oData) {
+		return jQuery.ajax({
+			url: sUrl,
+			type: "XHR_WAITER_IGNORE:POST",
+			data: oData,
+			dataType: "json"
+		});
+	}
 
-    return _UsageReport;
+	return _UsageReport;
 });

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

@@ -118,6 +118,10 @@ sap.ui.define([
 				this.oLogger.debug("Cannot enter text in control " + oControl + ": control is not enabled!");
 				return;
 			}
+			if (this.getText().length && oActionDomRef.selectionStart === undefined && oActionDomRef.selectionEnd === undefined) {
+				this.oLogger.debug("Cannot enter text in control " + oControl + ": The control's DOM element does not have the expected API of the html elements that accept text input: selectionStart and selectionEnd properties undefined.");
+				return;
+			}
 
 			var oUtils = this.getUtils();
 
@@ -137,10 +141,28 @@ sap.ui.define([
 				}
 			}
 
+			var sTypedInText = $ActionDomRef.val();
+
+			if (($ActionDomRef[0].selectionStart !== $ActionDomRef[0].selectionEnd) &&
+				($ActionDomRef[0].selectionStart !== sTypedInText.length)) {
+				// get non selected value only
+				sTypedInText = sTypedInText.slice(0, $ActionDomRef[0].selectionStart);
+				// remove selection as a new value will be typed there
+				$ActionDomRef[0].setSelectionRange($ActionDomRef[0].selectionStart, $ActionDomRef[0].selectionStart);
+			}
+
 			// Trigger events for every keystroke - livechange controls
-			var sValueBuffer = this.getClearTextFirst() ? "" : $ActionDomRef.val();
+			var sValueBuffer = this.getClearTextFirst() ? "" : sTypedInText;
+			var iCursorPosition = oActionDomRef.selectionStart;
 			this.getText().split("").forEach(function (sChar) {
-				sValueBuffer += sChar;
+
+				if (iCursorPosition === 0 || iCursorPosition === null) {
+					sValueBuffer += sChar;
+				} else {
+					var sLeftPart = sValueBuffer.slice(0, iCursorPosition);
+					var sRightPart = sValueBuffer.slice(iCursorPosition);
+					sValueBuffer = sLeftPart + sChar + sRightPart;
+				}
 				// Change the domref and fire the mock 'keypress' and 'input' events
 				this.triggerCharacterInput(oActionDomRef, sChar, sValueBuffer, oControl);
 				oUtils.triggerEvent("input", oActionDomRef);

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

@@ -16,6 +16,7 @@ sap.ui.define([
 
 	var WaiterBase = UI5Object.extend("sap.ui.test.autowaiter.WaiterBase", {
 		constructor: function () {
+			UI5Object.call(this);
 			this._mConfig = this._getDefaultConfig();
 			this._sName = this.getMetadata().getName();
 			this._oLogger = _OpaLogger.getLogger(this._sName);

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

@@ -19,6 +19,7 @@ sap.ui.define([
 
 	var ModuleWaiter = WaiterBase.extend("sap.ui.test.autowaiter._ModuleWaiter", {
 		constructor: function () {
+			WaiterBase.apply(this, arguments);
 			// (see sap.ui.performance.trace.Interaction)
 			/* As UI5 resources gets also loaded via script tags we need to
 			 * intercept this kind of loading as well. We assume that changing the
@@ -54,8 +55,6 @@ sap.ui.define([
 				},
 				get: mSrcDescriptor.get
 			});
-
-			WaiterBase.apply(this, arguments);
 		},
 		hasPending: function () {
 			var aPendingModules = this._aModules.filter(function (mModule) {

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

@@ -117,7 +117,7 @@ sap.ui.define([
 				oTimeoutWaiter._oLogger.trace("Timeout with ID " + iID + " started");
 				oCurrentTimeout.status = timeoutStatus.STARTED;
 				try {
-					fnCallback();
+					fnCallback.apply(window, aCallbackArgs);
 				} finally {
 					iInitiatorId = undefined;
 				}

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

@@ -158,6 +158,11 @@ sap.ui.define([], function() {
 					ControlMemoryLeaks: {
 						title: "QUnit Page for memory leak detection in UI5 controls"
 					},
+					/**
+					 * @deprecated As of 1.120
+					 * sap.ui.requireSync is deprecated, therefore it's not needed to test that no sync request is sent
+					 * when control renderer is retrieved.
+					 */
 					ControlRenderer: {
 						title: "QUnit Page for Control Renderer Tests"
 					},

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

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

@@ -223,7 +223,7 @@ sap.ui.define([
 						case "sap.ui.core.Toolbar":
 							// Toolbar is interface - Special treatment because of legacy coding in old
 							// DuplicateIdCheck qunit
-							sAggregationType = "sap.m.Bar";
+							sAggregationType = "sap.m.Toolbar";
 							break;
 						default:
 							sAggregationType = oAggregation.type;

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

@@ -12,11 +12,6 @@ sap.ui.define([
 
 	var oI18nMatcher = new I18NText();
 
-	/**
-	 *  The controls which should not be referenced by a "for" attribute (Specified in the HTML standard). See {@link sap.ui.core.LabelEnablement}
-	 */
-	var NON_LABELABLE_CONTROLS = ["sap.ui.comp.navpopover.SmartLink", "sap.m.Link", "sap.m.Label", "sap.m.Text"];
-
 	/**
 	 * @class
 	 * The LabelFor matcher checks if a given control has a label associated with it.
@@ -149,11 +144,6 @@ sap.ui.define([
 				return false;
 			}
 
-			if (NON_LABELABLE_CONTROLS.indexOf(oControl.getMetadata().getName()) > -1) {
-				this._oLogger.error("Control cannot have an associated label according to HTML standard");
-				return false;
-			}
-
 			var fnLabelType = this._getApplicationWindow().sap.ui.require("sap/m/Label");
 			var aLabelsInPage = this._getApplicationWindow().sap.ui.require("sap/ui/core/Element").registry.filter(function (oElement) {
 				return oElement instanceof fnLabelType;
@@ -168,9 +158,9 @@ sap.ui.define([
 
 			bIsMatching = aLabelsInPage.some(function (oLabel) {
 				if (sKey && oI18nMatcher.isMatching(oLabel)) {
-					return oControl.getId() === oLabel.getLabelForRendering();
+					return oControl.getId() === oLabel.getLabelForRendering() || oLabel.isLabelFor(oControl);
 				} else if (sLabelText && oLabel.getText() === sLabelText) {
-					return oControl.getId() === oLabel.getLabelForRendering();
+					return oControl.getId() === oLabel.getLabelForRendering() || oLabel.isLabelFor(oControl);
 				}
 				return false;
 			});

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

@@ -26,8 +26,8 @@ sap.ui.define([
 		},
 
 		constructor: function () {
+			ManagedObject.prototype.constructor.apply(this, arguments);
 			this._oLogger = _OpaLogger.getLogger(this.getMetadata().getName());
-			return ManagedObject.prototype.constructor.apply(this, arguments);
 		},
 
 		/**

package/src/sap/ui/test/pipelines/PipelineFactory.js

@@ -31,6 +31,7 @@ sap.ui.define([
 			 * @constructor
 			 */
 			constructor: function(options){
+				BaseObject.call(this);
 				this._oOptions = options;
 			},
 

package/src/sap/ui/test/selectors/_Selector.js

@@ -26,8 +26,8 @@ sap.ui.define([
     var _Selector = ManagedObject.extend("sap.ui.test.selectors._Selector", {
 
         constructor: function () {
+            ManagedObject.prototype.constructor.apply(this, arguments);
             this._oLogger = _OpaLogger.getLogger(this.getMetadata().getName());
-            return ManagedObject.prototype.constructor.apply(this, arguments);
         },
 
         /**

package/src/sap/ui/util/Storage.js

@@ -277,7 +277,7 @@ sap.ui.define(["sap/base/assert"], function (assert) {
 	 *
 	 * @enum {string}
 	 * @public
-	 * @version 1.119.1
+	 * @version 1.120.1
 	 */
 	Storage.Type = {
 		/**