2007-02-01 Atsushi Enomoto <atsushi@ximian.com>

	* Encoding.cs : the change broke the build, so reverted part of it.

	* EncodingTest.cs :
	  reverted part of the related patch, thus added NotWorking.

svn path=/trunk/mcs/; revision=72087

diff --git a/mcs/class/corlib/System.Text/ChangeLog b/mcs/class/corlib/System.Text/ChangeLog
index e94cf5dda9050b9839258a3817edd02bb8e181e9..101491785ed0909705b5d1dd110e706bffcc31db 100644 (file)
--- a/mcs/class/corlib/System.Text/ChangeLog
+++ b/mcs/class/corlib/System.Text/ChangeLog
@@ -1,3 +1,7 @@
+2007-02-01  Atsushi Enomoto  <atsushi@ximian.com>
+
+       * Encoding.cs : the change broke the build, so reverted part of it.
+
 2007-01-31  Gert Driesen  <drieseng@users.sourceforge.net>
 
        * Encoding.cs: Also set ParamName of the ArgumentException.

diff --git a/mcs/class/corlib/System.Text/Encoding.cs b/mcs/class/corlib/System.Text/Encoding.cs
index 7ea54912dbb0150a744f352ca9b4843b1425f41b..034e04fedcecf7f5c1322e9c42bce02dae1dff90 100644 (file)
--- a/mcs/class/corlib/System.Text/Encoding.cs
+++ b/mcs/class/corlib/System.Text/Encoding.cs
@@ -699,8 +699,8 @@ public abstract class Encoding
                }
 
                // We have no idea how to handle this encoding name.
-               throw new ArgumentException (String.Format ("Encoding name '{0}' not "
-                       + "supported", name), "name");
+               throw new NotSupportedException (String.Format ("Encoding name '{0}' not "
+                       + "supported", name));
        }
 
 #endif // !ECMA_COMPAT

diff --git a/mcs/class/corlib/Test/System.Text/ChangeLog b/mcs/class/corlib/Test/System.Text/ChangeLog
index 0e0100a44e78daf2a6d098788dcece99430a4c06..dca9c712ac3aab16fafa0d77928b013950218188 100644 (file)
--- a/mcs/class/corlib/Test/System.Text/ChangeLog
+++ b/mcs/class/corlib/Test/System.Text/ChangeLog
@@ -1,3 +1,8 @@
+2007-02-01  Atsushi Enomoto  <atsushi@ximian.com>
+
+       * EncodingTest.cs :
+         reverted part of the related patch, thus added NotWorking.
+
 2007-01-31  Gert Driesen  <drieseng@users.sourceforge.net>
 
        * EncodingTest.cs: Improved test for not-supported encoding.

diff --git a/mcs/class/corlib/Test/System.Text/EncodingTest.cs b/mcs/class/corlib/Test/System.Text/EncodingTest.cs
index 9d6bf31804e4b549e7f5647d296d236abc55f56f..d4b2a54ec42c5961a934cd645e1d5b53de4e0533 100644 (file)
--- a/mcs/class/corlib/Test/System.Text/EncodingTest.cs
+++ b/mcs/class/corlib/Test/System.Text/EncodingTest.cs
@@ -69,6 +69,7 @@ namespace MonoTests.System.Text
                }
 
                [Test]
+               [Category ("NotWorking")]
                public void GetEncoding_Name_NotSupported ()
                {
                        try {