@openui5/sap.ui.core 1.123.0 → 1.124.0

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

@@ -585,4 +585,17 @@ sap.ui.define([
 		assert.equal(html.getContent(), sanitizedContent, "HTML sanitized using constructor, wrong order");
 	});
 
+	QUnit.module("Fixes in caja-html-sanitizer");
+
+	QUnit.test("Tags wrapped in iframe tag", function(assert) {
+		const sOffensiveContent = `<select><iframe><select><img src=x onerror=alert(1)></select></iframe></select>`;
+		const oHTML = new HTML({
+			sanitizeContent: true,
+			content: sOffensiveContent
+		});
+
+		assert.notOk(oHTML.getContent().includes("onerror"), "The error handler should be removed");
+		oHTML.destroy();
+	});
+
 });

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

@@ -1,13 +1,14 @@
 /*global QUnit sinon*/
 sap.ui.define([
-	"sap/ui/core/Lib",
-	"sap/base/util/ObjectPath",
-	"sap/ui/core/theming/ThemeManager",
+	"sap/base/Log",
 	"sap/base/i18n/ResourceBundle",
-	"sap/ui/dom/includeScript",
 	"sap/base/util/LoaderExtensions",
-	"sap/base/Log"
-], function(Library, ObjectPath, ThemeManager, ResourceBundle, includeScript, LoaderExtensions, Log) {
+	"sap/base/util/ObjectPath",
+	"sap/ui/base/DataType",
+	"sap/ui/core/Lib",
+	"sap/ui/core/theming/ThemeManager",
+	"sap/ui/dom/includeScript"
+], function(Log, ResourceBundle, LoaderExtensions, ObjectPath, DataType, Library, ThemeManager, includeScript) {
 	"use strict";
 
 	QUnit.module("Instance methods");
@@ -67,6 +68,9 @@ sap.ui.define([
 		}
 
 		this.spy(sap.ui.loader._, 'loadJSResourceAsync');
+		/**
+		 * @deprecated As of version 1.120
+		 */
 		this.spy(XMLHttpRequest.prototype, 'open');
 		this.spy(sap.ui, 'require');
 		/**
@@ -78,6 +82,7 @@ sap.ui.define([
 		sap.ui.predefine('testlibs/scenario1/lib3/library', ["sap/ui/core/Lib"], function(Library) {
 			return Library.init({
 				name: 'testlibs.scenario1.lib3',
+				apiVersion: 2,
 				noLibraryCSS: true
 			});
 		});
@@ -120,6 +125,9 @@ sap.ui.define([
 			// lib5 should load the json format as fallback
 			checkLibNotInitialized('testlibs.scenario1.lib5');
 			sinon.assert.calledWith(sap.ui.loader._.loadJSResourceAsync, sinon.match(/scenario1\/lib5\/library-preload\.js$/));
+			/**
+			 * @deprecated As of version 1.120
+			 */
 			sinon.assert.calledWith(XMLHttpRequest.prototype.open, "GET", sinon.match(/scenario1\/lib5\/library-preload\.json$/));
 			/**
 			 * @deprecated As of version 1.120
@@ -331,6 +339,7 @@ sap.ui.define([
 		sap.ui.predefine('testlibs/scenario2/lib3/library', ["sap/ui/core/Lib"], function(Library) {
 			return Library.init({
 				name: 'testlibs.scenario2.lib3',
+				apiVersion: 2,
 				noLibraryCSS: true
 			});
 		});
@@ -580,62 +589,171 @@ sap.ui.define([
 	/**
 	 * @deprecated since 1.120
 	 */
-	QUnit.module("Pseudo Module Deprecation", {});
+	QUnit.module("Pseudo Module Deprecation", {
+		async before() {
+			sap.ui.define("testing/pseudo/modules/deprecation/library", [
+				"sap/ui/base/DataType",
+				"sap/ui/core/Lib"
+			], function(DataType, Library) {
+				const oThisLib = Library.init({
+					name: 'testing.pseudo.modules.deprecation',
+					apiVersion: 2,
+					noLibraryCSS: true,
+					types: [
+						"testing.pseudo.modules.deprecation.SomeEnum",
+						"testing.pseudo.modules.deprecation.HexNumber",
+						"testing.pseudo.modules.deprecation.SomethingElse"
+					]
+				});
 
-	QUnit.test("", async function(assert) {
-		let oErrorLogSpy;
+				oThisLib.SomeEnum = {
+					"A": "A",
+					"B": "B"
+				};
+				DataType.registerEnum("testing.pseudo.modules.deprecation.SomeEnum", oThisLib.SomeEnum);
 
-		assert.expect(6);
+				oThisLib.HexNumber = DataType.createType('testing.pseudo.modules.deprecation.HexNumber', {
+						isValid : function(vValue) {
+							return /^[0-9A-F]+$/.test(vValue);
+						}
+					},
+					DataType.getType('string')
+				);
 
-		sap.ui.predefine('testing/pseudo/modules/deprecation/library', ["sap/ui/core/Lib"], function(Library) {
-			const oThisLib = Library.init({
-				name: 'testing.pseudo.modules.deprecation',
-				noLibraryCSS: true,
-				types: ["testing.pseudo.modules.deprecation.Type1"]
+				oThisLib.SomethingElse = new Date(); // something that is neither a DataType nor a plain object;
+
+				return oThisLib;
 			});
 
-			oThisLib.Type1 = {
-				"A": "A",
-				"B": "B"
-			};
-		});
+			await Library.load({
+				name: "testing.pseudo.modules.deprecation"
+			});
+		},
+		beforeEach() {
+			this.oLib = sap.ui.require("testing/pseudo/modules/deprecation/library");
+			this.spy(Log, "error");
+			this.sExpectedEnumErrorMessage =
+				"Importing the pseudo module 'testing/pseudo/modules/deprecation/SomeEnum' is deprecated."
+				+ " To access the type 'testing.pseudo.modules.deprecation.SomeEnum',"
+				+ " please import 'testing/pseudo/modules/deprecation/library'."
+				+ " You can then reference this type via the library's module export."
+				+ " For more information, see documentation under 'Best Practices for Loading Modules'.";
+			this.sExpectedDataTypeErrorMessage =
+				"Importing the pseudo module 'testing/pseudo/modules/deprecation/HexNumber' is deprecated."
+				+ " To access the type 'testing.pseudo.modules.deprecation.HexNumber',"
+				+ " please import 'testing/pseudo/modules/deprecation/library' to ensure that the type is defined."
+				+ " You can then access it by calling 'DataType.getType(\"testing.pseudo.modules.deprecation.HexNumber\")'."
+				+ " For more information, see documentation under 'Best Practices for Loading Modules'.";
+			this.sExpectedOtherErrorMessage =
+				"Importing the pseudo module 'testing/pseudo/modules/deprecation/SomethingElse' is deprecated."
+				+ " To access the type 'testing.pseudo.modules.deprecation.SomethingElse',"
+				+ " please import 'testing/pseudo/modules/deprecation/library'."
+				+ " For more information, see documentation under 'Best Practices for Loading Modules'.";
+		}
+	});
 
-		await Library.load({
-			name: "testing.pseudo.modules.deprecation"
+	QUnit.test("Enum with sap.ui.require", function(assert) {
+		// Anonymous require: Log does not contain the requesting module
+		return new Promise((resolve, reject) => {
+			sap.ui.require(["testing/pseudo/modules/deprecation/SomeEnum"], (SomeEnum) => {
+				assert.ok(Log.error.calledWith(this.sExpectedEnumErrorMessage), "Error Message for pseudo module deprecation logged.");
+				assert.deepEqual(SomeEnum, this.oLib.SomeEnum, "pseudo type module export is correct (A).");
+				resolve();
+			}, reject);
 		});
+	});
 
-		const sExpectedErrorMessage = "Deprecation: Importing the type 'testing.pseudo.modules.deprecation.Type1' as a pseudo module is deprecated. Please import the type from the module 'testing/pseudo/modules/deprecation/library'. You can then reference this type via the library's module export. For more information, see documentation under 'Best Practices for Loading Modules'.";
+	QUnit.test("DataType with sap.ui.require", function(assert) {
+		// Anonymous require: Log does not contain the requesting module
+		return new Promise((resolve, reject) => {
+			sap.ui.require(["testing/pseudo/modules/deprecation/HexNumber"], (HexNumber) => {
+				assert.ok(Log.error.calledWith(this.sExpectedDataTypeErrorMessage), "Error Message for pseudo module deprecation logged.");
+				assert.strictEqual(HexNumber, DataType.getType("testing.pseudo.modules.deprecation.HexNumber"), "pseudo type module export is correct.");
+				resolve();
+			}, reject);
+		});
+	});
 
+	QUnit.test("Something else with sap.ui.require", function(assert) {
 		// Anonymous require: Log does not contain the requesting module
-		await new Promise((resolve, reject) => {
-			oErrorLogSpy = this.spy(Log, "error");
+		return new Promise((resolve, reject) => {
+			sap.ui.require(["testing/pseudo/modules/deprecation/SomethingElse"], (SomethingElse) => {
+				assert.ok(Log.error.calledWith(this.sExpectedOtherErrorMessage), "Error Message for pseudo module deprecation logged.");
+				assert.strictEqual(SomethingElse, this.oLib.SomethingElse, "pseudo type module export is correct.");
+				resolve();
+			}, reject);
+		});
+	});
 
-			sap.ui.require(["testing/pseudo/modules/deprecation/Type1"], (Type1) => {
-				assert.ok(oErrorLogSpy.calledWith(sExpectedErrorMessage), "Error Message for pseudo module deprecation logged.");
-				assert.ok(Type1.A, "A", "pseudo type module export is correct (A).");
-				assert.ok(Type1.B, "B", "pseudo type module export is correct (B).");
+	QUnit.test("Enum with sap.ui.define", function(assert) {
+		// sap.ui.define: Log contains the requesting module
+		return new Promise((resolve, reject) => {
+			const sModuleSpecificErrorMessage = `(dependency of 'my/old/Module1.js') ${this.sExpectedEnumErrorMessage}`;
+
+			sap.ui.define("my/old/Module1", ["testing/pseudo/modules/deprecation/SomeEnum"], (SomeEnum) => {
+				assert.ok(Log.error.calledWith(sModuleSpecificErrorMessage), "Error Message for pseudo module deprecation logged.");
+				assert.deepEqual(SomeEnum, this.oLib.SomeEnum, "pseudo type module export is correct.");
+			});
+
+			sap.ui.require(["my/old/Module1"], function() {
 				resolve();
 			}, reject);
-		}).finally(() => {
-			oErrorLogSpy.restore();
 		});
+	});
 
-		// Anonymous require: Log does not contain the requesting module
-		await new Promise((resolve, reject) => {
-			oErrorLogSpy = this.spy(Log, "error");
-			const sModuleSpecificErrorMessage = `(dependency of 'my/old/Module.js') ${sExpectedErrorMessage}`;
-
-			sap.ui.define("my/old/Module", ["testing/pseudo/modules/deprecation/Type1"], (Type1) => {
-				assert.ok(oErrorLogSpy.calledWith(sModuleSpecificErrorMessage), "Error Message for pseudo module deprecation logged.");
-				assert.ok(Type1.A, "A", "pseudo type module export is correct (A).");
-				assert.ok(Type1.B, "B", "pseudo type module export is correct (B).");
+	QUnit.test("DataType with sap.ui.define", function(assert) {
+		// sap.ui.define: Log contains the requesting module
+		return new Promise((resolve, reject) => {
+			const sModuleSpecificErrorMessage = `(dependency of 'my/old/Module2.js') ${this.sExpectedDataTypeErrorMessage}`;
+
+			sap.ui.define("my/old/Module2", ["testing/pseudo/modules/deprecation/HexNumber"], (HexNumber) => {
+				assert.ok(Log.error.calledWith(sModuleSpecificErrorMessage), "Error Message for pseudo module deprecation logged.");
+				assert.strictEqual(HexNumber, DataType.getType("testing.pseudo.modules.deprecation.HexNumber"), "pseudo type module export is correct.");
+			});
+
+			sap.ui.require(["my/old/Module1"], function() {
 				resolve();
 			}, reject);
-		}).finally(() => {
-			oErrorLogSpy.restore();
 		});
 	});
 
+	QUnit.test("Something else with sap.ui.define", function(assert) {
+		// sap.ui.define: Log contains the requesting module
+		return new Promise((resolve, reject) => {
+			const sModuleSpecificErrorMessage = `(dependency of 'my/old/Module3.js') ${this.sExpectedOtherErrorMessage}`;
+
+			sap.ui.define("my/old/Module3", ["testing/pseudo/modules/deprecation/SomethingElse"], (SomethingElse) => {
+				assert.ok(Log.error.calledWith(sModuleSpecificErrorMessage), "Error Message for pseudo module deprecation logged.");
+				assert.strictEqual(SomethingElse, this.oLib.SomethingElse, "pseudo type module export is correct.");
+				resolve();
+			});
+
+			sap.ui.require(["my/old/Module1"], function() {
+				resolve();
+			}, reject);
+		});
+	});
+
+	QUnit.test("Enum with probing require", function(assert) {
+		const SomeEnum = sap.ui.require("testing/pseudo/modules/deprecation/SomeEnum");
+		assert.deepEqual(SomeEnum, this.oLib.SomeEnum);
+		assert.ok(Log.error.calledWith(this.sExpectedEnumErrorMessage), "Error Message for pseudo module deprecation logged.");
+	});
+
+	QUnit.test("DataType with probing require", function(assert) {
+		const HexNumber = sap.ui.require("testing/pseudo/modules/deprecation/HexNumber");
+		assert.deepEqual(HexNumber, DataType.getType("testing.pseudo.modules.deprecation.HexNumber"));
+		assert.ok(Log.error.calledWith(this.sExpectedDataTypeErrorMessage), "Error Message for pseudo module deprecation logged.");
+	});
+
+	QUnit.test("Enum with probing require", function(assert) {
+		const SomethingElse = sap.ui.require("testing/pseudo/modules/deprecation/SomethingElse");
+		assert.deepEqual(SomethingElse, this.oLib.SomethingElse);
+		assert.ok(Log.error.calledWith(this.sExpectedOtherErrorMessage), "Error Message for pseudo module deprecation logged.");
+	});
+
+
+
 	QUnit.module("Handling of 'apiVersion: 2'");
 
 	QUnit.test("Unknown apiVersion is rejected", function (assert) {

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

@@ -25,8 +25,8 @@ sap.ui.define([
 	var mObjects = {};
 
 	var sXmlViewContent =
-		"<mvc:View height=\"100%\" xmlns:mvc=\"sap.ui.core.mvc\" xmlns:core=\"sap.ui.core\" xmlns=\"sap.m\" id=\"view\"" +
-		"	displayBlock=\"true\" unknownProperty=\"true\">" +
+		"<mvc:View height=\"100%\" xmlns:mvc=\"sap.ui.core.mvc\" xmlns:core=\"sap.ui.core\" xmlns=\"sap.m\" " +
+		"	displayBlock=\"true\">" +
 		"	<Panel id=\"panel\">" +
 		"		<content>" +
 		"			<Button text=\"Button\" id=\"button1\" />" +

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

@@ -246,6 +246,7 @@ sap.ui.define([
 		// Fake direct require to a library.js module by just calling initLibrary
 		Library.init({
 			name : "sap.ui.fake.testlib",
+			apiVersion: 2,
 			version: "1.0.0",
 			dependencies : ["sap.ui.core"],
 			types: [],

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

@@ -1,5 +1,6 @@
 /*global QUnit */
 sap.ui.define([
+	"sap/base/future",
 	"sap/ui/core/theming/Parameters",
 	"sap/ui/core/Control",
 	"sap/ui/core/Element",
@@ -10,7 +11,7 @@ sap.ui.define([
 	"sap/m/Bar",
 	"sap/ui/thirdparty/URI",
 	"sap/ui/qunit/utils/nextUIUpdate"
-], function(Parameters, Control, Element, Icon, Library, Theming, includeStylesheet, Bar, URI, nextUIUpdate) {
+], function(future, Parameters, Control, Element, Icon, Library, Theming, includeStylesheet, Bar, URI, nextUIUpdate) {
 	"use strict";
 
 	QUnit.module("Parmeters.get", {
@@ -86,7 +87,10 @@ sap.ui.define([
 			name: "sapUiAsyncThemeParamForLib5"
 		}), undefined, "'undefined' should be returned for a parameter of a library that currently is not loaded");
 
-		Library.init({ name: "testlibs.themeParameters.lib5" });
+		Library.init({
+			name: "testlibs.themeParameters.lib5",
+			apiVersion: 2
+		});
 
 		Parameters.get({
 			name: "sapUiAsyncThemeParamForLib5",
@@ -127,7 +131,11 @@ sap.ui.define([
 		});
 	});
 
-	QUnit.test("Read multiple given parameters (including undefined param name)", async function(assert) {
+	/**
+	 * @deprecated
+	 */
+	QUnit.test("Read multiple given parameters (including undefined param name) (future=false)", async function(assert) {
+		future.active = false;
 		var done = assert.async();
 		var oControl = new Control();
 		var aParams = ["sapUiMultipleAsyncThemeParamWithScopeForLib7", "sapUiMultipleAsyncThemeParamWithoutScopeForLib7", "sapUiNotExistingTestParam", "sapUiBaseColor"];
@@ -152,11 +160,37 @@ sap.ui.define([
 				});
 				assert.deepEqual(oParamResult, oExpected, "Key-value map for the given params 'sapUiMultipleAsyncThemeParamWithScopeForLib7', 'sapUiMultipleAsyncThemeParamWithoutScopeForLib7' and 'sapUiBaseColor' should be returned");
 				assert.strictEqual(checkLibraryParametersJsonRequestForLib("7").length, 0, "library-parameters.json not requested for testlibs.themeParameters.lib7");
+				future.active = undefined;
 				done();
 			}
 		}), undefined, "Parameter 'sapUiBaseColor' should already be available but value should be returned in callback.");
 	});
 
+	QUnit.test("Read multiple given parameters (including undefined param name) (future=true)", async function (assert) {
+		future.active = true;
+		var done = assert.async();
+		var oControl = new Control();
+		var aParams = ["sapUiMultipleAsyncThemeParamWithScopeForLib7", "sapUiMultipleAsyncThemeParamWithoutScopeForLib7", "sapUiNotExistingTestParam", "sapUiBaseColor"];
+
+		await Library.load({ name: "testlibs.themeParameters.lib7" });
+
+		Theming.attachAppliedOnce((oEvent) => {
+			oControl.addStyleClass("sapTestScope");
+
+			assert.throws(() => {
+				Parameters.get({
+					name: aParams,
+					scopeElement: oControl,
+					callback: function () {
+						assert.ok(false, "Callback should not be executed");
+					}
+				});
+			}, new Error("One or more parameters could not be found."), "Throws Error.");
+			future.active = undefined;
+			done();
+		});
+	});
+
 	QUnit.test("Call Parameters.get multiple times with same callback function should only be executed once", async function (assert) {
 		assert.expect(3);
 		var done = assert.async(), callback = function (oParamResult) {
@@ -188,7 +222,11 @@ sap.ui.define([
 		});
 	});
 
-	QUnit.test("Read not defined parameter using callback", async function(assert) {
+	/**
+	 * @deprecated
+	 */
+	QUnit.test("Read not defined parameter using callback (future=false)", async function(assert) {
+		future.active = false;
 		var done = assert.async();
 
 		await Library.load({name: "testlibs.themeParameters.lib9"});
@@ -198,11 +236,32 @@ sap.ui.define([
 			callback: function (oParamResult) {
 				assert.deepEqual(oParamResult, undefined, "Value for the given param 'sapUiNotExistingTestParam' does not exist and 'undefined' should be returned");
 				assert.strictEqual(checkLibraryParametersJsonRequestForLib("8").length, 0, "library-parameters.json not requested for testlibs.themeParameters.lib9");
+				future.active = undefined;
 				done();
 			}
 		});
 	});
 
+	QUnit.test("Read not defined parameter using callback (future=true)", async function (assert) {
+		future.active = true;
+		var done = assert.async();
+
+		await Library.load({ name: "testlibs.themeParameters.lib9" });
+
+		Theming.attachAppliedOnce((oEvent) => {
+			assert.throws(() => {
+				Parameters.get({
+					name: "sapUiNotExistingTestParam",
+					callback: function () {
+						assert.ok(false, "Callback should not be executed");
+					}
+				});
+			}, new Error("One or more parameters could not be found."), "Throws Error.");
+			future.active = undefined;
+			done();
+		});
+	});
+
 	QUnit.test("Read parameter first time from lib which CSS is already loaded shouldn't trigger a library-parameters.json request", async function(assert) {
 		var done = assert.async();
 		var fnAssertApplied = function() {

package/test/sap/ui/core/qunit/analytics/AnalyticalBinding.qunit.js

@@ -2483,6 +2483,7 @@ sap.ui.define([
 
 	//*********************************************************************************************
 	QUnit.test("constructor: unsupported model", function (assert) {
+		/** @deprecated As of version 1.120, because sap.ui.model.odata.Filter is deprecated since 1.22 */
 		this.mock(AnalyticalBinding.prototype).expects("_convertDeprecatedFilterObjects").withExactArgs(undefined);
 		const oModel = {createCustomParams() {}};
 		this.mock(oModel).expects("createCustomParams").withExactArgs({custom: undefined});

package/test/sap/ui/core/qunit/bootstrap/Configuration.qunit.js

@@ -10,16 +10,16 @@ sap.ui.define([
 	'sap/ui/core/Core',
 	'sap/ui/core/Lib',
 	'sap/ui/core/date/CalendarWeekNumbering',
-	'sap/ui/core/format/TimezoneUtil',
 	'sap/ui/core/Theming',
 	'sap/base/config',
 	'sap/base/Log',
 	"sap/base/config/GlobalConfigurationProvider",
+	'sap/base/i18n/date/TimezoneUtils',
 	'../routing/HistoryUtils',
 	'sap/ui/base/config/URLConfigurationProvider',
 	'sap/ui/core/LocaleData' // only used indirectly via Configuration.getCalendarType
-], function(CalendarType, Configuration, Core, Library, CalendarWeekNumbering, TimezoneUtil, Theming, BaseConfig, Log,
-		GlobalConfigurationProvider, HistoryUtils, URLConfigurationProvider/*, LocaleData*/) {
+], function(CalendarType, Configuration, Core, Library, CalendarWeekNumbering, Theming, BaseConfig, Log,
+		GlobalConfigurationProvider, TimezoneUtils, HistoryUtils, URLConfigurationProvider/*, LocaleData*/) {
 	"use strict";
 
 	var browserUrl = {
@@ -42,7 +42,7 @@ sap.ui.define([
 	var AnimationMode = Configuration.AnimationMode;
 	let mConfigStubValues = {};
 
-	var sLocalTimezone = TimezoneUtil.getLocalTimezone();
+	var sLocalTimezone = TimezoneUtils.getLocalTimezone();
 
 	function getHtmlAttribute(sAttribute) {
 		return document.documentElement.getAttribute(sAttribute);

package/test/sap/ui/core/qunit/bootstrap/ThemeVersion.qunit.js

@@ -83,6 +83,9 @@ sap.ui.define([
 		);
 	});
 
+	/**
+	 * @deprecated
+	 */
 	QUnit.test("library-parameters.json", function(assert) {
 		this.initFakeServer();