diff options
author | Justin Clark-Casey (justincc) | 2011-08-17 00:37:33 +0100 |
---|---|---|
committer | Justin Clark-Casey (justincc) | 2011-08-17 00:37:33 +0100 |
commit | 696bd448334c89607c95385f05a53e2ab72cb984 (patch) | |
tree | a061e2f61fb46bb344a48e6d08e627e6239880d5 /OpenSim/Tests/Common/Helpers | |
parent | get rid of logged warnings about lack of some modules - afaik these never occ... (diff) | |
download | opensim-SC_OLD-696bd448334c89607c95385f05a53e2ab72cb984.zip opensim-SC_OLD-696bd448334c89607c95385f05a53e2ab72cb984.tar.gz opensim-SC_OLD-696bd448334c89607c95385f05a53e2ab72cb984.tar.bz2 opensim-SC_OLD-696bd448334c89607c95385f05a53e2ab72cb984.tar.xz |
Add new regression TestRezAttachmentsOnAvatarEntrance() to do simple attachments check
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Tests/Common/Helpers/UserAccountHelpers.cs | 8 | ||||
-rw-r--r-- | OpenSim/Tests/Common/Helpers/UserInventoryHelpers.cs | 37 |
2 files changed, 36 insertions, 9 deletions
diff --git a/OpenSim/Tests/Common/Helpers/UserAccountHelpers.cs b/OpenSim/Tests/Common/Helpers/UserAccountHelpers.cs index d924ecd..b73df2c 100644 --- a/OpenSim/Tests/Common/Helpers/UserAccountHelpers.cs +++ b/OpenSim/Tests/Common/Helpers/UserAccountHelpers.cs | |||
@@ -118,13 +118,12 @@ namespace OpenSim.Tests.Common | |||
118 | 118 | ||
119 | public static UserAccount CreateUserWithInventory(Scene scene) | 119 | public static UserAccount CreateUserWithInventory(Scene scene) |
120 | { | 120 | { |
121 | return CreateUserWithInventory(scene, 99); | 121 | return CreateUserWithInventory(scene, TestHelpers.ParseTail(99)); |
122 | } | 122 | } |
123 | 123 | ||
124 | public static UserAccount CreateUserWithInventory(Scene scene, int uuidTail) | 124 | public static UserAccount CreateUserWithInventory(Scene scene, UUID userId) |
125 | { | 125 | { |
126 | return CreateUserWithInventory( | 126 | return CreateUserWithInventory(scene, "Bill", "Bailey", userId, "troll"); |
127 | scene, "Bill", "Bailey", new UUID(string.Format("00000000-0000-0000-0000-{0:X12}", uuidTail)), "troll"); | ||
128 | } | 127 | } |
129 | 128 | ||
130 | public static UserAccount CreateUserWithInventory( | 129 | public static UserAccount CreateUserWithInventory( |
@@ -139,7 +138,6 @@ namespace OpenSim.Tests.Common | |||
139 | { | 138 | { |
140 | // FIXME: This should really be set up by UserAccount itself | 139 | // FIXME: This should really be set up by UserAccount itself |
141 | ua.ServiceURLs = new Dictionary<string, object>(); | 140 | ua.ServiceURLs = new Dictionary<string, object>(); |
142 | |||
143 | scene.UserAccountService.StoreUserAccount(ua); | 141 | scene.UserAccountService.StoreUserAccount(ua); |
144 | scene.InventoryService.CreateUserInventory(ua.PrincipalID); | 142 | scene.InventoryService.CreateUserInventory(ua.PrincipalID); |
145 | scene.AuthenticationService.SetPassword(ua.PrincipalID, pw); | 143 | scene.AuthenticationService.SetPassword(ua.PrincipalID, pw); |
diff --git a/OpenSim/Tests/Common/Helpers/UserInventoryHelpers.cs b/OpenSim/Tests/Common/Helpers/UserInventoryHelpers.cs index 1703597..4e60ca9 100644 --- a/OpenSim/Tests/Common/Helpers/UserInventoryHelpers.cs +++ b/OpenSim/Tests/Common/Helpers/UserInventoryHelpers.cs | |||
@@ -52,7 +52,22 @@ namespace OpenSim.Tests.Common | |||
52 | /// <returns></returns> | 52 | /// <returns></returns> |
53 | public static InventoryItemBase CreateInventoryItem(Scene scene, string itemName, UUID userId) | 53 | public static InventoryItemBase CreateInventoryItem(Scene scene, string itemName, UUID userId) |
54 | { | 54 | { |
55 | return CreateInventoryItem(scene, itemName, UUID.Random(), userId); | 55 | return CreateInventoryItem(scene, itemName, UUID.Random(), UUID.Random(), userId, InventoryType.Notecard); |
56 | } | ||
57 | |||
58 | /// <summary> | ||
59 | /// Creates an item of the given type with an accompanying asset. | ||
60 | /// </summary> | ||
61 | /// <param name="scene"></param> | ||
62 | /// <param name="itemName"></param> | ||
63 | /// <param name="itemId"></param> | ||
64 | /// <param name="userId"></param> | ||
65 | /// <param name="type">Type of item to create</param> | ||
66 | /// <returns></returns> | ||
67 | public static InventoryItemBase CreateInventoryItem( | ||
68 | Scene scene, string itemName, UUID userId, InventoryType type) | ||
69 | { | ||
70 | return CreateInventoryItem(scene, itemName, UUID.Random(), UUID.Random(), userId, type); | ||
56 | } | 71 | } |
57 | 72 | ||
58 | /// <summary> | 73 | /// <summary> |
@@ -61,18 +76,32 @@ namespace OpenSim.Tests.Common | |||
61 | /// <param name="scene"></param> | 76 | /// <param name="scene"></param> |
62 | /// <param name="itemName"></param> | 77 | /// <param name="itemName"></param> |
63 | /// <param name="itemId"></param> | 78 | /// <param name="itemId"></param> |
79 | /// <param name="assetId"></param> | ||
64 | /// <param name="userId"></param> | 80 | /// <param name="userId"></param> |
81 | /// <param name="type">Type of item to create</param> | ||
65 | /// <returns></returns> | 82 | /// <returns></returns> |
66 | public static InventoryItemBase CreateInventoryItem(Scene scene, string itemName, UUID itemId, UUID userId) | 83 | public static InventoryItemBase CreateInventoryItem( |
84 | Scene scene, string itemName, UUID itemId, UUID assetId, UUID userId, InventoryType type) | ||
67 | { | 85 | { |
68 | AssetBase asset = AssetHelpers.CreateAsset(scene, userId); | 86 | AssetBase asset = null; |
87 | |||
88 | if (type == InventoryType.Notecard) | ||
89 | asset = AssetHelpers.CreateAsset(scene, userId); | ||
90 | else if (type == InventoryType.Object) | ||
91 | asset | ||
92 | = AssetHelpers.CreateAsset(assetId, SceneHelpers.CreateSceneObject(1, userId)); | ||
93 | else | ||
94 | throw new Exception(string.Format("Inventory type {0} not supported", type)); | ||
95 | |||
96 | scene.AssetService.Store(asset); | ||
97 | |||
69 | InventoryItemBase item = new InventoryItemBase(); | 98 | InventoryItemBase item = new InventoryItemBase(); |
70 | item.Name = itemName; | 99 | item.Name = itemName; |
71 | item.AssetID = asset.FullID; | 100 | item.AssetID = asset.FullID; |
72 | item.ID = itemId; | 101 | item.ID = itemId; |
73 | item.Owner = userId; | 102 | item.Owner = userId; |
74 | item.AssetType = asset.Type; | 103 | item.AssetType = asset.Type; |
75 | item.InvType = (int)InventoryType.Notecard; | 104 | item.InvType = (int)type; |
76 | 105 | ||
77 | InventoryFolderBase folder = scene.InventoryService.GetFolderForType(userId, AssetType.Notecard); | 106 | InventoryFolderBase folder = scene.InventoryService.GetFolderForType(userId, AssetType.Notecard); |
78 | 107 | ||