@openui5/sap.ui.core 1.117.1 → 1.119.0

package/test/sap/ui/core/demokit/sample/odata/v4/RecursiveHierarchy/pages/Main.js

@@ -4,8 +4,9 @@
 sap.ui.define([
 	"sap/ui/core/sample/odata/v4/RecursiveHierarchy/SandboxModel",
 	"sap/ui/test/Opa5",
+	"sap/ui/test/actions/EnterText",
 	"sap/ui/test/actions/Press"
-], function (SandboxModel, Opa5, Press) {
+], function (SandboxModel, Opa5, EnterText, Press) {
 	"use strict";
 
 	var mIcon2DrillState = {
@@ -103,17 +104,49 @@ sap.ui.define([
 	Opa5.createPageObjects({
 		onTheMainPage : {
 			actions : {
+				createNewChild : function (iRow, sComment) {
+					this.waitFor({
+						actions : new Press(),
+						controlType : "sap.m.Button",
+						errorMessage : `Could not create new child below row ${iRow}`,
+						id : bTreeTable ? /createInTreeTable/ : /create/,
+						matchers : function (oControl) {
+							return oControl.getBindingContext().getIndex() === iRow;
+						},
+						success : function () {
+							Opa5.assert.ok(true,
+								`Create new child below row ${iRow}. ${sComment}`);
+						},
+						viewName : sViewName
+					});
+				},
+				editName : function (iRow, sName, sComment) {
+					this.waitFor({
+						actions : new EnterText({clearTextFirst : true, text : sName}),
+						controlType : "sap.m.Input",
+						errorMessage : `Could not edit name in row ${iRow}`,
+						id : bTreeTable ? /nameInTreeTable/ : /name/,
+						matchers : function (oControl) {
+							return oControl.getBindingContext().getIndex() === iRow;
+						},
+						success : function () {
+							Opa5.assert.ok(true,
+								`Entered name in row ${iRow} as "${sName}". ${sComment}`);
+						},
+						viewName : sViewName
+					});
+				},
 				scrollToRow : function (iRow, sComment) {
 					this.waitFor({
 						actions : function (oTable) {
 							oTable.setFirstVisibleRow(iRow);
 						},
 						controlType : getTableType(),
-						errorMessage : "Could not select row: " + iRow,
+						errorMessage : "Could not select row " + iRow,
 						id : getTableId(),
 						success : function (oTable) {
 							Opa5.assert.strictEqual(oTable.getFirstVisibleRow(), iRow,
-								"Scrolled table to row: " + iRow + ". " + sComment);
+								"Scrolled table to row " + iRow + ". " + sComment);
 						},
 						viewName : sViewName
 					});
@@ -143,7 +176,7 @@ sap.ui.define([
 							errorMessage : "Could not toggle Expand Button in row " + iRow,
 							id : getTableId(),
 							success : function () {
-								Opa5.assert.ok(true, "Toggle Expand Button in row: " + iRow
+								Opa5.assert.ok(true, "Toggle Expand Button in row " + iRow
 									+ ". " + sComment);
 							},
 							viewName : sViewName
@@ -158,7 +191,7 @@ sap.ui.define([
 								return oControl.getBindingContext().getIndex() === iRow;
 							},
 							success : function () {
-								Opa5.assert.ok(true, "Toggle Expand Button in row: " + iRow
+								Opa5.assert.ok(true, "Toggle Expand Button in row " + iRow
 									+ ". " + sComment);
 							},
 							viewName : sViewName

package/test/sap/ui/core/demokit/sample/odata/v4/RecursiveHierarchy/tests/createEdit.js

@@ -0,0 +1,128 @@
+/*!
+ * ${copyright}
+ */
+sap.ui.define([
+	"sap/ui/core/sample/common/pages/Any",
+	"sap/ui/core/sample/odata/v4/RecursiveHierarchy/pages/Main",
+	"sap/ui/core/sample/odata/v4/RecursiveHierarchy/SandboxModel",
+	"sap/ui/test/TestUtils"
+], function (_Any, _Main, SandboxModel, TestUtils) {
+	"use strict";
+
+	return function (Given, When, Then) {
+		const aNodes = SandboxModel.getTopLevels(1);
+		let iFirstVisibleRow = 0;
+		// Note: If more rows are visible, no placeholders for paging will be created!
+		const iVisibleRowCount = 8;
+
+		function createNewChild(iRow, sComment) {
+			When.onTheMainPage.createNewChild(iRow, sComment);
+		}
+
+		// Note: iRow is always in model coordinates! Thus aExpected behaves the same!
+		function checkTable(aExpected, mDefaults) {
+			aExpected = aExpected.slice(iFirstVisibleRow, iFirstVisibleRow + iVisibleRowCount);
+			// Note: clone aExpected in order to deal with OPA's async nature
+			Then.onTheMainPage.checkTable(JSON.parse(JSON.stringify(aExpected)), mDefaults);
+		}
+
+		function editName(iRow, sName, sComment) {
+			When.onTheMainPage.editName(iRow, sName, sComment);
+		}
+
+		function scrollToRow(iRow, sComment) {
+			if (iRow + iVisibleRowCount > aNodes.length) {
+				throw new Error(
+					`Cannot scroll that far! ${iRow} > ${aNodes.length - iVisibleRowCount}`);
+			}
+			iFirstVisibleRow = iRow;
+			When.onTheMainPage.scrollToRow(iRow, sComment);
+		}
+
+		function toggleExpandInRow(iRow, sComment) {
+			When.onTheMainPage.toggleExpandInRow(iRow, sComment);
+		}
+
+		TestUtils.setData("sap.ui.core.sample.odata.v4.RecursiveHierarchy.expandTo", "1");
+		TestUtils.setData("sap.ui.core.sample.odata.v4.RecursiveHierarchy.visibleRowCount",
+			"" + iVisibleRowCount);
+		Given.iStartMyUIComponent({
+			autoWait : true,
+			componentConfig : {
+				name : "sap.ui.core.sample.odata.v4.RecursiveHierarchy"
+			}
+		});
+		Then.onAnyPage.iTeardownMyUIComponentInTheEnd();
+
+		checkTable(aNodes);
+
+		toggleExpandInRow(0, "Expand 0 (Alpha)");
+		aNodes[0].DrillState = "expanded";
+		aNodes.splice(1, 0, ...SandboxModel.getChildren("0"));
+		checkTable(aNodes);
+
+		createNewChild(0, "Create New Child of 0 (Alpha)");
+		aNodes.splice(1, 0, {
+			AGE : 54,
+			DistanceFromRoot : 1,
+			DrillState : "leaf",
+			ID : "6",
+			MANAGER_ID : "0",
+			Name : ""
+		});
+		checkTable(aNodes);
+
+		const sName1 = "1st new child";
+		editName(1, sName1, "Edit New Child's Name");
+		aNodes[1].Name = sName1;
+		checkTable(aNodes);
+
+		createNewChild(3, "Create New Child of 2 (Kappa)");
+		aNodes[3].DrillState = "expanded";
+		aNodes.splice(4, 0, {
+			AGE : 55,
+			DistanceFromRoot : 2,
+			DrillState : "leaf",
+			ID : "2.1",
+			MANAGER_ID : "2",
+			Name : ""
+		});
+		checkTable(aNodes);
+
+		const sName2 = "2nd new child";
+		editName(4, sName2, "Edit New Child's Name");
+		aNodes[4].Name = sName2;
+		checkTable(aNodes);
+
+		toggleExpandInRow(7, "Expand 5 (Xi)");
+		aNodes[7].DrillState = "expanded";
+		checkTable(aNodes);
+
+		aNodes.splice(8, 0, ...SandboxModel.getChildren("5"));
+		scrollToRow(1, "5.1 (Omicron) comes into view");
+		checkTable(aNodes);
+
+		toggleExpandInRow(8, "Expand 5.1 (Omicron)");
+		aNodes[8].DrillState = "expanded";
+		aNodes.splice(9, 0, ...SandboxModel.getChildren("5.1"));
+		checkTable(aNodes);
+
+		createNewChild(8, "Create New Child of 5.1 (Omicron)"); // still invisible
+		aNodes.splice(9, 0, {
+			AGE : 20,
+			DistanceFromRoot : 3,
+			DrillState : "leaf",
+			ID : "5.1.10",
+			MANAGER_ID : "5.1",
+			Name : ""
+		});
+
+		scrollToRow(2, "5.10 comes into view");
+		checkTable(aNodes);
+
+		scrollToRow(11, "scroll to bottom");
+		checkTable(aNodes);
+
+		Then.onAnyPage.checkLog();
+	};
+});

package/test/sap/ui/core/demokit/sample/odata/v4/RecursiveHierarchy/tests/pageExpandCollapse.js

@@ -49,9 +49,10 @@ sap.ui.define([
 				name : "sap.ui.core.sample.odata.v4.RecursiveHierarchy"
 			}
 		});
+		Then.onAnyPage.iTeardownMyUIComponentInTheEnd();
 
 		// basics: initial data
-		aNodes = SandboxModel.getNodes(0, 5);
+		aNodes = SandboxModel.getTopLevels(3, 0, 5);
 		checkTable(aNodes);
 
 		// Note: expand 1.1 (Gamma), synch., collapse 1.1 (Gamma) => Failed to drill-down...
@@ -71,18 +72,18 @@ sap.ui.define([
 		// expand nodes "at the edge" of the top pyramid (loads children)
 		toggleExpandInRow(3, "Expand 1.2 (Zeta)");
 		oExpandedZeta = Object.assign({}, aNodes[3], {DrillState : "expanded"});
-		aNodes = aNodes.slice(0, 3).concat(oExpandedZeta, SandboxModel.getChildrenOf1_2()[0]);
+		aNodes = aNodes.slice(0, 3).concat(oExpandedZeta, SandboxModel.getChildren("1.2")[0]);
 		checkTable(aNodes, {DistanceFromRoot : 3});
 
 		toggleExpandInRow(2, "Expand 1.1 (Gamma)");
 		oExpandedGamma = Object.assign({}, aNodes[2], {DrillState : "expanded"});
 		aAfterExpandGamma
-			= aNodes.slice(0, 2).concat(oExpandedGamma, SandboxModel.getChildrenOf1_1());
+			= aNodes.slice(0, 2).concat(oExpandedGamma, SandboxModel.getChildren("1.1"));
 		checkTable(aAfterExpandGamma, {DistanceFromRoot : 3});
 
 		// show more children of newly expanded node
 		scrollToRow(5, "1.2 (Zeta) is at the top");
-		aNodes = [oExpandedZeta].concat(SandboxModel.getChildrenOf1_2());
+		aNodes = [oExpandedZeta].concat(SandboxModel.getChildren("1.2"));
 		checkTable(aNodes, {DistanceFromRoot : 3});
 
 		// collapse incl. children outside of top pyramid
@@ -92,7 +93,7 @@ sap.ui.define([
 		toggleExpandInRow(1, "Collapse 1 (Beta)");
 		oCollapsedBeta = Object.assign({}, aAfterExpandGamma[1], {DrillState : "collapsed"});
 		aAfterCollapseBeta = aAfterExpandGamma.slice(0, 1)
-			.concat(oCollapsedBeta, SandboxModel.getNodes(4, 3));
+			.concat(oCollapsedBeta, SandboxModel.getTopLevels(3, 4, 3));
 		checkTable(aAfterCollapseBeta);
 
 		toggleExpandInRow(4, "Collapse 4 (Mu)");
@@ -102,7 +103,7 @@ sap.ui.define([
 
 		// this skips 4.1 (Nu) which has not been shown so far!
 		scrollToRow(2, "Scroll to the bottom");
-		aNodes = aNodes.slice(2).concat(SandboxModel.getNodes(8, 2));
+		aNodes = aNodes.slice(2).concat(SandboxModel.getTopLevels(3, 8, 2));
 		checkTable(aNodes);
 
 		// reveal a child from the top pyramid for the 1st time
@@ -110,7 +111,8 @@ sap.ui.define([
 		oExpandedMu = Object.assign({}, aNodes[2], {DrillState : "expanded"});
 		 // 4.1 (Nu) appears, 5.1 (Omicron) disappears
 		oCollapsedOmicron = aNodes[4];
-		aNodes = aNodes.slice(0, 2).concat(oExpandedMu, SandboxModel.getNodes(7, 1)[0], aNodes[3]);
+		aNodes = aNodes.slice(0, 2)
+			.concat(oExpandedMu, SandboxModel.getTopLevels(3, 7, 1)[0], aNodes[3]);
 		checkTable(aNodes);
 
 		// load children outside top pyramid, incl. paging
@@ -124,10 +126,10 @@ sap.ui.define([
 		checkTable(aNodes);
 
 		scrollToRow(8, "Show first page of 5.1's children");
-		checkTable(SandboxModel.getChildrenOf5_1(0, 5), {DistanceFromRoot : 3});
+		checkTable(SandboxModel.getChildren("5.1", 0, 5), {DistanceFromRoot : 3});
 
 		scrollToRow(12, "Show second page of 5.1's children");
-		checkTable(SandboxModel.getChildrenOf5_1(4, 5), {DistanceFromRoot : 3});
+		checkTable(SandboxModel.getChildren("5.1", 4, 5), {DistanceFromRoot : 3});
 
 		// collapse incl. children not counted via "Descendants" property
 		scrollToRow(0, "Scroll to the top");
@@ -142,33 +144,33 @@ sap.ui.define([
 
 		// tree state must be kept, even inside collapsed node, and update must happen there as well
 		toggleExpandInRow(0, "Expand 0 (Alpha)");
-		aNodes = SandboxModel.getNodes(0, 1).concat(aAfterCollapseBeta.slice(1, 5));
+		aNodes = SandboxModel.getTopLevels(3, 0, 1).concat(aAfterCollapseBeta.slice(1, 5));
 		checkTable(aNodes);
 
 		toggleExpandInRow(1, "Expand 1 (Beta)");
 		checkTable(aAfterExpandGamma, {DistanceFromRoot : 3});
 
 		toggleExpandInRow(2, "Collapse 1.1 (Gamma)");
-		aNodes = SandboxModel.getNodes(0, 3).concat(oExpandedZeta)
-			.concat(SandboxModel.getChildrenOf1_2()[0]);
+		aNodes = SandboxModel.getTopLevels(3, 0, 3).concat(oExpandedZeta)
+			.concat(SandboxModel.getChildren("1.2")[0]);
 		checkTable(aNodes, {DistanceFromRoot : 3});
 
 		toggleExpandInRow(3, "Collapse 1.2 (Zeta)");
-		checkTable(SandboxModel.getNodes(0, 5));
+		checkTable(SandboxModel.getTopLevels(3, 0, 5));
 
 		toggleExpandInRow(2, "Expand 1.1 (Gamma)");
-		aNodes = SandboxModel.getNodes(0, 2).concat(oExpandedGamma)
-			.concat(SandboxModel.getChildrenOf1_1());
+		aNodes = SandboxModel.getTopLevels(3, 0, 2).concat(oExpandedGamma)
+			.concat(SandboxModel.getChildren("1.1"));
 		checkTable(aNodes, {DistanceFromRoot : 3});
 
 		When.onTheMainPage.synchronize("2nd time");
 		checkTable(aNodes, {DistanceFromRoot : 3});
 
 		toggleExpandInRow(2, "Collapse 1.1 (Gamma)");
-		checkTable(SandboxModel.getNodes(0, 5));
+		checkTable(SandboxModel.getTopLevels(3, 0, 5));
 
 		toggleExpandInRow(1, "Collapse 1 (Beta)");
-		aNodes = SandboxModel.getNodes(0, 1).concat(aAfterCollapseBeta.slice(1, 5));
+		aNodes = SandboxModel.getTopLevels(3, 0, 1).concat(aAfterCollapseBeta.slice(1, 5));
 		checkTable(aNodes);
 
 		// still functional
@@ -177,7 +179,7 @@ sap.ui.define([
 		checkTable(aAfterCollapseBetaMu);
 
 		scrollToRow(1, "Scroll down one row"); // 5 (Xi) appears
-		aNodes = aAfterCollapseBetaMu.slice(1).concat(SandboxModel.getNodes(8, 1));
+		aNodes = aAfterCollapseBetaMu.slice(1).concat(SandboxModel.getTopLevels(3, 8, 1));
 		checkTable(aNodes);
 
 		toggleExpandInRow(5, "Collapse 5 (Xi)");
@@ -203,7 +205,7 @@ sap.ui.define([
 
 		// hidden node 5.1 (Omicron) still expanded and properly updated
 		toggleExpandInRow(5, "Expand 5 (Xi)");
-		aNodes = aAfterCollapseBetaMu.slice(1).concat(SandboxModel.getNodes(8, 1));
+		aNodes = aAfterCollapseBetaMu.slice(1).concat(SandboxModel.getTopLevels(3, 8, 1));
 		checkTable(aNodes);
 
 		scrollToRow(2, "Scroll down one row");
@@ -211,13 +213,13 @@ sap.ui.define([
 		checkTable(aAfterShowOmicron);
 
 		scrollToRow(7, "PAGE DOWN");
-		checkTable(SandboxModel.getChildrenOf5_1(0, 5), {DistanceFromRoot : 3});
+		checkTable(SandboxModel.getChildren("5.1", 0, 5), {DistanceFromRoot : 3});
 
 		scrollToRow(11, "Scroll To The Bottom");
-		checkTable(SandboxModel.getChildrenOf5_1(4, 5), {DistanceFromRoot : 3});
+		checkTable(SandboxModel.getChildren("5.1", 4, 5), {DistanceFromRoot : 3});
 
 		scrollToRow(6, "Scroll To 5.1 (Omicron)");
-		aNodes = [oExpandedOmicron].concat(SandboxModel.getChildrenOf5_1(0, 4));
+		aNodes = [oExpandedOmicron].concat(SandboxModel.getChildren("5.1", 0, 4));
 		checkTable(aNodes, {DistanceFromRoot : 3});
 
 		toggleExpandInRow(6, "Collapse 5.1 (Omicron)");
@@ -241,6 +243,5 @@ sap.ui.define([
 		checkTable(aNodes);
 
 		Then.onAnyPage.checkLog();
-		Then.iTeardownMyUIComponent();
 	};
 });

package/test/sap/ui/core/demokit/sample/odata/v4/SalesOrderTP100_V2/Opa.qunit.js

@@ -3,17 +3,18 @@
  */
 QUnit.config.autostart = false;
 
-sap.ui.getCore().attachInit(function () {
+sap.ui.require([
+	"sap/ui/core/Core",
+	"sap/ui/core/sample/common/Helper",
+	"sap/ui/core/sample/common/pages/Any",
+	"sap/ui/core/sample/odata/v4/SalesOrderTP100_V2/pages/Main",
+	"sap/base/Log",
+	"sap/ui/test/opaQunit",
+	"sap/ui/core/sample/odata/v4/SalesOrderTP100_V2/SandboxModel" // preload only
+], function (Core, Helper, Any, Main, Log, opaTest) {
 	"use strict";
 
-	sap.ui.require([
-		"sap/ui/core/sample/common/Helper",
-		"sap/ui/core/sample/common/pages/Any",
-		"sap/ui/core/sample/odata/v4/SalesOrderTP100_V2/pages/Main",
-		"sap/base/Log",
-		"sap/ui/test/opaQunit",
-		"sap/ui/core/sample/odata/v4/SalesOrderTP100_V2/SandboxModel" // preload only
-	], function (Helper, Any, Main, Log, opaTest) {
+	Core.ready().then(function () {
 		Helper.qUnitModule("sap.ui.core.sample.odata.v4.SalesOrderTP100_V2");
 
 		//*****************************************************************************
@@ -44,6 +45,7 @@ sap.ui.getCore().attachInit(function () {
 					name : "sap.ui.core.sample.odata.v4.SalesOrderTP100_V2"
 				}
 			});
+			Then.onAnyPage.iTeardownMyUIComponentInTheEnd();
 
 			When.onTheMainPage.pressMoreButton("SalesOrders");
 			When.onTheMainPage.selectSalesOrder(1);
@@ -51,7 +53,6 @@ sap.ui.getCore().attachInit(function () {
 
 			Then.onAnyPage.checkLog(aExpectedLogs);
 			Then.onAnyPage.analyzeSupportAssistant();
-			Then.iTeardownMyUIComponent();
 		});
 
 		QUnit.start();

package/test/sap/ui/core/demokit/sample/odata/v4/SalesOrderTP100_V4/Opa.qunit.js

@@ -3,16 +3,17 @@
  */
 QUnit.config.autostart = false;
 
-sap.ui.getCore().attachInit(function () {
+sap.ui.require([
+	"sap/ui/core/Core",
+	"sap/ui/core/sample/common/Helper",
+	"sap/ui/core/sample/common/pages/Any",
+	"sap/ui/core/sample/odata/v4/SalesOrderTP100_V4/pages/Main",
+	"sap/ui/test/opaQunit",
+	"sap/ui/core/sample/odata/v4/SalesOrderTP100_V4/SandboxModel" // preload only
+], function (Core, Helper, Any, Main, opaTest) {
 	"use strict";
 
-	sap.ui.require([
-		"sap/ui/core/sample/common/Helper",
-		"sap/ui/core/sample/common/pages/Any",
-		"sap/ui/core/sample/odata/v4/SalesOrderTP100_V4/pages/Main",
-		"sap/ui/test/opaQunit",
-		"sap/ui/core/sample/odata/v4/SalesOrderTP100_V4/SandboxModel" // preload only
-	], function (Helper, Any, Main, opaTest) {
+	Core.ready().then(function () {
 		Helper.qUnitModule("sap.ui.core.sample.odata.v4.SalesOrderTP100_V4");
 
 		//*****************************************************************************
@@ -24,6 +25,7 @@ sap.ui.getCore().attachInit(function () {
 					name : "sap.ui.core.sample.odata.v4.SalesOrderTP100_V4"
 				}
 			});
+			Then.onAnyPage.iTeardownMyUIComponentInTheEnd();
 
 			When.onTheMainPage.pressMoreButton("SalesOrders");
 			When.onTheMainPage.selectSalesOrder(1);
@@ -31,7 +33,6 @@ sap.ui.getCore().attachInit(function () {
 
 			Then.onAnyPage.checkLog();
 			Then.onAnyPage.analyzeSupportAssistant();
-			Then.iTeardownMyUIComponent();
 		});
 
 		QUnit.start();

package/test/sap/ui/core/demokit/sample/odata/v4/SalesOrders/Component.js

@@ -11,11 +11,12 @@ sap.ui.define([
 	"sap/base/Log",
 	"sap/m/HBox",
 	"sap/ui/core/library",
+	"sap/ui/core/Messaging",
 	"sap/ui/core/UIComponent",
 	"sap/ui/core/mvc/View",
 	"sap/ui/model/json/JSONModel",
 	"sap/ui/test/TestUtils"
-], function (Log, HBox, library, UIComponent, View, JSONModel, TestUtils) {
+], function (Log, HBox, library, Messaging, UIComponent, View, JSONModel, TestUtils) {
 	"use strict";
 
 	var MessageType = library.MessageType, // shortcut for sap.ui.core.MessageType
@@ -45,7 +46,7 @@ sap.ui.define([
 			// the same model can be accessed via two names to allow for different binding contexts
 			this.setModel(oModel, "headerContext");
 			this.setModel(oModel, "parameterContext");
-			this.setModel(sap.ui.getCore().getMessageManager().getMessageModel(), "messageModel");
+			this.setModel(Messaging.getMessageModel(), "messageModel");
 
 			// simulate a Fiori Elements app, where the view is only created after
 			// $metadata has been loaded

package/test/sap/ui/core/demokit/sample/odata/v4/SalesOrders/Opa.qunit.js

@@ -3,22 +3,23 @@
  */
 QUnit.config.autostart = false;
 
-sap.ui.getCore().attachInit(function () {
+sap.ui.require([
+	"sap/ui/core/Core",
+	"sap/ui/core/sample/common/pages/Any",
+	"sap/ui/core/sample/odata/v4/SalesOrders/pages/Main",
+	"sap/ui/core/sample/odata/v4/SalesOrders/Opa.SalesOrderAdditionalTargets.qunit",
+	"sap/ui/core/sample/odata/v4/SalesOrders/Opa.SalesOrderMessageHandling.qunit",
+	"sap/ui/core/sample/odata/v4/SalesOrders/Opa.SalesOrderTypeDeterminationAndDelete.qunit",
+	"sap/ui/core/sample/odata/v4/SalesOrders/Opa.SalesOrderChangeContext.qunit",
+	"sap/ui/core/sample/odata/v4/SalesOrders/Opa.SalesOrderCreate.qunit",
+	"sap/ui/core/sample/odata/v4/SalesOrders/Opa.SalesOrderCreateMultiple.qunit",
+	"sap/ui/core/sample/odata/v4/SalesOrders/Opa.SalesOrderCreateRelative.qunit",
+	"sap/ui/core/sample/odata/v4/SalesOrders/Opa.SalesOrderWriteNonDeferredGroup.qunit",
+	"sap/ui/core/sample/odata/v4/SalesOrders/SandboxModel" // preload only
+], function (Core) {
 	"use strict";
 
-	sap.ui.require([
-		"sap/ui/core/sample/common/pages/Any",
-		"sap/ui/core/sample/odata/v4/SalesOrders/pages/Main",
-		"sap/ui/core/sample/odata/v4/SalesOrders/Opa.SalesOrderAdditionalTargets.qunit",
-		"sap/ui/core/sample/odata/v4/SalesOrders/Opa.SalesOrderMessageHandling.qunit",
-		"sap/ui/core/sample/odata/v4/SalesOrders/Opa.SalesOrderTypeDeterminationAndDelete.qunit",
-		"sap/ui/core/sample/odata/v4/SalesOrders/Opa.SalesOrderChangeContext.qunit",
-		"sap/ui/core/sample/odata/v4/SalesOrders/Opa.SalesOrderCreate.qunit",
-		"sap/ui/core/sample/odata/v4/SalesOrders/Opa.SalesOrderCreateMultiple.qunit",
-		"sap/ui/core/sample/odata/v4/SalesOrders/Opa.SalesOrderCreateRelative.qunit",
-		"sap/ui/core/sample/odata/v4/SalesOrders/Opa.SalesOrderWriteNonDeferredGroup.qunit",
-		"sap/ui/core/sample/odata/v4/SalesOrders/SandboxModel" // preload only
-	], function () {
+	Core.ready().then(function () {
 		QUnit.start();
 	});
 });

package/test/sap/ui/core/demokit/sample/odata/v4/SalesOrders/pages/Main.js

@@ -2,6 +2,7 @@
  * ${copyright}
  */
 sap.ui.define([
+	"sap/ui/core/Element",
 	"sap/ui/core/sample/common/Helper",
 	"sap/ui/model/Filter",
 	"sap/ui/model/FilterOperator",
@@ -14,8 +15,8 @@ sap.ui.define([
 	"sap/ui/test/matchers/Ancestor",
 	"sap/ui/test/matchers/Interactable",
 	"sap/ui/test/matchers/Properties"
-], function (Helper, Filter, FilterOperator, ODataUtils, Opa, Opa5, TestUtils, EnterText, Press,
-		Ancestor, Interactable, Properties) {
+], function (Element, Helper, Filter, FilterOperator, ODataUtils, Opa, Opa5, TestUtils, EnterText,
+		Press, Ancestor, Interactable, Properties) {
 	"use strict";
 	var COMPANY_NAME_COLUMN_INDEX = 1,
 		GROSS_AMOUNT_COLUMN_INDEX = 2,
@@ -345,9 +346,8 @@ sap.ui.define([
 							return oSalesOrderTable.getItems().length > 0;
 						},
 						success : function () {
-							var oCore = sap.ui.getCore(),
-								sSalesOrderId = oCore.byId(sViewName).byId("SalesOrderList")
-									.getItems()[0].getCells()[0].getText();
+							var sSalesOrderId = Element.getElementById(sViewName)
+									.byId("SalesOrderList").getItems()[0].getCells()[0].getText();
 
 							Opa.getContext().firstSalesOrderId = sSalesOrderId;
 							Opa5.assert.ok(true, "First SalesOrderID: " + sSalesOrderId);
@@ -407,7 +407,7 @@ sap.ui.define([
 					if (TestUtils.isRealOData()) {
 						// remember created sales order for cleanup
 						this.waitFor({success : function () {
-							var oCreated = sap.ui.getCore().byId(sViewName).byId("SalesOrderList")
+							var oCreated = Element.getElementById(sViewName).byId("SalesOrderList")
 									.getItems()[0].getBindingContext();
 
 							oCreated.created().then(function () {
@@ -615,7 +615,7 @@ sap.ui.define([
 						controlType : "sap.m.Table",
 						id : "SalesOrderList",
 						success : function () {
-							sap.ui.getCore().byId(sViewName).getController().onSortByGrossAmount();
+							Element.getElementById(sViewName).getController().onSortByGrossAmount();
 							Opa5.assert.ok(true, "controller.onSortByGrossAmount() called");
 						},
 						viewName : sViewName
@@ -629,7 +629,8 @@ sap.ui.define([
 						controlType : "sap.m.Table",
 						id : "SalesOrderList",
 						success : function () {
-							sap.ui.getCore().byId(sViewName).getController().onSortBySalesOrderID();
+							Element.getElementById(sViewName).getController()
+								.onSortBySalesOrderID();
 							Opa5.assert.ok(true, "controller.onSortBySalesOrderID() called");
 						},
 						viewName : sViewName

package/test/sap/ui/core/demokit/sample/odata/v4/SalesOrders/tests/ChangeContext.js

@@ -12,6 +12,7 @@ sap.ui.define([], function () {
 					name : sUIComponent || "sap.ui.core.sample.odata.v4.SalesOrders"
 				}
 			});
+			Then.onAnyPage.iTeardownMyUIComponentInTheEnd();
 
 			When.onTheMainPage.firstSalesOrderIsVisible();
 
@@ -101,7 +102,6 @@ sap.ui.define([], function () {
 			When.onTheValueHelpPopover.close();
 
 			Then.onAnyPage.checkLog();
-			Then.iTeardownMyUIComponent();
 		}
 	};
 });

package/test/sap/ui/core/demokit/sample/odata/v4/SalesOrders/tests/Create.js

@@ -24,6 +24,7 @@ sap.ui.define([
 					name : sUIComponent || "sap.ui.core.sample.odata.v4.SalesOrders"
 				}
 			});
+			Then.onAnyPage.iTeardownMyUIComponentInTheEnd();
 
 			Opa.getContext().sViewName = "sap.ui.core.sample.odata.v4.SalesOrders.Main";
 
@@ -268,7 +269,6 @@ sap.ui.define([
 			Then.onAnyPage.checkLog(bRealOData
 				? [oExpectedLog, oExpectedLog, oExpectedLog]
 				: undefined);
-			Then.iTeardownMyUIComponent();
 		}
 	};
 });

package/test/sap/ui/core/demokit/sample/odata/v4/SalesOrders/tests/CreateMultiple.js

@@ -24,6 +24,7 @@ sap.ui.define([
 					name : sUIComponent || "sap.ui.core.sample.odata.v4.SalesOrders"
 				}
 			});
+			Then.onAnyPage.iTeardownMyUIComponentInTheEnd();
 
 			Opa.getContext().sViewName = "sap.ui.core.sample.odata.v4.SalesOrders.Main";
 
@@ -182,7 +183,6 @@ sap.ui.define([
 			// delete created sales orders
 			When.onAnyPage.cleanUp("SalesOrderList");
 			Then.onAnyPage.checkLog([oExpectedLog, oExpectedLog]);
-			Then.iTeardownMyUIComponent();
 		}
 	};
 });

package/test/sap/ui/core/demokit/sample/odata/v4/SalesOrders/tests/CreateRelative.js

@@ -61,6 +61,7 @@ sap.ui.define([
 					name : sUIComponent || "sap.ui.core.sample.odata.v4.SalesOrders"
 				}
 			});
+			Then.onAnyPage.iTeardownMyUIComponentInTheEnd();
 
 			Opa.getContext().sViewName = "sap.ui.core.sample.odata.v4.SalesOrders.Main";
 
@@ -218,7 +219,6 @@ sap.ui.define([
 			When.onAnyPage.cleanUp("SalesOrderList");
 			Then.onAnyPage.checkLog(aExpectedLogs);
 			Then.onAnyPage.analyzeSupportAssistant();
-			Then.iTeardownMyUIComponent();
 		}
 	};
 });

package/test/sap/ui/core/demokit/sample/odata/v4/SalesOrders/tests/MessageHandling.js

@@ -42,6 +42,7 @@ sap.ui.define([
 					name : sUIComponent || "sap.ui.core.sample.odata.v4.SalesOrders"
 				}
 			});
+			Then.onAnyPage.iTeardownMyUIComponentInTheEnd();
 
 			// ************************************************************************************
 			// Unbound/Bound Messages
@@ -412,7 +413,6 @@ sap.ui.define([
 			When.onTheMainPage.pressConfirmStrictModeButton();
 
 			Then.onAnyPage.checkLog(aExpectedLogs);
-			Then.iTeardownMyUIComponent();
 		}
 	};
 });