diff options
author | Diva Canto | 2010-01-11 07:45:47 -0800 |
---|---|---|
committer | Diva Canto | 2010-01-11 07:45:47 -0800 |
commit | 001d3695683d9511446d194feeb763c437170028 (patch) | |
tree | 037954a2227cfd5551ddbd9e1d3b1271284c151f /OpenSim/Tests | |
parent | Remove CreateCommsManagerPlugin (diff) | |
download | opensim-SC-001d3695683d9511446d194feeb763c437170028.zip opensim-SC-001d3695683d9511446d194feeb763c437170028.tar.gz opensim-SC-001d3695683d9511446d194feeb763c437170028.tar.bz2 opensim-SC-001d3695683d9511446d194feeb763c437170028.tar.xz |
CommunicationsManager deleted.
Diffstat (limited to 'OpenSim/Tests')
-rw-r--r-- | OpenSim/Tests/Common/Mock/TestCommunicationsManager.cs | 62 | ||||
-rw-r--r-- | OpenSim/Tests/Common/Mock/TestScene.cs | 4 | ||||
-rw-r--r-- | OpenSim/Tests/Common/Setup/SceneSetupHelpers.cs | 64 |
3 files changed, 35 insertions, 95 deletions
diff --git a/OpenSim/Tests/Common/Mock/TestCommunicationsManager.cs b/OpenSim/Tests/Common/Mock/TestCommunicationsManager.cs deleted file mode 100644 index 8e193c1..0000000 --- a/OpenSim/Tests/Common/Mock/TestCommunicationsManager.cs +++ /dev/null | |||
@@ -1,62 +0,0 @@ | |||
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 | |||
28 | using OpenSim.Framework; | ||
29 | using OpenSim.Framework.Communications; | ||
30 | using OpenSim.Framework.Communications.Cache; | ||
31 | using OpenSim.Framework.Servers; | ||
32 | using OpenSim.Framework.Servers.HttpServer; | ||
33 | using OpenSim.Data; | ||
34 | |||
35 | namespace OpenSim.Tests.Common.Mock | ||
36 | { | ||
37 | public class TestCommunicationsManager : CommunicationsManager | ||
38 | { | ||
39 | public IUserDataPlugin UserDataPlugin | ||
40 | { | ||
41 | get { return m_userDataPlugin; } | ||
42 | } | ||
43 | private IUserDataPlugin m_userDataPlugin; | ||
44 | |||
45 | // public IInventoryDataPlugin InventoryDataPlugin | ||
46 | // { | ||
47 | // get { return m_inventoryDataPlugin; } | ||
48 | // } | ||
49 | // private IInventoryDataPlugin m_inventoryDataPlugin; | ||
50 | |||
51 | public TestCommunicationsManager() | ||
52 | : this(null) | ||
53 | { | ||
54 | } | ||
55 | |||
56 | public TestCommunicationsManager(NetworkServersInfo serversInfo) | ||
57 | : base(serversInfo, null) | ||
58 | { | ||
59 | |||
60 | } | ||
61 | } | ||
62 | } | ||
diff --git a/OpenSim/Tests/Common/Mock/TestScene.cs b/OpenSim/Tests/Common/Mock/TestScene.cs index 22cfa2c..bf3825b 100644 --- a/OpenSim/Tests/Common/Mock/TestScene.cs +++ b/OpenSim/Tests/Common/Mock/TestScene.cs | |||
@@ -40,10 +40,10 @@ namespace OpenSim.Tests.Common.Mock | |||
40 | { | 40 | { |
41 | public TestScene( | 41 | public TestScene( |
42 | RegionInfo regInfo, AgentCircuitManager authen, | 42 | RegionInfo regInfo, AgentCircuitManager authen, |
43 | CommunicationsManager commsMan, SceneCommunicationService sceneGridService, StorageManager storeManager, | 43 | SceneCommunicationService sceneGridService, StorageManager storeManager, |
44 | ModuleLoader moduleLoader, bool dumpAssetsToFile, bool physicalPrim, | 44 | ModuleLoader moduleLoader, bool dumpAssetsToFile, bool physicalPrim, |
45 | bool SeeIntoRegionFromNeighbor, IConfigSource config, string simulatorVersion) | 45 | bool SeeIntoRegionFromNeighbor, IConfigSource config, string simulatorVersion) |
46 | : base(regInfo, authen, commsMan, sceneGridService, storeManager, moduleLoader, | 46 | : base(regInfo, authen, sceneGridService, storeManager, moduleLoader, |
47 | dumpAssetsToFile, physicalPrim, SeeIntoRegionFromNeighbor, config, simulatorVersion) | 47 | dumpAssetsToFile, physicalPrim, SeeIntoRegionFromNeighbor, config, simulatorVersion) |
48 | { | 48 | { |
49 | } | 49 | } |
diff --git a/OpenSim/Tests/Common/Setup/SceneSetupHelpers.cs b/OpenSim/Tests/Common/Setup/SceneSetupHelpers.cs index dbb8fd4..f6c9f3b 100644 --- a/OpenSim/Tests/Common/Setup/SceneSetupHelpers.cs +++ b/OpenSim/Tests/Common/Setup/SceneSetupHelpers.cs | |||
@@ -60,7 +60,6 @@ namespace OpenSim.Tests.Common.Setup | |||
60 | private static ISharedRegionModule m_assetService = null; | 60 | private static ISharedRegionModule m_assetService = null; |
61 | private static ISharedRegionModule m_inventoryService = null; | 61 | private static ISharedRegionModule m_inventoryService = null; |
62 | private static ISharedRegionModule m_gridService = null; | 62 | private static ISharedRegionModule m_gridService = null; |
63 | private static TestCommunicationsManager commsManager = null; | ||
64 | 63 | ||
65 | /// <summary> | 64 | /// <summary> |
66 | /// Set up a test scene | 65 | /// Set up a test scene |
@@ -83,21 +82,23 @@ namespace OpenSim.Tests.Common.Setup | |||
83 | public static TestScene SetupScene(String realServices) | 82 | public static TestScene SetupScene(String realServices) |
84 | { | 83 | { |
85 | return SetupScene( | 84 | return SetupScene( |
86 | "Unit test region", UUID.Random(), 1000, 1000, new TestCommunicationsManager(), realServices); | 85 | "Unit test region", UUID.Random(), 1000, 1000, realServices); |
87 | } | 86 | } |
88 | 87 | ||
89 | /// <summary> | 88 | // REFACTORING PROBLEM. No idea what the difference is with the previous one |
90 | /// Set up a test scene | 89 | ///// <summary> |
91 | /// </summary> | 90 | ///// Set up a test scene |
92 | /// | 91 | ///// </summary> |
93 | /// <param name="realServices">Starts real inventory and asset services, as opposed to mock ones, if true</param> | 92 | ///// |
94 | /// <param name="cm">This should be the same if simulating two scenes within a standalone</param> | 93 | ///// <param name="realServices">Starts real inventory and asset services, as opposed to mock ones, if true</param> |
95 | /// <returns></returns> | 94 | ///// <param name="cm">This should be the same if simulating two scenes within a standalone</param> |
96 | public static TestScene SetupScene(TestCommunicationsManager cm, String realServices) | 95 | ///// <returns></returns> |
97 | { | 96 | //public static TestScene SetupScene(String realServices) |
98 | return SetupScene( | 97 | //{ |
99 | "Unit test region", UUID.Random(), 1000, 1000, cm, ""); | 98 | // return SetupScene( |
100 | } | 99 | // "Unit test region", UUID.Random(), 1000, 1000, ""); |
100 | //} | ||
101 | |||
101 | /// <summary> | 102 | /// <summary> |
102 | /// Set up a test scene | 103 | /// Set up a test scene |
103 | /// </summary> | 104 | /// </summary> |
@@ -107,9 +108,9 @@ namespace OpenSim.Tests.Common.Setup | |||
107 | /// <param name="y">Y co-ordinate of the region</param> | 108 | /// <param name="y">Y co-ordinate of the region</param> |
108 | /// <param name="cm">This should be the same if simulating two scenes within a standalone</param> | 109 | /// <param name="cm">This should be the same if simulating two scenes within a standalone</param> |
109 | /// <returns></returns> | 110 | /// <returns></returns> |
110 | public static TestScene SetupScene(string name, UUID id, uint x, uint y, TestCommunicationsManager cm) | 111 | public static TestScene SetupScene(string name, UUID id, uint x, uint y) |
111 | { | 112 | { |
112 | return SetupScene(name, id, x, y, cm, ""); | 113 | return SetupScene(name, id, x, y,""); |
113 | } | 114 | } |
114 | 115 | ||
115 | 116 | ||
@@ -125,23 +126,24 @@ namespace OpenSim.Tests.Common.Setup | |||
125 | /// <param name="realServices">Starts real inventory and asset services, as opposed to mock ones, if true</param> | 126 | /// <param name="realServices">Starts real inventory and asset services, as opposed to mock ones, if true</param> |
126 | /// <returns></returns> | 127 | /// <returns></returns> |
127 | public static TestScene SetupScene( | 128 | public static TestScene SetupScene( |
128 | string name, UUID id, uint x, uint y, TestCommunicationsManager cm, String realServices) | 129 | string name, UUID id, uint x, uint y, String realServices) |
129 | { | 130 | { |
130 | bool newScene = false; | 131 | bool newScene = false; |
131 | 132 | ||
132 | Console.WriteLine("Setting up test scene {0}", name); | 133 | Console.WriteLine("Setting up test scene {0}", name); |
133 | 134 | ||
134 | // If cm is the same as our last commsManager used, this means the tester wants to link | 135 | // REFACTORING PROBLEM! |
135 | // regions. In this case, don't use the sameshared region modules and dont initialize them again. | 136 | //// If cm is the same as our last commsManager used, this means the tester wants to link |
136 | // Also, no need to start another MainServer and MainConsole instance. | 137 | //// regions. In this case, don't use the sameshared region modules and dont initialize them again. |
137 | if (cm == null || cm != commsManager) | 138 | //// Also, no need to start another MainServer and MainConsole instance. |
138 | { | 139 | //if (cm == null || cm != commsManager) |
139 | System.Console.WriteLine("Starting a brand new scene"); | 140 | //{ |
140 | newScene = true; | 141 | // System.Console.WriteLine("Starting a brand new scene"); |
141 | MainConsole.Instance = new LocalConsole("TEST PROMPT"); | 142 | // newScene = true; |
142 | MainServer.Instance = new BaseHttpServer(980); | 143 | // MainConsole.Instance = new LocalConsole("TEST PROMPT"); |
143 | commsManager = cm; | 144 | // MainServer.Instance = new BaseHttpServer(980); |
144 | } | 145 | // commsManager = cm; |
146 | //} | ||
145 | 147 | ||
146 | // We must set up a console otherwise setup of some modules may fail | 148 | // We must set up a console otherwise setup of some modules may fail |
147 | RegionInfo regInfo = new RegionInfo(x, y, new IPEndPoint(IPAddress.Loopback, 9000), "127.0.0.1"); | 149 | RegionInfo regInfo = new RegionInfo(x, y, new IPEndPoint(IPAddress.Loopback, 9000), "127.0.0.1"); |
@@ -149,13 +151,13 @@ namespace OpenSim.Tests.Common.Setup | |||
149 | regInfo.RegionID = id; | 151 | regInfo.RegionID = id; |
150 | 152 | ||
151 | AgentCircuitManager acm = new AgentCircuitManager(); | 153 | AgentCircuitManager acm = new AgentCircuitManager(); |
152 | SceneCommunicationService scs = new SceneCommunicationService(cm); | 154 | SceneCommunicationService scs = new SceneCommunicationService(); |
153 | 155 | ||
154 | StorageManager sm = new StorageManager("OpenSim.Data.Null.dll", "", ""); | 156 | StorageManager sm = new StorageManager("OpenSim.Data.Null.dll", "", ""); |
155 | IConfigSource configSource = new IniConfigSource(); | 157 | IConfigSource configSource = new IniConfigSource(); |
156 | 158 | ||
157 | TestScene testScene = new TestScene( | 159 | TestScene testScene = new TestScene( |
158 | regInfo, acm, cm, scs, sm, null, false, false, false, configSource, null); | 160 | regInfo, acm, scs, sm, null, false, false, false, configSource, null); |
159 | 161 | ||
160 | INonSharedRegionModule capsModule = new CapabilitiesModule(); | 162 | INonSharedRegionModule capsModule = new CapabilitiesModule(); |
161 | capsModule.Initialise(new IniConfigSource()); | 163 | capsModule.Initialise(new IniConfigSource()); |