X-Git-Url: http://wien.tomnetworks.com/gitweb/?a=blobdiff_plain;f=mcs%2Fclass%2Fcorlib%2FTest%2FSystem.Threading%2FCancellationTokenSourceTest.cs;h=5bf805aae0b6e0264998d15c63b8d01f5768c77a;hb=03aee949f13b7908f6fb797046c7b29f02196a17;hp=644d0c504996f360a78b8e65d7527c88763a5dfe;hpb=4df4b7a47a07d924d7bfcfc53f43bd2319b54266;p=mono.git

diff --git a/mcs/class/corlib/Test/System.Threading/CancellationTokenSourceTest.cs b/mcs/class/corlib/Test/System.Threading/CancellationTokenSourceTest.cs
index 644d0c50499..5bf805aae0b 100644
--- a/mcs/class/corlib/Test/System.Threading/CancellationTokenSourceTest.cs
+++ b/mcs/class/corlib/Test/System.Threading/CancellationTokenSourceTest.cs
@@ -90,9 +90,9 @@ namespace MonoTests.System.Threading
 			int called = 0;
 			var cts = new CancellationTokenSource ();
 			cts.Token.Register (() => called++);
-			cts.CancelAfter (20);
+			cts.CancelAfter (50);
 			cts.Dispose ();
-			Thread.Sleep (50);
+			Thread.Sleep (100);
 			Assert.AreEqual (0, called, "#1");
 		}
 
@@ -131,6 +131,20 @@ namespace MonoTests.System.Threading
 		}
 
 
+		[Test]
+		public void Cancel_Order ()
+		{
+			var cts = new CancellationTokenSource ();
+			var current = 0;
+			Action<object> a = x => { Assert.AreEqual(current, x); current++; };
+
+			cts.Token.Register (a, 2);
+			cts.Token.Register (a, 1);
+			cts.Token.Register (a, 0);
+			cts.Cancel ();
+		}
+
+
 		[Test]
 		public void CancelWithDispose ()
 		{
@@ -192,6 +206,25 @@ namespace MonoTests.System.Threading
 			cts.Cancel ();
 		}
 
+		[Test]
+		public void Cancel_ExceptionOrder ()
+		{
+			var cts = new CancellationTokenSource ();
+
+			cts.Token.Register (() => { throw new ApplicationException ("1"); });
+			cts.Token.Register (() => { throw new ApplicationException ("2"); });
+			cts.Token.Register (() => { throw new ApplicationException ("3"); });
+
+			try {
+				cts.Cancel ();
+			} catch (AggregateException e) {
+				Assert.AreEqual (3, e.InnerExceptions.Count, "#2");
+				Assert.AreEqual ("3", e.InnerExceptions[0].Message, "#3");
+				Assert.AreEqual ("2", e.InnerExceptions[1].Message, "#4");
+				Assert.AreEqual ("1", e.InnerExceptions[2].Message, "#5");
+			}
+		}
+
 		[Test]
 		public void Cancel_MultipleException_Recursive ()
 		{
@@ -375,10 +408,9 @@ namespace MonoTests.System.Threading
 			var source = new CancellationTokenSource ();
 			var token = source.Token;
 
-			var reg = new CancellationTokenRegistration ();
 			Console.WriteLine ("Test1");
+			var reg = token.Register (() => unregister = true);
 			token.Register (() => reg.Dispose ());
-			reg = token.Register (() => unregister = true);
 			token.Register (() => { Console.WriteLine ("Gnyah"); token.Register (() => register = true); });
 			source.Cancel ();
 
@@ -440,6 +472,21 @@ namespace MonoTests.System.Threading
 				t2.Join (500);
 			}, 500);
 		}
+
+#if NET_4_5
+		[Test]
+		public void DisposeRace ()
+		{
+			for (int i = 0; i < 1000; ++i) {
+				var c1 = new CancellationTokenSource ();
+				using (c1) {
+					var wh = c1.Token.WaitHandle;
+					c1.CancelAfter (1);
+					Thread.Sleep (1);
+				}
+			}
+		}
+#endif
 	}
 }