@openui5/sap.ui.core 1.124.0 → 1.124.2

package/test/sap/ui/core/qunit/odata/v4/ODataModel.integration.qunit.js

@@ -5179,12 +5179,6 @@ sap.ui.define([
 
 			oContext.setSelected(true);
 
-			// This error is unavoidable as #fetchValue runs right after creating the context, but
-			// fails as the context is deleted already.
-			that.oLogMock.expects("error")
-				.withArgs(sinon.match("Failed to drill-down into ($uid="),
-					sSalesOrderService + "SalesOrderList", "sap.ui.model.odata.v4.lib._Cache");
-
 			assert.ok(oModel.hasPendingChanges());
 			assert.ok(oListBindingWithoutUI.hasPendingChanges());
 			assert.strictEqual(oListBindingWithoutUI.getLength(), 1 + 10/*length is not final*/);
@@ -8353,6 +8347,59 @@ sap.ui.define([
 		});
 	});
 
+	//*********************************************************************************************
+	// Scenario: Table gets a binding context for which data was already loaded and then a refresh
+	// is performed synchronously.
+	// SNOW: CS20240007657519
+	QUnit.test("CS20240007657519", async function (assert) {
+		const oModel = this.createSalesOrdersModel({autoExpandSelect : true});
+		const sView = `
+<FlexBox binding="{/SalesOrderList('1')}" id="form">
+	<Table id="table" items="{path : 'SO_2_SOITEM', parameters : {$$ownRequest : true}}">
+		<Text id="position" text="{ItemPosition}"/>
+	</Table>
+</FlexBox>`;
+
+		this.expectRequest("SalesOrderList('1')/SO_2_SOITEM"
+				+ "?$select=ItemPosition,SalesOrderID&$skip=0&$top=100", {
+				value : [ // implicitly sorted descending
+					{SalesOrderID : "1", ItemPosition : "0020"},
+					{SalesOrderID : "1", ItemPosition : "0010"}
+				]
+			})
+			.expectChange("position", ["0020", "0010"]);
+
+		await this.createView(assert, sView, oModel);
+
+		const oTable = this.oView.byId("table");
+		const oFormContext = this.oView.byId("form").getBindingContext();
+
+		oTable.setBindingContext(null);
+
+		await this.waitForChanges(assert);
+
+		oTable.setBindingContext(oFormContext);
+
+		this.expectCanceledError("Failed to get contexts for " + sSalesOrderService
+					+ "SalesOrderList('1')/SO_2_SOITEM with start index 0 and length 100",
+				sODLB + ": /SalesOrderList('1')|SO_2_SOITEM"
+					+ " is ignoring response from inactive cache: " + sSalesOrderService
+					+ "SalesOrderList('1')/SO_2_SOITEM?$select=ItemPosition,SalesOrderID")
+			.expectRequest("SalesOrderList('1')/SO_2_SOITEM"
+				+ "?$select=ItemPosition,SalesOrderID&$skip=0&$top=100", {
+				value : [
+					{SalesOrderID : "1", ItemPosition : "0030"}, // a new one!
+					{SalesOrderID : "1", ItemPosition : "0020"},
+					{SalesOrderID : "1", ItemPosition : "0010"}
+				]
+			})
+			.expectChange("position", ["0030", "0020", "0010"]);
+
+		oFormContext.refresh();
+
+		await this.waitForChanges(assert);
+	});
+
 	//*********************************************************************************************
 	// Scenario: Read and modify an entity with key aliases
 	// CPOUI5ODATAV4-1580: show usage of ODataModel#getKeyPredicate
