regex: A few more null and bounds checks

[mono.git] / mcs / class / System / Test / System.Text.RegularExpressions / RegexTest.cs

diff --git a/mcs/class/System/Test/System.Text.RegularExpressions/RegexTest.cs b/mcs/class/System/Test/System.Text.RegularExpressions/RegexTest.cs
index 4c4f656f9bf818ab254a5adf4d3d204131c53caf..6f55bbeff08f55e3d45b77ae1dd2de856f6b9e26 100644 (file)
--- a/mcs/class/System/Test/System.Text.RegularExpressions/RegexTest.cs
+++ b/mcs/class/System/Test/System.Text.RegularExpressions/RegexTest.cs
@@ -63,6 +63,12 @@ namespace MonoTests.System.Text.RegularExpressions
                {
                        new Regex ("foo", (RegexOptions) Int32.MaxValue);
                }
+
+               [Test, ExpectedException (typeof (ArgumentOutOfRangeException))]
+               public void InvalidOptions2 ()
+               {
+                       new Regex ("foo", RegexOptions.ECMAScript | RegexOptions.RightToLeft);
+               }
                
                [Test]
                public void Unescape ()
@@ -213,6 +219,18 @@ namespace MonoTests.System.Text.RegularExpressions
                        r.Replace ("string", m, 0, 0);
                }
 
+               [Test, ExpectedException (typeof (ArgumentOutOfRangeException))]
+               public void Replace_InvalidCount ()
+               {
+                       Regex.Replace ("foo", "foo|bar", "baz", -4);
+               }
+
+               [Test, ExpectedException (typeof (ArgumentOutOfRangeException))]
+               public void Replace_InvalidStart ()
+               {
+                       Regex.Replace ("foo", "foo|bar", "baz", 1, -4);
+               }
+
                [Test, ExpectedException (typeof (ArgumentNullException))]
                public void Split_InputNull1 ()
                {
@@ -225,6 +243,30 @@ namespace MonoTests.System.Text.RegularExpressions
                        Regex.Split (null, "^.*$", RegexOptions.RightToLeft);
                }
 
+               [Test, ExpectedException (typeof (ArgumentNullException))]
+               public void Split_InvalidCount ()
+               {
+                       Regex.Split (null, "^.*$", -4);
+               }
+
+               [Test, ExpectedException (typeof (ArgumentNullException))]
+               public void Split_InvalidCount ()
+               {
+                       Regex.Split (null, "^.*$", 1, -4);
+               }
+
+               [Test, ExpectedException (typeof (ArgumentNullException))]
+               public void Escape_Null ()
+               {
+                       Regex.Escape (null);
+               }
+
+               [Test, ExpectedException (typeof (ArgumentNullException))]
+               public void Unescape_Null ()
+               {
+                       Regex.Unescape (null);
+               }
+
                static string story =
                        "Two little dragons lived in the forest\n" +
                        "They spent their days collecting honey suckle,\n" +