diff options
Diffstat (limited to '')
5 files changed, 48 insertions, 5 deletions
diff --git a/OpenSim/Region/Framework/Scenes/Tests/EntityManagerTests.cs b/OpenSim/Region/Framework/Scenes/Tests/EntityManagerTests.cs index 2c6ccc8..480abc6 100644 --- a/OpenSim/Region/Framework/Scenes/Tests/EntityManagerTests.cs +++ b/OpenSim/Region/Framework/Scenes/Tests/EntityManagerTests.cs | |||
@@ -26,6 +26,7 @@ | |||
26 | */ | 26 | */ |
27 | 27 | ||
28 | using System; | 28 | using System; |
29 | using System.Reflection; | ||
29 | using System.Threading; | 30 | using System.Threading; |
30 | using System.Text; | 31 | using System.Text; |
31 | using System.Collections.Generic; | 32 | using System.Collections.Generic; |
@@ -50,6 +51,8 @@ namespace OpenSim.Region.Framework.Scenes.Tests | |||
50 | [Test] | 51 | [Test] |
51 | public void T010_AddObjects() | 52 | public void T010_AddObjects() |
52 | { | 53 | { |
54 | Console.WriteLine("Beginning test {0}", MethodBase.GetCurrentMethod()); | ||
55 | |||
53 | random = new Random(); | 56 | random = new Random(); |
54 | SceneObjectGroup found; | 57 | SceneObjectGroup found; |
55 | EntityManager entman = new EntityManager(); | 58 | EntityManager entman = new EntityManager(); |
@@ -77,12 +80,14 @@ namespace OpenSim.Region.Framework.Scenes.Tests | |||
77 | Assert.That(entman.ContainsKey(obj1), Is.False); | 80 | Assert.That(entman.ContainsKey(obj1), Is.False); |
78 | Assert.That(entman.ContainsKey(li1), Is.False); | 81 | Assert.That(entman.ContainsKey(li1), Is.False); |
79 | Assert.That(entman.ContainsKey(obj2), Is.False); | 82 | Assert.That(entman.ContainsKey(obj2), Is.False); |
80 | Assert.That(entman.ContainsKey(li2), Is.False); | 83 | Assert.That(entman.ContainsKey(li2), Is.False); |
81 | } | 84 | } |
82 | 85 | ||
83 | [Test] | 86 | [Test] |
84 | public void T011_ThreadAddRemoveTest() | 87 | public void T011_ThreadAddRemoveTest() |
85 | { | 88 | { |
89 | Console.WriteLine("Beginning test {0}", MethodBase.GetCurrentMethod()); | ||
90 | |||
86 | // This test adds and removes with mutiple threads, attempting to break the | 91 | // This test adds and removes with mutiple threads, attempting to break the |
87 | // uuid and localid dictionary coherence. | 92 | // uuid and localid dictionary coherence. |
88 | EntityManager entman = new EntityManager(); | 93 | EntityManager entman = new EntityManager(); |
diff --git a/OpenSim/Region/Framework/Scenes/Tests/SceneObjectBasicTests.cs b/OpenSim/Region/Framework/Scenes/Tests/SceneObjectBasicTests.cs index caee3a5..59f1ba4 100644 --- a/OpenSim/Region/Framework/Scenes/Tests/SceneObjectBasicTests.cs +++ b/OpenSim/Region/Framework/Scenes/Tests/SceneObjectBasicTests.cs | |||
@@ -26,6 +26,7 @@ | |||
26 | */ | 26 | */ |
27 | 27 | ||
28 | using System; | 28 | using System; |
29 | using System.Reflection; | ||
29 | using NUnit.Framework; | 30 | using NUnit.Framework; |
30 | using NUnit.Framework.SyntaxHelpers; | 31 | using NUnit.Framework.SyntaxHelpers; |
31 | using OpenMetaverse; | 32 | using OpenMetaverse; |
@@ -51,13 +52,15 @@ namespace OpenSim.Region.Framework.Scenes.Tests | |||
51 | [Test] | 52 | [Test] |
52 | public void TestAddSceneObject() | 53 | public void TestAddSceneObject() |
53 | { | 54 | { |
55 | Console.WriteLine("Beginning test {0}", MethodBase.GetCurrentMethod()); | ||
56 | |||
54 | Scene scene = SceneSetupHelpers.SetupScene(); | 57 | Scene scene = SceneSetupHelpers.SetupScene(); |
55 | SceneObjectPart part = SceneSetupHelpers.AddSceneObject(scene); | 58 | SceneObjectPart part = SceneSetupHelpers.AddSceneObject(scene); |
56 | SceneObjectPart retrievedPart = scene.GetSceneObjectPart(part.LocalId); | 59 | SceneObjectPart retrievedPart = scene.GetSceneObjectPart(part.LocalId); |
57 | 60 | ||
58 | //m_log.Debug("retrievedPart : {0}", retrievedPart); | 61 | //m_log.Debug("retrievedPart : {0}", retrievedPart); |
59 | // If the parts have the same UUID then we will consider them as one and the same | 62 | // If the parts have the same UUID then we will consider them as one and the same |
60 | Assert.That(retrievedPart.UUID, Is.EqualTo(part.UUID)); | 63 | Assert.That(retrievedPart.UUID, Is.EqualTo(part.UUID)); |
61 | } | 64 | } |
62 | 65 | ||
63 | /// <summary> | 66 | /// <summary> |
@@ -66,6 +69,8 @@ namespace OpenSim.Region.Framework.Scenes.Tests | |||
66 | [Test] | 69 | [Test] |
67 | public void TestDeleteSceneObject() | 70 | public void TestDeleteSceneObject() |
68 | { | 71 | { |
72 | Console.WriteLine("Beginning test {0}", MethodBase.GetCurrentMethod()); | ||
73 | |||
69 | TestScene scene = SceneSetupHelpers.SetupScene(); | 74 | TestScene scene = SceneSetupHelpers.SetupScene(); |
70 | SceneObjectPart part = SceneSetupHelpers.AddSceneObject(scene); | 75 | SceneObjectPart part = SceneSetupHelpers.AddSceneObject(scene); |
71 | scene.DeleteSceneObject(part.ParentGroup, false); | 76 | scene.DeleteSceneObject(part.ParentGroup, false); |
@@ -80,6 +85,8 @@ namespace OpenSim.Region.Framework.Scenes.Tests | |||
80 | [Test] | 85 | [Test] |
81 | public void TestDeleteSceneObjectAsync() | 86 | public void TestDeleteSceneObjectAsync() |
82 | { | 87 | { |
88 | Console.WriteLine("Beginning test {0}", MethodBase.GetCurrentMethod()); | ||
89 | |||
83 | UUID agentId = UUID.Parse("00000000-0000-0000-0000-000000000001"); | 90 | UUID agentId = UUID.Parse("00000000-0000-0000-0000-000000000001"); |
84 | 91 | ||
85 | TestScene scene = SceneSetupHelpers.SetupScene(); | 92 | TestScene scene = SceneSetupHelpers.SetupScene(); |
@@ -98,7 +105,7 @@ namespace OpenSim.Region.Framework.Scenes.Tests | |||
98 | 105 | ||
99 | sogd.InventoryDeQueueAndDelete(); | 106 | sogd.InventoryDeQueueAndDelete(); |
100 | SceneObjectPart retrievedPart2 = scene.GetSceneObjectPart(part.LocalId); | 107 | SceneObjectPart retrievedPart2 = scene.GetSceneObjectPart(part.LocalId); |
101 | Assert.That(retrievedPart2, Is.Null); | 108 | Assert.That(retrievedPart2, Is.Null); |
102 | } | 109 | } |
103 | 110 | ||
104 | /// <summary> | 111 | /// <summary> |
@@ -107,6 +114,7 @@ namespace OpenSim.Region.Framework.Scenes.Tests | |||
107 | [Test] | 114 | [Test] |
108 | public void TestDeleteSceneObjectAsyncToUserInventory() | 115 | public void TestDeleteSceneObjectAsyncToUserInventory() |
109 | { | 116 | { |
117 | Console.WriteLine("Beginning test {0}", MethodBase.GetCurrentMethod()); | ||
110 | //log4net.Config.XmlConfigurator.Configure(); | 118 | //log4net.Config.XmlConfigurator.Configure(); |
111 | 119 | ||
112 | UUID agentId = UUID.Parse("00000000-0000-0000-0000-000000000001"); | 120 | UUID agentId = UUID.Parse("00000000-0000-0000-0000-000000000001"); |
diff --git a/OpenSim/Region/Framework/Scenes/Tests/SceneObjectLinkingTests.cs b/OpenSim/Region/Framework/Scenes/Tests/SceneObjectLinkingTests.cs index 003fef2..fe6b0e7 100644 --- a/OpenSim/Region/Framework/Scenes/Tests/SceneObjectLinkingTests.cs +++ b/OpenSim/Region/Framework/Scenes/Tests/SceneObjectLinkingTests.cs | |||
@@ -26,6 +26,7 @@ | |||
26 | */ | 26 | */ |
27 | 27 | ||
28 | using System; | 28 | using System; |
29 | using System.Reflection; | ||
29 | using NUnit.Framework; | 30 | using NUnit.Framework; |
30 | using NUnit.Framework.SyntaxHelpers; | 31 | using NUnit.Framework.SyntaxHelpers; |
31 | using OpenMetaverse; | 32 | using OpenMetaverse; |
@@ -52,6 +53,8 @@ namespace OpenSim.Region.Framework.Scenes.Tests | |||
52 | [Test] | 53 | [Test] |
53 | public void TestLinkDelink2SceneObjects() | 54 | public void TestLinkDelink2SceneObjects() |
54 | { | 55 | { |
56 | Console.WriteLine("Beginning test {0}", MethodBase.GetCurrentMethod()); | ||
57 | |||
55 | bool debugtest = false; | 58 | bool debugtest = false; |
56 | 59 | ||
57 | Scene scene = SceneSetupHelpers.SetupScene(); | 60 | Scene scene = SceneSetupHelpers.SetupScene(); |
@@ -122,12 +125,14 @@ namespace OpenSim.Region.Framework.Scenes.Tests | |||
122 | m_log.Debug("Group2: Prim2: OffsetPosition:" + part2.AbsolutePosition + ", OffsetRotation:" + part2.RotationOffset); | 125 | m_log.Debug("Group2: Prim2: OffsetPosition:" + part2.AbsolutePosition + ", OffsetRotation:" + part2.RotationOffset); |
123 | 126 | ||
124 | Assert.That(grp1.Children.Count, Is.EqualTo(1), "Group 1 still contained part2 after delink."); | 127 | Assert.That(grp1.Children.Count, Is.EqualTo(1), "Group 1 still contained part2 after delink."); |
125 | Assert.That(part2.AbsolutePosition == Vector3.Zero); | 128 | Assert.That(part2.AbsolutePosition == Vector3.Zero); |
126 | } | 129 | } |
127 | 130 | ||
128 | [Test] | 131 | [Test] |
129 | public void TestLinkDelink2groups4SceneObjects() | 132 | public void TestLinkDelink2groups4SceneObjects() |
130 | { | 133 | { |
134 | Console.WriteLine("Beginning test {0}", MethodBase.GetCurrentMethod()); | ||
135 | |||
131 | bool debugtest = false; | 136 | bool debugtest = false; |
132 | 137 | ||
133 | Scene scene = SceneSetupHelpers.SetupScene(); | 138 | Scene scene = SceneSetupHelpers.SetupScene(); |
diff --git a/OpenSim/Region/Framework/Scenes/Tests/ScenePresenceTests.cs b/OpenSim/Region/Framework/Scenes/Tests/ScenePresenceTests.cs index 9fcd478..443201a 100644 --- a/OpenSim/Region/Framework/Scenes/Tests/ScenePresenceTests.cs +++ b/OpenSim/Region/Framework/Scenes/Tests/ScenePresenceTests.cs | |||
@@ -25,11 +25,12 @@ | |||
25 | * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | 25 | * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. |
26 | */ | 26 | */ |
27 | 27 | ||
28 | using Nini.Config; | ||
29 | using System; | 28 | using System; |
30 | using System.Collections.Generic; | 29 | using System.Collections.Generic; |
30 | using System.Reflection; | ||
31 | using System.Text; | 31 | using System.Text; |
32 | using System.Threading; | 32 | using System.Threading; |
33 | using Nini.Config; | ||
33 | using NUnit.Framework; | 34 | using NUnit.Framework; |
34 | using NUnit.Framework.SyntaxHelpers; | 35 | using NUnit.Framework.SyntaxHelpers; |
35 | using OpenMetaverse; | 36 | using OpenMetaverse; |
@@ -96,6 +97,8 @@ namespace OpenSim.Region.Framework.Scenes.Tests | |||
96 | [Test] | 97 | [Test] |
97 | public void T010_TestAddRootAgent() | 98 | public void T010_TestAddRootAgent() |
98 | { | 99 | { |
100 | Console.WriteLine("Beginning test {0}", MethodBase.GetCurrentMethod()); | ||
101 | |||
99 | string firstName = "testfirstname"; | 102 | string firstName = "testfirstname"; |
100 | 103 | ||
101 | AgentCircuitData agent = new AgentCircuitData(); | 104 | AgentCircuitData agent = new AgentCircuitData(); |
@@ -127,6 +130,8 @@ namespace OpenSim.Region.Framework.Scenes.Tests | |||
127 | [Test] | 130 | [Test] |
128 | public void T011_TestRemoveRootAgent() | 131 | public void T011_TestRemoveRootAgent() |
129 | { | 132 | { |
133 | Console.WriteLine("Beginning test {0}", MethodBase.GetCurrentMethod()); | ||
134 | |||
130 | scene.RemoveClient(agent1); | 135 | scene.RemoveClient(agent1); |
131 | 136 | ||
132 | ScenePresence presence = scene.GetScenePresence(agent1); | 137 | ScenePresence presence = scene.GetScenePresence(agent1); |
@@ -137,6 +142,8 @@ namespace OpenSim.Region.Framework.Scenes.Tests | |||
137 | [Test] | 142 | [Test] |
138 | public void T012_TestAddNeighbourRegion() | 143 | public void T012_TestAddNeighbourRegion() |
139 | { | 144 | { |
145 | Console.WriteLine("Beginning test {0}", MethodBase.GetCurrentMethod()); | ||
146 | |||
140 | scene.NewUserConnection(acd1); | 147 | scene.NewUserConnection(acd1); |
141 | scene.AddNewClient(testclient); | 148 | scene.AddNewClient(testclient); |
142 | 149 | ||
@@ -156,6 +163,8 @@ namespace OpenSim.Region.Framework.Scenes.Tests | |||
156 | [Test] | 163 | [Test] |
157 | public void T013_TestRemoveNeighbourRegion() | 164 | public void T013_TestRemoveNeighbourRegion() |
158 | { | 165 | { |
166 | Console.WriteLine("Beginning test {0}", MethodBase.GetCurrentMethod()); | ||
167 | |||
159 | ScenePresence presence = scene.GetScenePresence(agent1); | 168 | ScenePresence presence = scene.GetScenePresence(agent1); |
160 | presence.RemoveNeighbourRegion(region3); | 169 | presence.RemoveNeighbourRegion(region3); |
161 | 170 | ||
@@ -171,6 +180,8 @@ namespace OpenSim.Region.Framework.Scenes.Tests | |||
171 | [Test] | 180 | [Test] |
172 | public void T020_TestMakeRootAgent() | 181 | public void T020_TestMakeRootAgent() |
173 | { | 182 | { |
183 | Console.WriteLine("Beginning test {0}", MethodBase.GetCurrentMethod()); | ||
184 | |||
174 | ScenePresence presence = scene.GetScenePresence(agent1); | 185 | ScenePresence presence = scene.GetScenePresence(agent1); |
175 | Assert.That(presence.IsChildAgent, Is.False, "Starts out as a root agent"); | 186 | Assert.That(presence.IsChildAgent, Is.False, "Starts out as a root agent"); |
176 | 187 | ||
@@ -187,6 +198,8 @@ namespace OpenSim.Region.Framework.Scenes.Tests | |||
187 | [Test] | 198 | [Test] |
188 | public void T021_TestCrossToNewRegion() | 199 | public void T021_TestCrossToNewRegion() |
189 | { | 200 | { |
201 | Console.WriteLine("Beginning test {0}", MethodBase.GetCurrentMethod()); | ||
202 | |||
190 | // Adding child agent to region 1001 | 203 | // Adding child agent to region 1001 |
191 | scene2.NewUserConnection(acd1); | 204 | scene2.NewUserConnection(acd1); |
192 | scene2.AddNewClient(testclient); | 205 | scene2.AddNewClient(testclient); |
@@ -240,6 +253,8 @@ namespace OpenSim.Region.Framework.Scenes.Tests | |||
240 | [Test] | 253 | [Test] |
241 | public void T030_TestAddAttachments() | 254 | public void T030_TestAddAttachments() |
242 | { | 255 | { |
256 | Console.WriteLine("Beginning test {0}", MethodBase.GetCurrentMethod()); | ||
257 | |||
243 | ScenePresence presence = scene.GetScenePresence(agent1); | 258 | ScenePresence presence = scene.GetScenePresence(agent1); |
244 | 259 | ||
245 | presence.AddAttachment(sog1); | 260 | presence.AddAttachment(sog1); |
@@ -253,6 +268,8 @@ namespace OpenSim.Region.Framework.Scenes.Tests | |||
253 | [Test] | 268 | [Test] |
254 | public void T031_RemoveAttachments() | 269 | public void T031_RemoveAttachments() |
255 | { | 270 | { |
271 | Console.WriteLine("Beginning test {0}", MethodBase.GetCurrentMethod()); | ||
272 | |||
256 | ScenePresence presence = scene.GetScenePresence(agent1); | 273 | ScenePresence presence = scene.GetScenePresence(agent1); |
257 | presence.RemoveAttachment(sog1); | 274 | presence.RemoveAttachment(sog1); |
258 | presence.RemoveAttachment(sog2); | 275 | presence.RemoveAttachment(sog2); |
@@ -263,6 +280,8 @@ namespace OpenSim.Region.Framework.Scenes.Tests | |||
263 | [Test] | 280 | [Test] |
264 | public void T032_CrossAttachments() | 281 | public void T032_CrossAttachments() |
265 | { | 282 | { |
283 | Console.WriteLine("Beginning test {0}", MethodBase.GetCurrentMethod()); | ||
284 | |||
266 | ScenePresence presence = scene.GetScenePresence(agent1); | 285 | ScenePresence presence = scene.GetScenePresence(agent1); |
267 | ScenePresence presence2 = scene2.GetScenePresence(agent1); | 286 | ScenePresence presence2 = scene2.GetScenePresence(agent1); |
268 | presence2.AddAttachment(sog1); | 287 | presence2.AddAttachment(sog1); |
@@ -281,6 +300,8 @@ namespace OpenSim.Region.Framework.Scenes.Tests | |||
281 | 300 | ||
282 | public static string GetRandomCapsObjectPath() | 301 | public static string GetRandomCapsObjectPath() |
283 | { | 302 | { |
303 | Console.WriteLine("Beginning test {0}", MethodBase.GetCurrentMethod()); | ||
304 | |||
284 | UUID caps = UUID.Random(); | 305 | UUID caps = UUID.Random(); |
285 | string capsPath = caps.ToString(); | 306 | string capsPath = caps.ToString(); |
286 | capsPath = capsPath.Remove(capsPath.Length - 4, 4); | 307 | capsPath = capsPath.Remove(capsPath.Length - 4, 4); |
diff --git a/OpenSim/Region/Framework/Scenes/Tests/StandaloneTeleportTests.cs b/OpenSim/Region/Framework/Scenes/Tests/StandaloneTeleportTests.cs index 64b3d67..46bfb30 100644 --- a/OpenSim/Region/Framework/Scenes/Tests/StandaloneTeleportTests.cs +++ b/OpenSim/Region/Framework/Scenes/Tests/StandaloneTeleportTests.cs | |||
@@ -25,6 +25,8 @@ | |||
25 | * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | 25 | * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. |
26 | */ | 26 | */ |
27 | 27 | ||
28 | using System; | ||
29 | using System.Reflection; | ||
28 | using Nini.Config; | 30 | using Nini.Config; |
29 | using NUnit.Framework; | 31 | using NUnit.Framework; |
30 | using NUnit.Framework.SyntaxHelpers; | 32 | using NUnit.Framework.SyntaxHelpers; |
@@ -51,6 +53,8 @@ namespace OpenSim.Region.Framework.Scenes.Tests | |||
51 | [Test] | 53 | [Test] |
52 | public void TestSimpleNotNeighboursTeleport() | 54 | public void TestSimpleNotNeighboursTeleport() |
53 | { | 55 | { |
56 | Console.WriteLine("Beginning test {0}", MethodBase.GetCurrentMethod()); | ||
57 | |||
54 | log4net.Config.XmlConfigurator.Configure(); | 58 | log4net.Config.XmlConfigurator.Configure(); |
55 | 59 | ||
56 | UUID sceneAId = UUID.Parse("00000000-0000-0000-0000-000000000100"); | 60 | UUID sceneAId = UUID.Parse("00000000-0000-0000-0000-000000000100"); |