Merge pull request #1325 from madrang/CryptoToolsCtorCheck

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

diff --git a/mcs/class/System/Test/System.Collections.Concurrent/CollectionStressTestHelper.cs b/mcs/class/System/Test/System.Collections.Concurrent/CollectionStressTestHelper.cs
index 59ba9e119ef0130d3acdf40218a91dc07d2f20f4..8dfb779b15e5f1995b8e3b5ce65a33851170bc5c 100644 (file)
--- a/mcs/class/System/Test/System.Collections.Concurrent/CollectionStressTestHelper.cs
+++ b/mcs/class/System/Test/System.Collections.Concurrent/CollectionStressTestHelper.cs
@@ -1,4 +1,3 @@
-#if NET_4_0
 // 
 // CollectionStressTestHelper.cs
 //  
@@ -36,6 +35,7 @@ using System.Threading.Tasks;
 
 using NUnit;
 using NUnit.Framework;
+using NUnit.Framework.Constraints;
 
 namespace MonoTests.System.Collections.Concurrent
 {
@@ -84,10 +84,12 @@ namespace MonoTests.System.Collections.Concurrent
                                        while (!coll.TryAdd (i));
                                
                                bool state = true;
+                               bool ran = false;
                                
                                Assert.AreEqual ((count + delta) * threads, coll.Count, "#0");
                                
                                ParallelTestHelper.ParallelStressTest (coll, (q) => {
+                                       ran = true;
                                        bool s = true;
                                        int t;
                                        
@@ -101,7 +103,8 @@ namespace MonoTests.System.Collections.Concurrent
                                        if (!s)
                                                state = false;
                                }, threads);
-                               
+
+                               Assert.IsTrue (ran, "#1-pre");
                                Assert.IsTrue (state, "#1");
                                Assert.AreEqual (delta * threads, coll.Count, "#2");
                                
@@ -117,12 +120,13 @@ namespace MonoTests.System.Collections.Concurrent
                                
                                string expected = range.Aggregate (string.Empty, (acc, v) => acc + v);
                                
-                               if (order == CheckOrderingType.DontCare)
-                                       CollectionAssert.AreEquivalent (expected, actual, "#3");
-                               else 
+                               if (order == CheckOrderingType.DontCare) {
+                                       Assert.That (actual, new CollectionEquivalentConstraint (expected), "#3, same");
+                               } else { 
                                        Assert.AreEqual (expected, actual, "#3");
-                       }, 1000);
+                                       Assert.That (actual, new EqualConstraint (expected), "#3, in order");
+                               }
+                       }, 100);
                }
        }
 }
-#endif