@openui5/sap.ui.core 1.115.1 → 1.117.0

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

@@ -16,6 +16,7 @@ sap.ui.define([
 	"sap/ui/core/message/Message",
 	"sap/ui/core/mvc/Controller",
 	"sap/ui/core/mvc/View",
+	"sap/ui/core/Rendering",
 	"sap/ui/model/BindingMode",
 	"sap/ui/model/Filter",
 	"sap/ui/model/FilterOperator",
@@ -35,7 +36,7 @@ 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, BindingMode, Filter, FilterOperator,
+		Core, coreLibrary, UI5Date, Message, Controller, View, Rendering, BindingMode, Filter, FilterOperator,
 		FilterType, Model, Sorter, JSONModel, MessageModel, CountMode, MessageScope, Context,
 		ODataModel, XMLModel, TestUtils, datajs, XMLHelper) {
 	/*global QUnit, sinon*/
@@ -490,10 +491,7 @@ sap.ui.define([
 				response : [{source : "qunit/odata/v2/data/ZUI5_GWSAMPLE_BASIC.metadata.xml"}]
 			}]);
 			this.oLogMock = this.mock(Log);
-			this.oLogMock.expects("warning")
-				.withExactArgs(sinon.match.string, "LegacyParametersGet", "sap.ui.support",
-					sinon.match.func)
-				.atLeast(0);
+			this.oLogMock.expects("warning").never();
 			this.oLogMock.expects("error").never();
 			this.oLogMock.expects("fatal").never();
 
@@ -8350,10 +8348,14 @@ ToProduct/ToSupplier/BusinessPartnerID\'}}">\
 <t:AnalyticalTable id="table" rows="{path : \'/Items\',\
 		parameters : {useBatchRequests : true}, sorter : {path : \'AccountingDocumentItem\', descending : true}}"\
 		threshold="10" visibleRowCount="2">\
-	<t:AnalyticalColumn grouped="true" leadingProperty="AccountingDocumentItem"\
-		template="AccountingDocumentItem"/>\
-	<t:AnalyticalColumn leadingProperty="AmountInCompanyCodeCurrency" summed="true"\
-		template="AmountInCompanyCodeCurrency"/>\
+	<t:AnalyticalColumn grouped="true" leadingProperty="AccountingDocumentItem">\
+		<Label text="AccountingDocumentItem"/>\
+		<t:template><Text wrapping="false" text="{AccountingDocumentItem}"/></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>',
 			that = this;
 
@@ -8374,6 +8376,11 @@ ToProduct/ToSupplier/BusinessPartnerID\'}}">\
 
 			return aItems;
 		}
