@openui5/sap.ui.core 1.116.0 → 1.117.1

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"));
@@ -4628,8 +4622,6 @@ sap.ui.define([
 			oCreateInCachePromise1 = Promise.resolve({}),
 			oCreatePathPromise = SyncPromise.resolve("~"),
 			oError = {},
-			oInitialData0 = {},
-			oInitialData1 = {},
 			oGroupLock0 = {},
 			oGroupLock1 = {},
 			oLockGroupExpectation,
@@ -4645,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");
@@ -4654,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);
@@ -4669,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);
@@ -4747,7 +4739,6 @@ sap.ui.define([
 		sTitle : "create: absolute"
 	}, {
 		sGroupId : "$auto",
-		oInitialData : {},
 		sTitle : "create: absolute, with initial data"
 	}, {
 		sGroupId : "deferred",
@@ -4813,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")
@@ -4830,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({});
 
@@ -4882,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();
 
@@ -4894,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);
@@ -4929,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 () {
@@ -4975,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",
@@ -5019,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)
@@ -5026,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")
@@ -5050,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);
@@ -5102,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 () {
@@ -5147,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
@@ -5163,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)
@@ -5172,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({});
 
@@ -5181,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);
@@ -5253,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)
@@ -5303,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]);
@@ -5395,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),
@@ -5489,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"),
@@ -6514,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,
@@ -7784,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);
 
@@ -7810,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);
@@ -7834,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();
@@ -7857,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);
@@ -7952,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()
@@ -8007,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()
@@ -8034,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();
@@ -8055,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);
@@ -8089,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();
@@ -8100,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"));
 	});
 
 	//*********************************************************************************************

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

@@ -3264,15 +3264,6 @@ sap.ui.define([
 			entityType : "tea_busi.TEAM",
 			predicate : "(~1)"
 		}]
