@openui5/sap.ui.core 1.117.0 → 1.118.0

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

@@ -3,8 +3,9 @@ sap.ui.define([
 	"sap/base/Log",
 	"sap/ui/core/InvisibleText",
 	"sap/ui/thirdparty/jquery",
-	"sap/ui/core/Configuration"
-], function(Log, InvisibleText, jQuery, Configuration) {
+	"sap/ui/core/Configuration",
+	"sap/ui/qunit/utils/nextUIUpdate"
+], function(Log, InvisibleText, jQuery, Configuration, nextUIUpdate) {
 	"use strict";
 
 	var oDIV = document.createElement("div");
@@ -13,30 +14,30 @@ sap.ui.define([
 
 	QUnit.module("");
 
-	QUnit.test("Hidden Text is really hidden", function(assert) {
+	QUnit.test("Hidden Text is really hidden", async function(assert) {
 		var iWidth = jQuery("#content").width();
 		var iHeight = jQuery("#content").height();
 
 		var text = new InvisibleText({text: "Hello"});
 		text.placeAt("content");
-		sap.ui.getCore().applyChanges();
+		await nextUIUpdate();
 
 		assert.equal(iWidth, jQuery("#content").width(), "Width of container not influenced by hidden text.");
 		assert.equal(iHeight, jQuery("#content").height(), "Height of container not influenced by hidden text.");
 		assert.ok(text.$().parent().attr("id") == "content", "Invisible Text was rendered.");
 	});
 
-	QUnit.test("Render to static area", function(assert) {
+	QUnit.test("Render to static area", async function(assert) {
 		var text = new InvisibleText({text: "Hello"});
 		text.toStatic();
-		sap.ui.getCore().applyChanges();
+		await nextUIUpdate();
 		assert.ok(text.$().parent().attr("id") == "sap-ui-static", "Invisible Text was rendered to static area");
 	});
 
-	QUnit.test("Rendering", function(assert) {
+	QUnit.test("Rendering", async function(assert) {
 		var text = new InvisibleText({text: "Hello"});
 		text.toStatic();
-		sap.ui.getCore().applyChanges();
+		await nextUIUpdate();
 		assert.equal(text.$().text(), "Hello", "Text rendered correctly");
 		text.setText("Hello2");
 		assert.equal(text.$().text(), "Hello2", "Text rendered correctly");
@@ -44,7 +45,7 @@ sap.ui.define([
 		assert.ok(text.$().hasClass("sapUiInvisibleText"), "Class sapUiInvisibleText is set");
 	});
 
-	QUnit.test("Shared Instances", function(assert) {
+	QUnit.test("Shared Instances", async function(assert) {
 		// Note: configuration enforces initial language 'en'
 		var sExpectedTextEN = sap.ui.getCore().getLibraryResourceBundle("sap.ui.core").getText("VALUE_STATE_ERROR");
 
@@ -60,7 +61,7 @@ sap.ui.define([
 
 		// switch language
 		Configuration.setLanguage("de");
-		sap.ui.getCore().applyChanges();
+		await nextUIUpdate();
 		var sExpectedTextDE = sap.ui.getCore().getLibraryResourceBundle("sap.ui.core").getText("VALUE_STATE_ERROR");
 		assert.notEqual(sExpectedTextEN, sExpectedTextDE, "texts should differ between 'en' and 'de'");
 
@@ -90,10 +91,10 @@ sap.ui.define([
 		}, this);
 	});
 
-	QUnit.test("getRendererMarkup is an equivalent of renderer output", function(assert) {
+	QUnit.test("getRendererMarkup is an equivalent of renderer output", async function(assert) {
 		var oSUT = new InvisibleText({text: "Hello"});
 		oSUT.placeAt("content");
-		sap.ui.getCore().applyChanges();
+		await nextUIUpdate();
 
 		var oDomRef = oSUT.getDomRef();
 		var oMarkupDomRef = jQuery(oSUT.getRendererMarkup())[0];

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

@@ -151,14 +151,14 @@ sap.ui.require([
 
 	QUnit.module("Static methods");
 
-	QUnit.test("Static method 'get' and '_get'", function(assert) {
-		var oLib = Library.get("my.test.library");
+	QUnit.test("Static method '_get'", function(assert) {
+		var oLib = Library._get("my.test.library");
 		assert.notOk(oLib, "Library instance should not be created without giving the second parameter");
 
 		oLib = Library._get("my.test.library", true);
 		assert.ok(oLib instanceof Library, "Library instance is created");
 
-		var oLibCopy = Library.get("my.test.library");
+		var oLibCopy = Library._get("my.test.library");
 		assert.strictEqual(oLibCopy, oLib, "Multiple call to Library.get should return the same instance");
 		assert.notOk(oLib.isSettingsEnhanced(), "Lib's settings aren't enhanced yet");
 
@@ -201,18 +201,18 @@ sap.ui.require([
 
 			// lib3 should not be preloaded as its library.js has been (pre)loaded before
 			checkLibInitialized('testlibs.scenario1.lib3');
-			var oLib3 = Library.get('testlibs.scenario1.lib3');
+			var oLib3 = Library._get('testlibs.scenario1.lib3');
 			assert.ok(oLib3, "Library instance is created");
 			sinon.assert.calledOn(Library.prototype._preload, oLib3, "Library.prototype.preload is called");
 
 			// lib4 and lib5 should have been preloaded
 			checkLibInitialized('testlibs.scenario1.lib4');
-			var oLib4 = Library.get('testlibs.scenario1.lib4');
+			var oLib4 = Library._get('testlibs.scenario1.lib4');
 			sinon.assert.calledOn(Library.prototype._preload, oLib4, "Library.prototype.preload is called");
 
 			// lib5 should load the json format as fallback
 			checkLibInitialized('testlibs.scenario1.lib5');
-			var oLib5 = Library.get('testlibs.scenario1.lib5');
+			var oLib5 = Library._get('testlibs.scenario1.lib5');
 			sinon.assert.calledOn(Library.prototype._preload, oLib5, "Library.prototype.preload is called");
 		});
 	});
@@ -388,7 +388,7 @@ sap.ui.require([
 					}
 				});
 
-				assert.ok(Library.get("sap.ui.core").controls.includes("sap.ui.core.TestControlInLibUnitTest"), "The new control is registered in the library");
+				assert.ok(Library._get("sap.ui.core").controls.includes("sap.ui.core.TestControlInLibUnitTest"), "The new control is registered in the library");
 				resolve();
 			}, reject);
 		});
@@ -420,7 +420,7 @@ sap.ui.require([
 
 				assert.notOk(Object.keys(Library.all()).includes("dummy.library"), "The library is created implicitly. But it's not listed in Library.all()");
 				assert.ok(Object.keys(Library._all(true)).includes("dummy.library"), "The library is created implicitly. And it's listed in Library._all(true) where the settings enhancement status isn't considered");
-				assert.ok(Library.get("dummy.library").controls.includes("dummy.library.TestControlInLibUnitTest"), "The new control is registered in the library");
+				assert.ok(Library._get("dummy.library").controls.includes("dummy.library.TestControlInLibUnitTest"), "The new control is registered in the library");
 				resolve();
 			}, reject);
 		});

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

@@ -8,13 +8,13 @@ sap.ui.define([
 	"sap/m/StandardListItem",
 	"sap/m/VBox",
 	"sap/ui/core/Control",
-	"sap/ui/core/Core",
 	"sap/ui/core/Element",
 	"sap/ui/core/mvc/XMLView",
 	"sap/ui/events/KeyCodes",
 	"sap/ui/thirdparty/jquery",
-	"sap/ui/qunit/QUnitUtils"
-], function(LocalBusyIndicatorSupport, BusyDialog, Button, List, Slider, StandardListItem, VBox, Control, Core, Element, XMLView, KeyCodes, jQuery, qutils) {
+	"sap/ui/qunit/QUnitUtils",
+	"sap/ui/qunit/utils/nextUIUpdate"
+], function(LocalBusyIndicatorSupport, BusyDialog, Button, List, Slider, StandardListItem, VBox, Control, Element, XMLView, KeyCodes, jQuery, qutils, nextUIUpdate) {
 	"use strict";
 
 	// Checks whether the given DomRef is contained or equals (in) one of the given container
@@ -114,7 +114,7 @@ sap.ui.define([
 			this.oFocusAfter = new Button("FocusAfter").placeAt("target1");
 			this.oSlider = new Slider().placeAt("target2");
 
-			Core.applyChanges();
+			return nextUIUpdate();
 		},
 
 		afterEach : function() {
@@ -286,7 +286,7 @@ sap.ui.define([
 
 			this.oSlider = new Slider().placeAt("target2");
 
-			Core.applyChanges();
+			return nextUIUpdate();
 		},
 
 		afterEach : function() {
@@ -381,13 +381,13 @@ sap.ui.define([
 		// setup the busy view
 		return XMLView.create({
 			definition: '<mvc:View xmlns:mvc="sap.ui.core.mvc" busyIndicatorDelay="0"></mvc:View>'
-		}).then(function(myView) {
+		}).then(async function(myView) {
 			myView.placeAt('target1');
-			Core.applyChanges();
+			await nextUIUpdate();
 			myView.setBusy(true);
 			// this rerendering is crucial to test the behavior
 			myView.invalidate();
-			Core.applyChanges();
+			await nextUIUpdate();
 			setTimeout(function() {
 				// assert
 				assert.ok(myView.$("busyIndicator").length, "BusyIndicator rendered");
@@ -439,7 +439,7 @@ sap.ui.define([
 		}
 	});
 
-	QUnit.test("OnBeforeRendering", function(assert) {
+	QUnit.test("OnBeforeRendering", async function(assert) {
 		var done = assert.async();
 
 		this.oButton.setBusyIndicatorDelay(0);
@@ -447,7 +447,7 @@ sap.ui.define([
 		this.oButton.placeAt("target1");
 		this.oButton.setBusy(true);
 
-		Core.applyChanges();
+		await nextUIUpdate();
 
 		// before delegate
 		this.oButton.addDelegate({
@@ -484,14 +484,14 @@ sap.ui.define([
 
 		// force a rendering
 		this.oButton.invalidate();
-		Core.applyChanges();
+		await nextUIUpdate();
 	});
 
-	QUnit.test("OnAfterRendering", function(assert) {
+	QUnit.test("OnAfterRendering", async function(assert) {
 		var done = assert.async();
 		assert.expect(4);
 		this.oButton.placeAt("target1");
-		Core.applyChanges();
+		await nextUIUpdate();
 		var that = this;
 
 		setTimeout(function() {
@@ -511,7 +511,7 @@ sap.ui.define([
 		}, 200);
 	});
 
-	QUnit.test("Ensuring DelayedCall Only Used Once", function(assert) {
+	QUnit.test("Ensuring DelayedCall Only Used Once", async function(assert) {
 		var done = assert.async();
 		assert.expect(2);
 
@@ -530,7 +530,7 @@ sap.ui.define([
 		};
 		this.oButton.addDelegate(oOnAfterRenderingDelegate, false, this);
 		this.oButton.placeAt("target1");
-		Core.applyChanges();
+		await nextUIUpdate();
 		var that = this;
 
 		setTimeout(function() {
@@ -553,7 +553,7 @@ sap.ui.define([
 
 	QUnit.module("Busy Animation");
 
-	QUnit.test("Check if small Animation is used", function(assert) {
+	QUnit.test("Check if small Animation is used", async function(assert) {
 		var done = assert.async();
 
 		this.oBtn = new Button({
@@ -570,7 +570,7 @@ sap.ui.define([
 		this.oBtn.addDelegate(this.oDelegate);
 		this.oSpy = sinon.spy(this.oDelegate, "onAfterRendering");
 
-		Core.applyChanges();
+		await nextUIUpdate();
 
 		setTimeout(function() {
 			var $Animation = jQuery(".sapUiLocalBusyIndicatorAnimation");
@@ -589,7 +589,7 @@ sap.ui.define([
 		}.bind(this), 50);
 	});
 
-	QUnit.test("Check if small Animation is used", function(assert) {
+	QUnit.test("Check if small Animation is used", async function(assert) {
 		var done = assert.async();
 
 		this.oBtn = new Button({
@@ -606,7 +606,7 @@ sap.ui.define([
 		this.oBtn.addDelegate(this.oDelegate);
 		this.oSpy = sinon.spy(this.oDelegate, "onAfterRendering");
 
-		Core.applyChanges();
+		await nextUIUpdate();
 
 		setTimeout(function() {
 			var $Animation = jQuery(".sapUiLocalBusyIndicatorAnimation");
@@ -625,7 +625,7 @@ sap.ui.define([
 		}.bind(this), 50);
 	});
 
-	QUnit.test("Check if animations are stacked", function(assert) {
+	QUnit.test("Check if animations are stacked", async function(assert) {
 		var done = assert.async();
 		this.oVBox = new VBox({
 			items : [
@@ -642,7 +642,7 @@ sap.ui.define([
 			busy : true
 		}).placeAt("target3");
 
-		Core.applyChanges();
+		await nextUIUpdate();
 
 		setTimeout(function() {
 			var $Animation = jQuery(".sapUiLocalBusyIndicatorAnimation");
@@ -684,7 +684,7 @@ sap.ui.define([
 		}
 	});
 
-	QUnit.test("on control which is migrated with the new renderer mechanism", function(assert) {
+	QUnit.test("on control which is migrated with the new renderer mechanism", async function(assert) {
 		// add one event delegate which set the busy state before the control is rerendered
 		this.oButton.addEventDelegate({
 			onBeforeRendering: function() {
@@ -693,14 +693,14 @@ sap.ui.define([
 		}, this.oButton);
 
 		this.oButton.placeAt("target1");
-		Core.applyChanges();
+		await nextUIUpdate();
 		this.oButton.setBusy(false);
 		// after reset the busy state, the control should be able to react to click event
 		this.testClickEventOn(this.oButton, assert);
 
 		// rerender the control to activate the busy state (problem only occurs with 2nd. rendering)
 		this.oButton.invalidate();
-		Core.applyChanges();
+		await nextUIUpdate();
 		this.oButton.setBusy(false);
 		// after reset the busy state, the control should be able to react to click event
 		this.testClickEventOn(this.oButton, assert);

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

@@ -12,9 +12,10 @@ sap.ui.define([
 	"sap/ui/thirdparty/jquery",
 	"sap/base/security/encodeXML",
 	"sap/ui/qunit/utils/createAndAppendDiv",
+	"sap/ui/qunit/utils/nextUIUpdate",
 	"sap/base/Log",
 	"sap/ui/core/Configuration"
-], function(Device, Control, Core, RenderManager, Element, HTML, IconPool, XMLView, jQuery, encodeXML, createAndAppendDiv, Log, Configuration) {
+], function(Device, Control, Core, RenderManager, Element, HTML, IconPool, XMLView, jQuery, encodeXML, createAndAppendDiv, nextUIUpdate, Log, Configuration) {
 	"use strict";
 
 	// prepare DOM
@@ -1085,13 +1086,13 @@ sap.ui.define([
 		}, Device.browser.safari ? 500 : 0);
 	});
 
-	QUnit.test("RenderManager lock", function(assert) {
+	QUnit.test("RenderManager lock", async function(assert) {
 		var oCtrl1 = new TestControl();
 		var oCtrl2 = new TestControl();
 
 		oCtrl1.placeAt("area5");
 		oCtrl2.placeAt("area5");
-		Core.applyChanges();
+		await nextUIUpdate();
 
 		oCtrl1.doBeforeRendering = function() {
 			oCtrl2.rerender();
@@ -1315,13 +1316,13 @@ sap.ui.define([
 		}, Device.browser.safari ? 500 : 0);
 	});
 
-	QUnit.test("RenderManager lock", function(assert) {
+	QUnit.test("RenderManager lock", async function(assert) {
 		var oCtrl1 = new TestControlSemanticRendering();
 		var oCtrl2 = new TestControlSemanticRendering();
 
 		oCtrl1.placeAt("area5");
 		oCtrl2.placeAt("area5");
-		Core.applyChanges();
+		await nextUIUpdate();
 
 		oCtrl1.doBeforeRendering = function() {
 			oCtrl2.rerender();
@@ -1525,7 +1526,7 @@ sap.ui.define([
 		assert.equal($img1.attr("alt"), "test alt message", "Attribute should be changed");
 	});
 
-	QUnit.test("RenderManager should not break for controls with invalid renderer", function(assert) {
+	QUnit.test("RenderManager should not break for controls with invalid renderer", async function(assert) {
 
 		var Log = sap.ui.require("sap/base/Log");
 		assert.ok(Log, "Log module should be available");
@@ -1550,7 +1551,7 @@ sap.ui.define([
 
 		// rendering should not lead to an error
 		oControl.placeAt("area8");
-		Core.applyChanges();
+		await nextUIUpdate();
 		oControl.destroy();
 
 		// check the error message
@@ -1612,10 +1613,10 @@ sap.ui.define([
 	 */
 	QUnit.module("Invisible - String based rendering");
 
-	QUnit.test("Render visible control", function(assert) {
+	QUnit.test("Render visible control", async function(assert) {
 		var oControl = new TestControl("testVisible");
 		oControl.placeAt("testArea");
-		Core.applyChanges();
+		await nextUIUpdate();
 
 		var oDomRef = document.getElementById("testVisible"),
 			oInvisbleRef = document.getElementById("sap-ui-invisible-testVisible");
@@ -1625,13 +1626,13 @@ sap.ui.define([
 		assert.ok(!oInvisbleRef, "Invisible DOM reference doesn't exist");
 
 		oControl.destroy();
-		Core.applyChanges();
+		await nextUIUpdate();
 	});
 
-	QUnit.test("Render invisible control", function(assert) {
+	QUnit.test("Render invisible control", async function(assert) {
 		var oControl = new TestControl("testVisible", {visible: false});
 		oControl.placeAt("testArea");
-		Core.applyChanges();
+		await nextUIUpdate();
 
 		var oDomRef = document.getElementById("testVisible"),
 			oInvisbleRef = document.getElementById("sap-ui-invisible-testVisible");
@@ -1641,19 +1642,19 @@ sap.ui.define([
 		assert.ok(oInvisbleRef instanceof HTMLElement, "Invisible DOM reference is an HTML element");
 
 		oControl.destroy();
-		Core.applyChanges();
+		await nextUIUpdate();
 	});
 
-	QUnit.test("Render control made visible in onBeforeRendering", function(assert) {
+	QUnit.test("Render control made visible in onBeforeRendering", async function(assert) {
 		var oControl = new TestControl("testVisible", {visible: false});
 		oControl.placeAt("testArea");
-		Core.applyChanges();
+		await nextUIUpdate();
 
 		oControl.doBeforeRendering = function() {
 			this.setVisible(true);
 		};
 		oControl.rerender();
-		Core.applyChanges();
+		await nextUIUpdate();
 
 		var oDomRef = document.getElementById("testVisible"),
 			oInvisbleRef = document.getElementById("sap-ui-invisible-testVisible");
@@ -1663,19 +1664,19 @@ sap.ui.define([
 		assert.ok(!oInvisbleRef, "Invisible DOM reference doesn't exist");
 
 		oControl.destroy();
-		Core.applyChanges();
+		await nextUIUpdate();
 	});
 
-	QUnit.test("Render control made invisible in onBeforeRendering", function(assert) {
+	QUnit.test("Render control made invisible in onBeforeRendering", async function(assert) {
 		var oControl = new TestControl("testVisible", {visible: true});
 		oControl.placeAt("testArea");
-		Core.applyChanges();
+		await nextUIUpdate();
 
 		oControl.doBeforeRendering = function() {
 			this.setVisible(false);
 		};
 		oControl.rerender();
-		Core.applyChanges();
+		await nextUIUpdate();
 
 		var oDomRef = document.getElementById("testVisible"),
 			oInvisbleRef = document.getElementById("sap-ui-invisible-testVisible");
@@ -1685,15 +1686,15 @@ sap.ui.define([
 		assert.ok(oInvisbleRef instanceof HTMLElement, "Invisible DOM reference is an HTML element");
 
 		oControl.destroy();
-		Core.applyChanges();
+		await nextUIUpdate();
 	});
 
 	QUnit.module("Invisible - Semantic Rendering");
 
-	QUnit.test("Render visible control", function(assert) {
+	QUnit.test("Render visible control", async function(assert) {
 		var oControl = new TestControlSemanticRendering("testVisible");
 		oControl.placeAt("testArea");
-		Core.applyChanges();
+		await nextUIUpdate();
 
 		var oDomRef = document.getElementById("testVisible"),
 			oInvisbleRef = document.getElementById("sap-ui-invisible-testVisible");
@@ -1703,13 +1704,13 @@ sap.ui.define([
 		assert.ok(!oInvisbleRef, "Invisible DOM reference doesn't exist");
 
 		oControl.destroy();
-		Core.applyChanges();
+		await nextUIUpdate();
 	});
 
-	QUnit.test("Render invisible control", function(assert) {
+	QUnit.test("Render invisible control", async function(assert) {
 		var oControl = new TestControlSemanticRendering("testVisible", {visible: false});
 		oControl.placeAt("testArea");
-		Core.applyChanges();
+		await nextUIUpdate();
 
 		var oDomRef = document.getElementById("testVisible"),
 			oInvisbleRef = document.getElementById("sap-ui-invisible-testVisible");
@@ -1719,16 +1720,16 @@ sap.ui.define([
 		assert.ok(oInvisbleRef instanceof HTMLElement, "Invisible DOM reference is an HTML element");
 
 		oControl.destroy();
-		Core.applyChanges();
+		await nextUIUpdate();
 	});
 
-	QUnit.test("Render control made visible in onBeforeRendering", function(assert) {
+	QUnit.test("Render control made visible in onBeforeRendering", async function(assert) {
 		var oControl = new TestControlSemanticRendering("testVisible", {visible: false});
 		oControl.doBeforeRendering = function() {
 			this.setVisible(true);
 		};
 		oControl.placeAt("testArea");
-		Core.applyChanges();
+		await nextUIUpdate();
 
 		var oDomRef = document.getElementById("testVisible"),
 			oInvisbleRef = document.getElementById("sap-ui-invisible-testVisible");
@@ -1738,16 +1739,16 @@ sap.ui.define([
 		assert.ok(!oInvisbleRef, "Invisible DOM reference doesn't exist");
 
 		oControl.destroy();
-		Core.applyChanges();
+		await nextUIUpdate();
 	});
 
-	QUnit.test("Render control made invisible in onBeforeRendering", function(assert) {
+	QUnit.test("Render control made invisible in onBeforeRendering", async function(assert) {
 		var oControl = new TestControlSemanticRendering("testVisible", {visible: true});
 		oControl.doBeforeRendering = function() {
 			this.setVisible(false);
 		};
 		oControl.placeAt("testArea");
-		Core.applyChanges();
+		await nextUIUpdate();
 
 		var oDomRef = document.getElementById("testVisible"),
 			oInvisbleRef = document.getElementById("sap-ui-invisible-testVisible");
@@ -1757,7 +1758,7 @@ sap.ui.define([
 		assert.ok(oInvisbleRef instanceof HTMLElement, "Invisible DOM reference is an HTML element");
 
 		oControl.destroy();
-		Core.applyChanges();
+		await nextUIUpdate();
 	});
 
 	/**
@@ -1828,13 +1829,13 @@ sap.ui.define([
 			this.oContainer = null;
 		},
 
-		executeTest: function (assert, fnApplyLuckyOne) {
+		executeTest: async function (assert, fnApplyLuckyOne) {
 			var oView1 = this.oView1;
 			var oView2 = this.oView2;
 			var oContainer = this.oContainer;
 			// initially show view 1. view 2 has not been rendered yet
 			oContainer.placeAt("area9");
-			Core.applyChanges();
+			await nextUIUpdate();
 			assert.ok(oView1.getDomRef(), "view1 should have DOM");
 			assert.ok(oView1.bOutput, "view1 should be marked with bOutput");
 			assert.notOk(RenderManager.isPreservedContent(oView1.getDomRef()), "DOM of view1 should not be in preserve area");
@@ -1842,7 +1843,7 @@ sap.ui.define([
 			assert.notOk(oView2.bOutput, "view2 should not be marked with bOutput");
 
 			// show view 2. view 1 will be moved to preserve area
-			fnApplyLuckyOne(1);
+			await fnApplyLuckyOne(1);
 			assert.ok(oView1.getDomRef(), "view1 still should have DOM");
 			assert.ok(RenderManager.isPreservedContent(oView1.getDomRef()), "DOM of view1 should be in preserve area");
 			assert.ok(oView1.bOutput, "view1 should be marked with bOutput");
@@ -1851,7 +1852,7 @@ sap.ui.define([
 			assert.notOk(RenderManager.isPreservedContent(oView2.getDomRef()), "DOM of view2 should not be in preserve area");
 
 			// show view 1 again (includes restore from preserve area
-			fnApplyLuckyOne(0);
+			await fnApplyLuckyOne(0);
 			assert.ok(oView1.getDomRef(), "view1 still should have DOM");
 			assert.ok(oView1.bOutput, "view1 should be marked with bOutput");
 			assert.notOk(RenderManager.isPreservedContent(oView1.getDomRef()), "DOM of view1 should not be in preserve area");
@@ -1860,7 +1861,7 @@ sap.ui.define([
 			assert.ok(RenderManager.isPreservedContent(oView2.getDomRef()), "DOM of view2 should be in preserve area");
 
 			// show view 3 (which does not exists). view 1 & 2 are moved to the preserve area
-			fnApplyLuckyOne(2);
+			await fnApplyLuckyOne(2);
 			assert.ok(oView1.getDomRef(), "view1 still should have DOM");
 			assert.ok(oView1.bOutput, "view1 should be marked with bOutput");
 			assert.ok(RenderManager.isPreservedContent(oView1.getDomRef()), "DOM of view1 should be in preserve area");
@@ -1875,43 +1876,43 @@ sap.ui.define([
 		}
 	});
 
-	QUnit.test("default rendering (string)", function(assert) {
+	QUnit.test("default rendering (string)", async function(assert) {
 		TestContainer.getMetadata().getRenderer().apiVersion = 1;
-		this.executeTest(assert, function(value) {
+		await this.executeTest(assert, async function(value) {
 			// use normal invalidation
 			this.oContainer.setTheLuckyOne(value);
 			// and force re-rendering
-			Core.applyChanges();
+			await nextUIUpdate();
 		}.bind(this));
 	});
 
-	QUnit.test("custom rendering (string)", function(assert) {
+	QUnit.test("custom rendering (string)", async function(assert) {
 		TestContainer.getMetadata().getRenderer().apiVersion = 1;
-		this.executeTest(assert, function(value) {
+		await this.executeTest(assert, function(value) {
 			// use custom rendering (leaves the preservation to the flush call)
 			this.oContainer.setTheLuckyOneAndRender(value);
 		}.bind(this));
 	});
 
-	QUnit.test("default rendering (patcher)", function(assert) {
+	QUnit.test("default rendering (patcher)", async function(assert) {
 		TestContainer.getMetadata().getRenderer().apiVersion = 2;
-		this.executeTest(assert, function(value) {
+		await this.executeTest(assert, async function(value) {
 			// use normal invalidation
 			this.oContainer.setTheLuckyOne(value);
 			// and force re-rendering
-			Core.applyChanges();
+			await nextUIUpdate();
 		}.bind(this));
 	});
 
-	QUnit.test("custom rendering (patcher)", function(assert) {
+	QUnit.test("custom rendering (patcher)", async function(assert) {
 		TestContainer.getMetadata().getRenderer().apiVersion = 2;
-		this.executeTest(assert, function(value) {
+		await this.executeTest(assert, function(value) {
 			// use custom rendering (leaves the preservation to the flush call)
 			this.oContainer.setTheLuckyOneAndRender(value);
 		}.bind(this));
 	});
 
-	QUnit.test("preservation of not-rendered, indirect descendants (grand children etc.)", function(assert) {
+	QUnit.test("preservation of not-rendered, indirect descendants (grand children etc.)", async function(assert) {
 		TestContainer.getMetadata().getRenderer().apiVersion = 2;
 		var oHtml1 = new HTML({content: "<div></div>"}),
 			oHtml2 = new HTML({content: "<div></div>"}),
@@ -1928,7 +1929,7 @@ sap.ui.define([
 
 		// act 1: initial rendering
 		oContainer.placeAt("area9");
-		Core.applyChanges();
+		await nextUIUpdate();
 
 		// assert 1: HTML1 rendered, HTML2 not yet rendered
 		assert.ok(oHtml1.getDomRef() && !RenderManager.isPreservedContent(oHtml1.getDomRef()),
@@ -1938,7 +1939,7 @@ sap.ui.define([
 
 		// act 2: switch rendered control
 		oContainer.setTheLuckyOne(1);
-		Core.applyChanges();
+		await nextUIUpdate();
 		oHtml2.$().append("<span></span>");
 		oHtml2.$().append("<span></span>");
 		oHtml2.$().append("<span></span>");
@@ -1954,7 +1955,7 @@ sap.ui.define([
 
 		// act 3: switch again
 		oContainer.setTheLuckyOne(0);
-		Core.applyChanges();
+		await nextUIUpdate();
 
 		// assert 3: HTML1 rendered, HTML2 not rendered, but preserved
 		assert.ok(oHtml1.getDomRef() && !RenderManager.isPreservedContent(oHtml1.getDomRef()),
@@ -1966,7 +1967,7 @@ sap.ui.define([
 
 		// act 4: switch again
 		oContainer.setTheLuckyOne(1);
-		Core.applyChanges();
+		await nextUIUpdate();
 
 		// assert 3: HTML1 not rendered but preserved, HTML2 rendered incl. dynamic modifications
 		assert.ok(oHtml1.getDomRef() && RenderManager.isPreservedContent(oHtml1.getDomRef()),