diff options
author | Justin Clark-Casey (justincc) | 2012-11-24 03:15:24 +0000 |
---|---|---|
committer | Justin Clark-Casey (justincc) | 2012-11-24 03:15:24 +0000 |
commit | 22d4c52ffc374e167cb674e0e20815615d8a6927 (patch) | |
tree | 15779982c870c359bb1de7f81af6d4cf586bbbbd /OpenSim/Data | |
parent | In ArchiverTests, use the local instantiated SceneManager rather than potenti... (diff) | |
download | opensim-SC-22d4c52ffc374e167cb674e0e20815615d8a6927.zip opensim-SC-22d4c52ffc374e167cb674e0e20815615d8a6927.tar.gz opensim-SC-22d4c52ffc374e167cb674e0e20815615d8a6927.tar.bz2 opensim-SC-22d4c52ffc374e167cb674e0e20815615d8a6927.tar.xz |
Consistenly make NUnit test cases inherit from OpenSimTestCase which automatically turns off any logging enabled between tests
Diffstat (limited to 'OpenSim/Data')
-rw-r--r-- | OpenSim/Data/Tests/AssetTests.cs | 2 | ||||
-rw-r--r-- | OpenSim/Data/Tests/BasicDataServiceTest.cs | 3 | ||||
-rw-r--r-- | OpenSim/Data/Tests/PropertyCompareConstraint.cs | 3 | ||||
-rw-r--r-- | OpenSim/Data/Tests/PropertyScrambler.cs | 3 |
4 files changed, 7 insertions, 4 deletions
diff --git a/OpenSim/Data/Tests/AssetTests.cs b/OpenSim/Data/Tests/AssetTests.cs index 1174e2f..8cb2ee0 100644 --- a/OpenSim/Data/Tests/AssetTests.cs +++ b/OpenSim/Data/Tests/AssetTests.cs | |||
@@ -49,7 +49,7 @@ using OpenSim.Data.SQLite; | |||
49 | namespace OpenSim.Data.Tests | 49 | namespace OpenSim.Data.Tests |
50 | { | 50 | { |
51 | [TestFixture(Description = "Asset store tests (SQLite)")] | 51 | [TestFixture(Description = "Asset store tests (SQLite)")] |
52 | public class SQLiteAssetTests : AssetTests<SqliteConnection, SQLiteAssetData> | 52 | public class SQLiteAssetTests : AssetTests<SqliteConnection, SQLiteAssetData> |
53 | { | 53 | { |
54 | } | 54 | } |
55 | 55 | ||
diff --git a/OpenSim/Data/Tests/BasicDataServiceTest.cs b/OpenSim/Data/Tests/BasicDataServiceTest.cs index 7d85f0c..d8019ba 100644 --- a/OpenSim/Data/Tests/BasicDataServiceTest.cs +++ b/OpenSim/Data/Tests/BasicDataServiceTest.cs | |||
@@ -33,6 +33,7 @@ using NUnit.Framework; | |||
33 | using NUnit.Framework.Constraints; | 33 | using NUnit.Framework.Constraints; |
34 | using OpenMetaverse; | 34 | using OpenMetaverse; |
35 | using OpenSim.Framework; | 35 | using OpenSim.Framework; |
36 | using OpenSim.Tests.Common; | ||
36 | using log4net; | 37 | using log4net; |
37 | using System.Data; | 38 | using System.Data; |
38 | using System.Data.Common; | 39 | using System.Data.Common; |
@@ -45,7 +46,7 @@ namespace OpenSim.Data.Tests | |||
45 | /// </summary> | 46 | /// </summary> |
46 | /// <typeparam name="TConn"></typeparam> | 47 | /// <typeparam name="TConn"></typeparam> |
47 | /// <typeparam name="TService"></typeparam> | 48 | /// <typeparam name="TService"></typeparam> |
48 | public class BasicDataServiceTest<TConn, TService> | 49 | public class BasicDataServiceTest<TConn, TService> : OpenSimTestCase |
49 | where TConn : DbConnection, new() | 50 | where TConn : DbConnection, new() |
50 | where TService : class, new() | 51 | where TService : class, new() |
51 | { | 52 | { |
diff --git a/OpenSim/Data/Tests/PropertyCompareConstraint.cs b/OpenSim/Data/Tests/PropertyCompareConstraint.cs index 6c79bda..b99525a 100644 --- a/OpenSim/Data/Tests/PropertyCompareConstraint.cs +++ b/OpenSim/Data/Tests/PropertyCompareConstraint.cs | |||
@@ -36,6 +36,7 @@ using NUnit.Framework; | |||
36 | using NUnit.Framework.Constraints; | 36 | using NUnit.Framework.Constraints; |
37 | using OpenMetaverse; | 37 | using OpenMetaverse; |
38 | using OpenSim.Framework; | 38 | using OpenSim.Framework; |
39 | using OpenSim.Tests.Common; | ||
39 | 40 | ||
40 | namespace OpenSim.Data.Tests | 41 | namespace OpenSim.Data.Tests |
41 | { | 42 | { |
@@ -254,7 +255,7 @@ namespace OpenSim.Data.Tests | |||
254 | } | 255 | } |
255 | 256 | ||
256 | [TestFixture] | 257 | [TestFixture] |
257 | public class PropertyCompareConstraintTest | 258 | public class PropertyCompareConstraintTest : OpenSimTestCase |
258 | { | 259 | { |
259 | public class HasInt | 260 | public class HasInt |
260 | { | 261 | { |
diff --git a/OpenSim/Data/Tests/PropertyScrambler.cs b/OpenSim/Data/Tests/PropertyScrambler.cs index c5d40c2..e0f5862 100644 --- a/OpenSim/Data/Tests/PropertyScrambler.cs +++ b/OpenSim/Data/Tests/PropertyScrambler.cs | |||
@@ -34,6 +34,7 @@ using System.Text; | |||
34 | using NUnit.Framework; | 34 | using NUnit.Framework; |
35 | using OpenMetaverse; | 35 | using OpenMetaverse; |
36 | using OpenSim.Framework; | 36 | using OpenSim.Framework; |
37 | using OpenSim.Tests.Common; | ||
37 | 38 | ||
38 | namespace OpenSim.Data.Tests | 39 | namespace OpenSim.Data.Tests |
39 | { | 40 | { |
@@ -158,7 +159,7 @@ namespace OpenSim.Data.Tests | |||
158 | } | 159 | } |
159 | 160 | ||
160 | [TestFixture] | 161 | [TestFixture] |
161 | public class PropertyScramblerTests | 162 | public class PropertyScramblerTests : OpenSimTestCase |
162 | { | 163 | { |
163 | [Test] | 164 | [Test] |
164 | public void TestScramble() | 165 | public void TestScramble() |