2004-06-06 Sebastien Pouliot <sebastien@ximian.com>

	* ByteTest.cs: Added tests for default ToString(String.Empty).
	* DoubleTest.cs: Added tests for default ToString(String.Empty).
	* Int16Test.cs: Added tests for default ToString(String.Empty).
	* Int32Test.cs: Added tests for default ToString(String.Empty).
	* Int64Test.cs: Added tests for default ToString(String.Empty).
	* SByteTest.cs: Added tests for default ToString(String.Empty).
	* SingleTest.cs: Added tests for default ToString(String.Empty).
	* UInt16Test.cs: Added tests for default ToString(String.Empty).
	* UInt32Test.cs: Added tests for default ToString(String.Empty).
	* UInt64Test.cs: Added tests for default ToString(String.Empty).

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

diff --git a/mcs/class/corlib/Test/System/ByteTest.cs b/mcs/class/corlib/Test/System/ByteTest.cs
index 6a0abcf77e412630a40b27ec7d5c345940e88ed4..b606de65f7f1884d2fd39f216ad56d89845772ed 100644 (file)
--- a/mcs/class/corlib/Test/System/ByteTest.cs
+++ b/mcs/class/corlib/Test/System/ByteTest.cs
@@ -218,14 +218,19 @@ public class ByteTest : Assertion
        }
 
        [Test]
-       public void ToString_Default () 
+       public void ToString_Defaults () 
        {
-               byte value = 255;
-               string def = value.ToString ("G");
-               string format = null;
-               AssertEquals ("null", def, value.ToString (format));
-               format = String.Empty;
-               AssertEquals ("empty", def, value.ToString (format));
+               byte i = 254;
+               // everything defaults to "G"
+               string def = i.ToString ("G");
+               AssertEquals ("ToString()", def, i.ToString ());
+               AssertEquals ("ToString((IFormatProvider)null)", def, i.ToString ((IFormatProvider)null));
+               AssertEquals ("ToString((string)null)", def, i.ToString ((string)null));
+               AssertEquals ("ToString(empty)", def, i.ToString (String.Empty));
+               AssertEquals ("ToString(null,null)", def, i.ToString (null, null));
+               AssertEquals ("ToString(empty,null)", def, i.ToString (String.Empty, null));
+
+               AssertEquals ("ToString(G)", "254", def);
        }
 }
 

