@openui5/sap.ui.core 1.120.9 → 1.120.11

package/test/sap/ui/core/demokit/tutorial/odatav4/08/ui5.yaml

@@ -4,7 +4,7 @@ metadata:
 type: application
 framework:
   name: OpenUI5
-  version: "1.120.9" #MainVersion#
+  version: "1.120.11" #MainVersion#
   libraries:
     - name: sap.m
     - name: sap.f

package/test/sap/ui/core/demokit/tutorial/odatav4/09/ui5.yaml

@@ -4,7 +4,7 @@ metadata:
 type: application
 framework:
   name: OpenUI5
-  version: "1.120.9" #MainVersion#
+  version: "1.120.11" #MainVersion#
   libraries:
     - name: sap.m
     - name: sap.f

package/test/sap/ui/core/demokit/tutorial/odatav4/10/ui5.yaml

@@ -4,7 +4,7 @@ metadata:
 type: application
 framework:
   name: OpenUI5
-  version: "1.120.9" #MainVersion#
+  version: "1.120.11" #MainVersion#
   libraries:
     - name: sap.m
     - name: sap.f

package/test/sap/ui/core/demokit/tutorial/odatav4/11/ui5.yaml

@@ -4,7 +4,7 @@ metadata:
 type: application
 framework:
   name: OpenUI5
-  version: "1.120.9" #MainVersion#
+  version: "1.120.11" #MainVersion#
   libraries:
     - name: sap.m
     - name: sap.f

package/test/sap/ui/core/demokit/tutorial/troubleshooting/01/ui5.yaml

@@ -4,7 +4,7 @@ metadata:
 type: application
 framework:
   name: OpenUI5
-  version: "1.120.9" #MainVersion#
+  version: "1.120.11" #MainVersion#
   libraries:
     - name: sap.m
     - name: sap.ui.layout

package/test/sap/ui/core/qunit/EventProvider.qunit.js

@@ -1,7 +1,8 @@
-/*global QUnit */
+/*global QUnit sinon */
 sap.ui.define([
+	"sap/base/Log",
 	"sap/ui/base/EventProvider"
-], function(EventProvider) {
+], function(Log, EventProvider) {
 	"use strict";
 
 	QUnit.test("InitialObject", function(assert) {
@@ -381,4 +382,31 @@ sap.ui.define([
 		assert.equal(iCount, 3, "Handler is called three times");
 	});
 
+	QUnit.test("FireEvent with Async Listener", async (assert) => {
+		const oEventProvider = new EventProvider();
+		const aPromises = [];
+
+		const myPromiseFunction = () => {
+			const oPromise = Promise.reject(new Error("Function failed."));
+			aPromises.push(oPromise);
+			return oPromise;
+		};
+		const myAsyncFunction = async () => {
+			const oPromise = Promise.reject(new Error("Async function failed."));
+			aPromises.push(oPromise);
+			await oPromise;
+		};
+
+		const myLogSpy = sinon.spy(Log, "error");
+		oEventProvider.attachEvent("MyEvent1", myPromiseFunction);
+		oEventProvider.attachEvent("MyEvent2", myAsyncFunction);
+		oEventProvider.fireEvent("MyEvent1");
+		oEventProvider.fireEvent("MyEvent2");
+
+		await Promise.allSettled(aPromises).then(() => {
+			assert.equal(myLogSpy.callCount, 2, "Error log should be displayed");
+			assert.ok(myLogSpy.getCall(0).calledWith("EventProvider.fireEvent: Event Listener for event 'MyEvent1' failed during execution."), "Correct Error Log displayed.");
+			assert.ok(myLogSpy.getCall(1).calledWith("EventProvider.fireEvent: Event Listener for event 'MyEvent2' failed during execution."), "Correct Error Log displayed.");
+		});
+	});
 });

package/test/sap/ui/core/qunit/ManagedObject.qunit.js

@@ -16,8 +16,9 @@ sap.ui.define([
 	"sap/ui/base/ManagedObjectMetadata",
 	"sap/base/strings/escapeRegExp",
 	"sap/base/util/isEmptyObject",
-	"sap/base/util/ObjectPath"
-], function(BindingInfo, BindingParser, DataType, ManagedObject, Element, JSONModel, Context, ManagedObjectModel, StringType, Control, Component, UIComponent, Sorter, ManagedObjectMetadata, escapeRegExp, isEmptyObject, ObjectPath) {
+	"sap/base/util/ObjectPath",
+	"sap/base/Log"
+], function(BindingInfo, BindingParser, DataType, ManagedObject, Element, JSONModel, Context, ManagedObjectModel, StringType, Control, Component, UIComponent, Sorter, ManagedObjectMetadata, escapeRegExp, isEmptyObject, ObjectPath, Log) {
 	"use strict";
 	var mObjects = {};
 
@@ -3260,4 +3261,45 @@ sap.ui.define([
 			done();
 		});
 	});
-});
+
+	QUnit.module("init/exit");
+
+	QUnit.test("Ensure that hooks do not return a value", async function (assert) {
+		const oErrorLogSpy = sinon.spy(Log, "error");
+		const aPromises = [];
+
+		const MySampleManagedObject = ManagedObject.extend("sap.ui.core.MySampleManagedObject", {
+			metadata: {
+				properties: {
+					name: { type: "string", defaultValue: "hello" }
+				}
+			},
+			init: function () {
+				return "init() shouldn't return a value.";
+			},
+			exit: async function () {
+				const oPromise = Promise.reject(new Error("exit() failed."));
+				aPromises.push(oPromise);
+				await oPromise;
+			}
+		});
+
+		// init
+		const oMySample = new MySampleManagedObject();
+		assert.ok(oErrorLogSpy.getCall(0).calledWith("[FUTURE FATAL] The registered Event Listener 'init' must not have a return value."), "init() should be logged correctly.");
+
+		// exit
+		oMySample.destroy();
+
+		await Promise.allSettled(aPromises);
+		assert.ok(oErrorLogSpy.getCall(1).calledWith("[FUTURE FATAL] The registered Event Listener 'exit' must not have a return value."), "exit() should be logged correctly.");
+
+		/**
+		 * @deprecated
+		 */
+		await Promise.resolve(() => {
+			assert.ok(oErrorLogSpy.getCall(2).calledWith("The registered Event Listener 'exit' of '__object0' failed."), "Promise rejection caught successfully.");
+		});
+		oErrorLogSpy.restore();
+	});
+});

