@openui5/sap.ui.core 1.117.1 → 1.118.0

package/test/sap/ui/core/qunit/generic/DuplicateIdCheck.qunit.js

@@ -5,8 +5,9 @@
 
 sap.ui.define([
 	"sap/ui/test/generic/TestBase",
-	"sap/ui/test/generic/Utils"
-], function (TestBase, Utils) {
+	"sap/ui/test/generic/Utils",
+	"sap/ui/qunit/utils/nextUIUpdate"
+], function (TestBase, Utils, nextUIUpdate) {
 	"use strict";
 
 	/**
@@ -75,15 +76,15 @@ sap.ui.define([
 					Utils.fillControlAggregations(oControl1, this.getObjectCapabilities()),
 					Utils.fillControlProperties(oControl2, oObjectCapabilities),
 					Utils.fillControlAggregations(oControl2, this.getObjectCapabilities())
-				]).then(function() {
+				]).then(async function() {
 					if (bCanRender) {
 						oControl1.placeAt("qunit-fixture");
 						oControl2.placeAt("qunit-fixture");
-						sap.ui.getCore().applyChanges();
+						await nextUIUpdate();
 
 						oControl1.rerender();
 						oControl2.rerender();
-						sap.ui.getCore().applyChanges();
+						await nextUIUpdate();
 
 						assert.ok(true, sControlName + " can be instantiated multiple times without duplicate ID errors.");
 					} else {
@@ -93,7 +94,7 @@ sap.ui.define([
 					// cleanup
 					oControl1.destroy();
 					oControl2.destroy();
-					sap.ui.getCore().applyChanges();
+					await nextUIUpdate();
 				});
 			}.bind(this));
 		}

package/test/sap/ui/core/qunit/generic/legacy/ControlIterator.qunit.js

@@ -2,8 +2,8 @@
 sap.ui.define([
 	"sap/ui/qunit/utils/ControlIterator",
 	"sap/ui/core/Control",
-	"sap/base/util/ObjectPath"
-], function(ControlIterator, Control, ObjectPath) {
+	"sap/ui/qunit/utils/nextUIUpdate"
+], function(ControlIterator, Control, nextUIUpdate) {
 	"use strict";
 
 	// disable require.js to avoid issues with thirdparty
@@ -186,7 +186,7 @@ sap.ui.define([
 								function() {
 									var oRenderer = oControl.getMetadata().getRenderer();
 									oControl.placeAt("content");
-									sap.ui.getCore().applyChanges();
+									await nextUIUpdate();
 								}, sControlName + " should not be able to render"
 							);
 						}
@@ -205,15 +205,15 @@ sap.ui.define([
 			ControlIterator.run(function(sControlName, oControlClass, oInfo) {
 
 				if (oInfo.canInstantiate && oInfo.canRender) {
-					QUnit.test("Trying to render control " + sControlName, function(assert) {
+					QUnit.test("Trying to render control " + sControlName, async function(assert) {
 						var oControl = new oControlClass();
 						oControl.placeAt("content");
-						sap.ui.getCore().applyChanges();
+						await nextUIUpdate();
 
 						// nope :-(    assert.ok(oControl.getDomRef(), sControlName + " should have rendered something");
 
 						oControl.destroy();
-						sap.ui.getCore().applyChanges();
+						await nextUIUpdate();
 
 						assert.ok(true, sControlName + " seems to have rendered successfully");
 					});

package/test/sap/ui/core/qunit/generic/legacy/ControlMemoryLeaks.qunit.js

@@ -18,8 +18,9 @@ sap.ui.define([
 	"sap/ui/core/Element",
 	"sap/ui/core/Lib",
 	"sap/ui/dom/includeStylesheet",
+	"sap/ui/qunit/utils/nextUIUpdate",
 	"require"
-], function (Log, ObjectPath, VersionInfo, Element, Library, includeStylesheet, require) {
+], function (Log, ObjectPath, VersionInfo, Element, Library, includeStylesheet, nextUIUpdate, require) {
 	"use strict";
 
 	/*global QUnit */
@@ -279,7 +280,7 @@ sap.ui.define([
 
 	// Creates and renders two instances of the given control and asserts that the second instance does not leak any controls after destruction.
 	// Has some special logic to ignore or work around problems where certain controls do not work standalone.
-	function checkControl(oControlClass, assert) {
+	async function checkControl(oControlClass, assert) {
 		var sControlName = oControlClass.getMetadata().getName();
 
 		var //mPrePreElements = Element.registry.all(),
@@ -304,13 +305,13 @@ sap.ui.define([
 
 		if (bCanRender) {
 			oControl1.placeAt("qunit-fixture");
-			sap.ui.getCore().applyChanges();
+			await nextUIUpdate();
 		} else {
 			// reported below
 		}
 
 		oControl1.destroy();
-		sap.ui.getCore().applyChanges();
+		await nextUIUpdate();
 
 
 		// Render Control Instance 2 - any new controls leaked?
@@ -322,10 +323,10 @@ sap.ui.define([
 
 		if (bCanRender) {
 			oControl2.placeAt("qunit-fixture");
-			sap.ui.getCore().applyChanges();
+			await nextUIUpdate();
 
-			oControl2.rerender();  // just re-render again - this finds problems
-			sap.ui.getCore().applyChanges();
+			oControl2.invalidate();  // just re-render again - this finds problems
+			await nextUIUpdate();
 
 			iFullyTestedControls++;
 		} else {
@@ -337,7 +338,7 @@ sap.ui.define([
 		// check what's left after destruction
 
 		oControl2.destroy();
-		sap.ui.getCore().applyChanges();
+		await nextUIUpdate();
 		var mPostElements = Element.registry.all();
 
 		// controls left over by second instance are real leaks that will grow proportionally to instance count => ERROR
@@ -395,12 +396,14 @@ sap.ui.define([
 					assert.expect(0);
 				}
 
-				return Promise.all(
-					aControls.map(function(sControlName) {
-						if (sControlName) {
-							iAllControls++;
+				var pControlChain = Promise.resolve();
 
-							if (!shouldIgnoreControl(sControlName, assert)) {
+				aControls.forEach(function(sControlName) {
+					if (sControlName) {
+						iAllControls++;
+
+						if (!shouldIgnoreControl(sControlName, assert)) {
+							pControlChain = pControlChain.then(function() {
 								return loadClass(sControlName).then(function(oControlClass) {
 									if ( !oControlClass ) {
 										Log.error("Could not load control class " + sControlName);
@@ -408,11 +411,11 @@ sap.ui.define([
 									}
 									return checkControl(oControlClass, assert);
 								});
-							}
+							});
 						}
-						return;
-					}));
-
+					}
+				});
+				return pControlChain;
 			});
 		});
 

package/test/sap/ui/core/qunit/generic/legacy/DuplicateIdCheck.qunit.js

@@ -17,8 +17,9 @@ sap.ui.define([
 	"sap/ui/commons/TextField",
 	"sap/m/Text",
 	"sap/ui/dom/includeStylesheet",
+	"sap/ui/qunit/utils/nextUIUpdate",
 	"require"
-], function (Log, ObjectPath, VersionInfo, DataType, Element, Control, Item, Library, CommonsTextField, MobileText, includeStylesheet, require) {
+], function (Log, ObjectPath, VersionInfo, DataType, Element, Control, Item, Library, CommonsTextField, MobileText, includeStylesheet, nextUIUpdate, require) {
 	"use strict";
 
 	var aKnownLibraries = [
@@ -389,16 +390,16 @@ sap.ui.define([
 			fillControlAggregations(oControl1, assert),
 			fillControlProperties(oControl2),
 			fillControlAggregations(oControl2, assert)
-		]).then(function() {
+		]).then(async function() {
 
 			if (bCanRender) {
 				oControl1.placeAt("qunit-fixture");
 				oControl2.placeAt("qunit-fixture");
-				sap.ui.getCore().applyChanges();
+				await nextUIUpdate();
 
-				oControl1.rerender();
-				oControl2.rerender();
-				sap.ui.getCore().applyChanges();
+				oControl1.invalidate();
+				oControl2.invalidate();
+				await nextUIUpdate();
 
 				iFullyTestedControls++;
 				assert.ok(true, sControlName + " can be instantiated multiple times without duplicate ID errors.");
@@ -410,7 +411,7 @@ sap.ui.define([
 			// cleanup
 			oControl1.destroy();
 			oControl2.destroy();
-			sap.ui.getCore().applyChanges();
+			await nextUIUpdate();
 		});
 	}
 

package/test/sap/ui/core/qunit/i18n/LocaleData.qunit.js

@@ -1062,8 +1062,7 @@ sap.ui.define([
 			{scale: "day", sign: 1, pattern: "bar {0}"}
 		]);
 	});
-
-	//*********************************************************************************************
+	/** @deprecated As of version 1.113.0 */
 	QUnit.test("CustomLocaleData: getFirstDayOfWeek", function(assert) {
 		var oCustomLocaleData = LocaleData.getInstance(new Locale("en_US-x-sapufmt")),
 			oFormatSettings = Configuration.getFormatSettings();

package/test/sap/ui/core/qunit/internal/1Ring.qunit.html

@@ -1,7 +1,7 @@
 <!DOCTYPE HTML>
 
 <!--
-	Tested class: all UI5 services code
+	Tested class: all code maintained by the OData V4 team (no coverage for SyncPromise)
 -->
 
 <html>
@@ -12,34 +12,29 @@
 		<base href="../../../../../../">
 
 		<script src="test-resources/sap/ui/core/shared-config.js"></script>
-		<link href="test-resources/sap/ui/core/qunit/thirdparty/qunit-2.18.css" media="screen" rel="stylesheet">
-		<script src="test-resources/sap/ui/core/qunit/thirdparty/qunit-2.18.js"></script>
-		<script src="test-resources/sap/ui/core/qunit/thirdparty/sinon-14.0.js"></script>
-		<!-- minimal bootstrap code starts here -->
-		<!-- @see sap-ui-core.js, @see BootstrapMinimal.qunit.html -->
-		<script src="resources/ui5loader.js"></script>
-		<script src="test-resources/sap/ui/core/qunit/internal/1Ring_handleAbort.js"></script>
-		<!-- BEWARE: data-sap-ui-async="true" prevents code coverage! -->
-		<script id="sap-ui-bootstrap" src="resources/ui5loader-autoconfig.js"
+		<script id="sap-ui-bootstrap" src="resources/sap-ui-core.js"
+			data-sap-ui-async="true"
 			data-sap-ui-compatversion="edge"
 			data-sap-ui-libs="sap.m"
-			data-sap-ui-resourceroots='{
-				"sap/ui/core/qunit" : "test-resources/sap/ui/core/qunit",
-				"sap/ui/test/qunit" : "test-resources/sap/ui/test/qunit"
+			data-sap-ui-resourceRoots='{
+				"sap.ui.core.qunit": "test-resources/sap/ui/core/qunit",
+				"sap.ui.test.qunit" : "test-resources/sap/ui/test/qunit"
 			}'
 			data-sap-ui-xx-waitForTheme="init">
 		</script>
-		<!-- end of minimal bootstrap code -->
+
+		<link href="test-resources/sap/ui/core/qunit/thirdparty/qunit-2.18.css" media="screen"
+			rel="stylesheet">
+		<script src="test-resources/sap/ui/core/qunit/thirdparty/qunit-2.18.js"></script>
+		<script src="test-resources/sap/ui/core/qunit/thirdparty/sinon-14.0.js"></script>
 		<script src="resources/sap/ui/qunit/qunit-junit.js"></script>
 		<script src="resources/sap/ui/qunit/QUnitUtils.js"></script>
 		<script src="resources/sap/ui/qunit/sinon-qunit-bridge.js"></script>
-		<script src="resources/sap/ui/qunit/qunit-coverage.js"
-			data-cover-flags="branchTracking"
+		<script src="resources/sap/ui/test/ModuleTracking.js"></script>
+		<script src="resources/sap/ui/qunit/qunit-coverage-istanbul.js"
 			data-sap-ui-cover-never="[.qunit.js]"
-			data-sap-ui-cover-only="[/odata/v4/,SyncPromise,XMLPreprocessor]"
+			data-sap-ui-cover-only="[/odata/v4/,XMLPreprocessor]"
 			></script>
-		<script src="resources/sap/ui/test/BranchTracking.js"
-			data-threshold="100"></script>
 
 		<script src="test-resources/sap/ui/core/qunit/internal/1Ring.qunit.js"></script>
 	</head>

package/test/sap/ui/core/qunit/internal/1Ring.qunit.js

@@ -1,29 +1,41 @@
 /*!
- * ${copyright}
- */
-/*global QUnit */
+* ${copyright}
+*/
 
-QUnit.config.autostart = false;
-
-// Note: to cover "sap/ui/base", this MUST happen after "qunit-coverage.js" is included!
-sap.ui.require([
-	"sap/ui/core/Core"
-], function (Core) {
+(function () {
 	"use strict";
+	/*global QUnit */
+	/* eslint-disable max-nested-callbacks */
 
-	Core.boot();
+	QUnit.config.autostart = false;
 
-	// Note: cannot require these above as data-sap-ui-resourceroots is ignored until boot
-	sap.ui.require([
-		"sap/ui/core/qunit/internal/testsuite.feature-odata-v4.qunit",
-		"sap/ui/core/qunit/internal/ODataV4.qunit"
-	], function (oTestsuite) {
-		var aModules = Object.keys(oTestsuite.tests).filter(function (sTest) {
-				return !sTest.startsWith("OPA.");
-			}).map(function (sTest) {
-				return oTestsuite.tests[sTest].module[0];
-			});
+	const aRequires = [
+		"sap/ui/core/Core",
+		"sap/ui/core/qunit/odata/v4/testsuite.odatav4.qunit"
+	];
+	if (window.location.pathname.includes("1Ring")) {
+		aRequires.push("sap/ui/core/qunit/internal/testsuite.feature-odata-v4.qunit");
+	}
+
+	sap.ui.require(aRequires, function (Core, ...aSuites) {
+		const aModules = [];
 
-		sap.ui.require(aModules, Core.attachInit.bind(Core, QUnit.start.bind(QUnit, /*count*/0)));
+		aSuites.forEach((oSuite) => {
+			for (const [sName, oTest] of Object.entries(oSuite.tests)) {
+				if (!sName.startsWith("OPA.")) {
+					aModules.push(oTest.module
+						? oTest.module[0]
+						: `sap/ui/core/qunit/odata/v4/${sName}.qunit`
+					);
+				}
+			}
+		});
+
+		sap.ui.require(aModules, function () {
+			Core.ready().then(function () {
+				QUnit.config.modules.sort((oMod1, oMod2) => (oMod1.name < oMod2.name ? -1 : 1));
+				QUnit.start(0);
+			});
+		});
 	});
-});
+}());

package/test/sap/ui/core/qunit/internal/ODataV4.qunit.html

@@ -12,8 +12,8 @@
 		<base href="../../../../../../">
 
 		<script src="test-resources/sap/ui/core/shared-config.js"></script>
-		<!-- BEWARE: data-sap-ui-async="true" prevents code coverage! -->
 		<script id="sap-ui-bootstrap" src="resources/sap-ui-core.js"
+			data-sap-ui-async="true"
 			data-sap-ui-compatversion="edge"
 			data-sap-ui-libs="sap.m"
 			data-sap-ui-resourceRoots='{
@@ -22,18 +22,18 @@
 			data-sap-ui-xx-waitForTheme="init">
 		</script>
 
-		<link href="test-resources/sap/ui/core/qunit/thirdparty/qunit-2.18.css" media="screen" rel="stylesheet">
+		<link href="test-resources/sap/ui/core/qunit/thirdparty/qunit-2.18.css" media="screen"
+			rel="stylesheet">
 		<script src="test-resources/sap/ui/core/qunit/thirdparty/qunit-2.18.js"></script>
 		<script src="test-resources/sap/ui/core/qunit/thirdparty/sinon-14.0.js"></script>
 		<script src="resources/sap/ui/qunit/qunit-junit.js"></script>
 		<script src="resources/sap/ui/qunit/QUnitUtils.js"></script>
 		<script src="resources/sap/ui/qunit/sinon-qunit-bridge.js"></script>
-		<script src="resources/sap/ui/qunit/qunit-coverage.js"
-			data-cover-flags="branchTracking"
+		<script src="resources/sap/ui/test/ModuleTracking.js"></script>
+		<script src="resources/sap/ui/qunit/qunit-coverage-istanbul.js"
 			data-sap-ui-cover-only="sap/ui/model/odata/v4/"></script>
-		<script src="resources/sap/ui/test/BranchTracking.js" data-threshold="100"></script>
 
-		<script src="test-resources/sap/ui/core/qunit/internal/ODataV4.qunit.js"></script>
+		<script src="test-resources/sap/ui/core/qunit/internal/1Ring.qunit.js"></script>
 	</head>
 	<body>
 		<div id="qunit"></div>

package/test/sap/ui/core/qunit/internal/testsuite.feature-odata-v4.qunit.js

@@ -32,6 +32,10 @@ sap.ui.define(function () {
 			autostart : true
 		},
 		tests : {
+			// SyncPromise coverage only via this testsuite:
+			// resources/sap/ui/test/starter/Test.qunit.html
+			// ?testsuite=test-resources/sap/ui/core/qunit/internal/testsuite.feature-odata-v4.qunit
+			// &test=SyncPromise&coverage
 			"SyncPromise" : {
 				module : ["sap/ui/core/qunit/util/SyncPromise.qunit"]
 			},

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

@@ -5,17 +5,17 @@ sap.ui.define([
     "sap/m/Input",
     "sap/m/MessagePopover",
     "sap/m/Page",
-    "sap/ui/core/Core",
 	"sap/ui/dom/isBehindOtherElement",
-    "sap/ui/thirdparty/jquery"
-], function(App, Button, Input, MessagePopover, Page, oCore, isBehindOtherElement, jQuery) {
+    "sap/ui/thirdparty/jquery",
+    "sap/ui/qunit/utils/nextUIUpdate"
+], function(App, Button, Input, MessagePopover, Page, isBehindOtherElement, jQuery, nextUIUpdate) {
 	"use strict";
 
 	// Test functions
 
 	QUnit.module("API");
 
-	QUnit.test("isBehindOtherElement returns correct value", function (assert) {
+	QUnit.test("isBehindOtherElement returns correct value", async function (assert) {
         // Arrange
         var oInput = new Input(),
             oMessagePopover = new MessagePopover({
@@ -48,7 +48,7 @@ sap.ui.define([
 
         assert.expect(2);
         oApp.placeAt("qunit-fixture");
-        oCore.applyChanges();
+        await nextUIUpdate();
         jQuery("#qunit-fixture").css("top", "0");
         jQuery("#qunit-fixture").css("left", "0");
 
@@ -56,13 +56,13 @@ sap.ui.define([
         oButton.firePress();
 	});
 
-    QUnit.test("isBehindOtherElement returns 'false', if element is outside the visible viewport", function (assert) {
+    QUnit.test("isBehindOtherElement returns 'false', if element is outside the visible viewport", async function (assert) {
         // Arrange
         var oButton = new Button({ text: "My Button" });
 
         // QUnit fixture is usually positioned outside of the visible viewport
         oButton.placeAt("qunit-fixture");
-        oCore.applyChanges();
+        await nextUIUpdate();
 
         // Assert
         assert.strictEqual(isBehindOtherElement(oButton.getDomRef()), false, "Button is outside the visible viewport");

package/test/sap/ui/core/qunit/jquery-mobile-custom.qunit.js

@@ -12,8 +12,8 @@ sap.ui.define(["sap/ui/Device"], function (Device) {
 		this.stub(Device, "support").value({ touch: true });
 
 		// load and boot the core
-		sap.ui.require(["sap/ui/core/Core", "sap/ui/thirdparty/jquery"], function (core, jQuery) {
-			sap.ui.getCore().attachInit(function () {
+		sap.ui.require(["sap/ui/core/Core", "sap/ui/thirdparty/jquery"], function (Core, jQuery) {
+			Core.ready().then(function () {
 				assert.ok(true, "Core should initialize after loading and booting it");
 
 				// its a touch device (tablet, hybrid)
@@ -24,7 +24,7 @@ sap.ui.define(["sap/ui/Device"], function (Device) {
 
 				done();
 			});
-			core.boot();
+			Core.boot();
 		}, function (oErr) {
 			assert.strictEqual(oErr, {}, "Requiring the Core must not fail");
 		});

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

@@ -6,9 +6,10 @@ sap.ui.define([
 	"sap/ui/events/F6Navigation",
 	"sap/ui/qunit/QUnitUtils",
 	"sap/ui/core/Configuration",
+	"sap/ui/qunit/utils/nextUIUpdate",
 	// provides jQuery.sap.keyCodes
 	"jquery.sap.keycodes"
-], function(jQuery, Device, Control, F6Navigation, qutils, Configuration) {
+], function(jQuery, Device, Control, F6Navigation, qutils, Configuration, nextUIUpdate) {
 	"use strict";
 
 	// Initialization
@@ -1010,7 +1011,7 @@ sap.ui.define([
 
 				this.oControl.setChild(this.oChildControl);
 				this.oControl.placeAt("uiArea");
-				sap.ui.getCore().applyChanges();
+				return nextUIUpdate();
 			},
 			afterEach: function() {
 				this.oControl.destroy();

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

@@ -2,8 +2,9 @@
 sap.ui.define([
 	"jquery.sap.ui",
 	"sap/ui/core/Control",
-	"sap/ui/core/UIArea"
-], function(jQuery, Control, UIArea) {
+	"sap/ui/core/UIArea",
+	"sap/ui/qunit/utils/nextUIUpdate"
+], function(jQuery, Control, UIArea, nextUIUpdate) {
 	"use strict";
 
 	var TestControl = Control.extend("sap.jsunittest.Test", {
@@ -29,11 +30,10 @@ sap.ui.define([
 
 	new TestControl("preSetupCtrl1", {marker: "presetup"}).placeAt("uiAreaPreSetup1");
 	new TestControl("preSetupCtrl2", {marker: "presetup"}).placeAt("uiAreaPreSetup2");
-	sap.ui.getCore().applyChanges();
 
-	/**
-		* Some test function... TODO: implement
-		*/
+	QUnit.module("Events", {
+		before: nextUIUpdate
+	});
 
 	QUnit.test("OneRootOk", function(assert) {
 		jQuery("#uiArea1").root();
@@ -71,9 +71,9 @@ sap.ui.define([
 		assert.strictEqual(iNo3, iNo2, "No additional UIArea should have been created.");
 	});
 
-	QUnit.test("RootWithControlOk", function(assert) {
+	QUnit.test("RootWithControlOk", async function(assert) {
 		jQuery("#uiAreaTarget").root(new TestControl("testControl"));
-		sap.ui.getCore().applyChanges();
+		await nextUIUpdate();
 		assert.notStrictEqual(jQuery("#testControl").length, 0, "There should be something rendered");
 		assert.ok(sap.ui.getCore().byId("testControl") !== null, "Control should be available");
 		assert.ok(jQuery("#testControl").control()[0] !== null, "Control should be available");
@@ -92,9 +92,9 @@ sap.ui.define([
 		assert.strictEqual(jQuery("div").root().length, iNo2, "jQuery method should return all relevant roots (i.e. UIArea DOMNodes), selector div");
 	});
 
-	QUnit.test("ControlOnOutermostDomRefOk", function(assert) {
+	QUnit.test("ControlOnOutermostDomRefOk", async function(assert) {
 		jQuery("#uiAreaTarget2").root(new TestControl("testControl2"));
-		sap.ui.getCore().applyChanges();
+		await nextUIUpdate();
 
 		var oCheckCtrl = sap.ui.getCore().byId("testControl2");
 		var oCtrl = jQuery("#testControl2").control()[0];
@@ -102,9 +102,9 @@ sap.ui.define([
 		assert.ok(oCheckCtrl === oCtrl, "Created control should be returned");
 	});
 
-	QUnit.test("ControlOnInnerDomRefOk", function(assert) {
+	QUnit.test("ControlOnInnerDomRefOk", async function(assert) {
 		jQuery("#uiAreaTarget3").root(new TestControl("testControl3"));
-		sap.ui.getCore().applyChanges();
+		await nextUIUpdate();
 
 		var oCheckCtrl = sap.ui.getCore().byId("testControl3");
 		var oCtrl = jQuery("#testControl3 > .inner").control()[0];
@@ -112,23 +112,23 @@ sap.ui.define([
 		assert.ok(oCheckCtrl === oCtrl, "Created control should be returned when queried for inner node");
 	});
 
-	QUnit.test("MultipleControlsOk", function(assert) {
+	QUnit.test("MultipleControlsOk", async function(assert) {
 		jQuery("#uiAreaTarget4").root(new TestControl("testControl4", {marker: "myClass"}));
 		jQuery("#uiAreaTarget5").root(new TestControl("testControl5", {marker: "myClass"}));
 		jQuery("#uiAreaTarget6").root(new TestControl("testControl6", {marker: "myClass"}));
-		sap.ui.getCore().applyChanges();
+		await nextUIUpdate();
 
 		var aCtrls = jQuery(".myClass").control();
 
 		assert.strictEqual(aCtrls.length, 3, "All requested Controls should be returned");
 	});
 
-	QUnit.test("control check with data-sap-ui-related", function(assert) {
+	QUnit.test("control check with data-sap-ui-related", async function(assert) {
 		var oTestControl7 = new TestControl("testControl7");
 		var oTestControl8 = new TestControl("testControl8");
 
 		jQuery("#uiAreaTarget7").root(oTestControl7);
-		sap.ui.getCore().applyChanges();
+		await nextUIUpdate();
 		oTestControl7.$().attr("data-sap-ui-related", oTestControl8.getId());
 
 		var oCtrl = oTestControl7.$().control(0, true);