@openui5/sap.ui.core 1.120.9 → 1.120.11

package/test/sap/ui/core/qunit/mvc/Controller.qunit.js

@@ -6,8 +6,9 @@ sap.ui.define([
 	'sap/ui/core/ElementRegistry',
 	'sap/ui/core/mvc/XMLView',
 	'sap/ui/core/mvc/Controller',
-	'sap/base/Log'
-], function(Component, Fragment, Element, ElementRegistry, XMLView, Controller, Log) {
+	'sap/base/Log',
+	'sap/ui/qunit/utils/nextUIUpdate'
+], function(Component, Fragment, Element, ElementRegistry, XMLView, Controller, Log, nextUIUpdate) {
 	"use strict";
 
 	QUnit.module("Controller.create API");
@@ -15,13 +16,13 @@ sap.ui.define([
 	/**
 	 * See @evo-todo in Controller.js
 	 */
-	QUnit.test("Controller Loading", function (assert) {
+	QUnit.test("Controller Loading", function(assert) {
 		var done = assert.async();
-		sap.ui.require(["sap/ui/core/mvc/Controller"], function (Controller) {
+		sap.ui.require(["sap/ui/core/mvc/Controller"], function(Controller) {
 			Controller.create({
 				name: "testdata.mvc.ControllerCreateTest"
 			})
-			.then(function (oController) {
+			.then(function(oController) {
 				assert.equal(oController.double(8), 16, "Controller implementation was correctly returned");
 				done();
 			});
@@ -78,7 +79,7 @@ sap.ui.define([
 		assert.equal(aDangling.length, 0, "No dangling controls found for '" + oView.getId() + "'.");
 	}
 
-	QUnit.test("Multiple asynchronous Fragment.create - duplicate ID issue expected", function(assert){
+	QUnit.test("Multiple asynchronous Fragment.create - duplicate ID issue expected", function(assert) {
 		assert.expect(4);
 		var aFragmentPromises = [];
 		var aViews = [];
@@ -91,7 +92,7 @@ sap.ui.define([
 
 		sap.ui.define("my/Controller01.controller", function() {
 			return Controller.extend("my.Controller01", {
-				onInit: function(){
+				onInit: function() {
 					this._pFragment = Fragment.load({
 						name: "testdata.fragments.XMLView",
 						type: "XML"
@@ -102,24 +103,24 @@ sap.ui.define([
 
 		var pView1 = XMLView.create({
 			definition: "<mvc:View xmlns:mvc='sap.ui.core.mvc' controllerName='my.Controller01'>" +
-			"</mvc:View>"
-		}).then(function(oView){
+				"</mvc:View>"
+		}).then(function(oView) {
 			aFragmentPromises.push(oView.getController()._pFragment.catch(assertCatch));
 			return oView;
 		});
 
 		var pView2 = XMLView.create({
 			definition: "<mvc:View xmlns:mvc='sap.ui.core.mvc' controllerName='my.Controller01'>" +
-						"</mvc:View>"
-		}).then(function(oView){
+				"</mvc:View>"
+		}).then(function(oView) {
 			aFragmentPromises.push(oView.getController()._pFragment.catch(assertCatch));
 			return oView;
 		});
 
-		return Promise.all([pView1, pView2]).then(function (oArguments) {
+		return Promise.all([pView1, pView2]).then(function(oArguments) {
 			aViews = oArguments;
 
-			return Promise.allSettled(aFragmentPromises).then(function(){
+			return Promise.allSettled(aFragmentPromises).then(function() {
 				// Clean-Up
 				aViews[0].destroy();
 				aViews[1].destroy();
@@ -132,7 +133,7 @@ sap.ui.define([
 		});
 	});
 
-	QUnit.test("Multiple asynchronous Controller.loadFragment - no duplicate ID issue expectecd", function(assert){
+	QUnit.test("Multiple asynchronous Controller.loadFragment - no duplicate ID issue expectecd", function(assert) {
 		assert.expect(2);
 
 		var aViews = [], aFragmentPromises = [];
@@ -144,7 +145,7 @@ sap.ui.define([
 
 		sap.ui.define("my/Controller02.controller", function() {
 			return Controller.extend("my.Controller02", {
-				onInit: function(){
+				onInit: function() {
 					this._pFragment = this.loadFragment({
 						name: "testdata.fragments.XMLView",
 						type: "XML"
@@ -155,21 +156,21 @@ sap.ui.define([
 
 		var pView1 = XMLView.create({
 			definition: "<mvc:View xmlns:mvc='sap.ui.core.mvc' controllerName='my.Controller02'>" +
-			"</mvc:View>"
-		}).then(function(oView){
+				"</mvc:View>"
+		}).then(function(oView) {
 			aFragmentPromises.push(oView.getController()._pFragment.catch(assertCatch));
 			return oView;
 		});
 
 		var pView2 = XMLView.create({
 			definition: "<mvc:View xmlns:mvc='sap.ui.core.mvc' controllerName='my.Controller02'>" +
-						"</mvc:View>"
-		}).then(function(oView){
+				"</mvc:View>"
+		}).then(function(oView) {
 			aFragmentPromises.push(oView.getController()._pFragment.catch(assertCatch));
 			return oView;
 		});
 
-		return Promise.all([pView1, pView2]).then(function (aResult) {
+		return Promise.all([pView1, pView2]).then(function(aResult) {
 			aViews = aResult;
 
 			// get controller first, the reference is otherwise lost after calling destroy()
@@ -186,19 +187,19 @@ sap.ui.define([
 			// capture all concurrent promises, the catch handler above and the implicit destroy of the controller
 			return Promise.allSettled(
 				aFragmentPromises.concat(oCtr1._getDestroyables())
-								.concat(oCtr2._getDestroyables()));
+					.concat(oCtr2._getDestroyables()));
 		}).then(function() {
 			checkForDanglingControls(assert, aViews[0]);
 			checkForDanglingControls(assert, aViews[1]);
 		});
 	});
 
-	QUnit.test("Fragment.create - add to dependents after destruction of view", function(assert){
+	QUnit.test("Fragment.create - add to dependents after destruction of view", function(assert) {
 		assert.expect(3);
 
 		sap.ui.define("my/Controller03.controller", function() {
 			return Controller.extend("my.Controller03", {
-				onInit: function(){
+				onInit: function() {
 					this._pFragment = Fragment.load({
 						name: "testdata.fragments.XMLView",
 						type: "XML"
@@ -211,8 +212,8 @@ sap.ui.define([
 
 		return XMLView.create({
 			definition: "<mvc:View xmlns:mvc='sap.ui.core.mvc' controllerName='my.Controller03'>" +
-			"</mvc:View>"
-		}).then(function(oView){
+				"</mvc:View>"
+		}).then(function(oView) {
 			var pFragmentPromise = oView.getController()._pFragment;
 			oView.destroy();
 			return pFragmentPromise.then(function() {
@@ -225,12 +226,12 @@ sap.ui.define([
 		});
 	});
 
-	QUnit.test("Controller.loadFragment - dependents cleaned up correctly", function(assert){
+	QUnit.test("Controller.loadFragment - dependents cleaned up correctly", function(assert) {
 		assert.expect(5);
 
 		sap.ui.define("my/Controller04.controller", function() {
 			return Controller.extend("my.Controller04", {
-				onInit: function(){
+				onInit: function() {
 					this._pFragment = this.loadFragment({
 						name: "testdata.fragments.XMLView",
 						type: "XML"
@@ -241,8 +242,8 @@ sap.ui.define([
 
 		var pView1 = XMLView.create({
 			definition: "<mvc:View xmlns:mvc='sap.ui.core.mvc' controllerName='my.Controller04'>" +
-			"</mvc:View>"
-		}).then(function(oView){
+				"</mvc:View>"
+		}).then(function(oView) {
 			var pResult = oView.getController()._pFragment.then(function() {
 				// return so we can use it for a clean up check later!
 				return oView;
@@ -256,8 +257,8 @@ sap.ui.define([
 
 		var pView2 = XMLView.create({
 			definition: "<mvc:View xmlns:mvc='sap.ui.core.mvc' controllerName='my.Controller04'>" +
-						"</mvc:View>"
-		}).then(function(oView){
+				"</mvc:View>"
+		}).then(function(oView) {
 			return oView.getController()._pFragment.then(function() {
 				assert.ok(oView.byId("xmlViewInsideFragment"), "Nested view added to dependents");
 				assert.ok(oView.getDependents().length === 1, "View has 1 dependent");
@@ -279,15 +280,15 @@ sap.ui.define([
 		});
 	});
 
-	QUnit.test("Controller.loadFragment - owner component set correctly", function(assert){
+	QUnit.test("Controller.loadFragment - owner component set correctly", function(assert) {
 		assert.expect(1);
 
-		var oComponent = new Component({id: "myComponent"});
+		var oComponent = new Component({ id: "myComponent" });
 		var pFragmentReady;
 
 		sap.ui.define("my/Controller05.controller", function() {
 			return Controller.extend("my.Controller05", {
-				onInit: function(){
+				onInit: function() {
 					pFragmentReady = new Promise(function(res, rej) {
 						this.loadFragment({
 							name: "testdata.fragments.XMLView",
@@ -304,8 +305,8 @@ sap.ui.define([
 		return oComponent.runAsOwner(function() {
 			return XMLView.create({
 				definition: "<mvc:View xmlns:mvc='sap.ui.core.mvc' controllerName='my.Controller05'>" +
-				"</mvc:View>"
-			}).then(function(oView){
+					"</mvc:View>"
+			}).then(function(oView) {
 				return pFragmentReady.then(function() {
 					assert.equal(oComponent, Component.getOwnerComponentFor(oView.getDependents()[0]), "Owner component set cortrectly for fragment");
 					oComponent.destroy();
@@ -314,14 +315,14 @@ sap.ui.define([
 		});
 	});
 
-	QUnit.test("Controller.loadFragment - add not to dependents", function(assert){
+	QUnit.test("Controller.loadFragment - add not to dependents", function(assert) {
 		assert.expect(1);
 
 		var pFragmentReady;
 
 		sap.ui.define("my/Controller06.controller", function() {
 			return Controller.extend("my.Controller06", {
-				onInit: function(){
+				onInit: function() {
 					pFragmentReady = new Promise(function(res, rej) {
 						this.loadFragment({
 							name: "testdata.fragments.XMLView",
@@ -337,8 +338,8 @@ sap.ui.define([
 
 		return XMLView.create({
 			definition: "<mvc:View xmlns:mvc='sap.ui.core.mvc' controllerName='my.Controller06'>" +
-			"</mvc:View>"
-		}).then(function(oView){
+				"</mvc:View>"
+		}).then(function(oView) {
 			return pFragmentReady.then(function() {
 				assert.equal(oView.getDependents().length, 0, "Fragment is not added to the dependents aggregation of the view");
 				oView.destroy();
@@ -346,14 +347,14 @@ sap.ui.define([
 		});
 	});
 
-	QUnit.test("Controller.loadFragment - no fragment ID and no autoPrefixId", function(assert){
+	QUnit.test("Controller.loadFragment - no fragment ID and no autoPrefixId", function(assert) {
 		assert.expect(2);
 
 		var pFragmentReady;
 
 		sap.ui.define("my/Controller07.controller", function() {
 			return Controller.extend("my.Controller07", {
-				onInit: function(){
+				onInit: function() {
 					pFragmentReady = new Promise(function(res, rej) {
 						this.loadFragment({
 							name: "testdata.fragments.XMLView",
@@ -369,8 +370,8 @@ sap.ui.define([
 
 		return XMLView.create({
 			definition: "<mvc:View xmlns:mvc='sap.ui.core.mvc' controllerName='my.Controller07'>" +
-			"</mvc:View>"
-		}).then(function(oView){
+				"</mvc:View>"
+		}).then(function(oView) {
 			return pFragmentReady.then(function() {
 				assert.ok(Element.getElementById("xmlViewInsideFragment"), "Fragment content is not prefixed by any ID.");
 				assert.notOk(oView.byId("xmlViewInsideFragment"), "Fragment content is not prefixed by the view ID.");
@@ -379,14 +380,14 @@ sap.ui.define([
 		});
 	});
 
-	QUnit.test("Controller.loadFragment - fragment ID but no autoPrefixId", function(assert){
+	QUnit.test("Controller.loadFragment - fragment ID but no autoPrefixId", function(assert) {
 		assert.expect(2);
 
 		var pFragmentReady;
 
 		sap.ui.define("my/Controller08.controller", function() {
 			return Controller.extend("my.Controller08", {
-				onInit: function(){
+				onInit: function() {
 					pFragmentReady = new Promise(function(res, rej) {
 						this.loadFragment({
 							name: "testdata.fragments.XMLView",
@@ -403,8 +404,8 @@ sap.ui.define([
 
 		return XMLView.create({
 			definition: "<mvc:View xmlns:mvc='sap.ui.core.mvc' controllerName='my.Controller08'>" +
-			"</mvc:View>"
-		}).then(function(oView){
+				"</mvc:View>"
+		}).then(function(oView) {
 			return pFragmentReady.then(function() {
 				assert.ok(Element.getElementById("myFragment--xmlViewInsideFragment"), "Fragment content is prefixed by the given ID.");
 				assert.notOk(oView.byId("myFragment--xmlViewInsideFragment"), "Fragment content is not prefixed by the view ID.");
@@ -412,4 +413,58 @@ sap.ui.define([
 			});
 		});
 	});
-});
+
+	QUnit.module("Controller Lifecycle-Hooks");
+
+	QUnit.test("Shouldn't return any values", async (assert) => {
+		const aPromises = [];
+		sap.ui.define("my/Controller09.controller", ["sap/ui/core/mvc/Controller"], function(Controller) {
+			return Controller.extend("my.Controller09", {
+				onInit: function() {
+					return "onInit returns a String value";
+				},
+				onExit: function() {
+					const oPromise = Promise.reject(new Error("onExit returns rejected Promise."));
+					aPromises.push(oPromise);
+					return oPromise;
+				},
+				onBeforeRendering: async function() {
+					const oPromise = Promise.resolve("async onBeforeRendering returns resolved Promise.");
+					aPromises.push(oPromise);
+					await oPromise;
+				},
+				onAfterRendering: async function() {
+					const oPromise = Promise.reject(new Error("async onAfterRendering returns rejected Promise."));
+					aPromises.push(oPromise);
+					await oPromise;
+				}
+			});
+		});
+		const oErrorLogSpy = sinon.spy(Log, "error");
+		const oView = await XMLView.create({
+			viewName: "example.mvc.asyncHooks"
+		});
+		assert.ok(oView, "View is created");
+		assert.ok(oErrorLogSpy.getCall(0).calledWith("[FUTURE FATAL] The registered Event Listener 'onInit' must not have a return value."), "Correct Fatal Log displayed");
+
+		// render view to enforce lifecycle-Hooks to be triggered
+		oView.placeAt("qunit-fixture");
+		await nextUIUpdate();
+		assert.ok(oView.getDomRef(), "View is rendered");
+		assert.ok(oErrorLogSpy.getCall(1).calledWith("[FUTURE FATAL] The registered Event Listener 'onBeforeRendering' must not have a return value."), "Correct Fatal Log displayed");
+		assert.ok(oErrorLogSpy.getCall(2).calledWith("[FUTURE FATAL] The registered Event Listener 'onAfterRendering' must not have a return value."), "Correct Fatal Log displayed");
+
+		oView.destroy();
+		assert.ok(oErrorLogSpy.getCall(3).calledWith("[FUTURE FATAL] The registered Event Listener 'onExit' must not have a return value."), "Correct Fatal Log displayed");
+
+		/**
+		 * @deprecated
+		 */
+		await (async () => {
+			await Promise.allSettled(aPromises);
+			assert.ok(oErrorLogSpy.getCall(4).calledWith("The registered Event Listener 'onAfterRendering' of 'my.Controller09' failed."), "Rejected Promise of 'onAfterRendering' hook should be handled and the correct error logged.");
+			assert.ok(oErrorLogSpy.getCall(5).calledWith("The registered Event Listener 'onExit' of 'my.Controller09' failed."), "Rejected Promise of 'onExit' hook should be handled and the correct error logged.");
+		})();
+		oErrorLogSpy.restore();
+	});
+});

package/test/sap/ui/core/qunit/mvc/testdata/asyncHooks.view.xml

@@ -0,0 +1,7 @@
+<mvc:View controllerName="my.Controller09" xmlns:m="sap.m"
+	xmlns:mvc="sap.ui.core.mvc" xmlns="http://www.w3.org/1999/xhtml"
+	displayBlock="true">
+	<m:Panel id="myPanel">
+		<m:Button id="myButton" text="Press me"></m:Button>
+	</m:Panel>
+</mvc:View>

package/test/sap/ui/core/qunit/odata/v4/lib/_Requestor.qunit.js

@@ -1386,19 +1386,29 @@ sap.ui.define([
 	});
 
 	//*********************************************************************************************
+[false, true].forEach(function (bWithCredentials) {
 	[false, true].forEach(function (bSuccess) {
-		QUnit.test("refreshSecurityToken: success = " + bSuccess, function (assert) {
+		const sTitle = "refreshSecurityToken, success=" + bSuccess + ", withCredentials="
+			+ bWithCredentials;
+		QUnit.test(sTitle, function (assert) {
 			var oError = {},
 				oPromise,
 				mHeaders = {},
-				mRequestHeaders = {},
+				oAjaxSettings = {
+					headers : "~requestHeaders~",
+					method : "HEAD"
+				},
 				oRequestor = _Requestor.create("/Service/", oModelInterface, mHeaders,
-					{"sap-client" : "123"}),
+					{"sap-client" : "123"}, /*sODataVersion*/undefined, bWithCredentials),
 				oTokenRequiredResponse = {};
 
+			if (bWithCredentials) {
+				oAjaxSettings.xhrFields = {withCredentials : true};
+			}
+
 			this.mock(Object).expects("assign").twice()
 				.withExactArgs({}, sinon.match.same(mHeaders), {"X-CSRF-Token" : "Fetch"})
-				.returns(mRequestHeaders);
+				.returns("~requestHeaders~");
 			this.mock(_Helper).expects("createError")
 				.exactly(bSuccess ? 0 : 2)
 				.withExactArgs(sinon.match.same(oTokenRequiredResponse),
@@ -1406,10 +1416,7 @@ sap.ui.define([
 				.returns(oError);
 
 			this.mock(jQuery).expects("ajax").twice()
-				.withExactArgs("/Service/?sap-client=123", sinon.match({
-					headers : sinon.match.same(mRequestHeaders),
-					method : "HEAD"
-				}))
+				.withExactArgs("/Service/?sap-client=123", oAjaxSettings)
 				.callsFake(function () {
 					var jqXHR;
 
@@ -1462,6 +1469,7 @@ sap.ui.define([
 			});
 		});
 	});
+});
 
 	//*********************************************************************************************
 	QUnit.test("refreshSecurityToken: keep fetching even if none is sent", function (assert) {
@@ -4383,28 +4391,35 @@ sap.ui.define([
 	});
 
 	//*****************************************************************************************
-	QUnit.test("setSessionContext: successful ping", function (assert) {
-		var oExpectation,
-			oRequestor = _Requestor.create(sServiceUrl, oModelInterface, {}, {
-				"sap-client" : "120"
-			});
+[false, true].forEach(function (bWithCredentials) {
+	const sTitle = "setSessionContext: successful ping, bWithCredentials: " + bWithCredentials;
+	QUnit.test(sTitle, function (assert) {
+		var oAjaxSettings = {
+				headers : {
+					"SAP-ContextId" : "context"
+				},
+				method : "HEAD"
+			},
+			oExpectation,
+			oRequestor = _Requestor.create(sServiceUrl, oModelInterface, {}, {"sap-client" : "120"},
+				/*sODataVersion*/undefined, bWithCredentials);
 
+		if (bWithCredentials) {
+			oAjaxSettings.xhrFields = {withCredentials : true};
+		}
 		oExpectation = this.mock(window).expects("setInterval")
 			.withExactArgs(sinon.match.func, 115000);
 
 		oRequestor.setSessionContext("context", "120");
 
-		this.mock(jQuery).expects("ajax").withExactArgs(sServiceUrl + "?sap-client=120", {
-				headers : sinon.match({
-					"SAP-ContextId" : "context"
-				}),
-				method : "HEAD"
-			})
+		this.mock(jQuery).expects("ajax")
+			.withExactArgs(sServiceUrl + "?sap-client=120", oAjaxSettings)
 			.returns(createMock(assert, undefined, "OK", {}));
 
 		// code under test - call setInterval function
 		oExpectation.callArg(0);
 	});
+});
 
 	//*****************************************************************************************
 	[false, true].forEach(function (bErrorId) {