OpenSim
/
OpenSimMirror
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

bring TestIarV0_1WithEscapedChars() back online

soprefactor
Justin Clark-Casey (justincc) 2010-06-04 21:15:25 +01:00
parent f523c2033d
commit a08ace300b
1 changed files with 66 additions and 83 deletions
OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/Tests

147
OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/Tests/InventoryArchiverTests.cs
View File

@ -55,14 +55,6 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver.Tests
{ {
protected ManualResetEvent mre = new ManualResetEvent(false); protected ManualResetEvent mre = new ManualResetEvent(false);
private void InventoryReceived(UUID userId)
{
lock (this)
{
Monitor.PulseAll(this);
}
}
private void SaveCompleted( private void SaveCompleted(
Guid id, bool succeeded, UserAccount userInfo, string invPath, Stream saveStream, Guid id, bool succeeded, UserAccount userInfo, string invPath, Stream saveStream,
Exception reportedException) Exception reportedException)
@ -199,7 +191,6 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver.Tests
public void TestLoadIarV0_1ExistingUsers() public void TestLoadIarV0_1ExistingUsers()
{ {
TestHelper.InMethod(); TestHelper.InMethod();
//log4net.Config.XmlConfigurator.Configure(); //log4net.Config.XmlConfigurator.Configure();
string userFirstName = "Mr"; string userFirstName = "Mr";
@ -284,95 +275,87 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver.Tests
Assert.That(foundItem3, Is.Not.Null, "Didn't find loaded item 3"); Assert.That(foundItem3, Is.Not.Null, "Didn't find loaded item 3");
} }
// REFACTORING PROBLEM. Needs rewrite. [Test]
// [Test] public void TestIarV0_1WithEscapedChars()
// public void TestIarV0_1WithEscapedChars() {
// { TestHelper.InMethod();
// TestHelper.InMethod(); // log4net.Config.XmlConfigurator.Configure();
//// log4net.Config.XmlConfigurator.Configure();
// string itemName = "You & you are a mean/man/"; string itemName = "You & you are a mean/man/";
// string humanEscapedItemName = @"You & you are a mean\/man\/"; string humanEscapedItemName = @"You & you are a mean\/man\/";
// string userPassword = "meowfood"; string userPassword = "meowfood";
// InventoryArchiverModule archiverModule = new InventoryArchiverModule(true); InventoryArchiverModule archiverModule = new InventoryArchiverModule(true);
// Scene scene = SceneSetupHelpers.SetupScene("Inventory"); Scene scene = SceneSetupHelpers.SetupScene("Inventory");
// SceneSetupHelpers.SetupSceneModules(scene, archiverModule); SceneSetupHelpers.SetupSceneModules(scene, archiverModule);
// CommunicationsManager cm = scene.CommsManager;
// // Create user // Create user
// string userFirstName = "Jock"; string userFirstName = "Jock";
// string userLastName = "Stirrup"; string userLastName = "Stirrup";
// UUID userId = UUID.Parse("00000000-0000-0000-0000-000000000020"); UUID userId = UUID.Parse("00000000-0000-0000-0000-000000000020");
UserProfileTestUtils.CreateUserWithInventory(scene, userFirstName, userLastName, userId, "meowfood");
// lock (this) // Create asset
// { SceneObjectGroup object1;
// UserProfileTestUtils.CreateUserWithInventory( SceneObjectPart part1;
// cm, userFirstName, userLastName, userPassword, userId, InventoryReceived); {
// Monitor.Wait(this, 60000); 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);
// // Create asset part1
// SceneObjectGroup object1; = new SceneObjectPart(
// SceneObjectPart part1; ownerId, shape, groupPosition, rotationOffset, offsetPosition);
// { part1.Name = partName;
// 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 object1 = new SceneObjectGroup(part1);
// = new SceneObjectPart( scene.AddNewSceneObject(object1, false);
// ownerId, shape, groupPosition, rotationOffset, offsetPosition); }
// part1.Name = partName;
// object1 = new SceneObjectGroup(part1); UUID asset1Id = UUID.Parse("00000000-0000-0000-0000-000000000060");
// scene.AddNewSceneObject(object1, false); AssetBase asset1 = AssetHelpers.CreateAsset(asset1Id, object1);
// } scene.AssetService.Store(asset1);
// UUID asset1Id = UUID.Parse("00000000-0000-0000-0000-000000000060"); // Create item
// AssetBase asset1 = AssetHelpers.CreateAsset(asset1Id, object1); UUID item1Id = UUID.Parse("00000000-0000-0000-0000-000000000080");
// scene.AssetService.Store(asset1); InventoryItemBase item1 = new InventoryItemBase();
item1.Name = itemName;
item1.AssetID = asset1.FullID;
item1.ID = item1Id;
InventoryFolderBase objsFolder
= InventoryArchiveUtils.FindFolderByPath(scene.InventoryService, userId, "Objects");
item1.Folder = objsFolder.ID;
scene.AddInventoryItem(userId, item1);
// // Create item MemoryStream archiveWriteStream = new MemoryStream();
// UUID item1Id = UUID.Parse("00000000-0000-0000-0000-000000000080"); archiverModule.OnInventoryArchiveSaved += SaveCompleted;
// InventoryItemBase item1 = new InventoryItemBase();
// item1.Name = itemName;
// item1.AssetID = asset1.FullID;
// item1.ID = item1Id;
// InventoryFolderBase objsFolder
// = InventoryArchiveUtils.FindFolderByPath(scene.InventoryService, userId, "Objects");
// item1.Folder = objsFolder.ID;
// scene.AddInventoryItem(userId, item1);
// MemoryStream archiveWriteStream = new MemoryStream(); mre.Reset();
// archiverModule.OnInventoryArchiveSaved += SaveCompleted; archiverModule.ArchiveInventory(
Guid.NewGuid(), userFirstName, userLastName, "Objects", userPassword, archiveWriteStream);
mre.WaitOne(60000, false);
// mre.Reset(); // LOAD ITEM
// archiverModule.ArchiveInventory( MemoryStream archiveReadStream = new MemoryStream(archiveWriteStream.ToArray());
// Guid.NewGuid(), userFirstName, userLastName, "Objects", userPassword, archiveWriteStream);
// mre.WaitOne(60000, false);
// // LOAD ITEM archiverModule.DearchiveInventory(userFirstName, userLastName, "Scripts", userPassword, archiveReadStream);
// MemoryStream archiveReadStream = new MemoryStream(archiveWriteStream.ToArray());
// archiverModule.DearchiveInventory(userFirstName, userLastName, "Scripts", userPassword, archiveReadStream); InventoryItemBase foundItem1
= InventoryArchiveUtils.FindItemByPath(
scene.InventoryService, userId, "Scripts/Objects/" + humanEscapedItemName);
// InventoryItemBase foundItem1 Assert.That(foundItem1, Is.Not.Null, "Didn't find loaded item 1");
// = 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( // Assert.That(
// foundItem1.Name, Is.EqualTo(itemName), // foundItem1.CreatorId, Is.EqualTo(userUuid),
// "Loaded item name doesn't match saved name"); // "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");
}
/// <summary> /// <summary>
/// Test loading a V0.1 OpenSim Inventory Archive (subject to change since there is no fixed format yet) where /// Test loading a V0.1 OpenSim Inventory Archive (subject to change since there is no fixed format yet) where