* SqlStringTest.cs: Change spaces to tabs. Restore original culture
authorGert Driesen <drieseng@users.sourceforge.net>
Tue, 30 Dec 2008 01:41:46 +0000 (01:41 -0000)
committerGert Driesen <drieseng@users.sourceforge.net>
Tue, 30 Dec 2008 01:41:46 +0000 (01:41 -0000)
on teardown. Enable commented-out tests. Removed CWLs.

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

mcs/class/System.Data/Test/System.Data.SqlTypes/ChangeLog
mcs/class/System.Data/Test/System.Data.SqlTypes/SqlStringTest.cs

index f2ba892e0235649289d264b10b34bc0d01f4a5db..f3c6cbc19226f6940b4ac5d4aae6bfd4a7950960 100644 (file)
@@ -1,3 +1,8 @@
+2008-12-29  Gert Driesen  <drieseng@users.sourceforge.net>
+
+       * SqlStringTest.cs: Change spaces to tabs. Restore original culture
+       on teardown. Enable commented-out tests. Removed CWLs.
+
 2008-12-23  Veerapuram Varadhan  <vvaradhan@novell.com>
 
        * SqlXmlTest.cs:  Available only in 2.0 and above
index f632685221f325f7125fb904b7378b69733c75b0..a1bf2f00f7dc7fc6184bef735a1f861082ab0b94 100644 (file)
@@ -7,7 +7,6 @@
 // (C) 2002 Ville Palo
 // (C) 2003 Martin Willemoes Hansen
 // 
-
 //
 // Copyright (C) 2004 Novell, Inc (http://www.novell.com)
 //
 // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 //
 
-using NUnit.Framework;
 using System;
-using System.Xml;
 using System.Data.SqlTypes;
 using System.Globalization;
+#if NET_2_0
+using System.IO;
+#endif
 using System.Threading;
-
+using System.Xml;
 #if NET_2_0
 using System.Xml.Serialization;
-using System.IO;
-#endif 
+#endif
+
+using NUnit.Framework;
 
 namespace MonoTests.System.Data.SqlTypes
 {
        [TestFixture]
-        public class SqlStringTest
+       public class SqlStringTest
        {
-
-                private SqlString Test1 = null;
-                private SqlString Test2 = null;
-                private SqlString Test3 = null;
+               private SqlString Test1;
+               private SqlString Test2;
+               private SqlString Test3;
+               private CultureInfo originalCulture;
 
                [SetUp]
-                public void GetReady()
-                {
-                        Test1 = new SqlString ("First TestString");
-                        Test2 = new SqlString ("This is just a test SqlString");
-                        Test3 = new SqlString ("This is just a test SqlString");
-                        Thread.CurrentThread.CurrentCulture = new CultureInfo ("en-AU");
-                }
-
-                // Test constructor
-               [Test]
-                public void Create()
-                {
-
-                        // SqlString (String)
-                        SqlString  TestString = new SqlString ("Test");
-                        Assert.AreEqual ("Test", TestString.Value, "#A01");
-
-                        // SqlString (String, int)
-                        TestString = new SqlString ("Test", 2057);
-                        Assert.AreEqual (2057, TestString.LCID, "#A02");
-
-                        // SqlString (int, SqlCompareOptions, byte[])
-                        TestString = new SqlString (2057,
-                                                    SqlCompareOptions.BinarySort|SqlCompareOptions.IgnoreCase,
-                                                    new byte [2] {123, 221});
-                        Assert.AreEqual (2057, TestString.CompareInfo.LCID, "#A03");
-                        
-                        // SqlString(string, int, SqlCompareOptions)
-                        TestString = new SqlString ("Test", 2057, SqlCompareOptions.IgnoreNonSpace);
-                        Assert.IsTrue (!TestString.IsNull, "#A04");
-                        
-                        // SqlString (int, SqlCompareOptions, byte[], bool)
-                        TestString = new SqlString (2057, SqlCompareOptions.BinarySort, new byte [4] {100, 100, 200, 45}, true);
-                        Assert.AreEqual ((byte)63, TestString.GetNonUnicodeBytes () [0], "#A05");
-                        TestString = new SqlString (2057, SqlCompareOptions.BinarySort, new byte [2] {113, 100}, false);
-                        Assert.AreEqual ((String)"qd", TestString.Value, "#A06");
-                        
-                        // SqlString (int, SqlCompareOptions, byte[], int, int)
-                        TestString = new SqlString (2057, SqlCompareOptions.BinarySort, new byte [2] {113, 100}, 0, 2);
-                        Assert.IsTrue (!TestString.IsNull, "#A07");
-
-                        // SqlString (int, SqlCompareOptions, byte[], int, int, bool)
-                        TestString = new SqlString (2057, SqlCompareOptions.IgnoreCase, new byte [3] {100, 111, 50}, 1, 2, false);
-                        Assert.AreEqual ("o2", TestString.Value, "#A08");
-                        TestString = new SqlString (2057, SqlCompareOptions.IgnoreCase, new byte [3] {123, 111, 222}, 1, 2, true);
-                        Assert.IsTrue (!TestString.IsNull, "#A09");                        
-                }
+               public void GetReady()
+               {
+                       originalCulture = Thread.CurrentThread.CurrentCulture;
+                       Thread.CurrentThread.CurrentCulture = new CultureInfo ("en-AU");
+                       Test1 = new SqlString ("First TestString");
+                       Test2 = new SqlString ("This is just a test SqlString");
+                       Test3 = new SqlString ("This is just a test SqlString");
+               }
+
+               [TearDown]
+               public void TearDown ()
+               {
+                       Thread.CurrentThread.CurrentCulture = originalCulture;
+               }
+
+               // Test constructor
+               [Test]
+               public void Create()
+               {
+                       // SqlString (String)
+                       SqlString TestString = new SqlString ("Test");
+                       Assert.AreEqual ("Test", TestString.Value, "#A01");
+
+                       // SqlString (String, int)
+                       TestString = new SqlString ("Test", 2057);
+                       Assert.AreEqual (2057, TestString.LCID, "#A02");
+
+                       // SqlString (int, SqlCompareOptions, byte[])
+                       TestString = new SqlString (2057,
+                               SqlCompareOptions.BinarySort|SqlCompareOptions.IgnoreCase,
+                               new byte [2] {123, 221});
+                       Assert.AreEqual (2057, TestString.CompareInfo.LCID, "#A03");
+
+                       // SqlString(string, int, SqlCompareOptions)
+                       TestString = new SqlString ("Test", 2057, SqlCompareOptions.IgnoreNonSpace);
+                       Assert.IsTrue (!TestString.IsNull, "#A04");
+
+                       // SqlString (int, SqlCompareOptions, byte[], bool)
+                       TestString = new SqlString (2057, SqlCompareOptions.BinarySort, new byte [4] {100, 100, 200, 45}, true);
+                       Assert.AreEqual ((byte)63, TestString.GetNonUnicodeBytes () [0], "#A05");
+                       TestString = new SqlString (2057, SqlCompareOptions.BinarySort, new byte [2] {113, 100}, false);
+                       Assert.AreEqual ((String)"qd", TestString.Value, "#A06");
+
+                       // SqlString (int, SqlCompareOptions, byte[], int, int)
+                       TestString = new SqlString (2057, SqlCompareOptions.BinarySort, new byte [2] {113, 100}, 0, 2);
+                       Assert.IsTrue (!TestString.IsNull, "#A07");
+
+                       // SqlString (int, SqlCompareOptions, byte[], int, int, bool)
+                       TestString = new SqlString (2057, SqlCompareOptions.IgnoreCase, new byte [3] {100, 111, 50}, 1, 2, false);
+                       Assert.AreEqual ("o2", TestString.Value, "#A08");
+                       TestString = new SqlString (2057, SqlCompareOptions.IgnoreCase, new byte [3] {123, 111, 222}, 1, 2, true);
+                       Assert.IsTrue (!TestString.IsNull, "#A09");
+               }
 
                [Test]
                [ExpectedException(typeof (ArgumentOutOfRangeException))]
@@ -116,58 +123,55 @@ namespace MonoTests.System.Data.SqlTypes
                        SqlString TestString = new SqlString (2057, SqlCompareOptions.BinarySort, new byte [2] {113, 100}, 0, 4);
                }
 
-                // Test public fields
-               [Test]
-                public void PublicFields()
-                {
-                        // BinarySort
-                        Assert.AreEqual (32768, SqlString.BinarySort, "#B01");
-                        
-                        // IgnoreCase
-                        Assert.AreEqual (1, SqlString.IgnoreCase, "#B02");
-                                      
-                        // IgnoreKanaType
-                        Assert.AreEqual (8, SqlString.IgnoreKanaType, "#B03");
-
-                        // IgnoreNonSpace
-                        Assert.AreEqual (2, SqlString.IgnoreNonSpace, "#B04");
-                        
-                        // IgnoreWidth
-                        Assert.AreEqual (16, SqlString.IgnoreWidth, "#B05");
-                        
-                        // Null
-                        Assert.IsTrue (SqlString.Null.IsNull, "#B06");
-                }
-
-                // Test properties
-               [Test]
-                public void Properties()
-                {
-/* Comment out: This test will succeed only when you're in en-au culture.
+               // Test public fields
+               [Test]
+               public void PublicFields()
+               {
+                       // BinarySort
+                       Assert.AreEqual (32768, SqlString.BinarySort, "#B01");
+
+                       // IgnoreCase
+                       Assert.AreEqual (1, SqlString.IgnoreCase, "#B02");
+
+                       // IgnoreKanaType
+                       Assert.AreEqual (8, SqlString.IgnoreKanaType, "#B03");
+
+                       // IgnoreNonSpace
+                       Assert.AreEqual (2, SqlString.IgnoreNonSpace, "#B04");
+
+                       // IgnoreWidth
+                       Assert.AreEqual (16, SqlString.IgnoreWidth, "#B05");
+
+                       // Null
+                       Assert.IsTrue (SqlString.Null.IsNull, "#B06");
+               }
+
+               // Test properties
+               [Test]
+               public void Properties()
+               {
                        // CompareInfo
                        Assert.AreEqual (3081, Test1.CompareInfo.LCID, "#C01");
 
-                        // CultureInfo
-                       Assert.AreEqual (3081, Test1.CultureInfo.LCID, "#C02");             
+                       // CultureInfo
+                       Assert.AreEqual (3081, Test1.CultureInfo.LCID, "#C02");
 
-                        // LCID
-                        Assert.AreEqual (3081, Test1.LCID, "#C05");                        
-*/   
-                        
-                        // IsNull
-                        Assert.IsTrue (!Test1.IsNull, "#C03");
-                        Assert.IsTrue (SqlString.Null.IsNull, "#C04");
-                                               
-                        // SqlCompareOptions
-                        Assert.AreEqual ("IgnoreCase, IgnoreKanaType, IgnoreWidth", 
-                                      Test1.SqlCompareOptions.ToString (), "#C06");
+                       // LCID
+                       Assert.AreEqual (3081, Test1.LCID, "#C05");
 
-                        // Value
-                        Assert.AreEqual ("First TestString", Test1.Value, "#C07");
+                       // IsNull
+                       Assert.IsTrue (!Test1.IsNull, "#C03");
+                       Assert.IsTrue (SqlString.Null.IsNull, "#C04");
 
-                }
+                       // SqlCompareOptions
+                       Assert.AreEqual ("IgnoreCase, IgnoreKanaType, IgnoreWidth", 
+                               Test1.SqlCompareOptions.ToString (), "#C06");
 
-                // PUBLIC METHODS
+                       // Value
+                       Assert.AreEqual ("First TestString", Test1.Value, "#C07");
+               }
+
+               // PUBLIC METHODS
 
                [Test]
                [ExpectedException(typeof(ArgumentException))]
