@openui5/sap.ui.core 1.117.1 → 1.119.0

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

@@ -1,11 +1,11 @@
 /* global QUnit */
 sap.ui.define([
 	"sap/ui/thirdparty/jquery",
-	"sap/ui/core/Core",
 	"sap/ui/core/DeclarativeSupport",
+	"sap/ui/core/Element",
 	"sap/ui/core/UIArea",
 	"sap/ui/model/json/JSONModel"
-], function(jQuery, oCore, DeclarativeSupport, UIArea, JSONModel) {
+], function(jQuery, DeclarativeSupport, Element, UIArea, JSONModel) {
 	"use strict";
 	QUnit.config.reorder = false;
 	QUnit.module("Basic");
@@ -26,12 +26,12 @@ sap.ui.define([
 	QUnit.test("Simple Button", function(assert) {
 		assert.expect(3);
 
-		var oButton = oCore.byId("simpleButton");
+		var oButton = Element.getElementById("simpleButton");
 		assert.equal(!!oButton, false, 'No control with id "simpleButton" found.');
 
 		DeclarativeSupport.compile(jQuery("#simple-button"));
 
-		var oButton = oCore.byId("simpleButton");
+		var oButton = Element.getElementById("simpleButton");
 		assert.ok(!!oButton, 'Control with id "simpleButton" found.');
 		assert.equal(oButton.getText(), "My Button", "Text is set right");
 	});
@@ -45,10 +45,10 @@ sap.ui.define([
 			DeclarativeSupport.attributes["data-tooltip"] = function() {
 				assert.ok(true, "Called special attribute handling");
 			};
-			var oButton = oCore.byId("buttonWithTooltip");
+			var oButton = Element.getElementById("buttonWithTooltip");
 			assert.equal(!!oButton, false, 'No control with id "buttonWithTooltip" found.');
 			DeclarativeSupport.compile(jQuery("#button-with-tooltip"));
-			var oButton = oCore.byId("buttonWithTooltip");
+			var oButton = Element.getElementById("buttonWithTooltip");
 			assert.ok(!!oButton, 'Control with id "buttonWithTooltip" found.');
 		} finally {
 			if (backup) {
@@ -61,12 +61,12 @@ sap.ui.define([
 	QUnit.test("Button with style and class", function(assert) {
 		assert.expect(3);
 
-		var oButton = oCore.byId("buttonStyleClass");
+		var oButton = Element.getElementById("buttonStyleClass");
 		assert.equal(!!oButton, false, 'No control with id "buttonStyleClass" found.');
 
 		DeclarativeSupport.compile(jQuery("#button-with-style-class"));
 
-		var oButton = oCore.byId("buttonStyleClass");
+		var oButton = Element.getElementById("buttonStyleClass");
 		assert.ok(!!oButton, 'Control with id "buttonStyleClass" found.');
 		assert.ok(!!oButton.hasStyleClass("mybutton"), 'Control has right classes.');
 	});
@@ -74,15 +74,15 @@ sap.ui.define([
 
 	QUnit.test("HTML Content", function(assert) {
 		assert.expect(7);
-		var oButton = oCore.byId("htmlContentButton");
+		var oButton = Element.getElementById("htmlContentButton");
 		assert.equal(!!oButton, false, 'No control with id "htmlContentButton" found.');
 
 		DeclarativeSupport.compile(jQuery("#html-content"));
 
-		var oButton = oCore.byId("htmlContentButton");
+		var oButton = Element.getElementById("htmlContentButton");
 		assert.ok(!!oButton, 'Control with id "htmlContentButton" found.');
 
-		var oPanel = oCore.byId("htmlContentPanel");
+		var oPanel = Element.getElementById("htmlContentPanel");
 		assert.ok(!!oPanel, 'Control with id "htmlContentPanel" found.');
 		assert.ok(oPanel.getHeaderToolbar(), "Toolbar is set right");
 		assert.equal(oPanel.getHeaderToolbar().getContent().length, 1, "Toolbar content is set right");
@@ -93,12 +93,12 @@ sap.ui.define([
 
 	QUnit.test("Panel aggregation", function(assert) {
 		assert.expect(6);
-		var oPanel = oCore.byId("panelAggregation");
+		var oPanel = Element.getElementById("panelAggregation");
 		assert.equal(!!oPanel, false, 'No control with id "panelAggregation" found.');
 
 		DeclarativeSupport.compile(jQuery("#panel-aggregation"));
 
-		var oPanel = oCore.byId("panelAggregation");
+		var oPanel = Element.getElementById("panelAggregation");
 		assert.ok(!!oPanel, 'Control with id "panelAggregation" found.');
 		assert.ok(oPanel.getHeaderToolbar(), "Toolbar is set right");
 		assert.equal(oPanel.getHeaderToolbar().getContent().length, 1, "Toolbar content is set right");
@@ -109,12 +109,12 @@ sap.ui.define([
 
 	QUnit.test("Panel with default aggregation", function(assert) {
 		assert.expect(6);
-		var oPanel = oCore.byId("panelWithDefaultAggregation");
+		var oPanel = Element.getElementById("panelWithDefaultAggregation");
 		assert.equal(!!oPanel, false, 'No control with id "panelWithDefaultAggregation" found.');
 
 		DeclarativeSupport.compile(jQuery("#panel-with-default-aggregation"));
 
-		var oPanel = oCore.byId("panelWithDefaultAggregation");
+		var oPanel = Element.getElementById("panelWithDefaultAggregation");
 		assert.ok(!!oPanel, 'Control with id "panelWithDefaultAggregation" found.');
 		assert.ok(oPanel.getHeaderToolbar(), "Toolbar is set right");
 		assert.equal(oPanel.getHeaderToolbar().getContent().length, 1, "Toolbar content is set right");
@@ -124,12 +124,12 @@ sap.ui.define([
 
 	QUnit.test("Panel with association", function(assert) {
 		assert.expect(6);
-		var oPanel = oCore.byId("panelWithAssociation");
+		var oPanel = Element.getElementById("panelWithAssociation");
 		assert.equal(!!oPanel, false, 'No control with id "panelWithAssociation" found.');
 
 		DeclarativeSupport.compile(jQuery("#panel-with-association"));
 
-		var oPanel = oCore.byId("panelWithAssociation");
+		var oPanel = Element.getElementById("panelWithAssociation");
 		assert.ok(!!oPanel, 'Control with id "panelWithAssociation" found.');
 
 		assert.equal(oPanel.getContent().length, 3, "Number of child controls is right");
@@ -147,10 +147,10 @@ sap.ui.define([
 		var oUIArea = UIArea.registry.get("uiAreaSimple");
 		assert.equal(!!oUIArea, false, 'No control with id "uiAreaSimple" found.');
 
-		var oButton1 = oCore.byId("uiAreaSimpleButton2");
+		var oButton1 = Element.getElementById("uiAreaSimpleButton2");
 		assert.equal(!!oButton1, false, 'No control with id "uiAreaSimpleButton2" found.');
 
-		var oButton2 = oCore.byId("uiAreaSimpleButton2");
+		var oButton2 = Element.getElementById("uiAreaSimpleButton2");
 		assert.equal(!!oButton2, false, 'No control with id "uiAreaSimpleButton2" found.');
 
 		DeclarativeSupport.compile(jQuery("#ui-area-simple"));
@@ -158,10 +158,10 @@ sap.ui.define([
 		var oUIArea = UIArea.registry.get("uiAreaSimple");
 		assert.ok(!!oUIArea, 'UIArea with id "uiAreaSimple" found.');
 
-		var oButton1 = oCore.byId("uiAreaSimpleButton2");
+		var oButton1 = Element.getElementById("uiAreaSimpleButton2");
 		assert.ok(!!oButton1, 'Control with id "uiAreaSimpleButton2" found.');
 
-		var oButton2 = oCore.byId("uiAreaSimpleButton2");
+		var oButton2 = Element.getElementById("uiAreaSimpleButton2");
 		assert.ok(!!oButton2, 'Control with id "uiAreaSimpleButton2" found.');
 
 		assert.equal(oButton2.getUIArea().getId(), "uiAreaSimple", "UI Areas are the same");
@@ -173,13 +173,13 @@ sap.ui.define([
 		var oUIArea = UIArea.registry.get("complexDeclarationUIArea");
 		assert.equal(!!oUIArea, false, 'No UIArea with id "complexDeclarationUIArea" found.');
 
-		var oPanel1 = oCore.byId("complexDeclarationPanel1");
+		var oPanel1 = Element.getElementById("complexDeclarationPanel1");
 		assert.equal(!!oPanel1, false, 'No control with id "complexDeclarationPanel1" found.');
 
-		var oPanel2 = oCore.byId("complexDeclarationPanel2");
+		var oPanel2 = Element.getElementById("complexDeclarationPanel2");
 		assert.equal(!!oPanel2, false, 'No control with id "complexDeclarationPanel2" found.');
 
-		var oPanel3 = oCore.byId("complexDeclarationPanel3");
+		var oPanel3 = Element.getElementById("complexDeclarationPanel3");
 		assert.equal(!!oPanel2, false, 'No control with id "complexDeclarationPanel3" found.');
 
 		window.handlePress = function(evt) {
@@ -191,13 +191,13 @@ sap.ui.define([
 		var oUIArea = UIArea.registry.get("complexDeclarationUIArea");
 		assert.ok(!!oUIArea, 'UIArea with id "complexDeclarationUIArea" found.');
 
-		var oPanel1 = oCore.byId("complexDeclarationPanel1");
+		var oPanel1 = Element.getElementById("complexDeclarationPanel1");
 		assert.ok(!!oPanel1, 'Control with id "complexDeclarationPanel1" found.');
 
-		var oPanel2 = oCore.byId("complexDeclarationPanel2");
+		var oPanel2 = Element.getElementById("complexDeclarationPanel2");
 		assert.ok(!!oPanel2, 'Control with id "complexDeclarationPanel2" found.');
 
-		var oPanel3 = oCore.byId("complexDeclarationPanel3");
+		var oPanel3 = Element.getElementById("complexDeclarationPanel3");
 		assert.ok(!!oPanel3, 'Control with id "complexDeclarationPanel3" found.');
 
 		delete window.handlePress;
@@ -205,7 +205,7 @@ sap.ui.define([
 
 	QUnit.test("Events", function(assert) {
 		assert.expect(3);
-		var oButton1 = oCore.byId("buttonWithEvent");
+		var oButton1 = Element.getElementById("buttonWithEvent");
 		assert.equal(!!oButton1, false, 'No control with id "buttonWithEvent" found.');
 
 		window.handlePress = function(evt) {
@@ -214,7 +214,7 @@ sap.ui.define([
 
 		DeclarativeSupport.compile(jQuery("#events"));
 
-		var oButton1 = oCore.byId("buttonWithEvent");
+		var oButton1 = Element.getElementById("buttonWithEvent");
 		assert.ok(!!oButton1, 'Control with id "buttonWithEvent" found.');
 		oButton1.firePress();
 
@@ -224,12 +224,12 @@ sap.ui.define([
 
 	QUnit.test("AltType", function(assert) {
 		assert.expect(3);
-		var oForm = oCore.byId("form");
+		var oForm = Element.getElementById("form");
 		assert.equal(!!oForm, false, 'No control with id "form" found.');
 
 		DeclarativeSupport.compile(jQuery("#altType"));
 
-		var oForm = oCore.byId("form");
+		var oForm = Element.getElementById("form");
 		assert.ok(!!oForm, 'Control with id "form" found.');
 
 		assert.equal(oForm.getTitle(), "Alt type works", "Title is set right");
@@ -265,10 +265,10 @@ sap.ui.define([
 
 	QUnit.test("DataBinding", function(assert) {
 		assert.expect(8);
-		var oButton1 = oCore.byId("buttonDataBinding");
+		var oButton1 = Element.getElementById("buttonDataBinding");
 		assert.equal(!!oButton1, false, 'No control with id "buttonDataBinding" found.');
 
-		var oCarousel = oCore.byId("aggregationDataBinding");
+		var oCarousel = Element.getElementById("aggregationDataBinding");
 		assert.equal(!!oCarousel, false, 'No control with id "aggregationDataBinding" found.');
 
 		var oModel1 = new JSONModel({
@@ -288,7 +288,7 @@ sap.ui.define([
 
 		DeclarativeSupport.compile(jQuery("#databinding"));
 
-		var oButton1 = oCore.byId("buttonDataBinding");
+		var oButton1 = Element.getElementById("buttonDataBinding");
 		assert.ok(!!oButton1, 'Control with id "buttonWithEvent" found.');
 
 		oButton1.setModel(oModel1);
@@ -297,9 +297,9 @@ sap.ui.define([
 		assert.equal(oButton1.getText(), oModel1.getData().stringValue, "Check 'text' property of button 'buttonDataBinding'");
 
 
-		var oCarousel = oCore.byId("aggregationDataBinding");
+		var oCarousel = Element.getElementById("aggregationDataBinding");
 
-		var oCarousel = oCore.byId("aggregationDataBinding");
+		var oCarousel = Element.getElementById("aggregationDataBinding");
 		assert.ok(!!oCarousel, 'Control with id "aggregationDataBinding" found.');
 
 
@@ -320,7 +320,7 @@ sap.ui.define([
 
 	QUnit.test("Custom Data", function(assert) {
 		assert.expect(2);
-		var oButton = oCore.byId("simpleButton");
+		var oButton = Element.getElementById("simpleButton");
 		assert.equal(oButton.data("customData1"), "customvalue", 'Custom Data not applied!');
 		assert.equal(oButton.data("CustomData2"), "customvalue", 'Custom Data not applied!');
 	});

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

@@ -29,7 +29,7 @@ sap.ui.define([
 		assert.ok(Element.hasOwnProperty("registry"), "Element has static method to access registry");
 		assert.equal(Element.registry.size, 3, "Return number of registered element instances");
 		assert.deepEqual(Object.keys(Element.registry.all()).sort(), ["A", "B", "C"], "Return all registered element instances");
-		assert.ok(Element.registry.get("B") === oFooB, "Return reference of element B from registry by ID");
+		assert.ok(Element.getElementById("B") === oFooB, "Return reference of element B from registry by ID");
 
 		Element.registry.forEach(fnCallbackSpy);
 		assert.ok(fnCallbackSpy.calledThrice, "Callback was executed 3 times");

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

@@ -2,12 +2,12 @@
 sap.ui.define([
 	"sap/base/Log",
 	"sap/ui/core/Element",
-	"sap/ui/core/CustomData",
 	"sap/ui/core/library",
 	"sap/ui/core/mvc/View",
 	"sap/ui/model/json/JSONModel",
-	"sap/m/Button"
-], function(Log, Element, CustomData, library, View, JSONModel, Button) {
+	"sap/m/Button",
+	"sap/ui/qunit/utils/nextUIUpdate"
+], function(Log, Element, library, View, JSONModel, Button, nextUIUpdate) {
 	"use strict";
 
 	var ViewType = library.mvc.ViewType;
@@ -284,7 +284,7 @@ sap.ui.define([
 	});
 
 
-	QUnit.test("Write Data to HTML", function(assert) {
+	QUnit.test("Write Data to HTML", async function(assert) {
 		var btn = new Button({text:"Hello"});
 
 		btn.data("test", "some payload", true);
@@ -294,7 +294,7 @@ sap.ui.define([
 		btn.data("test5", {"test":"nope"}, true);
 
 		btn.placeAt("content");
-		sap.ui.getCore().applyChanges();
+		await nextUIUpdate();
 
 		var $btn = btn.$();
 		assert.equal($btn.attr("data-test"), "some payload", "the 'test' data should be written to DOM");

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

@@ -1,9 +1,9 @@
 /*global QUnit*/
 sap.ui.define([
-	'sap/ui/core/Element',
 	'sap/ui/core/Control',
-	'sap/ui/core/RenderManager'
-], function(Element, Control, RenderManager) {
+	'sap/ui/core/RenderManager',
+	"sap/ui/qunit/utils/nextUIUpdate"
+], function(Control, RenderManager, nextUIUpdate) {
 
 	"use strict";
 	/*global QUnit, sinon */
@@ -45,10 +45,12 @@ sap.ui.define([
 			});
 
 			this.oParent.placeAt("content");
-			sap.ui.getCore().applyChanges();
+			this.clock.tick(0);
+			return nextUIUpdate();
 		},
 		afterEach: function() {
 			this.oParent.destroy();
+			this.clock.runAll();
 			this.clock.restore();
 		}
 	});

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

@@ -4,9 +4,10 @@ sap.ui.define([
 	"sap/m/Button",
 	"sap/m/Dialog",
 	"sap/ui/qunit/utils/createAndAppendDiv",
+	"sap/ui/qunit/utils/nextUIUpdate",
 	"sap/m/Input",
 	"sap/m/Panel"
-], function(BusyIndicator, Button, Dialog, createAndAppendDiv, Input, Panel) {
+], function(BusyIndicator, Button, Dialog, createAndAppendDiv, nextUIUpdate, Input, Panel) {
 	"use strict";
 
 	QUnit.module("Focus Issue");
@@ -42,7 +43,7 @@ sap.ui.define([
 
 	QUnit.module("Focus with preventScroll");
 
-	QUnit.test("Focus an element with preventScroll should NOT cause scrolling", function(assert) {
+	QUnit.test("Focus an element with preventScroll should NOT cause scrolling", async function(assert) {
 		var oContainerElement = createAndAppendDiv("scroll_container");
 		oContainerElement.style.overflow = "scroll";
 		oContainerElement.style.height = "400px";
@@ -53,7 +54,7 @@ sap.ui.define([
 
 		var oInput = new Input();
 		oInput.placeAt("input_uiarea");
-		sap.ui.getCore().applyChanges();
+		await nextUIUpdate();
 
 		oInputAtEnd.scrollIntoView();
 
@@ -79,17 +80,17 @@ sap.ui.define([
 
 	QUnit.module("#isFocusable");
 
-	QUnit.test("Element isn't focusable when it's invisible", function(assert) {
+	QUnit.test("Element isn't focusable when it's invisible", async function(assert) {
 		var oUIArea = createAndAppendDiv("uiarea_focus");
 
 		var oInput = new Input();
 		oInput.placeAt("uiarea_focus");
-		sap.ui.getCore().applyChanges();
+		await nextUIUpdate();
 
 		assert.ok(oInput.isFocusable(), "The input control should now be focusable");
 
 		oInput.setVisible(false);
-		sap.ui.getCore().applyChanges();
+		await nextUIUpdate();
 
 		assert.ok(!oInput.isFocusable(), "The input control should be not focusable because it's invisible");
 
@@ -97,19 +98,19 @@ sap.ui.define([
 		oUIArea.remove();
 	});
 
-	QUnit.test("Element isn't focusable when it's busy", function(assert) {
+	QUnit.test("Element isn't focusable when it's busy", async function(assert) {
 		var oUIArea = createAndAppendDiv("uiarea_focus");
 
 		var oInput = new Input();
 		oInput.setBusyIndicatorDelay(0);
 		oInput.placeAt("uiarea_focus");
-		sap.ui.getCore().applyChanges();
+		await nextUIUpdate();
 
 		assert.ok(oInput.isFocusable(), "The input control should now be focusable");
 
 
 		oInput.setBusy(true);
-		sap.ui.getCore().applyChanges();
+		await nextUIUpdate();
 
 		assert.ok(!oInput.isFocusable(), "The input control should be not focusable because it's busy");
 
@@ -120,17 +121,17 @@ sap.ui.define([
 	/**
 	 * @deprecated As of 1.69
 	 */
-	QUnit.test("Element isn't focusable when it's blocked", function(assert) {
+	QUnit.test("Element isn't focusable when it's blocked", async function(assert) {
 		var oUIArea = createAndAppendDiv("uiarea_focus");
 
 		var oInput = new Input();
 		oInput.placeAt("uiarea_focus");
-		sap.ui.getCore().applyChanges();
+		await nextUIUpdate();
 
 		assert.ok(oInput.isFocusable(), "The input control should now be focusable");
 
 		oInput.setBlocked(true);
-		sap.ui.getCore().applyChanges();
+		await nextUIUpdate();
 
 		assert.ok(!oInput.isFocusable(), "The input control should be not focusable because it's blocked");
 
@@ -138,7 +139,7 @@ sap.ui.define([
 		oUIArea.remove();
 	});
 
-	QUnit.test("Element isn't focusable when its parent is busy", function(assert) {
+	QUnit.test("Element isn't focusable when its parent is busy", async function(assert) {
 		var oUIArea = createAndAppendDiv("uiarea_focus");
 
 		var oInput = new Input();
@@ -147,13 +148,13 @@ sap.ui.define([
 		});
 		oPanel.setBusyIndicatorDelay(0);
 		oPanel.placeAt("uiarea_focus");
-		sap.ui.getCore().applyChanges();
+		await nextUIUpdate();
 
 		assert.ok(!oPanel.isFocusable(), "Panel doesn't have focusable DOM element");
 		assert.ok(oInput.isFocusable(), "The input control should now be focusable");
 
 		oPanel.setBusy(true);
-		sap.ui.getCore().applyChanges();
+		await nextUIUpdate();
 
 		assert.ok(!oInput.isFocusable(), "The input control should be not focusable because its parent is busy");
 
@@ -164,7 +165,7 @@ sap.ui.define([
 	/**
 	 * @deprecated As of 1.69
 	 */
-	QUnit.test("Element isn't focusable when its parent is blocked", function(assert) {
+	QUnit.test("Element isn't focusable when its parent is blocked", async function(assert) {
 		var oUIArea = createAndAppendDiv("uiarea_focus");
 
 		var oInput = new Input();
@@ -172,13 +173,13 @@ sap.ui.define([
 			content: oInput
 		});
 		oPanel.placeAt("uiarea_focus");
-		sap.ui.getCore().applyChanges();
+		await nextUIUpdate();
 
 		assert.ok(!oPanel.isFocusable(), "Panel doesn't have focusable DOM element");
 		assert.ok(oInput.isFocusable(), "The input control should now be focusable");
 
 		oPanel.setBlocked(true);
-		sap.ui.getCore().applyChanges();
+		await nextUIUpdate();
 
 		assert.ok(!oInput.isFocusable(), "The input control should be not focusable because its parent is busy");
 
@@ -186,12 +187,12 @@ sap.ui.define([
 		oUIArea.remove();
 	});
 
-	QUnit.test("Element isn't focusable when global BusyIndicator is open", function(assert) {
+	QUnit.test("Element isn't focusable when global BusyIndicator is open", async function(assert) {
 		var oUIArea = createAndAppendDiv("uiarea_focus");
 
 		var oInput = new Input();
 		oInput.placeAt("uiarea_focus");
-		sap.ui.getCore().applyChanges();
+		await nextUIUpdate();
 
 		assert.ok(oInput.isFocusable(), "The input control should now be focusable");
 
@@ -205,13 +206,13 @@ sap.ui.define([
 		oUIArea.remove();
 	});
 
-	QUnit.test("Element isn't focusable when modal Popup is open", function(assert) {
+	QUnit.test("Element isn't focusable when modal Popup is open", async function(assert) {
 		var done = assert.async();
 		var oUIArea = createAndAppendDiv("uiarea_focus");
 
 		var oInput = new Input();
 		oInput.placeAt("uiarea_focus");
-		sap.ui.getCore().applyChanges();
+		await nextUIUpdate();
 
 		assert.ok(oInput.isFocusable(), "The input control should now be focusable");
 
@@ -249,7 +250,7 @@ sap.ui.define([
 		oDialog.open();
 	});
 
-	QUnit.test("Element is focusable even when it's covered due to scrolling", function(assert) {
+	QUnit.test("Element is focusable even when it's covered due to scrolling", async function(assert) {
 		var done = assert.async();
 		var sContent =
 			"<div style='overflow-y: scroll; height: 400px; position:relative'>" +
@@ -264,7 +265,7 @@ sap.ui.define([
 
 		var oInput = new Input();
 		oInput.placeAt("uiarea11");
-		sap.ui.getCore().applyChanges();
+		await nextUIUpdate();
 
 		// focus the last <input> causes the "uiarea11" to scorlled out of the view port
 		document.getElementById("input11").focus();

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

@@ -1,8 +1,9 @@
 /*global QUnit */
 sap.ui.define([
 	'sap/ui/qunit/utils/createAndAppendDiv',
+	"sap/ui/qunit/utils/nextUIUpdate",
 	'sap/ui/core/Control'
-], function(createAndAppendDiv, Control) {
+], function(createAndAppendDiv, nextUIUpdate, Control) {
 	"use strict";
 
 	createAndAppendDiv("content");
@@ -143,7 +144,7 @@ sap.ui.define([
 			this.element = new SelectorControl("testId:that:_needs-escaping");
 			this.element.placeAt("content");
 			this.element.rerender();
-			sap.ui.getCore().applyChanges();
+			return nextUIUpdate();
 		},
 		afterEach: function() {
 			this.element.destroy();

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

@@ -2,8 +2,9 @@
 
 sap.ui.define([
 	'sap/ui/core/Control',
-	'sap/ui/core/EnabledPropagator'
-	], function(Control, EnabledPropagator) {
+	'sap/ui/core/EnabledPropagator',
+	"sap/ui/qunit/utils/nextUIUpdate"
+	], function(Control, EnabledPropagator, nextUIUpdate) {
 	"use strict";
 
 	var CustomControl = Control.extend("CustomControl", {
@@ -121,21 +122,21 @@ sap.ui.define([
 			oParentControl.destroy();
 		});
 
-		QUnit.test("Move Focus to next focusable parent control - " + ControlClass.getMetadata().getName(), function(assert) {
+		QUnit.test("Move Focus to next focusable parent control - " + ControlClass.getMetadata().getName(), async function(assert) {
 			var oChildControl = new ControlClass();
 			var oParentControl = new CustomContainerControl();
 
 			oParentControl.setContent(oChildControl);
 			oParentControl.placeAt("qunit-fixture");
 
-			sap.ui.getCore().applyChanges();
+			await nextUIUpdate();
 
 			oChildControl.focus();
 			assert.ok(oChildControl.getDomRef().contains(document.activeElement), "Child control should be focused.");
 
 			oChildControl.setEnabled(false);
-			// applyChanges as 'setEnabled' invalidates the control
-			sap.ui.getCore().applyChanges();
+			// flush as 'setEnabled' invalidates the control
+			await nextUIUpdate();
 
 			assert.ok(oParentControl.getDomRef().contains(document.activeElement), "Focus should be moved to parent control.");
 			oParentControl.destroy();

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

@@ -1,10 +1,11 @@
 /*global QUnit */
 sap.ui.define([
-	"sap/ui/base/EventProvider"
-], function(EventProvider) {
+	"sap/ui/base/EventProvider",
+	"sap/ui/core/EventBus"
+], function(EventProvider, EventBus) {
 	"use strict";
 
-	var oBus = sap.ui.getCore().getEventBus();
+	var oBus = EventBus.getInstance();
 
 	function checkNumberOfListeners(assert, oEventProvider, sEventId, iExpected) {
 		if (oEventProvider) {

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

@@ -700,7 +700,7 @@ sap.ui.define([
 			.atLeast(0)
 			.callThrough();
 		oSapUiMock.expects("require")
-			.withExactArgs("sap/ui/core/message/MessageManager")
+			.withExactArgs("sap/ui/core/Messaging")
 			.atLeast(0)
 			.callThrough();
 

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

@@ -1,10 +1,11 @@
 /*global QUnit */
 sap.ui.define([
+	"sap/ui/core/EventBus",
 	"sap/ui/events/F6Navigation",
 	"sap/ui/events/KeyCodes",
 	"sap/ui/qunit/QUnitUtils",
 	"../resources/fastnav"
-], function(F6Navigation, KeyCodes, qutils, fastnav) {
+], function(EventBus, F6Navigation, KeyCodes, qutils, fastnav) {
 	"use strict";
 
 	// Enhance the Navigation Handler to use the test scope only (not the QUnit related DOM) and the target of the event instead of the activeElement
@@ -32,7 +33,7 @@ sap.ui.define([
 
 
 
-	sap.ui.getCore().getEventBus().subscribe("fastnav", "screenready", function() {
+	EventBus.getInstance().subscribe("fastnav", "screenready", function() {
 		// exports of 'fastnav'
 		var oPopup1 = window.oPopup1;
 		var oPopup2 = window.oPopup2;

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

@@ -1,12 +1,12 @@
 /*global QUnit */
 sap.ui.define([
 	"sap/ui/events/F6Navigation",
-	"sap/ui/core/Core",
 	"sap/ui/core/mvc/XMLView",
 	"sap/ui/events/KeyCodes",
 	"sap/ui/qunit/QUnitUtils",
-	"sap/ui/qunit/utils/createAndAppendDiv"
-], function(F6Navigation, Core, XMLView, KeyCodes, QUnitUtils, createAndAppendDiv) {
+	"sap/ui/qunit/utils/createAndAppendDiv",
+	"sap/ui/qunit/utils/nextUIUpdate"
+], function(F6Navigation, XMLView, KeyCodes, QUnitUtils, createAndAppendDiv, nextUIUpdate) {
 	"use strict";
 
 	// Test setup
@@ -97,9 +97,9 @@ sap.ui.define([
 			pView = XMLView.create({
 				id: "xmlView",
 				viewName: "sap.ui.fastnav.view.FastNavigation"
-			}).then(function(oView) {
+			}).then(async function(oView) {
 				oView.placeAt("content");
-				Core.applyChanges();
+				await nextUIUpdate();
 				return oView;
 			});
 			return pView;