Merge pull request #916 from akoeplinger/fix-gac-test

[mono.git] / mcs / class / corlib / Test / System / DateTimeTest.cs

diff --git a/mcs/class/corlib/Test/System/DateTimeTest.cs b/mcs/class/corlib/Test/System/DateTimeTest.cs
index 2b6ad3fd5e7e3b01a33f9d4e2c74f387a344c94b..2ec8d85dbe7b3993329355c1306a09ee1197a8c0 100644 (file)
--- a/mcs/class/corlib/Test/System/DateTimeTest.cs
+++ b/mcs/class/corlib/Test/System/DateTimeTest.cs
@@ -1262,8 +1262,12 @@ namespace MonoTests.System
                public void Parse_Bug53023b ()
                {
                        foreach (CultureInfo ci in CultureInfo.GetCultures (CultureTypes.SpecificCultures)) {
-                               DateTime.Parse ("01-Sep-05", ci);
-                               DateTime.Parse ("4:35:35 AM", ci);
+                               try {
+                                       DateTime.Parse ("01-Sep-05", ci);
+                                       DateTime.Parse ("4:35:35 AM", ci);
+                               } catch {
+                                       Assert.Fail (ci.Name);
+                               }
                        }
                }
 
@@ -2194,10 +2198,10 @@ namespace MonoTests.System
                public void Kind ()
                {
                        if (DateTime.Now == DateTime.UtcNow)
-                               return; // This test does not make sense.
+                               Assert.Ignore (); // This test does not make sense.
                        if (TimeZone.CurrentTimeZone.GetUtcOffset (DateTime.UtcNow)
                                != TimeZone.CurrentTimeZone.GetUtcOffset (DateTime.Now))
-                               return; // In this case it does not satisfy the test premises.
+                               Assert.Ignore (); // In this case it does not satisfy the test premises.
 
                        Assert.AreEqual (DateTimeKind.Local, DateTime.Now.Kind, "#A1");
                        Assert.AreEqual (DateTimeKind.Local, DateTime.Today.Kind, "#A2");
@@ -2554,5 +2558,17 @@ namespace MonoTests.System
                        var dt = new DateTime (2012, 9, 15);
                        Assert.AreEqual ("15 сентября", dt.ToString ("m", ci));
                }
+
+               [Test]
+               public void Parse_ThaiCalendar ()
+               {
+                       var culture = CultureInfo.GetCultureInfo ("th-TH");
+                       Assert.IsTrue (culture.Calendar is ThaiBuddhistCalendar);
+                       var dt = DateTime.Now.Date;
+                       var s = dt.ToString (culture);
+                       var parsed = DateTime.Parse (s, culture);
+
+                       Assert.AreEqual (dt, parsed, "#1");
+               }
        }
 }