@openui5/sap.ui.core 1.120.0 → 1.120.2

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

@@ -82,7 +82,7 @@ sap.ui.require([
 	});
 
 	QUnit.test("Type Conversion: Convert all types", function(assert) {
-		assert.expect(18);
+		assert.expect(20);
 		var myEnum = {
 			enumKey: "enumValue"
 		};
@@ -144,7 +144,22 @@ sap.ui.require([
 			type: BaseConfiguration.Type.Object,
 			external: true
 		}), {objectAsStringKey: "objectAsStringValue"}, "BaseConfiguration.get for param 'sapUiParamObjectAsString' returns correct value '{objectAsStringKey: \"objectAsStringValue\"}'");
+		assert.deepEqual(BaseConfiguration.get({
+			name: "sapUiParamMergedObject",
+			type: BaseConfiguration.Type.Object,
+			external: true
+		}), {objectKeyUrl: "urlObject"}, "BaseConfiguration.get for param 'sapUiParamMergedObject' returns correct value '{objectKeyUrl: \"urlObject\"}'");
 		BaseConfiguration._.invalidate();
+		assert.deepEqual(BaseConfiguration.get({
+			name: "sapUiParamMergedObject",
+			type: BaseConfiguration.Type.MergedObject,
+			external: true
+		}), {
+			objectKeyGlobal: "globalObject",
+			objectKeyBootstrap: "bootstrapObject",
+			objectKeyMeta: "metaObject",
+			objectKeyUrl: "urlObject"
+		}, "BaseConfiguration.get for param 'sapUiParamMergedObject' returns correct value '{objectKeyGlobal: \"globalObject\",objectKeyBootstrap: \"bootstrapObject\",objectKeyMeta: \"metaObject\",objectKeyUrl: \"urlObject\"}'");
 		assert.strictEqual(BaseConfiguration.get({
 			name: "sapUiParamString",
 			type: BaseConfiguration.Type.String,
@@ -173,7 +188,7 @@ sap.ui.require([
 	});
 
 	QUnit.test("Type Conversion: Default values", function(assert) {
-		assert.expect(10);
+		assert.expect(13);
 
 		assert.strictEqual(BaseConfiguration.get({
 			name: "sapUiParamDoesNotExist",
@@ -226,10 +241,27 @@ sap.ui.require([
 			type: BaseConfiguration.Type.Object,
 			defaultValue: undefined
 		}), undefined, "BaseConfiguration.get for param 'sapUiParamDoesNotExist' returns correct value 'undefined'");
+		BaseConfiguration._.invalidate();
+		assert.deepEqual(BaseConfiguration.get({
+			name: "sapUiParamDoesNotExist",
+			type: BaseConfiguration.Type.MergedObject
+		}), {}, "BaseConfiguration.get for param 'sapUiParamDoesNotExist' returns correct value '{}'");
+		BaseConfiguration._.invalidate();
+		assert.deepEqual(BaseConfiguration.get({
+			name: "sapUiParamDoesNotExist",
+			type: BaseConfiguration.Type.MergedObject,
+			defaultValue: true
+		}), true, "BaseConfiguration.get for param 'sapUiParamDoesNotExist' returns provided default value 'true'");
+		BaseConfiguration._.invalidate();
+		assert.deepEqual(BaseConfiguration.get({
+			name: "sapUiParamDoesNotExist",
+			type: BaseConfiguration.Type.MergedObject,
+			defaultValue: undefined
+		}), undefined, "BaseConfiguration.get for param 'sapUiParamDoesNotExist' returns correct value 'undefined'");
 	});
 
 	QUnit.test("Type Conversion: Invalid usage of BaseConfiguration.get", function(assert) {
-		assert.expect(8);
+		assert.expect(9);
 		var myEnum = {
 			enumKey: "enumValue"
 		};
@@ -261,6 +293,13 @@ sap.ui.require([
 				external: true
 			});
 		}, new TypeError("unsupported value"), "BaseConfiguration.get with type 'object' for param 'sapUiParamInteger' throws error 'unsupported value'");
+		assert.throws(function () {
+			BaseConfiguration.get({
+				name: "sapUiParamInteger",
+				type: BaseConfiguration.Type.MergedObject,
+				external: true
+			});
+		}, new TypeError("unsupported value"), "BaseConfiguration.get with type 'mergedObject' for param 'sapUiParamInteger' throws error 'unsupported value'");
 		assert.throws(function () {
 			BaseConfiguration.get({
 				name: "sapUiParamInteger",
@@ -346,10 +385,10 @@ sap.ui.require([
 		var oLogSpy = sinon.spy(sap.ui.loader._.logger, "error");
 
 		// 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";
+		globalThis["sap-ui-config"]["param-d"] = "hubelDubel";
+		globalThis["sap-ui-config"]["xx-param-e"] = "hubelDubel";
+		globalThis["sap-ui-config"]["not-provided-param-c"] = "hubelDubel";
+		globalThis["sap-ui-config"]["not-provided-param-d"] = "hubelDubel";
 
 		// Change some parameter using WritableBootInstance.set
 		oWritableBootInstance.set("sapUiParamG", "HubelDubel");

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

@@ -3,38 +3,41 @@
     "use strict";
 
     globalThis["sap-ui-config"] = {
-        "paramA": "global",
-        "paramB": "global",
-        "paramC": "global",
-        "paramD": "global",
-        "xx-paramE": "xx-global",
+        "param-a": "global",
+        "param-b": "global",
+        "param-c": "global",
+        "param-d": "global",
+        "xx-param-e": "xx-global",
         "xxParamF": "xxGlobal",
-        "paramG": "global",
-        "paramH": "global",
-        "paramBoolean": "true",
-        "paramBooleanAsString": "X",
-        "paramFunction": function () {
+        "param-g": "global",
+        "param-h": "global",
+        "param-boolean": "true",
+        "param-boolean-as-string": "X",
+        "param-function": function () {
             return "function";
         },
-        "paramFunctionAsArray": [function () {
+        "param-function-as-array": [function () {
             return "functionAsArray";
         }, function () {
             return "functionAsArray";
         }],
-        "paramCode": function () {
+        "param-code": function () {
             return "code";
         },
-        "paramCodeAsString": "codeAsString",
-        "paramObject": {
+        "param-code-as-string": "codeAsString",
+        "param-object": {
             objectKey: "object"
         },
-        "paramObjectAsString": "{\"objectAsStringKey\": \"objectAsStringValue\"}",
-        "paramString": "string",
-        "paramStringArray": ["stringArray"],
-        "paramStringArrayAsString": "stringArrayAsString,stringArrayAsStr",
-        "paramInteger": 5,
-        "paramNull": null,
-        "paramEnum": "enumValue",
+        "param-merged-object": {
+            objectKeyGlobal: "globalObject"
+        },
+        "param-object-as-string": "{\"objectAsStringKey\": \"objectAsStringValue\"}",
+        "param-string": "string",
+        "param-string-array": ["stringArray"],
+        "param-string-array-as-string": "stringArrayAsString,stringArrayAsStr",
+        "param-integer": 5,
+        "param-null": null,
+        "param-enum": "enumValue",
         "paramlowercase": "lowercase"
     };
 })();

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

@@ -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/component/Component.qunit.js

@@ -3,6 +3,7 @@ sap.ui.define([
 	"sap/ui/qunit/utils/nextUIUpdate",
 	'sap/ui/core/Component',
 	'sap/ui/core/ComponentContainer',
+	'sap/ui/core/ComponentRegistry',
 	'sap/ui/core/Messaging',
 	'sap/ui/core/UIComponentMetadata',
 	'sap/ui/test/routing/Component',
@@ -12,13 +13,13 @@ sap.ui.define([
 	'sap/base/util/LoaderExtensions',
 	'sap/ui/core/Manifest',
 	'sap/base/i18n/ResourceBundle'
-], function (createAndAppendDiv, nextUIUpdate, Component, ComponentContainer, Messaging, UIComponentMetadata, SamplesRoutingComponent, SamplesRouterExtension, Log, deepExtend, LoaderExtensions, Manifest, ResourceBundle) {
+], function (createAndAppendDiv, nextUIUpdate, Component, ComponentContainer, ComponentRegistry, Messaging, UIComponentMetadata, SamplesRoutingComponent, SamplesRouterExtension, Log, deepExtend, LoaderExtensions, Manifest, ResourceBundle) {
 
 	"use strict";
 	/*global sinon, QUnit, foo*/
 
 	function cleanUpRegistry() {
-		Component.registry.forEach(function(oComponent) {
+		ComponentRegistry.forEach(function(oComponent) {
 			oComponent.destroy();
 		});
 	}
@@ -129,7 +130,7 @@ sap.ui.define([
 
 	QUnit.test("Factory Function", function(assert){
 		var oComp = this.oComp;
-		var oComponent = Component.get(oComp.getId());
+		var oComponent = Component.getComponentById(oComp.getId());
 		assert.equal(oComponent, oComp, "Factory function returns the same instance!");
 
 		return Component.create({
@@ -146,7 +147,7 @@ sap.ui.define([
 		var oCompCont1 = this.oCompCont1;
 		assert.ok(!!oComp.getComponentData(), "Component has component data");
 		assert.equal(oComp.getComponentData().foo, "bar", "Component data is correct");
-		var oComponent = Component.registry.get(oCompCont1.getComponent());
+		var oComponent = ComponentRegistry.get(oCompCont1.getComponent());
 		assert.ok(!!oComponent.getComponentData(), "Component has component data");
 		assert.equal(oComponent.getComponentData().foo, "bar", "Component data is correct");
 	});
@@ -434,7 +435,7 @@ sap.ui.define([
 		// check the nested component having the ID of the parent component
 		var oNestedComponentContainer = this.oComp.byId("ContButton");
 		var sNestedComponentId = oNestedComponentContainer.getComponent();
-		var oNestedComponent = Component.get(sNestedComponentId);
+		var oNestedComponent = Component.getComponentById(sNestedComponentId);
 		assert.equal(sRefComponentId, Component.getOwnerIdFor(oNestedComponent), "The nested component has the correct component context");
 		// check the control in the nested component to have the correct component context
 		var oNestedControl = oNestedComponent.byId("mybutn");
@@ -739,7 +740,7 @@ sap.ui.define([
 			manifest: "anylocation/manifest.json"
 		}).then(function(oComponent) {
 			assert.ok(true, "Component is loaded properly!");
-			assert.equal(oComponent, Component.get("myTestComp"), "Component.get returns right component");
+			assert.equal(oComponent, Component.getComponentById("myTestComp"), "Component.get returns right component");
 		}, function(oError) {
 			assert.ok(false, "Component should be loaded!");
 		});
@@ -1540,6 +1541,29 @@ sap.ui.define([
 
 	});
 
+	QUnit.test("Component.create with loaded manifest content", function(assert) {
+		var oProcessI18nSpy = this.spy(Manifest.prototype, "_processI18n");
+		// there's still one sync path where the i18n file is processed synchronously
+		// it's documented in BLI CPOUI5FRAMEWORK-286
+		var iExpectedSyncCallCount = 1;
+		return LoaderExtensions.loadResource(
+			"sap/ui/test/mixed/manifest.json",
+			{async: true}
+		).then(function(oManifest) {
+			return Component.create({
+				manifest: oManifest
+			});
+		}).then(function(oComponent) {
+			assert.ok(oComponent, "Component instance is created");
+			var iSyncCall = oProcessI18nSpy.getCalls().reduce(function(acc, oCall) {
+				if (oCall.args.length === 0 || !oCall.args[0]) {
+					acc++;
+				}
+				return acc;
+			}, 0);
+			assert.equal(iSyncCall, iExpectedSyncCallCount, "The number of sync loading of i18n file is the same as expectation");
+		});
+	});
 
 	QUnit.module("Models", {
 		beforeEach : function() {
@@ -1937,14 +1961,14 @@ sap.ui.define([
 		var aFilteredComponents = [];
 
 		assert.ok(Component.hasOwnProperty("registry"), "Component has static method to access registry");
-		assert.equal(Component.registry.size, 3, "Return number of registered component instances");
-		assert.deepEqual(Object.keys(Component.registry.all()).sort(), ["A", "B", "C"], "Return all registered component instances");
-		assert.ok(Component.registry.get("B") === oFooB, "Return reference of component B from registry by ID");
+		assert.equal(ComponentRegistry.size, 3, "Return number of registered component instances");
+		assert.deepEqual(Object.keys(ComponentRegistry.all()).sort(), ["A", "B", "C"], "Return all registered component instances");
+		assert.ok(ComponentRegistry.get("B") === oFooB, "Return reference of component B from registry by ID");
 
-		Component.registry.forEach(fnCallbackSpy);
+		ComponentRegistry.forEach(fnCallbackSpy);
 		assert.ok(fnCallbackSpy.calledThrice, "Callback was executed 3 times");
 
-		aFilteredComponents = Component.registry.filter(function(oComponent) {
+		aFilteredComponents = ComponentRegistry.filter(function(oComponent) {
 			return ["B", "C"].indexOf(oComponent.getId()) > -1;
 		});
 

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

@@ -79,7 +79,7 @@ sap.ui.define([
 				assert.ok(true, "Was not able to create component, componentFailed fired");
 				assert.ok(oReason.message.indexOf("failed to load") === 0, "Error object is passed as reason");
 				Promise.resolve().then(function() {
-					assert.ok(oLogErrorSpy.calledWith(sinon.match(/^Failed to load component for container/)));
+					assert.ok(oLogErrorSpy.calledWith(sinon.match(/Failed to load component for container/)));
 					assert.strictEqual(oLogErrorSpy.callCount, 1, "One error should have been logged");
 					done();
 				});

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

@@ -356,15 +356,15 @@ sap.ui.define([
 
 
 			// Log.error
-			sinon.assert.calledWithExactly(this.oLogSpy, "Component Manifest: Missing \"type\" for model \"no-model-type\"", "[\"sap.ui5\"][\"models\"][\"no-model-type\"]", this.oComponent.getMetadata().getComponentName());
-			sinon.assert.calledWithExactly(this.oLogSpy, sinon.match("Class \"sap.ui.not.defined.Model\" for model \"missing-model-class\" could not be loaded."), "[\"sap.ui5\"][\"models\"][\"missing-model-class\"]", this.oComponent.getMetadata().getComponentName());
-			sinon.assert.calledWithExactly(this.oLogSpy, "Component Manifest: Class \"sap.ui.test.v2models.parent.ModelNotDefined\" for model \"model-not-found\" could not be found", "[\"sap.ui5\"][\"models\"][\"model-not-found\"]", this.oComponent.getMetadata().getComponentName());
-			sinon.assert.calledWithExactly(this.oLogSpy, "Component Manifest: ODataAnnotation \"undefined\" for dataSource \"odata-invalid-annotations\" could not be found in manifest", "[\"sap.app\"][\"dataSources\"][\"undefined\"]", this.oComponent.getMetadata().getComponentName());
-			sinon.assert.calledWithExactly(this.oLogSpy, "Component Manifest: Missing \"uri\" for ODataAnnotation \"annotation-without-uri\"", "[\"sap.app\"][\"dataSources\"][\"annotation-without-uri\"]", this.oComponent.getMetadata().getComponentName());
-			sinon.assert.calledWithExactly(this.oLogSpy, "Component Manifest: dataSource \"json\" was expected to have type \"ODataAnnotation\" but was \"JSON\"", "[\"sap.app\"][\"dataSources\"][\"json\"]", this.oComponent.getMetadata().getComponentName());
-			sinon.assert.calledWithExactly(this.oLogSpy, "Component Manifest: dataSource \"invalid\" for model \"dataSource-invalid\" not found or invalid", "[\"sap.app\"][\"dataSources\"][\"invalid\"]", this.oComponent.getMetadata().getComponentName());
-			sinon.assert.calledWithExactly(this.oLogSpy, "Component Manifest: dataSource \"does-not-exist\" for model \"dataSource-not-found\" not found or invalid", "[\"sap.app\"][\"dataSources\"][\"does-not-exist\"]", this.oComponent.getMetadata().getComponentName());
-			sinon.assert.calledWithExactly(this.oLogSpy, "Component Manifest: Provided OData version \"3.0\" in dataSource \"unknown-odataVersion\" for model \"v2-ODataModel-unknown-odataVersion\" is unknown. Falling back to default model type \"sap.ui.model.odata.v2.ODataModel\".", "[\"sap.app\"][\"dataSources\"][\"unknown-odataVersion\"]", this.oComponent.getMetadata().getComponentName());
+			sinon.assert.calledWithExactly(this.oLogSpy, sinon.match(/Component Manifest: Missing \"type\" for model \"no-model-type\"/), "[\"sap.ui5\"][\"models\"][\"no-model-type\"]", this.oComponent.getMetadata().getComponentName());
+			sinon.assert.calledWithExactly(this.oLogSpy, sinon.match(/Class \"sap.ui.not.defined.Model\" for model \"missing-model-class\" could not be loaded./), "[\"sap.ui5\"][\"models\"][\"missing-model-class\"]", this.oComponent.getMetadata().getComponentName());
+			sinon.assert.calledWithExactly(this.oLogSpy, sinon.match(/Component Manifest: Class \"sap.ui.test.v2models.parent.ModelNotDefined\" for model \"model-not-found\" could not be found/), "[\"sap.ui5\"][\"models\"][\"model-not-found\"]", this.oComponent.getMetadata().getComponentName());
+			sinon.assert.calledWithExactly(this.oLogSpy, sinon.match(/Component Manifest: ODataAnnotation \"undefined\" for dataSource \"odata-invalid-annotations\" could not be found in manifest/), "[\"sap.app\"][\"dataSources\"][\"undefined\"]", this.oComponent.getMetadata().getComponentName());
+			sinon.assert.calledWithExactly(this.oLogSpy, sinon.match(/Component Manifest: Missing \"uri\" for ODataAnnotation \"annotation-without-uri\"/), "[\"sap.app\"][\"dataSources\"][\"annotation-without-uri\"]", this.oComponent.getMetadata().getComponentName());
+			sinon.assert.calledWithExactly(this.oLogSpy, sinon.match(/Component Manifest: dataSource \"json\" was expected to have type \"ODataAnnotation\" but was \"JSON\"/), "[\"sap.app\"][\"dataSources\"][\"json\"]", this.oComponent.getMetadata().getComponentName());
+			sinon.assert.calledWithExactly(this.oLogSpy, sinon.match(/Component Manifest: dataSource \"invalid\" for model \"dataSource-invalid\" not found or invalid/), "[\"sap.app\"][\"dataSources\"][\"invalid\"]", this.oComponent.getMetadata().getComponentName());
+			sinon.assert.calledWithExactly(this.oLogSpy, sinon.match(/Component Manifest: dataSource \"does-not-exist\" for model \"dataSource-not-found\" not found or invalid/), "[\"sap.app\"][\"dataSources\"][\"does-not-exist\"]", this.oComponent.getMetadata().getComponentName());
+			sinon.assert.calledWithExactly(this.oLogSpy, sinon.match(/Component Manifest: Provided OData version \"3.0\" in dataSource \"unknown-odataVersion\" for model \"v2-ODataModel-unknown-odataVersion\" is unknown. Falling back to default model type \"sap.ui.model.odata.v2.ODataModel\"./), "[\"sap.app\"][\"dataSources\"][\"unknown-odataVersion\"]", this.oComponent.getMetadata().getComponentName());
 
 
 			// check if models are set on component (and save them internally)
@@ -928,17 +928,16 @@ sap.ui.define([
 				uri: 'foo'
 			});
 
-
 			// Log.error
-			sinon.assert.calledWithExactly(this.oLogSpy, "Component Manifest: Missing \"type\" for model \"no-model-type\"", "[\"sap.ui5\"][\"models\"][\"no-model-type\"]", this.oComponent.getMetadata().getComponentName());
-			sinon.assert.calledWithExactly(this.oLogSpy, sinon.match("Class \"sap.ui.not.defined.Model\" for model \"missing-model-class\" could not be loaded."), "[\"sap.ui5\"][\"models\"][\"missing-model-class\"]", this.oComponent.getMetadata().getComponentName());
-			sinon.assert.calledWithExactly(this.oLogSpy, "Component Manifest: Class \"sap.ui.test.v2models.parent.ModelNotDefined\" for model \"model-not-found\" could not be found", "[\"sap.ui5\"][\"models\"][\"model-not-found\"]", this.oComponent.getMetadata().getComponentName());
-			sinon.assert.calledWithExactly(this.oLogSpy, "Component Manifest: ODataAnnotation \"undefined\" for dataSource \"odata-invalid-annotations\" could not be found in manifest", "[\"sap.app\"][\"dataSources\"][\"undefined\"]", this.oComponent.getMetadata().getComponentName());
-			sinon.assert.calledWithExactly(this.oLogSpy, "Component Manifest: Missing \"uri\" for ODataAnnotation \"annotation-without-uri\"", "[\"sap.app\"][\"dataSources\"][\"annotation-without-uri\"]", this.oComponent.getMetadata().getComponentName());
-			sinon.assert.calledWithExactly(this.oLogSpy, "Component Manifest: dataSource \"json\" was expected to have type \"ODataAnnotation\" but was \"JSON\"", "[\"sap.app\"][\"dataSources\"][\"json\"]", this.oComponent.getMetadata().getComponentName());
-			sinon.assert.calledWithExactly(this.oLogSpy, "Component Manifest: dataSource \"invalid\" for model \"dataSource-invalid\" not found or invalid", "[\"sap.app\"][\"dataSources\"][\"invalid\"]", this.oComponent.getMetadata().getComponentName());
-			sinon.assert.calledWithExactly(this.oLogSpy, "Component Manifest: dataSource \"does-not-exist\" for model \"dataSource-not-found\" not found or invalid", "[\"sap.app\"][\"dataSources\"][\"does-not-exist\"]", this.oComponent.getMetadata().getComponentName());
-			sinon.assert.calledWithExactly(this.oLogSpy, "Component Manifest: Provided OData version \"3.0\" in dataSource \"unknown-odataVersion\" for model \"v2-ODataModel-unknown-odataVersion\" is unknown. Falling back to default model type \"sap.ui.model.odata.v2.ODataModel\".", "[\"sap.app\"][\"dataSources\"][\"unknown-odataVersion\"]", this.oComponent.getMetadata().getComponentName());
+			sinon.assert.calledWithExactly(this.oLogSpy, sinon.match(/Component Manifest: Missing \"type\" for model \"no-model-type\"/), "[\"sap.ui5\"][\"models\"][\"no-model-type\"]", this.oComponent.getMetadata().getComponentName());
+			sinon.assert.calledWithExactly(this.oLogSpy, sinon.match(/Class \"sap.ui.not.defined.Model\" for model \"missing-model-class\" could not be loaded./), "[\"sap.ui5\"][\"models\"][\"missing-model-class\"]", this.oComponent.getMetadata().getComponentName());
+			sinon.assert.calledWithExactly(this.oLogSpy, sinon.match(/Component Manifest: Class \"sap.ui.test.v2models.parent.ModelNotDefined\" for model \"model-not-found\" could not be found/), "[\"sap.ui5\"][\"models\"][\"model-not-found\"]", this.oComponent.getMetadata().getComponentName());
+			sinon.assert.calledWithExactly(this.oLogSpy, sinon.match(/Component Manifest: ODataAnnotation \"undefined\" for dataSource \"odata-invalid-annotations\" could not be found in manifest/), "[\"sap.app\"][\"dataSources\"][\"undefined\"]", this.oComponent.getMetadata().getComponentName());
+			sinon.assert.calledWithExactly(this.oLogSpy, sinon.match(/Component Manifest: Missing \"uri\" for ODataAnnotation \"annotation-without-uri\"/), "[\"sap.app\"][\"dataSources\"][\"annotation-without-uri\"]", this.oComponent.getMetadata().getComponentName());
+			sinon.assert.calledWithExactly(this.oLogSpy, sinon.match(/Component Manifest: dataSource \"json\" was expected to have type \"ODataAnnotation\" but was \"JSON\"/), "[\"sap.app\"][\"dataSources\"][\"json\"]", this.oComponent.getMetadata().getComponentName());
+			sinon.assert.calledWithExactly(this.oLogSpy, sinon.match(/Component Manifest: dataSource \"invalid\" for model \"dataSource-invalid\" not found or invalid/), "[\"sap.app\"][\"dataSources\"][\"invalid\"]", this.oComponent.getMetadata().getComponentName());
+			sinon.assert.calledWithExactly(this.oLogSpy, sinon.match(/Component Manifest: dataSource \"does-not-exist\" for model \"dataSource-not-found\" not found or invalid/), "[\"sap.app\"][\"dataSources\"][\"does-not-exist\"]", this.oComponent.getMetadata().getComponentName());
+			sinon.assert.calledWithExactly(this.oLogSpy, sinon.match(/Component Manifest: Provided OData version \"3.0\" in dataSource \"unknown-odataVersion\" for model \"v2-ODataModel-unknown-odataVersion\" is unknown. Falling back to default model type \"sap.ui.model.odata.v2.ODataModel\"./), "[\"sap.app\"][\"dataSources\"][\"unknown-odataVersion\"]", this.oComponent.getMetadata().getComponentName());
 
 
 			// check if models are set on component (and save them internally)
@@ -1445,15 +1444,15 @@ sap.ui.define([
 
 
 			// Log.error
-			sinon.assert.calledWithExactly(this.oLogSpy, "Component Manifest: Missing \"type\" for model \"no-model-type\"", "[\"sap.ui5\"][\"models\"][\"no-model-type\"]", this.oComponent.getMetadata().getComponentName());
-			sinon.assert.calledWithExactly(this.oLogSpy, sinon.match("Class \"sap.ui.not.defined.Model\" for model \"missing-model-class\" could not be loaded."), "[\"sap.ui5\"][\"models\"][\"missing-model-class\"]", this.oComponent.getMetadata().getComponentName());
-			sinon.assert.calledWithExactly(this.oLogSpy, "Component Manifest: Class \"sap.ui.test.v2models.parent.ModelNotDefined\" for model \"model-not-found\" could not be found", "[\"sap.ui5\"][\"models\"][\"model-not-found\"]", this.oComponent.getMetadata().getComponentName());
-			sinon.assert.calledWithExactly(this.oLogSpy, "Component Manifest: ODataAnnotation \"undefined\" for dataSource \"odata-invalid-annotations\" could not be found in manifest", "[\"sap.app\"][\"dataSources\"][\"undefined\"]", this.oComponent.getMetadata().getComponentName());
-			sinon.assert.calledWithExactly(this.oLogSpy, "Component Manifest: Missing \"uri\" for ODataAnnotation \"annotation-without-uri\"", "[\"sap.app\"][\"dataSources\"][\"annotation-without-uri\"]", this.oComponent.getMetadata().getComponentName());
-			sinon.assert.calledWithExactly(this.oLogSpy, "Component Manifest: dataSource \"json\" was expected to have type \"ODataAnnotation\" but was \"JSON\"", "[\"sap.app\"][\"dataSources\"][\"json\"]", this.oComponent.getMetadata().getComponentName());
-			sinon.assert.calledWithExactly(this.oLogSpy, "Component Manifest: dataSource \"invalid\" for model \"dataSource-invalid\" not found or invalid", "[\"sap.app\"][\"dataSources\"][\"invalid\"]", this.oComponent.getMetadata().getComponentName());
-			sinon.assert.calledWithExactly(this.oLogSpy, "Component Manifest: dataSource \"does-not-exist\" for model \"dataSource-not-found\" not found or invalid", "[\"sap.app\"][\"dataSources\"][\"does-not-exist\"]", this.oComponent.getMetadata().getComponentName());
-			sinon.assert.calledWithExactly(this.oLogSpy, "Component Manifest: Provided OData version \"3.0\" in dataSource \"unknown-odataVersion\" for model \"v2-ODataModel-unknown-odataVersion\" is unknown. Falling back to default model type \"sap.ui.model.odata.v2.ODataModel\".", "[\"sap.app\"][\"dataSources\"][\"unknown-odataVersion\"]", this.oComponent.getMetadata().getComponentName());
+			sinon.assert.calledWithExactly(this.oLogSpy, sinon.match(/Component Manifest: Missing \"type\" for model \"no-model-type\"/), "[\"sap.ui5\"][\"models\"][\"no-model-type\"]", this.oComponent.getMetadata().getComponentName());
+			sinon.assert.calledWithExactly(this.oLogSpy, sinon.match(/Class \"sap.ui.not.defined.Model\" for model \"missing-model-class\" could not be loaded./), "[\"sap.ui5\"][\"models\"][\"missing-model-class\"]", this.oComponent.getMetadata().getComponentName());
+			sinon.assert.calledWithExactly(this.oLogSpy, sinon.match(/Component Manifest: Class \"sap.ui.test.v2models.parent.ModelNotDefined\" for model \"model-not-found\" could not be found/), "[\"sap.ui5\"][\"models\"][\"model-not-found\"]", this.oComponent.getMetadata().getComponentName());
+			sinon.assert.calledWithExactly(this.oLogSpy, sinon.match(/Component Manifest: ODataAnnotation \"undefined\" for dataSource \"odata-invalid-annotations\" could not be found in manifest/), "[\"sap.app\"][\"dataSources\"][\"undefined\"]", this.oComponent.getMetadata().getComponentName());
+			sinon.assert.calledWithExactly(this.oLogSpy, sinon.match(/Component Manifest: Missing \"uri\" for ODataAnnotation \"annotation-without-uri\"/), "[\"sap.app\"][\"dataSources\"][\"annotation-without-uri\"]", this.oComponent.getMetadata().getComponentName());
+			sinon.assert.calledWithExactly(this.oLogSpy, sinon.match(/Component Manifest: dataSource \"json\" was expected to have type \"ODataAnnotation\" but was \"JSON\"/), "[\"sap.app\"][\"dataSources\"][\"json\"]", this.oComponent.getMetadata().getComponentName());
+			sinon.assert.calledWithExactly(this.oLogSpy, sinon.match(/Component Manifest: dataSource \"invalid\" for model \"dataSource-invalid\" not found or invalid/), "[\"sap.app\"][\"dataSources\"][\"invalid\"]", this.oComponent.getMetadata().getComponentName());
+			sinon.assert.calledWithExactly(this.oLogSpy, sinon.match(/Component Manifest: dataSource \"does-not-exist\" for model \"dataSource-not-found\" not found or invalid/), "[\"sap.app\"][\"dataSources\"][\"does-not-exist\"]", this.oComponent.getMetadata().getComponentName());
+			sinon.assert.calledWithExactly(this.oLogSpy, sinon.match(/Component Manifest: Provided OData version \"3.0\" in dataSource \"unknown-odataVersion\" for model \"v2-ODataModel-unknown-odataVersion\" is unknown. Falling back to default model type \"sap.ui.model.odata.v2.ODataModel\"./), "[\"sap.app\"][\"dataSources\"][\"unknown-odataVersion\"]", this.oComponent.getMetadata().getComponentName());
 
 
 			// check if models are set on component (and save them internally)
@@ -1717,7 +1716,7 @@ sap.ui.define([
 
 			// check error log for "class-not-loaded" model
 			sinon.assert.calledWithExactly(this.oLogErrorSpy,
-				sinon.match("Component Manifest: Class \"sap.ui.sample.model.MyModel\" for model \"class-not-loaded\" could not be loaded."),
+				sinon.match(/Component Manifest: Class \"sap.ui.sample.model.MyModel\" for model \"class-not-loaded\" could not be loaded./),
 				"[\"sap.ui5\"][\"models\"][\"class-not-loaded\"]",
 				this.oComponent.getMetadata().getComponentName());
 
@@ -1837,7 +1836,7 @@ sap.ui.define([
 
 			// check error log for "class-not-loaded" model
 			sinon.assert.calledWithExactly(this.oLogErrorSpy,
-				sinon.match("Component Manifest: Class \"sap.ui.sample.model.MyModel\" for model \"class-not-loaded\" could not be loaded."),
+				sinon.match(/Component Manifest: Class \"sap.ui.sample.model.MyModel\" for model \"class-not-loaded\" could not be loaded./),
 				"[\"sap.ui5\"][\"models\"][\"class-not-loaded\"]",
 				this.oComponent.getMetadata().getComponentName());
 

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

@@ -1049,8 +1049,8 @@ sap.ui.define([
 					manifest: "json"
 				},
 				constructor: function() {
-					assert.ok(logWarningSpy.calledWith("Cannot load module 'sap/ui/model/odata/ODataModelNotExists'. This will most probably cause an error once the module is used later on."), "Model not found");
-					assert.ok(logWarningSpy.calledWith("Cannot load module 'someRouterNotExists'. This will most probably cause an error once the module is used later on."), "Router not found");
+					assert.ok(logWarningSpy.calledWith(sinon.match(/Cannot load module 'sap\/ui\/model\/odata\/ODataModelNotExists'. This will most probably cause an error once the module is used later on./)), "Model not found");
+					assert.ok(logWarningSpy.calledWith(sinon.match(/Cannot load module 'someRouterNotExists'. This will most probably cause an error once the module is used later on./)), "Router not found");
 					UIComponent.apply(this, arguments);
 				}
 			});
@@ -1366,7 +1366,7 @@ sap.ui.define([
 			manifest: true
 		}).then(function(oComponent){
 			assert.equal(oErrorLogSpy.callCount, 1, "error logged");
-			assert.equal(oErrorLogSpy.args[0][0], "Mandatory init() not called for UIComponent: 'manifestModules.scenario11'. This is likely caused by a missing super call in the component's init implementation.", "missing init super error logged");
+			assert.ok(oErrorLogSpy.calledWith(sinon.match(/Mandatory init\(\) not called for UIComponent: 'manifestModules.scenario11'. This is likely caused by a missing super call in the component's init implementation./)), "missing init super error logged");
 		}).catch(function() {
 			assert.ok(false, "Modules could not be loaded and an error occured.");
 		});

package/test/sap/ui/core/qunit/generic/ControlMemoryLeaks.qunit.js

@@ -7,8 +7,9 @@ sap.ui.define([
 	"sap/ui/test/generic/TestBase",
 	"sap/ui/test/generic/Utils",
 	"sap/ui/core/Element",
+	"sap/ui/core/ElementRegistry",
 	"sap/ui/qunit/utils/nextUIUpdate"
-], function(TestBase, Utils, Element, nextUIUpdate) {
+], function(TestBase, Utils, Element, ElementRegistry, nextUIUpdate) {
 	"use strict";
 
 	 // asserts that both given maps have the same entries
@@ -110,13 +111,13 @@ sap.ui.define([
 						await nextUIUpdate();
 
 						if (bFinalIteration) {
-							var mPostElements = Element.registry.all();
+							var mPostElements = ElementRegistry.all();
 
 							// controls left over by second instance are real leaks that will grow proportionally to instance count => ERROR
 							assert.equalElementsInControlList(mPostElements, mPreElements, "Memory leak check in " + sControlName);
 						} else {
 							// Render Control Instance 2 - any new controls leaked?
-							mPreElements = Element.registry.all();
+							mPreElements = ElementRegistry.all();
 						}
 					}.bind(this);
 

package/test/sap/ui/core/qunit/generic/legacy/ControlMemoryLeaks.qunit.js

@@ -15,12 +15,12 @@ sap.ui.define([
 	"sap/base/Log",
 	"sap/base/util/ObjectPath",
 	"sap/ui/VersionInfo",
-	"sap/ui/core/Element",
+	"sap/ui/core/ElementRegistry",
 	"sap/ui/core/Lib",
 	"sap/ui/dom/includeStylesheet",
 	"sap/ui/qunit/utils/nextUIUpdate",
 	"require"
-], function (Log, ObjectPath, VersionInfo, Element, Library, includeStylesheet, nextUIUpdate, require) {
+], function (Log, ObjectPath, VersionInfo, ElementRegistry, Library, includeStylesheet, nextUIUpdate, require) {
 	"use strict";
 
 	/*global QUnit */
@@ -301,8 +301,7 @@ sap.ui.define([
 	async function checkControl(oControlClass, assert) {
 		var sControlName = oControlClass.getMetadata().getName();
 
-		var //mPrePreElements = Element.registry.all(),
-			oControl1 = new oControlClass(),
+		var oControl1 = new oControlClass(),
 			bCanRender = false;
 
 		// check whether this control can be rendered
@@ -334,7 +333,7 @@ sap.ui.define([
 
 		// Render Control Instance 2 - any new controls leaked?
 
-		var mPreElements = Element.registry.all(),
+		var mPreElements = ElementRegistry.all(),
 			oControl2 = new oControlClass();
 
 		fillControlProperties(oControl2);
@@ -357,7 +356,7 @@ sap.ui.define([
 
 		oControl2.destroy();
 		await nextUIUpdate();
-		var mPostElements = Element.registry.all();
+		var mPostElements = ElementRegistry.all();
 
 		// controls left over by second instance are real leaks that will grow proportionally to instance count => ERROR
 		assert.equalElementsInControlList(mPostElements, mPreElements, "Memory leak check in " + sControlName);
@@ -372,7 +371,7 @@ sap.ui.define([
 
 	QUnit.module("Memory.Controls", {
 		afterEach: function() {
-			Element.registry.forEach(function(oElement, sId) {
+			ElementRegistry.forEach(function(oElement, sId) {
 				oElement.destroy();
 			});
 		}

package/test/sap/ui/core/qunit/generic/legacy/DuplicateIdCheck.qunit.js

@@ -11,6 +11,7 @@ sap.ui.define([
 	"sap/ui/VersionInfo",
 	"sap/ui/base/DataType",
 	"sap/ui/core/Element",
+	"sap/ui/core/ElementRegistry",
 	"sap/ui/core/Control",
 	"sap/ui/core/Item",
 	"sap/ui/core/Lib",
@@ -19,7 +20,7 @@ sap.ui.define([
 	"sap/ui/dom/includeStylesheet",
 	"sap/ui/qunit/utils/nextUIUpdate",
 	"require"
-], function (Log, ObjectPath, VersionInfo, DataType, Element, Control, Item, Library, CommonsTextField, MobileText, includeStylesheet, nextUIUpdate, require) {
+], function (Log, ObjectPath, VersionInfo, DataType, Element, ElementRegistry, Control, Item, Library, CommonsTextField, MobileText, includeStylesheet, nextUIUpdate, require) {
 	"use strict";
 
 	var aKnownLibraries = [
@@ -440,7 +441,7 @@ sap.ui.define([
 
 	QUnit.module("Duplicate ID issues in Controls", {
 		afterEach: function() {
-			Element.registry.forEach(function(oElement, sId) {
+			ElementRegistry.forEach(function(oElement, sId) {
 				oElement.destroy();
 			});
 		}

package/test/sap/ui/core/qunit/generic/legacy/testsuite.generic.qunit.js

@@ -29,6 +29,9 @@ sap.ui.define(function() {
 			ControlMemoryLeaks: {
 				title: "QUnit Page for memory leak detection in UI5 controls"
 			},
+			/**
+			 * @deprecated As of version 1.120
+			 */
 			ControlRenderer: {
 				title: "QUnit Page for memory leak detection in UI5 controls"
 			},

package/test/sap/ui/core/qunit/i18n/Islamic.qunit.js

@@ -1,10 +1,10 @@
 /*global QUnit, sinon */
 sap.ui.define([
 	"sap/base/Log",
-	"sap/ui/core/Configuration",
+	"sap/base/i18n/Formatting",
 	"sap/ui/core/date/Islamic",
 	"sap/ui/core/date/UI5Date"
-], function(Log, Configuration, Islamic, UI5Date) {
+], function(Log, Formatting, Islamic, UI5Date) {
 	"use strict";
 	/* eslint-disable camelcase */
 
@@ -172,8 +172,8 @@ sap.ui.define([
 			this.oLogMock.expects("error").never();
 			this.oLogMock.expects("warning").never();
 			// set to "1" and it will fall-back to "A"
-			this.stub(Configuration.getFormatSettings(), "getLegacyDateFormat").returns("1");
-			this.stub(Configuration.getFormatSettings(), "getLegacyDateCalendarCustomizing")
+			this.stub(Formatting, "getABAPDateFormat").returns("1");
+			this.stub(Formatting, "getCustomIslamicCalendarData")
 				.returns(customizingInfo);
 		}
 	});