diff options
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Data/Tests/BasicDataServiceTest.cs | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/OpenSim/Data/Tests/BasicDataServiceTest.cs b/OpenSim/Data/Tests/BasicDataServiceTest.cs index 8c296b9..580e7aa 100644 --- a/OpenSim/Data/Tests/BasicDataServiceTest.cs +++ b/OpenSim/Data/Tests/BasicDataServiceTest.cs | |||
@@ -41,11 +41,11 @@ using System.Reflection; | |||
41 | 41 | ||
42 | namespace OpenSim.Data.Tests | 42 | namespace OpenSim.Data.Tests |
43 | { | 43 | { |
44 | /// <summary>This is a base class for testing any Data service for any DBMS. | 44 | /// <summary>This is a base class for testing any Data service for any DBMS. |
45 | /// Requires NUnit 2.5 or better (to support the generics). | 45 | /// Requires NUnit 2.5 or better (to support the generics). |
46 | /// </summary> | 46 | /// </summary> |
47 | /// <remarks> | 47 | /// <remarks> |
48 | /// FIXME: Should extend OpenSimTestCase but compile on mono 2.4.3 currently fails with | 48 | /// FIXME: Should extend OpenSimTestCase but compile on mono 2.4.3 currently fails with |
49 | /// AssetTests`2 : System.MemberAccessException : Cannot create an instance of OpenSim.Data.Tests.AssetTests`2[TConn,TAssetData] because Type.ContainsGenericParameters is true. | 49 | /// AssetTests`2 : System.MemberAccessException : Cannot create an instance of OpenSim.Data.Tests.AssetTests`2[TConn,TAssetData] because Type.ContainsGenericParameters is true. |
50 | /// and similar on EstateTests, InventoryTests and RegionTests. | 50 | /// and similar on EstateTests, InventoryTests and RegionTests. |
51 | /// Runs fine with mono 2.10.8.1, so easiest thing is to wait until min Mono version uplifts. | 51 | /// Runs fine with mono 2.10.8.1, so easiest thing is to wait until min Mono version uplifts. |
@@ -60,7 +60,7 @@ namespace OpenSim.Data.Tests | |||
60 | private TService m_service; | 60 | private TService m_service; |
61 | private string m_file; | 61 | private string m_file; |
62 | 62 | ||
63 | // TODO: Is this in the right place here? | 63 | // TODO: Is this in the right place here? |
64 | // Later: apparently it's not, but does it matter here? | 64 | // Later: apparently it's not, but does it matter here? |
65 | // protected static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); | 65 | // protected static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); |
66 | 66 | ||
@@ -68,7 +68,7 @@ namespace OpenSim.Data.Tests | |||
68 | 68 | ||
69 | public BasicDataServiceTest() | 69 | public BasicDataServiceTest() |
70 | : this("") | 70 | : this("") |
71 | { | 71 | { |
72 | } | 72 | } |
73 | 73 | ||
74 | public BasicDataServiceTest(string conn) | 74 | public BasicDataServiceTest(string conn) |
@@ -106,7 +106,7 @@ namespace OpenSim.Data.Tests | |||
106 | if (String.IsNullOrEmpty(m_connStr)) | 106 | if (String.IsNullOrEmpty(m_connStr)) |
107 | { | 107 | { |
108 | m_file = Path.GetTempFileName() + ".db"; | 108 | m_file = Path.GetTempFileName() + ".db"; |
109 | m_connStr = "URI=file:../db/" + m_file + ",version=3"; | 109 | m_connStr = "URI=file:" + Util.dbDir() + "/" + m_file + ",version=3"; |
110 | } | 110 | } |
111 | } | 111 | } |
112 | 112 | ||
@@ -226,7 +226,7 @@ namespace OpenSim.Data.Tests | |||
226 | } | 226 | } |
227 | } | 227 | } |
228 | 228 | ||
229 | /// <summary>Clear tables listed as parameters (without dropping them). | 229 | /// <summary>Clear tables listed as parameters (without dropping them). |
230 | /// </summary> | 230 | /// </summary> |
231 | /// <param name="tables"></param> | 231 | /// <param name="tables"></param> |
232 | protected virtual void ResetMigrations(params string[] stores) | 232 | protected virtual void ResetMigrations(params string[] stores) |
@@ -251,7 +251,7 @@ namespace OpenSim.Data.Tests | |||
251 | } | 251 | } |
252 | } | 252 | } |
253 | 253 | ||
254 | /// <summary>Clear tables listed as parameters (without dropping them). | 254 | /// <summary>Clear tables listed as parameters (without dropping them). |
255 | /// </summary> | 255 | /// </summary> |
256 | /// <param name="tables"></param> | 256 | /// <param name="tables"></param> |
257 | protected virtual void ClearTables(params string[] tables) | 257 | protected virtual void ClearTables(params string[] tables) |