@openui5/sap.ui.core 1.121.1 → 1.122.0

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

@@ -12,6 +12,8 @@ sap.ui.define([
 	/*eslint camelcase: 0 */
 	"use strict";
 
+	const mustBeMocked = function () { throw new Error("Must be mocked"); };
+
 	//*********************************************************************************************
 	QUnit.module("sap.ui.model.odata.v4.lib._AggregationHelper", {
 		beforeEach : function () {
@@ -2358,4 +2360,177 @@ sap.ui.define([
 		assert.strictEqual(aSpliced.$stale, true);
 		assert.deepEqual(oElement, {"@$ui5._" : {spliced : []}}, "nothing else");
 	});
+
+	//*********************************************************************************************
+	QUnit.test("getQueryOptionsForOutOfPlaceNodesData: below parent", function (assert) {
+		const oOutOfPlace = {
+			nodeFilters : ["~node2Filter~", "~node1Filter~", "~node3Filter~"],
+			parentFilter : "~parentFilter~"
+		};
+		const sOutOfPlaceJSON = JSON.stringify(oOutOfPlace);
+		const oAggregation = {
+			expandTo : 99,
+			hierarchyQualifier : "X",
+			search : "~search~",
+			$DrillState : "~$DrillState~",
+			$ExpandLevels : "~$ExpandLevels~"
+		};
+		const sAggregationJSON = JSON.stringify(oAggregation);
+		const mQueryOptions = {
+			$$filterBeforeAggregate : "~filterBeforeAggregate~",
+			$count : "~count~",
+			$filter : "~filter~",
+			$orderby : "~orderby~",
+			custom : "~custom~"
+		};
+		const sQueryOptionsJSON = JSON.stringify(mQueryOptions);
+
+		this.mock(_AggregationHelper).expects("buildApply")
+			.callsFake(function (oAggregation0, mQueryOptions0, iLevel) {
+				assert.deepEqual(oAggregation0, {
+					expandTo : 1,
+					hierarchyQualifier : "X",
+					$DrillState : "~$DrillState~"
+				});
+				assert.deepEqual(mQueryOptions0, {
+					$$filterBeforeAggregate : "~parentFilter~",
+					custom : "~custom~"
+				});
+				assert.strictEqual(iLevel, 1);
+
+				mQueryOptions0.$apply = "~apply~";
+				mQueryOptions0.$select = ["~select~", "~$DrillState~"];
+				return mQueryOptions0;
+			});
+
+		// code under test
+		const mResult = _AggregationHelper.getQueryOptionsForOutOfPlaceNodesData(oOutOfPlace,
+			oAggregation, mQueryOptions);
+
+		assert.deepEqual(mResult, {
+			$$filterBeforeAggregate : "~parentFilter~",
+			$apply : "~apply~",
+			$filter : "~node1Filter~ or ~node2Filter~ or ~node3Filter~",
+			$select : ["~select~"],
+			$top : 3,
+			custom : "~custom~"
+		});
+		assert.strictEqual(JSON.stringify(oAggregation), sAggregationJSON, "unchanged");
+		assert.strictEqual(JSON.stringify(oOutOfPlace), sOutOfPlaceJSON, "unchanged");
+		assert.strictEqual(JSON.stringify(mQueryOptions), sQueryOptionsJSON, "unchanged");
+	});
+
+	//*********************************************************************************************
+	QUnit.test("getQueryOptionsForOutOfPlaceNodesData: root nodes", function (assert) {
+		const oOutOfPlace = {
+			nodeFilters : ["~node2Filter~", "~node1Filter~", "~node3Filter~"]
+		};
+		const sOutOfPlaceJSON = JSON.stringify(oOutOfPlace);
+		const oAggregation = {
+			expandTo : 99,
+			hierarchyQualifier : "X",
+			search : "~search~",
+			$DrillState : "~$DrillState~",
+			$ExpandLevels : "~$ExpandLevels~"
+		};
+		const sAggregationJSON = JSON.stringify(oAggregation);
+		const mQueryOptions = {
+			$count : "~count~",
+			$filter : "~filter~",
+			$orderby : "~orderby~",
+			custom : "~custom~"
+		};
+		const sQueryOptionsJSON = JSON.stringify(mQueryOptions);
+
+		this.mock(_AggregationHelper).expects("buildApply")
+			.callsFake(function (oAggregation0, mQueryOptions0, iLevel) {
+				assert.deepEqual(oAggregation0, {
+					expandTo : 1,
+					hierarchyQualifier : "X",
+					$DrillState : "~$DrillState~"
+				});
+				assert.deepEqual(mQueryOptions0, {custom : "~custom~"});
+				assert.strictEqual(iLevel, 1);
+
+				mQueryOptions0.$apply = "~apply~";
+				mQueryOptions0.$select = ["~select~"];
+				return mQueryOptions0;
+			});
+
+		// code under test
+		const mResult = _AggregationHelper.getQueryOptionsForOutOfPlaceNodesData(oOutOfPlace,
+			oAggregation, mQueryOptions);
+
+		assert.deepEqual(mResult, {
+			$apply : "~apply~",
+			$filter : "~node1Filter~ or ~node2Filter~ or ~node3Filter~",
+			$select : ["~select~"],
+			$top : 3,
+			custom : "~custom~"
+		});
+		assert.strictEqual(JSON.stringify(oAggregation), sAggregationJSON, "unchanged");
+		assert.strictEqual(JSON.stringify(oOutOfPlace), sOutOfPlaceJSON, "unchanged");
+		assert.strictEqual(JSON.stringify(mQueryOptions), sQueryOptionsJSON, "unchanged");
+	});
+
+	//*********************************************************************************************
+	QUnit.test("getQueryOptionsForOutOfPlaceNodesRank", function (assert) {
+		const aOutOfPlaceByParent = [{
+			nodeFilters : ["~node2Filter~", "~node1Filter~"],
+			parentFilter : "~parent1Filter~"
+		}, {
+			nodeFilters : ["~node4Filter~", "~node5Filter~"],
+			parentFilter : "~node2Filter~"
+		}, {
+			nodeFilters : ["~node3Filter~"]
+		}];
+		const sOutOfPlaceByParentJSON = JSON.stringify(aOutOfPlaceByParent);
+		const oAggregation = {
+			$DistanceFromRoot : "~$DistanceFromRoot~",
+			$DrillState : "~$DrillState~",
+			$LimitedDescendantCount : "~$LimitedDescendantCount~",
+			$LimitedRank : "~$LimitedRank~",
+			$metaPath : "~$metaPath~",
+			$fetchMetadata : mustBeMocked
+		};
+		const mQueryOptions = {
+			$apply : "~apply~",
+			$count : "~count~",
+			$filter : "~filter~",
+			$orderby : "~orderby~",
+			$select : "~select~",
+			custom : "~custom~"
+		};
+		const sQueryOptionsJSON = JSON.stringify(mQueryOptions);
+
+		this.mock(oAggregation).expects("$fetchMetadata").withExactArgs("~$metaPath~/")
+			.returns(SyncPromise.resolve("~$metadata~"));
+		this.mock(_Helper).expects("selectKeyProperties")
+			.withExactArgs(sinon.match.object, "~$metadata~")
+			.callsFake(function (mQueryOptions) {
+				mQueryOptions.$select.push("~key~");
+			});
+
+		// code under test
+		const mResult = _AggregationHelper.getQueryOptionsForOutOfPlaceNodesRank(
+			aOutOfPlaceByParent, oAggregation, mQueryOptions);
+
+		assert.deepEqual(mResult, {
+			$apply : "~apply~",
+			$filter : "~node1Filter~ or ~node2Filter~ or ~node3Filter~ or ~node4Filter~"
+				+ " or ~node5Filter~ or ~parent1Filter~",
+			$select : [
+				"~$DistanceFromRoot~",
+				"~$DrillState~",
+				"~$LimitedDescendantCount~",
+				"~$LimitedRank~",
+				"~key~"
+			],
+			$top : 6,
+			custom : "~custom~"
+		});
+		assert.strictEqual(
+			JSON.stringify(aOutOfPlaceByParent), sOutOfPlaceByParentJSON, "unchanged");
+		assert.strictEqual(JSON.stringify(mQueryOptions), sQueryOptionsJSON, "unchanged");
+	});
 });

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

@@ -4090,6 +4090,8 @@ sap.ui.define([
 			.exactly(bTransient ? 1 : 0)
 			.withExactArgs(sinon.match.same(oElement), "transientPredicate",
 				sTransientPredicate);
+		this.mock(_Helper).expects("copySelected")
+			.withExactArgs(sinon.match.same(oOldElement), sinon.match.same(oElement));
 		this.mock(_Helper).expects("restoreUpdatingProperties")
 			.withExactArgs(sinon.match.same(oOldElement), sinon.match.same(oElement));
 		this.mock(_Helper).expects("buildPath")
@@ -4118,14 +4120,24 @@ sap.ui.define([
 });
 
 	//*********************************************************************************************
-	QUnit.test("Cache#replaceElement for an element that has no index", function (assert) {
+[false, true].forEach((bHasOldElement) => {
+	const sTitle = "Cache#replaceElement for an element that has no index, bHasOldElement="
+		+ bHasOldElement;
+	QUnit.test(sTitle, function (assert) {
 		var oCache = new _Cache(this.oRequestor, "TEAMS"),
 			aElements = [{a : "doNotTouch"}],
 			oNewElement = {a : "4711", b : "0815"},
-			oOldElement = {a : "0815"},
+			oOldElement = bHasOldElement ? {a : "0815"} : undefined,
 			mTypeForMetaPath = {};
 
-		aElements.$byPredicate = {doNotTouch : aElements[0], "('42')" : oOldElement};
+		if (bHasOldElement) {
+			aElements.$byPredicate = {doNotTouch : aElements[0], "('42')" : oOldElement};
+			this.mock(_Helper).expects("copySelected")
+				.withExactArgs(sinon.match.same(oOldElement), sinon.match.same(oNewElement));
+		} else {
+			aElements.$byPredicate = {doNotTouch : aElements[0]};
+			this.mock(_Helper).expects("copySelected").never();
+		}
 
 		this.mock(_Cache).expects("getElementIndex").never();
 		this.mock(_Helper).expects("restoreUpdatingProperties")
@@ -4145,6 +4157,7 @@ sap.ui.define([
 		assert.deepEqual(aElements.$byPredicate,
 			{doNotTouch : aElements[0], "('42')" : oNewElement});
 	});
+});
 
 	//*********************************************************************************************
 [
@@ -4444,6 +4457,7 @@ sap.ui.define([
 	QUnit.test(sTitle, function (assert) {
 		var oCache = new _Cache(this.oRequestor, "TEAMS", {/*mQueryOptions*/}),
 			oCacheMock = this.mock(oCache),
+			oCopySelectedExpectation,
 			fnDataRequested = this.spy(),
 			oElement = {"@$ui5._" : {predicate : "('13')"}},
 			aElements = [oElement],
@@ -4526,13 +4540,17 @@ sap.ui.define([
 
 				return Promise.resolve(oInCollectionResponse);
 			});
+		oCopySelectedExpectation = this.mock(_Helper).expects("copySelected")
+			.exactly(oFixture.inCollection ? 0 : 1)
+			.withExactArgs(sinon.match.same(aElements.$byPredicate["('13')"]),
+				sinon.match.same(oReadResponse.value[0]));
+		oRemoveExpectation = oCacheMock.expects("removeElement")
+			.exactly(oFixture.inCollection ? 0 : 1)
+			.withExactArgs(0, "('13')", sinon.match.same(aElements), "~");
 		oReplaceExpectation = oCacheMock.expects("replaceElement")
 			.withExactArgs(sinon.match.same(aElements), oFixture.inCollection ? 0 : undefined,
 				"('13')", sinon.match.same(oReadResponse.value[0]),
 				sinon.match.same(mTypeForMetaPath), "~");
-		oRemoveExpectation = oCacheMock.expects("removeElement")
-			.exactly(oFixture.inCollection ? 0 : 1)
-			.withExactArgs(0, "('13')", sinon.match.same(aElements), "~");
 
 		// code under test
 		return oCache.refreshSingleWithRemove(oGroupLock, "~", 0, "('13')", true,
@@ -4546,6 +4564,7 @@ sap.ui.define([
 				assert.strictEqual(mQueryOptionsForPathCopy.$apply, "apply");
 				assert.strictEqual(mQueryOptionsForPathCopy.$search, undefined);
 				if (!oFixture.inCollection) {
+					assert.ok(oRemoveExpectation.calledAfter(oCopySelectedExpectation));
 					assert.ok(oReplaceExpectation.calledAfter(oRemoveExpectation));
 					sinon.assert.calledOnceWithExactly(fnOnRemove, true);
 				}
@@ -13233,7 +13252,8 @@ sap.ui.define([
 
 			oCacheMock.expects("hasPendingChangesForPath")
 				.exactly("key" in oElement || oElement.bChanges ? 1 : 0)
-				.withExactArgs(sPredicate).returns(oElement.bChanges);
+				.withExactArgs(sPredicate, "~bIgnorePendingChanges~")
+				.returns(oElement.bChanges);
 			oHelperMock.expects("getKeyFilter").exactly("key" in oElement ? 1 : 0)
 				.withExactArgs(sinon.match.same(oElement), oCache.sMetaPath,
 					sinon.match.same(mTypes))
@@ -13293,7 +13313,8 @@ sap.ui.define([
 			});
 
 		// code under test
-		return oCache.refreshKeptElements(oGroupLock, fnOnRemove, oFixture.bDropApply)
+		return oCache.refreshKeptElements(oGroupLock, fnOnRemove, oFixture.bDropApply,
+			"~bIgnorePendingChanges~")
 		.then(function (oResult) {
 			var mByPredicateAfterRefresh = {},
 				iCallCount = 0;
@@ -13318,6 +13339,25 @@ sap.ui.define([
 	});
 });
 
+	//*********************************************************************************************
+	QUnit.test("refreshKeptElements w/ deleteted element", function (assert) {
+		const oCache = _Cache.create(this.oRequestor, "Employees", {});
+
+		oCache.aElements.$byPredicate["('Foo')"] = {
+			"@$ui5.context.isDeleted" : true,
+			"@$ui5._" : {predicate : "('Foo')"}
+		};
+
+		this.mock(oCache).expects("hasPendingChangesForPath").never();
+		this.mock(oCache).expects("checkSharedRequest").withExactArgs();
+		this.mock(oCache).expects("getTypes").never();
+		this.mock(oCache.oRequestor).expects("request").never();
+
+		// code under test
+		assert.strictEqual(oCache.refreshKeptElements({/*GroupLock*/}, {/*fnOnRemove*/}),
+			undefined);
+	});
+
 	//*********************************************************************************************
 	QUnit.test("refreshKeptElements w/o kept-alive element", function (assert) {
 		var oCache = _Cache.create(this.oRequestor, "Employees", {});
@@ -13327,7 +13367,8 @@ sap.ui.define([
 		this.mock(oCache.oRequestor).expects("request").never();
 
 		// code under test
-		assert.deepEqual(oCache.refreshKeptElements({/*GroupLock*/}), undefined);
+		assert.strictEqual(oCache.refreshKeptElements({/*GroupLock*/}, {/*fnOnRemove*/}),
+			undefined);
 	});
 
 	//*********************************************************************************************

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

@@ -5414,6 +5414,23 @@ sap.ui.define([
 		assert.notOk("$postBodyCollection" in oCacheEntity.nested1);
 	});
 
+	//*********************************************************************************************
+	QUnit.test("copySelected", function (assert) {
+		let oTarget = {"@$ui5.context.isSelected" : false};
+
+		// code under test
+		_Helper.copySelected({foo : true, "@$ui5.context.isSelected" : true}, oTarget);
+
+		assert.deepEqual(oTarget, {"@$ui5.context.isSelected" : true});
+
+		oTarget = {};
+
+		// code under test
+		_Helper.copySelected({foo : true, "@$ui5.context.isSelected" : false}, oTarget);
+
+		assert.deepEqual(oTarget, {});
+	});
+
 	//*********************************************************************************************
 	QUnit.test("makeUpdateData", function (assert) {
 		assert.deepEqual(_Helper.makeUpdateData(["Age"], 42), {Age : 42});

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

@@ -8,7 +8,7 @@ sap.ui.define([
 ], function (Log, _Helper, _TreeState) {
 	"use strict";
 
-	const mapContent = (oMap) => [...oMap.entries()];
+	const mustBeMocked = function () { throw new Error("Must be mocked"); };
 
 	//*********************************************************************************************
 	QUnit.module("sap.ui.model.odata.v4.lib._TreeState", {
@@ -22,80 +22,85 @@ sap.ui.define([
 	//*********************************************************************************************
 	QUnit.test("constructor", function (assert) {
 		// code under test
-		const oTreeState = new _TreeState("~sNodeProperty~");
+		const oTreeState = new _TreeState("~sNodeProperty~", "~fnGetKeyFilter~");
 
 		assert.ok(oTreeState instanceof _TreeState);
 		assert.strictEqual(oTreeState.sNodeProperty, "~sNodeProperty~");
-		assert.ok(oTreeState.oExpandLevels instanceof Map);
-		assert.deepEqual(mapContent(oTreeState.oExpandLevels), []);
+		assert.strictEqual(oTreeState.fnGetKeyFilter, "~fnGetKeyFilter~");
+		assert.deepEqual(oTreeState.mPredicate2ExpandLevels, {});
+		assert.deepEqual(oTreeState.getOutOfPlaceGroupedByParent(), []);
+		assert.deepEqual(oTreeState.getOutOfPlaceCount(), 0);
 	});
 
 	//*********************************************************************************************
 	QUnit.test("expand/collapse", function (assert) {
 		const oTreeState = new _TreeState("~sNodeProperty~");
 
-		this.mock(_Helper).expects("drillDown").thrice()
+		this.mock(_Helper).expects("getPrivateAnnotation").thrice()
+			.withExactArgs("~oNode~", "predicate").returns("~predicate~");
+		this.mock(_Helper).expects("drillDown").twice()
 			.withExactArgs("~oNode~", "~sNodeProperty~")
 			.returns("~sNodeId~");
 
 		// code under test
 		oTreeState.expand("~oNode~");
 
-		assert.deepEqual(mapContent(oTreeState.oExpandLevels),
-			[["~sNodeId~", {NodeID : "~sNodeId~", Levels : 1}]]);
+		assert.deepEqual(oTreeState.mPredicate2ExpandLevels,
+			{"~predicate~" : {NodeID : "~sNodeId~", Levels : 1}});
 
 		// code under test
 		oTreeState.expand("~oNode~");
 
-		assert.deepEqual(mapContent(oTreeState.oExpandLevels),
-			[["~sNodeId~", {NodeID : "~sNodeId~", Levels : 1}]]);
+		assert.deepEqual(oTreeState.mPredicate2ExpandLevels,
+			{"~predicate~" : {NodeID : "~sNodeId~", Levels : 1}});
 
 		// code under test
 		oTreeState.collapse("~oNode~");
 
-		assert.deepEqual(mapContent(oTreeState.oExpandLevels), []);
+		assert.deepEqual(oTreeState.mPredicate2ExpandLevels, {});
 	});
 
 	//*********************************************************************************************
 	QUnit.test("collapse/expand", function (assert) {
 		const oTreeState = new _TreeState("~sNodeProperty~");
 
-		this.mock(_Helper).expects("drillDown").thrice()
+		this.mock(_Helper).expects("getPrivateAnnotation").thrice()
+			.withExactArgs("~oNode~", "predicate").returns("~predicate~");
+		this.mock(_Helper).expects("drillDown").twice()
 			.withExactArgs("~oNode~", "~sNodeProperty~")
 			.returns("~sNodeId~");
 
 		// code under test
 		oTreeState.collapse("~oNode~");
 
-		assert.deepEqual(mapContent(oTreeState.oExpandLevels),
-			[["~sNodeId~", {NodeID : "~sNodeId~", Levels : 0}]]);
+		assert.deepEqual(oTreeState.mPredicate2ExpandLevels,
+			{"~predicate~" : {NodeID : "~sNodeId~", Levels : 0}});
 
 		// code under test
 		oTreeState.collapse("~oNode~");
 
-		assert.deepEqual(mapContent(oTreeState.oExpandLevels),
-			[["~sNodeId~", {NodeID : "~sNodeId~", Levels : 0}]]);
+		assert.deepEqual(oTreeState.mPredicate2ExpandLevels,
+			{"~predicate~" : {NodeID : "~sNodeId~", Levels : 0}});
 
 		// code under test
 		oTreeState.expand("~oNode~");
 
-		assert.deepEqual(mapContent(oTreeState.oExpandLevels), []);
+		assert.deepEqual(oTreeState.mPredicate2ExpandLevels, {});
 	});
 
 	//*********************************************************************************************
 	QUnit.test("delete", function (assert) {
 		const oTreeState = new _TreeState("~sNodeProperty~");
 
-		oTreeState.oExpandLevels.set("foo", "bar");
-		oTreeState.oExpandLevels.set("~sNodeId~", "~");
-		this.mock(_Helper).expects("drillDown")
-			.withExactArgs("~oNode~", "~sNodeProperty~")
-			.returns("~sNodeId~");
+		oTreeState.mPredicate2ExpandLevels["foo"] = "bar";
+		oTreeState.mPredicate2ExpandLevels["~predicate~"] = "~";
+		this.mock(_Helper).expects("getPrivateAnnotation")
+			.withExactArgs("~oNode~", "predicate").returns("~predicate~");
 
 		// code under test
 		oTreeState.delete("~oNode~");
 
-		assert.deepEqual(mapContent(oTreeState.oExpandLevels), [["foo", "bar"]]);
+		assert.deepEqual(oTreeState.mPredicate2ExpandLevels, {foo : "bar"});
 	});
 
 	//*********************************************************************************************
@@ -103,25 +108,26 @@ sap.ui.define([
 	QUnit.test(sMethod + ": no sNodeProperty", function (assert) {
 		const oTreeState = new _TreeState();
 
-		oTreeState.oExpandLevels.set("foo", "bar");
+		oTreeState.mPredicate2ExpandLevels["foo"] = "bar";
 		this.mock(_Helper).expects("drillDown").never();
 
 		// code under test
 		oTreeState[sMethod]("~oNode~");
 
-		assert.deepEqual(mapContent(oTreeState.oExpandLevels), [["foo", "bar"]]);
+		assert.deepEqual(oTreeState.mPredicate2ExpandLevels, {foo : "bar"});
 	});
 });
 
 	//*********************************************************************************************
 	QUnit.test("getExpandLevels/reset", function (assert) {
 		const oTreeState = new _TreeState("~sNodeProperty~");
+		oTreeState.oOutOfPlace = "~oOutOfPlace~";
 
 		// code under test
 		assert.strictEqual(oTreeState.getExpandLevels(), undefined);
 
-		oTreeState.oExpandLevels.set("foo", {bar : 42});
-		oTreeState.oExpandLevels.set("baz", {qux : 23});
+		oTreeState.mPredicate2ExpandLevels["foo"] = {bar : 42};
+		oTreeState.mPredicate2ExpandLevels["baz"] = {qux : 23};
 
 		// code under test
 		assert.strictEqual(oTreeState.getExpandLevels(), '[{"bar":42},{"qux":23}]');
@@ -129,6 +135,113 @@ sap.ui.define([
 		// code under test
 		oTreeState.reset();
 
-		assert.deepEqual(mapContent(oTreeState.oExpandLevels), []);
+		assert.deepEqual(oTreeState.mPredicate2ExpandLevels, {});
+	});
+
+	//*********************************************************************************************
+	QUnit.test("out of place", function (assert) {
+		const fnGetKeyFilter = mustBeMocked;
+		const oTreeState = new _TreeState("~sNodeProperty~", fnGetKeyFilter);
+
+		// code under test
+		assert.deepEqual(oTreeState.getOutOfPlaceGroupedByParent(), []);
+
+		const oHelperMock = this.mock(_Helper);
+		oHelperMock.expects("getPrivateAnnotation").withExactArgs("~oParent1~", "predicate")
+			.returns("~parent1Predicate~");
+		const oTreeStateMock = this.mock(oTreeState);
+		oTreeStateMock.expects("fnGetKeyFilter").withExactArgs("~oParent1~")
+			.returns("~parent1Filter~");
+		oTreeStateMock.expects("fnGetKeyFilter").withExactArgs("~oNode1~").returns("~node1Filter~");
+		oHelperMock.expects("getPrivateAnnotation").withExactArgs("~oNode1~", "predicate")
+			.returns("~node1Predicate~");
+
+		// code under test
+		oTreeState.setOutOfPlace("~oNode1~", "~oParent1~");
+
+		assert.deepEqual(oTreeState.getOutOfPlaceGroupedByParent(), [{
+			nodeFilters : ["~node1Filter~"],
+			nodePredicates : ["~node1Predicate~"],
+			parentFilter : "~parent1Filter~",
+			parentPredicate : "~parent1Predicate~"
+		}]);
+		assert.strictEqual(oTreeState.getOutOfPlaceCount(), 1);
+
+		oHelperMock.expects("getPrivateAnnotation").withExactArgs("~oParent2~", "predicate")
+			.returns("~parent2Predicate~");
+		oTreeStateMock.expects("fnGetKeyFilter").withExactArgs("~oParent2~")
+			.returns("~parent2Filter~");
+		oTreeStateMock.expects("fnGetKeyFilter").withExactArgs("~oNode3~").returns("~node3Filter~");
+		oHelperMock.expects("getPrivateAnnotation").withExactArgs("~oNode3~", "predicate")
+			.returns("~node3Predicate~");
+
+		// code under test
+		oTreeState.setOutOfPlace("~oNode3~", "~oParent2~");
+
+		assert.deepEqual(oTreeState.getOutOfPlaceGroupedByParent(), [{
+			nodeFilters : ["~node1Filter~"],
+			nodePredicates : ["~node1Predicate~"],
+			parentFilter : "~parent1Filter~",
+			parentPredicate : "~parent1Predicate~"
+		}, {
+			nodeFilters : ["~node3Filter~"],
+			nodePredicates : ["~node3Predicate~"],
+			parentFilter : "~parent2Filter~",
+			parentPredicate : "~parent2Predicate~"
+		}]);
+		assert.strictEqual(oTreeState.getOutOfPlaceCount(), 2);
+
+		oHelperMock.expects("getPrivateAnnotation").withExactArgs("~oParent1~", "predicate")
+			.returns("~parent1Predicate~");
+		oTreeStateMock.expects("fnGetKeyFilter").withExactArgs("~oNode2~").returns("~node2Filter~");
+		oHelperMock.expects("getPrivateAnnotation").withExactArgs("~oNode2~", "predicate")
+			.returns("~node2Predicate~");
+
+		// code under test
+		oTreeState.setOutOfPlace("~oNode2~", "~oParent1~");
+
+		// code under test
+		assert.deepEqual(oTreeState.getOutOfPlaceGroupedByParent(), [{
+			nodeFilters : ["~node1Filter~", "~node2Filter~"],
+			nodePredicates : ["~node1Predicate~", "~node2Predicate~"],
+			parentFilter : "~parent1Filter~",
+			parentPredicate : "~parent1Predicate~"
+		}, {
+			nodeFilters : ["~node3Filter~"],
+			nodePredicates : ["~node3Predicate~"],
+			parentFilter : "~parent2Filter~",
+			parentPredicate : "~parent2Predicate~"
+		}]);
+		assert.strictEqual(oTreeState.getOutOfPlaceCount(), 3);
+
+		oTreeStateMock.expects("fnGetKeyFilter").withExactArgs("~oNode4~").returns("~node4Filter~");
+		oHelperMock.expects("getPrivateAnnotation").withExactArgs("~oNode4~", "predicate")
+			.returns("~node4Predicate~");
+
+		// code under test
+		oTreeState.setOutOfPlace("~oNode4~");
+
+		// code under test
+		assert.deepEqual(oTreeState.getOutOfPlaceGroupedByParent(), [{
+			nodeFilters : ["~node1Filter~", "~node2Filter~"],
+			nodePredicates : ["~node1Predicate~", "~node2Predicate~"],
+			parentFilter : "~parent1Filter~",
+			parentPredicate : "~parent1Predicate~"
+		}, {
+			nodeFilters : ["~node3Filter~"],
+			nodePredicates : ["~node3Predicate~"],
+			parentFilter : "~parent2Filter~",
+			parentPredicate : "~parent2Predicate~"
+		}, {
+			nodeFilters : ["~node4Filter~"],
+			nodePredicates : ["~node4Predicate~"]
+		}]);
+
+		// code under test
+		oTreeState.reset();
+
+		// code under test
+		assert.deepEqual(oTreeState.getOutOfPlaceGroupedByParent(), []);
+		assert.strictEqual(oTreeState.getOutOfPlaceCount(), 0);
 	});
 });

package/test/sap/ui/core/qunit/opa/RecordReplay.qunit.js

@@ -349,13 +349,15 @@ sap.ui.define([
 		beforeEach: function () {
 			this.clock = sinon.useFakeTimers();
 			this.fnWaitAsyncSpy = sinon.spy(_autoWaiterAsync, "waitAsync");
-			this.fnConfigSpy = sinon.spy(_autoWaiterAsync, "extendConfig");
+			this.fnConfigAsyncWaiterSpy = sinon.spy(_autoWaiterAsync, "extendConfig");
+			this.fnConfigWaiterSpy = sinon.spy(_autoWaiter, "extendConfig");
 			this.fnHasToWaitStub = sinon.stub(_autoWaiter, "hasToWait");
 		},
 		afterEach: function () {
 			this.clock.restore();
 			this.fnWaitAsyncSpy.restore();
-			this.fnConfigSpy.restore();
+			this.fnConfigAsyncWaiterSpy.restore();
+			this.fnConfigWaiterSpy.restore();
 			this.fnHasToWaitStub.restore();
 		}
 	});
@@ -367,7 +369,7 @@ sap.ui.define([
 		RecordReplay.waitForUI5({timeout: 10000, interval: 100}).then(function () {
 			assert.ok(this.fnHasToWaitStub.called, "Should call autoWaiter");
 			assert.ok(!_autoWaiter.hasToWait(), "Should wait for processing to end");
-			assert.ok(this.fnConfigSpy.calledOnce, "Should configure polling parameters");
+			assert.ok(this.fnConfigAsyncWaiterSpy.calledOnce, "Should configure polling parameters");
 			assert.ok(this.fnWaitAsyncSpy.calledOnce, "Should poll for autoWaiter conditions to be met");
 		}.bind(this)).catch(function (error) {
 			assert.ok(false, "Should not reach here" + error);
@@ -393,4 +395,11 @@ sap.ui.define([
 
 		this.clock.tick(200);
 	});
+
+	QUnit.test("Should apply default values when parameters values ommited", function (assert) {
+		RecordReplay.waitForUI5({timeout: 10000, interval: 100});
+		assert.ok(this.fnConfigWaiterSpy.calledWithMatch({timeout: 10000, interval: 100}), "the custom values are applied");
+		RecordReplay.waitForUI5().catch(function() {}); // ignore error for calling waitForUI5 twice sychronously
+		assert.ok(this.fnConfigWaiterSpy.calledWithMatch({timeout: 15000, interval: 400}), "the default values are applied");
+	});
 });

package/test/sap/ui/core/qunit/resource/ResourceModel.qunit.js

@@ -4,12 +4,11 @@ sap.ui.define([
 	"sap/base/i18n/ResourceBundle",
 	"sap/ui/Device",
 	"sap/ui/base/SyncPromise",
-	"sap/ui/core/Core",
 	"sap/ui/core/Supportability",
 	"sap/ui/model/BindingMode",
 	"sap/ui/model/resource/ResourceModel",
 	"sap/ui/testlib/TestButton"
-], function(Log, Localization, ResourceBundle, Device, SyncPromise, Core, Supportability, BindingMode,
+], function(Log, Localization, ResourceBundle, Device, SyncPromise, Supportability, BindingMode,
 		ResourceModel, TestButton) {
 	/*global sinon, QUnit*/
 	/*eslint no-new: 0 */

package/test/sap/ui/core/qunit/routing/fixture/placeholder/component/NavContainerOptOut/Component.js

@@ -4,6 +4,7 @@ sap.ui.define([
 	"use strict";
 	var Component = UIComponent.extend("qunit.placeholder.component.NavContainerOptOut.Component", {
 		metadata : {
+			interfaces: ["sap.ui.core.IAsyncContentCreation"],
 			manifest: "json"
 		}
 	});