From 2e46027c14fb7a7084e3909cd8b57db5565cce7d Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Sat, 5 Mar 2011 02:34:44 +0000
Subject: Construct test load iar only once and reuse for each test, rather
than recreating it every time
---
.../Archiver/Tests/InventoryArchiverTests.cs | 26 +++++++++++++++-------
1 file changed, 18 insertions(+), 8 deletions(-)
(limited to 'OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/Tests/InventoryArchiverTests.cs')
diff --git a/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/Tests/InventoryArchiverTests.cs b/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/Tests/InventoryArchiverTests.cs
index 76d0b85..8a84c7a 100644
--- a/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/Tests/InventoryArchiverTests.cs
+++ b/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/Tests/InventoryArchiverTests.cs
@@ -53,9 +53,14 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver.Tests
public class InventoryArchiverTests
{
protected ManualResetEvent mre = new ManualResetEvent(false);
-
+
+ ///
+ /// A raw array of bytes that we'll use to create an IAR memory stream suitable for isolated use in each test.
+ ///
+ protected byte[] m_iarStreamBytes;
+
///
- /// Stream of data representing a common IAR that can be reused in load tests.
+ /// Stream of data representing a common IAR for load tests.
///
protected MemoryStream m_iarStream;
@@ -79,12 +84,18 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver.Tests
}
[SetUp]
- public void Init()
+ public void SetUp()
{
- ConstructDefaultIarForTestLoad();
+ m_iarStream = new MemoryStream(m_iarStreamBytes);
}
- protected void ConstructDefaultIarForTestLoad()
+ [TestFixtureSetUp]
+ public void FixtureSetup()
+ {
+ ConstructDefaultIarBytesForTestLoad();
+ }
+
+ protected void ConstructDefaultIarBytesForTestLoad()
{
string archiveItemName = InventoryArchiveWriteRequest.CreateArchiveItemName(m_item1Name, UUID.Random());
@@ -107,7 +118,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver.Tests
= string.Format("{0}{1}", ArchiveConstants.INVENTORY_PATH, archiveItemName);
tar.WriteFile(item1FileName, UserInventoryItemSerializer.Serialize(item1, new Dictionary(), scene.UserAccountService));
tar.Close();
- m_iarStream = new MemoryStream(archiveWriteStream.ToArray());
+ m_iarStreamBytes = archiveWriteStream.ToArray();
}
///
@@ -392,8 +403,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver.Tests
UserProfileTestUtils.CreateUserWithInventory(scene, m_ua1, "meowfood");
UserProfileTestUtils.CreateUserWithInventory(scene, m_ua2, "hampshire");
- archiverModule.DearchiveInventory(m_ua1.FirstName, m_ua1.LastName, "/", "meowfood", m_iarStream);
-
+ archiverModule.DearchiveInventory(m_ua1.FirstName, m_ua1.LastName, "/", "meowfood", m_iarStream);
InventoryItemBase foundItem1
= InventoryArchiveUtils.FindItemByPath(scene.InventoryService, m_ua1.PrincipalID, m_item1Name);
--
cgit v1.1
From 8a2360bf815d4d78fcff34a69dec24782494bd2e Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Wed, 9 Mar 2011 01:21:31 +0000
Subject: Simplify TestLoadIarV0_1AbsentUsers() to use common IAR test setup.
Make static dictionaries on NullUserAccountData instance instead to stop user
accounts being carried over between tests
---
.../Archiver/Tests/InventoryArchiverTests.cs | 65 +++++-----------------
1 file changed, 15 insertions(+), 50 deletions(-)
(limited to 'OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/Tests/InventoryArchiverTests.cs')
diff --git a/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/Tests/InventoryArchiverTests.cs b/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/Tests/InventoryArchiverTests.cs
index 8a84c7a..de95505 100644
--- a/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/Tests/InventoryArchiverTests.cs
+++ b/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/Tests/InventoryArchiverTests.cs
@@ -97,6 +97,11 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver.Tests
protected void ConstructDefaultIarBytesForTestLoad()
{
+// log4net.Config.XmlConfigurator.Configure();
+
+ Scene scene = SceneSetupHelpers.SetupScene("Inventory");
+ UserProfileTestUtils.CreateUserWithInventory(scene, m_ua2, "hampshire");
+
string archiveItemName = InventoryArchiveWriteRequest.CreateArchiveItemName(m_item1Name, UUID.Random());
MemoryStream archiveWriteStream = new MemoryStream();
@@ -106,14 +111,9 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver.Tests
item1.Name = m_item1Name;
item1.AssetID = UUID.Random();
item1.GroupID = UUID.Random();
- //item1.CreatorId = OspResolver.MakeOspa(m_ua2.FirstName, m_ua2.LastName);
- //item1.CreatorId = userUuid.ToString();
- item1.CreatorId = m_ua2.PrincipalID.ToString();
+ item1.CreatorIdAsUuid = m_ua2.PrincipalID;
item1.Owner = UUID.Zero;
- Scene scene = SceneSetupHelpers.SetupScene("Inventory");
- UserProfileTestUtils.CreateUserWithInventory(scene, m_ua2, "hampshire");
-
string item1FileName
= string.Format("{0}{1}", ArchiveConstants.INVENTORY_PATH, archiveItemName);
tar.WriteFile(item1FileName, UserInventoryItemSerializer.Serialize(item1, new Dictionary(), scene.UserAccountService));
@@ -390,7 +390,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver.Tests
public void TestLoadIarV0_1ExistingUsers()
{
TestHelper.InMethod();
- //log4net.Config.XmlConfigurator.Configure();
+// log4net.Config.XmlConfigurator.Configure();
SerialiserModule serialiserModule = new SerialiserModule();
InventoryArchiverModule archiverModule = new InventoryArchiverModule();
@@ -414,9 +414,9 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver.Tests
// Assert.That(
// foundItem1.CreatorId, Is.EqualTo(item1.CreatorId),
// "Loaded item non-uuid creator doesn't match original");
- Assert.That(
- foundItem1.CreatorId, Is.EqualTo(m_ua2.PrincipalID.ToString()),
- "Loaded item non-uuid creator doesn't match original");
+// Assert.That(
+// foundItem1.CreatorId, Is.EqualTo(m_ua2.PrincipalID.ToString()),
+// "Loaded item non-uuid creator doesn't match original");
Assert.That(
foundItem1.CreatorIdAsUuid, Is.EqualTo(m_ua2.PrincipalID),
@@ -529,64 +529,29 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver.Tests
/// Test loading a V0.1 OpenSim Inventory Archive (subject to change since there is no fixed format yet) where
/// embedded creators do not exist in the system
///
- ///
- /// This may possibly one day get overtaken by the as yet incomplete temporary profiles feature
- /// (as tested in the a later commented out test)
- /// This test is currently disabled
[Test]
public void TestLoadIarV0_1AbsentUsers()
{
TestHelper.InMethod();
- //log4net.Config.XmlConfigurator.Configure();
-
- string userFirstName = "Charlie";
- string userLastName = "Chan";
- UUID userUuid = UUID.Parse("00000000-0000-0000-0000-000000000999");
- string userItemCreatorFirstName = "Bat";
- string userItemCreatorLastName = "Man";
- //UUID userItemCreatorUuid = UUID.Parse("00000000-0000-0000-0000-000000008888");
-
- string itemName = "b.lsl";
- string archiveItemName = InventoryArchiveWriteRequest.CreateArchiveItemName(itemName, UUID.Random());
-
- MemoryStream archiveWriteStream = new MemoryStream();
- TarArchiveWriter tar = new TarArchiveWriter(archiveWriteStream);
-
- InventoryItemBase item1 = new InventoryItemBase();
- item1.Name = itemName;
- item1.AssetID = UUID.Random();
- item1.GroupID = UUID.Random();
- item1.CreatorId = OspResolver.MakeOspa(userItemCreatorFirstName, userItemCreatorLastName);
- //item1.CreatorId = userUuid.ToString();
- //item1.CreatorId = "00000000-0000-0000-0000-000000000444";
- item1.Owner = UUID.Zero;
+// log4net.Config.XmlConfigurator.Configure();
- string item1FileName
- = string.Format("{0}{1}", ArchiveConstants.INVENTORY_PATH, archiveItemName);
- tar.WriteFile(item1FileName, UserInventoryItemSerializer.Serialize(item1, new Dictionary(), null));
- tar.Close();
-
- MemoryStream archiveReadStream = new MemoryStream(archiveWriteStream.ToArray());
SerialiserModule serialiserModule = new SerialiserModule();
InventoryArchiverModule archiverModule = new InventoryArchiverModule();
-
- // Annoyingly, we have to set up a scene even though inventory loading has nothing to do with a scene
Scene scene = SceneSetupHelpers.SetupScene("inventory");
-
SceneSetupHelpers.SetupSceneModules(scene, serialiserModule, archiverModule);
- UserProfileTestUtils.CreateUserWithInventory(scene, userFirstName, userLastName, userUuid, "meowfood");
- archiverModule.DearchiveInventory(userFirstName, userLastName, "/", "meowfood", archiveReadStream);
+ UserProfileTestUtils.CreateUserWithInventory(scene, m_ua1, "password");
+ archiverModule.DearchiveInventory(m_ua1.FirstName, m_ua1.LastName, "/", "password", m_iarStream);
InventoryItemBase foundItem1
- = InventoryArchiveUtils.FindItemByPath(scene.InventoryService, userUuid, itemName);
+ = InventoryArchiveUtils.FindItemByPath(scene.InventoryService, m_ua1.PrincipalID, m_item1Name);
Assert.That(foundItem1, Is.Not.Null, "Didn't find loaded item 1");
// Assert.That(
// foundItem1.CreatorId, Is.EqualTo(userUuid),
// "Loaded item non-uuid creator doesn't match that of the loading user");
Assert.That(
- foundItem1.CreatorIdAsUuid, Is.EqualTo(userUuid),
+ foundItem1.CreatorIdAsUuid, Is.EqualTo(m_ua1.PrincipalID),
"Loaded item uuid creator doesn't match that of the loading user");
}
--
cgit v1.1
From ae507bb0600774624f876c4562391cec0111eee8 Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Wed, 9 Mar 2011 01:53:27 +0000
Subject: Split out path tests from InventoryArchiveTests. Factor common code
into test case parent
---
.../Archiver/Tests/InventoryArchiverTests.cs | 533 +--------------------
1 file changed, 2 insertions(+), 531 deletions(-)
(limited to 'OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/Tests/InventoryArchiverTests.cs')
diff --git a/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/Tests/InventoryArchiverTests.cs b/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/Tests/InventoryArchiverTests.cs
index de95505..edbbd81 100644
--- a/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/Tests/InventoryArchiverTests.cs
+++ b/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/Tests/InventoryArchiverTests.cs
@@ -50,195 +50,8 @@ using OpenSim.Tests.Common.Setup;
namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver.Tests
{
[TestFixture]
- public class InventoryArchiverTests
- {
- protected ManualResetEvent mre = new ManualResetEvent(false);
-
- ///
- /// A raw array of bytes that we'll use to create an IAR memory stream suitable for isolated use in each test.
- ///
- protected byte[] m_iarStreamBytes;
-
- ///
- /// Stream of data representing a common IAR for load tests.
- ///
- protected MemoryStream m_iarStream;
-
- protected UserAccount m_ua1
- = new UserAccount {
- PrincipalID = UUID.Parse("00000000-0000-0000-0000-000000000555"),
- FirstName = "Mr",
- LastName = "Tiddles" };
- protected UserAccount m_ua2
- = new UserAccount {
- PrincipalID = UUID.Parse("00000000-0000-0000-0000-000000000666"),
- FirstName = "Lord",
- LastName = "Lucan" };
- string m_item1Name = "b.lsl";
-
- private void SaveCompleted(
- Guid id, bool succeeded, UserAccount userInfo, string invPath, Stream saveStream,
- Exception reportedException)
- {
- mre.Set();
- }
-
- [SetUp]
- public void SetUp()
- {
- m_iarStream = new MemoryStream(m_iarStreamBytes);
- }
-
- [TestFixtureSetUp]
- public void FixtureSetup()
- {
- ConstructDefaultIarBytesForTestLoad();
- }
-
- protected void ConstructDefaultIarBytesForTestLoad()
- {
-// log4net.Config.XmlConfigurator.Configure();
-
- Scene scene = SceneSetupHelpers.SetupScene("Inventory");
- UserProfileTestUtils.CreateUserWithInventory(scene, m_ua2, "hampshire");
-
- string archiveItemName = InventoryArchiveWriteRequest.CreateArchiveItemName(m_item1Name, UUID.Random());
-
- MemoryStream archiveWriteStream = new MemoryStream();
- TarArchiveWriter tar = new TarArchiveWriter(archiveWriteStream);
-
- InventoryItemBase item1 = new InventoryItemBase();
- item1.Name = m_item1Name;
- item1.AssetID = UUID.Random();
- item1.GroupID = UUID.Random();
- item1.CreatorIdAsUuid = m_ua2.PrincipalID;
- item1.Owner = UUID.Zero;
-
- string item1FileName
- = string.Format("{0}{1}", ArchiveConstants.INVENTORY_PATH, archiveItemName);
- tar.WriteFile(item1FileName, UserInventoryItemSerializer.Serialize(item1, new Dictionary(), scene.UserAccountService));
- tar.Close();
- m_iarStreamBytes = archiveWriteStream.ToArray();
- }
-
- ///
- /// Test saving an inventory path to a V0.1 OpenSim Inventory Archive
- /// (subject to change since there is no fixed format yet).
- ///
- [Test]
- public void TestSavePathToIarV0_1()
- {
- TestHelper.InMethod();
-// log4net.Config.XmlConfigurator.Configure();
-
- InventoryArchiverModule archiverModule = new InventoryArchiverModule();
-
- Scene scene = SceneSetupHelpers.SetupScene("Inventory");
- SceneSetupHelpers.SetupSceneModules(scene, archiverModule);
-
- // Create user
- string userFirstName = "Jock";
- string userLastName = "Stirrup";
- string userPassword = "troll";
- UUID userId = UUID.Parse("00000000-0000-0000-0000-000000000020");
- UserProfileTestUtils.CreateUserWithInventory(scene, userFirstName, userLastName, userId, userPassword);
-
- // Create asset
- SceneObjectGroup object1;
- SceneObjectPart part1;
- {
- string partName = "My Little Dog Object";
- UUID ownerId = UUID.Parse("00000000-0000-0000-0000-000000000040");
- PrimitiveBaseShape shape = PrimitiveBaseShape.CreateSphere();
- Vector3 groupPosition = new Vector3(10, 20, 30);
- Quaternion rotationOffset = new Quaternion(20, 30, 40, 50);
- Vector3 offsetPosition = new Vector3(5, 10, 15);
-
- part1
- = new SceneObjectPart(
- ownerId, shape, groupPosition, rotationOffset, offsetPosition);
- part1.Name = partName;
-
- object1 = new SceneObjectGroup(part1);
- scene.AddNewSceneObject(object1, false);
- }
-
- UUID asset1Id = UUID.Parse("00000000-0000-0000-0000-000000000060");
- AssetBase asset1 = AssetHelpers.CreateAsset(asset1Id, object1);
- scene.AssetService.Store(asset1);
-
- // Create item
- UUID item1Id = UUID.Parse("00000000-0000-0000-0000-000000000080");
- InventoryItemBase item1 = new InventoryItemBase();
- item1.Name = "My Little Dog";
- item1.AssetID = asset1.FullID;
- item1.ID = item1Id;
- InventoryFolderBase objsFolder
- = InventoryArchiveUtils.FindFolderByPath(scene.InventoryService, userId, "Objects")[0];
- item1.Folder = objsFolder.ID;
- scene.AddInventoryItem(item1);
-
- MemoryStream archiveWriteStream = new MemoryStream();
- archiverModule.OnInventoryArchiveSaved += SaveCompleted;
-
- // Test saving a particular path
- mre.Reset();
- archiverModule.ArchiveInventory(
- Guid.NewGuid(), userFirstName, userLastName, "Objects", userPassword, archiveWriteStream);
- mre.WaitOne(60000, false);
-
- byte[] archive = archiveWriteStream.ToArray();
- MemoryStream archiveReadStream = new MemoryStream(archive);
- TarArchiveReader tar = new TarArchiveReader(archiveReadStream);
-
- //bool gotControlFile = false;
- bool gotObject1File = false;
- //bool gotObject2File = false;
- string expectedObject1FileName = InventoryArchiveWriteRequest.CreateArchiveItemName(item1);
- string expectedObject1FilePath = string.Format(
- "{0}{1}{2}",
- ArchiveConstants.INVENTORY_PATH,
- InventoryArchiveWriteRequest.CreateArchiveFolderName(objsFolder),
- expectedObject1FileName);
-
- string filePath;
- TarArchiveReader.TarEntryType tarEntryType;
-
-// Console.WriteLine("Reading archive");
-
- while (tar.ReadEntry(out filePath, out tarEntryType) != null)
- {
-// Console.WriteLine("Got {0}", filePath);
-
-// if (ArchiveConstants.CONTROL_FILE_PATH == filePath)
-// {
-// gotControlFile = true;
-// }
-
- if (filePath.StartsWith(ArchiveConstants.INVENTORY_PATH) && filePath.EndsWith(".xml"))
- {
-// string fileName = filePath.Remove(0, "Objects/".Length);
-//
-// if (fileName.StartsWith(part1.Name))
-// {
- Assert.That(expectedObject1FilePath, Is.EqualTo(filePath));
- gotObject1File = true;
-// }
-// else if (fileName.StartsWith(part2.Name))
-// {
-// Assert.That(fileName, Is.EqualTo(expectedObject2FileName));
-// gotObject2File = true;
-// }
- }
- }
-
-// Assert.That(gotControlFile, Is.True, "No control file in archive");
- Assert.That(gotObject1File, Is.True, "No item1 file in archive");
-// Assert.That(gotObject2File, Is.True, "No object2 file in archive");
-
- // TODO: Test presence of more files and contents of files.
- }
-
+ public class InventoryArchiverTests : InventoryArchiveTestCase
+ {
///
/// Test saving a single inventory item to a V0.1 OpenSim Inventory Archive
/// (subject to change since there is no fixed format yet).
@@ -357,30 +170,6 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver.Tests
}
///
- /// Test that things work when the load path specified starts with a slash
- ///
- [Test]
- public void TestLoadIarPathStartsWithSlash()
- {
- TestHelper.InMethod();
-// log4net.Config.XmlConfigurator.Configure();
-
- SerialiserModule serialiserModule = new SerialiserModule();
- InventoryArchiverModule archiverModule = new InventoryArchiverModule();
- Scene scene = SceneSetupHelpers.SetupScene("inventory");
- SceneSetupHelpers.SetupSceneModules(scene, serialiserModule, archiverModule);
-
- UserProfileTestUtils.CreateUserWithInventory(scene, m_ua1, "password");
- archiverModule.DearchiveInventory(m_ua1.FirstName, m_ua1.LastName, "/Objects", "password", m_iarStream);
-
- InventoryItemBase foundItem1
- = InventoryArchiveUtils.FindItemByPath(
- scene.InventoryService, m_ua1.PrincipalID, "/Objects/" + m_item1Name);
-
- Assert.That(foundItem1, Is.Not.Null, "Didn't find loaded item 1 in TestLoadIarFolderStartsWithSlash()");
- }
-
- ///
/// Test loading a V0.1 OpenSim Inventory Archive (subject to change since there is no fixed format yet) where
/// an account exists with the creator name.
///
@@ -443,88 +232,6 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver.Tests
Assert.That(foundItem3, Is.Not.Null, "Didn't find loaded item 3");
}
- [Test]
- public void TestIarV0_1WithEscapedChars()
- {
- TestHelper.InMethod();
-// log4net.Config.XmlConfigurator.Configure();
-
- string itemName = "You & you are a mean/man/";
- string humanEscapedItemName = @"You & you are a mean\/man\/";
- string userPassword = "meowfood";
-
- InventoryArchiverModule archiverModule = new InventoryArchiverModule();
-
- Scene scene = SceneSetupHelpers.SetupScene("Inventory");
- SceneSetupHelpers.SetupSceneModules(scene, archiverModule);
-
- // Create user
- string userFirstName = "Jock";
- string userLastName = "Stirrup";
- UUID userId = UUID.Parse("00000000-0000-0000-0000-000000000020");
- UserProfileTestUtils.CreateUserWithInventory(scene, userFirstName, userLastName, userId, "meowfood");
-
- // Create asset
- SceneObjectGroup object1;
- SceneObjectPart part1;
- {
- string partName = "part name";
- UUID ownerId = UUID.Parse("00000000-0000-0000-0000-000000000040");
- PrimitiveBaseShape shape = PrimitiveBaseShape.CreateSphere();
- Vector3 groupPosition = new Vector3(10, 20, 30);
- Quaternion rotationOffset = new Quaternion(20, 30, 40, 50);
- Vector3 offsetPosition = new Vector3(5, 10, 15);
-
- part1
- = new SceneObjectPart(
- ownerId, shape, groupPosition, rotationOffset, offsetPosition);
- part1.Name = partName;
-
- object1 = new SceneObjectGroup(part1);
- scene.AddNewSceneObject(object1, false);
- }
-
- UUID asset1Id = UUID.Parse("00000000-0000-0000-0000-000000000060");
- AssetBase asset1 = AssetHelpers.CreateAsset(asset1Id, object1);
- scene.AssetService.Store(asset1);
-
- // Create item
- UUID item1Id = UUID.Parse("00000000-0000-0000-0000-000000000080");
- InventoryItemBase item1 = new InventoryItemBase();
- item1.Name = itemName;
- item1.AssetID = asset1.FullID;
- item1.ID = item1Id;
- InventoryFolderBase objsFolder
- = InventoryArchiveUtils.FindFolderByPath(scene.InventoryService, userId, "Objects")[0];
- item1.Folder = objsFolder.ID;
- scene.AddInventoryItem(item1);
-
- MemoryStream archiveWriteStream = new MemoryStream();
- archiverModule.OnInventoryArchiveSaved += SaveCompleted;
-
- mre.Reset();
- archiverModule.ArchiveInventory(
- Guid.NewGuid(), userFirstName, userLastName, "Objects", userPassword, archiveWriteStream);
- mre.WaitOne(60000, false);
-
- // LOAD ITEM
- MemoryStream archiveReadStream = new MemoryStream(archiveWriteStream.ToArray());
-
- archiverModule.DearchiveInventory(userFirstName, userLastName, "Scripts", userPassword, archiveReadStream);
-
- InventoryItemBase foundItem1
- = InventoryArchiveUtils.FindItemByPath(
- scene.InventoryService, userId, "Scripts/Objects/" + humanEscapedItemName);
-
- Assert.That(foundItem1, Is.Not.Null, "Didn't find loaded item 1");
-// Assert.That(
-// foundItem1.CreatorId, Is.EqualTo(userUuid),
-// "Loaded item non-uuid creator doesn't match that of the loading user");
- Assert.That(
- foundItem1.Name, Is.EqualTo(itemName),
- "Loaded item name doesn't match saved name");
- }
-
///
/// Test loading a V0.1 OpenSim Inventory Archive (subject to change since there is no fixed format yet) where
/// embedded creators do not exist in the system
@@ -554,241 +261,5 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver.Tests
foundItem1.CreatorIdAsUuid, Is.EqualTo(m_ua1.PrincipalID),
"Loaded item uuid creator doesn't match that of the loading user");
}
-
- ///
- /// Test loading a V0.1 OpenSim Inventory Archive (subject to change since there is no fixed format yet) where
- /// no account exists with the creator name
- ///
- /// Disabled since temporary profiles have not yet been implemented.
- ///
- //[Test]
- //public void TestLoadIarV0_1TempProfiles()
- //{
- // TestHelper.InMethod();
-
- // //log4net.Config.XmlConfigurator.Configure();
-
- // string userFirstName = "Dennis";
- // string userLastName = "Menace";
- // UUID userUuid = UUID.Parse("00000000-0000-0000-0000-000000000aaa");
- // string user2FirstName = "Walter";
- // string user2LastName = "Mitty";
-
- // string itemName = "b.lsl";
- // string archiveItemName = InventoryArchiveWriteRequest.CreateArchiveItemName(itemName, UUID.Random());
-
- // MemoryStream archiveWriteStream = new MemoryStream();
- // TarArchiveWriter tar = new TarArchiveWriter(archiveWriteStream);
-
- // InventoryItemBase item1 = new InventoryItemBase();
- // item1.Name = itemName;
- // item1.AssetID = UUID.Random();
- // item1.GroupID = UUID.Random();
- // item1.CreatorId = OspResolver.MakeOspa(user2FirstName, user2LastName);
- // item1.Owner = UUID.Zero;
-
- // string item1FileName
- // = string.Format("{0}{1}", ArchiveConstants.INVENTORY_PATH, archiveItemName);
- // tar.WriteFile(item1FileName, UserInventoryItemSerializer.Serialize(item1));
- // tar.Close();
-
- // MemoryStream archiveReadStream = new MemoryStream(archiveWriteStream.ToArray());
- // SerialiserModule serialiserModule = new SerialiserModule();
- // InventoryArchiverModule archiverModule = new InventoryArchiverModule();
-
- // // Annoyingly, we have to set up a scene even though inventory loading has nothing to do with a scene
- // Scene scene = SceneSetupHelpers.SetupScene();
- // IUserAdminService userAdminService = scene.CommsManager.UserAdminService;
-
- // SceneSetupHelpers.SetupSceneModules(scene, serialiserModule, archiverModule);
- // userAdminService.AddUser(
- // userFirstName, userLastName, "meowfood", String.Empty, 1000, 1000, userUuid);
-
- // archiverModule.DearchiveInventory(userFirstName, userLastName, "/", "troll", archiveReadStream);
-
- // // Check that a suitable temporary user profile has been created.
- // UserProfileData user2Profile
- // = scene.CommsManager.UserService.GetUserProfile(
- // OspResolver.HashName(user2FirstName + " " + user2LastName));
- // Assert.That(user2Profile, Is.Not.Null);
- // Assert.That(user2Profile.FirstName == user2FirstName);
- // Assert.That(user2Profile.SurName == user2LastName);
-
- // CachedUserInfo userInfo
- // = scene.CommsManager.UserProfileCacheService.GetUserDetails(userFirstName, userLastName);
- // userInfo.OnInventoryReceived += InventoryReceived;
-
- // lock (this)
- // {
- // userInfo.FetchInventory();
- // Monitor.Wait(this, 60000);
- // }
-
- // InventoryItemBase foundItem = userInfo.RootFolder.FindItemByPath(itemName);
-
- // Assert.That(foundItem.CreatorId, Is.EqualTo(item1.CreatorId));
- // Assert.That(
- // foundItem.CreatorIdAsUuid, Is.EqualTo(OspResolver.HashName(user2FirstName + " " + user2LastName)));
- // Assert.That(foundItem.Owner, Is.EqualTo(userUuid));
-
- // Console.WriteLine("### Successfully completed {0} ###", MethodBase.GetCurrentMethod());
- //}
-
- ///
- /// Test replication of an archive path to the user's inventory.
- ///
- [Test]
- public void TestNewIarPath()
- {
- TestHelper.InMethod();
-// log4net.Config.XmlConfigurator.Configure();
-
- Scene scene = SceneSetupHelpers.SetupScene("inventory");
- UserAccount ua1 = UserProfileTestUtils.CreateUserWithInventory(scene);
-
- Dictionary foldersCreated = new Dictionary();
- HashSet nodesLoaded = new HashSet();
-
- string folder1Name = "1";
- string folder2aName = "2a";
- string folder2bName = "2b";
-
- string folder1ArchiveName = InventoryArchiveWriteRequest.CreateArchiveFolderName(folder1Name, UUID.Random());
- string folder2aArchiveName = InventoryArchiveWriteRequest.CreateArchiveFolderName(folder2aName, UUID.Random());
- string folder2bArchiveName = InventoryArchiveWriteRequest.CreateArchiveFolderName(folder2bName, UUID.Random());
-
- string iarPath1 = string.Join("", new string[] { folder1ArchiveName, folder2aArchiveName });
- string iarPath2 = string.Join("", new string[] { folder1ArchiveName, folder2bArchiveName });
-
- {
- // Test replication of path1
- new InventoryArchiveReadRequest(scene, ua1, null, (Stream)null, false)
- .ReplicateArchivePathToUserInventory(
- iarPath1, scene.InventoryService.GetRootFolder(ua1.PrincipalID),
- foldersCreated, nodesLoaded);
-
- List folder1Candidates
- = InventoryArchiveUtils.FindFolderByPath(scene.InventoryService, ua1.PrincipalID, folder1Name);
- Assert.That(folder1Candidates.Count, Is.EqualTo(1));
-
- InventoryFolderBase folder1 = folder1Candidates[0];
- List folder2aCandidates
- = InventoryArchiveUtils.FindFolderByPath(scene.InventoryService, folder1, folder2aName);
- Assert.That(folder2aCandidates.Count, Is.EqualTo(1));
- }
-
- {
- // Test replication of path2
- new InventoryArchiveReadRequest(scene, ua1, null, (Stream)null, false)
- .ReplicateArchivePathToUserInventory(
- iarPath2, scene.InventoryService.GetRootFolder(ua1.PrincipalID),
- foldersCreated, nodesLoaded);
-
- List folder1Candidates
- = InventoryArchiveUtils.FindFolderByPath(scene.InventoryService, ua1.PrincipalID, folder1Name);
- Assert.That(folder1Candidates.Count, Is.EqualTo(1));
-
- InventoryFolderBase folder1 = folder1Candidates[0];
-
- List folder2aCandidates
- = InventoryArchiveUtils.FindFolderByPath(scene.InventoryService, folder1, folder2aName);
- Assert.That(folder2aCandidates.Count, Is.EqualTo(1));
-
- List folder2bCandidates
- = InventoryArchiveUtils.FindFolderByPath(scene.InventoryService, folder1, folder2bName);
- Assert.That(folder2bCandidates.Count, Is.EqualTo(1));
- }
- }
-
- ///
- /// Test replication of a partly existing archive path to the user's inventory. This should create
- /// a duplicate path without the merge option.
- ///
- [Test]
- public void TestPartExistingIarPath()
- {
- TestHelper.InMethod();
- //log4net.Config.XmlConfigurator.Configure();
-
- Scene scene = SceneSetupHelpers.SetupScene("inventory");
- UserAccount ua1 = UserProfileTestUtils.CreateUserWithInventory(scene);
-
- string folder1ExistingName = "a";
- string folder2Name = "b";
-
- InventoryFolderBase folder1
- = UserInventoryTestUtils.CreateInventoryFolder(
- scene.InventoryService, ua1.PrincipalID, folder1ExistingName);
-
- string folder1ArchiveName = InventoryArchiveWriteRequest.CreateArchiveFolderName(folder1ExistingName, UUID.Random());
- string folder2ArchiveName = InventoryArchiveWriteRequest.CreateArchiveFolderName(folder2Name, UUID.Random());
-
- string itemArchivePath = string.Join("", new string[] { folder1ArchiveName, folder2ArchiveName });
-
- new InventoryArchiveReadRequest(scene, ua1, null, (Stream)null, false)
- .ReplicateArchivePathToUserInventory(
- itemArchivePath, scene.InventoryService.GetRootFolder(ua1.PrincipalID),
- new Dictionary(), new HashSet());
-
- List folder1PostCandidates
- = InventoryArchiveUtils.FindFolderByPath(scene.InventoryService, ua1.PrincipalID, folder1ExistingName);
- Assert.That(folder1PostCandidates.Count, Is.EqualTo(2));
-
- // FIXME: Temporarily, we're going to do something messy to make sure we pick up the created folder.
- InventoryFolderBase folder1Post = null;
- foreach (InventoryFolderBase folder in folder1PostCandidates)
- {
- if (folder.ID != folder1.ID)
- {
- folder1Post = folder;
- break;
- }
- }
-// Assert.That(folder1Post.ID, Is.EqualTo(folder1.ID));
-
- List folder2PostCandidates
- = InventoryArchiveUtils.FindFolderByPath(scene.InventoryService, folder1Post, "b");
- Assert.That(folder2PostCandidates.Count, Is.EqualTo(1));
- }
-
- ///
- /// Test replication of a partly existing archive path to the user's inventory. This should create
- /// a merged path.
- ///
- [Test]
- public void TestMergeIarPath()
- {
- TestHelper.InMethod();
-// log4net.Config.XmlConfigurator.Configure();
-
- Scene scene = SceneSetupHelpers.SetupScene("inventory");
- UserAccount ua1 = UserProfileTestUtils.CreateUserWithInventory(scene);
-
- string folder1ExistingName = "a";
- string folder2Name = "b";
-
- InventoryFolderBase folder1
- = UserInventoryTestUtils.CreateInventoryFolder(
- scene.InventoryService, ua1.PrincipalID, folder1ExistingName);
-
- string folder1ArchiveName = InventoryArchiveWriteRequest.CreateArchiveFolderName(folder1ExistingName, UUID.Random());
- string folder2ArchiveName = InventoryArchiveWriteRequest.CreateArchiveFolderName(folder2Name, UUID.Random());
-
- string itemArchivePath = string.Join("", new string[] { folder1ArchiveName, folder2ArchiveName });
-
- new InventoryArchiveReadRequest(scene, ua1, folder1ExistingName, (Stream)null, true)
- .ReplicateArchivePathToUserInventory(
- itemArchivePath, scene.InventoryService.GetRootFolder(ua1.PrincipalID),
- new Dictionary(), new HashSet());
-
- List folder1PostCandidates
- = InventoryArchiveUtils.FindFolderByPath(scene.InventoryService, ua1.PrincipalID, folder1ExistingName);
- Assert.That(folder1PostCandidates.Count, Is.EqualTo(1));
- Assert.That(folder1PostCandidates[0].ID, Is.EqualTo(folder1.ID));
-
- List folder2PostCandidates
- = InventoryArchiveUtils.FindFolderByPath(scene.InventoryService, folder1PostCandidates[0], "b");
- Assert.That(folder2PostCandidates.Count, Is.EqualTo(1));
- }
}
}
\ No newline at end of file
--
cgit v1.1
From 9456bb77fbf794bb6fc2808e6cfd69c9bb1d1326 Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Wed, 9 Mar 2011 23:25:24 +0000
Subject: Upgrade nunit.framework.dll to version 2.5.9. Fix up tests
appropriately.
This version removes the NUnit.Framework.SyntaxHelpers namespace, so any modules with their own tests will need to delete this using statement.
---
.../Avatar/Inventory/Archiver/Tests/InventoryArchiverTests.cs | 1 -
1 file changed, 1 deletion(-)
(limited to 'OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/Tests/InventoryArchiverTests.cs')
diff --git a/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/Tests/InventoryArchiverTests.cs b/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/Tests/InventoryArchiverTests.cs
index edbbd81..67d7159 100644
--- a/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/Tests/InventoryArchiverTests.cs
+++ b/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/Tests/InventoryArchiverTests.cs
@@ -31,7 +31,6 @@ using System.IO;
using System.Reflection;
using System.Threading;
using NUnit.Framework;
-using NUnit.Framework.SyntaxHelpers;
using OpenMetaverse;
using OpenSim.Data;
using OpenSim.Framework;
--
cgit v1.1
From 549b0ea17ced61af995984bf8c155477bf9d624b Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Thu, 10 Mar 2011 00:06:32 +0000
Subject: Split the inventory path testing parts of
TestLoadIarV0_1ExistingUsers() into a new test TestLoadIarToInventoryPaths()
---
.../Archiver/Tests/InventoryArchiverTests.cs | 22 ----------------------
1 file changed, 22 deletions(-)
(limited to 'OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/Tests/InventoryArchiverTests.cs')
diff --git a/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/Tests/InventoryArchiverTests.cs b/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/Tests/InventoryArchiverTests.cs
index 67d7159..5f75c4a 100644
--- a/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/Tests/InventoryArchiverTests.cs
+++ b/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/Tests/InventoryArchiverTests.cs
@@ -172,8 +172,6 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver.Tests
/// Test loading a V0.1 OpenSim Inventory Archive (subject to change since there is no fixed format yet) where
/// an account exists with the creator name.
///
- ///
- /// This test also does some deeper probing of loading into nested inventory structures
[Test]
public void TestLoadIarV0_1ExistingUsers()
{
@@ -194,8 +192,6 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver.Tests
archiverModule.DearchiveInventory(m_ua1.FirstName, m_ua1.LastName, "/", "meowfood", m_iarStream);
InventoryItemBase foundItem1
= InventoryArchiveUtils.FindItemByPath(scene.InventoryService, m_ua1.PrincipalID, m_item1Name);
-
- Assert.That(foundItem1, Is.Not.Null, "Didn't find loaded item 1");
// We have to disable this check since loaded items that did find users via OSPA resolution are now only storing the
// UUID, not the OSPA itself.
@@ -211,24 +207,6 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver.Tests
"Loaded item uuid creator doesn't match original");
Assert.That(foundItem1.Owner, Is.EqualTo(m_ua1.PrincipalID),
"Loaded item owner doesn't match inventory reciever");
-
- // Now try loading to a root child folder
- UserInventoryTestUtils.CreateInventoryFolder(scene.InventoryService, m_ua1.PrincipalID, "xA");
- MemoryStream archiveReadStream = new MemoryStream(m_iarStream.ToArray());
- archiverModule.DearchiveInventory(m_ua1.FirstName, m_ua1.LastName, "xA", "meowfood", archiveReadStream);
-
- InventoryItemBase foundItem2
- = InventoryArchiveUtils.FindItemByPath(scene.InventoryService, m_ua1.PrincipalID, "xA/" + m_item1Name);
- Assert.That(foundItem2, Is.Not.Null, "Didn't find loaded item 2");
-
- // Now try loading to a more deeply nested folder
- UserInventoryTestUtils.CreateInventoryFolder(scene.InventoryService, m_ua1.PrincipalID, "xB/xC");
- archiveReadStream = new MemoryStream(archiveReadStream.ToArray());
- archiverModule.DearchiveInventory(m_ua1.FirstName, m_ua1.LastName, "xB/xC", "meowfood", archiveReadStream);
-
- InventoryItemBase foundItem3
- = InventoryArchiveUtils.FindItemByPath(scene.InventoryService, m_ua1.PrincipalID, "xB/xC/" + m_item1Name);
- Assert.That(foundItem3, Is.Not.Null, "Didn't find loaded item 3");
}
///
--
cgit v1.1
From 4dd60b7dce4421bec89e9964a3fb51a1658945ad Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Thu, 10 Mar 2011 00:19:17 +0000
Subject: Change existing users load iar test so that it fulfills it's original
intention (i.e. OSPA resolution, which is still active).
Will need to write a separate test for the simplest case where creator accounts with appropriate uuids exist on iar load.
---
.../Archiver/Tests/InventoryArchiverTests.cs | 19 +++++++++----------
1 file changed, 9 insertions(+), 10 deletions(-)
(limited to 'OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/Tests/InventoryArchiverTests.cs')
diff --git a/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/Tests/InventoryArchiverTests.cs b/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/Tests/InventoryArchiverTests.cs
index 5f75c4a..b52014b 100644
--- a/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/Tests/InventoryArchiverTests.cs
+++ b/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/Tests/InventoryArchiverTests.cs
@@ -170,10 +170,10 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver.Tests
///
/// Test loading a V0.1 OpenSim Inventory Archive (subject to change since there is no fixed format yet) where
- /// an account exists with the creator name.
+ /// an account exists with the same name as the creator, though not the same id.
///
[Test]
- public void TestLoadIarV0_1ExistingUsers()
+ public void TestLoadIarV0_1SameNameCreator()
{
TestHelper.InMethod();
// log4net.Config.XmlConfigurator.Configure();
@@ -187,7 +187,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver.Tests
SceneSetupHelpers.SetupSceneModules(scene, serialiserModule, archiverModule);
UserProfileTestUtils.CreateUserWithInventory(scene, m_ua1, "meowfood");
- UserProfileTestUtils.CreateUserWithInventory(scene, m_ua2, "hampshire");
+ UserProfileTestUtils.CreateUserWithInventory(scene, m_ua3, "hampshire");
archiverModule.DearchiveInventory(m_ua1.FirstName, m_ua1.LastName, "/", "meowfood", m_iarStream);
InventoryItemBase foundItem1
@@ -198,12 +198,11 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver.Tests
// Assert.That(
// foundItem1.CreatorId, Is.EqualTo(item1.CreatorId),
// "Loaded item non-uuid creator doesn't match original");
-// Assert.That(
-// foundItem1.CreatorId, Is.EqualTo(m_ua2.PrincipalID.ToString()),
-// "Loaded item non-uuid creator doesn't match original");
-
Assert.That(
- foundItem1.CreatorIdAsUuid, Is.EqualTo(m_ua2.PrincipalID),
+ foundItem1.CreatorId, Is.EqualTo(m_ua3.PrincipalID.ToString()),
+ "Loaded item non-uuid creator doesn't match original");
+ Assert.That(
+ foundItem1.CreatorIdAsUuid, Is.EqualTo(m_ua3.PrincipalID),
"Loaded item uuid creator doesn't match original");
Assert.That(foundItem1.Owner, Is.EqualTo(m_ua1.PrincipalID),
"Loaded item owner doesn't match inventory reciever");
@@ -211,10 +210,10 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver.Tests
///
/// Test loading a V0.1 OpenSim Inventory Archive (subject to change since there is no fixed format yet) where
- /// embedded creators do not exist in the system
+ /// the creator or an account with the creator's name does not exist within the system.
///
[Test]
- public void TestLoadIarV0_1AbsentUsers()
+ public void TestLoadIarV0_1AbsentCreator()
{
TestHelper.InMethod();
// log4net.Config.XmlConfigurator.Configure();
--
cgit v1.1
From a151afebe3348ad05db3d78074e3eaf99dc06afe Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Thu, 10 Mar 2011 19:40:19 +0000
Subject: When setting up default iar for testing, use iar archiving code
rather than constructing the tar manually
---
.../Avatar/Inventory/Archiver/Tests/InventoryArchiverTests.cs | 6 ++++++
1 file changed, 6 insertions(+)
(limited to 'OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/Tests/InventoryArchiverTests.cs')
diff --git a/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/Tests/InventoryArchiverTests.cs b/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/Tests/InventoryArchiverTests.cs
index b52014b..3eb4104 100644
--- a/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/Tests/InventoryArchiverTests.cs
+++ b/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/Tests/InventoryArchiverTests.cs
@@ -206,6 +206,12 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver.Tests
"Loaded item uuid creator doesn't match original");
Assert.That(foundItem1.Owner, Is.EqualTo(m_ua1.PrincipalID),
"Loaded item owner doesn't match inventory reciever");
+
+// AssetBase asset1 = scene.AssetService.Get(foundItem1.AssetID.ToString());
+// string xmlData = Utils.BytesToString(asset1.Data);
+// SceneObjectGroup sog1 = SceneObjectSerializer.FromOriginalXmlFormat(xmlData);
+//
+// Assert.That(sog1.RootPart.CreatorID, Is.EqualTo(m_ua3.PrincipalID.ToString()));
}
///
--
cgit v1.1
From b821f748ac591258f015ecf3ba8011d5561c488d Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Thu, 10 Mar 2011 21:56:15 +0000
Subject: For objects loaded from an IAR, make sure the CreatorID points
towards the OSP resolved ID if newer CreationData is not present.
This should resolve issues where the creator for rezzed objects was being shown as "Unknown user" where previous behaviour was to show the OSP resolved account.
This is being done by parsing the serialized objects and updating the CreatorID if no CreationData exists. This operation might be expensive for sculpties where the sculpt texture is inlined with the object data. Will just have to see.
This relies on the IAR streaming inventory data before asset data (as is currently the case). Will need to introduce more stringent checks for file order on loading (much like JAR zips must start with the manifest file).
This is for IAR loading only. Tests updated to check this behaviour.
---
.../Avatar/Inventory/Archiver/Tests/InventoryArchiverTests.cs | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
(limited to 'OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/Tests/InventoryArchiverTests.cs')
diff --git a/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/Tests/InventoryArchiverTests.cs b/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/Tests/InventoryArchiverTests.cs
index 3eb4104..5065227 100644
--- a/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/Tests/InventoryArchiverTests.cs
+++ b/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/Tests/InventoryArchiverTests.cs
@@ -207,11 +207,11 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver.Tests
Assert.That(foundItem1.Owner, Is.EqualTo(m_ua1.PrincipalID),
"Loaded item owner doesn't match inventory reciever");
-// AssetBase asset1 = scene.AssetService.Get(foundItem1.AssetID.ToString());
-// string xmlData = Utils.BytesToString(asset1.Data);
-// SceneObjectGroup sog1 = SceneObjectSerializer.FromOriginalXmlFormat(xmlData);
-//
-// Assert.That(sog1.RootPart.CreatorID, Is.EqualTo(m_ua3.PrincipalID.ToString()));
+ AssetBase asset1 = scene.AssetService.Get(foundItem1.AssetID.ToString());
+ string xmlData = Utils.BytesToString(asset1.Data);
+ SceneObjectGroup sog1 = SceneObjectSerializer.FromOriginalXmlFormat(xmlData);
+
+ Assert.That(sog1.RootPart.CreatorID, Is.EqualTo(m_ua3.PrincipalID));
}
///
--
cgit v1.1
From ce4421497e47d709018e6aba9e99317d6a936b98 Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Thu, 10 Mar 2011 22:38:52 +0000
Subject: re-enable item.CreatorId check in TestLoadIarV0_1AbsentCreator()
---
.../Avatar/Inventory/Archiver/Tests/InventoryArchiverTests.cs | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
(limited to 'OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/Tests/InventoryArchiverTests.cs')
diff --git a/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/Tests/InventoryArchiverTests.cs b/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/Tests/InventoryArchiverTests.cs
index 5065227..a092b65 100644
--- a/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/Tests/InventoryArchiverTests.cs
+++ b/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/Tests/InventoryArchiverTests.cs
@@ -236,9 +236,9 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver.Tests
= InventoryArchiveUtils.FindItemByPath(scene.InventoryService, m_ua1.PrincipalID, m_item1Name);
Assert.That(foundItem1, Is.Not.Null, "Didn't find loaded item 1");
-// Assert.That(
-// foundItem1.CreatorId, Is.EqualTo(userUuid),
-// "Loaded item non-uuid creator doesn't match that of the loading user");
+ Assert.That(
+ foundItem1.CreatorId, Is.EqualTo(m_ua1.PrincipalID.ToString()),
+ "Loaded item non-uuid creator doesn't match that of the loading user");
Assert.That(
foundItem1.CreatorIdAsUuid, Is.EqualTo(m_ua1.PrincipalID),
"Loaded item uuid creator doesn't match that of the loading user");
--
cgit v1.1
From 66d2d35425ee61e11445fc04c6d4949cdde85b87 Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Thu, 10 Mar 2011 22:40:24 +0000
Subject: extend TestLoadIarV0_1AbsentCreator() to check serialized object
CreatorId as well
---
.../Avatar/Inventory/Archiver/Tests/InventoryArchiverTests.cs | 6 ++++++
1 file changed, 6 insertions(+)
(limited to 'OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/Tests/InventoryArchiverTests.cs')
diff --git a/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/Tests/InventoryArchiverTests.cs b/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/Tests/InventoryArchiverTests.cs
index a092b65..78faefd 100644
--- a/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/Tests/InventoryArchiverTests.cs
+++ b/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/Tests/InventoryArchiverTests.cs
@@ -242,6 +242,12 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver.Tests
Assert.That(
foundItem1.CreatorIdAsUuid, Is.EqualTo(m_ua1.PrincipalID),
"Loaded item uuid creator doesn't match that of the loading user");
+
+ AssetBase asset1 = scene.AssetService.Get(foundItem1.AssetID.ToString());
+ string xmlData = Utils.BytesToString(asset1.Data);
+ SceneObjectGroup sog1 = SceneObjectSerializer.FromOriginalXmlFormat(xmlData);
+
+ Assert.That(sog1.RootPart.CreatorID, Is.EqualTo(m_ua1.PrincipalID));
}
}
}
\ No newline at end of file
--
cgit v1.1
From 9ecb745ed77c33631503e8ebbbfe82fd5fc3bb7c Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Thu, 10 Mar 2011 22:48:19 +0000
Subject: factor out common scene setup code in InventoryArchiveTestCase
---
.../Archiver/Tests/InventoryArchiverTests.cs | 72 ++++++++++------------
1 file changed, 32 insertions(+), 40 deletions(-)
(limited to 'OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/Tests/InventoryArchiverTests.cs')
diff --git a/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/Tests/InventoryArchiverTests.cs b/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/Tests/InventoryArchiverTests.cs
index 78faefd..79b4777 100644
--- a/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/Tests/InventoryArchiverTests.cs
+++ b/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/Tests/InventoryArchiverTests.cs
@@ -50,7 +50,22 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver.Tests
{
[TestFixture]
public class InventoryArchiverTests : InventoryArchiveTestCase
- {
+ {
+ protected TestScene m_scene;
+ protected InventoryArchiverModule m_archiverModule;
+
+ [SetUp]
+ public override void SetUp()
+ {
+ base.SetUp();
+
+ SerialiserModule serialiserModule = new SerialiserModule();
+ m_archiverModule = new InventoryArchiverModule();
+
+ m_scene = SceneSetupHelpers.SetupScene("Inventory");
+ SceneSetupHelpers.SetupSceneModules(m_scene, serialiserModule, m_archiverModule);
+ }
+
///
/// Test saving a single inventory item to a V0.1 OpenSim Inventory Archive
/// (subject to change since there is no fixed format yet).
@@ -61,17 +76,12 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver.Tests
TestHelper.InMethod();
// log4net.Config.XmlConfigurator.Configure();
- InventoryArchiverModule archiverModule = new InventoryArchiverModule();
-
- Scene scene = SceneSetupHelpers.SetupScene("Inventory");
- SceneSetupHelpers.SetupSceneModules(scene, archiverModule);
-
// Create user
string userFirstName = "Jock";
string userLastName = "Stirrup";
string userPassword = "troll";
UUID userId = UUID.Parse("00000000-0000-0000-0000-000000000020");
- UserProfileTestUtils.CreateUserWithInventory(scene, userFirstName, userLastName, userId, userPassword);
+ UserProfileTestUtils.CreateUserWithInventory(m_scene, userFirstName, userLastName, userId, userPassword);
// Create asset
SceneObjectGroup object1;
@@ -90,12 +100,12 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver.Tests
part1.Name = partName;
object1 = new SceneObjectGroup(part1);
- scene.AddNewSceneObject(object1, false);
+ m_scene.AddNewSceneObject(object1, false);
}
UUID asset1Id = UUID.Parse("00000000-0000-0000-0000-000000000060");
AssetBase asset1 = AssetHelpers.CreateAsset(asset1Id, object1);
- scene.AssetService.Store(asset1);
+ m_scene.AssetService.Store(asset1);
// Create item
UUID item1Id = UUID.Parse("00000000-0000-0000-0000-000000000080");
@@ -105,15 +115,15 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver.Tests
item1.AssetID = asset1.FullID;
item1.ID = item1Id;
InventoryFolderBase objsFolder
- = InventoryArchiveUtils.FindFolderByPath(scene.InventoryService, userId, "Objects")[0];
+ = InventoryArchiveUtils.FindFolderByPath(m_scene.InventoryService, userId, "Objects")[0];
item1.Folder = objsFolder.ID;
- scene.AddInventoryItem(item1);
+ m_scene.AddInventoryItem(item1);
MemoryStream archiveWriteStream = new MemoryStream();
- archiverModule.OnInventoryArchiveSaved += SaveCompleted;
+ m_archiverModule.OnInventoryArchiveSaved += SaveCompleted;
mre.Reset();
- archiverModule.ArchiveInventory(
+ m_archiverModule.ArchiveInventory(
Guid.NewGuid(), userFirstName, userLastName, "Objects/" + item1Name, userPassword, archiveWriteStream);
mre.WaitOne(60000, false);
@@ -177,27 +187,14 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver.Tests
{
TestHelper.InMethod();
// log4net.Config.XmlConfigurator.Configure();
-
- SerialiserModule serialiserModule = new SerialiserModule();
- InventoryArchiverModule archiverModule = new InventoryArchiverModule();
-
- // Annoyingly, we have to set up a scene even though inventory loading has nothing to do with a scene
- Scene scene = SceneSetupHelpers.SetupScene("inventory");
-
- SceneSetupHelpers.SetupSceneModules(scene, serialiserModule, archiverModule);
- UserProfileTestUtils.CreateUserWithInventory(scene, m_ua1, "meowfood");
- UserProfileTestUtils.CreateUserWithInventory(scene, m_ua3, "hampshire");
+ UserProfileTestUtils.CreateUserWithInventory(m_scene, m_ua1, "meowfood");
+ UserProfileTestUtils.CreateUserWithInventory(m_scene, m_ua3, "hampshire");
- archiverModule.DearchiveInventory(m_ua1.FirstName, m_ua1.LastName, "/", "meowfood", m_iarStream);
+ m_archiverModule.DearchiveInventory(m_ua1.FirstName, m_ua1.LastName, "/", "meowfood", m_iarStream);
InventoryItemBase foundItem1
- = InventoryArchiveUtils.FindItemByPath(scene.InventoryService, m_ua1.PrincipalID, m_item1Name);
+ = InventoryArchiveUtils.FindItemByPath(m_scene.InventoryService, m_ua1.PrincipalID, m_item1Name);
-// We have to disable this check since loaded items that did find users via OSPA resolution are now only storing the
-// UUID, not the OSPA itself.
-// Assert.That(
-// foundItem1.CreatorId, Is.EqualTo(item1.CreatorId),
-// "Loaded item non-uuid creator doesn't match original");
Assert.That(
foundItem1.CreatorId, Is.EqualTo(m_ua3.PrincipalID.ToString()),
"Loaded item non-uuid creator doesn't match original");
@@ -207,7 +204,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver.Tests
Assert.That(foundItem1.Owner, Is.EqualTo(m_ua1.PrincipalID),
"Loaded item owner doesn't match inventory reciever");
- AssetBase asset1 = scene.AssetService.Get(foundItem1.AssetID.ToString());
+ AssetBase asset1 = m_scene.AssetService.Get(foundItem1.AssetID.ToString());
string xmlData = Utils.BytesToString(asset1.Data);
SceneObjectGroup sog1 = SceneObjectSerializer.FromOriginalXmlFormat(xmlData);
@@ -224,16 +221,11 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver.Tests
TestHelper.InMethod();
// log4net.Config.XmlConfigurator.Configure();
- SerialiserModule serialiserModule = new SerialiserModule();
- InventoryArchiverModule archiverModule = new InventoryArchiverModule();
- Scene scene = SceneSetupHelpers.SetupScene("inventory");
- SceneSetupHelpers.SetupSceneModules(scene, serialiserModule, archiverModule);
-
- UserProfileTestUtils.CreateUserWithInventory(scene, m_ua1, "password");
- archiverModule.DearchiveInventory(m_ua1.FirstName, m_ua1.LastName, "/", "password", m_iarStream);
+ UserProfileTestUtils.CreateUserWithInventory(m_scene, m_ua1, "password");
+ m_archiverModule.DearchiveInventory(m_ua1.FirstName, m_ua1.LastName, "/", "password", m_iarStream);
InventoryItemBase foundItem1
- = InventoryArchiveUtils.FindItemByPath(scene.InventoryService, m_ua1.PrincipalID, m_item1Name);
+ = InventoryArchiveUtils.FindItemByPath(m_scene.InventoryService, m_ua1.PrincipalID, m_item1Name);
Assert.That(foundItem1, Is.Not.Null, "Didn't find loaded item 1");
Assert.That(
@@ -243,7 +235,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver.Tests
foundItem1.CreatorIdAsUuid, Is.EqualTo(m_ua1.PrincipalID),
"Loaded item uuid creator doesn't match that of the loading user");
- AssetBase asset1 = scene.AssetService.Get(foundItem1.AssetID.ToString());
+ AssetBase asset1 = m_scene.AssetService.Get(foundItem1.AssetID.ToString());
string xmlData = Utils.BytesToString(asset1.Data);
SceneObjectGroup sog1 = SceneObjectSerializer.FromOriginalXmlFormat(xmlData);
--
cgit v1.1
From 8d69e6831136fea089ed0ca04249bf65ba66db28 Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Thu, 10 Mar 2011 22:52:41 +0000
Subject: refactor: rename test user account fields
---
.../Archiver/Tests/InventoryArchiverTests.cs | 28 +++++++++++-----------
1 file changed, 14 insertions(+), 14 deletions(-)
(limited to 'OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/Tests/InventoryArchiverTests.cs')
diff --git a/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/Tests/InventoryArchiverTests.cs b/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/Tests/InventoryArchiverTests.cs
index 79b4777..c7aad5e 100644
--- a/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/Tests/InventoryArchiverTests.cs
+++ b/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/Tests/InventoryArchiverTests.cs
@@ -188,27 +188,27 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver.Tests
TestHelper.InMethod();
// log4net.Config.XmlConfigurator.Configure();
- UserProfileTestUtils.CreateUserWithInventory(m_scene, m_ua1, "meowfood");
- UserProfileTestUtils.CreateUserWithInventory(m_scene, m_ua3, "hampshire");
+ UserProfileTestUtils.CreateUserWithInventory(m_scene, m_uaMT, "meowfood");
+ UserProfileTestUtils.CreateUserWithInventory(m_scene, m_uaLL2, "hampshire");
- m_archiverModule.DearchiveInventory(m_ua1.FirstName, m_ua1.LastName, "/", "meowfood", m_iarStream);
+ m_archiverModule.DearchiveInventory(m_uaMT.FirstName, m_uaMT.LastName, "/", "meowfood", m_iarStream);
InventoryItemBase foundItem1
- = InventoryArchiveUtils.FindItemByPath(m_scene.InventoryService, m_ua1.PrincipalID, m_item1Name);
+ = InventoryArchiveUtils.FindItemByPath(m_scene.InventoryService, m_uaMT.PrincipalID, m_item1Name);
Assert.That(
- foundItem1.CreatorId, Is.EqualTo(m_ua3.PrincipalID.ToString()),
+ foundItem1.CreatorId, Is.EqualTo(m_uaLL2.PrincipalID.ToString()),
"Loaded item non-uuid creator doesn't match original");
Assert.That(
- foundItem1.CreatorIdAsUuid, Is.EqualTo(m_ua3.PrincipalID),
+ foundItem1.CreatorIdAsUuid, Is.EqualTo(m_uaLL2.PrincipalID),
"Loaded item uuid creator doesn't match original");
- Assert.That(foundItem1.Owner, Is.EqualTo(m_ua1.PrincipalID),
+ Assert.That(foundItem1.Owner, Is.EqualTo(m_uaMT.PrincipalID),
"Loaded item owner doesn't match inventory reciever");
AssetBase asset1 = m_scene.AssetService.Get(foundItem1.AssetID.ToString());
string xmlData = Utils.BytesToString(asset1.Data);
SceneObjectGroup sog1 = SceneObjectSerializer.FromOriginalXmlFormat(xmlData);
- Assert.That(sog1.RootPart.CreatorID, Is.EqualTo(m_ua3.PrincipalID));
+ Assert.That(sog1.RootPart.CreatorID, Is.EqualTo(m_uaLL2.PrincipalID));
}
///
@@ -221,25 +221,25 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver.Tests
TestHelper.InMethod();
// log4net.Config.XmlConfigurator.Configure();
- UserProfileTestUtils.CreateUserWithInventory(m_scene, m_ua1, "password");
- m_archiverModule.DearchiveInventory(m_ua1.FirstName, m_ua1.LastName, "/", "password", m_iarStream);
+ UserProfileTestUtils.CreateUserWithInventory(m_scene, m_uaMT, "password");
+ m_archiverModule.DearchiveInventory(m_uaMT.FirstName, m_uaMT.LastName, "/", "password", m_iarStream);
InventoryItemBase foundItem1
- = InventoryArchiveUtils.FindItemByPath(m_scene.InventoryService, m_ua1.PrincipalID, m_item1Name);
+ = InventoryArchiveUtils.FindItemByPath(m_scene.InventoryService, m_uaMT.PrincipalID, m_item1Name);
Assert.That(foundItem1, Is.Not.Null, "Didn't find loaded item 1");
Assert.That(
- foundItem1.CreatorId, Is.EqualTo(m_ua1.PrincipalID.ToString()),
+ foundItem1.CreatorId, Is.EqualTo(m_uaMT.PrincipalID.ToString()),
"Loaded item non-uuid creator doesn't match that of the loading user");
Assert.That(
- foundItem1.CreatorIdAsUuid, Is.EqualTo(m_ua1.PrincipalID),
+ foundItem1.CreatorIdAsUuid, Is.EqualTo(m_uaMT.PrincipalID),
"Loaded item uuid creator doesn't match that of the loading user");
AssetBase asset1 = m_scene.AssetService.Get(foundItem1.AssetID.ToString());
string xmlData = Utils.BytesToString(asset1.Data);
SceneObjectGroup sog1 = SceneObjectSerializer.FromOriginalXmlFormat(xmlData);
- Assert.That(sog1.RootPart.CreatorID, Is.EqualTo(m_ua1.PrincipalID));
+ Assert.That(sog1.RootPart.CreatorID, Is.EqualTo(m_uaMT.PrincipalID));
}
}
}
\ No newline at end of file
--
cgit v1.1
From ad1dea5affe24674ada19b801cab423f667f7979 Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Thu, 10 Mar 2011 22:56:11 +0000
Subject: Add test for simple case where creator account with appropriate uuid
exists on the target system for an iar load
---
.../Archiver/Tests/InventoryArchiverTests.cs | 32 ++++++++++++++++++++++
1 file changed, 32 insertions(+)
(limited to 'OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/Tests/InventoryArchiverTests.cs')
diff --git a/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/Tests/InventoryArchiverTests.cs b/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/Tests/InventoryArchiverTests.cs
index c7aad5e..7f156f8 100644
--- a/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/Tests/InventoryArchiverTests.cs
+++ b/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/Tests/InventoryArchiverTests.cs
@@ -179,6 +179,38 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver.Tests
}
///
+ /// Test case where a creator account exists for the creator UUID embedded in item metadata and serialized
+ /// objects.
+ ///
+ [Test]
+ public void TestLoadIarCreatorAccountPresent()
+ {
+ TestHelper.InMethod();
+// log4net.Config.XmlConfigurator.Configure();
+
+ UserProfileTestUtils.CreateUserWithInventory(m_scene, m_uaLL1, "meowfood");
+
+ m_archiverModule.DearchiveInventory(m_uaLL1.FirstName, m_uaLL1.LastName, "/", "meowfood", m_iarStream);
+ InventoryItemBase foundItem1
+ = InventoryArchiveUtils.FindItemByPath(m_scene.InventoryService, m_uaLL1.PrincipalID, m_item1Name);
+
+ Assert.That(
+ foundItem1.CreatorId, Is.EqualTo(m_uaLL1.PrincipalID.ToString()),
+ "Loaded item non-uuid creator doesn't match original");
+ Assert.That(
+ foundItem1.CreatorIdAsUuid, Is.EqualTo(m_uaLL1.PrincipalID),
+ "Loaded item uuid creator doesn't match original");
+ Assert.That(foundItem1.Owner, Is.EqualTo(m_uaLL1.PrincipalID),
+ "Loaded item owner doesn't match inventory reciever");
+
+ AssetBase asset1 = m_scene.AssetService.Get(foundItem1.AssetID.ToString());
+ string xmlData = Utils.BytesToString(asset1.Data);
+ SceneObjectGroup sog1 = SceneObjectSerializer.FromOriginalXmlFormat(xmlData);
+
+ Assert.That(sog1.RootPart.CreatorID, Is.EqualTo(m_uaLL1.PrincipalID));
+ }
+
+ ///
/// Test loading a V0.1 OpenSim Inventory Archive (subject to change since there is no fixed format yet) where
/// an account exists with the same name as the creator, though not the same id.
///
--
cgit v1.1