@openui5/sap.ui.core 1.117.1 → 1.119.0

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();
 		}
 	});
 

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

@@ -10,8 +10,9 @@ sap.ui.define([
 	"sap/ui/test/_OpaLogger",
 	"sap/ui/test/_OpaUriParameterParser",
 	"sap/ui/test/autowaiter/_autoWaiter",
-	"../utils/sinon"
-], function (XMLView, Opa, Opa5, opaTest, $, Button, URI, _OpaLogger, _OpaUriParameterParser, _autoWaiter, sinonUtils) {
+	"../utils/sinon",
+	"sap/ui/qunit/utils/nextUIUpdate"
+], function (XMLView, Opa, Opa5, opaTest, $, Button, URI, _OpaLogger, _OpaUriParameterParser, _autoWaiter, sinonUtils, nextUIUpdate) {
 	"use strict";
 
 	QUnit.test("Should not execute the test in debug mode", function (assert) {
@@ -205,8 +206,7 @@ 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([
 				createXmlView("my.namespace.View"),
 				createXmlView("my.namespace2.View")
 			]).then(function(aViews) {
@@ -218,8 +218,7 @@ sap.ui.define([
 				this.oView.placeAt("qunit-fixture");
 				this.oView2.placeAt("qunit-fixture");
 
-				sap.ui.getCore().applyChanges();
-				done();
+				return nextUIUpdate();
 			}.bind(this));
 		},
 		afterEach: function () {
@@ -227,7 +226,7 @@ sap.ui.define([
 			this.oView2.destroy();
 			this.oButton.destroy();
 			Opa5.resetConfig();
-			sap.ui.getCore().applyChanges();
+			return nextUIUpdate();
 		}
 	});
 
@@ -321,28 +320,26 @@ 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();
 			var sView = [
 				'<mvc:View xmlns:mvc="sap.ui.core.mvc" xmlns="sap.m">',
 				'<Button id="foo"/>',
 				'</mvc:View>'
 			].join('');
 
-			XMLView.create({
+			return XMLView.create({
 				id: "globalId",
 				definition: sView
 			}).then(function(oView) {
 				this.oView = oView;
 				this.oView.setViewName("myViewName");
 				this.oView.placeAt("qunit-fixture");
-				sap.ui.getCore().applyChanges();
-				done();
+				return nextUIUpdate();
 			}.bind(this));
 		},
 		afterEach: function () {
 			this.oView.destroy();
-			sap.ui.getCore().applyChanges();
 			Opa5.resetConfig();
+			return nextUIUpdate();
 		}
 	});
 
@@ -419,32 +416,30 @@ 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();
 			var sView = [
 				'<mvc:View xmlns:mvc="sap.ui.core.mvc" xmlns="sap.m">',
 					'<Button id="foo"/>',
 				'</mvc:View>'
 			].join('');
 
-			XMLView.create({
+			return XMLView.create({
 				id: "myView",
 				definition: sView
 			}).then(function(oView) {
 				this.oView = oView;
-				sap.ui.getCore().applyChanges();
 				Opa5.extendConfig({
 					// make the test fast
 					pollingInterval: 50,
 					viewNamespace: "namespace.",
 					viewName: "viewName"
 				});
-				done();
+				return nextUIUpdate();
 			}.bind(this));
 		},
 		afterEach: function () {
 			this.oView.destroy();
-			sap.ui.getCore().applyChanges();
 			Opa5.resetConfig();
+			return nextUIUpdate();
 		}
 	});
 

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

@@ -4,8 +4,9 @@ sap.ui.define([
 	"sap/ui/test/Opa5",
 	"sap/ui/test/Opa",
 	"sap/ui/test/_LogCollector",
-	"../utils/sinon"
-], function (XMLView, Opa5, Opa, _LogCollector, sinonUtils) {
+	"../utils/sinon",
+	"sap/ui/qunit/utils/nextUIUpdate"
+], function (XMLView, Opa5, Opa, _LogCollector, sinonUtils, nextUIUpdate) {
 	"use strict";
 
 	QUnit.test("Should not execute the test in debug mode", function (assert) {
@@ -18,7 +19,6 @@ 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();
 			var sView = [
 				'<mvc:View xmlns:mvc="sap.ui.core.mvc" xmlns="sap.m">',
 				'<Button id="foo">',
@@ -31,7 +31,7 @@ sap.ui.define([
 				'</mvc:View>'
 			].join('');
 
-			XMLView.create({
+			return XMLView.create({
 				id: "myViewWithAb",
 				definition: sView
 			}).then(function(oView) {
@@ -39,14 +39,13 @@ sap.ui.define([
 				this.oView.setViewName("bar");
 
 				this.oView.placeAt("qunit-fixture");
-				sap.ui.getCore().applyChanges();
 				var that = this;
 				this.waitForStub = sinonUtils.createStub(Opa.prototype, "waitFor", function (oOptions) {
 					that.check = function () {
 						oOptions.check.apply(this, oOptions);
 					}.bind(this);
 				});
-				done();
+				return nextUIUpdate();
 			}.bind(this));
 		},
 		afterEach: function () {

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

@@ -8,8 +8,9 @@ sap.ui.define([
 	"sap/ui/test/matchers/Ancestor",
 	"sap/ui/test/matchers/Descendant",
 	"sap/ui/test/matchers/MatcherFactory",
-	"sap/ui/layout/HorizontalLayout"
-], function (Opa, Opa5, Button, Input, PropertyStrictEquals, Ancestor, Descendant, MatcherFactory, HorizontalLayout) {
+	"sap/ui/layout/HorizontalLayout",
+	"sap/ui/qunit/utils/nextUIUpdate"
+], function (Opa, Opa5, Button, Input, PropertyStrictEquals, Ancestor, Descendant, MatcherFactory, HorizontalLayout, nextUIUpdate) {
 	"use strict";
 
 	QUnit.test("Should not execute the test in debug mode", function (assert) {
@@ -22,7 +23,7 @@ sap.ui.define([
 		beforeEach: function () {
 			this.oButton = new Button("testButton", {text : "foo"});
 			this.oButton.placeAt("qunit-fixture");
-			sap.ui.getCore().applyChanges();
+			return nextUIUpdate();
 		},
 		afterEach: function () {
 			this.oButton.destroy();
@@ -111,7 +112,7 @@ sap.ui.define([
 			this.oButton.placeAt(this.oLayout1);
 			this.oLayout1.placeAt("qunit-fixture");
 			this.oButton2.placeAt("qunit-fixture");
-			sap.ui.getCore().applyChanges();
+			return nextUIUpdate();
 		},
 		afterEach : function () {
 			sinon.config.useFakeTimers = false;
@@ -530,7 +531,7 @@ sap.ui.define([
 			this.oButton2.placeAt("qunit-fixture");
 			this.oInput.placeAt("qunit-fixture");
 			this.oInput2.placeAt("qunit-fixture");
-			sap.ui.getCore().applyChanges();
+			return nextUIUpdate();
 		},
 		afterEach : function () {
 			this.oButton.destroy();

package/test/sap/ui/core/qunit/opa/selectors/_BindingPath.js

@@ -3,16 +3,17 @@ sap.ui.define([
 	"sap/ui/test/selectors/_ControlSelectorGenerator",
 	"sap/ui/model/resource/ResourceModel",
 	"sap/m/Text",
-	"../fixture/bindingPath"
-], function (_ControlSelectorGenerator, ResourceModel, Text, fixture) {
+	"../fixture/bindingPath",
+	"sap/ui/qunit/utils/nextUIUpdate"
+], function (_ControlSelectorGenerator, ResourceModel, Text, fixture, nextUIUpdate) {
 	"use strict";
 
 	QUnit.module("_BindingPath - properties", {
 		beforeEach: function () {
-			fixture.PropertyFixture.beforeEach.call(this);
+			return fixture.PropertyFixture.beforeEach.call(this);
 		},
 		afterEach: function () {
-			fixture.PropertyFixture.afterEach.call(this);
+			return fixture.PropertyFixture.afterEach.call(this);
 		}
 	});
 
@@ -81,7 +82,7 @@ sap.ui.define([
 			sap.ui.getCore().setModel(oResourceModel, "i18n");
 			this.oPropertyText = new Text({text: "{i18n>propertyText}"});
 			this.oPropertyText.placeAt("qunit-fixture");
-			sap.ui.getCore().applyChanges();
+			return nextUIUpdate();
 		},
 		afterEach: function () {
 			sap.ui.getCore().setModel();
@@ -101,10 +102,10 @@ sap.ui.define([
 
 	QUnit.module("_BindingPath - object binding", {
 		beforeEach: function () {
-			fixture.ObjectFixture.beforeEach.call(this);
+			return fixture.ObjectFixture.beforeEach.call(this);
 		},
 		afterEach: function () {
-			fixture.ObjectFixture.afterEach.call(this);
+			return fixture.ObjectFixture.afterEach.call(this);
 		}
 	});
 
@@ -135,10 +136,10 @@ sap.ui.define([
 
 	QUnit.module("_BindingPath - aggregation", {
 		beforeEach: function () {
-			fixture.AggregationFixture.beforeEach.call(this);
+			return fixture.AggregationFixture.beforeEach.call(this);
 		},
 		afterEach: function () {
-			fixture.AggregationFixture.afterEach.call(this);
+			return fixture.AggregationFixture.afterEach.call(this);
 		}
 	});
 

package/test/sap/ui/core/qunit/opa/selectors/_ControlSelectorGenerator.js

@@ -14,10 +14,9 @@ sap.ui.define([
 	"sap/m/Link",
 	"sap/m/Button",
 	"sap/ui/layout/HorizontalLayout",
-	"sap/ui/layout/VerticalLayout",
-	"sap/m/StandardListItem",
 	"sap/m/Toolbar",
 	"sap/ui/test/_ControlFinder",
+	"sap/ui/qunit/utils/nextUIUpdate",
 	// only selector generators below; import in priority order
 	"sap/ui/test/selectors/_GlobalID",
 	"sap/ui/test/selectors/_ViewID",
@@ -26,7 +25,7 @@ sap.ui.define([
 	"sap/ui/test/selectors/_Properties",
 	"sap/ui/test/selectors/_DropdownItem"
 ], function (_ControlSelectorGenerator, _ControlSelectorValidator, Text, App, ToggleButton, Bar, Page,
-		JSONModel, List, CustomListItem, HBox, Link, Button, HorizontalLayout, VerticalLayout, StandardListItem, Toolbar, _ControlFinder) {
+		JSONModel, List, CustomListItem, HBox, Link, Button, HorizontalLayout, Toolbar, _ControlFinder, nextUIUpdate) {
 	"use strict";
 
 	var aSelectorGenerators = Array.prototype.slice.call(arguments, arguments.length - 6);
@@ -47,7 +46,7 @@ sap.ui.define([
 			this.fnFindControlsStub.returns([{control: "test"}]);
 			this.oText = new Text();
 			this.oText.placeAt("qunit-fixture");
-			sap.ui.getCore().applyChanges();
+			return nextUIUpdate();
 		},
 		afterEach: function () {
 			this.oText.destroy();
@@ -132,7 +131,7 @@ sap.ui.define([
 			this.oApp = new App("myApp", {initialPage: this.oPage});
 			this.oApp.addPage(this.oPage);
 			this.oApp.placeAt("qunit-fixture");
-			sap.ui.getCore().applyChanges();
+			return nextUIUpdate();
 		},
 		afterEach: function () {
 			_ControlSelectorGenerator.resetParams();
@@ -203,7 +202,7 @@ sap.ui.define([
 			});
 
 			this.oList.placeAt("qunit-fixture");
-			sap.ui.getCore().applyChanges();
+			return nextUIUpdate();
 		},
 		afterEach: function () {
 			_ControlSelectorGenerator.resetParams();
@@ -290,7 +289,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/selectors/_ControlSelectorValidator.js

@@ -6,8 +6,9 @@ sap.ui.define([
 	"sap/ui/model/json/JSONModel",
 	"sap/m/List",
 	"sap/m/StandardListItem",
-	"sap/m/Text"
-], function (extend, _ControlSelectorValidator, _ControlFinder, JSONModel, List, StandardListItem, Text) {
+	"sap/m/Text",
+	"sap/ui/qunit/utils/nextUIUpdate"
+], function (extend, _ControlSelectorValidator, _ControlFinder, JSONModel, List, StandardListItem, Text, nextUIUpdate) {
 	"use strict";
 
 	QUnit.module("_ControlSelectorValidator", {
@@ -36,7 +37,7 @@ sap.ui.define([
 			this.oText.placeAt("qunit-fixture");
 			this.oTextNoSelector1.placeAt("qunit-fixture");
 			this.oTextNoSelector2.placeAt("qunit-fixture");
-			sap.ui.getCore().applyChanges();
+			return nextUIUpdate();
 		},
 		afterEach: function () {
 			sap.ui.getCore().setModel();

package/test/sap/ui/core/qunit/opa/selectors/_DropdownItem.js

@@ -4,8 +4,9 @@ sap.ui.define([
 	"sap/ui/test/selectors/_ControlSelectorGenerator",
 	"sap/ui/model/json/JSONModel",
 	"sap/m/Select",
-	"sap/ui/core/Item"
-], function (_DropdownItem, _ControlSelectorGenerator, JSONModel, Select, Item) {
+	"sap/ui/core/Item",
+	"sap/ui/qunit/utils/nextUIUpdate"
+], function (_DropdownItem, _ControlSelectorGenerator, JSONModel, Select, Item, nextUIUpdate) {
 	"use strict";
 
 	QUnit.module("_DropdownItem", {
@@ -23,7 +24,7 @@ sap.ui.define([
 				})
 			});
 			this.oSelect.placeAt("qunit-fixture");
-			sap.ui.getCore().applyChanges();
+			return nextUIUpdate();
 		},
 		afterEach: function () {
 			sap.ui.getCore().setModel();

package/test/sap/ui/core/qunit/opa/selectors/_GlobalID.js

@@ -1,8 +1,9 @@
 /*global QUnit */
 sap.ui.define([
 	"sap/ui/test/selectors/_ControlSelectorGenerator",
-	"sap/m/Button"
-], function (_ControlSelectorGenerator, Button) {
+	"sap/m/Button",
+	"sap/ui/qunit/utils/nextUIUpdate"
+], function (_ControlSelectorGenerator, Button, nextUIUpdate) {
 	"use strict";
 
 	QUnit.module("_GlobalID", {
@@ -11,7 +12,7 @@ sap.ui.define([
 			this.oGeneratedIDButton = new Button();
 			this.oStableIDButton.placeAt("qunit-fixture");
 			this.oGeneratedIDButton.placeAt("qunit-fixture");
-			sap.ui.getCore().applyChanges();
+			return nextUIUpdate();
 		},
 		afterEach: function () {
 			this.oStableIDButton.destroy();

package/test/sap/ui/core/qunit/opa/selectors/_LabelFor.js

@@ -2,8 +2,9 @@
 sap.ui.define([
 	"sap/ui/test/selectors/_ControlSelectorGenerator",
 	"sap/m/Label",
-	"sap/m/Input"
-], function (_ControlSelectorGenerator, Label, Input) {
+	"sap/m/Input",
+	"sap/ui/qunit/utils/nextUIUpdate"
+], function (_ControlSelectorGenerator, Label, Input, nextUIUpdate) {
 	"use strict";
 
 	QUnit.module("_LabelFor", {
@@ -15,7 +16,7 @@ sap.ui.define([
 			this.oInput.placeAt("qunit-fixture");
 			this.oInputWithLabel.placeAt("qunit-fixture");
 			this.oLabel.placeAt("qunit-fixture");
-			sap.ui.getCore().applyChanges();
+			return nextUIUpdate();
 		},
 		afterEach: function () {
 			this.oInput.destroy();

package/test/sap/ui/core/qunit/opa/selectors/_Properties.js

@@ -3,44 +3,45 @@ sap.ui.define([
 	"sap/ui/test/selectors/_ControlSelectorGenerator",
 	"sap/m/Input",
 	"sap/m/Image",
-	"sap/ui/core/Icon"
-], function (_ControlSelectorGenerator, Input, Image, Icon) {
+	"sap/ui/core/Icon",
+	"sap/ui/qunit/utils/nextUIUpdate"
+], function (_ControlSelectorGenerator, Input, Image, Icon, nextUIUpdate) {
 	"use strict";
 
-	QUnit.module("_Properties", {
-		beforeEach: function () {
-			this.oInput = new Input({placeholder: "myText"});
-			this.oImage = new Image({src: "./../../test-resources/sap/ui/documentation/sdk/images/HT1040.jpg"});
-			this.oImage1 = new Image({src: "./../../test-resources/sap/ui/HT[-10$40].jpg"});
-			this.oIcon = new Icon({src: "sap-icon://action"});
-			this.oInput.placeAt("qunit-fixture");
-			this.oImage.placeAt("qunit-fixture");
-			this.oImage1.placeAt("qunit-fixture");
-			this.oIcon.placeAt("qunit-fixture");
-			sap.ui.getCore().applyChanges();
-		},
-		afterEach: function () {
-			this.oInput.destroy();
-			this.oImage.destroy();
-			this.oImage1.destroy();
-			this.oIcon.destroy();
-		}
-	});
+	QUnit.module("_Properties");
+
+	QUnit.test("Should generate selector for property", async function (assert) {
+		this.oInput = new Input({placeholder: "myText"});
+		this.oInput.placeAt("qunit-fixture");
+
+		await nextUIUpdate();
 
-	QUnit.test("Should generate selector for property", function (assert) {
 		var fnDone = assert.async();
-	   _ControlSelectorGenerator._generate({control: this.oInput, includeAll: true})
+		_ControlSelectorGenerator._generate({control: this.oInput, includeAll: true})
 			.then(function (aSelectors) {
 				assert.strictEqual(aSelectors[0][0].properties.valueState, "None", "Should generate selector with property valueState");
 				assert.strictEqual(aSelectors[0][1].properties.placeholder, "myText", "Should generate selector with property placeholder");
 				assert.strictEqual(aSelectors[0][2].properties.editable, true, "Should generate selector with property type");
 				assert.strictEqual(aSelectors[0][3].properties.type, "Text", "Should generate selector with property type");
-			}).finally(fnDone);
+			}).finally(function() {
+				this.oInput.destroy();
+				fnDone();
+			}.bind(this));
 	});
 
-	QUnit.test("Should generate selector for property with regex value", function (assert) {
+	QUnit.test("Should generate selector for property with regex value", async function (assert) {
+		this.oImage = new Image({src: "./../../test-resources/sap/ui/documentation/sdk/images/HT1040.jpg"});
+		this.oImage1 = new Image({src: "./../../test-resources/sap/ui/HT[-10$40].jpg"});
+		this.oIcon = new Icon({src: "sap-icon://action"});
+
+		this.oImage.placeAt("qunit-fixture");
+		this.oImage1.placeAt("qunit-fixture");
+		this.oIcon.placeAt("qunit-fixture");
+
+		await nextUIUpdate();
+
 		var fnDone = assert.async();
-	   _ControlSelectorGenerator._generate({control: this.oImage, includeAll: true})
+		_ControlSelectorGenerator._generate({control: this.oImage, includeAll: true})
 			.then(function (aSelectors) {
 				assert.strictEqual(aSelectors[0][0].properties.src.regex.source, "HT1040\\.jpg", "Should generate selector with regex src");
 				return _ControlSelectorGenerator._generate({control: this.oImage1, includeAll: true});
@@ -49,6 +50,11 @@ sap.ui.define([
 				return _ControlSelectorGenerator._generate({control: this.oIcon, includeAll: true});
 			}.bind(this)).then(function (aSelectors) {
 				assert.strictEqual(aSelectors[0][0].properties.src.regex.source, "action", "Should generate selector with regex src and icon path");
-			}).finally(fnDone);
+			}).finally(function() {
+				this.oImage.destroy();
+				this.oImage1.destroy();
+				this.oIcon.destroy();
+				fnDone();
+			}.bind(this));
 	});
 });

package/test/sap/ui/core/qunit/opa/selectors/_Selector.js

@@ -1,11 +1,13 @@
 /*global QUnit, sinon*/
 sap.ui.define([
 	"sap/ui/test/selectors/_Selector",
+	"sap/ui/core/Element",
 	"sap/ui/core/mvc/View",
 	"sap/ui/core/mvc/XMLView",
 	"sap/m/Button",
-	"sap/m/Dialog"
-], function (_Selector, View, XMLView, Button, Dialog) {
+	"sap/m/Dialog",
+	"sap/ui/qunit/utils/nextUIUpdate"
+], function (_Selector, Element, View, XMLView, Button, Dialog, nextUIUpdate) {
 	"use strict";
 
 	var singleStub = sinon.stub();
@@ -21,8 +23,7 @@ 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();
-			XMLView.create({
+			return XMLView.create({
 				id: "myView",
 				definition:
 					'<mvc:View xmlns:core="sap.ui.core" xmlns:mvc="sap.ui.core.mvc" xmlns="sap.m">' +
@@ -30,9 +31,8 @@ sap.ui.define([
 					'</mvc:View>'
 			}).then(function(oView) {
 				this.oView = oView.placeAt("qunit-fixture");
-				sap.ui.getCore().applyChanges();
 				this.oInput = this.oView.byId("myInput");
-				done();
+				return nextUIUpdate();
 			}.bind(this), function(oErr) {
 				assert.strictEqual(oErr, undefined, "failed to load view");
 			});
@@ -169,10 +169,9 @@ 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();
 
 			// create 3 new numeric tiles.
-			XMLView.create({
+			return XMLView.create({
 				id: "myView",
 				definition:
 					'<mvc:View xmlns:core="sap.ui.core" xmlns:mvc="sap.ui.core.mvc" xmlns="sap.m">' +
@@ -184,8 +183,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");
 			});
@@ -196,7 +194,7 @@ sap.ui.define([
 	});
 
 	QUnit.test("Should skip viewName when multiple views will match", function (assert) {
-		var oTile = sap.ui.getCore().byId("tile-0");
+		var oTile = Element.getElementById("tile-0");
 		singleStub.returns({
 			property: "value"
 		});

package/test/sap/ui/core/qunit/opa/selectors/_TableRowItem.js

@@ -2,10 +2,11 @@
 sap.ui.define([
 	"sap/ui/test/selectors/_TableRowItem",
 	"sap/ui/test/selectors/_ControlSelectorGenerator",
-	"sap/m/App",
+	"sap/ui/core/Element",
 	"sap/ui/core/mvc/XMLView",
-	"sap/ui/model/json/JSONModel"
-], function (_TableRowItem, _ControlSelectorGenerator, App, XMLView, JSONModel) {
+	"sap/ui/model/json/JSONModel",
+	"sap/ui/qunit/utils/nextUIUpdate"
+], function (_TableRowItem, _ControlSelectorGenerator, Element, XMLView, JSONModel, nextUIUpdate) {
 	"use strict";
 
 	function getViewContent() {
@@ -38,14 +39,12 @@ 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();
-			XMLView.create({
+			return XMLView.create({
 				id: "myView",
 				definition: getViewContent()
 			}).then(function(oView) {
 				this.oView = oView.setModel(oJSONModel).placeAt("qunit-fixture");
-				sap.ui.getCore().applyChanges();
-				done();
+				return nextUIUpdate();
 			}.bind(this), function(oErr) {
 				assert.strictEqual(oErr, undefined, "failed to load view");
 			});
@@ -57,7 +56,7 @@ sap.ui.define([
 
 	QUnit.test("Should select a control in table row", function (assert) {
 		var fnDone = assert.async();
-		var oControl = sap.ui.getCore().byId("myView--objectId-myView--myTable-0");
+		var oControl = Element.getElementById("myView--objectId-myView--myTable-0");
 		_ControlSelectorGenerator._generate({control: oControl._getTextControl(), includeAll: true})
 			.then(function (aSelectors) {
 				var mTableSelector = aSelectors[1][0];
@@ -70,7 +69,7 @@ sap.ui.define([
 
 	QUnit.test("Should find control table and row", function (assert) {
 		var oGenerator = new _TableRowItem();
-		var oControl = sap.ui.getCore().byId("myView--objectId-myView--myTable-0");
+		var oControl = Element.getElementById("myView--objectId-myView--myTable-0");
 		var oRow = oGenerator._getValidationRoot(oControl);
 		var oTable = oGenerator._getAncestor(oControl);
 		assert.ok(oGenerator._isAncestorRequired());