@openui5/sap.ui.core 1.120.1 → 1.120.3

package/test/sap/ui/core/qunit/opa/actions/EnterText.qunit.js

@@ -11,7 +11,9 @@ sap.ui.define([
 	"sap/m/TimePicker",
 	"sap/m/Popover",
 	"sap/m/Button",
+	"sap/m/Select",
 	"sap/ui/core/Icon",
+	"sap/ui/core/Item",
 	"sap/ui/test/Opa5",
 	"sap/ui/test/opaQunit",
 	"sap/m/library",
@@ -30,7 +32,9 @@ sap.ui.define([
 	TimePicker,
 	Popover,
 	Button,
+	Select,
 	Icon,
+	Item,
 	Opa5,
 	opaTest,
 	mobileLibrary,
@@ -320,6 +324,40 @@ sap.ui.define([
 		assert.strictEqual(this.oControl.getValue(), "{");
 	});
 
+	QUnit.test("No runtime error when entering text on control that is not an input", async function (assert) {
+		this.oControl = new Icon({src: "sap-icon://edit"});
+
+		this.oControl.placeAt("qunit-fixture");
+		await nextUIUpdate();
+
+		var action = new EnterText({ text: "entering some long enough text on an non-input control"});
+
+		try {
+			// without an internal safe-check, the line below causes runtime error
+			// with the current alorithm, when executed on a non-input control:
+			action.executeOn(this.oControl);
+			assert.ok("The test completes without runtime error");
+		} catch (error) {
+			assert.notOk("Runtime error upon enterng the text: " + error);
+		}
+	});
+
+	QUnit.test("Should enter text on select", async function (assert) {
+		this.oControl = new Select({
+			items: [
+				new Item({text: "one"}),
+				new Item({text: "two"})
+			]
+		});
+
+		this.oControl.placeAt("qunit-fixture");
+		await nextUIUpdate();
+
+		new EnterText({ text: "two" }).executeOn(this.oControl);
+
+		assert.strictEqual(this.oControl.getSelectedIndex(), 1);
+	});
+
 	QUnit.module("Logging", {
 		beforeEach: function () {
 			this.oEnterText = new EnterText({});
@@ -365,20 +403,6 @@ sap.ui.define([
 		sinon.assert.calledWith(this.oErrorLog, sinon.match(/Please provide a text/));
 	});
 
-	QUnit.test("Should log a warning and exit early when control is not an input", async function (assert) {
-		this.oControl = new Icon({src: "sap-icon://edit"});
-
-		this.oControl.placeAt("qunit-fixture");
-		await nextUIUpdate();
-
-		// without a safe-check, the line below causes errors with the
-		// the current alorithm, when executed on a non-input control:
-		this.oEnterText.setText("entering some long enough text on an non-input control");
-		this.oEnterText.executeOn(this.oControl);
-
-		sinon.assert.calledWith(this.oDebugLog, sinon.match(/Cannot enter text in control/));
-	});
-
 	QUnit.test("Should enter number with decimals in input of type number and preserve the value", function (assert) {
 		var fnDone = assert.async();
 		var sTextInControl = "12.4";

package/test/sap/ui/core/qunit/routing/async/Router.qunit.js

@@ -432,7 +432,7 @@ sap.ui.define([
 		});
 
 
-		assert.ok(oLogSpy.withArgs("The 'viewName' option shouldn't be used in Route. please use 'view' instead").calledOnce, "The error log is done and the log message is correct");
+		assert.ok(oLogSpy.calledWith(sinon.match(/The 'viewName' option shouldn't be used in Route. please use 'view' instead/)), "The error log is done and the log message is correct");
 	});
 
 	QUnit.test("subroute handling", function(assert) {
@@ -2476,70 +2476,120 @@ sap.ui.define([
 	QUnit.module("nested components", {
 		beforeEach: function() {
 			hasher.setHash("");
-			return Component.create({
-				name: "qunit.router.component.parentRoute.Parent",
-				id: "parent"
-			}).then(function(oComponent) {
-				var that = this;
-				this.oParentComponent = oComponent;
-				this.oParentComponent.getRouter().initialize();
 
-				var oRootView = oComponent.getRootControl();
-				var oComponentContainer = oRootView.byId("container");
-
-				return new Promise(function(resolve, reject) {
-					oRootView.placeAt("qunit-fixture");
-					oComponentContainer.attachComponentCreated(function(oEvent) {
-						that.oChildComponent = oEvent.getParameter("component");
-						resolve();
+			this.createComponent = function(sComponentName) {
+				return Component.create({
+					name: sComponentName,
+					id: "parent"
+				}).then(function(oComponent) {
+					var that = this;
+					this.oParentComponent = oComponent;
+					this.oParentComponent.getRouter().initialize();
+
+					this.oRootView = oComponent.getRootControl();
+					var oComponentContainer = that.oRootView.byId("container");
+
+					return new Promise(function(resolve, reject) {
+						that.oRootView.placeAt("qunit-fixture");
+						oComponentContainer.attachComponentCreated(function(oEvent) {
+							that.oChildComponent = oEvent.getParameter("component");
+							resolve();
+						});
 					});
-				});
-			}.bind(this));
+				}.bind(this));
+			};
 		},
 		afterEach: function () {
+			this.oRootView.destroy();
 			this.oParentComponent.destroy();
 			this.oChildComponent.destroy();
 		}
 	});
 
 	QUnit.test("fire events", function(assert) {
-		// Arrange
-		var oParentRouteMatchedEvent,
-			oParentRouteMatchedEventSpy = sinon.spy(function(oEvent) {
-				// save the oEvent because EventProvider will overwrite it otherwise
-				oParentRouteMatchedEvent = deepExtend({}, oEvent);
-			}),
-			oParentRoutePatternMatchedEventSpy = sinon.spy(),
-			oChildRouteMatchedEvent,
-			oChildRouteMatchedEventSpy = sinon.spy(function(oEvent) {
-				oChildRouteMatchedEvent = deepExtend({}, oEvent);
-			}),
-			oChildRoutePatternMatchedEventSpy = sinon.spy(),
-			oParentRoute = this.oParentComponent.getRouter().getRoute("category"),
-			oChildRoute = this.oChildComponent.getRouter().getRoute("product"),
-			oParentRouteMatchedSpy = sinon.spy(oParentRoute, "_routeMatched"),
-			oChildRouteMatchedSpy = sinon.spy(oChildRoute, "_routeMatched");
+		return this.createComponent("qunit.router.component.parentRoute.Parent")
+			.then(function() {
+				// Arrange
+				var oParentRouteMatchedEvent,
+					oParentRouteMatchedEventSpy = this.spy(function(oEvent) {
+						// save the oEvent because EventProvider will overwrite it otherwise
+						oParentRouteMatchedEvent = deepExtend({}, oEvent);
+					}),
+					oParentRoutePatternMatchedEventSpy = this.spy(),
+					oChildRouteMatchedEvent,
+					oChildRouteMatchedEventSpy = this.spy(function(oEvent) {
+						oChildRouteMatchedEvent = deepExtend({}, oEvent);
+					}),
+					oChildRoutePatternMatchedEventSpy = this.spy(),
+					oParentRoute = this.oParentComponent.getRouter().getRoute("category"),
+					oChildRoute = this.oChildComponent.getRouter().getRoute("product"),
+					oParentRouteMatchedSpy = this.spy(oParentRoute, "_routeMatched"),
+					oChildRouteMatchedSpy = this.spy(oChildRoute, "_routeMatched");
+
+				oParentRoute.attachMatched(oParentRouteMatchedEventSpy);
+				oParentRoute.attachPatternMatched(oParentRoutePatternMatchedEventSpy);
+				oChildRoute.attachMatched(oChildRouteMatchedEventSpy);
+				oChildRoute.attachPatternMatched(oChildRoutePatternMatchedEventSpy);
+
+				// Act
+				hasher.setHash("category/0/product/0");
 
-		oParentRoute.attachMatched(oParentRouteMatchedEventSpy);
-		oParentRoute.attachPatternMatched(oParentRoutePatternMatchedEventSpy);
-		oChildRoute.attachMatched(oChildRouteMatchedEventSpy);
-		oChildRoute.attachPatternMatched(oChildRoutePatternMatchedEventSpy);
+				// Assert
+				assert.strictEqual(oParentRouteMatchedSpy.callCount, 1, "Parent should be matched");
+				assert.strictEqual(oChildRouteMatchedSpy.callCount, 1, "Child is matched");
+
+				return Promise.all([oParentRouteMatchedSpy.returnValues[0], oChildRouteMatchedSpy.returnValues[0]]).then(function() {
+					assert.strictEqual(oParentRouteMatchedEventSpy.callCount, 1, "routeMatched fired for parent route");
+					assert.strictEqual(oParentRoutePatternMatchedEventSpy.callCount, 0, "routePatternMatched not fired for parent route");
+					assert.strictEqual(oParentRouteMatchedEvent.getParameter("nestedRoute"), oChildRoute, "childRoute is passed to event listeners");
+					assert.strictEqual(oChildRouteMatchedEventSpy.callCount, 1, "routeMatched fired for child route");
+					assert.strictEqual(oChildRoutePatternMatchedEventSpy.callCount, 1, "routePatternMatched fired for child route");
+					assert.strictEqual(oChildRouteMatchedEvent.getParameter("nestedRoute"), undefined, "no route is passed to event listeners");
+				});
+			}.bind(this));
+	});
 
-		// Act
-		hasher.setHash("category/0/product/0");
+	QUnit.test("fire events with extended parent component", function(assert) {
+		return this.createComponent("qunit.router.component.parentRoute.ParentExtended")
+			.then(function() {
+				// Arrange
+				var oParentRouteMatchedEvent,
+					oParentRouteMatchedEventSpy = this.spy(function(oEvent) {
+						// save the oEvent because EventProvider will overwrite it otherwise
+						oParentRouteMatchedEvent = deepExtend({}, oEvent);
+					}),
+					oParentRoutePatternMatchedEventSpy = this.spy(),
+					oChildRouteMatchedEvent,
+					oChildRouteMatchedEventSpy = this.spy(function(oEvent) {
+						oChildRouteMatchedEvent = deepExtend({}, oEvent);
+					}),
+					oChildRoutePatternMatchedEventSpy = this.spy(),
+					oParentRoute = this.oParentComponent.getRouter().getRoute("category"),
+					oChildRoute = this.oChildComponent.getRouter().getRoute("product"),
+					oParentRouteMatchedSpy = this.spy(oParentRoute, "_routeMatched"),
+					oChildRouteMatchedSpy = this.spy(oChildRoute, "_routeMatched");
+
+				oParentRoute.attachMatched(oParentRouteMatchedEventSpy);
+				oParentRoute.attachPatternMatched(oParentRoutePatternMatchedEventSpy);
+				oChildRoute.attachMatched(oChildRouteMatchedEventSpy);
+				oChildRoute.attachPatternMatched(oChildRoutePatternMatchedEventSpy);
+
+				// Act
+				hasher.setHash("category/0/product/0");
 
-		// Assert
-		assert.strictEqual(oParentRouteMatchedSpy.callCount, 1, "Parent should be matched");
-		assert.strictEqual(oChildRouteMatchedSpy.callCount, 1, "Child is matched");
-
-		return Promise.all([oParentRouteMatchedSpy.returnValues[0], oChildRouteMatchedSpy.returnValues[0]]).then(function() {
-			assert.strictEqual(oParentRouteMatchedEventSpy.callCount, 1, "routeMatched fired for parent route");
-			assert.strictEqual(oParentRoutePatternMatchedEventSpy.callCount, 0, "routePatternMatched not fired for parent route");
-			assert.strictEqual(oParentRouteMatchedEvent.getParameter("nestedRoute"), oChildRoute, "childRoute is passed to event listeners");
-			assert.strictEqual(oChildRouteMatchedEventSpy.callCount, 1, "routeMatched fired for child route");
-			assert.strictEqual(oChildRoutePatternMatchedEventSpy.callCount, 1, "routePatternMatched fired for child route");
-			assert.strictEqual(oChildRouteMatchedEvent.getParameter("nestedRoute"), undefined, "no route is passed to event listeners");
-		});
+				// Assert
+				assert.strictEqual(oParentRouteMatchedSpy.callCount, 1, "Parent should be matched");
+				assert.strictEqual(oChildRouteMatchedSpy.callCount, 1, "Child is matched");
+
+				return Promise.all([oParentRouteMatchedSpy.returnValues[0], oChildRouteMatchedSpy.returnValues[0]]).then(function() {
+					assert.strictEqual(oParentRouteMatchedEventSpy.callCount, 1, "routeMatched fired for parent route");
+					assert.strictEqual(oParentRoutePatternMatchedEventSpy.callCount, 0, "routePatternMatched not fired for parent route");
+					assert.strictEqual(oParentRouteMatchedEvent.getParameter("nestedRoute"), oChildRoute, "childRoute is passed to event listeners");
+					assert.strictEqual(oChildRouteMatchedEventSpy.callCount, 1, "routeMatched fired for child route");
+					assert.strictEqual(oChildRoutePatternMatchedEventSpy.callCount, 1, "routePatternMatched fired for child route");
+					assert.strictEqual(oChildRouteMatchedEvent.getParameter("nestedRoute"), undefined, "no route is passed to event listeners");
+				});
+			}.bind(this));
 	});
 
 	function resetBrowserHash() {

package/test/sap/ui/core/qunit/routing/async/Target.qunit.js

@@ -302,7 +302,7 @@ sap.ui.define([
 			}, function(oError) {
 				// Assert
 				assert.ok(oError instanceof Error, "The promise is rejected with an error object");
-				assert.equal(oError.message, "The target myTarget has a control id or a parent but no 'controlAggregation' was set, so the target could not be displayed. - Target: myTarget", "The error message is correct");
+				assert.ok(oError.message.includes("The target myTarget has a control id or a parent but no 'controlAggregation' was set, so the target could not be displayed. - Target: myTarget"), "The error message is correct");
 			});
 	});
 

package/test/sap/ui/core/qunit/routing/async/Targets.qunit.js

@@ -355,7 +355,7 @@ sap.ui.define([
 		// Act
 		return this.oTargets.display("foo").then(function(aViewInfos) {
 			assert.strictEqual(aViewInfos[0].name, "foo", "Matching target info is returned");
-			assert.strictEqual(aViewInfos[0].error, "The target with the name \"foo\" does not exist!", "Matching error message is returned");
+			assert.ok(aViewInfos[0].error.includes("The target with the name \"foo\" does not exist!"), "Matching error message is returned");
 			// Assert
 			sinon.assert.calledWith(oErrorStub, sinon.match(/does not exist/), sinon.match(this.oTargets));
 		}.bind(this));
@@ -377,7 +377,7 @@ sap.ui.define([
 			assert.ok(Array.isArray(aViewInfos), "Did resolve with an array of the view infos");
 			assert.strictEqual(aViewInfos.length, 2, "Did resolve with two viewinfos");
 			assert.strictEqual(aViewInfos[1].name, "firstTarget", "Did resolve with first target");
-			assert.strictEqual(aViewInfos[0].error, "The target with the name \"foo\" does not exist!", "Did resolve with the error message of the erroneous target");
+			assert.ok(aViewInfos[0].error.includes("The target with the name \"foo\" does not exist!"), "Did resolve with the error message of the erroneous target");
 		}.bind(this));
 	});
 
@@ -1030,9 +1030,8 @@ sap.ui.define([
 		return oDisplayed.then(function() {
 			// Assert
 			assert.ok(fnEventSpy.notCalled, "the event isn't fired");
-			sinon.assert.calledWith(
-				oLogSpy,
-				"The target with the name \"foo\" where the titleChanged event should be fired does not exist!",
+			assert.ok(
+				oLogSpy.calledWith(sinon.match(/The target with the name \"foo\" where the titleChanged event should be fired does not exist!/)),
 				this.oTargets
 			);
 		}.bind(this));

package/test/sap/ui/core/qunit/routing/async/TitleHistory.qunit.js

@@ -634,7 +634,7 @@ sap.ui.define([
 
 		return this.oRouteMatchedSpies["product"].returnValues[0].then(function() {
 			// Assert
-			sinon.assert.calledWith(this.spy, "Routes with dynamic parts cannot be resolved as home route.");
+			assert.ok(this.spy.calledWith(sinon.match(/Routes with dynamic parts cannot be resolved as home route./)));
 			assert.strictEqual(oParameters.history.length, 0, "Home route shouldn't be added to history.");
 			assert.deepEqual(this.oRouter.getTitleHistory()[0], {
 				hash: "/product",

package/test/sap/ui/core/qunit/routing/fixture/router/component/parentRoute/Child/Component.js

@@ -5,6 +5,7 @@ sap.ui.define([
 
 	var Component = UIComponent.extend("qunit.router.component.parentRoute.Child.Component", {
 		metadata : {
+			interfaces: ["sap.ui.core.IAsyncContentCreation"],
 			manifest: "json"
 		},
 		init : function() {

package/test/sap/ui/core/qunit/routing/fixture/router/component/parentRoute/Child/manifest.json

@@ -8,13 +8,9 @@
 	"sap.ui5": {
 		"rootView": {
 			"viewName": "qunit.router.component.parentRoute.Child.view.RootView",
-			"type": "XML",
-			"async": true
+			"type": "XML"
 		},
 		"routing": {
-			"config": {
-				"async": true
-			},
 			"routes": [
 				{
 					"pattern": "product/{id}",

package/test/sap/ui/core/qunit/routing/fixture/router/component/parentRoute/Parent/Component.js

@@ -5,6 +5,7 @@ sap.ui.define([
 
 	var Component = UIComponent.extend("qunit.router.component.parentRoute.Parent.Component", {
 		metadata : {
+			interfaces: ["sap.ui.core.IAsyncContentCreation"],
 			manifest: "json"
 		}
 	});

package/test/sap/ui/core/qunit/routing/fixture/router/component/parentRoute/Parent/manifest.json

@@ -8,13 +8,9 @@
 	"sap.ui5": {
 		"rootView": {
 			"viewName": "qunit.router.component.parentRoute.Parent.view.RootView",
-			"type": "XML",
-			"async": true
+			"type": "XML"
 		},
 		"routing": {
-			"config": {
-				"async": true
-			},
 			"routes": [
 				{
 					"pattern": "category/{id}",

package/test/sap/ui/core/qunit/routing/fixture/router/component/parentRoute/ParentExtended/Component.js

@@ -0,0 +1,15 @@
+sap.ui.define([
+	'qunit/router/component/parentRoute/Parent/Component'
+], function(ParentComponent) {
+	"use strict";
+
+	var Component = ParentComponent.extend("qunit.router.component.parentRoute.ParentExtended.Component", {
+		metadata : {
+			interfaces: ["sap.ui.core.IAsyncContentCreation"],
+			manifest: "json"
+		}
+	});
+
+	return Component;
+
+});

package/test/sap/ui/core/qunit/routing/fixture/router/component/parentRoute/ParentExtended/manifest.json

@@ -0,0 +1,8 @@
+{
+	"sap.app": {
+		"id": "qunit.router.component.parentRoute.ParentExtended",
+		"applicationVersion": {
+			"version": "1.0.0"
+		}
+	}
+}

package/test/sap/ui/core/qunit/routing/sync/Router.qunit.js

@@ -330,7 +330,7 @@ sap.ui.define([
 		router.parse("view1");
 
 		assert.strictEqual(oRoute._oConfig.name, "name", "Route has correct name");
-		assert.ok(oLogSpy.withArgs("The 'viewName' option shouldn't be used in Route. please use 'view' instead").calledOnce, "The error log is done and the log message is correct");
+		assert.ok(oLogSpy.calledWith(sinon.match(/The 'viewName' option shouldn't be used in Route. please use 'view' instead/)), "The error log is done and the log message is correct");
 
 		oViewCreateStub.restore();
 		oLogSpy.restore();
@@ -1976,7 +1976,7 @@ sap.ui.define([
 
 		this.oRouter.attachRouteMatched(function() {
 			// Assert
-			sinon.assert.calledWith(this.spy, "Routes with dynamic parts cannot be resolved as home route.");
+			assert.ok(this.spy.calledWith(sinon.match(/Routes with dynamic parts cannot be resolved as home route./)));
 			assert.strictEqual(oParameters.history.length, 0, "Home route shouldn't be added to history.");
 			assert.deepEqual(this.oRouter.getTitleHistory()[0], {
 				hash: "/product",

package/test/sap/ui/core/qunit/routing/sync/Targets.qunit.js

@@ -757,9 +757,8 @@ sap.ui.define([
 
 		// Assert
 		assert.ok(fnEventSpy.notCalled, "the event isn't fired");
-		sinon.assert.calledWith(
-			oLogSpy,
-			"The target with the name \"foo\" where the titleChanged event should be fired does not exist!",
+		assert.ok(oLogSpy.calledWith(
+			sinon.match(/The target with the name \"foo\" where the titleChanged event should be fired does not exist!/)),
 			this.oTargets
 		);
 	});

package/test/sap/ui/core/qunit/testdata/fragments/XMLTestFragmentWithXMLView.fragment.xml

@@ -0,0 +1,5 @@
+<layout:HorizontalLayout xmlns:layout="sap.ui.layout" xmlns:mvc="sap.ui.core.mvc" xmlns="sap.m">
+	<Button id="btn1InXmlFragment" text="Hello XML World" press="doSomething"/>
+	<Button text="{/someText}" />
+	<mvc:View viewName="testdata.fragments.views.View" async="true" type="XML" />
+</layout:HorizontalLayout>

package/test/sap/ui/core/qunit/testsuites/testsuite.base.configuration.qunit.js

@@ -20,7 +20,7 @@ sap.ui.define([], function() {
 				page: "test-resources/sap/ui/core/qunit/base/Config_bootstrap.qunit.html"
 			},
 			"base/Config_cascade": {
-				page: "test-resources/sap/ui/core/qunit/base/Config_cascade.qunit.html?sap-ui-paramA=url"
+				page: "test-resources/sap/ui/core/qunit/base/Config_cascade.qunit.html?sap-ui-paramA=url&sap-ui-param-merged-object={\"objectKeyUrl\":\"urlObject\"}"
 			},
 			"base/Config_noUrl": {
 				page: "test-resources/sap/ui/core/qunit/base/Config_noUrl.qunit.html?sap-ui-foo-bar=url"

package/test/sap/ui/core/qunit/testsuites/testsuite.control.framework.qunit.js

@@ -51,6 +51,9 @@ sap.ui.define(function() {
 					libs: "sap.m"
 				}
 			},
+			/**
+			 * @deprecated since 1.120
+			 */
 			ControlRenderer: {
 				title: "sap.ui.core.Control (ControlRenderer)"
 			},
@@ -75,6 +78,7 @@ sap.ui.define(function() {
 				},
 				module: [
 					"testdata/core/Element_base.qunit",
+					"testdata/core/Element_base_legacyAPIs.qunit",
 					"testdata/core/Element_contextualSettings.qunit",
 					"testdata/core/Element_data.qunit",
 					"testdata/core/Element_delegates.qunit",