diff options
| author | Justin Clark-Casey (justincc) | 2013-08-01 23:17:21 +0100 |
|---|---|---|
| committer | Justin Clark-Casey (justincc) | 2013-08-01 23:17:21 +0100 |
| commit | 7a5d11f8a78de0dc6b69fe4aa2b3cdbd305c8cf8 (patch) | |
| tree | 6bf47062c915dffa2eedbdd809d41aa9a1d88601 /OpenSim/Framework/Tests | |
| parent | minor: Add name to debug lludp packet level feedback on console (diff) | |
| parent | * Thanks Plugh for pointing out that the constructor that takes a ulong regi... (diff) | |
| download | opensim-SC-7a5d11f8a78de0dc6b69fe4aa2b3cdbd305c8cf8.zip opensim-SC-7a5d11f8a78de0dc6b69fe4aa2b3cdbd305c8cf8.tar.gz opensim-SC-7a5d11f8a78de0dc6b69fe4aa2b3cdbd305c8cf8.tar.bz2 opensim-SC-7a5d11f8a78de0dc6b69fe4aa2b3cdbd305c8cf8.tar.xz | |
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
Diffstat (limited to '')
| -rw-r--r-- | OpenSim/Framework/Tests/LocationTest.cs | 14 |
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 | ||