@@ -182,7 +186,7 @@ namespace MonoTests.System.Data.SqlTypes
                public void CompareToSqlTypeException ()
                {
                        SqlString T1 = new SqlString ("test", 2057, SqlCompareOptions.IgnoreCase);
-                       SqlString T2 = new SqlString ("TEST", 2057, SqlCompareOptions.None);
+                       SqlString T2 = new SqlString ("TEST", 2057, SqlCompareOptions.None);
                        T1.CompareTo (T2);
                }
 
@@ -190,206 +194,202 @@ namespace MonoTests.System.Data.SqlTypes
 #if TARGET_JVM
                [Ignore ("The option CompareOptions.IgnoreWidth is not supported")]
 #endif
-                public void CompareTo()
-                {
-                        SqlByte Test = new SqlByte (1);
-
-                        Assert.IsTrue (Test1.CompareTo (Test3) < 0, "#D01");
-                        Assert.IsTrue (Test2.CompareTo (Test1) > 0, "#D02");
-                        Assert.IsTrue (Test2.CompareTo (Test3) == 0, "#D03");
-                        Assert.IsTrue (Test3.CompareTo (SqlString.Null) > 0, "#D04");
-
-                        
-                        SqlString T1 = new SqlString ("test", 2057, SqlCompareOptions.IgnoreCase);
-                       SqlString T2 = new SqlString ("TEST", 2057, SqlCompareOptions.None);
-                                               
-                       // IgnoreCase
-                       T1 = new SqlString ("test", 2057, SqlCompareOptions.IgnoreCase);
-                       T2 = new SqlString ("TEST", 2057, SqlCompareOptions.IgnoreCase);
-                       Assert.IsTrue (T2.CompareTo (T1) == 0, "#D09");
-                
-                       T1 = new SqlString ("test", 2057);
-                       T2 = new SqlString ("TEST", 2057);
-                       Assert.IsTrue (T2.CompareTo (T1) == 0, "#D10");
-
-                       T1 = new SqlString ("test", 2057, SqlCompareOptions.None);
-                       T2 = new SqlString ("TEST", 2057, SqlCompareOptions.None);
-                       Assert.IsTrue (T2.CompareTo (T1) != 0, "#D11");
+               public void CompareTo()
+               {
+                       SqlByte Test = new SqlByte (1);
+
+                       Assert.IsTrue (Test1.CompareTo (Test3) < 0, "#D01");
+                       Assert.IsTrue (Test2.CompareTo (Test1) > 0, "#D02");
+                       Assert.IsTrue (Test2.CompareTo (Test3) == 0, "#D03");
+                       Assert.IsTrue (Test3.CompareTo (SqlString.Null) > 0, "#D04");
+
+                       SqlString T1 = new SqlString ("test", 2057, SqlCompareOptions.IgnoreCase);
+                       SqlString T2 = new SqlString ("TEST", 2057, SqlCompareOptions.None);
+
+                       // IgnoreCase
+                       T1 = new SqlString ("test", 2057, SqlCompareOptions.IgnoreCase);
+                       T2 = new SqlString ("TEST", 2057, SqlCompareOptions.IgnoreCase);
+                       Assert.IsTrue (T2.CompareTo (T1) == 0, "#D09");
+
+                       T1 = new SqlString ("test", 2057);
+                       T2 = new SqlString ("TEST", 2057);
+                       Assert.IsTrue (T2.CompareTo (T1) == 0, "#D10");
+
+                       T1 = new SqlString ("test", 2057, SqlCompareOptions.None);
+                       T2 = new SqlString ("TEST", 2057, SqlCompareOptions.None);
+                       Assert.IsTrue (T2.CompareTo (T1) != 0, "#D11");
 
                        // IgnoreNonSpace
-                        T1 = new SqlString ("TEST\xF1", 2057, SqlCompareOptions.IgnoreNonSpace);
-                       T2 = new SqlString ("TESTn", 2057, SqlCompareOptions.IgnoreNonSpace);
-                       Assert.IsTrue (T2.CompareTo (T1) == 0, "#D12");
-                
-                       T1 = new SqlString ("TESTñ", 2057, SqlCompareOptions.None);
-                       T2 = new SqlString ("TESTn", 2057, SqlCompareOptions.None);
-                       Assert.IsTrue (T2.CompareTo (T1) != 0, "#D13");
+                       T1 = new SqlString ("TEST\xF1", 2057, SqlCompareOptions.IgnoreNonSpace);
+                       T2 = new SqlString ("TESTn", 2057, SqlCompareOptions.IgnoreNonSpace);
+                       Assert.IsTrue (T2.CompareTo (T1) == 0, "#D12");
+
+                       T1 = new SqlString ("TESTñ", 2057, SqlCompareOptions.None);
+                       T2 = new SqlString ("TESTn", 2057, SqlCompareOptions.None);
+                       Assert.IsTrue (T2.CompareTo (T1) != 0, "#D13");
 
                        // BinarySort
-                       T1 = new SqlString ("01_", 2057, SqlCompareOptions.BinarySort);
-                       T2 = new SqlString ("_01", 2057, SqlCompareOptions.BinarySort);
-                       Assert.IsTrue (T1.CompareTo (T2) < 0, "#D14");
-                       
-                       T1 = new SqlString ("01_", 2057, SqlCompareOptions.None);
-                       T2 = new SqlString ("_01", 2057, SqlCompareOptions.None);
-                       Assert.IsTrue (T1.CompareTo (T2) > 0, "#D15");                  
-                }
-
-               [Test]
-                public void EqualsMethods()
-                {
-                        Assert.IsTrue (!Test1.Equals (Test2), "#E01");
-                        Assert.IsTrue (!Test3.Equals (Test1), "#E02");
-                        Assert.IsTrue (!Test2.Equals (new SqlString ("TEST")), "#E03");
-                        Assert.IsTrue (Test2.Equals (Test3), "#E04");
-
-                        // Static Equals()-method
-                        Assert.IsTrue (SqlString.Equals (Test2, Test3).Value, "#E05");
-                        Assert.IsTrue (!SqlString.Equals (Test1, Test2).Value, "#E06");
-                }
-
-               [Test]
-                public void GetHashCodeTest()
-                {
-                        // FIXME: Better way to test HashCode
-                        Assert.AreEqual (Test1.GetHashCode (), 
-                                      Test1.GetHashCode (), "#F01");
-                        Assert.IsTrue (Test1.GetHashCode () != Test2.GetHashCode (), "#F02");
-                        Assert.IsTrue (Test2.GetHashCode () == Test2.GetHashCode (), "#F03");
-                }
-
-               [Test]
-                public void GetTypeTest()
-                {
-                        Assert.AreEqual ("System.Data.SqlTypes.SqlString", 
-                                      Test1.GetType ().ToString (), "#G01");
-                        Assert.AreEqual ("System.String", 
-                                      Test1.Value.GetType ().ToString (), "#G02");
-                }
+                       T1 = new SqlString ("01_", 2057, SqlCompareOptions.BinarySort);
+                       T2 = new SqlString ("_01", 2057, SqlCompareOptions.BinarySort);
+                       Assert.IsTrue (T1.CompareTo (T2) < 0, "#D14");
+
+                       T1 = new SqlString ("01_", 2057, SqlCompareOptions.None);
+                       T2 = new SqlString ("_01", 2057, SqlCompareOptions.None);
+                       Assert.IsTrue (T1.CompareTo (T2) > 0, "#D15");
+               }
+
+               [Test]
+               public void EqualsMethods()
+               {
+                       Assert.IsTrue (!Test1.Equals (Test2), "#E01");
+                       Assert.IsTrue (!Test3.Equals (Test1), "#E02");
+                       Assert.IsTrue (!Test2.Equals (new SqlString ("TEST")), "#E03");
+                       Assert.IsTrue (Test2.Equals (Test3), "#E04");
+
+                       // Static Equals()-method
+                       Assert.IsTrue (SqlString.Equals (Test2, Test3).Value, "#E05");
+                       Assert.IsTrue (!SqlString.Equals (Test1, Test2).Value, "#E06");
+               }
+
+               [Test]
+               public void GetHashCodeTest()
+               {
+                       // FIXME: Better way to test HashCode
+                       Assert.AreEqual (Test1.GetHashCode (), 
+                               Test1.GetHashCode (), "#F01");
+                       Assert.IsTrue (Test1.GetHashCode () != Test2.GetHashCode (), "#F02");
+                       Assert.IsTrue (Test2.GetHashCode () == Test2.GetHashCode (), "#F03");
+               }
+
+               [Test]
+               public void GetTypeTest()
+               {
+                       Assert.AreEqual ("System.Data.SqlTypes.SqlString", 
+                               Test1.GetType ().ToString (), "#G01");
+                       Assert.AreEqual ("System.String", 
+                               Test1.Value.GetType ().ToString (), "#G02");
+               }
 
                [Test]
 #if TARGET_JVM
                [Ignore ("The option CompareOptions.IgnoreWidth is not supported")]
 #endif