diff --git a/mcs/class/corlib/Test/System/ChangeLog b/mcs/class/corlib/Test/System/ChangeLog
index eab1c276f99581f3ab0ba2c90a430abe247c2440..65417dc1ce04596e47e69f0d35962ad1675cbd87 100644 (file)
--- a/mcs/class/corlib/Test/System/ChangeLog
+++ b/mcs/class/corlib/Test/System/ChangeLog
@@ -3,6 +3,16 @@
        * DecimalTest.cs: Added tests for default ToString(). Added tests when
        Decimal is casted to an integer (trunc not rounded). Added tests to
        parse very small values (#59301).
+       * ByteTest.cs: Added tests for default ToString(String.Empty).
+       * DoubleTest.cs: Added tests for default ToString(String.Empty).
+       * Int16Test.cs: Added tests for default ToString(String.Empty).
+       * Int32Test.cs: Added tests for default ToString(String.Empty).
+       * Int64Test.cs: Added tests for default ToString(String.Empty).
+       * SByteTest.cs: Added tests for default ToString(String.Empty).
+       * SingleTest.cs: Added tests for default ToString(String.Empty).
+       * UInt16Test.cs: Added tests for default ToString(String.Empty).
+       * UInt32Test.cs: Added tests for default ToString(String.Empty).
+       * UInt64Test.cs: Added tests for default ToString(String.Empty).
 
 2004-06-05  Sebastien Pouliot  <sebastien@ximian.com>
 

diff --git a/mcs/class/corlib/Test/System/DoubleTest.cs b/mcs/class/corlib/Test/System/DoubleTest.cs
index e3d70e2944df136e9190d2b7d7b551b6f0431613..10db02ba37db9caaf11888e48c3045da1740b9c1 100644 (file)
--- a/mcs/class/corlib/Test/System/DoubleTest.cs
+++ b/mcs/class/corlib/Test/System/DoubleTest.cs
@@ -14,7 +14,7 @@ using NUnit.Framework;
 namespace MonoTests.System {
 
        [TestFixture]
-       public class DoubleTest {
+       public class DoubleTest : Assertion {
                
                private const Double d_zero = 0.0;
                private const Double d_neg = -1234.5678;
@@ -444,6 +444,20 @@ namespace MonoTests.System {
                        
                }
 
+               [Test]
+               public void ToString_Defaults () 
+               {
+                       Double i = 254.9d;
+                       // everything defaults to "G"
+                       string def = i.ToString ("G");
+                       AssertEquals ("ToString()", def, i.ToString ());
+                       AssertEquals ("ToString((IFormatProvider)null)", def, i.ToString ((IFormatProvider)null));
+                       AssertEquals ("ToString((string)null)", def, i.ToString ((string)null));
+                       AssertEquals ("ToString(empty)", def, i.ToString (String.Empty));
+                       AssertEquals ("ToString(null,null)", def, i.ToString (null, null));
+                       AssertEquals ("ToString(empty,null)", def, i.ToString (String.Empty, null));
+
+                       AssertEquals ("ToString(G)", "254.9", def);
+               }
        }
-       
 }

diff --git a/mcs/class/corlib/Test/System/Int16Test.cs b/mcs/class/corlib/Test/System/Int16Test.cs
index d9df8a87efb2f424a4504dfe353cd715eeca04b1..a0becba34c01a51ca6f53526283ccd945bebf440 100644 (file)
--- a/mcs/class/corlib/Test/System/Int16Test.cs
+++ b/mcs/class/corlib/Test/System/Int16Test.cs
@@ -13,7 +13,8 @@ using System.Globalization;
 namespace MonoTests.System
 {
 
-public class Int16Test : TestCase
+[TestFixture]
+public class Int16Test : Assertion
 {
        private const Int16 MyInt16_1 = -42;
        private const Int16 MyInt16_2 = -32768;
@@ -33,11 +34,10 @@ public class Int16Test : TestCase
                                          "32767", "32,767.00000", "3,276,700.00000 %", "07fff"};
        private NumberFormatInfo Nfi = NumberFormatInfo.InvariantInfo;
        
-       public Int16Test() {}
-
        private CultureInfo old_culture;
 
-       protected override void SetUp() 
+       [TestFixtureSetUp]
+       public void SetUp () 
        {
                old_culture = Thread.CurrentThread.CurrentCulture;
 
@@ -49,7 +49,8 @@ public class Int16Test : TestCase
                Results2 [0] = NumberFormatInfo.CurrentInfo.CurrencySymbol+"32,767.00000";
        }
 
-       protected override void TearDown()
+       [TestFixtureTearDown]
+       public void TearDown ()
        {
                Thread.CurrentThread.CurrentCulture = old_culture;
        }
@@ -181,6 +182,22 @@ public class Int16Test : TestCase
                        Assert(typeof(FormatException) == e.GetType());
                }
        }
+
+       [Test]
+       public void ToString_Defaults () 
+       {
+               Int16 i = 254;
+               // everything defaults to "G"
+               string def = i.ToString ("G");
+               AssertEquals ("ToString()", def, i.ToString ());
+               AssertEquals ("ToString((IFormatProvider)null)", def, i.ToString ((IFormatProvider)null));
+               AssertEquals ("ToString((string)null)", def, i.ToString ((string)null));
+               AssertEquals ("ToString(empty)", def, i.ToString (String.Empty));
+               AssertEquals ("ToString(null,null)", def, i.ToString (null, null));
+               AssertEquals ("ToString(empty,null)", def, i.ToString (String.Empty, null));
+
+               AssertEquals ("ToString(G)", "254", def);
+       }
 }
 
 }

diff --git a/mcs/class/corlib/Test/System/Int32Test.cs b/mcs/class/corlib/Test/System/Int32Test.cs
index fd0c4a89492dfcbe2bb15c938b7ff0a134ae4b5a..c76154711a4cfff36a6424bb99297af313cc3df2 100644 (file)
--- a/mcs/class/corlib/Test/System/Int32Test.cs
+++ b/mcs/class/corlib/Test/System/Int32Test.cs
@@ -13,7 +13,8 @@ using System.Globalization;
 namespace MonoTests.System
 {
 
-public class Int32Test : TestCase
+[TestFixture]
+public class Int32Test : Assertion
 {
        private const Int32 MyInt32_1 = -42;
        private const Int32 MyInt32_2 = -2147483648;
@@ -37,11 +38,10 @@ public class Int32Test : TestCase
                                        "2.1475e+09", "2,147,483,647.00000", "214,748,364,700.00000 %", "7fffffff"};
        private NumberFormatInfo Nfi = NumberFormatInfo.InvariantInfo;
        
-       public Int32Test() {}
-
        private CultureInfo old_culture;
 
-       protected override void SetUp() 
+       [TestFixtureSetUp]
+       public void SetUp() 
        {
                old_culture = Thread.CurrentThread.CurrentCulture;
 
@@ -62,7 +62,8 @@ public class Int32Test : TestCase
                Results2 [6] = perPattern.Replace ("n","214,748,364,700.00000");
        }
 
-       protected override void TearDown()
+       [TestFixtureTearDown]
+       public void TearDown()
        {
                Thread.CurrentThread.CurrentCulture = old_culture;
        }
@@ -240,6 +241,22 @@ public class Int32Test : TestCase
                AssertEquals ("Custom format string ####", "0123", i.ToString ("#0###"));
                AssertEquals ("Custom format string ####", "000123", i.ToString ("0#0###"));
        }
