aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Framework/Scenes
diff options
context:
space:
mode:
authorlbsa712009-04-09 20:06:27 +0000
committerlbsa712009-04-09 20:06:27 +0000
commit6af0751cc5d276370c7c4ce2a0ee064b1106a7bc (patch)
tree8fae62569ca8bfd02d55a783893b2f412dae89e5 /OpenSim/Region/Framework/Scenes
parent* Remove Autooar module pending it's migration to the forge (diff)
downloadopensim-SC_OLD-6af0751cc5d276370c7c4ce2a0ee064b1106a7bc.zip
opensim-SC_OLD-6af0751cc5d276370c7c4ce2a0ee064b1106a7bc.tar.gz
opensim-SC_OLD-6af0751cc5d276370c7c4ce2a0ee064b1106a7bc.tar.bz2
opensim-SC_OLD-6af0751cc5d276370c7c4ce2a0ee064b1106a7bc.tar.xz
* Tagged long running tests with LongRunningAttribute.
* Now, the 144 unit tests takes roughly as long time to run (16s on my laptop) that the 10 long running takes. The database tests takes forever. * Feel free to run the unit tests as you code, and the rest before commit.
Diffstat (limited to 'OpenSim/Region/Framework/Scenes')
-rw-r--r--OpenSim/Region/Framework/Scenes/Tests/EntityManagerTests.cs7
-rw-r--r--OpenSim/Region/Framework/Scenes/Tests/SceneObjectBasicTests.cs3
-rw-r--r--OpenSim/Region/Framework/Scenes/Tests/StandaloneTeleportTests.cs5
3 files changed, 9 insertions, 6 deletions
diff --git a/OpenSim/Region/Framework/Scenes/Tests/EntityManagerTests.cs b/OpenSim/Region/Framework/Scenes/Tests/EntityManagerTests.cs
index 480abc6..d1ef686 100644
--- a/OpenSim/Region/Framework/Scenes/Tests/EntityManagerTests.cs
+++ b/OpenSim/Region/Framework/Scenes/Tests/EntityManagerTests.cs
@@ -37,11 +37,12 @@ using OpenMetaverse;
37using OpenSim.Framework; 37using OpenSim.Framework;
38using OpenSim.Framework.Communications; 38using OpenSim.Framework.Communications;
39using OpenSim.Region.Framework.Scenes; 39using OpenSim.Region.Framework.Scenes;
40using OpenSim.Tests.Common;
40using OpenSim.Tests.Common.Setup; 41using OpenSim.Tests.Common.Setup;
41 42
42namespace OpenSim.Region.Framework.Scenes.Tests 43namespace OpenSim.Region.Framework.Scenes.Tests
43{ 44{
44 [TestFixture] 45 [TestFixture, LongRunning]
45 public class EntityManagerTests 46 public class EntityManagerTests
46 { 47 {
47 static public Random random; 48 static public Random random;
@@ -51,7 +52,7 @@ namespace OpenSim.Region.Framework.Scenes.Tests
51 [Test] 52 [Test]
52 public void T010_AddObjects() 53 public void T010_AddObjects()
53 { 54 {
54 Console.WriteLine("Beginning test {0}", MethodBase.GetCurrentMethod()); 55 // Console.WriteLine("Beginning test {0}", MethodBase.GetCurrentMethod());
55 56
56 random = new Random(); 57 random = new Random();
57 SceneObjectGroup found; 58 SceneObjectGroup found;
@@ -86,7 +87,7 @@ namespace OpenSim.Region.Framework.Scenes.Tests
86 [Test] 87 [Test]
87 public void T011_ThreadAddRemoveTest() 88 public void T011_ThreadAddRemoveTest()
88 { 89 {
89 Console.WriteLine("Beginning test {0}", MethodBase.GetCurrentMethod()); 90 // Console.WriteLine("Beginning test {0}", MethodBase.GetCurrentMethod());
90 91
91 // This test adds and removes with mutiple threads, attempting to break the 92 // This test adds and removes with mutiple threads, attempting to break the
92 // uuid and localid dictionary coherence. 93 // uuid and localid dictionary coherence.
diff --git a/OpenSim/Region/Framework/Scenes/Tests/SceneObjectBasicTests.cs b/OpenSim/Region/Framework/Scenes/Tests/SceneObjectBasicTests.cs
index 59f1ba4..5c3d653 100644
--- a/OpenSim/Region/Framework/Scenes/Tests/SceneObjectBasicTests.cs
+++ b/OpenSim/Region/Framework/Scenes/Tests/SceneObjectBasicTests.cs
@@ -35,6 +35,7 @@ using OpenSim.Framework.Communications;
35using OpenSim.Framework.Communications.Cache; 35using OpenSim.Framework.Communications.Cache;
36using OpenSim.Region.Communications.Local; 36using OpenSim.Region.Communications.Local;
37using OpenSim.Region.Framework.Scenes; 37using OpenSim.Region.Framework.Scenes;
38using OpenSim.Tests.Common;
38using OpenSim.Tests.Common.Mock; 39using OpenSim.Tests.Common.Mock;
39using OpenSim.Tests.Common.Setup; 40using OpenSim.Tests.Common.Setup;
40 41
@@ -49,7 +50,7 @@ namespace OpenSim.Region.Framework.Scenes.Tests
49 /// <summary> 50 /// <summary>
50 /// Test adding an object to a scene. 51 /// Test adding an object to a scene.
51 /// </summary> 52 /// </summary>
52 [Test] 53 [Test, LongRunning]
53 public void TestAddSceneObject() 54 public void TestAddSceneObject()
54 { 55 {
55 Console.WriteLine("Beginning test {0}", MethodBase.GetCurrentMethod()); 56 Console.WriteLine("Beginning test {0}", MethodBase.GetCurrentMethod());
diff --git a/OpenSim/Region/Framework/Scenes/Tests/StandaloneTeleportTests.cs b/OpenSim/Region/Framework/Scenes/Tests/StandaloneTeleportTests.cs
index 46bfb30..80d2ba9 100644
--- a/OpenSim/Region/Framework/Scenes/Tests/StandaloneTeleportTests.cs
+++ b/OpenSim/Region/Framework/Scenes/Tests/StandaloneTeleportTests.cs
@@ -35,6 +35,7 @@ using OpenSim.Framework;
35using OpenSim.Framework.Communications; 35using OpenSim.Framework.Communications;
36using OpenSim.Region.Framework.Interfaces; 36using OpenSim.Region.Framework.Interfaces;
37using OpenSim.Region.CoreModules.Communications.REST; 37using OpenSim.Region.CoreModules.Communications.REST;
38using OpenSim.Tests.Common;
38using OpenSim.Tests.Common.Mock; 39using OpenSim.Tests.Common.Mock;
39using OpenSim.Tests.Common.Setup; 40using OpenSim.Tests.Common.Setup;
40 41
@@ -50,10 +51,10 @@ namespace OpenSim.Region.Framework.Scenes.Tests
50 /// Test a teleport between two regions that are not neighbours and do not share any neighbours in common. 51 /// Test a teleport between two regions that are not neighbours and do not share any neighbours in common.
51 /// </summary> 52 /// </summary>
52 /// Does not yet do what is says on the tin. 53 /// Does not yet do what is says on the tin.
53 [Test] 54 [Test, LongRunning]
54 public void TestSimpleNotNeighboursTeleport() 55 public void TestSimpleNotNeighboursTeleport()
55 { 56 {
56 Console.WriteLine("Beginning test {0}", MethodBase.GetCurrentMethod()); 57 // Console.WriteLine("Beginning test {0}", MethodBase.GetCurrentMethod());
57 58
58 log4net.Config.XmlConfigurator.Configure(); 59 log4net.Config.XmlConfigurator.Configure();
59 60