diff options
author | Justin Clarke Casey | 2009-04-24 19:19:19 +0000 |
---|---|---|
committer | Justin Clarke Casey | 2009-04-24 19:19:19 +0000 |
commit | 8fe70c826d06a949cde32ac7ff06022b0696a29f (patch) | |
tree | ceebba986b045082d715e1ae871b0568b4be5e00 /OpenSim/Framework | |
parent | * Refactor: break out loading of archive paths into inventory into a separate... (diff) | |
download | opensim-SC-8fe70c826d06a949cde32ac7ff06022b0696a29f.zip opensim-SC-8fe70c826d06a949cde32ac7ff06022b0696a29f.tar.gz opensim-SC-8fe70c826d06a949cde32ac7ff06022b0696a29f.tar.bz2 opensim-SC-8fe70c826d06a949cde32ac7ff06022b0696a29f.tar.xz |
* minor: move user profile test utils to test/common/setup for future reuse
Diffstat (limited to 'OpenSim/Framework')
-rw-r--r-- | OpenSim/Framework/Communications/Tests/Cache/UserProfileCacheServiceTests.cs | 1 | ||||
-rw-r--r-- | OpenSim/Framework/Communications/Tests/Cache/UserProfileTestUtils.cs | 67 |
2 files changed, 1 insertions, 67 deletions
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; | |||
33 | using OpenSim.Framework.Communications.Cache; | 33 | using OpenSim.Framework.Communications.Cache; |
34 | using OpenSim.Region.Communications.Local; | 34 | using OpenSim.Region.Communications.Local; |
35 | using OpenSim.Tests.Common.Mock; | 35 | using OpenSim.Tests.Common.Mock; |
36 | using OpenSim.Tests.Common.Setup; | ||
36 | 37 | ||
37 | namespace OpenSim.Framework.Communications.Tests | 38 | namespace OpenSim.Framework.Communications.Tests |
38 | { | 39 | { |
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 @@ | |||
1 | /* | ||
2 | * Copyright (c) Contributors, http://opensimulator.org/ | ||
3 | * See CONTRIBUTORS.TXT for a full list of copyright holders. | ||
4 | * | ||
5 | * Redistribution and use in source and binary forms, with or without | ||
6 | * modification, are permitted provided that the following conditions are met: | ||
7 | * * Redistributions of source code must retain the above copyright | ||
8 | * notice, this list of conditions and the following disclaimer. | ||
9 | * * Redistributions in binary form must reproduce the above copyright | ||
10 | * notice, this list of conditions and the following disclaimer in the | ||
11 | * documentation and/or other materials provided with the distribution. | ||
12 | * * Neither the name of the OpenSim Project nor the | ||
13 | * names of its contributors may be used to endorse or promote products | ||
14 | * derived from this software without specific prior written permission. | ||
15 | * | ||
16 | * THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY | ||
17 | * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED | ||
18 | * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE | ||
19 | * DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY | ||
20 | * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES | ||
21 | * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; | ||
22 | * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND | ||
23 | * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT | ||
24 | * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS | ||
25 | * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | ||
26 | */ | ||
27 | |||
28 | using OpenMetaverse; | ||
29 | using OpenSim.Framework.Communications.Cache; | ||
30 | using OpenSim.Region.Communications.Local; | ||
31 | |||
32 | namespace OpenSim.Framework.Communications.Tests | ||
33 | { | ||
34 | /// <summary> | ||
35 | /// Utility functions for carrying out user profile related tests. | ||
36 | /// </summary> | ||
37 | public class UserProfileTestUtils | ||
38 | { | ||
39 | /// <summary> | ||
40 | /// Create a test user with a standard inventory | ||
41 | /// </summary> | ||
42 | /// <param name="commsManager"></param> | ||
43 | /// <returns></returns> | ||
44 | public static CachedUserInfo CreateUserWithInventory(CommunicationsManager commsManager) | ||
45 | { | ||
46 | UUID userId = UUID.Parse("00000000-0000-0000-0000-000000000099"); | ||
47 | return CreateUserWithInventory(commsManager, userId); | ||
48 | } | ||
49 | |||
50 | /// <summary> | ||
51 | /// Create a test user with a standard inventory | ||
52 | /// </summary> | ||
53 | /// <param name="commsManager"></param> | ||
54 | /// <param name="userId">Explicit user id to use for user creation</param> | ||
55 | /// <returns></returns> | ||
56 | public static CachedUserInfo CreateUserWithInventory(CommunicationsManager commsManager, UUID userId) | ||
57 | { | ||
58 | LocalUserServices lus = (LocalUserServices)commsManager.UserService; | ||
59 | lus.AddUser("Bill", "Bailey", "troll", "bill@bailey.com", 1000, 1000, userId); | ||
60 | |||
61 | CachedUserInfo userInfo = commsManager.UserProfileCacheService.GetUserDetails(userId); | ||
62 | userInfo.FetchInventory(); | ||
63 | |||
64 | return userInfo; | ||
65 | } | ||
66 | } | ||
67 | } | ||