-                public void Greaters()
-                {
-
-                        // GreateThan ()
-                        Assert.IsTrue (!SqlString.GreaterThan (Test1, Test2).Value, "#H01");
-                        Assert.IsTrue (SqlString.GreaterThan (Test2, Test1).Value, "#H02");
-                        Assert.IsTrue (!SqlString.GreaterThan (Test2, Test3).Value, "#H03");
-
-                        // GreaterTharOrEqual ()
-                        Assert.IsTrue (!SqlString.GreaterThanOrEqual (Test1, Test2).Value, "#H04");
-                        Assert.IsTrue (SqlString.GreaterThanOrEqual (Test2, Test1).Value, "#H05");
-                        Assert.IsTrue (SqlString.GreaterThanOrEqual (Test2, Test3).Value, "#H06");
-                }
+               public void Greaters()
+               {
+                       // GreateThan ()
+                       Assert.IsTrue (!SqlString.GreaterThan (Test1, Test2).Value, "#H01");
+                       Assert.IsTrue (SqlString.GreaterThan (Test2, Test1).Value, "#H02");
+                       Assert.IsTrue (!SqlString.GreaterThan (Test2, Test3).Value, "#H03");
+
+                       // GreaterTharOrEqual ()
+                       Assert.IsTrue (!SqlString.GreaterThanOrEqual (Test1, Test2).Value, "#H04");
+                       Assert.IsTrue (SqlString.GreaterThanOrEqual (Test2, Test1).Value, "#H05");
+                       Assert.IsTrue (SqlString.GreaterThanOrEqual (Test2, Test3).Value, "#H06");
+               }
 
                [Test]
 #if TARGET_JVM
                [Ignore ("The option CompareOptions.IgnoreWidth is not supported")]
 #endif
