diff options
author | Justin Clark-Casey (justincc) | 2011-12-03 02:39:21 +0000 |
---|---|---|
committer | Justin Clark-Casey (justincc) | 2011-12-03 02:39:21 +0000 |
commit | a009871827c250cc677bd42aed2351a3c2cec021 (patch) | |
tree | eb6924a838e1ec4f5d02ba78b742aa5119cd8d7e | |
parent | Stop calling Animator.UpdateMovementAnimations() at the end of HandleAgentUpd... (diff) | |
download | opensim-SC-a009871827c250cc677bd42aed2351a3c2cec021.zip opensim-SC-a009871827c250cc677bd42aed2351a3c2cec021.tar.gz opensim-SC-a009871827c250cc677bd42aed2351a3c2cec021.tar.bz2 opensim-SC-a009871827c250cc677bd42aed2351a3c2cec021.tar.xz |
Add basic TestFlyingAnimation() regression test
-rw-r--r-- | OpenSim/Region/Framework/Scenes/ScenePresence.cs | 7 | ||||
-rw-r--r-- | OpenSim/Region/Framework/Scenes/Tests/ScenePresenceAnimationTests.cs | 70 |
2 files changed, 75 insertions, 2 deletions
diff --git a/OpenSim/Region/Framework/Scenes/ScenePresence.cs b/OpenSim/Region/Framework/Scenes/ScenePresence.cs index 8865b3d..0533106 100644 --- a/OpenSim/Region/Framework/Scenes/ScenePresence.cs +++ b/OpenSim/Region/Framework/Scenes/ScenePresence.cs | |||
@@ -3279,8 +3279,11 @@ namespace OpenSim.Region.Framework.Scenes | |||
3279 | ControllingClient.SendAgentAlertMessage("Physics is having a problem with your avatar. You may not be able to move until you relog.", true); | 3279 | ControllingClient.SendAgentAlertMessage("Physics is having a problem with your avatar. You may not be able to move until you relog.", true); |
3280 | } | 3280 | } |
3281 | 3281 | ||
3282 | // Event called by the physics plugin to tell the avatar about a collision. | 3282 | /// <summary> |
3283 | private void PhysicsCollisionUpdate(EventArgs e) | 3283 | /// Event called by the physics plugin to tell the avatar about a collision. |
3284 | /// </summary> | ||
3285 | /// <param name="e"></param> | ||
3286 | public void PhysicsCollisionUpdate(EventArgs e) | ||
3284 | { | 3287 | { |
3285 | if (IsChildAgent) | 3288 | if (IsChildAgent) |
3286 | return; | 3289 | return; |
diff --git a/OpenSim/Region/Framework/Scenes/Tests/ScenePresenceAnimationTests.cs b/OpenSim/Region/Framework/Scenes/Tests/ScenePresenceAnimationTests.cs new file mode 100644 index 0000000..4a0533c --- /dev/null +++ b/OpenSim/Region/Framework/Scenes/Tests/ScenePresenceAnimationTests.cs | |||
@@ -0,0 +1,70 @@ | |||
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 | |||
28 | using System; | ||
29 | using System.Collections.Generic; | ||
30 | using System.Reflection; | ||
31 | using System.Text; | ||
32 | using System.Threading; | ||
33 | using System.Timers; | ||
34 | using Nini.Config; | ||
35 | using NUnit.Framework; | ||
36 | using OpenMetaverse; | ||
37 | using OpenSim.Framework; | ||
38 | using OpenSim.Framework.Communications; | ||
39 | using OpenSim.Region.Framework.Scenes; | ||
40 | using OpenSim.Region.Framework.Interfaces; | ||
41 | using OpenSim.Region.CoreModules.Framework.EntityTransfer; | ||
42 | using OpenSim.Region.CoreModules.World.Serialiser; | ||
43 | using OpenSim.Region.CoreModules.ServiceConnectorsOut.Simulation; | ||
44 | using OpenSim.Region.Physics.Manager; | ||
45 | using OpenSim.Tests.Common; | ||
46 | using OpenSim.Tests.Common.Mock; | ||
47 | |||
48 | namespace OpenSim.Region.Framework.Scenes.Tests | ||
49 | { | ||
50 | /// <summary> | ||
51 | /// Scene presence animation tests | ||
52 | /// </summary> | ||
53 | [TestFixture] | ||
54 | public class ScenePresenceAnimationTests | ||
55 | { | ||
56 | [Test] | ||
57 | public void TestFlyingAnimation() | ||
58 | { | ||
59 | TestHelpers.InMethod(); | ||
60 | // log4net.Config.XmlConfigurator.Configure(); | ||
61 | |||
62 | TestScene scene = SceneHelpers.SetupScene(); | ||
63 | ScenePresence sp = SceneHelpers.AddScenePresence(scene, TestHelpers.ParseTail(0x1)); | ||
64 | sp.PhysicsActor.Flying = true; | ||
65 | sp.PhysicsCollisionUpdate(new CollisionEventUpdate()); | ||
66 | |||
67 | Assert.That(sp.Animator.CurrentMovementAnimation, Is.EqualTo("HOVER")); | ||
68 | } | ||
69 | } | ||
70 | } \ No newline at end of file | ||