aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
-rw-r--r--OpenSim/Region/Environment/Scenes/Tests/SceneObjectTests.cs12
-rw-r--r--OpenSim/Region/Environment/Scenes/Tests/TestCommunicationsManager.cs4
-rw-r--r--OpenSim/Region/Environment/Scenes/Tests/TestInventoryDataPlugin.cs60
-rw-r--r--OpenSim/Region/Environment/Scenes/Tests/TestUserDataPlugin.cs2
4 files changed, 71 insertions, 7 deletions
diff --git a/OpenSim/Region/Environment/Scenes/Tests/SceneObjectTests.cs b/OpenSim/Region/Environment/Scenes/Tests/SceneObjectTests.cs
index 216dce5..7f6fa3c 100644
--- a/OpenSim/Region/Environment/Scenes/Tests/SceneObjectTests.cs
+++ b/OpenSim/Region/Environment/Scenes/Tests/SceneObjectTests.cs
@@ -102,9 +102,11 @@ namespace OpenSim.Region.Environment.Scenes.Tests
102 SceneObjectPart part = SceneTestUtils.AddSceneObject(scene); 102 SceneObjectPart part = SceneTestUtils.AddSceneObject(scene);
103 103
104 ((LocalUserServices)scene.CommsManager.UserService).AddPlugin(new TestUserDataPlugin()); 104 ((LocalUserServices)scene.CommsManager.UserService).AddPlugin(new TestUserDataPlugin());
105// Assert.That( 105 ((LocalInventoryService)scene.CommsManager.InventoryService).AddPlugin(new TestInventoryDataPlugin());
106// scene.CommsManager.AddUser("Bob", "Hoskins", "test", "test@test.com", 1000, 1000, agentId), 106
107// Is.EqualTo(agentId)); 107 Assert.That(
108 scene.CommsManager.AddUser("Bob", "Hoskins", "test", "test@test.com", 1000, 1000, agentId),
109 Is.EqualTo(agentId));
108 110
109 IClientAPI client = SceneTestUtils.AddRootAgent(scene, agentId); 111 IClientAPI client = SceneTestUtils.AddRootAgent(scene, agentId);
110 scene.DeRezObject(client, part.LocalId, UUID.Zero, 9, UUID.Zero); 112 scene.DeRezObject(client, part.LocalId, UUID.Zero, 9, UUID.Zero);
@@ -116,8 +118,8 @@ namespace OpenSim.Region.Environment.Scenes.Tests
116 SceneObjectPart retrievedPart2 = scene.GetSceneObjectPart(part.LocalId); 118 SceneObjectPart retrievedPart2 = scene.GetSceneObjectPart(part.LocalId);
117 Assert.That(retrievedPart2, Is.Null); 119 Assert.That(retrievedPart2, Is.Null);
118 120
119// CachedUserInfo userInfo = scene.CommsManager.UserProfileCacheService.GetUserDetails(agentId); 121 CachedUserInfo userInfo = scene.CommsManager.UserProfileCacheService.GetUserDetails(agentId);
120// Assert.That(userInfo, Is.Not.Null); 122 Assert.That(userInfo, Is.Not.Null);
121 123
122 // TODO: test that the object actually made it successfully into inventory 124 // TODO: test that the object actually made it successfully into inventory
123 } 125 }
diff --git a/OpenSim/Region/Environment/Scenes/Tests/TestCommunicationsManager.cs b/OpenSim/Region/Environment/Scenes/Tests/TestCommunicationsManager.cs
index 9b2046b..07cd429 100644
--- a/OpenSim/Region/Environment/Scenes/Tests/TestCommunicationsManager.cs
+++ b/OpenSim/Region/Environment/Scenes/Tests/TestCommunicationsManager.cs
@@ -41,6 +41,10 @@ namespace OpenSim.Region.Environment.Scenes.Tests
41 LocalUserServices lus = new LocalUserServices(null, 991, 992, null); 41 LocalUserServices lus = new LocalUserServices(null, 991, 992, null);
42 m_userService = lus; 42 m_userService = lus;
43 m_userServiceAdmin = lus; 43 m_userServiceAdmin = lus;
44
45 LocalInventoryService lis = new LocalInventoryService();
46 m_interServiceInventoryService = lis;
47 AddInventoryService(lis);
44 } 48 }
45 } 49 }
46} 50}
diff --git a/OpenSim/Region/Environment/Scenes/Tests/TestInventoryDataPlugin.cs b/OpenSim/Region/Environment/Scenes/Tests/TestInventoryDataPlugin.cs
new file mode 100644
index 0000000..2d4edd6
--- /dev/null
+++ b/OpenSim/Region/Environment/Scenes/Tests/TestInventoryDataPlugin.cs
@@ -0,0 +1,60 @@
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
28using System;
29using System.Collections.Generic;
30using OpenMetaverse;
31using OpenSim.Framework;
32
33namespace OpenSim.Region.Environment.Scenes.Tests
34{
35 public class TestInventoryDataPlugin : IInventoryDataPlugin
36 {
37 public string Version { get { return "0"; } }
38 public string Name { get { return "TestInventoryDataPlugin"; } }
39
40 public void Initialise() {}
41 public void Initialise(string connect) {}
42 public void Dispose() {}
43
44 public List<InventoryFolderBase> getFolderHierarchy(UUID parentID) { return null; }
45 public List<InventoryItemBase> getInventoryInFolder(UUID folderID) { return null; }
46 public List<InventoryFolderBase> getUserRootFolders(UUID user) { return null; }
47 public InventoryFolderBase getUserRootFolder(UUID user) { return null; }
48 public List<InventoryFolderBase> getInventoryFolders(UUID parentID) { return null; }
49 public InventoryItemBase getInventoryItem(UUID item) { return null; }
50 public InventoryFolderBase getInventoryFolder(UUID folder) { return null; }
51 public void addInventoryItem(InventoryItemBase item) {}
52 public void updateInventoryItem(InventoryItemBase item) {}
53 public void deleteInventoryItem(UUID item) {}
54 public void addInventoryFolder(InventoryFolderBase folder) {}
55 public void updateInventoryFolder(InventoryFolderBase folder) {}
56 public void moveInventoryFolder(InventoryFolderBase folder) {}
57 public void deleteInventoryFolder(UUID folder) {}
58 public List<InventoryItemBase> fetchActiveGestures(UUID avatarID) { return null; }
59 }
60}
diff --git a/OpenSim/Region/Environment/Scenes/Tests/TestUserDataPlugin.cs b/OpenSim/Region/Environment/Scenes/Tests/TestUserDataPlugin.cs
index ab63fb9..85fa1f5 100644
--- a/OpenSim/Region/Environment/Scenes/Tests/TestUserDataPlugin.cs
+++ b/OpenSim/Region/Environment/Scenes/Tests/TestUserDataPlugin.cs
@@ -39,7 +39,6 @@ namespace OpenSim.Region.Environment.Scenes.Tests
39 public class TestUserDataPlugin : IUserDataPlugin 39 public class TestUserDataPlugin : IUserDataPlugin
40 { 40 {
41 public string Version { get { return "0"; } } 41 public string Version { get { return "0"; } }
42
43 public string Name { get { return "TestUserDataPlugin"; } } 42 public string Name { get { return "TestUserDataPlugin"; } }
44 43
45 /// <summary> 44 /// <summary>
@@ -53,7 +52,6 @@ namespace OpenSim.Region.Environment.Scenes.Tests
53 private Dictionary<UUID, UserProfileData> m_userProfilesByUuid = new Dictionary<UUID, UserProfileData>(); 52 private Dictionary<UUID, UserProfileData> m_userProfilesByUuid = new Dictionary<UUID, UserProfileData>();
54 53
55 public void Initialise() {} 54 public void Initialise() {}
56
57 public void Dispose() {} 55 public void Dispose() {}
58 56
59 public void AddNewUserProfile(UserProfileData user) 57 public void AddNewUserProfile(UserProfileData user)