@openui5/sap.ui.core 1.117.1 → 1.119.0

package/test/sap/ui/core/qunit/opa/actions/Action.qunit.js

@@ -3,8 +3,9 @@
 
 sap.ui.define([
 	"sap/ui/test/actions/Action",
-	"sap/ui/core/Control"
-], function(Action, Control){
+	"sap/ui/core/Control",
+	"sap/ui/qunit/utils/nextUIUpdate"
+], function(Action, Control, nextUIUpdate){
 	"use strict";
 
 	var MyControl = Control.extend("my.Control", {
@@ -39,8 +40,8 @@ sap.ui.define([
 		beforeEach: function () {
 			var oMyControl = new MyControl("myId");
 			oMyControl.placeAt("qunit-fixture");
-			sap.ui.getCore().applyChanges();
 			this.oMyControl = oMyControl;
+			return nextUIUpdate();
 		},
 		afterEach: function () {
 			this.oMyControl.destroy();
@@ -86,14 +87,14 @@ sap.ui.define([
 
 	});
 
-	QUnit.test("Artificial focus should synchronously trigger focusout for the old focused", function (assert) {
+	QUnit.test("Artificial focus should synchronously trigger focusout for the old focused", async function (assert) {
 		var oAction = new Action();
 		var async = assert.async();
 		var oInitiallyFocused = this.oMyControl;
 		var oNewlyFocused = new MyControl("myId2");
 
 		oNewlyFocused.placeAt("qunit-fixture");
-		sap.ui.getCore().applyChanges();
+		await nextUIUpdate();
 
 		oInitiallyFocused.focus();
 		oInitiallyFocused.onsapfocusleave = sinon.spy();

package/test/sap/ui/core/qunit/opa/actions/EnterText.qunit.js

@@ -15,7 +15,8 @@ sap.ui.define([
 	"sap/ui/test/opaQunit",
 	"sap/m/library",
 	"sap/ui/thirdparty/jquery",
-	"sap/base/strings/capitalize"
+	"sap/base/strings/capitalize",
+	"sap/ui/qunit/utils/nextUIUpdate"
 ], function (
 	extend,
 	EnterText,
@@ -32,7 +33,8 @@ sap.ui.define([
 	opaTest,
 	mobileLibrary,
 	$,
-	capitalize) {
+	capitalize,
+	nextUIUpdate) {
 	"use strict";
 
 	var InputType = mobileLibrary.InputType;
@@ -92,7 +94,7 @@ sap.ui.define([
 		clearTextFirst: true
 	}].forEach(function (testInfo) {
 
-		function testBobyForValidAction(bClearText, assert) {
+		async function testBobyForValidAction(bClearText, assert) {
 			var fnDone = assert.async();
 			var sTextToEnter = testInfo.textToEnter || "foo";
 			var sTextBeforeAction = testInfo.textInControl || "A";
@@ -112,7 +114,7 @@ sap.ui.define([
 			var fnOnSapFocusLeaveSpy = sinon.spy(oControl, "onsapfocusleave");
 
 			oControl.placeAt("qunit-fixture");
-			sap.ui.getCore().applyChanges();
+			await nextUIUpdate();
 
 			var oEnterText = new EnterText({
 				text: sTextToEnter,
@@ -155,22 +157,22 @@ sap.ui.define([
 
 		if (!testInfo.clearTextFirst) {
 			QUnit.test("Should enter a text and preserve the value in a " + testInfo.Control.getMetadata().getName(), function (assert) {
-				testBobyForValidAction.call(this, false, assert);
+				return testBobyForValidAction.call(this, false, assert);
 			});
 		}
 
 		QUnit.test("Should enter a text and clear the value in a " + testInfo.Control.getMetadata().getName(), function (assert) {
-			testBobyForValidAction.call(this, true, assert);
+			return testBobyForValidAction.call(this, true, assert);
 		});
 
-		function testBodyForInvalidAction(fnModifyControl, assert) {
+		async function testBodyForInvalidAction(fnModifyControl, assert) {
 			var fnDone = assert.async();
 			fnModifyControl();
 			var fnOnLiveChange = testInfo.liveChangeEventParameter ? sinon.spy(this.oControl, "fireLiveChange") : sinon.spy();
 			var fnOnChange = sinon.spy(this.oControl, "on" + capitalize(testInfo.changeEvent));
 
 			this.oControl.placeAt("qunit-fixture");
-			sap.ui.getCore().applyChanges();
+			await nextUIUpdate();
 
 			var oEnterText = new EnterText({
 				text: testInfo.textToEnter || "foo"
@@ -193,7 +195,7 @@ sap.ui.define([
 			this.oControl = oControl; // should be destroyed at end of test
 
 			if (oControl.getMetadata()._mAllProperties.editable) {
-				testBodyForInvalidAction.call(this, function () {
+				return testBodyForInvalidAction.call(this, function () {
 					oControl.setEditable(false);
 				}, assert);
 			} else {
@@ -201,26 +203,26 @@ sap.ui.define([
 			}
 		});
 
-		QUnit.test("Should not enter text when " + testInfo.Control.getMetadata().getName() + " is not enabled", function (assert) {
+		QUnit.test("Should not enter text when " + testInfo.Control.getMetadata().getName() + " is not enabled", async function (assert) {
 			this.sTextBeforeAction = testInfo.textInControl || "A";
 			var oControl = new testInfo.Control({
 				value: this.sTextBeforeAction
 			});
 			this.oControl = oControl; // should be destroyed at end of test
 
-			testBodyForInvalidAction.call(this, function () {
+			await testBodyForInvalidAction.call(this, function () {
 				oControl.setEnabled(false);
 			}, assert);
 			oControl.setEnabled(false);
 		});
 	});
 
-	QUnit.test("Should not fire enter on a control", function (assert) {
+	QUnit.test("Should not fire enter on a control", async function (assert) {
 		this.oControl = new Input();
 		var fnEnterSpy = sinon.spy(this.oControl, "onsapenter");
 
 		this.oControl.placeAt("qunit-fixture");
-		sap.ui.getCore().applyChanges();
+		await nextUIUpdate();
 
 		new EnterText({ text: "foo" }).executeOn(this.oControl);
 
@@ -238,7 +240,6 @@ sap.ui.define([
 			]
 		});
 		this.oControl.placeAt("qunit-fixture");
-		sap.ui.getCore().applyChanges();
 
 		var sTextInControl = "T";
 		oOpa.waitFor({
@@ -258,11 +259,11 @@ sap.ui.define([
 		});
 	});
 
-	QUnit.test("Should enter binding symbols", function (assert) {
+	QUnit.test("Should enter binding symbols", async function (assert) {
 		this.oControl = new Input();
 
 		this.oControl.placeAt("qunit-fixture");
-		sap.ui.getCore().applyChanges();
+		await nextUIUpdate();
 
 		new EnterText({ text: "{" }).executeOn(this.oControl);
 
@@ -276,7 +277,7 @@ sap.ui.define([
 			this.oErrorLog = sinon.spy(this.oEnterText.oLogger, "error");
 			this.oControl = new Input();
 			this.oControl.placeAt("qunit-fixture");
-			sap.ui.getCore().applyChanges();
+			return nextUIUpdate();
 		},
 		afterEach: function () {
 			this.oDebugLog.restore();
@@ -285,9 +286,9 @@ sap.ui.define([
 		}
 	});
 
-	QUnit.test("Should log an error if a control is not rendered", function (assert) {
+	QUnit.test("Should log an error if a control is not rendered", async function (assert) {
 		this.oControl.destroy();
-		sap.ui.getCore().applyChanges();
+		await nextUIUpdate();
 
 		this.oEnterText.setText("foo");
 
@@ -334,7 +335,7 @@ sap.ui.define([
 		beforeEach: function () {
 			this.oStepInput = new StepInput();
 			this.oStepInput.placeAt("qunit-fixture");
-			sap.ui.getCore().applyChanges();
+			return nextUIUpdate();
 		},
 		afterEach: function () {
 			this.oStepInput.destroy();
@@ -373,7 +374,7 @@ sap.ui.define([
 			});
 			$("#qunit-fixture").css("position", "static");
 			this.target.placeAt("qunit-fixture");
-			sap.ui.getCore().applyChanges();
+			return nextUIUpdate();
 		},
 		afterEach: function () {
 			this.target.destroy();

package/test/sap/ui/core/qunit/opa/actions/Press.qunit.js

@@ -15,8 +15,8 @@ sap.ui.define([
 	"sap/ui/core/Item",
 	"sap/m/Label",
 	"sap/m/Input",
-	"sap/m/TileContainer",
-	"sap/m/StandardTile",
+	"sap/f/GridContainer",
+	"sap/m/GenericTile",
 	"sap/m/SearchField",
 	"sap/m/Page",
 	"sap/m/App",
@@ -29,17 +29,17 @@ sap.ui.define([
 	"sap/m/library",
 	"sap/ui/test/Opa5",
 	"sap/ui/test/opaQunit",
-	"sap/ui/thirdparty/hasher",
 	"sap/ui/test/matchers/AggregationLengthEquals",
 	"sap/ui/test/matchers/PropertyStrictEquals",
-	"sap/ui/test/matchers/Ancestor",
 	"sap/base/Log",
 	"sap/ui/thirdparty/jquery",
 	"sap/m/ObjectIdentifier",
 	"sap/m/ObjectStatus",
 	"sap/m/inputUtils/ListHelpers",
 	"sap/m/Slider",
-	"sap/m/RatingIndicator"
+	"sap/m/RatingIndicator",
+	"sap/ui/core/UIArea",
+	"sap/ui/qunit/utils/nextUIUpdate"
 ],
 function(Press,
 		 Button,
@@ -56,8 +56,8 @@ function(Press,
 		 Item,
 		 Label,
 		 Input,
-		 TileContainer,
-		 StandardTile,
+		 GridContainer,
+		 GenericTile,
 		 SearchField,
 		 Page,
 		 App,
@@ -70,17 +70,17 @@ function(Press,
 		 mobileLibrary,
 		 Opa5,
 		 opaTest,
-		 hasher,
 		 AggregationLengthEquals,
 		 PropertyStrictEquals,
-		 Ancestor,
 		 Log,
 		 $,
 		 ObjectIdentifier,
 		 ObjectStatus,
 		 ListHelpers,
 		 Slider,
-		 RatingIndicator
+		 RatingIndicator,
+		 UIArea,
+		 nextUIUpdate
 ){
 	"use strict";
 
@@ -140,7 +140,7 @@ function(Press,
 		}),
 		event: "ValueHelpRequest"
 	}].forEach(function (oTestCase) {
-		QUnit.test("Should press a " + oTestCase.control.getMetadata().getName(), function (assert) {
+		QUnit.test("Should press a " + oTestCase.control.getMetadata().getName(), async function (assert) {
 			var fnDone = assert.async();
 
 			// Arrange
@@ -148,7 +148,7 @@ function(Press,
 			aControlsToClean.push(oControl);
 			oControl.placeAt("qunit-fixture");
 			//Make sure that the control is rendered
-			sap.ui.getCore().applyChanges();
+			await nextUIUpdate();
 
 			// System under Test
 			var oPressAction = new Press();
@@ -179,7 +179,7 @@ function(Press,
 		});
 	});
 
-	QUnit.test("Should request focus and trigger a 'press' event on an StandardListItem of type 'active'", function(assert) {
+	QUnit.test("Should request focus and trigger a 'press' event on an StandardListItem of type 'active'", async function(assert) {
 		var done = assert.async();
 
 		// Arrange
@@ -197,7 +197,7 @@ function(Press,
 		aControlsToClean.push(oList);
 
 		//Make sure that button is rendered
-		sap.ui.getCore().applyChanges();
+		await nextUIUpdate();
 
 		// System under Test
 		var oPressAction = new Press();
@@ -213,7 +213,7 @@ function(Press,
 		oPressAction.executeOn(oFirstListItem);
 	});
 
-	QUnit.test("Should press a button using key modifiers", function(assert) {
+	QUnit.test("Should press a button using key modifiers", async function(assert) {
 		var done = assert.async();
 
 		// Arrange
@@ -223,7 +223,7 @@ function(Press,
 		aControlsToClean.push(oButton);
 
 		//Make sure that button is rendered
-		sap.ui.getCore().applyChanges();
+		await nextUIUpdate();
 
 		// System under Test
 		var oPressAction = new Press({altKey: true, ctrlKey: true, shiftKey: true});
@@ -244,7 +244,7 @@ function(Press,
 		oPressAction.executeOn(oButton);
 	});
 
-	QUnit.test("Should use X percent for selecting slider value", function(assert) {
+	QUnit.test("Should use X percent for selecting slider value", async function(assert) {
 		var done = assert.async();
 
 		// Arrange
@@ -254,7 +254,7 @@ function(Press,
 		aControlsToClean.push(oSlider);
 
 		//Make sure that button is rendered
-		sap.ui.getCore().applyChanges();
+		await nextUIUpdate();
 
 		// System under Test
 		var oPressAction = new Press({idSuffix: "inner", xPercentage: 80});
@@ -270,7 +270,7 @@ function(Press,
 		oPressAction.executeOn(oSlider);
 	});
 
-	QUnit.test("Should use X perecent value for RatingIndicator", function(assert) {
+	QUnit.test("Should use X perecent value for RatingIndicator", async function(assert) {
 		var done = assert.async();
 
 		// Arrange
@@ -280,7 +280,7 @@ function(Press,
 		aControlsToClean.push(oRatingIndicator);
 
 		//Make sure that button is rendered
-		sap.ui.getCore().applyChanges();
+		await nextUIUpdate();
 
 		// System under Test
 		var oPressAction = new Press({xPercentage: 15});
@@ -296,7 +296,7 @@ function(Press,
 		oPressAction.executeOn(oRatingIndicator);
 	});
 
-	QUnit.test("List should fire selection change event", function(assert) {
+	QUnit.test("List should fire selection change event", async function(assert) {
 		var done = assert.async();
 
 		// Arrange
@@ -321,7 +321,7 @@ function(Press,
 		aControlsToClean.push(oList);
 
 		//Make sure that button is rendered
-		sap.ui.getCore().applyChanges();
+		await nextUIUpdate();
 
 		// System under Test
 		var oPressAction = new Press();
@@ -338,7 +338,7 @@ function(Press,
 		oPressAction.executeOn(oSecondListItem);
 	});
 
-	QUnit.test("IconTabBar should fire selection change event", function(assert) {
+	QUnit.test("IconTabBar should fire selection change event", async function(assert) {
 		var done = assert.async();
 
 		// Arrange
@@ -359,7 +359,7 @@ function(Press,
 		aControlsToClean.push(oTabBar);
 
 		//Make sure that button is rendered
-		sap.ui.getCore().applyChanges();
+		await nextUIUpdate();
 
 		// System under Test
 		var oPressAction = new Press();
@@ -376,7 +376,7 @@ function(Press,
 		oPressAction.executeOn(oSecondTab);
 	});
 
-	QUnit.test("Should be able to press a row in the sap.ui.table.Table", function(assert) {
+	QUnit.test("Should be able to press a row in the sap.ui.table.Table", async function(assert) {
 		// Arrange
 		var oTable = new Table({
 				selectionBehavior: "Row"
@@ -400,7 +400,7 @@ function(Press,
 
 		aControlsToClean.push(oTable);
 
-		sap.ui.getCore().applyChanges();
+		await nextUIUpdate();
 
 		// System under Test
 		var oPressAction = new Press();
@@ -415,18 +415,18 @@ function(Press,
 		oPressAction.executeOn(oTable.getRows()[1].getCells()[0]);
 	});
 
-	QUnit.test("Should press a Tile in a Tile container", function (assert) {
+	QUnit.test("Should press a Tile in a Tile container", async function (assert) {
 		var done = assert.async(),
-				oTile = new StandardTile(),
-				oTileContainer = new TileContainer({
-					tiles: oTile
+				oTile = new GenericTile(),
+				oGridContainer = new GridContainer({
+					items: oTile
 				});
 
-		oTileContainer.placeAt("qunit-fixture");
+		oGridContainer.placeAt("qunit-fixture");
 
-		aControlsToClean.push(oTileContainer);
+		aControlsToClean.push(oGridContainer);
 
-		sap.ui.getCore().applyChanges();
+		await nextUIUpdate();
 
 		// System under Test
 		var oPressAction = new Press();
@@ -457,7 +457,7 @@ function(Press,
 					}
 				});
 				oList.placeAt("qunit-fixture");
-				sap.ui.getCore().applyChanges();
+				return nextUIUpdate();
 
 			},
 			afterEach: function () {
@@ -538,18 +538,18 @@ function(Press,
 		beforeEach: function() {
 			this.oObjectIdentifier = new ObjectIdentifier();
 			this.oObjectIdentifier.placeAt("qunit-fixture");
-			sap.ui.getCore().applyChanges();
+			return nextUIUpdate();
 		},
 		afterEach: function() {
 			this.oObjectIdentifier.destroy();
 		}
 	});
 
-	QUnit.test("Should press active ObjectIdentifier - press adapter", function (assert) {
+	QUnit.test("Should press active ObjectIdentifier - press adapter", async function (assert) {
 		var done = assert.async();
 		this.oObjectIdentifier.setTitle("sampleTitle");
 		this.oObjectIdentifier.setTitleActive(true);
-		sap.ui.getCore().applyChanges();
+		await nextUIUpdate();
 
 		var oPressAction = new Press();
 
@@ -561,21 +561,21 @@ function(Press,
 		oPressAction.executeOn(this.oObjectIdentifier);
 	});
 
-	QUnit.test("Should press inactive ObjectIdentifier - press adapter", function (assert) {
+	QUnit.test("Should press inactive ObjectIdentifier - press adapter", async function (assert) {
 		var done = assert.async();
 		this.oObjectIdentifier.setTitle("sampleTitle");
 		this.oObjectIdentifier.setTitleActive(false);
 		this.oObjectIdentifier.setText("sampleText");
-		sap.ui.getCore().applyChanges();
+		await nextUIUpdate();
 
 		var oPressAction = new Press();
 		var that = this;
 
-		$(".sapMObjectIdentifierTitle").on("click", function () {
+		$(".sapMObjectIdentifierTitle").on("click", async function () {
 			assert.ok(true, "Executed press action on title");
 
 			that.oObjectIdentifier.setTitle(null);
-			sap.ui.getCore().applyChanges();
+			await nextUIUpdate();
 
 			$(".sapMObjectIdentifierText").on("click", function () {
 				assert.ok(true, "Executed press action on text");
@@ -604,18 +604,18 @@ function(Press,
 		beforeEach: function() {
 			this.oObjectStatus = new ObjectStatus();
 			this.oObjectStatus.placeAt("qunit-fixture");
-			sap.ui.getCore().applyChanges();
+			return nextUIUpdate();
 		},
 		afterEach: function() {
 			this.oObjectStatus.destroy();
 		}
 	});
 
-	QUnit.test("Should press active ObjectStatus - press adapter", function (assert) {
+	QUnit.test("Should press active ObjectStatus - press adapter", async function (assert) {
 		var done = assert.async();
 		this.oObjectStatus.setActive(true);
 		this.oObjectStatus.setText("foo");
-		sap.ui.getCore().applyChanges();
+		await nextUIUpdate();
 
 		var oPressAction = new Press();
 
@@ -627,10 +627,10 @@ function(Press,
 		oPressAction.executeOn(this.oObjectStatus);
 	});
 
-	QUnit.test("Should press ObjectStatus - missing press adapter", function (assert) {
+	QUnit.test("Should press ObjectStatus - missing press adapter", async function (assert) {
 		var done = assert.async();
 		this.oObjectStatus.setText("foo");
-		sap.ui.getCore().applyChanges();
+		await nextUIUpdate();
 
 		var oPressAction = new Press();
 
@@ -646,7 +646,7 @@ function(Press,
 		beforeEach: function() {
 			this.oSearchField = new SearchField();
 			this.oSearchField.placeAt("qunit-fixture");
-			sap.ui.getCore().applyChanges();
+			return nextUIUpdate();
 		},
 		afterEach: function() {
 			this.oSearchField.destroy();
@@ -666,12 +666,12 @@ function(Press,
 		oPressAction.executeOn(this.oSearchField);
 	});
 
-	QUnit.test("Should press SearchField - missing press adapter", function (assert) {
+	QUnit.test("Should press SearchField - missing press adapter", async function (assert) {
 		var done = assert.async();
 		var oPressAction = new Press();
 
 		this.oSearchField.setShowSearchButton(false);
-		sap.ui.getCore().applyChanges();
+		await nextUIUpdate();
 
 		$("input[type='search']").on("mousedown", function () {
 			assert.ok(true, "Executed press action on search input field (focus DOM ref)");
@@ -681,11 +681,11 @@ function(Press,
 		oPressAction.executeOn(this.oSearchField);
 	});
 
-	QUnit.test("Should press SearchField - user provided ID suffix", function (assert) {
+	QUnit.test("Should press SearchField - user provided ID suffix", async function (assert) {
 		var done = assert.async();
 
 		this.oSearchField.setShowRefreshButton(true);
-		sap.ui.getCore().applyChanges();
+		await nextUIUpdate();
 
 		var oPressAction = new Press({idSuffix: "reset"});
 
@@ -719,12 +719,12 @@ function(Press,
 			});
 			// arrange
 			this.oComboBox.placeAt("qunit-fixture");
-			sap.ui.getCore().applyChanges();
+			return nextUIUpdate();
 		},
 		// cleanup
 		afterEach: function() {
-			this.oComboBox.destroy();
 			this.clock.restore();
+			this.oComboBox.destroy();
 		}
 	});
 
@@ -780,12 +780,12 @@ function(Press,
 		QUnit.module("OverflowToolbar");
 
 		opaTest("Should synchronize with overflow popup", function (oOpa) {
+			var done = Opa5.assert.async();
 			var oOverflowToolbar = new OverflowToolbar({
 				width: "140px"
 			});
 
 			oOverflowToolbar.placeAt("qunit-fixture");
-			sap.ui.getCore().applyChanges();
 
 			setTimeout(function () {
 				oOverflowToolbar.addContent(createButton("Button1"));
@@ -807,21 +807,23 @@ function(Press,
 				actions: new Press()
 			});
 
+			// should destroy the toolbar only after everything is settled
 			oOpa.waitFor({
 				success: function() {
 					oOverflowToolbar.destroy();
+					done();
 				}
 			});
 		});
 
 		opaTest("Should synchronize with resizing overflow toolbar", function (oOpa) {
+			var done = Opa5.assert.async();
 			var oOverflowToolbar = new OverflowToolbar({
 				width: "400px"
 			});
 			oOverflowToolbar.addContent(createButton("Button1"));
 			oOverflowToolbar.addContent(createButton("Button2"));
 			oOverflowToolbar.placeAt("qunit-fixture");
-			sap.ui.getCore().applyChanges();
 
 			oOpa.extendConfig({autoWait: true});
 
@@ -852,11 +854,13 @@ function(Press,
 			oOpa.waitFor({
 				success: function() {
 					oOverflowToolbar.destroy();
+					done();
 				}
 			});
 		});
 
 		opaTest("Should synchronize with resizing overflow toolbar when resizing the app", function (oOpa) {
+			var done = Opa5.assert.async();
 			var toolbarContent1 = [
 				new Label({
 					text : "Priority Toolbar"
@@ -933,7 +937,6 @@ function(Press,
 
 			var oApp = new App();
 			oApp.addPage(oPage).placeAt("qunit-fixture");
-			sap.ui.getCore().applyChanges();
 
 			oOpa.extendConfig({
 				autoWait: true,
@@ -974,6 +977,7 @@ function(Press,
 				success: function() {
 					console.debug("Destroy the app"); // eslint-disable-line no-console
 					oApp.destroy();
+					done();
 				}
 			});
 		});

package/test/sap/ui/core/qunit/opa/autowaiter/_cssAnimationWaiter.js

@@ -7,13 +7,11 @@ sap.ui.define([
 	"sap/ui/test/autowaiter/_promiseWaiter",
 	"sap/f/DynamicPage",
 	"sap/m/Toolbar",
-	"sap/m/Button",
-	"sap/ui/test/opaQunit",
-	"sap/ui/test/Opa5",
 	"sap/ui/core/Configuration",
-	"sap/ui/thirdparty/jquery"
+	"sap/ui/thirdparty/jquery",
+	"sap/ui/qunit/utils/nextUIUpdate"
 ], function (_LogCollector, _autoWaiter, _timeoutWaiter, _XHRWaiter, _promiseWaiter,
-		DynamicPage,  Toolbar, Button, opaTest, Opa5, Configuration, jQuery) {
+		DynamicPage,  Toolbar, Configuration, jQuery, nextUIUpdate) {
 	"use strict";
 
 	var oLogCollector = _LogCollector.getInstance();
@@ -32,7 +30,7 @@ sap.ui.define([
 				footer: [new Toolbar()]
 			}).placeAt("qunit-fixture");
 
-			sap.ui.getCore().applyChanges();
+			return nextUIUpdate();
 		},
 
 		afterEach: function () {
@@ -40,7 +38,7 @@ sap.ui.define([
 			this.oXHRWaiterStub.restore();
 			this.oPromiseWaiterStub.restore();
 			this.oDynamicPage.destroy();
-			sap.ui.getCore().applyChanges();
+			return nextUIUpdate();
 		}
 	});