2005-06-10 Gonzalo Paniagua Javier <gonzalo@ximian.com>

	* ConvertTest.cs: added new tests for FromBase64String.

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

diff --git a/mcs/class/corlib/Test/System/ChangeLog b/mcs/class/corlib/Test/System/ChangeLog
index c32c2c06419a2b139b95e615f43344620fd5abf7..1c4466861f879a2cb6845b286c854521e17b82ad 100644 (file)
--- a/mcs/class/corlib/Test/System/ChangeLog
+++ b/mcs/class/corlib/Test/System/ChangeLog
@@ -1,3 +1,7 @@
+2005-06-10 Gonzalo Paniagua Javier <gonzalo@ximian.com>
+
+       * ConvertTest.cs: added new tests for FromBase64String.
+
 2005-06-06  Sebastien Pouliot  <sebastien@ximian.com>
 
        * ModuleHandleTest.cs: Renamed PortableExecutableKind to *Kinds to fix

diff --git a/mcs/class/corlib/Test/System/ConvertTest.cs b/mcs/class/corlib/Test/System/ConvertTest.cs
index aba7ebf16a11d3b33eadeeb316a13ba2eb93fd0e..7d8d17b129d01aa2accf086fb86e32fe395f9f68 100644 (file)
--- a/mcs/class/corlib/Test/System/ConvertTest.cs
+++ b/mcs/class/corlib/Test/System/ConvertTest.cs
@@ -2944,46 +2944,74 @@ namespace MonoTests.System {
                        AssertEquals ("CharArray-IgnoreCharsAfter-Ignored", 15, data.Length);
                }
 