-                public void Lessers()
-                {
-                        // LessThan()
-                        Assert.IsTrue (!SqlString.LessThan (Test2, Test3).Value, "#I01");
-                        Assert.IsTrue (!SqlString.LessThan (Test2, Test1).Value, "#I02");
-                        Assert.IsTrue (SqlString.LessThan (Test1, Test2).Value, "#I03");
-
-                        // LessThanOrEqual ()
-                        Assert.IsTrue (SqlString.LessThanOrEqual (Test1, Test2).Value, "#I04");
-                        Assert.IsTrue (!SqlString.LessThanOrEqual (Test2, Test1).Value, "#I05");
-                        Assert.IsTrue (SqlString.LessThanOrEqual (Test3, Test2).Value, "#I06");
-                        Assert.IsTrue (SqlString.LessThanOrEqual (Test2, SqlString.Null).IsNull, "#I07");
-                }
-
-               [Test]
-                public void NotEquals()
-                {
-                        Assert.IsTrue (SqlString.NotEquals (Test1, Test2).Value, "#J01");
-                        Assert.IsTrue (SqlString.NotEquals (Test2, Test1).Value, "#J02");
-                        Assert.IsTrue (SqlString.NotEquals (Test3, Test1).Value, "#J03");
-                        Assert.IsTrue (!SqlString.NotEquals (Test2, Test3).Value, "#J04");
-
-                        Assert.IsTrue (SqlString.NotEquals (SqlString.Null, Test3).IsNull, "#J05");
-                }
-
-               [Test]
-                public void Concat()
-                {
-                        Test1 = new SqlString ("First TestString");
-                        Test2 = new SqlString ("This is just a test SqlString");
-                        Test3 = new SqlString ("This is just a test SqlString");
-
-                        Assert.AreEqual ((SqlString)"First TestStringThis is just a test SqlString", 
-                              SqlString.Concat (Test1, Test2), "#K01");
-
-                        Assert.AreEqual (SqlString.Null, 
-                                      SqlString.Concat (Test1, SqlString.Null), "#K02");
-                }
-
-               [Test]
-                public void Clone()
-                {
-                        SqlString TestSqlString  = Test1.Clone ();
-                        Assert.AreEqual (Test1, TestSqlString, "#L01");
-                }
-
-               [Test]
-                public void CompareOptionsFromSqlCompareOptions()
-                {
-                        Assert.AreEqual (CompareOptions.IgnoreCase,
-                                    SqlString.CompareOptionsFromSqlCompareOptions (
-                                    SqlCompareOptions.IgnoreCase), "#M01");
-                        Assert.AreEqual (CompareOptions.IgnoreCase,
-                                    SqlString.CompareOptionsFromSqlCompareOptions (
-                                    SqlCompareOptions.IgnoreCase), "#M02");
-                        try {
-                                
-                                CompareOptions test = SqlString.CompareOptionsFromSqlCompareOptions (
-                                    SqlCompareOptions.BinarySort);
-                                Assert.Fail ("#M03");
-                        } catch (Exception e) {
-                                Assert.AreEqual (typeof (ArgumentOutOfRangeException), e.GetType (), "#M04");
-                        }
-                }
-
-               [Test]
-                public void UnicodeBytes()
-                {
-                        Assert.AreEqual ((byte)105, Test1.GetNonUnicodeBytes () [1], "#N01");
-                        Assert.AreEqual ((byte)32, Test1.GetNonUnicodeBytes () [5], "#N02");
-
-                        Assert.AreEqual ((byte)70, Test1.GetUnicodeBytes () [0], "#N03");
-                        Assert.AreEqual ((byte)70, Test1.GetNonUnicodeBytes () [0], "#N03b");
-                        Assert.AreEqual ((byte)0, Test1.GetUnicodeBytes () [1], "#N03c");
-                        Assert.AreEqual ((byte)105, Test1.GetNonUnicodeBytes () [1], "#N03d");
-                        Assert.AreEqual ((byte)105, Test1.GetUnicodeBytes () [2], "#N03e");
-                        Assert.AreEqual ((byte)114, Test1.GetNonUnicodeBytes () [2], "#N03f");
-                        Assert.AreEqual ((byte)0, Test1.GetUnicodeBytes () [3], "#N03g");
-                        Assert.AreEqual ((byte)115, Test1.GetNonUnicodeBytes () [3], "#N03h");
-                        Assert.AreEqual ((byte)114, Test1.GetUnicodeBytes () [4], "#N03i");
-                        Assert.AreEqual ((byte)116, Test1.GetNonUnicodeBytes () [4], "#N03j");
-
-                        Assert.AreEqual ((byte)105, Test1.GetUnicodeBytes () [2], "#N04");
-
-                        try {
-                                byte test = Test1.GetUnicodeBytes () [105];
-                                Assert.Fail ("#N05");
-                        } catch (Exception e) {
+               public void Lessers()
+               {
+                       // LessThan()
+                       Assert.IsTrue (!SqlString.LessThan (Test2, Test3).Value, "#I01");
+                       Assert.IsTrue (!SqlString.LessThan (Test2, Test1).Value, "#I02");
+                       Assert.IsTrue (SqlString.LessThan (Test1, Test2).Value, "#I03");
+
+                       // LessThanOrEqual ()
+                       Assert.IsTrue (SqlString.LessThanOrEqual (Test1, Test2).Value, "#I04");
+                       Assert.IsTrue (!SqlString.LessThanOrEqual (Test2, Test1).Value, "#I05");
+                       Assert.IsTrue (SqlString.LessThanOrEqual (Test3, Test2).Value, "#I06");
+                       Assert.IsTrue (SqlString.LessThanOrEqual (Test2, SqlString.Null).IsNull, "#I07");
+               }
+
+               [Test]
+               public void NotEquals()
+               {
+                       Assert.IsTrue (SqlString.NotEquals (Test1, Test2).Value, "#J01");
+                       Assert.IsTrue (SqlString.NotEquals (Test2, Test1).Value, "#J02");
+                       Assert.IsTrue (SqlString.NotEquals (Test3, Test1).Value, "#J03");
+                       Assert.IsTrue (!SqlString.NotEquals (Test2, Test3).Value, "#J04");
+                       Assert.IsTrue (SqlString.NotEquals (SqlString.Null, Test3).IsNull, "#J05");
+               }
+
+               [Test]
+               public void Concat()
+               {
+                       Test1 = new SqlString ("First TestString");
+                       Test2 = new SqlString ("This is just a test SqlString");
+                       Test3 = new SqlString ("This is just a test SqlString");
+
+                       Assert.AreEqual ((SqlString)"First TestStringThis is just a test SqlString", 
+                               SqlString.Concat (Test1, Test2), "#K01");
+
+                       Assert.AreEqual (SqlString.Null, 
+                               SqlString.Concat (Test1, SqlString.Null), "#K02");
+               }
+
+               [Test]
+               public void Clone()
+               {
+                       SqlString TestSqlString = Test1.Clone ();
+                       Assert.AreEqual (Test1, TestSqlString, "#L01");
+               }
+
+               [Test]
+               public void CompareOptionsFromSqlCompareOptions()
+               {
+                       Assert.AreEqual (CompareOptions.IgnoreCase,
+                               SqlString.CompareOptionsFromSqlCompareOptions (
+                               SqlCompareOptions.IgnoreCase), "#M01");
+                       Assert.AreEqual (CompareOptions.IgnoreCase,
+                               SqlString.CompareOptionsFromSqlCompareOptions (
+                               SqlCompareOptions.IgnoreCase), "#M02");
+                       try {
+                               CompareOptions test = SqlString.CompareOptionsFromSqlCompareOptions (
+                                       SqlCompareOptions.BinarySort);
+                               Assert.Fail ("#M03");
+                       } catch (ArgumentOutOfRangeException e) {
+                               Assert.AreEqual (typeof (ArgumentOutOfRangeException), e.GetType (), "#M04");
+                       }
+               }
+
+               [Test]
+               public void UnicodeBytes()
+               {
+                       Assert.AreEqual ((byte)105, Test1.GetNonUnicodeBytes () [1], "#N01");
+                       Assert.AreEqual ((byte)32, Test1.GetNonUnicodeBytes () [5], "#N02");
+
+                       Assert.AreEqual ((byte)70, Test1.GetUnicodeBytes () [0], "#N03");
+                       Assert.AreEqual ((byte)70, Test1.GetNonUnicodeBytes () [0], "#N03b");
+                       Assert.AreEqual ((byte)0, Test1.GetUnicodeBytes () [1], "#N03c");
+                       Assert.AreEqual ((byte)105, Test1.GetNonUnicodeBytes () [1], "#N03d");
+                       Assert.AreEqual ((byte)105, Test1.GetUnicodeBytes () [2], "#N03e");
+                       Assert.AreEqual ((byte)114, Test1.GetNonUnicodeBytes () [2], "#N03f");
+                       Assert.AreEqual ((byte)0, Test1.GetUnicodeBytes () [3], "#N03g");
+                       Assert.AreEqual ((byte)115, Test1.GetNonUnicodeBytes () [3], "#N03h");
+                       Assert.AreEqual ((byte)114, Test1.GetUnicodeBytes () [4], "#N03i");
+                       Assert.AreEqual ((byte)116, Test1.GetNonUnicodeBytes () [4], "#N03j");
+
+                       Assert.AreEqual ((byte)105, Test1.GetUnicodeBytes () [2], "#N04");
+
+                       try {
+                               byte test = Test1.GetUnicodeBytes () [105];
+                               Assert.Fail ("#N05");
+                       } catch (Exception e) {
 #if TARGET_JVM
-                                                               Assert.IsTrue (typeof (IndexOutOfRangeException).IsAssignableFrom(e.GetType()), "#N06");
+                               Assert.IsTrue (typeof (IndexOutOfRangeException).IsAssignableFrom(e.GetType()), "#N06");
 #else
-                                Assert.AreEqual (typeof (IndexOutOfRangeException), e.GetType(), "#N06");                                
+                               Assert.AreEqual (typeof (IndexOutOfRangeException), e.GetType(), "#N06");
 #endif
-                        }
-                }
-                      
+                       }
+               }
+
                [Test]
                [ExpectedException(typeof (FormatException))]
                public void ConversionBoolFormatException1 ()
                {
-                       bool test = Test1.ToSqlBoolean ().Value;                              
+                       bool test = Test1.ToSqlBoolean ().Value;
                }
 
                [Test]
