@openui5/sap.ui.core 1.117.1 → 1.118.0

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

@@ -12,6 +12,7 @@ sap.ui.define([
 	"sap/ui/core/Configuration",
 	"sap/ui/core/Core",
 	"sap/ui/core/library",
+	"sap/ui/core/Messaging",
 	"sap/ui/core/date/UI5Date",
 	"sap/ui/core/message/Message",
 	"sap/ui/core/mvc/Controller",
@@ -36,8 +37,8 @@ sap.ui.define([
 	// load Table resources upfront to avoid loading times > 1 second for the first test using Table
 	// "sap/ui/table/Table"
 ], function (Log, merge, uid, Input, Device, ManagedObjectObserver, SyncPromise, Configuration,
-		Core, coreLibrary, UI5Date, Message, Controller, View, Rendering, BindingMode, Filter, FilterOperator,
-		FilterType, Model, Sorter, JSONModel, MessageModel, CountMode, MessageScope, Context,
+		Core, coreLibrary, Messaging, UI5Date, Message, Controller, View, Rendering, BindingMode, Filter,
+		FilterOperator, FilterType, Model, Sorter, JSONModel, MessageModel, CountMode, MessageScope, Context,
 		ODataModel, XMLModel, TestUtils, datajs, XMLHelper) {
 	/*global QUnit, sinon*/
 	/*eslint max-nested-callbacks: 0, no-warning-comments: 0, quote-props: 0*/
@@ -576,8 +577,9 @@ sap.ui.define([
 				}
 				delete this.mListChanges[sControlId];
 			}
-			if (Core.getUIDirty()
-					|| Core.getMessageManager().getMessageModel().getObject("/").length	< this.aMessages.length) {
+
+			if (Rendering.isPending()
+					|| Messaging.getMessageModel().getObject("/").length < this.aMessages.length) {
 				setTimeout(this.checkFinish.bind(this, assert), 10);
 
 				return;
@@ -595,7 +597,7 @@ sap.ui.define([
 		 * @param {object} assert The QUnit assert object
 		 */
 		checkMessages : function (assert) {
-			var aCurrentMessages = Core.getMessageManager().getMessageModel()
+			var aCurrentMessages = Messaging.getMessageModel()
 					.getObject("/").sort(compareMessages),
 				aExpectedMessages = this.aMessages.slice().sort(compareMessages);
 
@@ -1088,7 +1090,7 @@ sap.ui.define([
 					that.oView.setModel(mNamedModels[sModelName], sModelName);
 				}
 				// enable parse error messages in the message manager
-				Core.getMessageManager().registerObject(that.oView, true);
+				Messaging.registerObject(that.oView, true);
 				// Place the view in the page so that it is actually rendered. In some situations,
 				// esp. for the table.Table this is essential.
 				that.oView.placeAt("qunit-fixture");
@@ -1665,12 +1667,11 @@ sap.ui.define([
 		 * Removes all persistent and technical message from the message model.
 		 */
 		removePersistentAndTechnicalMessages : function () {
-			var oMessageManager = Core.getMessageManager(),
-				aMessages = oMessageManager.getMessageModel().getObject("/").filter(function (oMessage) {
+			var aMessages = Messaging.getMessageModel().getObject("/").filter(function (oMessage) {
 					return oMessage.getPersistent() || oMessage.getTechnical();
 				});
 
-			oMessageManager.removeMessages(aMessages);
+			Messaging.removeMessages(aMessages);
 		},
 
 		/**
@@ -4714,7 +4715,7 @@ usePreliminaryContext : false}}">\
 		oModel.setMessageScope(MessageScope.BusinessObject);
 
 		return this.createView(assert, sView, oModel).then(function () {
-			oMessage = Core.getMessageManager().getMessageModel().getObject("/")[0];
+			oMessage = Messaging.getMessageModel().getObject("/")[0];
 			oObjectPage = that.oView.byId("objectPage");
 
 			assert.deepEqual(oMessage.getControlIds(), []);
@@ -9278,10 +9279,18 @@ ToProduct/ToSupplier/BusinessPartnerID\'}}">\
 		const oModel = createModel("/sap/opu/odata/sap/FAR_CUSTOMER_LINE_ITEMS");
 		const sView = '\
 <t:AnalyticalTable id="table" threshold="10" visibleRowCount="4">\
-	<t:AnalyticalColumn grouped="true" leadingProperty="CompanyCode" template="CompanyCode"/>\
-	<t:AnalyticalColumn grouped="false" leadingProperty="Customer" template="Customer"/>\
-	<t:AnalyticalColumn leadingProperty="AmountInCompanyCodeCurrency" summed="true"\
-		template="AmountInCompanyCodeCurrency"/>\
+	<t:AnalyticalColumn grouped="true" leadingProperty="CompanyCode">\
+		<Label text="CompanyCode"/>\
+		<t:template><Text wrapping="false" text="{CompanyCode}"/></t:template>\
+	</t:AnalyticalColumn>\
+	<t:AnalyticalColumn grouped="false" leadingProperty="Customer">\
+		<Label text="Customer"/>\
+		<t:template><Text wrapping="false" text="{Customer}"/></t:template>\
+	</t:AnalyticalColumn>\
+	<t:AnalyticalColumn summed="true" leadingProperty="AmountInCompanyCodeCurrency">\
+		<Label text="AmountInCompanyCodeCurrency"/>\
+		<t:template><Text wrapping="false" text="{AmountInCompanyCodeCurrency}"/></t:template>\
+	</t:AnalyticalColumn>\
 </t:AnalyticalTable>';
 
 		return this.createView(assert, sView, oModel).then(() => {
@@ -9340,10 +9349,18 @@ ToProduct/ToSupplier/BusinessPartnerID\'}}">\
 		const oModel = createModel("/sap/opu/odata/sap/FAR_CUSTOMER_LINE_ITEMS");
 		const sView = '\
 <t:AnalyticalTable id="table" threshold="10" visibleRowCount="4">\
-	<t:AnalyticalColumn grouped="true" leadingProperty="CompanyCode" template="CompanyCode"/>\
-	<t:AnalyticalColumn grouped="false" leadingProperty="Customer" template="Customer"/>\
-	<t:AnalyticalColumn leadingProperty="AmountInCompanyCodeCurrency" summed="true"\
-		template="AmountInCompanyCodeCurrency"/>\
+	<t:AnalyticalColumn grouped="true" leadingProperty="CompanyCode">\
+		<Label text="CompanyCode"/>\
+		<t:template><Text wrapping="false" text="{CompanyCode}"/></t:template>\
+	</t:AnalyticalColumn>\
+	<t:AnalyticalColumn grouped="false" leadingProperty="Customer">\
+		<Label text="Customer"/>\
+		<t:template><Text wrapping="false" text="{Customer}"/></t:template>\
+	</t:AnalyticalColumn>\
+	<t:AnalyticalColumn summed="true" leadingProperty="AmountInCompanyCodeCurrency">\
+		<Label text="AmountInCompanyCodeCurrency"/>\
+		<t:template><Text wrapping="false" text="{AmountInCompanyCodeCurrency}"/></t:template>\
+	</t:AnalyticalColumn>\
 </t:AnalyticalTable>';
 
 		return this.createView(assert, sView, oModel).then(() => {
@@ -10480,7 +10497,7 @@ ToProduct/ToSupplier/BusinessPartnerID\'}}">\
 				}])
 				.expectValueState("note", "Error", "Some message");
 
-			Core.getMessageManager().addMessages(new Message({
+			Messaging.addMessages(new Message({
 				message : "Some message",
 				processor : oModel,
 				target : "/Note",
@@ -10518,7 +10535,7 @@ ToProduct/ToSupplier/BusinessPartnerID\'}}">\
 				}])
 				.expectValueState("note", "Error", "Some message");
 
-			Core.getMessageManager().addMessages(new Message({
+			Messaging.addMessages(new Message({
 				message : "Some message",
 				processor : oModel,
 				target : "/Note",
@@ -10756,6 +10773,7 @@ ToProduct/ToSupplier/BusinessPartnerID\'}}">\
 		});
 	});
 
+	/** @deprecated As of version 1.102.0, reason OperationMode.Auto */
 	//*********************************************************************************************
 	// Scenario: If operation mode auto and a threshold is set as binding parameter and a count
 	// request returns a count smaller than the threshold then this count is used as the $top
@@ -11566,7 +11584,7 @@ ToProduct/ToSupplier/BusinessPartnerID\'}}">\
 				}])
 				.expectValueState("quantity", "Error", "Some message");
 
-			Core.getMessageManager().addMessages(new Message({
+			Messaging.addMessages(new Message({
 				message : "Some message",
 				processor : oModel,
 				target : "/RequestedQuantity",
@@ -14254,6 +14272,57 @@ ToProduct/ToSupplier/BusinessPartnerID\'}}">\
 		});
 	});
 
+	//*********************************************************************************************
+	// Scenario: If a list binding contains created entries at the start of the list and the
+	// binding's length is final, ensure that all data is requested if the user scrolls to the end
+	// of the list.
+	// BCP: 002075129400006921272023
+	QUnit.test("Created entries at start: scrolling to the end reads all data", function (assert) {
+		var oTable,
+			oModel = createSalesOrdersModel({defaultCountMode : CountMode.Inline}),
+			sView = '\
+<Table growing="true" growingThreshold="3" id="table" items="{/SalesOrderSet}">\
+	<Input id="note" value="{Note}"/>\
+</Table>',
+		that = this;
+
+		this.expectHeadRequest()
+			.expectRequest("SalesOrderSet?$skip=0&$top=3&$inlinecount=allpages", {
+				__count : "5",
+				results : [
+					{__metadata : {uri : "SalesOrderSet('1')"}, Note : "SO1", SalesOrderID : "1"},
+					{__metadata : {uri : "SalesOrderSet('2')"}, Note : "SO2", SalesOrderID : "2"},
+					{__metadata : {uri : "SalesOrderSet('3')"}, Note : "SO3", SalesOrderID : "3"}
+				]
+			})
+			.expectValue("note", ["SO1", "SO2", "SO3"]);
+
+		return this.createView(assert, sView, oModel).then(function () {
+			oTable = that.oView.byId("table");
+
+			that.expectValue("note", ["SONew", "SO1", "SO2", "SO3"]);
+
+			// code under test - create an item at the start of the list
+			oTable.getBinding("items").create({Note : "SONew"});
+
+			return that.waitForChanges(assert);
+		}).then(function () {
+			that.expectRequest("SalesOrderSet?$skip=3&$top=2", {
+				results : [
+					{__metadata : {uri : "SalesOrderSet('4')"}, Note : "SO4", SalesOrderID : "4"},
+					{__metadata : {uri : "SalesOrderSet('5')"}, Note : "SO5", SalesOrderID : "5"}
+				]
+			});
+
+			that.expectValue("note", ["SO3", "SO4", "SO5"], 3);
+
+			// code under test - scroll down to get all data from server
+			oTable.requestItems();
+
+			return that.waitForChanges(assert);
+		});
+	});
+
 	//*********************************************************************************************
 	// Scenario: If the table displays only transient entities (no threshold is set) and a new
 	// control filter is set on the table the number of available entities is properly displayed.
@@ -14329,8 +14398,11 @@ ToProduct/ToSupplier/BusinessPartnerID\'}}">\
 	// Scenario: Simple test for creation at the end of the list; more complex cases are tested in
 	// all pairs tests for multi create.
 	// JIRA: CPOUI5MODELS-617
+	// Scenario 2: Contexts can be retrieved using getContextByIndex
+	// BCP: 002075129400004574672023
 	QUnit.test("Creation at the end of a list", function (assert) {
-		var oModel = createSalesOrdersModel(),
+		var oRowsBinding,
+			oModel = createSalesOrdersModel(),
 			sView = '\
 <t:Table id="table" rows="{/SalesOrderSet}" visibleRowCount="2">\
 	<Text id="id" text="{SalesOrderID}"/>\
@@ -14338,6 +14410,17 @@ ToProduct/ToSupplier/BusinessPartnerID\'}}">\
 </t:Table>',
 			that = this;
 
+		function checkContextByIndex(bCreated) {
+			assert.strictEqual(oRowsBinding.getContextByIndex(-1), undefined);
+			assert.strictEqual(oRowsBinding.getContextByIndex(0).getPath(), "/SalesOrderSet('42')");
+			if (bCreated) {
+				assert.strictEqual(oRowsBinding.getContextByIndex(1).isTransient(), true);
+			} else {
+				assert.strictEqual(oRowsBinding.getContextByIndex(1), undefined);
+			}
+			assert.strictEqual(oRowsBinding.getContextByIndex(2), undefined);
+		}
+
 		this.expectHeadRequest()
 			.expectRequest("SalesOrderSet?$skip=0&$top=102", {
 				results : [{
@@ -14350,11 +14433,15 @@ ToProduct/ToSupplier/BusinessPartnerID\'}}">\
 			.expectValue("note", ["First SalesOrder", ""]);
 
 		return this.createView(assert, sView, oModel).then(function () {
+			oRowsBinding = that.oView.byId("table").getBinding("rows");
+
 			that.expectValue("note", "New 1", 1);
+			checkContextByIndex(false);
 
 			// code under test
-			that.oView.byId("table").getBinding("rows").create({Note : "New 1"}, /*bAtEnd*/true);
+			oRowsBinding.create({Note : "New 1"}, /*bAtEnd*/true);
 
+			checkContextByIndex(true);
 			return that.waitForChanges(assert);
 		});
 	});
@@ -17698,9 +17785,8 @@ ToProduct/ToSupplier/BusinessPartnerID\'}}">\
 	// restores the tree state for property and hierarchy changes, regardless of whether
 	// refreshAfterChange is true or false.
 	// JIRA: CPOUI5MODELS-958
-	// Scenario: To perform hierarchy changes both ODataModel#submitChanges and
-	// ODataTreeBinding#submitChanges can be used and both behave the same. For simple property
-	// changes via ODataModel#submitChanges a refresh/restoreTreeState is not needed.
+	// Scenario: To perform hierarchy changes ODataModel#submitChanges can be used. For simple property
+	// changes a refresh/restoreTreeState is not needed.
 	// JIRA: CPOUI5MODELS-745
 [false, true].forEach(function (bRefreshAfterChange) {
 	var sTitle = "ODataTreeBindingFlat: ODataModel#submitChanges for refreshAfterChange="
@@ -17843,15 +17929,15 @@ ToProduct/ToSupplier/BusinessPartnerID\'}}">\
 		});
 	});
 });
+
 	/** @deprecated As of version 1.104.0 */
 	//*********************************************************************************************
 	// Scenario: A table using ODataTreeBindingFlat with restoreTreeStateAfterChange=true correctly
 	// restores the tree state for property and hierarchy changes, regardless of whether
 	// refreshAfterChange is true or false.
 	// JIRA: CPOUI5MODELS-958
-	// Scenario: To perform hierarchy changes both ODataModel#submitChanges and
-	// ODataTreeBinding#submitChanges can be used and both behave the same. For simple property
-	// changes via ODataModel#submitChanges a refresh/restoreTreeState is not needed.
+	// Scenario: To perform hierarchy changes ODataTreeBinding#submitChanges can be used. For simple property
+	// changes a refresh/restoreTreeState is needed.
 	// JIRA: CPOUI5MODELS-745
 [false, true].forEach(function (bRefreshAfterChange) {
 	var sTitle = "ODataTreeBindingFlat: ODataTreeBindingFlat#submitChanges for refreshAfterChange="
@@ -18017,15 +18103,11 @@ ToProduct/ToSupplier/BusinessPartnerID\'}}">\
 	// restoreTreeStateAfterChange=false. After property / hierarchy changes have been submitted the
 	// binding gets refreshed.
 	// JIRA: CPOUI5MODELS-959
-	// Scenario: To perform hierarchy changes both ODataModel#submitChanges and
-	// ODataTreeBinding#submitChanges can be used and both behave the same. For simple property
-	// changes via ODataModel#submitChanges a refresh/restoreTreeState is not needed.
+	// Scenario: To perform hierarchy changes ODataModel#submitChanges can be used. For simple property
+	// changes a refresh/restoreTreeState is not needed.
 	// JIRA: CPOUI5MODELS-745
-[false, true].forEach(function (bSubmitOnModel) {
-	var sTitle = "ODataTreeBindingFlat: " + (bSubmitOnModel ? "ODataModel" : "ODataTreeBindingFlat")
-			+ "#submitChanges for refreshAfterChange=false and restoreTreeStateAfterChange=false";
-
-	QUnit.test(sTitle, function (assert) {
+	QUnit.test("ODataTreeBindingFlat: ODataModel#submitChanges for refreshAfterChange=false and "
+			+ "restoreTreeStateAfterChange=false", function (assert) {
 		var oBinding, oTable,
 			oModel = createHierarchyMaintenanceModel({refreshAfterChange : false}),
 			oNode100 = {
@@ -18082,9 +18164,161 @@ ToProduct/ToSupplier/BusinessPartnerID\'}}">\
 </t:TreeTable>',
 			that = this;
 
-		function fnSubmitChanges() {
-			(bSubmitOnModel ? oModel : oBinding).submitChanges();
-		}
+		this.expectHeadRequest()
+			.expectRequest({
+				batchNo : 1,
+				requestUri : "ErhaOrder('1')/to_Item?$skip=0&$top=103&$inlinecount=allpages"
+					+ "&$filter=HierarchyDistanceFromRoot le 0"
+			}, {
+				__count : "1",
+				results : [oNode100]
+			})
+			.expectValue("itemName", ["foo", "", ""]);
+
+		return this.createView(assert, sView, oModel).then(function () {
+			oTable = that.oView.byId("table");
+
+			that.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 () {
+			oBinding = oTable.getBinding("rows");
+
+			that.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"
+						+ "&$filter=HierarchyDistanceFromRoot le 0"
+				}, {
+					__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");
+
+			that.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({
+					batchNo : 6,
+					data : {
+						__metadata : {uri : "ErhaOrderItem(ErhaOrder='1',ErhaOrderItem='200')"},
+						ErhaOrderItemName : "bar: renamed"
+					},
+					key : "ErhaOrderItem(ErhaOrder='1',ErhaOrderItem='200')",
+					method : "MERGE",
+					requestUri : "ErhaOrderItem(ErhaOrder='1',ErhaOrderItem='200')"
+				}, NO_CONTENT);
+
+			// code under test: property change
+			oModel.setProperty("ErhaOrderItemName", "bar: renamed", oTable.getContextByIndex(1));
+			oModel.submitChanges();
+
+			return that.waitForChanges(assert);
+		});
+	});
+
+	/** @deprecated As of version 1.104.0 */
+	//*********************************************************************************************
+	// Scenario: A table using ODataTreeBindingFlat with refreshAfterChange=false and
+	// restoreTreeStateAfterChange=false. After property / hierarchy changes have been submitted the
+	// binding gets refreshed.
+	// JIRA: CPOUI5MODELS-959
+	// Scenario: To perform hierarchy changes ODataTreeBinding#submitChanges can be used. For simple property
+	// changes a refresh/restoreTreeState is needed.
+	// JIRA: CPOUI5MODELS-745
+	QUnit.test("ODataTreeBindingFlat: ODataTreeBindingFlat#submitChanges for refreshAfterChange=false and "
+			+ "restoreTreeStateAfterChange=false", function (assert) {
+		var oBinding, oTable,
+			oModel = createHierarchyMaintenanceModel({refreshAfterChange : false}),
+			oNode100 = {
+				__metadata : {uri : "ErhaOrderItem(ErhaOrder='1',ErhaOrderItem='100')"},
+				ErhaOrder : "1",
+				ErhaOrderItem : "100",
+				ErhaOrderItemName : "foo",
+				HierarchyNode : "100",
+				HierarchyParentNode : "",
+				HierarchyDescendantCount : 0,
+				HierarchyDistanceFromRoot : 0,
+				HierarchyDrillState : "collapsed",
+				HierarchyPreorderRank : 0,
+				HierarchySiblingRank : 0
+			},
+			oNode200 = {
+				__metadata : {uri : "ErhaOrderItem(ErhaOrder='1',ErhaOrderItem='200')"},
+				ErhaOrder : "1",
+				ErhaOrderItem : "200",
+				ErhaOrderItemName : "bar",
+				HierarchyNode : "200",
+				HierarchyParentNode : "100",
+				HierarchyDescendantCount : 0,
+				HierarchyDistanceFromRoot : 1,
+				HierarchyDrillState : "leaf",
+				HierarchyPreorderRank : 0,
+				HierarchySiblingRank : 0
+			},
+			oNode300 = {
+				__metadata : {uri : "ErhaOrderItem(ErhaOrder='1',ErhaOrderItem='300')"},
+				ErhaOrder : "1",
+				ErhaOrderItem : "300",
+				ErhaOrderItemName : "baz",
+				HierarchyNode : "300",
+				HierarchyParentNode : "100",
+				HierarchyDescendantCount : 0,
+				HierarchyDistanceFromRoot : 1,
+				HierarchyDrillState : "leaf",
+				HierarchyPreorderRank : 1,
+				HierarchySiblingRank : 1
+			},
+			sView = '\
+<t:TreeTable id="table"\
+		rows="{\
+			parameters : {\
+				countMode : \'Inline\',\
+				numberOfExpandedLevels : 0\
+			},\
+			path : \'/ErhaOrder(\\\'1\\\')/to_Item\'\
+		}"\
+		visibleRowCount="3"\
+		visibleRowCountMode="Fixed">\
+	<Text id="itemName" text="{ErhaOrderItemName}" />\
+</t:TreeTable>',
+			that = this;
 
 		this.expectHeadRequest()
 			.expectRequest({
@@ -18134,7 +18368,7 @@ ToProduct/ToSupplier/BusinessPartnerID\'}}">\
 
 			// code under test: hierarchy change
 			oBinding.removeContext(oTable.getContextByIndex(2));
-			fnSubmitChanges();
+			oBinding.submitChanges();
 
 			return that.waitForChanges(assert);
 		}).then(function () {
@@ -18167,7 +18401,6 @@ ToProduct/ToSupplier/BusinessPartnerID\'}}">\
 					requestUri : "ErhaOrderItem(ErhaOrder='1',ErhaOrderItem='200')"
 				}, NO_CONTENT);
 
-			if (!bSubmitOnModel) {
 				that.expectRequest({
 						batchNo : 7,
 						requestUri : "ErhaOrder('1')/to_Item?$skip=0&$top=103&$inlinecount=allpages"
@@ -18178,28 +18411,22 @@ ToProduct/ToSupplier/BusinessPartnerID\'}}">\
 					})
 					// binding gets refreshed, no restore tree state
 					.expectValue("itemName", "", 1);
-			}
 
 			// code under test: property change
 			oModel.setProperty("ErhaOrderItemName", "bar: renamed", oTable.getContextByIndex(1));
-			fnSubmitChanges();
+			oBinding.submitChanges();
 
 			return that.waitForChanges(assert);
 		});
 	});
-});
 
 	//*********************************************************************************************
 	// Scenario: A table using ODataTreeBindingFlat with refreshAfterChange=true and
 	// restoreTreeStateAfterChange=false. After property / hierarchy changes have been submitted
-	// either via ODataModel#submitChanges or via ODataTreeBindingFlat#submitChanges the binding
-	// gets refreshed only once via <code>refreshAfterChange</code>.
+	// via ODataModel#submitChanges the binding gets refreshed only once via <code>refreshAfterChange</code>.
 	// JIRA: CPOUI5MODELS-970
-[false, true].forEach(function (bSubmitOnModel) {
-	var sTitle = "ODataTreeBindingFlat: " + (bSubmitOnModel ? "ODataModel" : "ODataTreeBindingFlat")
-			+ "#submitChanges for refreshAfterChange=true and restoreTreeStateAfterChange=false";
-
-	QUnit.test(sTitle, function (assert) {
+	QUnit.test("ODataTreeBindingFlat: ODataModel#submitChanges for refreshAfterChange=true and "
+			+ "restoreTreeStateAfterChange=false", function (assert) {
 		var oBinding, oTable,
 			oModel = createHierarchyMaintenanceModel({refreshAfterChange : true}),
 			oNode100 = {
@@ -18256,10 +18483,6 @@ ToProduct/ToSupplier/BusinessPartnerID\'}}">\
 </t:TreeTable>',
 			that = this;
 
-		function fnSubmitChanges() {
-			(bSubmitOnModel ? oModel : oBinding).submitChanges();
-		}
-
 		this.expectHeadRequest()
 			.expectRequest({
 				batchNo : 1,
@@ -18333,7 +18556,7 @@ ToProduct/ToSupplier/BusinessPartnerID\'}}">\
 			// code under test: hierarchy change
 			oBinding.removeContext(oMoveContext);
 			oBinding.addContexts(oParentContext, [oMoveContext]);
-			fnSubmitChanges();
+			oModel.submitChanges();
 
 			return that.waitForChanges(assert);
 		}).then(function () {
@@ -18378,12 +18601,11 @@ ToProduct/ToSupplier/BusinessPartnerID\'}}">\
 
 			// code under test: property change
 			oModel.setProperty("ErhaOrderItemName", "bar: renamed", oTable.getContextByIndex(1));
-			fnSubmitChanges();
+			oModel.submitChanges();
 
 			return that.waitForChanges(assert);
 		});
 	});
-});
 
 	//*********************************************************************************************
 	// Scenario: It has to be possible to change a property with Edm.Time type to a different value

package/test/sap/ui/core/qunit/odata/v2/ODataModelNoFakeService.qunit.js

@@ -5,6 +5,7 @@ sap.ui.define([
 	"sap/base/Log",
 	"sap/ui/base/SyncPromise",
 	"sap/ui/core/Configuration",
+	"sap/ui/core/Messaging",
 	"sap/ui/core/date/UI5Date",
 	"sap/ui/core/message/Message",
 	"sap/ui/model/_Helper",
@@ -25,7 +26,7 @@ sap.ui.define([
 	"sap/ui/model/odata/v2/ODataListBinding",
 	"sap/ui/model/odata/v2/ODataModel",
 	"sap/ui/model/odata/v2/ODataTreeBinding"
-], function (Log, SyncPromise, Configuration, UI5Date, Message, _Helper, BaseContext,
+], function (Log, SyncPromise, Configuration, Messaging, UI5Date, Message, _Helper, BaseContext,
 		FilterProcessor, Model, _ODataMetaModelUtils, CountMode, MessageScope, ODataMessageParser,
 		ODataMetaModel, ODataPropertyBinding, ODataUtils, _CreatedContextsCache, Context,
 		ODataAnnotations, ODataContextBinding, ODataListBinding, ODataModel, ODataTreeBinding
@@ -6656,7 +6657,7 @@ sap.ui.define([
 	QUnit.test(sTitle, function (assert) {
 		var oFindAndRemoveContext, oRemoveEntity, fnResolve,
 			oContext = {removeFromTransientParent : function () {}},
-			oMessageManagerMock = this.mock(sap.ui.getCore().getMessageManager()),
+			oMessagingMock = this.mock(Messaging),
 			oMetadata = {
 				loaded : function () {}
 			},
@@ -6711,7 +6712,7 @@ sap.ui.define([
 		oModelMock.expects("getMessagesByEntity")
 			.withExactArgs("~sKey", !bDeleteEntity)
 			.returns("~aMessages");
-		oMessageManagerMock.expects("removeMessages").withExactArgs("~aMessages");
+		oMessagingMock.expects("removeMessages").withExactArgs("~aMessages");
 
 		// code under test
 		assert.strictEqual(
@@ -6768,7 +6769,7 @@ sap.ui.define([
 		this.mock(oModel).expects("getMessagesByEntity")
 			.withExactArgs("~sKey", false)
 			.returns("~aMessages");
-		this.mock(sap.ui.getCore().getMessageManager()).expects("removeMessages")
+		this.mock(Messaging).expects("removeMessages")
 			.withExactArgs("~aMessages");
 
 		// code under test
@@ -8707,4 +8708,27 @@ sap.ui.define([
 		ODataModel.prototype._isReloadNeeded.call(oModel, "~path", oFixture.parameters);
 	});
 });
+
+	/** @deprecated As of version 1.32.0 */
+	//*********************************************************************************************
+	QUnit.test("setDeferredBatchGroups", function (assert) {
+		const oModel = {setDeferredGroups() {}};
+
+		this.mock(oModel).expects("setDeferredGroups").withExactArgs("~mParameters");
+
+		// code under test
+		ODataModel.prototype.setDeferredBatchGroups.call(oModel, "~mParameters");
+	});
+
+	/** @deprecated As of version 1.32.0 */
+	//*********************************************************************************************
+	QUnit.test("setChangeBatchGroups", function (assert) {
+		const oModel = {setChangeGroups() {}};
+
+		this.mock(oModel).expects("setChangeGroups")
+			.withExactArgs({"*" : {batchGroupId : "~groupId", groupId: "~groupId"}});
+
+		// code under test
+		ODataModel.prototype.setChangeBatchGroups.call(oModel, {"*" : {batchGroupId : "~groupId"}});
+	});
 });

package/test/sap/ui/core/qunit/odata/v2/ODataTreeBindingFlatNoFakeService.qunit.js

@@ -208,6 +208,27 @@ sap.ui.define([
 		// code under test - parameters are not relevant for this test
 		assert.strictEqual(ODataTreeBindingFlat.prototype.createEntry.call(oBinding), undefined);
 	});
+
+	//*********************************************************************************************
+[{
+	parameters: {expand : "~expand"},
+	error: new Error("Parameter 'expand' is not supported")
+ }, {
+	parameters: {inactive : "~inactive"},
+	error: new Error("Parameter 'inactive' is not supported")
+}].forEach((oFixture) => {
+	QUnit.test("createEntry: unsupported parameter", function (assert) {
+		const oBinding = {
+				getResolvedPath() {}
+			};
+		this.mock(oBinding).expects("getResolvedPath").withExactArgs().returns("~sPath");
+
+		assert.throws(() => {
+			// code under test
+			ODataTreeBindingFlat.prototype.createEntry.call(oBinding, oFixture.parameters);
+		}, oFixture.error );
+	});
+});
 	/**
 	 * @deprecated As of version 1.104.0
 	 */

package/test/sap/ui/core/qunit/odata/v2/ODataTreeBindingNoFakeService.qunit.js

@@ -882,8 +882,7 @@ sap.ui.define([
 				"~ilength", "~iThreshold"),
 			"~V2Context[]");
 	});
-
-	//*********************************************************************************************
+	/** @deprecated As of version 1.102.0, reason OperationMode.Auto */
 	QUnit.test("_getContextsForNodeId: with operation mode 'Auto' and without"
 			+ " iTotalCollectionCount", function (assert) {
 		var oBinding = {