@openui5/sap.ui.core 1.118.0 → 1.119.1

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

@@ -923,9 +923,14 @@ sap.ui.define([
 						"~bIsProperty~");
 
 					assert.strictEqual(oBinding.aChildCanUseCachePromises[0], oPromise);
-					assert.strictEqual(oBinding.mCanUseCachePromiseByChildPath.childPath, oPromise);
-					assert.deepEqual(Object.keys(oBinding.mCanUseCachePromiseByChildPath),
-						["childPath"]);
+					if (bCacheCreationPending) {
+						assert.strictEqual(oBinding.mCanUseCachePromiseByChildPath.childPath,
+							oPromise);
+						assert.deepEqual(Object.keys(oBinding.mCanUseCachePromiseByChildPath),
+							["childPath"]);
+					} else {
+						assert.deepEqual(Object.keys(oBinding.mCanUseCachePromiseByChildPath), []);
+					}
 					return Promise.all([oPromise, oBinding.oCachePromise]).then(function (aResult) {
 						assert.strictEqual(aResult[0],
 							oFixture.hasChildQueryOptions && oFixture.canMergeQueryOptions
@@ -1194,8 +1199,12 @@ sap.ui.define([
 
 		assert.strictEqual(oBinding.aChildCanUseCachePromises[0], oPromise);
 		assert.notStrictEqual(oBinding.oCachePromise, oCachePromise);
-		assert.strictEqual(oBinding.mCanUseCachePromiseByChildPath.childPath, oPromise);
-		assert.deepEqual(Object.keys(oBinding.mCanUseCachePromiseByChildPath), ["childPath"]);
+		if (oFixture.cache === null) {
+			assert.deepEqual(Object.keys(oBinding.mCanUseCachePromiseByChildPath), []);
+		} else {
+			assert.strictEqual(oBinding.mCanUseCachePromiseByChildPath.childPath, oPromise);
+			assert.deepEqual(Object.keys(oBinding.mCanUseCachePromiseByChildPath), ["childPath"]);
+		}
 		return oBinding.oCachePromise.then(function (oCache0) {
 			assert.strictEqual(oPromise.getResult(),
 				oFixture.rejected ? undefined : "/reduced/child/path");
@@ -1747,8 +1756,7 @@ sap.ui.define([
 			"~bIsProperty~");
 
 		assert.strictEqual(oBinding.aChildCanUseCachePromises[0], oPromise);
-		assert.strictEqual(oBinding.mCanUseCachePromiseByChildPath[sPath], oPromise);
-		assert.deepEqual(Object.keys(oBinding.mCanUseCachePromiseByChildPath), [sPath]);
+		assert.deepEqual(Object.keys(oBinding.mCanUseCachePromiseByChildPath), []);
 		return oPromise.then(function (sReducedPath) {
 			assert.strictEqual(sReducedPath, "/reduced/child/path");
 			assert.strictEqual(oBinding.bHasPathReductionToParent, bReduced);
@@ -1914,7 +1922,8 @@ sap.ui.define([
 			fnFetchMetadata = function () {},
 			oParentBinding = new ODataParentBinding(),
 			oBinding = new ODataParentBinding({
-				oCache : undefined,
+				mCanUseCachePromiseByChildPath : {"SOITEMS_2_SO/Note" : "do not use"},
+				oCache : null,
 				oCachePromise : SyncPromise.resolve(Promise.resolve(null)),
 				oContext : {
 					getBinding : function () { return oParentBinding; },
@@ -1989,7 +1998,7 @@ sap.ui.define([
 			"~bIsProperty~");
 
 		assert.strictEqual(oBinding.aChildCanUseCachePromises[0], oPromise);
-		assert.strictEqual(oBinding.mCanUseCachePromiseByChildPath[sChildPath], oPromise);
+		assert.strictEqual(oBinding.mCanUseCachePromiseByChildPath[sChildPath], "do not use");
 		assert.deepEqual(Object.keys(oBinding.mCanUseCachePromiseByChildPath), [sChildPath]);
 		return oPromise.then(function (sReducedPath) {
 			assert.strictEqual(sReducedPath, "/SalesOrderList('42')/Note");
@@ -2021,6 +2030,7 @@ sap.ui.define([
 				getReducedPath : function () {}
 			},
 			oBinding = new ODataParentBinding({
+				oCache : {}, // not null
 				oContext : "do not use",
 				oModel : {
 					getMetaModel : function () { return oMetaModel; },

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

@@ -2299,40 +2299,19 @@ sap.ui.define([
 
 	//*********************************************************************************************
 	QUnit.test("deregisterChangeListener", function () {
-		var oBinding = this.oModel.bindProperty("/EMPLOYEES('1')/AGE"),
-			oMock,
-			oOtherBinding = {
-				doDeregisterChangeListener : function () {}
-			},
-			sPath = "foo";
+		var oBinding = this.oModel.bindProperty("/EMPLOYEES('1')/AGE");
 
-		oMock = this.mock(oBinding).expects("withCache")
-			.withExactArgs(sinon.match.func, "", false, /*bWithOrWithoutCache*/true)
-			.returns(SyncPromise.resolve());
+		oBinding.sReducedPath = "/reduced/path";
+		this.mock(oBinding).expects("doDeregisterChangeListener")
+			.withExactArgs("/reduced/path", sinon.match.same(oBinding));
 
 		// code under test
 		oBinding.deregisterChangeListener();
 
-		this.mock(oOtherBinding).expects("doDeregisterChangeListener")
-			.withExactArgs(sPath, sinon.match.same(oBinding));
+		oBinding.sReducedPath = undefined;
 
-		// code under test - check that the function passed to withCache works as expected
-		oMock.firstCall.args[0](null, sPath, oOtherBinding);
-	});
-
-	//*********************************************************************************************
-	QUnit.test("deregisterChangeListener: withCache rejects sync", function () {
-		var oBinding = this.oModel.bindProperty("/EMPLOYEES('1')/AGE"),
-			oError = new Error("fail intentionally"),
-			fnReporter = sinon.spy();
-
-		this.mock(oBinding).expects("withCache").returns(SyncPromise.reject(oError));
-		this.mock(this.oModel).expects("getReporter").withExactArgs().returns(fnReporter);
-
-		// code under test
+		// code under test - no further doDeregisterChangeListener
 		oBinding.deregisterChangeListener();
-
-		sinon.assert.calledOnceWithExactly(fnReporter, sinon.match.same(oError));
 	});
 
 	//*********************************************************************************************

package/test/sap/ui/core/qunit/odata/v4/data/metadata.json

@@ -169,6 +169,7 @@
 		"TEAM_2_EMPLOYEES" : {
 			"$kind" : "NavigationProperty",
 			"$isCollection" : true,
+			"$Partner" : "EMPLOYEE_2_TEAM",
 			"$Type" : "com.sap.gateway.default.iwbep.tea_busi.v0001.Worker"
 		},
 		"TEAM_2_MANAGER" : {
@@ -259,7 +260,8 @@
 		"EMPLOYEE_2_TEAM" : {
 			"$kind" : "NavigationProperty",
 			"$Type" : "com.sap.gateway.default.iwbep.tea_busi.v0001.TEAM",
-			"$Nullable" : false
+			"$Nullable" : false,
+			"$Partner" : "TEAM_2_EMPLOYEES"
 		},
 		"__CT__FAKE__Message" : {
 			"$kind" : "Property",

package/test/sap/ui/core/qunit/odata/v4/data/metadata.xml

@@ -63,7 +63,7 @@
 				<NavigationProperty Name="EMPLOYEE_2_MANAGER"
 					Type="com.sap.gateway.default.iwbep.tea_busi.v0001.MANAGER"/>
 				<NavigationProperty Name="EMPLOYEE_2_TEAM" Type="com.sap.gateway.default.iwbep.tea_busi.v0001.TEAM"
-					Nullable="false"/>
+					Nullable="false" Partner="TEAM_2_EMPLOYEES"/>
 				<Property Name="__CT__FAKE__Message" Type="SAP__self.__CT__FAKE__Message" />
 				<Annotation Term="com.sap.vocabularies.Common.v1.Messages" Path="__CT__FAKE__Message/__FAKE__Messages" />
 			</EntityType>
@@ -104,7 +104,7 @@
 				<Property Name="MANAGER_ID" Type="Edm.String" Nullable="false" MaxLength="4"/>
 				<Property Name="BudgetCurrency" Type="Edm.String" Nullable="false" MaxLength="5"/>
 				<Property Name="Budget" Type="Edm.Decimal" Nullable="false" Precision="16" Scale="variable"/>
-				<NavigationProperty Name="TEAM_2_EMPLOYEES"
+				<NavigationProperty Name="TEAM_2_EMPLOYEES" Partner="EMPLOYEE_2_TEAM"
 					Type="Collection(com.sap.gateway.default.iwbep.tea_busi.v0001.Worker)"/>
 				<NavigationProperty Name="TEAM_2_MANAGER"
 					Type="com.sap.gateway.default.iwbep.tea_busi.v0001.MANAGER" Nullable="false"/>

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

@@ -376,7 +376,7 @@ sap.ui.define([
 		assert.ok(oCache instanceof _AggregationCache, "module value is c'tor function");
 		assert.ok(oCache instanceof _Cache, "_AggregationCache is a _Cache");
 		assert.strictEqual(oCache.addTransientCollection, null, "disinherit");
-		assert.strictEqual(oCache.getAndRemoveValue, null, "disinherit");
+		assert.strictEqual(oCache.getAndRemoveCollection, null, "disinherit");
 		assert.strictEqual(oCache.oRequestor, this.oRequestor);
 		assert.strictEqual(oCache.sResourcePath, sResourcePath);
 		assert.strictEqual(oCache.mQueryOptions, mQueryOptions);
@@ -721,7 +721,8 @@ sap.ui.define([
 [undefined, {}].forEach(function (oParentGroupNode, i) {
 	QUnit.test("createGroupLevelCache: recursive hierarchy, #" + i, function (assert) {
 		var oAggregation = {
-				hierarchyQualifier : "X"
+				hierarchyQualifier : "X",
+				$metaPath : "/meta/path"
 			},
 			oCache = {},
 			mCacheQueryOptions = {},
@@ -736,7 +737,12 @@ sap.ui.define([
 
 		if (oParentGroupNode) {
 			oParentGroupNode["@$ui5.node.level"] = 2;
-			_Helper.setPrivateAnnotation(oParentGroupNode, "filter", "~filter~");
+			this.mock(_Helper).expects("getPrivateAnnotation")
+				.withExactArgs(sinon.match.same(oParentGroupNode), "filter").returns(undefined);
+			this.mock(oAggregationCache).expects("getTypes").withExactArgs().returns("~getTypes~");
+			this.mock(_Helper).expects("getKeyFilter")
+				.withExactArgs(sinon.match.same(oParentGroupNode), "/meta/path", "~getTypes~")
+				.returns("~filter~");
 		}
 		this.mock(_AggregationHelper).expects("getAllProperties").never();
 		this.mock(_AggregationHelper).expects("filterOrderby").never();
@@ -920,14 +926,6 @@ sap.ui.define([
 			.withExactArgs(sinon.match.same(oElement), "B/myDrillState")
 			.returns(sDrillState);
 		oHelperMock.expects("getKeyFilter").never();
-		if (sDrillState === "collapsed") {
-			oHelperMock.expects("getKeyFilter")
-				.withExactArgs(sinon.match.same(oElement), "/meta/path",
-					sinon.match.same(mTypeForMetaPath))
-				.returns("~filter~");
-			oHelperMock.expects("setPrivateAnnotation")
-				.withExactArgs(sinon.match.same(oElement), "filter", "~filter~");
-		}
 		oHelperMock.expects("deleteProperty")
 			.withExactArgs(sinon.match.same(oElement), "B/myDrillState");
 		oHelperMock.expects("drillDown").exactly(oGroupNode ? 0 : 1)
@@ -2461,22 +2459,26 @@ sap.ui.define([
 					cache : oGroupLevelCache,
 					groupLevelCount : 7,
 					spliced : [{
-						"@$ui5._" : {predicate : "('A')"}
+						"@$ui5._" : {predicate : "('A')"},
+						"@$ui5.node.level" : 10
 					}, {
-						"@$ui5._" : {placeholder : true, predicate : "n/a"}
+						"@$ui5._" : {placeholder : true, predicate : "n/a"},
+						"@$ui5.node.level" : 11
 					}, {
-						"@$ui5._" : {expanding : true, predicate : "('C')"}
+						"@$ui5._" : {expanding : true, predicate : "('C')"},
+						"@$ui5.node.level" : 12
 					}]
 				},
 				"@$ui5.node.isExpanded" : false,
-				"@$ui5.node.level" : 0
+				"@$ui5.node.level" : 5
 			},
 			oPromise,
 			aSpliced,
 			oUpdateAllExpectation;
 
 		oGroupNode["@$ui5._"].spliced[200000] = {
-			"@$ui5._" : {predicate : "('D')"}
+			"@$ui5._" : {predicate : "('D')"},
+			"@$ui5.node.level" : 10
 		};
 		aSpliced = oGroupNode["@$ui5._"].spliced.slice();
 		if (bStale) {
@@ -2527,11 +2529,15 @@ sap.ui.define([
 			assert.deepEqual(Object.keys(oCache.aElements),
 				["0", "1", "2", "3", "4", "200002", "200003", "200004", "$byPredicate", "$count"]);
 			assert.strictEqual(oCache.aElements[2], aSpliced[0]);
+			assert.strictEqual(aSpliced[0]["@$ui5.node.level"], 6);
 			assert.strictEqual(oCache.aElements[3], aSpliced[1]);
+			assert.strictEqual(aSpliced[1]["@$ui5.node.level"], 7);
 			assert.strictEqual(oCache.aElements[4], aSpliced[2]);
+			assert.strictEqual(aSpliced[2]["@$ui5.node.level"], 8);
 			assert.strictEqual(_Helper.hasPrivateAnnotation(aSpliced[2], "expanding"), bStale,
 				"deleted only if not stale");
 			assert.strictEqual(oCache.aElements[200002], aSpliced[200000]);
+			assert.strictEqual(aSpliced[200000]["@$ui5.node.level"], 6);
 
 			// check moved nodes
 			assert.strictEqual(oCache.aElements[200003], aElements[2]);
@@ -2748,7 +2754,7 @@ sap.ui.define([
 				"@$ui5.node.isExpanded" : true,
 				"@$ui5.node.level" : 5
 			}, {
-				"@$ui5._" : {predicate : "('2')"},
+				"@$ui5._" : {predicate : "('2')", transientPredicate : "($uid=1-23)"},
 				"@$ui5.node.level" : 6 // child
 			}, {
 				"@$ui5._" : {predicate : "('3')"},
@@ -2790,6 +2796,7 @@ sap.ui.define([
 			"('0')" : aElements[0],
 			"('1')" : aElements[1],
 			"('2')" : aElements[2],
+			"($uid=1-23)" : aElements[2],
 			"('3')" : aElements[3],
 			"('4')" : aElements[4]
 		};
@@ -3700,6 +3707,153 @@ sap.ui.define([
 		assert.strictEqual(aResult[1], aElements[2]);
 	});
 
+	//*********************************************************************************************
+[false, true].forEach((bTransient) => {
+	[0, 1].forEach((iOldSiblingCount) => {
+		[false, true].forEach((bParentHasCache) => {
+			const sTitle = `move: already transient = ${bTransient},
+ old sibling count = ${iOldSiblingCount}, new parent already has cache = ${bParentHasCache}`;
+
+	QUnit.test(sTitle, function (assert) {
+		const oCache = _AggregationCache.create(this.oRequestor, "n/a", "", {}, {
+				$ParentNavigationProperty : "myParent",
+				hierarchyQualifier : "X"
+			});
+		const oOldParent = {"@$ui5.node.isExpanded" : "n/a"};
+		const oParentNode = {"@$ui5.node.level" : 9};
+		oCache.aElements = ["a", oOldParent, "~oChildNode~", "d", "e", "f", "g", oParentNode, "i"];
+		oCache.aElements.$byPredicate = {
+			"('23')" : "~oChildNode~",
+			"('42')" : oParentNode
+		};
+		const oRequestExpectation = this.mock(this.oRequestor).expects("request")
+			.withExactArgs("PATCH", "Foo('23')", "~oGroupLock~", {
+					"If-Match" : "~oChildNode~",
+					Prefer : "return=minimal"
+				}, {"myParent@odata.bind" : "Foo('42')"},
+				/*fnSubmit*/null, /*fnCancel*/sinon.match.func)
+			.resolves({"@odata.etag" : "etag"});
+		const oHelperMock = this.mock(_Helper);
+		oHelperMock.expects("updateExisting")
+			.withExactArgs(sinon.match.same(oCache.mChangeListeners), "('23')", "~oChildNode~",
+				{"@odata.etag" : "etag"});
+		const oCacheMock = this.mock(oCache);
+		oCacheMock.expects("shiftIndex").withExactArgs(2, -1).callsFake(function () {
+				assert.deepEqual(oCache.aElements,
+					["a", oOldParent, "~oChildNode~", "d", "e", "f", "g", oParentNode, "i"]);
+			});
+		const oOldParentCache = {
+			getValue : mustBeMocked,
+			removeElement : mustBeMocked,
+			setActive : mustBeMocked
+		};
+		oHelperMock.expects("getPrivateAnnotation").withExactArgs("~oChildNode~", "parent")
+			.returns(oOldParentCache);
+		oHelperMock.expects("getPrivateAnnotation").withExactArgs("~oChildNode~", "index")
+			.returns("~index~");
+		this.mock(oOldParentCache).expects("removeElement")
+			.withExactArgs(undefined, "~index~", "('23')", "");
+		this.mock(oOldParentCache).expects("getValue").withExactArgs("$count")
+			.returns(iOldSiblingCount);
+		oHelperMock.expects("getPrivateAnnotation").exactly(iOldSiblingCount ? 0 : 1)
+			.withExactArgs(sinon.match.same(oOldParent), "predicate").returns("('b')");
+		oHelperMock.expects("updateAll").exactly(iOldSiblingCount ? 0 : 1)
+			.withExactArgs(sinon.match.same(oCache.mChangeListeners), "('b')",
+				sinon.match.same(oOldParent), {"@$ui5.node.isExpanded" : undefined});
+		oHelperMock.expects("deletePrivateAnnotation").exactly(iOldSiblingCount ? 0 : 1)
+			.withExactArgs(sinon.match.same(oOldParent), "cache");
+		this.mock(oOldParentCache).expects("setActive").exactly(iOldSiblingCount ? 0 : 1)
+			.withExactArgs(false);
+		oHelperMock.expects("hasPrivateAnnotation")
+			.withExactArgs("~oChildNode~", "transientPredicate").returns(bTransient);
+		oHelperMock.expects("uid").exactly(bTransient ? 0 : 1).withExactArgs().returns("1-23");
+		oHelperMock.expects("setPrivateAnnotation").exactly(bTransient ? 0 : 1)
+			.withExactArgs("~oChildNode~", "transientPredicate", "($uid=1-23)");
+		oHelperMock.expects("updateAll").exactly(bTransient ? 0 : 1)
+			.withExactArgs(sinon.match.same(oCache.mChangeListeners), "('23')", "~oChildNode~",
+				{"@$ui5.context.isTransient" : false});
+		const oParentCache = {
+			restoreElement : mustBeMocked,
+			setEmpty : mustBeMocked
+		};
+		oHelperMock.expects("getPrivateAnnotation")
+			.withExactArgs(sinon.match.same(oParentNode), "cache")
+			.returns(bParentHasCache ? oParentCache : undefined);
+		oCacheMock.expects("createGroupLevelCache").exactly(bParentHasCache ? 0 : 1)
+			.withExactArgs(sinon.match.same(oParentNode)).returns(oParentCache);
+		this.mock(oParentCache).expects("setEmpty").exactly(bParentHasCache ? 0 : 1)
+			.withExactArgs();
+		oHelperMock.expects("setPrivateAnnotation").exactly(bParentHasCache ? 0 : 1)
+			.withExactArgs(sinon.match.same(oParentNode), "cache", sinon.match.same(oParentCache));
+		oHelperMock.expects("updateAll").exactly(bParentHasCache ? 0 : 1)
+			.withExactArgs(sinon.match.same(oCache.mChangeListeners), "('42')",
+				sinon.match.same(oParentNode), {"@$ui5.node.isExpanded" : true});
+		this.mock(oParentCache).expects("restoreElement")
+			.withExactArgs(undefined, 0, "~oChildNode~", "");
+		oHelperMock.expects("setPrivateAnnotation").withExactArgs("~oChildNode~", "index", 0);
+		const oParentExpectation = oHelperMock.expects("setPrivateAnnotation")
+			.withExactArgs("~oChildNode~", "parent", sinon.match.same(oParentCache));
+		const oNodeLevelExpectation = oHelperMock.expects("updateAll")
+			.withExactArgs(sinon.match.same(oCache.mChangeListeners), "('23')", "~oChildNode~",
+				{"@$ui5.node.level" : 10});
+		oCacheMock.expects("shiftIndex").withExactArgs(7, +1).callsFake(function () {
+				assert.deepEqual(oCache.aElements,
+					["a", oOldParent, "d", "e", "f", "g", oParentNode, "~oChildNode~", "i"]);
+				// 'relies on "parent" & "@$ui5.node.level"!'
+				assert.strictEqual(oParentExpectation.callCount, 1);
+				assert.strictEqual(oNodeLevelExpectation.callCount, 1);
+			});
+
+		// code under test
+		return oCache.move("~oGroupLock~", "Foo('23')", "Foo('42')")
+			.then(function (vResult) {
+				assert.strictEqual(vResult, undefined, "without a defined result");
+				assert.deepEqual(oCache.aElements,
+					["a", oOldParent, "d", "e", "f", "g", oParentNode, "~oChildNode~", "i"]);
+				assert.deepEqual(oCache.aElements.$byPredicate, bTransient ? {
+						"('23')" : "~oChildNode~",
+						"('42')" : oParentNode
+					} : {
+						"($uid=1-23)" : "~oChildNode~",
+						"('23')" : "~oChildNode~",
+						"('42')" : oParentNode
+					});
+				assert.deepEqual(oOldParent,
+					iOldSiblingCount ? {"@$ui5.node.isExpanded" : "n/a"} : {});
+
+				// code under test (invoke fnCancel which does nothing)
+				oRequestExpectation.args[0][6]();
+			});
+	});
+		});
+	});
+});
+
+	//*********************************************************************************************
+	QUnit.test("move: failure", function (assert) {
+		const oCache = _AggregationCache.create(this.oRequestor, "n/a", "", {}, {
+				$ParentNavigationProperty : "myParent",
+				hierarchyQualifier : "X"
+			});
+		oCache.aElements.$byPredicate["('23')"] = "~oChildNode~";
+		const oError = new Error("This call intentionally failed");
+		this.mock(this.oRequestor).expects("request")
+			.withExactArgs("PATCH", "Foo('23')", "~oGroupLock~", {
+					"If-Match" : "~oChildNode~",
+					Prefer : "return=minimal"
+				}, {"myParent@odata.bind" : "Foo('42')"},
+				/*fnSubmit*/null, /*fnCancel*/sinon.match.func)
+			.rejects(oError);
+
+		// code under test
+		return oCache.move("~oGroupLock~", "Foo('23')", "Foo('42')")
+			.then(function () {
+				assert.ok(false, "unexpected success");
+			}, function (oError0) {
+				assert.strictEqual(oError0, oError);
+			});
+	});
+
 	//*********************************************************************************************
 [false, true].forEach(function (bHasGroupLevelCache) {
 	QUnit.test("create: already has group level cache: " + bHasGroupLevelCache, function (assert) {
@@ -4010,6 +4164,7 @@ sap.ui.define([
 		oHelperMock.expects("updateAll").exactly(oFixture.parentExpand ? 1 : 0)
 			.withExactArgs(sinon.match.same(oCache.mChangeListeners), "~predicate~",
 				sinon.match.same(oParent), {"@$ui5.node.isExpanded" : true});
+		oHelperMock.expects("setPrivateAnnotation").withExactArgs("~oElement~", "index", 3);
 
 		// code under test - callback reinserting
 		oDeleteExpectation.firstCall.args[4](3, 1);

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

@@ -171,7 +171,7 @@ sap.ui.define([
 	});
 
 	//*********************************************************************************************
-["descendants", "filter", "predicate"].forEach(function (sAnnotation) {
+["descendants", "predicate"].forEach(function (sAnnotation) {
 	var sTitle = "beforeOverwritePlaceholder: Unexpected structural change: " + sAnnotation;
 
 	QUnit.test(sTitle, function (assert) {
@@ -1191,24 +1191,22 @@ sap.ui.define([
 			sQueryOptionsJSON = JSON.stringify(mQueryOptions);
 
 		if (bStored) {
+			oAggregation.$DrillStateProperty = "myDrillState";
 			oAggregation.$NodeProperty = "SomeNodeID";
 			oAggregation.$ParentNavigationProperty = "SomeParentNavigation";
 		}
 		if (bAllLevels) {
 			iExpectedLevels = 999;
-			aExpectedSelect = ["ID", "SomeNodeID", "DistFromRoot"];
+			aExpectedSelect = ["ID", "SomeNodeID", "DistFromRoot", "myDrillState"];
 			oExpectedAggregation = {
 				$DistanceFromRootProperty : "DistFromRoot"
 			};
 			if (bStored) {
 				oAggregation.$DistanceFromRootProperty = "DistFromRoot";
 			}
-		} else if (bStored) {
-			oAggregation.$DrillStateProperty = "myDrillState";
-			if (iExpandTo > 1) {
-				oAggregation.$DistanceFromRootProperty = "DistFromRoot";
-				oAggregation.$LimitedDescendantCountProperty = "LtdDescendant_Count";
-			}
+		} else if (bStored && iExpandTo > 1) {
+			oAggregation.$DistanceFromRootProperty = "DistFromRoot";
+			oAggregation.$LimitedDescendantCountProperty = "LtdDescendant_Count";
 		}
 		oAggregationMock.expects("$fetchMetadata").exactly(bStored ? 0 : 1)
 			.withExactArgs("/meta/@Org.OData.Aggregation.V1.RecursiveHierarchy#X")
@@ -1229,6 +1227,7 @@ sap.ui.define([
 			$fetchMetadata : oAggregation.$fetchMetadata, // remember the mock(!)
 			$metaPath : "/meta",
 			$path : "/Foo",
+			$DrillStateProperty : "myDrillState",
 			$NodeProperty : "SomeNodeID",
 			$ParentNavigationProperty : "SomeParentNavigation"
 		}, oExpectedAggregation);