Merge pull request #1304 from slluis/mac-proxy-autoconfig

[mono.git] / mcs / class / System / Test / System.Collections.Concurrent / BlockingCollectionTests.cs

diff --git a/mcs/class/System/Test/System.Collections.Concurrent/BlockingCollectionTests.cs b/mcs/class/System/Test/System.Collections.Concurrent/BlockingCollectionTests.cs
index 9c391fc65ba139252605dafd8f2598dd769b9e57..b33a5b4385f2620b87d09df9266a2e8c1963585a 100644 (file)
--- a/mcs/class/System/Test/System.Collections.Concurrent/BlockingCollectionTests.cs
+++ b/mcs/class/System/Test/System.Collections.Concurrent/BlockingCollectionTests.cs
@@ -202,12 +202,12 @@ namespace MonoTests.System.Collections.Concurrent
                        var arr = new [] { a, b };
                        string res = null;
 
-                       Task<int> t = Task.Run (() => BlockingCollection<string>.TakeFromAny (arr, out res));
+                       Task<int> t = Task.Factory.StartNew (() => BlockingCollection<string>.TakeFromAny (arr, out res));
                        a.Add ("foo");
                        Assert.AreEqual (0, t.Result, "#1");
                        Assert.AreEqual ("foo", res, "#2");
 
-                       t = Task.Run (() => BlockingCollection<string>.TakeFromAny (arr, out res));
+                       t = Task.Factory.StartNew (() => BlockingCollection<string>.TakeFromAny (arr, out res));
                        b.Add ("bar");
                        Assert.AreEqual (1, t.Result, "#3");
                        Assert.AreEqual ("bar", res, "#4");
@@ -222,22 +222,22 @@ namespace MonoTests.System.Collections.Concurrent
                        var cts = new CancellationTokenSource ();
                        string res = null;
 
-                       Task<int> t = Task.Run (() => BlockingCollection<string>.TakeFromAny (arr, out res, cts.Token));
+                       Task<int> t = Task.Factory.StartNew (() => BlockingCollection<string>.TakeFromAny (arr, out res, cts.Token));
                        Thread.Sleep (100);
                        a.Add ("foo");
                        Assert.AreEqual (0, t.Result, "#1");
                        Assert.AreEqual ("foo", res, "#2");
 
-                       t = Task.Run (() => BlockingCollection<string>.TakeFromAny (arr, out res, cts.Token));
+                       t = Task.Factory.StartNew (() => BlockingCollection<string>.TakeFromAny (arr, out res, cts.Token));
                        Thread.Sleep (100);
                        b.Add ("bar");
                        Assert.AreEqual (1, t.Result, "#3");
                        Assert.AreEqual ("bar", res, "#4");
 
-                       t = Task.Run (() => {
+                       t = Task.Factory.StartNew (() => {
                                try {
                                        return BlockingCollection<string>.TakeFromAny (arr, out res, cts.Token);
-                               } catch (OperationCanceledException WE_GOT_CANCELED) {
+                               } catch (OperationCanceledException) {
                                        res = "canceled";
                                        return -10;
                                }