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.
---
OpenSim/Region/Framework/Scenes/SceneObjectPart.cs | 12 +-
.../Scenes/Tests/SceneObjectUndoRedoTests.cs | 130 +++++++++++++++++++++
.../Scenes/Tests/SceneObjectUserGroupTests.cs | 3 +-
3 files changed, 137 insertions(+), 8 deletions(-)
create mode 100644 OpenSim/Region/Framework/Scenes/Tests/SceneObjectUndoRedoTests.cs
(limited to 'OpenSim/Region/Framework')
diff --git a/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs b/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
index 411dcc7..63eb387 100644
--- a/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
+++ b/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
@@ -3191,9 +3191,9 @@ namespace OpenSim.Region.Framework.Scenes
}
}
- // m_log.DebugFormat(
- // "[SCENE OBJECT PART]: Storing undo state for {0} {1}, forGroup {2}, initial stack size {3}",
- // Name, LocalId, forGroup, m_undo.Count);
+// m_log.DebugFormat(
+// "[SCENE OBJECT PART]: Storing undo state for {0} {1}, forGroup {2}, initial stack size {3}",
+// Name, LocalId, forGroup, m_undo.Count);
if (ParentGroup.GetSceneMaxUndo() > 0)
{
@@ -3204,9 +3204,9 @@ namespace OpenSim.Region.Framework.Scenes
if (m_redo.Count > 0)
m_redo.Clear();
- // m_log.DebugFormat(
- // "[SCENE OBJECT PART]: Stored undo state for {0} {1}, forGroup {2}, stack size now {3}",
- // Name, LocalId, forGroup, m_undo.Count);
+// m_log.DebugFormat(
+// "[SCENE OBJECT PART]: Stored undo state for {0} {1}, forGroup {2}, stack size now {3}",
+// Name, LocalId, forGroup, m_undo.Count);
}
}
}
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