@openui5/sap.ui.core 1.124.0 → 1.125.0

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

@@ -385,8 +385,7 @@ sap.ui.define([
 	QUnit.test("mixin", function (assert) {
 		var oBinding = this.bindContext("/EMPLOYEES('42')"),
 			oMixin = {},
-			aOverriddenFunctions = ["adjustPredicate", "destroy", "doDeregisterChangeListener",
-				"doSetProperty", "doSuspend"];
+			aOverriddenFunctions = ["adjustPredicate", "destroy", "doSetProperty", "doSuspend"];
 
 		asODataParentBinding(oMixin);
 
@@ -703,7 +702,10 @@ sap.ui.define([
 		});
 
 		this.mock(oBinding).expects("createReadGroupLock").withExactArgs("group", true)
-			.returns(oGroupLock2);
+			.callsFake(function () {
+				oBinding.oReadGroupLock = oGroupLock2;
+			});
+		this.mock(oBinding.oCache).expects("hasChangeListeners").withExactArgs().returns(true);
 
 		// code under test (as called by ODataBinding#refresh)
 		oBinding.refreshInternal("", "group", true);
@@ -893,8 +895,8 @@ sap.ui.define([
 		this.mock(oBinding).expects("getRelativePath")
 			.withExactArgs("/OperationImport(...)/$Parameter/" + oFixture.path)
 			.returns("$Parameter/" + oFixture.path);
-		this.mock(_Helper).expects("addByPath")
-			.withExactArgs(sinon.match.same(oBinding.oOperation.mChangeListeners), oFixture.path,
+		this.mock(_Helper).expects("registerChangeListener")
+			.withExactArgs(sinon.match.same(oBinding.oOperation), oFixture.path,
 				sinon.match.same(oListener));
 
 		assert.strictEqual(
@@ -961,8 +963,8 @@ sap.ui.define([
 		this.mock(oBinding).expects("getRelativePath")
 			.withExactArgs("/OperationImport(...)/$Parameter/address/city")
 			.returns("$Parameter/address/city");
-		this.mock(_Helper).expects("addByPath")
-			.withExactArgs(sinon.match.same(oBinding.oOperation.mChangeListeners), "address/city",
+		this.mock(_Helper).expects("registerChangeListener")
+			.withExactArgs(sinon.match.same(oBinding.oOperation), "address/city",
 				sinon.match.same(oListener));
 
 		assert.strictEqual(
@@ -3490,7 +3492,9 @@ sap.ui.define([
 				});
 			}),
 			fnFetchCache,
-			oGroupLock = {},
+			oGroupLock = {
+				unlock : mustBeMocked
+			},
 			fnHasChangeListeners,
 			sPath = {/*EMPLOYEES('42')*/},
 			oRefreshResult;
@@ -3504,7 +3508,9 @@ sap.ui.define([
 		fnHasChangeListeners = this.mock(oBinding.oCache).expects("hasChangeListeners")
 			.withExactArgs().returns(bHasChangeListeners);
 		this.mock(oBinding).expects("createReadGroupLock").withExactArgs("myGroup", false)
-			.returns(oGroupLock);
+			.callsFake(function () {
+				oBinding.oReadGroupLock = oGroupLock;
+			});
 		this.mock(oBinding).expects("removeCachesAndMessages")
 			.withExactArgs(sinon.match.same(sPath));
 		fnFetchCache = oBindingMock.expects("fetchCache")
@@ -3512,6 +3518,8 @@ sap.ui.define([
 				bKeepCacheOnError ? "myGroup" : undefined);
 		this.mock(oBinding).expects("createRefreshPromise").exactly(bHasChangeListeners ? 1 : 0)
 			.withExactArgs(bKeepCacheOnError).callThrough();
+		this.mock(oGroupLock).expects("unlock").exactly(bHasChangeListeners ? 0 : 1)
+			.withExactArgs();
 		this.mock(oBinding).expects("refreshDependentBindings")
 			.withExactArgs(sinon.match.same(sPath), "myGroup", sinon.match.same(bCheckUpdate),
 				bKeepCacheOnError)
@@ -3524,6 +3532,7 @@ sap.ui.define([
 			});
 
 		assert.strictEqual(oBinding.bHasFetchedExpandSelectProperties, false);
+		assert.strictEqual(oBinding.oReadGroupLock, bHasChangeListeners ? oGroupLock : undefined);
 		sinon.assert.callOrder(fnHasChangeListeners, fnFetchCache);
 		if (bHasChangeListeners) { // simulate fetchValue invoked by a property binding
 			oBinding.resolveRefreshPromise(Promise.resolve());
@@ -3591,6 +3600,7 @@ sap.ui.define([
 				.callsFake(function () {
 					oBinding.oReadGroupLock = oReadGroupLock;
 				});
+			this.mock(oBinding.oCache).expects("hasChangeListeners").withExactArgs().returns(true);
 			this.mock(_Cache).expects("createSingle").returns(oCache);
 
 			// code under test
@@ -4502,8 +4512,6 @@ sap.ui.define([
 		this.mock(oBinding).expects("getRelativePath")
 			.withExactArgs("/Operation(...)/$Parameter/name")
 			.returns("$Parameter/name");
-		this.mock(_Helper).expects("addByPath")
-			.withExactArgs(sinon.match.same(oBinding.oOperation.mChangeListeners), "name", null);
 
 		// code under test value setting
 		oBinding.setParameter("name", "value");
@@ -5208,37 +5216,6 @@ sap.ui.define([
 		});
 	});
 
-	//*********************************************************************************************
-	QUnit.test("doDeregisterChangeListener: super", function () {
-		const oBinding = this.bindContext("/EMPLOYEES('42')");
-
-		this.mock(asODataParentBinding.prototype).expects("doDeregisterChangeListener")
-			.on(oBinding).withExactArgs("/absolute/path", "~oListener~");
-
-		// code under test
-		oBinding.doDeregisterChangeListener("/absolute/path", "~oListener~");
-	});
-
-	//*********************************************************************************************
-[undefined, "", "relative/path"].forEach(function (sRelativePath, i) {
-	QUnit.test(`doDeregisterChangeListener: operation binding, ${sRelativePath}`, function () {
-		const oBinding = this.bindContext("/Operation(...)");
-
-		this.mock(_Helper).expects("getRelativePath")
-			.withExactArgs("/absolute/path", "/Operation(...)/$Parameter")
-			.returns(sRelativePath);
-		this.mock(_Helper).expects("removeByPath").exactly(i ? 1 : 0)
-			.withExactArgs(sinon.match.same(oBinding.oOperation.mChangeListeners), sRelativePath,
-				"~oListener~");
-		this.mock(asODataParentBinding.prototype).expects("doDeregisterChangeListener")
-			.exactly(i ? 0 : 1)
-			.on(oBinding).withExactArgs("/absolute/path", sinon.match.same("~oListener~"));
-
-		// code under test
-		oBinding.doDeregisterChangeListener("/absolute/path", "~oListener~");
-	});
-});
-
 	//*********************************************************************************************
 	QUnit.test("doSetProperty: non operational binding", function (assert) {
 		var oBinding = this.bindContext("/Employee('42')"),

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

@@ -2593,10 +2593,10 @@ sap.ui.define([
 [
 	{success : true},
 	{success : true, refreshKeptElementsFails : true},
+	{success : true, destroyedWhileRefreshing : true},
 	{success : false}
 ].forEach(function (oFixture) {
-	var sTitle = "refreshInternal: relative with own cache, success=" + oFixture.success
-			+ ", refreshKeptElements fails = " + oFixture.refreshKeptElementsFails;
+	var sTitle = "refreshInternal: relative with own cache, " + JSON.stringify(oFixture);
 
 	QUnit.test(sTitle, function (assert) {
 		var oBinding,
@@ -2639,12 +2639,18 @@ sap.ui.define([
 		this.mock(oBinding).expects("fetchCache")
 			.withExactArgs(sinon.match.same(oContext), false, /*bKeepQueryOptions*/true, undefined);
 		this.mock(oBinding).expects("refreshKeptElements").withExactArgs("myGroup", undefined)
-			.returns(oRefreshKeptElementsPromise);
+			.callsFake(function () {
+				if (oFixture.destroyedWhileRefreshing) {
+					oBinding.oHeaderContext = undefined;
+				}
+				return oRefreshKeptElementsPromise;
+			});
 		this.mock(oBinding).expects("createRefreshPromise").withExactArgs(undefined).callThrough();
 		this.mock(oBinding).expects("reset")
 			.withExactArgs(ChangeReason.Refresh, undefined, "myGroup");
 		this.mock(oBinding.oHeaderContext).expects("checkUpdateInternal")
-			.exactly(oFixture.success && !oFixture.refreshKeptElementsFails ? 1 : 0)
+			.exactly(oFixture.success && !oFixture.refreshKeptElementsFails
+				&& !oFixture.destroyedWhileRefreshing ? 1 : 0)
 			.withExactArgs()
 			.returns(oHeaderContextCheckUpdatePromise);
 
@@ -2657,7 +2663,9 @@ sap.ui.define([
 		return oRefreshResult.then(function (oResult) {
 			assert.ok(oFixture.success);
 			assert.notOk(oFixture.refreshKeptElementsFails);
-			assert.strictEqual(oResult, oHeaderContextCheckUpdatePromise.getResult());
+			if (!oFixture.destroyedWhileRefreshing) {
+				assert.strictEqual(oResult, oHeaderContextCheckUpdatePromise.getResult());
+			}
 		}, function (oError0) {
 			assert.strictEqual(oError0, oError);
 			assert.ok(!oFixture.success || oFixture.refreshKeptElementsFails);
@@ -5759,7 +5767,6 @@ 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;
 		this.mock(oBinding).expects("fetchResourcePath").withExactArgs()
 			.returns("~oCreatePathPromise~");
 		this.mock(oBinding).expects("getUpdateGroupId").withExactArgs()
@@ -5777,7 +5784,7 @@ sap.ui.define([
 				getCanonicalPath : mustBeMocked,
 				isExpanded : mustBeMocked
 			};
-		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")
@@ -5805,8 +5812,8 @@ sap.ui.define([
 		this.mock(oContext).expects("setSelected").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);
@@ -5814,9 +5821,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}]);
 	});
 });
 
@@ -5827,7 +5831,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()
@@ -5841,7 +5844,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")
@@ -5862,8 +5864,8 @@ sap.ui.define([
 		this.mock(oContext).expects("setSelected").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);
@@ -5871,9 +5873,94 @@ 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) {
+	QUnit.test("create: recursive hierarchy, createInPlace, rank=" + iRank, 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"};
+		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();
+		oHelperMock.expects("publicClone")
+			.withExactArgs(undefined, true).returns("~oEntityData~");
+		this.mock(oBinding).expects("lockGroup")
+			.withExactArgs("~sGroupId~", true, true, sinon.match.func).returns("~oGroupLock~");
+		const oContext = {
+			destroy : mustBeMocked,
+			fetchValue : mustBeMocked,
+			setSelected : 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);
+				this.mock(oContext).expects("destroy").exactly(iRank ? 0 : 1).withExactArgs();
+				this.mock(oBinding).expects("insertContext").exactly(iRank ? 1 : 0)
+					.withExactArgs(sinon.match.same(oContext), 42);
+				oHelperMock.expects("getPrivateAnnotation").exactly(iRank ? 1 : 0)
+					.withExactArgs("~oCreatedEntity~", "deepCreate").returns(false);
+				oHelperMock.expects("deletePrivateAnnotation").exactly(iRank ? 1 : 0)
+					.withExactArgs("~oCreatedEntity~", "deepCreate");
+				this.mock(oBinding).expects("getGroupId").exactly(iRank ? 1 : 0)
+					.withExactArgs().returns("~sGroupId~");
+				this.mock(this.oModel).expects("isApiGroup").exactly(iRank ? 1 : 0)
+					.withExactArgs("~sGroupId~").returns(false);
+				this.mock(oContext).expects("updateAfterCreate").exactly(iRank ? 1 : 0)
+					.withExactArgs(true, "~sGroupId~");
+
+				resolve("~oCreatedEntity~");
+			}, 0);
+		});
+		this.mock(oBinding).expects("createInCache")
+			.withExactArgs("~oGroupLock~", "~oCreatePathPromise~", "~sResolvedPath~",
+				sinon.match(rTransientPredicate), "~oEntityData~",
+				false, sinon.match.func, sinon.match.func)
+			.returns(oCreatePromise);
+		this.mock(Context).expects("create")
+			.withExactArgs(sinon.match.same(this.oModel), sinon.match.same(oBinding),
+				"~sResolvedPath~($uid=id-1-23)", /*iIndex*/undefined,
+				sinon.match.instanceOf(SyncPromise), undefined)
+			.returns(oContext);
+		this.mock(oBinding.oHeaderContext).expects("isSelected")
+			.withExactArgs().returns("~selected~");
+		this.mock(oContext).expects("setSelected").withExactArgs("~selected~");
+		this.mock(oContext).expects("fetchValue").never();
+		this.mock(oBinding).expects("_fireChange").never();
+
+		// code under test
+		assert.strictEqual(oBinding.create(/*oInitialData*/ undefined, true), oContext);
+
+		assert.strictEqual(oBinding.iActiveContexts, 0, "unchanged");
+		assert.strictEqual(oBinding.iCreatedContexts, 0, "unchanged");
+		assert.strictEqual(oBinding.bFirstCreateAtEnd, false);
+
+		return oCreatePromise;
 	});
 });
 
@@ -11032,7 +11119,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}`;
 
@@ -11058,6 +11145,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~");
@@ -11086,6 +11174,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());
@@ -11151,6 +11243,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~");
@@ -11199,6 +11292,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~");
@@ -11231,6 +11325,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~");
@@ -11247,6 +11342,9 @@ sap.ui.define([
 		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~"));
@@ -11834,6 +11932,95 @@ sap.ui.define([
 		assert.strictEqual(ODataListBinding.isBelowAggregation(oContext), true);
 	});
 
+	//*********************************************************************************************
+	QUnit.test("requestSibling: Missing recursive hierarchy", function (assert) {
+		const oBinding = this.bindList("/EMPLOYEES");
+		this.mock(oBinding).expects("checkSuspended").never();
+
+		assert.throws(function () {
+			// code under test
+			oBinding.requestSibling();
+		}, new Error("Missing recursive hierarchy"));
+
+		oBinding.mParameters = {$$aggregation : {}};
+
+		assert.throws(function () {
+			// code under test
+			oBinding.requestSibling();
+		}, new Error("Missing recursive hierarchy"));
+	});
+
+	//*********************************************************************************************
+	QUnit.test("requestSibling: Unsupported context", 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 = Context.create({/*oModel*/}, oBinding, "/EMPLOYEES('42')", 42);
+		oBinding.aContexts[41] = oNode; // wrong index
+		this.mock(oBinding).expects("checkSuspended").never();
+
+		assert.throws(function () {
+			// code under test
+			oBinding.requestSibling(oNode);
+		}, new Error("Unsupported context: " + oNode));
+	});
+
+	//*********************************************************************************************
+	QUnit.test("requestSibling: null", 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~"};
+		oBinding.aContexts["~iIndex~"] = oNode;
+		const oCheckSuspendedExpectation
+			= this.mock(oBinding).expects("checkSuspended").withExactArgs();
+		const oCache = {
+			getSiblingIndex : mustBeMocked
+		};
+		oBinding.oCache = oCache;
+		const oGetSiblingIndexExpectation = this.mock(oCache).expects("getSiblingIndex")
+			.withExactArgs("~iIndex~", "~iOffset~").returns(-1);
+		this.mock(oBinding).expects("requestContexts").never();
+
+		// code under test
+		const oPromise = oBinding.requestSibling(oNode, "~iOffset~");
+
+		sinon.assert.callOrder(oCheckSuspendedExpectation, oGetSiblingIndexExpectation);
+		assert.ok(oPromise instanceof Promise);
+		assert.strictEqual(await oPromise, null);
+	});
+
+	//*********************************************************************************************
+[0, 1, 42].forEach((iIndex) => {
+	QUnit.test(`requestSibling: non-null, index = ${iIndex}`, 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~"};
+		oBinding.aContexts["~iIndex~"] = oNode;
+		const oCheckSuspendedExpectation
+			= this.mock(oBinding).expects("checkSuspended").withExactArgs();
+		const oCache = {
+			getSiblingIndex : mustBeMocked
+		};
+		oBinding.oCache = oCache;
+		const oGetSiblingIndexExpectation = this.mock(oCache).expects("getSiblingIndex")
+			.withExactArgs("~iIndex~", "~iOffset~").returns(iIndex);
+		this.mock(oBinding).expects("requestContexts").withExactArgs(iIndex, 1)
+			.resolves(["~oSiblingContext~"]);
+
+		// code under test
+		const oPromise = oBinding.requestSibling(oNode, "~iOffset~");
+
+		sinon.assert.callOrder(oCheckSuspendedExpectation, oGetSiblingIndexExpectation);
+		assert.ok(oPromise instanceof Promise);
+		assert.strictEqual(await oPromise, "~oSiblingContext~");
+	});
+});
+
 	//*********************************************************************************************
 	QUnit.test("setResetViaSideEffects ", function (assert) {
 		const oBinding = this.bindList("/SalesOrderList");
@@ -11852,6 +12039,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