instrument most of the tests with a new InMethod function that may help us figure

out where that pesky deadlock is during test runs.

1 files changed, 11 insertions, 0 deletions

diff --git a/OpenSim/Framework/Servers/Tests/GetAssetStreamHandlerTests.cs b/OpenSim/Framework/Servers/Tests/GetAssetStreamHandlerTests.cs
index 0b70cb1..702e66a 100644
--- a/OpenSim/Framework/Servers/Tests/GetAssetStreamHandlerTests.cs
+++ b/OpenSim/Framework/Servers/Tests/GetAssetStreamHandlerTests.cs
@@ -3,6 +3,7 @@ using System.Collections.Generic;
 using System.Text;

 using NUnit.Framework;

 using OpenSim.Data;

+using OpenSim.Tests.Common;

 

 namespace OpenSim.Framework.Servers.Tests

 {

@@ -12,12 +13,16 @@ namespace OpenSim.Framework.Servers.Tests
         [Test]

         public void TestConstructor()

         {

+            TestHelper.InMethod();

+

             GetAssetStreamHandler handler = new GetAssetStreamHandler( null );

         }

 

         [Test]

         public void TestGetParams()

         {

+            TestHelper.InMethod();

+

             GetAssetStreamHandler handler = new GetAssetStreamHandler(null);

 

             Assert.AreEqual("", handler.GetParam(null), "Failed on null path.");

@@ -36,6 +41,8 @@ namespace OpenSim.Framework.Servers.Tests
         [Test]

         public void TestSplitParams()

         {

+            TestHelper.InMethod();

+

             GetAssetStreamHandler handler = new GetAssetStreamHandler(null);

 

             Assert.AreEqual(new string[] { }, handler.SplitParams(null), "Failed on null.");

@@ -53,6 +60,8 @@ namespace OpenSim.Framework.Servers.Tests
         [Test]

         public void TestHandleNoParams()

         {

+            TestHelper.InMethod();

+

             byte[] emptyResult = new byte[] {};

             GetAssetStreamHandler handler = new GetAssetStreamHandler(null);

 

@@ -63,6 +72,8 @@ namespace OpenSim.Framework.Servers.Tests
         [Test]

         public void TestHandleMalformedGuid()

         {

+            TestHelper.InMethod();

+

             byte[] emptyResult = new byte[] {};

             GetAssetStreamHandler handler = new GetAssetStreamHandler(null);