@openui5/sap.ui.core 1.121.4 → 1.121.5

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

@@ -7,6 +7,7 @@ sap.ui.define([
 	"sap/ui/core/format/FormatUtils",
 	"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",
@@ -15,21 +16,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, Formatting, Localization, extend, DateFormat, FormatUtils, Locale, LocaleData,
-		UniversalDate, UI5Date, library, Configuration, Supportability, CalendarWeekNumbering, TestUtils) {
+], function(Log, Formatting, Localization, extend, DateFormat, FormatUtils, 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();
@@ -698,7 +698,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);
 
@@ -1648,7 +1648,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);
 
@@ -1708,7 +1708,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" }),
@@ -2983,7 +2983,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
 				});
@@ -3059,7 +3059,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");
@@ -3091,7 +3091,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"));
@@ -3126,7 +3126,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
@@ -3137,7 +3137,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);
@@ -3145,7 +3145,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,
@@ -3157,7 +3157,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,
@@ -3170,7 +3170,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);
@@ -3207,7 +3207,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
 				});
@@ -3242,7 +3242,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"));
@@ -3277,7 +3277,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
 				});
@@ -3312,7 +3312,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"));
@@ -3374,7 +3374,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
 				});
@@ -3383,7 +3383,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"
@@ -3423,6 +3423,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/types/Types.qunit.js

@@ -721,19 +721,22 @@ sap.ui.define([
 	//*********************************************************************************************
 [
 	{aTypes:[]}, // no types
-	{aTypes:[{}]}, // no constraints
-	{aTypes:[{oConstraints:{}}]}, // no scale
+	{aTypes:[{}], expScale:0, oldScale:0}, // no constraints
+	{aTypes:[{oConstraints:{}}], expScale:0, oldScale:0}, // no scale
 	{aTypes:[{oConstraints:{scale:24}}], expScale:24, expCreateFormats:1}, // consider scale
 	// only the first type is considered
 	{aTypes:[{oConstraints:{scale:24}}, {oConstraints:{scale:42}}], expScale:24, expCreateFormats:1},
 	// scale unchanged, no new formats
 	{aTypes:[{oConstraints:{scale:24}}], oldScale:24, expScale:24},
 	// scale reset, recreate formats
-	{aTypes:[{oConstraints:{}}], oldScale:24, expScale:undefined, expCreateFormats:1}
+	{aTypes:[{oConstraints:{}}], oldScale:24, expScale:0, expCreateFormats:1}
 ].forEach(({aTypes, expScale, expCreateFormats, oldScale}, i) => {
 	QUnit.test("Currency: processPartTypes, i=" + i, function (assert) {
 		const oCurrencyType = {iScale: oldScale, _createFormats() {}};
-
+		if (aTypes[0]) {
+			aTypes[0].isA = () => {};
+			this.mock(aTypes[0]).expects("isA").withExactArgs("sap.ui.model.odata.type.Decimal").returns(true);
+		}
 		this.mock(oCurrencyType).expects("_createFormats").withExactArgs().exactly(expCreateFormats || 0);
 
 		// code under test
@@ -743,6 +746,16 @@ sap.ui.define([
 	});
 });
 
+	//*********************************************************************************************
+	QUnit.test("Currency: processPartTypes, first part has non-Decimal type", function (assert) {
+		const oCurrencyType = {};
+		const oNonDecimalType = {isA() {}};
+		this.mock(oNonDecimalType).expects("isA").withExactArgs("sap.ui.model.odata.type.Decimal").returns(false);
+
+		// code under test
+		CurrencyType.prototype.processPartTypes.call(oCurrencyType, [oNonDecimalType]);
+	});
+
 	//*********************************************************************************************
 [
 	{iScale : undefined, oFormatOptions : {}},
@@ -2838,13 +2851,17 @@ sap.ui.define([
 	//*********************************************************************************************
 [
 	{aTypes : []},
-	{aTypes : [{}]},
-	{aTypes : [{oConstraints : {}}]},
+	{aTypes : [{}], iScale : 0},
+	{aTypes : [{oConstraints : {}}], iScale : 0},
 	{aTypes : [{oConstraints : {scale : 24}}], iScale : 24},
 	{aTypes : [{oConstraints : {scale : 24}}, {oConstraints : {scale : 42}}], iScale : 24}
 ].forEach(({aTypes, iScale}, i) => {
 	QUnit.test("Unit: processPartTypes, i=" + i, function (assert) {
 		const oUnitType = {};
+		if (aTypes[0]) {
+			aTypes[0].isA = () => {};
+			this.mock(aTypes[0]).expects("isA").withExactArgs("sap.ui.model.odata.type.Decimal").returns(true);
+		}
 
 		// code under test
 		UnitType.prototype.processPartTypes.call(oUnitType, aTypes);
@@ -2852,4 +2869,16 @@ sap.ui.define([
 		assert.strictEqual(oUnitType.iScale, iScale);
 	});
 });
+
+	//*********************************************************************************************
+	QUnit.test("Unit: processPartTypes, first part has non-Decimal type", function (assert) {
+		const oUnitType = {iScale : 42};
+		const oNonDecimalType = {isA() {}};
+		this.mock(oNonDecimalType).expects("isA").withExactArgs("sap.ui.model.odata.type.Decimal").returns(false);
+
+		// code under test
+		UnitType.prototype.processPartTypes.call(oUnitType, [oNonDecimalType]);
+
+		assert.strictEqual(oUnitType.iScale, 42);
+	});
 });

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

@@ -620,5 +620,25 @@
         "text": " sap.ui.model.type.Unit: amount scale is used instead of unit's decimal places"
       }
     ]
+  },
+  "1.121.5": {
+    "date": "June 2024",
+    "notes": [
+      {
+        "id": "0eaf7c45cd103d1b2f03f3de58116642ad8c78be",
+        "type": "FIX",
+        "text": " sap.ui.core.format.DateFormat.qunit: Fix flaky tests"
+      },
+      {
+        "id": "936e6b506dee4b441230173af6448bfeed760c90",
+        "type": "FIX",
+        "text": " sap\\ui\\core\\format\\DateFormat.fnCreateDate: set UTCFullYear must be set with all components"
+      },
+      {
+        "id": "d5a91ba0ebb618479047c0dc2a35a4b6307b44de",
+        "type": "FIX",
+        "text": " sap.ui.model.type.(Currency|Unit): use amount scale default 0 instead of currency's or unit's decimal places"
+      }
+    ]
   }
 }