@openui5/sap.ui.core 1.119.1 → 1.120.1

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

@@ -12,6 +12,9 @@ sap.ui.define([
 
 	//*********************************************************************************************
 	QUnit.module("sap.ui.model.analytics.ODataModelAdapter", {
+		before() {
+			this.__ignoreIsolatedCoverage__ = true;
+		},
 		beforeEach : function () {
 			this.oLogMock = this.mock(Log);
 			this.oLogMock.expects("error").never();

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

@@ -20,6 +20,9 @@ sap.ui.define([
 
 	//*********************************************************************************************
 	QUnit.module("sap.ui.model.analytics.odata4analytics", {
+		before() {
+			this.__ignoreIsolatedCoverage__ = true;
+		},
 		afterEach : function (assert) {
 			if (this.oModel) {
 				this.oModel.getODataModel().destroy();

package/test/sap/ui/core/qunit/app/DesignMode_controllerDeactivated.qunit.js

@@ -1,8 +1,8 @@
 /*global QUnit */
 sap.ui.define([
-	"sap/ui/core/Configuration",
+	"sap/ui/base/DesignTime",
 	"sap/ui/core/mvc/XMLView"
-], function (Configuration, XMLView) {
+], function (DesignTime, XMLView) {
 	"use strict";
 
 	QUnit.module("DesignMode, Controller Deactivation");
@@ -10,10 +10,9 @@ sap.ui.define([
 	QUnit.test("Configuration Accessors", function (assert) {
 		assert.expect(3);
 
-		var oConfig = Configuration;
-		assert.equal(oConfig.getDesignMode(), true, "Design Mode is on");
-		assert.equal(oConfig.getSuppressDeactivationOfControllerCode(), false, "SuppressDeactivationOfControllerCode is false");
-		assert.equal(oConfig.getControllerCodeDeactivated(), true, "getControllerCodeDeactivated is true");
+		assert.equal(DesignTime.isDesignModeEnabled(), true, "Design Mode is on");
+		assert.equal(DesignTime.isControllerCodeDeactivationSuppressed(), false, "SuppressDeactivationOfControllerCode is false");
+		assert.equal(DesignTime.isControllerCodeDeactivated(), true, "isControllerCodeDeactivated is true");
 	});
 
 	QUnit.test("Create a XMLView instance and check controller methods are replaced by empty ones", function (assert) {

package/test/sap/ui/core/qunit/app/DesignMode_suppressedDeactivation.qunit.js

@@ -1,8 +1,8 @@
 /*global QUnit */
 sap.ui.define([
-	"sap/ui/core/Configuration",
+	"sap/ui/base/DesignTime",
 	"sap/ui/core/mvc/XMLView"
-], function (Configuration, XMLView) {
+], function (DesignTime, XMLView) {
 	"use strict";
 
 	QUnit.module("DesignMode, Suppressed Deactivation of Controller Code");
@@ -10,10 +10,9 @@ sap.ui.define([
 	QUnit.test("Configuration Accessors", function (assert) {
 		assert.expect(3);
 
-		var oConfig = Configuration;
-		assert.equal(oConfig.getDesignMode(), true, "Design Mode is on");
-		assert.equal(oConfig.getSuppressDeactivationOfControllerCode(), true, "SuppressDeactivationOfControllerCode is true");
-		assert.equal(oConfig.getControllerCodeDeactivated(), false, "getControllerCodeDeactivated is false");
+		assert.equal(DesignTime.isDesignModeEnabled(), true, "Design Mode is on");
+		assert.equal(DesignTime.isControllerCodeDeactivationSuppressed(), true, "SuppressDeactivationOfControllerCode is true");
+		assert.equal(DesignTime.isControllerCodeDeactivated(), false, "isControllerCodeDeactivated is false");
 	});
 
 	QUnit.test("Create an XMLView instance and check controller methods are not replaced by empty ones", function (assert) {

package/test/sap/ui/core/qunit/app/MessageListBinding.qunit.js

@@ -11,6 +11,9 @@ sap.ui.define([
 	"use strict";
 
 	QUnit.module("sap.ui.model.message.MessageListBinding", {
+		before() {
+			this.__ignoreIsolatedCoverage__ = true;
+		},
 		afterEach: function() {
 			this.oLogMock = this.mock(Log);
 			this.oLogMock.expects("error").never();

package/test/sap/ui/core/qunit/app/_createDesignModeTests_legacyAPIs.qunit.js

@@ -1,8 +1,8 @@
 /*global QUnit sinon*/
 sap.ui.define([
 	"sap/base/config",
-	"sap/ui/core/Configuration"
-], function (BaseConfiguration, Configuration) {
+	"sap/ui/base/DesignTime"
+], function (BaseConfiguration, DesignTime) {
 	"use strict";
 
 	return function _createDesignModeTests(ViewClass) {
@@ -31,10 +31,9 @@ sap.ui.define([
 		QUnit.test("Configuration Accessors", function (assert) {
 			assert.expect(3);
 
-			var oConfig = Configuration;
-			assert.equal(oConfig.getDesignMode(), true, "Design Mode is on");
-			assert.equal(oConfig.getSuppressDeactivationOfControllerCode(), false, "SuppressDeactivationOfControllerCode is false");
-			assert.equal(oConfig.getControllerCodeDeactivated(), true, "getControllerCodeDeactivated is true");
+			assert.equal(DesignTime.isDesignModeEnabled(), true, "Design Mode is on");
+			assert.equal(DesignTime.isControllerCodeDeactivationSuppressed(), false, "SuppressDeactivationOfControllerCode is false");
+			assert.equal(DesignTime.isControllerCodeDeactivated(), true, "isControllerCodeDeactivated is true");
 		});
 
 		QUnit.test("Create a XMLView instance and check controller methods are replaced by empty ones", function (assert) {
@@ -66,10 +65,9 @@ sap.ui.define([
 		QUnit.test("Configuration Accessors", function (assert) {
 			assert.expect(3);
 
-			var oConfig = Configuration;
-			assert.equal(oConfig.getDesignMode(), true, "Design Mode is on");
-			assert.equal(oConfig.getSuppressDeactivationOfControllerCode(), true, "SuppressDeactivationOfControllerCode is true");
-			assert.equal(oConfig.getControllerCodeDeactivated(), false, "getControllerCodeDeactivated is false");
+			assert.equal(DesignTime.isDesignModeEnabled(), true, "Design Mode is on");
+			assert.equal(DesignTime.isControllerCodeDeactivationSuppressed(), true, "SuppressDeactivationOfControllerCode is true");
+			assert.equal(DesignTime.isControllerCodeDeactivated(), false, "isControllerCodeDeactivated is false");
 		});
 
 		QUnit.test("Create an XMLView instance and check controller methods are not replaced by empty ones", function(assert){

package/test/sap/ui/core/qunit/base/Config_cascade.qunit.js

@@ -1,8 +1,8 @@
 /*!
  * ${copyright}
  */
-/*global globalThis, QUnit */
-sap.ui.define([
+/*global QUnit */
+sap.ui.require([
 	"sap/base/config",
 	"sap/base/Log",
 	"sap/base/config/GlobalConfigurationProvider",

package/test/sap/ui/core/qunit/base/i18n/Formatting.qunit.js

@@ -69,36 +69,36 @@ sap.ui.define([
 			"getLanguageTag should return new 'sap/base/i18n/LanguageTag' for LanguageTag 'de-x-aa-sapufmt'");
 	});
 
-	QUnit.test("getLegacyDateFormat", function(assert) {
+	QUnit.test("getABAPDateFormat", function(assert) {
 		assert.expect(2);
-		assert.strictEqual(Formatting.getLegacyDateFormat(), "2", "getLegacyDateFormat should return '2' as provided by URL");
+		assert.strictEqual(Formatting.getABAPDateFormat(), "2", "getABAPDateFormat should return '2' as provided by URL");
 		BaseConfig._.invalidate();
 		mConfigStubValues = {
-			"sapUiLegacyDateFormat": "a"
+			"sapUiABAPDateFormat": "a"
 		};
-		assert.strictEqual(Formatting.getLegacyDateFormat(), "A", "getLegacyDateFormat should return expected value 'A'");
+		assert.strictEqual(Formatting.getABAPDateFormat(), "A", "getABAPDateFormat should return expected value 'A'");
 	});
 
-	QUnit.test("getLegacyTimeFormat", function(assert) {
+	QUnit.test("getABAPTimeFormat", function(assert) {
 		assert.expect(2);
 
-		assert.strictEqual(Formatting.getLegacyTimeFormat(), "3", "getLegacyTimeFormat should return '3' as provided by URL");
+		assert.strictEqual(Formatting.getABAPTimeFormat(), "3", "getABAPTimeFormat should return '3' as provided by URL");
 		BaseConfig._.invalidate();
 		mConfigStubValues = {
-			"sapUiLegacyTimeFormat": "0"
+			"sapUiABAPTimeFormat": "0"
 		};
-		assert.strictEqual(Formatting.getLegacyTimeFormat(), "0", "getLegacyTimeFormat should return expected value '0'");
+		assert.strictEqual(Formatting.getABAPTimeFormat(), "0", "getABAPTimeFormat should return expected value '0'");
 	});
 
-	QUnit.test("getLegacyNumberFormat", function(assert) {
+	QUnit.test("getABAPNumberFormat", function(assert) {
 		assert.expect(2);
 
-		assert.strictEqual(Formatting.getLegacyNumberFormat(), "X", "getLegacyNumberFormat should return 'Y' as provided by URL");
+		assert.strictEqual(Formatting.getABAPNumberFormat(), "X", "getABAPNumberFormat should return 'Y' as provided by URL");
 		BaseConfig._.invalidate();
 		mConfigStubValues = {
-			"sapUiLegacyNumberFormat": "y"
+			"sapUiABAPNumberFormat": "y"
 		};
-		assert.strictEqual(Formatting.getLegacyNumberFormat(), "Y", "getLegacyNumberFormat should return expected value 'Y'");
+		assert.strictEqual(Formatting.getABAPNumberFormat(), "Y", "getABAPNumberFormat should return expected value 'Y'");
 	});
 
 	QUnit.test("getTrailingCurrencyCode", function(assert) {
@@ -148,9 +148,9 @@ sap.ui.define([
 			"Warning logged for invalid value of parameter 'calendarType'");
 		BaseConfig._.invalidate();
 		mConfigStubValues = {
-			"sapUiLegacyDateFormat": "a"
+			"sapUiABAPDateFormat": "a"
 		};
-		assert.strictEqual(Formatting.getCalendarType(), CalendarType.Islamic, "getCalendarType should return expected value 'Islamic' derived from legacyDateFormat");
+		assert.strictEqual(Formatting.getCalendarType(), CalendarType.Islamic, "getCalendarType should return expected value 'Islamic' derived from ABAPDateFormat");
 	});
 
 	QUnit.module("Formatting setter");
@@ -172,55 +172,55 @@ sap.ui.define([
 		Formatting.detachChange(formattingChanged);
 	});
 
-	QUnit.test("setLegacyDateFormat", function(assert) {
+	QUnit.test("setABAPDateFormat", function(assert) {
 		assert.expect(6);
 		function test(oEvent) {
 			assert.strictEqual(oEvent["dateFormats-medium"], "yyyy/MM/dd", "dateFormat event parameter set correctly");
 			assert.strictEqual(oEvent["dateFormats-short"], "yyyy/MM/dd", "dateFormat event parameter set correctly");
-			assert.strictEqual(oEvent["legacyDateFormat"], "B", "dateFormat event parameter set correctly");
-			assert.strictEqual(Formatting.getLegacyDateFormat(), "B", "getLegacyDateFormat should return expected value 'B'");
+			assert.strictEqual(oEvent["ABAPDateFormat"], "B", "dateFormat event parameter set correctly");
+			assert.strictEqual(Formatting.getABAPDateFormat(), "B", "getABAPDateFormat should return expected value 'B'");
 			assert.strictEqual(Formatting.getDatePattern("short"), "yyyy/MM/dd", "getDatePattern('short') should return expected value 'yyyy/MM/dd'");
 			assert.strictEqual(Formatting.getDatePattern("medium"), "yyyy/MM/dd", "getDatePattern('medium') should return expected value 'yyyy/MM/dd'");
 		}
 		Formatting.attachChange(test);
-		Formatting.setLegacyDateFormat("b");
+		Formatting.setABAPDateFormat("b");
 		// Setting same format again shouldn't trigger a change event
-		Formatting.setLegacyDateFormat("b");
+		Formatting.setABAPDateFormat("b");
 		Formatting.detachChange(test);
 	});
 
-	QUnit.test("setLegacyTimeFormat", function(assert) {
+	QUnit.test("setABAPTimeFormat", function(assert) {
 		assert.expect(7);
 		function test(oEvent) {
 			assert.strictEqual(oEvent["timeFormats-medium"], "KK:mm:ss a", "timeFormat event parameter set correctly");
 			assert.strictEqual(oEvent["timeFormats-short"], "KK:mm a", "timeFormat event parameter set correctly");
-			assert.strictEqual(oEvent["legacyTimeFormat"], "4", "timeFormat event parameter set correctly");
+			assert.strictEqual(oEvent["ABAPTimeFormat"], "4", "timeFormat event parameter set correctly");
 			assert.deepEqual(oEvent["dayPeriods-format-abbreviated"], ["am", "pm"], "timeFormat event parameter set correctly");
-			assert.strictEqual(Formatting.getLegacyTimeFormat(), "4", "getLegacyTimeFormat should return expected value 'B'");
+			assert.strictEqual(Formatting.getABAPTimeFormat(), "4", "getABAPTimeFormat should return expected value 'B'");
 			assert.strictEqual(Formatting.getTimePattern("short"), "KK:mm a", "getTimePattern('short') should return expected value 'KK:mm a'");
 			assert.strictEqual(Formatting.getTimePattern("medium"), "KK:mm:ss a", "getTimePattern('medium') should return expected value 'KK:mm:ss a'");
 		}
 		Formatting.attachChange(test);
-		Formatting.setLegacyTimeFormat("4");
+		Formatting.setABAPTimeFormat("4");
 		// Setting same format again shouldn't trigger a change event
-		Formatting.setLegacyTimeFormat("4");
+		Formatting.setABAPTimeFormat("4");
 		Formatting.detachChange(test);
 	});
 
-	QUnit.test("setLegacyNumberFormat", function(assert) {
+	QUnit.test("setABAPNumberFormat", function(assert) {
 		assert.expect(6);
 		function test(oEvent) {
 			assert.strictEqual(oEvent["symbols-latn-decimal"], ",", "numberFormat event parameter set correctly");
 			assert.strictEqual(oEvent["symbols-latn-group"], " ", "numberFormat event parameter set correctly");
-			assert.strictEqual(oEvent["legacyNumberFormat"], "Y", "numberFormat event parameter set correctly");
-			assert.strictEqual(Formatting.getLegacyNumberFormat(), "Y", "getLegacyNumberFormat should return expected value 'Y'");
+			assert.strictEqual(oEvent["ABAPNumberFormat"], "Y", "numberFormat event parameter set correctly");
+			assert.strictEqual(Formatting.getABAPNumberFormat(), "Y", "getABAPNumberFormat should return expected value 'Y'");
 			assert.strictEqual(Formatting.getNumberSymbol("group"), " ", "getNumberSymbol('group') should return expected value ' '");
 			assert.strictEqual(Formatting.getNumberSymbol("decimal"), ",", "getNumberSymbol('decimal') should return expected value ','");
 		}
 		Formatting.attachChange(test);
-		Formatting.setLegacyNumberFormat("y");
+		Formatting.setABAPNumberFormat("y");
 		// Setting same type again shouldn't trigger a change event
-		Formatting.setLegacyNumberFormat("y");
+		Formatting.setABAPNumberFormat("y");
 		Formatting.detachChange(test);
 	});
 
@@ -232,7 +232,7 @@ sap.ui.define([
 
 		assert.throws(function() {
 			Formatting.setTrailingCurrencyCode();
-		}, new Error("bTrailingCurrencyCode must be a boolean"), "setTrailingCurrencyCode with invalid parameter should throw an error");
+		}, new TypeError("bTrailingCurrencyCode must be a boolean"), "setTrailingCurrencyCode with invalid parameter should throw an error");
 	});
 
 	QUnit.test("setCalendarWeekNumbering", function(assert) {
@@ -274,4 +274,23 @@ sap.ui.define([
 
 		Formatting.detachChange(formattingChanged);
 	});
+
+	QUnit.test("CustomIslamicCalendarData", function(assert) {
+		var aData = [{
+			"dateFormat": "A",
+			"islamicMonthStart": "14351201",
+			"gregDate": "20140925"
+		}, {
+			"dateFormat": "A",
+			"islamicMonthStart": "14360101",
+			"gregDate": "20141024"
+		}, {
+			"dateFormat": "A",
+			"islamicMonthStart": "14360201",
+			"gregDate": "20141123"
+		}];
+
+		Formatting.setCustomIslamicCalendarData(aData);
+		assert.deepEqual(Formatting.getCustomIslamicCalendarData(), aData, "The customizing data set can be retrieved");
+	});
 });

package/test/sap/ui/core/qunit/base/i18n/ResourceBundle.qunit.js

@@ -8,15 +8,7 @@ sap.ui.define([
 ], function(Localization, ResourceBundle, Properties, merge, Log) {
 	"use strict";
 
-	QUnit.module("sap/base/i18n/ResourceBundle", {
-		beforeEach: function () {
-			var aSupportedLanguages = Localization.getSupportedLanguages();
-			this.oSupportedLanguagesStub = this.stub(Localization, "getSupportedLanguages");
-			this.oSupportedLanguagesStub.returns(aSupportedLanguages);
-		},
-		afterEach: function () {
-		}
-	});
+	QUnit.module("sap/base/i18n/ResourceBundle");
 
 	QUnit.test("create invalid url", function(assert) {
 		assert.throws(ResourceBundle.create, new Error("resource URL '' has unknown type (should be one of .properties,.hdbtextbundle)"), "creation fails without valid url");
@@ -27,9 +19,17 @@ sap.ui.define([
 
 		this.stub(Properties, "create").returns(Promise.resolve(oEmptyProps));
 
+		// Uses default locale as defined in testsuite.i18n.qunit.js
 		return ResourceBundle.create({url: 'my.properties', async: true}).then(function(oResourceBundle) {
 			assert.ok(oResourceBundle instanceof ResourceBundle);
 			assert.deepEqual(oResourceBundle.aPropertyFiles[0], oEmptyProps, "properties are correctly loaded");
+			assert.equal(Properties.create.callCount, 1, "Properties.create should be called once");
+			assert.deepEqual(Properties.create.getCall(0).args, [{
+				async: true,
+				headers: undefined,
+				returnNullIfMissing: true,
+				url: "my_en_US.properties"
+			}], "Properties.create should be called with expected arguments");
 		});
 	});
 
@@ -234,7 +234,7 @@ sap.ui.define([
 
 	QUnit.test("fallback locale: supportedLocales not defined, but configuration has supportedLocales", function(assert) {
 		// configuration returns ["da", "en"] which is used as supportedLocales
-		this.oSupportedLanguagesStub.returns(["da", "en"]);
+		this.stub(Localization, "getSupportedLanguages").returns(["da", "en"]);
 
 		// fallback chain: -> de_CH (not supported) -> de (not supported) -> da (fallback)
 		var oStub = this.stub(Properties, "create").returns(createFakePropertiesPromise({number: "47", mee: "yo"}));
@@ -1147,6 +1147,119 @@ sap.ui.define([
 		});
 	});
 
+	QUnit.module("sap/base/i18n/ResourceBundle: hdbtextbundle");
+
+	QUnit.test("create with default locale", async function(assert) {
+		var oEmptyProps = createFakeProperties({number: "47"});
+		this.stub(Properties, "create").resolves(oEmptyProps);
+
+		// Uses default locale as defined in testsuite.i18n.qunit.js
+		const oResourceBundle = await ResourceBundle.create({url: 'my.hdbtextbundle', async: true});
+
+		assert.ok(oResourceBundle instanceof ResourceBundle);
+
+		assert.deepEqual(oResourceBundle.aPropertyFiles[0], oEmptyProps, "properties are correctly loaded");
+
+		assert.equal(Properties.create.callCount, 1, "Properties.create should be called once");
+		assert.deepEqual(Properties.create.getCall(0).args, [{
+			async: true,
+			headers: {
+				"Accept-Language": "en-US"
+			},
+			returnNullIfMissing: true,
+			url: "my.hdbtextbundle"
+		}], "Properties.create should be called with expected arguments");
+	});
+
+	QUnit.test("create with locale en_US_saptrc", async function(assert) {
+		this.stub(Properties, "create").resolves(createFakeProperties({number: "47"}));
+
+		const oResourceBundle = await ResourceBundle.create({
+			async: true,
+			url: "my.hdbtextbundle",
+			locale: "en_US_saptrc"
+		});
+
+		assert.ok(oResourceBundle instanceof ResourceBundle);
+
+		assert.equal(Properties.create.callCount, 1, "Properties.create should be called once");
+		assert.deepEqual(Properties.create.getCall(0).args, [{
+			async: true,
+			headers: {
+				"Accept-Language": "en-US-saptrc"
+			},
+			returnNullIfMissing: true,
+			url: "my.hdbtextbundle?sap-language=1Q"
+		}], "Properties.create should be called with expected arguments");
+	});
+
+	QUnit.test("create with locale en_US_sappsd", async function(assert) {
+		this.stub(Properties, "create").resolves(createFakeProperties({number: "47"}));
+
+		const oResourceBundle = await ResourceBundle.create({
+			async: true,
+			url: "my.hdbtextbundle",
+			locale: "en_US_sappsd"
+		});
+
+		assert.ok(oResourceBundle instanceof ResourceBundle);
+
+		assert.equal(Properties.create.callCount, 1, "Properties.create should be called once");
+		assert.deepEqual(Properties.create.getCall(0).args, [{
+			async: true,
+			headers: {
+				"Accept-Language": "en-US-sappsd"
+			},
+			returnNullIfMissing: true,
+			url: "my.hdbtextbundle?sap-language=2Q"
+		}], "Properties.create should be called with expected arguments");
+	});
+
+	QUnit.test("create with locale en_US_saprigi", async function(assert) {
+		this.stub(Properties, "create").resolves(createFakeProperties({number: "47"}));
+
+		const oResourceBundle = await ResourceBundle.create({
+			async: true,
+			url: "my.hdbtextbundle",
+			locale: "en_US_saprigi"
+		});
+
+		assert.ok(oResourceBundle instanceof ResourceBundle);
+
+		assert.equal(Properties.create.callCount, 1, "Properties.create should be called once");
+		assert.deepEqual(Properties.create.getCall(0).args, [{
+			async: true,
+			headers: {
+				"Accept-Language": "en-US-saprigi"
+			},
+			returnNullIfMissing: true,
+			url: "my.hdbtextbundle?sap-language=3Q"
+		}], "Properties.create should be called with expected arguments");
+	});
+
+	QUnit.test("create with empty locale", async function(assert) {
+		this.stub(Properties, "create").resolves(createFakeProperties({number: "47"}));
+
+		const oResourceBundle = await ResourceBundle.create({
+			async: true,
+			url: "my.hdbtextbundle",
+			locale: "",
+			supportedLocales: [""]
+		});
+
+		assert.ok(oResourceBundle instanceof ResourceBundle);
+
+		assert.equal(Properties.create.callCount, 1, "Properties.create should be called once");
+		assert.deepEqual(Properties.create.getCall(0).args, [{
+			async: true,
+			headers: {
+				"Accept-Language": "*"
+			},
+			returnNullIfMissing: true,
+			url: "my.hdbtextbundle"
+		}], "Properties.create should be called with expected arguments");
+	});
+
 	var oTerminologies = {
 		activeTerminologies: [
 			"oil",

package/test/sap/ui/core/qunit/base/util/resolveReference.qunit.js

@@ -312,4 +312,13 @@ sap.ui.define(['sap/base/util/resolveReference'], function(resolveReference) {
 		var fn = resolveReference(".notExistMethod", {}, {preferDotContext: true});
 		assert.strictEqual(fn, undefined, "correction method was returned");
 	});
+
+	QUnit.test("resolve value from loaded module", async function(assert) {
+		var sModulePath = "util/testdata/MyModule";
+		await new Promise(function(resolve, reject) {
+			sap.ui.require([sModulePath], resolve, reject);
+		});
+		var sValue = resolveReference("util/testdata/MyModule", {}, {useProbingRequire: true});
+		assert.equal(sValue, "MyModule", "");
+	});
 });

package/test/sap/ui/core/qunit/base/util/testdata/MyModule.js

@@ -0,0 +1,5 @@
+sap.ui.define(function() {
+	"use strict";
+
+	return "MyModule";
+});

package/test/sap/ui/core/qunit/bootstrap/BootstrapCustomBootTaskPreloadCss.beforeBootstrap.qunit.js

@@ -21,8 +21,10 @@
 	window["sap-ui-config"] = window["sap-ui-config"] || {};
 	window["sap-ui-config"]["preloadLibCss"] = [ "!sap.ui.core", "sap.ui.testlib" ];
 	window["sap-ui-config"]["xx-bootTask"] = function(callback) {
-		sap.ui.getCore().loadLibrary("sap.ui.testlib", "test-resources/sap/ui/core/qunit/testdata/uilib");
-		callback();
+		sap.ui.getCore().loadLibrary("sap.ui.testlib", {
+			url: "test-resources/sap/ui/core/qunit/testdata/uilib",
+			async: true
+		}).then(callback);
 	};
 	window["sap-ui-config"]["themeroots"] = {};
 	// Define theme root for current theme for testing purposes

package/test/sap/ui/core/qunit/bootstrap/BootstrapMinimal.qunit.html

@@ -9,6 +9,7 @@
 		<script src="../../../../../../resources/ui5loader.js"></script>
 		<script src="../../../../../../resources/ui5loader-autoconfig.js"
 			id="sap-ui-bootstrap"
+			data-sap-ui-async="true"
 			data-sap-ui-libs="sap.m,sap.ui.layout"
 			data-sap-ui-compatversion="edge">
 		</script>

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

@@ -8,12 +8,11 @@ sap.ui.define([
 	"use strict";
 
 	QUnit.test("Check Existance of Core", function(assert) {
-		assert.expect(9);
+		assert.expect(7);
 
-		var aExpectedLibraries = ["sap.m", "sap.ui.layout", "sap.ui.table"].sort();
-		var aConfigurationModules = Configuration.getValue("modules").sort();
-		var oLoadedLibraries = Core.getLoadedLibraries();
-		var sExpectedLibrary, sLoadedLibrary, aDependendLibraries = [];
+		var aExpectedLibraries = ["sap.ui.core", "sap.m", "sap.ui.layout", "sap.ui.table"].sort();
+		var aLoadedLibraries = Object.keys(Core.getLoadedLibraries());
+		var sExpectedLibrary, aDependendLibraries = [];
 
 		/* check that SAPUI5 has been loaded */
 		assert.ok(sap.ui.getCore(), "sap.ui.getCore() returns a value");
@@ -25,20 +24,20 @@ sap.ui.define([
 			assert.ok(!id, "browser is unknown: data-sap-ui-browser should not have been set (or empty)");
 		}
 
-		for (sLoadedLibrary in oLoadedLibraries) {
+		aLoadedLibraries.forEach((sLoadedLibrary) => {
 			if (!aDependendLibraries.includes(sLoadedLibrary) && !aExpectedLibraries.includes(sLoadedLibrary)) {
 				// Don't collect duplicates and only collect dependend libraries which are not already expected
 				aDependendLibraries.push(sLoadedLibrary);
 			}
-		}
+		});
 
 		for (var i = 0; i < aExpectedLibraries.length; i++) {
 			sExpectedLibrary = aExpectedLibraries[i];
-			assert.strictEqual(sExpectedLibrary + ".library", aConfigurationModules[i], "'" +  sExpectedLibrary + "' is part of sap.ui.core.Configuration property 'module'");
-			assert.ok(oLoadedLibraries[sExpectedLibrary], "'" +  sExpectedLibrary + "' is registered as loadedLibrary within Core");
+			//assert.strictEqual(sExpectedLibrary + ".library", aConfigurationModules[i], "'" +  sExpectedLibrary + "' is part of sap.ui.core.Configuration property 'module'");
+			assert.ok(aLoadedLibraries.includes(sExpectedLibrary) , "'" +  sExpectedLibrary + "' is registered as loadedLibrary within Core");
 		}
 
-		assert.strictEqual(aExpectedLibraries.concat(aDependendLibraries).length, Object.keys(oLoadedLibraries).length, "Only libraries declared in bootstrap including their dependencies are loaded");
+		assert.strictEqual(aExpectedLibraries.concat(aDependendLibraries).length, Object.keys(aLoadedLibraries).length, "Only libraries declared in bootstrap including their dependencies are loaded");
 	});
 
 });

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

@@ -135,8 +135,6 @@ sap.ui.define([
 		} else {
 			assert.ok(!id, "browser is unknown: data-sap-ui-browser should not have been set (or empty)");
 		}
-
-		assert.deepEqual(Configuration.getValue("modules"), ["sap.ui.layout.library","sap.m.library", "sap.ui.table.library"], "Libraries");
 	});
 
 	["sap.ui.core","sap.ui.layout","sap.m", "sap.ui.table"].forEach(function(sLib) {

package/test/sap/ui/core/qunit/bootstrap/BootstrapWithinBody.qunit.html

@@ -17,7 +17,8 @@
 		<script src="../../shared-config.js"></script>
 		<script id="sap-ui-bootstrap"
 				src="../../../../../../resources/sap-ui-core.js"
-				data-sap-ui-libs="sap.m">
+				data-sap-ui-libs="sap.m"
+				data-sap-ui-async="true">
 		</script>
 	</body>
 </html>

package/test/sap/ui/core/qunit/bootstrap/BootstrapWithinHead.qunit.html

@@ -13,7 +13,8 @@
 		<script src="../../shared-config.js"></script>
 		<script id="sap-ui-bootstrap"
 				src="../../../../../../resources/sap-ui-core.js"
-				data-sap-ui-libs="sap.m">
+				data-sap-ui-libs="sap.m"
+				data-sap-ui-async="true">
 		</script>
 		<script src="_checkCoreAndLibraryBooted.qunit.js"></script>
 	</head>