+		this.oLogMock.expects("warning")
+			.withExactArgs("Applying sorters to groups is only possible with auto expand mode 'Sequential';"
+				+ " current mode is: Bundled",
+				"/Items", "sap.ui.model.analytics.AnalyticalBinding", undefined)
+			.atLeast(1);
 
 		this.expectRequest({
 				encodeRequestUri : false,
@@ -8478,14 +8485,26 @@ ToProduct/ToSupplier/BusinessPartnerID\'}}">\
 			oModel = createModel("/sap/opu/odata/sap/FAR_CUSTOMER_LINE_ITEMS"),
 			sView = '\
 <t:AnalyticalTable id="table" threshold="6" visibleRowCount="4">\
-	<t:AnalyticalColumn grouped="true" leadingProperty="CompanyCode" template="CompanyCode"/>\
-	<t:AnalyticalColumn grouped="true" leadingProperty="Customer" template="Customer"/>\
-	<t:AnalyticalColumn grouped="true" leadingProperty="AccountingDocument"\
-		template="AccountingDocument"/>\
-	<t:AnalyticalColumn grouped="false" leadingProperty="AccountingDocumentItem"\
-		template="AccountingDocumentItem"/>\
-	<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="true" leadingProperty="Customer">\
+		<Label text="Customer"/>\
+		<t:template><Text wrapping="false" text="{Customer}"/></t:template>\
+	</t:AnalyticalColumn>\
+	<t:AnalyticalColumn grouped="true" leadingProperty="AccountingDocument">\
+		<Label text="AccountingDocument"/>\
+		<t:template><Text wrapping="false" text="{AccountingDocument}"/></t:template>\
+	</t:AnalyticalColumn>\
+	<t:AnalyticalColumn grouped="false" leadingProperty="AccountingDocumentItem">\
+		<Label text="AccountingDocumentItem"/>\
+		<t:template><Text wrapping="false" text="{AccountingDocumentItem}"/></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>',
 			that = this;
 
@@ -8692,12 +8711,22 @@ ToProduct/ToSupplier/BusinessPartnerID\'}}">\
 			oModel = createModel("/sap/opu/odata/sap/FAR_CUSTOMER_LINE_ITEMS"),
 			sView = '\
 <t:AnalyticalTable id="table" threshold="1" visibleRowCount="4">\
-	<t:AnalyticalColumn grouped="true" leadingProperty="CompanyCode" template="CompanyCode"/>\
-	<t:AnalyticalColumn grouped="true" leadingProperty="Customer" template="Customer"/>\
-	<t:AnalyticalColumn grouped="true" leadingProperty="AccountingDocument"\
-		template="AccountingDocument"/>\
-	<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="true" leadingProperty="Customer">\
+		<Label text="Customer"/>\
+		<t:template><Text wrapping="false" text="{Customer}"/></t:template>\
+	</t:AnalyticalColumn>\
+	<t:AnalyticalColumn grouped="true" leadingProperty="AccountingDocument">\
+		<Label text="AccountingDocument"/>\
+		<t:template><Text wrapping="false" text="{AccountingDocument}"/></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>',
 			that = this;
 
@@ -8839,12 +8868,22 @@ ToProduct/ToSupplier/BusinessPartnerID\'}}">\
 			oModel = createModel("/sap/opu/odata/sap/FAR_CUSTOMER_LINE_ITEMS"),
 			sView = '\
 <t:AnalyticalTable id="table" threshold="10" visibleRowCount="4">\
-	<t:AnalyticalColumn grouped="true" leadingProperty="CompanyCode" template="CompanyCode"/>\
-	<t:AnalyticalColumn grouped="true" leadingProperty="Customer" template="Customer"/>\
-	<t:AnalyticalColumn grouped="true" leadingProperty="AccountingDocument"\
-		template="AccountingDocument"/>\
-	<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="true" leadingProperty="Customer">\
+		<Label text="Customer"/>\
+		<t:template><Text wrapping="false" text="{Customer}"/></t:template>\
+	</t:AnalyticalColumn>\
+	<t:AnalyticalColumn grouped="true" leadingProperty="AccountingDocument">\
+		<Label text="AccountingDocument"/>\
+		<t:template><Text wrapping="false" text="{AccountingDocument}"/></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>',
 			that = this;
 
@@ -8956,19 +8995,29 @@ ToProduct/ToSupplier/BusinessPartnerID\'}}">\
 			oModel = createModel("/sap/opu/odata/sap/FAR_CUSTOMER_LINE_ITEMS"),
 			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 grouped="false" leadingProperty="AccountingDocument"\
-		template="AccountingDocument"/>\
-	<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 grouped="false" leadingProperty="AccountingDocument">\
+		<Label text="AccountingDocument"/>\
+		<t:template><Text wrapping="false" text="{AccountingDocument}"/></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>',
 			that = this;
 
 		// invalidating the UI via refresh and calling setGrouped immediately after cause
 		// "Couldn't rerender..." warnings that can be ignored here
-		this.oLogMock.expects("warning")
-			.withExactArgs(sinon.match.string, undefined, "sap.ui.Rendering", undefined)
+		this.mock(Rendering.getLogger()).expects("warning")
+			.withExactArgs(sinon.match.string)
 			.atLeast(0);
 
 		return this.createView(assert, sView, oModel).then(function () {
@@ -9151,10 +9200,18 @@ ToProduct/ToSupplier/BusinessPartnerID\'}}">\
 			oModel = createModel("/sap/opu/odata/sap/FAR_CUSTOMER_LINE_ITEMS"),
 			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>',
 		that = this;
 
@@ -9214,6 +9271,137 @@ ToProduct/ToSupplier/BusinessPartnerID\'}}">\
 		});
 	});
 
+	//*****************************************************************************************************************
+	// Scenario: Sequential mode: Sorting by text properties that are only additionally selected is possible.
+	// JIRA:CPOUI5MODELS-1311
+	QUnit.test("AnalyticalBinding: sort additional selected text properties (Sequential)", function (assert) {
+		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:AnalyticalTable>';
+
+		return this.createView(assert, sView, oModel).then(() => {
+			this.expectHeadRequest()
+				.expectRequest({ // count request
+					encodeRequestUri : false,
+					requestUri : "Items?$select=CompanyCode,Customer&$top=0&$inlinecount=allpages"
+				}, {__count : "20", results : []})
+				.expectRequest({ // first level request
+					encodeRequestUri : false,
+					requestUri : "Items?"
+					+ "$select=CompanyCode,CompanyName,AmountInCompanyCodeCurrency,Currency&"
+					+ "$orderby=CompanyName%20desc,CompanyCode%20asc&$top=14&$inlinecount=allpages"
+				}, {
+					results : [
+						Object.assign(getFarCustomerLineItem("A0"), {CompanyName: "A0Name"}),
+						Object.assign(getFarCustomerLineItem("A1"), {CompanyName: "A1Name"}),
+						Object.assign(getFarCustomerLineItem("A2"), {CompanyName: "A2Name"}),
+						Object.assign(getFarCustomerLineItem("A3"), {CompanyName: "A2Name"})
+					]
+				})
+				.expectRequest({ // grand total request
+					encodeRequestUri : false,
+					requestUri : "Items?$select=AmountInCompanyCodeCurrency,Currency&$top=100&$inlinecount=allpages"
+				}, {
+					__count : 1,
+					results : [{
+						__metadata : {uri : "/sap/opu/odata/sap/FAR_CUSTOMER_LINE_ITEMS/Items(grandTotal)"},
+						AmountInCompanyCodeCurrency : "140",
+						Currency : "USD"
+					}]
+				});
+
+			// bind it lately, otherwise the binding is constructed without the analytical info and the select parameter
+			// is ignored
+			this.oView.byId("table").bindRows({
+				path : "/Items",
+				parameters : {
+					autoExpandMode : "Sequential",
+					numberOfExpandedLevels : 0,
+					provideGrandTotals : false,
+					select : "CompanyCode,AmountInCompanyCodeCurrency,Currency,Customer,CompanyName",
+					useBatchRequests : true
+				},
+				sorter : [new Sorter("CompanyName", true)]
+			});
+
+			return this.waitForChanges(assert);
+		});
+	});
+
+	//*****************************************************************************************************************
+	// Scenario: Bundled mode: Sorting by text properties that are only additionally selected is possible.
+	// JIRA:CPOUI5MODELS-1311
+	QUnit.test("AnalyticalBinding: sort additional selected text properties (Bundled)", function (assert) {
+		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:AnalyticalTable>';
+
+		return this.createView(assert, sView, oModel).then(() => {
+			this.expectHeadRequest()
+				.expectRequest({ // count request
+					encodeRequestUri : false,
+					requestUri : "Items?$select=CompanyCode,Customer&$top=0&$inlinecount=allpages"
+				}, {__count : "20", results : []})
+				.expectRequest({ // first level request
+					encodeRequestUri : false,
+					requestUri : "Items?"
+					+ "$select=CompanyCode,CompanyName,AmountInCompanyCodeCurrency,Currency&"
+					+ "$orderby=CompanyName%20desc,CompanyCode%20asc&$top=7"
+				}, {
+					results : [
+						Object.assign(getFarCustomerLineItem("A0"), {CompanyName: "A0Name"}),
+						Object.assign(getFarCustomerLineItem("A1"), {CompanyName: "A1Name"}),
+						Object.assign(getFarCustomerLineItem("A2"), {CompanyName: "A2Name"}),
+						Object.assign(getFarCustomerLineItem("A3"), {CompanyName: "A2Name"})
+					]
+				})
+				.expectRequest({ // leaf level request
+					encodeRequestUri : false,
+					requestUri : "Items?"
+					+ "$select=CompanyCode,CompanyName,Customer,AmountInCompanyCodeCurrency,Currency&"
+					+ "$orderby=CompanyName%20desc,CompanyCode%20asc&$top=12"
+				}, {
+					results : [
+						Object.assign(getFarCustomerLineItem("A0"), {CompanyName: "A0Name"}),
+						Object.assign(getFarCustomerLineItem("A1"), {CompanyName: "A1Name"}),
+						Object.assign(getFarCustomerLineItem("A2"), {CompanyName: "A2Name"}),
+						Object.assign(getFarCustomerLineItem("A3"), {CompanyName: "A2Name"})
+					]
+				});
+
+			this.oLogMock.expects("warning")
+				.withExactArgs("Applying sorters to groups is only possible with auto expand mode 'Sequential';"
+					+ " current mode is: Bundled",
+					"/Items", "sap.ui.model.analytics.AnalyticalBinding", undefined)
+				.atLeast(1);
+
+			// bind it lately, otherwise the binding is constructed without the analytical info and the select parameter
+			// is ignored
+			this.oView.byId("table").bindRows({
+				path : "/Items",
+				parameters : {
+					numberOfExpandedLevels : 1,
+					provideGrandTotals : false,
+					select : "CompanyCode,AmountInCompanyCodeCurrency,Currency,Customer,CompanyName",
+					useBatchRequests : true
+				},
+				sorter : [new Sorter("CompanyName", true)]
+			});
+
+			return this.waitForChanges(assert);
+		});
+	});
+
 	//*********************************************************************************************
 	// Scenario: If a request for an AnalyticalBinding is cancelled because the analytical info has
 	// been updated before the request was processed, a "dataReceived" event has to be fired. Table
@@ -9228,9 +9416,14 @@ ToProduct/ToSupplier/BusinessPartnerID\'}}">\
 			oModel = createModel("/sap/opu/odata/sap/FAR_CUSTOMER_LINE_ITEMS"),
 			sView = '\
 <t:AnalyticalTable id="table" threshold="10" visibleRowCount="4">\
-	<t:AnalyticalColumn grouped="false" leadingProperty="CompanyCode" template="CompanyCode"/>\
-	<t:AnalyticalColumn leadingProperty="AmountInCompanyCodeCurrency" summed="true"\
-		template="AmountInCompanyCodeCurrency"/>\
+	<t:AnalyticalColumn grouped="false" leadingProperty="CompanyCode">\
+		<Label text="CompanyCode"/>\
+		<t:template><Text wrapping="false" text="{CompanyCode}"/></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>',
 			that = this;
 
@@ -14838,6 +15031,9 @@ ToProduct/ToSupplier/BusinessPartnerID\'}}">\
 	//    request in order to avoid duplicates
 	// 4. Nested collections are updated
 	// JIRA: CPOUI5MODELS-656
+	// Scenario: The promise returned by requestSideEffects is to be resolved with the list bindings
+	// which have been refreshed.
+	// JIRA: CPOUI5MODELS-1299
 	QUnit.test("Request side effects: $batch, nested collections", function (assert) {
 		var oBinding, oTable,
 			oModel = createSalesOrdersModel(),
@@ -15068,19 +15264,19 @@ ToProduct/ToSupplier/BusinessPartnerID\'}}">\
 				.expectValue("name", "SAP - SideEffect", 2);
 
 			// code under test
-			oModel.requestSideEffects(that.oView.byId("objectPage").getBindingContext(), {
-				urlParameters : {
-					$expand : "ToSalesOrders,ToSalesOrders/ToBusinessPartner,"
-						+ "ToSalesOrders/ToLineItems",
-					$select : "ToSalesOrders/SalesOrderID,ToSalesOrders/Note,"
-						+ "ToSalesOrders/ToBusinessPartner/CompanyName,"
-						+ "ToSalesOrders/ToLineItems/SalesOrderID,"
-						+ "ToSalesOrders/ToLineItems/ItemPosition,ToSalesOrders/ToLineItems/Note"
-				}
-			});
+			var oSideEffectPromise = oModel.requestSideEffects(that.oView.byId("objectPage").getBindingContext(), {
+					urlParameters : {
+						$expand : "ToSalesOrders,ToSalesOrders/ToBusinessPartner,"
+							+ "ToSalesOrders/ToLineItems",
+						$select : "ToSalesOrders/SalesOrderID,ToSalesOrders/Note,"
+							+ "ToSalesOrders/ToBusinessPartner/CompanyName,"
+							+ "ToSalesOrders/ToLineItems/SalesOrderID,"
+							+ "ToSalesOrders/ToLineItems/ItemPosition,ToSalesOrders/ToLineItems/Note"
+					}
+				});
 
-			return that.waitForChanges(assert);
-		}).then(function () {
+			return Promise.all([oSideEffectPromise, that.waitForChanges(assert)]);
+		}).then(function (aResults) {
 			var aSelectItems = oTable.getRows()[0].getCells()[2].getItems();
 
 			assert.strictEqual(aSelectItems.length, 1);
@@ -15092,6 +15288,14 @@ ToProduct/ToSupplier/BusinessPartnerID\'}}">\
 			assert.strictEqual(aSelectItems.length, 1);
 			assert.strictEqual(aSelectItems[0].getText(), "Sales Order Line Item 1 - SideEffect");
 
+			var aAffectedListBindings = aResults[0];
+
+			assert.strictEqual(aAffectedListBindings.length, 3);
+			// only list bindings with non-transient parent context may be affected by side effects
+			assert.ok(aAffectedListBindings.includes(oTable.getBinding("rows")));
+			assert.ok(aAffectedListBindings.includes(oTable.getRows()[0].getCells()[2].getBinding("items")));
+			assert.ok(aAffectedListBindings.includes(oTable.getRows()[2].getCells()[2].getBinding("items")));
+
 			return that.waitForChanges(assert);
 		});
 	});

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

