@openui5/sap.ui.core 1.120.16 → 1.120.18

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

@@ -1382,9 +1382,11 @@ sap.ui.define([
 			this.oCachePromise = SyncPromise.resolve(Promise.resolve(oCache));
 		});
 		oBinding.setContext(oContext);
+		const oBindingMock = that.mock(oBinding);
+		oBindingMock.expects("checkSameCache").never();
 
 		this.mock(oCache).expects("hasSentRequest").withExactArgs().returns(oFixture.hasSent);
-		this.mock(oBinding).expects("isRelative").exactly(oFixture.hasSent ? 0 : 1)
+		oBindingMock.expects("isRelative").exactly(oFixture.hasSent ? 0 : 1)
 			.withExactArgs().returns(!oFixture.isAbsolute);
 		this.mock(ODataListBinding).expects("isBelowCreated")
 			.exactly(oFixture.hasSent || oFixture.isAbsolute ? 0 : 1)
@@ -1399,11 +1401,7 @@ sap.ui.define([
 		oReadMock = this.mock(oCache).expects("read")
 			.withExactArgs(1, 2, 3, sinon.match.same(oGroupLock),
 				sinon.match.same(fnDataRequested))
-			.returns(SyncPromise.resolve(Promise.resolve().then(function () {
-				that.mock(oBinding).expects("assertSameCache")
-					.withExactArgs(sinon.match.same(oCache));
-				return oData;
-			})));
+			.returns(SyncPromise.resolve(Promise.resolve(oData)));
 
 		// code under test
 		oPromise = oBinding.fetchData(1, 2, 3, oGroupLock, fnDataRequested);
@@ -1411,7 +1409,7 @@ sap.ui.define([
 		oBinding.sChangeReason = "sChangeReason";
 		oBinding.bHasPathReductionToParent = true;
 		this.oModel.bAutoExpandSelect = true;
-		this.mock(oBinding).expects("checkSuspended").never();
+		oBindingMock.expects("checkSuspended").never();
 
 		assert.strictEqual(oBinding.sChangeReason, "sChangeReason");
 
@@ -1420,6 +1418,12 @@ sap.ui.define([
 			if (oFixture.elements) {
 				assert.ok(oSetCollectionMock.calledBefore(oReadMock));
 			}
+
+			oBindingMock.expects("checkSameCache").on(oBinding)
+				.withExactArgs(sinon.match.same(oCache));
+
+			// code under test
+			oResult.$checkStillValid();
 		});
 	});
 });
