Imported Upstream version 5.0.0.42

Former-commit-id: fd56571888259555122d8a0f58c68838229cea2b
This commit is contained in:
Xamarin Public Jenkins (auto-signing)
2017-04-10 11:41:01 +00:00
parent 1190d13a04
commit 6bdd276d05
19939 changed files with 3099680 additions and 93811 deletions

View File

@ -131,7 +131,7 @@ namespace MonoTests.System.Threading.Tasks.Dataflow {
Assert.IsTrue (transform.Post (1));
Assert.IsTrue (transform.Post (2));
Assert.GreaterOrEqual (scheduler.ExecuteAll (), 1);
AssertHelper.GreaterOrEqual (scheduler.ExecuteAll (), 1);
Assert.AreEqual (2, Volatile.Read (ref n));
}
@ -154,7 +154,7 @@ namespace MonoTests.System.Threading.Tasks.Dataflow {
Assert.IsTrue (transform.Post (1));
Assert.IsTrue (transform.Post (2));
Assert.GreaterOrEqual (scheduler.ExecuteAll (), 1);
AssertHelper.GreaterOrEqual (scheduler.ExecuteAll (), 1);
Assert.AreEqual (2, Volatile.Read (ref n));
}
@ -177,7 +177,7 @@ namespace MonoTests.System.Threading.Tasks.Dataflow {
Assert.IsFalse (transform.Post (101));
Assert.GreaterOrEqual (scheduler.ExecuteAll (), 1);
AssertHelper.GreaterOrEqual (scheduler.ExecuteAll (), 1);
Assert.IsFalse (transform.Post (102));

View File

@ -128,7 +128,7 @@ namespace MonoTests.System.Threading.Tasks.Dataflow {
Assert.IsNotNull (ex);
Assert.IsNotNull (ex.InnerException);
Assert.IsInstanceOfType (typeof(OperationCanceledException),
Assert.IsInstanceOfType (typeof(TaskCanceledException),
ex.InnerException);
Assert.IsTrue (task.IsCompleted);
Assert.AreEqual (TaskStatus.Canceled, task.Status);

View File

@ -90,7 +90,7 @@ namespace MonoTests.System.Threading.Tasks.Dataflow {
var queue = new ConcurrentQueue<Tuple<int, int>> ();
var block = factory (queue);
Assert.IsEmpty (queue);
CollectionAssert.IsEmpty (queue);
for (int i = 0; i < 100; i++)
block.Post (i);
@ -170,15 +170,15 @@ namespace MonoTests.System.Threading.Tasks.Dataflow {
options = new ExecutionDataflowBlockOptions { MaxDegreeOfParallelism = 2 };
foreach (var taskIds in GetTaskIdsForExecutionsOptions (options))
Assert.LessOrEqual (CalculateDegreeOfParallelism (taskIds), 2);
AssertHelper.LessOrEqual (CalculateDegreeOfParallelism (taskIds), 2);
options = new ExecutionDataflowBlockOptions { MaxDegreeOfParallelism = 4 };
foreach (var taskIds in GetTaskIdsForExecutionsOptions (options))
Assert.LessOrEqual (CalculateDegreeOfParallelism (taskIds), 4);
AssertHelper.LessOrEqual (CalculateDegreeOfParallelism (taskIds), 4);
options = new ExecutionDataflowBlockOptions { MaxDegreeOfParallelism = -1 };
foreach (var taskIds in GetTaskIdsForExecutionsOptions (options))
Assert.LessOrEqual (CalculateDegreeOfParallelism (taskIds), taskIds.Length);
AssertHelper.LessOrEqual (CalculateDegreeOfParallelism (taskIds), taskIds.Length);
}
}
@ -187,7 +187,7 @@ namespace MonoTests.System.Threading.Tasks.Dataflow {
{
var options = new ExecutionDataflowBlockOptions ();
foreach (var taskIds in GetTaskIdsForExecutionsOptions (options))
Assert.GreaterOrEqual (taskIds.Distinct ().Count (), 1);
AssertHelper.GreaterOrEqual (taskIds.Distinct ().Count (), 1);
options = new ExecutionDataflowBlockOptions { MaxMessagesPerTask = 1 };
foreach (var taskIds in GetTaskIdsForExecutionsOptions (options))
@ -195,11 +195,11 @@ namespace MonoTests.System.Threading.Tasks.Dataflow {
options = new ExecutionDataflowBlockOptions { MaxMessagesPerTask = 2 };
foreach (var taskIds in GetTaskIdsForExecutionsOptions (options))
Assert.GreaterOrEqual (taskIds.Distinct ().Count (), taskIds.Length / 2);
AssertHelper.GreaterOrEqual (taskIds.Distinct ().Count (), taskIds.Length / 2);
options = new ExecutionDataflowBlockOptions { MaxMessagesPerTask = 4 };
foreach (var taskIds in GetTaskIdsForExecutionsOptions (options))
Assert.GreaterOrEqual (taskIds.Distinct ().Count (), taskIds.Length / 4);
AssertHelper.GreaterOrEqual (taskIds.Distinct ().Count (), taskIds.Length / 4);
}
[Test]