package/test/sap/ui/core/qunit/app/DesignMode_suppressedDeactivation.qunit.js

@@ -23,10 +23,14 @@ sap.ui.define([
 			var oController = oView.getController();
 
 			//check lifecycle hooks
-			assert.equal(oController.onInit(), "aString", "Controller method has a return, i.e. method implementation was not replaced");
-			assert.equal(oController.onExit(), "aString", "Controller method has a return, i.e. method implementation was not replaced");
-			assert.equal(oController.onBeforeRendering(), "aString", "Controller method has a return, i.e. method implementation was not replaced");
-			assert.equal(oController.onAfterRendering(), "aString", "Controller method has a return, i.e. method implementation was not replaced");
+			oController.onInit();
+			assert.equal(oController._onInitCalled, true, "Controller method implementation was not replaced");
+			oController.onExit();
+			assert.equal(oController._onExitCalled, true, "Controller method implementation was not replaced");
+			oController.onBeforeRendering();
+			assert.equal(oController._onBeforeRenderingCalled, true, "Controller method implementation was not replaced");
+			oController.onAfterRendering();
+			assert.equal(oController._onAfterRenderingCalled, true, "Controller method implementation was not replaced");
 
 			//other methods
 			assert.equal(oController.method1(), "aString", "Controller method has a return, i.e. method implementation was not replaced");

package/test/sap/ui/core/qunit/app/_createDesignModeTests_legacyAPIs.qunit.js

@@ -78,10 +78,14 @@ sap.ui.define([
 				var oController = oView.getController();
 
 				//check lifecycle hooks
-				assert.equal(oController.onInit(), "aString", "Controller method has a return, i.e. method implementation was not replaced");
-				assert.equal(oController.onExit(), "aString", "Controller method has a return, i.e. method implementation was not replaced");
-				assert.equal(oController.onBeforeRendering(), "aString", "Controller method has a return, i.e. method implementation was not replaced");
-				assert.equal(oController.onAfterRendering(), "aString", "Controller method has a return, i.e. method implementation was not replaced");
+				oController.onInit();
+				assert.equal(oController._onInitCalled, true, "Controller method implementation was not replaced");
+				oController.onExit();
+				assert.equal(oController._onExitCalled, true, "Controller method implementation was not replaced");
+				oController.onBeforeRendering();
+				assert.equal(oController._onBeforeRenderingCalled, true, "Controller method implementation was not replaced");
+				oController.onAfterRendering();
+				assert.equal(oController._onAfterRenderingCalled, true, "Controller method implementation was not replaced");
 
 				//other methods
 				assert.equal(oController.method1(), "aString", "Controller method has a return, i.e. method implementation was not replaced");

package/test/sap/ui/core/qunit/app/fixture/designmode/test01.controller.js

@@ -6,19 +6,19 @@ sap.ui.define([
 
 	// lifecycle hooks
 		onInit : function() {
-			return "aString";
+			this._onInitCalled = true;
 		},
 
 		onExit : function(){
-			return "aString";
+			this._onExitCalled = true;
 		},
 
 		onBeforeRendering : function(){
-			return "aString";
+			this._onBeforeRenderingCalled = true;
 		},
 
 		onAfterRendering : function(){
-			return "aString";
+			this._onAfterRenderingCalled = true;
 		},
 
 	//other methods

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

@@ -1,6 +1,7 @@
 sap.ui.define([
+	"sap/base/Log",
 	"sap/ui/core/Component"
-], function (Component) {
+], function (Log, Component) {
 	"use strict";
 	/*global QUnit, sinon*/
 
@@ -600,4 +601,34 @@ sap.ui.define([
 			});
 		});
 	});
-});
+
+	QUnit.test("'onActivate/onDeactivate' should not return a value", async function(assert) {
+		window.aPromises = []; // see testdata.keepAlive.child3.Component.js
+		const oComponent = await Component.create({
+			id: "component",
+			name: "testdata.keepAlive.child3"
+		});
+
+		await fnWaitUntilHomeRouteMatched(oComponent);
+		assert.ok(oComponent.isActive(), "Component: Initially, the component is active");
+
+		const oErrorLogSpy = sinon.spy(Log, "error");
+		oComponent.deactivate();
+		await Promise.allSettled(window.aPromises);
+		assert.notOk(oComponent.isActive(), "Component: The component is not active after deactivate()");
+		assert.ok(oErrorLogSpy.getCall(0).calledWith("[FUTURE FATAL] The registered Event Listener 'onDeactivate' must not have a return value."), "The 'onDeactivate' should not return a value.");
+		assert.ok(oErrorLogSpy.getCall(1).calledWith("The registered Event Listener 'onDeactivate' of 'component' failed."), "The rejected Promise is caught successfully");
+
+		oComponent.activate();
+		assert.ok(oComponent.isActive(), "Component: The component is active after activate()");
+		assert.ok(oErrorLogSpy.getCall(2).calledWith("[FUTURE FATAL] The registered Event Listener 'onActivate' must not have a return value."), "The 'onActivate' should not return a value.");
+
+		/**
+		 * @deprecated
+		 */
+		await Promise.resolve(() => {
+			assert.ok(oErrorLogSpy.getCall(3).calledWith("The registered Event Listener 'onDeactivate' of 'component' failed."), "The rejected Promise is caught successfully");
+		});
+		oErrorLogSpy.restore();
+	});
+});

