Merge pull request #3028 from lateralusX/jlorenss/threadpool_warning

[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 5773a1003f63821a3440ca8289347d5b6d6346c5..e532913ff24a2632ef221276cea3ef03e1d96367 100644 (file)
--- a/mcs/class/corlib/Test/System.Threading/ThreadTest.cs
+++ b/mcs/class/corlib/Test/System.Threading/ThreadTest.cs
@@ -387,6 +387,7 @@ namespace MonoTests.System.Threading
                }
 
                [Test]
+               [Category ("NotWorking")] // setting the priority of a Thread before it is started isn't implemented in Mono yet
                public void TestPriority1()
                {
                        if (is_win32 && is_mono)
@@ -396,10 +397,11 @@ namespace MonoTests.System.Threading
                        Thread TestThread = new Thread(new ThreadStart(test1.TestMethod));
                        try {
                                TestThread.Priority=ThreadPriority.BelowNormal;
-                               ThreadPriority after = TestThread.Priority;
+                               ThreadPriority before = TestThread.Priority;
+                               Assert.AreEqual (ThreadPriority.BelowNormal, before, "#40 Unexpected priority before thread start: ");
                                TestThread.Start();
                                TestUtil.WaitForAlive (TestThread, "wait7");
-                               ThreadPriority before = TestThread.Priority;
+                               ThreadPriority after = TestThread.Priority;
                                Assert.AreEqual (before, after, "#41 Unexpected Priority Change: ");
                        } finally {
 #if MONO_FEATURE_THREAD_ABORT
@@ -572,37 +574,6 @@ namespace MonoTests.System.Threading
                        t.Name = "b";
                }
 
-               bool rename_finished;
-               bool rename_failed;
-
-               [Test]
-               public void RenameTpThread ()
-               {
-                       object monitor = new object ();
-                       ThreadPool.QueueUserWorkItem (new WaitCallback (Rename_callback), monitor);
-                       lock (monitor) {
-                               if (!rename_finished)
-                                       Monitor.Wait (monitor);
-                       }
-                       Assert.IsTrue (!rename_failed);
-               }
-
-               void Rename_callback (object o) {
-                       Thread.CurrentThread.Name = "a";
-                       try {
-                               Thread.CurrentThread.Name = "b";
-                               //Console.WriteLine ("Thread name is: {0}", Thread.CurrentThread.Name);
-                       } catch (Exception e) {
-                               //Console.Error.WriteLine (e);
-                               rename_failed = true;
-                       }
-                       object monitor = o;
-                       lock (monitor) {
-                               rename_finished = true;
-                               Monitor.Pulse (monitor);
-                       }
-               }
-
                [Test]
                public void TestNestedThreads1()
                {