@openui5/sap.ui.core 1.118.0 → 1.119.1

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

@@ -10,10 +10,10 @@ sap.ui.define([
 	"use strict";
 
 	return Controller.extend("sap.ui.core.sample.odata.v4.RecursiveHierarchy.RecursiveHierarchy", {
-		onCreate : function (oEvent) {
+		onCreate : async function (oEvent) {
 			try {
 				const oParentContext = oEvent.getSource().getBindingContext();
-				oParentContext.getBinding().create({
+				await oParentContext.getBinding().create({
 					"@$ui5.node.parent" : oParentContext
 				}, /*bSkipRefresh*/true);
 			} catch (oError) {
@@ -37,7 +37,7 @@ sap.ui.define([
 
 			const oTable = this.byId("table");
 			if (sVisibleRowCount) {
-				oTable.setVisibleRowCount(parseInt(sVisibleRowCount));
+				oTable.getRowMode().setRowCount(parseInt(sVisibleRowCount));
 			}
 			const oRowsBinding = oTable.getBinding("rows");
 			oRowsBinding.setAggregation(this._oAggregation);
@@ -53,7 +53,7 @@ sap.ui.define([
 			// enable V4 tree table flag
 			oTreeTable._oProxy._bEnableV4 = true;
 			if (sVisibleRowCount) {
-				oTreeTable.setVisibleRowCount(parseInt(sVisibleRowCount));
+				oTreeTable.getRowMode().setRowCount(parseInt(sVisibleRowCount));
 			}
 			const oTreeRowsBinding = oTreeTable.getBinding("rows");
 			oTreeRowsBinding.setAggregation(this._oAggregation);
@@ -66,6 +66,31 @@ sap.ui.define([
 			});
 		},
 
+		onMove : function (oEvent) {
+			this.oNode = oEvent.getSource().getBindingContext();
+			const oSelectDialog = this.byId("moveDialog");
+			const oListBinding = oSelectDialog.getBinding("items");
+			if (oListBinding.isSuspended()) {
+				oListBinding.resume();
+			}
+			oSelectDialog.open();
+		},
+
+		onMoveConfirm : async function (oEvent) {
+			try {
+				this.getView().setBusy(true);
+				const sParentId = oEvent.getParameter("selectedItem").getTitle();
+				const oParent = this.oNode.getBinding().getAllCurrentContexts()
+					.find((oNode) => oNode.getProperty("ID") === sParentId);
+				await this.oNode.move({parent : oParent});
+			} catch (oError) {
+				MessageBox.alert(oError.message, {icon : MessageBox.Icon.ERROR,
+					title : "Error"});
+			} finally {
+				this.getView().setBusy(false);
+			}
+		},
+
 		onNameChanged : function (oEvent) {
 			const oContext = oEvent.getSource().getBindingContext();
 			if (oContext.hasPendingChanges()) {

package/test/sap/ui/core/demokit/sample/odata/v4/RecursiveHierarchy/RecursiveHierarchy.view.xml

@@ -3,13 +3,14 @@
 	controllerName="sap.ui.core.sample.odata.v4.RecursiveHierarchy.RecursiveHierarchy"
 	xmlns="sap.ui.table"
 	xmlns:m="sap.m"
-	xmlns:mvc="sap.ui.core.mvc">
+	xmlns:mvc="sap.ui.core.mvc"
+	xmlns:rm="sap.ui.table.rowmodes">
 
-	<Table id="table" ariaLabelledBy="title" minAutoRowCount="2"
+	<Table id="table" ariaLabelledBy="title"
 		rows="{path : '/EMPLOYEES',
 			parameters : {$count : false, $orderby : 'AGE', $$patchWithoutSideEffects : true},
 			suspended : true}"
-		selectionMode="None" threshold="0" visibleRowCount="5" visibleRowCountMode="Interactive">
+		selectionMode="None" threshold="0">
 		<extension>
 			<m:Toolbar design="Transparent" class="sapMTBHeader-CTX">
 				<m:Title id="title" level="H1" text="Organizational Chart"/>
@@ -18,6 +19,9 @@
 					tooltip="Synchronize"/>
 			</m:Toolbar>
 		</extension>
+		<rowMode>
+			<rm:Interactive rowCount="5" minRowCount="2"/>
+		</rowMode>
 		<Column hAlign="End" width="5em">
 			<m:Label text="Level"/>
 			<template>
@@ -69,13 +73,18 @@
 					icon="sap-icon://create" press=".onCreate" tooltip="Create New Child"/>
 			</template>
 		</Column>
+		<Column width="4em">
+			<template>
+				<m:Button id="move" icon="sap-icon://move" press=".onMove" tooltip="Move"/>
+			</template>
+		</Column>
 	</Table>
 
-	<TreeTable id="treeTable" ariaLabelledBy="treeTitle" minAutoRowCount="2"
+	<TreeTable id="treeTable" ariaLabelledBy="treeTitle"
 		rows="{path : '/EMPLOYEES',
 			parameters : {$count : false, $orderby : 'AGE', $$patchWithoutSideEffects : true},
 			suspended : true}"
-		selectionMode="None" threshold="0" visibleRowCount="5" visibleRowCountMode="Interactive">
+		selectionMode="None" threshold="0">
 		<extension>
 			<m:Toolbar design="Transparent" class="sapMTBHeader-CTX">
 				<m:Title id="treeTitle" level="H1" text="Organizational Chart - TreeTable"/>
@@ -84,6 +93,9 @@
 					press="onSynchronizeTreeTable" tooltip="SynchronizeTreeTable"/>
 			</m:Toolbar>
 		</extension>
+		<rowMode>
+			<rm:Interactive rowCount="5" minRowCount="2"/>
+		</rowMode>
 		<Column>
 			<m:Label text="ID"/>
 			<template>
@@ -120,6 +132,19 @@
 					icon="sap-icon://create" press=".onCreate" tooltip="Create New Child"/>
 			</template>
 		</Column>
+		<Column width="4em">
+			<template>
+				<m:Button id="moveInTreeTable" icon="sap-icon://move" press=".onMove"
+					tooltip="Move"/>
+			</template>
+		</Column>
 	</TreeTable>
 
+	<mvc:dependents>
+		<m:SelectDialog confirm=".onMoveConfirm" draggable="true" id="moveDialog"
+			items="{path : '/EMPLOYEES', parameters : {$count : true}, suspended : true}"
+			title="Select New Parent">
+			<m:StandardListItem description="{Name}" title="{ID}" type="Active" />
+		</m:SelectDialog>
+	</mvc:dependents>
 </mvc:View>

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

@@ -261,7 +261,10 @@ sap.ui.define([
 			}
 			const aRows = aIDs.map((sID) => mNodeById[sID]);
 			selectCountSkipTop(aRows, mQueryOptions, oResponse);
+			return;
 		}
+
+		selectCountSkipTop(aAllNodes, mQueryOptions, oResponse);
 	}
 
 	/**
@@ -275,13 +278,36 @@ sap.ui.define([
 		if (oRequest.requestHeaders.Prefer !== "return=minimal") {
 			throw new Error("Unsupported Prefer header: " + oRequest.requestHeaders.Prefer);
 		}
-		// "{"Name" : "<new name>"}"
+		// {"Name" : "<new name>"}
+		// "EMPLOYEE_2_MANAGER@odata.bind" : "EMPLOYEES('1')"
 		const oBody = JSON.parse(oRequest.requestBody);
-		if (Object.keys(oBody).length > 1 || !("Name" in oBody)) {
-			throw new Error("Unsupported PATCH body: " + oRequest.requestBody);
+		switch (Object.keys(oBody).length === 1 && Object.keys(oBody)[0]) {
+			case "EMPLOYEE_2_MANAGER@odata.bind": {
+				const oChild = mNodeById[aMatches[1]];
+				const sParentId = oBody["EMPLOYEE_2_MANAGER@odata.bind"]
+					.slice("EMPLOYEES('".length, -"')".length);
+				//TODO prevent cycles!
+
+				if (oChild.MANAGER_ID) {
+					const aChildren = mChildrenByParentId[oChild.MANAGER_ID];
+					aChildren.splice(aChildren.indexOf(oChild), 1);
+				}
+				//TODO Note: "AGE determines sibling order (ascending)"
+				(mChildrenByParentId[sParentId] ??= []).push(oChild);
+
+				oChild.MANAGER_ID = sParentId;
+				//TODO update position in aAllNodes!
+				break;
+			}
+
+			case "Name":
+				// ignore suffixes added by SandboxModel.update
+				mNodeById[aMatches[1]].Name = oBody.Name.split(" #")[0];
+				break;
+
+			default:
+				throw new Error("Unsupported PATCH body: " + oRequest.requestBody);
 		}
-		// ignore suffixes added by SandboxModel.update
-		mNodeById[aMatches[1]].Name = oBody.Name.split(" #")[0];
 		// no response required
 	}
 
@@ -311,7 +337,8 @@ sap.ui.define([
 		if (sParentId in mChildrenByParentId) {
 			// Note: "AGE determines sibling order (ascending)"
 			oNewChild.AGE = mChildrenByParentId[sParentId][0].AGE - 1;
-			// Note:
+			//TODO use "largest" child ID which is hierarchical to parent? cf. move!
+			// .../c/openui5/+/5940246/6/src/sap.ui.core/test/sap/ui/core/demokit/sample/odata/v4/RecursiveHierarchy/SandboxModel.js#b302
 			const sLastChildID = mChildrenByParentId[sParentId].at(-1).ID;
 			if (sLastChildID.includes(".")) {
 				oNewChild.ID = sParentId + "."

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

@@ -52,6 +52,7 @@ sap.ui.define([
 				name : "sap.ui.core.sample.odata.v4.RecursiveHierarchy"
 			}
 		});
+		Then.onAnyPage.iTeardownMyUIComponentInTheEnd();
 
 		checkTable(aNodes);
 
@@ -123,6 +124,5 @@ sap.ui.define([
 		checkTable(aNodes);
 
 		Then.onAnyPage.checkLog();
-		Then.iTeardownMyUIComponent();
 	};
 });

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

@@ -49,6 +49,7 @@ sap.ui.define([
 				name : "sap.ui.core.sample.odata.v4.RecursiveHierarchy"
 			}
 		});
+		Then.onAnyPage.iTeardownMyUIComponentInTheEnd();
 
 		// basics: initial data
 		aNodes = SandboxModel.getTopLevels(3, 0, 5);
@@ -242,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

@@ -45,6 +45,7 @@ sap.ui.require([
 					name : "sap.ui.core.sample.odata.v4.SalesOrderTP100_V2"
 				}
 			});
+			Then.onAnyPage.iTeardownMyUIComponentInTheEnd();
 
 			When.onTheMainPage.pressMoreButton("SalesOrders");
 			When.onTheMainPage.selectSalesOrder(1);
@@ -52,7 +53,6 @@ sap.ui.require([
 
 			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

@@ -25,6 +25,7 @@ sap.ui.require([
 					name : "sap.ui.core.sample.odata.v4.SalesOrderTP100_V4"
 				}
 			});
+			Then.onAnyPage.iTeardownMyUIComponentInTheEnd();
 
 			When.onTheMainPage.pressMoreButton("SalesOrders");
 			When.onTheMainPage.selectSalesOrder(1);
@@ -32,7 +33,6 @@ sap.ui.require([
 
 			Then.onAnyPage.checkLog();
 			Then.onAnyPage.analyzeSupportAssistant();
-			Then.iTeardownMyUIComponent();
 		});
 
 		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();
 		}
 	};
 });

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

@@ -2,12 +2,13 @@
  * ${copyright}
  */
 sap.ui.define([
+	"sap/ui/core/Element",
 	"sap/ui/test/Opa5",
 	"sap/ui/test/TestUtils",
 	"sap/ui/test/actions/Press",
 	"sap/ui/test/matchers/Interactable",
 	"sap/ui/test/matchers/Properties"
-], function (Opa5, TestUtils, Press, Interactable, Properties) {
+], function (Element, Opa5, TestUtils, Press, Interactable, Properties) {
 	"use strict";
 
 	return {
@@ -192,7 +193,7 @@ sap.ui.define([
 					},
 					success : function () {
 						var sTypeName,
-						oView = sap.ui.getCore().byId(sViewName);
+						oView = Element.getElementById(sViewName);
 
 						// check for valid automatic type determination for each cell content in 1st
 						// row
@@ -222,8 +223,8 @@ sap.ui.define([
 					// sales order IDs are in controls with ID "SalesOrderList:SalesOrderID"
 					id : /SalesOrderID-/,
 					success : function () {
-						var aSalesOrderIds = sap.ui.getCore().byId(sViewName).byId("SalesOrderList")
-								.getItems().map(function (oItem) {
+						var aSalesOrderIds = Element.getElementById(sViewName)
+								.byId("SalesOrderList").getItems().map(function (oItem) {
 									return oItem.getCells()[0].getText();
 							});
 
@@ -242,10 +243,9 @@ sap.ui.define([
 						return oTable[0].getItems().length === aExpectedScheduleIds.length;
 					},
 					success : function () {
-						var oCore = sap.ui.getCore(),
-						aScheduleIds = [];
+						var aScheduleIds = [];
 
-						oCore.byId(sViewName).byId("SO_2_SCHDL")
+						Element.getElementById(sViewName).byId("SO_2_SCHDL")
 							.getItems().forEach(function (oItem) {
 								aScheduleIds.push(oItem.getCells()[0].getText());
 							});
@@ -261,6 +261,7 @@ sap.ui.define([
 					name : sUIComponent || "sap.ui.core.sample.odata.v4.SalesOrders"
 				}
 			});
+			Then.onAnyPage.iTeardownMyUIComponentInTheEnd();
 
 			//*****************************************************************************
 			// Check type determination
@@ -367,8 +368,6 @@ sap.ui.define([
 				deleteBusinessPartner();
 			}
 			Then.onAnyPage.checkLog();
-
-			Then.iTeardownMyUIComponent();
 		}
 	};
 });

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

@@ -27,6 +27,7 @@ sap.ui.define([
 					name : sUIComponent || "sap.ui.core.sample.odata.v4.SalesOrders"
 				}
 			});
+			Then.onAnyPage.iTeardownMyUIComponentInTheEnd();
 
 			TestUtils.setData("sap.ui.core.sample.odata.v4.SalesOrders.updateGroupId", sGroupId);
 
@@ -94,7 +95,6 @@ sap.ui.define([
 			Then.onTheMainPage.checkTableLength(0, "SalesOrderList");
 
 			Then.onAnyPage.checkLog(aExpectedLogs);
-			Then.iTeardownMyUIComponent();
 		}
 	};
 });

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

@@ -56,6 +56,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";
 
@@ -95,6 +96,5 @@ sap.ui.define([
 		// delete created sales orders
 		When.onAnyPage.cleanUp("SalesOrderList");
 		Then.onAnyPage.checkLog(aExpectedLogs);
-		Then.iTeardownMyUIComponent();
 	};
 });

package/test/sap/ui/core/demokit/sample/odata/v4/SalesOrdersRTATest/tests/AdaptSalesOrdersTable.js

@@ -12,6 +12,7 @@ sap.ui.define([], function () {
 					name : sUIComponent || "sap.ui.core.sample.odata.v4.SalesOrdersRTA"
 				}
 			});
+			Then.onAnyPage.iTeardownMyUIComponentInTheEnd();
 
 			When.onAnyPage.applySupportAssistant();
 
@@ -95,7 +96,6 @@ sap.ui.define([], function () {
 
 			Then.onAnyPage.checkLog();
 			Then.onAnyPage.analyzeSupportAssistant();
-			Then.iTeardownMyUIComponent();
 		}
 	};
 });

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

@@ -25,13 +25,13 @@ sap.ui.require([
 					name : "sap.ui.core.sample.odata.v4.SalesOrdersTemplate"
 				}
 			});
+			Then.onAnyPage.iTeardownMyUIComponentInTheEnd();
 
 			When.onTheMainPage.pressValueHelpOnCurrencyCode();
 			When.onTheMainPage.pressValueHelpOnRole();
 
 			Then.onAnyPage.checkLog();
 			Then.onAnyPage.analyzeSupportAssistant();
-			Then.iTeardownMyUIComponent();
 		});
 
 		QUnit.start();

package/test/sap/ui/core/demokit/sample/odata/v4/ServerDrivenPaging/Main.view.xml

@@ -3,6 +3,7 @@
 	controllerName="sap.ui.core.sample.odata.v4.ServerDrivenPaging.Main"
 	xmlns="sap.m"
 	xmlns:t="sap.ui.table"
+	xmlns:trm="sap.ui.table.rowmodes"
 	xmlns:mvc="sap.ui.core.mvc">
 	<IconTabBar select=".onTabSelect">
 		<items>
@@ -28,11 +29,13 @@
 				</Table>
 			</IconTabFilter>
 			<IconTabFilter id="table" key="table" text="table.Table">
-				<t:Table ariaLabelledBy="title" id="businessPartnerTable" selectionMode="None"
-						visibleRowCount="21">
+				<t:Table ariaLabelledBy="title" id="businessPartnerTable" selectionMode="None">
 					<t:extension>
 						<Title id="title" text="{$count} Business Partners" level="H1"/>
 					</t:extension>
+					<t:rowMode>
+						<trm:Fixed rowCount="21"/>
+					</t:rowMode>
 					<t:Column>
 						<Label text="Index"/>
 						<t:template>

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

@@ -16,9 +16,11 @@ sap.ui.define([
 						controlType : "sap.ui.table.Table",
 						id : "businessPartnerTable",
 						success : function (oTable) {
+							var iRowCount = oTable.getRowMode().getRowCount();
+
 							oTable.setFirstVisibleRow(Math.min(
-								oTable.getFirstVisibleRow() + oTable.getVisibleRowCount(),
-								oTable.getBinding("rows").getCount() - oTable.getVisibleRowCount()
+								oTable.getFirstVisibleRow() + iRowCount,
+								oTable.getBinding("rows").getCount() - iRowCount
 							));
 							Opa5.assert.ok(true, "Page down on grid table");
 						},

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

@@ -29,6 +29,7 @@ sap.ui.require([
 						name : "sap.ui.core.sample.odata.v4.Sticky"
 					}
 				});
+				Then.onAnyPage.iTeardownMyUIComponentInTheEnd();
 
 				When.onTheMainPage.selectStickyType(0);
 				When.onTheMainPage.pressPrepare();
@@ -42,7 +43,6 @@ sap.ui.require([
 
 				Then.onAnyPage.checkLog();
 				Then.onAnyPage.analyzeSupportAssistant();
-				Then.iTeardownMyUIComponent();
 			});
 		}
 

package/test/sap/ui/core/demokit/tutorial/mockserver/01/webapp/manifest.json

@@ -60,8 +60,8 @@
 		"dependencies": {
 			"minUI5Version": "1.30.0",
 			"libs": {
-				"sap.ui.core": {},
 				"sap.m": {},
+				"sap.ui.core": {},
 				"sap.ui.layout": {}
 			}
 		},

package/test/sap/ui/core/demokit/tutorial/mockserver/02/webapp/manifest.json

@@ -60,8 +60,8 @@
 		"dependencies": {
 			"minUI5Version": "1.30.0",
 			"libs": {
-				"sap.ui.core": {},
 				"sap.m": {},
+				"sap.ui.core": {},
 				"sap.ui.layout": {}
 			}
 		},

package/test/sap/ui/core/demokit/tutorial/mockserver/03/webapp/manifest.json

@@ -60,8 +60,8 @@
 		"dependencies": {
 			"minUI5Version": "1.30.0",
 			"libs": {
-				"sap.ui.core": {},
 				"sap.m": {},
+				"sap.ui.core": {},
 				"sap.ui.layout": {}
 			}
 		},

package/test/sap/ui/core/demokit/tutorial/mockserver/04/webapp/manifest.json

@@ -60,8 +60,8 @@
 		"dependencies": {
 			"minUI5Version": "1.30.0",
 			"libs": {
-				"sap.ui.core": {},
 				"sap.m": {},
+				"sap.ui.core": {},
 				"sap.ui.layout": {}
 			}
 		},

package/test/sap/ui/core/demokit/tutorial/troubleshooting/01/webapp/manifest.json

@@ -50,8 +50,8 @@
 		"dependencies": {
 			"minUI5Version": "1.30.0",
 			"libs": {
-				"sap.ui.core": {},
 				"sap.m": {},
+				"sap.ui.core": {},
 				"sap.ui.layout": {},
 				"sap.uxap": {}
 			}