@openui5/sap.ui.core 1.124.2 → 1.126.0

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

@@ -2467,7 +2467,7 @@ sap.ui.define([
 		this.mock(this.oModel).expects("resolve").exactly(oFixture.newContext ? 1 : 0)
 			.withExactArgs(oBinding.sPath, sinon.match.same(oContext))
 			.returns("/bar/Suppliers");
-		this.mock(oOldHeaderContext).expects("setSelected").exactly(oFixture.newContext ? 1 : 0)
+		this.mock(oOldHeaderContext).expects("doSetSelected").exactly(oFixture.newContext ? 1 : 0)
 			.withExactArgs(false);
 		this.mock(Context).expects("create").exactly(oFixture.newContext ? 1 : 0)
 			.withExactArgs(sinon.match.same(this.oModel), sinon.match.same(oBinding),
@@ -2508,7 +2508,7 @@ sap.ui.define([
 			oContext = {
 				getBinding : function () {}
 			},
-			oParentBinding = {
+			oParentBinding0 = {
 				isRootBindingSuspended : function () {}
 			};
 
@@ -2524,8 +2524,8 @@ sap.ui.define([
 			.withExactArgs(sinon.match.same(this.oModel), sinon.match.same(oBinding),
 				"/resolved/path")
 			.returns("~headerContext~");
-		this.mock(oContext).expects("getBinding").withExactArgs().returns(oParentBinding);
-		this.mock(oParentBinding).expects("isRootBindingSuspended").withExactArgs().returns(true);
+		this.mock(oContext).expects("getBinding").withExactArgs().returns(oParentBinding0);
+		this.mock(oParentBinding0).expects("isRootBindingSuspended").withExactArgs().returns(true);
 		this.mock(Binding.prototype).expects("setContext").never();
 		this.mock(oBinding).expects("setResumeChangeReason").withExactArgs(ChangeReason.Context);
 
@@ -2745,8 +2745,7 @@ sap.ui.define([
 			aCreatedContexts,
 			aPromises = [],
 			oReadPromise = Promise.reject(oError),
-			that = this,
-			i;
+			that = this;
 
 		function getPath(i) {
 			return "/EMPLOYEES/" + i;
@@ -2759,7 +2758,7 @@ sap.ui.define([
 		oBinding.mPreviousContextsByPath = {
 			"/EMPLOYEES/99" : 99 // not parked by #reset
 		};
-		for (i = 0; i < oBinding.iCreatedContexts; i += 1) {
+		for (let i = 0; i < oBinding.iCreatedContexts; i += 1) {
 			oBinding.aContexts[i] = { // dummy for a created context
 				// for simplicity, ignore bRelative here
 				getPath : getPath.bind(null, i)
@@ -2830,7 +2829,7 @@ sap.ui.define([
 				oBinding.iCreatedContexts = 0;
 				oBinding.aContexts = ["a", "b", "c"];
 				if (bKeepCacheOnError) {
-					for (i = 0; i < oBinding.iCreatedContexts; i += 1) {
+					for (let i = 0; i < oBinding.iCreatedContexts; i += 1) {
 						oBinding.mPreviousContextsByPath[getPath(i)] = i;
 					}
 				}
@@ -3160,7 +3159,7 @@ sap.ui.define([
 		};
 		this.mock(oBinding).expects("lockGroup").withExactArgs("myGroup").returns("~groupLock~");
 		oRefreshKeptElementsCall = this.mock(oNewCache).expects("refreshKeptElements")
-			.withExactArgs("~groupLock~", sinon.match.func, false, "~bIgnorePendingChanges~")
+			.withExactArgs("~groupLock~", sinon.match.func, "~bIgnorePendingChanges~")
 			.returns(bFail
 				? SyncPromise.reject(oError)
 				: SyncPromise.resolve("~result~"));
@@ -3398,7 +3397,8 @@ sap.ui.define([
 			"DataStateChange",
 			"patchCompleted",
 			"patchSent",
-			"refresh"
+			"refresh",
+			"selectionChanged"
 		].forEach(function (sEvent) {
 			oBindingMock.expects("attachEvent")
 				.withExactArgs(sEvent, sinon.match.same(mEventParameters)).returns(oReturn);
@@ -4146,17 +4146,16 @@ sap.ui.define([
 			QUnit.test(sTitle, function (assert) {
 				var oBinding = this.bindList("/EMPLOYEES", {/*oContext*/}),
 					aContexts = [
-						{setSelected : mustBeMocked},
-						{setSelected : mustBeMocked},
-						{setSelected : mustBeMocked}
+						{doSetSelected : mustBeMocked},
+						{doSetSelected : mustBeMocked},
+						{doSetSelected : mustBeMocked}
 					],
 					oContextMock = this.mock(Context),
-					i,
 					sPath,
 					aResults = [
-						{setSelected : mustBeMocked},
-						{setSelected : mustBeMocked},
-						{setSelected : mustBeMocked}
+						{doSetSelected : mustBeMocked},
+						{doSetSelected : mustBeMocked},
+						{doSetSelected : mustBeMocked}
 					],
 					iServerIndex,
 					iStart = 2;
@@ -4172,7 +4171,7 @@ sap.ui.define([
 				}
 				this.mock(oBinding).expects("getResolvedPath").twice().withExactArgs()
 					.returns("~resolved~");
-				for (i = iStart; i < iStart + aResults.length; i += 1) {
+				for (let i = iStart; i < iStart + aResults.length; i += 1) {
 					iServerIndex = bCreated ? i - 1 : i;
 					sPath = "~resolved~" + (bUsePredicates
 						? _Helper.getPrivateAnnotation(aResults[i - iStart], "predicate")
@@ -4181,7 +4180,7 @@ sap.ui.define([
 						.withExactArgs(sinon.match.same(this.oModel), sinon.match.same(oBinding),
 							sPath, iServerIndex)
 						.returns(aContexts[i - iStart]);
-					this.mock(aContexts[i - iStart]).expects("setSelected")
+					this.mock(aContexts[i - iStart]).expects("doSetSelected")
 						.withExactArgs("~selected~");
 				}
 				this.mock(oBinding.oHeaderContext).expects("isSelected").exactly(aContexts.length)
@@ -4190,7 +4189,7 @@ sap.ui.define([
 				// code under test
 				assert.strictEqual(oBinding.createContexts(iStart, aResults), true);
 
-				for (i = iStart; i < iStart + aResults.length; i += 1) {
+				for (let i = iStart; i < iStart + aResults.length; i += 1) {
 					assert.strictEqual(oBinding.aContexts[i], aContexts[i - iStart]);
 				}
 
@@ -4341,7 +4340,7 @@ sap.ui.define([
 		var oBinding = this.bindList("/EMPLOYEES", {/*oContext*/}),
 			oContext1 = Context.create(this.oModel, oBinding, "/EMPLOYEES/1", 1),
 			oContext2 = Context.create(this.oModel, oBinding, "/EMPLOYEES/2", 2),
-			oContext3 = {setSelected : mustBeMocked},
+			oContext3 = {doSetSelected : mustBeMocked},
 			oContextMock = this.mock(Context);
 
 		oBinding.mPreviousContextsByPath = {
@@ -4357,7 +4356,7 @@ sap.ui.define([
 			.returns(oContext3);
 		this.mock(oBinding.oHeaderContext).expects("isSelected")
 			.withExactArgs().returns("~selected~");
-		this.mock(oContext3).expects("setSelected").withExactArgs("~selected~");
+		this.mock(oContext3).expects("doSetSelected").withExactArgs("~selected~");
 		this.mock(this.oModel).expects("addPrerenderingTask")
 			.withExactArgs(sinon.match.func).callsArg(0);
 		this.mock(oBinding).expects("destroyPreviousContexts").withExactArgs(["/EMPLOYEES/0"]);
@@ -4448,7 +4447,7 @@ sap.ui.define([
 		var oBinding = this.bindList("/EMPLOYEES"),
 			oCreatedContext = Context.create(this.oModel, oBinding, "/EMPLOYEES('1')", -1,
 				SyncPromise.resolve()),
-			oNewContext = {setSelected : mustBeMocked};
+			oNewContext = {doSetSelected : mustBeMocked};
 
 		oBinding.mPreviousContextsByPath = {
 			"/EMPLOYEES('1')" : oCreatedContext
@@ -4460,11 +4459,12 @@ sap.ui.define([
 			.returns(oNewContext);
 		this.mock(oBinding.oHeaderContext).expects("isSelected")
 			.withExactArgs().returns("~selected~");
-		this.mock(oNewContext).expects("setSelected").withExactArgs("~selected~");
+		this.mock(oNewContext).expects("doSetSelected").withExactArgs("~selected~");
 		this.mock(this.oModel).expects("addPrerenderingTask")
 			.withExactArgs(sinon.match.func).callsArg(0);
 		this.mock(oCreatedContext).expects("destroy").withExactArgs();
 
+		// code under test
 		oBinding.createContexts(0, [{
 			"@$ui5._" : {predicate : "('1')"}
 		}]);
@@ -4967,7 +4967,7 @@ sap.ui.define([
 		oCreateInCacheExpectation.args[0][6](oError);
 
 		oSetSelectedExpectation = this.mock(oContext0).expects("doSetSelected")
-			.withExactArgs(false);
+			.withExactArgs(false, true);
 		oRemoveCreatedExpectation = oBindingMock.expects("removeCreated")
 			.withExactArgs(sinon.match.same(oContext0));
 
@@ -5487,14 +5487,14 @@ sap.ui.define([
 					created : function () {},
 					fetchValue : function () {},
 					getPath : function () {},
-					setSelected : mustBeMocked,
+					doSetSelected : mustBeMocked,
 					updateAfterCreate : function () {}
 				},
 				oNewContext1 = {
 					created : function () {},
 					fetchValue : function () {},
 					getPath : function () {},
-					setSelected : mustBeMocked,
+					doSetSelected : mustBeMocked,
 					updateAfterCreate : function () {}
 				},
 				bNotAllowed = aAtEnd[0] && !aAtEnd[1],
@@ -5529,7 +5529,7 @@ sap.ui.define([
 				});
 			this.mock(oBinding.oHeaderContext).expects("isSelected").exactly(bNotAllowed ? 1 : 2)
 				.withExactArgs().returns("~selected~");
-			this.mock(oNewContext0).expects("setSelected").withExactArgs("~selected~");
+			this.mock(oNewContext0).expects("doSetSelected").withExactArgs("~selected~");
 			this.mock(oNewContext0).expects("created").exactly(bTransient ? 1 : 0)
 				.withExactArgs()
 				.callsFake(function () {
@@ -5582,7 +5582,7 @@ sap.ui.define([
 						oNewContext1.oCreatedPromise = Promise.resolve(arguments[4]);
 						return oNewContext1;
 					});
-				this.mock(oNewContext1).expects("setSelected").withExactArgs("~selected~");
+				this.mock(oNewContext1).expects("doSetSelected").withExactArgs("~selected~");
 				this.mock(oNewContext1).expects("created").exactly(bTransient ? 1 : 0)
 					.withExactArgs()
 					.callsFake(function () {
@@ -5650,7 +5650,7 @@ sap.ui.define([
 				created : function () {},
 				fetchValue : function () {},
 				getPath : function () { return ""; },
-				setSelected : mustBeMocked,
+				doSetSelected : mustBeMocked,
 				refreshDependentBindings : function () {}
 			};
 
@@ -5670,7 +5670,7 @@ sap.ui.define([
 			.returns(oNewContext);
 		this.mock(oBinding.oHeaderContext).expects("isSelected")
 			.withExactArgs().returns("~selected~");
-		this.mock(oNewContext).expects("setSelected").withExactArgs("~selected~");
+		this.mock(oNewContext).expects("doSetSelected").withExactArgs("~selected~");
 		this.mock(oNewContext).expects("fetchValue").withExactArgs().resolves(undefined);
 		this.mock(_Helper).expects("setPrivateAnnotation").never();
 
@@ -5805,7 +5805,7 @@ sap.ui.define([
 		// Note: autoExpandSelect at model would be required for hierarchyQualifier, but that leads
 		// too far :-(
 		oBinding.mParameters.$$aggregation = {hierarchyQualifier : "X"};
-		oBinding.iMaxLength = 42;
+		oBinding.oCache = {isRefreshNeededAfterCreate : mustBeMocked};
 		this.mock(oBinding).expects("fetchResourcePath").withExactArgs()
 			.returns("~oCreatePathPromise~");
 		this.mock(oBinding).expects("getUpdateGroupId").withExactArgs()
@@ -5821,9 +5821,10 @@ sap.ui.define([
 		this.mock(oBinding).expects("isRelative").never();
 		const oParentContext = {
 				getCanonicalPath : mustBeMocked,
-				isExpanded : mustBeMocked
+				isExpanded : mustBeMocked,
+				iIndex : "~parentIndex~"
 			};
-		oBinding.aContexts.push("0", "1", oParentContext, {iIndex : 3}, undefined, {iIndex : 5});
+		oBinding.aContexts[2] = oParentContext;
 		const oInitialData = {"@$ui5.node.parent" : oParentContext};
 		const oEntityData = {};
 		this.mock(_Helper).expects("publicClone")
@@ -5831,6 +5832,9 @@ sap.ui.define([
 		this.mock(oParentContext).expects("getCanonicalPath").withExactArgs()
 			.returns("/canonical/path");
 		this.mock(oParentContext).expects("isExpanded").withExactArgs().returns(bExpanded);
+		this.mock(oBinding.oCache).expects("isRefreshNeededAfterCreate")
+			.withExactArgs("~parentIndex~")
+			.returns(false);
 		this.mock(oBinding).expects("lockGroup")
 			.withExactArgs("~sGroupId~", true, true, sinon.match.func).returns("~oGroupLock~");
 		this.mock(oBinding).expects("createInCache")
@@ -5840,7 +5844,7 @@ sap.ui.define([
 					.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, setSelected : mustBeMocked};
+		const oContext = {fetchValue : mustBeMocked, doSetSelected : mustBeMocked};
 		this.mock(Context).expects("create")
 			.withExactArgs(sinon.match.same(this.oModel), sinon.match.same(oBinding),
 				"~sResolvedPath~($uid=id-1-23)", /*iChildIndex*/3,
@@ -5848,11 +5852,11 @@ sap.ui.define([
 			.returns(oContext);
 		this.mock(oBinding.oHeaderContext).expects("isSelected")
 			.withExactArgs().returns("~selected~");
-		this.mock(oContext).expects("setSelected").withExactArgs("~selected~");
+		this.mock(oContext).expects("doSetSelected").withExactArgs("~selected~");
 		this.mock(oContext).expects("fetchValue").withExactArgs()
 			.returns(SyncPromise.resolve()); //TODO
-		this.mock(oBinding).expects("_fireChange")
-			.withExactArgs({reason : ChangeReason.Add});
+		this.mock(oBinding).expects("insertContext")
+			.withExactArgs(sinon.match.same(oContext), 3, false);
 
 		// code under test
 		assert.strictEqual(oBinding.create(oInitialData, true), oContext);
@@ -5860,9 +5864,6 @@ sap.ui.define([
 		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}]);
 	});
 });
 
@@ -5873,7 +5874,6 @@ sap.ui.define([
 		// Note: autoExpandSelect at model would be required for hierarchyQualifier, but that leads
 		// too far :-(
 		oBinding.mParameters.$$aggregation = {expandTo : 2, hierarchyQualifier : "X"};
-		oBinding.iMaxLength = 42;
 		this.mock(oBinding).expects("fetchResourcePath").withExactArgs()
 			.returns("~oCreatePathPromise~");
 		this.mock(oBinding).expects("getUpdateGroupId").withExactArgs()
@@ -5887,7 +5887,6 @@ sap.ui.define([
 		this.mock(oBinding).expects("isTransient").twice().withExactArgs().returns(false);
 		this.mock(oBinding).expects("checkDeepCreate").never();
 		this.mock(oBinding).expects("isRelative").never();
-		oBinding.aContexts.push({iIndex : 0}, undefined, {iIndex : 2});
 		this.mock(_Helper).expects("publicClone")
 			.withExactArgs(sinon.match.same(oInitialData), true).returns("~oEntityData~");
 		this.mock(oBinding).expects("lockGroup")
@@ -5897,7 +5896,7 @@ sap.ui.define([
 				sinon.match(rTransientPredicate), "~oEntityData~",
 				false, sinon.match.func, sinon.match.func)
 			.returns(SyncPromise.resolve(Promise.resolve("~oCreatedEntity~")));
-		const oContext = {fetchValue : mustBeMocked, setSelected : mustBeMocked};
+		const oContext = {fetchValue : mustBeMocked, doSetSelected : mustBeMocked};
 		this.mock(Context).expects("create")
 			.withExactArgs(sinon.match.same(this.oModel), sinon.match.same(oBinding),
 				"~sResolvedPath~($uid=id-1-23)", /*iChildIndex*/0,
@@ -5905,11 +5904,11 @@ sap.ui.define([
 			.returns(oContext);
 		this.mock(oBinding.oHeaderContext).expects("isSelected")
 			.withExactArgs().returns("~selected~");
-		this.mock(oContext).expects("setSelected").withExactArgs("~selected~");
+		this.mock(oContext).expects("doSetSelected").withExactArgs("~selected~");
 		this.mock(oContext).expects("fetchValue").withExactArgs()
 			.returns(SyncPromise.resolve()); //TODO
-		this.mock(oBinding).expects("_fireChange")
-			.withExactArgs({reason : ChangeReason.Add});
+		this.mock(oBinding).expects("insertContext")
+			.withExactArgs(sinon.match.same(oContext), 0, false);
 
 		// code under test
 		assert.strictEqual(oBinding.create(oInitialData, true), oContext);
@@ -5917,9 +5916,125 @@ sap.ui.define([
 		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,
-			[oContext, {iIndex : 1}, undefined, {iIndex : 3}]);
+	});
+});
+
+	//*********************************************************************************************
+[undefined, 42].forEach(function (iRank) {
+	[false, true].forEach(function (bRefresh) {
+		const sTitle = "create: recursive hierarchy, createInPlace, rank=" + iRank
+			+ ", refresh=" + bRefresh;
+
+	QUnit.test(sTitle, function (assert) {
+		const oBinding = this.bindList("/EMPLOYEES");
+		// Note: autoExpandSelect at model would be required for hierarchyQualifier, but that leads
+		// too far :-(
+		oBinding.mParameters.$$aggregation = {createInPlace : true, hierarchyQualifier : "X"};
+		oBinding.oCache = {isRefreshNeededAfterCreate : mustBeMocked};
+		this.mock(oBinding).expects("fetchResourcePath").withExactArgs()
+			.returns("~oCreatePathPromise~");
+		this.mock(oBinding).expects("getUpdateGroupId").withExactArgs()
+			.returns("~sGroupId~");
+		this.mock(oBinding).expects("getResolvedPath").withExactArgs()
+			.returns("~sResolvedPath~");
+		const oHelperMock = this.mock(_Helper);
+		oHelperMock.expects("uid").withExactArgs().returns("id-1-23");
+		this.mock(oBinding).expects("checkSuspended").withExactArgs();
+		oHelperMock.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,
+				iIndex : "~parentIndex~"
+			};
+		oBinding.aContexts[2] = oParentContext;
+		const oInitialData = {"@$ui5.node.parent" : oParentContext};
+		const oEntityData = {};
+		oHelperMock.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(undefined);
+		this.mock(oBinding.oCache).expects("isRefreshNeededAfterCreate")
+			.withExactArgs("~parentIndex~")
+			.returns(bRefresh);
+		this.mock(oBinding).expects("lockGroup")
+			.withExactArgs("~sGroupId~", true, true, sinon.match.func).returns("~oGroupLock~");
+		const oContext = {
+			destroy : mustBeMocked,
+			fetchValue : mustBeMocked,
+			doSetSelected : mustBeMocked,
+			updateAfterCreate : mustBeMocked
+		};
+		const oCreatePromise = new SyncPromise((resolve) => {
+			setTimeout(() => {
+				oHelperMock.expects("getPrivateAnnotation")
+					.withExactArgs("~oCreatedEntity~", "predicate")
+					.returns("~sPredicate~");
+				this.mock(oBinding).expects("adjustPredicate")
+					.withExactArgs("($uid=id-1-23)", "~sPredicate~", sinon.match.same(oContext));
+				this.mock(oBinding).expects("fireEvent")
+					.withExactArgs("createCompleted",
+						{context : sinon.match.same(oContext), success : true});
+				oHelperMock.expects("getPrivateAnnotation")
+					.withExactArgs("~oCreatedEntity~", "rank")
+					.returns(iRank);
+				const bUseContext = iRank && !bRefresh;
+				this.mock(oContext).expects("destroy").exactly(bUseContext ? 0 : 1).withExactArgs();
+				this.mock(oBinding).expects("insertContext").exactly(bUseContext ? 1 : 0)
+					.withExactArgs(sinon.match.same(oContext), 42);
+				oHelperMock.expects("getPrivateAnnotation").exactly(bUseContext ? 1 : 0)
+					.withExactArgs("~oCreatedEntity~", "deepCreate").returns(false);
+				oHelperMock.expects("deletePrivateAnnotation").exactly(bUseContext ? 1 : 0)
+					.withExactArgs("~oCreatedEntity~", "deepCreate");
+				this.mock(oBinding).expects("getGroupId").exactly(bUseContext ? 1 : 0)
+					.withExactArgs().returns("~sGroupId~");
+				this.mock(this.oModel).expects("isApiGroup").exactly(bUseContext ? 1 : 0)
+					.withExactArgs("~sGroupId~").returns(false);
+				this.mock(oContext).expects("updateAfterCreate").exactly(bUseContext ? 1 : 0)
+					.withExactArgs(true, "~sGroupId~");
+
+				resolve("~oCreatedEntity~");
+			}, 0);
+		});
+		this.mock(oBinding).expects("createInCache")
+			.withExactArgs("~oGroupLock~", "~oCreatePathPromise~", "~sResolvedPath~",
+				sinon.match(rTransientPredicate), sinon.match.same(oEntityData),
+				false, sinon.match.func, sinon.match.func)
+			.returns(oCreatePromise);
+		this.mock(oBinding).expects("requestSideEffects").exactly(bRefresh ? 1 : 0)
+			.withExactArgs("~sGroupId~", [""])
+			.resolves("~refreshResult~");
+		this.mock(Context).expects("create")
+			.withExactArgs(sinon.match.same(this.oModel), sinon.match.same(oBinding),
+				"~sResolvedPath~($uid=id-1-23)", /*iIndex*/undefined,
+				sinon.match(function (oCreatePromise0) {
+					oCreatePromise0.then(function (vResult) {
+						assert.deepEqual(vResult,
+							// createInCache's oCreatePromise resolves with no defined result
+							bRefresh ? [undefined, "~refreshResult~"] : undefined);
+					});
+					return oCreatePromise0 instanceof SyncPromise;
+				}), undefined)
+			.returns(oContext);
+		this.mock(oBinding.oHeaderContext).expects("isSelected")
+			.withExactArgs().returns("~selected~");
+		this.mock(oContext).expects("doSetSelected").withExactArgs("~selected~");
+		this.mock(oContext).expects("fetchValue").never();
+		this.mock(oBinding).expects("_fireChange").never();
+
+		// 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);
+
+		return oCreatePromise;
+	});
 	});
 });
 
@@ -6055,7 +6170,7 @@ sap.ui.define([
 		oContext.created().catch(function (oError) {
 			assert.ok(oError.canceled, "create promise rejected with 'canceled'");
 		});
-		this.mock(oContext).expects("doSetSelected").withExactArgs(false);
+		this.mock(oContext).expects("doSetSelected").withExactArgs(false, true);
 		this.mock(oBinding).expects("removeCreated").withExactArgs(sinon.match.same(oContext))
 			.callThrough();
 		oBindingMock.expects("deleteFromCache").callsFake(function () {
@@ -8485,11 +8600,11 @@ sap.ui.define([
 		function expectVisitAndRefresh(aPromises) {
 			that.mock(oBinding).expects("visitSideEffects").withExactArgs(sGroupId,
 					sinon.match.same(aPaths), bHeader ? undefined : oContext, aPromises)
-				.callsFake(function (_sGroupId, _aPaths, _oContext, aPromises) {
-					aPromises.push(Promise.resolve());
-					aPromises.push(Promise.reject(oCanceledError));
+				.callsFake(function (_sGroupId, _aPaths, _oContext, aPromises0) {
+					aPromises0.push(Promise.resolve());
+					aPromises0.push(Promise.reject(oCanceledError));
 					if (bRecursionRejects) {
-						aPromises.push(Promise.reject(oError));
+						aPromises0.push(Promise.reject(oError));
 					}
 				});
 			that.mock(oBinding).expects("refreshDependentListBindingsWithoutCache")
@@ -9563,12 +9678,13 @@ sap.ui.define([
 						+ ", count=" + iCount + ", silent=" + bSilent;
 
 	if (!bSuccess && iCount === 0 || bDataRequested && iCount < 0) {
-		return; // ignore useless combinations
+		return; // skip useless combinations
 	}
 
 	QUnit.test(sTitle, function (assert) {
 		var oBinding = this.bindList("/EMPLOYEES"),
 			oContext = {
+				iIndex : "~iIndex~",
 				getModelIndex : function () {},
 				getPath : function () {},
 				toString : function () { return "~context~"; }
@@ -9585,6 +9701,7 @@ sap.ui.define([
 		oBinding.oCache = { // simulate an aggregation cache
 			expand : function () {}
 		};
+		oBinding.aContexts["~iIndex~"] = oContext;
 
 		this.mock(oBinding).expects("checkSuspended").withExactArgs();
 		this.mock(oBinding).expects("lockGroup").withExactArgs().returns(oGroupLock);
@@ -9654,6 +9771,22 @@ sap.ui.define([
 	});
 });
 
+	//*********************************************************************************************
+	QUnit.test("expand: Not currently part of the hierarchy", function (assert) {
+		const oBinding = this.bindList("/EMPLOYEES");
+		const oContext = {
+			iIndex : 0,
+			toString : () => "~oContext~"
+		};
+
+		oBinding.aContexts = [, oContext];
+
+		assert.throws(function () {
+			// code under test
+			oBinding.expand(oContext);
+		}, new Error("Not currently part of the hierarchy: ~oContext~"));
+	});
+
 	//*********************************************************************************************
 	QUnit.test("insertGap", function (assert) {
 		const _ = undefined;
@@ -9710,12 +9843,12 @@ sap.ui.define([
 		var oBinding = this.bindList("/EMPLOYEES"),
 			oCollapseExpectation,
 			oContext = {
+				iIndex : "~iIndex~",
 				getModelIndex : function () {},
 				getPath : function () {}
 			},
 			aContextsBefore,
-			oFireChangeExpectation,
-			i;
+			oFireChangeExpectation;
 
 		// create a context dummy object with index i
 		function createContextDummy(i) {
@@ -9733,10 +9866,11 @@ sap.ui.define([
 		oBinding.oCache = { // simulate an aggregation cache
 			collapse : function () {}
 		};
-		for (i = 0; i < 8; i += 1) {
+		for (let i = 0; i < 8; i += 1) {
 			// with gap at 6
 			oBinding.aContexts.push(i === 6 ? undefined : createContextDummy(i));
 		}
+		oBinding.aContexts["~iIndex~"] = oContext;
 		oBinding.iMaxLength = 8;
 		aContextsBefore = oBinding.aContexts.slice();
 		assert.deepEqual(oBinding.mPreviousContextsByPath, {});
@@ -9767,9 +9901,9 @@ sap.ui.define([
 			assert.strictEqual(oBinding.aContexts[4], aContextsBefore[7], "4");
 			assert.strictEqual(oBinding.aContexts.length, 5);
 			assert.strictEqual(oBinding.iMaxLength, 5);
-			oBinding.aContexts.forEach(function (oContext, iIndex) {
+			oBinding.aContexts.forEach(function (oContext0, iIndex) {
 				if (iIndex !== 3) { // 6 - iCount
-					assert.strictEqual(oContext.iIndex, iIndex);
+					assert.strictEqual(oContext0.iIndex, iIndex);
 				}
 			});
 			assert.deepEqual(oBinding.mPreviousContextsByPath, {
@@ -9780,10 +9914,10 @@ sap.ui.define([
 		} else {
 			assert.strictEqual(oBinding.iMaxLength, 8);
 			assert.strictEqual(oBinding.aContexts.length, 8);
-			oBinding.aContexts.forEach(function (oContext, iIndex) {
+			oBinding.aContexts.forEach(function (oContext0, iIndex) {
 				if (iIndex !== 6) {
-					assert.strictEqual(oContext.iIndex, iIndex);
-					assert.strictEqual(oContext.getPath(), "/EMPLOYEES/" + iIndex);
+					assert.strictEqual(oContext0.iIndex, iIndex);
+					assert.strictEqual(oContext0.getPath(), "/EMPLOYEES/" + iIndex);
 				}
 			});
 			assert.deepEqual(oBinding.mPreviousContextsByPath, {});
@@ -9793,6 +9927,22 @@ sap.ui.define([
 	});
 });
 
+	//*********************************************************************************************
+	QUnit.test("collapse: Not currently part of the hierarchy", function (assert) {
+		const oBinding = this.bindList("/EMPLOYEES");
+		const oContext = {
+			iIndex : 0,
+			toString : () => "~oContext~"
+		};
+
+		oBinding.aContexts = [, oContext];
+
+		assert.throws(function () {
+			// code under test
+			oBinding.collapse(oContext);
+		}, new Error("Not currently part of the hierarchy: ~oContext~"));
+	});
+
 	//*********************************************************************************************
 	QUnit.test("resetKeepAlive", function () {
 		var oBinding = this.bindList("/EMPLOYEES"),
@@ -10427,6 +10577,17 @@ sap.ui.define([
 		assert.strictEqual(oBinding.iActiveContexts, 41);
 	});
 
+	//*********************************************************************************************
+	QUnit.test("fireSelectionChanged", function () {
+		const oBinding = this.bindList("/EMPLOYEES");
+
+		this.mock(oBinding).expects("fireEvent")
+			.withExactArgs("selectionChanged", {context : "~oContext~"});
+
+		// code under test
+		oBinding.fireSelectionChanged("~oContext~");
+	});
+
 	//*********************************************************************************************
 [false, true].forEach(function (bFireChange) {
 	QUnit.test("getAllCurrentContexts: bFireChange = " + bFireChange, function (assert) {
@@ -11078,7 +11239,7 @@ sap.ui.define([
 [false, true].forEach((bIsExpanded) => {
 	[1, 4].forEach((iCount) => {
 		[false, true].forEach((bMakeRoot) => {
-			[23, 42, 101, 999].forEach((iNewIndex) => {
+			[23, 42].forEach((iNewIndex) => {
 				const sTitle = `move: expanded=${bIsExpanded}, child nodes added=${iCount},
  make root=${bMakeRoot}, new index=${iNewIndex}`;
 
@@ -11104,6 +11265,7 @@ sap.ui.define([
 		// Note: autoExpandSelect at model would be required for hierarchyQualifier, but that leads
 		// too far :-(
 		oBinding.mParameters.$$aggregation = {hierarchyQualifier : "X"};
+		this.mock(oBinding).expects("checkSuspended").withExactArgs();
 		this.mock(oBinding).expects("getUpdateGroupId").withExactArgs().returns("~group~");
 		this.mock(oBinding).expects("lockGroup").withExactArgs("~group~", true, true)
 			.returns("~oGroupLock~");
@@ -11112,7 +11274,7 @@ sap.ui.define([
 		};
 		oBinding.oCache = oCache;
 		this.mock(oCache).expects("move").withExactArgs("~oGroupLock~", "~child~",
-				bMakeRoot ? null : "~parent~", undefined, undefined)
+				bMakeRoot ? null : "~parent~", undefined, undefined, undefined)
 			.returns({promise : new SyncPromise((resolve) => {
 				setTimeout(() => {
 					if (oParentContext) {
@@ -11132,6 +11294,10 @@ sap.ui.define([
 					this.mock(oChildContext).expects("getModelIndex").withExactArgs()
 						.returns(iOldIndex);
 					oBinding.aContexts[iOldIndex] = oChildContext;
+					this.mock(_Helper).expects("insert")
+						.withExactArgs(sinon.match.same(oBinding.aContexts), iNewIndex,
+							sinon.match.same(oChildContext))
+						.callThrough(); // needed for "setIndices"
 					this.mock(oBinding).expects("expand").exactly(bIsExpanded ? 1 : 0)
 						.withExactArgs(sinon.match.same(oChildContext))
 						.returns(SyncPromise.resolve());
@@ -11166,7 +11332,13 @@ sap.ui.define([
 	//*********************************************************************************************
 [false, true].forEach((bMakeRoot) => {
 	[undefined, null, {}].forEach((oSiblingContext) => {
-		const sTitle = `move: refresh; make root=${bMakeRoot}, with sibling=${oSiblingContext}`;
+		[false, true].forEach((bUpdateSiblingIndex) => {
+			const sTitle = `move: refresh; make root=${bMakeRoot}, with sibling=${oSiblingContext}`
+				+ `, update sibling's index=${bUpdateSiblingIndex}`;
+
+			if (bUpdateSiblingIndex && !oSiblingContext) {
+				return;
+			}
 
 	QUnit.test(sTitle, async function (assert) {
 		const oChildContext = {
@@ -11187,9 +11359,13 @@ sap.ui.define([
 		let sSiblingPath = oSiblingContext;
 		if (oSiblingContext) {
 			sSiblingPath = "~sibling~";
+			oSiblingContext.iIndex = "~old~";
 			oSiblingContext.getCanonicalPath = mustBeMocked;
+			oSiblingContext.isEffectivelyKeptAlive = mustBeMocked;
 			this.mock(oSiblingContext).expects("getCanonicalPath").withExactArgs()
 				.returns("/~sibling~");
+			this.mock(oSiblingContext).expects("isEffectivelyKeptAlive").withExactArgs()
+				.returns(bUpdateSiblingIndex);
 		}
 		const oBinding = this.bindList("/EMPLOYEES");
 		// Note: autoExpandSelect at model would be required for hierarchyQualifier, but that leads
@@ -11197,6 +11373,7 @@ sap.ui.define([
 		oBinding.mParameters.$$aggregation = {hierarchyQualifier : "X"};
 		this.mock(oBinding).expects("collapse").never();
 		this.mock(oBinding).expects("expand").never();
+		this.mock(oBinding).expects("checkSuspended").withExactArgs();
 		this.mock(oBinding).expects("getUpdateGroupId").withExactArgs().returns("~group~");
 		this.mock(oBinding).expects("lockGroup").withExactArgs("~group~", true, true)
 			.returns("~oGroupLock~");
@@ -11204,15 +11381,16 @@ sap.ui.define([
 			move : mustBeMocked
 		};
 		oBinding.oCache = oCache;
-		const fnGetIndex = sinon.stub().returns("~index~");
+		const fnGetIndices = sinon.stub().returns(["~childIndex~", "~siblingIndex~"]);
 		this.mock(oCache).expects("move")
 			.withExactArgs("~oGroupLock~", "~child~", bMakeRoot ? null : "~parent~", sSiblingPath,
-				bHasSibling ? "~childNonCanonical~" : undefined)
+				bHasSibling ? "~childNonCanonical~" : undefined,
+				oSiblingContext ? bUpdateSiblingIndex : undefined)
 			.returns({promise : "A", refresh : true});
 		this.mock(oBinding).expects("requestSideEffects").withExactArgs("~group~", [""])
 			.returns("B");
 		this.mock(SyncPromise).expects("all").withExactArgs(["A", "B"])
-			.returns(SyncPromise.resolve(Promise.resolve([fnGetIndex])));
+			.returns(SyncPromise.resolve(Promise.resolve([fnGetIndices])));
 		this.mock(oBinding).expects("insertGap").never();
 		this.mock(oBinding).expects("_fireChange").never();
 
@@ -11221,12 +11399,17 @@ sap.ui.define([
 			oSiblingContext);
 
 		assert.strictEqual(oSyncPromise.isPending(), true);
-		assert.notOk(fnGetIndex.called);
+		assert.notOk(fnGetIndices.called);
 
 		await oSyncPromise;
 
-		assert.strictEqual(oChildContext.iIndex, "~index~");
+		assert.strictEqual(oChildContext.iIndex, "~childIndex~");
+		if (oSiblingContext) {
+			assert.strictEqual(oSiblingContext.iIndex,
+				bUpdateSiblingIndex ? "~siblingIndex~" : "~old~");
+		}
 	});
+		});
 	});
 });
 
@@ -11245,6 +11428,7 @@ sap.ui.define([
 		// too far :-(
 		oBinding.mParameters.$$aggregation = {hierarchyQualifier : "X"};
 		this.mock(oBinding).expects("collapse").never();
+		this.mock(oBinding).expects("checkSuspended").withExactArgs();
 		this.mock(oBinding).expects("getUpdateGroupId").withExactArgs().returns("~group~");
 		this.mock(oBinding).expects("lockGroup").withExactArgs("~group~", true, true)
 			.returns("~oGroupLock~");
@@ -11253,7 +11437,7 @@ sap.ui.define([
 		};
 		oBinding.oCache = oCache;
 		this.mock(oCache).expects("move")
-			.withExactArgs("~oGroupLock~", "~child~", "~parent~", undefined, undefined)
+			.withExactArgs("~oGroupLock~", "~child~", "~parent~", undefined, undefined, undefined)
 			.returns({promise : SyncPromise.reject("~error~"), refresh : false});
 		this.mock(oBinding).expects("expand").never();
 
@@ -11277,6 +11461,7 @@ sap.ui.define([
 		// Note: autoExpandSelect at model would be required for hierarchyQualifier, but that leads
 		// too far :-(
 		oBinding.mParameters.$$aggregation = {hierarchyQualifier : "X"};
+		this.mock(oBinding).expects("checkSuspended").withExactArgs();
 		this.mock(oBinding).expects("getUpdateGroupId").withExactArgs().returns("~group~");
 		this.mock(oBinding).expects("lockGroup").withExactArgs("~group~", true, true)
 			.returns("~oGroupLock~");
@@ -11286,13 +11471,16 @@ sap.ui.define([
 		};
 		oBinding.oCache = oCache;
 		this.mock(oCache).expects("move")
-			.withExactArgs("~oGroupLock~", "~child~", null, undefined, undefined)
+			.withExactArgs("~oGroupLock~", "~child~", null, undefined, undefined, undefined)
 			.returns({promise : SyncPromise.resolve([1, 43, "~iCollapseCount~"]), refresh : false});
 		this.mock(oBinding).expects("requestSideEffects").never();
 		this.mock(oBinding).expects("insertGap").never();
 		this.mock(oBinding).expects("collapse")
 			.withExactArgs(sinon.match.same(oChildContext), true, "~iCollapseCount~");
 		this.mock(oChildContext).expects("getModelIndex").withExactArgs().returns(43);
+		this.mock(_Helper).expects("insert")
+			.withExactArgs(sinon.match.same(oBinding.aContexts), 43,
+				sinon.match.same(oChildContext));
 		this.mock(oBinding).expects("expand")
 			.withExactArgs(sinon.match.same(oChildContext))
 			.returns(SyncPromise.reject("~error~"));
@@ -11880,6 +12068,220 @@ sap.ui.define([
 		assert.strictEqual(ODataListBinding.isBelowAggregation(oContext), true);
 	});
 
+	//*********************************************************************************************
+	QUnit.test("fetchOrGetSibling: Missing recursive hierarchy", function (assert) {
+		const oBinding = this.bindList("/EMPLOYEES");
+		this.mock(oBinding).expects("checkSuspended").never();
+
+		assert.throws(function () {
+			// code under test
+			oBinding.fetchOrGetSibling();
+		}, new Error("Missing recursive hierarchy"));
+
+		oBinding.mParameters = {$$aggregation : {}};
+
+		assert.throws(function () {
+			// code under test
+			oBinding.fetchOrGetSibling();
+		}, new Error("Missing recursive hierarchy"));
+	});
+
+	//*********************************************************************************************
+[-2, +2, -3, +3, 0].forEach((iOffset) => {
+	QUnit.test(`fetchOrGetSibling: unsupported offset ${iOffset}`, 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"};
+		this.mock(oBinding).expects("checkSuspended").never();
+
+		assert.throws(function () {
+			// code under test
+			oBinding.fetchOrGetSibling(/*oNode*/null, iOffset);
+		}, new Error("Unsupported offset: " + iOffset));
+	});
+});
+
+	//*********************************************************************************************
+	QUnit.test("fetchOrGetSibling: Unsupported context (deleted)", 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"};
+		const oNode = {
+			iIndex : "~iIndex~",
+			isDeleted : mustBeMocked
+			// NO: isTransient
+		};
+		this.mock(oNode).expects("isDeleted").withExactArgs().returns(true);
+		oBinding.aContexts["~iIndex~"] = oNode;
+		this.mock(oBinding).expects("checkSuspended").never();
+
+		assert.throws(function () {
+			// code under test
+			oBinding.fetchOrGetSibling(oNode, -1);
+		}, new Error("Unsupported context: " + oNode));
+	});
+
+	//*********************************************************************************************
+	QUnit.test("fetchOrGetSibling: Unsupported context (transient)", 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"};
+		const oNode = {
+			iIndex : "~iIndex~",
+			isDeleted : mustBeMocked,
+			isTransient : mustBeMocked
+		};
+		this.mock(oNode).expects("isDeleted").withExactArgs().returns(false);
+		this.mock(oNode).expects("isTransient").withExactArgs().returns(true);
+		oBinding.aContexts["~iIndex~"] = oNode;
+		this.mock(oBinding).expects("checkSuspended").never();
+
+		assert.throws(function () {
+			// code under test
+			oBinding.fetchOrGetSibling(oNode, -1);
+		}, new Error("Unsupported context: " + oNode));
+	});
+
+	//*********************************************************************************************
+	QUnit.test("fetchOrGetSibling: Unsupported context (index)", 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"};
+		const oNode = {
+			iIndex : "~iIndex~",
+			isDeleted : mustBeMocked,
+			isTransient : mustBeMocked
+		};
+		this.mock(oNode).expects("isDeleted").withExactArgs().returns(false);
+		this.mock(oNode).expects("isTransient").withExactArgs().returns(false);
+		oBinding.aContexts["wrong index"] = oNode;
+		this.mock(oBinding).expects("checkSuspended").never();
+
+		assert.throws(function () {
+			// code under test
+			oBinding.fetchOrGetSibling(oNode, -1);
+		}, new Error("Unsupported context: " + oNode));
+	});
+
+	//*********************************************************************************************
+[{in : undefined, out : +1}, {in : +1, out : +1}, {in : -1, out : -1}].forEach((oOffset, i) => {
+	[{in : -1, out : null}, {in : undefined, out : undefined}].forEach((oResult, j) => {
+	QUnit.test(`fetchOrGetSibling: null/undefined #${i},${j}`, 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"};
+		const oNode = {
+			iIndex : "~iIndex~",
+			isDeleted : mustBeMocked,
+			isTransient : mustBeMocked
+		};
+		this.mock(oNode).expects("isDeleted").withExactArgs().returns(false);
+		this.mock(oNode).expects("isTransient").withExactArgs().returns(false);
+		oBinding.aContexts["~iIndex~"] = oNode;
+		const oCheckSuspendedExpectation
+			= this.mock(oBinding).expects("checkSuspended").withExactArgs();
+		this.mock(oBinding).expects("lockGroup").never();
+		const oCache = {
+			getSiblingIndex : mustBeMocked
+		};
+		oBinding.oCache = oCache;
+		const oGetSiblingIndexExpectation = this.mock(oCache).expects("getSiblingIndex")
+			.withExactArgs("~iIndex~", oOffset.out).returns(oResult.in);
+		this.mock(oBinding).expects("fetchContexts").never();
+		this.mock(oBinding).expects("requestContexts").never();
+
+		// code under test
+		assert.strictEqual(oBinding.fetchOrGetSibling(oNode, oOffset.in), oResult.out);
+
+		sinon.assert.callOrder(oCheckSuspendedExpectation, oGetSiblingIndexExpectation);
+	});
+	});
+});
+
+	//*********************************************************************************************
+[0, 1, 42].forEach((iIndex) => {
+	QUnit.test(`fetchOrGetSibling: no request, index = ${iIndex}`, 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"};
+		const oNode = {
+			iIndex : "~iIndex~",
+			isDeleted : mustBeMocked,
+			isTransient : mustBeMocked
+		};
+		this.mock(oNode).expects("isDeleted").withExactArgs().returns(false);
+		this.mock(oNode).expects("isTransient").withExactArgs().returns(false);
+		oBinding.aContexts["~iIndex~"] = oNode;
+		const oCheckSuspendedExpectation
+			= this.mock(oBinding).expects("checkSuspended").withExactArgs();
+		this.mock(oBinding).expects("lockGroup").never();
+		const oCache = {
+			getSiblingIndex : mustBeMocked
+		};
+		oBinding.oCache = oCache;
+		const oGetSiblingIndexExpectation = this.mock(oCache).expects("getSiblingIndex")
+			.withExactArgs("~iIndex~", +1).returns(iIndex);
+		this.mock(oBinding).expects("fetchContexts")
+			.withExactArgs(iIndex, 1, 0, sinon.match.same(_GroupLock.$cached))
+			.callsFake(function () {
+				oBinding.aContexts[iIndex] = "~oSiblingContext~";
+				return "n/a";
+			});
+		this.mock(oBinding).expects("requestContexts").never();
+
+		// code under test
+		assert.strictEqual(oBinding.fetchOrGetSibling(oNode), "~oSiblingContext~");
+
+		sinon.assert.callOrder(oCheckSuspendedExpectation, oGetSiblingIndexExpectation);
+	});
+});
+
+	//*********************************************************************************************
+[false, true].forEach((bNull) => {
+	QUnit.test(`fetchOrGetSibling: request, null=${bNull}`, async 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"};
+		const oNode = {
+			iIndex : "~iIndex~",
+			isDeleted : mustBeMocked,
+			isTransient : mustBeMocked
+		};
+		this.mock(oNode).expects("isDeleted").withExactArgs().returns(false);
+		this.mock(oNode).expects("isTransient").withExactArgs().returns(false);
+		oBinding.aContexts["~iIndex~"] = oNode;
+		const oCheckSuspendedExpectation
+			= this.mock(oBinding).expects("checkSuspended").withExactArgs();
+		this.mock(oBinding).expects("lockGroup").withExactArgs().returns("~oGroupLock~");
+		const oCache = {
+			getSiblingIndex : mustBeMocked,
+			requestSiblingIndex : mustBeMocked
+		};
+		oBinding.oCache = oCache;
+		const oGetSiblingIndexExpectation = this.mock(oCache).expects("getSiblingIndex")
+			.withExactArgs("~iIndex~", -1).returns(undefined);
+		this.mock(oBinding).expects("fetchContexts").never();
+		this.mock(oCache).expects("requestSiblingIndex")
+			.withExactArgs("~iIndex~", -1, "~oGroupLock~").resolves(bNull ? -1 : 42);
+		this.mock(oBinding).expects("requestContexts").exactly(bNull ? 0 : 1)
+			.withExactArgs(42, 1).resolves(["~oSiblingContext~"]);
+
+		// code under test
+		const oPromise = oBinding.fetchOrGetSibling(oNode, -1, true);
+
+		sinon.assert.callOrder(oCheckSuspendedExpectation, oGetSiblingIndexExpectation);
+		assert.ok(oPromise instanceof Promise);
+		assert.strictEqual(await oPromise, bNull ? null : "~oSiblingContext~");
+	});
+});
+
 	//*********************************************************************************************
 	QUnit.test("setResetViaSideEffects ", function (assert) {
 		const oBinding = this.bindList("/SalesOrderList");
@@ -11898,6 +12300,89 @@ sap.ui.define([
 		oBinding.setResetViaSideEffects(true);
 		assert.strictEqual(oBinding.bResetViaSideEffects, false, "true must not win over false");
 	});
+
+	//*********************************************************************************************
+	QUnit.test("insertContext: use index", function (assert) {
+		const oBinding = this.bindList("/EMPLOYEES");
+		oBinding.aContexts = [
+			{iIndex : 0, sName : "foo"},
+			{iIndex : 1, sName : "bar"},
+			undefined,
+			{iIndex : 2, sName : "baz"}
+		];
+		oBinding.iMaxLength = 42;
+
+		this.mock(oBinding).expects("_fireChange").twice()
+			.withExactArgs({reason : ChangeReason.Add});
+
+		// code under test
+		oBinding.insertContext({sName : "created0"}, 1);
+
+		assert.strictEqual(oBinding.iMaxLength, 43);
+		assert.deepEqual(oBinding.aContexts, [
+			{iIndex : 0, sName : "foo"},
+			{sName : "created0"},
+			{iIndex : 2, sName : "bar"},
+			undefined,
+			{iIndex : 3, sName : "baz"}
+		]);
+
+		// code under test
+		oBinding.insertContext({sName : "created1"}, 6);
+
+		assert.strictEqual(oBinding.iMaxLength, 44);
+		assert.deepEqual(oBinding.aContexts, [
+			{iIndex : 0, sName : "foo"},
+			{sName : "created0"},
+			{iIndex : 2, sName : "bar"},
+			undefined,
+			{iIndex : 3, sName : "baz"},
+			undefined,
+			{sName : "created1"}
+		]);
+	});
+
+	//*********************************************************************************************
+[false, true].forEach(function (bAtEnd, i) {
+	QUnit.test("insertContext: add to creation area #" + i, function (assert) {
+		const oBinding = this.bindList("/EMPLOYEES");
+		oBinding.aContexts = [
+			{iIndex : -1, sName : "created0"},
+			{iIndex : 0, sName : "foo"},
+			{iIndex : 1, sName : "bar"}
+		];
+		oBinding.bFirstCreateAtEnd = bAtEnd;
+		oBinding.iMaxLength = 23;
+
+		this.mock(oBinding).expects("_fireChange").twice()
+			.withExactArgs({reason : ChangeReason.Add});
+
+		// code under test: insert at beginning of aContexts
+		oBinding.insertContext({iIndex : -2, sName : "created1"}, /*iIndex*/undefined, bAtEnd);
+
+		assert.strictEqual(oBinding.iMaxLength, 23, "unchanged");
+		assert.deepEqual(oBinding.aContexts, [
+			{iIndex : -2, sName : "created1"},
+			{iIndex : -1, sName : "created0"},
+			{iIndex : 0, sName : "foo"},
+			{iIndex : 1, sName : "bar"}
+		]);
+
+		oBinding.iCreatedContexts = 3; // creation area increases to a third item
+
+		// code under test: insert at end of creation area; adjusting indices
+		oBinding.insertContext({iIndex : -3, sName : "created2"}, /*iIndex*/undefined, !bAtEnd);
+
+		assert.strictEqual(oBinding.iMaxLength, 23, "unchanged");
+		assert.deepEqual(oBinding.aContexts, [
+			{iIndex : -3, sName : "created1"},
+			{iIndex : -2, sName : "created0"},
+			{iIndex : -1, sName : "created2"},
+			{iIndex : 0, sName : "foo"},
+			{iIndex : 1, sName : "bar"}
+		]);
+	});
+});
 });
 
 //TODO integration: 2 entity sets with same $expand, but different $select