@openui5/sap.ui.core 1.118.0 → 1.119.0

package/test/sap/ui/core/qunit/internal/testsuite.models.qunit.js

@@ -129,10 +129,11 @@ sap.ui.define(function() {
 				title : "sap.ui.model.* (ListBinding)",
 				module : ["test-resources/sap/ui/core/qunit/ListBinding.qunit"]
 			},
+			/** @deprecated As of version 1.11.1 reason bindContext*/
 			MasterDetail : {
 				// not in 1RingModels.qunit because test has to be refactored
-				title : "sap.ui.model.* (MasterDetail)",
-				module : ["test-resources/sap/ui/core/qunit/MasterDetail.qunit"]
+				title : "sap.ui.model.* (MasterDetail_legacyAPIs)",
+				module : ["test-resources/sap/ui/core/qunit/MasterDetail_legacyAPIs.qunit"]
 			},
 
 			// *************************************************************************
@@ -215,10 +216,11 @@ sap.ui.define(function() {
 					language : "en-US"
 				}
 			},
+			/** @deprecated As of version 1.66.0 */
 			ODataListBinding : {
 				// not in 1RingModels.qunit because of ODataModelFakeService usage
 				title : "sap.ui.model.odata.ODataListBinding",
-				module : ["test-resources/sap/ui/core/qunit/odata/ODataListBinding.qunit"]
+				module : ["test-resources/sap/ui/core/qunit/odata/ODataListBinding_legacyAPIs.qunit"]
 			},
 			ODataMetadata : {
 				// not in 1RingModels.qunit because of MockServer usage
@@ -229,23 +231,26 @@ sap.ui.define(function() {
 				},
 				sinon : 1
 			},
+			/** @deprecated As of version 1.48.0 */
 			ODataModel : {
 				// not in 1RingModels.qunit because of ODataModelFakeService usage
-				title : "sap.ui.model.odata.ODataModel",
-				module : ["test-resources/sap/ui/core/qunit/odata/ODataModel.qunit"]
+				title : "sap.ui.model.odata.ODataModel (ODataModel_legacyAPIs)",
+				module : ["test-resources/sap/ui/core/qunit/odata/ODataModel_legacyAPIs.qunit"]
 			},
+			/** @deprecated As of version 1.48.0 reason sap.ui.model.odata.ODataModel */
 			ODataSharedMetadata : {
 				// not in 1RingModels.qunit because of ODataModelFakeService usage
-				title : "sap.ui.model.odata.ODataModel (ODataSharedMetadata)",
-				module : ["test-resources/sap/ui/core/qunit/odata/ODataSharedMetadata.qunit"],
+				title : "sap.ui.model.odata.ODataModel (ODataSharedMetadata_legacyAPIs)",
+				module : ["test-resources/sap/ui/core/qunit/odata/ODataSharedMetadata_legacyAPIs.qunit"],
 				sinon : {
 					useFakeTimers : true
 				}
 			},
+			/** @deprecated As of version 1.28.0 */
 			ODataTreeBinding : {
 				// not in 1RingModels.qunit because of MockServer usage
-				title : "sap.ui.model.odata.ODataTreeBinding",
-				module : ["test-resources/sap/ui/core/qunit/odata/ODataTreeBinding.qunit"],
+				title : "sap.ui.model.odata.ODataTreeBinding (ODataTreeBinding_legacyAPIs)",
+				module : ["test-resources/sap/ui/core/qunit/odata/ODataTreeBinding_legacyAPIs.qunit"],
 				sinon : 1
 			},
 			ODataTreeBindingAdapter : {
@@ -278,6 +283,11 @@ sap.ui.define(function() {
 				title : "sap.ui.model.odata.v2.ODataListBinding",
 				module : ["test-resources/sap/ui/core/qunit/odata/v2/ODataV2ListBinding.qunit"]
 			},
+			/** @deprecated As of version 1.22.0, reason sap.ui.model.odata.Filter */
+			ODataV2ListBinding_Filter_legacyAPIs: {
+				title: "sap.ui.model.odata.v2.ODataListBinding_Filter - QUnit tests",
+				module : ["test-resources/sap/ui/core/qunit/odata/v2/ODataV2ListBinding_Filter_legacyAPIs.qunit"]
+			},
 			ODataV2ListBinding_Paging : {
 				// not in 1RingModels.qunit because of ODataModelFakeService usage
 				title : "sap.ui.model.odata.v2.ODataListBinding - Paging",

package/test/sap/ui/core/qunit/jquery.sap.global-config.qunit.js

@@ -1,13 +1,11 @@
 /* global QUnit */
-sap.ui.define(["sap/ui/core/Configuration"], function(Configuration) {
+sap.ui.define(["sap/ui/core/Theming"], function(Theming) {
 	"use strict";
 	QUnit.module("Basic");
 
 	QUnit.test("ExternalConfig", function(assert) {
 
-		var oConfig = Configuration;
-
-		assert.equal(oConfig.getTheme(), "sap_bluecrystal", "Theme must be sap_blucrystal");
+		assert.equal(Theming.getTheme(), "sap_bluecrystal", "Theme must be sap_blucrystal");
 		assert.ok(sap.ui.commons !== undefined, "sap.ui.commons must be preloaded");
 		assert.ok(sap.m === undefined, "sap.m must not be preloaded");
 

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

@@ -2,9 +2,10 @@
 sap.ui.define([
 	"jquery.sap.ui",
 	"sap/ui/core/Control",
+	"sap/ui/core/Element",
 	"sap/ui/core/UIArea",
 	"sap/ui/qunit/utils/nextUIUpdate"
-], function(jQuery, Control, UIArea, nextUIUpdate) {
+], function(jQuery, Control, Element, UIArea, nextUIUpdate) {
 	"use strict";
 
 	var TestControl = Control.extend("sap.jsunittest.Test", {
@@ -75,7 +76,7 @@ sap.ui.define([
 		jQuery("#uiAreaTarget").root(new TestControl("testControl"));
 		await nextUIUpdate();
 		assert.notStrictEqual(jQuery("#testControl").length, 0, "There should be something rendered");
-		assert.ok(sap.ui.getCore().byId("testControl") !== null, "Control should be available");
+		assert.ok(Element.getElementById("testControl") !== null, "Control should be available");
 		assert.ok(jQuery("#testControl").control()[0] !== null, "Control should be available");
 	});
 
@@ -96,7 +97,7 @@ sap.ui.define([
 		jQuery("#uiAreaTarget2").root(new TestControl("testControl2"));
 		await nextUIUpdate();
 
-		var oCheckCtrl = sap.ui.getCore().byId("testControl2");
+		var oCheckCtrl = Element.getElementById("testControl2");
 		var oCtrl = jQuery("#testControl2").control()[0];
 
 		assert.ok(oCheckCtrl === oCtrl, "Created control should be returned");
@@ -106,7 +107,7 @@ sap.ui.define([
 		jQuery("#uiAreaTarget3").root(new TestControl("testControl3"));
 		await nextUIUpdate();
 
-		var oCheckCtrl = sap.ui.getCore().byId("testControl3");
+		var oCheckCtrl = Element.getElementById("testControl3");
 		var oCtrl = jQuery("#testControl3 > .inner").control()[0];
 
 		assert.ok(oCheckCtrl === oCtrl, "Created control should be returned when queried for inner node");

package/test/sap/ui/core/qunit/json/JSONModel.qunit.js

@@ -276,7 +276,7 @@ sap.ui.define([
 		oModel.setProperty("1/firstName", "Petri", oLabel.getBindingContext());
 		assert.equal(oLabel.getText(), "Petri", "new text value from model");
 	});
-
+	/** @deprecated As of version 1.88.0, reason Model.prototype.setLegacySyntax */
 	QUnit.test("test model setProperty onlabel with bindingContext and relative path (legacySyntax = true)", function(assert) {
 		oModel.setLegacySyntax(true);
 		var oContext = oModel.createBindingContext("/teamMembers");
@@ -288,9 +288,7 @@ sap.ui.define([
 		assert.equal(oLabel.getText(), "Petro", "new text value from model");
 		oModel.setLegacySyntax(false);
 	});
-	/**
-	 * @deprecated As of version 1.88.0
-	 */
+	/** @deprecated As of version 1.88.0, reason Model.prototype.setLegacySyntax */
 	QUnit.test("test model setProperty onlabel without bindingContext and relative path (legacySyntax = true)", function(assert) {
 		oModel.setLegacySyntax(true);
 		oLabel.setBindingContext(undefined);
@@ -301,7 +299,7 @@ sap.ui.define([
 		assert.equal(oLabel.getText(), "Petre", "new text value from model");
 		oModel.setLegacySyntax(false);
 	});
-
+	/** @deprecated As of version 1.88.0, reason Model.prototype.setLegacySyntax */
 	QUnit.test("test model setProperty onlabel with bindingContext and absolute path (legacySyntax = true)", function(assert) {
 		oModel.setLegacySyntax(true);
 		var oContext = oModel.createBindingContext("/teamMembers/HorstDerGrosse");
@@ -867,9 +865,7 @@ sap.ui.define([
 		oModel.setJSON(sJSON,false);
 		assert.equal(oModel.getData().name, "John", "get Data test");
 	});
-	/**
-	 * @deprecated As of version 1.88.0
-	 */
+	/** @deprecated As of version 1.88.0, reason Model.prototype.setLegacySyntax */
 	QUnit.test("test JSON compatible syntax", function(assert) {
 		var oModel = new JSONModel(aTestData);
 		oModel.setLegacySyntax(true);
@@ -882,7 +878,7 @@ sap.ui.define([
 		value = oModel.getProperty("lastName", oContext);
 		assert.equal(value, "Wallace", "model value");
 	});
-
+	/** @deprecated As of version 1.88.0, reason Model.prototype.setLegacySyntax */
 	QUnit.test("test JSON compatible syntax fail", function(assert) {
 		var oModel = new JSONModel(aTestData);
 		oModel.setLegacySyntax(false);

package/test/sap/ui/core/qunit/messages/Messaging.qunit.js

@@ -2,19 +2,24 @@
  * ${copyright}
  */
 sap.ui.define([
-	"sap/ui/core/Configuration",
+	"sap/ui/base/config/URLConfigurationProvider",
 	"sap/ui/core/message/Message",
 	"sap/ui/core/Messaging",
 	"sap/ui/model/message/MessageModel"
-], function(Configuration, Message, Messaging, MessageModel) {
-	/*global QUnit */
+], function(URLConfigurationProvider, Message, Messaging, MessageModel) {
+	/*global QUnit sinon */
 	"use strict";
 
+	var oURLConfigurationProviderStub;
 	QUnit.module("sap/ui/core/message/MessageManager", {
 		beforeEach : function () {
 			// avoid attaching to validation events on UI5 core
-			this.stub(Configuration, "getHandleValidation").returns(false);
-		}
+			oURLConfigurationProviderStub = sinon.stub(URLConfigurationProvider, "get");
+			oURLConfigurationProviderStub.callsFake(function(sKey) {
+				return sKey === "sapUiXxHandleValidation" ? false : oURLConfigurationProviderStub.wrappedMethod.call(this, sKey);
+			});
+		},
+		afterEach: () => oURLConfigurationProviderStub.restore()
 	});
 
 	var oProcessor = {getId : function () { return "id"; }, setMessages: function() {}},

package/test/sap/ui/core/qunit/messages/messagesGeneral.qunit.js

@@ -243,6 +243,7 @@ sap.ui.define([
 
 	QUnit.test("parseError", function(assert) {
 		var done = assert.async();
+		Messaging.registerObject(oZip, true);
 		TestUtils.withNormalizedMessages(function() {
 			spyDataState(oZip, function(sName, oDataState) {
 				assert.ok(oDataState.getMessages().length == 1, 'ParseError Message propagated to control');
@@ -256,6 +257,7 @@ sap.ui.define([
 				assert.ok(oDataState.getMessages().length == 0, 'Validation Message deleted');
 				assert.ok(oZip.getValueState() === ValueState.None, 'Input: ValueState set correctly');
 				assert.ok(oZip.getValueStateText() === '', 'Input: ValueStateText set correctly');
+				Messaging.unregisterObject(oZip);
 				done();
 			});
 			oZip.setValue('123');
@@ -264,6 +266,7 @@ sap.ui.define([
 
 	QUnit.test("validationError", function(assert) {
 		var done = assert.async();
+		Messaging.registerObject(oStreet, true);
 		TestUtils.withNormalizedMessages(function() {
 			spyDataState(oStreet, function(sName, oDataState) {
 				assert.ok(oDataState.getMessages().length == 1, 'Validation Message propagated to control');
@@ -277,6 +280,7 @@ sap.ui.define([
 				assert.ok(oDataState.getMessages().length == 0, 'Validation Message deleted');
 				assert.ok(oStreet.getValueState() === ValueState.None, 'Input: ValueState set correctly');
 				assert.ok(oStreet.getValueStateText() === '', 'Input: ValueStateText set correctly');
+				Messaging.unregisterObject(oStreet);
 				done();
 			});
 			oStreet.setValue('Busch');
@@ -285,6 +289,7 @@ sap.ui.define([
 
 	QUnit.test("validationError - multiple input", function(assert) {
 		var done = assert.async();
+		Messaging.registerObject(oStreet, true);
 
 		TestUtils.withNormalizedMessages(function() {
 			spyDataState(oStreet, function(sName, oDataState) {
@@ -314,6 +319,7 @@ sap.ui.define([
 					spyDataState(oStreet, function(sName, oDataState) {
 						assert.ok(oStreet.getValueState() === ValueState.None, 'Input: ValueState set correctly');
 						assert.ok(oStreet.getValueStateText() === '', 'Input: ValueStateText set correctly');
+						Messaging.unregisterObject(oStreet);
 						done();
 					});
 					oStreet.setValue('Busch');

package/test/sap/ui/core/qunit/messages/messagesGeneral_legacyAPIs.qunit.js

@@ -0,0 +1,158 @@
+/*global QUnit */
+sap.ui.define([
+	"sap/ui/core/library",
+	"sap/ui/model/json/JSONModel",
+	"sap/ui/model/type/Integer",
+	"sap/ui/model/type/String",
+	"sap/m/Input",
+	'sap/ui/qunit/utils/createAndAppendDiv',
+	"sap/ui/test/TestUtils"
+], function(coreLibrary, JSONModel, TypeInteger, TypeString, Input, createAndAppendDiv, TestUtils) {
+	"use strict";
+
+	// create content div
+	createAndAppendDiv("content");
+
+	// shortcuts for enums from the sap.ui.core namespace
+	var ValueState = coreLibrary.ValueState;
+
+	var oModel;
+	var oString, oInteger, oStreet, oZip;
+
+	function createControls() {
+		oString = new TypeString(null,{maxLength: 5});
+		oInteger = new TypeInteger();
+
+		oZip = new Input({value:{path:'/form/zip', type: oInteger}});
+		oStreet = new Input({value:{path:'/form/street', type: oString}});
+
+		oZip.placeAt("content");
+		oStreet.placeAt("content");
+	}
+
+	function destroyControls() {
+		oZip.destroy();
+		oStreet.destroy();
+	}
+
+	function spyDataState(oControl, fnTest) {
+		if (oControl.refreshDataState) {
+			var fnRefresh = oControl.refreshDataState;
+			oControl.refreshDataState = function(sName, oDataState) {
+				Input.prototype.refreshDataState.apply(oControl, arguments);
+				fnTest(sName, oDataState);
+				oControl.refreshDataState = fnRefresh;
+			};
+		}
+	}
+
+	function initModel() {
+		oModel = new JSONModel();
+		var oData = {
+			form: {
+				firstname: "Fritz",
+				lastname: "Heiner",
+				street: "im",
+				nr: 1,
+				zip: "12345"
+			}
+		};
+		oModel.setData(oData);
+		sap.ui.getCore().setModel(oModel);
+		createControls();
+	}
+
+	QUnit.module("Messaging  (global handleValidation)", {
+		beforeEach : function() {
+			initModel();
+		},
+
+		afterEach : function() {
+			destroyControls();
+			oModel.destroy();
+			oModel = undefined;
+		}
+	});
+
+	QUnit.test("parseError", function(assert) {
+		var done = assert.async();
+		TestUtils.withNormalizedMessages(function() {
+			spyDataState(oZip, function(sName, oDataState) {
+				assert.ok(oDataState.getMessages().length == 1, 'ParseError Message propagated to control');
+				assert.ok(oZip.getValueState() === ValueState.Error, 'Input: ValueState set correctly');
+				assert.equal(oZip.getValueStateText(), "EnterInt", 'Input: ValueStateText set correctly');
+			});
+			oZip.setValue('bbb');
+		});
+		setTimeout(function() {
+			spyDataState(oZip, function(sName, oDataState) {
+				assert.ok(oDataState.getMessages().length == 0, 'Validation Message deleted');
+				assert.ok(oZip.getValueState() === ValueState.None, 'Input: ValueState set correctly');
+				assert.ok(oZip.getValueStateText() === '', 'Input: ValueStateText set correctly');
+				done();
+			});
+			oZip.setValue('123');
+		}, this);
+	});
+
+	QUnit.test("validationError", function(assert) {
+		var done = assert.async();
+		TestUtils.withNormalizedMessages(function() {
+			spyDataState(oStreet, function(sName, oDataState) {
+				assert.ok(oDataState.getMessages().length == 1, 'Validation Message propagated to control');
+				assert.ok(oStreet.getValueState() === ValueState.Error, 'Input: ValueState set correctly');
+				assert.equal(oStreet.getValueStateText(), "String.MaxLength 5", 'Input: ValueStateText set correctly');
+			});
+			oStreet.setValue('am Busche');
+		});
+		setTimeout(function() {
+			spyDataState(oStreet, function(sName, oDataState) {
+				assert.ok(oDataState.getMessages().length == 0, 'Validation Message deleted');
+				assert.ok(oStreet.getValueState() === ValueState.None, 'Input: ValueState set correctly');
+				assert.ok(oStreet.getValueStateText() === '', 'Input: ValueStateText set correctly');
+				done();
+			});
+			oStreet.setValue('Busch');
+		}, this);
+	});
+
+	QUnit.test("validationError - multiple input", function(assert) {
+		var done = assert.async();
+
+		TestUtils.withNormalizedMessages(function() {
+			spyDataState(oStreet, function(sName, oDataState) {
+				assert.ok(oStreet.getValueState() === ValueState.Error, 'Input: ValueState set correctly');
+				assert.equal(oStreet.getValueStateText(), "String.MaxLength 5", 'Input: ValueStateText set correctly');
+			});
+			oStreet.setValue('am Busche');
+		});
+
+		setTimeout(function() {
+			spyDataState(oStreet, function(sName, oDataState) {
+				assert.ok(oStreet.getValueState() === ValueState.None, 'Input: ValueState set correctly');
+				assert.ok(oStreet.getValueStateText() === '', 'Input: ValueStateText set correctly');
+			});
+			oStreet.setValue('Busch');
+
+			setTimeout(function() {
+				TestUtils.withNormalizedMessages(function() {
+					spyDataState(oStreet, function(sName, oDataState) {
+						assert.ok(oStreet.getValueState() === ValueState.Error, 'Input: ValueState set correctly');
+						assert.equal(oStreet.getValueStateText(), "String.MaxLength 5", 'Input: ValueStateText set correctly');
+					});
+					oStreet.setValue('am Busche');
+				});
+
+				setTimeout(function() {
+					spyDataState(oStreet, function(sName, oDataState) {
+						assert.ok(oStreet.getValueState() === ValueState.None, 'Input: ValueState set correctly');
+						assert.ok(oStreet.getValueStateText() === '', 'Input: ValueStateText set correctly');
+						done();
+					});
+					oStreet.setValue('Busch');
+				}, 0);
+			}, 0);
+		}, 0);
+	});
+
+});

package/test/sap/ui/core/qunit/messages/messagesUsage.qunit.js

@@ -9,12 +9,13 @@ sap.ui.define([
 	'sap/ui/core/library',
 	'sap/ui/core/Component',
 	'sap/ui/core/ComponentContainer',
+	"sap/ui/core/Element",
 	'sap/ui/model/json/JSONModel',
 	'sap/ui/core/UIComponent',
 	'sap/ui/qunit/utils/createAndAppendDiv',
 	"sap/ui/qunit/utils/nextUIUpdate",
 	"sap/ui/test/TestUtils"
-], function(isPlainObject, Input, Model, Integer, Message, Messaging, library, Component, ComponentContainer, JSONModel, UIComponent, createAndAppendDiv, nextUIUpdate, TestUtils){
+], function(isPlainObject, Input, Model, Integer, Message, Messaging, library, Component, ComponentContainer, Element, JSONModel, UIComponent, createAndAppendDiv, nextUIUpdate, TestUtils){
 	"use strict";
 
 	// create content div
@@ -90,7 +91,7 @@ sap.ui.define([
 	QUnit.test("componentEnabled", function (assert) {
 		var done = assert.async();
 
-		var oCompZip = sap.ui.getCore().byId("zip_enabled");
+		var oCompZip = Element.getElementById("zip_enabled");
 
 		var oCoreValHandler = function (oEvent) {
 			assert.ok(false, "should never be called");
@@ -120,7 +121,7 @@ sap.ui.define([
 
 	QUnit.test("componentDisabled", function(assert) {
 		var oMessageModel = Messaging.getMessageModel();
-		var oCompZip = sap.ui.getCore().byId("zip_disabled");
+		var oCompZip = Element.getElementById("zip_disabled");
 
 		var oValHandler = function(oEvent) {
 			if (oEvent.getParameter("dataState").getMessages() && oEvent.getParameter("dataState").getMessages().length > 0) {
@@ -137,7 +138,7 @@ sap.ui.define([
 	QUnit.test("component handle validation undefined", function(assert) {
 		var oMessageModel = Messaging.getMessageModel();
 
-		var oCompZip = sap.ui.getCore().byId("zip");
+		var oCompZip = Element.getElementById("zip");
 		var oChangeHandler = function(oEvent) {
 			if (oEvent.getParameter("dataState").getMessages() && oEvent.getParameter("dataState").getMessages().length > 0) {
 				assert.ok(false,"should never be called");

package/test/sap/ui/core/qunit/messages/testsuite.messaging.base.qunit.js

@@ -22,6 +22,13 @@ sap.ui.define(function() {
 				title: "Messaging: sap.ui.core.message.MessageMixin"
 			},
 			messagesGeneral: {
+				title: "Messaging: General",
+				ui5: {
+					libs: "sap.m,sap.ui.layout",
+					language: "en"
+				}
+			},
+			messagesGeneral_legacyAPIs: {
 				title: "Messaging: General",
 				ui5: {
 					libs: "sap.m,sap.ui.layout",

package/test/sap/ui/core/qunit/model/ClientPropertyBinding.qunit.js

@@ -0,0 +1,47 @@
+/*!
+ * ${copyright}
+ */
+sap.ui.define([
+	"sap/base/Log",
+	"sap/ui/model/ClientPropertyBinding"
+], function (Log, ClientPropertyBinding) {
+	/*global QUnit*/
+	"use strict";
+
+	//*********************************************************************************************
+	QUnit.module("sap.ui.model.ClientPropertyBinding", {
+		beforeEach() {
+			this.oLogMock = this.mock(Log);
+			this.oLogMock.expects("error").never();
+			this.oLogMock.expects("warning").never();
+		}
+	});
+
+	//**********************************************************************************************
+[
+	{mParameters: undefined, expectedIgnoreMessages: undefined},
+	{mParameters: {}, expectedIgnoreMessages: undefined},
+	{mParameters: {ignoreMessages: "~ignoreMessages"}, expectedIgnoreMessages: "~ignoreMessages"}
+].forEach((oFixture, i) => {
+	QUnit.test(`constructor: calls setIgnoreMessages, ${i}`, function (assert) {
+		const oGetValueExpectation = this.mock(ClientPropertyBinding.prototype).expects("_getValue")
+			.withExactArgs()
+			.returns("~value");
+		const oSetIgnoreMessagesExpectation = this.mock(ClientPropertyBinding.prototype).expects("setIgnoreMessages")
+			.withExactArgs(oFixture.expectedIgnoreMessages);
+
+		// code under test
+		const oBinding = new ClientPropertyBinding({/*oModel*/}, "/path", /*oContext*/undefined, oFixture.mParameters);
+
+		assert.strictEqual(oBinding.oValue, "~value");
+		assert.ok(oGetValueExpectation.calledOn(oBinding));
+		assert.ok(oSetIgnoreMessagesExpectation.calledOn(oBinding));
+	});
+});
+
+	//**********************************************************************************************
+	QUnit.test("supportsIgnoreMessages", function (assert) {
+		// code under test
+		assert.strictEqual(ClientPropertyBinding.prototype.supportsIgnoreMessages(), true);
+	});
+});

package/test/sap/ui/core/qunit/mvc/AsyncXMLView.qunit.js

@@ -3,6 +3,7 @@ sap.ui.define([
 	"sap/ui/base/Object",
 	"sap/ui/core/cache/CacheManager",
 	"sap/ui/core/Component",
+	"sap/ui/core/Element",
 	"sap/ui/core/mvc/Controller",
 	"sap/ui/core/mvc/View",
 	"sap/ui/core/mvc/ViewType",
@@ -18,6 +19,7 @@ sap.ui.define([
 	BaseObject,
 	Cache,
 	Component,
+	Element,
 	Controller,
 	View,
 	ViewType,
@@ -76,7 +78,7 @@ sap.ui.define([
 			id: sId,
 			definition: sXml
 		}).catch(function(error) {
-			assert.notOk(sap.ui.getCore().byId(sId), "Must deregister an erroneous instance");
+			assert.notOk(Element.getElementById(sId), "Must deregister an erroneous instance");
 			assert.equal(error.message, sError, "Must reject with an error");
 		});
 	});
@@ -98,7 +100,7 @@ sap.ui.define([
 			id: sId,
 			definition: sXml
 		}).catch(function(error) {
-			assert.notOk(sap.ui.getCore().byId(sId), "Must deregister an erroneous instance");
+			assert.notOk(Element.getElementById(sId), "Must deregister an erroneous instance");
 			assert.equal(error.message, sError, "Must reject with an error");
 		});
 	});
@@ -118,7 +120,7 @@ sap.ui.define([
 				id: sId,
 				definition: sXml
 			}).catch(function(error) {
-				assert.notOk(sap.ui.getCore().byId(sId), "Must deregister an erroneous instance");
+				assert.notOk(Element.getElementById(sId), "Must deregister an erroneous instance");
 				assert.equal(error.message, "Controller error", "Must reject with an error");
 			});
 		});

package/test/sap/ui/core/qunit/mvc/Controller.qunit.js

@@ -122,7 +122,7 @@ sap.ui.define([
 				aViews[0].destroy();
 				aViews[1].destroy();
 				// dangling fragment content (not prefixed and not aggregated)
-				sap.ui.getCore().byId("xmlViewInsideFragment").destroy();
+				Element.getElementById("xmlViewInsideFragment").destroy();
 			});
 		}).then(function() {
 			checkForDanglingControls(assert, aViews[0]);
@@ -359,7 +359,7 @@ sap.ui.define([
 			"</mvc:View>"
 		}).then(function(oView){
 			return pFragmentReady.then(function() {
-				assert.ok(sap.ui.getCore().byId("xmlViewInsideFragment"), "Fragment content is not prefixed by any ID.");
+				assert.ok(Element.getElementById("xmlViewInsideFragment"), "Fragment content is not prefixed by any ID.");
 				assert.notOk(oView.byId("xmlViewInsideFragment"), "Fragment content is not prefixed by the view ID.");
 				oView.destroy();
 			});
@@ -391,7 +391,7 @@ sap.ui.define([
 			"</mvc:View>"
 		}).then(function(oView){
 			return pFragmentReady.then(function() {
-				assert.ok(sap.ui.getCore().byId("myFragment--xmlViewInsideFragment"), "Fragment content is prefixed by the given ID.");
+				assert.ok(Element.getElementById("myFragment--xmlViewInsideFragment"), "Fragment content is prefixed by the given ID.");
 				assert.notOk(oView.byId("myFragment--xmlViewInsideFragment"), "Fragment content is not prefixed by the view ID.");
 				oView.destroy();
 			});

package/test/sap/ui/core/qunit/mvc/View.qunit.js

@@ -863,7 +863,7 @@ sap.ui.define([
 		return XMLView.create({
 			viewName : "testdata.mvc.XMLViewEmbeddingTypedViews"
 		}).then(function(oXMLView) {
-			assert.expect(14);
+			assert.expect(15);
 			assert.equal(this.oAfterInitSpy.callCount, 5, "AfterInit event fired before resolving");
 
 			var oPanel = oXMLView.getContent()[0];
@@ -888,6 +888,10 @@ sap.ui.define([
 			assert.ok(oTypedView4.isA("testdata.mvc.TypedViewWithRenderer"), "embedded view is a typed view");
 			assert.ok(oTypedView4.byId("myPanel").isA("sap.m.Panel"), "Content created successfully");
 			assert.equal(oTypedView4.getMetadata().getRendererName(), "testdata.mvc.TypedViewWithRendererRenderer", "Own Renderer set correctly");
+			assert.strictEqual(
+				oTypedView4.getMetadata().getRenderer(),
+				sap.ui.require("testdata/mvc/TypedViewWithRendererRenderer"),
+				"Own Renderer set correctly");
 
 			oXMLView.destroy();
 		}.bind(this));

package/test/sap/ui/core/qunit/mvc/XMLView.qunit.js

@@ -2,6 +2,7 @@
 sap.ui.define([
 	'sap/base/Log',
 	'sap/base/i18n/ResourceBundle',
+	"sap/ui/core/Element",
 	'sap/ui/core/library',
 	'sap/ui/core/mvc/Controller',
 	'sap/ui/core/mvc/View',
@@ -17,7 +18,7 @@ sap.ui.define([
 	'sap/ui/thirdparty/jquery',
 	"sap/ui/core/Configuration",
 	"sap/ui/qunit/utils/nextUIUpdate"
-], function(Log, ResourceBundle, coreLibrary, Controller, View, XMLView, RenderManager, JSONModel, ResourceModel, VerticalLayout, XMLHelper, Button, Panel, testsuite, jQuery, Configuration, nextUIUpdate) {
+], function(Log, ResourceBundle, Element, coreLibrary, Controller, View, XMLView, RenderManager, JSONModel, ResourceModel, VerticalLayout, XMLHelper, Button, Panel, testsuite, jQuery, Configuration, nextUIUpdate) {
 	"use strict";
 
 	// shortcut for sap.ui.core.mvc.ViewType
@@ -583,7 +584,7 @@ sap.ui.define([
 			await nextUIUpdate();
 
 			expectedControls.forEach(function(sId) {
-				var oControl = sap.ui.getCore().byId(sId);
+				var oControl = Element.getElementById(sId);
 				assert.ok(oControl, "control with id '" + sId + "' should exist");
 				assert.ok(oControl.getDomRef(), "control with id '" + sId + "' should have DOM");
 			});
@@ -591,7 +592,7 @@ sap.ui.define([
 			// install delegates on each control to assert later that all have been rendered
 			var count = 0;
 			expectedControls.forEach(function(sId) {
-				var oControl = sap.ui.getCore().byId(sId);
+				var oControl = Element.getElementById(sId);
 				oControl.addDelegate({
 					onBeforeRendering: function() {
 						count += 100;
@@ -609,7 +610,7 @@ sap.ui.define([
 			// Assert: everythging has been rendered again
 			assert.equal(count, 101 * expectedControls.length, "all controls should have participated in the rendering");
 			expectedControls.forEach(function(sId) {
-				var oControl = sap.ui.getCore().byId(sId);
+				var oControl = Element.getElementById(sId);
 				assert.ok(oControl, "control with id '" + sId + "' should exist");
 				assert.ok(oControl.getDomRef(), "control with id '" + sId + "' should have DOM");
 				assert.notOk(document.getElementById(RenderManager.RenderPrefixes.Dummy + sId), "there should be no more Dummy-Element for id '" + sId + "'");
@@ -618,7 +619,7 @@ sap.ui.define([
 
 			oView.destroy();
 			expectedControls.forEach(function(sId) {
-				var oControl = sap.ui.getCore().byId(sId);
+				var oControl = Element.getElementById(sId);
 				assert.notOk(oControl, "control with id '" + sId + "' should no longer exist");
 				assert.notOk(document.getElementById(sId), "there should be no more DOM with id '" + sId + "'");
 			});