@openui5/sap.ui.core 1.115.1 → 1.117.0

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

@@ -81,6 +81,8 @@ sap.ui.define([
 		return bDrillDown ? oData.value : oData;
 	}
 
+	function mustBeMocked() { throw new Error("Must be mocked"); }
+
 	//*********************************************************************************************
 	QUnit.module("sap.ui.model.odata.v4.ODataListBinding", {
 		beforeEach : function () {
@@ -1251,10 +1253,6 @@ sap.ui.define([
 			this.bindList("/EMPLOYEES", undefined, new Sorter("ID"), undefined,
 				{$$operationMode : OperationMode.Client});
 		}, new Error("Unsupported operation mode: Client"));
-		assert.throws(function () {
-			this.bindList("/EMPLOYEES", undefined, new Sorter("ID"), undefined,
-				{$$operationMode : OperationMode.Auto});
-		}, new Error("Unsupported operation mode: Auto"));
 		assert.throws(function () {
 			this.bindList("/EMPLOYEES", undefined, new Sorter("ID"));
 		}, new Error("Unsupported operation mode: undefined"));
@@ -1289,10 +1287,6 @@ sap.ui.define([
 			this.bindList("/EMPLOYEES", undefined, undefined, new Filter("ID", "eq", 42),
 				{$$operationMode : OperationMode.Client});
 		}, new Error("Unsupported operation mode: Client"));
-		assert.throws(function () {
-			this.bindList("/EMPLOYEES", undefined, undefined, new Filter("ID", "eq", 42),
-				{$$operationMode : OperationMode.Auto});
-		}, new Error("Unsupported operation mode: Auto"));
 		assert.throws(function () {
 			this.bindList("/EMPLOYEES", undefined, undefined, new Filter("ID", "eq", 42));
 		}, new Error("Unsupported operation mode: undefined"));
@@ -2373,6 +2367,7 @@ sap.ui.define([
 		if (oFixture.aggregation) {
 			oBinding.mParameters.$$aggregation = oAggregation;
 		}
+		oBinding.mCanUseCachePromiseByChildPath = "~mCanUseCachePromiseByChildPath~";
 		oBinding.sChangeReason = "sChangeReason";
 		oBinding.bHasPathReductionToParent = oFixture.backLink;
 
@@ -2408,6 +2403,8 @@ sap.ui.define([
 
 		assert.ok(oFetchCacheCall.calledAfter(oResetKeepAliveCall));
 		assert.strictEqual(oBinding.sChangeReason, sExpectedChangeReason);
+		assert.deepEqual(oBinding.mCanUseCachePromiseByChildPath,
+			i === 0 ? {} : "~mCanUseCachePromiseByChildPath~");
 		if (oFixture.newContext) {
 			assert.deepEqual(oBinding.mPreviousContextsByPath, {
 				"/foo/Suppliers" : oOldHeaderContext
@@ -3806,6 +3803,44 @@ sap.ui.define([
 		assert.strictEqual(oContext2.iIndex, undefined);
 	});
 
+	//*********************************************************************************************
+	QUnit.test("destroyPreviousContexts: cache & hidden context", function (assert) {
+		var oBinding = this.bindList("/EMPLOYEES"),
+			oContext1 = {
+				iIndex : undefined,
+				destroy : function () {},
+				isEffectivelyKeptAlive : function () {},
+				isTransient : function () {}
+			},
+			oContext2 = {
+				iIndex : 0,
+				destroy : function () {},
+				isEffectivelyKeptAlive : function () {},
+				isTransient : function () {}
+			};
+
+		oBinding.mPreviousContextsByPath = {
+			p1 : oContext1,
+			p2 : oContext2,
+			p3 : "~oContext3~"
+		};
+		this.mock(oContext1).expects("isEffectivelyKeptAlive").withExactArgs().returns(false);
+		this.mock(oContext1).expects("isTransient").withExactArgs().returns(false);
+		this.mock(oContext1).expects("destroy").withExactArgs();
+		this.mock(oContext2).expects("isEffectivelyKeptAlive").withExactArgs().returns(false);
+		this.mock(oContext2).expects("isTransient").withExactArgs().returns(false);
+		this.mock(oContext2).expects("destroy").withExactArgs();
+		this.mock(oBinding.oHeaderContext).expects("getPath").withExactArgs().returns("/EMPLOYEES");
+		this.mock(_Helper).expects("getRelativePath")
+			.withExactArgs("p1", "/EMPLOYEES").returns("relative/path");
+		this.mock(oBinding.oCache).expects("removeKeptElement").withExactArgs("relative/path");
+
+		// code under test
+		oBinding.destroyPreviousContexts(["p1", "p2"]);
+
+		assert.deepEqual(oBinding.mPreviousContextsByPath, {p3 : "~oContext3~"});
+	});
+
 	//*********************************************************************************************
 	QUnit.test("destroyPreviousContexts: binding already destroyed", function (assert) {
 		var oBinding = this.bindList("relative");
@@ -4587,8 +4622,6 @@ sap.ui.define([
 			oCreateInCachePromise1 = Promise.resolve({}),
 			oCreatePathPromise = SyncPromise.resolve("~"),
 			oError = {},
-			oInitialData0 = {},
-			oInitialData1 = {},
 			oGroupLock0 = {},
 			oGroupLock1 = {},
 			oLockGroupExpectation,
@@ -4604,8 +4637,8 @@ sap.ui.define([
 		oBindingMock.expects("fetchResourcePath").withExactArgs().returns(oCreatePathPromise);
 		oCreateInCacheExpectation = oBindingMock.expects("createInCache")
 			.withExactArgs(sinon.match.same(oGroupLock0), sinon.match.same(oCreatePathPromise),
-				"/EMPLOYEES", sinon.match(rTransientPredicate), sinon.match.same(oInitialData0),
-				false, sinon.match.func, sinon.match.func)
+				"/EMPLOYEES", sinon.match(rTransientPredicate), {}, false, sinon.match.func,
+				sinon.match.func)
 			.returns(SyncPromise.resolve(oCreateInCachePromise0));
 		oCreateInCachePromise0.then(function () {
 			that.mock(oContext0).expects("updateAfterCreate").withExactArgs(true, "$auto");
@@ -4613,7 +4646,7 @@ sap.ui.define([
 		this.mock(oContextPrototype).expects("fetchValue").twice().withExactArgs().resolves({});
 
 		// code under test (create first entity, skip refresh)
-		oContext0 = oBinding.create(oInitialData0, true);
+		oContext0 = oBinding.create(null, true);
 
 		assert.strictEqual(oBinding.iCreatedContexts, 1);
 		assert.strictEqual(oBinding.iActiveContexts, 1);
@@ -4628,15 +4661,15 @@ sap.ui.define([
 		oBindingMock.expects("fetchResourcePath").withExactArgs().returns(oCreatePathPromise);
 		oBindingMock.expects("createInCache")
 			.withExactArgs(sinon.match.same(oGroupLock1), sinon.match.same(oCreatePathPromise),
-				"/EMPLOYEES", sinon.match(rTransientPredicate), sinon.match.same(oInitialData1),
-				false, sinon.match.func, sinon.match.func)
+				"/EMPLOYEES", sinon.match(rTransientPredicate), {}, false, sinon.match.func,
+				sinon.match.func)
 			.returns(SyncPromise.resolve(oCreateInCachePromise1));
 		oCreateInCachePromise1.then(function () {
 			that.mock(oContext1).expects("updateAfterCreate").withExactArgs(true, "$auto");
 		});
 
 		// code under test (create second entity, skip refresh)
-		oContext1 = oBinding.create(oInitialData1, true);
+		oContext1 = oBinding.create(null, true);
 
 		assert.strictEqual(oBinding.iCreatedContexts, 2);
 		assert.strictEqual(oBinding.iActiveContexts, 2);
@@ -4706,7 +4739,6 @@ sap.ui.define([
 		sTitle : "create: absolute"
 	}, {
 		sGroupId : "$auto",
-		oInitialData : {},
 		sTitle : "create: absolute, with initial data"
 	}, {
 		sGroupId : "deferred",
@@ -4772,6 +4804,8 @@ sap.ui.define([
 					iCurrentCreateNo = iCreateNo;
 
 				oBindingMock.expects("checkSuspended").withExactArgs();
+				oHelperMock.expects("isDataAggregation")
+					.withExactArgs(sinon.match.same(oBinding.mParameters)).returns(false);
 				oBindingMock.expects("getGroupId")
 					.returns(oFixture.sGroupId || "$auto");
 				oModelMock.expects("isApiGroup")
@@ -4789,8 +4823,8 @@ sap.ui.define([
 				oBindingMock.expects("createInCache")
 					.withExactArgs(sinon.match.same(oGroupLock),
 						sinon.match.same(oCreatePathPromise), "/EMPLOYEES",
-						sinon.match(rTransientPredicate), sinon.match.same(oFixture.oInitialData),
-						false, sinon.match.func, sinon.match.func)
+						sinon.match(rTransientPredicate), {}, false, sinon.match.func,
+						sinon.match.func)
 					.returns(aCreatePromises[iCurrentCreateNo]);
 				oContextMock.expects("fetchValue").withExactArgs().resolves({});
 
@@ -4841,8 +4875,8 @@ sap.ui.define([
 			oBindingMock.expects("refreshSingle").never();
 
 			// code under test
-			aContexts.push(oBinding.create(oFixture.oInitialData, false, false,
-				oFixture.bInactive, oFixture.bTransient));
+			aContexts.push(
+				oBinding.create(null, false, false, oFixture.bInactive, oFixture.bTransient));
 
 			checkCreatedContext();
 
@@ -4853,8 +4887,8 @@ sap.ui.define([
 			expect();
 
 			// code under test: 2nd create
-			aContexts.push(oBinding.create(oFixture.oInitialData, false, false,
-				oFixture.bInactive, oFixture.bTransient));
+			aContexts.push(
+				oBinding.create(null, false, false, oFixture.bInactive, oFixture.bTransient));
 
 			checkCreatedContext();
 			assert.strictEqual(aContexts[0].getIndex(), 1);
@@ -4888,20 +4922,21 @@ sap.ui.define([
 				oGroupLock0 = {},
 				oGroupLock1 = {},
 				oHelperMock = this.mock(_Helper),
-				oInitialData = {},
 				sPredicate = "(ID=42)",
 				oRefreshedEntity = {},
 				that = this;
 
 			oBindingMock.expects("getUpdateGroupId").withExactArgs().returns("~update~");
+			oHelperMock.expects("publicClone").withExactArgs("~oInitialData~", true)
+				.returns("~publicClone~");
 			oBindingMock.expects("lockGroup")
 				.withExactArgs("~update~", true, true, sinon.match.func)
 				.returns(oGroupLock0);
 			oBindingMock.expects("fetchResourcePath").withExactArgs().returns(oCreatePathPromise);
 			oBindingMock.expects("createInCache")
 				.withExactArgs(sinon.match.same(oGroupLock0), sinon.match.same(oCreatePathPromise),
-					"/EMPLOYEES", sinon.match(rTransientPredicate), sinon.match.same(oInitialData),
-					false, sinon.match.func, sinon.match.func)
+					"/EMPLOYEES", sinon.match(rTransientPredicate), "~publicClone~", false,
+					sinon.match.func, sinon.match.func)
 				.returns(oCreatePromise);
 			this.mock(oContextPrototype).expects("fetchValue").withExactArgs().resolves({});
 			oCreatePromise.then(function () {
@@ -4934,23 +4969,15 @@ sap.ui.define([
 			});
 
 			// code under test
-			oContext = oBinding.create(oInitialData, oFixture.bSkipRefresh);
+			oContext = oBinding.create("~oInitialData~", oFixture.bSkipRefresh);
 
 			return oContext.created();
 		});
 	});
 
 	//*********************************************************************************************
-	[{
-		sPredicate : "('bar')"
-	}, {
-		oInitialData : {},
-		sPredicate : "('bar')"
-	}, {
-		oInitialData : {}
-	}].forEach(function (oFixture) {
-		var sTitle = "create: relative binding, initial data: "
-				+ JSON.stringify(oFixture.oInitialData) + ", predicate: " + oFixture.sPredicate;
+	[undefined, "('bar')"].forEach(function (sPredicate) {
+		var sTitle = "create: relative binding, predicate: " + sPredicate;
 
 		QUnit.test(sTitle, function (assert) {
 			var oBinding = this.bindList("TEAM_2_EMPLOYEES",
@@ -4978,6 +5005,8 @@ sap.ui.define([
 				.withExactArgs()
 				.returns(oCreatePathPromise);
 			oBindingMock.expects("checkSuspended").withExactArgs().twice();
+			oHelperMock.expects("isDataAggregation")
+				.withExactArgs(sinon.match.same(oBinding.mParameters)).returns(false);
 			oBindingMock.expects("getUpdateGroupId").withExactArgs().returns("~update~");
 			oBindingMock.expects("lockGroup")
 				.withExactArgs("~update~", true, true, sinon.match.func)
@@ -4985,17 +5014,17 @@ sap.ui.define([
 			oBindingMock.expects("createInCache")
 				.withExactArgs(sinon.match.same(oCreateGroupLock),
 					sinon.match.same(oCreatePathPromise), "/TEAMS/1/TEAM_2_EMPLOYEES",
-					sinon.match(rTransientPredicate), sinon.match.same(oFixture.oInitialData),
-					false, sinon.match.func, sinon.match.func)
+					sinon.match(rTransientPredicate), {}, false, sinon.match.func,
+					sinon.match.func)
 				.returns(oCreateInCachePromise);
 			oCreateInCachePromise.then(function () {
 				oHelperMock.expects("getPrivateAnnotation")
 					.withExactArgs(sinon.match.same(oCreatedEntity), "predicate")
-					.returns(oFixture.sPredicate);
-				oBindingMock.expects("adjustPredicate").exactly(oFixture.sPredicate ? 1 : 0)
-					.withExactArgs(sinon.match(rTransientPredicate), oFixture.sPredicate,
+					.returns(sPredicate);
+				oBindingMock.expects("adjustPredicate").exactly(sPredicate ? 1 : 0)
+					.withExactArgs(sinon.match(rTransientPredicate), sPredicate,
 						sinon.match.same(oContext));
-				that.mock(that.oModel).expects("checkMessages").exactly(oFixture.sPredicate ? 1 : 0)
+				that.mock(that.oModel).expects("checkMessages").exactly(sPredicate ? 1 : 0)
 					.withExactArgs();
 				oHelperMock.expects("getPrivateAnnotation")
 					.withExactArgs(sinon.match.same(oCreatedEntity), "deepCreate")
@@ -5009,7 +5038,7 @@ sap.ui.define([
 			oContextMock.expects("fetchValue").withExactArgs().resolves({});
 
 			// code under test
-			oContext = oBinding.create(oFixture.oInitialData);
+			oContext = oBinding.create();
 
 			aCacheResult.unshift({/*transient element*/});
 			oBindingMock.expects("lockGroup").withExactArgs().returns(oFetchDataGroupLock);
@@ -5061,6 +5090,7 @@ sap.ui.define([
 			oError = new Error("suspended");
 
 		this.mock(oBinding).expects("checkSuspended").withExactArgs().throws(oError);
+		this.mock(_Helper).expects("isDataAggregation").never();
 
 		// code under test
 		assert.throws(function () {
@@ -5106,7 +5136,8 @@ sap.ui.define([
 	QUnit.test("create: $$aggregation", function (assert) {
 		var oBinding = this.bindList("/EMPLOYEES");
 
-		oBinding.mParameters.$$aggregation = "~aggregation~";
+		this.mock(_Helper).expects("isDataAggregation")
+			.withExactArgs(sinon.match.same(oBinding.mParameters)).returns(true);
 
 		assert.throws(function () {
 			// code under test
@@ -5122,8 +5153,7 @@ sap.ui.define([
 			oCreatePathPromise = {},
 			oError = new Error(),
 			oCreatePromise = SyncPromise.resolve(Promise.reject(oError)),
-			oGroupLock = {unlock : function () {}},
-			oInitialData = {};
+			oGroupLock = {unlock : function () {}};
 
 		oBindingMock.expects("getUpdateGroupId").withExactArgs().returns("~update~");
 		oBindingMock.expects("lockGroup").withExactArgs("~update~", true, true, sinon.match.func)
@@ -5131,8 +5161,8 @@ sap.ui.define([
 		oBindingMock.expects("fetchResourcePath").withExactArgs().returns(oCreatePathPromise);
 		oBindingMock.expects("createInCache")
 			.withExactArgs(sinon.match.same(oGroupLock), sinon.match.same(oCreatePathPromise),
-				"/EMPLOYEES", sinon.match(rTransientPredicate), sinon.match.same(oInitialData),
-				false, sinon.match.func, sinon.match.func)
+				"/EMPLOYEES", sinon.match(rTransientPredicate), {}, false, sinon.match.func,
+				sinon.match.func)
 			.returns(oCreatePromise);
 		this.mock(oContextPrototype).expects("fetchValue").withExactArgs().resolves({});
 
@@ -5140,7 +5170,7 @@ sap.ui.define([
 		this.mock(oGroupLock).expects("unlock").withExactArgs(true);
 
 		// code under test
-		oContext = oBinding.create(oInitialData);
+		oContext = oBinding.create();
 
 		return oContext.created().then(function () {
 			assert.ok(false);
@@ -5212,7 +5242,7 @@ sap.ui.define([
 				.returns(oGroupLock);
 			oBindingMock.expects("createInCache")
 				.withExactArgs(sinon.match.same(oGroupLock), oCreatePathMatcher, "/EMPLOYEES",
-					sinon.match(rTransientPredicate), undefined,
+					sinon.match(rTransientPredicate), {},
 					sinon.match(function (bAtEndOfCreated) {
 						return bAtEndOfCreated === (oBinding.bFirstCreateAtEnd !== !!aAtEnd[0]);
 					}), sinon.match.func, sinon.match.func)
@@ -5262,7 +5292,7 @@ sap.ui.define([
 				oBindingMock.expects("createInCache")
 					.withExactArgs(sinon.match.same(oGroupLock),
 						oCreatePathMatcher, "/EMPLOYEES",
-						sinon.match(rTransientPredicate), undefined,
+						sinon.match(rTransientPredicate), {},
 						sinon.match(function (bAtEndOfCreated) {
 							return bAtEndOfCreated
 								=== (oBinding.bFirstCreateAtEnd !== !!aAtEnd[1]);
@@ -5354,8 +5384,7 @@ sap.ui.define([
 			.returns(oGroupLock);
 		oBindingMock.expects("createInCache")
 			.withExactArgs(sinon.match.same(oGroupLock), oCreatePathMatcher, "/EMPLOYEES",
-				sinon.match(rTransientPredicate), undefined,
-				false, sinon.match.func, sinon.match.func)
+				sinon.match(rTransientPredicate), {}, false, sinon.match.func, sinon.match.func)
 			.returns(SyncPromise.resolve(Promise.resolve({})));
 		this.mock(Context).expects("create")
 			.withExactArgs(sinon.match.same(oBinding.oModel),
@@ -5448,6 +5477,119 @@ sap.ui.define([
 		]);
 	});
 
+	//*********************************************************************************************
+	QUnit.test("create: recursive hierarchy, restrictions not met", function (assert) {
+		var oBinding = this.bindList("/EMPLOYEES");
+
+		// Note: autoExpandSelect at model would be required for hierarchyQualifier, but that leads
+		// too far :-(
+		oBinding.mParameters.$$aggregation = {hierarchyQualifier : "X"};
+
+		assert.throws(function () {
+			// code under test
+			oBinding.create();
+		}, new Error("Missing bSkipRefresh"));
+
+		assert.throws(function () {
+			// code under test
+			oBinding.create(null, true, false);
+		}, new Error("Only the parameters oInitialData and bSkipRefresh are supported"));
+
+		assert.throws(function () {
+			// code under test
+			oBinding.create(null, true, undefined, undefined);
+		}, new Error("Only the parameters oInitialData and bSkipRefresh are supported"));
+
+		assert.throws(function () {
+			// code under test
+			oBinding.create({"@$ui5.node.parent" : oBinding.getHeaderContext()}, true);
+		}, new Error("Invalid parent context: /EMPLOYEES"));
+
+		const oParentContext = {
+				isExpanded : mustBeMocked,
+				toString : function () { return "~toString~"; } // cannot be mocked?
+			};
+		this.mock(oParentContext).expects("isExpanded").withExactArgs().returns(false);
+		oBinding.aContexts.push(oParentContext);
+
+		assert.throws(function () {
+			// code under test
+			oBinding.create({"@$ui5.node.parent" : oParentContext}, true);
+		}, new Error("Unsupported collapsed parent: ~toString~"));
+
+		oBinding.mParameters.$$aggregation = {expandTo : 2, hierarchyQualifier : "X"};
+
+		assert.throws(function () {
+			// code under test
+			oBinding.create();
+		}, new Error("Unsupported $$aggregation.expandTo: 2"));
+	});
+
+	//*********************************************************************************************
+[undefined, true].forEach(function (bExpanded) {
+	QUnit.test("create: recursive hierarchy, parent expanded : " + bExpanded, function (assert) {
+		const oBinding = this.bindList("/EMPLOYEES");
+		// Note: autoExpandSelect at model would be required for hierarchyQualifier, but that leads
+		// too far :-(
+		oBinding.mParameters.$$aggregation = {hierarchyQualifier : "X"};
+		oBinding.iMaxLength = 42;
+		this.mock(oBinding).expects("fetchResourcePath").withExactArgs()
+			.returns("~oCreatePathPromise~");
+		this.mock(oBinding).expects("getUpdateGroupId").withExactArgs()
+			.returns("~sGroupId~");
+		this.mock(oBinding).expects("getResolvedPath").withExactArgs()
+			.returns("~sResolvedPath~");
+		this.mock(_Helper).expects("uid").withExactArgs().returns("id-1-23");
+		this.mock(oBinding).expects("checkSuspended").withExactArgs();
+		this.mock(_Helper).expects("isDataAggregation")
+			.withExactArgs(sinon.match.same(oBinding.mParameters)).returns(false);
+		this.mock(oBinding).expects("isTransient").twice().withExactArgs().returns(false);
+		this.mock(oBinding).expects("checkDeepCreate").never();
+		this.mock(oBinding).expects("isRelative").never();
+		const oParentContext = {
+				getCanonicalPath : mustBeMocked,
+				isExpanded : mustBeMocked
+			};
+		oBinding.aContexts.push("0", "1", oParentContext, {iIndex : 3}, undefined, {iIndex : 5});
+		const oInitialData = {"@$ui5.node.parent" : oParentContext};
+		const oEntityData = {};
+		this.mock(_Helper).expects("publicClone")
+			.withExactArgs(sinon.match.same(oInitialData), true).returns(oEntityData);
+		this.mock(oParentContext).expects("getCanonicalPath").withExactArgs()
+			.returns("/canonical/path");
+		this.mock(oParentContext).expects("isExpanded").withExactArgs().returns(bExpanded);
+		this.mock(oBinding).expects("lockGroup")
+			.withExactArgs("~sGroupId~", true, true, sinon.match.func).returns("~oGroupLock~");
+		this.mock(oBinding).expects("createInCache")
+			.withExactArgs("~oGroupLock~", "~oCreatePathPromise~", "~sResolvedPath~",
+				sinon.match(rTransientPredicate),
+				sinon.match.same(oEntityData)
+					.and(sinon.match({"@$ui5.node.parent" : "canonical/path"})),
+				false, sinon.match.func, sinon.match.func)
+			.returns(SyncPromise.resolve(Promise.resolve("~oCreatedEntity~")));
+		const oContext = {fetchValue : mustBeMocked};
+		this.mock(Context).expects("create")
+			.withExactArgs(sinon.match.same(this.oModel), sinon.match.same(oBinding),
+				"~sResolvedPath~($uid=id-1-23)", /*iChildIndex*/3,
+				sinon.match.instanceOf(SyncPromise), undefined)
+			.returns(oContext);
+		this.mock(oContext).expects("fetchValue").withExactArgs()
+			.returns(SyncPromise.resolve()); //TODO
+		this.mock(oBinding).expects("_fireChange")
+			.withExactArgs({reason : ChangeReason.Add});
+
+		// code under test
+		assert.strictEqual(oBinding.create(oInitialData, true), oContext);
+
+		assert.strictEqual(oBinding.iActiveContexts, 0, "unchanged");
+		assert.strictEqual(oBinding.iCreatedContexts, 0, "unchanged");
+		assert.strictEqual(oBinding.bFirstCreateAtEnd, false);
+		assert.strictEqual(oBinding.iMaxLength, 43);
+		assert.deepEqual(oBinding.aContexts,
+			["0", "1", oParentContext, oContext, {iIndex : 4}, undefined, {iIndex : 6}]);
+	});
+});
+
 	//*********************************************************************************************
 	QUnit.test("create and delete with bAtEnd varying", function () {
 		var oBinding = this.bindList("/EMPLOYEES"),
@@ -6357,7 +6499,7 @@ sap.ui.define([
 
 	//*********************************************************************************************
 [false, true].forEach(function (bChanged) {
-	QUnit.test("doFetchQueryOptions: meta path changed = " + bChanged, function (assert) {
+	QUnit.test("doFetchOrGetQueryOptions: meta path changed = " + bChanged, function (assert) {
 		var oBinding = this.bindList("TEAM_2_EMPLOYEES"),
 			oContext = {
 				getPath : function () {}
@@ -6387,14 +6529,14 @@ sap.ui.define([
 			.returns(mMergedQueryOptions);
 
 		// code under test
-		oQueryOptionsPromise = oBinding.doFetchQueryOptions(oContext);
+		oQueryOptionsPromise = oBinding.doFetchOrGetQueryOptions(oContext);
 
 		assert.strictEqual(oBinding.oQueryOptionsPromise, oQueryOptionsPromise);
 		assert.strictEqual(oQueryOptionsPromise.getResult(), mMergedQueryOptions);
 		assert.strictEqual(oQueryOptionsPromise.$metaPath, "/TEAMS");
 
 		// code under test (promise exists, meta path unchanged)
-		assert.strictEqual(oBinding.doFetchQueryOptions(oContext), oQueryOptionsPromise);
+		assert.strictEqual(oBinding.doFetchOrGetQueryOptions(oContext), oQueryOptionsPromise);
 
 		assert.strictEqual(oBinding.oQueryOptionsPromise, oQueryOptionsPromise);
 		assert.strictEqual(oQueryOptionsPromise.$metaPath, "/TEAMS");
@@ -6473,15 +6615,15 @@ sap.ui.define([
 
 	QUnit.test(sTitle, function (assert) {
 		var oAggregationCache = {
-				addKeptElement : function () { throw new Error("must be mocked"); }
+				addKeptElement : mustBeMocked
 			},
 			oAggregationCacheMock = this.mock(oAggregationCache),
 			oBinding = this.bindList("/EMPLOYEES"),
 			oBindingMock = this.mock(oBinding),
 			oCache = { // #setLateQueryOptions must not be called
-				getValue : function () { throw new Error("must be mocked"); },
+				getValue : mustBeMocked,
 				registerChangeListener : function () {},
-				setActive : function () { throw new Error("must be mocked"); }
+				setActive : mustBeMocked
 			},
 			oCacheMock = this.mock(oCache),
 			oGetExpectation,
@@ -6639,7 +6781,7 @@ sap.ui.define([
 			this.mock(oBinding).expects("getQueryOptionsForPath")
 				.withExactArgs("", sinon.match.same(oContext))
 				.returns(oFixture.mInheritedQueryOptions);
-			this.mock(Object).expects("assign")
+			this.mock(_Helper).expects("merge")
 				.withExactArgs({}, sinon.match.same(oFixture.mInheritedQueryOptions),
 					oFixture.mExpectedQueryOptions)
 				.returns(mQueryOptions);
@@ -7743,6 +7885,9 @@ sap.ui.define([
 			sGroupId = "group";
 
 		oBinding.iCurrentEnd = 42;
+		this.mock(_Helper).expects("isDataAggregation").withExactArgs(oBinding.mParameters)
+			.returns(false);
+		this.mock(_AggregationHelper).expects("isAffected").never();
 		oCacheMock.expects("isDeletingInOtherGroup").withExactArgs(sGroupId).returns(false);
 		oCacheMock.expects("getPendingRequestsPromise").withExactArgs().returns(null);
 
@@ -7769,6 +7914,9 @@ sap.ui.define([
 			sGroupId = "group",
 			oGroupLock = {};
 
+		this.mock(_Helper).expects("isDataAggregation").withExactArgs(oBinding.mParameters)
+			.returns(false);
+		this.mock(_AggregationHelper).expects("isAffected").never();
 		oCacheMock.expects("isDeletingInOtherGroup").never();
 		oCacheMock.expects("getPendingRequestsPromise").withExactArgs().returns(null);
 		this.mock(oBinding).expects("lockGroup").withExactArgs(sGroupId).returns(oGroupLock);
@@ -7793,6 +7941,9 @@ sap.ui.define([
 			oBinding = bindList(this, "/Set"),
 			oContext = bHeader ? oBinding.getHeaderContext() : undefined;
 
+		this.mock(_Helper).expects("isDataAggregation").withExactArgs(oBinding.mParameters)
+			.returns(false);
+		this.mock(_AggregationHelper).expects("isAffected").never();
 		oCacheMock.expects("isDeletingInOtherGroup").withExactArgs("group").returns(true);
 		oCacheMock.expects("getPendingRequestsPromise").never();
 		oCacheMock.expects("requestSideEffects").never();
@@ -7816,6 +7967,9 @@ sap.ui.define([
 			}),
 			oPromise;
 
+		this.mock(_Helper).expects("isDataAggregation").withExactArgs(oBinding.mParameters)
+			.returns(false);
+		this.mock(_AggregationHelper).expects("isAffected").never();
 		oCacheMock.expects("isDeletingInOtherGroup").never();
 		oCacheMock.expects("getPendingRequestsPromise").twice().withExactArgs()
 			.returns(oPendingRequestsPromise);
@@ -7911,6 +8065,9 @@ sap.ui.define([
 		oCanceledError.canceled = true;
 		oBinding.iCurrentEnd = 6;
 
+		this.mock(_Helper).expects("isDataAggregation").withExactArgs(oBinding.mParameters)
+			.returns(false);
+		this.mock(_AggregationHelper).expects("isAffected").never();
 		oCacheMock.expects("isDeletingInOtherGroup").exactly(bHeader && bHasCache ? 1 : 0)
 			.withExactArgs(sGroupId).returns(false);
 		oCacheMock.expects("getPendingRequestsPromise").exactly(bHasCache ? 1 : 0).withExactArgs()
@@ -7966,6 +8123,9 @@ sap.ui.define([
 			sGroupId = "group";
 
 		oBinding.iCurrentEnd = 8;
+		this.mock(_Helper).expects("isDataAggregation").withExactArgs(oBinding.mParameters)
+			.returns(false);
+		this.mock(_AggregationHelper).expects("isAffected").never();
 		oCacheMock.expects("isDeletingInOtherGroup").withExactArgs(sGroupId).returns(false);
 		oCacheMock.expects("getPendingRequestsPromise").withExactArgs().returns(null);
 		this.mock(oBinding).expects("keepOnlyVisibleContexts").withExactArgs()
@@ -7993,6 +8153,9 @@ sap.ui.define([
 		var oCacheMock = this.getCacheMock(), // must be called before creating the binding
 			oBinding = bindList(this, "/Set");
 
+		this.mock(_Helper).expects("isDataAggregation").withExactArgs(oBinding.mParameters)
+			.returns(false);
+		this.mock(_AggregationHelper).expects("isAffected").never();
 		oCacheMock.expects("isDeletingInOtherGroup").withExactArgs("group").returns(false);
 		oCacheMock.expects("getPendingRequestsPromise").withExactArgs().returns(null);
 		this.mock(oBinding).expects("lockGroup").never();
@@ -8014,15 +8177,15 @@ sap.ui.define([
 				+ bHeaderContext;
 
 		QUnit.test(sTitle, function (assert) {
-		var oBinding = this.bindList("/Set", undefined, undefined, undefined, {
-				$$aggregation : {} // Note: no hierarchyQualifier!
-			}),
+		var oBinding = this.bindList("/Set"),
 			oContext = bHeaderContext ? oBinding.getHeaderContext() : undefined,
 			aFilters = [],
 			aPaths = [],
 			oPromise,
 			oRefreshPromise = {};
 
+		this.mock(_Helper).expects("isDataAggregation").withExactArgs(oBinding.mParameters)
+			.returns(true);
 		this.mock(oBinding.oCache).expects("requestSideEffects").never();
 		this.mock(oBinding.aFilters).expects("concat").withExactArgs(oBinding.aApplicationFilters)
 			.returns(aFilters);
@@ -8048,10 +8211,10 @@ sap.ui.define([
 
 	//*********************************************************************************************
 	QUnit.test("requestSideEffects with $$aggregation and row context", function (assert) {
-		var oBinding = this.bindList("/Set", undefined, undefined, undefined, {
-				$$aggregation : {} // Note: no hierarchyQualifier!
-			});
+		var oBinding = this.bindList("/Set");
 
+		this.mock(_Helper).expects("isDataAggregation").withExactArgs(oBinding.mParameters)
+			.returns(true);
 		this.mock(oBinding.oCache).expects("requestSideEffects").never();
 		this.mock(oBinding).expects("refreshInternal").never();
 		this.mock(_AggregationHelper).expects("isAffected").never();
@@ -8059,8 +8222,7 @@ sap.ui.define([
 		assert.throws(function () {
 			// code under test
 			oBinding.requestSideEffects("group", [/*aPaths*/], {/*oContext*/});
-		}, new Error(
-			"Must not request side effects for a context of a binding with $$aggregation"));
+		}, new Error("Must not request side effects when using data aggregation"));
 	});
 
 	//*********************************************************************************************
@@ -10446,6 +10608,80 @@ sap.ui.define([
 			oBinding.checkDeepCreate();
 		}, new Error("Invalid path 'SO_2_SOITEM/SOITEM_2_SCHDL' in deep create"));
 	});
+
+	//*********************************************************************************************
+	QUnit.test("onKeepAliveChanged: remove from cache", function () {
+		var oBinding = this.bindList("/SalesOrderList"),
+			oContext = {
+				isDeleted : function () {},
+				isEffectivelyKeptAlive : function () {},
+				getPath : function () {}
+			};
+
+		oBinding.mPreviousContextsByPath = {
+			"/SalesOrderList('1')" : "~" // would actually be the context
+		};
+		this.mock(oContext).expects("isDeleted").withExactArgs().returns(false);
+		this.mock(oContext).expects("getPath").twice()
+			.withExactArgs().returns("/SalesOrderList('1')");
+		this.mock(oContext).expects("isEffectivelyKeptAlive").withExactArgs().returns(false);
+		this.mock(oBinding).expects("destroyPreviousContextsLater")
+			.withExactArgs(["/SalesOrderList('1')"]);
+
+		// code under test
+		oBinding.onKeepAliveChanged(oContext);
+	});
+
+	//*********************************************************************************************
+	QUnit.test("onKeepAliveChanged: deleted", function () {
+		var oBinding = this.bindList("/SalesOrderList"),
+			oContext = {
+				isDeleted : function () {}
+			};
+
+		this.mock(oContext).expects("isDeleted").withExactArgs().returns(true);
+		this.mock(oBinding).expects("destroyPreviousContextsLater").never();
+
+		// code under test
+		oBinding.onKeepAliveChanged(oContext);
+	});
+
+	//*********************************************************************************************
+	QUnit.test("onKeepAliveChanged: in the binding's collection", function () {
+		var oBinding = this.bindList("/SalesOrderList"),
+			oContext = {
+				isDeleted : function () {},
+				getPath : function () {}
+			};
+
+		this.mock(oContext).expects("isDeleted").withExactArgs().returns(false);
+		this.mock(oContext).expects("getPath").withExactArgs().returns("/SalesOrderList('1')");
+		this.mock(oBinding).expects("destroyPreviousContextsLater").never();
+
+		// code under test
+		oBinding.onKeepAliveChanged(oContext);
+	});
+
+	//*********************************************************************************************
+	QUnit.test("onKeepAliveChanged: effectively kept alive", function () {
+		var oBinding = this.bindList("/SalesOrderList"),
+			oContext = {
+				isDeleted : function () {},
+				isEffectivelyKeptAlive : function () {},
+				getPath : function () {}
+			};
+
+		oBinding.mPreviousContextsByPath = {
+			"/SalesOrderList('1')" : oContext
+		};
+		this.mock(oContext).expects("isDeleted").withExactArgs().returns(false);
+		this.mock(oContext).expects("getPath").withExactArgs().returns("/SalesOrderList('1')");
+		this.mock(oContext).expects("isEffectivelyKeptAlive").withExactArgs().returns(true);
+		this.mock(oBinding).expects("destroyPreviousContextsLater").never();
+
+		// code under test
+		oBinding.onKeepAliveChanged(oContext);
+	});
 });
 
 //TODO integration: 2 entity sets with same $expand, but different $select