aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorJustin Clark-Casey (justincc)2011-06-03 23:13:05 +0100
committerJustin Clark-Casey (justincc)2011-06-03 23:13:05 +0100
commit527e10a04e9108bebe5de76541d47409dd6ce4f4 (patch)
tree70ccbc6cf6921db1d3de9a396225ab12f5dd328d
parentAdded prefix HG to the name of the landmark item in inventory, as a soft remi... (diff)
downloadopensim-SC_OLD-527e10a04e9108bebe5de76541d47409dd6ce4f4.zip
opensim-SC_OLD-527e10a04e9108bebe5de76541d47409dd6ce4f4.tar.gz
opensim-SC_OLD-527e10a04e9108bebe5de76541d47409dd6ce4f4.tar.bz2
opensim-SC_OLD-527e10a04e9108bebe5de76541d47409dd6ce4f4.tar.xz
add stub UserInventoryTests.GiveInventoryFolder(). Not yet complete
-rw-r--r--OpenSim/Region/Framework/Scenes/Tests/UserInventoryTests.cs70
-rw-r--r--OpenSim/Tests/Common/Helpers/UserInventoryHelpers.cs11
2 files changed, 79 insertions, 2 deletions
diff --git a/OpenSim/Region/Framework/Scenes/Tests/UserInventoryTests.cs b/OpenSim/Region/Framework/Scenes/Tests/UserInventoryTests.cs
new file mode 100644
index 0000000..b82ddb4
--- /dev/null
+++ b/OpenSim/Region/Framework/Scenes/Tests/UserInventoryTests.cs
@@ -0,0 +1,70 @@
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 OpenSimulator 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
28using System;
29using System.Collections.Generic;
30using System.Reflection;
31using System.Text;
32using System.Threading;
33using System.Timers;
34using Timer=System.Timers.Timer;
35using Nini.Config;
36using NUnit.Framework;
37using OpenMetaverse;
38using OpenMetaverse.Assets;
39using OpenSim.Framework;
40using OpenSim.Framework.Communications;
41using OpenSim.Region.Framework.Scenes;
42using OpenSim.Region.Framework.Interfaces;
43using OpenSim.Region.CoreModules.Avatar.Inventory.Archiver;
44using OpenSim.Region.CoreModules.World.Serialiser;
45using OpenSim.Region.CoreModules.ServiceConnectorsOut.Simulation;
46using OpenSim.Services.Interfaces;
47using OpenSim.Tests.Common;
48using OpenSim.Tests.Common.Mock;
49
50namespace OpenSim.Region.Framework.Tests
51{
52 [TestFixture]
53 public class UserInventoryTests
54 {
55 [Test]
56 public void TestGiveInventoryFolder()
57 {
58 Scene scene = SceneSetupHelpers.SetupScene();
59 UserAccount user1 = UserAccountHelpers.CreateUserWithInventory(scene);
60 UserAccount user2 = UserAccountHelpers.CreateUserWithInventory(scene);
61 InventoryFolderBase folder1
62 = UserInventoryHelpers.CreateInventoryFolder(scene.InventoryService, user1.PrincipalID, "folder1");
63
64 scene.GiveInventoryFolder(user2.PrincipalID, user1.PrincipalID, folder1.ID, UUID.Zero);
65
66// InventoryFolderBase receivedFolder1Template = new InventoryFolderBase(
67// InventoryFolderBase receivedFolder1 = scene.InventoryService.GetFolder
68 }
69 }
70} \ No newline at end of file
diff --git a/OpenSim/Tests/Common/Helpers/UserInventoryHelpers.cs b/OpenSim/Tests/Common/Helpers/UserInventoryHelpers.cs
index 0419134..e33145f 100644
--- a/OpenSim/Tests/Common/Helpers/UserInventoryHelpers.cs
+++ b/OpenSim/Tests/Common/Helpers/UserInventoryHelpers.cs
@@ -40,8 +40,15 @@ namespace OpenSim.Tests.Common
40 { 40 {
41 public static readonly string PATH_DELIMITER = "/"; 41 public static readonly string PATH_DELIMITER = "/";
42 42
43 public static InventoryItemBase CreateInventoryItem( 43 /// <summary>
44 Scene scene, string itemName, UUID itemId, string folderPath, UUID userId) 44 /// Creates a notecard in the objects folder.
45 /// </summary>
46 /// <param name="scene"></param>
47 /// <param name="itemName"></param>
48 /// <param name="itemId"></param>
49 /// <param name="userId"></param>
50 /// <returns></returns>
51 public static InventoryItemBase CreateInventoryItem(Scene scene, string itemName, UUID itemId, UUID userId)
45 { 52 {
46 InventoryItemBase item = new InventoryItemBase(); 53 InventoryItemBase item = new InventoryItemBase();
47 item.Name = itemName; 54 item.Name = itemName;