aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Tests/Common/Helpers/SceneHelpers.cs
diff options
context:
space:
mode:
Diffstat (limited to 'OpenSim/Tests/Common/Helpers/SceneHelpers.cs')
-rw-r--r--OpenSim/Tests/Common/Helpers/SceneHelpers.cs35
1 files changed, 30 insertions, 5 deletions
diff --git a/OpenSim/Tests/Common/Helpers/SceneHelpers.cs b/OpenSim/Tests/Common/Helpers/SceneHelpers.cs
index 086a725..2cf40d7 100644
--- a/OpenSim/Tests/Common/Helpers/SceneHelpers.cs
+++ b/OpenSim/Tests/Common/Helpers/SceneHelpers.cs
@@ -40,6 +40,7 @@ using OpenSim.Region.Framework;
40using OpenSim.Region.Framework.Interfaces; 40using OpenSim.Region.Framework.Interfaces;
41using OpenSim.Region.Framework.Scenes; 41using OpenSim.Region.Framework.Scenes;
42using OpenSim.Region.CoreModules.Avatar.Gods; 42using OpenSim.Region.CoreModules.Avatar.Gods;
43using OpenSim.Region.CoreModules.Asset;
43using OpenSim.Region.CoreModules.ServiceConnectorsOut.Asset; 44using OpenSim.Region.CoreModules.ServiceConnectorsOut.Asset;
44using OpenSim.Region.CoreModules.ServiceConnectorsOut.Authentication; 45using OpenSim.Region.CoreModules.ServiceConnectorsOut.Authentication;
45using OpenSim.Region.CoreModules.ServiceConnectorsOut.Inventory; 46using OpenSim.Region.CoreModules.ServiceConnectorsOut.Inventory;
@@ -56,6 +57,11 @@ namespace OpenSim.Tests.Common
56 /// </summary> 57 /// </summary>
57 public class SceneHelpers 58 public class SceneHelpers
58 { 59 {
60 public static TestScene SetupScene()
61 {
62 return SetupScene(null);
63 }
64
59 /// <summary> 65 /// <summary>
60 /// Set up a test scene 66 /// Set up a test scene
61 /// </summary> 67 /// </summary>
@@ -63,9 +69,14 @@ namespace OpenSim.Tests.Common
63 /// Automatically starts service threads, as would the normal runtime. 69 /// Automatically starts service threads, as would the normal runtime.
64 /// </remarks> 70 /// </remarks>
65 /// <returns></returns> 71 /// <returns></returns>
66 public static TestScene SetupScene() 72 public static TestScene SetupScene(CoreAssetCache cache)
73 {
74 return SetupScene("Unit test region", UUID.Random(), 1000, 1000, cache);
75 }
76
77 public static TestScene SetupScene(string name, UUID id, uint x, uint y)
67 { 78 {
68 return SetupScene("Unit test region", UUID.Random(), 1000, 1000); 79 return SetupScene(name, id, x, y, null);
69 } 80 }
70 81
71 /// <summary> 82 /// <summary>
@@ -78,7 +89,7 @@ namespace OpenSim.Tests.Common
78 /// <param name="y">Y co-ordinate of the region</param> 89 /// <param name="y">Y co-ordinate of the region</param>
79 /// <param name="cm">This should be the same if simulating two scenes within a standalone</param> 90 /// <param name="cm">This should be the same if simulating two scenes within a standalone</param>
80 /// <returns></returns> 91 /// <returns></returns>
81 public static TestScene SetupScene(string name, UUID id, uint x, uint y) 92 public static TestScene SetupScene(string name, UUID id, uint x, uint y, CoreAssetCache cache)
82 { 93 {
83 Console.WriteLine("Setting up test scene {0}", name); 94 Console.WriteLine("Setting up test scene {0}", name);
84 95
@@ -103,7 +114,7 @@ namespace OpenSim.Tests.Common
103 godsModule.Initialise(testScene, new IniConfigSource()); 114 godsModule.Initialise(testScene, new IniConfigSource());
104 testScene.AddModule(godsModule.Name, godsModule); 115 testScene.AddModule(godsModule.Name, godsModule);
105 116
106 LocalAssetServicesConnector assetService = StartAssetService(testScene); 117 LocalAssetServicesConnector assetService = StartAssetService(testScene, cache);
107 StartAuthenticationService(testScene); 118 StartAuthenticationService(testScene);
108 LocalInventoryServicesConnector inventoryService = StartInventoryService(testScene); 119 LocalInventoryServicesConnector inventoryService = StartInventoryService(testScene);
109 StartGridService(testScene); 120 StartGridService(testScene);
@@ -132,7 +143,7 @@ namespace OpenSim.Tests.Common
132 return testScene; 143 return testScene;
133 } 144 }
134 145
135 private static LocalAssetServicesConnector StartAssetService(Scene testScene) 146 private static LocalAssetServicesConnector StartAssetService(Scene testScene, CoreAssetCache cache)
136 { 147 {
137 LocalAssetServicesConnector assetService = new LocalAssetServicesConnector(); 148 LocalAssetServicesConnector assetService = new LocalAssetServicesConnector();
138 IConfigSource config = new IniConfigSource(); 149 IConfigSource config = new IniConfigSource();
@@ -145,6 +156,20 @@ namespace OpenSim.Tests.Common
145 156
146 assetService.Initialise(config); 157 assetService.Initialise(config);
147 assetService.AddRegion(testScene); 158 assetService.AddRegion(testScene);
159
160 if (cache != null)
161 {
162 IConfigSource cacheConfig = new IniConfigSource();
163 cacheConfig.AddConfig("Modules");
164 cacheConfig.Configs["Modules"].Set("AssetCaching", "CoreAssetCache");
165 cacheConfig.AddConfig("AssetCache");
166
167 cache.Initialise(cacheConfig);
168 cache.AddRegion(testScene);
169 cache.RegionLoaded(testScene);
170 testScene.AddRegionModule(cache.Name, cache);
171 }
172
148 assetService.RegionLoaded(testScene); 173 assetService.RegionLoaded(testScene);
149 testScene.AddRegionModule(assetService.Name, assetService); 174 testScene.AddRegionModule(assetService.Name, assetService);
150 175