@openui5/sap.ui.core 1.123.1 → 1.124.1

package/test/sap/ui/core/qunit/opa/autowaiter/_navigationContainerWaiter.js

@@ -7,16 +7,20 @@ sap.ui.define([
 	"sap/ui/test/autowaiter/_promiseWaiter",
 	"sap/ui/test/autowaiter/_cssTransitionWaiter",
 	"sap/ui/test/autowaiter/_cssAnimationWaiter",
+	"sap/ui/test/autowaiter/_UIUpdatesWaiter",
 	"sap/m/NavContainer",
 	"sap/m/App",
 	"sap/m/Page",
 	"sap/m/Button",
 	"sap/ui/test/opaQunit",
 	"sap/ui/test/Opa5",
-	"sap/ui/qunit/utils/nextUIUpdate"
+	"sap/ui/qunit/utils/nextUIUpdate",
+	"sap/ui/core/IntervalTrigger",
+	"sap/ui/core/ResizeHandler"
 ], function (_LogCollector, _autoWaiter, _timeoutWaiter, _XHRWaiter,
-		_promiseWaiter, _cssTransitionWaiter, _cssAnimationWaiter,
-		NavContainer, App, Page, Button, opaTest, Opa5, nextUIUpdate) {
+		_promiseWaiter, _cssTransitionWaiter, _cssAnimationWaiter, _UIUpdatesWaiter,
+		NavContainer, App, Page, Button, opaTest, Opa5,
+		nextUIUpdate, IntervalTrigger, ResizeHandler) {
 	"use strict";
 
 	var oLogCollector = _LogCollector.getInstance();
@@ -29,22 +33,26 @@ sap.ui.define([
 				this.oPromiseWaiterStub = sinon.stub(_promiseWaiter, "hasPending");
 				this.oCssTransitionWaiterStub = sinon.stub(_cssTransitionWaiter, "hasPending");
 				this.oCssAnimationWaiterStub = sinon.stub(_cssAnimationWaiter, "hasPending");
+				this.oUIUpdatesWaiterStub = sinon.stub(_UIUpdatesWaiter, "hasPending");
 				this.oTimeoutWaiterStub.returns(false);
 				this.oXHRWaiterStub.returns(false);
 				this.oPromiseWaiterStub.returns(false);
 				this.oCssTransitionWaiterStub.returns(false);
 				this.oCssAnimationWaiterStub.returns(false);
+				this.oUIUpdatesWaiterStub.returns(false);
 
 				this.oInitialPageButton = new Button();
 				this.oSecondPageButton = new Button();
-				var oInitialPage = new Page({
+				this.oInitialPage = new Page({
+					showHeader: false,
 					content: this.oInitialPageButton
 				});
 				this.oSecondPage = new Page({
+					showHeader: false,
 					content: this.oSecondPageButton
 				});
 				this.oNavContainer = new FnConstructor({
-					pages: [oInitialPage, this.oSecondPage]
+					pages: [this.oInitialPage, this.oSecondPage]
 				}).placeAt("qunit-fixture");
 
 				return nextUIUpdate();
@@ -56,6 +64,7 @@ sap.ui.define([
 				this.oPromiseWaiterStub.restore();
 				this.oCssTransitionWaiterStub.restore();
 				this.oCssAnimationWaiterStub.restore();
+				this.oUIUpdatesWaiterStub.restore();
 				this.oNavContainer.destroy();
 				return nextUIUpdate();
 			}
@@ -64,25 +73,63 @@ sap.ui.define([
 		QUnit.test("Should not match a Button while its navContainer is navigating", function (assert) {
 			var fnDone = assert.async();
 			var oNavigationLogRegExp = new RegExp("The NavContainer " + this.oNavContainer + " is currently navigating", "g");
-
+			var bIsAfterNavigate;
+
+			var oIntervalListener = {
+				onTrigger: function() {
+					if (bIsAfterNavigate) {
+						var bInitialResultAfterNavigationFinished = _autoWaiter.hasToWait();
+						var bSecondResultAfterNavigationFinished = _autoWaiter.hasToWait();
+						assert.ok(!bInitialResultAfterNavigationFinished, "Navigation is done");
+						assert.ok(!bSecondResultAfterNavigationFinished, "Navigation is done");
+						assert.ok(!oLogCollector.getAndClearLog().match(oNavigationLogRegExp));
+						IntervalTrigger.removeListener(this.onTrigger, this);
+						fnDone();
+					}
+				}
+			};
+			IntervalTrigger.addListener(oIntervalListener.onTrigger, oIntervalListener);
 			this.oNavContainer.to(this.oSecondPage);
 			var bInitialResultBeforeNavigationFinished = _autoWaiter.hasToWait();
 			var bSecondResultBeforeNavigationFinished = _autoWaiter.hasToWait();
 
 			assert.strictEqual(oLogCollector.getAndClearLog().match(oNavigationLogRegExp).length, 2);
+			assert.ok(bInitialResultBeforeNavigationFinished, "Navigation is in progress");
+			assert.ok(bSecondResultBeforeNavigationFinished, "Navigation is in progress");
 
 			this.oNavContainer.attachAfterNavigate(function () {
-				var bInitialResultAfterNavigationFinished = _autoWaiter.hasToWait();
-				var bSecondResultAfterNavigationFinished = _autoWaiter.hasToWait();
-
-				assert.ok(bInitialResultBeforeNavigationFinished, "Navigation is in progress");
-				assert.ok(bSecondResultBeforeNavigationFinished, "Navigation is in progress");
-				assert.ok(!bInitialResultAfterNavigationFinished, "Navigation is done");
-				assert.ok(!bSecondResultAfterNavigationFinished, "Navigation is done");
-				assert.ok(!oLogCollector.getAndClearLog().match(oNavigationLogRegExp));
-				fnDone();
+				bIsAfterNavigate = true;
 			}, this);
 		});
+
+		QUnit.test("Should wait for resize notifications at navigatiion end", function (assert) {
+			var fnDone = assert.async();
+			var oResizeSpy = this.spy(ResizeHandler.prototype, "checkSizes");
+			var bIsAfterNavigate;
+
+			var oIntervalListener = {
+				onTrigger: function() {
+					if (bIsAfterNavigate) {
+						assert.ok(oResizeSpy.called, "the resize listener is called at the next interval trigger");
+						assert.notOk(_autoWaiter.hasToWait(), "no navigations in progress");
+						IntervalTrigger.removeListener(this.onTrigger, this);
+						fnDone();
+					}
+				}
+			};
+			this.oNavContainer.setDefaultTransitionName("show");
+			// ensure ResizeHandler monitors at least one control for resize:
+			ResizeHandler.register(this.oInitialPage, function(){});
+			IntervalTrigger.addListener(oIntervalListener.onTrigger, oIntervalListener);
+			oResizeSpy.reset();
+
+			// Act
+			this.oNavContainer.to(this.oSecondPage);
+			bIsAfterNavigate = true;
+
+			// Check navigation detected
+			assert.ok(_autoWaiter.hasToWait(), "navigation in progress");
+		});
 	});
 
 	QUnit.module("NavigationContainerWaiter - iFrame");

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

@@ -1,5 +1,6 @@
 /*global QUnit, sinon, hasher */
 sap.ui.define([
+	"sap/base/future",
 	"sap/base/Log",
 	"sap/base/util/deepExtend",
 	"sap/ui/core/UIComponent",
@@ -14,7 +15,7 @@ sap.ui.define([
 	"./AsyncViewModuleHook",
 	"sap/ui/core/Component",
 	"sap/ui/core/ComponentContainer"
-], function (Log, deepExtend, UIComponent, View, ViewType, HashChanger, Router, Views, App, NavContainer, Panel, ModuleHook, Component, ComponentContainer) {
+], function (future, Log, deepExtend, UIComponent, View, ViewType, HashChanger, Router, Views, App, NavContainer, Panel, ModuleHook, Component, ComponentContainer) {
 	"use strict";
 
 	// This global namespace is used for creating custom component classes.
@@ -329,8 +330,11 @@ sap.ui.define([
 
 	});
 
-	QUnit.test("Should log a warning if a router gets destroyed while the hash changes", function (assert) {
-
+	/**
+	 * @deprecated As of version 1.120
+	 */
+	QUnit.test("Should log a warning if a router gets destroyed while the hash changes (future=false)", function (assert) {
+		future.active = false;
 		// Arrange
 		var oWarningSpy = this.stub(Log, "warning"),
 			oFirstRouter = fnCreateRouter({
@@ -361,6 +365,38 @@ sap.ui.define([
 		assert.ok(oWarningSpy.args[0][0].indexOf("destroyed") !== -1, "The message contains the correct keyword");
 		assert.strictEqual(oWarningSpy.args[0][1], oRouterToBeDestroyed, "The second parameter to the warning call is correct");
 		oFirstRouter.destroy();
+
+		future.active = undefined;
+		hasher.setHash("");
+	});
+
+	QUnit.test("Should throw an error if a router gets destroyed while the hash changes (future=true)", function (assert) {
+		future.active = true;
+		// Arrange
+		const oFirstRouter = fnCreateRouter({
+			"matchingRoute": {
+				pattern: "matches"
+			}
+		}),
+		oRouterToBeDestroyed = fnCreateRouter({
+			"matchingRoute": {
+				pattern: "matches"
+			}
+		});
+
+		// first router has to init first it is the first registered router on the hashchanger
+		oFirstRouter.initialize();
+		oRouterToBeDestroyed.initialize();
+
+		this.stub(oFirstRouter, "parse").callsFake(function () {
+			Router.prototype.parse.apply(this, arguments);
+			oRouterToBeDestroyed.destroy();
+		});
+
+		// Act - trigger both routers
+		assert.throws(() => { hasher.setHash("matches"); }, new Error("This router has been destroyed while the hash changed. No routing events where fired by the destroyed instance."), "Error thrown because router has been destroyed while the hash changed.");
+
+		future.active = undefined;
 	});
 
 	QUnit.module("config", {
@@ -415,7 +451,12 @@ sap.ui.define([
 		});
 	});
 
-	QUnit.test("Handle setting invalid option 'viewName' in route", function(assert) {
+	/**
+	 * @deprecated As of version 1.120
+	 */
+	QUnit.test("Handle setting invalid option 'viewName' in route (future=false)", function(assert) {
+		future.active = false;
+
 		var oLogSpy = this.spy(Log, "error");
 
 		//Arrange System under Test
@@ -433,6 +474,29 @@ sap.ui.define([
 
 
 		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");
+
+		future.active = undefined;
+	});
+
+	QUnit.test("Throw Error when setting invalid option 'viewName' in route (future=true)", function (assert) {
+		future.active = true;
+
+		//Arrange System under Test
+		assert.throws(() => {
+			fnCreateRouter({
+				name: {
+					// This is a wrong usage, the option "view" should be set
+					// instead of "viewName"
+					// We should still support the usage but log an error to
+					// let the app be aware of the wrong usage
+					viewName: "myView",
+					viewType: "JS",
+					pattern: "view1"
+				}
+			});
+		}, new Error("The 'viewName' option shouldn't be used in Route. please use 'view' instead"), "Error thrown because invalid option 'viewName' is set for route.");
+
+		future.active = undefined;
 	});
 
 	QUnit.test("subroute handling", function(assert) {
@@ -1078,24 +1142,32 @@ sap.ui.define([
 		});
 	});
 
-	QUnit.module("navTo", {
-		beforeEach: function () {
-			this.oRouter = fnCreateRouter();
-			this.oRouter.oHashChanger = {
-				setHash: function() {}
-			};
-		},
-		afterEach: function () {
-			this.oRouter.destroy();
-		}
+	QUnit.module("navTo", {});
+
+
+	QUnit.test("Throw Error when route doesn't exist (future=true)", function(assert) {
+		future.active = true;
+		const oRouter = fnCreateRouter();
+
+		assert.throws(() => oRouter.navTo("home"), new Error("Route with name home does not exist"), "Error thrown because route does not exist.");
+		future.active = undefined;
 	});
 
 	QUnit.test("Should be able to chain NavTo", function (assert) {
+		const oRouter = fnCreateRouter([
+			{
+				name: "home",
+				pattern: ""
+			}
+		]);
+		oRouter.oHashChanger = {
+			setHash: function () { }
+		};
 		// Act
-		var oReturnValue = this.oRouter.navTo();
+		var oReturnValue = oRouter.navTo("home");
 
 		// Assert
-		assert.strictEqual(oReturnValue, this.oRouter, "able to chain navTo");
+		assert.strictEqual(oReturnValue, oRouter, "able to chain navTo");
 	});
 
 	QUnit.test("Should be able to use navTo with query parameters", function (assert) {
@@ -1141,9 +1213,6 @@ sap.ui.define([
 			}
 		});
 		oRouter.initialize();
-
-		// Act
-		oRouter.navTo("home");
 	});
 
 	QUnit.test("Should throw an exception if route placeholder are not unique", function(assert){
@@ -3223,6 +3292,7 @@ sap.ui.define([
 	 * @deprecated As of version 1.90
 	 */
 	QUnit.test("Should throw an error if a nested component has configured synchronous routing", function(assert){
+		future.active = false;
 		return Component.create({
 			name: "qunit.router.component.nestedComponentSync.Parent",
 			id: "asyncParent"
@@ -3234,6 +3304,8 @@ sap.ui.define([
 			assert.equal(oHomeRouteMatchedSpy.callCount, 1, "The home route should be matched once");
 			return oHomeRouteMatchedSpy.getCall(0).returnValue.catch(function(oError){
 				assert.equal(oError.message, "The router of component 'asyncParent---syncChildComponent' which is loaded via the target 'home' is defined as synchronous which is not supported using as a nested component.", "The correct error should be thrown.");
+				oParentComponent.destroy();
+				future.active = undefined;
 			});
 		});
 	});

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.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");
+				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."), "The error message is correct");
 			});
 	});
 

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

@@ -1,5 +1,6 @@
 /*global QUnit, sinon */
 sap.ui.define([
+	"sap/base/future",
 	"sap/ui/core/mvc/XMLView",
 	"sap/ui/core/routing/Targets",
 	"sap/ui/core/routing/Views",
@@ -10,7 +11,7 @@ sap.ui.define([
 	"sap/m/App",
 	"sap/m/Panel",
 	"sap/ui/model/json/JSONModel"
-], function(XMLView, Targets, Views, Router, Log, deepExtend, ModuleHook, App, Panel, JSONModel){
+], function(future, XMLView, Targets, Views, Router, Log, deepExtend, ModuleHook, App, Panel, JSONModel){
 	"use strict";
 
 	// use sap.m.Panel as a lightweight drop-in replacement for the ux3.Shell
@@ -183,7 +184,11 @@ sap.ui.define([
 		assert.strictEqual(oTarget._oParent, this.oTargets.getTarget("myParent"), "correct parent should be set");
 	});
 
-	QUnit.test("Should kept the existing target and log an error message if 'addTarget' is called with the same name", function (assert) {
+	/**
+	 * @deprecated As of version 1.120
+	 */
+	QUnit.test("Should kept the existing target and log an error message if 'addTarget' is called with the same name (future=false)", function (assert) {
+		future.active = false;
 		// Arrange
 		var oStub = this.stub(Log, "error");
 
@@ -200,6 +205,20 @@ sap.ui.define([
 		assert.notOk(oParent._oOptions.viewName, "config is converted to the new format");
 		// Check whether the error message is thrown
 		sinon.assert.calledWith(oStub, sinon.match(/myParent/), sinon.match(this.oTargets));
+		future.active = undefined;
+	});
+
+	QUnit.test("Throw Error if 'addTarget' is called with the same name (future=true)", function (assert) {
+		future.active = true;
+
+		// Act
+		assert.throws(() => {
+			this.oTargets.addTarget("myParent", {
+				viewName: "myNewParentView"
+			});
+		}, new Error("Target with name myParent already exists"), "");
+
+		future.active = undefined;
 	});
 
 	QUnit.module("config - defaults and additional values", {
@@ -246,13 +265,35 @@ sap.ui.define([
 		assert.strictEqual(oOptions.rootView, "changed", "Did pass one of the routing api values from the config");
 	});
 
-	QUnit.module("config - invalid parent", {
-		afterEach: function () {
-			this.oTargets.destroy();
-		}
+	QUnit.module("config - invalid parent");
+
+	/**
+	 * @deprecated As of version 1.120
+	 */
+	QUnit.test("Should complain about an non existing parent (future=false)", function (assert) {
+		future.active = false;
+		// Arrange
+		var oIncorrectConfig = {
+			targets: {
+				myChildWithoutParent: {
+					parent: "foo"
+				}
+			}
+		},
+			oErrorStub = this.stub(Log, "error");
+
+		// System under test + Act
+		const oTargets = new Targets(oIncorrectConfig);
+
+		// Assert
+		sinon.assert.calledWith(oErrorStub, sinon.match(/was not found/), sinon.match(oTargets));
+
+		oTargets.destroy();
+		future.active = undefined;
 	});
 
-	QUnit.test("Should complain about an non existing parent", function (assert) {
+	QUnit.test("Should complain about an non existing parent (future=true)", function (assert) {
+		future.active = true;
 		// Arrange
 		var oIncorrectConfig = {
 				targets: {
@@ -260,14 +301,13 @@ sap.ui.define([
 						parent:"foo"
 					}
 				}
-			},
-			oErrorStub = this.stub(Log, "error");
+			};
 
 		// System under test + Act
-		this.oTargets = new Targets(oIncorrectConfig);
+		assert.throws(() => { this.oTargets = new Targets(oIncorrectConfig); },
+			new Error("The target 'myChildWithoutParent' has a parent 'foo' defined, but it was not found in the other targets"), "Throws an error because parent doesn't exist.");
 
-		// Assert
-		sinon.assert.calledWith(oErrorStub, sinon.match(/was not found/), sinon.match(this.oTargets));
+		future.active = undefined;
 	});
 
 	QUnit.module("display", {
@@ -348,7 +388,11 @@ sap.ui.define([
 
 	});
 
-	QUnit.test("Should log an error if user tries to display a non existing Target", function (assert) {
+	/**
+	 * @deprecated As of version 1.120
+	 */
+	QUnit.test("Should log an error if user tries to display a non existing Target (future=false)", function (assert) {
+		future.active = false;
 		// Assert
 		var oErrorStub = this.stub(Log, "error");
 
@@ -358,10 +402,21 @@ sap.ui.define([
 			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));
+			future.active = undefined;
 		}.bind(this));
 	});
 
-	QUnit.test("Should log an error if user tries to display a non existing Target, but should display existing ones", function (assert) {
+	QUnit.test("Should throw an error if user tries to display a non existing Target (future=true)", function (assert) {
+		future.active = true;
+		assert.throws(() => { this.oTargets.display("foo"); }, new Error("The target with the name \"foo\" does not exist!"), "Promise rejects because target does not exist");
+		future.active = undefined;
+	});
+
+	/**
+	 * @deprecated As of version 1.120
+	 */
+	QUnit.test("Should log an error if user tries to display a non existing Target, but should display existing ones (future=false)", function (assert) {
+		future.active = false;
 		// Assert
 		var oErrorStub = this.stub(Log, "error");
 		// Replace display with an empty fn
@@ -378,6 +433,7 @@ sap.ui.define([
 			assert.strictEqual(aViewInfos.length, 2, "Did resolve with two viewinfos");
 			assert.strictEqual(aViewInfos[1].name, "firstTarget", "Did resolve with first 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");
+			future.active = undefined;
 		}.bind(this));
 	});
 
@@ -990,7 +1046,11 @@ sap.ui.define([
 		});
 	});
 
-	QUnit.test("multiple targets - provided TitleTarget pointing to target without title", function (assert) {
+	/**
+	 * @deprecated As of version 1.120
+	 */
+	QUnit.test("multiple targets - provided TitleTarget pointing to target without title (future=false)", function (assert) {
+		future.active = false;
 		// Arrange
 		var that = this,
 			oData = {some : "data"},
@@ -1008,10 +1068,40 @@ sap.ui.define([
 		// Assert
 		return oDisplayed.then(function() {
 			assert.ok(fnEventSpy.notCalled, "the event isn't fired");
+			future.active = undefined;
 		});
 	});
 
-	QUnit.test("provided invalid TitleTarget", function (assert) {
+	QUnit.test("multiple targets - provided TitleTarget pointing to target without title (future=true)", function (assert) {
+		future.active = true;
+		// Arrange
+		const that = this,
+			oData = { some: "data" },
+			fnEventSpy = this.spy();
+
+		this.stub(this.oViews, "_getView").callsFake(function () {
+			return that.oView;
+		});
+
+		this.oTargets.attachTitleChanged(fnEventSpy);
+
+		// Act
+		const myAssertFn = () => {
+			this.oTargets.display(["myNoTitleTarget", "myTarget", "mySecondTarget"], oData, "myNoTitleTarget");
+		};
+
+		// Assert
+		assert.throws(myAssertFn, new Error("The target with the name \"myNoTitleTarget\" where the titleChanged event should be fired does not exist!"),
+			"Throws an error because target does not exist.");
+		assert.ok(fnEventSpy.notCalled, "the event isn't fired");
+		future.active = undefined;
+	});
+
+	/**
+	 * @deprecated As of version 1.120
+	 */
+	QUnit.test("provided invalid TitleTarget (future=false)", function (assert) {
+		future.active = false;
 		// Arrange
 		var that = this,
 			oData = {some : "data"},
@@ -1034,9 +1124,34 @@ sap.ui.define([
 				oLogSpy.calledWith(sinon.match(/The target with the name \"foo\" where the titleChanged event should be fired does not exist!/)),
 				this.oTargets
 			);
+			future.active = undefined;
 		}.bind(this));
 	});
 
+	QUnit.test("provided invalid TitleTarget (future=true)", function (assert) {
+		future.active = true;
+		// Arrange
+		var that = this,
+			oData = { some: "data" },
+			fnEventSpy = this.spy();
+
+		this.stub(this.oViews, "_getView").callsFake(function () {
+			return that.oView;
+		});
+
+		this.oTargets.attachTitleChanged(fnEventSpy);
+
+		// Act
+		const myAssertFn = () => {
+			this.oTargets.display(["myTarget"], oData, "foo");
+		};
+		assert.throws(myAssertFn, new Error("The target with the name \"foo\" where the titleChanged event should be fired does not exist!"),
+			"Throws an error because TitleTarget is invalid.");
+		assert.ok(fnEventSpy.notCalled, "the event isn't fired");
+
+		future.active = undefined;
+	});
+
 	QUnit.test("single target which has its own title with parent", function (assert) {
 		// Arrange
 		var that = this,