diff options
author | Justin Clark-Casey (justincc) | 2011-04-15 01:10:26 +0100 |
---|---|---|
committer | Justin Clark-Casey (justincc) | 2011-04-15 01:10:26 +0100 |
commit | 79bd430e08b9e8612194d9b02504f8f4acd889f6 (patch) | |
tree | c74dce75de623385d7de52b63621b9f486037127 /OpenSim/Tests/Common/Setup/SceneSetupHelpers.cs | |
parent | extend TestLoadCoalesecedItem() to check loaded object ids and positions (diff) | |
download | opensim-SC_OLD-79bd430e08b9e8612194d9b02504f8f4acd889f6.zip opensim-SC_OLD-79bd430e08b9e8612194d9b02504f8f4acd889f6.tar.gz opensim-SC_OLD-79bd430e08b9e8612194d9b02504f8f4acd889f6.tar.bz2 opensim-SC_OLD-79bd430e08b9e8612194d9b02504f8f4acd889f6.tar.xz |
Remove the mock inventory service for tests and just use the real one all the time with an in-memory data plugin
Diffstat (limited to 'OpenSim/Tests/Common/Setup/SceneSetupHelpers.cs')
-rw-r--r-- | OpenSim/Tests/Common/Setup/SceneSetupHelpers.cs | 19 |
1 files changed, 6 insertions, 13 deletions
diff --git a/OpenSim/Tests/Common/Setup/SceneSetupHelpers.cs b/OpenSim/Tests/Common/Setup/SceneSetupHelpers.cs index 837f4e2..97d4ace 100644 --- a/OpenSim/Tests/Common/Setup/SceneSetupHelpers.cs +++ b/OpenSim/Tests/Common/Setup/SceneSetupHelpers.cs | |||
@@ -137,7 +137,7 @@ namespace OpenSim.Tests.Common.Setup | |||
137 | // For now, always started a 'real' authentication service | 137 | // For now, always started a 'real' authentication service |
138 | StartAuthenticationService(testScene, true); | 138 | StartAuthenticationService(testScene, true); |
139 | 139 | ||
140 | LocalInventoryServicesConnector inventoryService = StartInventoryService(testScene, realServices.Contains("inventory")); | 140 | LocalInventoryServicesConnector inventoryService = StartInventoryService(testScene); |
141 | StartGridService(testScene, true); | 141 | StartGridService(testScene, true); |
142 | LocalUserAccountServicesConnector userAccountService = StartUserAccountService(testScene); | 142 | LocalUserAccountServicesConnector userAccountService = StartUserAccountService(testScene); |
143 | LocalPresenceServicesConnector presenceService = StartPresenceService(testScene); | 143 | LocalPresenceServicesConnector presenceService = StartPresenceService(testScene); |
@@ -208,24 +208,17 @@ namespace OpenSim.Tests.Common.Setup | |||
208 | //m_authenticationService = service; | 208 | //m_authenticationService = service; |
209 | } | 209 | } |
210 | 210 | ||
211 | private static LocalInventoryServicesConnector StartInventoryService(Scene testScene, bool real) | 211 | private static LocalInventoryServicesConnector StartInventoryService(Scene testScene) |
212 | { | 212 | { |
213 | LocalInventoryServicesConnector inventoryService = new LocalInventoryServicesConnector(); | 213 | LocalInventoryServicesConnector inventoryService = new LocalInventoryServicesConnector(); |
214 | IConfigSource config = new IniConfigSource(); | 214 | |
215 | IConfigSource config = new IniConfigSource(); | ||
215 | config.AddConfig("Modules"); | 216 | config.AddConfig("Modules"); |
216 | config.AddConfig("InventoryService"); | 217 | config.AddConfig("InventoryService"); |
217 | config.Configs["Modules"].Set("InventoryServices", "LocalInventoryServicesConnector"); | 218 | config.Configs["Modules"].Set("InventoryServices", "LocalInventoryServicesConnector"); |
218 | 219 | config.Configs["InventoryService"].Set("LocalServiceModule", "OpenSim.Services.InventoryService.dll:InventoryService"); | |
219 | if (real) | ||
220 | { | ||
221 | config.Configs["InventoryService"].Set("LocalServiceModule", "OpenSim.Services.InventoryService.dll:InventoryService"); | ||
222 | } | ||
223 | else | ||
224 | { | ||
225 | config.Configs["InventoryService"].Set("LocalServiceModule", "OpenSim.Tests.Common.dll:MockInventoryService"); | ||
226 | } | ||
227 | |||
228 | config.Configs["InventoryService"].Set("StorageProvider", "OpenSim.Tests.Common.dll"); | 220 | config.Configs["InventoryService"].Set("StorageProvider", "OpenSim.Tests.Common.dll"); |
221 | |||
229 | inventoryService.Initialise(config); | 222 | inventoryService.Initialise(config); |
230 | inventoryService.AddRegion(testScene); | 223 | inventoryService.AddRegion(testScene); |
231 | inventoryService.RegionLoaded(testScene); | 224 | inventoryService.RegionLoaded(testScene); |