@openui5/sap.ui.core 1.116.0 → 1.117.1

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

@@ -8348,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;
 
@@ -8372,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,
@@ -8476,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;
 
@@ -8690,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;
 
@@ -8837,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;
 
@@ -8954,12 +8995,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="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;
 
@@ -9149,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;
 
@@ -9212,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
@@ -9226,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;
 

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

@@ -7290,7 +7290,7 @@ sap.ui.define([
 								]
 							},
 							columns : [
-								{label: "ProductID", template: "ProductID"}
+								new Column({label: new Label({text: "ProductID"}), template: new Label({text: "{ProductID}"})})
 							]
 						})
 					]

package/test/sap/ui/core/qunit/odata/v4/Context.qunit.js

@@ -12,6 +12,8 @@ sap.ui.define([
 
 	var sClassName = "sap.ui.model.odata.v4.Context";
 
+	function mustBeMocked() { throw new Error("Must be mocked"); }
+
 	//*********************************************************************************************
 	QUnit.module("sap.ui.model.odata.v4.Context", {
 		beforeEach : function () {
@@ -1510,6 +1512,11 @@ sap.ui.define([
 
 		// code under test
 		oContext.checkUpdate();
+
+		oContext.oModel = undefined;
+
+		// code under test
+		oContext.checkUpdate();
 	});
 
 	//*********************************************************************************************
@@ -1987,7 +1994,7 @@ sap.ui.define([
 				isResolved : function () { return true; }
 			},
 			oMetaModel = {
-				getObject : function () { assert.ok(false, "use only when mocked"); }
+				getObject : mustBeMocked
 			},
 			oModel = {
 				getMetaModel : function () { return oMetaModel; }
@@ -3867,9 +3874,7 @@ sap.ui.define([
 			oBindingMock = this.mock(oBinding),
 			oError = new Error(),
 			oMetaModel = {
-				fetchObject : function () {
-					assert.ok(false); // use only when mocked
-				}
+				fetchObject : mustBeMocked
 			},
 			oModel = {
 				bAutoExpandSelect : true,
@@ -4221,7 +4226,7 @@ sap.ui.define([
 	QUnit.test("isEffectivelyKeptAlive: implicitly", function (assert) {
 		var oBinding = {
 				getHeaderContext : function () {},
-				isRelative : function () { throw new Error("must be mocked"); },
+				isRelative : mustBeMocked,
 				onKeepAliveChanged : function () {},
 				mParameters : {}
 			},

package/test/sap/ui/core/qunit/odata/v4/ODataBinding.qunit.js

@@ -16,6 +16,8 @@ sap.ui.define([
 
 	var sClassName = "sap.ui.model.odata.v4.ODataBinding";
 
+	function mustBeMocked() { throw new Error("Must be mocked"); }
+
 	/**
 	 * Returns a function which must not be called. Use as a replacment for
 	 * {@link sap.ui.model.odata.v4.ODataModel#getReporter} in cases where that reporter must not be
@@ -518,7 +520,7 @@ sap.ui.define([
 			bIgnoreTransient = false,
 			oTemplate = {
 				mParameters : {},
-				isRoot : function () { throw new Error("must be mocked"); }
+				isRoot : mustBeMocked
 			},
 			oWithCachePromise = {unwrap : function () {}};
 
@@ -748,6 +750,32 @@ sap.ui.define([
 	});
 });
 
+	//*********************************************************************************************
+	QUnit.test("fetchOrGetQueryOptionsForOwnCache: promise rejected", function (assert) {
+		var oBinding = new ODataBinding({
+				doFetchOrGetQueryOptions : mustBeMocked,
+				oModel : {resolve : mustBeMocked},
+				sPath : "/absolute",
+				bRelative : false
+			}),
+			oContext = {},
+			oError = new Error();
+
+		this.mock(oBinding.oModel).expects("resolve")
+			.withExactArgs("/absolute", sinon.match.same(oContext))
+			.returns("/resolved/path");
+		this.mock(oBinding).expects("doFetchOrGetQueryOptions")
+			.withExactArgs(sinon.match.same(oContext))
+			.returns(SyncPromise.reject(oError));
+
+		// code under test
+		oBinding.fetchOrGetQueryOptionsForOwnCache(oContext).then(function () {
+			assert.ok(false, "unexpected success");
+		}, function (oError0) {
+			assert.strictEqual(oError0, oError);
+		});
+	});
+
 	//*********************************************************************************************
 	[
 		{sPath : "unresolvedRelative", bRelative : true},
@@ -1079,6 +1107,7 @@ sap.ui.define([
 		return oBinding.oCachePromise.then(function () {
 			assert.strictEqual(oBinding.oCachePromise.getResult(), oNewCache);
 			assert.strictEqual(oBinding.sReducedPath, "/resolved/path");
+			assert.strictEqual(oBinding.oFetchCacheCallToken, undefined, "cleaned up");
 		});
 	});
 
@@ -1148,6 +1177,7 @@ sap.ui.define([
 			return oBinding.oCachePromise.then(function (oCache0) {
 				assert.strictEqual(oCache0, oCache);
 				assert.strictEqual(oBinding.sReducedPath, "/resolved/path");
+				assert.strictEqual(oBinding.oFetchCacheCallToken, undefined, "cleaned up");
 			});
 		});
 	});
@@ -1341,6 +1371,8 @@ sap.ui.define([
 
 		assert.strictEqual(oBinding.oCache, null);
 		assert.strictEqual(oBinding.sReducedPath, "~sReducedPath~", "unchanged");
+		assert.deepEqual(oBinding.oFetchCacheCallToken, {oOldCache : undefined},
+			"no old cache kept");
 	});
 
 	//*********************************************************************************************

package/test/sap/ui/core/qunit/odata/v4/ODataContextBinding.qunit.js

@@ -22,6 +22,8 @@ sap.ui.define([
 			"$$ownRequest", "$$patchWithoutSideEffects", "$$updateGroupId"],
 		sClassName = "sap.ui.model.odata.v4.ODataContextBinding";
 
+	function mustBeMocked() { throw new Error("Must be mocked"); }
+
 	//*********************************************************************************************
 	QUnit.module("sap.ui.model.odata.v4.ODataContextBinding", {
 		beforeEach : function () {
@@ -4487,7 +4489,7 @@ sap.ui.define([
 			oError = new Error("This call intentionally failed"),
 			oNewCache = {},
 			oOldCache = {
-				setActive : function () { throw new Error("must be mocked"); }
+				setActive : mustBeMocked
 			},
 			oReturnValueContext = Context.create(this.oModel, oBinding, "/SalesOrderList('77')"),
 			that = this;
@@ -4948,7 +4950,7 @@ sap.ui.define([
 
 		if (oFixture.name) {
 			oBinding.oOperation.bAction = true;
-			this.mock(_Cache).expects("makeUpdateData")
+			this.mock(_Helper).expects("makeUpdateData")
 				.withExactArgs(oFixture.update, "bar")
 				.returns(oUpdateValue);
 			this.mock(_Helper).expects("updateAll")
@@ -4972,7 +4974,7 @@ sap.ui.define([
 			oUpdateValue = {};
 
 		oBinding.oOperation.bAction = true;
-		this.mock(_Cache).expects("makeUpdateData").withExactArgs(["foo"], "bar")
+		this.mock(_Helper).expects("makeUpdateData").withExactArgs(["foo"], "bar")
 			.returns(oUpdateValue);
 		this.mock(_Helper).expects("updateAll")
 			.withExactArgs(sinon.match.same(oBinding.oOperation.mChangeListeners), "",