@@ -1540,13 +1544,16 @@ sap.ui.define([
 
 	//*********************************************************************************************
 [false, true].forEach(function (bFirstCreateAtEnd) {
-	QUnit.test("fetchContexts: created, atEnd=" + bFirstCreateAtEnd, function () {
+	QUnit.test("fetchContexts: created, atEnd=" + bFirstCreateAtEnd, function (assert) {
 		var oBinding = this.bindList("/EMPLOYEES"),
 			bChanged = {/*boolean*/},
 			fnDataRequested = {/*function*/},
 			oGroupLock = {},
 			iReadStart = bFirstCreateAtEnd ? 3 : 1,
-			oResult = {value : {}};
+			oResult = {
+				$checkStillValid : mustBeMocked,
+				value : {}
+			};
 
 		oBinding.bFirstCreateAtEnd = bFirstCreateAtEnd;
 		oBinding.iCreatedContexts = 2;
@@ -1554,15 +1561,46 @@ sap.ui.define([
 			.withExactArgs(iReadStart, 2, 3, sinon.match.same(oGroupLock),
 				sinon.match.same(fnDataRequested))
 			.returns(SyncPromise.resolve(oResult));
-		this.mock(oBinding).expects("createContexts")
+		const oCheckStillValidExpectation
+			= this.mock(oResult).expects("$checkStillValid").withExactArgs();
+		const oCreateContextsExpectation = this.mock(oBinding).expects("createContexts")
 			.withExactArgs(iReadStart, sinon.match.same(oResult.value))
 			.returns(SyncPromise.resolve(bChanged));
 
 		// code under test
-		return oBinding.fetchContexts(1, 2, 3, oGroupLock, false, fnDataRequested);
+		return oBinding.fetchContexts(1, 2, 3, oGroupLock, false, fnDataRequested)
+			.then(function () {
+				assert.ok(oCheckStillValidExpectation.calledBefore(oCreateContextsExpectation));
+			});
 	});
 });
 
+	//*********************************************************************************************
+	QUnit.test("fetchContexts: invalid cache", function (assert) {
+		var oBinding = this.bindList("/EMPLOYEES"),
+			fnDataRequested = {/*function*/},
+			oError = new Error(),
+			oGroupLock = "~oGroupLock~",
+			oResponse = {
+				$checkStillValid : mustBeMocked,
+				value : {}
+			};
+
+		this.mock(oBinding).expects("fetchData")
+			.withExactArgs(1, 2, 3, sinon.match.same(oGroupLock),
+				sinon.match.same(fnDataRequested))
+			.returns(SyncPromise.resolve(oResponse));
+		this.mock(oResponse).expects("$checkStillValid").withExactArgs().throws(oError);
+
+		// code under test
+		return oBinding.fetchContexts(1, 2, 3, oGroupLock, false, fnDataRequested)
+			.then(function () {
+				assert.ok(false);
+			}, function (oResultError) {
+				assert.strictEqual(oResultError, oError);
+			});
+	});
+
 	//*********************************************************************************************
 	QUnit.test("fetchContexts: fetchData returns undefined", function (assert) {
 		var oBinding = this.bindList("TEAM_2_EMPLOYEES",
@@ -7285,7 +7323,7 @@ sap.ui.define([
 			oRefreshSingleExpectation,
 			oRefreshSinglePromise = SyncPromise.resolve(Promise.resolve({})),
 			oRootBinding = {
-				assertSameCache : function () {},
+				checkSameCache : function () {},
 				getGroupId : function () {}
 			},
 			that = this;
@@ -7319,7 +7357,7 @@ sap.ui.define([
 
 			// these must only be called when the cache's refreshSingle is finished
 			that.mock(oBinding).expects("fireDataReceived").withExactArgs({data : {}});
-			that.mock(oRootBinding).expects("assertSameCache")
+			that.mock(oRootBinding).expects("checkSameCache")
 				.withExactArgs(sinon.match.same(oCache))
 				.callsFake(function () {
 					if (!bSameCache) {
@@ -7397,7 +7435,7 @@ sap.ui.define([
 					oRemoveCreatedExpectation,
 					oResetKeepAliveExpectation,
 					oRootBinding = {
-						assertSameCache : function () {},
+						checkSameCache : function () {},
 						getGroupId : function () {}
 					},
 					that = this;
@@ -7529,7 +7567,7 @@ sap.ui.define([
 			oExpectation,
 			oGroupLock = {getGroupId : function () {}},
 			oRootBinding = {
-				assertSameCache : function () {},
+				checkSameCache : function () {},
 				getGroupId : function () {}
 			},
 			that = this;

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

@@ -8180,6 +8180,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
@@ -41236,8 +41289,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;

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

@@ -645,7 +645,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;
 					})));

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

@@ -12,9 +12,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;
 		}
@@ -72,8 +73,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") {
@@ -145,8 +146,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") {
@@ -193,7 +194,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") {

package/test/sap/ui/core/qunit/types/DateFormat.qunit.js

@@ -4,6 +4,7 @@ sap.ui.define([
 	"sap/ui/core/format/DateFormat",
 	"sap/ui/core/Locale",
 	"sap/ui/core/LocaleData",
+	"sap/ui/core/date/Buddhist",
 	"sap/ui/core/date/UniversalDate",
 	"sap/ui/core/date/UI5Date",
 	"sap/ui/core/library",
@@ -12,21 +13,20 @@ sap.ui.define([
 	"sap/ui/core/date/CalendarWeekNumbering",
 	"sap/ui/test/TestUtils",
 	// load all required calendars in advance
-	"sap/ui/core/date/Buddhist",
 	"sap/ui/core/date/Gregorian",
 	"sap/ui/core/date/Islamic",
 	"sap/ui/core/date/Japanese",
 	"sap/ui/core/date/Persian"
-], function (Log, extend, DateFormat, Locale, LocaleData, UniversalDate, UI5Date, library, Configuration,
-	Supportability, CalendarWeekNumbering, TestUtils) {
+], function (Log, extend, DateFormat, Locale, LocaleData, Buddhist, UniversalDate, UI5Date, library, Configuration,
+		Supportability, CalendarWeekNumbering, TestUtils) {
 	"use strict";
 	/* eslint-disable max-nested-callbacks */
 	/*global QUnit, sinon */
 
 	// shortcut for sap.ui.core.CalendarType
 	const CalendarType = library.CalendarType;
-	const oDateTime = UI5Date.getInstance("Tue Sep 23 06:46:13 2000 GMT+0000");
-	const oTZDateTime = UI5Date.getInstance("Tue Sep 23 03:46:13 2000 GMT+0530");
+	const oDateTime = UI5Date.getInstance("2000-09-23T06:46:13Z");
+	const oTZDateTime = UI5Date.getInstance("2000-09-23T03:46:13+05:30");
 	const oDefaultDate = DateFormat.getInstance();
 	const oDefaultDateTime = DateFormat.getDateTimeInstance();
 	const oDefaultTime = DateFormat.getTimeInstance();
@@ -695,7 +695,7 @@ sap.ui.define([
 		});
 
 		QUnit.test("format custom date timezone UTC+2 (EET)", function (assert) {
-			var oDate = UI5Date.getInstance("Tue Oct 9 11:37:56 2018 GMT+0000"),
+			var oDate = UI5Date.getInstance("2018-10-09T11:37:56Z"),
 				oCustomDateFormat, sFormatted;
 			oDate.setMilliseconds(235);
 
@@ -1645,7 +1645,7 @@ sap.ui.define([
 		});
 
 		QUnit.test("parse short format without delimiter", function (assert) {
-			var oDate = UI5Date.getInstance("Mon Apr 7 00:00:00 2014"),
+			var oDate = UI5Date.getInstance("2014-04-07T00:00:00"),
 				oFormat = DateFormat.getDateInstance(),
 				sDateIn = "040714", oDateOut = oFormat.parse(sDateIn);
 
@@ -1705,7 +1705,7 @@ sap.ui.define([
 		});
 
 		QUnit.test("parse and format quarters", function (assert) {
-			var oDate = UI5Date.getInstance("Wed Jul 4 2001"),
+			var oDate = UI5Date.getInstance(2001, 6, 4),
 				oQuarter1 = DateFormat.getDateInstance({ pattern: "qq" }),
 				oQuarter2 = DateFormat.getDateInstance({ pattern: "qqq" }),
 				oQuarter3 = DateFormat.getDateInstance({ pattern: "qqqq" }),
@@ -2980,7 +2980,7 @@ sap.ui.define([
 		QUnit.module("Islamic Date in locale en");
 
 		QUnit.test("format date to Islamic type with locale en", function (assert) {
-			var oDate = UI5Date.getInstance("Wed Jul 4 2001"),
+			var oDate = UI5Date.getInstance(2001, 6, 4),
 				oDateFormat = DateFormat.getDateInstance({
 					calendarType: CalendarType.Islamic
 				});
@@ -3056,7 +3056,7 @@ sap.ui.define([
 
 		["ar", "ar_EG", "ar_SA", "he"].forEach(function (sLocale, index) {
 			QUnit.test("format Islamic date " + sLocale, function (assert) {
-				var oDate = UI5Date.getInstance("Wed Jul 4 2001"),
+				var oDate = UI5Date.getInstance(2001, 6, 4),
 					oDateFormat = DateFormat.getDateInstance(new Locale(sLocale));
 
 				assert.strictEqual(oDateFormat.format(oDate), aResultLocal[index], "Date is formatted to Islamic Date in " + sLocale + " locale");
@@ -3088,7 +3088,7 @@ sap.ui.define([
 		QUnit.module("Japanese Date");
 
 		QUnit.test("format date to Japanese type", function (assert) {
-			var oDate = UI5Date.getInstance("Wed Jul 4 2001"),
+			var oDate = UI5Date.getInstance(2001, 6, 4),
 				oDateFormat = DateFormat.getDateInstance({
 					calendarType: CalendarType.Japanese
 				}, new Locale("ja_JP"));
@@ -3123,7 +3123,7 @@ sap.ui.define([
 		});
 
 		QUnit.test("format/parse date with Gannen instead of Ichinen", function (assert) {
-			var oDate = UI5Date.getInstance("May 1 2019"),
+			var oDate = UI5Date.getInstance(2019, 4, 1),
 				sDate = "令和元年5月1日",
 				oDateFormat = DateFormat.getDateInstance({
 					calendarType: CalendarType.Japanese
@@ -3134,7 +3134,7 @@ sap.ui.define([
 			assert.strictEqual(sFormatted, sDate, "Date is formatted correctly with Gannen year");
 			assert.deepEqual(oParsed, oDate, "Date with Gannen year is parsed correctly");
 
-			oDate = UI5Date.getInstance("Apr 1 2019");
+			oDate = UI5Date.getInstance(2019, 3, 1);
 			sDate = "平成31年4月1日";
 			sFormatted = oDateFormat.format(oDate);
 			oParsed = oDateFormat.parse(sDate);
@@ -3142,7 +3142,7 @@ sap.ui.define([
 			assert.strictEqual(sFormatted, sDate, "Year ending with 1 is formatted as a number");
 			assert.deepEqual(oParsed, oDate, "Date with numeric year is parsed correctly");
 
-			oDate = UI5Date.getInstance("May 1 2019");
+			oDate = UI5Date.getInstance(2019, 4, 1);
 			sDate = "R1/5/1";
 			oDateFormat = DateFormat.getDateInstance({
 				calendarType: CalendarType.Japanese,
@@ -3154,7 +3154,7 @@ sap.ui.define([
 			assert.strictEqual(sFormatted, sDate, "Date is formatted correctly with numeric year");
 			assert.deepEqual(oParsed, oDate, "Date with numeric year is parsed correctly");
 
-			oDate = [UI5Date.getInstance("May 1 2019"), UI5Date.getInstance("May 10 2019")];
+			oDate = [UI5Date.getInstance(2019, 4, 1), UI5Date.getInstance(2019, 4, 10)];
 			sDate = "令和元年5月1日～10日";
 			oDateFormat = DateFormat.getDateInstance({
 				calendarType: CalendarType.Japanese,
@@ -3167,7 +3167,7 @@ sap.ui.define([
 			assert.strictEqual(sFormatted, sDate, "Date interval is formatted correctly with Gannen year");
 			assert.deepEqual(oParsed, oDate, "Date interval with Gannen year is parsed correctly");
 
-			oDate = [UI5Date.getInstance("Apr 1 2019"), UI5Date.getInstance("May 1 2019")];
+			oDate = [UI5Date.getInstance(2019, 3, 1), UI5Date.getInstance(2019, 4, 1)];
 			sDate = "平成31年4月1日～令和元年5月1日";
 			sFormatted = oDateFormat.format(oDate);
 			oParsed = oDateFormat.parse(sDate);
@@ -3204,7 +3204,7 @@ sap.ui.define([
 		QUnit.module("Japanese Date in locale en");
 
 		QUnit.test("format date to Japanese type with locale en", function (assert) {
-			var oDate = UI5Date.getInstance("Wed Jul 4 2001"),
+			var oDate = UI5Date.getInstance(2001, 6, 4),
 				oDateFormat = DateFormat.getDateInstance({
 					calendarType: CalendarType.Japanese
 				});
@@ -3239,7 +3239,7 @@ sap.ui.define([
 		QUnit.module("Persian Date");
 
 		QUnit.test("format date to Persian type", function (assert) {
-			var oDate = UI5Date.getInstance("Wed Jul 4 2001"),
+			var oDate = UI5Date.getInstance(2001, 6, 4),
 				oDateFormat = DateFormat.getDateInstance({
 					calendarType: CalendarType.Persian
 				}, new Locale("fa_IR"));
@@ -3274,7 +3274,7 @@ sap.ui.define([
 		QUnit.module("Persian Date in locale en");
 
 		QUnit.test("format date to Persian type with locale en", function (assert) {
-			var oDate = UI5Date.getInstance("Wed Jul 4 2001"),
+			var oDate = UI5Date.getInstance(2001, 6, 4),
 				oDateFormat = DateFormat.getDateInstance({
 					calendarType: CalendarType.Persian
 				});
@@ -3309,7 +3309,7 @@ sap.ui.define([
 		QUnit.module("Buddhist Date");
 
 		QUnit.test("format date to Buddhist type", function (assert) {
-			var oDate = UI5Date.getInstance("Wed Jul 4 2001"),
+			var oDate = UI5Date.getInstance(2001, 6, 4),
 				oDateFormat = DateFormat.getDateInstance({
 					calendarType: CalendarType.Buddhist
 				}, new Locale("th_TH"));
@@ -3371,7 +3371,7 @@ sap.ui.define([
 		QUnit.module("Buddhist Date in locale en");
 
 		QUnit.test("format date to Buddhist type with locale en", function (assert) {
-			var oDate = UI5Date.getInstance("Wed Jul 4 2001"),
+			var oDate = UI5Date.getInstance(2001, 6, 4),
 				oDateFormat = DateFormat.getDateInstance({
 					calendarType: CalendarType.Buddhist
 				});
@@ -3380,7 +3380,7 @@ sap.ui.define([
 		});
 
 		QUnit.test("format date to Buddhist type with locale en and calendar week", function (assert) {
-			var oDate = UI5Date.getInstance("Wed Jul 4 2001"),
+			var oDate = UI5Date.getInstance(2001, 6, 4),
 				oDateFormat = DateFormat.getDateInstance({
 					calendarType: CalendarType.Buddhist,
 					pattern: "YYYY'/'ww"
@@ -3420,6 +3420,35 @@ sap.ui.define([
 			doTestRelative(assert, false, { style: "long", relativeRange: [1, 5], calendarType: CalendarType.Buddhist }, "en", "style long, range [1, 5], en with calendar type Buddhist");
 		});
 
+	// DINC0133323
+	[
+		{buddhistYear : 2465, date : "May 1, 2465 BE", expected : {day : 1, month : 4, year : 1922}},
+		{buddhistYear : 2482, date : "Mar 1, 2482 BE", expected : {day : 1, month : 2, year : 1940}},
+		{buddhistYear : 2483, date : "Apr 1, 2483 BE", expected : {day : 1, month : 3, year : 1940}},
+		{buddhistYear : 2484, date : "Jan 1, 2484 BE", expected : {day : 1, month : 0, year : 1941}},
+		{buddhistYear : 2484, date : "Apr 1, 2484 BE", expected : {day : 1, month : 3, year : 1941}}
+	].forEach(function (oFixture, i) {
+		QUnit.test("parse and format dates with Buddhist calendar around era change " + i, function (assert) {
+			const oDateFormat = DateFormat.getDateInstance({
+				calendarType: CalendarType.Buddhist
+			});
+			const oFullYearSpy = this.spy(Buddhist.prototype, "setUTCFullYear");
+			const oMonthSpy = this.spy(Buddhist.prototype, "setUTCMonth");
+
+			// code under test
+			const oDate = oDateFormat.parse(oFixture.date);
+
+			assert.ok(oFullYearSpy.calledOnceWithExactly(oFixture.buddhistYear, oFixture.expected.month,
+				oFixture.expected.day));
+			assert.ok(oMonthSpy.notCalled, "setMonth is not called");
+			assert.strictEqual(oDate.getFullYear(), oFixture.expected.year);
+			assert.strictEqual(oDate.getMonth(), oFixture.expected.month);
+			assert.strictEqual(oDate.getDate(), 1, oFixture.expected.day);
+
+			// code under test
+			assert.strictEqual(oDateFormat.format(oDate), oFixture.date);
+		});
+	});
 
 		QUnit.module("interval options validation", {
 			beforeEach: function (assert) {

package/test/sap/ui/core/qunit/util/Mobile.qunit.js

@@ -22,6 +22,8 @@ sap.ui.define([
 	});
 
 	QUnit.test("Test init with default settings", function (assert) {
+		const done = assert.async();
+
 		Mobile.init();
 
 		// check viewport:  <meta name="viewport" content="width=device-width, initial-scale=1.0">
@@ -36,7 +38,7 @@ sap.ui.define([
 			var $mwac = jQuery("meta").filter("[name=mobile-web-app-capable]");
 			assert.equal($amwac.length, 1, "There should be an apple-mobile-web-app-capable meta tag");
 			assert.equal($amwac.attr("content"), "yes", "The apple-mobile-web-app-capable meta tag content should be correct");
-			assert.equal($mwac.length, 0, "There shouldn't be any mobile-web-app-capable meta tag due to compatibility");
+			assert.equal($mwac.length, 1, "There should be an mobile-web-app-capable meta tag due to compatibility");
 		}
 
 		// check status bar style: <meta name="apple-mobile-web-app-status-bar-style" content="default">
@@ -50,13 +52,16 @@ sap.ui.define([
 		var $ti = jQuery("link").filter("[rel=apple-touch-icon]");
 		assert.equal($ti.length, 0, "There should be no apple-touch-icon tag");
 
-		// Check whether size changes through new viewport were detected and the Device.resize values were adapted.
-		assert.equal(window.innerHeight, Device.resize.height, "Device.resize.height is set correctly.");
-		assert.equal(window.innerWidth, Device.resize.width, "Device.resize.width is set correctly.");
+		setTimeout(() => {
+			// Check whether size changes through new viewport were detected and the Device.resize values were adapted.
+			assert.equal(window.innerHeight, Device.resize.height, "Device.resize.height is set correctly.");
+			assert.equal(window.innerWidth, Device.resize.width, "Device.resize.width is set correctly.");
 
-		// Check that additional init without parameters does not crash ==> See BCP 2270099497
-		Mobile.init();
-		assert.ok(true, "Mobile.init() was re-executed without exception.");
+			// Check that additional init without parameters does not crash ==> See BCP 2270099497
+			Mobile.init();
+			assert.ok(true, "Mobile.init() was re-executed without exception.");
+			done();
+		}, 50);
 	});
 
 	QUnit.test("Test init with custom settings", function (assert) {

package/test/sap/ui/core/relnotes/changes-1.120.json

@@ -807,5 +807,66 @@
         "text": " Add sap-system to OData V4 service URLs"
       }
     ]
+  },
+  "1.120.17": {
+    "date": "July 2024",
+    "notes": [
+      {
+        "id": "09f3f3272ebe7034f5cf81763976d3dd1718a80e",
+        "type": "FIX",
+        "text": " sap.ui.model.json.JSONModel#loadData: Don't use JSONP"
+      },
+      {
+        "id": "bf3541a8b52aac9b7786da3912498cd15a9bfb16",
+        "type": "FIX",
+        "text": " sap.ui.core.util.LibraryInfo: Loosen baseUrl regex check"
+      },
+      {
+        "id": "1dcad63d6d858e4bcd7685605f40d4fc6289a3c9",
+        "type": "FIX",
+        "text": " sap/ui/core/.library: Remove wrong component for sap/ui/core/util/MockServer"
+      },
+      {
+        "id": "86d3a35d8991b3a191660626fc77652bb1bfa6de",
+        "type": "FIX",
+        "text": " sap.ui.performance.XHRInterceptor: Fix CORS check"
+      },
+      {
+        "id": "f6b1d3719a89a64dbc89206fd6b7dcd466a01803",
+        "type": "FIX",
+        "text": " util/Mobile: update window size with delay after viewport is set"
+      },
+      {
+        "id": "f43529b494184af3a8962108f0fc905acb9682cd",
+        "type": "FIX",
+        "text": " sap.ui.core.format.DateFormat.qunit: Fix flaky tests"
+      },
+      {
+        "id": "ac4ad92e9770362dfea99a3bad8a9e2dae788421",
+        "type": "FIX",
+        "text": " sap\\ui\\core\\format\\DateFormat.fnCreateDate: set UTCFullYear must be set with all components"
+      }
+    ]
+  },
+  "1.120.18": {
+    "date": "July 2024",
+    "notes": [
+      {
+        "id": "ca8190849d7c2a56da46db4e7424ab538ee04f09",
+        "type": "FIX",
+        "text": " BindingInfo: Ensure that named models are only parsed once"
+      },
+      {
+        "id": "c905be5bc1d5bd6b89c49ae142101e9a466bf137",
+        "type": "FIX",
+        "text": " ControllerExtension support for TypeScript",
+        "references": [
+          {
+            "type": "BCP",
+            "reference": ""
+          }
+        ]
+      }
+    ]
   }
 }