@@ -23406,12 +23453,6 @@ sap.ui.define([
 
 			assert.strictEqual(oTable.getBinding("rows").getContexts().length, 2);
 
-			that.oLogMock.expects("error").withExactArgs("Failed to drill-down into"
-				+ " (Country='UK',Region='Z')/Region, invalid segment: (Country='UK',Region='Z')",
-				"/aggregation/BusinessPartners"
-				+ "?$apply=groupby((Country,Region),aggregate(SalesAmount))",
-				"sap.ui.model.odata.v4.lib._Cache");
-
 			// code under test
 			assert.strictEqual(oThirdRow.getProperty("Region"), undefined,
 				"$byPredicate has been cleaned up");
@@ -36881,6 +36922,7 @@ make root = ${bMakeRoot}`;
 					ID : "3",
 					Name : "Gamma"
 				}, {
+					"@odata.etag" : "Delta's ETag",
 					DescendantCount : "0",
 					DistanceFromRoot : "0",
 					DrillState : "leaf",
@@ -36912,6 +36954,7 @@ make root = ${bMakeRoot}`;
 		this.expectRequest({
 				batchNo : 2,
 				headers : {
+					"If-Match" : "Delta's ETag",
 					Prefer : "return=minimal"
 				},
 				method : "PATCH",
@@ -36923,6 +36966,7 @@ make root = ${bMakeRoot}`;
 			.expectRequest({
 				batchNo : 2,
 				headers : {
+					"If-Match" : "Delta's ETag",
 					Prefer : "return=minimal"
 				},
 				method : "POST",
@@ -48193,8 +48237,7 @@ make root = ${bMakeRoot}`;
 		return this.createView(assert, sView).then(function () {
 			that.expectCanceledError("Failed to get contexts for " + sTeaBusi
 						+ "EMPLOYEES with start index 0 and length 100",
-					sODLB + ": /EMPLOYEES is ignoring response from inactive cache: " + sTeaBusi
-						+ "EMPLOYEES");
+					"Binding already destroyed");
 
 			that.oView.destroy();
 			delete that.oView;
@@ -67100,6 +67143,36 @@ make root = ${bMakeRoot}`;
 		});
 	});
 
+	//*********************************************************************************************
+	// Scenario: setBindingContext of a table w/o cache below a context binding w/o own properties.
+	// See that this context binding can refresh properly afterwards.
+	// SNOW: DINC0117588
+	QUnit.test("DINC0117588", async function (assert) {
+		const oModel = this.createTeaBusiModel({autoExpandSelect : true});
+		const sView = `
+<FlexBox id="root" binding="{/TEAMS('0')}">
+	<Table id="table" items="{TEAM_2_EMPLOYEES}">
+		<Text id="id" text="{ID}"/>
+	</Table>
+</FlexBox>`;
+
+		this.expectRequest("TEAMS('0')?$select=Team_Id&$expand=TEAM_2_EMPLOYEES($select=ID)", {
+				TeamId : "0",
+				TEAM_2_EMPLOYEES : [
+					{ID : "1"}
+				]
+			})
+			.expectChange("id", ["1"]);
+
+		await this.createView(assert, sView, oModel);
+
+		this.oView.byId("table").setBindingContext(null);
+
+		await this.waitForChanges(assert);
+
+		await this.oView.byId("root").getBindingContext().requestRefresh();
+	});
+
 	//*********************************************************************************************
 	// Scenario: Create an item, persist it, select it and sort the cache. Because of the selected
 	// (and thus effectively kept-alive) element, the cache cannot be recreated. Then delete the

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

@@ -4113,7 +4113,6 @@ sap.ui.define([
 		[
 			"adjustPredicate",
 			"destroy",
-			"doDeregisterChangeListener",
 			"getGeneration",
 			"hasPendingChangesForPath",
 			"isUnchangedParameter",

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

@@ -32,8 +32,6 @@ sap.ui.define([
 			refreshDataState : function () {}
 		});
 
-	function mustBeMocked() { throw new Error("Must be mocked"); }
-
 	//*********************************************************************************************
 	QUnit.module("sap.ui.model.odata.v4.ODataPropertyBinding", {
 		beforeEach : function () {
@@ -692,7 +690,7 @@ sap.ui.define([
 					.withExactArgs(sinon.match.same(oGroupLock), undefined, sinon.match.func,
 						sinon.match.same(oBinding))
 					.returns(SyncPromise.resolve(Promise.resolve().then(function () {
-						that.mock(oBinding).expects("assertSameCache")
+						that.mock(oBinding).expects("checkSameCache")
 							.withExactArgs(sinon.match.same(oCache));
 						return vValue;
 					})));
@@ -2260,7 +2258,6 @@ sap.ui.define([
 
 		oPropertyBinding.oCheckUpdateCallToken = {};
 		oPropertyBinding.vValue = "foo";
-		this.mock(oPropertyBinding).expects("deregisterChangeListener").withExactArgs();
 		this.mock(this.oModel).expects("bindingDestroyed")
 			.withExactArgs(sinon.match.same(oPropertyBinding));
 		this.mock(asODataBinding.prototype).expects("destroy").on(oPropertyBinding).withExactArgs();
@@ -2375,52 +2372,6 @@ sap.ui.define([
 		oBinding.resetInvalidDataState();
 	});
 
-	//*********************************************************************************************
-[false, true].forEach(function (bRelative) {
-	[false, true].forEach(function (bHasContext) {
-		[false, true].forEach(function (bHasMethod) {
-		const sTitle = `deregisterChangeListener: relative=${bRelative}, w/ context=${bHasContext},
-			w/ method=${bHasMethod}`;
-
-	QUnit.test(sTitle, function () {
-		const oBinding = this.oModel.bindProperty((bRelative ? "" : "/") + "EMPLOYEES('1')/AGE");
-		if (bRelative && bHasContext) {
-			oBinding.oContext = {};
-			if (bHasMethod) {
-				oBinding.oContext.deregisterChangeListener = mustBeMocked;
-				this.mock(oBinding.oContext).expects("deregisterChangeListener").twice()
-					.withExactArgs(sinon.match.same(oBinding)).returns(false);
-			}
-		}
-		oBinding.sReducedPath = "/reduced/path";
-		this.mock(oBinding).expects("doDeregisterChangeListener")
-			.withExactArgs("/reduced/path", sinon.match.same(oBinding));
-
-		// code under test
-		oBinding.deregisterChangeListener();
-
-		oBinding.sReducedPath = undefined;
-
-		// code under test - no further doDeregisterChangeListener
-		oBinding.deregisterChangeListener();
-	});
-		});
-	});
-});
-
-	//*********************************************************************************************
-	QUnit.test("deregisterChangeListener: ask context; answers true", function () {
-		const oBinding = this.oModel.bindProperty("EMPLOYEES('1')/AGE");
-		oBinding.oContext = {deregisterChangeListener : mustBeMocked};
-		oBinding.sReducedPath = "/reduced/path";
-
-		this.mock(oBinding.oContext).expects("deregisterChangeListener")
-			.withExactArgs(sinon.match.same(oBinding)).returns(true);
-
-		// code under test
-		oBinding.deregisterChangeListener();
-	});
-
 	//*********************************************************************************************
 	QUnit.test("visitSideEffects", function () {
 		var oBinding = this.oModel.bindProperty("/EMPLOYEES('1')/AGE");

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

@@ -4613,9 +4613,10 @@ sap.ui.define([
 			.returns(SyncPromise.resolve({foo : "n/a", $bar : "n/a", baz : "n/a"}));
 		this.mock(oGroupLock).expects("getUnlockedCopy").withExactArgs().returns("~groupLockCopy~");
 		oRequestorMock.expects("request")
-			.withExactArgs("POST", "non/canonical/changeNextSibling", "~groupLockCopy~",
-				{Prefer : "return=minimal"},
-				{NextSibling : sSiblingPath ? {foo : "A", baz : "C"} : null})
+			.withExactArgs("POST", "non/canonical/changeNextSibling", "~groupLockCopy~", {
+					"If-Match" : "~oChildNode~",
+					Prefer : "return=minimal"
+				}, {NextSibling : sSiblingPath ? {foo : "A", baz : "C"} : null})
 			.returns("B");
 		this.mock(oCache).expects("requestRank")
 			.withExactArgs("~oChildNode~", sinon.match.same(oGroupLock), true)

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

@@ -1112,8 +1112,8 @@ sap.ui.define([
 	QUnit.test("_Cache#registerChangeListener", function () {
 		var oCache = new _Cache(this.oRequestor, "TEAMS");
 
-		this.mock(_Helper).expects("addByPath")
-			.withExactArgs(sinon.match.same(oCache.mChangeListeners), "path", "listener");
+		this.mock(_Helper).expects("registerChangeListener")
+			.withExactArgs(sinon.match.same(oCache), "path", "listener");
 
 		oCache.registerChangeListener("path", "listener");
 	});
@@ -1122,47 +1122,28 @@ sap.ui.define([
 	QUnit.test("_Cache#registerChangeListener: $$sharedRequest", function () {
 		var oCache = new _Cache(this.oRequestor, "TEAMS", undefined, false, undefined, true);
 
-		this.mock(_Helper).expects("addByPath")
-			.withExactArgs(sinon.match.same(oCache.mChangeListeners), "", "listener2");
+		this.mock(_Helper).expects("registerChangeListener")
+			.withExactArgs(sinon.match.same(oCache), "", "listener2");
 
 		oCache.registerChangeListener("path", "listener1");
 		oCache.registerChangeListener("", "listener2");
 	});
 
-	//*********************************************************************************************
-	QUnit.test("_Cache#deregisterChangeListener", function () {
-		var oCache = new _Cache(this.oRequestor, "TEAMS");
-
-		this.mock(_Helper).expects("removeByPath")
-			.withExactArgs(sinon.match.same(oCache.mChangeListeners), "path", "listener");
-
-		oCache.deregisterChangeListener("path", "listener");
-	});
-
-	//*********************************************************************************************
-	QUnit.test("_Cache#deregisterChangeListener: $$sharedRequest", function () {
-		var oCache = new _Cache(this.oRequestor, "TEAMS", undefined, false, undefined, true);
-
-		this.mock(_Helper).expects("removeByPath")
-			.withExactArgs(sinon.match.same(oCache.mChangeListeners), "", "listener2");
-
-		oCache.deregisterChangeListener("path", "listener1");
-		oCache.deregisterChangeListener("", "listener2");
-	});
-
 	//*********************************************************************************************
 	QUnit.test("_Cache#hasChangeListeners", function (assert) {
-		var oCache = new _Cache(this.oRequestor, "TEAMS");
-
-		// code under test
-		assert.strictEqual(oCache.hasChangeListeners(), false);
+		const oCache = new _Cache(this.oRequestor, "TEAMS");
+		const oHelperMock = this.mock(_Helper);
 
-		oCache.registerChangeListener("path", "listener");
+		oHelperMock.expects("isEmptyObject")
+			.withExactArgs(sinon.match.same(oCache.mChangeListeners))
+			.returns(false);
 
 		// code under test
 		assert.strictEqual(oCache.hasChangeListeners(), true);
 
-		oCache.deregisterChangeListener("path", "listener");
+		oHelperMock.expects("isEmptyObject")
+			.withExactArgs(sinon.match.same(oCache.mChangeListeners))
+			.returns(true);
 
 		// code under test
 		assert.strictEqual(oCache.hasChangeListeners(), false);
@@ -1782,6 +1763,20 @@ sap.ui.define([
 	});
 });
 
+	//*********************************************************************************************
+	QUnit.test("_Cache#drillDown: unexpected missing predicate", function (assert) {
+		const oCache = new _Cache(this.oRequestor, "Products");
+
+		this.oLogMock.expects("info").withExactArgs(
+			"Failed to drill-down into ('42')/entity/foo/bar/baz, invalid segment: ('42')",
+			"/~/Products", sClassName);
+
+		return oCache.drillDown([], "('42')/entity/foo/bar/baz")
+			.then(function (vValue) {
+				assert.strictEqual(vValue, undefined);
+			});
+	});
+
 	//*********************************************************************************************
 [0, "None"].forEach(function (vPermissions) {
 	QUnit.test("_Cache#drillDown: @Core.Permissions: " + vPermissions, function (assert) {
@@ -8285,7 +8280,10 @@ sap.ui.define([
 			oCache = this.createCache(sResourcePath),
 			fnCancelCallback = sinon.spy(),
 			iCountAfterCreate = bInactive ? 26 : 27,
-			oCountChangeListener = {onChange : function () {}},
+			oCountChangeListener = {
+				onChange : function () {},
+				setDeregisterChangeListener : function () {}
+			},
 			oCountChangeListenerMock = this.mock(oCountChangeListener),
 			oGroupLock = {
 				cancel : function () {},
@@ -8511,7 +8509,8 @@ sap.ui.define([
 			oListener = {
 				onChange : function () {
 					assert.ok(false);
-				}
+				},
+				setDeregisterChangeListener : function () {}
 			},
 			that = this;
 
@@ -8553,7 +8552,10 @@ sap.ui.define([
 				oCacheMock = this.mock(oCache),
 				oCancelNestedExpectation,
 				aCollection = [],
-				oCountChangeListener = {onChange : function () {}},
+				oCountChangeListener = {
+					onChange : function () {},
+					setDeregisterChangeListener : function () {}
+				},
 				oCreatePromise,
 				oGroupLock = {getGroupId : function () {}},
 				oHelperMock = this.mock(_Helper),
@@ -8685,7 +8687,8 @@ sap.ui.define([
 			oCache.registerChangeListener(sPathInCache + sTransientPredicate + "/Name", {
 				onChange : function () {
 					assert.ok(false, "No change event for Name");
-				}
+				},
+				setDeregisterChangeListener : function () {}
 			});
 
 			if (bDropTransientElement) { // side-effects refresh might drop transient element
@@ -9465,7 +9468,10 @@ sap.ui.define([
 
 	QUnit.test(sTitle, function (assert) {
 		var oCache = _Cache.create(this.oRequestor, "Employees"),
-			oCountChangeListener = {onChange : function () {}},
+			oCountChangeListener = {
+				onChange : function () {},
+				setDeregisterChangeListener : function () {}
+			},
 			oCreateGroupLock = {getGroupId : function () {}},
 			oHelperMock = this.mock(_Helper),
 			oPromise,

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

@@ -14,6 +14,8 @@ sap.ui.define([
 
 	var sClassName = "sap.ui.model.odata.v4.lib._Helper";
 
+	function mustBeMocked() { throw new Error("Must be mocked"); }
+
 	/**
 	 * Checks the given cloned error according to the given expectations.
 	 *
@@ -5468,4 +5470,32 @@ sap.ui.define([
 				}
 			});
 	});
+
+	//*********************************************************************************************
+	QUnit.test("registerChangeListener", function () {
+		const oOwner = {
+			mChangeListeners : "~listeners1~"
+		};
+		const oListener = {
+			setDeregisterChangeListener : mustBeMocked
+		};
+
+		this.mock(_Helper).expects("addByPath")
+			.withExactArgs("~listeners1~", "~path~", sinon.match.same(oListener));
+		const oCallbackExpectation = this.mock(oListener).expects("setDeregisterChangeListener")
+			.withExactArgs(sinon.match.func);
+
+		// code under test
+		_Helper.registerChangeListener(oOwner, "~path~", oListener);
+
+		oOwner.mChangeListeners = "~listeners2~";
+		this.mock(_Helper).expects("removeByPath")
+			.withExactArgs("~listeners2~", "~path~", sinon.match.same(oListener));
+
+		// code under test
+		oCallbackExpectation.args[0][0]();
+
+		// code under test
+		_Helper.registerChangeListener(oOwner, "~path~");
+	});
 });

package/test/sap/ui/core/qunit/performance/trace/FESR.qunit.js

@@ -34,9 +34,10 @@ sap.ui.define(['sap/ui/performance/trace/FESR', 'sap/ui/performance/trace/Intera
 		afterEach: function(assert) {
 			assert.notOk(FESR.getActive(), "FESR is deactivated");
 		},
-		dummyRequest: function() {
+		dummyRequest: function(bUseUrlObject) {
 			var xhr = new XMLHttpRequest();
-			xhr.open("GET", "resources/ui5loader.js?noCache=" + Date.now() + "-" + (++requestCounter), false);
+			const sUrl = "resources/ui5loader.js?noCache=" + Date.now() + "-" + (++requestCounter);
+			xhr.open("GET", bUseUrlObject ?  new URL(sUrl, document.baseURI) : sUrl, false);
 			xhr.send();
 			return xhr;
 		}
@@ -94,8 +95,8 @@ sap.ui.define(['sap/ui/performance/trace/FESR', 'sap/ui/performance/trace/Intera
 		Interaction.end(true);
 		oXhrHandle.abort();
 
-		// trigger another request to send FESR
-		oXhrHandle = this.dummyRequest();
+		// trigger another request to send FESR using URL object to ensure isCORSRequest can handle URL objects as well
+		oXhrHandle = this.dummyRequest(/* bUseUrlObject */ true);
 
 		assert.ok(oHeaderSpy.args.some(function(args) {
 			if (args[0] === "SAP-Perf-FESRec") {
@@ -167,8 +168,8 @@ sap.ui.define(['sap/ui/performance/trace/FESR', 'sap/ui/performance/trace/Intera
 		Interaction.end(true);
 		oXhrHandle.abort();
 
-		// trigger another request to send FESR
-		oXhrHandle = this.dummyRequest();
+		// trigger another request to send FESR using URL object to ensure isCORSRequest can handle URL objects as well
+		oXhrHandle = this.dummyRequest(/* bUseUrlObject */ true);
 
 		assert.ok(oHeaderSpy.args.some(function(args) {
 			if (args[0] === "SAP-Perf-FESRec") {
@@ -215,7 +216,8 @@ sap.ui.define(['sap/ui/performance/trace/FESR', 'sap/ui/performance/trace/Intera
 		Interaction.end(true);
 		oXhrHandle.abort();
 		// trigger initial FESR header creation (which should include the actual "action")
-		oXhrHandle = this.dummyRequest();
+		// using URL object to ensure isCORSRequest can handle URL objects as well
+		oXhrHandle = this.dummyRequest(/* bUseUrlObject */ true);
 
 		assert.ok(oHeaderSpy.args.some(function(args) {
 			if (args[0] === "SAP-Perf-FESRec") {