2009-06-26 Zoltan Varga <vargaz@gmail.com>

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

diff --git a/mcs/class/corlib/Test/System.Text/EncoderReplacementFallbackTest.cs b/mcs/class/corlib/Test/System.Text/EncoderReplacementFallbackTest.cs
index d41aecbc4efc6e8da6668fa38fad3712fed1e08e..c03edc4d0b20a6625296810ea901151ca9083980 100644 (file)
--- a/mcs/class/corlib/Test/System.Text/EncoderReplacementFallbackTest.cs
+++ b/mcs/class/corlib/Test/System.Text/EncoderReplacementFallbackTest.cs
@@ -33,8 +33,8 @@ namespace MonoTests.System.Text
 
                        f = Encoding.UTF8.EncoderFallback as EncoderReplacementFallback;
                        Assert.IsNotNull (f, "#5");
-                       Assert.AreEqual (String.Empty, f.DefaultString, "#6");
-                       Assert.AreEqual (0, f.MaxCharCount, "#7");
+                       Assert.AreEqual ("\uFFFD", f.DefaultString, "#6");
+                       Assert.AreEqual (1, f.MaxCharCount, "#7");
 
                        // after beta2 this test became invalid.
                        //f = new MyEncoding ().EncoderFallback as EncoderReplacementFallback;
@@ -56,11 +56,17 @@ namespace MonoTests.System.Text
                }
 
                [Test]
-               [ExpectedException (typeof (NotSupportedException))]
                public void DontChangeReadOnlyCodePageEncoderFallback ()
                {
-                       Encoding.GetEncoding (932).EncoderFallback =
-                               new EncoderReplacementFallback ();
+                       Encoding encoding = Encoding.GetEncoding (Encoding.Default.CodePage);
+                       try {
+                               encoding.EncoderFallback = new EncoderReplacementFallback ();
+                               Assert.Fail ("#1");
+                       } catch (InvalidOperationException ex) {
+                               Assert.AreEqual (typeof (InvalidOperationException), ex.GetType (), "#2");
+                               Assert.IsNull (ex.InnerException, "#3");
+                               Assert.IsNotNull (ex.Message, "#4");
+                       }
                }
 
                [Test]