X-Git-Url: http://wien.tomnetworks.com/gitweb/?a=blobdiff_plain;f=mcs%2Fclass%2Fcorlib%2FTest%2FSystem%2FUInt32Test.cs;h=20f5a299e36fdf12f742ee4c953dde0a8f9f90e6;hb=60979ce4a41d1be8f9d3d4d38162c0803207b4d5;hp=f7326ce6c3d740c6a6eebfd2e422c8d43a2f71e3;hpb=421b9cc38bd6caa4992e0051ba9c8c6650df3dc4;p=mono.git

diff --git a/mcs/class/corlib/Test/System/UInt32Test.cs b/mcs/class/corlib/Test/System/UInt32Test.cs
index f7326ce6c3d..20f5a299e36 100644
--- a/mcs/class/corlib/Test/System/UInt32Test.cs
+++ b/mcs/class/corlib/Test/System/UInt32Test.cs
@@ -40,7 +40,7 @@ public class UInt32Test
 	
 	private CultureInfo old_culture;
 
-	[TestFixtureSetUp]
+	[SetUp]
 	public void SetUp () 
 	{
 		old_culture = Thread.CurrentThread.CurrentCulture;
@@ -62,19 +62,21 @@ public class UInt32Test
 		Results2 [6] = perPattern.Replace ("n","429,496,729,500.00000");
 	}
 
-	[TestFixtureTearDown]
+	[TearDown]
 	public void TearDown ()
 	{
 		Thread.CurrentThread.CurrentCulture = old_culture;
 	}
 
+	[Test]
 	public void TestMinMax()
 	{
 		
 		Assert.AreEqual(UInt32.MinValue, MyUInt32_2);
 		Assert.AreEqual(UInt32.MaxValue, MyUInt32_3);
 	}
-	
+
+	[Test]
 	public void TestCompareTo()
 	{
 		Assert.IsTrue(MyUInt32_3.CompareTo(MyUInt32_2) > 0);
@@ -109,6 +111,7 @@ public class UInt32Test
 		}
 	}
 
+	[Test]
 	public void TestEquals()
 	{
 		Assert.IsTrue(MyUInt32_1.Equals(MyUInt32_1));
@@ -116,7 +119,8 @@ public class UInt32Test
 		Assert.IsTrue(MyUInt32_1.Equals((object)(SByte)(42)) == false);
 		Assert.IsTrue(MyUInt32_1.Equals(MyUInt32_2) == false);
 	}
-	
+
+	[Test]
 	public void TestGetHashCode()
 	{
 		try {
@@ -128,7 +132,8 @@ public class UInt32Test
 			Assert.Fail("GetHashCode should not raise an exception here");
 		}
 	}
-	
+
+	[Test]
 	public void TestParse()
 	{
 		//test Parse(string s)
@@ -187,8 +192,90 @@ public class UInt32Test
 		catch (Exception e) {
 			Assert.IsTrue(typeof(FormatException) == e.GetType());
 		}
+		// Pass a DateTimeFormatInfo, it is unable to format
+		// numbers, but we should not crash
+		
+		UInt32.Parse ("123", new DateTimeFormatInfo ());
+
+		Assert.AreEqual (734561, UInt32.Parse ("734561\0"), "C#43");
+		Assert.AreEqual (734561, UInt32.Parse ("734561\0\0\0    \0"), "C#44");
+		Assert.AreEqual (734561, UInt32.Parse ("734561\0\0\0    "), "C#45");
+		Assert.AreEqual (734561, UInt32.Parse ("734561\0\0\0"), "C#46");
+
+		Assert.AreEqual (0, UInt32.Parse ("0+", NumberStyles.Any), "#50");
 	}
-	
+
+	[Test]
+	public void TestParseExponent ()
+	{
+		Assert.AreEqual (2, uint.Parse ("2E0", NumberStyles.AllowExponent), "A#1");
+		Assert.AreEqual (20, uint.Parse ("2E1", NumberStyles.AllowExponent), "A#2");
+		Assert.AreEqual (200, uint.Parse ("2E2", NumberStyles.AllowExponent), "A#3");
+		Assert.AreEqual (2000000, uint.Parse ("2E6", NumberStyles.AllowExponent), "A#4");
+		Assert.AreEqual (200, uint.Parse ("2E+2", NumberStyles.AllowExponent), "A#5");
+		Assert.AreEqual (2, uint.Parse ("2", NumberStyles.AllowExponent), "A#6");
+		Assert.AreEqual (21, uint.Parse ("2.1E1", NumberStyles.AllowDecimalPoint | NumberStyles.AllowExponent), "A#7");
+		Assert.AreEqual (520, uint.Parse (".52E3", NumberStyles.AllowDecimalPoint | NumberStyles.AllowExponent), "A#8");
+		Assert.AreEqual (32500000, uint.Parse ("32.5E6", NumberStyles.AllowDecimalPoint | NumberStyles.AllowExponent), "A#9");
+		Assert.AreEqual (890, uint.Parse ("8.9000E2", NumberStyles.AllowDecimalPoint | NumberStyles.AllowExponent), "A#10");		
+
+		try {
+			uint.Parse ("2E");
+			Assert.Fail ("B#1");
+		} catch (FormatException) {
+		}
+
+		try {
+			uint.Parse ("2E3.0", NumberStyles.AllowExponent); // decimal notation for the exponent
+			Assert.Fail ("B#2");
+		} catch (FormatException) {
+		}
+
+		try {
+			uint.Parse ("2E 2", NumberStyles.AllowExponent);
+			Assert.Fail ("B#3");
+		} catch (FormatException) {
+		}
+
+		try {
+			uint.Parse ("2E2 ", NumberStyles.AllowExponent);
+			Assert.Fail ("B#4");
+		} catch (FormatException) {
+		}
+
+		try {
+			uint.Parse ("2E66", NumberStyles.AllowExponent); // final result overflow
+			Assert.Fail ("B#5");
+		} catch (OverflowException) {
+		}
+
+		try {
+			long exponent = (long) Int32.MaxValue + 10;
+			uint.Parse ("2E" + exponent.ToString (), NumberStyles.AllowExponent);
+			Assert.Fail ("B#6");
+		} catch (OverflowException) {
+		}
+
+		try {
+			uint.Parse ("2E-1", NumberStyles.AllowExponent); // negative exponent
+			Assert.Fail ("B#7");
+		} catch (OverflowException) {
+		}
+		
+		try {
+			uint.Parse ("2 math e1", NumberStyles.AllowExponent);
+			Assert.Fail ("B#8");
+		} catch (FormatException) {
+		}
+
+		try {
+			uint.Parse ("2.09E1",  NumberStyles.AllowDecimalPoint | NumberStyles.AllowExponent);
+			Assert.Fail ("B#9");
+		} catch (OverflowException) {
+		}
+	}
+
+	[Test]
 	public void TestToString()
 	{
 		int TestNumber = 1;