@openui5/sap.ui.core 1.115.1 → 1.116.0

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

@@ -141,7 +141,7 @@ sap.ui.define([
 			bAction : undefined,
 			mChangeListeners : {},
 			mParameters : {},
-			sResourcePath : undefined
+			mRefreshParameters : {}
 		});
 		assert.strictEqual(oBinding.oReturnValueContext, null);
 		assert.strictEqual(oBinding.sUpdateGroupId, "updateGroup");
@@ -2420,7 +2420,7 @@ sap.ui.define([
 				bAction : undefined,
 				mChangeListeners : {},
 				mParameters : {},
-				sResourcePath : undefined
+				mRefreshParameters : {}
 			});
 
 		assert.throws(function () {
@@ -2433,7 +2433,7 @@ sap.ui.define([
 				bAction : undefined,
 				mChangeListeners : {},
 				mParameters : {},
-				sResourcePath : undefined
+				mRefreshParameters : {}
 			}, "unchanged");
 	});
 
@@ -3838,7 +3838,7 @@ sap.ui.define([
 });
 
 	//*********************************************************************************************
-	QUnit.test("doFetchQueryOptions", function (assert) {
+	QUnit.test("doFetchOrGetQueryOptions", function (assert) {
 		var oBinding = this.bindContext("foo"),
 			oContext = {},
 			oPromise = {};
@@ -3848,7 +3848,7 @@ sap.ui.define([
 			.returns(oPromise);
 
 		// code under test
-		assert.strictEqual(oBinding.doFetchQueryOptions(oContext), oPromise);
+		assert.strictEqual(oBinding.doFetchOrGetQueryOptions(oContext), oPromise);
 	});
 
 	//*********************************************************************************************
@@ -3894,6 +3894,7 @@ sap.ui.define([
 			.callsFake(function () {
 				assert.deepEqual(oBinding.mAggregatedQueryOptions, {});
 				assert.strictEqual(oBinding.bAggregatedQueryOptionsInitial, true);
+				assert.deepEqual(oBinding.mCanUseCachePromiseByChildPath, {});
 			});
 		this.mock(oBinding).expects("getDependentBindings").withExactArgs()
 			.returns([oDependent0, oDependent1]);
@@ -3905,6 +3906,7 @@ sap.ui.define([
 			.withExactArgs({reason : sinon.match.same(sResumeChangeReason)});
 		oBinding.mAggregatedQueryOptions = {$select : ["Team_Id"]};
 		oBinding.bAggregatedQueryOptionsInitial = false;
+		oBinding.mCanUseCachePromiseByChildPath = "~mCanUseCachePromiseByChildPath~";
 
 		// code under test
 		oBinding.resumeInternal(bCheckUpdate);
@@ -4435,7 +4437,9 @@ sap.ui.define([
 		oBinding.mLateQueryOptions = bWithLateQueryOptions ? {} : undefined;
 		oBinding.oReturnValueContext = oReturnValueContext;
 		this.mock(oBinding).expects("computeOperationQueryOptions").withExactArgs()
-			.returns(mQueryOptions);
+			.returns(bWithLateQueryOptions ? "~operationQueryOptions~" : mQueryOptions);
+		this.mock(_Helper).expects("clone").exactly(bWithLateQueryOptions ? 1 : 0)
+			.withExactArgs("~operationQueryOptions~").returns(mQueryOptions);
 		this.mock(_Helper).expects("aggregateExpandSelect")
 			.exactly(bWithLateQueryOptions ? 1 : 0)
 			.withExactArgs(sinon.match.same(mQueryOptions),
@@ -4531,10 +4535,12 @@ sap.ui.define([
 });
 
 	//*********************************************************************************************
+[0, 1, 2].forEach(function (iOperation) {
 	[false, true].forEach(function (bWithContext) {
 		[false, true].forEach(function (bRecursionRejects) {
 			var sTitle = "requestSideEffects, with context: " + bWithContext
-					+ "; recursion rejects: " + bRecursionRejects;
+					+ "; recursion rejects: " + bRecursionRejects
+					+ "; operation setup #" + iOperation;
 
 			QUnit.test(sTitle, function (assert) {
 				// Note: w/o a context, the binding would be relative in real life
@@ -4555,32 +4561,52 @@ sap.ui.define([
 					oResult,
 					that = this;
 
+				function expectVisitEtc(aPromises) {
+					that.mock(oBinding).expects("visitSideEffects")
+						.withExactArgs(sGroupId, sinon.match.same(aPaths),
+							sinon.match.same(oContext), aPromises)
+						.callsFake(function (_sGroupId, _aPaths, _oContext, aPromises) {
+							aPromises.push(Promise.resolve());
+							aPromises.push(Promise.reject(oCanceledError));
+							if (bRecursionRejects) {
+								aPromises.push(Promise.reject(oError));
+							}
+						});
+					that.mock(oBinding).expects("refreshDependentListBindingsWithoutCache")
+						.exactly(bRecursionRejects ? 0 : 1).withExactArgs().resolves("~");
+				}
+
 				oCanceledError.canceled = true;
 				oBinding.oCache = oCache; // simulate execute
-				this.mock(oBinding).expects("lockGroup").withExactArgs(sGroupId)
-					.returns(oGroupLock);
+				switch (iOperation) {
+					case 0:
+						oBinding.oOperation = null;
+						break;
+
+					case 1:
+						oBinding.oReturnValueContext = "~truthy~";
+						break;
+
+					default:
+						// oOperation, but no oReturnValueContext
+				}
+				this.mock(oBinding).expects("lockGroup").exactly(iOperation < 2 ? 1 : 0)
+					.withExactArgs(sGroupId).returns(oGroupLock);
 				if (bWithContext) {
-					this.mock(oContext).expects("getPath").withExactArgs().returns("/Me");
+					this.mock(oContext).expects("getPath").exactly(iOperation < 2 ? 1 : 0)
+						.withExactArgs().returns("/Me");
 				}
-				this.mock(oCache).expects("requestSideEffects")
+				this.mock(oCache).expects("requestSideEffects").exactly(iOperation < 2 ? 1 : 0)
 					.withExactArgs(sinon.match.same(oGroupLock), sinon.match.same(aPaths),
 						bWithContext ? "Me" : undefined)
-					.callsFake(function (_oGroupLock, aPaths) {
-						that.mock(oBinding).expects("visitSideEffects")
-							.withExactArgs(sGroupId, sinon.match.same(aPaths),
-								sinon.match.same(oContext), [oPromise])
-							.callsFake(function (_sGroupId, _aPaths, _oContext, aPromises) {
-								aPromises.push(Promise.resolve());
-								aPromises.push(Promise.reject(oCanceledError));
-								if (bRecursionRejects) {
-									aPromises.push(Promise.reject(oError));
-								}
-							});
-							that.mock(oBinding).expects("refreshDependentListBindingsWithoutCache")
-								.exactly(bRecursionRejects ? 0 : 1).withExactArgs().resolves("~");
+					.callsFake(function () {
+						expectVisitEtc([oPromise]);
 
 						return oPromise;
 					});
+				if (iOperation >= 2) {
+					expectVisitEtc([]);
+				}
 				oModelMock.expects("reportError")
 					.withExactArgs("Failed to request side effects", sClassName,
 						sinon.match.same(oCanceledError));
@@ -4606,10 +4632,11 @@ sap.ui.define([
 			});
 		});
 	});
+});
 
 	//*********************************************************************************************
 	QUnit.test("requestSideEffects: no cache", function (assert) {
-		var oBinding = this.bindContext("/Me/name.space.Operation(...)");
+		var oBinding = this.bindContext("/Me");
 
 		// @see sap.ui.model.odata.v4.ODataParentBinding#requestSideEffects
 		// @throws {Error} - If this binding does not use own data service requests
@@ -4621,7 +4648,7 @@ sap.ui.define([
 
 	//*********************************************************************************************
 	QUnit.test("requestSideEffects: fails", function (assert) {
-		var oBinding = this.bindContext("/Me/name.space.Operation(...)"),
+		var oBinding = this.bindContext("/Me/Friends('42')"),
 			oCache = {
 				requestSideEffects : function () {}
 			},
@@ -4673,6 +4700,7 @@ sap.ui.define([
 					oRefreshPromise = bReturnValueContext ? SyncPromise.resolve() : null;
 
 				oBinding.oCache = oCache; // simulate execute
+				oBinding.oReturnValueContext = "~truthy~";
 				if (sPath === "") {
 					this.mock(oCache).expects("requestSideEffects").never();
 				} else {
@@ -4737,7 +4765,7 @@ sap.ui.define([
 
 	//*********************************************************************************************
 	QUnit.test("requestSideEffects: do not stifle errors", function (assert) {
-		var oBinding = this.bindContext("/Me/name.space.Operation(...)"),
+		var oBinding = this.bindContext("/Me"),
 			oCache = {
 				requestSideEffects : function () {}
 			},

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

@@ -2373,6 +2373,7 @@ sap.ui.define([
 		if (oFixture.aggregation) {
 			oBinding.mParameters.$$aggregation = oAggregation;
 		}
+		oBinding.mCanUseCachePromiseByChildPath = "~mCanUseCachePromiseByChildPath~";
 		oBinding.sChangeReason = "sChangeReason";
 		oBinding.bHasPathReductionToParent = oFixture.backLink;
 
@@ -2408,6 +2409,8 @@ sap.ui.define([
 
 		assert.ok(oFetchCacheCall.calledAfter(oResetKeepAliveCall));
 		assert.strictEqual(oBinding.sChangeReason, sExpectedChangeReason);
+		assert.deepEqual(oBinding.mCanUseCachePromiseByChildPath,
+			i === 0 ? {} : "~mCanUseCachePromiseByChildPath~");
 		if (oFixture.newContext) {
 			assert.deepEqual(oBinding.mPreviousContextsByPath, {
 				"/foo/Suppliers" : oOldHeaderContext
@@ -3806,6 +3809,44 @@ sap.ui.define([
 		assert.strictEqual(oContext2.iIndex, undefined);
 	});
 
+	//*********************************************************************************************
+	QUnit.test("destroyPreviousContexts: cache & hidden context", function (assert) {
+		var oBinding = this.bindList("/EMPLOYEES"),
+			oContext1 = {
+				iIndex : undefined,
+				destroy : function () {},
+				isEffectivelyKeptAlive : function () {},
+				isTransient : function () {}
+			},
+			oContext2 = {
+				iIndex : 0,
+				destroy : function () {},
+				isEffectivelyKeptAlive : function () {},
+				isTransient : function () {}
+			};
+
+		oBinding.mPreviousContextsByPath = {
+			p1 : oContext1,
+			p2 : oContext2,
+			p3 : "~oContext3~"
+		};
+		this.mock(oContext1).expects("isEffectivelyKeptAlive").withExactArgs().returns(false);
+		this.mock(oContext1).expects("isTransient").withExactArgs().returns(false);
+		this.mock(oContext1).expects("destroy").withExactArgs();
+		this.mock(oContext2).expects("isEffectivelyKeptAlive").withExactArgs().returns(false);
+		this.mock(oContext2).expects("isTransient").withExactArgs().returns(false);
+		this.mock(oContext2).expects("destroy").withExactArgs();
+		this.mock(oBinding.oHeaderContext).expects("getPath").withExactArgs().returns("/EMPLOYEES");
+		this.mock(_Helper).expects("getRelativePath")
+			.withExactArgs("p1", "/EMPLOYEES").returns("relative/path");
+		this.mock(oBinding.oCache).expects("removeKeptElement").withExactArgs("relative/path");
+
+		// code under test
+		oBinding.destroyPreviousContexts(["p1", "p2"]);
+
+		assert.deepEqual(oBinding.mPreviousContextsByPath, {p3 : "~oContext3~"});
+	});
+
 	//*********************************************************************************************
 	QUnit.test("destroyPreviousContexts: binding already destroyed", function (assert) {
 		var oBinding = this.bindList("relative");
@@ -6357,7 +6398,7 @@ sap.ui.define([
 
 	//*********************************************************************************************
 [false, true].forEach(function (bChanged) {
-	QUnit.test("doFetchQueryOptions: meta path changed = " + bChanged, function (assert) {
+	QUnit.test("doFetchOrGetQueryOptions: meta path changed = " + bChanged, function (assert) {
 		var oBinding = this.bindList("TEAM_2_EMPLOYEES"),
 			oContext = {
 				getPath : function () {}
@@ -6387,14 +6428,14 @@ sap.ui.define([
 			.returns(mMergedQueryOptions);
 
 		// code under test
-		oQueryOptionsPromise = oBinding.doFetchQueryOptions(oContext);
+		oQueryOptionsPromise = oBinding.doFetchOrGetQueryOptions(oContext);
 
 		assert.strictEqual(oBinding.oQueryOptionsPromise, oQueryOptionsPromise);
 		assert.strictEqual(oQueryOptionsPromise.getResult(), mMergedQueryOptions);
 		assert.strictEqual(oQueryOptionsPromise.$metaPath, "/TEAMS");
 
 		// code under test (promise exists, meta path unchanged)
-		assert.strictEqual(oBinding.doFetchQueryOptions(oContext), oQueryOptionsPromise);
+		assert.strictEqual(oBinding.doFetchOrGetQueryOptions(oContext), oQueryOptionsPromise);
 
 		assert.strictEqual(oBinding.oQueryOptionsPromise, oQueryOptionsPromise);
 		assert.strictEqual(oQueryOptionsPromise.$metaPath, "/TEAMS");
@@ -6639,7 +6680,7 @@ sap.ui.define([
 			this.mock(oBinding).expects("getQueryOptionsForPath")
 				.withExactArgs("", sinon.match.same(oContext))
 				.returns(oFixture.mInheritedQueryOptions);
-			this.mock(Object).expects("assign")
+			this.mock(_Helper).expects("merge")
 				.withExactArgs({}, sinon.match.same(oFixture.mInheritedQueryOptions),
 					oFixture.mExpectedQueryOptions)
 				.returns(mQueryOptions);
@@ -10446,6 +10487,80 @@ sap.ui.define([
 			oBinding.checkDeepCreate();
 		}, new Error("Invalid path 'SO_2_SOITEM/SOITEM_2_SCHDL' in deep create"));
 	});
+
+	//*********************************************************************************************
+	QUnit.test("onKeepAliveChanged: remove from cache", function () {
+		var oBinding = this.bindList("/SalesOrderList"),
+			oContext = {
+				isDeleted : function () {},
+				isEffectivelyKeptAlive : function () {},
+				getPath : function () {}
+			};
+
+		oBinding.mPreviousContextsByPath = {
+			"/SalesOrderList('1')" : "~" // would actually be the context
+		};
+		this.mock(oContext).expects("isDeleted").withExactArgs().returns(false);
+		this.mock(oContext).expects("getPath").twice()
+			.withExactArgs().returns("/SalesOrderList('1')");
+		this.mock(oContext).expects("isEffectivelyKeptAlive").withExactArgs().returns(false);
+		this.mock(oBinding).expects("destroyPreviousContextsLater")
+			.withExactArgs(["/SalesOrderList('1')"]);
+
+		// code under test
+		oBinding.onKeepAliveChanged(oContext);
+	});
+
+	//*********************************************************************************************
+	QUnit.test("onKeepAliveChanged: deleted", function () {
+		var oBinding = this.bindList("/SalesOrderList"),
+			oContext = {
+				isDeleted : function () {}
+			};
+
+		this.mock(oContext).expects("isDeleted").withExactArgs().returns(true);
+		this.mock(oBinding).expects("destroyPreviousContextsLater").never();
+
+		// code under test
+		oBinding.onKeepAliveChanged(oContext);
+	});
+
+	//*********************************************************************************************
+	QUnit.test("onKeepAliveChanged: in the binding's collection", function () {
+		var oBinding = this.bindList("/SalesOrderList"),
+			oContext = {
+				isDeleted : function () {},
+				getPath : function () {}
+			};
+
+		this.mock(oContext).expects("isDeleted").withExactArgs().returns(false);
+		this.mock(oContext).expects("getPath").withExactArgs().returns("/SalesOrderList('1')");
+		this.mock(oBinding).expects("destroyPreviousContextsLater").never();
+
+		// code under test
+		oBinding.onKeepAliveChanged(oContext);
+	});
+
+	//*********************************************************************************************
+	QUnit.test("onKeepAliveChanged: effectively kept alive", function () {
+		var oBinding = this.bindList("/SalesOrderList"),
+			oContext = {
+				isDeleted : function () {},
+				isEffectivelyKeptAlive : function () {},
+				getPath : function () {}
+			};
+
+		oBinding.mPreviousContextsByPath = {
+			"/SalesOrderList('1')" : oContext
+		};
+		this.mock(oContext).expects("isDeleted").withExactArgs().returns(false);
+		this.mock(oContext).expects("getPath").withExactArgs().returns("/SalesOrderList('1')");
+		this.mock(oContext).expects("isEffectivelyKeptAlive").withExactArgs().returns(true);
+		this.mock(oBinding).expects("destroyPreviousContextsLater").never();
+
+		// code under test
+		oBinding.onKeepAliveChanged(oContext);
+	});
 });
 
 //TODO integration: 2 entity sets with same $expand, but different $select

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

@@ -3136,13 +3136,13 @@ sap.ui.define([
 		oResult : undefined
 	}, {
 		oProperty : {$Precision : 7, $Type : "Edm.DateTimeOffset"},
-		oResult : {precision : 7}
+		oResult : {precision : 7, V4 : true}
 	}, {
 		oProperty : {$Nullable : false, $Precision : 7, $Type : "Edm.DateTimeOffset"},
-		oResult : {nullable : false, precision : 7}
+		oResult : {nullable : false, precision : 7, V4 : true}
 	}, {
 		oProperty : {$Nullable : false, $Type : "Edm.DateTimeOffset"},
-		oResult : {nullable : false}
+		oResult : {nullable : false, V4 : true}
 	}, {
 		mGetObjectResults : {
 			"/foo@Org.OData.Validation.V1.Minimum/$Decimal" : "0.00",