@@ -410,7 +410,7 @@ namespace MonoTests.System.Data.SqlTypes
                [ExpectedException(typeof (FormatException))]
                public void ConversionDecimalFormatException2 ()
                {
-                        SqlString String9E300 = new SqlString ("9E+300");
+                       SqlString String9E300 = new SqlString ("9E+300");
                        SqlDecimal test = String9E300.ToSqlDecimal ();
                }
 
@@ -418,7 +418,7 @@ namespace MonoTests.System.Data.SqlTypes
                [ExpectedException(typeof (FormatException))]
                public void ConversionGuidFormatException ()
                {
-                        SqlString String9E300 = new SqlString ("9E+300");
+                       SqlString String9E300 = new SqlString ("9E+300");
                        SqlGuid test = String9E300.ToSqlGuid ();
                }
 
@@ -426,7 +426,7 @@ namespace MonoTests.System.Data.SqlTypes
                [ExpectedException(typeof (FormatException))]
                public void ConversionInt16FormatException ()
                {
-                        SqlString String9E300 = new SqlString ("9E+300");
+                       SqlString String9E300 = new SqlString ("9E+300");
                        SqlInt16 test = String9E300.ToSqlInt16().Value;
                }
 
@@ -434,7 +434,7 @@ namespace MonoTests.System.Data.SqlTypes
                [ExpectedException(typeof (FormatException))]
                public void ConversionInt32FormatException1 ()
                {
-                        SqlString String9E300 = new SqlString ("9E+300");
+                       SqlString String9E300 = new SqlString ("9E+300");
                        SqlInt32 test = String9E300.ToSqlInt32 ().Value;
                }
 
@@ -449,7 +449,7 @@ namespace MonoTests.System.Data.SqlTypes
                [ExpectedException(typeof (FormatException))]
                public void ConversionInt64FormatException ()
                {
-                        SqlString String9E300 = new SqlString ("9E+300");
+                       SqlString String9E300 = new SqlString ("9E+300");
                        SqlInt64 test = String9E300.ToSqlInt64 ().Value;
                }
 
@@ -457,7 +457,7 @@ namespace MonoTests.System.Data.SqlTypes
                [ExpectedException(typeof (FormatException))]
                public void ConversionIntMoneyFormatException2 ()
                {
-                        SqlString String9E300 = new SqlString ("9E+300");
+                       SqlString String9E300 = new SqlString ("9E+300");
                        SqlMoney test = String9E300.ToSqlMoney ().Value;
                }
 
@@ -479,253 +479,250 @@ namespace MonoTests.System.Data.SqlTypes
                [ExpectedException(typeof(OverflowException))]
                public void ConversionSingleOverflowException ()
                {
-                        SqlString String9E300 = new SqlString ("9E+300");
+                       SqlString String9E300 = new SqlString ("9E+300");
                        SqlSingle test = String9E300.ToSqlSingle().Value;
                }
 
