diff options
| author | Tom | 2011-09-04 07:06:36 -0700 |
|---|---|---|
| committer | Tom | 2011-09-04 07:06:36 -0700 |
| commit | 66dec3b8742eff04fbbcc6e3249fe4ba87986500 (patch) | |
| tree | 76cc708a821d35fac5cdbbce2de304b47064e732 /OpenSim/Framework/Tests/UtilTest.cs | |
| parent | Guard another nullref (diff) | |
| parent | Fixed BulletSim config files for Linux *.so libraries. (diff) | |
| download | opensim-SC_OLD-66dec3b8742eff04fbbcc6e3249fe4ba87986500.zip opensim-SC_OLD-66dec3b8742eff04fbbcc6e3249fe4ba87986500.tar.gz opensim-SC_OLD-66dec3b8742eff04fbbcc6e3249fe4ba87986500.tar.bz2 opensim-SC_OLD-66dec3b8742eff04fbbcc6e3249fe4ba87986500.tar.xz | |
Resolve merge commits, stage 1
Diffstat (limited to 'OpenSim/Framework/Tests/UtilTest.cs')
| -rw-r--r-- | OpenSim/Framework/Tests/UtilTest.cs | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/OpenSim/Framework/Tests/UtilTest.cs b/OpenSim/Framework/Tests/UtilTest.cs index 5eac411..c5a20e7 100644 --- a/OpenSim/Framework/Tests/UtilTest.cs +++ b/OpenSim/Framework/Tests/UtilTest.cs | |||
| @@ -61,7 +61,7 @@ namespace OpenSim.Framework.Tests | |||
| 61 | "Magnitude of vector was incorrect."); | 61 | "Magnitude of vector was incorrect."); |
| 62 | 62 | ||
| 63 | TestDelegate d = delegate() { Util.GetNormalizedVector(v1); }; | 63 | TestDelegate d = delegate() { Util.GetNormalizedVector(v1); }; |
| 64 | bool causesArgumentException = TestHelper.AssertThisDelegateCausesArgumentException(d); | 64 | bool causesArgumentException = TestHelpers.AssertThisDelegateCausesArgumentException(d); |
| 65 | Assert.That(causesArgumentException, Is.True, | 65 | Assert.That(causesArgumentException, Is.True, |
| 66 | "Getting magnitude of null vector did not cause argument exception."); | 66 | "Getting magnitude of null vector did not cause argument exception."); |
| 67 | 67 | ||
| @@ -94,12 +94,12 @@ namespace OpenSim.Framework.Tests | |||
| 94 | "Magnitude of vector was incorrect."); | 94 | "Magnitude of vector was incorrect."); |
| 95 | 95 | ||
| 96 | TestDelegate d = delegate() { Util.GetNormalizedVector(v1); }; | 96 | TestDelegate d = delegate() { Util.GetNormalizedVector(v1); }; |
| 97 | bool causesArgumentException = TestHelper.AssertThisDelegateCausesArgumentException(d); | 97 | bool causesArgumentException = TestHelpers.AssertThisDelegateCausesArgumentException(d); |
| 98 | Assert.That(causesArgumentException, Is.True, | 98 | Assert.That(causesArgumentException, Is.True, |
| 99 | "Getting magnitude of null vector did not cause argument exception."); | 99 | "Getting magnitude of null vector did not cause argument exception."); |
| 100 | 100 | ||
| 101 | d = delegate() { Util.GetNormalizedVector(v2); }; | 101 | d = delegate() { Util.GetNormalizedVector(v2); }; |
| 102 | causesArgumentException = TestHelper.AssertThisDelegateCausesArgumentException(d); | 102 | causesArgumentException = TestHelpers.AssertThisDelegateCausesArgumentException(d); |
| 103 | Assert.That(causesArgumentException, Is.True, | 103 | Assert.That(causesArgumentException, Is.True, |
| 104 | "Getting magnitude of null vector did not cause argument exception."); | 104 | "Getting magnitude of null vector did not cause argument exception."); |
| 105 | } | 105 | } |
| @@ -122,7 +122,7 @@ namespace OpenSim.Framework.Tests | |||
| 122 | "Magnitude of vector was incorrect."); | 122 | "Magnitude of vector was incorrect."); |
| 123 | 123 | ||
| 124 | TestDelegate d = delegate() { Util.GetNormalizedVector(v1); }; | 124 | TestDelegate d = delegate() { Util.GetNormalizedVector(v1); }; |
| 125 | bool causesArgumentException = TestHelper.AssertThisDelegateCausesArgumentException(d); | 125 | bool causesArgumentException = TestHelpers.AssertThisDelegateCausesArgumentException(d); |
| 126 | Assert.That(causesArgumentException, Is.True, | 126 | Assert.That(causesArgumentException, Is.True, |
| 127 | "Getting magnitude of null vector did not cause argument exception."); | 127 | "Getting magnitude of null vector did not cause argument exception."); |
| 128 | 128 | ||