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 a50c78f630a29102498bee3ea3e2ae286827a7fe..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);
+                               }
                        }
                }
 
@@ -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");
+               }
        }
 }