diff options
author | BlueWall | 2011-03-15 17:17:28 -0400 |
---|---|---|
committer | BlueWall | 2011-03-15 17:17:28 -0400 |
commit | d4ed38821f383d66bd3d322bdbb03942cbb43c19 (patch) | |
tree | 491f3b9295555c82a3c84b2f365df861f84f0a7f /OpenSim/Data/Tests/AssetTests.cs | |
parent | Hello, World! (diff) | |
parent | Fix a bug in T015_LargeSceneObjects() where the large scene object was stored... (diff) | |
download | opensim-SC_OLD-d4ed38821f383d66bd3d322bdbb03942cbb43c19.zip opensim-SC_OLD-d4ed38821f383d66bd3d322bdbb03942cbb43c19.tar.gz opensim-SC_OLD-d4ed38821f383d66bd3d322bdbb03942cbb43c19.tar.bz2 opensim-SC_OLD-d4ed38821f383d66bd3d322bdbb03942cbb43c19.tar.xz |
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
Diffstat (limited to 'OpenSim/Data/Tests/AssetTests.cs')
-rw-r--r-- | OpenSim/Data/Tests/AssetTests.cs | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/OpenSim/Data/Tests/AssetTests.cs b/OpenSim/Data/Tests/AssetTests.cs index 32f74a9..b5ae244 100644 --- a/OpenSim/Data/Tests/AssetTests.cs +++ b/OpenSim/Data/Tests/AssetTests.cs | |||
@@ -32,6 +32,7 @@ using NUnit.Framework; | |||
32 | using NUnit.Framework.Constraints; | 32 | using NUnit.Framework.Constraints; |
33 | using OpenMetaverse; | 33 | using OpenMetaverse; |
34 | using OpenSim.Framework; | 34 | using OpenSim.Framework; |
35 | using OpenSim.Tests.Common; | ||
35 | using System.Data.Common; | 36 | using System.Data.Common; |
36 | using log4net; | 37 | using log4net; |
37 | 38 | ||
@@ -105,6 +106,8 @@ namespace OpenSim.Data.Tests | |||
105 | [Test] | 106 | [Test] |
106 | public void T001_LoadEmpty() | 107 | public void T001_LoadEmpty() |
107 | { | 108 | { |
109 | TestHelper.InMethod(); | ||
110 | |||
108 | Assert.That(m_db.ExistsAsset(uuid1), Is.False); | 111 | Assert.That(m_db.ExistsAsset(uuid1), Is.False); |
109 | Assert.That(m_db.ExistsAsset(uuid2), Is.False); | 112 | Assert.That(m_db.ExistsAsset(uuid2), Is.False); |
110 | Assert.That(m_db.ExistsAsset(uuid3), Is.False); | 113 | Assert.That(m_db.ExistsAsset(uuid3), Is.False); |
@@ -113,6 +116,8 @@ namespace OpenSim.Data.Tests | |||
113 | [Test] | 116 | [Test] |
114 | public void T010_StoreReadVerifyAssets() | 117 | public void T010_StoreReadVerifyAssets() |
115 | { | 118 | { |
119 | TestHelper.InMethod(); | ||
120 | |||
116 | 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()); |
117 | 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()); |
118 | AssetBase a3 = new AssetBase(uuid3, "asset three", (sbyte)AssetType.Texture, critter3.ToString()); | 123 | AssetBase a3 = new AssetBase(uuid3, "asset three", (sbyte)AssetType.Texture, critter3.ToString()); |
@@ -178,6 +183,8 @@ namespace OpenSim.Data.Tests | |||
178 | [Test] | 183 | [Test] |
179 | public void T020_CheckForWeirdCreatorID() | 184 | public void T020_CheckForWeirdCreatorID() |
180 | { | 185 | { |
186 | TestHelper.InMethod(); | ||
187 | |||
181 | // 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) |
182 | // 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 |
183 | // attempt to convert CreatorID to GUID, but just passes it both ways as a string. | 190 | // attempt to convert CreatorID to GUID, but just passes it both ways as a string. |