@@ -24,13 +24,11 @@ sap.ui.define([
 	"sap/ui/model/odata/v2/ODataContextBinding",
 	"sap/ui/model/odata/v2/ODataListBinding",
 	"sap/ui/model/odata/v2/ODataModel",
-	"sap/ui/model/odata/v2/ODataTreeBinding",
-	"sap/ui/test/TestUtils"
+	"sap/ui/model/odata/v2/ODataTreeBinding"
 ], function (Log, SyncPromise, Configuration, UI5Date, Message, _Helper, BaseContext,
 		FilterProcessor, Model, _ODataMetaModelUtils, CountMode, MessageScope, ODataMessageParser,
 		ODataMetaModel, ODataPropertyBinding, ODataUtils, _CreatedContextsCache, Context,
-		ODataAnnotations, ODataContextBinding, ODataListBinding, ODataModel, ODataTreeBinding,
-		TestUtils
+		ODataAnnotations, ODataContextBinding, ODataListBinding, ODataModel, ODataTreeBinding
 ) {
 	/*global QUnit,sinon*/
 	/*eslint camelcase: 0, max-nested-callbacks: 0, no-warning-comments: 0*/
@@ -58,10 +56,6 @@ sap.ui.define([
 			this.oLogMock = this.mock(Log);
 			this.oLogMock.expects("error").never();
 			this.oLogMock.expects("warning").never();
-		},
-
-		afterEach : function (assert) {
-			return TestUtils.awaitRendering();
 		}
 	});
 
@@ -216,6 +210,8 @@ sap.ui.define([
 		var oModel = new ODataModel(mParameters);
 
 		assert.strictEqual(oModel.bIgnoreAnnotationsFromMetadata, oFixture.member);
+
+		return oPromise;
 	});
 });
 
