fix(Calendar): Fix Calendar.YearAsString() and `Calendar.YearAsTrun…

…catedString()`
unoplatform · Jan 4, 2021 · 4a31447 · 4a31447
1 parent 1f1ad99
commit 4a31447
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 15 deletions.
diff --git a/src/Uno.UI.Tests/Windows_Globalization/When_Calendar.cs b/src/Uno.UI.Tests/Windows_Globalization/When_Calendar.cs
@@ -340,7 +340,6 @@ public void When_Gregorian_FixedDate_AddHour()
 			);
 		}
 
-
 		[TestMethod]
 		public void When_Gregorian_FixedDate_AddDay()
 		{
@@ -489,14 +488,16 @@ public void When_Gregorian_FixedDate_AddYear()
 		}
 
 		[TestMethod]
-		public void When_Gregorian_FixedDate_Format_12h()
+		[DataRow(2020, "Thursday")]
+		[DataRow(2021, "Saturday")]
+		public void When_Gregorian_FixedDate_Format_12h(int year, string dayOfWeek)
 		{
 			ValidateFormat(culture: "en-US",
 				  calendar: WG.CalendarIdentifiers.GregorianValue,
 				  clock: WG.ClockIdentifiers.TwelveHour,
-				  date: new DateTimeOffset(2020, 01, 02, 23, 04, 05, 00, TimeSpan.Zero),
-				  yearAsPaddedString: "2020",
-				  yearAsString: "2020",
+				  date: new DateTimeOffset(year, 01, 02, 23, 04, 05, 00, TimeSpan.Zero),
+				  yearAsPaddedString: year.ToString(CultureInfo.InvariantCulture),
+				  yearAsString: year.ToString(CultureInfo.InvariantCulture),
 				  monthAsPaddedNumericString: "01",
 				  monthAsSoloString: "Jan",
 				  monthAsString: "Jan",
@@ -511,19 +512,21 @@ public void When_Gregorian_FixedDate_Format_12h()
 				  secondAsString: "5",
 				  nanosecondAsPaddedString: "00",
 				  nanosecondAsString: "0",
-				  dayOfWeekAsSoloString: "Thursday",
-				  dayOfWeekAsString: "Thursday");
+				  dayOfWeekAsSoloString: dayOfWeek,
+				  dayOfWeekAsString: dayOfWeek);
 		}
 
 		[TestMethod]
-		public void When_Gregorian_FixedDate_Format_24h()
+		[DataRow(2020, "Thursday")]
+		[DataRow(2021, "Saturday")]
+		public void When_Gregorian_FixedDate_Format_24h(int year, string dayOfWeek)
 		{
 			ValidateFormat(culture: "en-US",
 				  calendar: WG.CalendarIdentifiers.GregorianValue,
 				  clock: WG.ClockIdentifiers.TwentyFourHourValue,
-				  date: new DateTimeOffset(2020, 01, 02, 23, 04, 05, 00, TimeSpan.Zero),
-				  yearAsPaddedString: "2020",
-				  yearAsString: "2020",
+				  date: new DateTimeOffset(year, 01, 02, 23, 04, 05, 00, TimeSpan.Zero),
+				  yearAsPaddedString: year.ToString(CultureInfo.InvariantCulture),
+				  yearAsString: year.ToString(CultureInfo.InvariantCulture),
 				  monthAsPaddedNumericString: "01",
 				  monthAsSoloString: "Jan",
 				  monthAsString: "Jan",
@@ -538,8 +541,8 @@ public void When_Gregorian_FixedDate_Format_24h()
 				  secondAsString: "5",
 				  nanosecondAsPaddedString: "00",
 				  nanosecondAsString: "0",
-				  dayOfWeekAsSoloString: "Thursday",
-				  dayOfWeekAsString: "Thursday");
+				  dayOfWeekAsSoloString: dayOfWeek,
+				  dayOfWeekAsString: dayOfWeek);
 		}
 
 		private void Validate(

diff --git a/src/Uno.UWP/Globalization/Calendar.cs b/src/Uno.UWP/Globalization/Calendar.cs
@@ -373,10 +373,10 @@ public string EraAsString(int idealLength)
 			=> throw new global::System.NotImplementedException("The member string Calendar.EraAsString(int idealLength) is not implemented in Uno.");
 
 		public string YearAsString()
-			=> DateTimeOffset.Now.Year.ToString(_resolvedCulture);
+			=> _time.Year.ToString(_resolvedCulture);
 
 		public string YearAsTruncatedString(int remainingDigits)
-			=> DateTimeOffset.Now.ToString("yy", _resolvedCulture);
+			=> _time.ToString("yy", _resolvedCulture);
 
 		public string YearAsPaddedString(int minDigits)
 			=> _time.Year.ToString(new string('0', minDigits), _resolvedCulture);