diff options
| author | Mic Bowman | 2011-08-19 14:49:16 -0700 |
|---|---|---|
| committer | Mic Bowman | 2011-08-19 14:49:16 -0700 |
| commit | 384cb79a1a27c47bb3fdbdef6d601a3dcb9dfb0f (patch) | |
| tree | 5e557eac5d4d3d4ad95b9e3e70a2a661e5745ec3 /OpenSim/Data/Tests/AssetTests.cs | |
| parent | BulletSim: add runtime setting of physics parameters. Update default values. (diff) | |
| parent | Get rid of HttpServer.dll to avoid confusion since we use HttpServer_OpenSim.... (diff) | |
| download | opensim-SC-384cb79a1a27c47bb3fdbdef6d601a3dcb9dfb0f.zip opensim-SC-384cb79a1a27c47bb3fdbdef6d601a3dcb9dfb0f.tar.gz opensim-SC-384cb79a1a27c47bb3fdbdef6d601a3dcb9dfb0f.tar.bz2 opensim-SC-384cb79a1a27c47bb3fdbdef6d601a3dcb9dfb0f.tar.xz | |
Merge branch 'master' into bulletsim
Conflicts:
OpenSim/Region/Framework/Scenes/SceneManager.cs
Diffstat (limited to '')
| -rw-r--r-- | OpenSim/Data/Tests/AssetTests.cs | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/OpenSim/Data/Tests/AssetTests.cs b/OpenSim/Data/Tests/AssetTests.cs index b5ae244..1174e2f 100644 --- a/OpenSim/Data/Tests/AssetTests.cs +++ b/OpenSim/Data/Tests/AssetTests.cs | |||
| @@ -106,7 +106,7 @@ namespace OpenSim.Data.Tests | |||
| 106 | [Test] | 106 | [Test] |
| 107 | public void T001_LoadEmpty() | 107 | public void T001_LoadEmpty() |
| 108 | { | 108 | { |
| 109 | TestHelper.InMethod(); | 109 | TestHelpers.InMethod(); |
| 110 | 110 | ||
| 111 | Assert.That(m_db.ExistsAsset(uuid1), Is.False); | 111 | Assert.That(m_db.ExistsAsset(uuid1), Is.False); |
| 112 | Assert.That(m_db.ExistsAsset(uuid2), Is.False); | 112 | Assert.That(m_db.ExistsAsset(uuid2), Is.False); |
| @@ -116,7 +116,7 @@ namespace OpenSim.Data.Tests | |||
| 116 | [Test] | 116 | [Test] |
| 117 | public void T010_StoreReadVerifyAssets() | 117 | public void T010_StoreReadVerifyAssets() |
| 118 | { | 118 | { |
| 119 | TestHelper.InMethod(); | 119 | TestHelpers.InMethod(); |
| 120 | 120 | ||
| 121 | AssetBase a1 = new AssetBase(uuid1, "asset one", (sbyte)AssetType.Texture, critter1.ToString()); | 121 | AssetBase a1 = new AssetBase(uuid1, "asset one", (sbyte)AssetType.Texture, critter1.ToString()); |
| 122 | AssetBase a2 = new AssetBase(uuid2, "asset two", (sbyte)AssetType.Texture, critter2.ToString()); | 122 | AssetBase a2 = new AssetBase(uuid2, "asset two", (sbyte)AssetType.Texture, critter2.ToString()); |
| @@ -183,7 +183,7 @@ namespace OpenSim.Data.Tests | |||
| 183 | [Test] | 183 | [Test] |
| 184 | public void T020_CheckForWeirdCreatorID() | 184 | public void T020_CheckForWeirdCreatorID() |
| 185 | { | 185 | { |
| 186 | TestHelper.InMethod(); | 186 | TestHelpers.InMethod(); |
| 187 | 187 | ||
| 188 | // It is expected that eventually the CreatorID might be an arbitrary string (an URI) | 188 | // It is expected that eventually the CreatorID might be an arbitrary string (an URI) |
| 189 | // rather than a valid UUID (?). This test is to make sure that the database layer does not | 189 | // rather than a valid UUID (?). This test is to make sure that the database layer does not |