-                               public void TestConvertFromNull() {
-                                       
-                                       AssertEquals ("#W1", false, Convert.ToBoolean (null as object));
-                                       AssertEquals ("#W2", 0, Convert.ToByte (null as object));
-                                       AssertEquals ("#W3", 0, Convert.ToChar (null as object));
-                                       AssertEquals ("#W4", new DateTime (1,1,1,0,0,0), Convert.ToDateTime (null as object));
-                                       AssertEquals ("#W5", 0, Convert.ToDecimal (null as object));
-                                       AssertEquals ("#W6", 0, Convert.ToDouble (null as object));
-                                       AssertEquals ("#W7", 0, Convert.ToInt16 (null as object));
-                                       AssertEquals ("#W8", 0, Convert.ToInt32 (null as object));
-                                       AssertEquals ("#W9", 0, Convert.ToInt64 (null as object));
-                                       AssertEquals ("#W10", 0, Convert.ToSByte (null as object));
-                                       AssertEquals ("#W11", 0, Convert.ToSingle (null as object));
-                                       AssertEquals ("#W12", "", Convert.ToString (null as object));
-                                       AssertEquals ("#W13", 0, Convert.ToUInt16 (null as object));
-                                       AssertEquals ("#W14", 0, Convert.ToUInt32 (null as object));
-                                       AssertEquals ("#W15", 0, Convert.ToUInt64 (null as object));
-                                       AssertEquals ("#W16", false, Convert.ToBoolean (null as string));
-                                       AssertEquals ("#W17", 0, Convert.ToByte (null as string));
-
-                                       try {
-                                               Convert.ToChar (null as string);
-                                               Fail ();
-                                       } catch (Exception e) {
-                                               AssertEquals ("#W18", typeof (ArgumentNullException), e.GetType ());                                            
-                                       }
-                                       
-                                       AssertEquals ("#W19", new DateTime (1,1,1,0,0,0), Convert.ToDateTime (null as string));
-                                       AssertEquals ("#W20", 0, Convert.ToDecimal (null as string));
-                                       AssertEquals ("#W21", 0, Convert.ToDouble (null as string));
-                                       AssertEquals ("#W22", 0, Convert.ToInt16 (null as string));
-                                       AssertEquals ("#W23", 0, Convert.ToInt32 (null as string));
-                                       AssertEquals ("#W24", 0, Convert.ToInt64 (null as string));
-                                       AssertEquals ("#W25", 0, Convert.ToSByte (null as string));
-                                       AssertEquals ("#W26", 0, Convert.ToSingle (null as string));
-                                       AssertEquals ("#W27", null, Convert.ToString (null as string));
-                                       AssertEquals ("#W28", 0, Convert.ToUInt16 (null as string));
-                                       AssertEquals ("#W29", 0, Convert.ToUInt32 (null as string));
-                                       AssertEquals ("#W30", 0, Convert.ToUInt64 (null as string));                                    
-                               }
+               [Test]
+               [ExpectedException (typeof (FormatException))]
+               public void ConvertEmpty ()
+               {
+                       Convert.FromBase64String ("");
+               }
+
+               [Test]
+               [ExpectedException (typeof (FormatException))]
+               public void ConvertOnlyWhiteSpace ()
+               {
+                       Convert.FromBase64String ("  \r\t");
+               }
+
+               [Test]
+               [ExpectedException (typeof (FormatException))]
+               public void ConvertInvalidChar ()
+               {
+                       Convert.FromBase64String ("amVsb3U=\u0100");
+               }
+
+               [Test]
+               [ExpectedException (typeof (FormatException))]
+               public void ConvertMin ()
+               {
+                       Convert.FromBase64String ("amVsb3U=   \r \n\u007B");
+               }
+
+               public void TestConvertFromNull() {
+                       
+                       AssertEquals ("#W1", false, Convert.ToBoolean (null as object));
+                       AssertEquals ("#W2", 0, Convert.ToByte (null as object));
+                       AssertEquals ("#W3", 0, Convert.ToChar (null as object));
+                       AssertEquals ("#W4", new DateTime (1,1,1,0,0,0), Convert.ToDateTime (null as object));
+                       AssertEquals ("#W5", 0, Convert.ToDecimal (null as object));
+                       AssertEquals ("#W6", 0, Convert.ToDouble (null as object));
+                       AssertEquals ("#W7", 0, Convert.ToInt16 (null as object));
+                       AssertEquals ("#W8", 0, Convert.ToInt32 (null as object));
+                       AssertEquals ("#W9", 0, Convert.ToInt64 (null as object));
+                       AssertEquals ("#W10", 0, Convert.ToSByte (null as object));
+                       AssertEquals ("#W11", 0, Convert.ToSingle (null as object));
+                       AssertEquals ("#W12", "", Convert.ToString (null as object));
+                       AssertEquals ("#W13", 0, Convert.ToUInt16 (null as object));
+                       AssertEquals ("#W14", 0, Convert.ToUInt32 (null as object));
+                       AssertEquals ("#W15", 0, Convert.ToUInt64 (null as object));
+                       AssertEquals ("#W16", false, Convert.ToBoolean (null as string));
+                       AssertEquals ("#W17", 0, Convert.ToByte (null as string));
+
+                       try {
+                               Convert.ToChar (null as string);
+                               Fail ();
+                       } catch (Exception e) {
+                               AssertEquals ("#W18", typeof (ArgumentNullException), e.GetType ());                                            
+                       }
+                       
+                       AssertEquals ("#W19", new DateTime (1,1,1,0,0,0), Convert.ToDateTime (null as string));
+                       AssertEquals ("#W20", 0, Convert.ToDecimal (null as string));
+                       AssertEquals ("#W21", 0, Convert.ToDouble (null as string));
+                       AssertEquals ("#W22", 0, Convert.ToInt16 (null as string));
+                       AssertEquals ("#W23", 0, Convert.ToInt32 (null as string));
+                       AssertEquals ("#W24", 0, Convert.ToInt64 (null as string));
+                       AssertEquals ("#W25", 0, Convert.ToSByte (null as string));
+                       AssertEquals ("#W26", 0, Convert.ToSingle (null as string));
+                       AssertEquals ("#W27", null, Convert.ToString (null as string));
+                       AssertEquals ("#W28", 0, Convert.ToUInt16 (null as string));
+                       AssertEquals ("#W29", 0, Convert.ToUInt32 (null as string));
+                       AssertEquals ("#W30", 0, Convert.ToUInt64 (null as string));                                    
+               }
 
                [Test]
                public void ToByte_PrefixedHexStringInBase16 ()