-	}, { // simple entity in transient context
-		dataPath : "/TEAMS($uid=id-1-23)",
-		canonicalUrl : "/TEAMS(~1)",
-		requests : [{
-			entityType : "tea_busi.TEAM",
-			// TODO a transient entity does not necessarily have all key properties, but this is
-			//      required to create a dependent cache
-			predicate : "(~1)"
-		}]
 	}, { // simple entity by key predicate
 		dataPath : "/TEAMS('4%3D2')",
 		canonicalUrl : "/TEAMS('4%3D2')",
@@ -3498,40 +3489,15 @@ sap.ui.define([
 	}, { // entity set w/o navigation property bindings
 		path : "/ServiceGroups('42')/DefaultSystem|SystemAlias",
 		editUrl : "ServiceGroups('42')/DefaultSystem"
-	}, { // transient predicate
-		path : "/TEAMS($uid=id-1-23)|",
-		fetchPredicates : {
-			"/TEAMS($uid=id-1-23)" : "tea_busi.TEAM"
-		},
-		editUrl : "TEAMS(~0)"
-	}, { // navigation to contained entity within a collection via transient predicate
-		path : "/TEAMS($uid=id-1-23)/TEAM_2_CONTAINED_C($uid=id-1-24)|",
-		fetchPredicates : {
-			"/TEAMS($uid=id-1-23)" : "tea_busi.TEAM",
-			"/TEAMS($uid=id-1-23)/TEAM_2_CONTAINED_C($uid=id-1-24)"
-				: "tea_busi.ContainedC"
-		},
-		editUrl : "TEAMS(~0)/TEAM_2_CONTAINED_C(~1)"
-	}, { // navigation from contained to root entity, resolved via navigation property binding path
-		// via transient predicate
-		path : "/TEAMS($uid=id-1-23)/TEAM_2_CONTAINED_S/S_2_EMPLOYEE|ID",
-		fetchPredicates : {
-			"/TEAMS($uid=id-1-23)/TEAM_2_CONTAINED_S/S_2_EMPLOYEE" : "tea_busi.Worker"
-		},
-		editUrl : "EMPLOYEES(~0)"
-	}, { // decode entity set initially, with transient predicate
-		path : "/T%E2%82%ACAMS($uid=id-1-23)|Name",
-		fetchPredicates : {
-			"/T%E2%82%ACAMS($uid=id-1-23)" : "tea_busi.TEAM"
-		},
-		editUrl : "T%E2%82%ACAMS(~0)"
-	}, { // multiple navigation to root entity via transient predicates
-		path : "/T%E2%82%ACAMS($uid=id-1-23)/TEAM_2_EMPLOYEES($uid=id-2)/EMPLOYEE_2_TEAM|Name",
-		fetchPredicates : {
-			"/T%E2%82%ACAMS($uid=id-1-23)/TEAM_2_EMPLOYEES($uid=id-2)/EMPLOYEE_2_TEAM"
-				: "tea_busi.TEAM"
-		},
-		editUrl : "T%E2%82%ACAMS(~0)"
+	}, { // transient predicate at entity set
+		path : "/TEAMS($uid=id-1-23)|TEAM_2_MANAGER/ID",
+		editUrl : undefined
+	}, { // transient predicate at navigation property
+		path : "/TEAMS('1')/TEAM_2_EMPLOYEES($uid=id-1-23)|EMPLOYEE_2_CONTAINED_S/Id",
+		editUrl : undefined
+	}, { // transient predicate at transient navigation property
+		path : "/TEAMS($uid=id-1-42)/TEAM_2_EMPLOYEES($uid=id-1-23)|EMPLOYEE_2_CONTAINED_S/Id",
+		editUrl : undefined
 	}, { // instance annotation
 		path : "/TEAMS/0|Name@my.annotation",
 		fetchPredicates : {
@@ -3597,27 +3563,6 @@ sap.ui.define([
 	// "com.sap.gateway.default.iwbep.tea_busi_product.v0001.Container/Products(...)"?
 	//TODO type casts, operations?
 
-	//*********************************************************************************************
-	QUnit.test("fetchUpdateData: transient entity", function (assert) {
-		var oContext = Context.create(this.oModel, undefined, "/TEAMS($uid=id-1-23)");
-
-		this.oMetaModelMock.expects("fetchEntityContainer").twice()
-			.returns(SyncPromise.resolve(mScope));
-		// Note: we try to "calculate key predicate" because context path alone is no indication
-		// that entity is still transient!
-		this.mock(oContext).expects("fetchValue").withExactArgs("/TEAMS($uid=id-1-23)")
-			.returns(SyncPromise.resolve({"@$ui5.context.isTransient" : true}));
-
-		// code under test
-		return this.oMetaModel.fetchUpdateData("Name", oContext).then(function (oResult) {
-			assert.deepEqual(oResult, {
-				editUrl : undefined,
-				entityPath : "/TEAMS($uid=id-1-23)",
-				propertyPath : "Name"
-			});
-		});
-	});
-
 	//*********************************************************************************************
 	QUnit.test("fetchUpdateData: bNoEditUrl", function (assert) {
 		var oContext = Context.create(this.oModel, undefined, "/TEAMS('42')");
@@ -4488,6 +4433,12 @@ sap.ui.define([
 		assert.throws(function () {
 			this.oMetaModel.attachRequestSent();
 		}, new Error("Unsupported event 'requestSent': v4.ODataMetaModel#attachEvent"));
+
+		this.mock(MetaModel.prototype).expects("attachEvent").on(this.oMetaModel)
+			.withExactArgs("messageChange", "~oData~", "~fnFunction~", "~oListener~");
+
+		// code under test
+		this.oMetaModel.attachEvent("messageChange", "~oData~", "~fnFunction~", "~oListener~");
 	});
 
 	//*********************************************************************************************
@@ -5245,7 +5196,7 @@ sap.ui.define([
 		// Note: "ab-CD" is derived from Configuration#getLanguageTag here, not from mHeaders!
 		this.mock(_MetadataRequestor).expects("create")
 			.withExactArgs({"Accept-Language" : "ab-CD"}, "4.0", undefined,
-				{"sap-language" : "~sLanguage~"});
+				{"sap-language" : "~sLanguage~"}, undefined);
 
 		// code under test
 		oSharedModel = oMetaModel.getOrCreateSharedModel("../ValueListService/$metadata",
@@ -5286,7 +5237,7 @@ sap.ui.define([
 			.withArgs(false + "/Foo1/ValueListService/").callThrough();
 		// observe metadataUrlParams NOT being passed along
 		this.mock(_MetadataRequestor).expects("create")
-			.withExactArgs({"Accept-Language" : "ab-CD"}, "4.0", undefined, {});
+			.withExactArgs({"Accept-Language" : "ab-CD"}, "4.0", undefined, {}, undefined);
 
 		// code under test
 		oSharedModel = oMetaModel.getOrCreateSharedModel("../ValueListService/$metadata",