@openui5/sap.ui.core 1.117.1 → 1.119.0

package/test/sap/ui/core/qunit/mvc/XMLView.qunit.js

@@ -2,6 +2,7 @@
 sap.ui.define([
 	'sap/base/Log',
 	'sap/base/i18n/ResourceBundle',
+	"sap/ui/core/Element",
 	'sap/ui/core/library',
 	'sap/ui/core/mvc/Controller',
 	'sap/ui/core/mvc/View',
@@ -15,8 +16,9 @@ sap.ui.define([
 	'sap/m/Panel',
 	'./AnyView.qunit',
 	'sap/ui/thirdparty/jquery',
-	"sap/ui/core/Configuration"
-], function(Log, ResourceBundle, coreLibrary, Controller, View, XMLView, RenderManager, JSONModel, ResourceModel, VerticalLayout, XMLHelper, Button, Panel, testsuite, jQuery, Configuration) {
+	"sap/ui/core/Configuration",
+	"sap/ui/qunit/utils/nextUIUpdate"
+], function(Log, ResourceBundle, Element, coreLibrary, Controller, View, XMLView, RenderManager, JSONModel, ResourceModel, VerticalLayout, XMLHelper, Button, Panel, testsuite, jQuery, Configuration, nextUIUpdate) {
 	"use strict";
 
 	// shortcut for sap.ui.core.mvc.ViewType
@@ -254,18 +256,22 @@ sap.ui.define([
 			type: ViewType.XML,
 			async: true
 		}).placeAt('content');
-		sap.ui.getCore().applyChanges();
 
-		// check that placeholder DOM is not marked for preservation
-		var oElemView = oView.getDomRef();
-		assert.ok(oElemView, "DOM for view must exist");
-		assert.ok(oElemView.getAttribute("data-sap-ui-preserve") == null, "DOM must not be marked as 'to be preserved' after construction but before afterInit");
+		oView.onControllerConnected = async () => {
+			await nextUIUpdate();
+
+			// check that placeholder DOM is not marked for preservation
+			var oElemView = oView.getDomRef();
+			assert.ok(oElemView, "DOM for view must exist");
+			assert.ok(oElemView.getAttribute("data-sap-ui-preserve") == null, "DOM must not be marked as 'to be preserved' after construction but before afterInit");
+			return XMLView.prototype.onControllerConnected.apply(oView, arguments);
+		};
 
 		// wait for the async load to complete
-		oView.attachAfterInit(function() {
+		oView.attachAfterInit(async function() {
 
 			// ensure rendering
-			sap.ui.getCore().applyChanges();
+			await nextUIUpdate();
 
 			// check that DOm now exists and that it is correctly marked for preservation
 			var oElemView = oView.getDomRef();
@@ -280,7 +286,7 @@ sap.ui.define([
 
 			// force a rerendering
 			oView.invalidate();
-			sap.ui.getCore().applyChanges();
+			await nextUIUpdate();
 
 			// check that DOM has been preserved
 			var oPanel = oView.byId("myPanel");
@@ -298,10 +304,10 @@ sap.ui.define([
 			assert.ok(oSubViewDomRef.hasAttribute("data-sap-ui-preserve"), "Dom Element has the preserve attribute set");
 
 			// complete execution only in next tick as the controller code will execute further QUnit asserts in the current tick
-			setTimeout(function() {
-				done();
+			setTimeout(async function() {
 				oView.destroy();
-				sap.ui.getCore().applyChanges();
+				await nextUIUpdate();
+				done();
 			});
 		});
 	});
@@ -311,12 +317,12 @@ sap.ui.define([
 		// load view, embed it in a Panel and force rendering
 		return XMLView.create({
 			viewName: 'example.mvc.test'
-		}).then(function(oView) {
+		}).then(async function(oView) {
 			var oPanel = new Panel({
 				text: "My View",
 				content: [oView]
 			}).placeAt('content');
-			sap.ui.getCore().applyChanges();
+			await nextUIUpdate();
 
 			// check that DOM exists
 			var oElemViewBefore = oView.getDomRef();
@@ -386,7 +392,7 @@ sap.ui.define([
 		return XMLView.create({
 			id: "xmlview",
 			viewName: 'example.mvc.test'
-		}).then(function(oView) {
+		}).then(async function(oView) {
 			xmlview = oView;
 
 			var iLayoutRendered = 0;
@@ -405,17 +411,17 @@ sap.ui.define([
 			});
 			oLayout.placeAt('content');
 
-			sap.ui.getCore().applyChanges();
+			await nextUIUpdate();
 			check(true, " (after initial rendering)");
 			assert.equal(1, iLayoutRendered, "layout initially should have been rendered once");
 
 			xmlview.setVisible(false);
-			sap.ui.getCore().applyChanges();
+			await nextUIUpdate();
 			check(false, " (after becoming invisible)");
 			assert.equal(1, iLayoutRendered, "layout still should have been rendered only once (after making the xmlview invisible)");
 
 			xmlview.setVisible(true);
-			sap.ui.getCore().applyChanges();
+			await nextUIUpdate();
 			check(true, " (after becoming visible again)");
 			assert.equal(1, iLayoutRendered, "layout still should have been rendered only once (after making the xmlview visible again)");
 
@@ -428,17 +434,17 @@ sap.ui.define([
 		// load and place view, force rendering
 		return XMLView.create({
 			viewName: "example.mvc.test"
-		}).then(function(oView) {
+		}).then(async function(oView) {
 			oView.placeAt("content");
 			var oPanel = oView.byId("myPanel");
-			sap.ui.getCore().applyChanges();
+			await nextUIUpdate();
 
 			// panel should be visible and have normal control DOM
 			assert.ok(oPanel.getDomRef() && !isInPreservedArea(oPanel.getDomRef()), "panel rendered (and not part of the preserve area())");
 
 			// make only the panel invisible, force rendering
 			oPanel.setVisible(false);
-			sap.ui.getCore().applyChanges();
+			await nextUIUpdate();
 
 			// there should be no more DOM for the panel, but an invisible placeholder
 			assert.notOk(oPanel.getDomRef(), "panel should be hidden");
@@ -446,7 +452,7 @@ sap.ui.define([
 
 			// hide the view
 			oView.setVisible(false);
-			sap.ui.getCore().applyChanges();
+			await nextUIUpdate();
 
 			// this should move it to the preserve area with all child controls incl. the invisible placeholder
 			assert.ok(oView.getDomRef() && isPreserved(oView.getDomRef()), "view has DOM and DOM is in preserved area");
@@ -456,7 +462,7 @@ sap.ui.define([
 			// restore both, view and child control
 			oView.setVisible(true);
 			oPanel.setVisible(true);
-			sap.ui.getCore().applyChanges();
+			await nextUIUpdate();
 
 			// both view and child should have DOM, should not be in the preserve area and should have no placeholders
 			assert.ok(oView.getDomRef() && !isPreserved(oView.getDomRef()), "view has DOM and DOM is no longer in preserved area");
@@ -469,9 +475,9 @@ sap.ui.define([
 			// now make view and child visible in two different renderings
 			oView.setVisible(false);
 			oPanel.setVisible(false);
-			sap.ui.getCore().applyChanges();
+			await nextUIUpdate();
 			oView.setVisible(true);
-			sap.ui.getCore().applyChanges();
+			await nextUIUpdate();
 
 			// invisible control should still be invisible and invisible placeholder still should exist
 			assert.ok(oView.getDomRef() && !isPreserved(oView.getDomRef()), "view has DOM and DOM is no longer in preserved area");
@@ -481,7 +487,7 @@ sap.ui.define([
 
 			// making the panel visible should also work
 			oPanel.setVisible(true);
-			sap.ui.getCore().applyChanges();
+			await nextUIUpdate();
 			assert.ok(oPanel.getDomRef(), "panel rendered after making it visible");
 			assert.notOk(invisiblePlaceholder(oPanel), "invisible placeholder must not exist for visible panel");
 			assert.notOk(dummyPlaceholder(oPanel), "dummy placeholder must not exists for visible panel");
@@ -496,9 +502,9 @@ sap.ui.define([
 		// load and place view, force rendering
 		return XMLView.create({
 			viewName: 'example.mvc.test'
-		}).then(function(oView) {
+		}).then(async function(oView) {
 			oView.placeAt("content");
-			sap.ui.getCore().applyChanges();
+			await nextUIUpdate();
 
 			var oDomRef = oView.getDomRef();
 			RenderManager.preserveContent(oDomRef, true);
@@ -516,9 +522,9 @@ sap.ui.define([
 		// load and place view, force rendering
 		return XMLView.create({
 			viewName: 'example.mvc.test'
-		}).then(function(oView) {
+		}).then(async function(oView) {
 			oView.placeAt("content");
-			sap.ui.getCore().applyChanges();
+			await nextUIUpdate();
 
 			var oDomRef = oView.getDomRef();
 
@@ -573,12 +579,12 @@ sap.ui.define([
 		return XMLView.create({
 			id: "outer",
 			viewName: "nested.views.outer"
-		}).then(function(oView) {
+		}).then(async function(oView) {
 			oView.placeAt("content");
-			sap.ui.getCore().applyChanges();
+			await nextUIUpdate();
 
 			expectedControls.forEach(function(sId) {
-				var oControl = sap.ui.getCore().byId(sId);
+				var oControl = Element.getElementById(sId);
 				assert.ok(oControl, "control with id '" + sId + "' should exist");
 				assert.ok(oControl.getDomRef(), "control with id '" + sId + "' should have DOM");
 			});
@@ -586,7 +592,7 @@ sap.ui.define([
 			// install delegates on each control to assert later that all have been rendered
 			var count = 0;
 			expectedControls.forEach(function(sId) {
-				var oControl = sap.ui.getCore().byId(sId);
+				var oControl = Element.getElementById(sId);
 				oControl.addDelegate({
 					onBeforeRendering: function() {
 						count += 100;
@@ -599,12 +605,12 @@ sap.ui.define([
 
 			// Act: force a re-rerendering of the outer view
 			oView.invalidate();
-			sap.ui.getCore().applyChanges();
+			await nextUIUpdate();
 
 			// Assert: everythging has been rendered again
 			assert.equal(count, 101 * expectedControls.length, "all controls should have participated in the rendering");
 			expectedControls.forEach(function(sId) {
-				var oControl = sap.ui.getCore().byId(sId);
+				var oControl = Element.getElementById(sId);
 				assert.ok(oControl, "control with id '" + sId + "' should exist");
 				assert.ok(oControl.getDomRef(), "control with id '" + sId + "' should have DOM");
 				assert.notOk(document.getElementById(RenderManager.RenderPrefixes.Dummy + sId), "there should be no more Dummy-Element for id '" + sId + "'");
@@ -613,7 +619,7 @@ sap.ui.define([
 
 			oView.destroy();
 			expectedControls.forEach(function(sId) {
-				var oControl = sap.ui.getCore().byId(sId);
+				var oControl = Element.getElementById(sId);
 				assert.notOk(oControl, "control with id '" + sId + "' should no longer exist");
 				assert.notOk(document.getElementById(sId), "there should be no more DOM with id '" + sId + "'");
 			});
@@ -647,9 +653,9 @@ sap.ui.define([
 
 		return XMLView.create({
 			definition: sXML
-		}).then(function (oView) {
+		}).then(async function (oView) {
 			oView.placeAt("content");
-			sap.ui.getCore().applyChanges();
+			await nextUIUpdate();
 
 			var oButtonDomRef = oView.byId("Jenson").getDomRef();
 			assert.ok(oButtonDomRef.parentNode === oView.getDomRef(), "Button is a direct DOM child of the View.");
@@ -742,9 +748,9 @@ sap.ui.define([
 		return XMLView.create({
 			id: "view",
 			definition: xmlWithHTMLFragment
-		}).then(function(oView) {
+		}).then(async function(oView) {
 			oView.placeAt("content");
-			sap.ui.getCore().applyChanges();
+			await nextUIUpdate();
 			return oView;
 		}).then(function(oView) {
 			assert.ok(jQuery("#view--valid1").length == 1, "DOM must contain view--valid1 element.");
@@ -940,9 +946,9 @@ sap.ui.define([
 		return XMLView.create({
 			id: "viewWithNamedAggregations",
 			definition: sXmlWithNamedAggregations
-		}).then(function(oView) {
+		}).then(async function(oView) {
 			oView.placeAt("content");
-			sap.ui.getCore().applyChanges();
+			await nextUIUpdate();
 
 			assert.strictEqual(oView.getContent()[0].getId(),"viewWithNamedAggregations--contentButton", "viewWithNamedAggregations: The button was added correctly to content aggregation");
 

package/test/sap/ui/core/qunit/mvc/testdata/TypedViewWithRendererRenderer.js

@@ -1,8 +1,8 @@
 /*!
  * ${copyright}
  */
-sap.ui.define(["sap/ui/core/mvc/JSViewRenderer"], function(JSViewRenderer) {
+sap.ui.define(["sap/ui/core/mvc/ViewRenderer"], function(ViewRenderer) {
 	"use strict";
 
-	return JSViewRenderer;
+	return ViewRenderer;
 });

package/test/sap/ui/core/qunit/mvc/testdata/stashed/OP.html

@@ -10,7 +10,7 @@
 			data-sap-ui-libs="sap.m"
 			data-sap-ui-resourceroots=
 				'{"testdata.mvc.stashed":"./"}'
-			data-sap-ui-theme="sap_fiori_3">
+			data-sap-ui-theme="sap_horizon">
 		</script>
 	</head>
 	<body>

package/test/sap/ui/core/qunit/mvc/testdata/stashed/manifest.json

@@ -17,7 +17,8 @@
 	"sap.ui5": {
 		"dependencies": {
 			"libs": {
-				"sap.m": {}
+				"sap.m": {},
+				"sap.ui.core": {}
 			}
         },
         "models" : {

package/test/sap/ui/core/qunit/mvc/viewprocessing/ViewProcessing.qunit.js

@@ -1,21 +1,17 @@
 /*global QUnit, sinon */
 sap.ui.define([
-	"sap/ui/model/json/JSONModel",
-	"sap/ui/core/mvc/View",
 	"sap/ui/core/mvc/Controller",
-	"sap/ui/core/UIArea",
 	"sap/ui/core/UIComponent",
 	'sap/ui/core/Component',
-	'sap/ui/core/ComponentContainer',
-	"sap/m/Label",
+	"sap/ui/core/Element",
 	"sap/m/Panel",
 	"sap/m/HBox",
 	'sap/ui/core/qunit/mvc/viewprocessing/MyGlobal',
 	'sap/ui/base/SyncPromise',
 	"sap/ui/core/mvc/XMLView",
-	"sap/ui/core/mvc/XMLProcessingMode",
-	"sap/ui/core/StashedControlSupport"
-], function(JSONModel, View, Controller, UIArea, UIComponent, Component, ComponentContainer, Label, Panel, HBox, MyGlobal, SyncPromise, XMLView, XMLProcessingMode, StashedControlSupport) {
+	"sap/ui/core/StashedControlSupport",
+	"sap/ui/qunit/utils/nextUIUpdate"
+], function(Controller, UIComponent, Component, Element, Panel, HBox, MyGlobal, SyncPromise, XMLView, StashedControlSupport, nextUIUpdate) {
 
 	"use strict";
 
@@ -96,10 +92,10 @@ sap.ui.define([
 				});
 				this.viewFactory = testViewFactoryFn();
 				this._cleanup = [];
-				this.renderSync = function(ctrl) {
+				this.render = async function(ctrl) {
 					this._cleanup.push(ctrl);
 					ctrl.placeAt("content");
-					sap.ui.getCore().applyChanges();
+					await nextUIUpdate();
 				};
 
 				// create fake server for extension point manifests
@@ -133,8 +129,8 @@ sap.ui.define([
 			// view
 			var pView = this.viewFactory("myViewSimpleAggrs", "sap.ui.core.qunit.mvc.viewprocessing.ViewProcessingSimpleAggregations");
 
-			return pView.then(function(oView) {
-				this.renderSync(
+			return pView.then(async function(oView) {
+				await this.render(
 					new HBox({
 						renderType: "Bare",
 						items: pView
@@ -170,8 +166,8 @@ sap.ui.define([
 			// view
 			var pView = this.viewFactory("myViewAggrs", "sap.ui.core.qunit.mvc.viewprocessing.ViewProcessingManyAggregations");
 
-			return pView.then(function(oView) {
-				this.renderSync(
+			return pView.then(async function(oView) {
+				await this.render(
 					new HBox({
 						renderType: "Bare",
 						items: oView
@@ -232,8 +228,8 @@ sap.ui.define([
 				return oCtrl.getText();
 			};
 
-			return pView.then(function(oView) {
-				this.renderSync(
+			return pView.then(async function(oView) {
+				await this.render(
 					new HBox({
 						renderType: "Bare",
 						items: oView
@@ -286,8 +282,8 @@ sap.ui.define([
 				// view
 				var pView = this.viewFactory("myViewWithController", "sap.ui.core.qunit.mvc.viewprocessing.ViewProcessing", oController);
 
-				pView.then(function (oView) {
-					this.renderSync(
+				pView.then(async function (oView) {
+					await this.render(
 						new HBox({
 							renderType: "Bare",
 							items: oView
@@ -312,8 +308,8 @@ sap.ui.define([
 			// view
 			var pView = this.viewFactory("myViewBadControl", "sap.ui.core.qunit.mvc.viewprocessing.ViewProcessingBadControl");
 
-			return pView.then(function(oView) {
-				this.renderSync(oView);
+			return pView.then(async function(oView) {
+				await this.render(oView);
 
 				var myBadControl = oView.byId("myBadControl");
 				assert.ok(myBadControl, "BadControl is present within view");
@@ -501,7 +497,7 @@ sap.ui.define([
 					assert.strictEqual(oOwnerComponent.getId(), oComponent.getId(), "Stashed Panel should have owner component");
 				}
 
-				var oStashedPanel = sap.ui.getCore().byId(oView.createId("panel"));
+				var oStashedPanel = Element.getElementById(oView.createId("panel"));
 				oOwnerComponent = Component.getOwnerComponentFor(oStashedPanel);
 				assert.ok(oOwnerComponent, "Owner Component for StashedControl of panel can be found");
 				if (oOwnerComponent) {
@@ -538,7 +534,7 @@ sap.ui.define([
 				assert.ok(oRealPanel.isA("sap.m.Panel"), "The real panel instance is created after unstash");
 
 				// check for additional stashed control inside the now unstashed panel
-				oStashedControlForButtonInPanel = sap.ui.getCore().byId(oView.createId("stashedButton"));
+				oStashedControlForButtonInPanel = Element.getElementById(oView.createId("stashedButton"));
 				oNormalButtonInStashedParent = oView.byId("normalButtonInStashedParent");
 
 				assert.ok(oStashedControlForButtonInPanel, "Stashed button in stashed area is created");

package/test/sap/ui/core/qunit/mvc/viewprocessing/ViewProcessing_legacyAPIs.qunit.js

@@ -1,20 +1,16 @@
 /*global QUnit, sinon */
 sap.ui.define([
-	"sap/ui/model/json/JSONModel",
-	"sap/ui/core/mvc/View",
-	"sap/ui/core/UIArea",
 	"sap/ui/core/UIComponent",
 	'sap/ui/core/Component',
-	'sap/ui/core/ComponentContainer',
-	"sap/m/Label",
+	"sap/ui/core/Element",
 	"sap/m/Panel",
 	"sap/m/HBox",
 	'sap/ui/core/qunit/mvc/viewprocessing/MyGlobal',
 	'sap/ui/base/SyncPromise',
-	"sap/ui/core/mvc/XMLView",
 	"sap/ui/core/mvc/XMLProcessingMode",
-	"sap/ui/core/StashedControlSupport"
-], function(JSONModel, View, UIArea, UIComponent, Component, ComponentContainer, Label, Panel, HBox, MyGlobal, SyncPromise, XMLView, XMLProcessingMode, StashedControlSupport) {
+	"sap/ui/core/StashedControlSupport",
+	"sap/ui/qunit/utils/nextUIUpdate"
+], function(UIComponent, Component, Element, Panel, HBox, MyGlobal, SyncPromise, XMLProcessingMode, StashedControlSupport, nextUIUpdate) {
 
 	"use strict";
 
@@ -93,10 +89,10 @@ sap.ui.define([
 				});
 				this.viewFactory = testViewFactoryFn(bAsyncView, sProcessingMode);
 				this._cleanup = [];
-				this.renderSync = function(ctrl) {
+				this.render = async function(ctrl) {
 					this._cleanup.push(ctrl);
 					ctrl.placeAt("content");
-					sap.ui.getCore().applyChanges();
+					await nextUIUpdate();
 				};
 
 				// create fake server for extension point manifests
@@ -126,7 +122,7 @@ sap.ui.define([
 		/**
 		 * check that all aggregations are created in the correct order
 		 */
-		QUnit.test("Simple Aggregation order with async view", function(assert) {
+		QUnit.test("Simple Aggregation order with async view", async function(assert) {
 
 			// view
 			var oView = this.viewFactory("myViewSimpleAggrs", "sap.ui.core.qunit.mvc.viewprocessing.ViewProcessingSimpleAggregations");
@@ -153,7 +149,7 @@ sap.ui.define([
 
 			});
 
-			this.renderSync(
+			await this.render(
 				new HBox({
 					renderType: "Bare",
 					items: oView
@@ -167,7 +163,7 @@ sap.ui.define([
 		/**
 		 * check that all aggregations are created in the correct order
 		 */
-		QUnit.test("Aggregation order with async view", function(assert) {
+		QUnit.test("Aggregation order with async view", async function(assert) {
 
 			// view
 			var oView = this.viewFactory("myViewAggrs", "sap.ui.core.qunit.mvc.viewprocessing.ViewProcessingManyAggregations");
@@ -216,7 +212,7 @@ sap.ui.define([
 
 			});
 
-			this.renderSync(
+			await this.render(
 				new HBox({
 					renderType: "Bare",
 					items: oView
@@ -230,7 +226,7 @@ sap.ui.define([
 		/**
 		 * check that all aggregations are created in the correct order
 		 */
-		QUnit.test("ExtensionPoint with async view tests", function(assert) {
+		QUnit.test("ExtensionPoint with async view tests", async function(assert) {
 
 			// view
 			var oView = this.viewFactory("myViewEP", "sap.ui.core.qunit.mvc.viewprocessing.ViewProcessingExtensionPoint");
@@ -263,7 +259,7 @@ sap.ui.define([
 
 			});
 
-			this.renderSync(
+			await this.render(
 				new HBox({
 					renderType: "Bare",
 					items: oView
@@ -277,7 +273,7 @@ sap.ui.define([
 		/**
 		 * check that all events are properly called within controller and that the view is correctly connected
 		 */
-		QUnit.test("controller event test", function(assert) {
+		QUnit.test("controller event test", async function(assert) {
 
 			// controller
 			var oControllerImpl = testControllerImplFactory(assert, "sap.ui.core.qunit.mvc.viewprocessing.ViewProcessing");
@@ -304,7 +300,7 @@ sap.ui.define([
 			// view
 			var oView = this.viewFactory("myViewWithController", "sap.ui.core.qunit.mvc.viewprocessing.ViewProcessing", oController);
 
-			this.renderSync(
+			await this.render(
 				new HBox({
 					renderType: "Bare",
 					items: oView
@@ -323,12 +319,12 @@ sap.ui.define([
 		/**
 		 * Tests parsing of a control which is not properly defined (does not return its class)
 		 */
-		QUnit.test("Bad control processing", function(assert) {
+		QUnit.test("Bad control processing", async function(assert) {
 
 			// view
 			var oView = this.viewFactory("myViewBadControl", "sap.ui.core.qunit.mvc.viewprocessing.ViewProcessingBadControl");
 
-			this.renderSync(oView);
+			await this.render(oView);
 
 			return oView.loaded().then(function() {
 				var myBadControl = oView.byId("myBadControl");
@@ -460,7 +456,7 @@ sap.ui.define([
 
 		});
 
-		QUnit.test("Owner component setting for ExtensionPoints", function(assert) {
+		QUnit.test("Owner component setting for ExtensionPoints", async function(assert) {
 			var done = assert.async();
 
 			// responds changed parent manifest
@@ -537,20 +533,20 @@ sap.ui.define([
 					name:"sap.ui.core.qunit.mvc.viewprocessing.ExtensionPoints.Child"
 				}).then(function(oComponent) {
 					oComponent.getRootControl().loaded().then(function(oView) {
-						fnAssertions(oComponent, oView);
+						return fnAssertions(oComponent, oView);
 					});
 				});
 			} else {
 				var oComponent = sap.ui.component({
 					name:"sap.ui.core.qunit.mvc.viewprocessing.ExtensionPoints.Child"
 				});
-				sap.ui.getCore().applyChanges();
+				await nextUIUpdate();
 				fnAssertions(oComponent, oComponent.getRootControl());
 			}
 
 		});
 
-		QUnit.test("Owner component setting for stashed control", function(assert) {
+		QUnit.test("Owner component setting for stashed control", async function(assert) {
 			var done = assert.async();
 
 			var sComponentName = "sap.ui.core.qunit.mvc.viewprocessing.StashedControl" + bAsyncView + sProcessingMode;
@@ -599,7 +595,7 @@ sap.ui.define([
 					assert.strictEqual(oOwnerComponent.getId(), oComponent.getId(), "Stashed Panel should have owner component");
 				}
 
-				var oStashedPanel = sap.ui.getCore().byId(oView.createId("panel"));
+				var oStashedPanel = Element.getElementById(oView.createId("panel"));
 				oOwnerComponent = Component.getOwnerComponentFor(oStashedPanel);
 				assert.ok(oOwnerComponent, "Owner Component for StashedControl of panel can be found");
 				if (oOwnerComponent) {
@@ -636,7 +632,7 @@ sap.ui.define([
 				assert.ok(oRealPanel.isA("sap.m.Panel"), "The real panel instance is created after unstash");
 
 				// check for additional stashed control inside the now unstashed panel
-				oStashedControlForButtonInPanel = sap.ui.getCore().byId(oView.createId("stashedButton"));
+				oStashedControlForButtonInPanel = Element.getElementById(oView.createId("stashedButton"));
 				oNormalButtonInStashedParent = oView.byId("normalButtonInStashedParent");
 
 				assert.ok(oStashedControlForButtonInPanel, "Stashed button in stashed area is created");
@@ -674,7 +670,7 @@ sap.ui.define([
 					manifest: oManifest,
 					async: false
 				});
-				sap.ui.getCore().applyChanges();
+				await nextUIUpdate();
 				fnAssertions(oComponent, oComponent.getRootControl());
 			}
 

package/test/sap/ui/core/qunit/mvc_legacyAPIs/AnyViewAsync_legacyAPIs.qunit.js

@@ -6,8 +6,9 @@ sap.ui.define([
 	"sap/ui/core/mvc/JSView",
 	"sap/ui/core/mvc/XMLView",
 	"sap/ui/core/mvc/HTMLView",
+	"sap/ui/qunit/utils/nextUIUpdate",
 	"sap/ui/thirdparty/jquery"
-], function(ObjectPath, View, JSONView, JSView, XMLView, HTMLView, jQuery) {
+], function(ObjectPath, View, JSONView, JSView, XMLView, HTMLView, nextUIUpdate, jQuery) {
 	"use strict";
 
 	// create content div
@@ -88,26 +89,26 @@ sap.ui.define([
 			assert.ok(sSource !== undefined, "View content was preloaded synchronously");
 		});
 
-		QUnit.test("Rendering - synchronous resource loading", function (assert) {
+		QUnit.test("Rendering - synchronous resource loading", async function (assert) {
 			assert.expect(3);
 			this.oView = fnFactory();
 			this.oView.placeAt("content");
-			sap.ui.getCore().applyChanges();
+			await nextUIUpdate();
 
 			assert.ok(this.oView, "Instance has been created");
 			assert.ok(this.oView instanceof View, "Instance is a View");
 			assert.ok(this.oView.$().children().length, "View content was rendered synchronously");
 		});
 
-		QUnit.test("Rendering - asynchronous resource loading", function (assert) {
-			assert.expect(5);
+		QUnit.test("Rendering - asynchronous resource loading", async function (assert) {
+			assert.expect(4);
 			var done = assert.async();
 			this.oView = fnFactory(true); //true for async
 
 			// event attachement needs to be done immediately, otherwise the event may be fired beforehands
 			var that = this;
-			this.oView.attachAfterInit(function() {
-				sap.ui.getCore().applyChanges();
+			this.oView.attachAfterInit(async function() {
+				await nextUIUpdate();
 				assert.ok(that.oView.$().children().length, "View content was rendered");
 				done();
 			});
@@ -116,10 +117,8 @@ sap.ui.define([
 			assert.ok(this.oView, "Instance has been created");
 			assert.ok(this.oView instanceof View, "Instance is a View");
 
-			sap.ui.getCore().applyChanges();
-			assert.ok(this.oView.$().length, "View was rendered empty");
-			assert.ok(!this.oView.$().children().length, "View content is not rendered yet");
-
+			await nextUIUpdate();
+			assert.ok(that.oView.$().length, "View was rendered");
 		});
 
 		QUnit.test("Promise - loaded() for sync view", function(assert) {