-               [Test]          
-                public void Conversions()
-                {
-
-                        SqlString String250 = new SqlString ("250");
-                        SqlString String9E300 = new SqlString ("9E+300");
+               [Test]
+               public void Conversions()
+               {
+                       SqlString String250 = new SqlString ("250");
+                       SqlString String9E300 = new SqlString ("9E+300");
 
-                        // ToSqlBoolean ()                                
-                        Assert.IsTrue ((new SqlString("1")).ToSqlBoolean ().Value, "#O02");
-                        Assert.IsTrue (!(new SqlString("0")).ToSqlBoolean ().Value, "#O03");
-                        Assert.IsTrue ((new SqlString("True")).ToSqlBoolean ().Value, "#O04");
-                        Assert.IsTrue (!(new SqlString("FALSE")).ToSqlBoolean ().Value, "#O05");
-                        Assert.IsTrue (SqlString.Null.ToSqlBoolean ().IsNull, "#O06");
+                       // ToSqlBoolean ()
+                       Assert.IsTrue ((new SqlString("1")).ToSqlBoolean ().Value, "#O02");
+                       Assert.IsTrue (!(new SqlString("0")).ToSqlBoolean ().Value, "#O03");
+                       Assert.IsTrue ((new SqlString("True")).ToSqlBoolean ().Value, "#O04");
+                       Assert.IsTrue (!(new SqlString("FALSE")).ToSqlBoolean ().Value, "#O05");
+                       Assert.IsTrue (SqlString.Null.ToSqlBoolean ().IsNull, "#O06");
 
-                        // ToSqlByte ()
-                        Assert.AreEqual ((byte)250, String250.ToSqlByte ().Value, "#O08");    
+                       // ToSqlByte ()
+                       Assert.AreEqual ((byte)250, String250.ToSqlByte ().Value, "#O08");
 
-                        // ToSqlDateTime
-                        Assert.AreEqual (10, 
-                                      (new SqlString ("2002-10-10")).ToSqlDateTime ().Value.Day, "#O11");
-                        
-                        // ToSqlDecimal ()
-                        Assert.AreEqual ((decimal)250, String250.ToSqlDecimal ().Value, "#O16");
+                       // ToSqlDateTime
+                       Assert.AreEqual (10, 
+                               (new SqlString ("2002-10-10")).ToSqlDateTime ().Value.Day, "#O11");
 
-                        // ToSqlDouble
-                        Assert.AreEqual ((SqlDouble)9E+300, String9E300.ToSqlDouble (), "#O19");
+                       // ToSqlDecimal ()
+                       Assert.AreEqual ((decimal)250, String250.ToSqlDecimal ().Value, "#O16");
 
-                        // ToSqlGuid
-                        SqlString TestGuid = new SqlString("11111111-1111-1111-1111-111111111111");
-                        Assert.AreEqual (new SqlGuid("11111111-1111-1111-1111-111111111111"), TestGuid.ToSqlGuid (), "#O22");
+                       // ToSqlDouble
+                       Assert.AreEqual ((SqlDouble)9E+300, String9E300.ToSqlDouble (), "#O19");
 
-                        // ToSqlInt16 ()
-                        Assert.AreEqual ((short)250, String250.ToSqlInt16 ().Value, "#O24");
+                       // ToSqlGuid
+                       SqlString TestGuid = new SqlString("11111111-1111-1111-1111-111111111111");
+                       Assert.AreEqual (new SqlGuid("11111111-1111-1111-1111-111111111111"), TestGuid.ToSqlGuid (), "#O22");
 
-                        // ToSqlInt32 ()
-                        Assert.AreEqual ((int)250, String250.ToSqlInt32 ().Value, "#O27");
+                       // ToSqlInt16 ()
+                       Assert.AreEqual ((short)250, String250.ToSqlInt16 ().Value, "#O24");
 
-                        // ToSqlInt64 ()
-                        Assert.AreEqual ((long)250, String250.ToSqlInt64 ().Value, "#O32");
+                       // ToSqlInt32 ()
+                       Assert.AreEqual ((int)250, String250.ToSqlInt32 ().Value, "#O27");
 
-                        // ToSqlMoney ()
-                        Assert.AreEqual (250.0000M, String250.ToSqlMoney ().Value, "#O35");
+                       // ToSqlInt64 ()
+                       Assert.AreEqual ((long)250, String250.ToSqlInt64 ().Value, "#O32");
 
+                       // ToSqlMoney ()
+                       Assert.AreEqual (250.0000M, String250.ToSqlMoney ().Value, "#O35");
 
-                        // ToSqlSingle ()
-                        Assert.AreEqual ((float)250, String250.ToSqlSingle ().Value, "#O38");
+                       // ToSqlSingle ()
+                       Assert.AreEqual ((float)250, String250.ToSqlSingle ().Value, "#O38");
 
-                        // ToString ()
-                        Assert.AreEqual ("First TestString", Test1.ToString (), "#O41");
-                }
+                       // ToString ()
+                       Assert.AreEqual ("First TestString", Test1.ToString (), "#O41");
+               }
 
-                // OPERATORS
+               // OPERATORS
 
                [Test]
-                public void ArithmeticOperators()
-                {
-                        SqlString TestString = new SqlString ("...Testing...");
-                        Assert.AreEqual ((SqlString)"First TestString...Testing...",
-                                      Test1 + TestString, "#P01");
-                        Assert.AreEqual (SqlString.Null,
-                                      Test1 + SqlString.Null, "#P02");
-                }
+               public void ArithmeticOperators()
+               {
+                       SqlString TestString = new SqlString ("...Testing...");
+                       Assert.AreEqual ((SqlString)"First TestString...Testing...",
+                               Test1 + TestString, "#P01");
+                       Assert.AreEqual (SqlString.Null,
+                               Test1 + SqlString.Null, "#P02");
+               }
 
                [Test]
 #if TARGET_JVM
                [Ignore ("The option CompareOptions.IgnoreWidth is not supported")]
 #endif
