@openui5/sap.ui.core 1.121.1 → 1.122.1

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

@@ -300,7 +300,8 @@ sap.ui.define([
 	});
 
 	//*********************************************************************************************
-	QUnit.test("requestRefresh: success", function (assert) {
+[false, true].forEach((bRoot) => {
+	QUnit.test(`requestRefresh: success, root = ${bRoot}`, function (assert) {
 		var oBinding = new ODataBinding({
 				oModel : {},
 				refreshInternal : function () {}
@@ -308,7 +309,10 @@ sap.ui.define([
 			oPromise,
 			bRefreshed = false;
 
-		this.mock(oBinding).expects("isRoot").withExactArgs().returns(true);
+		if (!bRoot) {
+			oBinding.mParameters = {$$ownRequest : true};
+		}
+		this.mock(oBinding).expects("isRoot").exactly(bRoot ? 1 : 0).withExactArgs().returns(true);
 		this.mock(oBinding).expects("hasPendingChanges").withExactArgs(true).returns(false);
 		this.mock(_Helper).expects("checkGroupId").withExactArgs("groupId");
 		this.mock(oBinding).expects("refreshInternal").withExactArgs("", "groupId", true)
@@ -329,6 +333,7 @@ sap.ui.define([
 			assert.ok(bRefreshed);
 		});
 	});
+});
 
 	//*********************************************************************************************
 	QUnit.test("requestRefresh: reject", function (assert) {
@@ -385,17 +390,23 @@ sap.ui.define([
 	});
 
 	//*********************************************************************************************
-	QUnit.test("requestRefresh: not refreshable", function (assert) {
+[false, true].forEach((bHasParams) => {
+	QUnit.test(`requestRefresh: not refreshable, but has params=${bHasParams}`, function (assert) {
 		var oBinding = new ODataBinding({
 				oModel : {}
 			});
 
+		if (bHasParams) {
+			oBinding.mParameters = {}; // no $$ownRequest here!
+		}
+
 		this.mock(oBinding).expects("isRoot").withExactArgs().returns(false);
 
 		assert.throws(function () {
 			oBinding.requestRefresh();
 		}, new Error("Refresh on this binding is not supported"));
 	});
+});
 
 	//*********************************************************************************************
 	QUnit.test("requestRefresh: pending changes", function (assert) {
@@ -1086,7 +1097,8 @@ sap.ui.define([
 						ready : function () { return SyncPromise.resolve(); }
 					},
 					mUriParameters : {},
-					getReporter : getForbiddenReporter
+					getReporter : getForbiddenReporter,
+					waitForKeepAliveBinding : mustBeMocked
 				},
 				sPath : "/absolute",
 				bRelative : false
@@ -1108,10 +1120,15 @@ sap.ui.define([
 			.returns(false);
 		oBindingMock.expects("fetchResourcePath").withExactArgs(undefined)
 			.returns(SyncPromise.resolve("absolute"));
-		oBindingMock.expects("createAndSetCache")
-			.withExactArgs(sinon.match.same(mLocalQueryOptions), "absolute", undefined,
-				"~sGroupId~", sinon.match.same(oOldCache))
-			.returns(oNewCache);
+		this.mock(oBinding.oModel).expects("waitForKeepAliveBinding")
+			.withExactArgs(sinon.match.same(oBinding))
+			.callsFake(async function () {
+				await "next tick";
+				oBindingMock.expects("createAndSetCache")
+					.withExactArgs(sinon.match.same(mLocalQueryOptions), "absolute", undefined,
+						"~sGroupId~", sinon.match.same(oOldCache))
+					.returns(oNewCache);
+			});
 
 		// code under test
 		oBinding.fetchCache(oContext, bIgnoreParentCache, undefined, "~sGroupId~");
@@ -1141,7 +1158,8 @@ sap.ui.define([
 							ready : function () { return SyncPromise.resolve(); }
 						},
 						mUriParameters : {},
-						getReporter : getForbiddenReporter
+						getReporter : getForbiddenReporter,
+						waitForKeepAliveBinding : mustBeMocked
 					},
 					sPath : "relative",
 					bRelative : true
@@ -1172,12 +1190,17 @@ sap.ui.define([
 			oBindingMock.expects("fetchResourcePath")
 				.withExactArgs(sinon.match.same(oContext))
 				.returns(oResourcePathPromise);
-			oBindingMock.expects("createAndSetCache")
-				.withExactArgs(sinon.match.same(mLocalQueryOptions), "resourcePath",
-					sinon.match.same(oContext), undefined, null)
+			this.mock(oBinding.oModel).expects("waitForKeepAliveBinding")
+				.withExactArgs(sinon.match.same(oBinding))
 				.callsFake(function () {
-					oBinding.oCache = oCache;
-					return oCache;
+					oBindingMock.expects("createAndSetCache")
+						.withExactArgs(sinon.match.same(mLocalQueryOptions), "resourcePath",
+							sinon.match.same(oContext), undefined, null)
+						.callsFake(function () {
+							oBinding.oCache = oCache;
+							return oCache;
+						});
+					return SyncPromise.resolve();
 				});
 
 			// code under test
@@ -1209,14 +1232,16 @@ sap.ui.define([
 				oModel : {
 					oRequestor : oRequestor,
 					mUriParameters : {},
-					getReporter : getForbiddenReporter
+					getReporter : getForbiddenReporter,
+					waitForKeepAliveBinding : mustBeMocked
 				},
 				sPath : "/absolute",
 				bRelative : false
 			}),
 			oBindingMock = this.mock(oBinding),
 			oCache = {},
-			mLocalQueryOptions = {};
+			mLocalQueryOptions = {},
+			that = this;
 
 		oBindingMock.expects("fetchOrGetQueryOptionsForOwnCache")
 			.withExactArgs(undefined, undefined)
@@ -1233,10 +1258,20 @@ sap.ui.define([
 					.returns(false);
 				oBindingMock.expects("fetchResourcePath").withExactArgs(undefined)
 					.returns(SyncPromise.resolve("absolute"));
+				let bWaitedForKeepAliveBinding = false;
+				that.mock(oBinding.oModel).expects("waitForKeepAliveBinding")
+					.withExactArgs(sinon.match.same(oBinding))
+					.callsFake(function () {
+						bWaitedForKeepAliveBinding = true;
+						return SyncPromise.resolve();
+					});
 				oBindingMock.expects("createAndSetCache")
 					.withExactArgs(sinon.match.same(mLocalQueryOptions), "absolute", undefined,
 						undefined, null)
-					.returns(oCache);
+					.callsFake(function () {
+						assert.strictEqual(bWaitedForKeepAliveBinding, true);
+						return oCache;
+					});
 			})));
 
 		// code under test
@@ -1407,7 +1442,8 @@ sap.ui.define([
 					oRequestor : {
 						ready : function () { return SyncPromise.resolve(); }
 					},
-					mUriParameters : {}
+					mUriParameters : {},
+					waitForKeepAliveBinding : mustBeMocked
 				},
 				sPath : "relative",
 				mParameters : {$$canonicalPath : true},
@@ -1455,6 +1491,9 @@ sap.ui.define([
 		oBindingMock.expects("fetchResourcePath")
 			.withExactArgs(sinon.match.same(oContext1))
 			.returns(SyncPromise.resolve(Promise.resolve("resourcePath1")));
+		this.mock(oBinding.oModel).expects("waitForKeepAliveBinding")
+			.withExactArgs(sinon.match.same(oBinding))
+			.returns(SyncPromise.resolve());
 		oBindingMock.expects("createAndSetCache")
 			.withExactArgs(sinon.match.same(mLocalQueryOptions), "resourcePath1",
 				sinon.match.same(oContext1), "~sGroupId~", sinon.match.same(oOldCache))

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

@@ -2588,7 +2588,7 @@ sap.ui.define([
 			.withExactArgs(sinon.match.same(sPath));
 		this.mock(oBinding).expects("fetchCache")
 			.withExactArgs(sinon.match.same(oContext), false, /*bKeepQueryOptions*/true, undefined);
-		this.mock(oBinding).expects("refreshKeptElements").withExactArgs("myGroup")
+		this.mock(oBinding).expects("refreshKeptElements").withExactArgs("myGroup", undefined)
 			.returns(oRefreshKeptElementsPromise);
 		this.mock(oBinding).expects("createRefreshPromise").withExactArgs(undefined).callThrough();
 		this.mock(oBinding).expects("reset")
@@ -2724,6 +2724,9 @@ sap.ui.define([
 					oBinding.oCachePromise = SyncPromise.resolve(oBinding.oCache);
 				}
 			});
+		this.mock(oBinding).expects("refreshKeptElements")
+			.withExactArgs("myGroup", bKeepCacheOnError)
+			.returns(SyncPromise.resolve());
 		this.mock(oBinding).expects("reset").exactly(iNoOfCalls)
 			.withExactArgs(ChangeReason.Refresh, bKeepCacheOnError ? false : undefined, "myGroup")
 			.callsFake(function () {
@@ -2804,6 +2807,8 @@ sap.ui.define([
 				oBinding.oCache = oNewCache;
 				oBinding.oCachePromise = SyncPromise.resolve(oNewCache);
 			});
+		this.mock(oBinding).expects("refreshKeptElements").withExactArgs("myGroup", true)
+			.returns(SyncPromise.resolve());
 		this.mock(oBinding).expects("createRefreshPromise").withExactArgs(true)
 			.returns(oRefreshPromise);
 		this.mock(oBinding).expects("reset").withExactArgs(ChangeReason.Refresh, false, "myGroup");
@@ -2861,6 +2866,8 @@ sap.ui.define([
 				oBinding.oCache = oNewCache;
 				oBinding.oCachePromise = SyncPromise.resolve(oNewCache);
 			});
+		this.mock(oBinding).expects("refreshKeptElements").withExactArgs("myGroup", true)
+			.returns(SyncPromise.resolve());
 		this.mock(oBinding).expects("createRefreshPromise").withExactArgs(true).rejects(oError);
 		this.mock(oBinding).expects("fetchResourcePath").never();
 		this.mock(oCache).expects("restore").withExactArgs(false); // free memory
@@ -3057,7 +3064,7 @@ sap.ui.define([
 		};
 		this.mock(oBinding).expects("lockGroup").withExactArgs("myGroup").returns("~groupLock~");
 		oRefreshKeptElementsCall = this.mock(oNewCache).expects("refreshKeptElements")
-			.withExactArgs("~groupLock~", sinon.match.func)
+			.withExactArgs("~groupLock~", sinon.match.func, false, "~bIgnorePendingChanges~")
 			.returns(bFail
 				? SyncPromise.reject(oError)
 				: SyncPromise.resolve("~result~"));
@@ -3066,7 +3073,8 @@ sap.ui.define([
 				sinon.match.same(oError));
 
 		// code under test
-		return oBinding.refreshKeptElements("myGroup").then(function (vResult) {
+		return oBinding.refreshKeptElements("myGroup", "~bIgnorePendingChanges~")
+				.then(function (vResult) {
 			var iCallCount = iIndex >= 0 ? 0 : 1;
 
 			assert.strictEqual(vResult, "~result~");
@@ -4366,6 +4374,30 @@ sap.ui.define([
 		assert.strictEqual(oCreatedContext.getModelIndex(), 0);
 	});
 
+	//*********************************************************************************************
+	QUnit.test("createContexts: reuse a created context in a RH", function (assert) {
+		const oBinding = this.bindList("/EMPLOYEES");
+		oBinding.mParameters.$$aggregation = {hierarchyQualifier : "X"};
+		const oCreatedContext = Context.create(this.oModel, oBinding, "/EMPLOYEES('1')", 42,
+			SyncPromise.resolve());
+
+		oBinding.mPreviousContextsByPath = {
+			"/EMPLOYEES('1')" : oCreatedContext
+		};
+		this.mock(Context).expects("create").never();
+		this.mock(oBinding).expects("destroyPreviousContextsLater").withExactArgs([]);
+		this.mock(oCreatedContext).expects("destroy").never();
+		this.mock(oCreatedContext).expects("checkUpdate").withExactArgs();
+
+		// code under test
+		oBinding.createContexts(0, [{
+			"@$ui5._" : {context : "n/a", predicate : "('1')"}
+		}]);
+
+		assert.strictEqual(oBinding.aContexts[0], oCreatedContext);
+		assert.strictEqual(oCreatedContext.getModelIndex(), 0);
+	});
+
 	//*********************************************************************************************
 	QUnit.test("createContexts: reuse created from 'context' annotation", function (assert) {
 		var oBinding = this.bindList("/EMPLOYEES"),
@@ -4808,7 +4840,8 @@ sap.ui.define([
 		// code under test - call fnErrorCallback
 		oCreateInCacheExpectation.args[0][6](oError);
 
-		oSetSelectedExpectation = this.mock(oContext0).expects("setSelected").withExactArgs(false);
+		oSetSelectedExpectation = this.mock(oContext0).expects("doSetSelected")
+			.withExactArgs(false);
 		oRemoveCreatedExpectation = oBindingMock.expects("removeCreated")
 			.withExactArgs(sinon.match.same(oContext0));
 
@@ -5880,7 +5913,7 @@ sap.ui.define([
 		oContext.created().catch(function (oError) {
 			assert.ok(oError.canceled, "create promise rejected with 'canceled'");
 		});
-		this.mock(oContext).expects("setSelected").withExactArgs(false);
+		this.mock(oContext).expects("doSetSelected").withExactArgs(false);
 		this.mock(oBinding).expects("removeCreated").withExactArgs(sinon.match.same(oContext))
 			.callThrough();
 		oBindingMock.expects("deleteFromCache").callsFake(function () {
@@ -7887,7 +7920,8 @@ sap.ui.define([
 		this.mock(oBinding).expects("getGroupId").exactly(bRefreshKeptElements ? 1 : 0)
 			.returns("myGroup");
 		this.mock(oBinding).expects("refreshKeptElements").exactly(bRefreshKeptElements ? 1 : 0)
-			.withExactArgs("myGroup");
+			.withExactArgs("myGroup")
+			.returns(SyncPromise.resolve());
 		this.mock(oBinding).expects("fetchCache")
 			.withExactArgs(sinon.match.same(oContext), false);
 		this.mock(oBinding).expects("_fireRefresh").never();

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

@@ -3536,6 +3536,9 @@ sap.ui.define([
 			"/TEAMS/0" : "tea_busi.TEAM"
 		},
 		editUrl : "TEAMS(~0)"
+	}, { // client-side annotation
+		path : "/TEAMS('42')|@$ui5.context.isSelected",
+		editUrl : "TEAMS('42')"
 	}].forEach(function (oFixture) {
 		QUnit.test("fetchUpdateData: " + oFixture.path, function (assert) {
 			var i = oFixture.path.indexOf("|"),