Fix xUnit1031 warnings

Author: tmatthey

src/NetMQ.Tests/NetMQMonitorTests.cs

@@ -68,7 +68,7 @@ public void StartAsync()
                 Thread.Sleep(200);
                 Assert.Equal(TaskStatus.Running, task.Status);
                 monitor.Stop();
-                Assert.True(task.Wait(TimeSpan.FromMilliseconds(1000)));
+                Assert.True(Utils.Tasks.Wait(task, TimeSpan.FromMilliseconds(1000)));
             }
         }
 #endif
@@ -154,7 +154,7 @@ public void MonitorDisposeProperlyWhenDisposedAfterMonitoredTcpSocket()
                 }
                 Thread.Sleep(100);
                 // Monitor.Dispose should complete
-                var completed = Task.Factory.StartNew(() => monitor.Dispose()).Wait(1000);
+                var completed = Utils.Tasks.Wait(Task.Factory.StartNew(() => monitor.Dispose()), TimeSpan.FromMilliseconds(1000));
                 Assert.True(completed);
             }
             // NOTE If this test fails, it will hang because context.Dispose will block

src/NetMQ.Tests/NetMQPollerTest.cs

@@ -395,7 +395,7 @@ public void RemoveSocket()
 
                 poller.Stop();
                 // await the pollerTask, 1ms should suffice
-                pollerTask.Wait(1);
+                Utils.Tasks.Wait(pollerTask, TimeSpan.FromMilliseconds(1));
                 Assert.True(pollerTask.IsCompleted);
             }
         }
@@ -879,7 +879,7 @@ public void OneTask()
                     Assert.True(poller.CanExecuteTaskInline, "Should be on NetMQPoller thread");
                 });
                 task.Start(poller);
-                task.Wait();
+                Utils.Tasks.Wait(task);
 
                 Assert.True(triggered);
             }
@@ -894,7 +894,7 @@ public void SetsCurrentTaskScheduler()
 
                 var task = new Task(() => Assert.Same(TaskScheduler.Current, poller));
                 task.Start(poller);
-                task.Wait();
+                Utils.Tasks.Wait(task);
             }
         }
 
@@ -911,7 +911,7 @@ public void CanExecuteTaskInline()
 
                 var task = new Task(() => Assert.True(poller.CanExecuteTaskInline));
                 task.Start(poller);
-                task.Wait();
+                Utils.Tasks.Wait(task);
             }
         }
 
@@ -941,8 +941,8 @@ public void ContinueWith()
                 }, poller);
 
                 task.Start(poller);
-                task.Wait();
-                task2.Wait();
+                Utils.Tasks.Wait(task);
+                Utils.Tasks.Wait(task2);
 
                 Assert.Equal(threadId1, threadId2);
                 Assert.Equal(1, runCount1);
@@ -982,9 +982,9 @@ public void TwoThreads()
                     }
                 });
 
-                t1.Wait(1000);
-                t2.Wait(1000);
-                Task.WaitAll(allTasks.ToArray(), 1000);
+                Utils.Tasks.Wait(t1, TimeSpan.FromMilliseconds(1000));
+                Utils.Tasks.Wait(t2, TimeSpan.FromMilliseconds(1000));
+                Utils.Tasks.WaitAll(allTasks.ToArray(), TimeSpan.FromMilliseconds(1000));
 
                 Assert.Equal(100, count1);
                 Assert.Equal(100, count2);

src/NetMQ.Tests/NetMQQueueTests.cs

@@ -39,7 +39,7 @@ public void EnqueueShouldNotBlockWhenCapacityIsZero()
                     }
                 });
 
-                bool completed = task.Wait(TimeSpan.FromSeconds(1));
+                bool completed = Utils.Tasks.Wait(task, TimeSpan.FromSeconds(1));
                 Assert.True(completed, "Enqueue task should have completed " + socketWatermarkCapacity + " enqueue within 1 second");
             }
         }

src/NetMQ.Tests/PgmTests.cs

@@ -230,8 +230,8 @@ public void Sending1000Messages()
                 }
             });
 
-            pubTask.Wait();
-            subTask.Wait();
+            Utils.Tasks.Wait(pubTask);
+            Utils.Tasks.Wait(subTask);
 
             Assert.Equal(1000, count);
         }
@@ -291,7 +291,7 @@ public void SubscriberCleanupOnUnbind(string address)
 
                         monitor.Stop();
 
-                        monitorTask.Wait();
+                        Utils.Tasks.Wait(monitorTask);
                     }
                 }
             }

src/NetMQ.Tests/SocketTests.cs

@@ -134,7 +134,7 @@ public void ReceiveMessageWithTimeout()
                 t1.Start();
                 t2.Start();
 
-                Task.WaitAll(t1, t2);
+                Utils.Tasks.WaitAll(new[]{t1, t2});
             }
         }
 

src/NetMQ/Utils/Tasks.cs

@@ -0,0 +1,55 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading;
+using System.Threading.Tasks;
+
+namespace NetMQ.Utils
+{
+    internal class Tasks
+    {
+        internal static async Task PollUntil(Func<bool> condition, TimeSpan timeout)
+        {
+            var cts = new CancellationTokenSource();
+            cts.CancelAfter(timeout);
+
+            await PollUntil(condition, cts.Token);
+        }
+
+        internal static async Task PollUntil(Func<bool> condition, CancellationToken ct = default)
+        {
+            try
+            {
+                while (!condition())
+                {
+                    await Task.Delay(25, ct).ConfigureAwait(true);
+                }
+            }
+            catch (TaskCanceledException)
+            {
+                // Task was cancelled. Ignore exception and return.
+            }
+        }
+
+        internal static bool WaitAll(Task[] tasks, TimeSpan timeout)
+        {
+            return PollUntil(() => tasks.All(t => t.IsCompleted), timeout).Status == TaskStatus.RanToCompletion;
+        }
+
+        internal static bool WaitAll(Task[] tasks)
+        {
+            return WaitAll(tasks, TimeSpan.MaxValue);
+        }
+
+        internal static bool Wait(Task task, TimeSpan timeout)
+        {
+            return PollUntil(() => task.IsCompleted, timeout).Status == TaskStatus.RanToCompletion;
+        }
+
+        internal static bool Wait(Task task)
+        {
+            return Wait(task, TimeSpan.MaxValue);
+        }
+    }
+}