Merge "[INTERNAL] sap.ui.model.odata.v4.lib._AggregationCache#expand: iLevels is mandatory"

Author: ThomasChadzelek

src/sap.ui.core/src/sap/ui/model/odata/v4/lib/_AggregationCache.js

@@ -864,7 +864,7 @@ sap.ui.define([
 						}
 						if (_Helper.hasPrivateAnnotation(oElement, "expanding")) {
 							_Helper.deletePrivateAnnotation(oElement, "expanding");
-							iCount += that.expand(_GroupLock.$cached, oElement).getResult();
+							iCount += that.expand(_GroupLock.$cached, oElement, 1).getResult();
 						}
 					}
 				}
@@ -1755,7 +1755,7 @@ sap.ui.define([
 				let iResult = 1;
 				switch (oParentNode ? oParentNode["@$ui5.node.isExpanded"] : true) {
 					case false:
-						iResult = this.expand(_GroupLock.$cached, sParentPredicate).unwrap() + 1;
+						iResult = this.expand(_GroupLock.$cached, sParentPredicate, 1).unwrap() + 1;
 						// fall through
 					case true:
 						break;
@@ -1819,7 +1819,7 @@ sap.ui.define([
 				this.aElements.splice(iNodeIndex, 1);
 				this.aElements.splice(iParentIndex + 1, 0, oNode);
 				if (bExpanded) {
-					this.expand(_GroupLock.$cached, sNodePredicate);
+					this.expand(_GroupLock.$cached, sNodePredicate, 1);
 				}
 			}
 		});

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

@@ -3222,7 +3222,7 @@ sap.ui.define([
 			.withExactArgs(sinon.match.same(oGroupLock), "~path~", "~iLevels~")
 			.callThrough(); // for code under test
 		oCacheMock.expects("expand").exactly(bStale ? 0 : 1)
-			.withExactArgs(sinon.match.same(_GroupLock.$cached), sinon.match.same(aSpliced[2]))
+			.withExactArgs(sinon.match.same(_GroupLock.$cached), sinon.match.same(aSpliced[2]), 1)
 			.returns(SyncPromise.resolve(100));
 		if (bStale) {
 			oCacheMock.expects("isSelectionDifferent")
@@ -5598,7 +5598,7 @@ sap.ui.define([
 		const oCollapseExpectation = oCacheMock.expects("collapse").exactly(bChildExpanded ? 1 : 0)
 			.withExactArgs("('23')").returns("~collapseCount~");
 		oCacheMock.expects("expand").exactly(bNewParentExpanded === false ? 1 : 0)
-			.withExactArgs(sinon.match.same(_GroupLock.$cached), "('42')")
+			.withExactArgs(sinon.match.same(_GroupLock.$cached), "('42')", 1)
 			.returns(SyncPromise.resolve(47));
 		oHelperMock.expects("updateAll")
 			.exactly(oParentNode && bNewParentExpanded === undefined ? 1 : 0)
@@ -7526,7 +7526,7 @@ sap.ui.define([
 				assert.strictEqual(oCache.aElements.indexOf(oNode3), 5, "not yet moved");
 			});
 		this.mock(oCache).expects("expand")
-			.withExactArgs(sinon.match.same(_GroupLock.$cached), "~predicate3~")
+			.withExactArgs(sinon.match.same(_GroupLock.$cached), "~predicate3~", 1)
 			.callsFake(function () {
 				assert.strictEqual(oCache.aElements.indexOf(oNode3), 2,
 					"moved immediately behind parent (snapshot)");