+
+       [Test]
+       public void ToString_Defaults () 
+       {
+               Int32 i = 254;
+               // everything defaults to "G"
+               string def = i.ToString ("G");
+               AssertEquals ("ToString()", def, i.ToString ());
+               AssertEquals ("ToString((IFormatProvider)null)", def, i.ToString ((IFormatProvider)null));
+               AssertEquals ("ToString((string)null)", def, i.ToString ((string)null));
+               AssertEquals ("ToString(empty)", def, i.ToString (String.Empty));
+               AssertEquals ("ToString(null,null)", def, i.ToString (null, null));
+               AssertEquals ("ToString(empty,null)", def, i.ToString (String.Empty, null));
+
+               AssertEquals ("ToString(G)", "254", def);
+       }
 }
 
 }

diff --git a/mcs/class/corlib/Test/System/Int64Test.cs b/mcs/class/corlib/Test/System/Int64Test.cs
index 86107ddc37139a243d38cb8c6cf672051367fbac..3f33a37659fc80a0b00514002d240c704c7a704c 100644 (file)
--- a/mcs/class/corlib/Test/System/Int64Test.cs
+++ b/mcs/class/corlib/Test/System/Int64Test.cs
@@ -405,5 +405,21 @@ public class Int64Test : Assertion
                {
                        Int64.Parse (Int64.MinValue.ToString () + "1");
                }
+
+               [Test]
+               public void ToString_Defaults () 
+               {
+                       Int64 i = 254;
+                       // everything defaults to "G"
+                       string def = i.ToString ("G");
+                       AssertEquals ("ToString()", def, i.ToString ());
+                       AssertEquals ("ToString((IFormatProvider)null)", def, i.ToString ((IFormatProvider)null));
+                       AssertEquals ("ToString((string)null)", def, i.ToString ((string)null));
+                       AssertEquals ("ToString(empty)", def, i.ToString (String.Empty));
+                       AssertEquals ("ToString(null,null)", def, i.ToString (null, null));
+                       AssertEquals ("ToString(empty,null)", def, i.ToString (String.Empty, null));
+
+                       AssertEquals ("ToString(G)", "254", def);
+               }
        }
 }

diff --git a/mcs/class/corlib/Test/System/SByteTest.cs b/mcs/class/corlib/Test/System/SByteTest.cs
index 40d5d3feb47ec904a37d157c79c1ec9cfc62f18c..36a9f569fd1ef411d0e2ef702f35e1d406d789a1 100644 (file)
--- a/mcs/class/corlib/Test/System/SByteTest.cs
+++ b/mcs/class/corlib/Test/System/SByteTest.cs
@@ -171,6 +171,22 @@ public class SByteTest : Assertion
                        Assert("typeof(FormatException) == e.GetType()", typeof(FormatException) == e.GetType());
                }
        }
+
+       [Test]
+       public void ToString_Defaults () 
+       {
+               SByte i = 100;
+               // everything defaults to "G"
+               string def = i.ToString ("G");
+               AssertEquals ("ToString()", def, i.ToString ());
+               AssertEquals ("ToString((IFormatProvider)null)", def, i.ToString ((IFormatProvider)null));
+               AssertEquals ("ToString((string)null)", def, i.ToString ((string)null));
+               AssertEquals ("ToString(empty)", def, i.ToString (String.Empty));
+               AssertEquals ("ToString(null,null)", def, i.ToString (null, null));
+               AssertEquals ("ToString(empty,null)", def, i.ToString (String.Empty, null));
+
+               AssertEquals ("ToString(G)", "100", def);
+       }
 }
 
 }

