diff options
Diffstat (limited to 'OpenSim/Framework/Communications/Tests/Cache/UserProfileCacheServiceTests.cs')
-rw-r--r-- | OpenSim/Framework/Communications/Tests/Cache/UserProfileCacheServiceTests.cs | 40 |
1 files changed, 20 insertions, 20 deletions
diff --git a/OpenSim/Framework/Communications/Tests/Cache/UserProfileCacheServiceTests.cs b/OpenSim/Framework/Communications/Tests/Cache/UserProfileCacheServiceTests.cs index 807afcc..44a28a2 100644 --- a/OpenSim/Framework/Communications/Tests/Cache/UserProfileCacheServiceTests.cs +++ b/OpenSim/Framework/Communications/Tests/Cache/UserProfileCacheServiceTests.cs | |||
@@ -52,7 +52,7 @@ namespace OpenSim.Framework.Communications.Tests | |||
52 | UUID nonExistingUserId = UUID.Parse("00000000-0000-0000-0000-000000000001"); | 52 | UUID nonExistingUserId = UUID.Parse("00000000-0000-0000-0000-000000000001"); |
53 | UUID existingUserId = UUID.Parse("00000000-0000-0000-0000-000000000002"); | 53 | UUID existingUserId = UUID.Parse("00000000-0000-0000-0000-000000000002"); |
54 | 54 | ||
55 | CommunicationsManager commsManager = UserProfileTestUtils.SetupServices(); | 55 | TestCommunicationsManager commsManager = new TestCommunicationsManager(); |
56 | CachedUserInfo existingUserInfo = UserProfileTestUtils.CreateUserWithInventory(commsManager, existingUserId); | 56 | CachedUserInfo existingUserInfo = UserProfileTestUtils.CreateUserWithInventory(commsManager, existingUserId); |
57 | 57 | ||
58 | Assert.That(existingUserInfo, Is.Not.Null, "Existing user info unexpectedly not found"); | 58 | Assert.That(existingUserInfo, Is.Not.Null, "Existing user info unexpectedly not found"); |
@@ -68,7 +68,7 @@ namespace OpenSim.Framework.Communications.Tests | |||
68 | [Test] | 68 | [Test] |
69 | public void TestRequestInventoryForUser() | 69 | public void TestRequestInventoryForUser() |
70 | { | 70 | { |
71 | CommunicationsManager commsManager = UserProfileTestUtils.SetupServices(); | 71 | TestCommunicationsManager commsManager = new TestCommunicationsManager(); |
72 | CachedUserInfo userInfo = UserProfileTestUtils.CreateUserWithInventory(commsManager); | 72 | CachedUserInfo userInfo = UserProfileTestUtils.CreateUserWithInventory(commsManager); |
73 | 73 | ||
74 | Assert.That(userInfo.HasReceivedInventory, Is.True); | 74 | Assert.That(userInfo.HasReceivedInventory, Is.True); |
@@ -80,7 +80,7 @@ namespace OpenSim.Framework.Communications.Tests | |||
80 | [Test] | 80 | [Test] |
81 | public void TestGetChildFolder() | 81 | public void TestGetChildFolder() |
82 | { | 82 | { |
83 | CommunicationsManager commsManager = UserProfileTestUtils.SetupServices(); | 83 | TestCommunicationsManager commsManager = new TestCommunicationsManager(); |
84 | CachedUserInfo userInfo = UserProfileTestUtils.CreateUserWithInventory(commsManager); | 84 | CachedUserInfo userInfo = UserProfileTestUtils.CreateUserWithInventory(commsManager); |
85 | 85 | ||
86 | UUID folderId = UUID.Parse("00000000-0000-0000-0000-000000000011"); | 86 | UUID folderId = UUID.Parse("00000000-0000-0000-0000-000000000011"); |
@@ -96,12 +96,12 @@ namespace OpenSim.Framework.Communications.Tests | |||
96 | /// </summary> | 96 | /// </summary> |
97 | [Test] | 97 | [Test] |
98 | public void TestCreateFolder() | 98 | public void TestCreateFolder() |
99 | { | 99 | { |
100 | IUserDataPlugin userDataPlugin = new TestUserDataPlugin(); | 100 | TestCommunicationsManager commsManager = new TestCommunicationsManager(); |
101 | IInventoryDataPlugin inventoryDataPlugin = new TestInventoryDataPlugin(); | 101 | |
102 | IUserDataPlugin userDataPlugin = commsManager.UserDataPlugin; | ||
103 | IInventoryDataPlugin inventoryDataPlugin = commsManager.InventoryDataPlugin; | ||
102 | 104 | ||
103 | CommunicationsManager commsManager | ||
104 | = UserProfileTestUtils.SetupServices(userDataPlugin, inventoryDataPlugin); | ||
105 | CachedUserInfo userInfo = UserProfileTestUtils.CreateUserWithInventory(commsManager); | 105 | CachedUserInfo userInfo = UserProfileTestUtils.CreateUserWithInventory(commsManager); |
106 | 106 | ||
107 | UUID folderId = UUID.Parse("00000000-0000-0000-0000-000000000010"); | 107 | UUID folderId = UUID.Parse("00000000-0000-0000-0000-000000000010"); |
@@ -129,11 +129,11 @@ namespace OpenSim.Framework.Communications.Tests | |||
129 | [Test] | 129 | [Test] |
130 | public void TestUpdateFolder() | 130 | public void TestUpdateFolder() |
131 | { | 131 | { |
132 | IUserDataPlugin userDataPlugin = new TestUserDataPlugin(); | 132 | TestCommunicationsManager commsManager = new TestCommunicationsManager(); |
133 | IInventoryDataPlugin inventoryDataPlugin = new TestInventoryDataPlugin(); | 133 | |
134 | IUserDataPlugin userDataPlugin = commsManager.UserDataPlugin; | ||
135 | IInventoryDataPlugin inventoryDataPlugin = commsManager.InventoryDataPlugin; | ||
134 | 136 | ||
135 | CommunicationsManager commsManager | ||
136 | = UserProfileTestUtils.SetupServices(userDataPlugin, inventoryDataPlugin); | ||
137 | CachedUserInfo userInfo = UserProfileTestUtils.CreateUserWithInventory(commsManager); | 137 | CachedUserInfo userInfo = UserProfileTestUtils.CreateUserWithInventory(commsManager); |
138 | 138 | ||
139 | UUID folder1Id = UUID.Parse("00000000-0000-0000-0000-000000000060"); | 139 | UUID folder1Id = UUID.Parse("00000000-0000-0000-0000-000000000060"); |
@@ -188,11 +188,11 @@ namespace OpenSim.Framework.Communications.Tests | |||
188 | [Test] | 188 | [Test] |
189 | public void TestMoveFolder() | 189 | public void TestMoveFolder() |
190 | { | 190 | { |
191 | IUserDataPlugin userDataPlugin = new TestUserDataPlugin(); | 191 | TestCommunicationsManager commsManager = new TestCommunicationsManager(); |
192 | IInventoryDataPlugin inventoryDataPlugin = new TestInventoryDataPlugin(); | 192 | |
193 | IUserDataPlugin userDataPlugin = commsManager.UserDataPlugin; | ||
194 | IInventoryDataPlugin inventoryDataPlugin = commsManager.InventoryDataPlugin; | ||
193 | 195 | ||
194 | CommunicationsManager commsManager | ||
195 | = UserProfileTestUtils.SetupServices(userDataPlugin, inventoryDataPlugin); | ||
196 | CachedUserInfo userInfo = UserProfileTestUtils.CreateUserWithInventory(commsManager); | 196 | CachedUserInfo userInfo = UserProfileTestUtils.CreateUserWithInventory(commsManager); |
197 | 197 | ||
198 | UUID folder1Id = UUID.Parse("00000000-0000-0000-0000-000000000020"); | 198 | UUID folder1Id = UUID.Parse("00000000-0000-0000-0000-000000000020"); |
@@ -226,11 +226,11 @@ namespace OpenSim.Framework.Communications.Tests | |||
226 | { | 226 | { |
227 | //log4net.Config.XmlConfigurator.Configure(); | 227 | //log4net.Config.XmlConfigurator.Configure(); |
228 | 228 | ||
229 | IUserDataPlugin userDataPlugin = new TestUserDataPlugin(); | 229 | TestCommunicationsManager commsManager = new TestCommunicationsManager(); |
230 | IInventoryDataPlugin inventoryDataPlugin = new TestInventoryDataPlugin(); | 230 | |
231 | IUserDataPlugin userDataPlugin = commsManager.UserDataPlugin; | ||
232 | IInventoryDataPlugin inventoryDataPlugin = commsManager.InventoryDataPlugin; | ||
231 | 233 | ||
232 | CommunicationsManager commsManager | ||
233 | = UserProfileTestUtils.SetupServices(userDataPlugin, inventoryDataPlugin); | ||
234 | CachedUserInfo userInfo = UserProfileTestUtils.CreateUserWithInventory(commsManager); | 234 | CachedUserInfo userInfo = UserProfileTestUtils.CreateUserWithInventory(commsManager); |
235 | 235 | ||
236 | UUID folder1Id = UUID.Parse("00000000-0000-0000-0000-000000000070"); | 236 | UUID folder1Id = UUID.Parse("00000000-0000-0000-0000-000000000070"); |