From 90dd5844d64643246fb8bccf356614eb7e07d61c Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Wed, 26 Sep 2012 21:28:43 +0100
Subject: Add basic undo/redo regression tests.
---
.../Scenes/Tests/SceneObjectUndoRedoTests.cs | 130 +++++++++++++++++++++
.../Scenes/Tests/SceneObjectUserGroupTests.cs | 3 +-
2 files changed, 131 insertions(+), 2 deletions(-)
create mode 100644 OpenSim/Region/Framework/Scenes/Tests/SceneObjectUndoRedoTests.cs
(limited to 'OpenSim/Region/Framework/Scenes/Tests')
diff --git a/OpenSim/Region/Framework/Scenes/Tests/SceneObjectUndoRedoTests.cs b/OpenSim/Region/Framework/Scenes/Tests/SceneObjectUndoRedoTests.cs
new file mode 100644
index 0000000..1e317c6
--- /dev/null
+++ b/OpenSim/Region/Framework/Scenes/Tests/SceneObjectUndoRedoTests.cs
@@ -0,0 +1,130 @@
+/*
+ * Copyright (c) Contributors, http://opensimulator.org/
+ * See CONTRIBUTORS.TXT for a full list of copyright holders.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ * * Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * * Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ * * Neither the name of the OpenSimulator Project nor the
+ * names of its contributors may be used to endorse or promote products
+ * derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY
+ * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
+ * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+using System;
+using System.Reflection;
+using NUnit.Framework;
+using OpenMetaverse;
+using OpenSim.Framework;
+using OpenSim.Framework.Communications;
+using OpenSim.Region.Framework.Scenes;
+using OpenSim.Tests.Common;
+using OpenSim.Tests.Common.Mock;
+
+namespace OpenSim.Region.Framework.Scenes.Tests
+{
+ ///
+ /// Tests for undo/redo
+ ///
+ public class SceneObjectUndoRedoTests : OpenSimTestCase
+ {
+ [Test]
+ public void TestUndoRedoResizeSceneObject()
+ {
+ TestHelpers.InMethod();
+// TestHelpers.EnableLogging();
+
+ Vector3 firstSize = new Vector3(2, 3, 4);
+ Vector3 secondSize = new Vector3(5, 6, 7);
+
+ Scene scene = new SceneHelpers().SetupScene();
+ SceneObjectGroup g1 = SceneHelpers.AddSceneObject(scene);
+
+ // TODO: It happens to be the case that we are not storing undo states for SOPs which are not yet in a SOG,
+ // which is the way that AddSceneObject() sets up the object (i.e. it creates the SOP first). However,
+ // this is somewhat by chance. Really, we shouldn't be storing undo states at all if the object is not
+ // in a scene.
+ Assert.That(g1.RootPart.UndoCount, Is.EqualTo(0));
+
+ g1.GroupResize(firstSize);
+ Assert.That(g1.RootPart.UndoCount, Is.EqualTo(1));
+
+ g1.GroupResize(secondSize);
+ Assert.That(g1.RootPart.UndoCount, Is.EqualTo(2));
+
+ g1.RootPart.Undo();
+ Assert.That(g1.RootPart.UndoCount, Is.EqualTo(1));
+ Assert.That(g1.GroupScale, Is.EqualTo(firstSize));
+
+ g1.RootPart.Redo();
+ Assert.That(g1.RootPart.UndoCount, Is.EqualTo(2));
+ Assert.That(g1.GroupScale, Is.EqualTo(secondSize));
+ }
+
+ [Test]
+ public void TestUndoBeyondAvailable()
+ {
+ TestHelpers.InMethod();
+
+ Vector3 newSize = new Vector3(2, 3, 4);
+
+ Scene scene = new SceneHelpers().SetupScene();
+ SceneObjectGroup g1 = SceneHelpers.AddSceneObject(scene);
+ Vector3 originalSize = g1.GroupScale;
+
+ g1.RootPart.Undo();
+
+ Assert.That(g1.RootPart.UndoCount, Is.EqualTo(0));
+ Assert.That(g1.GroupScale, Is.EqualTo(originalSize));
+
+ g1.GroupResize(newSize);
+ Assert.That(g1.RootPart.UndoCount, Is.EqualTo(1));
+ Assert.That(g1.GroupScale, Is.EqualTo(newSize));
+
+ g1.RootPart.Undo();
+ g1.RootPart.Undo();
+
+ Assert.That(g1.RootPart.UndoCount, Is.EqualTo(0));
+ Assert.That(g1.GroupScale, Is.EqualTo(originalSize));
+ }
+
+ [Test]
+ public void TestRedoBeyondAvailable()
+ {
+ TestHelpers.InMethod();
+
+ Vector3 newSize = new Vector3(2, 3, 4);
+
+ Scene scene = new SceneHelpers().SetupScene();
+ SceneObjectGroup g1 = SceneHelpers.AddSceneObject(scene);
+ Vector3 originalSize = g1.GroupScale;
+
+ g1.RootPart.Redo();
+
+ Assert.That(g1.RootPart.UndoCount, Is.EqualTo(0));
+ Assert.That(g1.GroupScale, Is.EqualTo(originalSize));
+
+ g1.GroupResize(newSize);
+ g1.RootPart.Undo();
+ g1.RootPart.Redo();
+ g1.RootPart.Redo();
+
+ Assert.That(g1.RootPart.UndoCount, Is.EqualTo(1));
+ Assert.That(g1.GroupScale, Is.EqualTo(newSize));
+ }
+ }
+}
\ No newline at end of file
diff --git a/OpenSim/Region/Framework/Scenes/Tests/SceneObjectUserGroupTests.cs b/OpenSim/Region/Framework/Scenes/Tests/SceneObjectUserGroupTests.cs
index c7eaff9..2b79271 100644
--- a/OpenSim/Region/Framework/Scenes/Tests/SceneObjectUserGroupTests.cs
+++ b/OpenSim/Region/Framework/Scenes/Tests/SceneObjectUserGroupTests.cs
@@ -44,7 +44,7 @@ using OpenSim.Tests.Common.Mock;
namespace OpenSim.Region.Framework.Scenes.Tests
{
[TestFixture]
- public class SceneObjectUserGroupTests
+ public class SceneObjectUserGroupTests : OpenSimTestCase
{
///
/// Test share with group object functionality
@@ -54,7 +54,6 @@ namespace OpenSim.Region.Framework.Scenes.Tests
public void TestShareWithGroup()
{
TestHelpers.InMethod();
-// log4net.Config.XmlConfigurator.Configure();
UUID userId = UUID.Parse("10000000-0000-0000-0000-000000000001");
--
cgit v1.1
From 327320d1a7acbba969d26c281f92f64ce8ff365f Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Wed, 26 Sep 2012 22:49:44 +0100
Subject: Enforce existing 5 action hardcoded undo limit.
This was present in the code but not enforced, which led to a memory leak over time as part properties were changed, whether by viewer, script or another source.
This commit enforces that limit, which will soon become configurable.
Regression test for undo limit added
Should help with http://opensimulator.org/mantis/view.php?id=6279
---
.../Scenes/Tests/SceneObjectUndoRedoTests.cs | 27 ++++++++++++++++++++++
1 file changed, 27 insertions(+)
(limited to 'OpenSim/Region/Framework/Scenes/Tests')
diff --git a/OpenSim/Region/Framework/Scenes/Tests/SceneObjectUndoRedoTests.cs b/OpenSim/Region/Framework/Scenes/Tests/SceneObjectUndoRedoTests.cs
index 1e317c6..c93562d 100644
--- a/OpenSim/Region/Framework/Scenes/Tests/SceneObjectUndoRedoTests.cs
+++ b/OpenSim/Region/Framework/Scenes/Tests/SceneObjectUndoRedoTests.cs
@@ -76,6 +76,33 @@ namespace OpenSim.Region.Framework.Scenes.Tests
}
[Test]
+ public void TestUndoLimit()
+ {
+ TestHelpers.InMethod();
+
+ Vector3 firstSize = new Vector3(2, 3, 4);
+ Vector3 secondSize = new Vector3(5, 6, 7);
+ Vector3 thirdSize = new Vector3(8, 9, 10);
+ Vector3 fourthSize = new Vector3(11, 12, 13);
+
+ Scene scene = new SceneHelpers().SetupScene();
+ scene.MaxUndoCount = 2;
+ SceneObjectGroup g1 = SceneHelpers.AddSceneObject(scene);
+
+ g1.GroupResize(firstSize);
+ g1.GroupResize(secondSize);
+ g1.GroupResize(thirdSize);
+ g1.GroupResize(fourthSize);
+
+ g1.RootPart.Undo();
+ g1.RootPart.Undo();
+ g1.RootPart.Undo();
+
+ Assert.That(g1.RootPart.UndoCount, Is.EqualTo(0));
+ Assert.That(g1.GroupScale, Is.EqualTo(secondSize));
+ }
+
+ [Test]
public void TestUndoBeyondAvailable()
{
TestHelpers.InMethod();
--
cgit v1.1
From b9934fc4dbb1267409fa7264f3dd83a98959ea87 Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Wed, 26 Sep 2012 23:31:10 +0100
Subject: Don't store undo states if a scene object is manipulated when it is
not in a scene.
Adds regression test for this.
---
.../Scenes/Tests/SceneObjectUndoRedoTests.cs | 23 ++++++++++++++++++++++
1 file changed, 23 insertions(+)
(limited to 'OpenSim/Region/Framework/Scenes/Tests')
diff --git a/OpenSim/Region/Framework/Scenes/Tests/SceneObjectUndoRedoTests.cs b/OpenSim/Region/Framework/Scenes/Tests/SceneObjectUndoRedoTests.cs
index c93562d..133fac5 100644
--- a/OpenSim/Region/Framework/Scenes/Tests/SceneObjectUndoRedoTests.cs
+++ b/OpenSim/Region/Framework/Scenes/Tests/SceneObjectUndoRedoTests.cs
@@ -103,6 +103,29 @@ namespace OpenSim.Region.Framework.Scenes.Tests
}
[Test]
+ public void TestNoUndoOnObjectsNotInScene()
+ {
+ TestHelpers.InMethod();
+
+ Vector3 firstSize = new Vector3(2, 3, 4);
+ Vector3 secondSize = new Vector3(5, 6, 7);
+ Vector3 thirdSize = new Vector3(8, 9, 10);
+ Vector3 fourthSize = new Vector3(11, 12, 13);
+
+ Scene scene = new SceneHelpers().SetupScene();
+ SceneObjectGroup g1 = SceneHelpers.CreateSceneObject(1, TestHelpers.ParseTail(0x1));
+
+ g1.GroupResize(firstSize);
+ g1.GroupResize(secondSize);
+
+ Assert.That(g1.RootPart.UndoCount, Is.EqualTo(0));
+
+ g1.RootPart.Undo();
+
+ Assert.That(g1.GroupScale, Is.EqualTo(secondSize));
+ }
+
+ [Test]
public void TestUndoBeyondAvailable()
{
TestHelpers.InMethod();
--
cgit v1.1
From 2bf42f30af5030890b8e3ff5bb29074a1f0e9085 Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Thu, 27 Sep 2012 00:12:34 +0100
Subject: Add MaxPrimsUndo config setting to [Startup] section of OpenSim.ini.
This controls how many undo steps the simulator will store for each prim.
Default is now 20 rather than 5 as it briefly was.
The default number could be increased through this is a memory tradeoff which will scale with the number of prims in the sim and level of activity.
---
OpenSim/Region/Framework/Scenes/Tests/SceneObjectResizeTests.cs | 2 --
OpenSim/Region/Framework/Scenes/Tests/SceneObjectUndoRedoTests.cs | 4 ++++
2 files changed, 4 insertions(+), 2 deletions(-)
(limited to 'OpenSim/Region/Framework/Scenes/Tests')
diff --git a/OpenSim/Region/Framework/Scenes/Tests/SceneObjectResizeTests.cs b/OpenSim/Region/Framework/Scenes/Tests/SceneObjectResizeTests.cs
index e931859..89647d6 100644
--- a/OpenSim/Region/Framework/Scenes/Tests/SceneObjectResizeTests.cs
+++ b/OpenSim/Region/Framework/Scenes/Tests/SceneObjectResizeTests.cs
@@ -62,8 +62,6 @@ namespace OpenSim.Region.Framework.Scenes.Tests
Assert.That(g1Post.RootPart.Scale.X, Is.EqualTo(2));
Assert.That(g1Post.RootPart.Scale.Y, Is.EqualTo(3));
Assert.That(g1Post.RootPart.Scale.Z, Is.EqualTo(4));
-
- Assert.That(g1Post.RootPart.UndoCount, Is.EqualTo(1));
}
///
diff --git a/OpenSim/Region/Framework/Scenes/Tests/SceneObjectUndoRedoTests.cs b/OpenSim/Region/Framework/Scenes/Tests/SceneObjectUndoRedoTests.cs
index 133fac5..96973de 100644
--- a/OpenSim/Region/Framework/Scenes/Tests/SceneObjectUndoRedoTests.cs
+++ b/OpenSim/Region/Framework/Scenes/Tests/SceneObjectUndoRedoTests.cs
@@ -52,6 +52,7 @@ namespace OpenSim.Region.Framework.Scenes.Tests
Vector3 secondSize = new Vector3(5, 6, 7);
Scene scene = new SceneHelpers().SetupScene();
+ scene.MaxUndoCount = 20;
SceneObjectGroup g1 = SceneHelpers.AddSceneObject(scene);
// TODO: It happens to be the case that we are not storing undo states for SOPs which are not yet in a SOG,
@@ -113,6 +114,7 @@ namespace OpenSim.Region.Framework.Scenes.Tests
Vector3 fourthSize = new Vector3(11, 12, 13);
Scene scene = new SceneHelpers().SetupScene();
+ scene.MaxUndoCount = 20;
SceneObjectGroup g1 = SceneHelpers.CreateSceneObject(1, TestHelpers.ParseTail(0x1));
g1.GroupResize(firstSize);
@@ -133,6 +135,7 @@ namespace OpenSim.Region.Framework.Scenes.Tests
Vector3 newSize = new Vector3(2, 3, 4);
Scene scene = new SceneHelpers().SetupScene();
+ scene.MaxUndoCount = 20;
SceneObjectGroup g1 = SceneHelpers.AddSceneObject(scene);
Vector3 originalSize = g1.GroupScale;
@@ -160,6 +163,7 @@ namespace OpenSim.Region.Framework.Scenes.Tests
Vector3 newSize = new Vector3(2, 3, 4);
Scene scene = new SceneHelpers().SetupScene();
+ scene.MaxUndoCount = 20;
SceneObjectGroup g1 = SceneHelpers.AddSceneObject(scene);
Vector3 originalSize = g1.GroupScale;
--
cgit v1.1