diff options
author | Mike Mazur | 2008-07-28 02:36:22 +0000 |
---|---|---|
committer | Mike Mazur | 2008-07-28 02:36:22 +0000 |
commit | a61e1ea7dcf174c640d868ec2ebf57a9d25e90ef (patch) | |
tree | d5b2565a9737f270989baa9343f70d874ba3e9c9 | |
parent | -copy LSL_Types tests from Common/ to Shared/ (diff) | |
download | opensim-SC_OLD-a61e1ea7dcf174c640d868ec2ebf57a9d25e90ef.zip opensim-SC_OLD-a61e1ea7dcf174c640d868ec2ebf57a9d25e90ef.tar.gz opensim-SC_OLD-a61e1ea7dcf174c640d868ec2ebf57a9d25e90ef.tar.bz2 opensim-SC_OLD-a61e1ea7dcf174c640d868ec2ebf57a9d25e90ef.tar.xz |
Adding explicit cast from LSLFloat to LSLInteger. Work on issue 1822.
-rw-r--r-- | OpenSim/Region/ScriptEngine/Common/LSL_Types.cs | 5 | ||||
-rw-r--r-- | OpenSim/Tests/OpenSim/Region/ScriptEngine/Common/LSL_TypesTestLSLInteger.cs | 71 |
2 files changed, 76 insertions, 0 deletions
diff --git a/OpenSim/Region/ScriptEngine/Common/LSL_Types.cs b/OpenSim/Region/ScriptEngine/Common/LSL_Types.cs index bb1fe2f..d0871bc 100644 --- a/OpenSim/Region/ScriptEngine/Common/LSL_Types.cs +++ b/OpenSim/Region/ScriptEngine/Common/LSL_Types.cs | |||
@@ -1291,6 +1291,11 @@ namespace OpenSim.Region.ScriptEngine.Common | |||
1291 | return new LSLInteger(d); | 1291 | return new LSLInteger(d); |
1292 | } | 1292 | } |
1293 | 1293 | ||
1294 | static public explicit operator LSLInteger(LSLFloat f) | ||
1295 | { | ||
1296 | return new LSLInteger(f.value); | ||
1297 | } | ||
1298 | |||
1294 | static public bool operator ==(LSLInteger i1, LSLInteger i2) | 1299 | static public bool operator ==(LSLInteger i1, LSLInteger i2) |
1295 | { | 1300 | { |
1296 | bool ret = i1.value == i2.value; | 1301 | bool ret = i1.value == i2.value; |
diff --git a/OpenSim/Tests/OpenSim/Region/ScriptEngine/Common/LSL_TypesTestLSLInteger.cs b/OpenSim/Tests/OpenSim/Region/ScriptEngine/Common/LSL_TypesTestLSLInteger.cs new file mode 100644 index 0000000..08f80d3 --- /dev/null +++ b/OpenSim/Tests/OpenSim/Region/ScriptEngine/Common/LSL_TypesTestLSLInteger.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 OpenSim 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.Collections.Generic; | ||
29 | using NUnit.Framework; | ||
30 | using OpenSim.Tests.Common; | ||
31 | using OpenSim.Region.ScriptEngine.Common; | ||
32 | |||
33 | namespace OpenSim.Region.ScriptEngine.Common.Tests | ||
34 | { | ||
35 | [TestFixture] | ||
36 | public class LSL_TypesTestLSLInteger | ||
37 | { | ||
38 | private Dictionary<double, int> m_doubleIntSet; | ||
39 | |||
40 | /// <summary> | ||
41 | /// Sets up dictionaries and arrays used in the tests. | ||
42 | /// </summary> | ||
43 | [TestFixtureSetUp] | ||
44 | public void SetUpDataSets() | ||
45 | { | ||
46 | m_doubleIntSet = new Dictionary<double, int>(); | ||
47 | m_doubleIntSet.Add(2.0, 2); | ||
48 | m_doubleIntSet.Add(-2.0, -2); | ||
49 | m_doubleIntSet.Add(0.0, 0); | ||
50 | m_doubleIntSet.Add(1.0, 1); | ||
51 | m_doubleIntSet.Add(-1.0, -1); | ||
52 | m_doubleIntSet.Add(999999999.0, 999999999); | ||
53 | m_doubleIntSet.Add(-99999999.0, -99999999); | ||
54 | } | ||
55 | |||
56 | /// <summary> | ||
57 | /// Tests LSLInteger is correctly cast explicitly to LSLFloat. | ||
58 | /// </summary> | ||
59 | [Test] | ||
60 | public void TestExplicitCastLSLFloatToLSLInteger() | ||
61 | { | ||
62 | LSL_Types.LSLInteger testInteger; | ||
63 | |||
64 | foreach (KeyValuePair<double, int> number in m_doubleIntSet) | ||
65 | { | ||
66 | testInteger = (LSL_Types.LSLInteger) new LSL_Types.LSLFloat(number.Key); | ||
67 | Assert.AreEqual(testInteger.value, number.Value); | ||
68 | } | ||
69 | } | ||
70 | } | ||
71 | } | ||