clockwerk-opensim-stable – Diff between revs 1 and 3

Subversion Repositories:

?pathlinks?

Rev 1 – Details – Blame – Last modification – View Log

Only display areas with differences – Ignore whitespace

 /*
  * Copyright (c) Contributors, http://opensimulator.org/
  * See CONTRIBUTORS.TXT for a full list of copyright holders.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
  *     * Redistributions of source code must retain the above copyright
  *       notice, this list of conditions and the following disclaimer.
  *     * Redistributions in binary form must reproduce the above copyright
  *       notice, this list of conditions and the following disclaimer in the
  *       documentation and/or other materials provided with the distribution.
  *     * Neither the name of the OpenSimulator Project nor the
  *       names of its contributors may be used to endorse or promote products
  *       derived from this software without specific prior written permission.
+ *
  * THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY
  * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
  * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
  * DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
  * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
  * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
  * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
  * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 using System;
 using System.Collections.Generic;
 using System.IO;
 using System.Reflection;
 using System.Threading;
 using NUnit.Framework;
 using OpenMetaverse;
 using OpenSim.Data;
 using OpenSim.Framework;
 using OpenSim.Framework.Serialization;
 using OpenSim.Framework.Serialization.External;
 using OpenSim.Framework.Communications;
 using OpenSim.Region.CoreModules.Avatar.Inventory.Archiver;
 using OpenSim.Region.CoreModules.World.Serialiser;
 using OpenSim.Region.Framework.Scenes;
 using OpenSim.Region.Framework.Scenes.Serialization;
 using OpenSim.Services.Interfaces;
 using OpenSim.Tests.Common;
 using OpenSim.Tests.Common.Mock;
 namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver.Tests
+{
     [TestFixture]
     public class InventoryArchiveLoadTests : 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 = new SceneHelpers().SetupScene();
             SceneHelpers.SetupSceneModules(m_scene, serialiserModule, m_archiverModule);
+        }
         [Test]
         public void TestLoadCoalesecedItem()
+        {
             TestHelpers.InMethod();
 //            TestHelpers.EnableLogging();
             UserAccountHelpers.CreateUserWithInventory(m_scene, m_uaLL1, "password");
-            m_archiverModule.DearchiveInventory(m_uaLL1.FirstName, m_uaLL1.LastName, "/", "password", m_iarStream);
+            m_archiverModule.DearchiveInventory(m_uaLL1.FirstName, m_uaLL1.LastName, "/", m_iarStream);
             InventoryItemBase coaItem
                 = InventoryArchiveUtils.FindItemByPath(m_scene.InventoryService, m_uaLL1.PrincipalID, m_coaItemName);
             Assert.That(coaItem, Is.Not.Null, "Didn't find loaded item 1");
             string assetXml = AssetHelpers.ReadAssetAsString(m_scene.AssetService, coaItem.AssetID);
             CoalescedSceneObjects coa;
             bool readResult = CoalescedSceneObjectsSerializer.TryFromXml(assetXml, out coa);
             Assert.That(readResult, Is.True);
             Assert.That(coa.Count, Is.EqualTo(2));
             List<SceneObjectGroup> coaObjects = coa.Objects;
             Assert.That(coaObjects[0].UUID, Is.EqualTo(UUID.Parse("00000000-0000-0000-0000-000000000120")));
             Assert.That(coaObjects[0].AbsolutePosition, Is.EqualTo(new Vector3(15, 30, 45)));
             Assert.That(coaObjects[1].UUID, Is.EqualTo(UUID.Parse("00000000-0000-0000-0000-000000000140")));
             Assert.That(coaObjects[1].AbsolutePosition, Is.EqualTo(new Vector3(25, 50, 75)));
+        }
         /// <summary>
         /// Test case where a creator account exists for the creator UUID embedded in item metadata and serialized
         /// objects.
         /// </summary>
         [Test]
         public void TestLoadIarCreatorAccountPresent()
+        {
             TestHelpers.InMethod();
 //            log4net.Config.XmlConfigurator.Configure();
             UserAccountHelpers.CreateUserWithInventory(m_scene, m_uaLL1, "meowfood");
-            m_archiverModule.DearchiveInventory(m_uaLL1.FirstName, m_uaLL1.LastName, "/", "meowfood", m_iarStream);
+            m_archiverModule.DearchiveInventory(m_uaLL1.FirstName, m_uaLL1.LastName, "/", 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));
+        }
 //        /// <summary>
 //        /// 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.
 //        /// </summary>
 //        [Test]
 //        public void TestLoadIarV0_1SameNameCreator()
 //        {
 //            TestHelpers.InMethod();
 //            TestHelpers.EnableLogging();
 //
 //            UserAccountHelpers.CreateUserWithInventory(m_scene, m_uaMT, "meowfood");
 //            UserAccountHelpers.CreateUserWithInventory(m_scene, m_uaLL2, "hampshire");
 //
 //            m_archiverModule.DearchiveInventory(m_uaMT.FirstName, m_uaMT.LastName, "/", "meowfood", m_iarStream);
 //            InventoryItemBase foundItem1
 //                = InventoryArchiveUtils.FindItemByPath(m_scene.InventoryService, m_uaMT.PrincipalID, m_item1Name);
 //
 //            Assert.That(
 //                foundItem1.CreatorId, Is.EqualTo(m_uaLL2.PrincipalID.ToString()),
 //                "Loaded item non-uuid creator doesn't match original");
 //            Assert.That(
 //                foundItem1.CreatorIdAsUuid, Is.EqualTo(m_uaLL2.PrincipalID),
 //                "Loaded item uuid creator doesn't match original");
 //            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_uaLL2.PrincipalID));
 //        }
         /// <summary>
         /// Test loading a V0.1 OpenSim Inventory Archive (subject to change since there is no fixed format yet) where
         /// the creator or an account with the creator's name does not exist within the system.
         /// </summary>
         [Test]
         public void TestLoadIarV0_1AbsentCreator()
+        {
             TestHelpers.InMethod();
 //            log4net.Config.XmlConfigurator.Configure();
             UserAccountHelpers.CreateUserWithInventory(m_scene, m_uaMT, "password");
-            m_archiverModule.DearchiveInventory(m_uaMT.FirstName, m_uaMT.LastName, "/", "password", m_iarStream);
+            m_archiverModule.DearchiveInventory(m_uaMT.FirstName, m_uaMT.LastName, "/", m_iarStream);
             InventoryItemBase foundItem1
                 = 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_uaMT.PrincipalID.ToString()),
                 "Loaded item non-uuid creator doesn't match that of the loading user");
             Assert.That(
                 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_uaMT.PrincipalID));
+        }
+    }
+}
 Generated by GNU Enscript 1.6.5.90.