From 8fe70c826d06a949cde32ac7ff06022b0696a29f Mon Sep 17 00:00:00 2001 From: Justin Clarke Casey Date: Fri, 24 Apr 2009 19:19:19 +0000 Subject: * minor: move user profile test utils to test/common/setup for future reuse --- .../Tests/Cache/UserProfileCacheServiceTests.cs | 1 + .../Tests/Cache/UserProfileTestUtils.cs | 67 --------------------- .../Archiver/Tests/InventoryArchiverTests.cs | 14 +++++ OpenSim/Tests/Common/Setup/UserProfileTestUtils.cs | 68 ++++++++++++++++++++++ 4 files changed, 83 insertions(+), 67 deletions(-) delete mode 100644 OpenSim/Framework/Communications/Tests/Cache/UserProfileTestUtils.cs create mode 100644 OpenSim/Tests/Common/Setup/UserProfileTestUtils.cs diff --git a/OpenSim/Framework/Communications/Tests/Cache/UserProfileCacheServiceTests.cs b/OpenSim/Framework/Communications/Tests/Cache/UserProfileCacheServiceTests.cs index 1711187..2972a0a 100644 --- a/OpenSim/Framework/Communications/Tests/Cache/UserProfileCacheServiceTests.cs +++ b/OpenSim/Framework/Communications/Tests/Cache/UserProfileCacheServiceTests.cs @@ -33,6 +33,7 @@ using OpenSim.Framework; using OpenSim.Framework.Communications.Cache; using OpenSim.Region.Communications.Local; using OpenSim.Tests.Common.Mock; +using OpenSim.Tests.Common.Setup; namespace OpenSim.Framework.Communications.Tests { diff --git a/OpenSim/Framework/Communications/Tests/Cache/UserProfileTestUtils.cs b/OpenSim/Framework/Communications/Tests/Cache/UserProfileTestUtils.cs deleted file mode 100644 index d0f92d6..0000000 --- a/OpenSim/Framework/Communications/Tests/Cache/UserProfileTestUtils.cs +++ /dev/null @@ -1,67 +0,0 @@ -/* - * 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 OpenSim 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 OpenMetaverse; -using OpenSim.Framework.Communications.Cache; -using OpenSim.Region.Communications.Local; - -namespace OpenSim.Framework.Communications.Tests -{ - /// - /// Utility functions for carrying out user profile related tests. - /// - public class UserProfileTestUtils - { - /// - /// Create a test user with a standard inventory - /// - /// - /// - public static CachedUserInfo CreateUserWithInventory(CommunicationsManager commsManager) - { - UUID userId = UUID.Parse("00000000-0000-0000-0000-000000000099"); - return CreateUserWithInventory(commsManager, userId); - } - - /// - /// Create a test user with a standard inventory - /// - /// - /// Explicit user id to use for user creation - /// - public static CachedUserInfo CreateUserWithInventory(CommunicationsManager commsManager, UUID userId) - { - LocalUserServices lus = (LocalUserServices)commsManager.UserService; - lus.AddUser("Bill", "Bailey", "troll", "bill@bailey.com", 1000, 1000, userId); - - CachedUserInfo userInfo = commsManager.UserProfileCacheService.GetUserDetails(userId); - userInfo.FetchInventory(); - - return userInfo; - } - } -} diff --git a/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/Tests/InventoryArchiverTests.cs b/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/Tests/InventoryArchiverTests.cs index 5388403..1d4256b 100644 --- a/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/Tests/InventoryArchiverTests.cs +++ b/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/Tests/InventoryArchiverTests.cs @@ -42,6 +42,7 @@ using OpenSim.Region.CoreModules.Avatar.Inventory.Archiver; using OpenSim.Region.CoreModules.World.Serialiser; using OpenSim.Region.Framework.Scenes; using OpenSim.Tests.Common; +using OpenSim.Tests.Common.Mock; using OpenSim.Tests.Common.Setup; namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver.Tests @@ -242,5 +243,18 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver.Tests Console.WriteLine("Finished TestLoadIarV0p1()"); } + + /* + /// + /// Test replication of an archive path to the user's inventory. + /// + [Test] + public void TestReplicateArchivePathToUserInventory() + { + CommunicationsManager commsManager = new TestCommunicationsManager(); + CachedUserInfo userInfo = new CachedUserInfo(); + new InventoryArchiveReadRequest(userInfo, "/", null, commsManager); + } + */ } } diff --git a/OpenSim/Tests/Common/Setup/UserProfileTestUtils.cs b/OpenSim/Tests/Common/Setup/UserProfileTestUtils.cs new file mode 100644 index 0000000..90bd6c1 --- /dev/null +++ b/OpenSim/Tests/Common/Setup/UserProfileTestUtils.cs @@ -0,0 +1,68 @@ +/* + * 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 OpenSim 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 OpenMetaverse; +using OpenSim.Framework.Communications; +using OpenSim.Framework.Communications.Cache; +using OpenSim.Region.Communications.Local; + +namespace OpenSim.Tests.Common.Setup +{ + /// + /// Utility functions for carrying out user profile related tests. + /// + public class UserProfileTestUtils + { + /// + /// Create a test user with a standard inventory + /// + /// + /// + public static CachedUserInfo CreateUserWithInventory(CommunicationsManager commsManager) + { + UUID userId = UUID.Parse("00000000-0000-0000-0000-000000000099"); + return CreateUserWithInventory(commsManager, userId); + } + + /// + /// Create a test user with a standard inventory + /// + /// + /// Explicit user id to use for user creation + /// + public static CachedUserInfo CreateUserWithInventory(CommunicationsManager commsManager, UUID userId) + { + LocalUserServices lus = (LocalUserServices)commsManager.UserService; + lus.AddUser("Bill", "Bailey", "troll", "bill@bailey.com", 1000, 1000, userId); + + CachedUserInfo userInfo = commsManager.UserProfileCacheService.GetUserDetails(userId); + userInfo.FetchInventory(); + + return userInfo; + } + } +} -- cgit v1.1