[INTERNAL] mvc.ControllerExtension: add support for the new "overrides"

Tests are adapted to the new name, but a copy of the main tests still checks the old property "override". Change-Id: I559c2f6aa79f8ef022052effc60d504f10127fa5
SAP · Feb 16, 2023 · 167251e · 167251e
1 parent afa5f0b
commit 167251e
Show file tree

Hide file tree

Showing 16 changed files with 838 additions and 20 deletions.
diff --git a/src/sap.ui.core/src/sap/ui/core/mvc/ControllerMetadata.js b/src/sap.ui.core/src/sap/ui/core/mvc/ControllerMetadata.js
@@ -37,10 +37,11 @@ sap.ui.define([
 	ControllerMetadata.prototype.constructor = ControllerMetadata;
 
 	ControllerMetadata.prototype.applySettings = function(oClassInfo) {
-		// property 'override' needs to be handled separately and must not be attached to the prototype
-		if (oClassInfo.override) {
-			this._override = oClassInfo.override;
+		// property 'overrides' needs to be handled separately and must not be attached to the prototype
+		if (oClassInfo.overrides || oClassInfo.override) { // also consider the deprecated 'override' property
+			this._override = oClassInfo.overrides || oClassInfo.override; // ...but only when the new property is not set
 			delete oClassInfo.override;
+			delete oClassInfo.overrides;
 		}
 
 		Metadata.prototype.applySettings.call(this, oClassInfo);

diff --git a/...sap.ui.core/test/sap/ui/core/demokit/sample/ControllerExtension/OtherCustomerExtension.js b/...sap.ui.core/test/sap/ui/core/demokit/sample/ControllerExtension/OtherCustomerExtension.js
@@ -37,7 +37,7 @@ sap.ui.define([
 			oMyOwnButtonFromExtension.setText(sText);
 		},
 
-		override: {
+		overrides: {
 			//Override controller method; this is the second extension, so this override will win
 			getToolbarTitle: function(){
 				return "OtherExtension Table Operations:";

diff --git a/.../core/qunit/component/testdata/customizing/customer/Sub2ControllerExtension.controller.js b/.../core/qunit/component/testdata/customizing/customer/Sub2ControllerExtension.controller.js
@@ -13,7 +13,7 @@ sap.ui.define(['sap/ui/core/mvc/ControllerExtension'],
 		customerAction: function() {
 			customSub2ControllerCalled();
 		},
-		override: {
+		overrides: {
 			onInit: function() {
 				aLifeCycleCalls.push("Sub2ControllerExtension Controller onInit()");
 			},

diff --git a/...unit/component/testdata/customizing/customer/Sub6AnotherControllerExtension.controller.js b/...unit/component/testdata/customizing/customer/Sub6AnotherControllerExtension.controller.js
@@ -12,7 +12,7 @@ sap.ui.define(['sap/ui/core/mvc/ControllerExtension'],
 			}
 		},
 
-		override: {
+		overrides: {
 			onInit: function() {
 				oLifecycleSpy("Sub6AnotherControllerExtension Controller onInit()");
 			},

diff --git a/.../core/qunit/component/testdata/customizing/customer/Sub6ControllerExtension.controller.js b/.../core/qunit/component/testdata/customizing/customer/Sub6ControllerExtension.controller.js
@@ -12,7 +12,7 @@ sap.ui.define(['sap/ui/core/mvc/ControllerExtension'],
 			}
 		},
 
-		override: {
+		overrides: {
 			onInit: function() {
 				oLifecycleSpy("Sub6ControllerExtension Controller onInit()");
 			},

diff --git a/...onent/testdata/customizing/customer/Sub6InstanceSpecificControllerExtension.controller.js b/...onent/testdata/customizing/customer/Sub6InstanceSpecificControllerExtension.controller.js
@@ -11,7 +11,7 @@ sap.ui.define(['sap/ui/core/mvc/ControllerExtension'],
 			}
 		},
 
-		override: {
+		overrides: {
 			onInit: function() {
 				oLifecycleSpy("Sub6InstanceSpecificControllerExtension Controller onInit()");
 			},

diff --git a/...qunit/component/testdata/customizing/customersub/Sub2SubControllerExtension.controller.js b/...qunit/component/testdata/customizing/customersub/Sub2SubControllerExtension.controller.js
@@ -12,7 +12,7 @@ sap.ui.define(['sap/ui/core/mvc/ControllerExtension'],
 			}
 		},
 
-		override: {
+		overrides: {
 
 			onInit: function() {
 				aLifeCycleCalls.push("Sub2SubControllerExtension Controller onInit()");

diff --git a/.../component/testdata/customizing_legacyAPIs/customer/Sub2ControllerExtension.controller.js b/.../component/testdata/customizing_legacyAPIs/customer/Sub2ControllerExtension.controller.js
@@ -13,7 +13,7 @@ sap.ui.define(['sap/ui/core/mvc/ControllerExtension'],
 		customerAction: function() {
 			customSub2ControllerCalled();
 		},
-		override: {
+		overrides: {
 			onInit: function() {
 				aLifeCycleCalls.push("Sub2ControllerExtension Controller onInit()");
 			},

diff --git a/...nent/testdata/customizing_legacyAPIs/customersub/Sub2SubControllerExtension.controller.js b/...nent/testdata/customizing_legacyAPIs/customersub/Sub2SubControllerExtension.controller.js
@@ -12,7 +12,7 @@ sap.ui.define(['sap/ui/core/mvc/ControllerExtension'],
 			}
 		},
 
-		override: {
+		overrides: {
 
 			onInit: function() {
 				aLifeCycleCalls.push("Sub2SubControllerExtension Controller onInit()");

diff --git a/src/sap.ui.core/test/sap/ui/core/qunit/mvc/extensions/Controllerextensions.qunit.js b/src/sap.ui.core/test/sap/ui/core/qunit/mvc/extensions/Controllerextensions.qunit.js
@@ -163,7 +163,7 @@ sap.ui.define([
 		myAfter: function() {
 			this.base.overrideCalledAfter = true;
 		},
-		override: {
+		overrides: {
 			callbackMethod: function() {
 				return "callbackOfControllerExt1";
 			}
@@ -286,7 +286,7 @@ sap.ui.define([
 			},
 			myAfter: function() {
 			},
-			override: {
+			overrides: {
 				extHookLegacy: function() {
 					return "extHookLegacy App implementation";
 				},
@@ -360,7 +360,7 @@ sap.ui.define([
 			},
 			myAfter: function() {
 			},
-			override: {
+			overrides: {
 				extension: {
 					"example.ProviderExt1": {
 						publicMethodToOverride: function() {