@openui5/sap.ui.core 1.117.0 → 1.118.0

package/test/sap/ui/core/qunit/composite/XMLComposite.qunit.js

@@ -7,12 +7,13 @@ sap.ui.define([
 	"composites/TemplateTest", "composites/ChildOfAbstract", "composites/TextToggleButton",
 	"composites/TextToggleButtonNested", "composites/TextToggleButtonForwarded",
 	"composites/WrapperLayouter", "composites/TranslatableText", "composites/TranslatableTextLib",
-	"composites/TranslatableTextBundle"
+	"composites/TranslatableTextBundle",
+	"sap/ui/qunit/utils/nextUIUpdate"
 ], function (QUnitUtils, Core, XMLPreprocessor, XMLComposite, Controller, JSONModel, Item,
 			 Text, SimpleText, SortedList, TextButton, TextList, ForwardText, Field, HiddenMetadata,
 			 TemplateTest, ChildOfAbstract, TextToggleButton, TextToggleButtonNested,
 			 TextToggleButtonForwarded, WrapperLayouter, TranslatableText, TranslatableTextLib,
-			 TranslatableTextBundle) {
+			 TranslatableTextBundle, nextUIUpdate) {
 	/*global QUnit, sinon */
 	/*eslint no-warning-comments: 0 */
 	"use strict";
@@ -22,7 +23,7 @@ sap.ui.define([
 		beforeEach: function () {
 			this.oXMLComposite = new SimpleText();
 			this.oXMLComposite.placeAt("qunit-fixture");
-			Core.applyChanges();
+			return nextUIUpdate();
 		},
 		afterEach: function () {
 			this.oXMLComposite.destroy();
@@ -137,7 +138,7 @@ sap.ui.define([
 		beforeEach: function() {
 			this.oXMLComposite = new HiddenMetadata();
 			this.oXMLComposite.placeAt("qunit-fixture");
-			Core.applyChanges();
+			return nextUIUpdate();
 		},
 		afterEach: function() {
 			this.oXMLComposite.destroy();
@@ -165,7 +166,7 @@ sap.ui.define([
 				text: this.oText
 			});
 			this.oXMLComposite.placeAt("qunit-fixture");
-			Core.applyChanges();
+			return nextUIUpdate();
 		},
 		afterEach: function () {
 			this.oXMLComposite.destroy();
@@ -245,7 +246,7 @@ sap.ui.define([
 				textItems: this.aTexts
 			});
 			this.oXMLComposite.placeAt("qunit-fixture");
-			Core.applyChanges();
+			return nextUIUpdate();
 		},
 		afterEach: function () {
 			//	this.oXMLComposite.destroy();  TODO: why do this destroy lead to
@@ -345,7 +346,7 @@ sap.ui.define([
 		beforeEach: function () {
 			this.oXMLComposite = new Field();
 			this.oXMLComposite.placeAt("qunit-fixture");
-			Core.applyChanges();
+			return nextUIUpdate();
 		},
 		afterEach: function () {
 			this.oXMLComposite.destroy();
@@ -412,10 +413,10 @@ sap.ui.define([
 		oXMLComposite.destroy();
 	});
 
-	QUnit.test("outer", function (assert) {
+	QUnit.test("outer", async function (assert) {
 		var oXMLComposite = new TextToggleButton();
 		oXMLComposite.placeAt("qunit-fixture");
-		Core.applyChanges();
+		await nextUIUpdate();
 		var done = assert.async();
 
 		oXMLComposite.attachTextChanged(function () {
@@ -430,11 +431,11 @@ sap.ui.define([
 		oXMLComposite.destroy();
 	});
 
-	QUnit.test("nested - event from deep inner to outer", function (assert) {
+	QUnit.test("nested - event from deep inner to outer", async function (assert) {
 		var fnFireTextChangedSpy = sinon.spy(TextToggleButtonNested.prototype, "fireTextChanged");
 		var oXMLComposite = new TextToggleButtonNested();
 		oXMLComposite.placeAt("qunit-fixture");
-		Core.applyChanges();
+		await nextUIUpdate();
 
 		// act: Click on ToggleButton
 		QUnitUtils.triggerTouchEvent("tap", oXMLComposite.getAggregation("_content").getItems()[0].getAggregation("_content").getItems()[1].getDomRef());
@@ -446,10 +447,10 @@ sap.ui.define([
 		oXMLComposite.destroy();
 	});
 
-	QUnit.test("nested - event from inner to outer", function (assert) {
+	QUnit.test("nested - event from inner to outer", async function (assert) {
 		var oXMLComposite = new TextToggleButtonNested();
 		oXMLComposite.placeAt("qunit-fixture");
-		Core.applyChanges();
+		await nextUIUpdate();
 		var done = assert.async();
 
 		// Initial state of the nested controls
@@ -478,14 +479,14 @@ sap.ui.define([
 		oXMLComposite.destroy();
 	});
 
-	QUnit.test("forwarded - event from deep inner to outer", function (assert) {
+	QUnit.test("forwarded - event from deep inner to outer", async function (assert) {
 		var oTextToggleButton = new TextToggleButton();
 		var fnFireTextChangedSpy = sinon.spy(TextToggleButtonForwarded.prototype, "fireTextChanged");
 		var oXMLComposite = new TextToggleButtonForwarded({
 			textToggleButton: oTextToggleButton
 		});
 		oXMLComposite.placeAt("qunit-fixture");
-		Core.applyChanges();
+		await nextUIUpdate();
 
 		// act: Click on ToggleButton
 		QUnitUtils.triggerTouchEvent("tap", oTextToggleButton.getAggregation("_content").getItems()[1].getDomRef());
@@ -497,12 +498,12 @@ sap.ui.define([
 		oXMLComposite.destroy();
 	});
 
-	QUnit.test("forwarded - event from inner to outer", function (assert) {
+	QUnit.test("forwarded - event from inner to outer", async function (assert) {
 		var oXMLComposite = new TextToggleButtonForwarded({
 			textToggleButton: new TextToggleButton()
 		});
 		oXMLComposite.placeAt("qunit-fixture");
-		Core.applyChanges();
+		await nextUIUpdate();
 		var done = assert.async();
 
 		// Initial state of controls
@@ -558,10 +559,10 @@ sap.ui.define([
 		oXMLComposite.destroy();
 	});
 
-	QUnit.test("Abstract", function (assert) {
+	QUnit.test("Abstract", async function (assert) {
 		var oXMLComposite = new ChildOfAbstract();
 		oXMLComposite.placeAt("qunit-fixture");
-		Core.applyChanges();
+		await nextUIUpdate();
 		assert.ok(oXMLComposite);
 		oXMLComposite.destroy();
 	});
@@ -591,14 +592,14 @@ sap.ui.define([
 
 		var oClone = oXMLComposite.clone("MyClone");
 		assert.equal(oClone.getId(), "Frag1-MyClone", "XMLComposite cloned");
-		setTimeout(function() {
+		setTimeout(async function() {
 			var oContent = oClone._getCompositeAggregation();
 			//TEMP-CLONE-ISSUE assert.notOk(fnVBoxCloneSpy.called, "VBox clone function not called");
 			//TEMP-CLONE-ISSUE assert.equal(oContent.getId(), "Frag1-MyClone--myVBox", "VBox created, not cloned");
 
 			oXMLComposite.placeAt("qunit-fixture");
 			oClone.placeAt("qunit-fixture");
-			Core.applyChanges();
+			await nextUIUpdate();
 
 			//Id access
 			oButton = oXMLComposite.byId("myButton");
@@ -673,7 +674,7 @@ sap.ui.define([
 			});
 			this.oWrapper = new Wrapper("layout");
 			this.oWrapper.placeAt("qunit-fixture");
-			Core.applyChanges();
+			return nextUIUpdate();
 		},
 		afterEach: function () {
 			this.oWrapper.destroy();
@@ -702,7 +703,7 @@ sap.ui.define([
 			this.oWrapper.setHeight("100%");
 			this.oWrapper.setWidth("200px");
 			this.oWrapper.setDisplayBlock(false);
-			Core.applyChanges();
+			return nextUIUpdate();
 		},
 		afterEach: function () {
 			this.oWrapper.destroy();
@@ -731,11 +732,11 @@ sap.ui.define([
 	});
 	//*********************************************************************************************
 
-	QUnit.test("properties", function (assert) {
+	QUnit.test("properties", async function (assert) {
 		var done = assert.async();
 		var oXMLComposite = new TranslatableText();
 		oXMLComposite.placeAt("qunit-fixture");
-		Core.applyChanges();
+		await nextUIUpdate();
 		assert.equal(oXMLComposite.bUsesI18n, true, "The i18n resource model is used");
 		if (oXMLComposite.getResourceBundle().then) {
 			//async loading of resource bundle
@@ -750,7 +751,7 @@ sap.ui.define([
 		}
 	});
 
-	QUnit.test("positive tests - not in root", function (assert) {
+	QUnit.test("positive tests - not in root", async function (assert) {
 		var done = assert.async();
 
 		var sFragmentContent = '<core:FragmentDefinition xmlns="sap.m" xmlns:core="sap.ui.core" xmlns:layout="sap.ui.layout">'
@@ -769,7 +770,7 @@ sap.ui.define([
 
 		var oXMLComposite = new TextInButton({placeholder: "custom placeholder"});
 		oXMLComposite.placeAt("qunit-fixture");
-		Core.applyChanges();
+		await nextUIUpdate();
 		assert.equal(oXMLComposite.bUsesI18n, true, "The i18n resource model is used");
 		if (oXMLComposite.getResourceBundle().then) {
 			//async loading of resource bundle
@@ -784,7 +785,7 @@ sap.ui.define([
 		}
 	});
 
-	QUnit.test("positive tests - in root", function (assert) {
+	QUnit.test("positive tests - in root", async function (assert) {
 		var done = assert.async();
 		var sFragmentContent = '<m:Panel id="myTranslatableTextControl" headerText="{$this.i18n>panelText}" xmlns:m="sap.m"><m:Input id="innerInput" placeholder="{$this>/placeholder}" />'
 			+ '<m:Button text="{$this>/buttonText}" press="handleSearch" /></m:Panel>';
@@ -802,7 +803,7 @@ sap.ui.define([
 
 		var oXMLComposite = new TextInRoot({placeholder: "custom placeholder"});
 		oXMLComposite.placeAt("qunit-fixture");
-		Core.applyChanges();
+		await nextUIUpdate();
 		assert.equal(oXMLComposite.bUsesI18n, true, "The i18n resource model is used");
 		if (oXMLComposite.getResourceBundle().then) {
 			//async loading of resource bundle
@@ -817,10 +818,10 @@ sap.ui.define([
 		}
 	});
 
-	QUnit.test("negative test lib not loaded when not used", function (assert) {
+	QUnit.test("negative test lib not loaded when not used", async function (assert) {
 		var oXMLComposite = new TextToggleButton();
 		oXMLComposite.placeAt("qunit-fixture");
-		Core.applyChanges();
+		await nextUIUpdate();
 		var oContent = oXMLComposite._getCompositeAggregation();
 		assert.equal(oXMLComposite.bUsesI18n, false, "No reference for the i18n resource model is found");
 		assert.notOk(oContent.getModel("$" + oXMLComposite.alias + ".i18n"), "there is no i18n Model");
@@ -836,11 +837,11 @@ sap.ui.define([
 	});
 	//*********************************************************************************************
 
-	QUnit.test("properties", function (assert) {
+	QUnit.test("properties", async function (assert) {
 		var done = assert.async();
 		var oXMLComposite = new TranslatableTextLib();
 		oXMLComposite.placeAt("qunit-fixture");
-		Core.applyChanges();
+		await nextUIUpdate();
 		if (oXMLComposite.getResourceBundle().then) {
 			//async loading of resource bundle
 			oXMLComposite.getResourceBundle().then(function (oBundle) {
@@ -863,11 +864,11 @@ sap.ui.define([
 	});
 	//*********************************************************************************************
 
-	QUnit.test("properties", function (assert) {
+	QUnit.test("properties", async function (assert) {
 		var done = assert.async();
 		var oXMLComposite = new TranslatableText();
 		oXMLComposite.placeAt("qunit-fixture");
-		Core.applyChanges();
+		await nextUIUpdate();
 		if (oXMLComposite.getResourceBundle().then) {
 			//async loading of resource bundle
 			oXMLComposite.getResourceBundle().then(function (oBundle) {
@@ -889,11 +890,11 @@ sap.ui.define([
 	});
 	//*********************************************************************************************
 
-	QUnit.test("properties", function (assert) {
+	QUnit.test("properties", async function (assert) {
 		var done = assert.async();
 		var oXMLComposite = new TranslatableTextBundle();
 		oXMLComposite.placeAt("qunit-fixture");
-		Core.applyChanges();
+		await nextUIUpdate();
 		if (oXMLComposite.getResourceBundle().then) {
 			//async loading of resource bundle
 			oXMLComposite.getResourceBundle().then(function (oBundle) {
@@ -917,11 +918,11 @@ sap.ui.define([
 	});
 	//*********************************************************************************************
 
-	QUnit.test("properties", function (assert) {
+	QUnit.test("properties", async function (assert) {
 		var done = assert.async();
 		var oXMLComposite = new TranslatableTextBundle();
 		oXMLComposite.placeAt("qunit-fixture");
-		Core.applyChanges();
+		await nextUIUpdate();
 		if (oXMLComposite.getResourceBundle().then) {
 			//async loading of resource bundle
 			oXMLComposite.getResourceBundle().then(function (oBundle) {
@@ -944,13 +945,13 @@ sap.ui.define([
 	});
 	//*********************************************************************************************
 
-	QUnit.test("properties", function (assert) {
+	QUnit.test("properties", async function (assert) {
 		var done = assert.async();
 		var oXMLComposite0 = new TranslatableTextLib();
 		var oXMLComposite1 = new TranslatableTextLib();
 		oXMLComposite0.placeAt("qunit-fixture");
 		oXMLComposite1.placeAt("qunit-fixture");
-		Core.applyChanges();
+		await nextUIUpdate();
 
 		//async loading of resource bundle
 		var p0 = oXMLComposite0.getResourceBundle();
@@ -1025,8 +1026,7 @@ sap.ui.define([
 					oField.addAriaLabelledBy(oAdditionalLabel);
 					this.content = new HBox({items: [oLabel,oField, oAdditionalLabel]});
 					this.content.placeAt("qunit-fixture");
-					Core.applyChanges();
-					resolve();
+					nextUIUpdate().then(resolve);
 				}.bind(this));
 			}.bind(this));
 		},

package/test/sap/ui/core/qunit/csp/ContentSecurityPolicy.qunit.js

@@ -1,5 +1,9 @@
 /*global QUnit*/
-sap.ui.define([], function() {
+sap.ui.define([
+	"sap/ui/core/Core"
+], function(
+	Core
+) {
 	"use strict";
 
 	QUnit.module("CSP Compliance");
@@ -24,20 +28,21 @@ sap.ui.define([], function() {
 				// the browser completely ignores the header and won't report violations
 				if (sCsp || (sCspReportOnly && sCspReportOnly.indexOf("report-uri") !== -1)) {
 					// Check for reported CSP violations
-					assert.ok(sap.ui.getCore().isInitialized(), "UI5 Core has been initialized");
-					assert.ok(window["ui5-core-csp-violations"].length === 0,
-						"Found " + window["ui5-core-csp-violations"].length + " CSP violation(s)"
-					);
-					window["ui5-core-csp-violations"].forEach(function(oViolation) {
-						assert.ok(
-							false,
-							oViolation.sourceFile + ":" + oViolation.lineNumber + ":" +
-							oViolation.columnNumber + ": " +
-							oViolation.effectiveDirective + " - " + oViolation.blockedURI
+					Core.ready().then(function() {
+						assert.ok(sap.ui.getCore().isInitialized(), "UI5 Core has been initialized");
+						assert.ok(window["ui5-core-csp-violations"].length === 0,
+							"Found " + window["ui5-core-csp-violations"].length + " CSP violation(s)"
 						);
+						window["ui5-core-csp-violations"].forEach(function(oViolation) {
+							assert.ok(
+								false,
+								oViolation.sourceFile + ":" + oViolation.lineNumber + ":" +
+								oViolation.columnNumber + ": " +
+								oViolation.effectiveDirective + " - " + oViolation.blockedURI
+							);
+						});
+						done();
 					});
-
-					done();
 				} else {
 					// Fail test as headers are not set as required
 					oReq.abort();

package/test/sap/ui/core/qunit/dnd/DragAndDrop.qunit.js

@@ -6,12 +6,11 @@ sap.ui.define([
 	"sap/ui/core/dnd/DragDropInfo",
 	"sap/ui/thirdparty/jquery",
 	"sap/ui/core/Control",
-	"sap/ui/core/Element",
 	"sap/ui/core/UIArea",
-	"sap/ui/core/Core",
 	"sap/ui/Device",
-	"sap/ui/core/Configuration"
-], function(DragAndDrop, DragInfo, DropInfo, DragDropInfo, jQuery, Control, Element, UIArea, Core, Device, Configuration) {
+	"sap/ui/core/Configuration",
+	"sap/ui/qunit/utils/nextUIUpdate"
+], function(DragAndDrop, DragInfo, DropInfo, DragDropInfo, jQuery, Control, UIArea, Device, Configuration, nextUIUpdate) {
 	"use strict";
 
 	var DivControl = Control.extend("sap.ui.core.dnd.test.DivControl", {
@@ -156,7 +155,7 @@ sap.ui.define([
 				]
 			});
 			this.oControl.addStyleClass("sapUiScrollDelegate").placeAt("qunit-fixture");
-			Core.applyChanges();
+			return nextUIUpdate();
 		},
 		afterEach: function() {
 			this.oControl.destroy();
@@ -170,13 +169,13 @@ sap.ui.define([
 		assert.equal(oEvent.dragSession, null, "No drag session was created for a non draggable element");
 	});
 
-	QUnit.test("Text input elements", function(assert) {
+	QUnit.test("Text input elements", async function(assert) {
 		var oEvent;
 
 		this.oControl.addTopItem(new DivControl({elementTag: "input"}));
 		this.oControl.addTopItem(new DivControl({elementTag: "textarea"}));
 		this.oControl.addDragDropConfig(new DragDropInfo({sourceAggregation: "topItems"}));
-		Core.applyChanges();
+		await nextUIUpdate();
 
 		oEvent = createjQueryDragEventDummy("dragstart", this.oControl.getTopItems()[0]);
 		oEvent.target.focus();
@@ -190,7 +189,7 @@ sap.ui.define([
 		assert.equal(oEvent.dragSession, null, "No drag session was created for a textarea element");
 	});
 
-	QUnit.test("Text input elements - Workaround for a bug in Firefox", function(assert) {
+	QUnit.test("Text input elements - Workaround for a bug in Firefox", async function(assert) {
 		var oBrowserStub = sinon.stub(Device, "browser");
 		var that = this;
 		var sBrowser = "firefox";
@@ -200,7 +199,7 @@ sap.ui.define([
 		that.oControl.addTopItem(new DivControl({elementTag: "input"}));
 		that.oControl.addTopItem(new DivControl({elementTag: "textarea"}));
 		that.oControl.addDragDropConfig(new DragDropInfo());
-		Core.applyChanges();
+		await nextUIUpdate();
 
 		assert.ok(that.oControl.getDomRef().draggable, sBrowser + " - Ancestor is draggable before mousedown");
 
@@ -299,7 +298,7 @@ sap.ui.define([
 				]
 			});
 			this.oControl.placeAt("qunit-fixture");
-			Core.applyChanges();
+			return nextUIUpdate();
 		},
 		afterEach: function() {
 			this.oControl.destroy();
@@ -463,7 +462,7 @@ sap.ui.define([
 				]
 			});
 			this.oControl.placeAt("qunit-fixture");
-			Core.applyChanges();
+			return nextUIUpdate();
 		},
 		afterEach: function() {
 			this.oControl.destroy();
@@ -583,7 +582,7 @@ sap.ui.define([
 				]
 			});
 			this.oControl.placeAt("qunit-fixture");
-			Core.applyChanges();
+			return nextUIUpdate();
 		},
 		afterEach: function() {
 			this.oControl.destroy();
@@ -658,7 +657,7 @@ sap.ui.define([
 	});
 
 	QUnit.module("dragSession", {
-		beforeEach: function() {
+		beforeEach: async function() {
 			this.oContainer = new DragAndDropControl({
 				topItems: [this.oSourceControl = new DivControl()],
 				bottomItems: [this.oTargetControl = new DivControl(), this.oLastTargetControl = new DivControl()],
@@ -673,7 +672,8 @@ sap.ui.define([
 			});
 
 			this.oContainer.placeAt("qunit-fixture");
-			Core.applyChanges();
+
+			await nextUIUpdate();
 
 			this.oTargetDomRef = this.oTargetControl.getDomRef();
 			this.oSourceDomRef = this.oSourceControl.getDomRef();
@@ -789,7 +789,7 @@ sap.ui.define([
 	});
 
 	QUnit.module("groupName", {
-		beforeEach: function() {
+		beforeEach: async function() {
 			this.oContainer = new DragAndDropControl({
 				topItems: [this.oSourceControl = new DivControl()],
 				bottomItems: [this.oTargetControl = new DivControl()],
@@ -807,7 +807,8 @@ sap.ui.define([
 			});
 
 			this.oContainer.placeAt("qunit-fixture");
-			Core.applyChanges();
+
+			await nextUIUpdate();
 
 			this.oTargetDomRef = this.oTargetControl.getDomRef();
 			this.oSourceDomRef = this.oSourceControl.getDomRef();
@@ -863,7 +864,7 @@ sap.ui.define([
 	});
 
 	QUnit.module("Parent traverse", {
-		beforeEach: function() {
+		beforeEach: async function() {
 			this.oContainer = new DragAndDropControl({
 				topItems: [this.oSourceControl = new DivControl()],
 				bottomItems: [this.oTargetControl = new DivControl({
@@ -886,7 +887,7 @@ sap.ui.define([
 			});
 
 			this.oContainer.placeAt("qunit-fixture");
-			Core.applyChanges();
+			await nextUIUpdate();
 
 			this.oTargetDomRef = this.oTargetControl.getDomRef();
 			this.oSourceDomRef = this.oSourceControl.getDomRef();

package/test/sap/ui/core/qunit/dnd/DragInfo.qunit.js

@@ -6,8 +6,9 @@ sap.ui.define([
 	"sap/ui/core/dnd/DragInfo",
 	"sap/ui/base/ManagedObject",
 	"sap/ui/core/ElementMetadata",
-	"sap/base/Log"
-], function(jQuery, TestControl, DragInfo, ManagedObject, ElementMetadata, Log) {
+	"sap/base/Log",
+	"sap/ui/qunit/utils/nextUIUpdate"
+], function(jQuery, TestControl, DragInfo, ManagedObject, ElementMetadata, Log, nextUIUpdate) {
 	"use strict";
 
 	QUnit.module("");
@@ -73,7 +74,7 @@ sap.ui.define([
 		oControl.destroy();
 	});
 
-	QUnit.test("isDraggable - Aggregated child element", function(assert) {
+	QUnit.test("isDraggable - Aggregated child element", async function(assert) {
 		var oDragInfo = new DragInfo({
 			sourceAggregation: "children"
 		});
@@ -84,7 +85,7 @@ sap.ui.define([
 		});
 
 		oParent.placeAt("qunit-fixture");
-		sap.ui.getCore().applyChanges();
+		await nextUIUpdate();
 
 		assert.ok(oDragInfo.isDraggable(oControl), "Draggable: Child control is in the defined sourceAggregation");
 		assert.ok(oControl.getDomRef().draggable, "Dom Draggable: Child control is in the defined sourceAggregation");
@@ -96,31 +97,31 @@ sap.ui.define([
 		delete oControl.isDragAllowed;
 
 		oDragInfo.setSourceAggregation("thereIsNoSuchAnAggregationName");
-		sap.ui.getCore().applyChanges();
+		await nextUIUpdate();
 
 		assert.notOk(oDragInfo.isDraggable(oControl), "Not Draggable: Child control is not in the defined sourceAggregation");
 		assert.notOk(oControl.getDomRef().draggable, "Dom Not Draggable: Child control is not in the defined sourceAggregation");
 
 		oDragInfo.setSourceAggregation("children");
-		sap.ui.getCore().applyChanges();
+		await nextUIUpdate();
 
 		assert.ok(oDragInfo.isDraggable(oControl), "Draggable Again: Child control is in the defined sourceAggregation");
 		assert.ok(oControl.getDomRef().draggable, "Dom Draggable Again: Child control is in the defined sourceAggregation");
 
 		oDragInfo.setEnabled(false);
-		sap.ui.getCore().applyChanges();
+		await nextUIUpdate();
 
 		assert.notOk(oDragInfo.isDraggable(oControl), "Not Draggable: DragInfo is disabled");
 		assert.notOk(oControl.getDomRef().draggable, "Dom Not Draggable: DragInfo is disabled");
 
 		oDragInfo.setEnabled(true);
-		sap.ui.getCore().applyChanges();
+		await nextUIUpdate();
 
 		assert.ok(oDragInfo.isDraggable(oControl), "Draggable: DragInfo is enabled");
 		assert.ok(oControl.getDomRef().draggable, "Dom Draggable: DragInfo is enabled");
 
 		oDragInfo.setSourceAggregation();
-		sap.ui.getCore().applyChanges();
+		await nextUIUpdate();
 
 		assert.notOk(oDragInfo.isDraggable(oControl), "Not Draggable: sourceAggregation is empty");
 		assert.notOk(oControl.getDomRef().draggable, "Dom Not Draggable: sourceAggregation is empty");
@@ -130,7 +131,7 @@ sap.ui.define([
 		oParent.destroy();
 	});
 
-	QUnit.test("isDraggable - Enabled", function(assert) {
+	QUnit.test("isDraggable - Enabled", async function(assert) {
 		var oDragInfo = new DragInfo({
 			enabled: false
 		});
@@ -139,13 +140,13 @@ sap.ui.define([
 		});
 
 		oControl.placeAt("qunit-fixture");
-		sap.ui.getCore().applyChanges();
+		await nextUIUpdate();
 
 		assert.notOk(oDragInfo.isDraggable(oControl), "Not draggable: DragInfo is not enabled");
 		assert.notOk(oControl.getDomRef().draggable, "Dom Not draggable: DragInfo is not enabled");
 
 		oDragInfo.setEnabled(true);
-		sap.ui.getCore().applyChanges();
+		await nextUIUpdate();
 
 		assert.ok(oDragInfo.isDraggable(oControl), "Draggable: DragInfo is enabled and drag source is the control itself");
 		assert.ok(oControl.getDomRef().draggable, "Dom Draggable: DragInfo is enabled and drag source is the control itself");

package/test/sap/ui/core/qunit/dnd/DropInfo.qunit.js

@@ -6,8 +6,9 @@ sap.ui.define([
 	"sap/ui/core/dnd/DropInfo",
 	"sap/ui/base/ManagedObject",
 	"sap/ui/core/ElementMetadata",
-	"sap/base/Log"
-], function(jQuery, TestControl, DropInfo, ManagedObject, ElementMetadata, Log) {
+	"sap/base/Log",
+	"sap/ui/qunit/utils/nextUIUpdate"
+], function(jQuery, TestControl, DropInfo, ManagedObject, ElementMetadata, Log, nextUIUpdate) {
 	"use strict";
 
 	QUnit.module("");
@@ -129,7 +130,7 @@ sap.ui.define([
 		oParent.destroy();
 	});
 
-	QUnit.test("isDroppable - Empty Aggregation", function(assert) {
+	QUnit.test("isDroppable - Empty Aggregation", async function(assert) {
 		var oDropInfo = new DropInfo({
 			targetAggregation: "children"
 		});
@@ -139,7 +140,7 @@ sap.ui.define([
 		var oEvent = new jQuery.Event("dragenter");
 
 		oControl.placeAt("qunit-fixture");
-		sap.ui.getCore().applyChanges();
+		await nextUIUpdate();
 
 		oEvent.target = oControl.getDomRef("children");
 		assert.notOk(oDropInfo.isDroppable(oControl, oEvent), "Not Droppable: event target is the defined targetAggregation DOM");

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

@@ -6,8 +6,9 @@
 sap.ui.define([
 	"sap/ui/test/generic/TestBase",
 	"sap/ui/test/generic/Utils",
-	"sap/ui/core/Element"
-], function(TestBase, Utils, Element) {
+	"sap/ui/core/Element",
+	"sap/ui/qunit/utils/nextUIUpdate"
+], function(TestBase, Utils, Element, nextUIUpdate) {
 	"use strict";
 
 	 // asserts that both given maps have the same entries
@@ -80,7 +81,7 @@ sap.ui.define([
 				mPreElements,
 				createAndTestControl = function (bFinalIteration) {
 					var oControl = Utils.createControlOrElement(oClassInfo.fnClass, this.getObjectCapabilities(sControlName)),
-					testControl = function (oControl) {
+					testControl = async function (oControl) {
 						// check whether this control can be rendered
 						if (oControl.placeAt && !bFinalIteration) {
 							try {
@@ -96,17 +97,17 @@ sap.ui.define([
 
 						if (bCanRender) {
 							oControl.placeAt("qunit-fixture");
-							sap.ui.getCore().applyChanges();
+							await nextUIUpdate();
 
 							if (bFinalIteration) {
 								oControl.rerender();  // just re-render again - this finds problems
-								sap.ui.getCore().applyChanges();
+								await nextUIUpdate();
 							}
 						} else if (bFinalIteration) {
 							assert.ok(true, "Info: " + sControlName + " cannot be rendered");
 						}
 						oControl.destroy();
-						sap.ui.getCore().applyChanges();
+						await nextUIUpdate();
 
 						if (bFinalIteration) {
 							var mPostElements = Element.registry.all();