aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region
diff options
context:
space:
mode:
authorJustin Clarke Casey2008-11-14 20:06:44 +0000
committerJustin Clarke Casey2008-11-14 20:06:44 +0000
commit2bb4b45626322c3789fc56545c64f2f9aacdb6fb (patch)
treefe39575b5be48ab31b9ba6782739549f6829a8be /OpenSim/Region
parentMantis #2618 (diff)
downloadopensim-SC-2bb4b45626322c3789fc56545c64f2f9aacdb6fb.zip
opensim-SC-2bb4b45626322c3789fc56545c64f2f9aacdb6fb.tar.gz
opensim-SC-2bb4b45626322c3789fc56545c64f2f9aacdb6fb.tar.bz2
opensim-SC-2bb4b45626322c3789fc56545c64f2f9aacdb6fb.tar.xz
* Move test scene construction infrastructure methods to a separate class for future common use
Diffstat (limited to 'OpenSim/Region')
-rw-r--r--OpenSim/Region/ClientStack/LindenUDP/LLUDPServer.cs2
-rw-r--r--OpenSim/Region/ClientStack/LindenUDP/Tests/BasicCircuitTests.cs2
-rw-r--r--OpenSim/Region/Environment/Scenes/Scene.cs2
-rw-r--r--OpenSim/Region/Environment/Scenes/Tests/SceneObjectTests.cs46
-rw-r--r--OpenSim/Region/Environment/Scenes/Tests/SceneTestUtils.cs78
5 files changed, 85 insertions, 45 deletions
diff --git a/OpenSim/Region/ClientStack/LindenUDP/LLUDPServer.cs b/OpenSim/Region/ClientStack/LindenUDP/LLUDPServer.cs
index 9470f1f..b6aa961 100644
--- a/OpenSim/Region/ClientStack/LindenUDP/LLUDPServer.cs
+++ b/OpenSim/Region/ClientStack/LindenUDP/LLUDPServer.cs
@@ -373,7 +373,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
373 { 373 {
374 // TODO : Actually only handle those states that we have control over, re-throw everything else, 374 // TODO : Actually only handle those states that we have control over, re-throw everything else,
375 // TODO: implement cases as we encounter them. 375 // TODO: implement cases as we encounter them.
376 //m_log.Error("[[CLIENT]: ]: Connection Error! - " + e.ToString()); 376 //m_log.Error("[CLIENT]: Connection Error! - " + e.ToString());
377 switch (e.SocketErrorCode) 377 switch (e.SocketErrorCode)
378 { 378 {
379 case SocketError.AlreadyInProgress: 379 case SocketError.AlreadyInProgress:
diff --git a/OpenSim/Region/ClientStack/LindenUDP/Tests/BasicCircuitTests.cs b/OpenSim/Region/ClientStack/LindenUDP/Tests/BasicCircuitTests.cs
index 1d61024..b2cf14c 100644
--- a/OpenSim/Region/ClientStack/LindenUDP/Tests/BasicCircuitTests.cs
+++ b/OpenSim/Region/ClientStack/LindenUDP/Tests/BasicCircuitTests.cs
@@ -288,6 +288,6 @@ namespace OpenSim.Region.ClientStack.LindenUDP.Tests
288 288
289 Assert.That(testLLPacketServer.GetTotalPacketsReceived(), Is.EqualTo(3)); 289 Assert.That(testLLPacketServer.GetTotalPacketsReceived(), Is.EqualTo(3));
290 Assert.That(testLLPacketServer.GetPacketsReceivedFor(PacketType.ObjectName), Is.EqualTo(3)); 290 Assert.That(testLLPacketServer.GetPacketsReceivedFor(PacketType.ObjectName), Is.EqualTo(3));
291 } 291 }
292 } 292 }
293} 293}
diff --git a/OpenSim/Region/Environment/Scenes/Scene.cs b/OpenSim/Region/Environment/Scenes/Scene.cs
index 71acc9f..f606018 100644
--- a/OpenSim/Region/Environment/Scenes/Scene.cs
+++ b/OpenSim/Region/Environment/Scenes/Scene.cs
@@ -2695,7 +2695,7 @@ namespace OpenSim.Region.Environment.Scenes
2695 } 2695 }
2696 2696
2697 /// <summary> 2697 /// <summary>
2698 /// 2698 /// Deregister this scene from receiving incoming region events
2699 /// </summary> 2699 /// </summary>
2700 public void UnRegisterRegionWithComms() 2700 public void UnRegisterRegionWithComms()
2701 { 2701 {
diff --git a/OpenSim/Region/Environment/Scenes/Tests/SceneObjectTests.cs b/OpenSim/Region/Environment/Scenes/Tests/SceneObjectTests.cs
index c306433..52447a7 100644
--- a/OpenSim/Region/Environment/Scenes/Tests/SceneObjectTests.cs
+++ b/OpenSim/Region/Environment/Scenes/Tests/SceneObjectTests.cs
@@ -26,7 +26,6 @@
26 */ 26 */
27 27
28using System; 28using System;
29using Nini.Config;
30using NUnit.Framework; 29using NUnit.Framework;
31using NUnit.Framework.SyntaxHelpers; 30using NUnit.Framework.SyntaxHelpers;
32using OpenMetaverse; 31using OpenMetaverse;
@@ -54,43 +53,6 @@ namespace OpenSim.Region.Environment.Scenes.Tests
54 // I don't care, just leave log4net off 53 // I don't care, just leave log4net off
55 } 54 }
56 } 55 }
57
58 /// <summary>
59 /// Set up a test scene
60 /// </summary>
61 private TestScene SetupScene()
62 {
63 RegionInfo regInfo = new RegionInfo(1000, 1000, null, null);
64 regInfo.RegionName = "Unit test region";
65 AgentCircuitManager acm = new AgentCircuitManager();
66 //CommunicationsManager cm = new CommunicationsManager(null, null, null, false, null);
67 CommunicationsManager cm = null;
68 //SceneCommunicationService scs = new SceneCommunicationService(cm);
69 SceneCommunicationService scs = null;
70 StorageManager sm = new OpenSim.Region.Environment.StorageManager("OpenSim.Data.Null.dll", "", "");
71 IConfigSource configSource = new IniConfigSource();
72
73 return new TestScene(regInfo, acm, cm, scs, null, sm, null, null, false, false, false, configSource, null);
74 }
75
76 /// <summary>
77 /// Add a test object
78 /// </summary>
79 /// <param name="scene"></param>
80 /// <returns></returns>
81 private SceneObjectPart AddSceneObject(Scene scene)
82 {
83 SceneObjectGroup sceneObject = new SceneObjectGroup();
84 SceneObjectPart part
85 = new SceneObjectPart(UUID.Zero, PrimitiveBaseShape.Default, Vector3.Zero, Quaternion.Identity, Vector3.Zero);
86 //part.UpdatePrimFlags(false, false, true);
87 part.ObjectFlags |= (uint)PrimFlags.Phantom;
88 sceneObject.SetRootPart(part);
89
90 scene.AddNewSceneObject(sceneObject, false);
91
92 return part;
93 }
94 56
95 /// <summary> 57 /// <summary>
96 /// Test adding an object to a scene. 58 /// Test adding an object to a scene.
@@ -98,8 +60,8 @@ namespace OpenSim.Region.Environment.Scenes.Tests
98 [Test] 60 [Test]
99 public void TestAddSceneObject() 61 public void TestAddSceneObject()
100 { 62 {
101 Scene scene = SetupScene(); 63 Scene scene = SceneTestUtils.SetupScene();
102 SceneObjectPart part = AddSceneObject(scene); 64 SceneObjectPart part = SceneTestUtils.AddSceneObject(scene);
103 SceneObjectPart retrievedPart = scene.GetSceneObjectPart(part.LocalId); 65 SceneObjectPart retrievedPart = scene.GetSceneObjectPart(part.LocalId);
104 66
105 //System.Console.WriteLine("retrievedPart : {0}", retrievedPart); 67 //System.Console.WriteLine("retrievedPart : {0}", retrievedPart);
@@ -112,8 +74,8 @@ namespace OpenSim.Region.Environment.Scenes.Tests
112 /// </summary> 74 /// </summary>
113 public void TestRemoveSceneObject() 75 public void TestRemoveSceneObject()
114 { 76 {
115 TestScene scene = SetupScene();; 77 TestScene scene = SceneTestUtils.SetupScene();
116 SceneObjectPart part = AddSceneObject(scene); 78 SceneObjectPart part = SceneTestUtils.AddSceneObject(scene);
117 scene.DeleteSceneObject(part.ParentGroup, false); 79 scene.DeleteSceneObject(part.ParentGroup, false);
118 80
119 SceneObjectPart retrievedPart = scene.GetSceneObjectPart(part.LocalId); 81 SceneObjectPart retrievedPart = scene.GetSceneObjectPart(part.LocalId);
diff --git a/OpenSim/Region/Environment/Scenes/Tests/SceneTestUtils.cs b/OpenSim/Region/Environment/Scenes/Tests/SceneTestUtils.cs
new file mode 100644
index 0000000..c20dacf
--- /dev/null
+++ b/OpenSim/Region/Environment/Scenes/Tests/SceneTestUtils.cs
@@ -0,0 +1,78 @@
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 Nini.Config;
29using OpenMetaverse;
30using OpenSim.Framework;
31using OpenSim.Framework.Communications;
32using OpenSim.Region.Environment.Scenes;
33
34namespace OpenSim.Region.Environment.Scenes.Tests
35{
36 /// <summary>
37 /// Utilities for constructing and performing operations upon scenes.
38 /// </summary>
39 public class SceneTestUtils
40 {
41 /// <summary>
42 /// Set up a test scene
43 /// </summary>
44 public static TestScene SetupScene()
45 {
46 RegionInfo regInfo = new RegionInfo(1000, 1000, null, null);
47 regInfo.RegionName = "Unit test region";
48 AgentCircuitManager acm = new AgentCircuitManager();
49 //CommunicationsManager cm = new CommunicationsManager(null, null, null, false, null);
50 CommunicationsManager cm = null;
51 //SceneCommunicationService scs = new SceneCommunicationService(cm);
52 SceneCommunicationService scs = null;
53 StorageManager sm = new OpenSim.Region.Environment.StorageManager("OpenSim.Data.Null.dll", "", "");
54 IConfigSource configSource = new IniConfigSource();
55
56 return new TestScene(regInfo, acm, cm, scs, null, sm, null, null, false, false, false, configSource, null);
57 }
58
59 /// <summary>
60 /// Add a test object
61 /// </summary>
62 /// <param name="scene"></param>
63 /// <returns></returns>
64 public static SceneObjectPart AddSceneObject(Scene scene)
65 {
66 SceneObjectGroup sceneObject = new SceneObjectGroup();
67 SceneObjectPart part
68 = new SceneObjectPart(UUID.Zero, PrimitiveBaseShape.Default, Vector3.Zero, Quaternion.Identity, Vector3.Zero);
69 //part.UpdatePrimFlags(false, false, true);
70 part.ObjectFlags |= (uint)PrimFlags.Phantom;
71 sceneObject.SetRootPart(part);
72
73 scene.AddNewSceneObject(sceneObject, false);
74
75 return part;
76 }
77 }
78}