package/test/sap/ui/core/qunit/component/testdata/keepAlive/child3/App.view.xml

@@ -0,0 +1,3 @@
+<mvc:XMLView xmlns:mvc="sap.ui.core.mvc" xmlns="sap.m">
+	<App id="app"></App>
+</mvc:XMLView>

package/test/sap/ui/core/qunit/component/testdata/keepAlive/child3/Component.js

@@ -0,0 +1,20 @@
+sap.ui.define(["sap/ui/core/UIComponent"], function (UIComponent) {
+	"use strict";
+	return UIComponent.extend("testdata.keepAlive.child3.Component", {
+		metadata: {
+			manifest: "json"
+		},
+		init: function(){
+			UIComponent.prototype.init.apply(this, arguments);
+			this.getRouter().initialize();
+		},
+		onActivate: function() {
+			return "'onActivate' should not return a value.";
+		},
+		onDeactivate: async function() {
+			const oPromise = Promise.reject(new Error("'onDeactivate' failed."));
+			window.aPromises?.push(oPromise);
+			await oPromise;
+		}
+	});
+});

package/test/sap/ui/core/qunit/component/testdata/keepAlive/child3/Home.view.xml

@@ -0,0 +1,5 @@
+<mvc:XMLView xmlns:mvc="sap.ui.core.mvc" xmlns="sap.m">
+	<Page>
+		<Text text="Home" />
+	</Page>
+</mvc:XMLView>

package/test/sap/ui/core/qunit/component/testdata/keepAlive/child3/Other.view.xml

@@ -0,0 +1,5 @@
+<mvc:XMLView xmlns:mvc="sap.ui.core.mvc" xmlns="sap.m">
+	<Page>
+		<Text text="Other" />
+	</Page>
+</mvc:XMLView>

package/test/sap/ui/core/qunit/component/testdata/keepAlive/child3/manifest.json

@@ -0,0 +1,54 @@
+{
+	"sap.app": {
+		"id": "testdata.keepAlive.child3"
+	},
+	"sap.ui5": {
+		"keepAlive": {
+			"supported": true
+		},
+		"dependencies": {
+			"libs": {}
+		},
+		"rootView": {
+			"viewName": "testdata.keepAlive.child3.App",
+			"type": "XML",
+			"async": true,
+			"id": "appView"
+		},
+		"routing": {
+			"config": {
+				"routerClass": "sap.m.routing.Router",
+				"viewType": "XML",
+				"path": "testdata.keepAlive.child3",
+				"controlId": "app",
+				"controlAggregation": "pages",
+				"transition": "slide",
+				"async": true
+			},
+			"routes": [
+				{
+					"name": "home",
+					"pattern": "",
+					"target": "homeTarget"
+				},
+				{
+					"name": "other",
+					"pattern": "other",
+					"target": "otherTarget"
+				}
+			],
+			"targets": {
+				"homeTarget": {
+					"type": "View",
+					"id": "homeView",
+					"name": "Home"
+				},
+				"otherTarget": {
+					"type": "View",
+					"id": "otherView",
+					"name": "Other"
+				}
+			}
+		}
+	}
+}