diff --git a/mcs/class/corlib/Test/System/SingleTest.cs b/mcs/class/corlib/Test/System/SingleTest.cs
index 61d1d05213b4f6691fdf0f33aac69c80cd3c0864..b82ddb00a9da3c066cc18c4e4a2f456559ebbc51 100644 (file)
--- a/mcs/class/corlib/Test/System/SingleTest.cs
+++ b/mcs/class/corlib/Test/System/SingleTest.cs
@@ -67,5 +67,21 @@ namespace MonoTests.System  {
                        Assert ("12", !Single.IsPositiveInfinity (12));         
                        Assert ("NaN", !Single.IsPositiveInfinity (Single.NaN));                
                }
+
+               [Test]
+               public void ToString_Defaults () 
+               {
+                       Single i = 254.9f;
+                       // everything defaults to "G"
+                       string def = i.ToString ("G");
+                       AssertEquals ("ToString()", def, i.ToString ());
+                       AssertEquals ("ToString((IFormatProvider)null)", def, i.ToString ((IFormatProvider)null));
+                       AssertEquals ("ToString((string)null)", def, i.ToString ((string)null));
+                       AssertEquals ("ToString(empty)", def, i.ToString (String.Empty));
+                       AssertEquals ("ToString(null,null)", def, i.ToString (null, null));
+                       AssertEquals ("ToString(empty,null)", def, i.ToString (String.Empty, null));
+
+                       AssertEquals ("ToString(G)", "254.9", def);
+               }
        }
 }

diff --git a/mcs/class/corlib/Test/System/UInt16Test.cs b/mcs/class/corlib/Test/System/UInt16Test.cs
index c060783f6308df574eef39fb6b618b262315ed59..6970089e27394d45f296f8f3e3ff741bbbb1d003 100644 (file)
--- a/mcs/class/corlib/Test/System/UInt16Test.cs
+++ b/mcs/class/corlib/Test/System/UInt16Test.cs
@@ -13,7 +13,8 @@ using System.Globalization;
 namespace MonoTests.System
 {
 
-public class UInt16Test : TestCase
+[TestFixture]
+public class UInt16Test : Assertion
 {
        private const UInt16 MyUInt16_1 = 42;
        private const UInt16 MyUInt16_2 = 0;
@@ -38,11 +39,10 @@ public class UInt16Test : TestCase
 
        private NumberFormatInfo Nfi = NumberFormatInfo.InvariantInfo;
        
-       public UInt16Test() {}
-
        private CultureInfo old_culture;
 
-       protected override void SetUp() 
+       [TestFixtureSetUp]
+       public void SetUp () 
        {
                old_culture = Thread.CurrentThread.CurrentCulture;
 
@@ -61,7 +61,8 @@ public class UInt16Test : TestCase
                Results2 [6] = perPattern.Replace ("n","6,553,500.00000");
        }
 
-       protected override void TearDown()
+       [TestFixtureTearDown]
+       public void TearDown ()
        {
                Thread.CurrentThread.CurrentCulture = old_culture;
        }
@@ -190,7 +191,22 @@ public class UInt16Test : TestCase
                        Assert("A8", typeof(FormatException) == e.GetType());
                }
        }
-}
 
+       [Test]
+       public void ToString_Defaults () 
+       {
+               UInt16 i = 254;
+               // everything defaults to "G"
+               string def = i.ToString ("G");
+               AssertEquals ("ToString()", def, i.ToString ());
+               AssertEquals ("ToString((IFormatProvider)null)", def, i.ToString ((IFormatProvider)null));
+               AssertEquals ("ToString((string)null)", def, i.ToString ((string)null));
+               AssertEquals ("ToString(empty)", def, i.ToString (String.Empty));
+               AssertEquals ("ToString(null,null)", def, i.ToString (null, null));
+               AssertEquals ("ToString(empty,null)", def, i.ToString (String.Empty, null));
+
+               AssertEquals ("ToString(G)", "254", def);
+       }
+}
 
 }

