@openui5/sap.ui.core 1.123.1 → 1.124.0

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

@@ -1,5 +1,6 @@
 /*global sinon QUnit */
 sap.ui.define([
+	"sap/base/future",
 	"sap/base/Log",
 	"sap/m/Button",
 	'sap/ui/core/Component',
@@ -10,7 +11,7 @@ sap.ui.define([
 	"sap/ui/model/json/JSONModel",
 	"sap/ui/thirdparty/jquery",
 	"sap/ui/base/DesignTime"
-], function(Log, Button, Component, UIComponent, XMLTemplateProcessor, XMLProcessingMode, XMLView, JSONModel, jQuery, DesignTime) {
+], function(future, Log, Button, Component, UIComponent, XMLTemplateProcessor, XMLProcessingMode, XMLView, JSONModel, jQuery, DesignTime) {
 	"use strict";
 
 	QUnit.module("enrichTemplateIdsPromise", {
@@ -490,7 +491,11 @@ sap.ui.define([
 		}
 	});
 
-	QUnit.test("[Simple Binding] Async loading of data types", function(assert) {
+	/**
+	 * @deprecated
+	 */
+	QUnit.test("[Simple Binding] Async loading of data types (future=false)", function(assert) {
+		future.active = false;
 		var oModel = new JSONModel({
 			value: 1234,
 			customDataValue: "#FF06B5",
@@ -501,7 +506,7 @@ sap.ui.define([
 		var oView;
 
 		return XMLView.create({
-			viewName: "testdata/mvc/XMLViewWithTypes",
+			viewName: "testdata/mvc/XMLViewWithTypesFailure",
 			models: {"undefined": oModel}
 		}).then(function (oFinishedView) {
 			oView = oFinishedView;
@@ -543,6 +548,56 @@ sap.ui.define([
 			if (oView) {
 				oView.destroy();
 			}
+			future.active = undefined;
+		});
+	});
+
+	QUnit.test("[Simple Binding] Async loading of data types (future=false)", async function(assert) {
+		future.active = true;
+		var oModel = new JSONModel({
+			value: 1234,
+			customDataValue: "#FF06B5",
+			amount: 12.345,
+			date: 1682600768240
+		});
+
+		var oView;
+
+		await assert.rejects(XMLView.create({
+			viewName: "testdata/mvc/XMLViewWithTypesFailure",
+			models: {"undefined": oModel}
+		})).then(() => {
+			return XMLView.create({
+				viewName: "testdata/mvc/XMLViewWithTypes",
+				models: {"undefined": oModel}
+			});
+		}).then(function (oFinishedView) {
+			oView = oFinishedView;
+			oFinishedView.placeAt("qunit-fixture");
+
+
+
+			// test binding values
+			var oInput = oView.byId("inputField");
+			assert.equal(oInput.getValue(), "1.234", "Input field has correct value '1.234'");
+
+			var oInputInvalidType = oView.byId("inputField_invalidType");
+			assert.equal(oInputInvalidType.getValue(), "1234", "Input field has correct unformatted(!) value '1234'.");
+
+			// test CustomData binding values
+			var oPanel = oView.byId("panel");
+			var oCustomData = oPanel.getCustomData().find(function(oCustomData) {
+				return oCustomData.getKey() === "myColor";
+			});
+			assert.equal(oCustomData.getValue(), "#FF06B5", "CustomData is correctly bound: myColor value = #FF06B5.");
+
+			var oLabel = oView.byId("label");
+			assert.equal(oLabel.getText(), "12.3 EUR on 2023-04-27", "Composite binding is resolved correctly");
+		}).finally(function(){
+			if (oView) {
+				oView.destroy();
+			}
+			future.active = undefined;
 		});
 	});
 });

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

@@ -3,6 +3,7 @@ sap.ui.define([
 	'sap/ui/core/Component',
 	"sap/ui/core/mvc/View",
 	"sap/m/InstanceManager",
+	"sap/base/future",
 	"sap/base/Log",
 	"sap/base/util/merge",
 	"sap/ui/model/json/JSONModel",
@@ -10,7 +11,7 @@ sap.ui.define([
 	"sap/ui/core/routing/HashChanger",
 	"sap/ui/qunit/utils/nextUIUpdate"
 ], function(Component, View,
-	InstanceManager, Log, merge, JSONModel, XMLView, HashChanger, nextUIUpdate) {
+	InstanceManager, future, Log, merge, JSONModel, XMLView, HashChanger, nextUIUpdate) {
 	"use strict";
 
 	var TESTDATA_PREFIX = "testdata.xml-require";
@@ -347,8 +348,13 @@ sap.ui.define([
 			InstanceManager.closeAllDialogs();
 			InstanceManager.closeAllPopovers();
 		}
-	}, {
-		testDescription: "Parsing core:require in XMLView with fragment with missing definition in require context",
+	},
+
+	/**
+	 * @deprecated
+	 */
+	{
+		testDescription: "Parsing core:require in XMLView with fragment with missing definition in require context (future=false)",
 		viewName: ".view.XMLTemplateProcessorAsync_fragment_insufficient_require",
 		settings: {
 			async: {
@@ -358,10 +364,30 @@ sap.ui.define([
 				}
 			}
 		},
+		future: false,
 		runAssertions: function (oView, mSpies, assert, bAsync) {
 			var oWarningSpy = mSpies.warning;
 			assert.ok(oWarningSpy.calledWith(sinon.match(/Event handler name 'Toast.show\('This is a toast'\)' could not be resolved to an event handler function/)));
 		}
+	}, {
+		testDescription: "Parsing core:require in XMLView with fragment with missing definition in require context (future=true)",
+		viewName: ".view.XMLTemplateProcessorAsync_fragment_insufficient_require",
+		settings: {
+			async: {
+				create: async (name, setting, assert) => {
+					const oView = createView(name, setting);
+					assert.rejects(oView);
+					await oView.catch((err) => {
+							assert.ok(err.message.includes("Event handler name 'Toast.show('This is a toast')' could not be resolved to an event handler function"),
+							"View creation rejects with correct error");
+						});
+				}
+			}
+		},
+		future: true,
+		runAssertions: function (oView, mSpies, assert, bAsync) {
+
+		}
 	}, {
 		testDescription: "Parsing core:require in XMLView with fragment with missing definition in require context with preprocessors enabled",
 		viewName: ".view.XMLTemplateProcessorAsync_fragment_insufficient_require",
@@ -383,8 +409,13 @@ sap.ui.define([
 			sinon.assert.neverCalledWith(oWarningSpy, "Variable: Toast isn't defined in the require context of the current XMLView/Fragment");
 			assert.ok(oWarningSpy.neverCalledWith(sinon.match(/Event handler name 'Toast.show\('This is a toast'\)' could not be resolved to an event handler function/)));
 		}
-	}, {
-		testDescription: "Parsing core:require in XMLView with fragment w/o require context",
+	},
+
+	/**
+	 * @deprecated
+	 */
+	{
+		testDescription: "Parsing core:require in XMLView with fragment w/o require context (future=false)",
 		viewName: ".view.XMLTemplateProcessorAsync_fragment_require_noRequire",
 		settings: {
 			async: {
@@ -394,12 +425,37 @@ sap.ui.define([
 				}
 			}
 		},
+		future: false,
 		runAssertions: function (oView, mSpies, assert, bAsync) {
 			var oWarningSpy = mSpies.warning;
 			assert.ok(oWarningSpy.calledWith(sinon.match(/Event handler name 'Toast.show\('Problem occurred'\)' could not be resolved to an event handler function/)));
 		}
 	}, {
-		testDescription: "Parsing core:require in XMLView with nested view and the require context isn't forwarded to nested view",
+		testDescription: "Parsing core:require in XMLView with fragment w/o require context (future=true)",
+		viewName: ".view.XMLTemplateProcessorAsync_fragment_require_noRequire",
+		settings: {
+			async: {
+				create: async (name, setting, assert) => {
+					const oView = createView(name, setting);
+					assert.rejects(oView);
+					await oView.catch((err) => {
+							assert.ok(err.message.includes("Event handler name 'Toast.show('Problem occurred')' could not be resolved to an event handler function"),
+							"View creation rejects with correct error");
+						});
+				}
+			}
+		},
+		future: true,
+		runAssertions: function (oView, mSpies, assert, bAsync) {
+
+		}
+	},
+
+	/**
+	 * @deprecated
+	 */
+	{
+		testDescription: "Parsing core:require in XMLView with nested view and the require context isn't forwarded to nested view (future=false)",
 		viewName: ".view.XMLTemplateProcessorAsync_require_nested",
 		settings: {
 			async: {
@@ -410,6 +466,7 @@ sap.ui.define([
 				}
 			}
 		},
+		future: false,
 		runAssertions: function (oView, mSpies, assert, bAsync) {
 			var oCreateSpy = mSpies._create;
 			var oWarningSpy = mSpies.warning;
@@ -420,7 +477,34 @@ sap.ui.define([
 			});
 		}
 	}, {
-		testDescription: "Parsing core:require in ExtensionPoint",
+		testDescription: "Parsing core:require in XMLView with nested view and the require context isn't forwarded to nested view (future=true)",
+		viewName: ".view.XMLTemplateProcessorAsync_require_nested",
+		settings: {
+			async: {
+				create: async (name, setting, assert) => {
+					const oView = createView(name, setting)
+						.then((oView) => {
+							return oView.getContent()[0].loaded();
+						});
+					assert.rejects(oView);
+					await oView.catch((err) => {
+						assert.ok(err.message.includes("Event handler name 'Box.show('MessageBox')' could not be resolved to an event handler function"),
+						"View creation rejects with correct error");
+					});
+				}
+			}
+		},
+		future: true,
+		runAssertions: function (oView, mSpies, assert, bAsync) {
+
+		}
+	},
+
+	/**
+	 * @deprecated
+	 */
+	{
+		testDescription: "Parsing core:require in ExtensionPoint (future=false)",
 		settings: {
 			async: {
 				create: function () {
@@ -435,6 +519,7 @@ sap.ui.define([
 				}
 			}
 		},
+		future: false,
 		runAssertions: function (oView, mSpies, assert, bAsync) {
 			var oWarningSpy = mSpies.warning;
 
@@ -464,8 +549,35 @@ sap.ui.define([
 			});
 		}
 	}, {
-		testDescription: "Parsing core:require in ExpressionBinding",
-		viewName: ".view.XMLTemplateProcessorAsync_require_expression",
+		testDescription: "Parsing core:require in ExtensionPoint (future=true)",
+		settings: {
+			async: {
+				create: async (name, settings, assert) => {
+					const oComponent = Component.create({
+						name: TESTDATA_PREFIX + ".extension-points.Child"
+					}).then(function (oComponent) {
+						return oComponent.getRootControl().loaded();
+					});
+					assert.rejects(oComponent);
+					await oComponent.catch((err) => {
+						assert.ok(err.message.includes("Event handler name 'Toast.show('Do you really want to close?')' could not be resolved to an event handler function"),
+						"View creation rejects with correct error");
+					});
+				}
+			}
+		},
+		future: true,
+		runAssertions: function (oView, mSpies, assert, bAsync) {
+
+		}
+	},
+
+	/**
+	 * @deprecated
+	 */
+	{
+		testDescription: "Parsing core:require in ExpressionBinding (future=false)",
+		viewName: ".view.XMLTemplateProcessorAsync_require_expressionFaulty",
 		settings: {
 			async: {
 				create: createView,
@@ -477,6 +589,7 @@ sap.ui.define([
 				}
 			}
 		},
+		future: false,
 		runAssertions: function (oView, mSpies, assert, bAsync) {
 
 			var oModel = new JSONModel({
@@ -542,11 +655,13 @@ sap.ui.define([
 				bAsync = true,
 				mSpies;
 
+			future.active = oConfig.future;
+
 			if (oConfig.settings.async.spies) {
 				mSpies = createSpies(oConfig.settings.async.spies, this);
 			}
 
-			return oConfig.settings.async.create(oConfig.viewName, oConfig.settings.async.additionalViewSettings)
+			return oConfig.settings.async.create(oConfig.viewName, oConfig.settings.async.additionalViewSettings, assert)
 				.then(function (oView) {
 					return oConfig.runAssertions.call(that, oView, mSpies, assert, bAsync);
 				}, function(oError) {
@@ -555,6 +670,8 @@ sap.ui.define([
 					} else {
 						throw oError;
 					}
+				}).then(() => {
+					future.active = undefined;
 				});
 		});
 	});

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

@@ -1,5 +1,6 @@
 /*global QUnit, sinon */
 sap.ui.define([
+	"sap/base/future",
 	'sap/base/Log',
 	"sap/base/i18n/Localization",
 	'sap/base/i18n/ResourceBundle',
@@ -18,7 +19,7 @@ sap.ui.define([
 	'./AnyView.qunit',
 	'sap/ui/thirdparty/jquery',
 	"sap/ui/qunit/utils/nextUIUpdate"
-], function(Log, Localization, ResourceBundle, Element, coreLibrary, Controller, View, XMLView, RenderManager, JSONModel, ResourceModel, VerticalLayout, XMLHelper, Button, Panel, testsuite, jQuery, nextUIUpdate) {
+], function(future, Log, Localization, ResourceBundle, Element, coreLibrary, Controller, View, XMLView, RenderManager, JSONModel, ResourceModel, VerticalLayout, XMLHelper, Button, Panel, testsuite, jQuery, nextUIUpdate) {
 	"use strict";
 
 	// shortcut for sap.ui.core.mvc.ViewType
@@ -132,6 +133,24 @@ sap.ui.define([
 		});
 	});
 
+	QUnit.test("Using native HTML in XMLViews (future=false)", async function (assert) {
+		future.active = false;
+		const oView = await XMLView.create({
+			viewName: 'example.mvc.HtmlOnRoot'
+		});
+
+		assert.ok(oView, "XMLView containing native HTML content is created successfully.");
+		future.active = false;
+	});
+
+	QUnit.test("Using native HTML in XMLViews (future=true)", async function (assert) {
+		future.active = true;
+		await assert.rejects(XMLView.create({
+			viewName: 'example.mvc.HtmlOnRoot'
+		}), "View creation rejects because XMLView contains HTML content on root.");
+		future.active = false;
+	});
+
 	QUnit.test("async loading new Factory with resource bundle", function(assert) {
 		var oResourceBundleCreateSpy = sinon.spy(ResourceBundle, "create");
 		var oViewPromise = XMLView.create({definition: "" +
@@ -139,7 +158,7 @@ sap.ui.define([
 				"\t\t   resourceBundleAlias=\"i18n\"\n" +
 				"\t\t   xmlns:mvc=\"sap.ui.core.mvc\" xmlns=\"sap.m\" xmlns:html=\"http://www.w3.org/1999/xhtml\">\n" +
 				"\t<Panel id=\"aPanel\">\n" +
-				"\t\t<Button id=\"Button1\" text=\"{i18n>TEXT_CLOSE}\" press=\"doIt\"></Button>\n" +
+				"\t\t<Button id=\"Button1\" text=\"{i18n>TEXT_CLOSE}\"></Button>\n" +
 				"\t</Panel>\n" +
 				"</mvc:View>" +
 				""});
@@ -245,6 +264,13 @@ sap.ui.define([
 		});
 	});
 
+    /**
+     * @deprecated As of version 1.120
+     *
+     * Preserve DOM is tested with a XMLView where HTML tags are used. Since
+     * the support of HTML tags in XMLView is deprecated, those tests are
+     * deprecated as well.
+     */
 	QUnit.module("Preserve DOM");
 
 	QUnit.test("async loading", function(assert) {
@@ -981,7 +1007,7 @@ sap.ui.define([
 
 	QUnit.test("Named Aggregation", function(assert) {
 		var sXmlWithNamedAggregations = [
-			'<mvc:View xmlns:core="sap.ui.core" xmlns:mvc="sap.ui.core.mvc" xmlns:test="sap.ui.testlib" xmlns:html="http://www.w3.org/1999/xhtml">',
+			'<mvc:View xmlns:core="sap.ui.core" xmlns:mvc="sap.ui.core.mvc" xmlns:test="sap.ui.testlib" xmlns:html="http://www.w3.org/1999/xhtml" controllerName="example.mvc.test">',
 			'  <mvc:content>',
 			'    <test:TestButton id="contentButton" />',
 			'    <html:div id="div1">test1</html:div>',
@@ -996,7 +1022,7 @@ sap.ui.define([
 		].join('');
 
 		var sXmlWithNamedDependents = [
-			'<mvc:View xmlns:core="sap.ui.core" xmlns:mvc="sap.ui.core.mvc" xmlns:test="sap.ui.testlib">',
+			'<mvc:View xmlns:core="sap.ui.core" xmlns:mvc="sap.ui.core.mvc" xmlns:test="sap.ui.testlib" controllerName="example.mvc.test">',
 			'  <test:TestButton id="contentButton" />',
 			'  <mvc:dependents>',
 			'    <test:TestButton id="dependentButton" />',
@@ -1006,7 +1032,7 @@ sap.ui.define([
 		].join('');
 
 		var sXmlWithWrongAggregation = [
-			'<mvc:View xmlns:core="sap.ui.core" xmlns:mvc="sap.ui.core.mvc" xmlns:test="sap.ui.testlib">',
+			'<mvc:View xmlns:core="sap.ui.core" xmlns:mvc="sap.ui.core.mvc" xmlns:test="sap.ui.testlib" controllerName="example.mvc.test">',
 			'  <test:TestButton id="contentButton" />',
 			'  <mvc:wrong>',
 			'    <test:TestButton id="dependentButton" />',
@@ -1086,6 +1112,8 @@ sap.ui.define([
 
 	QUnit.module("Preprocessor API", {
 		beforeEach: function() {
+			// reset global preprocessors
+			View._mPreprocessors = {};
 			this.sViewContent = '<mvc:View xmlns:mvc="sap.ui.core.mvc"/>';
 			this.runPreprocessorSpy = sinon.spy(View.prototype, "runPreprocessor");
 			this.fnGetConfig = function(fnPreprocessor, bSyncSupport) {
@@ -1113,14 +1141,16 @@ sap.ui.define([
 			}.bind(this);
 		},
 		afterEach: function() {
-			// reset global preprocessors
-			View._mPreprocessors = {};
 			this.runPreprocessorSpy.restore();
 			delete this.xml;
 		}
 	});
 
-	QUnit.test("registration", function(assert) {
+	/**
+	 * @deprecated
+	 */
+	QUnit.test("registration (future=false)", function(assert) {
+		future.active = false;
 		var logSpyError = this.spy(Log, "error");
 
 		var noop = function() {};
@@ -1128,7 +1158,7 @@ sap.ui.define([
 		XMLView.registerPreprocessor(XMLView.PreprocessorType.VIEWXML, noop, false);
 		XMLView.registerPreprocessor(XMLView.PreprocessorType.CONTROLS, noop, false);
 
-		assert.strictEqual(View._mPreprocessors["XML"]["xml"][1].preprocessor, noop, "Registration for xml successful");
+		assert.strictEqual(View._mPreprocessors["XML"]["xml"][0].preprocessor, noop, "Registration for xml successful");
 		assert.strictEqual(View._mPreprocessors["XML"]["viewxml"][0].preprocessor, noop, "Registration for viewxml successful");
 		assert.strictEqual(View._mPreprocessors["XML"]["controls"][0].preprocessor, noop, "Registration for content successful");
 
@@ -1141,6 +1171,7 @@ sap.ui.define([
 
 		logSpyError.resetHistory();
 		XMLView.registerPreprocessor(XMLView.PreprocessorType.XML, noop, false, true);
+		XMLView.registerPreprocessor(XMLView.PreprocessorType.XML, noop, false, true);
 		assert.ok(
 			logSpyError.calledWith(sinon.match(/only one on-demand-preprocessor allowed/)),
 			"Error logged when registering more than one ondemand pp");
@@ -1158,6 +1189,50 @@ sap.ui.define([
 		assert.throws(function() {
 			XMLView.registerPreprocessor(XMLView.PreprocessorType.XML, fnUniquePP, "YAML", false);
 		}, TypeError, "TypeError thrown when registering for a view type other than XML");
+		future.active = undefined;
+	});
+
+	QUnit.test("registration (future=true)", function(assert) {
+		future.active = true;
+		var logSpyError = this.spy(Log, "error");
+
+		var noop = function() {};
+		XMLView.registerPreprocessor(XMLView.PreprocessorType.XML, noop, false);
+		XMLView.registerPreprocessor(XMLView.PreprocessorType.VIEWXML, noop, false);
+		XMLView.registerPreprocessor(XMLView.PreprocessorType.CONTROLS, noop, false);
+
+		assert.strictEqual(View._mPreprocessors["XML"]["xml"][0].preprocessor, noop, "Registration for xml successful");
+		assert.strictEqual(View._mPreprocessors["XML"]["viewxml"][0].preprocessor, noop, "Registration for viewxml successful");
+		assert.strictEqual(View._mPreprocessors["XML"]["controls"][0].preprocessor, noop, "Registration for content successful");
+
+		logSpyError.resetHistory();
+		let sExpectedMessage = 'Preprocessor could not be registered due to unknown sType "UNKNOWN"';
+		assert.throws(() => XMLView.registerPreprocessor("unknown", noop, false, {type: "unknown"}),
+			new Error(sExpectedMessage),
+			"Error logged when registering invalid type");
+		assert.strictEqual(View._mPreprocessors["XML"]["unknown"], undefined, "Registration for invalid type refused");
+
+		logSpyError.resetHistory();
+		XMLView.registerPreprocessor(XMLView.PreprocessorType.XML, noop, false, true);
+		sExpectedMessage = 'Registration for "xml" failed, only one on-demand-preprocessor allowed';
+		assert.throws(() => XMLView.registerPreprocessor(XMLView.PreprocessorType.XML, noop, false, true),
+			new Error(sExpectedMessage),
+			"Error logged when registering more than one ondemand pp");
+		assert.strictEqual(View._mPreprocessors["XML"]["unknown"], undefined, "Registration for invalid type refused");
+
+		// explicitly providing view type "XML" does not fail
+		var fnUniquePP = function() {};
+		XMLView.registerPreprocessor(XMLView.PreprocessorType.XML, fnUniquePP, "XML", false);
+		assert.ok(Array.isArray(View._mPreprocessors["XML"]["xml"]) &&
+			View._mPreprocessors["XML"]["xml"].some(function(entry) {
+				return entry.preprocessor === fnUniquePP;
+			}), "Preprocessor call passed through to View");
+
+		// explicitly providing an unsupported type fails
+		assert.throws(function() {
+			XMLView.registerPreprocessor(XMLView.PreprocessorType.XML, fnUniquePP, "YAML", false);
+		}, TypeError, "TypeError thrown when registering for a view type other than XML");
+		future.active = undefined;
 	});
 
 	QUnit.test("async: assignment of preprocessor results", function(assert) {
@@ -1242,7 +1317,11 @@ sap.ui.define([
 
 	QUnit.module("Compatibility");
 
-	QUnit.test("XMLView with wrong root node name should still be parsed correctly", function(assert) {
+	/**
+	 * @deprecated
+	 */
+	QUnit.test("XMLView with wrong root node name should still be parsed correctly (future=false)", function(assert) {
+		future.active = false;
 		var oLogErrorSpy = this.spy(Log, "error");
 		var sContent = [
 			'<mvc:view xmlns:mvc="sap.ui.core.mvc" xmlns:m="sap.m">',
@@ -1262,11 +1341,30 @@ sap.ui.define([
 			assert.equal(oView.getContent()[0], oView.byId("panel"), "The panel is added to the view's content aggregation");
 
 			oView.destroy();
+			future.active = undefined;
 		}, function() {
 			assert.notOk(true, "The XMLView.create promise should not reject");
 		});
 	});
 
+	QUnit.test("XMLView with wrong root node name should still be parsed correctly (future=true)", async function(assert) {
+		future.active = true;
+		var sContent = [
+			'<mvc:view xmlns:mvc="sap.ui.core.mvc" xmlns:m="sap.m">',
+			'  <m:Panel id="panel">',
+			'  </m:Panel>',
+			'</mvc:view>'
+		].join('');
+
+		await assert.rejects(XMLView.create({
+			id: "wrongRootNodeName",
+			definition: sContent
+		}),
+		new Error("XMLView's root node must be 'View' or 'XMLView' and have the namespace 'sap.ui.core.mvc'"),
+		"View creation rejects with correct error");
+	});
+
+
 	// let test starter wait for the XML to be loaded
 	return pViewXMLLoaded;
 });

package/test/sap/ui/core/qunit/mvc/extensions/ControllerMetadata.qunit.js

@@ -1,11 +1,10 @@
 /*global QUnit */
 
 sap.ui.define([
+	'sap/base/future',
 	'sap/ui/core/mvc/Controller',
 	'sap/ui/core/mvc/XMLView'
-
-
-], function(Controller, XMLView) {
+], function(future, Controller, XMLView) {
 	"use strict";
 
 	// create content div
@@ -190,6 +189,20 @@ sap.ui.define([
 		});
 	});
 
+	QUnit.module("Controller Member Legacy Extension final checks", {
+		beforeEach: function() {
+			this.pView = Controller.create({name:"my.test.MainMemberExtLegacyFinal"}).then(function(oController) {
+				return XMLView.create({
+					viewName: "my.test.Main",
+					controller: oController
+				});
+			});
+		},
+		afterEach: function() {
+
+		}
+	});
+
 	QUnit.test("controller final method check", function(assert) {
 		var done = assert.async();
 		this.pView.then(function(oView) {
@@ -201,8 +214,12 @@ sap.ui.define([
 		});
 	});
 
-	 QUnit.module("Controller Member Extension inline override", {
+	/**
+	 * @deprecated
+	 */
+	QUnit.module("Controller Member Extension inline override", {
 		beforeEach: function() {
+			future.active = false;
 			this.pView = Controller.create({name:"my.test.MainMemberExtInlineOverride"}).then(function(oController) {
 				return XMLView.create({
 					viewName: "my.test.Main",
@@ -211,11 +228,11 @@ sap.ui.define([
 			});
 		},
 		afterEach: function() {
-
+			future.active = undefined;
 		}
 	});
 
-	QUnit.test("extension final method check", function(assert) {
+	QUnit.test("extension final method check (future=false)", function(assert) {
 		var done = assert.async();
 		this.pView.then(function(oView) {
 			var oController = oView.getController();
@@ -226,6 +243,28 @@ sap.ui.define([
 		});
 	});
 
+	QUnit.module("Controller Member Extension inline override", {
+		beforeEach: function() {
+			future.active = true;
+			this.pView = Controller.create({name:"my.test.MainMemberExtInlineOverride"}).then(function(oController) {
+				return XMLView.create({
+					viewName: "my.test.Main",
+					controller: oController
+				});
+			});
+		},
+		afterEach: function() {
+			future.active = undefined;
+		}
+	});
+
+	QUnit.test("extension final method check (future=true)", async function(assert) {
+		assert.rejects(this.pView);
+		await this.pView.catch((err) => {
+			assert.ok(err.message.endsWith("is flagged final and cannot be overridden by calling 'override'"), "Correct final check error thrown");
+		});
+	});
+
 	 QUnit.module("Extend Controller", {
 		beforeEach: function() {
 			this.pView = Controller.create({name:"my.test.AnotherMain"}).then(function(oController) {
@@ -286,6 +325,7 @@ sap.ui.define([
 
 	QUnit.module("Controller final checks", {
 		beforeEach: function() {
+			future.active = true;
 			Controller.registerExtensionProvider("");
 			this.pView = Controller.create({name:"my.test.ExtendMain"}).then(function(oController) {
 				return XMLView.create({
@@ -295,11 +335,38 @@ sap.ui.define([
 			});
 		},
 		afterEach: function() {
+			future.active = undefined;
+		}
+	});
 
+	QUnit.test("override final metadata/function (future=true)", async function(assert) {
+		assert.expect(2);
+		assert.rejects(this.pView);
+		await this.pView.catch((err) => {
+			assert.equal(err.message, "failed to execute module factory for ''my/test/ExtendMain.controller.js'': Method: 'myFinalMethod' of controller 'my.test.Main' is final and cannot be overridden by controller 'my.test.ExtendMain'");
+		});
+	});
+
+	/**
+	 * @deprecated
+	 */
+	QUnit.module("Controller final checks", {
+		beforeEach: function() {
+			future.active = false;
+			Controller.registerExtensionProvider("");
+			this.pView = Controller.create({name:"my.test.ExtendMainLegacy"}).then(function(oController) {
+				return XMLView.create({
+					viewName: "my.test.Main",
+					controller: oController
+				});
+			});
+		},
+		afterEach: function() {
+			future.active = undefined;
 		}
 	});
 
-	 QUnit.test("override final metadata/function", function(assert) {
+	QUnit.test("override final metadata/function (future=false)", function(assert) {
 		var done = assert.async();
 		assert.expect(2);
 		this.pView.then(function(oView) {