-                public void ThanOrEqualOperators()
-                {
-                        // == -operator
-                        Assert.IsTrue ((Test2 == Test3).Value, "#Q01");
-                        Assert.IsTrue (!(Test1 == Test2).Value, "#Q02");
-                        Assert.IsTrue ((Test1 == SqlString.Null).IsNull, "#Q03");
-                        
-                        // != -operator
-                        Assert.IsTrue (!(Test3 != Test2).Value, "#Q04");
-                        Assert.IsTrue (!(Test2 != Test3).Value, "#Q05");
-                        Assert.IsTrue ((Test1 != Test3).Value, "#Q06");
-                        Assert.IsTrue ((Test1 != SqlString.Null).IsNull, "#Q07");
-
-                        // > -operator
-                        Assert.IsTrue ((Test2 > Test1).Value, "#Q08");
-                        Assert.IsTrue (!(Test1 > Test3).Value, "#Q09");
-                        Assert.IsTrue (!(Test2 > Test3).Value, "#Q10");
-                        Assert.IsTrue ((Test1 > SqlString.Null).IsNull, "#Q11");
-
-                        // >=  -operator
-                        Assert.IsTrue (!(Test1 >= Test3).Value, "#Q12");
-                        Assert.IsTrue ((Test3 >= Test1).Value, "#Q13");
-                        Assert.IsTrue ((Test2 >= Test3).Value, "#Q14");
-                        Assert.IsTrue ((Test1 >= SqlString.Null).IsNull, "#Q15");
-
-                        // < -operator
-                        Assert.IsTrue ((Test1 < Test2).Value, "#Q16");
-                        Assert.IsTrue ((Test1 < Test3).Value, "#Q17");
-                        Assert.IsTrue (!(Test2 < Test3).Value, "#Q18");
-                        Assert.IsTrue ((Test1 < SqlString.Null).IsNull, "#Q19");
-
-                        // <= -operator
-                        Assert.IsTrue ((Test1 <= Test3).Value, "#Q20");
-                        Assert.IsTrue (!(Test3 <= Test1).Value, "#Q21");
-                        Assert.IsTrue ((Test2 <= Test3).Value, "#Q22");
-                        Assert.IsTrue ((Test1 <= SqlString.Null).IsNull, "#Q23");
-                }
-
-               [Test]
-                public void SqlBooleanToSqlString()
-                {
-                        SqlBoolean TestBoolean = new SqlBoolean (true);
-                        SqlBoolean TestBoolean2 = new SqlBoolean (false);
-                        SqlString Result;
-
-                        Result = (SqlString)TestBoolean;
-                        Assert.AreEqual ("True", Result.Value, "#R01");
-                        
-                        Result = (SqlString)TestBoolean2;
-                        Assert.AreEqual ("False", Result.Value, "#R02");
-                        
-                        Result = (SqlString)SqlBoolean.Null;
-                        Assert.IsTrue (Result.IsNull, "#R03");
-                }
-
-               [Test]
-                public void SqlByteToBoolean()
-                {
-                        SqlByte TestByte = new SqlByte (250);
-                        Assert.AreEqual ("250", ((SqlString)TestByte).Value, "#S01");
-                        try {
-                                SqlString test = ((SqlString)SqlByte.Null).Value;
-                                Assert.Fail ("#S02");
-                        } catch (Exception e) {
-                                Assert.AreEqual (typeof (SqlNullValueException), e.GetType (), "#S03");
-                        }
-                }
-
-               [Test]
-                public void SqlDateTimeToSqlString()
-                {                        
-                        Thread.CurrentThread.CurrentCulture = new CultureInfo ("en-AU");
-                        SqlDateTime TestTime = new SqlDateTime(2002, 10, 22, 9, 52, 30);
-                        Assert.AreEqual ("22/10/2002 9:52:30 AM", ((SqlString)TestTime).Value, "#T01");                        
-                }
-                
-               [Test]
-                public void SqlDecimalToSqlString()
-                {
-                        SqlDecimal TestDecimal = new SqlDecimal (1000.2345);
+               public void ThanOrEqualOperators()
+               {
+                       // == -operator
+                       Assert.IsTrue ((Test2 == Test3).Value, "#Q01");
+                       Assert.IsTrue (!(Test1 == Test2).Value, "#Q02");
+                       Assert.IsTrue ((Test1 == SqlString.Null).IsNull, "#Q03");
+
+                       // != -operator
+                       Assert.IsTrue (!(Test3 != Test2).Value, "#Q04");
+                       Assert.IsTrue (!(Test2 != Test3).Value, "#Q05");
+                       Assert.IsTrue ((Test1 != Test3).Value, "#Q06");
+                       Assert.IsTrue ((Test1 != SqlString.Null).IsNull, "#Q07");
+
+                       // > -operator
+                       Assert.IsTrue ((Test2 > Test1).Value, "#Q08");
+                       Assert.IsTrue (!(Test1 > Test3).Value, "#Q09");
+                       Assert.IsTrue (!(Test2 > Test3).Value, "#Q10");
+                       Assert.IsTrue ((Test1 > SqlString.Null).IsNull, "#Q11");
+
+                       // >= -operator
+                       Assert.IsTrue (!(Test1 >= Test3).Value, "#Q12");
+                       Assert.IsTrue ((Test3 >= Test1).Value, "#Q13");
+                       Assert.IsTrue ((Test2 >= Test3).Value, "#Q14");
+                       Assert.IsTrue ((Test1 >= SqlString.Null).IsNull, "#Q15");
+
+                       // < -operator
+                       Assert.IsTrue ((Test1 < Test2).Value, "#Q16");
+                       Assert.IsTrue ((Test1 < Test3).Value, "#Q17");
+                       Assert.IsTrue (!(Test2 < Test3).Value, "#Q18");
+                       Assert.IsTrue ((Test1 < SqlString.Null).IsNull, "#Q19");
+
+                       // <= -operator
+                       Assert.IsTrue ((Test1 <= Test3).Value, "#Q20");
+                       Assert.IsTrue (!(Test3 <= Test1).Value, "#Q21");
+                       Assert.IsTrue ((Test2 <= Test3).Value, "#Q22");
+                       Assert.IsTrue ((Test1 <= SqlString.Null).IsNull, "#Q23");
+               }
+
+               [Test]
+               public void SqlBooleanToSqlString()
+               {
+                       SqlBoolean TestBoolean = new SqlBoolean (true);
+                       SqlBoolean TestBoolean2 = new SqlBoolean (false);
+                       SqlString Result;
+
+                       Result = (SqlString)TestBoolean;
+                       Assert.AreEqual ("True", Result.Value, "#R01");
+
+                       Result = (SqlString)TestBoolean2;
+                       Assert.AreEqual ("False", Result.Value, "#R02");
+
+                       Result = (SqlString)SqlBoolean.Null;
+                       Assert.IsTrue (Result.IsNull, "#R03");
+               }
+
+               [Test]
+               public void SqlByteToBoolean()
+               {
+                       SqlByte TestByte = new SqlByte (250);
+                       Assert.AreEqual ("250", ((SqlString)TestByte).Value, "#S01");
+                       try {
+                               SqlString test = ((SqlString)SqlByte.Null).Value;
+                               Assert.Fail ("#S02");
+                       } catch (SqlNullValueException e) {
+                               Assert.AreEqual (typeof (SqlNullValueException), e.GetType (), "#S03");
+                       }
+               }
+
+               [Test]
+               public void SqlDateTimeToSqlString()
+               {
+                       SqlDateTime TestTime = new SqlDateTime(2002, 10, 22, 9, 52, 30);
+                       Assert.AreEqual ("22/10/2002 9:52:30 AM", ((SqlString)TestTime).Value, "#T01");
+               }
+
+               [Test]
+               public void SqlDecimalToSqlString()
+               {
+                       SqlDecimal TestDecimal = new SqlDecimal (1000.2345);
                        Assert.AreEqual ("1000.2345000000000", ((SqlString)TestDecimal).Value, "#U01");
-                }
-                
-               [Test]
-                public void SqlDoubleToSqlString()
-                {
-                        SqlDouble TestDouble = new SqlDouble (64E+64);
-                        Assert.AreEqual ("6.4E+65", ((SqlString)TestDouble).Value, "#V01");
-                }
-
-               [Test]
-                public void SqlGuidToSqlString()
-                {
-                        byte [] b = new byte [16];
-                        b [0] = 100;
-                        b [1] = 64;
-                        SqlGuid TestGuid = new SqlGuid (b);
-                        
-                        Assert.AreEqual ("00004064-0000-0000-0000-000000000000", 
-                                      ((SqlString)TestGuid).Value, "#W01");
-                        try {
-                                SqlString test = ((SqlString)SqlGuid.Null).Value;
-                                Assert.Fail ("#W02");
-                        } catch (Exception e) {
-                                Assert.AreEqual (typeof (SqlNullValueException), e.GetType(), "#W03");
-                        }
-                }
-                
-               [Test]
-                public void SqlInt16ToSqlString()
-                {
-                        SqlInt16 TestInt = new SqlInt16(20012);
-                        Assert.AreEqual ("20012", ((SqlString)TestInt).Value, "#X01");
-                        try {
-                                SqlString test = ((SqlString)SqlInt16.Null).Value;
-                                Assert.Fail ("#X02");
-                        } catch (Exception e) {
-                                Assert.AreEqual (typeof (SqlNullValueException), e.GetType (), "#X03");                                
-                        }
-                }
-                
-               [Test]
-                public void SqlInt32ToSqlString()
-                {
-                        SqlInt32 TestInt = new SqlInt32(-12456);
-                        Assert.AreEqual ("-12456", ((SqlString)TestInt).Value, "#Y01");
-                        try {
-                                SqlString test = ((SqlString)SqlInt32.Null).Value;
-                                Assert.Fail ("#Y02");
-                        } catch (Exception e) {
-                                Assert.AreEqual (typeof (SqlNullValueException), e.GetType (), "#Y03");                                
-                        }
-                }
-                
-               [Test]
-                public void SqlInt64ToSqlString()
-                {
-                        SqlInt64 TestInt = new SqlInt64(10101010);
-                        Assert.AreEqual ("10101010", ((SqlString)TestInt).Value, "#Z01");
-                }
-                
-               [Test]
-                public void SqlMoneyToSqlString()
-                {
-                        SqlMoney TestMoney = new SqlMoney (646464.6464);
-                        Assert.AreEqual ("646464.6464", ((SqlString)TestMoney).Value, "#AA01");
-                }
-                
-               [Test]
-                public void SqlSingleToSqlString()
-                {
-                        SqlSingle TestSingle = new SqlSingle (3E+20);
-                        Assert.AreEqual ("3E+20", ((SqlString)TestSingle).Value, "#AB01");
-                }
-                      
-               [Test]                        
-                public void SqlStringToString()
-                {
-                        Assert.AreEqual ("First TestString",(String)Test1, "#AC01");                        
-                }
-
-               [Test]
-                public void StringToSqlString()
-                {
-                        String TestString = "Test String";
-                        Assert.AreEqual ("Test String", ((SqlString)TestString).Value, "#AD01");                        
-                }                
-               
+               }
+
+               [Test]
+               public void SqlDoubleToSqlString()
+               {
+                       SqlDouble TestDouble = new SqlDouble (64E+64);
+                       Assert.AreEqual ("6.4E+65", ((SqlString)TestDouble).Value, "#V01");
+               }
+
+               [Test]
+               public void SqlGuidToSqlString()
+               {
+                       byte [] b = new byte [16];
+                       b [0] = 100;
+                       b [1] = 64;
+                       SqlGuid TestGuid = new SqlGuid (b);
+
+                       Assert.AreEqual ("00004064-0000-0000-0000-000000000000", 
+                               ((SqlString)TestGuid).Value, "#W01");
+                       try {
+                               SqlString test = ((SqlString)SqlGuid.Null).Value;
+                               Assert.Fail ("#W02");
+                       } catch (SqlNullValueException e) {
+                               Assert.AreEqual (typeof (SqlNullValueException), e.GetType(), "#W03");
+                       }
+               }
+
+               [Test]
+               public void SqlInt16ToSqlString()
+               {
+                       SqlInt16 TestInt = new SqlInt16(20012);
+                       Assert.AreEqual ("20012", ((SqlString)TestInt).Value, "#X01");
+                       try {
+                               SqlString test = ((SqlString)SqlInt16.Null).Value;
+                               Assert.Fail ("#X02");
+                       } catch (SqlNullValueException e) {
+                               Assert.AreEqual (typeof (SqlNullValueException), e.GetType (), "#X03");
+                       }
+               }
+
+               [Test]
+               public void SqlInt32ToSqlString()
+               {
+                       SqlInt32 TestInt = new SqlInt32(-12456);
+                       Assert.AreEqual ("-12456", ((SqlString)TestInt).Value, "#Y01");
+                       try {
+                               SqlString test = ((SqlString)SqlInt32.Null).Value;
+                               Assert.Fail ("#Y02");
+                       } catch (SqlNullValueException e) {
+                               Assert.AreEqual (typeof (SqlNullValueException), e.GetType (), "#Y03");
+                       }
+               }
+
+               [Test]
+               public void SqlInt64ToSqlString()
+               {
+                       SqlInt64 TestInt = new SqlInt64(10101010);
+                       Assert.AreEqual ("10101010", ((SqlString)TestInt).Value, "#Z01");
+               }
+
+               [Test]
+               public void SqlMoneyToSqlString()
+               {
+                       SqlMoney TestMoney = new SqlMoney (646464.6464);
+                       Assert.AreEqual ("646464.6464", ((SqlString)TestMoney).Value, "#AA01");
+               }
+
+               [Test]
+               public void SqlSingleToSqlString()
+               {
+                       SqlSingle TestSingle = new SqlSingle (3E+20);
+                       Assert.AreEqual ("3E+20", ((SqlString)TestSingle).Value, "#AB01");
+               }
+
+               [Test]
+               public void SqlStringToString()
+               {
+                       Assert.AreEqual ("First TestString",(String)Test1, "#AC01");
+               }
+
+               [Test]
+               public void StringToSqlString()
+               {
+                       String TestString = "Test String";
+                       Assert.AreEqual ("Test String", ((SqlString)TestString).Value, "#AD01");
+               }
+
 #if NET_2_0