@@ -4963,8 +4959,8 @@ sap.ui.define([
 	{entitySetPath : "~FooSetPath"},
 	{entitySet : "~FooSet", returnType : "Collection(~FooType)"},
 	{entitySetPath : "~FooSetPath", returnType : "Collection(~FooType)"}
-].forEach(function (oFunctionMetadata) {
-	QUnit.test("callFunction: with expand; retuns a collection", function (assert) {
+].forEach(function (oFunctionMetadata, i) {
+	QUnit.test("callFunction: with expand; returns a collection, #" + i, function (assert) {
 		var callFunctionResult,
 			oMetadata = {
 				_getFunctionImportMetadata : function () {}
@@ -5444,8 +5440,8 @@ sap.ui.define([
 	{bPersist : true, bExpected : true},
 	{bPersist : undefined, bExpected : false},
 	{bPersist : false, bExpected : false}
-].forEach(function (oFixture) {
-	QUnit.test("_parseResponse, message parser does not exist", function (assert) {
+].forEach(function (oFixture, i) {
+	QUnit.test("_parseResponse, message parser does not exist, #" + i, function (assert) {
 		var oModel = {
 				bIsMessageScopeSupported : "~bIsMessageScopeSupported",
 				bPersistTechnicalMessages : oFixture.bPersist,
@@ -7961,8 +7957,8 @@ sap.ui.define([
 			.withExactArgs("sap.ui.model.odata.v2.ODataListBinding")
 			.returns(true);
 		this.mock(aBindings[1]).expects("_refreshForSideEffects")
-			.withExactArgs(sinon.match.set.deepEquals(new Set(["~type0", "~type1", undefined])),
-				"~groupId");
+			.withExactArgs(sinon.match.set.deepEquals(new Set(["~type0", "~type1", undefined])), "~groupId")
+			.returns(false);
 
 		// code under test
 		oResult = ODataModel.prototype.requestSideEffects.call(oModel, "~oContext", mParameters);
@@ -7977,7 +7973,7 @@ sap.ui.define([
 
 		return oResult.then(function (oResult) {
 				assert.ok(bSuccess);
-				assert.strictEqual(oResult, undefined);
+				assert.deepEqual(oResult, []);
 			}, function (oError) {
 				assert.ok(!bSuccess);
 				assert.strictEqual(oError, "~oError");
@@ -7985,6 +7981,65 @@ sap.ui.define([
 	});
 });
 
+	//*********************************************************************************************
+	QUnit.test("requestSideEffects: resolves with affected bindings", function (assert) {
+		var oResult, fnSuccess,
+			aBindings = [
+				{isA : function () {}},
+				{_refreshForSideEffects : function () {}, isA : function () {}}
+			],
+			oModel = {
+				oMetadata : {_getEntityTypeByPath : function () {}},
+				_read : function () {},
+				getBindings : function () {},
+				resolve : function () {}
+			},
+			oMetadataMock = this.mock(oModel.oMetadata),
+			oModelMock = this.mock(oModel),
+			mParameters = {
+				groupId : "~groupId",
+				urlParameters : {
+					$expand : "To0,To0/To1,To2",
+					$select : "~select"
+				}
+			};
+
+		oModelMock.expects("_read")
+			.withExactArgs("", {
+				context : "~oContext",
+				error : sinon.match.func,
+				groupId : "~groupId",
+				success : sinon.match.func.and(sinon.match(function (fnSuccess0) {
+					fnSuccess = fnSuccess0;
+
+					return true;
+				})),
+				updateAggregatedMessages : true,
+				urlParameters : sinon.match.same(mParameters.urlParameters)
+			}, /*bSideEffect*/true);
+		oModelMock.expects("resolve").withExactArgs("To0", "~oContext").returns("~resolved0");
+		oMetadataMock.expects("_getEntityTypeByPath").withExactArgs("~resolved0").returns("~type0");
+		oModelMock.expects("resolve").withExactArgs("To0/To1", "~oContext").returns("~resolved1");
+		oMetadataMock.expects("_getEntityTypeByPath").withExactArgs("~resolved1").returns("~type1");
+		oModelMock.expects("resolve").withExactArgs("To2", "~oContext").returns("~resolved2");
+		oMetadataMock.expects("_getEntityTypeByPath").withExactArgs("~resolved2").returns(undefined);
+		oModelMock.expects("getBindings").withExactArgs().returns(aBindings);
+		this.mock(aBindings[0]).expects("isA").withExactArgs("sap.ui.model.odata.v2.ODataListBinding").returns(false);
+		this.mock(aBindings[1]).expects("isA").withExactArgs("sap.ui.model.odata.v2.ODataListBinding").returns(true);
+		this.mock(aBindings[1]).expects("_refreshForSideEffects")
+			.withExactArgs(sinon.match.set.deepEquals(new Set(["~type0", "~type1", undefined])), "~groupId")
+			.returns(true);
+
+		// code under test
+		oResult = ODataModel.prototype.requestSideEffects.call(oModel, "~oContext", mParameters);
+
+		assert.ok(oResult instanceof Promise);
+
+		fnSuccess("~oData", "~oResponse");
+
+		return oResult.then(function (oResult) {assert.deepEqual(oResult, [aBindings[1]]);});
+	});
+
 	//*********************************************************************************************
 [{
 	mParameters : undefined

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

@@ -10,10 +10,9 @@ sap.ui.define([
 	"sap/ui/model/PropertyBinding",
 	"sap/ui/model/odata/ODataMetaModel",
 	"sap/ui/model/odata/ODataPropertyBinding",
-	"sap/ui/model/odata/v2/ODataModel",
-	"sap/ui/test/TestUtils"
+	"sap/ui/model/odata/v2/ODataModel"
 ], function (Log, SyncPromise, Binding, ChangeReason, Context, PropertyBinding, ODataMetaModel,
-		ODataPropertyBinding, ODataModel, TestUtils) {
+		ODataPropertyBinding, ODataModel) {
 	/*global QUnit,sinon*/
 	/*eslint no-warning-comments: 0*/
 	"use strict";
@@ -24,10 +23,6 @@ sap.ui.define([
 			this.oLogMock = this.mock(Log);
 			this.oLogMock.expects("error").never();
 			this.oLogMock.expects("warning").never();
-		},
-
-		afterEach : function (assert) {
-			return TestUtils.awaitRendering();
 		}
 	});
 

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

@@ -7,9 +7,8 @@ sap.ui.define([
 	"sap/ui/model/ChangeReason",
 	"sap/ui/model/Filter",
 	"sap/ui/model/TreeBinding",
-	"sap/ui/model/odata/ODataTreeBindingFlat",
-	"sap/ui/test/TestUtils"
-], function (Log, _Helper, ChangeReason, Filter, TreeBinding, ODataTreeBindingFlat, TestUtils) {
+	"sap/ui/model/odata/ODataTreeBindingFlat"
+], function (Log, _Helper, ChangeReason, Filter, TreeBinding, ODataTreeBindingFlat) {
 	/*global QUnit,sinon*/
 	"use strict";
 
@@ -21,10 +20,6 @@ sap.ui.define([
 			this.oLogMock = this.mock(Log);
 			this.oLogMock.expects("error").never();
 			this.oLogMock.expects("warning").never();
-		},
-
-		afterEach : function (assert) {
-			return TestUtils.awaitRendering();
 		}
 	});
 
@@ -167,8 +162,8 @@ sap.ui.define([
 }, {
 	inputParameters : {bar : "~baz", groupId : "~value0", refreshAfterChange : "~value1"},
 	expectedParameters : {bar : "~baz", groupId : "~groupId", refreshAfterChange : false}
-}].forEach(function (oFixture) {
-	QUnit.test("createEntry: resolved binding", function (assert) {
+}].forEach(function (oFixture, i) {
+	QUnit.test("createEntry: resolved binding, #" + i, function (assert) {
 		var oBinding = {
 				oModel : {
 					_resolveGroup : function () {},

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

@@ -11,10 +11,9 @@ sap.ui.define([
 	"sap/ui/model/odata/CountMode",
 	"sap/ui/model/odata/OperationMode",
 	"sap/ui/model/odata/v2/ODataTreeBinding",
-	"sap/ui/model/Sorter",
-	"sap/ui/test/TestUtils"
+	"sap/ui/model/Sorter"
 ], function (Log, ChangeReason, Context, Filter, FilterProcessor, FilterType, CountMode, OperationMode,
-		ODataTreeBinding, Sorter, TestUtils) {
+		ODataTreeBinding, Sorter) {
 	/*global QUnit,sinon*/
 	"use strict";
 
@@ -24,10 +23,6 @@ sap.ui.define([
 			this.oLogMock = this.mock(Log);
 			this.oLogMock.expects("error").never();
 			this.oLogMock.expects("warning").never();
-		},
-
-		afterEach : function (assert) {
-			return TestUtils.awaitRendering();
 		}
 	});