@openui5/sap.ui.core 1.118.0 → 1.119.1

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

@@ -5,8 +5,6 @@ sap.ui.define([
 	'sap/ui/core/Core',
 	'sap/ui/core/date/CalendarWeekNumbering',
 	'sap/ui/core/format/TimezoneUtil',
-	'sap/ui/core/Locale',
-	'sap/ui/base/Interface',
 	'sap/ui/core/Theming',
 	'sap/base/config',
 	'sap/base/Log',
@@ -14,7 +12,7 @@ sap.ui.define([
 	'../routing/HistoryUtils',
 	'sap/ui/base/config/URLConfigurationProvider',
 	'sap/ui/core/LocaleData' // only used indirectly via Configuration.getCalendarType
-], function(CalendarType, Configuration, Core, CalendarWeekNumbering, TimezoneUtil, Locale, Interface, Theming, BaseConfig, Log,
+], function(CalendarType, Configuration, Core, CalendarWeekNumbering, TimezoneUtil, Theming, BaseConfig, Log,
 		GlobalConfigurationProvider, HistoryUtils, URLConfigurationProvider/*, LocaleData*/) {
 	"use strict";
 
@@ -68,7 +66,7 @@ sap.ui.define([
 	});
 
 	QUnit.test("Settings", function(assert) {
-		assert.equal(Configuration.getTheme(), "SapSampleTheme2", "tag config should override global config");
+		assert.equal(Theming.getTheme(), "SapSampleTheme2", "tag config should override global config");
 		assert.deepEqual(Configuration.getValue("modules"), ["sap.ui.core.library"], "Module List in configuration matches configured modules/libraries");
 	});
 
@@ -476,200 +474,6 @@ sap.ui.define([
 		assert.equal(oConfig.getSAPLogonLanguage(), "6N", "setting only BCP47 language again must reset the knowledge about SAP Language");
 	});
 
-	QUnit.module("SAP Logon Language (via url)", {
-		before: function() {
-			this.oConfig = Configuration;
-		},
-		beforeEach: function(assert) {
-			this.setupConfig = function(sLanguage, data) {
-				var oCoreMock = {
-					fireLocalizationChanged: function() {}
-				};
-				data = data ? data : {};
-				this.oStub && this.oStub.restore();
-				this.oStub = sinon.stub(BaseConfig, "get");
-				this.oStub.callsFake(function(mParameters) {
-					if (mParameters.name === "sapUiLanguage") {
-						return data["sap-ui-language"] || sLanguage || "";
-					} else if (mParameters.name === "sapLanguage") {
-						return data["sap-language"] || this.oStub.wrappedMethod.call(this, mParameters);
-					} else if (mParameters.name === "sapLocale") {
-						return data["sap-locale"] || this.oStub.wrappedMethod.call(this, mParameters);
-					} else if (mParameters.name === "sapUiFormatLocale") {
-						return data["sap-ui-formatLocale"]  ? new Locale(data["sap-ui-formatLocale"]) :  this.oStub.wrappedMethod.call(this, mParameters);
-					} else {
-						return this.oStub.wrappedMethod.call(this, mParameters);
-					}
-				}.bind(this));
-
-				// reset sapLogonLanguage
-				this.oConfig.setCalendarWeekNumbering(CalendarWeekNumbering.Default);
-				Configuration.setCore(oCoreMock);
-				return Configuration;
-			};
-		},
-		afterEach: function() {
-			this.oStub && this.oStub.restore();
-		}
-	});
-
-	[
-		/* URL parameter							language			languageTag 		SAP-L	Caption */
-		[ {"sap-language": "en"},								"en",				"en",				"EN",	"sap-language is the valid ISO language EN"],
-		[ {"sap-language": "EN"},								"EN",				"en",				"EN",	"sap-language is the valid ISO language EN"],
-		[ {"sap-language": "ZH"},								"zh-Hans",			"zh-Hans",			"ZH",	"sap-language is the known SAP language ZN"],
-		[ {"sap-language": "ZF"},								"zh-Hant",			"zh-Hant",			"ZF",	"sap-language is the known SAP language ZF"],
-		[ {"sap-language": "1Q"},								"en-US-x-saptrc",	"en-US-x-saptrc",	"1Q",	"sap-language is the known SAP language 1Q"],
-		[ {"sap-language": "2Q"},								"en-US-x-sappsd",	"en-US-x-sappsd",	"2Q",	"sap-language is the known SAP language 2Q"],
-		[ {"sap-language": "3Q"},								"en-US-x-saprigi",	"en-US-x-saprigi",	"3Q",	"sap-language is the known SAP language 3Q"],
-		[ {"sap-language": "6N"},								"en-GB",			"en-GB",			"6N",	"sap-language is the unknown SAP language 6N"],
-		[ {"sap-language": "SH"},								"sr-Latn",			"sh",		    	"SH",	"sap-language is the unknown SAP language 6N"],
-		[ {"sap-locale": "fr_CH"},								"fr_CH",			"fr-CH",			"FR",	"sap-locale is the accepted BCP47 tag fr_CH"],
-		[ {"sap-locale": "En_gb", "sap-language": "6N"},		"En_gb",			"en-GB",			"6N",	"valid combination of sap-locale and sap-language (En_gb, 6N)"],
-		[ {"sap-ui-language":"en_GB", "sap-language": "6N"},	"en-GB",			"en-GB",			"6N",	"valid combination of sap-ui-language and sap-language (en_GB, 6N)"],
-		[ {"sap-language": "EN", "sap-locale": "en_GB"},		"en_GB",			"en-GB",			"EN",	"valid combination of sap-language and sap-locale, both as BCP47 tag (EN, en_GB)"]
-	].forEach(function( data ) {
-
-		QUnit.test(data[4], function(assert) {
-
-			var oConfig = this.setupConfig("de", data[0]);
-			assert.equal(oConfig.getLanguage(), data[1], "the effective language should be '" + data[1] + "'");
-			assert.equal(oConfig.getLanguageTag(), data[2], "the effective language tag should be '" + data[2] + "'");
-			assert.equal(oConfig.getSAPLogonLanguage(), data[3], "the SAP Logon language should be '" + data[3] + "'");
-
-		});
-
-	});
-
-	// url: sap-language=en
-	// window: language=de
-	// ==> en
-	// url: sap-language=en&sap-ui-language=de
-	// ==> de
-
-	QUnit.test("language via url, locale+language via API", function(assert) {
-		var oConfig = this.setupConfig("de", {"sap-language": "6N"});
-		assert.equal(oConfig.getLanguage(), "en-GB", "the effective language still should be 'en-GB'");
-		assert.equal(oConfig.getLanguageTag(), "en-GB", "the effective language tag still should be 'en-GB'");
-		assert.equal(oConfig.getSAPLogonLanguage(), "6N", "the SAP Logon language should be '6N' already");
-		oConfig = this.setupConfig("de", {"sap-language":"1E"});
-		assert.equal(oConfig.getLanguage(), "de", "the effective language still should be 'de'");
-		assert.equal(oConfig.getLanguageTag(), "de", "the effective language tag still should be 'de'");
-		assert.equal(oConfig.getSAPLogonLanguage(), "1E", "the SAP Logon language should be '6N' already");
-	});
-
-	QUnit.test("language via url, locale+language via API", function(assert) {
-		// without the second parameter, the sap language now would be 'EN' only
-		this.oConfig.setLanguage("en-GB");
-		assert.equal(this.oConfig.getLanguage(), "en-GB", "the effective language should be 'en-GB'");
-		assert.equal(this.oConfig.getLanguageTag(), "en-GB", "the effective language tag should be 'en-GB'");
-		assert.equal(this.oConfig.getSAPLogonLanguage(), "6N", "the SAP Logon language should be 'EN'");
-
-		// but with the second parameter, everything should be fine
-		this.oConfig.setLanguage("en-GB", "6N");
-		assert.equal(this.oConfig.getLanguage(), "en-GB", "the effective language should be 'en-GB'");
-		assert.equal(this.oConfig.getLanguageTag(), "en-GB", "the effective language tag should be 'en-GB'");
-		assert.equal(this.oConfig.getSAPLogonLanguage(), "6N", "the SAP Logon language should be '6N'");
-
-		this.oConfig.setLanguage("en-GB", "1E");
-		assert.equal(this.oConfig.getLanguage(), "en-GB", "the effective language should be 'en-GB'");
-		assert.equal(this.oConfig.getLanguageTag(), "en-GB", "the effective language tag should be 'en-GB'");
-		assert.equal(this.oConfig.getSAPLogonLanguage(), "1E", "the SAP Logon language should be '1E'");
-
-	});
-
-	QUnit.test("error reporting", function(assert) {
-		this.stub(Log, 'warning').callThrough();
-		this.setupConfig("de", {"sap-language":"1E", "sap-locale": "en-GB"});
-		this.oConfig.getLanguage();
-		assert.strictEqual(Log.warning.called, false, "no warning should be written if accompanied by sap-locale");
-		this.setupConfig("de", {"sap-language":"1E", "sap-ui-language":"en-GB"});
-		this.oConfig.getLanguage();
-		assert.strictEqual(Log.warning.called, false, "no warning should be written if accompanied by sap-ui-language");
-		this.setupConfig(null, {"sap-language" :"1E"});
-		this.oConfig.getLanguage();
-		assert.ok(Log.warning.calledWith(sinon.match(/1E/).and(sinon.match(/BCP-?47/i))), "warning must have been written");
-		assert.throws(function() {
-			this.setupConfig("de", {"sap-locale":"1E","sap-language":"1E"});
-			this.oConfig.getLanguage();
-		}, "setting an invalid (non-BCP-47) sap-locale should cause an error");
-		assert.throws(function() {
-			this.setupConfig("de", {"sap-ui-language":"1E", "sap-language":"1E"});
-			this.oConfig.getLanguage();
-		}, "setting an invalid (non-BCP-47) sap-ui-language should cause an error");
-	});
-
-	QUnit.test("Format Locale", function(assert) {
-		var rMethodsToIgnore = /^(_|destroy|getInterface$|getMetadata$|isA$)/;
-
-		// Checks via duck-typing whether the given object is an instance of Locale
-		// The check should work with facades (1.x) as well as with instances (2.x)
-		function assertCoreLocale(oObject) {
-			var aMethodNames = Object.keys(Locale.prototype).filter(function(sKey) {
-				return !rMethodsToIgnore.test(sKey) && typeof Locale.prototype[sKey] === "function";
-			});
-
-			aMethodNames.forEach(function(sMethodName) {
-				assert.strictEqual(typeof oObject[sMethodName], "function",
-					"expected interface method should actually exist: " + sMethodName);
-			});
-
-			for ( var sMethodName in oObject ) {
-				if ( !rMethodsToIgnore.test(sMethodName) && typeof oObject[sMethodName] === "function" ) {
-					assert.ok(aMethodNames.includes(sMethodName),
-						"actual method should be part of expected interface: " + sMethodName);
-				}
-			}
-		}
-
-		var oConfig;
-
-		//window['sap-ui-config'].formatlocale = 'fr-CH'; // Note: Configuration expects sap-ui-config names converted to lowercase (done by bootstrap)
-		oConfig = this.setupConfig("fr-FR", {});
-		oConfig.setFormatLocale("fr-CH");
-		assert.equal(oConfig.getLanguageTag(), "fr-FR", "language should be fr-FR");
-		assert.equal(oConfig.getFormatLocale(), "fr-CH", "format locale string should be fr-CH");
-		assert.ok(oConfig.getFormatSettings().getFormatLocale(), "format locale should exist");
-		assertCoreLocale(oConfig.getFormatSettings().getFormatLocale());
-		assert.equal(oConfig.getFormatSettings().getFormatLocale().toString(), "fr-CH", "format locale should be fr-CH");
-
-		//window['sap-ui-config'].formatlocale = null;
-		oConfig = this.setupConfig("fr-FR", {});
-		oConfig.setFormatLocale(null);
-		assert.equal(oConfig.getLanguageTag(), "fr-FR", "language should be fr-FR");
-		assert.equal(oConfig.getFormatLocale(), "fr-FR", "format locale string should be fr-CH");
-		assert.ok(oConfig.getFormatSettings().getFormatLocale(), "format locale should exist");
-		assert.equal(oConfig.getFormatSettings().getFormatLocale().toString(), "fr-FR", "format locale should be fr-CH");
-		delete window['sap-ui-config'].formatlocale;
-
-		oConfig = this.setupConfig("de", {"sap-language": "EN", "sap-ui-formatLocale": "en-AU"});
-		assert.equal(oConfig.getLanguageTag(), "en", "language should be en");
-		assert.equal(oConfig.getFormatLocale(), "en-AU", "format locale string should be en-AU");
-		assert.ok(oConfig.getFormatSettings().getFormatLocale(), "format locale should exist");
-		assert.equal(oConfig.getFormatSettings().getFormatLocale().toString(), "en-AU", "format locale should be en-AU");
-
-		oConfig = this.setupConfig();
-		oConfig.setFormatLocale("en-CA");
-		assert.equal(oConfig.getFormatLocale(), "en-CA", "format locale string should be en-CA");
-		assert.ok(oConfig.getFormatSettings().getFormatLocale(), "format locale should exist");
-		assert.equal(oConfig.getFormatSettings().getFormatLocale().toString(), "en-CA", "format locale should be en-CA");
-
-		oConfig = this.setupConfig("de", {"sap-language": "EN"});
-		oConfig.setFormatLocale();
-		assert.equal(oConfig.getFormatLocale(), "en", "format locale string should be en");
-		assert.ok(oConfig.getFormatSettings().getFormatLocale(), "format locale should exist");
-		assert.equal(oConfig.getFormatSettings().getFormatLocale().toString(), "en", "format locale should be en");
-
-		assert.throws(function() {
-			oConfig.setFormatLocale('6N');
-		}, "setting an invalid (non-BCP-47) format locale should cause an error");
-		assert.throws(function() {
-			oConfig.setFormatLocale(new Date());
-		}, "setting a non-string value as format locale should cause an error");
-	});
-
-
-
 	QUnit.module("Format settings", {
 		afterEach: function() {
 			browserUrl.reset();

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

@@ -0,0 +1,210 @@
+/*global QUnit, sinon */
+sap.ui.define([
+	"sap/base/Log",
+	"sap/base/config",
+	"sap/base/config/GlobalConfigurationProvider",
+	"sap/ui/base/config/URLConfigurationProvider",
+	"sap/ui/core/Configuration",
+	"sap/ui/core/Locale",
+	"sap/ui/core/date/CalendarWeekNumbering"
+], (
+	Log,
+	BaseConfig,
+	GlobalConfigurationProvider,
+	URLConfigurationProvider,
+	Configuration,
+	Locale,
+	CalendarWeekNumbering
+) => {
+	"use strict";
+
+	QUnit.module("SAP Logon Language (via url)", {
+		beforeEach: (assert) => {
+			this.setupConfig = (sLanguage, data) => {
+				data = data ? data : {};
+				this.oURLProviderStub && this.oURLProviderStub.restore();
+				this.oURLProviderStub = sinon.stub(URLConfigurationProvider, "get");
+				this.oURLProviderStub.callsFake((sKey) => {
+					if (sKey === "sapUiLanguage") {
+						return data["sap-ui-language"] || undefined;
+					} else if (sKey === "sapLanguage") {
+						return data["sap-language"] || this.oURLProviderStub.wrappedMethod.call(this, sKey);
+					} else if (sKey === "sapLocale") {
+						return data["sap-locale"] || this.oURLProviderStub.wrappedMethod.call(this, sKey);
+					} else if (sKey === "sapUiFormatLocale") {
+						return data["sap-ui-formatLocale"] || this.oURLProviderStub.wrappedMethod.call(this, sKey);
+					} else {
+						return this.oURLProviderStub.wrappedMethod.call(this, sKey);
+					}
+				});
+
+				this.oGlobalProviderStub && this.oGlobalProviderStub.restore();
+				this.oGlobalProviderStub = sinon.stub(GlobalConfigurationProvider, "get");
+				this.oGlobalProviderStub.callsFake((sKey) => {
+					if (sKey === "sapUiLanguage") {
+						return sLanguage || "";
+					} else {
+						return this.oGlobalProviderStub.wrappedMethod.call(this, sKey);
+					}
+				});
+
+				// reset sapLogonLanguage
+				Configuration.setCalendarWeekNumbering(CalendarWeekNumbering.Default);
+				BaseConfig._.invalidate();
+				Configuration.setCore({
+					fireLocalizationChanged: () => {}
+				});
+				return Configuration;
+			};
+		},
+		afterEach: () => {
+			this.oURLProviderStub && this.oURLProviderStub.restore();
+			this.oGlobalProviderStub && this.oGlobalProviderStub.restore();
+		}
+	});
+
+	[
+		/* URL parameter							language			languageTag 		SAP-L	Caption */
+		[ {"sap-language": "en"},								"en",				"en",				"EN",	"sap-language is the valid ISO language EN"],
+		[ {"sap-language": "EN"},								"EN",				"en",				"EN",	"sap-language is the valid ISO language EN"],
+		[ {"sap-language": "ZH"},								"zh-Hans",			"zh-Hans",			"ZH",	"sap-language is the known SAP language ZN"],
+		[ {"sap-language": "ZF"},								"zh-Hant",			"zh-Hant",			"ZF",	"sap-language is the known SAP language ZF"],
+		[ {"sap-language": "1Q"},								"en-US-x-saptrc",	"en-US-x-saptrc",	"1Q",	"sap-language is the known SAP language 1Q"],
+		[ {"sap-language": "2Q"},								"en-US-x-sappsd",	"en-US-x-sappsd",	"2Q",	"sap-language is the known SAP language 2Q"],
+		[ {"sap-language": "3Q"},								"en-US-x-saprigi",	"en-US-x-saprigi",	"3Q",	"sap-language is the known SAP language 3Q"],
+		[ {"sap-language": "6N"},								"en-GB",			"en-GB",			"6N",	"sap-language is the unknown SAP language 6N"],
+		[ {"sap-language": "SH"},								"sr-Latn",			"sh",		    	"SH",	"sap-language is the unknown SAP language 6N"],
+		[ {"sap-locale": "fr_CH"},								"fr_CH",			"fr-CH",			"FR",	"sap-locale is the accepted BCP47 tag fr_CH"],
+		[ {"sap-locale": "En_gb", "sap-language": "6N"},		"En_gb",			"en-GB",			"6N",	"valid combination of sap-locale and sap-language (En_gb, 6N)"],
+		[ {"sap-ui-language":"en_GB", "sap-language": "6N"},	"en-GB",			"en-GB",			"6N",	"valid combination of sap-ui-language and sap-language (en_GB, 6N)"],
+		[ {"sap-language": "EN", "sap-locale": "en_GB"},		"en_GB",			"en-GB",			"EN",	"valid combination of sap-language and sap-locale, both as BCP47 tag (EN, en_GB)"]
+	].forEach((data) => {
+		QUnit.test(data[4], (assert) => {
+			this.setupConfig("de", data[0]);
+			assert.equal(Configuration.getLanguage(), data[1], "the effective language should be '" + data[1] + "'");
+			assert.equal(Configuration.getLanguageTag(), data[2], "the effective language tag should be '" + data[2] + "'");
+			assert.equal(Configuration.getSAPLogonLanguage(), data[3], "the SAP Logon language should be '" + data[3] + "'");
+		});
+	});
+
+	QUnit.test("error reporting", (assert) => {
+		sinon.stub(Log, 'warning').callThrough();
+		this.setupConfig("de", {"sap-language":"1E", "sap-locale": "en-GB"});
+		Configuration.getLanguage();
+		assert.strictEqual(Log.warning.called, false, "no warning should be written if accompanied by sap-locale");
+		this.setupConfig("de", {"sap-language":"1E", "sap-ui-language":"en-GB"});
+		Configuration.getLanguage();
+		assert.strictEqual(Log.warning.called, false, "no warning should be written if accompanied by sap-ui-language");
+		this.setupConfig(null, {"sap-language" :"1E"});
+		Configuration.getLanguage();
+		assert.ok(Log.warning.calledWith(sinon.match(/1E/).and(sinon.match(/BCP-?47/i))), "warning must have been written");
+		assert.throws(() => {
+			this.setupConfig("de", {"sap-locale":"1E","sap-language":"1E"});
+			Configuration.getLanguage();
+		}, "setting an invalid (non-BCP-47) sap-locale should cause an error");
+		assert.throws(() => {
+			this.setupConfig("de", {"sap-ui-language":"1E", "sap-language":"1E"});
+			Configuration.getLanguage();
+		}, "setting an invalid (non-BCP-47) sap-ui-language should cause an error");
+	});
+
+	QUnit.test("Format Locale", (assert) => {
+		var rMethodsToIgnore = /^(_|destroy|getInterface$|getMetadata$|isA$)/;
+
+		// Checks via duck-typing whether the given object is an instance of Locale
+		// The check should work with facades (1.x) as well as with instances (2.x)
+		const assertCoreLocale = (oObject) => {
+			var aMethodNames = Object.keys(Locale.prototype).filter((sKey) => {
+				return !rMethodsToIgnore.test(sKey) && typeof Locale.prototype[sKey] === "function";
+			});
+
+			aMethodNames.forEach((sMethodName) => {
+				assert.strictEqual(typeof oObject[sMethodName], "function",
+					"expected interface method should actually exist: " + sMethodName);
+			});
+
+			for (var sMethodName in oObject) {
+				if (!rMethodsToIgnore.test(sMethodName) && typeof oObject[sMethodName] === "function") {
+					assert.ok(aMethodNames.includes(sMethodName),
+						"actual method should be part of expected interface: " + sMethodName);
+				}
+			}
+		};
+
+		//window['sap-ui-config'].formatlocale = 'fr-CH'; // Note: Configuration expects sap-ui-config names converted to lowercase (done by bootstrap)
+		this.setupConfig("fr-FR", {});
+		Configuration.setFormatLocale("fr-CH");
+		assert.equal(Configuration.getLanguageTag(), "fr-FR", "language should be fr-FR");
+		assert.equal(Configuration.getFormatLocale(), "fr-CH", "format locale string should be fr-CH");
+		assert.ok(Configuration.getFormatSettings().getFormatLocale(), "format locale should exist");
+		assertCoreLocale(Configuration.getFormatSettings().getFormatLocale());
+		assert.equal(Configuration.getFormatSettings().getFormatLocale().toString(), "fr-CH", "format locale should be fr-CH");
+
+		//window['sap-ui-config'].formatlocale = null;
+		this.setupConfig("fr-FR", {});
+		Configuration.setFormatLocale(null);
+		assert.equal(Configuration.getLanguageTag(), "fr-FR", "language should be fr-FR");
+		assert.equal(Configuration.getFormatLocale(), "fr-FR", "format locale string should be fr-CH");
+		assert.ok(Configuration.getFormatSettings().getFormatLocale(), "format locale should exist");
+		assert.equal(Configuration.getFormatSettings().getFormatLocale().toString(), "fr-FR", "format locale should be fr-CH");
+
+		this.setupConfig("de", {"sap-language": "EN", "sap-ui-formatLocale": "en-AU"});
+		assert.equal(Configuration.getLanguageTag(), "en", "language should be en");
+		assert.equal(Configuration.getFormatLocale(), "en-AU", "format locale string should be en-AU");
+		assert.ok(Configuration.getFormatSettings().getFormatLocale(), "format locale should exist");
+		assert.equal(Configuration.getFormatSettings().getFormatLocale().toString(), "en-AU", "format locale should be en-AU");
+
+		this.setupConfig();
+		Configuration.setFormatLocale("en-CA");
+		assert.equal(Configuration.getFormatLocale(), "en-CA", "format locale string should be en-CA");
+		assert.ok(Configuration.getFormatSettings().getFormatLocale(), "format locale should exist");
+		assert.equal(Configuration.getFormatSettings().getFormatLocale().toString(), "en-CA", "format locale should be en-CA");
+
+		this.setupConfig("de", {"sap-language": "EN"});
+		Configuration.setFormatLocale();
+		assert.equal(Configuration.getFormatLocale(), "en", "format locale string should be en");
+		assert.ok(Configuration.getFormatSettings().getFormatLocale(), "format locale should exist");
+		assert.equal(Configuration.getFormatSettings().getFormatLocale().toString(), "en", "format locale should be en");
+
+		assert.throws(() => {
+			Configuration.setFormatLocale('6N');
+		}, "setting an invalid (non-BCP-47) format locale should cause an error");
+		assert.throws(() => {
+			Configuration.setFormatLocale(new Date());
+		}, "setting a non-string value as format locale should cause an error");
+	});
+
+	// url: sap-language=en
+	// window: language=de
+	// ==> en
+	// url: sap-language=en&sap-ui-language=de
+	// ==> de
+
+	QUnit.test("language via url, locale+language via API", (assert) => {
+		this.setupConfig("de", {"sap-language": "6N"});
+		assert.equal(Configuration.getLanguage(), "en-GB", "the effective language still should be 'en-GB'");
+		assert.equal(Configuration.getLanguageTag(), "en-GB", "the effective language tag still should be 'en-GB'");
+		assert.equal(Configuration.getSAPLogonLanguage(), "6N", "the SAP Logon language should be '6N' already");
+		this.setupConfig("de", {"sap-language":"1E"});
+		assert.equal(Configuration.getLanguage(), "de", "the effective language still should be 'de'");
+		assert.equal(Configuration.getLanguageTag(), "de", "the effective language tag still should be 'de'");
+		assert.equal(Configuration.getSAPLogonLanguage(), "1E", "the SAP Logon language should be '6N' already");
+
+		// without the second parameter, the sap language now would be 'EN' only
+		Configuration.setLanguage("en-GB");
+		assert.equal(Configuration.getLanguage(), "en-GB", "the effective language should be 'en-GB'");
+		assert.equal(Configuration.getLanguageTag(), "en-GB", "the effective language tag should be 'en-GB'");
+		assert.equal(Configuration.getSAPLogonLanguage(), "6N", "the SAP Logon language should be '6N'");
+
+		// but with the second parameter, everything should be fine
+		Configuration.setLanguage("en-GB", "6N");
+		assert.equal(Configuration.getLanguage(), "en-GB", "the effective language should be 'en-GB'");
+		assert.equal(Configuration.getLanguageTag(), "en-GB", "the effective language tag should be 'en-GB'");
+		assert.equal(Configuration.getSAPLogonLanguage(), "6N", "the SAP Logon language should be '6N'");
+
+		Configuration.setLanguage("en-GB", "1E");
+		assert.equal(Configuration.getLanguage(), "en-GB", "the effective language should be 'en-GB'");
+		assert.equal(Configuration.getLanguageTag(), "en-GB", "the effective language tag should be 'en-GB'");
+		assert.equal(Configuration.getSAPLogonLanguage(), "1E", "the SAP Logon language should be '1E'");
+	});
+});

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

@@ -1,10 +1,11 @@
 /*global QUnit */
 sap.ui.define([
 	"sap/ui/thirdparty/URI",
+	"sap/ui/core/Theming",
 	"sap/ui/core/theming/Parameters",
 	"sap/ui/qunit/utils/waitForThemeApplied",
 	"sap/ui/core/Configuration"
-], function(URI, Parameters, waitForThemeApplied, Configuration) {
+], function(URI, Theming, Parameters, waitForThemeApplied, Configuration) {
 	"use strict";
 
 	// use options and version info as determined by ThemeVersion.beforeBootstrap.qunit.js
@@ -43,7 +44,7 @@ sap.ui.define([
 		} else {
 			sExpectedHref = sap.ui.require.toUrl("sap/ui/core/themes/");
 		}
-		sExpectedHref += Configuration.getTheme() + "/library.css";
+		sExpectedHref += Theming.getTheme() + "/library.css";
 		sExpectedHref = new URL(sExpectedHref, document.baseURI);
 
 		if (mOptions.versionedLibCss) {
@@ -72,7 +73,7 @@ sap.ui.define([
 		var sHref = oLink.href;
 		var sCoreVersion = sap.ui.getCore().getLoadedLibraries()["sap.ui.core"].version;
 
-		var sExpectedHref = new URL("test-resources/sap/ui/core/qunit/testdata/customcss/sap/ui/core/themes/" + Configuration.getTheme() + "/custom.css", document.baseURI);
+		var sExpectedHref = new URL("test-resources/sap/ui/core/qunit/testdata/customcss/sap/ui/core/themes/" + Theming.getTheme() + "/custom.css", document.baseURI);
 
 		assert.equal(
 			sHref,
@@ -91,7 +92,7 @@ sap.ui.define([
 		// trigger loading library-parameters.json files
 		Parameters.get();
 
-		if (Configuration.getTheme() === "customcss") {
+		if (Theming.getTheme() === "customcss") {
 			// the following asserts are relevant for the 'withCredentials' probing.
 			// Since the requests goes against the UI5 bootstrap origin, the first request is done without credentials.
 			// The second request re-tries with credentials.
@@ -126,33 +127,35 @@ sap.ui.define([
 	QUnit.test("Theme Change", function(assert) {
 		var done = assert.async();
 
-		function fnThemeChanged() {
-			sap.ui.getCore().detachThemeChanged(fnThemeChanged);
-
-			var oLink = document.getElementById("sap-ui-theme-sap.ui.core");
-			var sHref = oLink.href;
-			var sCoreVersion = sap.ui.getCore().getLoadedLibraries()["sap.ui.core"].version;
-
-			var sExpectedHref = new URL(sap.ui.require.toUrl("sap/ui/core/themes/sap_bluecrystal/library.css"), document.baseURI);
-
-			if (mOptions.versionedLibCss) {
-				assert.equal(
-					sHref,
-					sExpectedHref + "?version=" + sCoreVersion + "&sap-ui-dist-version=" + oVersionInfo.version,
-					"'sap.ui.core' library.css URL should contain version parameters."
-				);
-			} else {
-				assert.equal(
-					sHref,
-					sExpectedHref,
-					"'sap.ui.core' library.css URL should not contain version parameters."
-				);
+		function fnApplied(oEvent) {
+			if (oEvent.theme === "sap_bluecrystal") {
+				Theming.detachApplied(fnApplied);
+
+				var oLink = document.getElementById("sap-ui-theme-sap.ui.core");
+				var sHref = oLink.href;
+				var sCoreVersion = sap.ui.getCore().getLoadedLibraries()["sap.ui.core"].version;
+
+				var sExpectedHref = new URL(sap.ui.require.toUrl("sap/ui/core/themes/sap_bluecrystal/library.css"), document.baseURI);
+
+				if (mOptions.versionedLibCss) {
+					assert.equal(
+						sHref,
+						sExpectedHref + "?version=" + sCoreVersion + "&sap-ui-dist-version=" + oVersionInfo.version,
+						"'sap.ui.core' library.css URL should contain version parameters."
+					);
+				} else {
+					assert.equal(
+						sHref,
+						sExpectedHref,
+						"'sap.ui.core' library.css URL should not contain version parameters."
+					);
+				}
+
+				done();
 			}
-
-			done();
 		}
-		sap.ui.getCore().attachThemeChanged(fnThemeChanged);
-		sap.ui.getCore().applyTheme("sap_bluecrystal");
+		Theming.attachApplied(fnApplied);
+		Theming.setTheme("sap_bluecrystal");
 	});
 
 	QUnit.test("RTL Change", function(assert) {
@@ -162,7 +165,7 @@ sap.ui.define([
 		var sHref = oLink.href;
 		var sCoreVersion = sap.ui.getCore().getLoadedLibraries()["sap.ui.core"].version;
 
-		var sExpectedHref = new URL(sap.ui.require.toUrl("sap/ui/core/themes/" + Configuration.getTheme() + "/library-RTL.css"), document.baseURI);
+		var sExpectedHref = new URL(sap.ui.require.toUrl("sap/ui/core/themes/" + Theming.getTheme() + "/library-RTL.css"), document.baseURI);
 
 		if (mOptions.versionedLibCss) {
 			assert.equal(

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

@@ -367,6 +367,12 @@ sap.ui.define(function() {
 					reorder: false
 				}
 			},
+			"Configuration_language_via_URL": {
+				group: "Configuration",
+				qunit: {
+					reorder: false
+				}
+			},
 			"PreloadCfg-optimized-ui5loader-async": {
 				group: "Configuration",
 				loader: {

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

@@ -1741,6 +1741,9 @@ sap.ui.define([
 	});
 
 
+	/**
+	 * @deprecated Since 1.119
+	 */
 	QUnit.module("Window Event Handler", {
 		beforeEach: function() {
 
@@ -1753,6 +1756,9 @@ sap.ui.define([
 		}
 	});
 
+	/**
+	 * @deprecated Since 1.119
+	 */
 	QUnit.test("onWindowError", function(assert) {
 		var MyOnWindowErrorComponent = Component.extend("test.onWindowError.Component");
 
@@ -1786,6 +1792,9 @@ sap.ui.define([
 		assert.equal(this.removeEventListenerSpy.getCall(0).thisValue, window, "removeEventListener has been called on the window object");
 	});
 
+	/**
+	 * @deprecated Since 1.119
+	 */
 	QUnit.test("onWindowBeforeUnload", function(assert) {
 		var MyOnWindowBeforeUnloadComponent = Component.extend("test.onWindowBeforeUnload.Component");
 
@@ -1812,6 +1821,9 @@ sap.ui.define([
 		assert.equal(this.removeEventListenerSpy.getCall(0).thisValue, window, "removeEventListener has been called on the window object");
 	});
 
+	/**
+	 * @deprecated Since 1.119
+	 */
 	QUnit.test("onWindowUnload", function(assert) {
 		var MyOnWindowUnloadComponent = Component.extend("test.onWindowUnload.Component");
 

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

@@ -4,8 +4,9 @@ sap.ui.define([
 	'sap/ui/core/UIComponent',
 	'sap/ui/core/ComponentContainer',
 	'sap/ui/core/ComponentSupport',
+	"sap/ui/core/Element",
 	'sap/ui/core/library'
-], function(Log, hyphenate, UIComponent, ComponentContainer, ComponentSupport, library) {
+], function(Log, hyphenate, UIComponent, ComponentContainer, ComponentSupport, Element, library) {
 
 	"use strict";
 	/*global QUnit, sinon, Promise*/
@@ -197,10 +198,10 @@ sap.ui.define([
 			assert.ok(document.getElementById("container3"), "ComponentContainer element for third Component found!");
 			assert.ok(document.getElementById("container4"), "ComponentContainer element for fourth Component found!");
 
-			var oContainer1 = sap.ui.getCore().byId("container1");
-			var oContainer2 = sap.ui.getCore().byId("container2");
-			var oContainer3 = sap.ui.getCore().byId("container3");
-			var oContainer4 = sap.ui.getCore().byId("container4");
+			var oContainer1 = Element.getElementById("container1");
+			var oContainer2 = Element.getElementById("container2");
+			var oContainer3 = Element.getElementById("container3");
+			var oContainer4 = Element.getElementById("container4");
 			assert.ok(oContainer1 instanceof ComponentContainer, "ComponentContainer for first Component found!");
 			assert.ok(oContainer2 instanceof ComponentContainer, "ComponentContainer for second Component found!");
 			assert.ok(oContainer3 instanceof ComponentContainer, "ComponentContainer for third Component found!");