aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Data/Tests/RegionTests.cs
diff options
context:
space:
mode:
authorMelanie2010-09-13 16:16:40 +0100
committerMelanie2010-09-13 16:17:38 +0100
commit6a1ce17cdbf143f11262e1194b6a6d9e5bb1077e (patch)
tree1e7bf4fddcf559886c6b2babf13cf4b2ca8829a1 /OpenSim/Data/Tests/RegionTests.cs
parentMerge branch 'careminster-presence-refactor' of ssh://melanie@3dhosting.de/va... (diff)
parentFix unit test SceneSetupHelpers to load the mock simulation data store (diff)
downloadopensim-SC-6a1ce17cdbf143f11262e1194b6a6d9e5bb1077e.zip
opensim-SC-6a1ce17cdbf143f11262e1194b6a6d9e5bb1077e.tar.gz
opensim-SC-6a1ce17cdbf143f11262e1194b6a6d9e5bb1077e.tar.bz2
opensim-SC-6a1ce17cdbf143f11262e1194b6a6d9e5bb1077e.tar.xz
Merge branch 'master' into careminster-presence-refactor
The modules will need to be updated for this to compile and run again. Please don't use until I do the companion commit to modules later on.
Diffstat (limited to '')
-rw-r--r--OpenSim/Data/Tests/RegionTests.cs12
1 files changed, 6 insertions, 6 deletions
diff --git a/OpenSim/Data/Tests/RegionTests.cs b/OpenSim/Data/Tests/RegionTests.cs
index 29bf5a3..a081462 100644
--- a/OpenSim/Data/Tests/RegionTests.cs
+++ b/OpenSim/Data/Tests/RegionTests.cs
@@ -61,17 +61,17 @@ namespace OpenSim.Data.Tests
61#else 61#else
62 62
63 [TestFixture(Description = "Region store tests (SQLite)")] 63 [TestFixture(Description = "Region store tests (SQLite)")]
64 public class SQLiteRegionTests : RegionTests<SqliteConnection, SQLiteRegionData> 64 public class SQLiteRegionTests : RegionTests<SqliteConnection, SQLiteSimulationData>
65 { 65 {
66 } 66 }
67 67
68 [TestFixture(Description = "Region store tests (MySQL)")] 68 [TestFixture(Description = "Region store tests (MySQL)")]
69 public class MySqlRegionTests : RegionTests<MySqlConnection, MySQLDataStore> 69 public class MySqlRegionTests : RegionTests<MySqlConnection, MySQLSimulationData>
70 { 70 {
71 } 71 }
72 72
73 [TestFixture(Description = "Region store tests (MS SQL Server)")] 73 [TestFixture(Description = "Region store tests (MS SQL Server)")]
74 public class MSSQLRegionTests : RegionTests<SqlConnection, MSSQLRegionDataStore> 74 public class MSSQLRegionTests : RegionTests<SqlConnection, MSSQLSimulationData>
75 { 75 {
76 } 76 }
77 77
@@ -79,11 +79,11 @@ namespace OpenSim.Data.Tests
79 79
80 public class RegionTests<TConn, TRegStore> : BasicDataServiceTest<TConn, TRegStore> 80 public class RegionTests<TConn, TRegStore> : BasicDataServiceTest<TConn, TRegStore>
81 where TConn : DbConnection, new() 81 where TConn : DbConnection, new()
82 where TRegStore : class, IRegionDataStore, new() 82 where TRegStore : class, ISimulationDataStore, new()
83 { 83 {
84 bool m_rebuildDB; 84 bool m_rebuildDB;
85 85
86 public IRegionDataStore db; 86 public ISimulationDataStore db;
87 public UUID zero = UUID.Zero; 87 public UUID zero = UUID.Zero;
88 public UUID region1 = UUID.Random(); 88 public UUID region1 = UUID.Random();
89 public UUID region2 = UUID.Random(); 89 public UUID region2 = UUID.Random();
@@ -122,7 +122,7 @@ namespace OpenSim.Data.Tests
122 protected override void InitService(object service) 122 protected override void InitService(object service)
123 { 123 {
124 ClearDB(); 124 ClearDB();
125 db = (IRegionDataStore)service; 125 db = (ISimulationDataStore)service;
126 db.Initialise(m_connStr); 126 db.Initialise(m_connStr);
127 } 127 }
128 128