@openui5/sap.ui.core 1.117.1 → 1.118.0

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

@@ -5,9 +5,10 @@ sap.ui.define([
 	"sap/base/Log",
 	"sap/ui/base/SyncPromise",
 	"sap/ui/core/Configuration",
+	"sap/ui/core/Rendering",
 	"sap/ui/core/cache/CacheManager",
 	"sap/ui/core/message/Message",
-	"sap/ui/core/message/MessageManager",
+	"sap/ui/core/Messaging",
 	"sap/ui/model/Binding",
 	"sap/ui/model/BindingMode",
 	"sap/ui/model/Context",
@@ -23,7 +24,7 @@ sap.ui.define([
 	"sap/ui/model/odata/v4/lib/_Requestor",
 	"sap/ui/core/library",
 	"sap/ui/test/TestUtils"
-], function (Log, SyncPromise, Configuration, CacheManager, Message, MessageManager, Binding,
+], function (Log, SyncPromise, Configuration, Rendering, CacheManager, Message, Messaging, Binding,
 		BindingMode, BaseContext, Model, OperationMode, Context, ODataMetaModel, ODataModel,
 		SubmitMode, _Helper, _MetadataRequestor, _Parser, _Requestor, library, TestUtils) {
 	"use strict";
@@ -567,7 +568,7 @@ sap.ui.define([
 		// code under test
 		oModel.setIgnoreETag("~bIgnoreETag~");
 
-		this.mock(MessageManager).expects("updateMessages")
+		this.mock(Messaging).expects("updateMessages")
 			.withExactArgs("~oldMessages~", "~newMessages~");
 
 		// code under test
@@ -1119,7 +1120,7 @@ sap.ui.define([
 				.twice();
 			oModelMock.expects("reportStateMessages").never();
 			oModelMock.expects("reportTransitionMessages")
-				.once()// add each error only once to the MessageManager
+				.once()// add each error only once to the Messaging
 				.withExactArgs("~extractedMessages~", "resource/path");
 
 			// code under test
@@ -1795,7 +1796,7 @@ sap.ui.define([
 				return oMessage === aMessages[1] && oMessage.transition === true;
 			}), sResourcePath)
 			.returns("~UI5msg1~");
-		this.mock(MessageManager).expects("updateMessages")
+		this.mock(Messaging).expects("updateMessages")
 			.withExactArgs(undefined, sinon.match(["~UI5msg0~", "~UI5msg1~"]));
 
 		// code under test
@@ -1812,7 +1813,7 @@ sap.ui.define([
 	QUnit.test("reportStateMessages", function () {
 		var aBarMessages = ["~rawMessage0~", "~rawMessage1~"],
 			aBazMessages = ["~rawMessage2~"],
-			oMessageManagerMock = this.mock(MessageManager),
+			oMessagingMock = this.mock(Messaging),
 			oModel = this.createModel(),
 			oModelMock = this.mock(oModel);
 
@@ -1822,14 +1823,14 @@ sap.ui.define([
 			.withExactArgs(aBarMessages[1], "Team('42')", "foo/bar").returns("~UI5msg1~");
 		oModelMock.expects("createUI5Message")
 			.withExactArgs(aBazMessages[0], "Team('42')", "foo/baz").returns("~UI5msg2~");
-		oMessageManagerMock.expects("updateMessages")
+		oMessagingMock.expects("updateMessages")
 			.withExactArgs([], ["~UI5msg0~", "~UI5msg1~", "~UI5msg2~"]);
 
 		// code under test
 		oModel.reportStateMessages("Team('42')",
 			{"foo/bar" : aBarMessages, "foo/baz" : aBazMessages});
 
-		oMessageManagerMock.expects("updateMessages").never();
+		oMessagingMock.expects("updateMessages").never();
 
 		// code under test
 		oModel.reportStateMessages("Team('42')", {});
@@ -1846,12 +1847,12 @@ sap.ui.define([
 				"/FOO('3')/NavSingle/Name" : [{}, {}],
 				"/FOO('3')/NavSingleBar/Name" : [{}]
 			},
-			oMessageManagerMock = this.mock(MessageManager),
+			oMessagingMock = this.mock(Messaging),
 			oModel = this.createModel();
 
 		oModel.mMessages = mMessages;
 
-		oMessageManagerMock.expects("updateMessages")
+		oMessagingMock.expects("updateMessages")
 			.withExactArgs(sinon.match.array, sinon.match.array)
 			.callsFake(function (aOldMessages, aNewMessages) {
 				assert.ok(aOldMessages.indexOf(mMessages["/FOO('1')"][0]) >= 0);
@@ -1867,7 +1868,7 @@ sap.ui.define([
 		// code under test
 		oModel.reportStateMessages("FOO('1')", {});
 
-		oMessageManagerMock.expects("updateMessages")
+		oMessagingMock.expects("updateMessages")
 			.withExactArgs(sinon.match.array, sinon.match.array)
 			.callsFake(function (aOldMessages, aNewMessages) {
 				assert.ok(aOldMessages.indexOf(mMessages["/FOO('3')/NavSingle"][0]) >= 0);
@@ -1898,7 +1899,7 @@ sap.ui.define([
 		oModel.mMessages = mMessages;
 		oHelperMock.expects("buildPath").withExactArgs("/FOO", "('1')").returns("/FOO('1')");
 		oHelperMock.expects("buildPath").withExactArgs("/FOO", "('2')").returns("/FOO('2')");
-		this.mock(MessageManager).expects("updateMessages")
+		this.mock(Messaging).expects("updateMessages")
 			.withExactArgs(sinon.match.array, sinon.match.array)
 			.callsFake(function (aOldMessages, aNewMessages) {
 				assert.ok(aOldMessages.indexOf(mMessages["/FOO('1')"][0]) >= 0);
@@ -1930,7 +1931,7 @@ sap.ui.define([
 			oModel = this.createModel();
 
 		oModel.mMessages = mMessages;
-		this.mock(MessageManager).expects("updateMessages")
+		this.mock(Messaging).expects("updateMessages")
 			.withExactArgs(sinon.match.array, sinon.match.array)
 			.callsFake(function (aOldMessages, aNewMessages) {
 				assert.ok(aOldMessages.indexOf(mMessages["/FOO('1')"][0]) >= 0);
@@ -2281,7 +2282,7 @@ sap.ui.define([
 
 	//*********************************************************************************************
 	QUnit.test("addPrerenderingTask: queue", function (assert) {
-		var oExpectation = this.mock(sap.ui.getCore()).expects("addPrerenderingTask")
+		var oExpectation = this.mock(Rendering).expects("addPrerenderingTask")
 				.withExactArgs(sinon.match.func),
 			fnFirstPrerenderingTask = "first",
 			fnPrerenderingTask0 = "0",
@@ -2323,7 +2324,7 @@ sap.ui.define([
 				oModel.addPrerenderingTask(fnLastTask);
 			});
 
-		oAddTaskMock = this.mock(sap.ui.getCore()).expects("addPrerenderingTask")
+		oAddTaskMock = this.mock(Rendering).expects("addPrerenderingTask")
 			.withExactArgs(sinon.match.func);
 		this.mock(window).expects("setTimeout").withExactArgs(sinon.match.func, 0).returns(42);
 		oModel.addPrerenderingTask(fnPrerenderingTask0);
@@ -2363,7 +2364,7 @@ sap.ui.define([
 			fnTask = this.spy(),
 			oWindowMock = this.mock(window);
 
-		oAddTaskExpectation = this.mock(sap.ui.getCore()).expects("addPrerenderingTask")
+		oAddTaskExpectation = this.mock(Rendering).expects("addPrerenderingTask")
 			.withExactArgs(sinon.match.func);
 		oSetTimeoutExpectation = oWindowMock.expects("setTimeout")
 			.withExactArgs(sinon.match.func, 0);
@@ -2395,7 +2396,7 @@ sap.ui.define([
 			fnTask1 = this.spy(),
 			fnTask2 = "~task~2~";
 
-		oAddTaskExpectation = this.mock(sap.ui.getCore()).expects("addPrerenderingTask").twice()
+		oAddTaskExpectation = this.mock(Rendering).expects("addPrerenderingTask").twice()
 			.withExactArgs(sinon.match.func);
 		oSetTimeoutExpectation = this.mock(window).expects("setTimeout").thrice()
 			.withExactArgs(sinon.match.func, 0);

package/test/sap/ui/core/qunit/odata/v4/lib/_AggregationCache.qunit.js

@@ -375,7 +375,6 @@ sap.ui.define([
 		// "super" call
 		assert.ok(oCache instanceof _AggregationCache, "module value is c'tor function");
 		assert.ok(oCache instanceof _Cache, "_AggregationCache is a _Cache");
-		assert.strictEqual(oCache._delete, null, "disinherit");
 		assert.strictEqual(oCache.addTransientCollection, null, "disinherit");
 		assert.strictEqual(oCache.getAndRemoveValue, null, "disinherit");
 		assert.strictEqual(oCache.oRequestor, this.oRequestor);
@@ -2244,9 +2243,8 @@ sap.ui.define([
 		oCache.aElements.$byPredicate = {};
 		oCache.aElements.$count = 3;
 
-		oCacheMock.expects("fetchValue").exactly(vHasCache === "expanding" ? 0 : 1)
-			.withExactArgs(sinon.match.same(_GroupLock.$cached), "~path~")
-			.returns(SyncPromise.resolve(oGroupNode));
+		oCacheMock.expects("getValue").exactly(vHasCache === "expanding" ? 0 : 1)
+			.withExactArgs("~path~").returns(oGroupNode);
 		this.mock(_AggregationHelper).expects("getOrCreateExpandedObject")
 			.exactly(vHasCache === "expanding" ? 0 : 1)
 			.withExactArgs(sinon.match.same(oAggregation), sinon.match.same(oGroupNode))
@@ -2385,9 +2383,7 @@ sap.ui.define([
 		oCache.aElements.$byPredicate = {};
 		oCache.aElements.$count = 3;
 
-		this.mock(oCache).expects("fetchValue")
-			.withExactArgs(sinon.match.same(_GroupLock.$cached), "~path~")
-			.returns(SyncPromise.resolve(oGroupNode));
+		this.mock(oCache).expects("getValue").withExactArgs("~path~").returns(oGroupNode);
 		this.mock(_AggregationHelper).expects("getOrCreateExpandedObject")
 			.withExactArgs(sinon.match.same(oAggregation), sinon.match.same(oGroupNode))
 			.returns(oExpanded);
@@ -2490,9 +2486,7 @@ sap.ui.define([
 		oCache.aElements = aElements.slice();
 		oCache.aElements.$byPredicate = {};
 		oCache.aElements.$count = 4;
-		oCacheMock.expects("fetchValue")
-			.withExactArgs(sinon.match.same(_GroupLock.$cached), "~path~")
-			.returns(SyncPromise.resolve(oGroupNode));
+		oCacheMock.expects("getValue").withExactArgs("~path~").returns(oGroupNode);
 		oUpdateAllExpectation = this.mock(_Helper).expects("updateAll")
 			.withExactArgs(sinon.match.same(oCache.mChangeListeners), "~path~",
 				sinon.match.same(oGroupNode), {"@$ui5.node.isExpanded" : true})
@@ -2590,9 +2584,7 @@ sap.ui.define([
 		oCache.aElements.$byPredicate = {};
 		oCache.aElements.$count = 3;
 
-		this.mock(oCache).expects("fetchValue")
-			.withExactArgs(sinon.match.same(_GroupLock.$cached), "~path~")
-			.returns(SyncPromise.resolve(oGroupNode));
+		this.mock(oCache).expects("getValue").withExactArgs("~path~").returns(oGroupNode);
 		oUpdateAllExpectation = this.mock(_Helper).expects("updateAll")
 			.withExactArgs(sinon.match.same(oCache.mChangeListeners), "~path~",
 				sinon.match.same(oGroupNode), {"@$ui5.node.isExpanded" : true})
@@ -2653,9 +2645,7 @@ sap.ui.define([
 			},
 			that = this;
 
-		this.mock(oCache).expects("fetchValue")
-			.withExactArgs(sinon.match.same(_GroupLock.$cached), "~path~")
-			.returns(SyncPromise.resolve(oGroupNode));
+		this.mock(oCache).expects("getValue").withExactArgs("~path~").returns(oGroupNode);
 		this.mock(oCache).expects("createGroupLevelCache")
 			.withExactArgs(sinon.match.same(oGroupNode)).returns(oGroupLevelCache);
 		this.mock(oGroupLevelCache).expects("read")
@@ -2695,7 +2685,7 @@ sap.ui.define([
 			};
 
 		oCache.aElements = [oGroupNode];
-		this.mock(oCache).expects("fetchValue").never();
+		this.mock(oCache).expects("getValue").never();
 		this.mock(_Helper).expects("updateAll").never();
 		this.mock(oCache).expects("createGroupLevelCache").never();
 		this.mock(_AggregationHelper).expects("getCollapsedObject")
@@ -2803,9 +2793,7 @@ sap.ui.define([
 			"('3')" : aElements[3],
 			"('4')" : aElements[4]
 		};
-		this.mock(oCache).expects("fetchValue")
-			.withExactArgs(sinon.match.same(_GroupLock.$cached), "~path~")
-			.returns(SyncPromise.resolve(aElements[1]));
+		this.mock(oCache).expects("getValue").withExactArgs("~path~").returns(aElements[1]);
 		this.mock(_Helper).expects("updateAll")
 			.withExactArgs(sinon.match.same(oCache.mChangeListeners), "~path~",
 				sinon.match.same(aElements[1]), sinon.match.same(oCollapsed))
@@ -2855,9 +2843,7 @@ sap.ui.define([
 			}];
 
 		oCache.aElements = aElements.slice(); // simulate a read
-		this.mock(oCache).expects("fetchValue")
-			.withExactArgs(sinon.match.same(_GroupLock.$cached), "~path~")
-			.returns(SyncPromise.resolve(aElements[0]));
+		this.mock(oCache).expects("getValue").withExactArgs("~path~").returns(aElements[0]);
 		this.mock(_AggregationHelper).expects("getCollapsedObject")
 			.withExactArgs(sinon.match.same(aElements[0])).returns(oCollapsed);
 		this.mock(_Helper).expects("getPrivateAnnotation")
@@ -2928,9 +2914,7 @@ sap.ui.define([
 				aSpliced.push(oPlaceholder);
 			}
 		}
-		this.mock(oCache).expects("fetchValue")
-			.withExactArgs(sinon.match.same(_GroupLock.$cached), "~path~")
-			.returns(SyncPromise.resolve(aElements[0]));
+		this.mock(oCache).expects("getValue").withExactArgs("~path~").returns(aElements[0]);
 		// don't care about getCollapsedObject and updateAll here
 
 		// code under test
@@ -2998,9 +2982,7 @@ sap.ui.define([
 			"('2')" : aElements[2],
 			"('3')" : aElements[3]
 		};
-		this.mock(oCache).expects("fetchValue")
-			.withExactArgs(sinon.match.same(_GroupLock.$cached), "~path~")
-			.returns(SyncPromise.resolve(aElements[0]));
+		this.mock(oCache).expects("getValue").withExactArgs("~path~").returns(aElements[0]);
 		// don't care about getCollapsedObject and updateAll here
 
 		// code under test
@@ -3721,12 +3703,15 @@ sap.ui.define([
 	//*********************************************************************************************
 [false, true].forEach(function (bHasGroupLevelCache) {
 	QUnit.test("create: already has group level cache: " + bHasGroupLevelCache, function (assert) {
+		var fnCancelCallback;
+
 		const oCache = _AggregationCache.create(this.oRequestor, "Foo", "", {}, {
 				$ParentNavigationProperty : "myParent",
 				hierarchyQualifier : "X"
 			});
 		const oGroupLevelCache = {
-				create : mustBeMocked
+				create : mustBeMocked,
+				setEmpty : mustBeMocked
 			};
 		const oParentNode = {
 				"@$ui5._" : {cache : bHasGroupLevelCache ? oGroupLevelCache : undefined},
@@ -3735,8 +3720,11 @@ sap.ui.define([
 		oCache.aElements = ["0", "1", oParentNode, "3", "4"];
 		oCache.aElements.$byPredicate = {"('42')" : oParentNode};
 		oCache.aElements.$count = 5;
-		this.mock(oCache).expects("createGroupLevelCache").exactly(bHasGroupLevelCache ? 0 : 1)
+		const oCacheMock = this.mock(oCache);
+		oCacheMock.expects("createGroupLevelCache").exactly(bHasGroupLevelCache ? 0 : 1)
 			.withExactArgs(sinon.match.same(oParentNode)).returns(oGroupLevelCache);
+		this.mock(oGroupLevelCache).expects("setEmpty").exactly(bHasGroupLevelCache ? 0 : 1)
+			.withExactArgs();
 		this.mock(_Helper).expects("updateAll").exactly(bHasGroupLevelCache ? 0 : 1)
 			.withExactArgs(sinon.match.same(oCache.mChangeListeners), "('42')",
 				sinon.match.same(oParentNode), {"@$ui5.node.isExpanded" : true});
@@ -3749,8 +3737,9 @@ sap.ui.define([
 		this.mock(oGroupLevelCache).expects("create")
 			.withExactArgs("~oGroupLock~", "~oPostPathPromise~", "~sPath~", "~sTransientPredicate~",
 				{bar : "~bar~", foo : "~foo~"},
-				false, "~fnErrorCallback~", "~fnSubmitCallback~")
-			.callsFake(() => {
+				false, "~fnErrorCallback~", "~fnSubmitCallback~", sinon.match.func)
+			.callsFake(function () {
+				fnCancelCallback = arguments[8];
 				if (!bHasGroupLevelCache) {
 					assert.strictEqual(_Helper.getPrivateAnnotation(oParentNode, "cache"),
 						oGroupLevelCache);
@@ -3763,18 +3752,21 @@ sap.ui.define([
 					});
 				});
 			});
-		this.mock(oCache).expects("addElements")
+		this.mock(_Helper).expects("makeRelativeUrl").withExactArgs("/Foo('42')", "/Foo")
+			.returns("~relativeUrl~");
+		oCacheMock.expects("addElements")
 			.withExactArgs(sinon.match.same(oEntityData), 3, sinon.match.same(oGroupLevelCache), 0)
 			.callsFake(function () {
 				assert.deepEqual(oCache.aElements, ["0", "1", oParentNode, null, "3", "4"]);
 			});
+		oCacheMock.expects("shiftIndex").withExactArgs(3, +1);
 
 		// code under test
 		const oResult = oCache.create("~oGroupLock~", "~oPostPathPromise~", "~sPath~",
 			"~sTransientPredicate~", oEntityData, /*bAtEndOfCreated*/false, "~fnErrorCallback~",
 			"~fnSubmitCallback~");
 
-		assert.deepEqual(oPostBody, {"myParent@odata.bind" : "Foo('42')"});
+		assert.deepEqual(oPostBody, {"myParent@odata.bind" : "~relativeUrl~"});
 		assert.deepEqual(oEntityData, {
 			"@$ui5._" : {postBody : oPostBody},
 			"@$ui5.node.level" : 24,
@@ -3790,7 +3782,27 @@ sap.ui.define([
 				"('42')" : oParentNode,
 				"('ABC')" : oEntityData
 			});
-		});
+			assert.strictEqual(oCache.aElements.$count, 6);
+
+			oCache.aElements[3] = oEntityData;
+			oCacheMock.expects("shiftIndex").withExactArgs(3, -1)
+				.callsFake(function () {
+					assert.deepEqual(oCache.aElements,
+						["0", "1", oParentNode, oEntityData, "3", "4"], "not yet spliced");
+				});
+			this.mock(_Helper).expects("getPrivateAnnotation")
+				.withExactArgs(sinon.match.same(oEntityData), "transientPredicate")
+				.returns("('42')"); // just testing ;-)
+
+			// code under test
+			fnCancelCallback();
+
+			assert.strictEqual(oCache.aElements.$count, 5);
+			assert.deepEqual(oCache.aElements.$byPredicate, {
+				"('ABC')" : oEntityData
+			});
+			assert.deepEqual(oCache.aElements, ["0", "1", oParentNode, "3", "4"]);
+		}.bind(this));
 	});
 });
 
@@ -3828,4 +3840,228 @@ sap.ui.define([
 			oCache.create(null, null, "", "", {"@$ui5.node.parent" : "Foo('42')"});
 		}, new Error("Unsupported collapsed parent: Foo('42')"));
 	});
+
+	//*********************************************************************************************
+[false, true].forEach(function (bBreak) {
+	QUnit.test(`shiftIndex: break = ${bBreak}`, function (assert) {
+		const oCache = _AggregationCache.create(this.oRequestor, "Foo", "", {}, {
+				hierarchyQualifier : "X"
+			});
+		const oNode = {
+				"@$ui5._" : {parent : "~oGroupLevelCache~"},
+				"@$ui5.node.level" : 24,
+				ID : "node"
+			};
+		const oElementSkip = {
+				"@$ui5._" : {index : -3, parent : "not oGroupLevelCache", placeholder : true},
+				"@$ui5.node.level" : 0, // must be ignored
+				ID : "skip"
+			};
+		const oElementNoBreak = {
+				"@$ui5.node.level" : 24,
+				ID : "no break"
+			};
+		const oElementChange = {
+				"@$ui5._" : {index : 4, parent : "~oGroupLevelCache~"},
+				"@$ui5.node.level" : 24,
+				ID : "change (node)"
+			};
+		const oPlaceholderChange = {
+				"@$ui5._" : {index : 5, parent : "~oGroupLevelCache~", placeholder : true},
+				"@$ui5.node.level" : 0, // must be ignored
+				ID : "change (placeholder)"
+			};
+		const oElementBreak = {
+				"@$ui5.node.level" : bBreak
+					? 23 // looks like sibling of oNode's parent
+					: 24, // no break here (check that for-loop does not "overshoot")
+				ID : "break"
+			};
+		const oElementTrap = { // this is unrealistic and acts as a trap to prove that loop ends
+				"@$ui5._" : {index : 7, parent : "~oGroupLevelCache~", placeholder : true},
+				"@$ui5.node.level" : 0, // must be ignored
+				ID : "trap"
+			};
+		oCache.aElements = ["0", "1", oNode, oElementSkip, oElementNoBreak, oElementChange,
+			oPlaceholderChange, oElementBreak, oElementTrap];
+
+		// code under test
+		oCache.shiftIndex(2, 47);
+
+		assert.deepEqual(oCache.aElements, ["0", "1", {
+			"@$ui5._" : {parent : "~oGroupLevelCache~"},
+			"@$ui5.node.level" : 24,
+			ID : "node"
+		}, {
+			"@$ui5._" : {index : -3, parent : "not oGroupLevelCache", placeholder : true},
+			"@$ui5.node.level" : 0,
+			ID : "skip"
+		}, {
+			"@$ui5.node.level" : 24,
+			ID : "no break"
+		}, {
+			"@$ui5._" : {index : 4 + 47, parent : "~oGroupLevelCache~"},
+			"@$ui5.node.level" : 24,
+			ID : "change (node)"
+		}, {
+			"@$ui5._" : {index : 5 + 47, parent : "~oGroupLevelCache~", placeholder : true},
+			"@$ui5.node.level" : 0,
+			ID : "change (placeholder)"
+		}, {
+			"@$ui5.node.level" : bBreak ? 23 : 24,
+			ID : "break"
+		}, {
+			"@$ui5._" : {
+				index : bBreak ? /*unchanged!*/7 : 7 + 47,
+				parent : "~oGroupLevelCache~",
+				placeholder : true
+			},
+			"@$ui5.node.level" : 0,
+			ID : "trap"
+		}]);
+	});
+});
+
+	//*********************************************************************************************
+[
+	{parentLeaf : false, parentExpand : true},
+	{parentLeaf : false, parentExpand : false, parentMoved : true},
+	{parentLeaf : true, parentExpand : false},
+	{noParent : true}
+].forEach(function (oFixture) {
+	QUnit.test(`_delete: leaf, ${JSON.stringify(oFixture)}`, function (assert) {
+		// Before the delete, the child is at 2 and the parent is at 1 (or missing) - hence the
+		// child's level index is 0 (or 2). When restoring, the level index is 3, and the parent
+		// possibly moved to index 6. So the child must be restored to 3 (no parent), 5 (parent
+		// still at 1) or 10 (parent moved to 6).
+		const oCache = _AggregationCache.create(this.oRequestor, "Foo", "", {}, {
+			hierarchyQualifier : "X"
+		});
+		const fnCallback = sinon.spy();
+		const oLevelCache = {
+			_delete : mustBeMocked,
+			getValue : mustBeMocked
+		};
+		const oParent = {
+			"@$ui5.node.isExpanded" : true
+		};
+
+		if (!oFixture.noParent) {
+			oCache.aElements[1] = oParent;
+		}
+		oCache.aElements[2] = "~oElement~";
+		const oHelperMock = this.mock(_Helper);
+		oHelperMock.expects("getPrivateAnnotation").withExactArgs("~oElement~", "parent")
+			.returns(oLevelCache);
+		oHelperMock.expects("getPrivateAnnotation").withExactArgs("~oElement~", "index")
+			.returns(oFixture.noParent ? 2 : 0);
+		const oLevelCacheMock = this.mock(oLevelCache);
+		const oDeleteExpectation = oLevelCacheMock.expects("_delete")
+			.withExactArgs("~groupLock~", "~editUrl~", oFixture.noParent ? "2" : "0",
+				"~etagEntity~", sinon.match.func)
+			.returns("~promise~");
+
+		assert.strictEqual(
+			// code under test
+			oCache._delete("~groupLock~", "~editUrl~", "2", "~etagEntity~", fnCallback),
+			"~promise~");
+
+		const oCacheMock = this.mock(oCache);
+		const oShiftExpectation1 = oCacheMock.expects("shiftIndex").withExactArgs(2, -1);
+		oHelperMock.expects("getPrivateAnnotation").withExactArgs("~oElement~", "predicate")
+			.returns("~predicate~");
+		const oRemoveExpectation = oCacheMock.expects("removeElement")
+			.withExactArgs(sinon.match.same(oCache.aElements), 2, "~predicate~", "");
+		oLevelCacheMock.expects("getValue").exactly(oFixture.noParent ? 0 : 1)
+			.withExactArgs("$count").returns(oFixture.parentLeaf ? 0 : 5);
+		oHelperMock.expects("getPrivateAnnotation").exactly(oFixture.parentLeaf ? 1 : 0)
+			.withExactArgs(sinon.match.same(oParent), "predicate").returns("~predicate~");
+		oHelperMock.expects("updateAll").exactly(oFixture.parentLeaf ? 1 : 0)
+			.withExactArgs(sinon.match.same(oCache.mChangeListeners), "~predicate~",
+				sinon.match.same(oParent), {"@$ui5.node.isExpanded" : undefined});
+
+		// code under test - callback deleting
+		oDeleteExpectation.firstCall.args[4](0, -1);
+
+		if (oFixture.parentMoved) {
+			delete oCache.aElements[1];
+			oCache.aElements[6] = oParent;
+		}
+		assert.ok(oShiftExpectation1.calledBefore(oRemoveExpectation));
+		assert.strictEqual(fnCallback.callCount, 1);
+		assert.deepEqual(fnCallback.args[0], [2, -1]);
+		if (oFixture.parentLeaf) {
+			assert.notOk("@$ui5.node.isExpanded" in oParent);
+		}
+
+		// parent index is 6 or 1, child index in level cache is 3 (from the callback)
+		let iExpectedIndex = oFixture.parentMoved ? 10 : 5;
+		if (oFixture.noParent) {
+			iExpectedIndex = 3;
+		}
+		const oRestoreExpectation = this.mock(oCache).expects("restoreElement")
+			.withExactArgs(sinon.match.same(oCache.aElements), iExpectedIndex, "~oElement~", "");
+		const oShiftExpectation2 = oCacheMock.expects("shiftIndex")
+			.withExactArgs(iExpectedIndex, 1);
+		oLevelCacheMock.expects("getValue").exactly(oFixture.noParent ? 0 : 1)
+			.withExactArgs("$count").returns(oFixture.parentExpand ? 1 : 5);
+		oHelperMock.expects("getPrivateAnnotation").exactly(oFixture.parentExpand ? 1 : 0)
+			.withExactArgs(sinon.match.same(oParent), "predicate").returns("~predicate~");
+		oHelperMock.expects("updateAll").exactly(oFixture.parentExpand ? 1 : 0)
+			.withExactArgs(sinon.match.same(oCache.mChangeListeners), "~predicate~",
+				sinon.match.same(oParent), {"@$ui5.node.isExpanded" : true});
+
+		// code under test - callback reinserting
+		oDeleteExpectation.firstCall.args[4](3, 1);
+
+		assert.ok(oRestoreExpectation.calledBefore(oShiftExpectation2));
+		assert.strictEqual(fnCallback.callCount, 2);
+		assert.deepEqual(fnCallback.args[1], [iExpectedIndex, 1]);
+	});
+});
+
+	//*********************************************************************************************
+	QUnit.test("_delete: expandTo > 1", function (assert) {
+		const oCache = _AggregationCache.create(this.oRequestor, "Foo", "", {}, {
+				expandTo : 2,
+				hierarchyQualifier : "X"
+			});
+		this.mock(oCache).expects("removeElement").never();
+		this.mock(_Helper).expects("updateAll").never();
+
+		assert.throws(function () {
+			oCache._delete();
+		}, new Error("Unsupported expandTo: 2"));
+	});
+
+	//*********************************************************************************************
+	QUnit.test("_delete: kept-alive not in collection", function (assert) {
+		const oCache = _AggregationCache.create(this.oRequestor, "Foo", "", {}, {
+				hierarchyQualifier : "X"
+			});
+		this.mock(oCache).expects("removeElement").never();
+		this.mock(_Helper).expects("updateAll").never();
+
+		assert.throws(function () {
+			oCache._delete("~oGroupLock~", "~sEditUrl~", "('1')");
+		}, new Error("Unsupported kept-alive entity: Foo('1')"));
+	});
+
+	//*********************************************************************************************
+	QUnit.test("resetChangesForPath", function () {
+		const oCache = _AggregationCache.create(this.oRequestor, "Foo", "", {}, {
+			hierarchyQualifier : "X"
+		});
+		const oElementCache = {
+			resetChangesForPath : mustBeMocked
+		};
+
+		this.mock(oCache).expects("getValue").withExactArgs("~sPath~").returns("~oElement~");
+		this.mock(_Helper).expects("getPrivateAnnotation").withExactArgs("~oElement~", "parent")
+			.returns(oElementCache);
+		this.mock(oElementCache).expects("resetChangesForPath").withExactArgs("~sPath~");
+
+		// code under test
+		oCache.resetChangesForPath("~sPath~");
+	});
 });