@openui5/sap.ui.core 1.123.1 → 1.124.1

package/test/sap/ui/core/qunit/component/Component.qunit.js

@@ -2,6 +2,7 @@ sap.ui.define([
 	'sap/ui/qunit/utils/createAndAppendDiv',
 	"sap/ui/qunit/utils/nextUIUpdate",
 	'sap/ui/core/Component',
+	'sap/ui/core/Supportability',
 	'sap/ui/core/ComponentContainer',
 	'sap/ui/core/ComponentRegistry',
 	'sap/ui/core/Messaging',
@@ -12,8 +13,9 @@ sap.ui.define([
 	'sap/base/util/deepExtend',
 	'sap/base/util/LoaderExtensions',
 	'sap/ui/core/Manifest',
-	'sap/base/i18n/ResourceBundle'
-], function (createAndAppendDiv, nextUIUpdate, Component, ComponentContainer, ComponentRegistry, Messaging, UIComponentMetadata, SamplesRoutingComponent, SamplesRouterExtension, Log, deepExtend, LoaderExtensions, Manifest, ResourceBundle) {
+	'sap/base/i18n/ResourceBundle',
+	'sap/ui/VersionInfo'
+], function (createAndAppendDiv, nextUIUpdate, Component, Supportability, ComponentContainer, ComponentRegistry, Messaging, UIComponentMetadata, SamplesRoutingComponent, SamplesRouterExtension, Log, deepExtend, LoaderExtensions, Manifest, ResourceBundle, VersionInfo) {
 
 	"use strict";
 	/*global sinon, QUnit, foo*/
@@ -1541,6 +1543,32 @@ sap.ui.define([
 
 	});
 
+	/**
+	 * Legacy tests with an already loaded manifest.json for a Component with metadata based on a "component.json".
+	 * @deprecated
+	 */
+	QUnit.test("Component.create with loaded manifest content (legacy, component.json)", function(assert) {
+		var oProcessI18nSpy = this.spy(Manifest.prototype, "_processI18n");
+
+		return LoaderExtensions.loadResource(
+			"sap/ui/test/mixed_legacyAPIs/manifest.json",
+			{async: true}
+		).then(function(oManifest) {
+			return Component.create({
+				manifest: oManifest
+			});
+		}).then(function(oComponent) {
+			assert.ok(oComponent, "Component instance is created");
+			var iSyncCall = oProcessI18nSpy.getCalls().reduce(function(acc, oCall) {
+				if (oCall.args.length === 0 || !oCall.args[0]) {
+					acc++;
+				}
+				return acc;
+			}, 0);
+			assert.equal(iSyncCall, 0, "No sync loading of i18n is done");
+		});
+	});
+
 	QUnit.test("Component.create with loaded manifest content", function(assert) {
 		var oProcessI18nSpy = this.spy(Manifest.prototype, "_processI18n");
 
@@ -1563,8 +1591,11 @@ sap.ui.define([
 		});
 	});
 
-
-	QUnit.test("Check the loading of i18n of a component and its inheriting parent", function(assert) {
+	/**
+	 * Legacy tests with an inheritance chain that contains a "component.json" based parent.
+	 * @deprecated
+	 */
+	QUnit.test("Check the loading of i18n of a component and its inheriting parent (legacy, component.json)", function(assert) {
 		var oProcessI18nSpy = this.spy(Manifest.prototype, "_processI18n");
 
 		return Component.create({
@@ -1575,7 +1606,7 @@ sap.ui.define([
 			// _processI18n are called 3 times:
 			//  1. for the oComponent instance itself
 			//  2. for the sap.ui.test.inherit ComponentMetadata
-			//  3. for the inheriting parent sap.ui.test.inherit.parent ComponentMetadata
+			//  3. for the inheriting parent sap.ui.test.inherit.parent ComponentMetadata (component.json based)
 			assert.equal(oProcessI18nSpy.callCount, 3, "_processI18n is called for the expected times");
 
 			var iSyncCall = oProcessI18nSpy.getCalls().reduce(function(acc, oCall) {
@@ -1589,6 +1620,32 @@ sap.ui.define([
 		});
 	});
 
+	QUnit.test("Check the loading of i18n of a component and its inheriting parent", function(assert) {
+		var oProcessI18nSpy = this.spy(Manifest.prototype, "_processI18n");
+
+		return Component.create({
+			name: "sap.ui.test.inheritAsync"
+		}).then(function(oComponent) {
+			assert.ok(oComponent, "Component instance is created");
+
+			// _processI18n are called 4 times:
+			//  1. for the oComponent instance itself
+			//  2. for the sap.ui.test.inheritAsync ComponentMetadata
+			//  3. for the inheriting parent sap.ui.test.inheritAsync.parentB ComponentMetadata
+			//  4. for the inheriting parent sap.ui.test.inheritAsync.parentA ComponentMetadata
+			assert.equal(oProcessI18nSpy.callCount, 4, "_processI18n is called for the expected times");
+
+			var iSyncCall = oProcessI18nSpy.getCalls().reduce(function(acc, oCall) {
+				if (oCall.args.length === 0 || !oCall.args[0]) {
+					acc++;
+				}
+				return acc;
+			}, 0);
+
+			assert.equal(iSyncCall, 0, "No sync loading of i18n is done");
+		});
+	});
+
 	QUnit.module("Models", {
 		beforeEach : function() {
 
@@ -2031,8 +2088,8 @@ sap.ui.define([
 				},
 				"models": {
 					"myModel": {
-						"type": "sap.ui.model.odata.ODataModel",
-						"uri": "./some/odata/service"
+						"type": "sap.ui.model.odata.v2.ODataModel",
+						"uri": "./some/odata/service/"
 					}
 				}
 			}
@@ -2040,8 +2097,8 @@ sap.ui.define([
 
 		Component._fnPreprocessManifest = function(oManifestJSON) {
 			// To test if the modification is correctly passed back to the
-			// Component's manifest processing, we just change the class of a given model v1 -> v2
-			oManifestJSON["sap.ui5"]["models"]["myModel"].type = "sap.ui.model.odata.v2.ODataModel";
+			// Component's manifest processing, we just change the class of a given model v2 -> v4
+			oManifestJSON["sap.ui5"]["models"]["myModel"].type = "sap.ui.model.odata.v4.ODataModel";
 
 			return Promise.resolve(oManifestJSON);
 		};
@@ -2052,7 +2109,7 @@ sap.ui.define([
 		}).then(function(oComponent) {
 			// check if the modification was correctly taken over
 			var oModel = oComponent.getModel("myModel");
-			assert.ok(oModel.isA("sap.ui.model.odata.v2.ODataModel"), "Manifest was modified to use v2 instead of v1 ODataModel.");
+			assert.ok(oModel.isA("sap.ui.model.odata.v4.ODataModel"), "Manifest was modified to use v4 instead of v2 ODataModel.");
 		});
 	});
 
@@ -2119,8 +2176,8 @@ sap.ui.define([
 		// register hook and modify the manifest
 		Component._fnPreprocessManifest = function(oManifestJSON) {
 			// To test if the modification is correctly passed back to the
-			// Component's manifest processing, we just change the class of a given model v1 -> v2
-			oManifestJSON["sap.ui5"]["models"]["sfapi"].type = "sap.ui.model.odata.v2.ODataModel";
+			// Component's manifest processing, we just change the class of a given model v2 -> v4
+			oManifestJSON["sap.ui5"]["models"]["sfapi"].type = "sap.ui.model.odata.v4.ODataModel";
 
 			return Promise.resolve(oManifestJSON);
 		};
@@ -2131,7 +2188,7 @@ sap.ui.define([
 		}).then(function(oComponent) {
 			// check if the modification was correctly taken over
 			var oModel = oComponent.getModel("sfapi");
-			assert.ok(oModel.isA("sap.ui.model.odata.v2.ODataModel"), "Manifest was modified to use v2 instead of v1 ODataModel.");
+			assert.ok(oModel.isA("sap.ui.model.odata.v4.ODataModel"), "Manifest was modified to use v4 instead of v2 ODataModel.");
 		});
 	});
 
@@ -2178,8 +2235,8 @@ sap.ui.define([
 		// register hook and modify the manifest
 		Component._fnPreprocessManifest = function(oManifestJSON) {
 			// To test if the modification is correctly passed back to the
-			// Component's manifest processing, we just change the class of a given model v1 -> v2
-			oManifestJSON["sap.ui5"]["models"]["sfapi"].type = "sap.ui.model.odata.v2.ODataModel";
+			// Component's manifest processing, we just change the class of a given model v2 -> v4
+			oManifestJSON["sap.ui5"]["models"]["sfapi"].type = "sap.ui.model.odata.v4.ODataModel";
 
 			return Promise.resolve(oManifestJSON);
 		};
@@ -2190,7 +2247,7 @@ sap.ui.define([
 		}).then(function(oComponent) {
 			// check if the modification was correctly taken over
 			var oModel = oComponent.getModel("sfapi");
-			assert.ok(oModel.isA("sap.ui.model.odata.v2.ODataModel"), "Manifest was modified to use v2 instead of v1 ODataModel.");
+			assert.ok(oModel.isA("sap.ui.model.odata.v4.ODataModel"), "Manifest was modified to use v4 instead of v2 ODataModel.");
 		});
 	});
 
@@ -2747,4 +2804,19 @@ sap.ui.define([
 		}.bind(this));
 	});
 
+	QUnit.module("Multiple minUI5Version");
+
+	QUnit.test("Ensure that each major version can only be included once", async function (assert) {
+		assert.expect(1);
+		const oStub = sinon.stub(Supportability, "isDebugModeEnabled").callsFake(() => { return true; });
+	    const oLogStub = sinon.stub(Log, "isLoggable").callsFake(() => { return true; });
+
+		await Component.create({
+			name: "testdata.minUI5Version"
+		}).catch((error) => {
+			assert.equal(error.message, "The minimal UI5 versions defined in the manifest must not include multiple versions with the same major version, Component: testdata.minUI5Version.", "Error thrown because manifest contains multiple minUI5Versions with the same major version");
+			oStub.restore();
+			oLogStub.restore();
+		});
+	});
 });

package/test/sap/ui/core/qunit/component/ComponentContainer.qunit.js

@@ -1,9 +1,10 @@
 sap.ui.define([
+	'sap/base/future',
 	'sap/base/Log',
 	'sap/ui/core/library',
 	'sap/ui/core/Component',
 	'sap/ui/core/ComponentContainer'
-], function(Log, sapUiCore, Component, ComponentContainer) {
+], function(future, Log, sapUiCore, Component, ComponentContainer) {
 
 	"use strict";
 	/*global QUnit, sinon */
@@ -67,7 +68,11 @@ sap.ui.define([
 		oComponentContainer.onBeforeRendering();
 	});
 
-	QUnit.test("Create component async - componentFailed (default)", function (assert) {
+	/**
+	 * @deprecated
+	 */
+	QUnit.test("Create component async - componentFailed (default) (future=false)", function (assert) {
+		future.active = false;
 		var done = assert.async();
 		var oComponentContainer = new ComponentContainer({
 			name: "samples.components.unkown",
@@ -81,6 +86,7 @@ sap.ui.define([
 				Promise.resolve().then(function() {
 					assert.ok(oLogErrorSpy.calledWith(sinon.match(/Failed to load component for container/)));
 					assert.strictEqual(oLogErrorSpy.callCount, 1, "One error should have been logged");
+					future.active = undefined;
 					done();
 				});
 			}.bind(this)
@@ -88,6 +94,24 @@ sap.ui.define([
 		oComponentContainer.onBeforeRendering();
 	});
 
+	QUnit.test("Create component async - componentFailed (default) (future=true)", async function (assert) {
+		future.active = true;
+		var oComponentContainer = new ComponentContainer({
+			name: "samples.components.unkown",
+			async: true,
+			componentFailed: function(oEvent) {
+				var oReason = oEvent.getParameter("reason");
+				assert.ok(true, "Was not able to create component, componentFailed fired");
+				assert.ok(oReason.message.indexOf("failed to load") === 0, "Error object is passed as reason");
+			}
+		});
+		oComponentContainer.onBeforeRendering();
+		await oComponentContainer._oComponentPromise.catch((err) => {
+			assert.ok(err.message.includes("failed to load 'samples/components/unkown/Component.js"), "Component creation fails with correct error");
+			future.active = undefined;
+		});
+	});
+
 	QUnit.test("Create component async - componentFailed (prevent Default)", function (assert) {
 		var done = assert.async();
 		var oComponentContainer = new ComponentContainer({

package/test/sap/ui/core/qunit/component/ComponentSupport.qunit.js

@@ -1,4 +1,5 @@
 sap.ui.define([
+	'sap/base/future',
 	'sap/base/Log',
 	'sap/base/strings/hyphenate',
 	'sap/base/util/Deferred',
@@ -8,7 +9,7 @@ sap.ui.define([
 	'sap/ui/core/ComponentSupport',
 	"sap/ui/core/Element",
 	'sap/ui/core/library'
-], function(Log, hyphenate, Deferred, ObjectPath, UIComponent, ComponentContainer, ComponentSupport, Element, library) {
+], function(future, Log, hyphenate, Deferred, ObjectPath, UIComponent, ComponentContainer, ComponentSupport, Element, library) {
 
 	"use strict";
 	/*global QUnit, sinon*/
@@ -72,20 +73,22 @@ sap.ui.define([
 			componentCreated: "myAppController.onComponentCreated",
 			manifest: "true"
 		},
+		/**
+		 * @deprecated As of 1.120, manifest=false is no longer supported
+		 */
 		"div4": {
 			id: "container4",
 			name: "sap.ui.test.v2empty",
 			settings: {
 				id: "component4"
 			},
-			/**
-			 * @deprecated As of 1.120, the support for events is deprecated as it relies on global names
-			 */
 			componentCreated: "myAppController.onComponentCreated",
 			manifest: "false"
 		}
 	};
 
+	const iExpectedComponents = Object.keys(mSettings).length;
+
 	// convert the settings and create the component container div elements
 	var mContainers = {};
 	Object.keys(mSettings).forEach(function(sId) {
@@ -107,7 +110,7 @@ sap.ui.define([
 
 		// check the finder
 		var aElements = ComponentSupport._find();
-		assert.equal(aElements.length, 4, "Found 4 declarative components!");
+		assert.equal(aElements.length, iExpectedComponents, `Found ${iExpectedComponents} declarative components!`);
 
 		for (var i = 0, l = aElements.length; i < l; i++) {
 			var oElement = aElements[i];
@@ -141,16 +144,43 @@ sap.ui.define([
 
 	});
 
-	QUnit.test("Parser with unknown setting", function(assert) {
+	/**
+	 * @deprecated As of 1.120
+	 */
+	QUnit.test("Parser with unknown setting (future:false)", function(assert) {
+
+		future.active = false;
 
 		this.spy(Log, "warning");
+
 		var oElement = document.createElement("div");
 		oElement.setAttribute("data-unknown", "foo");
+
+		const expectedMessage =
+			"Property or event \"unknown\" does not exist in sap.ui.core.ComponentContainer. It will be ignored";
+
 		ComponentSupport._parse(oElement);
 		assert.ok(
-			Log.warning.calledWithMatch("Property or event \"unknown\" will be ignored as it does not exist in sap.ui.core.ComponentContainer"),
+			Log.warning.calledWithMatch(expectedMessage),
 			"should log a warning with the expected message");
 
+		future.active = undefined; // restores configured default
+	});
+
+	QUnit.test("Parser with unknown setting (future:true)", function(assert) {
+		future.active = true;
+
+		var oElement = document.createElement("div");
+		oElement.setAttribute("data-unknown", "foo");
+
+		const expectedMessage =
+			"Property or event \"unknown\" does not exist in sap.ui.core.ComponentContainer.";
+
+		assert.throws(() => {
+			ComponentSupport._parse(oElement);
+		}, new Error(expectedMessage), "should throw an error with the expected message");
+
+		future.active = undefined; // restores configured default
 	});
 
 	/**
@@ -170,11 +200,10 @@ sap.ui.define([
 
 		const aComponentElements = document.querySelectorAll("[data-sap-ui-component]");
 
-		assert.equal(aComponentElements.length, 4, "There should be four declarative elements");
-		assert.ok(aComponentElements[0].hasAttribute("data-sap-ui-component"), "First element should have the indicator attribute");
-		assert.ok(aComponentElements[1].hasAttribute("data-sap-ui-component"), "Second element should have the indicator attribute");
-		assert.ok(aComponentElements[2].hasAttribute("data-sap-ui-component"), "Third element should have the indicator attribute");
-		assert.ok(aComponentElements[3].hasAttribute("data-sap-ui-component"), "Fourth element should have the indicator attribute");
+		assert.equal(aComponentElements.length, iExpectedComponents, `There should be ${iExpectedComponents} declarative elements`);
+		aComponentElements.forEach((oElement, idx) => {
+			assert.ok(oElement.hasAttribute("data-sap-ui-component"), `Element ${idx + 1} should have the indicator attribute`);
+		});
 
 		const deferred = new Deferred();
 		let iComponentCount = 0;
@@ -183,7 +212,7 @@ sap.ui.define([
 			mSettings.componentCreated = function() {
 				iComponentCount++;
 				// continue the test once all component instances have been created
-				if (iComponentCount == 4) {
+				if (iComponentCount == iExpectedComponents) {
 					deferred.resolve();
 				}
 			};
@@ -194,16 +223,12 @@ sap.ui.define([
 		ComponentSupport.run();
 
 		// Four ComponentContainers should have been created
-		sinon.assert.callCount(ComponentContainer.prototype.applySettings, 4);
+		sinon.assert.callCount(ComponentContainer.prototype.applySettings, iExpectedComponents);
 
-		assert.notOk(aComponentElements[0].hasAttribute("data-sap-ui-component"), "First element should not have the indicator attribute anymore");
-		assert.ok(aComponentElements[0].parentNode, "First element should still be part of the DOM");
-		assert.notOk(aComponentElements[1].hasAttribute("data-sap-ui-component"), "Second element should not have the indicator attribute anymore");
-		assert.ok(aComponentElements[1].parentNode, "Second element should still be part of the DOM");
-		assert.notOk(aComponentElements[1].hasAttribute("data-sap-ui-component"), "Third element should not have the indicator attribute anymore");
-		assert.ok(aComponentElements[1].parentNode, "Third element should still be part of the DOM");
-		assert.notOk(aComponentElements[1].hasAttribute("data-sap-ui-component"), "Fourth element should not have the indicator attribute anymore");
-		assert.ok(aComponentElements[1].parentNode, "Fourth element should still be part of the DOM");
+		aComponentElements.forEach((oElement, idx) => {
+			assert.notOk(oElement.hasAttribute("data-sap-ui-component"), `Element ${idx + 1} should not have the indicator attribute anymore`);
+			assert.ok(oElement.parentNode, `Element ${idx + 1} should still be part of the DOM`);
+		});
 
 		assert.equal(document.querySelectorAll("[data-sap-ui-component]").length, 0, "There should not be any declarative elements anymore");
 
@@ -211,51 +236,29 @@ sap.ui.define([
 		ComponentSupport.run();
 
 		// Still, only four ComponentContainers should have been created
-		sinon.assert.callCount(ComponentContainer.prototype.applySettings, 4);
+		sinon.assert.callCount(ComponentContainer.prototype.applySettings, iExpectedComponents);
 
 		return deferred.promise.then(function() {
 
-			assert.ok(document.getElementById("div1"), "Placeholder DIV for first Component found!");
-			assert.ok(document.getElementById("div2"), "Placeholder DIV for second Component found!");
-			assert.ok(document.getElementById("div3"), "Placeholder DIV for third Component found!");
-			assert.ok(document.getElementById("div4"), "Placeholder DIV for fourth Component found!");
-			assert.ok(document.getElementById("container1"), "ComponentContainer element for first Component found!");
-			assert.ok(document.getElementById("container2"), "ComponentContainer element for second Component found!");
-			assert.ok(document.getElementById("container3"), "ComponentContainer element for third Component found!");
-			assert.ok(document.getElementById("container4"), "ComponentContainer element for fourth Component found!");
-
-			var oContainer1 = Element.getElementById("container1");
-			var oContainer2 = Element.getElementById("container2");
-			var oContainer3 = Element.getElementById("container3");
-			var oContainer4 = Element.getElementById("container4");
-			assert.ok(oContainer1 instanceof ComponentContainer, "ComponentContainer for first Component found!");
-			assert.ok(oContainer2 instanceof ComponentContainer, "ComponentContainer for second Component found!");
-			assert.ok(oContainer3 instanceof ComponentContainer, "ComponentContainer for third Component found!");
-			assert.ok(oContainer4 instanceof ComponentContainer, "ComponentContainer for fourth Component found!");
-
-			var oComponent1 = oContainer1.getComponentInstance();
-			var oComponent2 = oContainer2.getComponentInstance();
-			var oComponent3 = oContainer3.getComponentInstance();
-			var oComponent4 = oContainer4.getComponentInstance();
-			assert.ok(oComponent1 instanceof UIComponent, "UIComponent instance for first Component found!");
-			assert.ok(oComponent2 instanceof UIComponent, "UIComponent instance for second Component found!");
-			assert.ok(oComponent3 instanceof UIComponent, "UIComponent instance for third Component found!");
-			assert.ok(oComponent4 instanceof UIComponent, "UIComponent instance for fourth Component found!");
-
-			assert.equal(oComponent1.getId(), oContainer1.getId() + "-component1", "The id of the first Component is correct!");
-			assert.equal(oComponent1.getMetadata().getName(), "sap.ui.test.v2empty.Component", "The name of the first Component is correct!");
-			assert.equal(oComponent2.getId(), oContainer2.getId() + "-component2", "The id of the second Component is correct!");
-			assert.equal(oComponent2.getMetadata().getName(), "sap.ui.test.v2empty.Component", "The name of the second Component is correct!");
-			assert.equal(oComponent3.getId(), oContainer3.getId() + "-component3", "The id of the third Component is correct!");
-			assert.equal(oComponent3.getMetadata().getName(), "sap.ui.test.v2empty.Component", "The name of the third Component is correct!");
-			assert.equal(oComponent4.getId(), oContainer4.getId() + "-component4", "The id of the fourth Component is correct!");
-			assert.equal(oComponent4.getMetadata().getName(), "sap.ui.test.v2empty.Component", "The name of the fourth Component is correct!");
+			for (let i = 1; i <= iExpectedComponents; i++) {
+				assert.ok(document.getElementById(`div${i}`), `Placeholder DIV for Component ${i} found!`);
+				assert.ok(document.getElementById(`container${i}`), `ComponentContainer element for Component ${i} found!`);
+
+				const oContainer = Element.getElementById(`container${i}`);
+				assert.ok(oContainer instanceof ComponentContainer, `ComponentContainer for Component ${i} found!`);
+
+				const oComponent = oContainer.getComponentInstance();
+				assert.ok(oComponent instanceof UIComponent, `UIComponent instance for Component ${i} found!`);
+
+				assert.equal(oComponent.getId(), `${oContainer.getId()}-component${i}`, `The id of Component ${i} is correct!`);
+				assert.equal(oComponent.getMetadata().getName(), "sap.ui.test.v2empty.Component", `The name of the Component ${i} is correct!`);
+			}
 
 			// Executing run again afterwards also shouldn't try to create the same containers again
 			ComponentSupport.run();
 
 			// Still, only four ComponentContainers should have been created
-			sinon.assert.callCount(ComponentContainer.prototype.applySettings, 4);
+			sinon.assert.callCount(ComponentContainer.prototype.applySettings, iExpectedComponents);
 
 		});
 

package/test/sap/ui/core/qunit/component/Component_keepAlive.qunit.js

@@ -1,7 +1,8 @@
 sap.ui.define([
+	"sap/base/future",
 	"sap/base/Log",
 	"sap/ui/core/Component"
-], function (Log, Component) {
+], function (future, Log, Component) {
 	"use strict";
 	/*global QUnit, sinon*/
 
@@ -602,11 +603,40 @@ sap.ui.define([
 		});
 	});
 
-	QUnit.test("'onActivate/onDeactivate' should not return a value", async function(assert) {
+	/**
+	 * @deprecated
+	 */
+	QUnit.test("'onActivate' should not return a value (future=false)", async function(assert) {
+		future.active = false;
 		window.aPromises = []; // see testdata.keepAlive.child3.Component.js
 		const oComponent = await Component.create({
 			id: "component",
-			name: "testdata.keepAlive.child3"
+			name: "testdata.keepAlive.child3OnActivateReturns"
+		});
+
+		await fnWaitUntilHomeRouteMatched(oComponent);
+		assert.ok(oComponent.isActive(), "Component: Initially, the component is active");
+
+		const oFatalLogSpy = sinon.spy(Log, "fatal");
+		oComponent.deactivate();
+		oComponent.activate();
+		assert.ok(oComponent.isActive(), "Component: The component is active after activate()");
+		assert.ok(oFatalLogSpy.getCall(0).calledWith("[FUTURE FATAL] The registered Event Listener 'onActivate' must not have a return value."), "The 'onActivate' should not return a value.");
+
+		oFatalLogSpy.restore();
+		oComponent.destroy();
+		future.active = undefined;
+	});
+
+	/**
+	 * @deprecated
+	 */
+	QUnit.test("'onDeactivate' should not return a value (future=false)", async function(assert) {
+		future.active = false;
+		window.aPromises = []; // see testdata.keepAlive.child3.Component.js
+		const oComponent = await Component.create({
+			id: "component",
+			name: "testdata.keepAlive.child3OnDeactivateReturns"
 		});
 
 		await fnWaitUntilHomeRouteMatched(oComponent);
@@ -623,10 +653,6 @@ sap.ui.define([
 		assert.notOk(oComponent.isActive(), "Component: The component is not active after deactivate()");
 		assert.ok(oFatalLogSpy.getCall(0).calledWith("[FUTURE FATAL] The registered Event Listener 'onDeactivate' must not have a return value."), "The 'onDeactivate' should not return a value.");
 
-		oComponent.activate();
-		assert.ok(oComponent.isActive(), "Component: The component is active after activate()");
-		assert.ok(oFatalLogSpy.getCall(1).calledWith("[FUTURE FATAL] The registered Event Listener 'onActivate' must not have a return value."), "The 'onActivate' should not return a value.");
-
 		/**
 		 * @deprecated
 		 */
@@ -636,5 +662,47 @@ sap.ui.define([
 		});
 
 		oFatalLogSpy.restore();
+		oComponent.destroy();
+		future.active = undefined;
 	});
+
+	QUnit.test("'onActivate' should not return a value (future=true)", async function(assert) {
+		future.active = true;
+		const oComponent = await Component.create({
+			id: "component",
+			name: "testdata.keepAlive.child3OnActivateReturns"
+		});
+
+		await fnWaitUntilHomeRouteMatched(oComponent);
+		assert.ok(oComponent.isActive(), "Component: Initially, the component is active");
+
+		oComponent.deactivate();
+		assert.throws(() => oComponent.activate(),
+			new Error("The registered Event Listener 'onActivate' must not have a return value."),
+			"The 'onActivate' should not return a value."
+		);
+
+		oComponent.destroy();
+		future.active = undefined;
+	});
+
+	QUnit.test("'onDeactivate' should not return a value (future=true)", async function(assert) {
+		future.active = true;
+		const oComponent = await Component.create({
+			id: "component",
+			name: "testdata.keepAlive.child3OnDeactivateReturns"
+		});
+
+		await fnWaitUntilHomeRouteMatched(oComponent);
+		assert.ok(oComponent.isActive(), "Component: Initially, the component is active");
+
+		assert.throws(() => oComponent.deactivate(),
+			new Error("The registered Event Listener 'onDeactivate' must not have a return value."),
+			"The 'onDeactivate' should not return a value."
+		);
+
+		oComponent.destroy();
+		future.active = undefined;
+	});
+
 });