aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorSean Dague2009-05-07 19:07:08 +0000
committerSean Dague2009-05-07 19:07:08 +0000
commitce0a84cbc0e277dd5be08a20febf13364a985a3a (patch)
treed5fc2dda5eaf3674c67d82198efd04323f1ba7a5
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 '')
-rw-r--r--OpenSim/Framework/Communications/Tests/Cache/UserProfileCacheServiceTests.cs14
-rw-r--r--OpenSim/Framework/Communications/Tests/LoginServiceTests.cs12
-rw-r--r--OpenSim/Framework/Servers/Tests/GetAssetStreamHandlerTests.cs11
-rw-r--r--OpenSim/Region/ClientStack/LindenUDP/Tests/BasicCircuitTests.cs8
-rw-r--r--OpenSim/Region/ClientStack/LindenUDP/Tests/PacketHandlerTests.cs3
-rw-r--r--OpenSim/Region/CoreModules/Agent/TextureSender/Tests/TextureSenderTests.cs4
-rw-r--r--OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/Tests/InventoryArchiverTests.cs4
-rw-r--r--OpenSim/Region/CoreModules/World/Archiver/Tests/ArchiverTests.cs3
-rw-r--r--OpenSim/Region/Framework/Scenes/Tests/EntityManagerTests.cs2
-rw-r--r--OpenSim/Region/Framework/Scenes/Tests/SceneObjectBasicTests.cs10
-rw-r--r--OpenSim/Region/Framework/Scenes/Tests/SceneObjectLinkingTests.cs5
-rw-r--r--OpenSim/Region/Framework/Scenes/Tests/ScenePresenceTests.cs21
-rw-r--r--OpenSim/Region/Framework/Scenes/Tests/StandaloneTeleportTests.cs2
-rw-r--r--OpenSim/Tests/Common/TestHelper.cs8
-rw-r--r--prebuild.xml1
15 files changed, 91 insertions, 17 deletions
diff --git a/OpenSim/Framework/Communications/Tests/Cache/UserProfileCacheServiceTests.cs b/OpenSim/Framework/Communications/Tests/Cache/UserProfileCacheServiceTests.cs
index 2972a0a..75848b7 100644
--- a/OpenSim/Framework/Communications/Tests/Cache/UserProfileCacheServiceTests.cs
+++ b/OpenSim/Framework/Communications/Tests/Cache/UserProfileCacheServiceTests.cs
@@ -34,6 +34,7 @@ using OpenSim.Framework.Communications.Cache;
34using OpenSim.Region.Communications.Local; 34using OpenSim.Region.Communications.Local;
35using OpenSim.Tests.Common.Mock; 35using OpenSim.Tests.Common.Mock;
36using OpenSim.Tests.Common.Setup; 36using OpenSim.Tests.Common.Setup;
37using OpenSim.Tests.Common;
37 38
38namespace OpenSim.Framework.Communications.Tests 39namespace OpenSim.Framework.Communications.Tests
39{ 40{
@@ -43,6 +44,8 @@ namespace OpenSim.Framework.Communications.Tests
43 [Test] 44 [Test]
44 public void TestGetUserDetails() 45 public void TestGetUserDetails()
45 { 46 {
47 TestHelper.InMethod();
48
46 UUID userId = UUID.Parse("00000000-0000-0000-0000-000000000002"); 49 UUID userId = UUID.Parse("00000000-0000-0000-0000-000000000002");
47 string firstName = "Bill"; 50 string firstName = "Bill";
48 string lastName = "Bailey"; 51 string lastName = "Bailey";
@@ -109,6 +112,8 @@ namespace OpenSim.Framework.Communications.Tests
109 [Test] 112 [Test]
110 public void TestFetchInventory() 113 public void TestFetchInventory()
111 { 114 {
115 TestHelper.InMethod();
116
112 TestCommunicationsManager commsManager = new TestCommunicationsManager(); 117 TestCommunicationsManager commsManager = new TestCommunicationsManager();
113 CachedUserInfo userInfo = UserProfileTestUtils.CreateUserWithInventory(commsManager); 118 CachedUserInfo userInfo = UserProfileTestUtils.CreateUserWithInventory(commsManager);
114 119
@@ -118,6 +123,8 @@ namespace OpenSim.Framework.Communications.Tests
118 [Test] 123 [Test]
119 public void TestGetChildFolder() 124 public void TestGetChildFolder()
120 { 125 {
126 TestHelper.InMethod();
127
121 TestCommunicationsManager commsManager = new TestCommunicationsManager(); 128 TestCommunicationsManager commsManager = new TestCommunicationsManager();
122 CachedUserInfo userInfo = UserProfileTestUtils.CreateUserWithInventory(commsManager); 129 CachedUserInfo userInfo = UserProfileTestUtils.CreateUserWithInventory(commsManager);
123 130
@@ -132,6 +139,8 @@ namespace OpenSim.Framework.Communications.Tests
132 [Test] 139 [Test]
133 public void TestCreateFolder() 140 public void TestCreateFolder()
134 { 141 {
142 TestHelper.InMethod();
143
135 TestCommunicationsManager commsManager = new TestCommunicationsManager(); 144 TestCommunicationsManager commsManager = new TestCommunicationsManager();
136 IInventoryDataPlugin inventoryDataPlugin = commsManager.InventoryDataPlugin; 145 IInventoryDataPlugin inventoryDataPlugin = commsManager.InventoryDataPlugin;
137 146
@@ -159,6 +168,8 @@ namespace OpenSim.Framework.Communications.Tests
159 [Test] 168 [Test]
160 public void TestUpdateFolder() 169 public void TestUpdateFolder()
161 { 170 {
171 TestHelper.InMethod();
172
162 TestCommunicationsManager commsManager = new TestCommunicationsManager(); 173 TestCommunicationsManager commsManager = new TestCommunicationsManager();
163 IInventoryDataPlugin inventoryDataPlugin = commsManager.InventoryDataPlugin; 174 IInventoryDataPlugin inventoryDataPlugin = commsManager.InventoryDataPlugin;
164 175
@@ -213,6 +224,8 @@ namespace OpenSim.Framework.Communications.Tests
213 [Test] 224 [Test]
214 public void TestMoveFolder() 225 public void TestMoveFolder()
215 { 226 {
227 TestHelper.InMethod();
228
216 TestCommunicationsManager commsManager = new TestCommunicationsManager(); 229 TestCommunicationsManager commsManager = new TestCommunicationsManager();
217 IInventoryDataPlugin inventoryDataPlugin = commsManager.InventoryDataPlugin; 230 IInventoryDataPlugin inventoryDataPlugin = commsManager.InventoryDataPlugin;
218 231
@@ -244,6 +257,7 @@ namespace OpenSim.Framework.Communications.Tests
244 [Test] 257 [Test]
245 public void TestPurgeFolder() 258 public void TestPurgeFolder()
246 { 259 {
260 TestHelper.InMethod();
247 //log4net.Config.XmlConfigurator.Configure(); 261 //log4net.Config.XmlConfigurator.Configure();
248 262
249 TestCommunicationsManager commsManager = new TestCommunicationsManager(); 263 TestCommunicationsManager commsManager = new TestCommunicationsManager();
diff --git a/OpenSim/Framework/Communications/Tests/LoginServiceTests.cs b/OpenSim/Framework/Communications/Tests/LoginServiceTests.cs
index 965e6b4..7d75faa 100644
--- a/OpenSim/Framework/Communications/Tests/LoginServiceTests.cs
+++ b/OpenSim/Framework/Communications/Tests/LoginServiceTests.cs
@@ -38,6 +38,7 @@ using OpenSim.Framework.Communications.Services;
38using OpenSim.Region.Communications.Local; 38using OpenSim.Region.Communications.Local;
39using OpenSim.Tests.Common.Mock; 39using OpenSim.Tests.Common.Mock;
40using OpenSim.Client.Linden; 40using OpenSim.Client.Linden;
41using OpenSim.Tests.Common;
41 42
42namespace OpenSim.Framework.Communications.Tests 43namespace OpenSim.Framework.Communications.Tests
43{ 44{
@@ -45,6 +46,7 @@ namespace OpenSim.Framework.Communications.Tests
45 /// Test the login service. For now, most of this will be done through the LocalLoginService as LoginService 46 /// Test the login service. For now, most of this will be done through the LocalLoginService as LoginService
46 /// is abstract 47 /// is abstract
47 /// </summary> 48 /// </summary>
49
48 [TestFixture] 50 [TestFixture]
49 public class LoginServiceTests 51 public class LoginServiceTests
50 { 52 {
@@ -83,6 +85,7 @@ namespace OpenSim.Framework.Communications.Tests
83 [Test] 85 [Test]
84 public void T010_TestUnauthenticatedLogin() 86 public void T010_TestUnauthenticatedLogin()
85 { 87 {
88 TestHelper.InMethod();
86 // We want to use our own LoginService for this test, one that 89 // We want to use our own LoginService for this test, one that
87 // doesn't require authentication. 90 // doesn't require authentication.
88 LoginService loginService = new LLStandaloneLoginService((UserManagerBase)m_commsManager.UserService, "Hello folks", m_commsManager.InterServiceInventoryService, 91 LoginService loginService = new LLStandaloneLoginService((UserManagerBase)m_commsManager.UserService, "Hello folks", m_commsManager.InterServiceInventoryService,
@@ -119,6 +122,7 @@ namespace OpenSim.Framework.Communications.Tests
119 [Test] 122 [Test]
120 public void T011_TestAuthenticatedLoginSuccess() 123 public void T011_TestAuthenticatedLoginSuccess()
121 { 124 {
125 TestHelper.InMethod();
122 // TODO: Not check inventory part of response yet. 126 // TODO: Not check inventory part of response yet.
123 // TODO: Not checking all of login response thoroughly yet. 127 // TODO: Not checking all of login response thoroughly yet.
124 128
@@ -168,6 +172,7 @@ namespace OpenSim.Framework.Communications.Tests
168 [Test] 172 [Test]
169 public void T012_TestAuthenticatedLoginForBuddies() 173 public void T012_TestAuthenticatedLoginForBuddies()
170 { 174 {
175 TestHelper.InMethod();
171 // 1.1) Test for budddies! 176 // 1.1) Test for budddies!
172 m_localUserServices.AddUser("Friend","Number1","boingboing","abc@ftw.com",42,43); 177 m_localUserServices.AddUser("Friend","Number1","boingboing","abc@ftw.com",42,43);
173 m_localUserServices.AddUser("Friend","Number2","boingboing","abc@ftw.com",42,43); 178 m_localUserServices.AddUser("Friend","Number2","boingboing","abc@ftw.com",42,43);
@@ -207,6 +212,7 @@ namespace OpenSim.Framework.Communications.Tests
207 [Test] 212 [Test]
208 public void T020_TestAuthenticatedLoginBadUsername() 213 public void T020_TestAuthenticatedLoginBadUsername()
209 { 214 {
215 TestHelper.InMethod();
210 216
211 // 2) Test for negative authentication 217 // 2) Test for negative authentication
212 // 218 //
@@ -234,6 +240,8 @@ namespace OpenSim.Framework.Communications.Tests
234 [Test] 240 [Test]
235 public void T021_TestAuthenticatedLoginBadPassword() 241 public void T021_TestAuthenticatedLoginBadPassword()
236 { 242 {
243 TestHelper.InMethod();
244
237 string error_auth_message = "Could not authenticate your avatar. Please check your username and password, and check the grid if problems persist."; 245 string error_auth_message = "Could not authenticate your avatar. Please check your username and password, and check the grid if problems persist.";
238 // 2.2) Test for wrong password 246 // 2.2) Test for wrong password
239 Hashtable loginParams = new Hashtable(); 247 Hashtable loginParams = new Hashtable();
@@ -257,6 +265,8 @@ namespace OpenSim.Framework.Communications.Tests
257 [Test] 265 [Test]
258 public void T022_TestAuthenticatedLoginBadXml() 266 public void T022_TestAuthenticatedLoginBadXml()
259 { 267 {
268 TestHelper.InMethod();
269
260 string error_xml_message = "Error connecting to grid. Could not percieve credentials from login XML."; 270 string error_xml_message = "Error connecting to grid. Could not percieve credentials from login XML.";
261 // 2.3) Bad XML 271 // 2.3) Bad XML
262 Hashtable loginParams = new Hashtable(); 272 Hashtable loginParams = new Hashtable();
@@ -280,6 +290,8 @@ namespace OpenSim.Framework.Communications.Tests
280 [Test] 290 [Test]
281 public void T023_TestAuthenticatedLoginAlreadyLoggedIn() 291 public void T023_TestAuthenticatedLoginAlreadyLoggedIn()
282 { 292 {
293 TestHelper.InMethod();
294
283 //Console.WriteLine("Starting T023_TestAuthenticatedLoginAlreadyLoggedIn()"); 295 //Console.WriteLine("Starting T023_TestAuthenticatedLoginAlreadyLoggedIn()");
284 //log4net.Config.XmlConfigurator.Configure(); 296 //log4net.Config.XmlConfigurator.Configure();
285 297
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
diff --git a/OpenSim/Region/ClientStack/LindenUDP/Tests/BasicCircuitTests.cs b/OpenSim/Region/ClientStack/LindenUDP/Tests/BasicCircuitTests.cs
index 80fbba2..02f78c7 100644
--- a/OpenSim/Region/ClientStack/LindenUDP/Tests/BasicCircuitTests.cs
+++ b/OpenSim/Region/ClientStack/LindenUDP/Tests/BasicCircuitTests.cs
@@ -150,6 +150,8 @@ namespace OpenSim.Region.ClientStack.LindenUDP.Tests
150 [Test, LongRunning] 150 [Test, LongRunning]
151 public void TestAddClient() 151 public void TestAddClient()
152 { 152 {
153 TestHelper.InMethod();
154
153 uint myCircuitCode = 123456; 155 uint myCircuitCode = 123456;
154 UUID myAgentUuid = UUID.Parse("00000000-0000-0000-0000-000000000001"); 156 UUID myAgentUuid = UUID.Parse("00000000-0000-0000-0000-000000000001");
155 UUID mySessionUuid = UUID.Parse("00000000-0000-0000-0000-000000000002"); 157 UUID mySessionUuid = UUID.Parse("00000000-0000-0000-0000-000000000002");
@@ -196,6 +198,8 @@ namespace OpenSim.Region.ClientStack.LindenUDP.Tests
196 [Test] 198 [Test]
197 public void TestRemoveClient() 199 public void TestRemoveClient()
198 { 200 {
201 TestHelper.InMethod();
202
199 uint myCircuitCode = 123457; 203 uint myCircuitCode = 123457;
200 204
201 TestLLUDPServer testLLUDPServer; 205 TestLLUDPServer testLLUDPServer;
@@ -218,6 +222,8 @@ namespace OpenSim.Region.ClientStack.LindenUDP.Tests
218 [Test] 222 [Test]
219 public void TestMalformedPacketSend() 223 public void TestMalformedPacketSend()
220 { 224 {
225 TestHelper.InMethod();
226
221 uint myCircuitCode = 123458; 227 uint myCircuitCode = 123458;
222 EndPoint testEp = new IPEndPoint(IPAddress.Loopback, 1001); 228 EndPoint testEp = new IPEndPoint(IPAddress.Loopback, 1001);
223 MockScene scene = new MockScene(); 229 MockScene scene = new MockScene();
@@ -256,6 +262,8 @@ namespace OpenSim.Region.ClientStack.LindenUDP.Tests
256 [Test] 262 [Test]
257 public void TestExceptionOnBeginReceive() 263 public void TestExceptionOnBeginReceive()
258 { 264 {
265 TestHelper.InMethod();
266
259 MockScene scene = new MockScene(); 267 MockScene scene = new MockScene();
260 268
261 uint circuitCodeA = 130000; 269 uint circuitCodeA = 130000;
diff --git a/OpenSim/Region/ClientStack/LindenUDP/Tests/PacketHandlerTests.cs b/OpenSim/Region/ClientStack/LindenUDP/Tests/PacketHandlerTests.cs
index 6e429a4..4ebc624 100644
--- a/OpenSim/Region/ClientStack/LindenUDP/Tests/PacketHandlerTests.cs
+++ b/OpenSim/Region/ClientStack/LindenUDP/Tests/PacketHandlerTests.cs
@@ -32,6 +32,7 @@ using OpenMetaverse;
32using OpenMetaverse.Packets; 32using OpenMetaverse.Packets;
33using OpenSim.Framework; 33using OpenSim.Framework;
34using OpenSim.Tests.Common.Mock; 34using OpenSim.Tests.Common.Mock;
35using OpenSim.Tests.Common;
35 36
36namespace OpenSim.Region.ClientStack.LindenUDP.Tests 37namespace OpenSim.Region.ClientStack.LindenUDP.Tests
37{ 38{
@@ -47,6 +48,8 @@ namespace OpenSim.Region.ClientStack.LindenUDP.Tests
47 /// </summary> 48 /// </summary>
48 public void InPacketTest() 49 public void InPacketTest()
49 { 50 {
51 TestHelper.InMethod();
52
50 AgentCircuitData agent = new AgentCircuitData(); 53 AgentCircuitData agent = new AgentCircuitData();
51 agent.AgentID = UUID.Random(); 54 agent.AgentID = UUID.Random();
52 agent.firstname = "testfirstname"; 55 agent.firstname = "testfirstname";
diff --git a/OpenSim/Region/CoreModules/Agent/TextureSender/Tests/TextureSenderTests.cs b/OpenSim/Region/CoreModules/Agent/TextureSender/Tests/TextureSenderTests.cs
index ec95187..7b3e887 100644
--- a/OpenSim/Region/CoreModules/Agent/TextureSender/Tests/TextureSenderTests.cs
+++ b/OpenSim/Region/CoreModules/Agent/TextureSender/Tests/TextureSenderTests.cs
@@ -30,6 +30,7 @@ using NUnit.Framework;
30using NUnit.Framework.SyntaxHelpers; 30using NUnit.Framework.SyntaxHelpers;
31using OpenMetaverse; 31using OpenMetaverse;
32using OpenSim.Framework; 32using OpenSim.Framework;
33using OpenSim.Tests.Common;
33using OpenSim.Tests.Common.Mock; 34using OpenSim.Tests.Common.Mock;
34 35
35namespace OpenSim.Region.CoreModules.Agent.TextureSender 36namespace OpenSim.Region.CoreModules.Agent.TextureSender
@@ -76,6 +77,7 @@ namespace OpenSim.Region.CoreModules.Agent.TextureSender
76 [Test] 77 [Test]
77 public void T010_SendPkg() 78 public void T010_SendPkg()
78 { 79 {
80 TestHelper.InMethod();
79 // Normal sending 81 // Normal sending
80 AssetBase abase = new AssetBase(uuid1, "asset one"); 82 AssetBase abase = new AssetBase(uuid1, "asset one");
81 byte[] abdata = new byte[testsize]; 83 byte[] abdata = new byte[testsize];
@@ -95,6 +97,7 @@ namespace OpenSim.Region.CoreModules.Agent.TextureSender
95 [Test] 97 [Test]
96 public void T011_UpdateReq() 98 public void T011_UpdateReq()
97 { 99 {
100 TestHelper.InMethod();
98 // Test packet number start 101 // Test packet number start
99 AssetBase abase = new AssetBase(uuid2, "asset two"); 102 AssetBase abase = new AssetBase(uuid2, "asset two");
100 byte[] abdata = new byte[testsize]; 103 byte[] abdata = new byte[testsize];
@@ -143,6 +146,7 @@ namespace OpenSim.Region.CoreModules.Agent.TextureSender
143 [Test] 146 [Test]
144 public void T999_FinishStatus() 147 public void T999_FinishStatus()
145 { 148 {
149 TestHelper.InMethod();
146 // Of the 4 assets "sent", only 2 sent the first part. 150 // Of the 4 assets "sent", only 2 sent the first part.
147 Assert.That(client.sentdatapkt.Count,Is.EqualTo(2)); 151 Assert.That(client.sentdatapkt.Count,Is.EqualTo(2));
148 152
diff --git a/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/Tests/InventoryArchiverTests.cs b/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/Tests/InventoryArchiverTests.cs
index 4c6045a..374cea3 100644
--- a/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/Tests/InventoryArchiverTests.cs
+++ b/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/Tests/InventoryArchiverTests.cs
@@ -68,6 +68,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver.Tests
68 [Test] 68 [Test]
69 public void TestSaveIarV0p1() 69 public void TestSaveIarV0p1()
70 { 70 {
71 TestHelper.InMethod();
71 //log4net.Config.XmlConfigurator.Configure(); 72 //log4net.Config.XmlConfigurator.Configure();
72 73
73 InventoryArchiverModule archiverModule = new InventoryArchiverModule(); 74 InventoryArchiverModule archiverModule = new InventoryArchiverModule();
@@ -201,6 +202,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver.Tests
201 [Test] 202 [Test]
202 public void TestLoadIarV0p1ExistingUsers() 203 public void TestLoadIarV0p1ExistingUsers()
203 { 204 {
205 TestHelper.InMethod();
204 Console.WriteLine("Started {0}", MethodBase.GetCurrentMethod()); 206 Console.WriteLine("Started {0}", MethodBase.GetCurrentMethod());
205 207
206 //log4net.Config.XmlConfigurator.Configure(); 208 //log4net.Config.XmlConfigurator.Configure();
@@ -267,6 +269,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver.Tests
267 [Test] 269 [Test]
268 public void TestLoadIarV0p1TempProfiles() 270 public void TestLoadIarV0p1TempProfiles()
269 { 271 {
272 TestHelper.InMethod();
270 Console.WriteLine("### Started {0} ###", MethodBase.GetCurrentMethod()); 273 Console.WriteLine("### Started {0} ###", MethodBase.GetCurrentMethod());
271 274
272 log4net.Config.XmlConfigurator.Configure(); 275 log4net.Config.XmlConfigurator.Configure();
@@ -336,6 +339,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver.Tests
336 [Test] 339 [Test]
337 public void TestReplicateArchivePathToUserInventory() 340 public void TestReplicateArchivePathToUserInventory()
338 { 341 {
342 TestHelper.InMethod();
339 CommunicationsManager commsManager = new TestCommunicationsManager(); 343 CommunicationsManager commsManager = new TestCommunicationsManager();
340 CachedUserInfo userInfo = UserProfileTestUtils.CreateUserWithInventory(commsManager); 344 CachedUserInfo userInfo = UserProfileTestUtils.CreateUserWithInventory(commsManager);
341 Dictionary <string, InventoryFolderImpl> foldersCreated = new Dictionary<string, InventoryFolderImpl>(); 345 Dictionary <string, InventoryFolderImpl> foldersCreated = new Dictionary<string, InventoryFolderImpl>();
diff --git a/OpenSim/Region/CoreModules/World/Archiver/Tests/ArchiverTests.cs b/OpenSim/Region/CoreModules/World/Archiver/Tests/ArchiverTests.cs
index af789aa..7037141 100644
--- a/OpenSim/Region/CoreModules/World/Archiver/Tests/ArchiverTests.cs
+++ b/OpenSim/Region/CoreModules/World/Archiver/Tests/ArchiverTests.cs
@@ -79,6 +79,7 @@ namespace OpenSim.Region.CoreModules.World.Archiver.Tests
79 [Test] 79 [Test]
80 public void TestSaveOarV0p2() 80 public void TestSaveOarV0p2()
81 { 81 {
82 TestHelper.InMethod();
82 //log4net.Config.XmlConfigurator.Configure(); 83 //log4net.Config.XmlConfigurator.Configure();
83 84
84 ArchiverModule archiverModule = new ArchiverModule(); 85 ArchiverModule archiverModule = new ArchiverModule();
@@ -202,6 +203,7 @@ namespace OpenSim.Region.CoreModules.World.Archiver.Tests
202 [Test] 203 [Test]
203 public void TestLoadOarV0p2() 204 public void TestLoadOarV0p2()
204 { 205 {
206 TestHelper.InMethod();
205 //log4net.Config.XmlConfigurator.Configure(); 207 //log4net.Config.XmlConfigurator.Configure();
206 208
207 MemoryStream archiveWriteStream = new MemoryStream(); 209 MemoryStream archiveWriteStream = new MemoryStream();
@@ -277,6 +279,7 @@ namespace OpenSim.Region.CoreModules.World.Archiver.Tests
277 //[Test] 279 //[Test]
278 public void TestMergeOarV0p2() 280 public void TestMergeOarV0p2()
279 { 281 {
282 TestHelper.InMethod();
280 //XmlConfigurator.Configure(); 283 //XmlConfigurator.Configure();
281 284
282 MemoryStream archiveWriteStream = new MemoryStream(); 285 MemoryStream archiveWriteStream = new MemoryStream();
diff --git a/OpenSim/Region/Framework/Scenes/Tests/EntityManagerTests.cs b/OpenSim/Region/Framework/Scenes/Tests/EntityManagerTests.cs
index d1ef686..10c2039 100644
--- a/OpenSim/Region/Framework/Scenes/Tests/EntityManagerTests.cs
+++ b/OpenSim/Region/Framework/Scenes/Tests/EntityManagerTests.cs
@@ -52,6 +52,7 @@ namespace OpenSim.Region.Framework.Scenes.Tests
52 [Test] 52 [Test]
53 public void T010_AddObjects() 53 public void T010_AddObjects()
54 { 54 {
55 TestHelper.InMethod();
55 // Console.WriteLine("Beginning test {0}", MethodBase.GetCurrentMethod()); 56 // Console.WriteLine("Beginning test {0}", MethodBase.GetCurrentMethod());
56 57
57 random = new Random(); 58 random = new Random();
@@ -87,6 +88,7 @@ namespace OpenSim.Region.Framework.Scenes.Tests
87 [Test] 88 [Test]
88 public void T011_ThreadAddRemoveTest() 89 public void T011_ThreadAddRemoveTest()
89 { 90 {
91 TestHelper.InMethod();
90 // Console.WriteLine("Beginning test {0}", MethodBase.GetCurrentMethod()); 92 // Console.WriteLine("Beginning test {0}", MethodBase.GetCurrentMethod());
91 93
92 // This test adds and removes with mutiple threads, attempting to break the 94 // This test adds and removes with mutiple threads, attempting to break the
diff --git a/OpenSim/Region/Framework/Scenes/Tests/SceneObjectBasicTests.cs b/OpenSim/Region/Framework/Scenes/Tests/SceneObjectBasicTests.cs
index 5c3d653..8a17ee7 100644
--- a/OpenSim/Region/Framework/Scenes/Tests/SceneObjectBasicTests.cs
+++ b/OpenSim/Region/Framework/Scenes/Tests/SceneObjectBasicTests.cs
@@ -53,8 +53,8 @@ namespace OpenSim.Region.Framework.Scenes.Tests
53 [Test, LongRunning] 53 [Test, LongRunning]
54 public void TestAddSceneObject() 54 public void TestAddSceneObject()
55 { 55 {
56 Console.WriteLine("Beginning test {0}", MethodBase.GetCurrentMethod()); 56 TestHelper.InMethod();
57 57
58 Scene scene = SceneSetupHelpers.SetupScene(); 58 Scene scene = SceneSetupHelpers.SetupScene();
59 SceneObjectPart part = SceneSetupHelpers.AddSceneObject(scene); 59 SceneObjectPart part = SceneSetupHelpers.AddSceneObject(scene);
60 SceneObjectPart retrievedPart = scene.GetSceneObjectPart(part.LocalId); 60 SceneObjectPart retrievedPart = scene.GetSceneObjectPart(part.LocalId);
@@ -70,7 +70,7 @@ namespace OpenSim.Region.Framework.Scenes.Tests
70 [Test] 70 [Test]
71 public void TestDeleteSceneObject() 71 public void TestDeleteSceneObject()
72 { 72 {
73 Console.WriteLine("Beginning test {0}", MethodBase.GetCurrentMethod()); 73 TestHelper.InMethod();
74 74
75 TestScene scene = SceneSetupHelpers.SetupScene(); 75 TestScene scene = SceneSetupHelpers.SetupScene();
76 SceneObjectPart part = SceneSetupHelpers.AddSceneObject(scene); 76 SceneObjectPart part = SceneSetupHelpers.AddSceneObject(scene);
@@ -86,7 +86,7 @@ namespace OpenSim.Region.Framework.Scenes.Tests
86 [Test] 86 [Test]
87 public void TestDeleteSceneObjectAsync() 87 public void TestDeleteSceneObjectAsync()
88 { 88 {
89 Console.WriteLine("Beginning test {0}", MethodBase.GetCurrentMethod()); 89 TestHelper.InMethod();
90 90
91 UUID agentId = UUID.Parse("00000000-0000-0000-0000-000000000001"); 91 UUID agentId = UUID.Parse("00000000-0000-0000-0000-000000000001");
92 92
@@ -115,7 +115,7 @@ namespace OpenSim.Region.Framework.Scenes.Tests
115 [Test] 115 [Test]
116 public void TestDeleteSceneObjectAsyncToUserInventory() 116 public void TestDeleteSceneObjectAsyncToUserInventory()
117 { 117 {
118 Console.WriteLine("Beginning test {0}", MethodBase.GetCurrentMethod()); 118 TestHelper.InMethod();
119 //log4net.Config.XmlConfigurator.Configure(); 119 //log4net.Config.XmlConfigurator.Configure();
120 120
121 UUID agentId = UUID.Parse("00000000-0000-0000-0000-000000000001"); 121 UUID agentId = UUID.Parse("00000000-0000-0000-0000-000000000001");
diff --git a/OpenSim/Region/Framework/Scenes/Tests/SceneObjectLinkingTests.cs b/OpenSim/Region/Framework/Scenes/Tests/SceneObjectLinkingTests.cs
index d62ce1f..8a1fa29 100644
--- a/OpenSim/Region/Framework/Scenes/Tests/SceneObjectLinkingTests.cs
+++ b/OpenSim/Region/Framework/Scenes/Tests/SceneObjectLinkingTests.cs
@@ -35,6 +35,7 @@ using OpenSim.Framework.Communications;
35using OpenSim.Framework.Communications.Cache; 35using OpenSim.Framework.Communications.Cache;
36using OpenSim.Region.Communications.Local; 36using OpenSim.Region.Communications.Local;
37using OpenSim.Region.Framework.Scenes; 37using OpenSim.Region.Framework.Scenes;
38using OpenSim.Tests.Common;
38using OpenSim.Tests.Common.Mock; 39using OpenSim.Tests.Common.Mock;
39using OpenSim.Tests.Common.Setup; 40using OpenSim.Tests.Common.Setup;
40using log4net; 41using log4net;
@@ -52,7 +53,7 @@ namespace OpenSim.Region.Framework.Scenes.Tests
52 [Test] 53 [Test]
53 public void TestLinkDelink2SceneObjects() 54 public void TestLinkDelink2SceneObjects()
54 { 55 {
55 Console.WriteLine("Beginning test {0}", MethodBase.GetCurrentMethod()); 56 TestHelper.InMethod();
56 57
57 bool debugtest = false; 58 bool debugtest = false;
58 59
@@ -130,7 +131,7 @@ namespace OpenSim.Region.Framework.Scenes.Tests
130 [Test] 131 [Test]
131 public void TestLinkDelink2groups4SceneObjects() 132 public void TestLinkDelink2groups4SceneObjects()
132 { 133 {
133 Console.WriteLine("Beginning test {0}", MethodBase.GetCurrentMethod()); 134 TestHelper.InMethod();
134 135
135 bool debugtest = false; 136 bool debugtest = false;
136 137
diff --git a/OpenSim/Region/Framework/Scenes/Tests/ScenePresenceTests.cs b/OpenSim/Region/Framework/Scenes/Tests/ScenePresenceTests.cs
index 2903766..8801176 100644
--- a/OpenSim/Region/Framework/Scenes/Tests/ScenePresenceTests.cs
+++ b/OpenSim/Region/Framework/Scenes/Tests/ScenePresenceTests.cs
@@ -42,6 +42,7 @@ using OpenSim.Region.Framework.Scenes;
42using OpenSim.Region.Framework.Interfaces; 42using OpenSim.Region.Framework.Interfaces;
43using OpenSim.Region.CoreModules.ServiceConnectors.Interregion; 43using OpenSim.Region.CoreModules.ServiceConnectors.Interregion;
44using OpenSim.Region.CoreModules.World.Serialiser; 44using OpenSim.Region.CoreModules.World.Serialiser;
45using OpenSim.Tests.Common;
45using OpenSim.Tests.Common.Mock; 46using OpenSim.Tests.Common.Mock;
46using OpenSim.Tests.Common.Setup; 47using OpenSim.Tests.Common.Setup;
47 48
@@ -99,7 +100,7 @@ namespace OpenSim.Region.Framework.Scenes.Tests
99 [Test] 100 [Test]
100 public void T010_TestAddRootAgent() 101 public void T010_TestAddRootAgent()
101 { 102 {
102 Console.WriteLine("Beginning test {0}", MethodBase.GetCurrentMethod()); 103 TestHelper.InMethod();
103 104
104 string firstName = "testfirstname"; 105 string firstName = "testfirstname";
105 106
@@ -133,7 +134,7 @@ namespace OpenSim.Region.Framework.Scenes.Tests
133 [Test] 134 [Test]
134 public void T011_TestRemoveRootAgent() 135 public void T011_TestRemoveRootAgent()
135 { 136 {
136 Console.WriteLine("Beginning test {0}", MethodBase.GetCurrentMethod()); 137 TestHelper.InMethod();
137 138
138 scene.RemoveClient(agent1); 139 scene.RemoveClient(agent1);
139 140
@@ -145,7 +146,7 @@ namespace OpenSim.Region.Framework.Scenes.Tests
145 [Test] 146 [Test]
146 public void T012_TestAddNeighbourRegion() 147 public void T012_TestAddNeighbourRegion()
147 { 148 {
148 Console.WriteLine("Beginning test {0}", MethodBase.GetCurrentMethod()); 149 TestHelper.InMethod();
149 150
150 string reason; 151 string reason;
151 scene.NewUserConnection(acd1, out reason); 152 scene.NewUserConnection(acd1, out reason);
@@ -167,7 +168,7 @@ namespace OpenSim.Region.Framework.Scenes.Tests
167 [Test] 168 [Test]
168 public void T013_TestRemoveNeighbourRegion() 169 public void T013_TestRemoveNeighbourRegion()
169 { 170 {
170 Console.WriteLine("Beginning test {0}", MethodBase.GetCurrentMethod()); 171 TestHelper.InMethod();
171 172
172 ScenePresence presence = scene.GetScenePresence(agent1); 173 ScenePresence presence = scene.GetScenePresence(agent1);
173 presence.RemoveNeighbourRegion(region3); 174 presence.RemoveNeighbourRegion(region3);
@@ -184,7 +185,7 @@ namespace OpenSim.Region.Framework.Scenes.Tests
184 [Test] 185 [Test]
185 public void T020_TestMakeRootAgent() 186 public void T020_TestMakeRootAgent()
186 { 187 {
187 Console.WriteLine("Beginning test {0}", MethodBase.GetCurrentMethod()); 188 TestHelper.InMethod();
188 189
189 ScenePresence presence = scene.GetScenePresence(agent1); 190 ScenePresence presence = scene.GetScenePresence(agent1);
190 Assert.That(presence.IsChildAgent, Is.False, "Starts out as a root agent"); 191 Assert.That(presence.IsChildAgent, Is.False, "Starts out as a root agent");
@@ -202,7 +203,7 @@ namespace OpenSim.Region.Framework.Scenes.Tests
202 [Test] 203 [Test]
203 public void T021_TestCrossToNewRegion() 204 public void T021_TestCrossToNewRegion()
204 { 205 {
205 Console.WriteLine("Beginning test {0}", MethodBase.GetCurrentMethod()); 206 TestHelper.InMethod();
206 207
207 // Adding child agent to region 1001 208 // Adding child agent to region 1001
208 string reason; 209 string reason;
@@ -295,7 +296,7 @@ namespace OpenSim.Region.Framework.Scenes.Tests
295 [Test] 296 [Test]
296 public void T030_TestAddAttachments() 297 public void T030_TestAddAttachments()
297 { 298 {
298 Console.WriteLine("Beginning test {0}", MethodBase.GetCurrentMethod()); 299 TestHelper.InMethod();
299 300
300 ScenePresence presence = scene.GetScenePresence(agent1); 301 ScenePresence presence = scene.GetScenePresence(agent1);
301 302
@@ -310,7 +311,7 @@ namespace OpenSim.Region.Framework.Scenes.Tests
310 [Test] 311 [Test]
311 public void T031_RemoveAttachments() 312 public void T031_RemoveAttachments()
312 { 313 {
313 Console.WriteLine("Beginning test {0}", MethodBase.GetCurrentMethod()); 314 TestHelper.InMethod();
314 315
315 ScenePresence presence = scene.GetScenePresence(agent1); 316 ScenePresence presence = scene.GetScenePresence(agent1);
316 presence.RemoveAttachment(sog1); 317 presence.RemoveAttachment(sog1);
@@ -322,7 +323,7 @@ namespace OpenSim.Region.Framework.Scenes.Tests
322 [Test] 323 [Test]
323 public void T032_CrossAttachments() 324 public void T032_CrossAttachments()
324 { 325 {
325 Console.WriteLine("Beginning test {0}", MethodBase.GetCurrentMethod()); 326 TestHelper.InMethod();
326 327
327 ScenePresence presence = scene.GetScenePresence(agent1); 328 ScenePresence presence = scene.GetScenePresence(agent1);
328 ScenePresence presence2 = scene2.GetScenePresence(agent1); 329 ScenePresence presence2 = scene2.GetScenePresence(agent1);
@@ -342,7 +343,7 @@ namespace OpenSim.Region.Framework.Scenes.Tests
342 343
343 public static string GetRandomCapsObjectPath() 344 public static string GetRandomCapsObjectPath()
344 { 345 {
345 Console.WriteLine("Beginning test {0}", MethodBase.GetCurrentMethod()); 346 TestHelper.InMethod();
346 347
347 UUID caps = UUID.Random(); 348 UUID caps = UUID.Random();
348 string capsPath = caps.ToString(); 349 string capsPath = caps.ToString();
diff --git a/OpenSim/Region/Framework/Scenes/Tests/StandaloneTeleportTests.cs b/OpenSim/Region/Framework/Scenes/Tests/StandaloneTeleportTests.cs
index 2618da6..5356ae8 100644
--- a/OpenSim/Region/Framework/Scenes/Tests/StandaloneTeleportTests.cs
+++ b/OpenSim/Region/Framework/Scenes/Tests/StandaloneTeleportTests.cs
@@ -54,6 +54,8 @@ namespace OpenSim.Region.Framework.Scenes.Tests
54 [Test, LongRunning] 54 [Test, LongRunning]
55 public void TestSimpleNotNeighboursTeleport() 55 public void TestSimpleNotNeighboursTeleport()
56 { 56 {
57 TestHelper.InMethod();
58
57 // Console.WriteLine("Beginning test {0}", MethodBase.GetCurrentMethod()); 59 // Console.WriteLine("Beginning test {0}", MethodBase.GetCurrentMethod());
58 60
59 log4net.Config.XmlConfigurator.Configure(); 61 log4net.Config.XmlConfigurator.Configure();
diff --git a/OpenSim/Tests/Common/TestHelper.cs b/OpenSim/Tests/Common/TestHelper.cs
index 6853e55..21c2875 100644
--- a/OpenSim/Tests/Common/TestHelper.cs
+++ b/OpenSim/Tests/Common/TestHelper.cs
@@ -26,6 +26,7 @@
26 */ 26 */
27 27
28using System; 28using System;
29using System.Diagnostics;
29 30
30namespace OpenSim.Tests.Common 31namespace OpenSim.Tests.Common
31{ 32{
@@ -46,5 +47,12 @@ namespace OpenSim.Tests.Common
46 47
47 return false; 48 return false;
48 } 49 }
50
51 // A debugging method that can be used to print out which test method you are in
52 public static void InMethod()
53 {
54 StackTrace stackTrace = new StackTrace();
55 Console.WriteLine("In Test Method : {0}", stackTrace.GetFrame(1).GetMethod().Name);
56 }
49 } 57 }
50} 58}
diff --git a/prebuild.xml b/prebuild.xml
index 5e51ff6..8e2906a 100644
--- a/prebuild.xml
+++ b/prebuild.xml
@@ -3198,6 +3198,7 @@
3198 <ReferencePath>../../../../bin/</ReferencePath> 3198 <ReferencePath>../../../../bin/</ReferencePath>
3199 <Reference name="System"/> 3199 <Reference name="System"/>
3200 <Reference name="OpenSim.Data"/> 3200 <Reference name="OpenSim.Data"/>
3201 <Reference name="OpenSim.Tests.Common"/>
3201 <Reference name="OpenSim.Framework"/> 3202 <Reference name="OpenSim.Framework"/>
3202 <Reference name="OpenSim.Framework.Servers"/> 3203 <Reference name="OpenSim.Framework.Servers"/>
3203 <Reference name="OpenSim.Framework.Servers.HttpServer"/> 3204 <Reference name="OpenSim.Framework.Servers.HttpServer"/>