1 files changed, 2 insertions, 138 deletions
diff --git a/OpenSim/Framework/Tests/ThreadTrackerTests.cs b/OpenSim/Framework/Tests/ThreadTrackerTests.cs
index 15d5b73..7eb83e6 100644
--- a/OpenSim/Framework/Tests/ThreadTrackerTests.cs
+++ b/OpenSim/Framework/Tests/ThreadTrackerTests.cs
@@ -41,7 +41,7 @@ namespace OpenSim.Framework.Tests
        [Test]
        public void DefaultThreadTrackerTest()
        {
-            List<Thread> lThread = ThreadTracker.GetThreads();
+            System.Diagnostics.ProcessThreadCollection lThread = ThreadTracker.GetThreads();
            
            /*
            foreach (Thread t in lThread)
@@ -50,143 +50,7 @@ namespace OpenSim.Framework.Tests
            }
            */
-            Assert.That(lThread.Count == 1);
+            Assert.That(lThread.Count > 0);
-            Assert.That(lThread[0].Name == "ThreadTrackerThread");
        }
-        /// <summary>
-        /// Validate that adding a thread to the thread tracker works
-        /// Validate that removing a thread from the thread tracker also works.
-        /// </summary>
-        [Test]
-        public void AddThreadToThreadTrackerTestAndRemoveTest()
-        {
-            Thread t = new Thread(run);
-            t.Name = "TestThread";
-            t.Priority = ThreadPriority.BelowNormal;
-            t.IsBackground = true;
-            t.SetApartmentState(ApartmentState.MTA);
-            t.Start();
-            ThreadTracker.Add(t);
-            List<Thread> lThread = ThreadTracker.GetThreads();
-            Assert.That(lThread.Count == 2);
-            foreach (Thread tr in lThread)
-            {
-                Assert.That((tr.Name == "ThreadTrackerThread" || tr.Name == "TestThread"));
-            }
-            running = false;
-            ThreadTracker.Remove(t);
-            lThread = ThreadTracker.GetThreads();
-            Assert.That(lThread.Count == 1);
-            foreach (Thread tr in lThread)
-            {
-                Assert.That((tr.Name == "ThreadTrackerThread"));
-            }
-        }
-        /// <summary>
-        /// Test a dead thread removal by aborting it and setting it's last seen active date to 50 seconds
-        /// </summary>
-        [Test]
-        public void DeadThreadTest()
-        {
-            Thread t = new Thread(run2);
-            t.Name = "TestThread";
-            t.Priority = ThreadPriority.BelowNormal;
-            t.IsBackground = true;
-            t.SetApartmentState(ApartmentState.MTA);
-            t.Start();
-            ThreadTracker.Add(t);
-            t.Abort();
-            Thread.Sleep(5000);
-            ThreadTracker.m_Threads[1].LastSeenActive = DateTime.Now.Ticks - (50*10000000);
-            ThreadTracker.CleanUp();
-            List<Thread> lThread = ThreadTracker.GetThreads();
-            Assert.That(lThread.Count == 1);
-            foreach (Thread tr in lThread)
-            {
-                Assert.That((tr.Name == "ThreadTrackerThread"));
-            }
-        }
-        [Test]
-        public void UnstartedThreadTest()
-        {
-            Thread t = new Thread(run2);
-            t.Name = "TestThread";
-            t.Priority = ThreadPriority.BelowNormal;
-            t.IsBackground = true;
-            t.SetApartmentState(ApartmentState.MTA);
-            ThreadTracker.Add(t);
-            ThreadTracker.m_Threads[1].LastSeenActive = DateTime.Now.Ticks - (50 * 10000000);
-            ThreadTracker.CleanUp();
-            List<Thread> lThread = ThreadTracker.GetThreads();
-            Assert.That(lThread.Count == 1);
-            foreach (Thread tr in lThread)
-            {
-                Assert.That((tr.Name == "ThreadTrackerThread"));
-            }
-        }
-        [Test]
-        public void NullThreadTest()
-        {
-            Thread t = null;
-            ThreadTracker.Add(t);
-            
-            List<Thread> lThread = ThreadTracker.GetThreads();
-            Assert.That(lThread.Count == 1);
-            foreach (Thread tr in lThread)
-            {
-                Assert.That((tr.Name == "ThreadTrackerThread"));
-            }
-        }
-        /// <summary>
-        /// Worker thread 0
-        /// </summary>
-        /// <param name="o"></param>
-        public void run(object o)
-        {
-            while (running)
-            {
-                Thread.Sleep(5000);
-            }
-        }
-        /// <summary>
-        /// Worker thread 1
-        /// </summary>
-        /// <param name="o"></param>
-        public void run2(object o)
-        {
-            try
-            {
-                while (running2)
-                {
-                    Thread.Sleep(5000);
-                }
-            } 
-            catch (ThreadAbortException)
-            {
-            }
-        }
    }
 }

