@openui5/sap.ui.core 1.119.1 → 1.120.1

package/test/sap/ui/core/qunit/odata/v2/ODataModel.integration.qunit.js

@@ -386,6 +386,7 @@ sap.ui.define([
 				for (j = aChildNodes.length - 1; j >= 0; j -= 1) {
 					oChildNode = aChildNodes[j];
 					if (oChildNode.nodeType === Node.ELEMENT_NODE
+							&& oChildNode.localName !== "AnalyticalColumn"
 							&& oChildNode.localName !== "Column"
 							&& oChildNode.localName !== "rowMode") {
 						oColumn = document.createElementNS("sap.ui.table", "Column");
@@ -399,6 +400,7 @@ sap.ui.define([
 			}
 		}
 
+		convertElements(oDocument.getElementsByTagNameNS("sap.ui.table", "AnalyticalTable"));
 		convertElements(oDocument.getElementsByTagNameNS("sap.ui.table", "Table"));
 		convertElements(oDocument.getElementsByTagNameNS("sap.ui.table", "TreeTable"));
 	}
@@ -517,9 +519,6 @@ sap.ui.define([
 			this.mChanges = {};
 			// counter for OData messages created during a test
 			this.iODataMessageCount = 0;
-			// {map<string, true>}
-			// If an ID is in this.mIgnoredChanges, change events with null are ignored
-			this.mIgnoredChanges = {};
 			// {map<string, string[][]>}
 			// this.mListChanges["id"][i] is a list of expected changes for the property "text" of
 			// the control with ID "id" in row i
@@ -667,9 +666,7 @@ sap.ui.define([
 				sVisibleId = iRow === undefined ? sControlId : sControlId + "[" + iRow + "]";
 
 			if (!aExpectedValues || !aExpectedValues.length) {
-				if (!(sControlId in this.mIgnoredChanges && sValue === null)) {
-					assert.ok(false, sVisibleId + ": " + JSON.stringify(sValue) + " (unexpected)");
-				}
+				assert.ok(false, sVisibleId + ": " + JSON.stringify(sValue) + " (unexpected)");
 			} else {
 				sExpectedValue = aExpectedValues.shift();
 				// Note: avoid bad performance of assert.strictEqual(), e.g. DOM manipulation
@@ -779,6 +776,8 @@ sap.ui.define([
 			 * @param {object} oHandler The request handler object
 			 * @param {object} oHttpClient The HttpClient object
 			 * @param {object} oMetadata The metadata object
+			 * @returns {object}
+			 *   An object with a property <code>abort</code>, containing a function to abort the request
 			 */
 			function checkRequest(oRequest, fnSuccess, fnError, oHandler, oHttpClient, oMetadata) {
 				if (oRequest.requestUri.includes("$batch")) {
@@ -1113,7 +1112,7 @@ sap.ui.define([
 				// esp. for the table.Table this is essential.
 				that.oView.placeAt("qunit-fixture");
 
-				return that.waitForChanges(assert);
+				return that.waitForChanges(assert, "create view");
 			});
 		},
 
@@ -1486,19 +1485,6 @@ sap.ui.define([
 			return this;
 		},
 
-		/**
-		 * Allows that the property "text" of the control with the given ID is set to undefined or
-		 * null. This may happen when bindings are initialized before the model value is available.
-		 *
-		 * @param {string} sControlId The control ID
-		 * @returns {object} The test instance for chaining
-		 */
-		ignoreNullChanges : function (sControlId) {
-			this.mIgnoredChanges[sControlId] = true;
-
-			return this;
-		},
-
 		/**
 		 * Observes and checks value changes for a control. In case the test uses {#expectChange},
 		 * checks the model internal value by attaching a formatter; if the test uses
@@ -1697,15 +1683,17 @@ sap.ui.define([
 		 * states.
 		 *
 		 * @param {object} assert The QUnit assert object
-		 * @param {number} [iTimeout=3000] The timeout time in milliseconds
+		 * @param {string} [sTitle] Title for this section of a test
+		 * @param {number} [iWaitTimeout=3000] The timeout time in milliseconds
 		 * @returns {Promise} A promise that is resolved when all requests have been responded,
 		 *   all expected values for controls have been set, all expected messages and all value
 		 *   states have been checked
 		 */
-		waitForChanges : function (assert, iTimeout) {
+		waitForChanges : function (assert, sTitle, iWaitTimeout) {
 			var oPromise,
 				that = this;
 
+			iWaitTimeout = iWaitTimeout || 3000;
 			oPromise = new SyncPromise(function (resolve) {
 				that.resolve = resolve;
 				// After three seconds everything should have run through
@@ -1713,11 +1701,11 @@ sap.ui.define([
 				setTimeout(function () {
 					if (oPromise.isPending()) {
 						assert.ok(false, "Timeout in waitForChanges");
-						resolve();
+						resolve(true);
 					}
-				}, iTimeout || 3000);
+				}, iWaitTimeout);
 				that.checkFinish(assert);
-			}).then(function () {
+			}).then(function (bTimeout) {
 				var sControlId, aExpectedValuesPerRow, i, j;
 
 				// Report missing requests
@@ -1743,8 +1731,8 @@ sap.ui.define([
 					}
 				}
 				that.checkMessages(assert);
-				return that.aValueStates.length === 0
-					? undefined
+				return (that.aValueStates.length === 0
+					? SyncPromise.resolve()
 					// Checks the controls' value state after waiting some time for the control to
 					// set it.
 					: resolveLater(function () {
@@ -1760,6 +1748,9 @@ sap.ui.define([
 									+ oControl.getValueStateText());
 						});
 						that.aValueStates = [];
+					})).then(() => {
+						assert.ok(!bTimeout, "waitForChanges(" + (sTitle || "") + "): "
+							+ (bTimeout ? "Timeout (" + iWaitTimeout + " ms)" : "Done"));
 					});
 			});
 
@@ -5037,7 +5028,7 @@ usePreliminaryContext : false}}">\
 				}]
 			})
 			.expectValue("connectionID", ["10"])
-			.expectValue("flightDate", ["5/30/15, 1:47 PM"])
+			.expectValue("flightDate", ["5/30/15, 1:47\u202FPM"])
 			.expectMessage(oFlight10PriceError, "/FlightCollection",
 				"/CarrierCollection('1')/carrierFlights")
 			.expectMessage(oFlight20PriceWarning, "/FlightCollection",
@@ -5054,7 +5045,7 @@ usePreliminaryContext : false}}">\
 			});
 		}).then(function (oFilter) {
 			that.expectValue("connectionID", ["20"])
-				.expectValue("flightDate", ["6/30/15, 1:47 PM"]);
+				.expectValue("flightDate", ["6/30/15, 1:47\u202FPM"]);
 
 			oItemsBinding.filter(oFilter);
 
@@ -5319,7 +5310,7 @@ usePreliminaryContext : false}}">\
 			that.expectRequest({
 					created : true,
 					data : {
-						__metadata :  {type : "GWSAMPLE_BASIC.SalesOrderLineItem"}
+						__metadata : {type : "GWSAMPLE_BASIC.SalesOrderLineItem"}
 					},
 					method : "POST",
 					requestUri : "SalesOrderSet('1')/ToLineItems"
@@ -5449,7 +5440,7 @@ usePreliminaryContext : false}}">\
 		}).then(function () {
 			var oResetPromise;
 
-			if (bWithFailedPOST && bPersistTechnicalMessages && !bDeleteCreatedEntities) {
+			if (bWithFailedPOST && bPersistTechnicalMessages) {
 				that.expectMessages([{
 						code : "UF0",
 						fullTarget : "/SalesOrderSet('1')/ToLineItems('~key~')",
@@ -8248,11 +8239,11 @@ ToProduct/ToSupplier/BusinessPartnerID\'}}">\
 				ID : "1",
 				TimezoneID : "America/New_York"
 			}, {"sap-message" : getMessageHeader(oDateWarning)})
-			.expectValue("dateAndTime", "Jan 17, 2022, 4:54:48 AM")
+			.expectValue("dateAndTime", "Jan 17, 2022, 4:54:48\u202FAM")
 			.expectValue("date", "Jan 17, 2022")
-			.expectValue("time", "4:54:48 AM")
+			.expectValue("time", "4:54:48\u202FAM")
 			.expectValue("timezone", "Americas, New York")
-			.expectValue("default", "Jan 17, 2022, 4:54:48 AM Americas, New York")
+			.expectValue("default", "Jan 17, 2022, 4:54:48\u202FAM Americas, New York")
 			.expectMessage(oDateWarning, "/DateTimeWithTimezoneSet('1')/")
 			.expectValueState("dateAndTime", "Warning", "Foo")
 			.expectValueState("date", "Warning", "Foo")
@@ -10332,8 +10323,8 @@ ToProduct/ToSupplier/BusinessPartnerID\'}}">\
 		threshold="0"\
 		visibleRowCount="1">\
 	<Text id="maintenanceOrder" text="{MaintenanceOrder}" />\
-</t:TreeTable>',
-			that = this;
+</t:TreeTable>';
+		let oTable;
 
 		this.expectHeadRequest()
 			.expectRequest({
@@ -10354,12 +10345,15 @@ ToProduct/ToSupplier/BusinessPartnerID\'}}">\
 					MaintenanceOrder : "Foo"
 				}]
 			})
-			.expectValue("person", "Alice")
-			.ignoreNullChanges("maintenanceOrder") //FIXME: unexpected change occurring in testsuite
-			.expectValue("maintenanceOrder", ["Foo"]);
+			.expectValue("person", "Alice");
 
-		return this.createView(assert, sView, oModel).then(function () {
-			that.expectRequest({
+		return this.createView(assert, sView, oModel).then(() => {
+			oTable = this.oView.byId("table");
+
+			// don't use expectValue to avoid timing issues causing flaky tests
+			assert.deepEqual(getTableContent(oTable), [["Foo"]]);
+
+			this.expectRequest({
 					batchNo : 3,
 					data : {
 						__metadata : {uri : "C_RSHMaintSchedSmltdOrdAndOp('1')"},
@@ -10379,16 +10373,17 @@ ToProduct/ToSupplier/BusinessPartnerID\'}}">\
 						__metadata : {uri : "C_RSHMaintSchedSmltdOrdAndOp('1')"},
 						MaintenanceOrder : "Bar"
 					}]
-				})
-				.expectValue("maintenanceOrder", ["Bar"]);
+				});
 
 			// code under test
 			oModel.setProperty("/C_RSHMaintSchedSmltdOrdAndOp('1')/MaintenanceOrder", "Bar");
 			oModel.submitChanges();
 
-			return that.waitForChanges(assert);
-		}).then(function () {
-			that.expectRequest({
+			return this.waitForChanges(assert);
+		}).then(() => {
+			assert.deepEqual(getTableContent(oTable), [["Bar"]]);
+
+			this.expectRequest({
 					batchNo : 4,
 					data : {
 						Person : "Bob"
@@ -10408,7 +10403,7 @@ ToProduct/ToSupplier/BusinessPartnerID\'}}">\
 			// code under test: scenario 2
 			oModel.update("/I_UserContactCard('foo')", {"Person" : "Bob"});
 
-			return that.waitForChanges(assert);
+			return this.waitForChanges(assert);
 		});
 	});
 
@@ -10805,8 +10800,10 @@ ToProduct/ToSupplier/BusinessPartnerID\'}}">\
 	// Scenario: TreeTable#collapseAll for a table using ODataTreeBindingAdapter resets the number
 	// of levels expanded automatically in subsequent read requests to 0.
 	// BCP: 66039 / 2021
+	// Scenario: ODataTreeBinding#expandNodeToLevel expands all children up to the given level.
+	// JIRA: CPOUI5MODELS-1437
 	QUnit.test("ODataTreeBindingAdapter: collapseToLevel prevents auto expand of child nodes with"
-			+ " higher level", function (assert) {
+			+ " higher level and expandNodeToLevel works as expected", function (assert) {
 		var oModel = createSpecialCasesModel(),
 			oTable,
 			sView = '\
@@ -10827,8 +10824,7 @@ ToProduct/ToSupplier/BusinessPartnerID\'}}">\
 		threshold="0"\
 		visibleRowCount="2">\
 	<Text id="maintenanceOrder" text="{MaintenanceOrder}" />\
-</t:TreeTable>',
-			that = this;
+</t:TreeTable>';
 
 		this.expectHeadRequest()
 			.expectRequest("C_RSHMaintSchedSmltdOrdAndOp?$filter=OrderOperationRowLevel eq 0"
@@ -10869,22 +10865,23 @@ ToProduct/ToSupplier/BusinessPartnerID\'}}">\
 						OrderOperationRowID : "id-0.1",
 						OrderOperationRowLevel : 1
 					}]
-				})
-			.expectValue("maintenanceOrder", ["0", "1"])
-			.expectValue("maintenanceOrder", "0.0", 1);
+				});
 
-		return this.createView(assert, sView, oModel).then(function () {
-			oTable = that.oView.byId("table");
+		return this.createView(assert, sView, oModel).then(() => {
+			oTable = this.oView.byId("table");
 
-			that.expectValue("maintenanceOrder", "1", 1);
+			// don't use expectValue to avoid timing issues causing flaky tests
+			assert.deepEqual(getTableContent(oTable), [["0"], ["0.0"]]);
 
 			// code under test
 			oTable.collapseAll();
 
-			return that.waitForChanges(assert);
-		}).then(function () {
+			return this.waitForChanges(assert);
+		}).then(() => {
+			assert.deepEqual(getTableContent(oTable), [["0"], ["1"]]);
+
 			//TODO expect $top=2 instead of $top=4, check TreeBindingAdapter#_getContextsOrNodes?
-			that.expectRequest("C_RSHMaintSchedSmltdOrdAndOp"
+			this.expectRequest("C_RSHMaintSchedSmltdOrdAndOp"
 				+ "?$filter=OrderOperationRowLevel eq 0&$skip=2&$top=4",
 				{
 					results : [{
@@ -10900,17 +10897,192 @@ ToProduct/ToSupplier/BusinessPartnerID\'}}">\
 						OrderOperationRowID : "id-3",
 						OrderOperationRowLevel : 0
 					}]
-				})
-				.expectValue("maintenanceOrder", "", 2)
-				.expectValue("maintenanceOrder", "", 3)
-				.expectValue("maintenanceOrder", "2", 2)
-				.expectValue("maintenanceOrder", "3", 3);
+				});
 
 			// code under test
 			// scroll down shows additional level 0 nodes, but must NOT load or show their children
 			oTable.setFirstVisibleRow(2);
 
-			return that.waitForChanges(assert);
+			return this.waitForChanges(assert);
+		}).then(() => {
+			assert.deepEqual(getTableContent(oTable), [["2"], ["3"]]);
+
+			this.expectRequest(
+				"C_RSHMaintSchedSmltdOrdAndOp?$filter=OrderOperationRowID eq 'id-2' and OrderOperationRowLevel le 2",
+				{
+					results : [{
+						__metadata : {uri : "C_RSHMaintSchedSmltdOrdAndOp('id-2')"},
+						MaintenanceOrder : "2",
+						OrderOperationIsExpanded : "expanded",
+						OrderOperationRowID : "id-2",
+						OrderOperationRowLevel : 0
+					}, {
+						__metadata : {uri : "C_RSHMaintSchedSmltdOrdAndOp('id-2.0')"},
+						MaintenanceOrder : "2.0",
+						OrderOperationIsExpanded : "leaf",
+						OrderOperationParentRowID : "id-2",
+						OrderOperationRowID : "id-2.0",
+						OrderOperationRowLevel : 1
+					}]
+				});
+
+			return Promise.all([
+				// code under test
+				oTable.getBinding("rows").expandNodeToLevel(2, 2),
+				this.waitForChanges(assert)
+			]);
+		}).then(() => {
+			assert.deepEqual(getTableContent(oTable), [["2"], ["2.0"]]);
+		});
+	});
+
+	//*********************************************************************************************
+	// Scenario: All read requests of the tree binding except $count requests, consider "transitionMessagesOnly"
+	// parameter.
+	// JIRA: CPOUI5MODELS-1437
+	QUnit.test("ODataTreeBinding: transtionMessagesOnly", function (assert) {
+		const oModel = createSpecialCasesModel();
+		let oTable;
+		const sView = '\
+<t:TreeTable id="table"\
+		rows="{\
+			parameters: {\
+				countMode : \'Request\',\
+				numberOfExpandedLevels: 1,\
+				transitionMessagesOnly: true,\
+				treeAnnotationProperties: {\
+					hierarchyDrillStateFor: \'OrderOperationIsExpanded\',\
+					hierarchyLevelFor: \'OrderOperationRowLevel\',\
+					hierarchyNodeFor: \'OrderOperationRowID\',\
+					hierarchyParentNodeFor: \'OrderOperationParentRowID\'\
+				}\
+			},\
+			path: \'/C_RSHMaintSchedSmltdOrdAndOp\'\
+		}"\
+		threshold="0"\
+		visibleRowCount="2">\
+	<Text id="maintenanceOrder" text="{MaintenanceOrder}" />\
+</t:TreeTable>';
+
+		this.expectHeadRequest()
+			// triggered by ODataTreeBinding#_getCountForNodeId
+			.expectRequest("C_RSHMaintSchedSmltdOrdAndOp/$count?$filter=OrderOperationRowLevel eq 0", "273")
+			.expectRequest({ // triggered by ODataTreeBinding#_loadSubNodes
+					headers: {"sap-messages": "transientOnly"},
+					requestUri: "C_RSHMaintSchedSmltdOrdAndOp?$filter=OrderOperationRowLevel eq 0&$skip=0&$top=2"
+				}, {
+					results: [{
+						__metadata: {uri: "C_RSHMaintSchedSmltdOrdAndOp('id-0')"},
+						MaintenanceOrder: "0",
+						OrderOperationIsExpanded: "collapsed",
+						OrderOperationRowID: "id-0",
+						OrderOperationRowLevel: 0
+					}, {
+						__metadata: {uri: "C_RSHMaintSchedSmltdOrdAndOp('id-1')"},
+						MaintenanceOrder: "1",
+						OrderOperationIsExpanded: "leaf",
+						OrderOperationRowID: "id-1",
+						OrderOperationRowLevel: 0
+					}]
+				})
+			// triggered by ODataTreeBinding#_getCountForNodeId
+			.expectRequest("C_RSHMaintSchedSmltdOrdAndOp/$count?$filter=OrderOperationParentRowID eq 'id-0'", "5")
+			.expectRequest({ // triggered by ODataTreeBinding#_loadSubNodes
+					headers: {"sap-messages": "transientOnly"},
+					requestUri: "C_RSHMaintSchedSmltdOrdAndOp?$filter=OrderOperationParentRowID eq 'id-0'"
+						+ "&$skip=0&$top=2"
+				}, {
+					results: [{
+						__metadata: {uri: "C_RSHMaintSchedSmltdOrdAndOp('id-0.0')"},
+						MaintenanceOrder: "0.0",
+						OrderOperationIsExpanded: "leaf",
+						OrderOperationParentRowID: "id-0",
+						OrderOperationRowID: "id-0.0",
+						OrderOperationRowLevel: 1
+					}, {
+						__metadata: {uri: "C_RSHMaintSchedSmltdOrdAndOp('id-0.1')"},
+						MaintenanceOrder: "0.1",
+						OrderOperationIsExpanded: "leaf",
+						OrderOperationParentRowID: "id-0",
+						OrderOperationRowID: "id-0.1",
+						OrderOperationRowLevel: 1
+					}]
+				});
+
+		return this.createView(assert, sView, oModel).then(() => {
+			oTable = this.oView.byId("table");
+
+			// don't use expectValue to avoid timing issues causing flaky tests
+			assert.deepEqual(getTableContent(oTable), [["0"], ["0.0"]]);
+
+			// code under test
+			oTable.collapseAll();
+
+			return this.waitForChanges(assert, "collapse all nodes");
+		}).then(() => {
+			assert.deepEqual(getTableContent(oTable), [["0"], ["1"]]);
+
+			this.expectRequest({ // triggered by ODataTreeBinding#_loadSubNodes
+					headers: {"sap-messages": "transientOnly"},
+					requestUri: "C_RSHMaintSchedSmltdOrdAndOp?$filter=OrderOperationRowLevel eq 0&$skip=2&$top=4"
+				}, {
+					results: [{
+						__metadata: {uri: "C_RSHMaintSchedSmltdOrdAndOp('id-2')"},
+						MaintenanceOrder: "2",
+						OrderOperationIsExpanded: "collapsed",
+						OrderOperationRowID: "id-2",
+						OrderOperationRowLevel: 0
+					}, {
+						__metadata: {uri: "C_RSHMaintSchedSmltdOrdAndOp('id-3')"},
+						MaintenanceOrder: "3",
+						OrderOperationIsExpanded: "leaf",
+						OrderOperationRowID: "id-3",
+						OrderOperationRowLevel: 0
+					}]
+				});
+
+			// code under test
+			oTable.setFirstVisibleRow(2);
+
+			return this.waitForChanges(assert, "scroll down");
+		}).then(() => {
+			assert.deepEqual(getTableContent(oTable), [["2"], ["3"]]);
+
+			this.expectRequest({ // triggered by ODataTreeBinding#_loadSubTree
+					headers: {"sap-messages": "transientOnly"},
+					requestUri: "C_RSHMaintSchedSmltdOrdAndOp?"
+						+ "$filter=OrderOperationRowID eq 'id-2' and OrderOperationRowLevel le 2"
+				}, {
+					results: [{
+						__metadata: {uri: "C_RSHMaintSchedSmltdOrdAndOp('id-2')"},
+						MaintenanceOrder: "2",
+						OrderOperationIsExpanded: "expanded",
+						OrderOperationRowID: "id-2",
+						OrderOperationRowLevel: 0
+					}, {
+						__metadata: {uri: "C_RSHMaintSchedSmltdOrdAndOp('id-2.0')"},
+						MaintenanceOrder: "2.0",
+						OrderOperationIsExpanded: "leaf",
+						OrderOperationParentRowID: "id-2",
+						OrderOperationRowID: "id-2.0",
+						OrderOperationRowLevel: 1
+					}]
+				});
+
+			return Promise.all([
+				// code under test
+				oTable.getBinding("rows").expandNodeToLevel(2, 2),
+				this.waitForChanges(assert, "expand node to level 2")
+			]);
+		}).then(() => {
+			assert.deepEqual(getTableContent(oTable), [["2"], ["2.0"]]);
+
+			// code under test
+			oTable.setFirstVisibleRow(0);
+
+			return this.waitForChanges(assert, "scroll up again");
+		}).then(() => {
+			assert.deepEqual(getTableContent(oTable), [["0"], ["1"]]);
 		});
 	});
 
@@ -17986,8 +18158,7 @@ ToProduct/ToSupplier/BusinessPartnerID\'}}">\
 		}"\
 		visibleRowCount="3">\
 	<Text id="itemName" text="{ErhaOrderItemName}" />\
-</t:TreeTable>',
-			that = this;
+</t:TreeTable>';
 
 		this.expectHeadRequest()
 			.expectRequest({
@@ -17997,34 +18168,36 @@ ToProduct/ToSupplier/BusinessPartnerID\'}}">\
 			}, {
 				__count : "1",
 				results : [oNode100]
-			})
-			.expectValue("itemName", ["foo", "", ""]);
+			});
 
-		return this.createView(assert, sView, oModel).then(function () {
-			oTable = that.oView.byId("table");
+		return this.createView(assert, sView, oModel).then(() => {
+			oTable = this.oView.byId("table");
 
-			that.expectRequest({
+			// don't use expectValue to avoid timing issues causing flaky tests
+			assert.deepEqual(getTableContent(oTable), [["foo"], [""], [""]]);
+
+			this.expectRequest({
 					batchNo : 2,
 					requestUri : "ErhaOrder('1')/to_Item?$skip=0&$top=103&$inlinecount=allpages"
 						+ "&$filter=HierarchyParentNode eq '100'"
 				}, {
 					__count : "2",
 					results : [oNode200, oNode300]
-				})
-				.expectValue("itemName", ["bar", "baz"], 1);
+				});
 
 			oTable.expand(0);
 
-			return that.waitForChanges(assert);
-		}).then(function () {
+			return this.waitForChanges(assert);
+		}).then(() => {
 			oBinding = oTable.getBinding("rows");
 
-			that.expectRequest({
+			assert.deepEqual(getTableContent(oTable), [["foo"], ["bar"], ["baz"]]);
+
+			this.expectRequest({
 					batchNo : 3,
 					method : "DELETE",
 					requestUri : "ErhaOrderItem(ErhaOrder='1',ErhaOrderItem='300')"
 				}, NO_CONTENT)
-				.expectValue("itemName", "", 2)
 				.expectRequest({
 					batchNo : 4,
 					requestUri : "ErhaOrder('1')/to_Item?$skip=0&$top=1&$inlinecount=allpages"
@@ -18046,10 +18219,11 @@ ToProduct/ToSupplier/BusinessPartnerID\'}}">\
 			oBinding.removeContext(oTable.getContextByIndex(2));
 			oModel.submitChanges();
 
-			return that.waitForChanges(assert);
-		}).then(function () {
-			that.expectValue("itemName", "bar: renamed", 1)
-				.expectRequest({
+			return this.waitForChanges(assert);
+		}).then(() => {
+			assert.deepEqual(getTableContent(oTable), [["foo"], ["bar"], [""]]);
+
+			this.expectRequest({
 					batchNo : 5,
 					data : {
 						__metadata : {uri : "ErhaOrderItem(ErhaOrder='1',ErhaOrderItem='200')"},
@@ -18064,7 +18238,9 @@ ToProduct/ToSupplier/BusinessPartnerID\'}}">\
 			oModel.setProperty("ErhaOrderItemName", "bar: renamed", oTable.getContextByIndex(1));
 			oModel.submitChanges();
 
-			return that.waitForChanges(assert);
+			return this.waitForChanges(assert);
+		}).then(() => {
+			assert.deepEqual(getTableContent(oTable), [["foo"], ["bar: renamed"], [""]]);
 		});
 	});
 });
@@ -18136,8 +18312,7 @@ ToProduct/ToSupplier/BusinessPartnerID\'}}">\
 		}"\
 		visibleRowCount="3">\
 	<Text id="itemName" text="{ErhaOrderItemName}" />\
-</t:TreeTable>',
-			that = this;
+</t:TreeTable>';
 
 		this.expectHeadRequest()
 			.expectRequest({
@@ -18147,34 +18322,36 @@ ToProduct/ToSupplier/BusinessPartnerID\'}}">\
 			}, {
 				__count : "1",
 				results : [oNode100]
-			})
-			.expectValue("itemName", ["foo", "", ""]);
+			});
 
-		return this.createView(assert, sView, oModel).then(function () {
-			oTable = that.oView.byId("table");
+		return this.createView(assert, sView, oModel).then(() => {
+			oTable = this.oView.byId("table");
 
-			that.expectRequest({
+			// don't use expectValue to avoid timing issues causing flaky tests
+			assert.deepEqual(getTableContent(oTable), [["foo"], [""], [""]]);
+
+			this.expectRequest({
 					batchNo : 2,
 					requestUri : "ErhaOrder('1')/to_Item?$skip=0&$top=103&$inlinecount=allpages"
 						+ "&$filter=HierarchyParentNode eq '100'"
 				}, {
 					__count : "2",
 					results : [oNode200, oNode300]
-				})
-				.expectValue("itemName", ["bar", "baz"], 1);
+				});
 
 			oTable.expand(0);
 
-			return that.waitForChanges(assert);
-		}).then(function () {
+			return this.waitForChanges(assert);
+		}).then(() => {
 			oBinding = oTable.getBinding("rows");
 
-			that.expectRequest({
+			assert.deepEqual(getTableContent(oTable), [["foo"], ["bar"], ["baz"]]);
+
+			this.expectRequest({
 					batchNo : 3,
 					method : "DELETE",
 					requestUri : "ErhaOrderItem(ErhaOrder='1',ErhaOrderItem='300')"
 				}, NO_CONTENT)
-				.expectValue("itemName", "", 2)
 				.expectRequest({
 					batchNo : 4,
 					requestUri : "ErhaOrder('1')/to_Item?$skip=0&$top=1&$inlinecount=allpages"
@@ -18196,10 +18373,11 @@ ToProduct/ToSupplier/BusinessPartnerID\'}}">\
 			oBinding.removeContext(oTable.getContextByIndex(2));
 			oBinding.submitChanges();
 
-			return that.waitForChanges(assert);
-		}).then(function () {
-			that.expectValue("itemName", "bar: renamed", 1)
-				.expectRequest({
+			return this.waitForChanges(assert);
+		}).then(() => {
+			assert.deepEqual(getTableContent(oTable), [["foo"], ["bar"], [""]]);
+
+			this.expectRequest({
 					batchNo : 5,
 					data : {
 						__metadata : {uri : "ErhaOrderItem(ErhaOrder='1',ErhaOrderItem='200')"},
@@ -18208,9 +18386,8 @@ ToProduct/ToSupplier/BusinessPartnerID\'}}">\
 					key : "ErhaOrderItem(ErhaOrder='1',ErhaOrderItem='200')",
 					method : "MERGE",
 					requestUri : "ErhaOrderItem(ErhaOrder='1',ErhaOrderItem='200')"
-				}, NO_CONTENT);
-
-			that.expectRequest({
+				}, NO_CONTENT)
+				.expectRequest({
 					batchNo : 6,
 					requestUri : "ErhaOrder('1')/to_Item?$skip=0&$top=1&$inlinecount=allpages"
 						+ "&$filter=HierarchyDistanceFromRoot le 0"
@@ -18231,7 +18408,9 @@ ToProduct/ToSupplier/BusinessPartnerID\'}}">\
 			oModel.setProperty("ErhaOrderItemName", "bar: renamed", oTable.getContextByIndex(1));
 			oBinding.submitChanges();
 
-			return that.waitForChanges(assert);
+			return this.waitForChanges(assert);
+		}).then(() => {
+			assert.deepEqual(getTableContent(oTable), [["foo"], ["bar: renamed"], [""]]);
 		});
 	});
 });
@@ -18298,8 +18477,7 @@ ToProduct/ToSupplier/BusinessPartnerID\'}}">\
 		}"\
 		visibleRowCount="3">\
 	<Text id="itemName" text="{ErhaOrderItemName}" />\
-</t:TreeTable>',
-			that = this;
+</t:TreeTable>';
 
 		this.expectHeadRequest()
 			.expectRequest({
@@ -18309,34 +18487,36 @@ ToProduct/ToSupplier/BusinessPartnerID\'}}">\
 			}, {
 				__count : "1",
 				results : [oNode100]
-			})
-			.expectValue("itemName", ["foo", "", ""]);
+			});
 
-		return this.createView(assert, sView, oModel).then(function () {
-			oTable = that.oView.byId("table");
+		return this.createView(assert, sView, oModel).then(() => {
+			oTable = this.oView.byId("table");
 
-			that.expectRequest({
+			// don't use expectValue to avoid timing issues causing flaky tests
+			assert.deepEqual(getTableContent(oTable), [["foo"], [""], [""]]);
+
+			this.expectRequest({
 					batchNo : 2,
 					requestUri : "ErhaOrder('1')/to_Item?$skip=0&$top=103&$inlinecount=allpages"
 						+ "&$filter=HierarchyParentNode eq '100'"
 				}, {
 					__count : "2",
 					results : [oNode200, oNode300]
-				})
-				.expectValue("itemName", ["bar", "baz"], 1);
+				});
 
 			oTable.expand(0);
 
-			return that.waitForChanges(assert);
-		}).then(function () {
+			return this.waitForChanges(assert);
+		}).then(() => {
 			oBinding = oTable.getBinding("rows");
 
-			that.expectRequest({
+			assert.deepEqual(getTableContent(oTable), [["foo"], ["bar"], ["baz"]]);
+
+			this.expectRequest({
 					batchNo : 3,
 					method : "DELETE",
 					requestUri : "ErhaOrderItem(ErhaOrder='1',ErhaOrderItem='300')"
 				}, NO_CONTENT)
-				.expectValue("itemName", "", 2)
 				.expectRequest({
 					batchNo : 4,
 					requestUri : "ErhaOrder('1')/to_Item?$skip=0&$top=103&$inlinecount=allpages"
@@ -18344,34 +18524,34 @@ ToProduct/ToSupplier/BusinessPartnerID\'}}">\
 				}, {
 					__count : "1",
 					results : [oNode100]
-				})
-				.expectValue("itemName", "", 1); // binding gets refreshed, no restore tree state
+				});
 
 			// code under test: hierarchy change
 			oBinding.removeContext(oTable.getContextByIndex(2));
 			oModel.submitChanges();
 
-			return that.waitForChanges(assert);
-		}).then(function () {
-			oTable = that.oView.byId("table");
+			return this.waitForChanges(assert);
+		}).then(() => {
+			// binding gets refreshed, no restore tree state
+			assert.deepEqual(getTableContent(oTable), [["foo"], [""], [""]]);
 
-			that.expectRequest({
+			this.expectRequest({
 					batchNo : 5,
 					requestUri : "ErhaOrder('1')/to_Item?$skip=0&$top=103&$inlinecount=allpages"
 						+ "&$filter=HierarchyParentNode eq '100'"
 				}, {
 					__count : "1",
 					results : [oNode200]
-				})
-				.expectValue("itemName", "bar", 1);
+				});
 
 			// manually expand the node again
 			oTable.expand(0);
 
-			return that.waitForChanges(assert);
-		}).then(function () {
-			that.expectValue("itemName", "bar: renamed", 1)
-				.expectRequest({
+			return this.waitForChanges(assert);
+		}).then(() => {
+			assert.deepEqual(getTableContent(oTable), [["foo"], ["bar"], [""]]);
+
+			this.expectRequest({
 					batchNo : 6,
 					data : {
 						__metadata : {uri : "ErhaOrderItem(ErhaOrder='1',ErhaOrderItem='200')"},
@@ -18386,7 +18566,9 @@ ToProduct/ToSupplier/BusinessPartnerID\'}}">\
 			oModel.setProperty("ErhaOrderItemName", "bar: renamed", oTable.getContextByIndex(1));
 			oModel.submitChanges();
 
-			return that.waitForChanges(assert);
+			return this.waitForChanges(assert);
+		}).then(() => {
+			assert.deepEqual(getTableContent(oTable), [["foo"], ["bar: renamed"], [""]]);
 		});
 	});
 
@@ -18453,8 +18635,7 @@ ToProduct/ToSupplier/BusinessPartnerID\'}}">\
 		}"\
 		visibleRowCount="3">\
 	<Text id="itemName" text="{ErhaOrderItemName}" />\
-</t:TreeTable>',
-			that = this;
+</t:TreeTable>';
 
 		this.expectHeadRequest()
 			.expectRequest({
@@ -18464,34 +18645,36 @@ ToProduct/ToSupplier/BusinessPartnerID\'}}">\
 			}, {
 				__count : "1",
 				results : [oNode100]
-			})
-			.expectValue("itemName", ["foo", "", ""]);
+			});
 
-		return this.createView(assert, sView, oModel).then(function () {
-			oTable = that.oView.byId("table");
+		return this.createView(assert, sView, oModel).then(() => {
+			oTable = this.oView.byId("table");
 
-			that.expectRequest({
+			// don't use expectValue to avoid timing issues causing flaky tests
+			assert.deepEqual(getTableContent(oTable), [["foo"], [""], [""]]);
+
+			this.expectRequest({
 					batchNo : 2,
 					requestUri : "ErhaOrder('1')/to_Item?$skip=0&$top=103&$inlinecount=allpages"
 						+ "&$filter=HierarchyParentNode eq '100'"
 				}, {
 					__count : "2",
 					results : [oNode200, oNode300]
-				})
-				.expectValue("itemName", ["bar", "baz"], 1);
+				});
 
 			oTable.expand(0);
 
-			return that.waitForChanges(assert);
-		}).then(function () {
+			return this.waitForChanges(assert);
+		}).then(() => {
 			oBinding = oTable.getBinding("rows");
 
-			that.expectRequest({
+			assert.deepEqual(getTableContent(oTable), [["foo"], ["bar"], ["baz"]]);
+
+			this.expectRequest({
 					batchNo : 3,
 					method : "DELETE",
 					requestUri : "ErhaOrderItem(ErhaOrder='1',ErhaOrderItem='300')"
 				}, NO_CONTENT)
-				.expectValue("itemName", "", 2)
 				.expectRequest({
 					batchNo : 4,
 					requestUri : "ErhaOrder('1')/to_Item?$skip=0&$top=103&$inlinecount=allpages"
@@ -18499,34 +18682,34 @@ ToProduct/ToSupplier/BusinessPartnerID\'}}">\
 				}, {
 					__count : "1",
 					results : [oNode100]
-				})
-				.expectValue("itemName", "", 1); // binding gets refreshed, no restore tree state
+				});
 
 			// code under test: hierarchy change
 			oBinding.removeContext(oTable.getContextByIndex(2));
 			oBinding.submitChanges();
 
-			return that.waitForChanges(assert);
-		}).then(function () {
-			oTable = that.oView.byId("table");
+			return this.waitForChanges(assert);
+		}).then(() => {
+			// binding gets refreshed, no restore tree state
+			assert.deepEqual(getTableContent(oTable), [["foo"], [""], [""]]);
 
-			that.expectRequest({
+			this.expectRequest({
 					batchNo : 5,
 					requestUri : "ErhaOrder('1')/to_Item?$skip=0&$top=103&$inlinecount=allpages"
 						+ "&$filter=HierarchyParentNode eq '100'"
 				}, {
 					__count : "1",
 					results : [oNode200]
-				})
-				.expectValue("itemName", "bar", 1);
+				});
 
 			// manually expand the node again
 			oTable.expand(0);
 
-			return that.waitForChanges(assert);
-		}).then(function () {
-			that.expectValue("itemName", "bar: renamed", 1)
-				.expectRequest({
+			return this.waitForChanges(assert);
+		}).then(() => {
+			assert.deepEqual(getTableContent(oTable), [["foo"], ["bar"], [""]]);
+
+			this.expectRequest({
 					batchNo : 6,
 					data : {
 						__metadata : {uri : "ErhaOrderItem(ErhaOrder='1',ErhaOrderItem='200')"},
@@ -18535,24 +18718,24 @@ ToProduct/ToSupplier/BusinessPartnerID\'}}">\
 					key : "ErhaOrderItem(ErhaOrder='1',ErhaOrderItem='200')",
 					method : "MERGE",
 					requestUri : "ErhaOrderItem(ErhaOrder='1',ErhaOrderItem='200')"
-				}, NO_CONTENT);
-
-				that.expectRequest({
-						batchNo : 7,
-						requestUri : "ErhaOrder('1')/to_Item?$skip=0&$top=103&$inlinecount=allpages"
-							+ "&$filter=HierarchyDistanceFromRoot le 0"
-					}, {
-						__count : "1",
-						results : [oNode100]
-					})
-					// binding gets refreshed, no restore tree state
-					.expectValue("itemName", "", 1);
+				}, NO_CONTENT)
+				.expectRequest({
+					batchNo : 7,
+					requestUri : "ErhaOrder('1')/to_Item?$skip=0&$top=103&$inlinecount=allpages"
+						+ "&$filter=HierarchyDistanceFromRoot le 0"
+				}, {
+					__count : "1",
+					results : [oNode100]
+				});
 
 			// code under test: property change
 			oModel.setProperty("ErhaOrderItemName", "bar: renamed", oTable.getContextByIndex(1));
 			oBinding.submitChanges();
 
-			return that.waitForChanges(assert);
+			return this.waitForChanges(assert);
+		}).then(() => {
+			// binding gets refreshed, no restore tree state
+			assert.deepEqual(getTableContent(oTable), [["foo"], [""], [""]]);
 		});
 	});
 
@@ -18615,8 +18798,7 @@ ToProduct/ToSupplier/BusinessPartnerID\'}}">\
 		}"\
 		visibleRowCount="3">\
 	<Text id="itemName" text="{ErhaOrderItemName}" />\
-</t:TreeTable>',
-			that = this;
+</t:TreeTable>';
 
 		this.expectHeadRequest()
 			.expectRequest({
@@ -18626,48 +18808,50 @@ ToProduct/ToSupplier/BusinessPartnerID\'}}">\
 			}, {
 				__count : "1",
 				results : [oNode100]
-			})
-			.expectValue("itemName", ["foo", "", ""]);
+			});
 
-		return this.createView(assert, sView, oModel).then(function () {
-			oTable = that.oView.byId("table");
+		return this.createView(assert, sView, oModel).then(() => {
+			oTable = this.oView.byId("table");
 
-			that.expectRequest({
+			// don't use expectValue to avoid timing issues causing flaky tests
+			assert.deepEqual(getTableContent(oTable), [["foo"], [""], [""]]);
+
+			this.expectRequest({
 					batchNo : 2,
 					requestUri : "ErhaOrder('1')/to_Item?$skip=0&$top=103&$inlinecount=allpages"
 						+ "&$filter=HierarchyParentNode eq '100'"
 				}, {
 					__count : "1",
 					results : [oNode200]
-				})
-				.expectValue("itemName", "bar", 1);
+				});
 
 			oTable.expand(0);
 
-			return that.waitForChanges(assert);
-		}).then(function () {
-			oTable = that.oView.byId("table");
+			return this.waitForChanges(assert);
+		}).then(() => {
+			assert.deepEqual(getTableContent(oTable), [["foo"], ["bar"], [""]]);
 
-			that.expectRequest({
+			this.expectRequest({
 					batchNo : 3,
 					requestUri : "ErhaOrder('1')/to_Item?$skip=0&$top=103&$inlinecount=allpages"
 						+ "&$filter=HierarchyParentNode eq '200'"
 				}, {
 					__count : "1",
 					results : [oNode300]
-				})
-				.expectValue("itemName", "baz", 2);
+				});
 
 			oTable.expand(1);
 
-			return that.waitForChanges(assert);
-		}).then(function () {
+			return this.waitForChanges(assert);
+		}).then(() => {
 			var oMoveContext = oTable.getContextByIndex(2),
 				oParentContext = oTable.getContextByIndex(0);
 
 			oBinding = oTable.getBinding("rows");
 
-			that.expectRequest({
+			assert.deepEqual(getTableContent(oTable), [["foo"], ["bar"], ["baz"]]);
+
+			this.expectRequest({
 					batchNo : 4,
 					data : {
 						__metadata : {uri : "ErhaOrderItem(ErhaOrder='1',ErhaOrderItem='300')"},
@@ -18677,7 +18861,6 @@ ToProduct/ToSupplier/BusinessPartnerID\'}}">\
 					method : "MERGE",
 					requestUri : "ErhaOrderItem(ErhaOrder='1',ErhaOrderItem='300')"
 				}, NO_CONTENT)
-				.expectValue("itemName", ["baz", "bar"], 1)
 				.expectRequest({
 					batchNo : 4,
 					requestUri : "ErhaOrder('1')/to_Item?$skip=0&$top=103&$inlinecount=allpages"
@@ -18685,35 +18868,35 @@ ToProduct/ToSupplier/BusinessPartnerID\'}}">\
 				}, {
 					__count : "1",
 					results : [oNode100]
-				})
-				.expectValue("itemName", ["", ""], 1); // binding gets refreshed
+				}); // binding gets refreshed
 
 			// code under test: hierarchy change
 			oBinding.removeContext(oMoveContext);
 			oBinding.addContexts(oParentContext, [oMoveContext]);
 			oModel.submitChanges();
 
-			return that.waitForChanges(assert);
-		}).then(function () {
-			oTable = that.oView.byId("table");
+			return this.waitForChanges(assert);
+		}).then(() => {
+			// binding gets refreshed
+			assert.deepEqual(getTableContent(oTable), [["foo"], [""], [""]]);
 
-			that.expectRequest({
+			this.expectRequest({
 					batchNo : 5,
 					requestUri : "ErhaOrder('1')/to_Item?$skip=0&$top=103&$inlinecount=allpages"
 						+ "&$filter=HierarchyParentNode eq '100'"
 				}, {
 					__count : "1",
 					results : [oNode200]
-				})
-				.expectValue("itemName", "bar", 1);
+				});
 
 			// manually expand the node again
 			oTable.expand(0);
 
-			return that.waitForChanges(assert);
-		}).then(function () {
-			that.expectValue("itemName", "bar: renamed", 1)
-				.expectRequest({
+			return this.waitForChanges(assert);
+		}).then(() => {
+			assert.deepEqual(getTableContent(oTable), [["foo"], ["bar"], [""]]);
+
+			this.expectRequest({
 					batchNo : 6,
 					data : {
 						__metadata : {uri : "ErhaOrderItem(ErhaOrder='1',ErhaOrderItem='200')"},
@@ -18730,15 +18913,16 @@ ToProduct/ToSupplier/BusinessPartnerID\'}}">\
 				}, {
 					__count : "1",
 					results : [oNode100]
-				})
-				// binding gets refreshed, no restore tree state
-				.expectValue("itemName", "", 1);
+				});
 
 			// code under test: property change
 			oModel.setProperty("ErhaOrderItemName", "bar: renamed", oTable.getContextByIndex(1));
 			oModel.submitChanges();
 
-			return that.waitForChanges(assert);
+			return this.waitForChanges(assert);
+		}).then(() => {
+			// binding gets refreshed, no restore tree state
+			assert.deepEqual(getTableContent(oTable), [["foo"], [""], [""]]);
 		});
 	});
 
@@ -18879,8 +19063,7 @@ ToProduct/ToSupplier/BusinessPartnerID\'}}">\
 		}"\
 		visibleRowCount="4">\
 	<Text id="itemName" text="{ErhaOrderItemName}" />\
-</t:TreeTable>',
-			that = this;
+</t:TreeTable>';
 
 		this.expectHeadRequest()
 			.expectRequest({
@@ -18890,34 +19073,34 @@ ToProduct/ToSupplier/BusinessPartnerID\'}}">\
 			}, {
 				__count : "1",
 				results : [oNode100]
-			})
-			.expectValue("itemName", ["foo", "", "", ""]);
+			});
 
-		return this.createView(assert, sView, oModel).then(function () {
-			oTable = that.oView.byId("table");
+		return this.createView(assert, sView, oModel).then(() => {
+			oTable = this.oView.byId("table");
 			oBinding = oTable.getBinding("rows");
 
-			that.expectRequest({
+			// don't use expectValue to avoid timing issues causing flaky tests
+			assert.deepEqual(getTableContent(oTable), [["foo"], [""], [""], [""]]);
+
+			this.expectRequest({
 					batchNo : 2,
 					requestUri : "ErhaOrder('1')/to_Item?$skip=0&$top=104&$inlinecount=allpages"
 						+ "&$filter=HierarchyParentNode eq '100'"
 				}, {
 					__count : "2",
 					results : [oNode200, oNode300]
-				})
-				.expectValue("itemName", ["bar", "baz"], 1);
+				});
 
 			oTable.expand(0);
 
-			return that.waitForChanges(assert);
-		}).then(function () {
+			return this.waitForChanges(assert);
+		}).then(() => {
 			var oCreatedContext, oExpectedEntry;
 
+			assert.deepEqual(getTableContent(oTable), [["foo"], ["bar"], ["baz"], [""]]);
 			assert.strictEqual(oModel.hasPendingChanges(), false);
 			assert.deepEqual(oModel.getPendingChanges(), {});
 
-			that.expectValue("itemName", ["qux", "bar", "baz"], 1);
-
 			// code under test: add node
 			oCreatedContext = oBinding.createEntry({properties : {ErhaOrderItemName : "qux"}});
 			oBinding.addContexts(oTable.getContextByIndex(0), [oCreatedContext]);
@@ -18932,9 +19115,9 @@ ToProduct/ToSupplier/BusinessPartnerID\'}}">\
 				assert.deepEqual(oPendingChanges[sKey], oExpectedEntry);
 			}
 
-			return that.waitForChanges(assert);
-		}).then(function () {
-			that.expectValue("itemName", ["bar", "baz", ""], 1);
+			return this.waitForChanges(assert);
+		}).then(() => {
+			assert.deepEqual(getTableContent(oTable), [["foo"], ["qux"], ["bar"], ["baz"]]);
 
 			// code under test: reset added node
 			oModel.resetChanges();
@@ -18942,11 +19125,11 @@ ToProduct/ToSupplier/BusinessPartnerID\'}}">\
 			assert.strictEqual(oModel.hasPendingChanges(), false);
 			assert.deepEqual(oModel.getPendingChanges(), {});
 
-			return that.waitForChanges(assert);
-		}).then(function () {
+			return this.waitForChanges(assert);
+		}).then(() => {
 			var oMovedContext = oTable.getContextByIndex(2);
 
-			that.expectValue("itemName", "", 2);
+			assert.deepEqual(getTableContent(oTable), [["foo"], ["bar"], ["baz"], [""]]);
 
 			// code under test: move node
 			oBinding.removeContext(oMovedContext);
@@ -18960,9 +19143,9 @@ ToProduct/ToSupplier/BusinessPartnerID\'}}">\
 				assert.deepEqual(oPendingChanges[sKey], {HierarchyParentNode : "200"});
 			}
 
-			return that.waitForChanges(assert);
-		}).then(function () {
-			that.expectValue("itemName", "baz", 2);
+			return this.waitForChanges(assert);
+		}).then(() => {
+			assert.deepEqual(getTableContent(oTable), [["foo"], ["bar"], [""], [""]]);
 
 			// code under test: reset moved node
 			oModel.resetChanges();
@@ -18970,11 +19153,11 @@ ToProduct/ToSupplier/BusinessPartnerID\'}}">\
 			assert.strictEqual(oModel.hasPendingChanges(), false);
 			assert.deepEqual(oModel.getPendingChanges(), {});
 
-			return that.waitForChanges(assert);
-		}).then(function () {
+			return this.waitForChanges(assert);
+		}).then(() => {
 			var oRemovedContext = oTable.getContextByIndex(2);
 
-			that.expectValue("itemName", "", 2);
+			assert.deepEqual(getTableContent(oTable), [["foo"], ["bar"], ["baz"], [""]]);
 
 			// code under test: remove node
 			oBinding.removeContext(oRemovedContext);
@@ -18987,9 +19170,9 @@ ToProduct/ToSupplier/BusinessPartnerID\'}}">\
 				assert.deepEqual(oPendingChanges[sKey], {});
 			}
 
-			return that.waitForChanges(assert);
-		}).then(function () {
-			that.expectValue("itemName", "baz", 2);
+			return this.waitForChanges(assert);
+		}).then(() => {
+			assert.deepEqual(getTableContent(oTable), [["foo"], ["bar"], [""], [""]]);
 
 			// code under test: reset removed node
 			oModel.resetChanges();
@@ -18997,9 +19180,9 @@ ToProduct/ToSupplier/BusinessPartnerID\'}}">\
 			assert.strictEqual(oModel.hasPendingChanges(), false);
 			assert.deepEqual(oModel.getPendingChanges(), {});
 
-			return that.waitForChanges(assert);
-		}).then(function () {
-			that.expectValue("itemName", ["qux2", "bar", "baz"], 1);
+			return this.waitForChanges(assert);
+		}).then(() => {
+			assert.deepEqual(getTableContent(oTable), [["foo"], ["bar"], ["baz"], [""]]);
 
 			// code under test: cancelled creation (add)
 			oCancelledContext = oBinding.createEntry({properties : {ErhaOrderItemName : "qux2"}});
@@ -19007,9 +19190,9 @@ ToProduct/ToSupplier/BusinessPartnerID\'}}">\
 
 			// #hasPendingChanges and #getPendingChanges tested in "added case"
 
-			return that.waitForChanges(assert);
-		}).then(function () {
-			that.expectValue("itemName", ["bar", "baz", ""], 1);
+			return this.waitForChanges(assert);
+		}).then(() => {
+			assert.deepEqual(getTableContent(oTable), [["foo"], ["qux2"], ["bar"], ["baz"]]);
 
 			// code under test: cancelled creation (remove)
 			oBinding.removeContext(oCancelledContext);
@@ -19020,7 +19203,9 @@ ToProduct/ToSupplier/BusinessPartnerID\'}}">\
 			// code under test: no request as created entry has been removed again
 			oModel.submitChanges();
 
-			return that.waitForChanges(assert);
+			return this.waitForChanges(assert);
+		}).then(() => {
+			assert.deepEqual(getTableContent(oTable), [["foo"], ["bar"], ["baz"], [""]]);
 		});
 	});
 
@@ -19043,8 +19228,7 @@ ToProduct/ToSupplier/BusinessPartnerID\'}}">\
 		}"\
 		visibleRowCount="3">\
 	<Text id="itemName" text="{ErhaOrderItemName}" />\
-</t:TreeTable>',
-			that = this;
+</t:TreeTable>';
 
 		this.expectHeadRequest()
 			.expectRequest({
@@ -19102,30 +19286,30 @@ ToProduct/ToSupplier/BusinessPartnerID\'}}">\
 					HierarchyPreorderRank : 3,
 					HierarchySiblingRank : 2
 				}]
-			})
-			.expectValue("itemName", ["099", "100", "110"]);
+			});
 
-		return this.createView(assert, sView, oModel).then(function () {
-			oTable = that.oView.byId("table");
+		return this.createView(assert, sView, oModel).then(() => {
+			oTable = this.oView.byId("table");
 			oBinding = oTable.getBinding("rows");
 
+			// don't use expectValue to avoid timing issues causing flaky tests
+			assert.deepEqual(getTableContent(oTable), [["099"], ["100"], ["110"]]);
 			assert.strictEqual(oBinding.isExpanded(1), true, "row 2 expanded");
 			assert.strictEqual(oBinding.isExpanded(3), false, "row 4 collapsed");
 			assert.strictEqual(oBinding.getLength(), 4, "initial binding length is 3");
 
-			return that.waitForChanges(assert);
-		}).then(function () {
-			that.expectValue("itemName", "200", 2);
-
+			return this.waitForChanges(assert);
+		}).then(() => {
 			// code under test
 			oBinding.collapse(1);
 
 			assert.strictEqual(oBinding.getLength(), 3,
 				"first collapse reduces binding length to 3");
 
-			return that.waitForChanges(assert);
-		}).then(function () {
-			that.expectRequest({
+			return this.waitForChanges(assert);
+		}).then(() => {
+			assert.deepEqual(getTableContent(oTable), [["099"], ["100"], ["200"]]);
+			this.expectRequest({
 					batchNo : 2,
 					requestUri : "ErhaOrder('1')/to_Item?$skip=0&$top=103&$inlinecount=allpages&"
 						+ "$filter=HierarchyParentNode eq '200'"
@@ -19149,8 +19333,9 @@ ToProduct/ToSupplier/BusinessPartnerID\'}}">\
 			// code under test
 			oBinding.expand(2);
 
-			return that.waitForChanges(assert);
-		}).then(function () {
+			return this.waitForChanges(assert);
+		}).then(() => {
+			assert.deepEqual(getTableContent(oTable), [["099"], ["100"], ["200"]]);
 			assert.strictEqual(oBinding.isExpanded(2), true, "row 2 expanded");
 			assert.strictEqual(oBinding.getLength(), 4,
 				"expand of row 2 increases binding length to 4");
@@ -19177,8 +19362,7 @@ ToProduct/ToSupplier/BusinessPartnerID\'}}">\
 		}"\
 		visibleRowCount="2">\
 	<Text id="itemName" text="{ErhaOrderItemName}" />\
-</t:TreeTable>',
-			that = this;
+</t:TreeTable>';
 
 		this.expectHeadRequest()
 			.expectRequest({
@@ -19200,13 +19384,15 @@ ToProduct/ToSupplier/BusinessPartnerID\'}}">\
 					HierarchyPreorderRank : 0,
 					HierarchySiblingRank : 0
 				}]
-			})
-			.expectValue("itemName", ["foo", ""]);
+			});
 
-		return this.createView(assert, sView, oModel).then(function () {
-			oTable = that.oView.byId("table");
+		return this.createView(assert, sView, oModel).then(() => {
+			oTable = this.oView.byId("table");
 			oBinding = oTable.getBinding("rows");
 
+			// don't use expectValue to avoid timing issues causing flaky tests
+			assert.deepEqual(getTableContent(oTable), [["foo"], [""]]);
+
 			// code under test: add node
 			oCreatedContext = oBinding.createEntry({
 				properties : {ErhaOrderItemName : "bar", HierarchyNode : "~key~"}});
@@ -19214,18 +19400,18 @@ ToProduct/ToSupplier/BusinessPartnerID\'}}">\
 
 			assert.strictEqual(oBinding.isExpanded(0), false);
 
-			return that.waitForChanges(assert);
-		}).then(function () {
-			that.expectValue("itemName", ["bar"], 1);
-
+			return this.waitForChanges(assert);
+		}).then(() => {
 			// code under test
 			oTable.expand(0);
 
 			assert.strictEqual(oBinding.isExpanded(0), true);
 
-			return that.waitForChanges(assert);
-		}).then(function () {
-			that.expectRequest({ // POST for entity creation
+			return this.waitForChanges(assert);
+		}).then(() => {
+			assert.deepEqual(getTableContent(oTable), [["foo"], ["bar"]]);
+
+			this.expectRequest({ // POST for entity creation
 					batchNo : 2,
 					created : true,
 					data : {
@@ -19317,13 +19503,198 @@ ToProduct/ToSupplier/BusinessPartnerID\'}}">\
 
 			return Promise.all([
 				oCreatedContext.created(),
-				that.waitForChanges(assert)
+				this.waitForChanges(assert)
 			]);
 		}).then(function () {
+			assert.deepEqual(getTableContent(oTable), [["foo"], ["bar"]]);
 			assert.strictEqual(oBinding.isExpanded(0), true, "expanded state is restored");
 		});
 	});
 
+	//*********************************************************************************************
+	// Scenario: All read requests of the ODataTreeBindingFlat, consider "transitionMessagesOnly" parameter.
+	// JIRA: CPOUI5MODELS-1437
+	QUnit.test("ODataTreeBindingFlat: transitionMessagesOnly", function (assert) {
+		const oModel = createHierarchyMaintenanceModel();
+		let oTable;
+		const sView = '\
+<t:TreeTable id="table"\
+		rows="{\
+			parameters: {countMode: \'Inline\', numberOfExpandedLevels: 1, transitionMessagesOnly: true},\
+			path: \'/ErhaOrder(\\\'1\\\')/to_Item\'\
+		}"\
+		visibleRowCount="4">\
+	<Text id="itemName" text="{ErhaOrderItemName}" />\
+</t:TreeTable>';
+
+		this.expectHeadRequest()
+			.expectRequest({ // triggered by ODataTreeBindingFlat#_requestServerIndexNodes
+				batchNo: 1,
+				headers: {"sap-messages": "transientOnly"},
+				requestUri: "ErhaOrder('1')/to_Item?$skip=0&$top=104&$inlinecount=allpages"
+					+ "&$filter=HierarchyDistanceFromRoot le 1"
+			}, {
+				__count: "4",
+				results: [{
+					__metadata: {uri: "ErhaOrderItem(ErhaOrder='1',ErhaOrderItem='0')"},
+					ErhaOrder: "1",
+					ErhaOrderItem: "0",
+					ErhaOrderItemName: "0",
+					HierarchyParentNode: "",
+					HierarchyDescendantCount: 0,
+					HierarchyDistanceFromRoot: 0,
+					HierarchyDrillState: "leaf",
+					HierarchyNode: "0",
+					HierarchyPreorderRank: 0,
+					HierarchySiblingRank: 0
+				}, {
+					__metadata: {uri: "ErhaOrderItem(ErhaOrder='1',ErhaOrderItem='1')"},
+					ErhaOrder: "1",
+					ErhaOrderItem: "1",
+					ErhaOrderItemName: "1",
+					HierarchyParentNode: "",
+					HierarchyDescendantCount: 2,
+					HierarchyDistanceFromRoot: 0,
+					HierarchyDrillState: "expanded",
+					HierarchyNode: "1",
+					HierarchyPreorderRank: 1,
+					HierarchySiblingRank: 1
+				}, {
+					__metadata: {uri: "ErhaOrderItem(ErhaOrder='1',ErhaOrderItem='1.0')"},
+					ErhaOrder: "1",
+					ErhaOrderItem: "1.0",
+					ErhaOrderItemName: "1.0",
+					HierarchyParentNode: "1",
+					HierarchyDescendantCount: 0,
+					HierarchyDistanceFromRoot: 1,
+					HierarchyDrillState: "collapsed",
+					HierarchyNode: "1.0",
+					HierarchyPreorderRank: 2,
+					HierarchySiblingRank: 0
+				}, {
+					__metadata: {uri: "ErhaOrderItem(ErhaOrder='1',ErhaOrderItem='1.1')"},
+					ErhaOrder: "1",
+					ErhaOrderItem: "1.1",
+					ErhaOrderItemName: "1.1",
+					HierarchyParentNode: "1",
+					HierarchyDescendantCount: 0,
+					HierarchyDistanceFromRoot: 1,
+					HierarchyDrillState: "leaf",
+					HierarchyNode: "1.1",
+					HierarchyPreorderRank: 3,
+					HierarchySiblingRank: 1
+				}]
+			});
+
+		return this.createView(assert, sView, oModel).then(() => {
+			oTable = this.oView.byId("table");
+
+			// don't use expectValue to avoid timing issues causing flaky tests
+			assert.deepEqual(getTableContent(oTable), [["0"], ["1"], ["1.0"], ["1.1"]]);
+
+			this.expectRequest({ // triggered by ODataTreeBindingFlat#_requestChildren
+					batchNo: 2,
+					headers: {"sap-messages": "transientOnly"},
+					requestUri: "ErhaOrder('1')/to_Item?$skip=0&$top=104&$inlinecount=allpages"
+						+ "&$filter=HierarchyParentNode eq '1.0'"
+				}, {
+					__count: "1",
+					results: [{
+						__metadata: {uri: "ErhaOrderItem(ErhaOrder='1',ErhaOrderItem='1.0.0')"},
+						ErhaOrder: "1",
+						ErhaOrderItem: "1.0.0",
+						ErhaOrderItemName: "1.0.0",
+						HierarchyParentNode: "1.0",
+						HierarchyDescendantCount: 0,
+						HierarchyDistanceFromRoot: 2,
+						HierarchyDrillState: "leaf",
+						HierarchyNode: "1.0.0",
+						HierarchyPreorderRank: 0,
+						HierarchySiblingRank: 0
+					}]
+				});
+
+			// code under test
+			oTable.expand(2);
+
+			return this.waitForChanges(assert, "expand node '1.0'");
+		}).then(() => {
+			assert.deepEqual(getTableContent(oTable), [["0"], ["1"], ["1.0"], ["1.0.0"]]);
+
+			// code under test
+			oTable.collapse(1);
+
+			return this.waitForChanges(assert, "collapse node '1'");
+		}).then(() => {
+			assert.deepEqual(getTableContent(oTable), [["0"], ["1"], [""], [""]]);
+
+			this.expectRequest({ // triggered by ODataTreeBindingFlat#_requestSubTree
+				batchNo: 3,
+				headers: {"sap-messages": "transientOnly"},
+				requestUri: "ErhaOrder('1')/to_Item?$filter=HierarchyNode eq '1' and HierarchyDistanceFromRoot le 2"
+			}, {
+				__count: "3",
+				results: [{
+					__metadata: {uri: "ErhaOrderItem(ErhaOrder='1',ErhaOrderItem='1')"},
+					ErhaOrder: "1",
+					ErhaOrderItem: "1",
+					ErhaOrderItemName: "1",
+					HierarchyParentNode: "",
+					HierarchyDescendantCount: 3,
+					HierarchyDistanceFromRoot: 0,
+					HierarchyDrillState: "expanded",
+					HierarchyNode: "1",
+					HierarchyPreorderRank: 1,
+					HierarchySiblingRank: 1
+				}, {
+					__metadata: {uri: "ErhaOrderItem(ErhaOrder='1',ErhaOrderItem='1.0')"},
+					ErhaOrder: "1",
+					ErhaOrderItem: "1.0",
+					ErhaOrderItemName: "1.0",
+					HierarchyParentNode: "1",
+					HierarchyDescendantCount: 1,
+					HierarchyDistanceFromRoot: 1,
+					HierarchyDrillState: "expanded",
+					HierarchyNode: "1.0",
+					HierarchyPreorderRank: 2,
+					HierarchySiblingRank: 0
+				}, {
+					__metadata: {uri: "ErhaOrderItem(ErhaOrder='1',ErhaOrderItem='1.0.0')"},
+					ErhaOrder: "1",
+					ErhaOrderItem: "1.0.0",
+					ErhaOrderItemName: "1.0.0",
+					HierarchyParentNode: "1.0",
+					HierarchyDescendantCount: 0,
+					HierarchyDistanceFromRoot: 2,
+					HierarchyDrillState: "leaf",
+					HierarchyNode: "1.0.0",
+					HierarchyPreorderRank: 0,
+					HierarchySiblingRank: 0
+				}, {
+					__metadata: {uri: "ErhaOrderItem(ErhaOrder='1',ErhaOrderItem='1.1')"},
+					ErhaOrder: "1",
+					ErhaOrderItem: "1.1",
+					ErhaOrderItemName: "1.1",
+					HierarchyParentNode: "1",
+					HierarchyDescendantCount: 0,
+					HierarchyDistanceFromRoot: 1,
+					HierarchyDrillState: "leaf",
+					HierarchyNode: "1.1",
+					HierarchyPreorderRank: 3,
+					HierarchySiblingRank: 1
+				}]
+			});
+
+			return Promise.all([
+				// code under test
+				oTable.getBinding("rows").expandNodeToLevel(1, 2),
+				this.waitForChanges(assert, "expand node '1' to level 2")
+			]);
+		}).then(() => {
+			assert.deepEqual(getTableContent(oTable), [["0"], ["1"], ["1.0"], ["1.0.0"]]);
+		});
+	});
+
 	//*********************************************************************************************
 	// Scenario: A table has an inactive created entity. After rebinding the table and activating
 	// this inactive entity, the createActivate-event of the ODataListBinding is properly handled.
@@ -20079,7 +20450,7 @@ ToProduct/ToSupplier/BusinessPartnerID\'}}">\
 				]
 			})
 			.expectValue("SalesOrderID", ["1", "2"])
-			.expectValue("CreatedAt", ["Jan 25, 2023, 12:00:00 AM", "Jan 29, 2023, 11:00:00 PM"]);
+			.expectValue("CreatedAt", ["Jan 25, 2023, 12:00:00\u202FAM", "Jan 29, 2023, 11:00:00\u202FPM"]);
 
 		return this.createView(assert, sView, mModels).then(function () {
 			that.oView.byId("DateRangeSelection").setValue("Jan 30, 2023 - Jan 31, 2023");
@@ -20087,7 +20458,7 @@ ToProduct/ToSupplier/BusinessPartnerID\'}}">\
 			return that.waitForChanges(assert);
 		}).then(function () {
 			that.expectValue("SalesOrderID", ["3"])
-				.expectValue("CreatedAt", ["Jan 31, 2023, 11:00:00 PM"]);
+				.expectValue("CreatedAt", ["Jan 31, 2023, 11:00:00\u202FPM"]);
 
 			// code under test
 			that.oView.byId("Table").getBinding("items").filter(new Filter({
@@ -20453,8 +20824,7 @@ ToProduct/ToSupplier/BusinessPartnerID\'}}">\
 		}"\
 		visibleRowCount="4">\
 	<Text id="itemName" text="{ErhaOrderItemName}" />\
-</t:TreeTable>',
-			that = this;
+</t:TreeTable>';
 
 		this.expectHeadRequest()
 			.expectRequest({
@@ -20465,13 +20835,15 @@ ToProduct/ToSupplier/BusinessPartnerID\'}}">\
 			}, {
 				__count : "1",
 				results : [oNode050]
-			})
-			.expectValue("itemName", ["node050", "", "", ""]);
+			});
 
-		return this.createView(assert, sView, oModel).then(function () {
-			oTable = that.oView.byId("table");
+		return this.createView(assert, sView, oModel).then(() => {
+			oTable = this.oView.byId("table");
 
-			that.expectRequest({
+			// don't use expectValue to avoid timing issues causing flaky tests
+			assert.deepEqual(getTableContent(oTable), [["node050"], [""], [""], [""]]);
+
+			this.expectRequest({
 					batchNo : 2,
 					requestUri : "ErhaOrder('1')/to_Item?$skip=0&$top=104&$inlinecount=allpages"
 						+ "&$filter=HierarchyDistanceFromRoot le 0"
@@ -20479,8 +20851,7 @@ ToProduct/ToSupplier/BusinessPartnerID\'}}">\
 				}, {
 					__count : "1",
 					results : [oNode100]
-				})
-				.expectValue("itemName", ["node100"], 0);
+				});
 
 			// code under test
 			oTable.getBinding("rows").filter([
@@ -20488,9 +20859,11 @@ ToProduct/ToSupplier/BusinessPartnerID\'}}">\
 				new Filter("CreatedByUser", FilterOperator.EQ, "user3")
 			], FilterType.Application);
 
-			return that.waitForChanges(assert);
-		}).then(function () {
-			that.expectRequest({
+			return this.waitForChanges(assert);
+		}).then(() => {
+			assert.deepEqual(getTableContent(oTable), [["node100"], [""], [""], [""]]);
+
+			this.expectRequest({
 					batchNo : 3,
 					requestUri : "ErhaOrder('1')/to_Item?$skip=0&$top=104&$inlinecount=allpages"
 						+ "&$filter=HierarchyParentNode eq '100'"
@@ -20498,27 +20871,29 @@ ToProduct/ToSupplier/BusinessPartnerID\'}}">\
 				}, {
 					__count : "2",
 					results : [oNode200, oNode300]
-				})
-				.expectValue("itemName", ["node200", "node300"], 1);
+				});
 
 			oTable.expand(0);
 
-			return that.waitForChanges(assert);
-		}).then(function () {
-			that.expectRequest({
+			return this.waitForChanges(assert);
+		}).then(() => {
+			assert.deepEqual(getTableContent(oTable), [["node100"], ["node200"], ["node300"], [""]]);
+
+			this.expectRequest({
 					batchNo : 4,
 					requestUri : "ErhaOrder('1')/to_Item?$skip=0&$top=104&$inlinecount=allpages"
 						+ "&$filter=HierarchyDistanceFromRoot le 0"
 				}, {
 					__count : "2",
 					results : [oNode050, oNode100NoFilter]
-				})
-				.expectValue("itemName", ["node050", "node100", ""]);
+				});
 
 			// code under test
 			oTable.getBinding("rows").filter([], FilterType.Application);
 
-			return that.waitForChanges(assert);
+			return this.waitForChanges(assert);
+		}).then(() => {
+			assert.deepEqual(getTableContent(oTable), [["node050"], ["node100"], [""], [""]]);
 		});
 	});
 
@@ -20814,11 +21189,14 @@ ToProduct/ToSupplier/BusinessPartnerID\'}}">\
 			checkServiceCache(["token0", "token1"]);
 		}).finally(clearCaches);
 	});
+
 	//*********************************************************************************************
 	// Scenario: For a table where transient entries have messages, the filter returned by requestFilterForMessages does
-	// not refer to these entries. For the BCP incident, check the case no item loaded from the backend has a message:
-	// the filter is null then.
+	// not refer to these entries. For the BCP incident, check the case that no item loaded from the backend has a
+	// message: the filter is Filter.NONE then.
 	// BCP: 2370088390
+	// When the list is filtered only the transient entry is shown and no entries are requested.
+	// JIRA: CPOUI5MODELS-1421
 	QUnit.test("Filter table where only transient items have messages", function (assert) {
 		let oCreatedContext, oRowsBinding;
 		const oModel = createSalesOrdersModel({preliminaryContext : true});
@@ -20878,7 +21256,289 @@ ToProduct/ToSupplier/BusinessPartnerID\'}}">\
 				this.waitForChanges(assert)
 			]);
 		}).then((aResults) => {
-			assert.strictEqual(aResults[0], null, "no message filter, only transient item has message");
+			assert.strictEqual(aResults[0], Filter.NONE, "Filter.NONE message filter, only transient item has message");
+
+			this.expectValue("itemPosition", "", 1)
+				.expectValue("note", "", 1);
+
+			oRowsBinding.filter(aResults[0], FilterType.Application);
+
+			return this.waitForChanges(assert);
+		});
+	});
+
+	//*********************************************************************************************
+	// Scenario: For a table where only transient entries have messages, the filter returned by requestFilterForMessages
+	// is Filter.NONE. When the list is filtered, only the transient entries are shown and no $filter and no $count
+	// request occurs. It is still possible to create new inactive entries. Check that count and length of the binding
+	// is always correct.
+	// JIRA:CPOUI5MODELS-1421
+["Default", "Client"].forEach((sOperationMode) => {
+	const sTitle = "Filter table where only transient items have messages: operation mode=" + sOperationMode;
+	QUnit.test(sTitle, function (assert) {
+		let oMessage, oRowsBinding, oTable;
+		let aExpectedMessages = [];
+		const oModel = createSalesOrdersModel({
+				defaultBindingMode : BindingMode.TwoWay,
+				defaultCountMode : CountMode.Request,
+				defaultOperationMode : sOperationMode,
+				preliminaryContext : true
+			});
+		const sView = '\
+<t:Table id="table" rows="{/SalesOrderSet(\'1\')/ToLineItems}" visibleRowCount="3">\
+	<Input id="itemPosition" value="{ItemPosition}" />\
+	<Input id="note" value="{Note}" />\
+</t:Table>';
+		const that = this;
+
+		/* Prevents activation of passed inactive context, adds a message to the message model for
+		this context, creates another inactive context at the end if ItemPosition is empty.*/
+		function onCreateActivate(oEvent) {
+			const oCreatedContext = oEvent.getParameter("context");
+			if (!oCreatedContext.getObject("").ItemPosition) {
+				oMessage = {
+					message : "Item position is required",
+					type : "Error",
+					target : oCreatedContext.getPath() + "/ItemPosition",
+					fullTarget : oCreatedContext.getDeepPath() + "/ItemPosition",
+					processor : oModel
+				};
+				aExpectedMessages.push(oMessage);
+				that.expectMessages(aExpectedMessages);
+				Messaging.addMessages(new Message(oMessage));
+				oEvent.preventDefault();
+			} else {
+				const aCurrentMessages = Messaging.getMessageModel().getObject("/");
+				aCurrentMessages.some((oMessage) => {
+					if (oMessage.getTargets()[0] === oCreatedContext.getPath() + "/ItemPosition") {
+						Messaging.removeMessages(oMessage);
+						aExpectedMessages = aExpectedMessages.slice(0, 1);
+						return true;
+					}
+					return false;
+				});
+				that.expectMessages(aExpectedMessages);
+
+				return; // do not create another inactive row
+			}
+
+			// code under test - create works also if binding length is not final but Filter.NONE is set
+			oRowsBinding.create({}, /*bAtEnd*/ true, {inactive: true});
+		}
+
+		this.expectHeadRequest()
+			.expectRequest("SalesOrderSet('1')/ToLineItems/$count", "1")
+			.expectRequest({
+				requestUri : "SalesOrderSet('1')/ToLineItems"
+					+ (sOperationMode === "Default" ? "?$skip=0&$top=103" : "")
+			}, {
+				results : [{
+					__metadata : {
+						uri : "SalesOrderLineItemSet(SalesOrderID='1',ItemPosition='10')"
+					},
+					Note : "Bar",
+					ItemPosition : "10",
+					SalesOrderID : "1"
+				}]
+			})
+			.expectValue("itemPosition", ["10", "", ""])
+			.expectValue("note", ["Bar", "", ""]);
+
+		return this.createView(assert, sView, oModel).then(() => {
+			oTable = this.oView.byId("table");
+			oRowsBinding = oTable.getBinding("rows");
+			oRowsBinding.attachCreateActivate(onCreateActivate);
+			oRowsBinding.create({}, /*bAtEnd*/ true, {inactive: true});
+
+			assert.strictEqual(oRowsBinding.getCount(), 1, "1 active entry - count 1");
+			assert.strictEqual(oRowsBinding.getLength(), 2, "length is 2");
+
+			return this.waitForChanges(assert);
+		}).then(() => {
+			this.expectValue("note", "Foo", 1)
+				.expectValueState(oTable.getRows()[0].getCells()[0], "None", "")
+				.expectValueState(oTable.getRows()[1].getCells()[0], "Error", "Item position is required")
+				.expectValueState(oTable.getRows()[2].getCells()[0], "None", "");
+
+			oTable.getRows()[1].getCells()[1].setValue("Foo");
+
+			return this.waitForChanges(assert);
+		}).then(() => {
+			assert.strictEqual(oRowsBinding.getCount(), 1, "1 active entry - count 1");
+			assert.strictEqual(oRowsBinding.getLength(), 3, "length is 3");
+
+			return Promise.all([
+				oRowsBinding.requestFilterForMessages(),
+				this.waitForChanges(assert)
+			]);
+		}).then((aResults) => {
+			assert.strictEqual(aResults[0], Filter.NONE, "only transient items have messages");
+
+			this.expectValue("itemPosition", "", 0)
+				.expectValue("note", "Foo", 0)
+				.expectValue("note", "", 1)
+				.expectValueState(oTable.getRows()[0].getCells()[0], "Error", "Item position is required")
+				.expectValueState(oTable.getRows()[1].getCells()[0], "None", "")
+				.expectValueState(oTable.getRows()[2].getCells()[0], "None", "");
+
+			// code under test - no requests
+			oRowsBinding.filter(aResults[0], FilterType.Application);
+
+			assert.strictEqual(oRowsBinding.getCount(), 0, "no active entry - count 0");
+			assert.strictEqual(oRowsBinding.getLength(), 2, "length is 2");
+
+			return this.waitForChanges(assert);
+		}).then(() => {
+			this.expectValue("note", "Bar", 1)
+				.expectValueState(oTable.getRows()[0].getCells()[0], "Error", "Item position is required")
+				.expectValueState(oTable.getRows()[1].getCells()[0], "Error", "Item position is required")
+				.expectValueState(oTable.getRows()[2].getCells()[0], "None", "");
+
+			oTable.getRows()[1].getCells()[1].setValue("Bar");
+
+			return this.waitForChanges(assert);
+		}).then(() => {
+			this.expectValue("itemPosition", "30", 1)
+				.expectValueState(oTable.getRows()[0].getCells()[0], "Error", "Item position is required")
+				.expectValueState(oTable.getRows()[1].getCells()[0], "None", "")
+				.expectValueState(oTable.getRows()[2].getCells()[0], "None", "");
+
+			oTable.getRows()[1].getCells()[0].setValue("30");
+
+			return this.waitForChanges(assert);
+		}).then(() => {
+			assert.strictEqual(oRowsBinding.getCount(), 1, "one active entry - count 1");
+			assert.strictEqual(oRowsBinding.getLength(), 3, "length is 3");
+			if (sOperationMode === "Default" ) {
+				this.expectRequest("SalesOrderSet('1')/ToLineItems/$count", "1")
+					.expectRequest({
+						requestUri : "SalesOrderSet('1')/ToLineItems?$skip=0&$top=103"
+					}, {
+						results : [{
+							__metadata : {
+								uri : "SalesOrderLineItemSet(SalesOrderID='1',ItemPosition='10')"
+							},
+							Note : "Bar",
+							ItemPosition : "10",
+							SalesOrderID : "1"
+						}]
+					});
+			}
+			this.expectValue("itemPosition", ["10", "", "30"])
+				.expectValue("note", ["Bar", "Foo", "Bar"]);
+
+			// code under test
+			oRowsBinding.filter([], FilterType.Application);
+
+			return this.waitForChanges(assert);
+		}).then(() => {
+			assert.strictEqual(oRowsBinding.getCount(), 2, "1 active entry - count 1");
+			assert.strictEqual(oRowsBinding.getLength(), 4, "length is 4");
+
+			return Promise.all([
+				// code under test (filter out all messages)
+				oRowsBinding.requestFilterForMessages(() => false),
+				this.waitForChanges(assert)
+			]);
+		}).then((aResults) => {
+			assert.strictEqual(aResults[0], null);
+		});
+	});
+});
+
+	//*********************************************************************************************
+	// Scenario: The data state of a control in a table needs to be reevaluated if the row context changes but the
+	// value of the property binding does not change.
+	// JIRA: CPOUI5MODELS-1421
+	QUnit.test("Filter table with messages, every line has the correct data state", function (assert) {
+		let oRowsBinding, oTable;
+		const oModel = createSalesOrdersModel({preliminaryContext : true});
+		const oResponseMessage = this.createResponseMessage("(SalesOrderID='1',ItemPosition='20')/Note",
+			"~errorMessage");
+		const sView = '\
+<t:Table id="table" rows="{/SalesOrderSet(\'1\')/ToLineItems}" visibleRowCount="3">\
+	<Input id="note" value="{Note}" />\
+</t:Table>';
+
+		this.expectHeadRequest()
+			.expectRequest({
+				requestUri : "SalesOrderSet('1')/ToLineItems?$skip=0&$top=103"
+			}, {
+				results : [{
+					__metadata : {
+						uri : "SalesOrderLineItemSet(SalesOrderID='1',ItemPosition='10')"
+					},
+					Note : "Bar",
+					ItemPosition : "10",
+					SalesOrderID : "1"
+				}, {
+					__metadata : {
+						uri : "SalesOrderLineItemSet(SalesOrderID='1',ItemPosition='20')"
+					},
+					Note : "Baz",
+					ItemPosition : "20",
+					SalesOrderID : "1"
+				}, {
+					__metadata : {
+						uri : "SalesOrderLineItemSet(SalesOrderID='1',ItemPosition='30')"
+					},
+					Note : "Baz", // same value as for 20
+					ItemPosition : "30",
+					SalesOrderID : "1"
+				}]
+			}, {
+				"sap-message" : getMessageHeader(oResponseMessage)
+			})
+			.expectValue("note", ["Bar", "Baz", "Baz"])
+			.expectMessage(oResponseMessage, "/SalesOrderLineItemSet", "/SalesOrderSet('1')/ToLineItems");
+
+		return this.createView(assert, sView, oModel).then(() => {
+			oTable = this.oView.byId("table");
+			oRowsBinding = oTable.getBinding("rows");
+
+			this.expectValueState(oTable.getRows()[0].getCells()[0], "None", "")
+				.expectValueState(oTable.getRows()[1].getCells()[0], "Error", "~errorMessage")
+				.expectValueState(oTable.getRows()[2].getCells()[0], "None", "");
+
+			return this.waitForChanges(assert);
+		}).then(() => {
+			this.expectRequest({
+					requestUri : "SalesOrderSet('1')/ToLineItems?$skip=0&$top=103&$filter=ItemPosition gt '10'"
+				}, {
+					results : [{
+						__metadata : {
+							uri : "SalesOrderLineItemSet(SalesOrderID='1',ItemPosition='20')"
+						},
+						Note : "Baz",
+						ItemPosition : "20",
+						SalesOrderID : "1"
+					}, {
+						__metadata : {
+							uri : "SalesOrderLineItemSet(SalesOrderID='1',ItemPosition='30')"
+						},
+						Note : "Baz", // same value as for 20
+						ItemPosition : "30",
+						SalesOrderID : "1"
+					}]
+				}, {
+					"sap-message" : getMessageHeader(oResponseMessage)
+				})
+				.expectValue("note", "Baz", 0)
+				.expectValue("note", "", 2)
+				.expectMessage(oResponseMessage, "/SalesOrderLineItemSet", "/SalesOrderSet('1')/ToLineItems", true)
+				.expectValueState(oTable.getRows()[0].getCells()[0], "Error", "~errorMessage")
+				.expectValueState(oTable.getRows()[1].getCells()[0], "None", "")
+				.expectValueState(oTable.getRows()[2].getCells()[0], "None", "");
+
+			// filter out item 10
+			oRowsBinding.filter(new Filter({
+					path : "ItemPosition",
+					operator : FilterOperator.GT,
+					value1 : "10"
+				})
+			);
+
+			return this.waitForChanges(assert);
 		});
 	});
 });