Merge pull request #1410 from alesliehughes/master

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

diff --git a/mcs/class/corlib/Test/System.Globalization/RegionInfoTest.cs b/mcs/class/corlib/Test/System.Globalization/RegionInfoTest.cs
index dd44a01a33a51640489996ce564cd7f24a55e8e0..b0b1a041da8b987aa66b86e335d5b7556ceee114 100644 (file)
--- a/mcs/class/corlib/Test/System.Globalization/RegionInfoTest.cs
+++ b/mcs/class/corlib/Test/System.Globalization/RegionInfoTest.cs
@@ -42,13 +42,15 @@ namespace MonoTests.System.Globalization
                                } catch (ArgumentException) {
                                }
                        }
+
+                       try {
+                               new RegionInfo ("2342#");
+                               Assert.Fail ("#2");
+                       } catch (ArgumentException) {
+                       }
                }
 
                [Test]
-#if NET_2_0
-#else
-               [ExpectedException (typeof (ArgumentException))]
-#endif
                public void RegionByLocaleName ()
                {
                        string [] names = new string [] {
@@ -58,6 +60,14 @@ namespace MonoTests.System.Globalization
                                new RegionInfo (name);
                }
                
+               [Test]
+               // This can fail on systems where CultureInfo.CurrentCulture==null
+               [Category ("NotWorking")]
+               public void CurrentRegion ()
+               {
+                       Assert.IsNotNull (RegionInfo.CurrentRegion, "CurrentRegion");
+               }
+               
                [Test]
                public void HongKong ()
                {
@@ -73,5 +83,13 @@ namespace MonoTests.System.Globalization
                        Assert.IsTrue (hk.ThreeLetterISORegionName.Length <= 3, "ThreeLetterISORegionName");
                        Assert.IsTrue (hk.ThreeLetterWindowsRegionName.Length <= 3, "ThreeLetterWindowsRegionName");
                }
+
+               [Test]
+               public void Equals ()
+               {
+                       var a = new RegionInfo (0x414);
+                       var b = new RegionInfo (0x43B);
+                       Assert.AreEqual (a, b);
+               }
        }
 }
\ No newline at end of file