X-Git-Url: http://wien.tomnetworks.com/gitweb/?a=blobdiff_plain;f=mcs%2Fclass%2Fcorlib%2FTest%2FSystem%2FGuidTest.cs;h=697ebb79062e15c8400e2a0c2a6423b3aa36452f;hb=e2602e1d4ae8e83d969b0230d5175f78e06c3b41;hp=631faa7c69d4513809986c6ca37a6c3eae262af7;hpb=aa1c098cb9e5471eaf5a3e5f7088416f06b35e7f;p=mono.git

diff --git a/mcs/class/corlib/Test/System/GuidTest.cs b/mcs/class/corlib/Test/System/GuidTest.cs
index 631faa7c69d..697ebb79062 100644
--- a/mcs/class/corlib/Test/System/GuidTest.cs
+++ b/mcs/class/corlib/Test/System/GuidTest.cs
@@ -54,6 +54,7 @@ namespace MonoTests.System {
 			Guid g3 = new Guid ("{0x00010203,0x0405,0x0607,{0x08,0x09,0x0a,0x0b,0x0c,0x0d,0x0e,0x0f}}");
 			Guid g4 = new Guid ("(00010203-0405-0607-0809-0A0B0C0D0E0F)");
 			Guid g5 = new Guid ("\n  \r  \n 00010203-0405-0607-0809-0a0b0c0d0e0f \r\n");
+			Guid g6 = new Guid ("\t {\t 0x00000001 , 0x0002 , \t 0x0003 \t , { 0x04 , 0x05 , \t 0x06\t,\t0x07 , 0x08 , 0x09 , 0x0a , 0x0b } \t }\t ");
 			string expected = "00010203-0405-0607-0809-0a0b0c0d0e0f";
 			Assert.AreEqual (expected, g0.ToString (), "A0");
 			Assert.AreEqual (expected, g1.ToString (), "A1");
@@ -61,6 +62,7 @@ namespace MonoTests.System {
 			Assert.AreEqual (expected, g3.ToString (), "A3");
 			Assert.AreEqual (expected, g4.ToString (), "A4");
 			Assert.AreEqual (expected, g5.ToString (), "A5");
+			Assert.AreEqual ("00000001-0002-0003-0405-060708090a0b", g6.ToString (), "A6");
 		}
 
 		[Test]
@@ -140,6 +142,15 @@ namespace MonoTests.System {
 			Assert.IsFalse (g1 == g2);
 		}
 
+		[Test]
+		public void NewGuid_Stressed ()
+		{
+			for (int i = 0; i < 256; i++) {
+				Guid g = Guid.NewGuid ();
+				Assert.AreNotEqual (0, g.CompareTo (Guid.Empty), i.ToString ());
+			}
+		}
+
 #pragma warning disable 1718
 		[Test]
 		public void EqualityOp ()
@@ -283,20 +294,10 @@ namespace MonoTests.System {
 			Assert.AreEqual ("00010203-0405-0607-0809-0a0b0c0d0e0f", g.ToString (""), "A6");
 			Assert.AreEqual ("00010203-0405-0607-0809-0a0b0c0d0e0f", g.ToString ((string)null), "A7");
 			Assert.AreEqual ("{00010203-0405-0607-0809-0a0b0c0d0e0f}", g.ToString ("B", null), "A10");
-#if NET_4_0
 			Assert.AreEqual ("{0x00010203,0x0405,0x0607,{0x08,0x09,0x0a,0x0b,0x0c,0x0d,0x0e,0x0f}}", g.ToString ("x"), "A11");
 			Assert.AreEqual ("{0x00010203,0x0405,0x0607,{0x08,0x09,0x0a,0x0b,0x0c,0x0d,0x0e,0x0f}}", g.ToString ("X"), "A11");
-#endif
 		}
 
-#if !NET_4_0
-		[Test]
-		[ExpectedException (typeof (FormatException))]
-		public void ToString_UnsupportedFormat ()
-		{
-			new Guid (0x00010203, 0x0405, 0x0607, 0x08, 0x09, 0x0a, 0x0b, 0x0c, 0x0d, 0x0e, 0x0f).ToString ("X");
-		}
-#endif
 
 		[Test]
 		[ExpectedException (typeof (FormatException))]
@@ -340,7 +341,6 @@ namespace MonoTests.System {
 			new Guid ("{0x00010203,0x0405,0x0607,{0x08,0x09,0x0a,0x0b,0x0c,0x0d,0x0e,0x0f}}aaaa");
 		}
 
-#if NET_4_0
 
 		/*
 			N = new Guid ("000102030405060708090a0b0c0d0e0f"); 
@@ -377,6 +377,23 @@ namespace MonoTests.System {
 
 			guid = Guid.ParseExact ("{0x00010203,0x0405,0x0607,{0x08,0x09,0x0a,0x0b,0x0c,0x0d,0x0e,0x0f}}", "X");
 			Assert.AreEqual (expected, guid.ToString ());
+
+			guid = Guid.ParseExact ("\t {\t 0x00000001 , 0x0002 , \t 0x0003 \t , { 0x04 , 0x05 , \t 0x06\t,\t0x07 , 0x08 , 0x09 , 0x0a , 0x0b } \t }\t ", "X");
+			Assert.AreEqual ("00000001-0002-0003-0405-060708090a0b", guid.ToString (), "#8");
+		}
+
+		[Test]
+		public void Parse ()
+		{
+			var guid = Guid.Parse ("\t {\t 0x00000001 , 0x0002 , \t 0x0003 \t , { 0x04 , 0x05 , \t 0x06\t,\t0x07 , 0x08 , 0x09 , 0x0a , 0x0b } \t }\t ");
+			Assert.AreEqual ("00000001-0002-0003-0405-060708090a0b", guid.ToString (), "#1");
+		}
+
+		[Test]
+		[ExpectedException (typeof (FormatException))]
+		public void ParseError_1 ()
+		{
+			Guid.Parse("08888888-0444-444-0444-012121212121");
 		}
 
 		[Test]
@@ -403,6 +420,7 @@ namespace MonoTests.System {
 			Assert.AreEqual (Guid.Empty, guid, "A4");
 			Assert.IsFalse (Guid.TryParse("foobar", out guid), "A5");
 			Assert.AreEqual (Guid.Empty, guid, "A6");
+			Assert.IsFalse (Guid.TryParse ("08888888-0444-444-0444-012121212121", out guid), "A7");
 		}
 
 		[Test]
@@ -416,6 +434,5 @@ namespace MonoTests.System {
 			Assert.IsFalse (Guid.TryParseExact("foobar", null, out guid), "A5");
 			Assert.AreEqual (Guid.Empty, guid, "A6");
 		}
-#endif
 	}
 }