@openui5/sap.ui.core 1.118.0 → 1.119.0

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

@@ -1,5 +1,6 @@
 /*global QUnit, sinon */
 sap.ui.define([
+	"sap/ui/core/Element",
 	"sap/ui/core/TooltipBase",
 	"sap/ui/qunit/QUnitUtils",
 	"sap/ui/layout/HorizontalLayout",
@@ -7,7 +8,7 @@ sap.ui.define([
 	"sap/ui/qunit/utils/createAndAppendDiv",
 	"sap/ui/qunit/utils/nextUIUpdate",
 	"sap/ui/events/KeyCodes"
-], function (TooltipBase, QUnitUtils, HorizontalLayout, Button, createAndAppendDiv, nextUIUpdate, KeyCodes) {
+], function (Element, TooltipBase, QUnitUtils, HorizontalLayout, Button, createAndAppendDiv, nextUIUpdate, KeyCodes) {
 	"use strict";
 
 	createAndAppendDiv("target");
@@ -508,7 +509,7 @@ sap.ui.define([
 
 		// needed to wait for rendering the icons
 		setTimeout(function() {
-			var oIcon = sap.ui.getCore().byId(this.oButton2.getId() + "-img");
+			var oIcon = Element.getElementById(this.oButton2.getId() + "-img");
 			var oSpyIconMoveOver = sinon.spy(oIcon, "onmouseover");
 
 			QUnitUtils.triggerMouseEvent(this.oButton2.$(), "mouseover");

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

@@ -64,8 +64,8 @@ sap.ui.define([
 		UIArea.registry.get("uiArea1").removeAllContent();
 		await nextUIUpdate();
 		assert.equal(jQuery("#uiArea1").children().length, 0, "no more content");
-		assert.ok(oCore.byId("text1"), "remove must not destroy child 1");
-		assert.ok(oCore.byId("text2"), "remove must not destroy child 2");
+		assert.ok(Element.getElementById("text1"), "remove must not destroy child 1");
+		assert.ok(Element.getElementById("text2"), "remove must not destroy child 2");
 	});
 
 	/**
@@ -104,10 +104,10 @@ sap.ui.define([
 		var $originalDom = jQuery("#uiArea2").children();
 		assert.equal($originalDom.length, 1, "precondition: one span exists already in UIArea");
 		assert.equal(jQuery($originalDom.get(0)).text(), "Before", "precondition: span contains correct text");
-		assert.ok(oCore.byId("text1"), "precondition: control 1 still exists");
-		assert.ok(!oCore.byId("text1").getParent(), "precondition: control 1 not bound");
-		assert.ok(oCore.byId("text2"), "precondition: control 2 still exists");
-		assert.ok(!oCore.byId("text2").getParent(), "precondition: control 2 not bound");
+		assert.ok(Element.getElementById("text1"), "precondition: control 1 still exists");
+		assert.ok(!Element.getElementById("text1").getParent(), "precondition: control 1 not bound");
+		assert.ok(Element.getElementById("text2"), "precondition: control 2 still exists");
+		assert.ok(!Element.getElementById("text2").getParent(), "precondition: control 2 not bound");
 
 		// do some interleaved modifications: Control / DOM / Control / DOM
 		this.oText1.placeAt("uiArea2");
@@ -142,10 +142,10 @@ sap.ui.define([
 	 * then rerendering of the UIArea must not delete such preserved DOM
 	 */
 	QUnit.test("preserved DOM content", async function(assert) {
-		assert.ok(oCore.byId("text1"), "precondition: control 1 still exists");
-		assert.ok(!oCore.byId("text1").getParent(), "precondition: control 1 not bound");
-		assert.ok(oCore.byId("text2"), "precondition: control 2 still exists");
-		assert.ok(!oCore.byId("text2").getParent(), "precondition: control 2 not bound");
+		assert.ok(Element.getElementById("text1"), "precondition: control 1 still exists");
+		assert.ok(!Element.getElementById("text1").getParent(), "precondition: control 1 not bound");
+		assert.ok(Element.getElementById("text2"), "precondition: control 2 still exists");
+		assert.ok(!Element.getElementById("text2").getParent(), "precondition: control 2 not bound");
 		var $originalDom = jQuery("#uiArea1").children();
 		assert.equal($originalDom.length, 0, "precondition: UIArea1 is empty");
 

package/test/sap/ui/core/qunit/analytics/testsuite4analytics.qunit.html

@@ -13,6 +13,7 @@
 
 		<script src="test-resources/sap/ui/core/shared-config.js"></script>
 		<script id="sap-ui-bootstrap" src="resources/sap-ui-core.js"
+			data-sap-ui-async="true"
 			data-sap-ui-compatversion="edge"
 			data-sap-ui-noConflict="true"
 			data-sap-ui-libs="sap.ui.table,sap.m"
@@ -27,12 +28,11 @@
 		<script src="resources/sap/ui/qunit/QUnitUtils.js"></script>
 		<script src="resources/sap/ui/thirdparty/sinon.js"></script>
 		<script src="resources/sap/ui/thirdparty/sinon-qunit.js"></script>
-		<script src="resources/sap/ui/qunit/qunit-coverage.js"
-			data-cover-flags="branchTracking"
+		<script src="resources/sap/ui/test/ModuleTracking.js"></script>
+		<script src="resources/sap/ui/qunit/qunit-coverage-istanbul.js"
 			data-sap-ui-cover-never="[/qunit/]"
 			data-sap-ui-cover-only="[/analytics/]">
 		</script>
-		<script src="resources/sap/ui/test/BranchTracking.js"></script>
 
 		<script src="test-resources/sap/ui/core/qunit/analytics/testsuite4analytics.qunit.js">
 		</script>

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

@@ -193,7 +193,7 @@ sap.ui.define([
 			assert.strictEqual(Localization.getLanguage(), sExpectedLanguage || sExpectedLanguageTag, "Should return expected LanguageTag '" + sExpectedLanguage || sExpectedLanguageTag + "'");
 			assert.strictEqual(Localization.getSAPLogonLanguage(), sExpectedSAPLogonLanguage || sExpectedLanguageTag.toUpperCase(), "Should return expected SAPLogonLanguage '" + sExpectedSAPLogonLanguage || sExpectedLanguageTag.toUpperCase() + "'");
 			assert.strictEqual(Localization.getRTL(), bExpectedRtl, "Should return expected rtl '" + bExpectedRtl + "'");
-			assert.strictEqual(oEvent.language, sExpectedLanguageTag, "Change event should contain the correct language'" + sExpectedLanguageTag + "'");
+			assert.strictEqual(oEvent.language, sExpectedLanguageTag, "Change event should contain the correct language '" + sExpectedLanguageTag + "'");
 			if (bExpectedRtl !== bOldRtl) {
 				assert.strictEqual(oEvent.rtl, bExpectedRtl, "Change event should contain the correct rtl '" + sExpectedLanguageTag + "'");
 				bOldRtl = oEvent.rtl;
@@ -219,9 +219,10 @@ sap.ui.define([
 		// Setting same language again shouldn't trigger a change event
 		Localization.setLanguage(sExpectedLanguageTag);
 
-		sExpectedLanguageTag = "us";
+		sExpectedLanguageTag = "en";
+		sExpectedSAPLogonLanguage = "US";
 		bExpectedRtl = false;
-		Localization.setLanguage("en", sExpectedLanguageTag);
+		Localization.setLanguage(sExpectedLanguageTag, sExpectedSAPLogonLanguage);
 
 		assert.throws(function() {
 			Localization.setLanguage("invalidLanguage");

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

@@ -3,8 +3,9 @@ sap.ui.define([
 	"sap/base/i18n/Localization",
 	"sap/base/i18n/ResourceBundle",
 	"sap/base/util/Properties",
-	"sap/base/util/merge"
-], function(Localization, ResourceBundle, Properties, merge) {
+	"sap/base/util/merge",
+	"sap/base/Log"
+], function(Localization, ResourceBundle, Properties, merge, Log) {
 	"use strict";
 
 	QUnit.module("sap/base/i18n/ResourceBundle", {
@@ -1124,16 +1125,25 @@ sap.ui.define([
 	 */
 	QUnit.test("getText - with placeholder values as positional parameters (not supported)", function(assert) {
 		var oStub = this.stub(Properties, "create").returns(createFakePropertiesPromise({sayHello: "Hello {0}"}));
-
+		var oErrorLogSpy = this.spy(Log, "error");
 		return ResourceBundle.create({url: 'my.properties', locale: "", async: true, supportedLocales: [""], fallbackLocale: ""}).then(function(oResourceBundle) {
 			assert.equal(oStub.callCount, 1);
 			assert.equal(oStub.getCall(0).args[0].url, "my.properties", "raw properties file is requested");
+			assert.equal(oErrorLogSpy.callCount, 0, "Log.error should be called once");
 
 			// non-falsy, non-array value for 2nd parameter of #getText
 			assert.equal(oResourceBundle.getText("sayHello", "Peter"), "Hello Peter");
+			assert.equal(oErrorLogSpy.callCount, 1, "Log.error should be called");
+			assert.equal(oErrorLogSpy.getCall(0).args[0],
+				"sap/base/i18n/ResourceBundle: value for parameter 'aArgs' is not of type array",
+				"Log.error should be called with expected message");
 
 			// non-nullish but "falsy" value for 2nd parameter of #getText
 			assert.equal(oResourceBundle.getText("sayHello", ""), "Hello {0}");
+			assert.equal(oErrorLogSpy.callCount, 2, "Log.error should be called");
+			assert.equal(oErrorLogSpy.getCall(1).args[0],
+				"sap/base/i18n/ResourceBundle: value for parameter 'aArgs' is not of type array",
+				"Log.error should be called with expected message");
 		});
 	});
 

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

@@ -18,11 +18,23 @@ sap.ui.define(['sap/base/Log', 'sap/base/util/UriParameters'], function(Log, Uri
 		assert.deepEqual(Array.from(oUriParams.keys()), [], "empty constructor should result in no parameters");
 	});
 
+	QUnit.test("invalid constructor parameters", function(assert) {
+		assert.throws(() => new UriParameters({ foo: "bar" }), /query parameter must be a string/ );
+	});
+
 	QUnit.test("a single parameter", function(assert) {
 		var oUriParams = new UriParameters("/service?x=1");
 		assert.deepEqual(oUriParams.getAll('x'), ['1']);
 	});
 
+	QUnit.test("has", function(assert) {
+		var oUriParams = new UriParameters("/service?x=1&y=2&y=3&z=");
+		assert.equal(oUriParams.has('x'), true, "parameter with one value");
+		assert.equal(oUriParams.has('y'), true, "parameter with multiple values");
+		assert.equal(oUriParams.has('z'), true, "parameter without value");
+		assert.equal(oUriParams.has('a'), false, "parameter not within query");
+	});
+
 	QUnit.test("wrong syntax", function(assert) {
 		var oUriParams = new UriParameters("/service&x=1");
 		assert.deepEqual(oUriParams.getAll('x'), []);
@@ -137,6 +149,10 @@ sap.ui.define(['sap/base/Log', 'sap/base/util/UriParameters'], function(Log, Uri
 		assert.deepEqual(oUriParams.getAll('y'), ["2"]);
 	});
 
+	QUnit.test("fromQuery, invalid parameter", function(assert) {
+		assert.throws(() => UriParameters.fromQuery({ query: "?x=1" }), /query parameter must be a string/);
+	});
+
 	QUnit.test("Deprecated Access to get(...,true)", function(assert) {
 		sinon.stub(Log, "warning");
 		try {
@@ -155,7 +171,8 @@ sap.ui.define(['sap/base/Log', 'sap/base/util/UriParameters'], function(Log, Uri
 	QUnit.test("Deprecated Access to mParams", function(assert) {
 		sinon.stub(Log, "warning");
 		try {
-			var mParams = UriParameters.fromQuery("x=1&y=2").mParams;
+			var oParams = UriParameters.fromQuery("x=1&y=2");
+			var mParams = oParams.mParams;
 			assert.strictEqual(Object.getPrototypeOf(mParams), Object.prototype, "mParams should have Object.prototype as prototype");
 			assert.deepEqual(mParams, {x:["1"], y: ["2"]}, "mParams should have the expected content");
 			assert.ok(
@@ -163,6 +180,15 @@ sap.ui.define(['sap/base/Log', 'sap/base/util/UriParameters'], function(Log, Uri
 					sinon.match(/Deprecated/)
 					.and(sinon.match(/mParams must not be accessed/))),
 				"A warning should be logged");
+
+			Log.warning.resetHistory();
+
+			mParams = oParams.mParams;
+			assert.strictEqual(Object.getPrototypeOf(mParams), Object.prototype, "mParams should have Object.prototype as prototype");
+			assert.deepEqual(mParams, {x:["1"], y: ["2"]}, "mParams should have the expected content");
+
+			assert.equal(Log.warning.callCount, 0, "Warning should only be logged once");
+
 		} finally {
 			Log.warning.restore();
 		}

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

@@ -1,9 +1,9 @@
 /*global QUnit */
 sap.ui.define([
 	"sap/ui/core/Core",
-	"sap/ui/core/Configuration",
+	"sap/ui/core/Theming",
 	"sap/ui/core/theming/Parameters"
-], function(Core, Configuration, Parameters) {
+], function(Core, Theming, Parameters) {
 	"use strict";
 
 	/**
@@ -19,7 +19,7 @@ sap.ui.define([
 	 * take the configured "themeroots" into account.
 	 */
 	QUnit.test("Theme Modulepath should be registered accordingly", function(assert) {
-		var sTheme = Configuration.getTheme();
+		var sTheme = Theming.getTheme();
 
 		assert.equal(sap.ui.require.toUrl("sap/ui/core/themes/" + sTheme), "foo/bar/sap/ui/core/themes/" + sTheme,
 			"Modulepath of 'sap/ui/core/themes/" + sTheme + "' should be set to themeroot.");
@@ -40,7 +40,7 @@ sap.ui.define([
 				done();
 		});
 
-		Core.applyTheme("sap_hcb");
+		Theming.setTheme("sap_hcb");
 	});
 
 });

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

@@ -16,29 +16,30 @@
 
 	window["sap-ui-config"] = window["sap-ui-config"] || {};
 	window["sap-ui-config"]["xx-bootTask"] = function(callback) {
-		testresults.bHookCalled = true;
-		testresults.bSapUiCoreExists = typeof sap.ui.getCore === "function";
-		if ( testresults.bSapUiCoreExists ) {
-			testresults.bApplyThemeExists = typeof sap.ui.getCore().applyTheme === "function";
-			testresults.sThemeBefore = sap.ui.getCore().getConfiguration().getTheme();
-			testresults.oLinksBefore = document.querySelectorAll('head > link[id^="sap-ui-theme-"]');
-			try {
-				sap.ui.getCore().applyTheme("SapSampleTheme2");
-				testresults.oLinksAfter = document.querySelectorAll('head > link[id^="sap-ui-theme-"]');
-				testresults.sThemeAfter = sap.ui.getCore().getConfiguration().getTheme();
-				testresults.bApplyThemeFails = false;
-			} catch (e) {
-				testresults.bApplyThemeFails = true;
-			}
-		}
-
 		testresults.bIconPoolLoaded = !!sap.ui.require("sap/ui/core/IconPool");
 
 		sap.ui.require([
-			"sap/ui/core/IconPool"
-		], function() {
-			callback();
+			"sap/ui/core/Theming"
+		], function(Theming) {
+			testresults.bHookCalled = true;
+			testresults.bSapUiCoreExists = typeof sap.ui.getCore === "function";
+			if ( testresults.bSapUiCoreExists ) {
+				testresults.sThemeBefore = Theming.getTheme();
+				testresults.oLinksBefore = document.querySelectorAll('head > link[id^="sap-ui-theme-"]');
+				try {
+					Theming.setTheme("SapSampleTheme2");
+					testresults.oLinksAfter = document.querySelectorAll('head > link[id^="sap-ui-theme-"]');
+					testresults.sThemeAfter = sap.ui.getCore().getConfiguration().getTheme();
+					testresults.bApplyThemeFails = false;
+				} catch (e) {
+					testresults.bApplyThemeFails = true;
+				}
+			}
+			sap.ui.require([
+				"sap/ui/core/IconPool"
+			], function() {
+				callback();
+			});
 		});
 	};
-
-}());
+})();

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

@@ -1,7 +1,7 @@
 /*global QUnit, testresults */
 sap.ui.define([
-
-], function() {
+	"sap/ui/core/Theming"
+], function(Theming) {
 	"use strict";
 
 	/**
@@ -12,7 +12,6 @@ sap.ui.define([
 		var checkBootstrap = function () {
 			assert.ok(testresults.bHookCalled, "boottask should be called");
 			assert.ok(testresults.bSapUiCoreExists, "sap.ui.getCore() should exist in the boot task");
-			assert.ok(testresults.bApplyThemeExists, "sap.ui.getCore().applyTheme() should exist when the boot task is executed");
 			assert.equal(testresults.sThemeBefore, "SapSampleTheme1", "theme before applyTheme should be as configured");
 			assert.equal(testresults.sThemeAfter, "SapSampleTheme2", "theme should have changed after apply theme");
 			assert.equal(testresults.oLinksBefore && testresults.oLinksBefore.length, 0, "there should be no link tags for theme styles when the hook is called");
@@ -21,15 +20,11 @@ sap.ui.define([
 			assert.notOk(testresults.bIconPoolLoaded, "IconPool module should not have been loaded on entry into bootTask");
 			assert.ok(sap.ui.require("sap/ui/core/IconPool"), "IconPool module should have been loaded by bootTask");
 
-			sap.ui.getCore().detachThemeChanged(checkBootstrap);
+			Theming.detachApplied(checkBootstrap);
 			done();
 		};
 
-		if (sap.ui.getCore().isThemeApplied()) {
-			checkBootstrap();
-		} else {
-			sap.ui.getCore().attachThemeChanged(checkBootstrap);
-		}
+		Theming.attachApplied(checkBootstrap);
 
 	});
 

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

@@ -5,6 +5,17 @@ sap.ui.define([
 	"use strict";
 
 	QUnit.test("Calendar Class Loading", function(assert) {
+		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");
@@ -12,11 +23,15 @@ sap.ui.define([
 			assert.notOk(GregorianClass, "The calendar class shouldn't be loaded");
 			assert.ok(JapaneseClass, "The calendar class is loaded");
 
-			var bLibraryPreloadLoaded = !!document.querySelector("head > script[src*='sap/ui/core/library-preload.js']");
-			var bCalendarLoaded = !!document.querySelector("head > script[src*='sap/ui/core/date/Japanese.js']");
+			const japaneseCalendarIsIncludedAsSingleRequest = isScriptIncluded("sap/ui/core/date/Japanese.js");
+			const coreLibraryPreloadIsLoaded = isLoaded("sap/ui/core/library-preload.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");
+			}
 
-			// If the Core is loaded and booted the correct calendar class must be loaded.
-			assert.ok(bLibraryPreloadLoaded ? !bCalendarLoaded : bCalendarLoaded, "calendar class is loaded within library-preload.js when it exists");
 		});
 	});
 

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

@@ -2,9 +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, ThemeHelper, Device) {
+], function(Configuration, Locale, Theming, ThemeHelper, Device) {
 	"use strict";
 
 	/*
@@ -46,7 +47,7 @@ sap.ui.define([
 
 	QUnit.test("Settings", function(assert) {
 		// compare values where possible
-		assert.equal(Configuration.getTheme(), ThemeHelper.getDefaultThemeInfo().DEFAULT_THEME, "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,8 +1,9 @@
 /*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;
@@ -13,7 +14,7 @@ sap.ui.define([
 
 		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'");