aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Environment
diff options
context:
space:
mode:
authorJustin Clarke Casey2008-11-10 21:12:53 +0000
committerJustin Clarke Casey2008-11-10 21:12:53 +0000
commit4c731dd44e6c7946c86db596f5ec1c84417b6d71 (patch)
treea6a08e78755857fc5d38bf7b11562787aa438dbe /OpenSim/Region/Environment
parent* refactor: clean up SOG xml2 reloading to reuse more code (diff)
downloadopensim-SC_OLD-4c731dd44e6c7946c86db596f5ec1c84417b6d71.zip
opensim-SC_OLD-4c731dd44e6c7946c86db596f5ec1c84417b6d71.tar.gz
opensim-SC_OLD-4c731dd44e6c7946c86db596f5ec1c84417b6d71.tar.bz2
opensim-SC_OLD-4c731dd44e6c7946c86db596f5ec1c84417b6d71.tar.xz
* Remove mono warnings
* Remove duplicate test part
Diffstat (limited to 'OpenSim/Region/Environment')
-rw-r--r--OpenSim/Region/Environment/Scenes/Tests/EntityListTests.cs41
1 files changed, 9 insertions, 32 deletions
diff --git a/OpenSim/Region/Environment/Scenes/Tests/EntityListTests.cs b/OpenSim/Region/Environment/Scenes/Tests/EntityListTests.cs
index 94b1fdd..65f0dcb 100644
--- a/OpenSim/Region/Environment/Scenes/Tests/EntityListTests.cs
+++ b/OpenSim/Region/Environment/Scenes/Tests/EntityListTests.cs
@@ -55,19 +55,8 @@ namespace OpenSim.Region.Environment.Scenes.Tests
55 catch 55 catch
56 { 56 {
57 // I don't care, just leave log4net off 57 // I don't care, just leave log4net off
58 } 58 }
59 } 59
60
61 static public Random random;
62 SceneObjectGroup found;
63 Scene scene;
64
65 /// <summary>
66 /// Test adding an object to a scene. Doesn't yet do what it says on the tin.
67 /// </summary>
68 [Test]
69 public void T001_TestAddSceneObject()
70 {
71 RegionInfo regInfo = new RegionInfo(1000, 1000, null, null); 60 RegionInfo regInfo = new RegionInfo(1000, 1000, null, null);
72 regInfo.RegionName = "Unit test region"; 61 regInfo.RegionName = "Unit test region";
73 AgentCircuitManager acm = new AgentCircuitManager(); 62 AgentCircuitManager acm = new AgentCircuitManager();
@@ -79,24 +68,12 @@ namespace OpenSim.Region.Environment.Scenes.Tests
79 IConfigSource configSource = new IniConfigSource(); 68 IConfigSource configSource = new IniConfigSource();
80 69
81 scene 70 scene
82 = new Scene(regInfo, acm, cm, scs, null, sm, null, null, false, false, false, configSource, null); 71 = new Scene(regInfo, acm, cm, scs, null, sm, null, null, false, false, false, configSource, null);
83
84 SceneObjectGroup sceneObject = new SceneObjectGroup();
85 SceneObjectPart part
86 = new SceneObjectPart(UUID.Random(), PrimitiveBaseShape.Default, Vector3.Zero, Quaternion.Identity, Vector3.Zero);
87 //part.UpdatePrimFlags(false, false, true);
88 part.ObjectFlags |= (uint)PrimFlags.Phantom;
89
90 sceneObject.SetRootPart(part);
91
92 scene.AddNewSceneObject(sceneObject, false);
93
94 SceneObjectPart retrievedPart = scene.GetSceneObjectPart(part.LocalId);
95
96 //System.Console.WriteLine("retrievedPart : {0}", retrievedPart);
97 // If the parts have the same UUID then we will consider them as one and the same
98 Assert.That(retrievedPart.UUID, Is.EqualTo(part.UUID));
99 } 72 }
73
74 static public Random random;
75 SceneObjectGroup found;
76 Scene scene;
100 77
101 [Test] 78 [Test]
102 public void T010_AddObjects() 79 public void T010_AddObjects()
@@ -181,8 +158,8 @@ namespace OpenSim.Region.Environment.Scenes.Tests
181 { 158 {
182 EntityList entlist = new EntityList(); 159 EntityList entlist = new EntityList();
183 UUID id = UUID.Random(); 160 UUID id = UUID.Random();
184 int exceptions = 0; 161 //int exceptions = 0;
185 Dictionary<UUID, uint> dict = new Dictionary<UUID,uint>(); 162 //Dictionary<UUID, uint> dict = new Dictionary<UUID,uint>();
186 List<Thread> trdlist = new List<Thread>(); 163 List<Thread> trdlist = new List<Thread>();
187 SceneObjectGroup sog = NewSOG(id); 164 SceneObjectGroup sog = NewSOG(id);
188 uint lid = sog.LocalId; 165 uint lid = sog.LocalId;