@openui5/sap.ui.core 1.117.1 → 1.119.0

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

@@ -2,7 +2,7 @@
 (function(){
 	"use strict";
 
-	var coreInitFired = false;
+	var coreReady = false;
 
 	QUnit.test("After loading the minimal bootstrap code...", function(assert) {
 		assert.strictEqual(typeof sap.ui.define, "function", "...function sap.ui.define should exist");
@@ -19,17 +19,17 @@
 
 	QUnit.test("When sap/ui/core/Core has been required", function(assert) {
 		var done = assert.async();
-		sap.ui.require(['sap/ui/core/Core'], function() {
+		sap.ui.require(['sap/ui/core/Core'], function(Core) {
 			assert.strictEqual(typeof sap.ui.Device, "object", "...utility object sap.ui.Device should exist");
 			assert.strictEqual(typeof sap.ui.base, "object", "...the namespace sap.ui.base should exist");
 			assert.strictEqual(typeof sap.ui.core, "object", "...the namespace sap.ui.core should exist");
 			assert.strictEqual(typeof sap.ui.model, "object", "...the namespace sap.ui.model should exist (status quo, not mandatory)");
 			assert.strictEqual(typeof sap.ui.getCore, "function", "...the function sap.ui.getCore should exist");
-			sap.ui.getCore().attachInit(function() {
-				coreInitFired = true;
+			Core.ready().then(function() {
+				coreReady = true;
 			});
 			setTimeout(function() {
-				assert.notOk(coreInitFired, "...but Core should not have fired init event");
+				assert.notOk(coreReady, "...but Core should not have fired init event");
 				assert.strictEqual(typeof sap.m, "undefined", "...and library namespace sap.m should not yet exist");
 				assert.strictEqual(typeof sap.ui.layout, "undefined", "...and library namespace sap.ui.layout should not yet exist");
 				done();
@@ -39,13 +39,15 @@
 
 	QUnit.test("When boot() has been called on the Core...", function(assert) {
 		var done = assert.async();
-		sap.ui.getCore().attachInit(function() {
-			assert.ok(true, "...then the Core should fire the init event");
-			assert.strictEqual(typeof sap.m, "object", "...the library sap.m should have been loaded");
-			assert.strictEqual(typeof sap.ui.layout, "object", "...the library sap.ui.layout should have been loaded");
-			done();
+		sap.ui.require(['sap/ui/core/Core'], function(Core) {
+			Core.ready().then(function() {
+				assert.ok(true, "...then the Core should fire the init event");
+				assert.strictEqual(typeof sap.m, "object", "...the library sap.m should have been loaded");
+				assert.strictEqual(typeof sap.ui.layout, "object", "...the library sap.ui.layout should have been loaded");
+				done();
+			});
+			Core.boot();
 		});
-		sap.ui.getCore().boot();
 	});
 
 }());

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

@@ -21,11 +21,13 @@
 		assert.strictEqual(typeof sap.ui.getCore, "function", "...the function sap.ui.getCore should exist");
 
 		var done = assert.async();
-		sap.ui.getCore().attachInit(function() {
-			assert.ok(true, "...then the Core should fire the init event");
-			assert.strictEqual(typeof sap.m, "object", "...the library sap.m should have been loaded");
-			assert.strictEqual(typeof sap.ui.layout, "object", "...the library sap.ui.layout should have been loaded");
-			done();
+		sap.ui.require(['sap/ui/core/Core'], function(Core) {
+			Core.ready().then(function() {
+				assert.ok(true, "...then the Core should fire the init event");
+				assert.strictEqual(typeof sap.m, "object", "...the library sap.m should have been loaded");
+				assert.strictEqual(typeof sap.ui.layout, "object", "...the library sap.ui.layout should have been loaded");
+				done();
+			});
 		});
 	});
 

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

@@ -1,25 +1,38 @@
 /*global QUnit*/
 sap.ui.define([
-
-], function() {
+	"sap/ui/core/Core"
+], function(Core) {
 	"use strict";
 
 	QUnit.test("Calendar Class Loading", function(assert) {
-		var GregorianClass = sap.ui.require("sap/ui/core/date/Gregorian");
-		var JapaneseClass = sap.ui.require("sap/ui/core/date/Japanese");
+		var isScriptIncluded = (sResourcePath) => {
+			return [...document.scripts].filter((oScript) => {
+				return oScript.src.endsWith(sResourcePath);
+			}).length !== 0;
+		};
+
+		const isLoaded = (sResourcePath) => {
+			const state = sap.ui.loader._.getModuleState(sResourcePath);
+			return state === 4;
+		};
+
+		return Core.ready(function() {
+			var GregorianClass = sap.ui.require("sap/ui/core/date/Gregorian");
+			var JapaneseClass = sap.ui.require("sap/ui/core/date/Japanese");
+
+			assert.notOk(GregorianClass, "The calendar class shouldn't be loaded");
+			assert.ok(JapaneseClass, "The calendar class is loaded");
 
-		assert.notOk(GregorianClass, "The calendar class shouldn't be loaded");
-		assert.ok(JapaneseClass, "The calendar class is loaded");
+			const japaneseCalendarIsIncludedAsSingleRequest = isScriptIncluded("sap/ui/core/date/Japanese.js");
+			const coreLibraryPreloadIsLoaded = isLoaded("sap/ui/core/library-preload.js");
 
-		var bLibraryRequestExists = !!document.querySelector("head > script[src*='sap/ui/core/library.js']");
-		var bCalendarClassRequestExists = !!document.querySelector("head > script[src*='sap/ui/core/date/Japanese.js']");
+			if (coreLibraryPreloadIsLoaded) {
+				assert.notOk(japaneseCalendarIsIncludedAsSingleRequest, "calendar class is not loaded when library-preload.js exists");
+			} else {
+				assert.ok(japaneseCalendarIsIncludedAsSingleRequest, "calendar class is loaded standalone");
+			}
 
-		// When a single request is sent for loading sap/ui/core/library.js, it means that the
-		// sap/ui/core/library-preload.js doesn't exist or it has empty content. Therefore the existence of the request
-		// which loads the calendar class should be the same as the existence of sap/ui/core/library.js. This means that
-		// when library-preload.js exists, both of library.js and calendar class should be loaded within the
-		// library-preload.js. When library-preload.js doesn't exists, both of them are loaded with single requests.
-		assert.ok(bLibraryRequestExists ? bCalendarClassRequestExists : !bCalendarClassRequestExists, "calendar class is loaded within library-preload.js when it exists");
+		});
 	});
 
 });

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

@@ -2,8 +2,10 @@
 sap.ui.define([
 	"sap/ui/core/Configuration",
 	"sap/ui/core/Locale",
+	"sap/ui/core/Theming",
+	"sap/ui/core/theming/ThemeHelper",
 	"sap/ui/Device"
-], function(Configuration, Locale, Device) {
+], function(Configuration, Locale, Theming, ThemeHelper, Device) {
 	"use strict";
 
 	/*
@@ -45,7 +47,7 @@ sap.ui.define([
 
 	QUnit.test("Settings", function(assert) {
 		// compare values where possible
-		assert.equal(Configuration.getTheme(), "base", "theme");
+		assert.equal(Theming.getTheme(), ThemeHelper.getDefaultThemeInfo().DEFAULT_THEME, "theme");
 		assert.equal(toLower(Configuration.getLanguage()), toLower(defaultLocale()), "language");
 		assert.equal(Configuration.getAccessibility(), true, "accessibility");
 		assert.equal(Configuration.getAnimationMode(), Configuration.AnimationMode.full, "animationMode");

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

@@ -1,14 +1,15 @@
 /*global QUnit */
 sap.ui.define([
-	"sap/ui/core/Configuration"
-], function(Configuration) {
+	"sap/ui/core/Configuration",
+	"sap/ui/core/Theming"
+], function(Configuration, Theming) {
 	"use strict";
 
 	QUnit.module("Configuration From Config Attribute");
 
 	QUnit.test("Settings", function(assert) {
 		// compare values where possible
-		assert.equal(Configuration.getTheme(), "fantasy", "theme");
+		assert.equal(Theming.getTheme(), "fantasy", "theme");
 		assert.equal(Configuration.getLanguage(), "klingon", "language");
 		assert.equal(Configuration.getAccessibility(), true, "accessibility");
 		assert.equal(Configuration.getAnimationMode(), Configuration.AnimationMode.minimal, "animation mode set to 'minimal'");

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

@@ -1,14 +1,15 @@
 /*global QUnit */
 sap.ui.define([
-	"sap/ui/core/Configuration"
-], function(Configuration) {
+	"sap/ui/core/Configuration",
+	"sap/ui/core/Theming"
+], function(Configuration, Theming) {
 	"use strict";
 
 	QUnit.module("Configuration From Global Object");
 
 	QUnit.test("Settings", function(assert) {
 		// compare values where possible
-		assert.equal(Configuration.getTheme(), "fantasy", "theme");
+		assert.equal(Theming.getTheme(), "fantasy", "theme");
 		assert.equal(Configuration.getLanguage(), "klingon", "language");
 		assert.equal(Configuration.getAccessibility(), true, "accessibility");
 		assert.equal(Configuration.getAnimationMode(), Configuration.AnimationMode.minimal, "animation mode set to 'minimal'");

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

@@ -1,19 +1,20 @@
 /*global QUnit */
 sap.ui.define([
 	"sap/ui/core/Core",
-	"sap/ui/core/Configuration"
-], function(Core, Configuration) {
+	"sap/ui/core/Configuration",
+	"sap/ui/core/Theming"
+], function(Core, Configuration, Theming) {
 	"use strict";
 
 	QUnit.config.autostart = false;
 
-	Core.attachInit(function() {
+	Core.ready().then(function() {
 
 		QUnit.module("Configuration From Tag Attributes");
 
 		QUnit.test("Settings", function(assert) {
 			// compare values where possible
-			assert.equal(Configuration.getTheme(), "fantasy", "theme");
+			assert.equal(Theming.getTheme(), "fantasy", "theme");
 			assert.equal(Configuration.getLanguage(), "klingon", "language");
 			assert.equal(Configuration.getAccessibility(), true, "accessibility");
 			assert.equal(Configuration.getAnimationMode(), Configuration.AnimationMode.minimal, "animation mode set to 'minimal'");

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();