aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/CoreModules
diff options
context:
space:
mode:
Diffstat (limited to 'OpenSim/Region/CoreModules')
-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
3 files changed, 11 insertions, 0 deletions
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();