Author: gonzalo
Date: 2005-06-10 17:13:41 -0400 (Fri, 10 Jun 2005)
New Revision: 45794
Modified:
trunk/mcs/class/corlib/Test/System/ChangeLog
trunk/mcs/class/corlib/Test/System/ConvertTest.cs
Log:
2005-06-10 Gonzalo Paniagua Javier <[EMAIL PROTECTED]>
* ConvertTest.cs: added new tests for FromBase64String.
Modified: trunk/mcs/class/corlib/Test/System/ChangeLog
===================================================================
--- trunk/mcs/class/corlib/Test/System/ChangeLog 2005-06-10 20:39:05 UTC
(rev 45793)
+++ trunk/mcs/class/corlib/Test/System/ChangeLog 2005-06-10 21:13:41 UTC
(rev 45794)
@@ -1,3 +1,7 @@
+2005-06-10 Gonzalo Paniagua Javier <[EMAIL PROTECTED]>
+
+ * ConvertTest.cs: added new tests for FromBase64String.
+
2005-06-06 Sebastien Pouliot <[EMAIL PROTECTED]>
* ModuleHandleTest.cs: Renamed PortableExecutableKind to *Kinds to fix
Modified: trunk/mcs/class/corlib/Test/System/ConvertTest.cs
===================================================================
--- trunk/mcs/class/corlib/Test/System/ConvertTest.cs 2005-06-10 20:39:05 UTC
(rev 45793)
+++ trunk/mcs/class/corlib/Test/System/ConvertTest.cs 2005-06-10 21:13:41 UTC
(rev 45794)
@@ -2944,48 +2944,76 @@
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));
+ [Test]
+ [ExpectedException (typeof (FormatException))]
+ public void ConvertEmpty ()
+ {
+ Convert.FromBase64String ("");
+ }
- 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 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 ()
{
AssertEquals ("0xff", 255, Convert.ToByte ("0xff", 16));
_______________________________________________
Mono-patches maillist - [email protected]
http://lists.ximian.com/mailman/listinfo/mono-patches