-                [Test]
-                public void AddSqlString()
-                {
-                        Assert.AreEqual ("First TestStringThis is just a test SqlString", (String)(SqlString.Add(Test1, Test2)), "#AE01");
-                        Assert.AreEqual ("First TestStringPlainString", (String)(SqlString.Add (Test1, "PlainString")), "#AE02");
-                        Assert.IsTrue (SqlString.Add (Test1, null).IsNull, "#AE03");
-                }
+               [Test]
+               public void AddSqlString()
+               {
+                       Assert.AreEqual ("First TestStringThis is just a test SqlString", (String)(SqlString.Add(Test1, Test2)), "#AE01");
+                       Assert.AreEqual ("First TestStringPlainString", (String)(SqlString.Add (Test1, "PlainString")), "#AE02");
+                       Assert.IsTrue (SqlString.Add (Test1, null).IsNull, "#AE03");
+               }
 
                [Test]
                public void GetXsdTypeTest ()
@@ -754,14 +751,12 @@ namespace MonoTests.System.Data.SqlTypes
                        ser.Serialize (xw, test);
 
                        Assert.AreEqual (xml, sw.ToString (), unit_test_id);
-                       Console.WriteLine ("{0} - Got: {1}", unit_test_id, sw.ToString ());
 
                        sr = new StringReader (xml);
                        xr = new XmlTextReader (sr);
                        test1 = (SqlString)ser.Deserialize (xr);
 
                        Assert.AreEqual (testval, test1.Value, unit_test_id);
-                       Console.WriteLine ("{0} - Got: {1}", unit_test_id, test1.Value);
                }
 
                [Test]
@@ -776,6 +771,5 @@ namespace MonoTests.System.Data.SqlTypes
                        ReadWriteXmlTestInternal (xml2, strtest2.ToString (), "BA02");
                }
 #endif
-        }
+       }
 }
-