@openui5/sap.ui.core 1.117.1 → 1.119.0

package/test/sap/ui/core/qunit/odata/v4/lib/_Helper.qunit.js

@@ -2009,6 +2009,16 @@ sap.ui.define([
 			"/service/Foo('1')/Bar(baz='2',qux=3)");
 	});
 
+	//*********************************************************************************************
+	QUnit.test("makeRelativeUrl", function (assert) {
+		assert.strictEqual(_Helper.makeRelativeUrl("/foo/baz", "/foo/bar"), "baz");
+		assert.strictEqual(_Helper.makeRelativeUrl("/foo/bar/qux", "/foo/baz"), "bar/qux");
+		assert.strictEqual(_Helper.makeRelativeUrl("/foo/baz", "/foo/bar/qux"), "../baz");
+		assert.strictEqual(
+			_Helper.makeRelativeUrl("/Bar(baz='2',qux=3)", "/Foo"),
+			"Bar(baz='2',qux=3)");
+	});
+
 	//*********************************************************************************************
 	QUnit.test("drillDown", function (assert) {
 		var oObject = {
@@ -3820,28 +3830,6 @@ sap.ui.define([
 	});
 });
 
-	//*********************************************************************************************
-[true, false].forEach(function (bAbsolute) {
-	var sTitle = "getReturnValueContextPath with "
-			+ (bAbsolute ? "absolute" : "relative") + " path";
-
-	QUnit.test(sTitle, function (assert) {
-		var sPathPrefix = bAbsolute ? "/" : "";
-
-		// code under test
-		assert.strictEqual(
-			_Helper.getReturnValueContextPath(
-				sPathPrefix + "Artists('42')/special.cases.Action(...)", "('77')"),
-			sPathPrefix + "Artists('77')");
-
-		// code under test
-		assert.strictEqual(
-			_Helper.getReturnValueContextPath(
-				sPathPrefix + "Artists/special.cases.Action(...)", "('77')"),
-			sPathPrefix + "Artists('77')");
-	});
-});
-
 	//*********************************************************************************************
 	QUnit.test("hasPathPrefix", function (assert) {
 		var oHelperMock = this.mock(_Helper);
@@ -5377,6 +5365,7 @@ sap.ui.define([
 			nested2 : ["~created21~"]
 		});
 		assert.strictEqual(oCacheEntity.nested1.$created, 0);
+		assert.ok(oCacheEntity.nested1.$transfer, true);
 		assert.deepEqual(oCacheEntity.nested1.$byPredicate, {
 			"~predicate11~" : "~created11~",
 			"~predicate12~" : "~created12~"
@@ -5385,6 +5374,7 @@ sap.ui.define([
 		assert.deepEqual(oCacheEntity.nested2.$byPredicate, {
 			"~predicate21~" : "~created21~"
 		});
+		assert.notOk("$transfer" in oCacheEntity.nested2);
 		assert.notOk("$postBodyCollection" in oCacheEntity.nested1);
 	});
 

package/test/sap/ui/core/qunit/odata/v4/lib/_Requestor.qunit.js

@@ -5465,8 +5465,15 @@ sap.ui.define([
 	});
 
 	//*****************************************************************************************
-	QUnit.test("processOptimisticBatch: n+1 start, optimistic batch matches", function (assert) {
-		var sKey = window.location.href,
+[false, true, undefined].forEach((bEnabled) => { // undefined -> no enabler assigned
+	[false, true].forEach((bCacheManagerRejects) => {
+	const sTitle = `processOptimisticBatch: n+1 start, optimistic batch matches, 
+		enabler=${bEnabled}, del rejects=${bCacheManagerRejects}`;
+	QUnit.test(sTitle, function (assert) {
+		var done = assert.async(),
+			oError = new Error("CacheManager.del rejected"),
+			iGetReporterCount,
+			sKey = window.location.href,
 			oOptimisticBatch = {
 				firstBatch : {
 					requests : "~optimisticRequests~",
@@ -5475,26 +5482,108 @@ sap.ui.define([
 				key : sKey,
 				result : "~optimisticBatchResult~"
 			},
-			oRequestor = _Requestor.create("/", oModelInterface);
+			fnEnabler = bEnabled === undefined ? undefined : sinon.stub().resolves(bEnabled),
+			oRequestor = _Requestor.create("/", oModelInterface),
+			fnReporter = function (oError0) {
+				assert.strictEqual(oError0, oError);
+				done();
+			};
+
+		if (bEnabled) {
+			iGetReporterCount = 1;
+		} else {
+			iGetReporterCount = bEnabled !== undefined ? 1 : 0;
+		}
 
 		oRequestor.oOptimisticBatch = oOptimisticBatch;
+
 		this.mock(_Requestor).expects("matchesOptimisticBatch")
 			.withExactArgs("~requests~", "~group~", "~optimisticRequests~", "~optimisticGroup~")
 			.returns(true);
+
+		this.mock(oModelInterface).expects("getOptimisticBatchEnabler").returns(fnEnabler);
+		this.mock(oModelInterface).expects("getReporter").exactly(iGetReporterCount)
+			.withExactArgs().returns(fnReporter);
+		if (bEnabled === false) {
+			if (bCacheManagerRejects) {
+				this.mock(CacheManager).expects("del")
+					.withExactArgs("sap.ui.model.odata.v4.optimisticBatch:" + sKey).rejects(oError);
+			} else {
+				this.mock(CacheManager).expects("del")
+					.withExactArgs("sap.ui.model.odata.v4.optimisticBatch:" + sKey).resolves();
+				this.oLogMock.expects("info")
+					.withExactArgs("optimistic batch: disabled, response deleted", sKey,
+						sClassName);
+				done();
+			}
+		}
 		this.oLogMock.expects("info")
 			.withExactArgs("optimistic batch: success, response consumed", sKey, sClassName);
 		this.mock(CacheManager).expects("set").never();
-		this.mock(oModelInterface).expects("getOptimisticBatchEnabler").never();
 
 		// code under test
 		assert.strictEqual(oRequestor.processOptimisticBatch("~requests~", "~group~"),
 			"~optimisticBatchResult~");
 
 		assert.strictEqual(oRequestor.oOptimisticBatch, null);
+
+		if (bEnabled !== undefined) {
+			assert.strictEqual(fnEnabler.calledOnce, true);
+		}
+		if (bEnabled !== false) {
+			done();
+		}
+	});
+	});
+});
+
+	//*****************************************************************************************
+	const sTitle = "processOptimisticBatch: n+1 start, optimistic batch matches, enabler rejects";
+	QUnit.test(sTitle, function (assert) {
+		var oError = new Error("Enabler rejects"),
+			sKey = window.location.href,
+			oOptimisticBatch = {
+				firstBatch : {
+					requests : "~optimisticRequests~",
+					groupId : "~optimisticGroup~"
+				},
+				key : sKey,
+				result : "~optimisticBatchResult~"
+			},
+			fnEnabler = sinon.stub().rejects(oError),
+			oRequestor = _Requestor.create("/", oModelInterface),
+			fnReporter = function (oError0) {
+				assert.strictEqual(oError0, oError);
+			};
+
+		oRequestor.oOptimisticBatch = oOptimisticBatch;
+
+		this.mock(_Requestor).expects("matchesOptimisticBatch")
+			.withExactArgs("~requests~", "~group~", "~optimisticRequests~", "~optimisticGroup~")
+			.returns(true);
+
+		this.mock(oModelInterface).expects("getOptimisticBatchEnabler").returns(fnEnabler);
+		this.mock(oModelInterface).expects("getReporter").withExactArgs().returns(fnReporter);
+
+		this.oLogMock.expects("info")
+			.withExactArgs("optimistic batch: disabled, response deleted", sKey, sClassName)
+			.never();
+		this.oLogMock.expects("info")
+			.withExactArgs("optimistic batch: success, response consumed", sKey, sClassName);
+		this.mock(CacheManager).expects("set").never();
+		this.mock(CacheManager).expects("del").never();
+
+		// code under test
+		assert.strictEqual(oRequestor.processOptimisticBatch("~requests~", "~group~"),
+			"~optimisticBatchResult~");
+
+		assert.strictEqual(fnEnabler.calledOnce, true);
 	});
 
 	//*****************************************************************************************
-	QUnit.test("processOptimisticBatch: mismatch, CacheManager.del rejects", function (assert) {
+[false, true].forEach((bRejects) => {
+	const sTitle = `processOptimisticBatch: mismatch, CacheManager.del rejects=${bRejects}`;
+	QUnit.test(sTitle, function (assert) {
 		// Note: this test covers also the successful CacheManager.del case
 		var oCacheManagerMock = this.mock(CacheManager),
 			done = assert.async(),
@@ -5519,11 +5608,19 @@ sap.ui.define([
 		this.mock(_Requestor).expects("matchesOptimisticBatch")
 			.withExactArgs("~requests~", "~group~", "~optimisticRequests~", "~optimisticGroup~")
 			.returns(false);
-		this.oLogMock.expects("warning")
-			.withExactArgs("optimistic batch: mismatch, response skipped", sKey, sClassName);
-		oCacheManagerMock.expects("del")
-			.withExactArgs("sap.ui.model.odata.v4.optimisticBatch:" + sKey)
-			.rejects(oError);
+
+		if (bRejects) {
+			oCacheManagerMock.expects("del")
+				.withExactArgs("sap.ui.model.odata.v4.optimisticBatch:" + sKey)
+				.rejects(oError);
+		} else {
+			oCacheManagerMock.expects("del")
+				.withExactArgs("sap.ui.model.odata.v4.optimisticBatch:" + sKey)
+				.resolves();
+			this.oLogMock.expects("warning")
+				.withExactArgs("optimistic batch: mismatch, response skipped", sKey, sClassName);
+			done();
+		}
 		oModelInterfaceMock.expects("getReporter")
 			.withExactArgs()
 			.returns(fnReporter);
@@ -5537,6 +5634,7 @@ sap.ui.define([
 
 		assert.strictEqual(oRequestor.oOptimisticBatch, null);
 	});
+});
 
 	//*****************************************************************************************
 	QUnit.test("hasOnlyPatchesWithoutSideEffects", function (assert) {

package/test/sap/ui/core/qunit/odata/v4/lib/_V2Requestor.qunit.js

@@ -1735,7 +1735,7 @@ sap.ui.define([
 			oRequestor = _Requestor.create("/", oModelInterface, undefined, undefined, "2.0");
 
 		// code under test
-		oRequestor.reportHeaderMessages("[]");
+		oRequestor.reportHeaderMessages("resource/path", "[]");
 
 		assert.notOk(fnreportTransitionMessages.called);
 	});

package/test/sap/ui/core/qunit/opa/Opa5PageObject.qunit.js

@@ -4,8 +4,9 @@ sap.ui.define([
 	"sap/ui/test/Opa5",
 	"sap/ui/test/PageObjectFactory",
 	"sap/base/Log",
-	"./utils/view"
-], function (Opa, Opa5, PageObjectFactory, Log, viewUtils) {
+	"./utils/view",
+	"sap/ui/qunit/utils/nextUIUpdate"
+], function (Opa, Opa5, PageObjectFactory, Log, viewUtils, nextUIUpdate) {
 	"use strict";
 
 	// preset some globals to avoid issues with QUnit's 'noglobals' option
@@ -226,15 +227,13 @@ sap.ui.define([
 		beforeEach: function (assert) {
 			// Note: This test is executed with QUnit 1 and QUnit 2.
 			//       We therefore cannot rely on the built-in promise handling of QUnit 2.
-			var done = assert.async();
-			Promise.all([
+			return Promise.all([
 				viewUtils.createXmlView("foo", "myFooView"),
 				viewUtils.createXmlView("bar", "myBarView")
 			]).then(function (aViews) {
 				this.oView = aViews[0].placeAt("qunit-fixture");
 				this.oView2 = aViews[1].placeAt("qunit-fixture");
-				sap.ui.getCore().applyChanges();
-				done();
+				return nextUIUpdate();
 			}.bind(this), function(oErr) {
 				assert.strictEqual(oErr, undefined, "failed to load view");
 			});

package/test/sap/ui/core/qunit/opa/OpaPlugin.qunit.js

@@ -8,10 +8,11 @@ sap.ui.define([
 	"sap/m/Button",
 	"sap/m/Input",
 	"sap/m/Dialog",
+	"sap/ui/core/Element",
 	"sap/ui/core/mvc/View",
 	"sap/ui/core/mvc/XMLView",
-	"sap/ui/core/Fragment",
 	"./utils/view",
+	"sap/ui/qunit/utils/nextUIUpdate",
 	"sap/base/Log"
 ], function (OpaPlugin,
 			 Interactable,
@@ -21,10 +22,11 @@ sap.ui.define([
 			 Button,
 			 Input,
 			 Dialog,
+			 Element,
 			 View,
 			 XMLView,
-			 Fragment,
 			 viewUtils,
+			 nextUIUpdate,
 			 Log) {
 	"use strict";
 
@@ -43,10 +45,10 @@ sap.ui.define([
 		}
 	});
 
-	QUnit.test("Should retrieve a control by a global id", function(assert) {
+	QUnit.test("Should retrieve a control by a global id", async function(assert) {
 		// Arrange
 		this.oButton.placeAt("qunit-fixture");
-		sap.ui.getCore().applyChanges();
+		await nextUIUpdate();
 
 		// Act
 		var oRetrievedButton = this.oPlugin.getMatchingControls({ id : this.sId });
@@ -100,14 +102,14 @@ sap.ui.define([
 		assert.strictEqual(oRetrievedButton, this.oButton);
 	});
 
-	QUnit.test("Should retrieve multiple controls by global id's", function(assert) {
+	QUnit.test("Should retrieve multiple controls by global id's", async function(assert) {
 		// Arrange
 		var oButton = new Button(),
 			oButton2 = new Button();
 
 		oButton.placeAt("qunit-fixture");
 		oButton2.placeAt("qunit-fixture");
-		sap.ui.getCore().applyChanges();
+		await nextUIUpdate();
 
 		// System under Test
 		var oPlugin = new OpaPlugin();
@@ -125,14 +127,14 @@ sap.ui.define([
 		oButton2.destroy();
 	});
 
-	QUnit.test("Should retrieve multiple controls by global id's with regexp", function(assert) {
+	QUnit.test("Should retrieve multiple controls by global id's with regexp", async function(assert) {
 		// Arrange
 		var oButton = new Button(),
 			oButton2 = new Button();
 
 		oButton.placeAt("qunit-fixture");
 		oButton2.placeAt("qunit-fixture");
-		sap.ui.getCore().applyChanges();
+		await nextUIUpdate();
 
 		// System under Test
 		var oPlugin = new OpaPlugin();
@@ -197,7 +199,7 @@ sap.ui.define([
 			this.oButton2.placeAt("qunit-fixture");
 			this.oCheckBox.placeAt("qunit-fixture");
 
-			sap.ui.getCore().applyChanges();
+			return nextUIUpdate();
 		},
 		afterEach : function() {
 			this.fnLogSpy.restore();
@@ -326,6 +328,9 @@ sap.ui.define([
 		});
 
 		assert.strictEqual(oResult.length, 0, "Result was null");
+		/**
+		 * @deprecated since 1.56 together with lazy loading as it implies sync loading
+		 */
 		sinon.assert.calledWith(this.fnLogSpy, "The control type sap.m.MessageToast must be a function.");
 	});
 
@@ -375,14 +380,12 @@ sap.ui.define([
 	});
 
 	QUnit.module("OpaPlugin - Controls in a view", {
-		beforeEach: function (assert) {
+		beforeEach: async function (assert) {
 			// Note: This test is executed with QUnit 1 and QUnit 2.
 			//       We therefore cannot rely on the built-in promise handling of QUnit 2.
-			var done = assert.async();
-			viewUtils.createXmlView("bar", "myFooBarView").then(function(oView) {
+			await viewUtils.createXmlView("bar", "myFooBarView").then(function(oView) {
 				this.oView = oView.placeAt("qunit-fixture");
-				sap.ui.getCore().applyChanges();
-				done();
+				return nextUIUpdate();
 			}.bind(this), function(oErr) {
 				assert.strictEqual(oErr, undefined, "failed to load view");
 			});
@@ -782,16 +785,14 @@ sap.ui.define([
 			].join('');
 			// Note: This test is executed with QUnit 1 and QUnit 2.
 			//       We therefore cannot rely on the built-in promise handling of QUnit 2.
-			var done = assert.async();
-			XMLView.create({
+			return XMLView.create({
 				id: "viewWithDialog",
 				definition: sViewContent
 			}).then(function(oView) {
 				this.oView = oView
 					.setViewName("testView")
 					.placeAt("qunit-fixture");
-				sap.ui.getCore().applyChanges();
-				done();
+				return nextUIUpdate();
 			}.bind(this), function(oErr) {
 				assert.strictEqual(oErr, undefined, "failed to load view");
 			});
@@ -804,7 +805,7 @@ sap.ui.define([
 	QUnit.test("Should only match controls in open dialog", function (assert) {
 		var oPlugin = new OpaPlugin();
 		var fnStart = assert.async();
-		var oDialog = sap.ui.getCore().byId("viewWithDialog--myDialog");
+		var oDialog = Element.getElementById("viewWithDialog--myDialog");
 		oDialog.attachAfterOpen(function () {
 			var aControls = oPlugin.getMatchingControls({
 				searchOpenDialogs: true,
@@ -823,7 +824,7 @@ sap.ui.define([
 	QUnit.test("Should match controls in open dialog by ID and view", function (assert) {
 		var oPlugin = new OpaPlugin();
 		var fnStart = assert.async();
-		var oDialog = sap.ui.getCore().byId("viewWithDialog--myDialog");
+		var oDialog = Element.getElementById("viewWithDialog--myDialog");
 		oDialog.attachAfterOpen(function () {
 			var oControlWithViewName = oPlugin.getMatchingControls({
 				searchOpenDialogs: true,
@@ -857,7 +858,7 @@ sap.ui.define([
 	QUnit.test("Should match controls in open dialog by ID with no viewName or viewID", function (assert) {
 		var oPlugin = new OpaPlugin();
 		var fnStart = assert.async();
-		var oDialog = sap.ui.getCore().byId("viewWithDialog--myDialog");
+		var oDialog = Element.getElementById("viewWithDialog--myDialog");
 		oDialog.attachAfterOpen(function () {
 			var oControlWithStrictID = oPlugin.getMatchingControls({
 				searchOpenDialogs: true,
@@ -881,7 +882,7 @@ sap.ui.define([
 		beforeEach: function () {
 			this.oPlugin =  new OpaPlugin();
 			this.oButton = new Button("foo").placeAt("qunit-fixture");
-			sap.ui.getCore().applyChanges();
+			return nextUIUpdate();
 		},
 		afterEach: function () {
 			this.oPlugin.destroy();
@@ -1011,16 +1012,13 @@ sap.ui.define([
 		beforeEach: function (assert) {
 			// Note: This test is executed with QUnit 1 and QUnit 2.
 			//       We therefore cannot rely on the built-in promise handling of QUnit 2.
-			var done = assert.async();
-			viewUtils.createXmlView("sample.viewNamespace.viewName", "myViewSample").then(function(oView) {
+			this.oPlugin = new OpaPlugin();
+			return viewUtils.createXmlView("sample.viewNamespace.viewName", "myViewSample").then(function(oView) {
 				this.oView = oView.placeAt("qunit-fixture");
-				sap.ui.getCore().applyChanges();
-				done();
+				return nextUIUpdate();
 			}.bind(this), function(oErr) {
 				assert.strictEqual(oErr, undefined, "failed to load view");
 			});
-
-			this.oPlugin = new OpaPlugin();
 		},
 		afterEach: function () {
 			this.oView.destroy();
@@ -1061,8 +1059,7 @@ sap.ui.define([
 			this.sViewName = "sample.viewNamespace.viewName";
 			// Note: This test is executed with QUnit 1 and QUnit 2.
 			//       We therefore cannot rely on the built-in promise handling of QUnit 2.
-			var done = assert.async();
-			Promise.all([
+			return Promise.all([
 				viewUtils.createXmlView(this.sViewName, "mySampleView"),
 				viewUtils.createXmlView(this.sViewName, "myOtherView"),
 				viewUtils.createXmlView("differentName", "myDifferentlyNamedView")
@@ -1070,8 +1067,7 @@ sap.ui.define([
 				this.oSampleView = aViews[0].placeAt("qunit-fixture");
 				this.oDuplicateView = aViews[1].placeAt("qunit-fixture");
 				this.oDifferentView = aViews[2].placeAt("qunit-fixture");
-				sap.ui.getCore().applyChanges();
-				done();
+				return nextUIUpdate();
 			}.bind(this), function(oErr) {
 				assert.strictEqual(oErr, undefined, "failed to load view");
 			});
@@ -1100,17 +1096,14 @@ sap.ui.define([
 
 		// Note: This test is executed with QUnit 1 and QUnit 2.
 		//       We therefore cannot rely on the built-in promise handling of QUnit 2.
-		var done = assert.async();
-		viewUtils.createXmlView(this.sViewName, "myOtherView").then(function(oView) {
+		return viewUtils.createXmlView(this.sViewName, "myOtherView").then(async function(oView) {
 			this.oDuplicateView = oView;  // do not render view
-			sap.ui.getCore().applyChanges();
+			await nextUIUpdate();
 
 			assert.strictEqual(aViews.length, 3, "Should find all controls of type View");
 			assert.strictEqual(oMatchedView.getId(), "mySampleView", "Should match only rendered views");
 			sinon.assert.calledWith(this.fnLogSpy, "Found 2 views with viewName '" + this.sViewName + "'");
 			sinon.assert.calledWith(this.fnLogSpy, "Found 1 visible views with viewName '" + this.sViewName + "'");
-
-			done();
 		}.bind(this), function(oErr) {
 			assert.strictEqual(oErr, undefined, "failed to load view");
 		});
@@ -1140,14 +1133,12 @@ sap.ui.define([
 		beforeEach: function (assert) {
 			// Note: This test is executed with QUnit 1 and QUnit 2.
 			//       We therefore cannot rely on the built-in promise handling of QUnit 2.
-			var done = assert.async(assert);
-			viewUtils.createXmlView("testViewName", "myView", {
+			return viewUtils.createXmlView("testViewName", "myView", {
 				id: "testFragment",
 				name: "fixture.OpaPlugin"
 			}).then(function(oView) {
 				this.oView = oView.placeAt("qunit-fixture");
-				sap.ui.getCore().applyChanges();
-				done();
+				return nextUIUpdate();
 			}.bind(this), function(oErr) {
 				assert.strictEqual(oErr, undefined, "failed to load view");
 			});
@@ -1172,14 +1163,12 @@ sap.ui.define([
 			].join('');
 			// Note: This test is executed with QUnit 1 and QUnit 2.
 			//       We therefore cannot rely on the built-in promise handling of QUnit 2.
-			var done = assert.async();
-			XMLView.create({
+			return XMLView.create({
 				id: "myView",
 				definition: sView
 			}).then(function(oView) {
 				this.oView = oView.placeAt("qunit-fixture");
-				sap.ui.getCore().applyChanges();
-				done();
+				return nextUIUpdate();
 			}.bind(this), function(oErr) {
 				assert.strictEqual(oErr, undefined, "failed to load view");
 			});
@@ -1191,7 +1180,7 @@ sap.ui.define([
 
 	QUnit.test("Should match controls by fragment ID inside static area", function (assert) {
 		var fnStart = assert.async();
-		var oDialog = sap.ui.getCore().byId("myView--myDialog");
+		var oDialog = Element.getElementById("myView--myDialog");
 		oDialog.attachAfterOpen(function () {
 			testWithFragmentId(new OpaPlugin(), assert);
 			fnStart();

package/test/sap/ui/core/qunit/opa/RecordReplay.qunit.js

@@ -12,16 +12,16 @@ sap.ui.define([
 	'sap/m/SearchField',
 	"sap/ui/thirdparty/jquery",
 	'sap/m/App',
-	'sap/ui/core/mvc/XMLView'
-], function (RecordReplay, _autoWaiter, _autoWaiterAsync, ListItem, Button, Input, MultiInput, OverflowToolbar, Popover, SearchField, $, App, XMLView) {
+	'sap/ui/core/mvc/XMLView',
+	"sap/ui/qunit/utils/nextUIUpdate"
+], function (RecordReplay, _autoWaiter, _autoWaiterAsync, ListItem, Button, Input, MultiInput, OverflowToolbar, Popover, SearchField, $, App, XMLView, nextUIUpdate) {
 	"use strict";
 
 	QUnit.module("RecordReplay - control selector", {
 		beforeEach: function (assert) {
 			// Note: This test is executed with QUnit 1 and QUnit 2.
 			//       We therefore cannot rely on the built-in promise handling of QUnit 2.
-			var done = assert.async();
-			XMLView.create({
+			return XMLView.create({
 				id: "myView",
 				definition:
 					'<mvc:View xmlns:core="sap.ui.core" xmlns:mvc="sap.ui.core.mvc" xmlns="sap.m">' +
@@ -34,8 +34,7 @@ sap.ui.define([
 					'</mvc:View>'
 			}).then(function(oView) {
 				this.oView = oView.placeAt("qunit-fixture");
-				sap.ui.getCore().applyChanges();
-				done();
+				return nextUIUpdate();
 			}.bind(this), function(oErr) {
 				assert.strictEqual(oErr, undefined, "failed to load view");
 			});
@@ -72,7 +71,7 @@ sap.ui.define([
 			this.oSearchFieldMulti = new SearchField("mySecondSearch", {placeholder: "Multi"});
 			this.oSearchField.placeAt("qunit-fixture");
 			this.oSearchFieldMulti.placeAt("qunit-fixture");
-			sap.ui.getCore().applyChanges();
+			return nextUIUpdate();
 		},
 		afterEach: function () {
 			this.oSearchField.destroy();
@@ -174,7 +173,7 @@ sap.ui.define([
 			this.oSearchField = new SearchField();
 			this.oSearchField.attachSearch(this.oActionSpy);
 			this.oSearchField.placeAt("qunit-fixture");
-			sap.ui.getCore().applyChanges();
+			return nextUIUpdate();
 		},
 		afterEach: function () {
 			this.oSearchField.destroy();
@@ -207,7 +206,7 @@ sap.ui.define([
 		}.bind(this));
 	});
 
-	QUnit.test("Should open Suggestions Popover through EnterText Action on MultiInput", function (assert) {
+	QUnit.test("Should open Suggestions Popover through EnterText Action on MultiInput", async function (assert) {
 		var fnDone = assert.async(),
 			oMultiInput = new MultiInput({
 				value: "",
@@ -228,7 +227,7 @@ sap.ui.define([
 			fnDone();
 		});
 		oMultiInput.placeAt("qunit-fixture");
-		sap.ui.getCore().applyChanges();
+		await nextUIUpdate();
 
 		RecordReplay.interactWithControl({
 			selector: {controlType: "sap.m.MultiInput"},
@@ -238,7 +237,7 @@ sap.ui.define([
 		});
 	});
 
-	QUnit.test("Should enter text in Popover - Popover should remain open", function (assert) {
+	QUnit.test("Should enter text in Popover - Popover should remain open", async function (assert) {
 		var fnDone = assert.async(),
 			oButton = new Button({
 				id: "open"
@@ -257,7 +256,7 @@ sap.ui.define([
 			});
 
 		oButton.placeAt("qunit-fixture");
-		sap.ui.getCore().applyChanges();
+		await nextUIUpdate();
 
 		oPopover.openBy(oButton);
 		oPopover.$().css("display", "block");
@@ -295,7 +294,7 @@ sap.ui.define([
 		});
 	});
 
-	QUnit.test("Should interact with Control with provided idSuffix", function (assert) {
+	QUnit.test("Should interact with Control with provided idSuffix", async function (assert) {
 		var fnDone = assert.async(),
 			oOFT = new OverflowToolbar({
 				content: [
@@ -306,7 +305,7 @@ sap.ui.define([
 			oPopover = oOFT._getPopover();
 
 		oOFT.placeAt("qunit-fixture");
-		sap.ui.getCore().applyChanges();
+		await nextUIUpdate();
 
 		oPopover.attachAfterOpen(function () {
 			assert.ok(true, "Overflow button of OverflowToolbar is pressed");

package/test/sap/ui/core/qunit/opa/_ControlFinder.qunit.js

@@ -10,8 +10,9 @@ sap.ui.define([
 	"sap/m/Dialog",
 	"sap/ui/model/json/JSONModel",
 	"sap/ui/test/matchers/PropertyStrictEquals",
-	"sap/ui/test/_LogCollector"
-], function ($, _ControlFinder,  mobileLibrary, Button, SearchField, List, ObjectListItem, Dialog, JSONModel, PropertyStrictEquals, _LogCollector) {
+	"sap/ui/test/_LogCollector",
+	"sap/ui/qunit/utils/nextUIUpdate"
+], function ($, _ControlFinder,  mobileLibrary, Button, SearchField, List, ObjectListItem, Dialog, JSONModel, PropertyStrictEquals, _LogCollector, nextUIUpdate) {
 	"use strict";
 
 	// shortcut for sap.m.ButtonType
@@ -36,7 +37,7 @@ sap.ui.define([
 			this.oButton.placeAt("qunit-fixture");
 			this.oButtonWithSpecialId.placeAt("qunit-fixture");
 			this.oObjectListItem.placeAt("qunit-fixture");
-			sap.ui.getCore().applyChanges();
+			return nextUIUpdate();
 		},
 		afterEach: function () {
 			this.oButton.destroy();
@@ -236,7 +237,7 @@ sap.ui.define([
 			this.oSearchField = new SearchField("myId");
 			this.oSearchField.placeAt("qunit-fixture");
 			this.oList.placeAt("qunit-fixture");
-			sap.ui.getCore().applyChanges();
+			return nextUIUpdate();
 		},
 		afterEach: function () {
 			this.oSearchField.destroy();