aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Framework/Tests
diff options
context:
space:
mode:
authorMelanie2013-08-01 23:42:19 +0100
committerMelanie2013-08-01 23:42:19 +0100
commit6fc03c7e6e4e0938e69b7c1b4aa319a02dd1784e (patch)
tree53f6b87b7d66451214f5486a5ff0ae91c3fa7742 /OpenSim/Framework/Tests
parentMerge branch 'master' into careminster (diff)
parentMerge branch 'master' of ssh://opensimulator.org/var/git/opensim (diff)
downloadopensim-SC_OLD-6fc03c7e6e4e0938e69b7c1b4aa319a02dd1784e.zip
opensim-SC_OLD-6fc03c7e6e4e0938e69b7c1b4aa319a02dd1784e.tar.gz
opensim-SC_OLD-6fc03c7e6e4e0938e69b7c1b4aa319a02dd1784e.tar.bz2
opensim-SC_OLD-6fc03c7e6e4e0938e69b7c1b4aa319a02dd1784e.tar.xz
Merge branch 'master' into careminster
Conflicts: OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs
Diffstat (limited to 'OpenSim/Framework/Tests')
-rw-r--r--OpenSim/Framework/Tests/LocationTest.cs14
1 files changed, 7 insertions, 7 deletions
diff --git a/OpenSim/Framework/Tests/LocationTest.cs b/OpenSim/Framework/Tests/LocationTest.cs
index a56ecb4..af5f164 100644
--- a/OpenSim/Framework/Tests/LocationTest.cs
+++ b/OpenSim/Framework/Tests/LocationTest.cs
@@ -51,21 +51,21 @@ namespace OpenSim.Framework.Tests
51 [Test] 51 [Test]
52 public void locationXYRegionHandle() 52 public void locationXYRegionHandle()
53 { 53 {
54 Location TestLocation1 = new Location(256000,256000); 54 Location TestLocation1 = new Location(255000,256000);
55 Location TestLocation2 = new Location(1099511628032000); 55 Location TestLocation2 = new Location(1095216660736000);
56 Assert.That(TestLocation1 == TestLocation2); 56 Assert.That(TestLocation1 == TestLocation2);
57 57
58 Assert.That(TestLocation2.X == 256000 && TestLocation2.Y == 256000, "Test xy location doesn't match regionhandle provided"); 58 Assert.That(TestLocation2.X == 255000 && TestLocation2.Y == 256000, "Test xy location doesn't match regionhandle provided");
59 59
60 Assert.That(TestLocation2.RegionHandle == 1099511628032000, 60 Assert.That(TestLocation2.RegionHandle == 1095216660736000,
61 "Location RegionHandle Property didn't match regionhandle provided in constructor"); 61 "Location RegionHandle Property didn't match regionhandle provided in constructor");
62 62
63 63
64 TestLocation1 = new Location(256001, 256001); 64 TestLocation1 = new Location(255001, 256001);
65 TestLocation2 = new Location(1099511628032000); 65 TestLocation2 = new Location(1095216660736000);
66 Assert.That(TestLocation1 != TestLocation2); 66 Assert.That(TestLocation1 != TestLocation2);
67 67
68 Assert.That(TestLocation1.Equals(256001, 256001), "Equals(x,y) failed to match the position in the constructor"); 68 Assert.That(TestLocation1.Equals(255001, 256001), "Equals(x,y) failed to match the position in the constructor");
69 69
70 Assert.That(TestLocation2.GetHashCode() == (TestLocation2.X.GetHashCode() ^ TestLocation2.Y.GetHashCode()), "GetHashCode failed to produce the expected hashcode"); 70 Assert.That(TestLocation2.GetHashCode() == (TestLocation2.X.GetHashCode() ^ TestLocation2.Y.GetHashCode()), "GetHashCode failed to produce the expected hashcode");
71 71