From 2519f071f2c592aeea0414c8b2871e5df623271c Mon Sep 17 00:00:00 2001 From: John Hurliman Date: Tue, 6 Oct 2009 02:50:59 -0700 Subject: Fixing a few compile errors in the previous commit --- OpenSim/Framework/Tests/ThreadTrackerTests.cs | 140 +------------------------- 1 file changed, 2 insertions(+), 138 deletions(-) (limited to 'OpenSim/Framework/Tests/ThreadTrackerTests.cs') 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 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[0].Name == "ThreadTrackerThread"); + Assert.That(lThread.Count > 0); } - - /// - /// Validate that adding a thread to the thread tracker works - /// Validate that removing a thread from the thread tracker also works. - /// - [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 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")); - } - - - } - - /// - /// Test a dead thread removal by aborting it and setting it's last seen active date to 50 seconds - /// - [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 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 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 lThread = ThreadTracker.GetThreads(); - - Assert.That(lThread.Count == 1); - - foreach (Thread tr in lThread) - { - Assert.That((tr.Name == "ThreadTrackerThread")); - } - } - - - /// - /// Worker thread 0 - /// - /// - public void run(object o) - { - while (running) - { - Thread.Sleep(5000); - } - } - - /// - /// Worker thread 1 - /// - /// - public void run2(object o) - { - try - { - while (running2) - { - Thread.Sleep(5000); - } - - } - catch (ThreadAbortException) - { - } - } - } } -- cgit v1.1 From 1eb390beda0764191680ff2bddfc70b360f930cf Mon Sep 17 00:00:00 2001 From: Melanie Date: Thu, 8 Oct 2009 08:32:34 +0100 Subject: Remove ThreadTrackerTest. It's no longer relevant because the thread tracker now uses the system thread list --- OpenSim/Framework/Tests/ThreadTrackerTests.cs | 56 --------------------------- 1 file changed, 56 deletions(-) delete mode 100644 OpenSim/Framework/Tests/ThreadTrackerTests.cs (limited to 'OpenSim/Framework/Tests/ThreadTrackerTests.cs') diff --git a/OpenSim/Framework/Tests/ThreadTrackerTests.cs b/OpenSim/Framework/Tests/ThreadTrackerTests.cs deleted file mode 100644 index 7eb83e6..0000000 --- a/OpenSim/Framework/Tests/ThreadTrackerTests.cs +++ /dev/null @@ -1,56 +0,0 @@ -/* - * Copyright (c) Contributors, http://opensimulator.org/ - * See CONTRIBUTORS.TXT for a full list of copyright holders. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions are met: - * * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * * Neither the name of the OpenSimulator Project nor the - * names of its contributors may be used to endorse or promote products - * derived from this software without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY - * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED - * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE - * DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY - * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES - * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND - * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT - * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS - * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - */ - -using System; -using NUnit.Framework; -using System.Threading; -using System.Collections.Generic; - -namespace OpenSim.Framework.Tests -{ - [TestFixture] - public class ThreadTrackerTests - { - private bool running = true; - private bool running2 = true; - - [Test] - public void DefaultThreadTrackerTest() - { - System.Diagnostics.ProcessThreadCollection lThread = ThreadTracker.GetThreads(); - - /* - foreach (Thread t in lThread) - { - System.Console.WriteLine(t.Name); - } - */ - - Assert.That(lThread.Count > 0); - } - } -} -- cgit v1.1