@openui5/sap.ui.core 1.117.1 → 1.119.0

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

@@ -291,89 +291,160 @@ sap.ui.define([
 	});
 
 	QUnit.test("Configuration freeze", function(assert) {
-		assert.expect(8);
-		assert.strictEqual(BaseConfiguration.get({
-			name: "sapUiParamD",
-			type: BaseConfiguration.Type.String,
-			external: true,
-			freeze: true
-		}), "global", "BaseConfiguration.get for param 'sapUiParamD' returns value 'global'");
+		assert.expect(87);
+		var oGlobalProviderGetSpy = sinon.spy(GlobalConfigurationProvider, "get");
+		var oWritableBootInstance = BaseConfiguration.getWritableBootInstance();
 
-		assert.strictEqual(BaseConfiguration.get({
-			name: "sapUiParamE",
-			type: BaseConfiguration.Type.String,
-			external: true
-		}), "xx-global", "BaseConfiguration.get for param 'paramE' returns correct value 'xx-global'");
+		// BaseConfiguration and WritableBootInstance use both the identical get function, therefore
+		// the result should be always the same, but the first call could be either answered by cache
+		// or by provider whether the second call must always be answered by cache.
+		function assertBaseConfigGet(sName, vResult, sMessage, bFreeze) {
+			assert.strictEqual(oWritableBootInstance.get({
+				name: sName,
+				type: BaseConfiguration.Type.String,
+				external: true,
+				freeze: bFreeze
+			}), vResult, "WritableBootInstance: " + sMessage);
+			assert.strictEqual(BaseConfiguration.get({
+				name: sName,
+				type: BaseConfiguration.Type.String,
+				external: true
+			}), vResult, "BaseConfiguration: " + sMessage);
+		}
+		// Params provided and changed via globalThis['sap-ui-config']
+		assertBaseConfigGet("sapUiParamD", "global", "get: for param 'sapUiParamD' returns value 'global'", true);
+		assertBaseConfigGet("sapUiXxParamE", "xx-global", "get: for param 'xxParamE' returns correct value 'xx-global'");
+		// Params provided via globalThis['sap-ui-config'] and changed via WritableBootInstance.set
+		assertBaseConfigGet("sapUiParamG", "global", "get: for param 'paramG' returns correct value 'global'", true);
+		assertBaseConfigGet("sapUiParamH", "global", "get: for param 'paramH' returns correct value 'global'");
+		// Params not provided at all and changed via WritableBootInstance.set
+		assertBaseConfigGet("sapUiNotProvidedParamA", "", "get: for param 'notProvidedParamA' returns correct value ''", true);
+		assertBaseConfigGet("sapUiNotProvidedParamB", "", "get: for param 'notProvidedParamB' returns correct value ''");
+		// Params not provided at all and changed via WritableBootInstance.set and globalThis['sap-ui-config']
+		assertBaseConfigGet("sapUiNotProvidedParamC", "", "get: for param 'notProvidedParamC' returns correct value ''", true);
+		assertBaseConfigGet("sapUiNotProvidedParamD", "", "get: for param 'notProvidedParamD' returns correct value ''");
 
-		globalThis["sap-ui-config"]["paramD"] = "hubelDubel";
-		globalThis["sap-ui-config"]["paramE"] = "hubelDubel";
-		BaseConfiguration._.invalidate();
+		// Param is provided via globalThis['sap-ui-config'] in lowercase and the param should not become frozen
+		assertBaseConfigGet("sapUiParamLowercase", "lowercase", "get: for param 'paramlowercase' returns correct value 'lowercase'");
+
+		assert.strictEqual(oGlobalProviderGetSpy.callCount, 13, "No entries in cache. All 'get' calls to the provider, eigth regular and four times for the 'xx'-fallback. BaseConfiguration already reads from cache within 'assertBaseConfigGet'.");
+		assert.ok(oGlobalProviderGetSpy.getCall(0).calledWithExactly("sapUiParamD", true), "1st call was for 'sapUiParamD' with additional parameter freeze 'true'.");
+		assert.ok(oGlobalProviderGetSpy.getCall(1).calledWithExactly("sapUiXxParamE", undefined), "2nd call was for 'sapUiXxParamE' with additional parameter freeze 'undefined'.");
+		assert.ok(oGlobalProviderGetSpy.getCall(2).calledWithExactly("sapUiParamG", true), "3rd call was for 'sapUiParamG' with additional parameter freeze 'true'.");
+		assert.ok(oGlobalProviderGetSpy.getCall(3).calledWithExactly("sapUiParamH", undefined), "4th call was for 'sapUiParamH' with additional parameter freeze 'undefined'.");
+		assert.ok(oGlobalProviderGetSpy.getCall(4).calledWithExactly("sapUiNotProvidedParamA", true), "5th call was for 'sapUiNotProvidedParamA' with additional parameter freeze 'true'.");
+		assert.ok(oGlobalProviderGetSpy.getCall(5).calledWithExactly("sapUiXxNotProvidedParamA", true), "6th call was for 'sapUiXxNotProvidedParamA' with additional parameter freeze 'true'.");
+		assert.ok(oGlobalProviderGetSpy.getCall(6).calledWithExactly("sapUiNotProvidedParamB", undefined), "7th call was for 'sapUiNotProvidedParamB' with additional parameter freeze 'undefined'.");
+		assert.ok(oGlobalProviderGetSpy.getCall(7).calledWithExactly("sapUiXxNotProvidedParamB", undefined), "8th call was for 'sapUiXxNotProvidedParamB' with additional parameter freeze 'undefined'.");
+		assert.ok(oGlobalProviderGetSpy.getCall(8).calledWithExactly("sapUiNotProvidedParamC", true), "9th call was for 'sapUiNotProvidedParamC' with additional parameter freeze 'true'.");
+		assert.ok(oGlobalProviderGetSpy.getCall(9).calledWithExactly("sapUiXxNotProvidedParamC", true), "10th call was for 'sapUiXxNotProvidedParamC' with additional parameter freeze 'true'.");
+		assert.ok(oGlobalProviderGetSpy.getCall(10).calledWithExactly("sapUiNotProvidedParamD", undefined), "11th call was for 'sapUiNotProvidedParamD' with additional parameter freeze 'undefined'.");
+		assert.ok(oGlobalProviderGetSpy.getCall(11).calledWithExactly("sapUiXxNotProvidedParamD", undefined), "12th call was for 'sapUiXxNotProvidedParamD' with additional parameter freeze 'undefined'.");
+		assert.ok(oGlobalProviderGetSpy.getCall(12).calledWithExactly("sapUiParamLowercase", undefined), "12th call was for 'sapUiParamLowercase' with additional parameter freeze 'undefined'.");
+		oGlobalProviderGetSpy.reset();
 
 		var oLogSpy = sinon.spy(sap.ui.loader._.logger, "error");
 
-		assert.strictEqual(BaseConfiguration.get({
-			name: "sapUiParamD",
-			type: BaseConfiguration.Type.String,
-			external: true
-		}), "global", "BaseConfiguration.get for param 'sapUiParamD' still returns value 'global'");
+		// Change some parameter using the globalThis['sap-ui-config'] object
+		globalThis["sap-ui-config"]["paramD"] = "hubelDubel";
+		globalThis["sap-ui-config"]["xx-paramE"] = "hubelDubel";
+		globalThis["sap-ui-config"]["notProvidedParamC"] = "hubelDubel";
+		globalThis["sap-ui-config"]["notProvidedParamD"] = "hubelDubel";
 
-		assert.strictEqual(BaseConfiguration.get({
-			name: "sapUiParamE",
-			type: BaseConfiguration.Type.String,
-			external: true
-		}), "xx-global", "BaseConfiguration.get for param 'paramE' still returns correct value 'xx-global'");
+		// Change some parameter using WritableBootInstance.set
+		oWritableBootInstance.set("sapUiParamG", "HubelDubel");
+		oWritableBootInstance.set("sapUiParamH", "HubelDubel");
+		oWritableBootInstance.set("sapUiNotProvidedParamA", "HubelDubel");
+		oWritableBootInstance.set("sapUiNotProvidedParamB", "HubelDubel");
+		oWritableBootInstance.set("sapUiNotProvidedParamC", "HubelDubel");
+		oWritableBootInstance.set("sapUiNotProvidedParamD", "HubelDubel");
+		assert.strictEqual(oLogSpy.callCount, 3, "There should be 3 log messages.");
+		assert.ok(oLogSpy.calledWith("Configuration option 'sapUiParamG' was frozen and cannot be changed to HubelDubel!"), "Correct error message logged.");
+		assert.ok(oLogSpy.calledWith("Configuration option 'sapUiNotProvidedParamA' was frozen and cannot be changed to HubelDubel!"), "Correct error message logged.");
+		assert.ok(oLogSpy.calledWith("Configuration option 'sapUiNotProvidedParamC' was frozen and cannot be changed to HubelDubel!"), "Correct error message logged.");
+		oLogSpy.reset();
+
+		assertBaseConfigGet("sapUiParamD", "global", "BaseConfiguration.get for param 'sapUiParamD' still returns value 'global'");
+		assertBaseConfigGet("sapUiXxParamE", "xx-global", "BaseConfiguration.get for param 'paramE' still returns correct value 'xx-global'");
+		assertBaseConfigGet("sapUiParamG", "global", "BaseConfiguration.get for param 'paramG' returns correct value 'global'");
+		assertBaseConfigGet("sapUiParamH", "HubelDubel", "BaseConfiguration.get for param 'paramH' returns correct value 'HubelDubel'");
+		assertBaseConfigGet("sapUiNotProvidedParamA", "", "BaseConfiguration.get for param 'notProvidedParamA' returns correct value ''");
+		assertBaseConfigGet("sapUiNotProvidedParamB", "HubelDubel", "BaseConfiguration.get for param 'notProvidedParamB' returns correct value 'HubelDubel'");
+		assertBaseConfigGet("sapUiNotProvidedParamC", "", "BaseConfiguration.get for param 'notProvidedParamC' returns correct value ''");
+		assertBaseConfigGet("sapUiNotProvidedParamD", "HubelDubel", "BaseConfiguration.get for param 'notProvidedParamD' returns correct value 'HubelDubel'");
+
+		assert.strictEqual(oGlobalProviderGetSpy.callCount, 10, "All entries were cached, but WriteabelConfig.set clears the cache. There are only two 'xx'-fallback because 'sapUiParamG' and 'sapUiParamH' are not evaluated before freeze of provider.");
+		oGlobalProviderGetSpy.reset();
 
 		GlobalConfigurationProvider.freeze();
-		BaseConfiguration._.invalidate();
-		assert.strictEqual(oLogSpy.callCount, 1, "There should be 1 log message.");
+		// Set after freeze should not change any parameter
+		oWritableBootInstance.set("sapUiParamLowercase", "HubelDubel");
+		assert.strictEqual(oLogSpy.callCount, 3, "There should be 3 log messages.");
 		assert.ok(oLogSpy.calledWith("Configuration option 'sapUiParamD' was frozen and cannot be changed to hubelDubel!"), "Correct error message logged.");
+		assert.ok(oLogSpy.calledWith("Configuration option 'sapUiNotProvidedParamC' was frozen and cannot be changed to hubelDubel!"), "Correct error message logged.");
+		assert.ok(oLogSpy.calledWith("Configuration option 'sapUiParamLowercase' was frozen and cannot be changed to HubelDubel!"), "Correct error message logged.");
+		oLogSpy.reset();
 
-		assert.strictEqual(BaseConfiguration.get({
-			name: "sapUiParamD",
-			type: BaseConfiguration.Type.String,
-			external: true
-		}), "global", "After freeze: BaseConfiguration.get for param 'sapUiParamD' returns default value 'global'");
+		assertBaseConfigGet("sapUiParamD", "global", "get (after freeze): for param 'sapUiParamD' returns default value 'global'");
+		assertBaseConfigGet("sapUiXxParamE", "hubelDubel", "get (after freeze): for param 'sapUiParamE' returns correct value 'hubelDubel'");
+		assertBaseConfigGet("sapUiParamG", "global", "get (after freeze): for param 'sapUiParamG' returns correct value 'hubelDubel'");
+		assertBaseConfigGet("sapUiParamH", "HubelDubel", "get (after freeze): for param 'sapUiParamH' returns correct value 'HubelDubel'");
+		assertBaseConfigGet("sapUiNotProvidedParamA", "", "get (after freeze): for param 'sapUiNotProvidedParamA' returns correct value ''");
+		assertBaseConfigGet("sapUiNotProvidedParamB", "HubelDubel", "get (after freeze): for param 'sapUiNotProvidedParamB' returns correct value 'HubelDubel'");
+		assertBaseConfigGet("sapUiNotProvidedParamC", "", "get (after freeze): for param 'sapUiNotProvidedParamC' returns correct value ''");
+		assertBaseConfigGet("sapUiNotProvidedParamD", "HubelDubel", "get (after freeze): for param 'sapUiNotProvidedParamD' returns correct value 'HubelDubel'");
+		assertBaseConfigGet("sapUiParamLowercase", "lowercase", "get (after freeze): for param 'sapUiParamLowercase' returns correct value 'lowercase'");
 
-		assert.strictEqual(BaseConfiguration.get({
-			name: "sapUiParamE",
-			type: BaseConfiguration.Type.String,
-			external: true
-		}), "hubelDubel", "After freeze: BaseConfiguration.get for param 'sapUiParamE' returns correct value 'hubelDubel'");
+		assert.strictEqual(oGlobalProviderGetSpy.callCount, 11, "The cache should be emtpy again after freeze. There are two 'xx'-fallback calls because frozen value of 'sapUiNotProvidedParamA' and 'sapUiNotProvidedParamC' is 'undefined'.");
+		assert.ok(oGlobalProviderGetSpy.getCall(0).calledWithExactly("sapUiParamD", undefined), "1st call was for 'sapUiParamD' with additional parameter freeze 'undefined'.");
+		assert.ok(oGlobalProviderGetSpy.getCall(1).calledWithExactly("sapUiXxParamE", undefined), "2nd call was for 'sapUiXxParamE' with additional parameter freeze 'undefined'.");
+		assert.ok(oGlobalProviderGetSpy.getCall(2).calledWithExactly("sapUiParamG", undefined), "3rd call was for 'sapUiParamG' with additional parameter freeze 'undefined'.");
+		assert.ok(oGlobalProviderGetSpy.getCall(3).calledWithExactly("sapUiParamH", undefined), "4th call was for 'sapUiParamH' with additional parameter freeze 'undefined'.");
+		assert.ok(oGlobalProviderGetSpy.getCall(4).calledWithExactly("sapUiNotProvidedParamA", undefined), "5th call was for 'sapUiNotProvidedParamA' with additional parameter freeze 'undefined'.");
+		assert.ok(oGlobalProviderGetSpy.getCall(5).calledWithExactly("sapUiXxNotProvidedParamA", undefined), "6th call was for 'sapUiXxNotProvidedParamA' with additional parameter freeze 'undefined'.");
+		assert.ok(oGlobalProviderGetSpy.getCall(6).calledWithExactly("sapUiNotProvidedParamB", undefined), "7th call was for 'sapUiNotProvidedParamB' with additional parameter freeze 'undefined'.");
+		assert.ok(oGlobalProviderGetSpy.getCall(7).calledWithExactly("sapUiNotProvidedParamC", undefined), "8th call was for 'sapUiNotProvidedParamC' with additional parameter freeze 'undefined'.");
+		assert.ok(oGlobalProviderGetSpy.getCall(8).calledWithExactly("sapUiXxNotProvidedParamC", undefined), "9th call was for 'sapUiXxNotProvidedParamC' with additional parameter freeze 'undefined'.");
+		assert.ok(oGlobalProviderGetSpy.getCall(9).calledWithExactly("sapUiNotProvidedParamD", undefined), "10th call was for 'sapUiNotProvidedParamD' with additional parameter freeze 'undefined'.");
+		assert.ok(oGlobalProviderGetSpy.getCall(10).calledWithExactly("sapUiParamLowercase", undefined), "11th call was for 'sapUiParamLowercase' with additional parameter freeze 'undefined'.");
+
+		oGlobalProviderGetSpy.restore();
+		oLogSpy.restore();
 	});
 
 	QUnit.test("Configuration write", function(assert) {
 		assert.expect(5);
 
-		var oWriteableInstance1 = BaseConfiguration.getWritableInstance();
-		var oWriteableInstance2 = BaseConfiguration.getWritableInstance();
+		var oWritableInstance1 = BaseConfiguration.getWritableInstance();
+		var oWritableInstance2 = BaseConfiguration.getWritableInstance();
 
-		oWriteableInstance1.set("myNewParameter", true);
-		oWriteableInstance2.set("myNewParameter", false);
+		oWritableInstance1.set("myNewParameter", true);
+		oWritableInstance2.set("myNewParameter", false);
 
-		assert.strictEqual(oWriteableInstance1.get({
+		assert.strictEqual(oWritableInstance1.get({
 			name: "myNewParameter",
-			type: oWriteableInstance2.Type.Boolean
+			type: oWritableInstance2.Type.Boolean
 		}), true, "WritableInstance1.get for param 'myNewParameter' returns value 'true'");
-		assert.strictEqual(oWriteableInstance2.get({
+		assert.strictEqual(oWritableInstance2.get({
 			name: "myNewParameter",
-			type: oWriteableInstance2.Type.Boolean,
+			type: oWritableInstance2.Type.Boolean,
 			defaultValue: true
 		}), false, "WritableInstance2.get for param 'myNewParameter' returns value 'false'");
 
-		oWriteableInstance1.set("sapUiParamA", "write");
-		assert.strictEqual(oWriteableInstance1.get({
+		oWritableInstance1.set("sapUiParamA", "write");
+		assert.strictEqual(oWritableInstance1.get({
 			name: "sapUiParamA",
-			type: oWriteableInstance2.Type.String,
+			type: oWritableInstance2.Type.String,
 			external: true
 		}), "write", "WritableInstance1.get for param 'sapUiParamA' returns value 'write'");
-		assert.strictEqual(oWriteableInstance2.get({
+		assert.strictEqual(oWritableInstance2.get({
 			name: "sapUiParamA",
-			type: oWriteableInstance2.Type.String,
+			type: oWritableInstance2.Type.String,
 			external: true
 		}), "url", "WritableInstance2.get for param 'sapUiParamA' returns value 'url'");
 
 		assert.throws(function () {
-			oWriteableInstance1.set("sap-ui-param1", true);
-		}, new TypeError("Invalid configuration key 'sap-ui-param1'!"), "oWriteableInstance1.set for param 'sap-ui-param1' throws error 'Invalid configuration key 'sap-ui-param1'!'");
+			oWritableInstance1.set("sap-ui-param1", true);
+		}, new TypeError("Invalid configuration key 'sap-ui-param1'!"), "oWritableInstance1.set for param 'sap-ui-param1' throws error 'Invalid configuration key 'sap-ui-param1'!'");
 	});
 });

package/test/sap/ui/core/qunit/base/Config_meta.qunit.html

@@ -18,6 +18,8 @@
 	<meta name="sap-ui-xx-farBoo" content="value12">
 	<meta name="sap-ui-sap/foo/bar" content="value13">
 	<meta name="sap-ushell-foo-bar" content="value14">
+	<meta name="sap-ui-initialFalsyValue"=false>
+	<meta name="sap-ui-initial-falsy-value" content=true>
 
 	<script src="../../../../../../resources/ui5loader.js"></script>
 	<script src="../../../../../../resources/ui5loader-autoconfig.js"></script>

package/test/sap/ui/core/qunit/base/config/GlobalConfig.js

@@ -15,6 +15,8 @@
         "xxBarFoo": "value11", // valid
         "xx-farBoo": "value12", // valid
         "sap/foo/bar": "value13", // invalid
-        "sap-ushell-foo-bar": "value14" // valid but sap-ui- prefixed
+        "sap-ushell-foo-bar": "value14", // valid but sap-ui- prefixed
+        "initialFalsyValue": false, // valid
+        "initial-falsy-value": false // duplicate
     };
 })();

package/test/sap/ui/core/qunit/base/config/GlobalConfigForCascade.js

@@ -9,6 +9,8 @@
         "paramD": "global",
         "xx-paramE": "xx-global",
         "xxParamF": "xxGlobal",
+        "paramG": "global",
+        "paramH": "global",
         "paramBoolean": "true",
         "paramBooleanAsString": "X",
         "paramFunction": function () {
@@ -32,6 +34,7 @@
         "paramStringArrayAsString": "stringArrayAsString,stringArrayAsStr",
         "paramInteger": 5,
         "paramNull": null,
-        "paramEnum": "enumValue"
+        "paramEnum": "enumValue",
+        "paramlowercase": "lowercase"
     };
 })();

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/BootstrapMinimal.qunit.js

@@ -11,7 +11,7 @@
 	QUnit.test("When sap/ui/core/Core has been required...", function(assert) {
 		var coreInitFired = false;
 		var done = assert.async();
-		sap.ui.require(['sap/ui/core/Core'], function() {
+		sap.ui.require(['sap/ui/core/Core'], function(Core) {
 			// TODO clarify how to handle jQuery gloabls
 			assert.strictEqual(typeof jQuery, "function", "...function jQuery should exist");
 			assert.strictEqual(typeof jQuery.prototype.position, "function", "...function jQuery.fn.position should exist");
@@ -19,14 +19,14 @@
 					"...loader should know module 'sap/ui/thirdparty/jquery' and its export");
 			assert.strictEqual(sap.ui.require('sap/ui/thirdparty/jqueryui/jquery-ui-position'), jQuery,
 					"...loader should know module 'sap/ui/thirdparty/jqueryui/jquery-ui-position' and its export");
-			sap.ui.getCore().attachInit(function() {
+			Core.ready().then(function() {
 				coreInitFired = true;
 				assert.ok(coreInitFired, "...init event should be fired after boot");
 				done();
 			});
 			setTimeout(function() {
 				assert.notOk(coreInitFired, "...but Core should not have fired init event before boot");
-				sap.ui.getCore().boot();
+				Core.boot();
 			}, 500);
 		});
 	});

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

@@ -17,9 +17,9 @@
 	});
 
 	QUnit.test("When sap/ui/core/Core has been required...", function(assert) {
-		var coreInitFired = false;
+		var coreReady = false;
 		var done = assert.async();
-		sap.ui.require(['sap/ui/core/Core'], function() {
+		sap.ui.require(['sap/ui/core/Core'], function(Core) {
 			assert.strictEqual(typeof jQuery, "function", "...function jQuery should exist");
 			assert.strictEqual(typeof jQuery.prototype.position, "function", "...function jQuery.fn.position should exist");
 			assert.strictEqual(sap.ui.require('sap/ui/thirdparty/jquery'), jQuery,
@@ -31,11 +31,11 @@
 			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();
@@ -45,13 +45,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/BootstrapPreload.qunit.js

@@ -20,7 +20,7 @@ sap.ui.define([
 
 		var id = document.querySelector("html").getAttribute("data-sap-ui-browser");
 		if ( Device.browser.name ) {
-			assert.strictEqual(id, Device.browser.name + Device.browser.versionStr, "browser is known: data-sap-ui-browser should have been set and must not be empty");
+			assert.strictEqual(id, Device.browser.name + Math.floor(Device.browser.versionStr), "browser is known: data-sap-ui-browser should have been set and must not be empty");
 		} else {
 			assert.ok(!id, "browser is unknown: data-sap-ui-browser should not have been set (or empty)");
 		}

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