aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Framework/Servers
diff options
context:
space:
mode:
authorSean Dague2009-05-07 19:07:08 +0000
committerSean Dague2009-05-07 19:07:08 +0000
commitce0a84cbc0e277dd5be08a20febf13364a985a3a (patch)
treed5fc2dda5eaf3674c67d82198efd04323f1ba7a5 /OpenSim/Framework/Servers
parentRemoteAdminPlugin was using a mixture of both "true"/"false" and 0/1 (diff)
downloadopensim-SC_OLD-ce0a84cbc0e277dd5be08a20febf13364a985a3a.zip
opensim-SC_OLD-ce0a84cbc0e277dd5be08a20febf13364a985a3a.tar.gz
opensim-SC_OLD-ce0a84cbc0e277dd5be08a20febf13364a985a3a.tar.bz2
opensim-SC_OLD-ce0a84cbc0e277dd5be08a20febf13364a985a3a.tar.xz
instrument most of the tests with a new InMethod function that may help us figure
out where that pesky deadlock is during test runs.
Diffstat (limited to 'OpenSim/Framework/Servers')
-rw-r--r--OpenSim/Framework/Servers/Tests/GetAssetStreamHandlerTests.cs11
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;
3using System.Text; 3using System.Text;
4using NUnit.Framework; 4using NUnit.Framework;
5using OpenSim.Data; 5using OpenSim.Data;
6using OpenSim.Tests.Common;
6 7
7namespace OpenSim.Framework.Servers.Tests 8namespace OpenSim.Framework.Servers.Tests
8{ 9{
@@ -12,12 +13,16 @@ namespace OpenSim.Framework.Servers.Tests
12 [Test] 13 [Test]
13 public void TestConstructor() 14 public void TestConstructor()
14 { 15 {
16 TestHelper.InMethod();
17
15 GetAssetStreamHandler handler = new GetAssetStreamHandler( null ); 18 GetAssetStreamHandler handler = new GetAssetStreamHandler( null );
16 } 19 }
17 20
18 [Test] 21 [Test]
19 public void TestGetParams() 22 public void TestGetParams()
20 { 23 {
24 TestHelper.InMethod();
25
21 GetAssetStreamHandler handler = new GetAssetStreamHandler(null); 26 GetAssetStreamHandler handler = new GetAssetStreamHandler(null);
22 27
23 Assert.AreEqual("", handler.GetParam(null), "Failed on null path."); 28 Assert.AreEqual("", handler.GetParam(null), "Failed on null path.");
@@ -36,6 +41,8 @@ namespace OpenSim.Framework.Servers.Tests
36 [Test] 41 [Test]
37 public void TestSplitParams() 42 public void TestSplitParams()
38 { 43 {
44 TestHelper.InMethod();
45
39 GetAssetStreamHandler handler = new GetAssetStreamHandler(null); 46 GetAssetStreamHandler handler = new GetAssetStreamHandler(null);
40 47
41 Assert.AreEqual(new string[] { }, handler.SplitParams(null), "Failed on null."); 48 Assert.AreEqual(new string[] { }, handler.SplitParams(null), "Failed on null.");
@@ -53,6 +60,8 @@ namespace OpenSim.Framework.Servers.Tests
53 [Test] 60 [Test]
54 public void TestHandleNoParams() 61 public void TestHandleNoParams()
55 { 62 {
63 TestHelper.InMethod();
64
56 byte[] emptyResult = new byte[] {}; 65 byte[] emptyResult = new byte[] {};
57 GetAssetStreamHandler handler = new GetAssetStreamHandler(null); 66 GetAssetStreamHandler handler = new GetAssetStreamHandler(null);
58 67
@@ -63,6 +72,8 @@ namespace OpenSim.Framework.Servers.Tests
63 [Test] 72 [Test]
64 public void TestHandleMalformedGuid() 73 public void TestHandleMalformedGuid()
65 { 74 {
75 TestHelper.InMethod();
76
66 byte[] emptyResult = new byte[] {}; 77 byte[] emptyResult = new byte[] {};
67 GetAssetStreamHandler handler = new GetAssetStreamHandler(null); 78 GetAssetStreamHandler handler = new GetAssetStreamHandler(null);
68 79