From 355247c2b257cd6f0688c9b378008840f4d43632 Mon Sep 17 00:00:00 2001 From: Justin Clarke Casey Date: Fri, 27 Mar 2009 16:33:15 +0000 Subject: * For each test in OpenSim.Region.Framework.Scenes.Tests, tell the console when the test starts * This is to help identify which test is freezing, since all the tests in the previous dll (coremodules) succeed * Unfortunately they are not executed in the same order in which the results are listed in Bamboo --- .../Framework/Scenes/Tests/EntityManagerTests.cs | 7 ++++++- .../Scenes/Tests/SceneObjectBasicTests.cs | 12 +++++++++-- .../Scenes/Tests/SceneObjectLinkingTests.cs | 7 ++++++- .../Framework/Scenes/Tests/ScenePresenceTests.cs | 23 +++++++++++++++++++++- .../Scenes/Tests/StandaloneTeleportTests.cs | 4 ++++ 5 files changed, 48 insertions(+), 5 deletions(-) (limited to 'OpenSim/Region/Framework') 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 @@ */ using System; +using System.Reflection; using System.Threading; using System.Text; using System.Collections.Generic; @@ -50,6 +51,8 @@ namespace OpenSim.Region.Framework.Scenes.Tests [Test] public void T010_AddObjects() { + Console.WriteLine("Beginning test {0}", MethodBase.GetCurrentMethod()); + random = new Random(); SceneObjectGroup found; EntityManager entman = new EntityManager(); @@ -77,12 +80,14 @@ namespace OpenSim.Region.Framework.Scenes.Tests Assert.That(entman.ContainsKey(obj1), Is.False); Assert.That(entman.ContainsKey(li1), Is.False); Assert.That(entman.ContainsKey(obj2), Is.False); - Assert.That(entman.ContainsKey(li2), Is.False); + Assert.That(entman.ContainsKey(li2), Is.False); } [Test] public void T011_ThreadAddRemoveTest() { + Console.WriteLine("Beginning test {0}", MethodBase.GetCurrentMethod()); + // This test adds and removes with mutiple threads, attempting to break the // uuid and localid dictionary coherence. 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 @@ */ using System; +using System.Reflection; using NUnit.Framework; using NUnit.Framework.SyntaxHelpers; using OpenMetaverse; @@ -51,13 +52,15 @@ namespace OpenSim.Region.Framework.Scenes.Tests [Test] public void TestAddSceneObject() { + Console.WriteLine("Beginning test {0}", MethodBase.GetCurrentMethod()); + Scene scene = SceneSetupHelpers.SetupScene(); SceneObjectPart part = SceneSetupHelpers.AddSceneObject(scene); SceneObjectPart retrievedPart = scene.GetSceneObjectPart(part.LocalId); //m_log.Debug("retrievedPart : {0}", retrievedPart); // If the parts have the same UUID then we will consider them as one and the same - Assert.That(retrievedPart.UUID, Is.EqualTo(part.UUID)); + Assert.That(retrievedPart.UUID, Is.EqualTo(part.UUID)); } /// @@ -66,6 +69,8 @@ namespace OpenSim.Region.Framework.Scenes.Tests [Test] public void TestDeleteSceneObject() { + Console.WriteLine("Beginning test {0}", MethodBase.GetCurrentMethod()); + TestScene scene = SceneSetupHelpers.SetupScene(); SceneObjectPart part = SceneSetupHelpers.AddSceneObject(scene); scene.DeleteSceneObject(part.ParentGroup, false); @@ -80,6 +85,8 @@ namespace OpenSim.Region.Framework.Scenes.Tests [Test] public void TestDeleteSceneObjectAsync() { + Console.WriteLine("Beginning test {0}", MethodBase.GetCurrentMethod()); + UUID agentId = UUID.Parse("00000000-0000-0000-0000-000000000001"); TestScene scene = SceneSetupHelpers.SetupScene(); @@ -98,7 +105,7 @@ namespace OpenSim.Region.Framework.Scenes.Tests sogd.InventoryDeQueueAndDelete(); SceneObjectPart retrievedPart2 = scene.GetSceneObjectPart(part.LocalId); - Assert.That(retrievedPart2, Is.Null); + Assert.That(retrievedPart2, Is.Null); } /// @@ -107,6 +114,7 @@ namespace OpenSim.Region.Framework.Scenes.Tests [Test] public void TestDeleteSceneObjectAsyncToUserInventory() { + Console.WriteLine("Beginning test {0}", MethodBase.GetCurrentMethod()); //log4net.Config.XmlConfigurator.Configure(); 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 @@ */ using System; +using System.Reflection; using NUnit.Framework; using NUnit.Framework.SyntaxHelpers; using OpenMetaverse; @@ -52,6 +53,8 @@ namespace OpenSim.Region.Framework.Scenes.Tests [Test] public void TestLinkDelink2SceneObjects() { + Console.WriteLine("Beginning test {0}", MethodBase.GetCurrentMethod()); + bool debugtest = false; Scene scene = SceneSetupHelpers.SetupScene(); @@ -122,12 +125,14 @@ namespace OpenSim.Region.Framework.Scenes.Tests m_log.Debug("Group2: Prim2: OffsetPosition:" + part2.AbsolutePosition + ", OffsetRotation:" + part2.RotationOffset); Assert.That(grp1.Children.Count, Is.EqualTo(1), "Group 1 still contained part2 after delink."); - Assert.That(part2.AbsolutePosition == Vector3.Zero); + Assert.That(part2.AbsolutePosition == Vector3.Zero); } [Test] public void TestLinkDelink2groups4SceneObjects() { + Console.WriteLine("Beginning test {0}", MethodBase.GetCurrentMethod()); + bool debugtest = false; 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 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -using Nini.Config; using System; using System.Collections.Generic; +using System.Reflection; using System.Text; using System.Threading; +using Nini.Config; using NUnit.Framework; using NUnit.Framework.SyntaxHelpers; using OpenMetaverse; @@ -96,6 +97,8 @@ namespace OpenSim.Region.Framework.Scenes.Tests [Test] public void T010_TestAddRootAgent() { + Console.WriteLine("Beginning test {0}", MethodBase.GetCurrentMethod()); + string firstName = "testfirstname"; AgentCircuitData agent = new AgentCircuitData(); @@ -127,6 +130,8 @@ namespace OpenSim.Region.Framework.Scenes.Tests [Test] public void T011_TestRemoveRootAgent() { + Console.WriteLine("Beginning test {0}", MethodBase.GetCurrentMethod()); + scene.RemoveClient(agent1); ScenePresence presence = scene.GetScenePresence(agent1); @@ -137,6 +142,8 @@ namespace OpenSim.Region.Framework.Scenes.Tests [Test] public void T012_TestAddNeighbourRegion() { + Console.WriteLine("Beginning test {0}", MethodBase.GetCurrentMethod()); + scene.NewUserConnection(acd1); scene.AddNewClient(testclient); @@ -156,6 +163,8 @@ namespace OpenSim.Region.Framework.Scenes.Tests [Test] public void T013_TestRemoveNeighbourRegion() { + Console.WriteLine("Beginning test {0}", MethodBase.GetCurrentMethod()); + ScenePresence presence = scene.GetScenePresence(agent1); presence.RemoveNeighbourRegion(region3); @@ -171,6 +180,8 @@ namespace OpenSim.Region.Framework.Scenes.Tests [Test] public void T020_TestMakeRootAgent() { + Console.WriteLine("Beginning test {0}", MethodBase.GetCurrentMethod()); + ScenePresence presence = scene.GetScenePresence(agent1); Assert.That(presence.IsChildAgent, Is.False, "Starts out as a root agent"); @@ -187,6 +198,8 @@ namespace OpenSim.Region.Framework.Scenes.Tests [Test] public void T021_TestCrossToNewRegion() { + Console.WriteLine("Beginning test {0}", MethodBase.GetCurrentMethod()); + // Adding child agent to region 1001 scene2.NewUserConnection(acd1); scene2.AddNewClient(testclient); @@ -240,6 +253,8 @@ namespace OpenSim.Region.Framework.Scenes.Tests [Test] public void T030_TestAddAttachments() { + Console.WriteLine("Beginning test {0}", MethodBase.GetCurrentMethod()); + ScenePresence presence = scene.GetScenePresence(agent1); presence.AddAttachment(sog1); @@ -253,6 +268,8 @@ namespace OpenSim.Region.Framework.Scenes.Tests [Test] public void T031_RemoveAttachments() { + Console.WriteLine("Beginning test {0}", MethodBase.GetCurrentMethod()); + ScenePresence presence = scene.GetScenePresence(agent1); presence.RemoveAttachment(sog1); presence.RemoveAttachment(sog2); @@ -263,6 +280,8 @@ namespace OpenSim.Region.Framework.Scenes.Tests [Test] public void T032_CrossAttachments() { + Console.WriteLine("Beginning test {0}", MethodBase.GetCurrentMethod()); + ScenePresence presence = scene.GetScenePresence(agent1); ScenePresence presence2 = scene2.GetScenePresence(agent1); presence2.AddAttachment(sog1); @@ -281,6 +300,8 @@ namespace OpenSim.Region.Framework.Scenes.Tests public static string GetRandomCapsObjectPath() { + Console.WriteLine("Beginning test {0}", MethodBase.GetCurrentMethod()); + UUID caps = UUID.Random(); string capsPath = caps.ToString(); 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 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ +using System; +using System.Reflection; using Nini.Config; using NUnit.Framework; using NUnit.Framework.SyntaxHelpers; @@ -51,6 +53,8 @@ namespace OpenSim.Region.Framework.Scenes.Tests [Test] public void TestSimpleNotNeighboursTeleport() { + Console.WriteLine("Beginning test {0}", MethodBase.GetCurrentMethod()); + log4net.Config.XmlConfigurator.Configure(); UUID sceneAId = UUID.Parse("00000000-0000-0000-0000-000000000100"); -- cgit v1.1