diff --git a/OpenSim/Framework/Tests/ThreadTrackerTests.cs b/OpenSim/Framework/Tests/ThreadTrackerTests.cs index 15d5b73..7eb83e6 100644 --- a/OpenSim/Framework/Tests/ThreadTrackerTests.cs +++ b/OpenSim/Framework/Tests/ThreadTrackerTests.cs
@@ -41,7 +41,7 @@ namespace OpenSim.Framework.Tests
41	[Test]	41	[Test]
42	public void DefaultThreadTrackerTest()	42	public void DefaultThreadTrackerTest()
43	{	43	{
44	List<Thread> lThread = ThreadTracker.GetThreads();	44	System.Diagnostics.ProcessThreadCollection lThread = ThreadTracker.GetThreads();
45		45
46	/*	46	/*
47	foreach (Thread t in lThread)	47	foreach (Thread t in lThread)
@@ -50,143 +50,7 @@ namespace OpenSim.Framework.Tests
50	}	50	}
51	*/	51	*/
52		52
53	Assert.That(lThread.Count == 1);	53	Assert.That(lThread.Count > 0);
54	Assert.That(lThread[0].Name == "ThreadTrackerThread");
55	}	54	}
56
57	/// <summary>
58	/// Validate that adding a thread to the thread tracker works
59	/// Validate that removing a thread from the thread tracker also works.
60	/// </summary>
61	[Test]
62	public void AddThreadToThreadTrackerTestAndRemoveTest()
63	{
64	Thread t = new Thread(run);
65	t.Name = "TestThread";
66	t.Priority = ThreadPriority.BelowNormal;
67	t.IsBackground = true;
68	t.SetApartmentState(ApartmentState.MTA);
69	t.Start();
70	ThreadTracker.Add(t);
71
72	List<Thread> lThread = ThreadTracker.GetThreads();
73
74	Assert.That(lThread.Count == 2);
75
76	foreach (Thread tr in lThread)
77	{
78	Assert.That((tr.Name == "ThreadTrackerThread" \|\| tr.Name == "TestThread"));
79	}
80	running = false;
81	ThreadTracker.Remove(t);
82
83	lThread = ThreadTracker.GetThreads();
84
85	Assert.That(lThread.Count == 1);
86
87	foreach (Thread tr in lThread)
88	{
89	Assert.That((tr.Name == "ThreadTrackerThread"));
90	}
91
92
93	}
94
95	/// <summary>
96	/// Test a dead thread removal by aborting it and setting it's last seen active date to 50 seconds
97	/// </summary>
98	[Test]
99	public void DeadThreadTest()
100	{
101	Thread t = new Thread(run2);
102	t.Name = "TestThread";
103	t.Priority = ThreadPriority.BelowNormal;
104	t.IsBackground = true;
105	t.SetApartmentState(ApartmentState.MTA);
106	t.Start();
107	ThreadTracker.Add(t);
108	t.Abort();
109	Thread.Sleep(5000);
110	ThreadTracker.m_Threads[1].LastSeenActive = DateTime.Now.Ticks - (50*10000000);
111	ThreadTracker.CleanUp();
112	List<Thread> lThread = ThreadTracker.GetThreads();
113
114	Assert.That(lThread.Count == 1);
115
116	foreach (Thread tr in lThread)
117	{
118	Assert.That((tr.Name == "ThreadTrackerThread"));
119	}
120	}
121
122	[Test]
123	public void UnstartedThreadTest()
124	{
125	Thread t = new Thread(run2);
126	t.Name = "TestThread";
127	t.Priority = ThreadPriority.BelowNormal;
128	t.IsBackground = true;
129	t.SetApartmentState(ApartmentState.MTA);
130	ThreadTracker.Add(t);
131	ThreadTracker.m_Threads[1].LastSeenActive = DateTime.Now.Ticks - (50 * 10000000);
132	ThreadTracker.CleanUp();
133	List<Thread> lThread = ThreadTracker.GetThreads();
134
135	Assert.That(lThread.Count == 1);
136
137	foreach (Thread tr in lThread)
138	{
139	Assert.That((tr.Name == "ThreadTrackerThread"));
140	}
141	}
142
143	[Test]
144	public void NullThreadTest()
145	{
146	Thread t = null;
147	ThreadTracker.Add(t);
148
149	List<Thread> lThread = ThreadTracker.GetThreads();
150
151	Assert.That(lThread.Count == 1);
152
153	foreach (Thread tr in lThread)
154	{
155	Assert.That((tr.Name == "ThreadTrackerThread"));
156	}
157	}
158
159
160	/// <summary>
161	/// Worker thread 0
162	/// </summary>
163	/// <param name="o"></param>
164	public void run(object o)
165	{
166	while (running)
167	{
168	Thread.Sleep(5000);
169	}
170	}
171
172	/// <summary>
173	/// Worker thread 1
174	/// </summary>
175	/// <param name="o"></param>
176	public void run2(object o)
177	{
178	try
179	{
180	while (running2)
181	{
182	Thread.Sleep(5000);
183	}
184
185	}
186	catch (ThreadAbortException)
187	{
188	}
189	}
190
191	}	55	}
192	}	56	}