[corlib] Changed TimeZoneTest to be invariant to culture.
authorMarcos Henrich <marcos.henrich@xamarin.com>
Fri, 10 Apr 2015 12:34:18 +0000 (08:34 -0400)
committerMarcos Henrich <marcos.henrich@xamarin.com>
Fri, 10 Apr 2015 12:34:22 +0000 (08:34 -0400)
mcs/class/corlib/Test/System/TimeZoneTest.cs

index 85d43ad252f4ff23c859e76056a20ff9fbf4e4b3..19e2cb5c49d3fc7bfcf57f254ff011b9159aa9c7 100644 (file)
@@ -27,13 +27,13 @@ public class TimeZoneTest {
                Assert.AreEqual("CEST", t1.DaylightName, "A02");
        
                DaylightTime d1 = t1.GetDaylightChanges (2002);
-               Assert.AreEqual("03/31/2002 02:00:00", d1.Start.ToString ("G"), "A03");
-               Assert.AreEqual("10/27/2002 03:00:00", d1.End.ToString ("G"), "A04");
+               Assert.AreEqual("03/31/2002 02:00:00", d1.Start.ToString ("G", CultureInfo.InvariantCulture), "A03");
+               Assert.AreEqual("10/27/2002 03:00:00", d1.End.ToString ("G", CultureInfo.InvariantCulture), "A04");
                Assert.AreEqual(36000000000L, d1.Delta.Ticks, "A05");
        
                DaylightTime d2 = t1.GetDaylightChanges (1996);
-               Assert.AreEqual("03/31/1996 02:00:00", d2.Start.ToString ("G"), "A06");
-               Assert.AreEqual("10/27/1996 03:00:00", d2.End.ToString ("G"), "A07");
+               Assert.AreEqual("03/31/1996 02:00:00", d2.Start.ToString ("G", CultureInfo.InvariantCulture), "A06");
+               Assert.AreEqual("10/27/1996 03:00:00", d2.End.ToString ("G", CultureInfo.InvariantCulture), "A07");
                Assert.AreEqual(36000000000L, d2.Delta.Ticks, "A08");
        
                DateTime d3 = new DateTime (2002,2,25);
@@ -60,19 +60,20 @@ public class TimeZoneTest {
                //Assert.AreEqual("Eastern Daylight Time", t1.DaylightName, "B02");
 
                DaylightTime d1 = t1.GetDaylightChanges (2002);
-               Assert.AreEqual("04/07/2002 02:00:00", d1.Start.ToString ("G"), "B03");
-               Assert.AreEqual("10/27/2002 02:00:00", d1.End.ToString ("G"), "B04");
+               Assert.AreEqual("04/07/2002 02:00:00", d1.Start.ToString ("G", CultureInfo.InvariantCulture), "B03");
+               Assert.AreEqual("10/27/2002 02:00:00", d1.End.ToString ("G", CultureInfo.InvariantCulture), "B04");
                Assert.AreEqual(36000000000L, d1.Delta.Ticks, "B05");
 
                DaylightTime d2 = t1.GetDaylightChanges (1996);
-               Assert.AreEqual("04/07/1996 02:00:00", d2.Start.ToString ("G"), "B06");
-               Assert.AreEqual("10/27/1996 02:00:00", d2.End.ToString ("G"), "B07");
+               Assert.AreEqual("04/07/1996 02:00:00", d2.Start.ToString ("G", CultureInfo.InvariantCulture), "B06");
+               Assert.AreEqual("10/27/1996 02:00:00", d2.End.ToString ("G", CultureInfo.InvariantCulture), "B07");
                Assert.AreEqual(36000000000L, d2.Delta.Ticks, "B08");
 
                DateTime d3 = new DateTime (2002,2,25);
                Assert.AreEqual(false, t1.IsDaylightSavingTime (d3), "B09");
                DateTime d4 = new DateTime (2002,4,8);
                Assert.AreEqual(true, t1.IsDaylightSavingTime (d4), "B10");
+               
                DateTime d5 = new DateTime (2002,11,4);
                Assert.AreEqual(false, t1.IsDaylightSavingTime (d5), "B11");
 
@@ -111,13 +112,13 @@ public class TimeZoneTest {
                Assert.IsTrue("BST" == t1.DaylightName || "IST" == t1.DaylightName, "D02");
        
                DaylightTime d1 = t1.GetDaylightChanges (2002);
-               Assert.AreEqual("03/31/2002 01:00:00", d1.Start.ToString ("G"), "D03");
-               Assert.AreEqual("10/27/2002 02:00:00", d1.End.ToString ("G"), "D04");
+               Assert.AreEqual("03/31/2002 01:00:00", d1.Start.ToString ("G", CultureInfo.InvariantCulture), "D03");
+               Assert.AreEqual("10/27/2002 02:00:00", d1.End.ToString ("G", CultureInfo.InvariantCulture), "D04");
                Assert.AreEqual(36000000000L, d1.Delta.Ticks, "D05");
        
                DaylightTime d2 = t1.GetDaylightChanges (1996);
-               Assert.AreEqual("03/31/1996 01:00:00", d2.Start.ToString ("G"), "D06");
-               Assert.AreEqual("10/27/1996 02:00:00", d2.End.ToString ("G"), "D07");
+               Assert.AreEqual("03/31/1996 01:00:00", d2.Start.ToString ("G", CultureInfo.InvariantCulture), "D06");
+               Assert.AreEqual("10/27/1996 02:00:00", d2.End.ToString ("G", CultureInfo.InvariantCulture), "D07");
                Assert.AreEqual(36000000000L, d2.Delta.Ticks, "D08");
        
                DateTime d3 = new DateTime (2002,2,25);
@@ -142,13 +143,13 @@ public class TimeZoneTest {
                Assert.AreEqual("NZDT", t1.DaylightName, "E02");
 
                DaylightTime d1 = t1.GetDaylightChanges (2013);
-               Assert.AreEqual("09/29/2013 02:00:00", d1.Start.ToString ("G"), "E03");
-               Assert.AreEqual("04/07/2013 03:00:00", d1.End.ToString ("G"), "E04");
+               Assert.AreEqual("09/29/2013 02:00:00", d1.Start.ToString ("G", CultureInfo.InvariantCulture), "E03");
+               Assert.AreEqual("04/07/2013 03:00:00", d1.End.ToString ("G", CultureInfo.InvariantCulture), "E04");
                Assert.AreEqual(36000000000L, d1.Delta.Ticks, "E05");
 
                DaylightTime d2 = t1.GetDaylightChanges (2001);
-               Assert.AreEqual("10/07/2001 02:00:00", d2.Start.ToString ("G"), "E06");
-               Assert.AreEqual("03/18/2001 03:00:00", d2.End.ToString ("G"), "E07");
+               Assert.AreEqual("10/07/2001 02:00:00", d2.Start.ToString ("G", CultureInfo.InvariantCulture), "E06");
+               Assert.AreEqual("03/18/2001 03:00:00", d2.End.ToString ("G", CultureInfo.InvariantCulture), "E07");
                Assert.AreEqual(36000000000L, d2.Delta.Ticks, "E08");
 
                DateTime d3 = new DateTime(2013,02,15);
@@ -169,7 +170,6 @@ public class TimeZoneTest {
        }
 
        [Test]
-       [Culture ("")]
        public void TestCtors ()
        {
                TimeZone t1 = TimeZone.CurrentTimeZone;