@openui5/sap.ui.core 1.117.1 → 1.118.0

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

@@ -11,10 +11,12 @@ sap.ui.define([
 	'sap/ui/core/UIArea',
 	'sap/ui/core/Element',
 	'sap/ui/core/Configuration',
+	'sap/ui/core/Rendering',
 	'sap/ui/core/RenderManager',
 	'sap/ui/core/theming/ThemeManager',
-	'sap/ui/qunit/utils/createAndAppendDiv'
-], function(ResourceBundle, Log, LoaderExtensions, ObjectPath, Device, Interface, VersionInfo, oCore, UIArea, Element, Configuration, RenderManager, ThemeManager, createAndAppendDiv) {
+	'sap/ui/qunit/utils/createAndAppendDiv',
+	"sap/ui/qunit/utils/nextUIUpdate"
+], function(ResourceBundle, Log, LoaderExtensions, ObjectPath, Device, Interface, VersionInfo, oCore, UIArea, Element, Configuration, Rendering, RenderManager, ThemeManager, createAndAppendDiv, nextUIUpdate) {
 	"use strict";
 
 	var privateLoaderAPI = sap.ui.loader._;
@@ -213,14 +215,16 @@ sap.ui.define([
 	});
 
 	QUnit.test("testSetThemeRoot", function(assert) {
+		var corePath, mobilePath, otherPath, oCoreLink;
+
 		oCore.setThemeRoot("my_theme", ["sap.ui.core"], "http://core.something.corp");
 		oCore.setThemeRoot("my_theme", "http://custom.something.corp");
 		oCore.setThemeRoot("my_theme", ["sap.m"], "http://mobile.something.corp");
 
 		return Promise.resolve().then(function () {
-			var corePath = ThemeManager._getThemePath("sap.ui.core", "my_theme");
-			var mobilePath = ThemeManager._getThemePath("sap.m", "my_theme");
-			var otherPath = ThemeManager._getThemePath("sap.ui.other", "my_theme");
+			corePath = ThemeManager._getThemePath("sap.ui.core", "my_theme");
+			mobilePath = ThemeManager._getThemePath("sap.m", "my_theme");
+			otherPath = ThemeManager._getThemePath("sap.ui.other", "my_theme");
 
 			assert.equal(corePath, "http://core.something.corp/sap/ui/core/themes/my_theme/", "path should be as configured");
 			assert.equal(mobilePath, "http://mobile.something.corp/sap/m/themes/my_theme/", "path should be as configured");
@@ -236,25 +240,21 @@ sap.ui.define([
 
 			// Set theme root for all libs with forceUpdate
 			oCore.setThemeRoot("test_theme", "/foo/", true);
+		}).then(function () {
+			corePath = ThemeManager._getThemePath("sap.ui.core", "test_theme");
+			oCoreLink = document.getElementById("sap-ui-theme-sap.ui.core");
 
-			return Promise.resolve().then(function () {
-				corePath = ThemeManager._getThemePath("sap.ui.core", "test_theme");
-				var oCoreLink = document.getElementById("sap-ui-theme-sap.ui.core");
-
-				assert.equal(corePath, "/foo/sap/ui/core/themes/test_theme/", "path should be as configured");
-				assert.equal(oCoreLink.getAttribute("href"), "/foo/sap/ui/core/themes/test_theme/library.css", "Stylesheet should have been updated");
+			assert.equal(corePath, "/foo/sap/ui/core/themes/test_theme/", "path should be as configured");
+			assert.equal(oCoreLink.getAttribute("href"), new URL("/foo/sap/ui/core/themes/test_theme/library.css", document.baseURI).href, "Stylesheet should have been updated");
 
-				// Set theme root for sap.ui.core lib with forceUpdate
-				oCore.setThemeRoot("test_theme", ["sap.ui.core"], "/bar/", true);
+			// Set theme root for sap.ui.core lib with forceUpdate
+			oCore.setThemeRoot("test_theme", ["sap.ui.core"], "/bar/", true);
+		}).then(function () {
+			corePath = ThemeManager._getThemePath("sap.ui.core", "test_theme");
+			oCoreLink = document.getElementById("sap-ui-theme-sap.ui.core");
 
-				return Promise.resolve().then(function () {
-					corePath = ThemeManager._getThemePath("sap.ui.core", "test_theme");
-					oCoreLink = document.getElementById("sap-ui-theme-sap.ui.core");
-
-					assert.equal(corePath, "/bar/sap/ui/core/themes/test_theme/", "path should be as configured");
-					assert.equal(oCoreLink.getAttribute("href"), "/bar/sap/ui/core/themes/test_theme/library.css", "Stylesheet should have been updated");
-				});
-			});
+			assert.equal(corePath, "/bar/sap/ui/core/themes/test_theme/", "path should be as configured");
+			assert.equal(oCoreLink.getAttribute("href"), new URL("/bar/sap/ui/core/themes/test_theme/library.css", document.baseURI).href, "Stylesheet should have been updated");
 		});
 
 	});
@@ -327,7 +327,7 @@ sap.ui.define([
 		assert.equal(oHtml.getAttribute("lang"), sLocale, "lang attribute matches locale");
 	});
 
-	QUnit.test("prerendering tasks", function (assert) {
+	QUnit.test("prerendering tasks", async function (assert) {
 		var bCalled1 = false,
 			bCalled2 = false;
 
@@ -340,19 +340,21 @@ sap.ui.define([
 			bCalled2 = true;
 		}
 
-		oCore.addPrerenderingTask(task1);
-		oCore.addPrerenderingTask(task2);
+		Rendering.addPrerenderingTask(task1);
+		Rendering.addPrerenderingTask(task2);
 
 		assert.ok(!bCalled1, "not yet called");
 		assert.ok(!bCalled2, "not yet called");
-
-		oCore.applyChanges();
+		var oMyArea = UIArea.create("qunit-fixture");
+		oMyArea.invalidate();
+		await nextUIUpdate();
 
 		assert.ok(bCalled1, "first task called");
 		assert.ok(bCalled2, "second task called");
+		oMyArea.destroy();
 	});
 
-	QUnit.test("prerendering tasks: reverse order", function (assert) {
+	QUnit.test("prerendering tasks: reverse order", async function (assert) {
 		var bCalled1 = false,
 			bCalled2 = false;
 
@@ -365,16 +367,18 @@ sap.ui.define([
 			bCalled2 = true;
 		}
 
-		oCore.addPrerenderingTask(task2);
-		oCore.addPrerenderingTask(task1, true);
+		Rendering.addPrerenderingTask(task2);
+		Rendering.addPrerenderingTask(task1, true);
 
 		assert.ok(!bCalled1, "not yet called");
 		assert.ok(!bCalled2, "not yet called");
-
-		oCore.applyChanges();
+		var oMyArea = UIArea.create("qunit-fixture");
+		oMyArea.invalidate();
+		await nextUIUpdate();
 
 		assert.ok(bCalled1, "first task called");
 		assert.ok(bCalled2, "second task called");
+		oMyArea.destroy();
 	});
 
 

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

@@ -1,11 +1,13 @@
 /*global QUnit */
 sap.ui.define([
-	"sap/ui/testlib/TestButton"
-], function(TestButton) {
+	"sap/ui/core/Rendering",
+	"sap/ui/testlib/TestButton",
+	"sap/ui/qunit/utils/nextUIUpdate"
+], function(Rendering, TestButton, nextUIUpdate) {
 	"use strict";
 
 	QUnit.test("UI dirty state - initial", function(assert) {
-		assert.equal(sap.ui.getCore().getUIDirty(), false, "UI should not be dirty initially");
+		assert.equal(Rendering.isPending(), false, "UI should not be dirty initially");
 	});
 
 	QUnit.module("Basics", {
@@ -13,12 +15,12 @@ sap.ui.define([
 			this.handler = function() {
 				assert.ok(true, "(UIUpdated event is fired)");
 			};
-			sap.ui.getCore().attachEvent("UIUpdated", this.handler);
+			Rendering.attachUIUpdated(this.handler);
 			this.button = new TestButton("myButton");
 		},
 		afterEach: function() {
 			this.button.destroy();
-			sap.ui.getCore().detachEvent("UIUpdated", this.handler);
+			Rendering.detachUIUpdated(this.handler);
 		}
 	});
 
@@ -27,35 +29,35 @@ sap.ui.define([
 		assert.expect(0);
 	});
 
-	QUnit.test("Control creation", function(assert) {
+	QUnit.test("Control creation", async function(assert) {
 		assert.expect(3); // including event handler
 		this.button.placeAt("qunit-fixture");
-		assert.equal(sap.ui.getCore().getUIDirty(), true, "UI should be dirty after placing the button into a UIArea");
+		assert.equal(Rendering.isPending(), true, "UI should be dirty after placing the button into a UIArea");
 
-		sap.ui.getCore().applyChanges();
-		assert.equal(sap.ui.getCore().getUIDirty(), false, "UI should no longer be dirty after calling applyChanges");
+		await nextUIUpdate();
+		assert.equal(Rendering.isPending(), false, "UI should no longer be dirty after calling flush");
 	});
 
 
-	QUnit.test("UI dirty on control modification", function(assert) {
+	QUnit.test("UI dirty on control modification", async function(assert) {
 		assert.expect(6);
 
 		// prepare
 		this.button.placeAt("qunit-fixture");
-		sap.ui.getCore().applyChanges();
-		assert.equal(sap.ui.getCore().getUIDirty(), false, "UI should not be dirty after applyChanges");
+		await nextUIUpdate();
+		assert.equal(Rendering.isPending(), false, "UI should not be dirty after flush");
 
 		// Act
 		this.button.setText("new text");
 
 		// Assert
-		assert.equal(sap.ui.getCore().getUIDirty(), true, "UI should be dirty after setting the button text");
+		assert.equal(Rendering.isPending(), true, "UI should be dirty after setting the button text");
 		var done = assert.async();
 		setTimeout(function() {
 			assert.equal(document.getElementById("myButton").textContent, "new text", "button should have new text after setting the button text and some timeout");
-			assert.equal(sap.ui.getCore().getUIDirty(), false, "UI should not be dirty after setting the button text and some timeout");
+			assert.equal(Rendering.isPending(), false, "UI should not be dirty after setting the button text and some timeout");
 			done();
 		}, 500);
 	});
 
-});
+});

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

@@ -19,9 +19,9 @@ sap.ui.define([], function() {
 		};
 
 		// load and boot the core
-		sap.ui.require(["sap/ui/core/Core"], function(core) {
-			core.boot();
-			sap.ui.getCore().attachInit(function() {
+		sap.ui.require(["sap/ui/core/Core"], function(Core) {
+			Core.boot();
+			Core.ready().then(function() {
 				assert.ok(true, "Core should initalize after loading and booting it");
 				done();
 			});

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

@@ -3,8 +3,9 @@
 sap.ui.define([
 	"sap/ui/core/Control",
 	"sap/ui/core/theming/Parameters",
-	"sap/ui/qunit/utils/createAndAppendDiv"
-], function(Control, Parameters, createAndAppendDiv) {
+	"sap/ui/qunit/utils/createAndAppendDiv",
+	"sap/ui/qunit/utils/nextUIUpdate"
+], function(Control, Parameters, createAndAppendDiv, nextUIUpdate) {
 	"use strict";
 
 	createAndAppendDiv("content");
@@ -48,7 +49,7 @@ sap.ui.define([
 			this.myControl = new MyControlClass("myControl", assert);
 
 			this.myControl.placeAt("content");
-			sap.ui.getCore().applyChanges();
+			return nextUIUpdate();
 		},
 		afterEach: function() {
 

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/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/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;

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

@@ -11,8 +11,9 @@ sap.ui.define([
 	"sap/ui/layout/HorizontalLayout",
 	"sap/ui/layout/VerticalLayout",
 	"sap/ui/qunit/QUnitUtils",
-	"sap/ui/qunit/utils/createAndAppendDiv"
-], function(Button, CheckBox, DatePicker, Input, Label, Popover, UIArea, KeyCodes, HorizontalLayout, VerticalLayout, qutils, createAndAppendDiv) {
+	"sap/ui/qunit/utils/createAndAppendDiv",
+	"sap/ui/qunit/utils/nextUIUpdate"
+], function(Button, CheckBox, DatePicker, Input, Label, Popover, UIArea, KeyCodes, HorizontalLayout, VerticalLayout, qutils, createAndAppendDiv, nextUIUpdate) {
 	"use strict";
 
 	// Prepare a UI
@@ -169,8 +170,6 @@ sap.ui.define([
 		]
 	}).placeAt("content");
 
-	sap.ui.getCore().applyChanges();
-
 	// Attach handler for testing
 	var bPauseEventing = false;
 	oVerticalLayout.attachValidateFieldGroup(function(oEvent) {
@@ -229,7 +228,11 @@ sap.ui.define([
 		}, 1);
 	}
 
-	QUnit.test("Input with valueHelp", function(assert) {
+	QUnit.module("FieldGroups", {
+		before: nextUIUpdate
+	});
+
+	QUnit.test("Input with valueHelp", async function(assert) {
 		assert.expect(1);
 		var done = assert.async();
 		var oButton = new Button({text: "Button"});
@@ -250,7 +253,7 @@ sap.ui.define([
 				oPopover.openBy(oEvent.getSource());
 			}
 		}).placeAt('content');
-		sap.ui.getCore().applyChanges();
+		await nextUIUpdate();
 		qutils.triggerEvent("click", oInput._getValueHelpIcon(), {});
 		oPopover.attachAfterOpen(function() {
 			assert.strictEqual(oButton.getId(), document.activeElement.id, "focus moved to popover and no fieldgroupchange must happen");