aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Framework
diff options
context:
space:
mode:
authorJustin Clark-Casey (justincc)2010-08-07 01:06:47 +0100
committerJustin Clark-Casey (justincc)2010-08-07 01:06:47 +0100
commit4e2caab756e1b7ebd58682efe92401e2e2d5a917 (patch)
treee62bcfc5506050854ba5541df3e828eb159ef0d8 /OpenSim/Region/Framework
parentRemove old test classes that don't actually test anything not done elsewhere (diff)
downloadopensim-SC-4e2caab756e1b7ebd58682efe92401e2e2d5a917.zip
opensim-SC-4e2caab756e1b7ebd58682efe92401e2e2d5a917.tar.gz
opensim-SC-4e2caab756e1b7ebd58682efe92401e2e2d5a917.tar.bz2
opensim-SC-4e2caab756e1b7ebd58682efe92401e2e2d5a917.tar.xz
Add new SceneGraphTests class. Add simple TestDuplicateObject()
Diffstat (limited to 'OpenSim/Region/Framework')
-rw-r--r--OpenSim/Region/Framework/Scenes/SceneGraph.cs2
-rw-r--r--OpenSim/Region/Framework/Scenes/Tests/SceneGraphTests.cs71
-rw-r--r--OpenSim/Region/Framework/Scenes/Tests/SceneObjectBasicTests.cs1
3 files changed, 72 insertions, 2 deletions
diff --git a/OpenSim/Region/Framework/Scenes/SceneGraph.cs b/OpenSim/Region/Framework/Scenes/SceneGraph.cs
index 03549d7..9f38a99 100644
--- a/OpenSim/Region/Framework/Scenes/SceneGraph.cs
+++ b/OpenSim/Region/Framework/Scenes/SceneGraph.cs
@@ -1739,7 +1739,7 @@ namespace OpenSim.Region.Framework.Scenes
1739 /// <param name="AgentID"></param> 1739 /// <param name="AgentID"></param>
1740 /// <param name="GroupID"></param> 1740 /// <param name="GroupID"></param>
1741 /// <param name="rot"></param> 1741 /// <param name="rot"></param>
1742 protected internal SceneObjectGroup DuplicateObject(uint originalPrimID, Vector3 offset, uint flags, UUID AgentID, UUID GroupID, Quaternion rot) 1742 public SceneObjectGroup DuplicateObject(uint originalPrimID, Vector3 offset, uint flags, UUID AgentID, UUID GroupID, Quaternion rot)
1743 { 1743 {
1744 //m_log.DebugFormat("[SCENE]: Duplication of object {0} at offset {1} requested by agent {2}", originalPrim, offset, AgentID); 1744 //m_log.DebugFormat("[SCENE]: Duplication of object {0} at offset {1} requested by agent {2}", originalPrim, offset, AgentID);
1745 SceneObjectGroup original = GetGroupByPrim(originalPrimID); 1745 SceneObjectGroup original = GetGroupByPrim(originalPrimID);
diff --git a/OpenSim/Region/Framework/Scenes/Tests/SceneGraphTests.cs b/OpenSim/Region/Framework/Scenes/Tests/SceneGraphTests.cs
new file mode 100644
index 0000000..8a103d7
--- /dev/null
+++ b/OpenSim/Region/Framework/Scenes/Tests/SceneGraphTests.cs
@@ -0,0 +1,71 @@
1/*
2 * Copyright (c) Contributors, http://opensimulator.org/
3 * See CONTRIBUTORS.TXT for a full list of copyright holders.
4 *
5 * Redistribution and use in source and binary forms, with or without
6 * modification, are permitted provided that the following conditions are met:
7 * * Redistributions of source code must retain the above copyright
8 * notice, this list of conditions and the following disclaimer.
9 * * Redistributions in binary form must reproduce the above copyright
10 * notice, this list of conditions and the following disclaimer in the
11 * documentation and/or other materials provided with the distribution.
12 * * Neither the name of the OpenSimulator Project nor the
13 * names of its contributors may be used to endorse or promote products
14 * derived from this software without specific prior written permission.
15 *
16 * THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY
17 * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
18 * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
19 * DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
20 * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
21 * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
22 * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
23 * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
24 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
25 * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
26 */
27
28using System;
29using System.Reflection;
30using NUnit.Framework;
31using NUnit.Framework.SyntaxHelpers;
32using OpenMetaverse;
33using OpenSim.Framework;
34using OpenSim.Framework.Communications;
35using OpenSim.Region.Framework.Scenes;
36using OpenSim.Tests.Common;
37using OpenSim.Tests.Common.Mock;
38using OpenSim.Tests.Common.Setup;
39
40namespace OpenSim.Region.Framework.Scenes.Tests
41{
42 [TestFixture]
43 public class SceneGraphTests
44 {
45 [Test]
46 public void TestDuplicateObject()
47 {
48 TestHelper.InMethod();
49 Scene scene = SceneSetupHelpers.SetupScene();
50
51 UUID ownerUuid = new UUID("00000000-0000-0000-0000-000000000010");
52 string objName = "obj1";
53 UUID objUuid = new UUID("00000000-0000-0000-0000-000000000001");
54
55 SceneObjectPart part
56 = new SceneObjectPart(ownerUuid, PrimitiveBaseShape.Default, Vector3.Zero, Quaternion.Identity, Vector3.Zero)
57 { Name = objName, UUID = objUuid };
58
59 scene.AddNewSceneObject(new SceneObjectGroup(part), false);
60
61 SceneObjectGroup duplicatedSo
62 = scene.SceneGraph.DuplicateObject(
63 part.LocalId, new Vector3(10, 0, 0), 0, ownerUuid, UUID.Zero, Quaternion.Identity);
64
65 Assert.That(duplicatedSo.Children.Count, Is.EqualTo(1));
66 Assert.That(duplicatedSo.RootPart.LocalId, Is.Not.EqualTo(part.LocalId));
67
68 //SceneObjectPart retrievedPart = scene.GetSceneObjectPart(objUuid);
69 }
70 }
71} \ No newline at end of file
diff --git a/OpenSim/Region/Framework/Scenes/Tests/SceneObjectBasicTests.cs b/OpenSim/Region/Framework/Scenes/Tests/SceneObjectBasicTests.cs
index 4baa22c..d4f9f18 100644
--- a/OpenSim/Region/Framework/Scenes/Tests/SceneObjectBasicTests.cs
+++ b/OpenSim/Region/Framework/Scenes/Tests/SceneObjectBasicTests.cs
@@ -32,7 +32,6 @@ using NUnit.Framework.SyntaxHelpers;
32using OpenMetaverse; 32using OpenMetaverse;
33using OpenSim.Framework; 33using OpenSim.Framework;
34using OpenSim.Framework.Communications; 34using OpenSim.Framework.Communications;
35
36using OpenSim.Region.Framework.Scenes; 35using OpenSim.Region.Framework.Scenes;
37using OpenSim.Tests.Common; 36using OpenSim.Tests.Common;
38using OpenSim.Tests.Common.Mock; 37using OpenSim.Tests.Common.Mock;