diff --git a/mcs/class/corlib/Test/System/UInt32Test.cs b/mcs/class/corlib/Test/System/UInt32Test.cs
index f6e1d0e860a78ba8389c5f0853884cab766988eb..402e2922deb017e1e68b887d1329bc236ff627b9 100644 (file)
--- a/mcs/class/corlib/Test/System/UInt32Test.cs
+++ b/mcs/class/corlib/Test/System/UInt32Test.cs
@@ -13,7 +13,8 @@ using System.Threading;
 namespace MonoTests.System
 {
 
-public class UInt32Test : TestCase
+[TestFixture]
+public class UInt32Test : Assertion
 {
        private const UInt32 MyUInt32_1 = 42;
        private const UInt32 MyUInt32_2 = 0;
@@ -37,11 +38,10 @@ public class UInt32Test : TestCase
                                        "4.295e+09", "4,294,967,295.00000", "429,496,729,500.00000 %", "ffffffff"};
        private NumberFormatInfo Nfi = NumberFormatInfo.InvariantInfo;
        
-       public UInt32Test() {}
-
        private CultureInfo old_culture;
 
-       protected override void SetUp() 
+       [TestFixtureSetUp]
+       public void SetUp () 
        {
                old_culture = Thread.CurrentThread.CurrentCulture;
 
@@ -62,7 +62,8 @@ public class UInt32Test : TestCase
                Results2 [6] = perPattern.Replace ("n","429,496,729,500.00000");
        }
 
-       protected override void TearDown()
+       [TestFixtureTearDown]
+       public void TearDown ()
        {
                Thread.CurrentThread.CurrentCulture = old_culture;
        }
@@ -232,6 +233,22 @@ public class UInt32Test : TestCase
                        Assert(typeof(FormatException) == e.GetType());
                }
        }
+
+       [Test]
+       public void ToString_Defaults () 
+       {
+               UInt32 i = 254;
+               // everything defaults to "G"
+               string def = i.ToString ("G");
+               AssertEquals ("ToString()", def, i.ToString ());
+               AssertEquals ("ToString((IFormatProvider)null)", def, i.ToString ((IFormatProvider)null));
+               AssertEquals ("ToString((string)null)", def, i.ToString ((string)null));
+               AssertEquals ("ToString(empty)", def, i.ToString (String.Empty));
+               AssertEquals ("ToString(null,null)", def, i.ToString (null, null));
+               AssertEquals ("ToString(empty,null)", def, i.ToString (String.Empty, null));
+
+               AssertEquals ("ToString(G)", "254", def);
+       }
 }
 
 

diff --git a/mcs/class/corlib/Test/System/UInt64Test.cs b/mcs/class/corlib/Test/System/UInt64Test.cs
index b47225ca61891fbbefbfbbaee5fe4a006fa69e20..3f7a4e422c58af78c9e296d6f08b1d31a2793228 100644 (file)
--- a/mcs/class/corlib/Test/System/UInt64Test.cs
+++ b/mcs/class/corlib/Test/System/UInt64Test.cs
@@ -13,7 +13,8 @@ using System.Threading;
 namespace MonoTests.System
 {
 
-public class UInt64Test : TestCase
+[TestFixture]
+public class UInt64Test : Assertion
 {
        private const UInt64 MyUInt64_1 = 42;
        private const UInt64 MyUInt64_2 = 0;
@@ -40,11 +41,10 @@ public class UInt64Test : TestCase
 
        private NumberFormatInfo Nfi = NumberFormatInfo.InvariantInfo;
        
-       public UInt64Test() {}
-
        private CultureInfo old_culture;
 
-       protected override void SetUp() 
+       [TestFixtureSetUp]
+       public void SetUp() 
        {
                old_culture = Thread.CurrentThread.CurrentCulture;
 
@@ -65,7 +65,8 @@ public class UInt64Test : TestCase
                Results2 [6] = perPattern.Replace ("n","1,844,674,407,370,955,161,500.00000");
        }
 
-       protected override void TearDown()
+       [TestFixtureTearDown]
+       public void TearDown ()
        {
                Thread.CurrentThread.CurrentCulture = old_culture;
        }
@@ -201,6 +202,22 @@ public class UInt64Test : TestCase
                        Assert(typeof(FormatException) == e.GetType());
                }
        }
+
+       [Test]
+       public void ToString_Defaults () 
+       {
+               UInt64 i = 254;
+               // everything defaults to "G"
+               string def = i.ToString ("G");
+               AssertEquals ("ToString()", def, i.ToString ());
+               AssertEquals ("ToString((IFormatProvider)null)", def, i.ToString ((IFormatProvider)null));
+               AssertEquals ("ToString((string)null)", def, i.ToString ((string)null));
+               AssertEquals ("ToString(empty)", def, i.ToString (String.Empty));
+               AssertEquals ("ToString(null,null)", def, i.ToString (null, null));
+               AssertEquals ("ToString(empty,null)", def, i.ToString (String.Empty, null));
+
+               AssertEquals ("ToString(G)", "254", def);
+       }
 }
 
 }