@openui5/sap.ui.core 1.117.1 → 1.118.0

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

@@ -8,8 +8,9 @@ sap.ui.define([
 	"sap/m/Panel",
 	"sap/ui/layout/BlockLayout",
 	"sap/ui/layout/BlockLayoutRow",
-	"sap/ui/layout/BlockLayoutCell"
-], function (_LogCollector, _OpaLogger, _resourceWaiter, Image, Text, Panel, BlockLayout, BlockLayoutRow, BlockLayoutCell) {
+	"sap/ui/layout/BlockLayoutCell",
+	"sap/ui/qunit/utils/nextUIUpdate"
+], function (_LogCollector, _OpaLogger, _resourceWaiter, Image, Text, Panel, BlockLayout, BlockLayoutRow, BlockLayoutCell, nextUIUpdate) {
 	"use strict";
 
 	var oLogCollector = _LogCollector.getInstance();
@@ -41,7 +42,7 @@ sap.ui.define([
 			"Should have stop pending log for image with src " + sSrc);
 	}
 
-	QUnit.test("Should wait for image to load", function (assert) {
+	QUnit.test("Should wait for image to load", async function (assert) {
 		var fnDone = assert.async();
 		var bCompleted = false;
 		this.oImageExistingSrc = new Image({
@@ -49,7 +50,7 @@ sap.ui.define([
 			load: fnOnComplete.bind(this)
 		});
 		this.oImageExistingSrc.placeAt("qunit-fixture");
-		sap.ui.getCore().applyChanges();
+		await nextUIUpdate();
 
 		function fnOnComplete() {
 			// guard agains duplicate call to load callback
@@ -58,19 +59,19 @@ sap.ui.define([
 			}
 			bCompleted = true;
 			// wait for other load handlers, give some time for the observer to fire the changed event
-			setTimeout(function () {
+			setTimeout(async function () {
 				// assert image was pending and then completed retrospectively from logs
 				assertPendingStartedAndFinished(this.sExistingImageSrc,true,assert);
 
 				// cleanup
 				this.oImageExistingSrc.destroy();
-				sap.ui.getCore().applyChanges();
+				await nextUIUpdate();
 				fnDone();
 			}.bind(this), 50);
 		}
 	});
 
-	QUnit.test("Should wait for image to load - nested image", function (assert) {
+	QUnit.test("Should wait for image to load - nested image", async function (assert) {
 		var fnDone = assert.async();
 		var bCompleted = false;
 		this.oNestedImage = new Image("nestedImage", {
@@ -93,7 +94,7 @@ sap.ui.define([
 			})]
 		});
 		this.oPanel.placeAt("qunit-fixture");
-		sap.ui.getCore().applyChanges();
+		await nextUIUpdate();
 
 		function fnOnComplete() {
 			// guard agains duplicate call to load callback
@@ -102,19 +103,19 @@ sap.ui.define([
 			}
 			bCompleted = true;
 			// wait for other load handlers, give some time for the observer to fire the changed event
-			setTimeout(function () {
+			setTimeout(async function () {
 				// assert image was pending and then completed retrospectively from logs
 				assertPendingStartedAndFinished(this.sNestedImageSrc,true,assert);
 
 				// cleanup
 				this.oPanel.destroy();
-				sap.ui.getCore().applyChanges();
+				await nextUIUpdate();
 				fnDone();
 			}.bind(this), 50);
 		}
 	});
 
-	QUnit.test("Should wait for image to complete with error", function (assert) {
+	QUnit.test("Should wait for image to complete with error", async function (assert) {
 		var bFailed = false;
 		var fnDone = assert.async();
 		this.oImageWrongSrc = new Image({
@@ -122,7 +123,7 @@ sap.ui.define([
 			error: fnOnError.bind(this)
 		});
 		this.oImageWrongSrc.placeAt("qunit-fixture");
-		sap.ui.getCore().applyChanges();
+		await nextUIUpdate();
 
 		function fnOnError() {
 			// guard agains duplicate call to error callback
@@ -131,19 +132,19 @@ sap.ui.define([
 			}
 			bFailed = true;
 			// wait for other load handlers, give some time for the observer to fire the changed event
-			setTimeout(function () {
+			setTimeout(async function () {
 				// assert image was pending and then completed retrospectively from logs
 				assertPendingStartedAndFinished(this.sNotFoundSrc,false,assert);
 
 				// cleanup
 				this.oImageWrongSrc.destroy();
-				sap.ui.getCore().applyChanges();
+				await nextUIUpdate();
 				fnDone();
 			}.bind(this), 50);
 		}
 	});
 
-	QUnit.test("Should wait for image to load when src is changed", function (assert) {
+	QUnit.test("Should wait for image to load when src is changed", async function (assert) {
 		var fnDone = assert.async();
 		var bCompleted = false;
 		var bFailed = false;
@@ -153,7 +154,7 @@ sap.ui.define([
 			load: fnOnComplete.bind(this)
 		});
 		this.oImageWrongSrc.placeAt("qunit-fixture");
-		sap.ui.getCore().applyChanges();
+		await nextUIUpdate();
 
 		function fnOnError() {
 			// guard agains duplicate call to error callback
@@ -162,13 +163,13 @@ sap.ui.define([
 			}
 			bFailed = true;
 			// wait for other load handlers
-			setTimeout(function () {
+			setTimeout(async function () {
 				// wait for other load handlers, give some time for the observer to fire the changed event
 				assertPendingStartedAndFinished(this.sNotFoundSrc,false,assert);
 
 				// update image - from sNotFoundSrc to sReplacerImageSrc
 				this.oImageWrongSrc.setSrc(this.sReplacerImageSrc);
-				sap.ui.getCore().applyChanges();
+				await nextUIUpdate();
 			}.bind(this), 50);
 		}
 
@@ -179,13 +180,13 @@ sap.ui.define([
 			}
 			bCompleted = true;
 			// wait for other load handlers, give some time for the observer to fire the changed event
-			setTimeout(function () {
+			setTimeout(async function () {
 				// assert image was pending and then completed retrospectively from logs
 				assertPendingStartedAndFinished(this.sReplacerImageSrc,true,assert);
 
 				// cleanup
 				this.oImageWrongSrc.destroy();
-				sap.ui.getCore().applyChanges();
+				await nextUIUpdate();
 				fnDone();
 			}.bind(this), 50);
 		}

package/test/sap/ui/core/qunit/opa/fixture/bindingPath.js

@@ -4,8 +4,9 @@ sap.ui.define([
 	'sap/m/Text',
 	'sap/m/Input',
 	'sap/ui/layout/VerticalLayout',
-	'sap/ui/model/json/JSONModel'
-], function (List, StandardListItem, Text, Input, VerticalLayout, JSONModel) {
+	'sap/ui/model/json/JSONModel',
+	"sap/ui/qunit/utils/nextUIUpdate"
+], function (List, StandardListItem, Text, Input, VerticalLayout, JSONModel, nextUIUpdate) {
 	"use strict";
 
 	var mPropertyData = {
@@ -54,7 +55,7 @@ sap.ui.define([
 			this.oCompositePropertyText.placeAt("qunit-fixture");
 			this.oNamedCompositePropertyText.placeAt("qunit-fixture");
 			this.oStaticPropertyText.placeAt("qunit-fixture");
-			sap.ui.getCore().applyChanges();
+			return nextUIUpdate();
 		};
 
 		this.afterEach = function () {
@@ -93,7 +94,7 @@ sap.ui.define([
 			this.oInput.placeAt("qunit-fixture");
 			this.oNamedInput.placeAt("qunit-fixture");
 			this.oVerticalLayout.placeAt("qunit-fixture");
-			sap.ui.getCore().applyChanges();
+			return nextUIUpdate();
 		};
 
 		this.afterEach = function () {
@@ -136,7 +137,7 @@ sap.ui.define([
 				});
 			});
 
-			sap.ui.getCore().applyChanges();
+			return nextUIUpdate();
 		};
 
 		this.afterEach = function () {

package/test/sap/ui/core/qunit/opa/matchers/Interactable.qunit.js

@@ -10,6 +10,7 @@ sap.ui.define([
 	'sap/ui/test/opaQunit',
 	'sap/ui/test/Opa5',
 	'sap/ui/test/_LogCollector',
+	"sap/ui/qunit/utils/nextUIUpdate",
 	'../utils/customQUnitAssertions'
 ], function (Interactable,
 			 $,
@@ -20,7 +21,8 @@ sap.ui.define([
 			 Dialog,
 			 opaTest,
 			 Opa5,
-			 _LogCollector) {
+			 _LogCollector,
+			 nextUIUpdate) {
 	"use strict";
 
 	[NavContainer, App].forEach(function (FnConstructor) {
@@ -42,7 +44,7 @@ sap.ui.define([
 
 				this.oInteractable = new Interactable();
 				this.oSpy = sinon.spy(this.oInteractable._oLogger, "debug");
-				sap.ui.getCore().applyChanges();
+				return nextUIUpdate();
 			},
 
 			afterEach: function () {
@@ -101,9 +103,9 @@ sap.ui.define([
 				content: this.oButtonInDialog
 			});
 			this.oButtonInPage.placeAt("qunit-fixture");
-			sap.ui.getCore().applyChanges();
 			// Async tests use global spy
 			this.oSpy = sinon.spy(this.oInteractable._oLogger, "debug");
+			return nextUIUpdate();
 		},
 		afterEach: function () {
 			this.oButtonInPage.destroy();
@@ -227,14 +229,14 @@ sap.ui.define([
 
 			this.oButton = new Button();
 			this.oButton.placeAt("qunit-fixture");
-			sap.ui.getCore().applyChanges();
 			// Async tests use global spy
 			this.oSpy = sinon.spy(this.oInteractable._oLogger, "debug");
+			return nextUIUpdate();
 		},
 		afterEach: function () {
 			this.oSpy.restore();
 			this.oButton.destroy();
-			sap.ui.getCore().applyChanges();
+			return nextUIUpdate();
 		}
 	});
 

package/test/sap/ui/core/qunit/opa/matchers/LabelFor.qunit.js

@@ -9,8 +9,9 @@ sap.ui.define([
 	"sap/m/Page",
 	"sap/ui/layout/library",
 	"sap/ui/layout/form/SimpleForm",
-	"sap/m/Link"
-], function (LabelFor, Input, Label, Button, ResourceModel, App, Page, layoutLibrary, SimpleForm, Link) {
+	"sap/m/Link",
+	"sap/ui/qunit/utils/nextUIUpdate"
+], function (LabelFor, Input, Label, Button, ResourceModel, App, Page, layoutLibrary, SimpleForm, Link, nextUIUpdate) {
 	"use strict";
 
 	var SimpleFormLayout = layoutLibrary.form.SimpleFormLayout;
@@ -68,7 +69,7 @@ sap.ui.define([
 				]
 			})).setModel(this.oModel, "i18n").placeAt("qunit-fixture");
 
-			sap.ui.getCore().applyChanges();
+			return nextUIUpdate();
 		},
 		afterEach: function () {
 			this.oApp.destroy();

package/test/sap/ui/core/qunit/opa/matchers/Sibling.qunit.js

@@ -6,8 +6,9 @@ sap.ui.define([
 	"sap/ui/layout/VerticalLayout",
 	"sap/m/List",
 	"sap/m/StandardListItem",
-	"sap/m/Toolbar"
-], function (Sibling, Button, HorizontalLayout, VerticalLayout, List, StandardListItem, Toolbar) {
+	"sap/m/Toolbar",
+	"sap/ui/qunit/utils/nextUIUpdate"
+], function (Sibling, Button, HorizontalLayout, VerticalLayout, List, StandardListItem, Toolbar, nextUIUpdate) {
 	"use strict";
 
 	QUnit.module("Sibling", {
@@ -37,7 +38,7 @@ sap.ui.define([
 				]
 			});
 			this.oLayout.placeAt("qunit-fixture");
-			sap.ui.getCore().applyChanges();
+			return nextUIUpdate();
 		},
 		afterEach : function(){
 			this.oLayout.destroy();

package/test/sap/ui/core/qunit/opa/matchers/Visible.qunit.js

@@ -1,8 +1,9 @@
 /*global QUnit, sinon */
 sap.ui.define([
 	'sap/ui/test/matchers/Visible',
-	'sap/m/Button'
-], function (Visible, Button) {
+	'sap/m/Button',
+	"sap/ui/qunit/utils/nextUIUpdate"
+], function (Visible, Button, nextUIUpdate) {
 	"use strict";
 
 	QUnit.module("Visible", {
@@ -11,7 +12,7 @@ sap.ui.define([
 			this.oSpy = sinon.spy(this.oVisibleMatcher._oLogger, "debug");
 			this.oButton = new Button();
 			this.oButton.placeAt("qunit-fixture");
-			sap.ui.getCore().applyChanges();
+			return nextUIUpdate();
 		},
 
 		afterEach: function () {
@@ -19,9 +20,9 @@ sap.ui.define([
 		}
 	});
 
-	QUnit.test("Should not match a Button without domref", function (assert) {
+	QUnit.test("Should not match a Button without domref", async function (assert) {
 		this.oButton.destroy();
-		sap.ui.getCore().applyChanges();
+		await nextUIUpdate();
 		// Act
 		var oResult = this.oVisibleMatcher.isMatching(this.oButton);
 

package/test/sap/ui/core/qunit/opa/matchers/_Busy.qunit.js

@@ -6,8 +6,9 @@ sap.ui.define([
 	'sap/m/Toolbar',
 	'sap/m/Page',
 	'sap/m/VBox',
-	"sap/ui/core/mvc/XMLView"
-], function (_Busy, Button, Dialog, Toolbar, Page, VBox, XMLView) {
+	"sap/ui/core/mvc/XMLView",
+	"sap/ui/qunit/utils/nextUIUpdate"
+], function (_Busy, Button, Dialog, Toolbar, Page, VBox, XMLView, nextUIUpdate) {
 	"use strict";
 
 	QUnit.module("_Busy", {
@@ -20,14 +21,14 @@ sap.ui.define([
 				content: [this.oToolbar]
 			});
 			this.oPage.placeAt("qunit-fixture");
-			sap.ui.getCore().applyChanges();
 			this.oBusyMatcher = new _Busy();
 			this.oSpy = sinon.spy(this.oBusyMatcher._oLogger, "debug");
+			return nextUIUpdate();
 		},
 		afterEach: function () {
 			this.oPage.destroy();
-			sap.ui.getCore().applyChanges();
 			this.oSpy.restore();
+			return nextUIUpdate();
 		}
 	});
 
@@ -88,20 +89,20 @@ sap.ui.define([
 			});
 
 			oContainer.placeAt("qunit-fixture");
-			sap.ui.getCore().applyChanges();
+			nextUIUpdate().then(function() {
+				// Assert
+				assert.strictEqual(oBusy.isMatching(oButton), false, "Button is not busy");
 
-			// Assert
-			assert.strictEqual(oBusy.isMatching(oButton), false, "Button is not busy");
+				// Act
+				oContainer.setBusy(true);
 
-			// Act
-			oContainer.setBusy(true);
+				// Assert
+				assert.strictEqual(oBusy.isMatching(oButton), true, "Button is busy");
 
-			// Assert
-			assert.strictEqual(oBusy.isMatching(oButton), true, "Button is busy");
-
-			// Clean up
-			oContainer.destroy();
-			fnDone();
+				// Clean up
+				oContainer.destroy();
+				fnDone();
+			});
 		});
 
 		QUnit.test("Should not block Dialog, when parent is ComponentContainer, placed in Busy control/view", function (assert) {
@@ -150,21 +151,21 @@ sap.ui.define([
 					oVBox.addItem(oContainer);
 					oVBox.placeAt("qunit-fixture");
 					oView.addDependent(oDialog);
-					sap.ui.getCore().applyChanges();
+					nextUIUpdate().then(function() {
+						// Assert
+						assert.strictEqual(oBusy.isMatching(oDialog), false, "Button is not busy");
 
-					// Assert
-					assert.strictEqual(oBusy.isMatching(oDialog), false, "Button is not busy");
+						// Act
+						oVBox.setBusy(true);
+						oDialog.open();
 
-					// Act
-					oVBox.setBusy(true);
-					oDialog.open();
+						// Assert
+						assert.strictEqual(oBusy.isMatching(oDialog), false, "Button is not busy");
 
-					// Assert
-					assert.strictEqual(oBusy.isMatching(oDialog), false, "Button is not busy");
-
-					// Clean up
-					oContainer.destroy();
-					fnDone();
+						// Clean up
+						oContainer.destroy();
+						fnDone();
+					});
 				});
 
 			});

package/test/sap/ui/core/qunit/opa/matchers/_Editable.qunit.js

@@ -4,8 +4,9 @@ sap.ui.define([
 	'sap/m/Input',
 	'sap/m/Text',
 	'sap/ui/layout/library',
-	'sap/ui/layout/form/SimpleForm'
-], function (_Editable, Input, Text, layoutLibrary, SimpleForm) {
+	'sap/ui/layout/form/SimpleForm',
+	"sap/ui/qunit/utils/nextUIUpdate"
+], function (_Editable, Input, Text, layoutLibrary, SimpleForm, nextUIUpdate) {
 	"use strict";
 
 	var SimpleFormLayout = layoutLibrary.form.SimpleFormLayout;
@@ -21,12 +22,12 @@ sap.ui.define([
 			this.oForm.placeAt("qunit-fixture");
 			this.oEditableMatcher = new _Editable();
 			this.oSpy = sinon.spy(this.oEditableMatcher._oLogger, "debug");
-			sap.ui.getCore().applyChanges();
+			return nextUIUpdate();
 		},
 		afterEach: function () {
 			this.oSpy.restore();
 			this.oForm.destroy();
-			sap.ui.getCore().applyChanges();
+			return nextUIUpdate();
 		}
 	});
 
@@ -36,26 +37,26 @@ sap.ui.define([
 		sinon.assert.notCalled(this.oSpy);
 	});
 
-	QUnit.test("Should not match non-editable control", function (assert) {
+	QUnit.test("Should not match non-editable control", async function (assert) {
 		this.oForm.setEditable(true);
 		this.oInput.setEditable(false);
-		sap.ui.getCore().applyChanges();
+		await nextUIUpdate();
 
 		assert.ok(!this.oEditableMatcher.isMatching(this.oInput));
 		sinon.assert.calledWith(this.oSpy, "Control 'Element sap.m.Input#myInput' is not editable");
 	});
 
-	QUnit.test("Should not match control with non-editable ancestor", function (assert) {
+	QUnit.test("Should not match control with non-editable ancestor", async function (assert) {
 		this.oForm.setEditable(false);
-		sap.ui.getCore().applyChanges();
+		await nextUIUpdate();
 
 		assert.ok(!this.oEditableMatcher.isMatching(this.oInput));
 		sinon.assert.calledWith(this.oSpy, "Control 'Element sap.m.Input#myInput' has a parent 'Element sap.ui.layout.form.Form#myForm--Form' that is not editable");
 	});
 
-	QUnit.test("Should not match control when a parent is disabled and it has no Disabled propagator", function (assert) {
+	QUnit.test("Should not match control when a parent is disabled and it has no Disabled propagator", async function (assert) {
 		this.oForm.setEditable(false);
-		sap.ui.getCore().applyChanges();
+		await nextUIUpdate();
 
 		assert.ok(!this.oEditableMatcher.isMatching(this.oText));
 		sinon.assert.calledWith(this.oSpy, "Control 'Element sap.m.Text#myText' has a parent 'Element sap.ui.layout.form.Form#myForm--Form' that is not editable");

package/test/sap/ui/core/qunit/opa/matchers/_Enabled.qunit.js

@@ -3,8 +3,9 @@ sap.ui.define([
 	'sap/ui/test/matchers/_Enabled',
 	'sap/m/Button',
 	'sap/m/Page',
-	'sap/m/Toolbar'
-], function (_Enabled, Button, Page, Toolbar) {
+	'sap/m/Toolbar',
+	"sap/ui/qunit/utils/nextUIUpdate"
+], function (_Enabled, Button, Page, Toolbar, nextUIUpdate) {
 	"use strict";
 
 	QUnit.module("_Enabled matcher", {
@@ -17,12 +18,12 @@ sap.ui.define([
 			this.oToolbar.placeAt("qunit-fixture");
 			this.oEnabledMatcher = new _Enabled();
 			this.oSpy = sinon.spy(this.oEnabledMatcher._oLogger, "debug");
-			sap.ui.getCore().applyChanges();
+			return nextUIUpdate();
 		},
 		afterEach: function () {
 			this.oSpy.restore();
 			this.oToolbar.destroy();
-			sap.ui.getCore().applyChanges();
+			return nextUIUpdate();
 		}
 	});
 
@@ -31,25 +32,25 @@ sap.ui.define([
 		sinon.assert.notCalled(this.oSpy);
 	});
 
-	QUnit.test("Should not match disabled control", function (assert) {
+	QUnit.test("Should not match disabled control", async function (assert) {
 		this.oButton.setEnabled(false);
-		sap.ui.getCore().applyChanges();
+		await nextUIUpdate();
 
 		assert.ok(!this.oEnabledMatcher.isMatching(this.oButton));
 		sinon.assert.calledWith(this.oSpy, "Control 'Element sap.m.Button#myButton' is not enabled");
 	});
 
-	QUnit.test("Should not match control with disabled ancestor", function (assert) {
+	QUnit.test("Should not match control with disabled ancestor", async function (assert) {
 		this.oToolbar.setEnabled(false);
-		sap.ui.getCore().applyChanges();
+		await nextUIUpdate();
 
 		assert.ok(!this.oEnabledMatcher.isMatching(this.oButton));
 		sinon.assert.calledWith(this.oSpy, "Control 'Element sap.m.Button#myButton' is not enabled");
 	});
 
-	QUnit.test("Should not match control when a parent is disabled and it has no Disabled propagator", function (assert) {
+	QUnit.test("Should not match control when a parent is disabled and it has no Disabled propagator", async function (assert) {
 		this.oToolbar.setEnabled(false);
-		sap.ui.getCore().applyChanges();
+		await nextUIUpdate();
 
 		assert.ok(!this.oEnabledMatcher.isMatching(this.oPage));
 		sinon.assert.calledWith(this.oSpy, "Control 'Element sap.m.Page#myPage' has a parent 'Element sap.m.Toolbar#myToolbar' that is not enabled");

package/test/sap/ui/core/qunit/opa/matchers/_Visitor.qunit.js

@@ -3,8 +3,9 @@ sap.ui.define([
 	'sap/ui/test/matchers/_Visitor',
 	'sap/m/Button',
 	'sap/m/Toolbar',
-	'sap/m/Page'
-], function (_Visitor, Button, Toolbar, Page) {
+	'sap/m/Page',
+	"sap/ui/qunit/utils/nextUIUpdate"
+], function (_Visitor, Button, Toolbar, Page, nextUIUpdate) {
 	"use strict";
 
 	QUnit.module("_Visitor", {
@@ -17,12 +18,12 @@ sap.ui.define([
 				content: [this.oToolbar]
 			});
 			this.oPage.placeAt("qunit-fixture");
-			sap.ui.getCore().applyChanges();
 			this.oVisitor = new _Visitor();
+			return nextUIUpdate();
 		},
 		afterEach: function () {
 			this.oPage.destroy();
-			sap.ui.getCore().applyChanges();
+			return nextUIUpdate();
 		}
 	});
 

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

@@ -4,8 +4,9 @@ sap.ui.define([
 	"sap/ui/test/opaQunit",
 	"sap/ui/test/autowaiter/_timeoutWaiter",
 	"sap/m/Button",
-	"sap/ui/test/autowaiter/_autoWaiter"
-], function (Opa5, opaTest, _timeoutWaiter, Button, _autoWaiter) {
+	"sap/ui/test/autowaiter/_autoWaiter",
+	"sap/ui/qunit/utils/nextUIUpdate"
+], function (Opa5, opaTest, _timeoutWaiter, Button, _autoWaiter, nextUIUpdate) {
 	"use strict";
 
 	QUnit.test("Should not execute the test in debug mode", function (assert) {
@@ -16,7 +17,7 @@ sap.ui.define([
 		beforeEach: function () {
 			this.oButton = new Button("foo");
 			this.oButton.placeAt("qunit-fixture");
-			sap.ui.getCore().applyChanges();
+			return nextUIUpdate();
 		},
 		afterEach: function () {
 			this.oButton.destroy();
@@ -124,15 +125,15 @@ sap.ui.define([
 		beforeEach: function () {
 			this.oButton = new Button();
 			this.oButton.placeAt("qunit-fixture");
-			sap.ui.getCore().applyChanges();
 			Opa5.extendConfig({
 				pollingInterval: 20
 			});
+			return nextUIUpdate();
 		},
 		afterEach: function () {
 			this.oButton.destroy();
-			sap.ui.getCore().applyChanges();
 			Opa5.resetConfig();
+			return nextUIUpdate();
 		}
 	});
 
@@ -279,16 +280,16 @@ sap.ui.define([
 			this.oButton.placeAt("qunit-fixture");
 			this.oButton2 = new Button();
 			this.oButton2.placeAt("qunit-fixture");
-			sap.ui.getCore().applyChanges();
 			Opa5.extendConfig({
 				pollingInterval: 20
 			});
+			return nextUIUpdate();
 		},
 		afterEach: function () {
 			this.oButton.destroy();
 			this.oButton2.destroy();
-			sap.ui.getCore().applyChanges();
 			Opa5.resetConfig();
+			return nextUIUpdate();
 		}
 	});