Fix tests errors

sillsdev · Feb 24, 2020 · 1bcaaf7 · 1bcaaf7
1 parent 1263254
commit 1bcaaf7
Showing 1 changed file with 16 additions and 7 deletions.
diff --git a/source/icu.net.tests/CalendarTests.cs b/source/icu.net.tests/CalendarTests.cs
@@ -465,31 +465,40 @@ public void AmPmTest()
 		[Test]
 		public void SetTimeZone2Test()
 		{
+			var tzdbId = "Europe/Paris";
 			var winId = "Romance Standard Time";
-			var expected = "Europe/Paris";
-			var timezone = TimeZoneInfo.FindSystemTimeZoneById(winId);
+
+			var timezones = TimeZoneInfo.GetSystemTimeZones();
+
+			var timezone = timezones.FirstOrDefault(tzi => tzi.Id == tzdbId);
+			if(timezone==null)
+			{
+				timezone = timezones.First(tzi => tzi.Id == winId);
+			}
 
 			using (var cal = new GregorianCalendar(new TimeZone("UTC")))
 			{
 				cal.SetTimeZone(timezone);
 
 				var tz = cal.GetTimeZone();
 
-				Assert.AreEqual(expected, tz.Id);
+				Assert.AreEqual(tzdbId, tz.Id);
 			}
 		}
 
 		[Test]
 		public void GetTimeZoneInfoTest()
 		{
-			var timezone = new TimeZone("Europe/Zagreb");
-			var expected = "Central European Standard Time";
+			var tzdbId = "Europe/Zagreb";
+			var winId = "Central European Standard Time";
+
+			var timezone = new TimeZone(tzdbId);
 
 			using (var cal = new GregorianCalendar(timezone))
 			{
-				var tz = cal.GetTimeZoneInfo();
+				var result = cal.GetTimeZoneInfo();
 
-				Assert.AreEqual(expected, tz.Id);
+				Assert.IsTrue(result.Id == winId || result.Id == tzdbId);
 			}
 		}