Merge pull request #5198 from BrzVlad/fix-binprot-stats

[mono.git] / mcs / class / corlib / Test / System.Threading / ThreadTest.cs

diff --git a/mcs/class/corlib/Test/System.Threading/ThreadTest.cs b/mcs/class/corlib/Test/System.Threading/ThreadTest.cs
index ae5bdbfd586d3391d656861047590897068957ca..c45938e5be7af4c6976fe79ed12e25eead9ab123 100644 (file)
--- a/mcs/class/corlib/Test/System.Threading/ThreadTest.cs
+++ b/mcs/class/corlib/Test/System.Threading/ThreadTest.cs
@@ -912,20 +912,18 @@ namespace MonoTests.System.Threading
                [Test]
                public void SetNameInThreadPoolThread ()
                {
-                       for (int i = 0; i < 10; ++i) {
-                               Task t = Task.Run (delegate () {
-                                       Thread.CurrentThread.Name = "x/" + i;
-                                       Assert.AreEqual (Thread.CurrentThread.Name, "x/" + i, "#1");
+                       Task t = Task.Run (delegate () {
+                               Thread.CurrentThread.Name = "ThreadName1";
+                               Assert.AreEqual (Thread.CurrentThread.Name, "ThreadName1", "#1");
 
-                                       try {
-                                               Thread.CurrentThread.Name = "y/" + i;
-                                               Assert.Fail ("#2");
-                                       } catch (InvalidOperationException) {
-                                       }
-                               });
+                               try {
+                                       Thread.CurrentThread.Name = "ThreadName2";
+                                       Assert.Fail ("#2");
+                               } catch (InvalidOperationException) {
+                               }
+                       });
 
-                               t.Wait ();
-                       }
+                       t.Wait ();
                }
 
                void CheckIsRunning (string s, Thread t)
@@ -1351,9 +1349,9 @@ namespace MonoTests.System.Threading
                
                public static void WhileAlive (Thread t, bool alive, string s)
                {
-                       DateTime ti = DateTime.Now;
+                       var sw = SD.Stopwatch.StartNew ();
                        while (t.IsAlive == alive) {
-                               if ((DateTime.Now - ti).TotalSeconds > 10) {
+                               if (sw.Elapsed.TotalSeconds > 10) {
                                        if (alive) Assert.Fail ("Timeout while waiting for not alive state. " + s);
                                        else Assert.Fail ("Timeout while waiting for alive state. " + s);
                                }
@@ -1362,12 +1360,12 @@ namespace MonoTests.System.Threading
 
                public static bool WhileAliveOrStop (Thread t, bool alive, string s)
                {
-                       DateTime ti = DateTime.Now;
+                       var sw = SD.Stopwatch.StartNew ();
                        while (t.IsAlive == alive) {
                                if (t.ThreadState == ThreadState.Stopped)
                                        return false;
 
-                               if ((DateTime.Now - ti).TotalSeconds > 10) {
+                               if (sw.Elapsed.TotalSeconds > 10) {
                                        if (alive) Assert.Fail ("Timeout while waiting for not alive state. " + s);
                                        else Assert.Fail ("Timeout while waiting for alive state. " + s);
                                }