@openui5/sap.ui.core 1.117.1 → 1.119.0

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

@@ -5,21 +5,23 @@ sap.ui.define([
 	'sap/ui/model/Model',
 	'sap/ui/model/type/Integer',
 	'sap/ui/core/message/Message',
-	'sap/ui/core/message/MessageManager',
+	'sap/ui/core/Messaging',
 	'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, MessageManager, library, Component, ComponentContainer, JSONModel, UIComponent, createAndAppendDiv, TestUtils){
+], function(isPlainObject, Input, Model, Integer, Message, Messaging, library, Component, ComponentContainer, Element, JSONModel, UIComponent, createAndAppendDiv, nextUIUpdate, TestUtils){
 	"use strict";
 
 	// create content div
 	createAndAppendDiv('content');
 
-	QUnit.module("MessageManager components", {
+	QUnit.module("Messaging components", {
 		before: function(){
 			this.spyDataState = function(oControl, fnTest) {
 				if (oControl.refreshDataState) {
@@ -74,9 +76,7 @@ sap.ui.define([
 				sap.ui.getCore().setModel(this.oModel);
 			};
 
-			return Promise.all([pCompContRendered, pCompContEnabledRendered, pCompContDisabledRendered]).then(function() {
-				sap.ui.getCore().applyChanges();
-			});
+			return Promise.all([pCompContRendered, pCompContEnabledRendered, pCompContDisabledRendered]).then(nextUIUpdate);
 		},
 
 		beforeEach : function() {
@@ -91,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,9 +120,8 @@ sap.ui.define([
 	});
 
 	QUnit.test("componentDisabled", function(assert) {
-		var oMessageManager = sap.ui.getCore().getMessageManager();
-		var oMessageModel = oMessageManager.getMessageModel();
-		var oCompZip = sap.ui.getCore().byId("zip_disabled");
+		var oMessageModel = Messaging.getMessageModel();
+		var oCompZip = Element.getElementById("zip_disabled");
 
 		var oValHandler = function(oEvent) {
 			if (oEvent.getParameter("dataState").getMessages() && oEvent.getParameter("dataState").getMessages().length > 0) {
@@ -137,10 +136,9 @@ sap.ui.define([
 	});
 
 	QUnit.test("component handle validation undefined", function(assert) {
-		var oMessageManager = sap.ui.getCore().getMessageManager();
-		var oMessageModel = oMessageManager.getMessageModel();
+		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");
@@ -193,12 +191,12 @@ sap.ui.define([
 		},
 		afterEach: function() {
 			this.oComponent.destroy();
+			Messaging.removeAllMessages();
 		}
 	});
 
 	QUnit.test("Metadata: n/a, instance: n/a", function(assert) {
-		var oMessageManager = sap.ui.getCore().getMessageManager();
-		var oRegisterObjectSpy = this.spy(oMessageManager, "registerObject");
+		var oRegisterObjectSpy = this.spy(Messaging, "registerObject");
 
 		return this.createComponent(undefined, undefined).then(function(oComponent) {
 			sinon.assert.callCount(oRegisterObjectSpy, 0);
@@ -206,8 +204,7 @@ sap.ui.define([
 	});
 
 	QUnit.test("Metadata: n/a, instance: false", function(assert) {
-		var oMessageManager = sap.ui.getCore().getMessageManager();
-		var oRegisterObjectSpy = this.spy(oMessageManager, "registerObject");
+		var oRegisterObjectSpy = this.spy(Messaging, "registerObject");
 
 		return this.createComponent(undefined, false).then(function(oComponent) {
 			sinon.assert.callCount(oRegisterObjectSpy, 0);
@@ -215,8 +212,7 @@ sap.ui.define([
 	});
 
 	QUnit.test("Metadata: n/a, instance: true", function(assert) {
-		var oMessageManager = sap.ui.getCore().getMessageManager();
-		var oRegisterObjectSpy = this.spy(oMessageManager, "registerObject");
+		var oRegisterObjectSpy = this.spy(Messaging, "registerObject");
 
 		return this.createComponent(undefined, true).then(function(oComponent) {
 			sinon.assert.callCount(oRegisterObjectSpy, 1);
@@ -225,8 +221,7 @@ sap.ui.define([
 	});
 
 	QUnit.test("Metadata: false, instance: false", function(assert) {
-		var oMessageManager = sap.ui.getCore().getMessageManager();
-		var oRegisterObjectSpy = this.spy(oMessageManager, "registerObject");
+		var oRegisterObjectSpy = this.spy(Messaging, "registerObject");
 
 		return this.createComponent(false, false).then(function(oComponent) {
 			sinon.assert.callCount(oRegisterObjectSpy, 1);
@@ -235,8 +230,7 @@ sap.ui.define([
 	});
 
 	QUnit.test("Metadata: false, instance: n/a", function(assert) {
-		var oMessageManager = sap.ui.getCore().getMessageManager();
-		var oRegisterObjectSpy = this.spy(oMessageManager, "registerObject");
+		var oRegisterObjectSpy = this.spy(Messaging, "registerObject");
 
 		return this.createComponent(false, undefined).then(function(oComponent) {
 			sinon.assert.callCount(oRegisterObjectSpy, 1);
@@ -245,8 +239,7 @@ sap.ui.define([
 	});
 
 	QUnit.test("Metadata: false, instance: true", function(assert) {
-		var oMessageManager = sap.ui.getCore().getMessageManager();
-		var oRegisterObjectSpy = this.spy(oMessageManager, "registerObject");
+		var oRegisterObjectSpy = this.spy(Messaging, "registerObject");
 
 		return this.createComponent(false, true).then(function(oComponent) {
 			sinon.assert.callCount(oRegisterObjectSpy, 1);
@@ -255,8 +248,7 @@ sap.ui.define([
 	});
 
 	QUnit.test("Metadata: true, instance: true", function(assert) {
-		var oMessageManager = sap.ui.getCore().getMessageManager();
-		var oRegisterObjectSpy = this.spy(oMessageManager, "registerObject");
+		var oRegisterObjectSpy = this.spy(Messaging, "registerObject");
 
 		return this.createComponent(true, true).then(function(oComponent) {
 			sinon.assert.callCount(oRegisterObjectSpy, 1);
@@ -265,8 +257,7 @@ sap.ui.define([
 	});
 
 	QUnit.test("Metadata: true, instance: n/a", function(assert) {
-		var oMessageManager = sap.ui.getCore().getMessageManager();
-		var oRegisterObjectSpy = this.spy(oMessageManager, "registerObject");
+		var oRegisterObjectSpy = this.spy(Messaging, "registerObject");
 
 		return this.createComponent(true, undefined).then(function(oComponent) {
 			sinon.assert.callCount(oRegisterObjectSpy, 1);
@@ -275,8 +266,7 @@ sap.ui.define([
 	});
 
 	QUnit.test("Metadata: true, instance: false", function(assert) {
-		var oMessageManager = sap.ui.getCore().getMessageManager();
-		var oRegisterObjectSpy = this.spy(oMessageManager, "registerObject");
+		var oRegisterObjectSpy = this.spy(Messaging, "registerObject");
 
 		return this.createComponent(true, false).then(function(oComponent) {
 			sinon.assert.callCount(oRegisterObjectSpy, 1);
@@ -318,9 +308,7 @@ sap.ui.define([
 		oModel.refresh(true);
 	});
 
-	QUnit.test("MessageManager:register/unregisterObject", function(assert) {
-		var oMessageManager = sap.ui.getCore().getMessageManager();
-		var oHandlererrorSpy = sinon.spy(MessageManager.prototype, "_handleError");
+	QUnit.test("Messaging:register/unregisterObject", function(assert) {
 		var oModel = new JSONModel(
 			{
 				data: {
@@ -337,14 +325,16 @@ sap.ui.define([
 				models: oModel
 			}
 		);
-		oMessageManager.registerObject(oInput);
+		assert.equal(Messaging.getMessageModel().getData().length, 0, "No Messages");
+		Messaging.registerObject(oInput, true);
 		oInput.setValue("abc");
-		assert.equal(oHandlererrorSpy.callCount, 1, "Changes detected - _handleError");
+		assert.equal(Messaging.getMessageModel().getData().length, 1, "Message created");
+		assert.equal(Messaging.getMessageModel().getData()[0].type, 'Error', "Message has type error");
 		oInput.setValue("2");
-		oMessageManager.unregisterObject(oInput);
+		assert.equal(Messaging.getMessageModel().getData().length, 0, "Message deleted");
+		Messaging.unregisterObject(oInput, true);
 		oInput.setValue("abc");
-		assert.equal(oHandlererrorSpy.callCount, 1, "No Changes detected - _handleError");
-		oHandlererrorSpy.restore();
+		assert.equal(Messaging.getMessageModel().getData().length, 0, "No new Message created");
 	});
 
 });

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

@@ -15,13 +15,20 @@ sap.ui.define(function() {
 			Message: {
 				title: "Messaging: sap.ui.core.message.Message"
 			},
-			MessageManager: {
-				title: "Messaging: sap.ui.core.message.MessageManager"
+			Messaging: {
+				title: "Messaging: sap.ui.core.message.Messaging"
 			},
 			MessageMixin: {
 				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/Binding.qunit.js

@@ -4,9 +4,10 @@
 sap.ui.define([
 	"sap/base/Log",
 	"sap/ui/base/EventProvider",
+	"sap/ui/core/Messaging",
 	"sap/ui/model/Binding",
 	"sap/ui/model/ChangeReason"
-], function (Log, EventProvider, Binding, ChangeReason) {
+], function (Log, EventProvider, Messaging, Binding, ChangeReason) {
 	/*global QUnit, sinon*/
 	"use strict";
 
@@ -60,16 +61,16 @@ sap.ui.define([
 				getControlMessages : function () {},
 				reset : function () {}
 			},
-			oMessageManager = {removeMessages : function () {}};
+			oMessaging = {removeMessages : function () {}};
 
 		assert.strictEqual(oBinding.getContext(), oContext);
 
-		this.mock(sap.ui).expects("require").withExactArgs("sap/ui/core/message/MessageManager")
-			.returns(oMessageManager);
+		this.mock(sap.ui).expects("require").withExactArgs("sap/ui/core/Messaging")
+			.returns(oMessaging);
 		this.mock(oBinding).expects("getDataState").withExactArgs().twice().returns(oDataState);
 		this.mock(oDataState).expects("getControlMessages").withExactArgs()
 			.returns("~messages");
-		this.mock(oMessageManager).expects("removeMessages").withExactArgs("~messages", true);
+		this.mock(oMessaging).expects("removeMessages").withExactArgs("~messages", true);
 		this.mock(oDataState).expects("reset").withExactArgs();
 		this.mock(oBinding).expects("checkDataState").withExactArgs();
 		this.mock(oBinding).expects("_fireChange").withExactArgs({
@@ -202,15 +203,14 @@ sap.ui.define([
 				getControlMessages : function () {},
 				setModelMessages : function () {}
 			},
-			oDataStateMock = this.mock(oDataState),
-			oMessageManager = sap.ui.getCore().getMessageManager();
+			oDataStateMock = this.mock(oDataState);
 
 		if (oFixture.dataStateSet) {
 			oBinding.oDataState = oDataState;
 
 			oDataStateMock.expects("getControlMessages")
 				.withExactArgs().returns("~oControlMessages");
-			this.mock(oMessageManager).expects("removeMessages")
+			this.mock(Messaging).expects("removeMessages")
 				.withExactArgs("~oControlMessages", true);
 			oDataStateMock.expects("setModelMessages").withExactArgs();
 			oDataStateMock.expects("changed").withExactArgs().returns(oFixture.dataStateChanged);

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/model/controlhelper/TreeBindingProxy.qunit.js

@@ -38,39 +38,39 @@ sap.ui.define([
 	// does not make sense to test with no binding
 
 	QUnit.test("#isLeaf", function(assert) {
-		assert.ok(this.oProxy.isLeaf(0), "isLeaf returns true");
+		assert.strictEqual(this.oProxy.isLeaf(0), true, "isLeaf returns true");
 	});
 
 	QUnit.test("#getNodeByIndex", function(assert) {
-		assert.equal(this.oProxy.getNodeByIndex(0), undefined, "getNodeByIndex returns undefined");
+		assert.strictEqual(this.oProxy.getNodeByIndex(0), null, "getNodeByIndex returns null");
 	});
 
 	QUnit.test("#getContextByIndex", function(assert) {
-		assert.equal(this.oProxy.getContextByIndex(0), undefined, "getContextByIndex returns undefined");
+		assert.strictEqual(this.oProxy.getContextByIndex(0), null, "getContextByIndex returns null");
 	});
 
 	QUnit.test("#isExpanded", function(assert) {
-		assert.notOk(this.oProxy.isExpanded(0), "isExpanded returns false");
+		assert.strictEqual(this.oProxy.isExpanded(0), false, "isExpanded returns false");
 	});
 
 	QUnit.test("#getContexts", function(assert) {
-		assert.equal(this.oProxy.getContexts(0).length, 0, "getContexts returns []");
+		assert.strictEqual(this.oProxy.getContexts(0).length, 0, "getContexts returns []");
 	});
 
 	QUnit.test("#getLevel", function(assert) {
-		assert.equal(this.oProxy.getLevel(0), undefined, "getLevel returns undefined");
+		assert.strictEqual(this.oProxy.getLevel(0), undefined, "getLevel returns undefined");
 	});
 
 	QUnit.test("#getSiblingCount", function(assert) {
-		assert.equal(this.oProxy.getSiblingCount(0), 0, "getSiblingCount returns 0");
+		assert.strictEqual(this.oProxy.getSiblingCount(0), 0, "getSiblingCount returns 0");
 	});
 
 	QUnit.test("#getPositionInParent", function(assert) {
-		assert.equal(this.oProxy.getPositionInParent(0), -1, "getPositionInParent returns -1");
+		assert.strictEqual(this.oProxy.getPositionInParent(0), -1, "getPositionInParent returns -1");
 	});
 
 	QUnit.test("#isSelectionSupported", function(assert) {
-		assert.notOk(this.oProxy.isSelectionSupported(), "isSelectionSupported returns false");
+		assert.strictEqual(this.oProxy.isSelectionSupported(), false, "isSelectionSupported returns false");
 	});
 
 	QUnit.test("#applyLegacySettingsToBindingInfo", function(assert) {
@@ -83,9 +83,9 @@ sap.ui.define([
 
 		this.oProxy.applyLegacySettingsToBindingInfo(oBindingInfo, mLegacySettings);
 
-		assert.equal(oBindingInfo.parameters.rootLevel, mLegacySettings.rootLevel);
-		assert.equal(oBindingInfo.parameters.collapseRecursive, mLegacySettings.collapseRecursive);
-		assert.equal(oBindingInfo.parameters.numberOfExpandedLevels, mLegacySettings.numberOfExpandedLevels);
+		assert.strictEqual(oBindingInfo.parameters.rootLevel, mLegacySettings.rootLevel);
+		assert.strictEqual(oBindingInfo.parameters.collapseRecursive, mLegacySettings.collapseRecursive);
+		assert.strictEqual(oBindingInfo.parameters.numberOfExpandedLevels, mLegacySettings.numberOfExpandedLevels);
 	});
 
 	QUnit.module("sap.ui.model.TreeBindingProxy: Behaviour for V4 bindings", {
@@ -343,7 +343,10 @@ sap.ui.define([
 				nodeHasChildren: function() {
 					return true;
 				},
-				getNodeByIndex: function() {
+				getNodeByIndex: function(iIndex) {
+					if (iIndex === 1) {
+						return undefined;
+					}
 					return {
 						node: "test",
 						level: 0,
@@ -351,7 +354,10 @@ sap.ui.define([
 						positionInParent: 3
 					};
 				},
-				getContextByIndex: function() {
+				getContextByIndex: function(iIndex) {
+					if (iIndex === 1) {
+						return undefined;
+					}
 					return {context: "test"};
 				},
 				isExpanded: function() {
@@ -381,10 +387,14 @@ sap.ui.define([
 			parent: {children: [1, 2]},
 			positionInParent: 3
 		}, "getNodeByIndex returns context object");
+		assert.strictEqual(this.oProxy.getNodeByIndex(-1), null, "getNodeByIndex returns null for negative index");
+		assert.strictEqual(this.oProxy.getNodeByIndex(1), null, "getNodeByIndex returns null if no node exists at this index");
 	});
 
 	QUnit.test("#getContextByIndex", function(assert) {
 		assert.deepEqual(this.oProxy.getContextByIndex(0), {context: "test"}, "getContextByIndex returns context object");
+		assert.strictEqual(this.oProxy.getContextByIndex(-1), null, "getContextByIndex returns null for negative index");
+		assert.strictEqual(this.oProxy.getContextByIndex(1), null, "getContextByIndex returns null if no context exists at this index");
 	});
 
 	QUnit.test("#isExpanded", function(assert) {

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

@@ -3,8 +3,9 @@ sap.ui.define([
 	"sap/ui/Device",
 	"sap/ui/core/mvc/Controller",
 	"sap/ui/qunit/QUnitUtils",
-	"sap/ui/qunit/utils/createAndAppendDiv"
-], function(Device, Controller, qutils, createAndAppendDiv) {
+	"sap/ui/qunit/utils/createAndAppendDiv",
+	"sap/ui/qunit/utils/nextUIUpdate"
+], function(Device, Controller, qutils, createAndAppendDiv, nextUIUpdate) {
 	"use strict";
 
 	QUnit.config.reorder = false;
@@ -51,12 +52,12 @@ sap.ui.define([
 		});
 
 		QUnit.test("Lifecycle: onAfterRendering", function(assert) {
-			return pView.then(function(oView) {
+			return pView.then(async function(oView) {
 				assert.expect(5);
 				window.onAfterRenderingCalled = false;
 
 				oView.placeAt("content");
-				sap.ui.getCore().applyChanges();
+				await nextUIUpdate();
 
 				assert.ok(window.onAfterRenderingCalled, "controller.onAfterRendering should be called by now");
 				window.onAfterRenderingCalled = false;
@@ -126,12 +127,12 @@ sap.ui.define([
 
 		});
 
-		QUnit.test("Re-Rendering", function(assert) {
+		QUnit.test("Re-Rendering", async function(assert) {
 			assert.expect(4 + oConfig.idsToBeChecked.length);
 			window.onBeforeRenderingCalled = false;
 			window.onAfterRenderingCalled = false;
 			view.invalidate();
-			sap.ui.getCore().applyChanges();
+			await nextUIUpdate();
 
 			function doCheck() {
 				for (var i = 0; i < oConfig.idsToBeChecked.length; i++) {

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

@@ -3,8 +3,9 @@ sap.ui.define([
 	"sap/base/util/ObjectPath",
 	"sap/ui/core/mvc/View",
 	"sap/ui/qunit/utils/createAndAppendDiv",
+	"sap/ui/qunit/utils/nextUIUpdate",
 	"sap/ui/thirdparty/jquery"
-], function(ObjectPath, View, createAndAppendDiv, jQuery) {
+], function(ObjectPath, View, createAndAppendDiv, nextUIUpdate, jQuery) {
 	"use strict";
 
 	// create content div
@@ -83,7 +84,7 @@ sap.ui.define([
 
 				assert.ok(this.oView, "Instance has been created");
 				assert.ok(this.oView instanceof View, "Instance is a View");
-				sap.ui.getCore().applyChanges();
+				return nextUIUpdate();
 			}.bind(this));
 		});
 

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

@@ -1,7 +1,8 @@
 /*global QUnit */
 sap.ui.define([
-	"sap/ui/core/mvc/XMLView"
-], function(XMLView) {
+	"sap/ui/core/mvc/XMLView",
+	"sap/ui/qunit/utils/nextUIUpdate"
+], function(XMLView, nextUIUpdate) {
 	"use strict";
 
 	QUnit.module("HTML nesting in XMLView");
@@ -20,9 +21,9 @@ sap.ui.define([
 					}
 				}]
 			}
-		}).then(function(oView) {
+		}).then(async function(oView) {
 			oView.placeAt("qunit-fixture");
-			sap.ui.getCore().applyChanges();
+			await nextUIUpdate();
 			var oDomRef = oView.getDomRef();
 
 			// <style> on top-level

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

@@ -1,17 +1,16 @@
 /*global QUnit, sinon */
 sap.ui.define([
 	'sap/ui/core/Component',
-	'sap/ui/core/UIComponent',
-	"sap/ui/core/XMLTemplateProcessor",
 	"sap/ui/core/mvc/View",
 	"sap/m/InstanceManager",
 	"sap/base/Log",
 	"sap/base/util/merge",
 	"sap/ui/model/json/JSONModel",
 	"sap/ui/core/mvc/XMLView",
-	"sap/ui/core/routing/HashChanger"
-], function(Component, UIComponent, XMLTemplateProcessor, View,
-	InstanceManager, Log, merge, JSONModel, XMLView, HashChanger) {
+	"sap/ui/core/routing/HashChanger",
+	"sap/ui/qunit/utils/nextUIUpdate"
+], function(Component, View,
+	InstanceManager, Log, merge, JSONModel, XMLView, HashChanger, nextUIUpdate) {
 	"use strict";
 
 	var TESTDATA_PREFIX = "testdata.xml-require";
@@ -183,9 +182,9 @@ sap.ui.define([
 				create: createView
 			}
 		},
-		runAssertions: function (oView, mSpies, assert, bAsync) {
+		runAssertions: async function (oView, mSpies, assert, bAsync) {
 			oView.placeAt("qunit-fixture");
-			sap.ui.getCore().applyChanges();
+			await nextUIUpdate();
 
 			var aContent = oView.getContent();
 			var aDependents = oView.getDependents();
@@ -205,7 +204,7 @@ sap.ui.define([
 			});
 
 			oView.setModel(oModel);
-			sap.ui.getCore().applyChanges();
+			await nextUIUpdate();
 
 			aContent = oView.getContent();
 			assert.equal(aContent.length, 2, "content under binding is created");
@@ -232,7 +231,7 @@ sap.ui.define([
 			aContent = oView.getContent();
 			assert.equal(aContent.length, 3, "content under binding is created");
 			assert.equal(aContent[2].getText(), "NAME3", "The bound value is formatted by the given formatter");
-			sap.ui.getCore().applyChanges();
+			await nextUIUpdate();
 
 			assert.ok(aContent[0].getDomRef(), "The control created from binding template should be rendered");
 			assert.ok(aContent[1].getDomRef(), "The control created from binding template should be rendered");