@openui5/sap.ui.core 1.117.1 → 1.118.0

package/test/sap/ui/core/qunit/testsuite.core.framework.qunit.js

@@ -59,12 +59,6 @@ sap.ui.define(function() {
 				 */
 				page: "test-resources/sap/ui/core/qunit/Core_unavoidablyUsingEval.qunit.html"
 			},
-			CoreLock: {
-				title: "sap.ui.core.Core: Core unlocks unconditionally itself upon load/init",
-				ui5: {
-					libs: "sap.m"
-				}
-			},
 			/**
 			 * The tests for the preload files all share the same test configuration.
 			 * There is only one HTML test page, which is opened with different URL parameters.

package/test/sap/ui/core/qunit/testsuites/testsuite.base.configuration.qunit.js

@@ -14,7 +14,7 @@ sap.ui.define([], function() {
 				page: "test-resources/sap/ui/core/qunit/base/Config_meta.qunit.html?sap-ui-context=meta tag"
 			},
 			"base/Config_url": {
-				page: "test-resources/sap/ui/core/qunit/base/Config_url.qunit.html?sap-ui-context=url&sap-ui-hubelDubel=value1&sap-ui-hubeldubel=value2&sap-ui-fooBar=value3&sap-ui-FooBar=value4&sap-ui-foobar=value5&sap-ui-foo-bar=value6&sap-ui-5ooBar=value7&sap-ui-sap-ui-fooBar=value8&sap-ui-sapUiFooBar=value9&sap-ui-sap.foo.bar=value10&sap-ui-xxBarFoo=value11&sap-ui-xx-farBoo=value12&sap-ui-sap/foo/bar=value13&sap-ushell-foo-bar=value14"
+				page: "test-resources/sap/ui/core/qunit/base/Config_url.qunit.html?sap-ui-context=url&sap-ui-hubelDubel=value1&sap-ui-hubeldubel=value2&sap-ui-fooBar=value3&sap-ui-FooBar=value4&sap-ui-foobar=value5&sap-ui-foo-bar=value6&sap-ui-5ooBar=value7&sap-ui-sap-ui-fooBar=value8&sap-ui-sapUiFooBar=value9&sap-ui-sap.foo.bar=value10&sap-ui-xxBarFoo=value11&sap-ui-xx-farBoo=value12&sap-ui-sap/foo/bar=value13&sap-ushell-foo-bar=value14&sap-ui-initialFalsyValue=false&sap-ui-initial-falsy-value=true"
 			},
 			"base/Config_bootstrap": {
 				page: "test-resources/sap/ui/core/qunit/base/Config_bootstrap.qunit.html"

package/test/sap/ui/core/qunit/testsuites/testsuite.databinding.qunit.js

@@ -88,9 +88,12 @@ sap.ui.define(function() {
 			ListBinding: {
 				title: "sap.ui.model.ListBinding - QUnit Tests"
 			},
-			/** @deprecated As of version 1.11.1 */
+			/** @deprecated As of version 1.11.1 reason bindContext*/
 			MasterDetail: {
-				title: "QUnit tests: databinding MasterDetail"
+				title: "QUnit tests: databinding MasterDetail",
+				module: [
+					"test-resources/sap/ui/core/qunit/MasterDetail_legacyAPIs.qunit"
+				]
 			},
 			ODataAnnotations: {
 				title: "sap.ui.model.odata.ODataAnnotations - QUnit Tests",
@@ -105,7 +108,7 @@ sap.ui.define(function() {
 			ODataListBinding: {
 				title: "sap.ui.model.odata.ODataListBinding - QUnit Tests",
 				module: [
-					"test-resources/sap/ui/core/qunit/odata/ODataListBinding.qunit"
+					"test-resources/sap/ui/core/qunit/odata/ODataListBinding_legacyAPIs.qunit"
 				]
 			},
 			ODataMessageParser: {
@@ -140,13 +143,14 @@ sap.ui.define(function() {
 			ODataModel: {
 				title: "sap.ui.model.odata.ODataModel - QUnit Tests",
 				module: [
-					"test-resources/sap/ui/core/qunit/odata/ODataModel.qunit"
+					"test-resources/sap/ui/core/qunit/odata/ODataModel_legacyAPIs.qunit"
 				]
 			},
+			/** @deprecated As of version 1.48.0 reason sap.ui.model.odata.ODataModel */
 			ODataSharedMetadata: {
 				title: "sap.ui.model.odata.ODataModel - Shared Metadata QUnit Tests",
 				module: [
-					"test-resources/sap/ui/core/qunit/odata/ODataSharedMetadata.qunit"
+					"test-resources/sap/ui/core/qunit/odata/ODataSharedMetadata_legacyAPIs.qunit"
 				],
 				sinon: {
 					useFakeTimers: true
@@ -156,7 +160,7 @@ sap.ui.define(function() {
 			ODataTreeBinding: {
 				title: "sap.ui.model.odata.ODataTreeBinding - QUnit Tests",
 				module: [
-					"test-resources/sap/ui/core/qunit/odata/ODataTreeBinding.qunit"
+					"test-resources/sap/ui/core/qunit/odata/ODataTreeBinding_legacyAPIs.qunit"
 				],
 				sinon: 1 // because MockServer is used which has a hard dependency to sinon V1
 			},

package/test/sap/ui/core/qunit/testsuites/testsuite.theming.qunit.js

@@ -85,9 +85,9 @@ sap.ui.define(["sap/ui/Device"], function(Device) {
 			"Theming": {
 				title: "sap.ui.core.Theming",
 				ui5: {
-					theme: "",
+					theme: "", // Note: this is intentionally an empty string, regression test for theme defaulting
 					themeRoots: {
-						"sap_initialThemeRoot": "/somewhere/outside"
+						"theme_with_initial_themeRoot": "/somewhere/outside"
 					}
 				},
 				qunit: {
@@ -97,9 +97,9 @@ sap.ui.define(["sap/ui/Device"], function(Device) {
 			"ThemingWoThemeManager": {
 				title: "sap.ui.core.Theming w/o sap.ui.core.theming.ThemeManager",
 				ui5: {
-					theme: "",
+					theme: "", // Note: this is intentionally an empty string, regression test for theme defaulting
 					themeRoots: {
-						"sap_initialThemeRoot": "/somewhere/outside"
+						"theme_with_initial_themeRoot": "/somewhere/outside"
 					}
 				},
 				testConfig: {
@@ -110,6 +110,29 @@ sap.ui.define(["sap/ui/Device"], function(Device) {
 				},
 				beforeBootstrap: "testdata/core/Theming.beforeBootstrap.qunit",
 				module: "testdata/core/Theming.qunit"
+			},
+			"Theming_default_and_fallback": {
+				title: "sap.ui.core.Theming - defaulting and fallbacks",
+				ui5: {
+					theme: "sap_goldreflection" // Note: deprecated and deleted theme: used for fallback test!
+				},
+				qunit: {
+					reorder: false
+				}
+			},
+			"Theming_default_and_fallback_wo_ThemeManager": {
+				title: "sap.ui.core.Theming - defaulting and fallbacks",
+				ui5: {
+					theme: "sap_goldreflection" // Note: deprecated and deleted theme: used for fallback test!
+				},
+				testConfig: {
+					themeManagerNotActive: true
+				},
+				qunit: {
+					reorder: false
+				},
+				beforeBootstrap: "testdata/core/Theming.beforeBootstrap.qunit",
+				module: "testdata/core/Theming_default_and_fallback.qunit"
 			}
 		}
 	};

package/test/sap/ui/core/qunit/tmpl/Template.qunit.js

@@ -4,8 +4,9 @@ sap.ui.define([
 	"sap/ui/core/tmpl/Template",
 	"sap/ui/model/json/JSONModel",
 	"sap/ui/thirdparty/jquery",
-	"sap/ui/thirdparty/handlebars"
-], function(Element, Template, JSONModel, jQuery, Handlebars) {
+	"sap/ui/thirdparty/handlebars",
+	"sap/ui/qunit/utils/nextUIUpdate"
+], function(Element, Template, JSONModel, jQuery, Handlebars, nextUIUpdate) {
 	"use strict";
 
 	QUnit.module("handlebars validation");
@@ -143,7 +144,7 @@ sap.ui.define([
 
 	});
 
-	QUnit.test("Rerendering on aggregation change", function(assert) {
+	QUnit.test("Rerendering on aggregation change", async function(assert) {
 
 		// create a model to validate data binding
 		var oModel = new JSONModel({
@@ -162,8 +163,8 @@ sap.ui.define([
 			type: "text/x-handlebars-template"
 		});
 
-		// force the re-rendering
-		sap.ui.getCore().applyChanges();
+		// wait for the re-rendering
+		await nextUIUpdate();
 
 		var $tmpl = jQuery("#templateWithListBinding");
 		assert.equal($tmpl.find("b").length, 1, "Found 1 B elements!");
@@ -178,8 +179,8 @@ sap.ui.define([
 		});
 		oModel.checkUpdate();
 
-		// force the re-rendering
-		sap.ui.getCore().applyChanges();
+		// wait for the re-rendering
+		await nextUIUpdate();
 
 		$tmpl = jQuery("#templateWithListBinding");
 		assert.equal($tmpl.find("b").length, 1, "Found 1 B elements!");
@@ -191,8 +192,8 @@ sap.ui.define([
 		oModel.getData()["subvalues"].pop();
 		oModel.checkUpdate();
 
-		// force the re-rendering
-		sap.ui.getCore().applyChanges();
+		// wait for the re-rendering
+		await nextUIUpdate();
 
 		$tmpl = jQuery("#templateWithListBinding");
 		assert.equal($tmpl.find("b").length, 1, "Found 1 B elements!");
@@ -242,20 +243,20 @@ sap.ui.define([
 				type: "text/x-handlebars-template"
 			});
 
-			// force the re-rendering
-			sap.ui.getCore().applyChanges();
+			// wait for the re-rendering
+			nextUIUpdate().then(function() {
+				var oTmplDom = document.getElementById("templateWithListBindingAndControls");
+				var aChildDoms = oTmplDom.querySelectorAll("[data-sap-ui]");
+				assert.equal(aChildDoms.length, 2, "Found 2 UI5 controls!");
+				assert.equal(Element.closestTo(aChildDoms[0]).getText(), "First subvalue", "Text for 1st control is correct!");
+				assert.equal(Element.closestTo(aChildDoms[1]).getText(), "Second subvalue", "Text for 2st control is correct!");
+				assert.ok(aChildDoms[0].classList.contains("test1"), "First Custom Style Classes is set!");
+				assert.ok(aChildDoms[0].classList.contains("test2"), "Second Custom Style Classes is set!");
+				assert.ok(Element.closestTo(aChildDoms[0]).hasStyleClass("test1"), "First Custom Style Classes is set!");
+				assert.ok(Element.closestTo(aChildDoms[0]).hasStyleClass("test2"), "Second Custom Style Classes is set!");
 
-			var oTmplDom = document.getElementById("templateWithListBindingAndControls");
-			var aChildDoms = oTmplDom.querySelectorAll("[data-sap-ui]");
-			assert.equal(aChildDoms.length, 2, "Found 2 UI5 controls!");
-			assert.equal(Element.closestTo(aChildDoms[0]).getText(), "First subvalue", "Text for 1st control is correct!");
-			assert.equal(Element.closestTo(aChildDoms[1]).getText(), "Second subvalue", "Text for 2st control is correct!");
-			assert.ok(aChildDoms[0].classList.contains("test1"), "First Custom Style Classes is set!");
-			assert.ok(aChildDoms[0].classList.contains("test2"), "Second Custom Style Classes is set!");
-			assert.ok(Element.closestTo(aChildDoms[0]).hasStyleClass("test1"), "First Custom Style Classes is set!");
-			assert.ok(Element.closestTo(aChildDoms[0]).hasStyleClass("test2"), "Second Custom Style Classes is set!");
-
-			done();
+				done();
+			});
 		});
 	});
 
@@ -300,20 +301,20 @@ sap.ui.define([
 				type: "text/x-handlebars-template"
 			});
 
-			// force the re-rendering
-			sap.ui.getCore().applyChanges();
+			// wait for the re-rendering
+			nextUIUpdate().then(function() {
+				var oTmplDom = document.getElementById("templateWithListBindingAndControls");
+				var aChildDoms = oTmplDom.querySelectorAll("[data-sap-ui]");
+				assert.equal(aChildDoms.length, 2, "Found 2 UI5 controls!");
+				assert.equal(Element.closestTo(aChildDoms[0]).getText(), "First subvalue", "Text for 1st control is correct!");
+				assert.equal(Element.closestTo(aChildDoms[1]).getText(), "Second subvalue", "Text for 2st control is correct!");
+				assert.ok(aChildDoms[0].classList.contains("test1"), "First Custom Style Classes is set!");
+				assert.ok(aChildDoms[0].classList.contains("test2"), "Second Custom Style Classes is set!");
+				assert.ok(Element.closestTo(aChildDoms[0]).hasStyleClass("test1"), "First Custom Style Classes is set!");
+				assert.ok(Element.closestTo(aChildDoms[0]).hasStyleClass("test2"), "Second Custom Style Classes is set!");
 
-			var oTmplDom = document.getElementById("templateWithListBindingAndControls");
-			var aChildDoms = oTmplDom.querySelectorAll("[data-sap-ui]");
-			assert.equal(aChildDoms.length, 2, "Found 2 UI5 controls!");
-			assert.equal(Element.closestTo(aChildDoms[0]).getText(), "First subvalue", "Text for 1st control is correct!");
-			assert.equal(Element.closestTo(aChildDoms[1]).getText(), "Second subvalue", "Text for 2st control is correct!");
-			assert.ok(aChildDoms[0].classList.contains("test1"), "First Custom Style Classes is set!");
-			assert.ok(aChildDoms[0].classList.contains("test2"), "Second Custom Style Classes is set!");
-			assert.ok(Element.closestTo(aChildDoms[0]).hasStyleClass("test1"), "First Custom Style Classes is set!");
-			assert.ok(Element.closestTo(aChildDoms[0]).hasStyleClass("test2"), "Second Custom Style Classes is set!");
-
-			done();
+				done();
+			});
 		});
 	});
 

package/test/sap/ui/core/qunit/types/DateFormat.qunit.js

@@ -4968,4 +4968,17 @@ sap.ui.define([
 			DateFormat.getDateTimeWithTimezoneInstance().getSampleValue(),
 			[UI5Date.getInstance("2012-12-31T23:59:58.123"), "Europe/Berlin"]);
 	});
+
+	//*****************************************************************************************************************
+	// BCP 002075129400005085862023
+	QUnit.test("DateTime parse, format options style=long, UTC=true, locale=zh_CN", function (assert) {
+		var oParsedDate,
+			oDate = UI5Date.getInstance("2021-10-13T02:22:33Z"),
+			oFormat = DateFormat.getDateTimeInstance({style : "long", UTC : true}, new Locale("zh_CN"));
+
+		// code under test
+		oParsedDate = oFormat.parse(oFormat.format(oDate));
+
+		assert.deepEqual(oParsedDate, oDate);
+	});
 });

package/test/sap/ui/core/qunit/types/DateInterval.qunit.js

@@ -130,7 +130,7 @@ sap.ui.define([
 	//*********************************************************************************************
 	QUnit.test("parseValue", function (assert) {
 		var oDate1 = UI5Date.getInstance(2003, 10, 6),
-			oDate2 = UI5Date.getInstance(2003, 11, 6, 23, 59, 59, 999),
+			oDate2 = UI5Date.getInstance(2003, 11, 6, 23, 59, 59, 0),
 			oDateInterval = new DateInterval({format: "yMMMd"});
 
 		assert.deepEqual(oDateInterval.parseValue("", "string"), [null, null],
@@ -158,7 +158,7 @@ sap.ui.define([
 	QUnit.test("parseValue: UTC", function (assert) {
 		var oDateInterval = new DateInterval({UTC: true}),
 			oUTCDate1 = UI5Date.getInstance(Date.UTC(2003, 10, 6, 0, 0, 0, 0)),
-			oUTCDate2 = UI5Date.getInstance(Date.UTC(2003, 11, 6, 23, 59, 59, 999));
+			oUTCDate2 = UI5Date.getInstance(Date.UTC(2003, 11, 6, 23, 59, 59, 0));
 
 		// code under test
 		assert.deepEqual(oDateInterval.parseValue("Nov 6, 2003 - Dec 6, 2003", "string"), [oUTCDate1, oUTCDate2]);

package/test/sap/ui/core/qunit/util/BusyIndicatorNoCore.qunit.js

@@ -10,7 +10,7 @@ sap.ui.define([
 ) {
 	"use strict";
 
-	var bInitialized = oCore.isInitialized();
+	var bInitialized = false;
 
 	var oSpyShow = sinon.spy(BusyIndicator, "show");
 	var oSpyShowNowIfRequested = sinon.spy(BusyIndicator, "_showNowIfRequested");
@@ -45,7 +45,7 @@ sap.ui.define([
 	QUnit.test("Check if 'show' waits for DOM", function (assert) {
 		var done = assert.async();
 
-		oCore.attachInit(function () {
+		oCore.ready().then(function () {
 			assert.notOk(bInitialized, "Core wasn't ready when 'show' was called");
 			assert.ok(oSpyShow.callCount > 1, "'show' called more than once");
 

package/test/sap/ui/core/qunit/util/InvisibleMessage.qunit.js

@@ -6,9 +6,9 @@ sap.ui.define([
 	"sap/ui/core/InvisibleMessage",
 	"sap/base/Log",
 	"sap/ui/thirdparty/sinon",
+	"sap/ui/qunit/utils/nextUIUpdate",
 	"sap/ui/thirdparty/sinon-qunit"
-
-], function (Core, coreLibrary, InvisibleMessage, Log, sinon) {
+], function (Core, coreLibrary, InvisibleMessage, Log, sinon, nextUIUpdate) {
 	"use strict";
 
 	var InvisibleMessageMode = coreLibrary.InvisibleMessageMode;
@@ -44,7 +44,7 @@ sap.ui.define([
 		assert.ok(fnInfoSpy.called, "An info message should be displayed when calling the method with invalid mode.");
 	});
 
-	QUnit.test("Clearing of element content", function(assert) {
+	QUnit.test("Clearing of element content", async function(assert) {
 		// Arrange
 		var oInvisibleMessage = InvisibleMessage.getInstance(),
 			oStatic = Core.getStaticAreaRef(),
@@ -61,7 +61,7 @@ sap.ui.define([
 		assert.strictEqual(oAssertiveMarkup.textContent, "Announcement",  "The text of the assertive span should have been changed.");
 
 		this.clock.tick(4000);
-		sap.ui.getCore().applyChanges();
+		await nextUIUpdate();
 
 		// Assert
 		assert.strictEqual(oAssertiveMarkup.textContent, "",  "The text of the assertive span should be cleared out.");

package/test/sap/ui/core/qunit/util/LabelEnablement.qunit.js

@@ -3,8 +3,6 @@
 sap.ui.define([
 	"sap/ui/core/Control",
 	"sap/ui/core/LabelEnablement",
-	"sap/ui/core/Core",
-	"sap/ui/core/ResizeHandler",
 	"sap/m/Label",
 	"sap/m/Button",
 	"sap/m/Link",
@@ -15,12 +13,11 @@ sap.ui.define([
 	"sap/ui/layout/form/FormElement",
 	"sap/ui/mdc/Field",
 	"sap/ui/mdc/field/content/ContentFactory",
-	"sap/ui/qunit/utils/createAndAppendDiv"
+	"sap/ui/qunit/utils/createAndAppendDiv",
+	"sap/ui/qunit/utils/nextUIUpdate"
 ], function(
 	Control,
 	LabelEnablement,
-	Core,
-	ResizeHandler,
 	Label,
 	Button,
 	Link,
@@ -31,7 +28,8 @@ sap.ui.define([
 	FormElement,
 	Field,
 	ContentFactory,
-	createAndAppendDiv
+	createAndAppendDiv,
+	nextUIUpdate
 ) {
 	"use strict";
 
@@ -119,7 +117,7 @@ sap.ui.define([
 			this.oLabel.placeAt("content");
 			this.oControl1.placeAt("content");
 			this.oControl2.placeAt("content");
-			Core.applyChanges();
+			return nextUIUpdate();
 		},
 		afterEach : function () {
 			this.oLabel.destroy();
@@ -151,9 +149,9 @@ sap.ui.define([
 		assert.strictEqual(this.oControl2.$().attr("aria-labelledby"), "testControl2-additionalLabel", "No aria-labelledby reference to label in control 1");
 	});
 
-	QUnit.test("Label assignment done with LabelFor association", function(assert) {
+	QUnit.test("Label assignment done with LabelFor association", async function(assert) {
 		this.oLabel.setLabelFor(this.oControl1);
-		Core.applyChanges();
+		await nextUIUpdate();
 
 		assert.strictEqual(LabelEnablement.getReferencingLabels(this.oControl1).length, 1, "Label assigned to control 1");
 		assert.strictEqual(LabelEnablement.getReferencingLabels(this.oControl1)[0], "testLabel", "Label assigned to control 1");
@@ -163,9 +161,9 @@ sap.ui.define([
 		assert.strictEqual(this.oControl2.$().attr("aria-labelledby"), "testControl2-additionalLabel", "No aria-labelledby reference to label in control 1");
 	});
 
-	QUnit.test("Label assignment done with setAlternativeLabelFor", function(assert) {
+	QUnit.test("Label assignment done with setAlternativeLabelFor", async function(assert) {
 		this.oLabel.setAlternativeLabelFor(this.oControl1);
-		Core.applyChanges();
+		await nextUIUpdate();
 
 		assert.strictEqual(LabelEnablement.getReferencingLabels(this.oControl1).length, 1, "Label assigned to control 1");
 		assert.strictEqual(LabelEnablement.getReferencingLabels(this.oControl1)[0], "testLabel", "Label assigned to control 1");
@@ -175,10 +173,10 @@ sap.ui.define([
 		assert.strictEqual(this.oControl2.$().attr("aria-labelledby"), "testControl2-additionalLabel", "No aria-labelledby reference to label in control 1");
 	});
 
-	QUnit.test("Label assignment done with LabelFor association and setAlternativeLabelFor - association wins", function(assert) {
+	QUnit.test("Label assignment done with LabelFor association and setAlternativeLabelFor - association wins", async function(assert) {
 		this.oLabel.setLabelFor(this.oControl1);
 		this.oLabel.setAlternativeLabelFor(this.oControl2);
-		Core.applyChanges();
+		await nextUIUpdate();
 
 		assert.strictEqual(LabelEnablement.getReferencingLabels(this.oControl1).length, 1, "Label assigned to control 1");
 		assert.strictEqual(LabelEnablement.getReferencingLabels(this.oControl1)[0], "testLabel", "Label assigned to control 1");
@@ -188,9 +186,9 @@ sap.ui.define([
 		assert.strictEqual(this.oControl2.$().attr("aria-labelledby"), "testControl2-additionalLabel", "No aria-labelledby reference to label in control 1");
 	});
 
-	QUnit.test("Label assignment change is reflected", function(assert) {
+	QUnit.test("Label assignment change is reflected", async function(assert) {
 		this.oLabel.setLabelFor(this.oControl1);
-		Core.applyChanges();
+		await nextUIUpdate();
 
 		assert.strictEqual(LabelEnablement.getReferencingLabels(this.oControl1).length, 1, "Label assigned to control 1");
 		assert.strictEqual(LabelEnablement.getReferencingLabels(this.oControl1)[0], "testLabel", "Label assigned to control 1");
@@ -200,7 +198,7 @@ sap.ui.define([
 		assert.strictEqual(this.oControl2.$().attr("aria-labelledby"), "testControl2-additionalLabel", "No aria-labelledby reference to label in control 1");
 
 		this.oLabel.setLabelFor(this.oControl2);
-		Core.applyChanges();
+		await nextUIUpdate();
 
 		assert.strictEqual(LabelEnablement.getReferencingLabels(this.oControl1).length, 0, "No label assigned to control 1");
 		assert.strictEqual(LabelEnablement.getReferencingLabels(this.oControl2).length, 1, "Label assigned to control 2");
@@ -210,7 +208,7 @@ sap.ui.define([
 		assert.strictEqual(this.oControl2.$().attr("aria-labelledby"), "testLabel testControl2-additionalLabel", "aria-labelledby reference to label in control 2 available");
 
 		this.oLabel.setLabelFor(null);
-		Core.applyChanges();
+		await nextUIUpdate();
 
 		assert.strictEqual(LabelEnablement.getReferencingLabels(this.oControl1).length, 0, "No label assigned to control 1");
 		assert.strictEqual(LabelEnablement.getReferencingLabels(this.oControl2).length, 0, "No label assigned to control 2");
@@ -226,7 +224,7 @@ sap.ui.define([
 			this.oLabel.placeAt("content");
 			this.oControl.placeAt("content");
 			this.oLabel.setLabelFor(this.oControl);
-			Core.applyChanges();
+			return nextUIUpdate();
 		},
 		afterEach : function () {
 			this.oLabel.destroy();
@@ -249,43 +247,43 @@ sap.ui.define([
 		assert.strictEqual(fnInvalidateSpy.callCount, 0);
 	});
 
-	QUnit.test("LabelEnablement.isRequired", function(assert) {
+	QUnit.test("LabelEnablement.isRequired", async function(assert) {
 		assert.ok(!LabelEnablement.isRequired(this.oControl), "Control not required (own property and label property not set)");
 
 		this.oControl.setRequired(true);
-		Core.applyChanges();
+		await nextUIUpdate();
 		assert.ok(LabelEnablement.isRequired(this.oControl), "Control required (explicitly via own property)");
 
 		this.oControl.setRequired(false);
-		Core.applyChanges();
+		await nextUIUpdate();
 		assert.ok(!LabelEnablement.isRequired(this.oControl), "Control not required (own property and label property not set)");
 
 		this.oLabel.setRequired(true);
-		Core.applyChanges();
+		await nextUIUpdate();
 		assert.ok(LabelEnablement.isRequired(this.oControl), "Control required (implicitly via label property)");
 
 		this.oLabel.setLabelFor(null);
-		Core.applyChanges();
+		await nextUIUpdate();
 		assert.ok(!LabelEnablement.isRequired(this.oControl), "Control not required (own property not set and no label assigned)");
 	});
 
-	QUnit.test("aria-required", function(assert) {
+	QUnit.test("aria-required", async function(assert) {
 		assert.ok(!this.oControl.$().attr("aria-required"), "Control not required (own property and label property not set)");
 
 		this.oControl.setRequired(true);
-		Core.applyChanges();
+		await nextUIUpdate();
 		assert.strictEqual(this.oControl.$().attr("aria-required"), "true", "Control required (explicitly via own property)");
 
 		this.oControl.setRequired(false);
-		Core.applyChanges();
+		await nextUIUpdate();
 		assert.ok(!this.oControl.$().attr("aria-required"), "Control not required (own property and label property not set)");
 
 		this.oLabel.setRequired(true);
-		Core.applyChanges();
+		await nextUIUpdate();
 		assert.strictEqual(this.oControl.$().attr("aria-required"), "true", "Control required (implicitly via label property)");
 
 		this.oLabel.setLabelFor(null);
-		Core.applyChanges();
+		await nextUIUpdate();
 		assert.ok(!this.oControl.$().attr("aria-required"), "Control not required (own property not set and no label assigned)");
 	});
 
@@ -312,7 +310,7 @@ sap.ui.define([
 			this.oLabel2.setLabelFor(this.oControl2);
 			this.oLabel3.setLabelFor(this.oControl3);
 
-			Core.applyChanges();
+			return nextUIUpdate();
 		},
 		afterEach : function () {
 			this.oLabel1.destroy();
@@ -374,8 +372,6 @@ sap.ui.define([
 			}).placeAt('content');
 
 			this.oForm = oForm;
-
-			Core.applyChanges();
 		},
 		afterEach : function () {
 			this.oForm.destroy();