diff options
author | Sean Dague | 2008-09-19 17:47:37 +0000 |
---|---|---|
committer | Sean Dague | 2008-09-19 17:47:37 +0000 |
commit | 7ac264c2f0a33ca771ebbe15aae48103627548da (patch) | |
tree | 0d370e75c72c4f38260b325104d68d8f1bb6d06e /OpenSim/Data/SQLite | |
parent | * Only allow logins on standalone when the sim has completed it's initial sta... (diff) | |
download | opensim-SC-7ac264c2f0a33ca771ebbe15aae48103627548da.zip opensim-SC-7ac264c2f0a33ca771ebbe15aae48103627548da.tar.gz opensim-SC-7ac264c2f0a33ca771ebbe15aae48103627548da.tar.bz2 opensim-SC-7ac264c2f0a33ca771ebbe15aae48103627548da.tar.xz |
convert to using proper .net tempfiles, should have done this
initially.
Diffstat (limited to 'OpenSim/Data/SQLite')
-rw-r--r-- | OpenSim/Data/SQLite/Tests/SQLiteAssetTest.cs | 5 | ||||
-rw-r--r-- | OpenSim/Data/SQLite/Tests/SQLiteInventoryTest.cs | 6 | ||||
-rw-r--r-- | OpenSim/Data/SQLite/Tests/SQLiteRegionTest.cs | 2 | ||||
-rw-r--r-- | OpenSim/Data/SQLite/Tests/SQLiteUserTest.cs | 4 |
4 files changed, 13 insertions, 4 deletions
diff --git a/OpenSim/Data/SQLite/Tests/SQLiteAssetTest.cs b/OpenSim/Data/SQLite/Tests/SQLiteAssetTest.cs index 89bb2ae..993f5f5 100644 --- a/OpenSim/Data/SQLite/Tests/SQLiteAssetTest.cs +++ b/OpenSim/Data/SQLite/Tests/SQLiteAssetTest.cs | |||
@@ -26,6 +26,7 @@ | |||
26 | */ | 26 | */ |
27 | 27 | ||
28 | using System; | 28 | using System; |
29 | using System.IO; | ||
29 | using System.Collections.Generic; | 30 | using System.Collections.Generic; |
30 | using NUnit.Framework; | 31 | using NUnit.Framework; |
31 | using NUnit.Framework.SyntaxHelpers; | 32 | using NUnit.Framework.SyntaxHelpers; |
@@ -40,14 +41,14 @@ namespace OpenSim.Data.SQLite.Tests | |||
40 | [TestFixture] | 41 | [TestFixture] |
41 | public class SQLiteAssetTest : BasicAssetTest | 42 | public class SQLiteAssetTest : BasicAssetTest |
42 | { | 43 | { |
43 | public string file = "assettest.db"; | 44 | public string file; |
44 | public string connect; | 45 | public string connect; |
45 | 46 | ||
46 | [TestFixtureSetUp] | 47 | [TestFixtureSetUp] |
47 | public void Init() | 48 | public void Init() |
48 | { | 49 | { |
49 | SuperInit(); | 50 | SuperInit(); |
50 | System.Console.WriteLine("SQLiteAssetTest"); | 51 | file = Path.GetTempFileName() + ".db"; |
51 | connect = "URI=file:" + file + ",version=3"; | 52 | connect = "URI=file:" + file + ",version=3"; |
52 | db = new SQLiteAssetData(); | 53 | db = new SQLiteAssetData(); |
53 | db.Initialise(connect); | 54 | db.Initialise(connect); |
diff --git a/OpenSim/Data/SQLite/Tests/SQLiteInventoryTest.cs b/OpenSim/Data/SQLite/Tests/SQLiteInventoryTest.cs index 998229f..55a1f75 100644 --- a/OpenSim/Data/SQLite/Tests/SQLiteInventoryTest.cs +++ b/OpenSim/Data/SQLite/Tests/SQLiteInventoryTest.cs | |||
@@ -26,6 +26,7 @@ | |||
26 | */ | 26 | */ |
27 | 27 | ||
28 | using System; | 28 | using System; |
29 | using System.IO; | ||
29 | using System.Collections.Generic; | 30 | using System.Collections.Generic; |
30 | using NUnit.Framework; | 31 | using NUnit.Framework; |
31 | using NUnit.Framework.SyntaxHelpers; | 32 | using NUnit.Framework.SyntaxHelpers; |
@@ -41,7 +42,7 @@ namespace OpenSim.Data.SQLite.Tests | |||
41 | [TestFixture] | 42 | [TestFixture] |
42 | public class SQLiteInventoryTest : BasicInventoryTest | 43 | public class SQLiteInventoryTest : BasicInventoryTest |
43 | { | 44 | { |
44 | public string file = "inventorytest.db"; | 45 | public string file; |
45 | public string connect; | 46 | public string connect; |
46 | 47 | ||
47 | [TestFixtureSetUp] | 48 | [TestFixtureSetUp] |
@@ -56,7 +57,10 @@ namespace OpenSim.Data.SQLite.Tests | |||
56 | { | 57 | { |
57 | // I don't care, just leave log4net off | 58 | // I don't care, just leave log4net off |
58 | } | 59 | } |
60 | |||
61 | file = Path.GetTempFileName() + ".db"; | ||
59 | connect = "URI=file:" + file + ",version=3"; | 62 | connect = "URI=file:" + file + ",version=3"; |
63 | |||
60 | db = new SQLiteInventoryStore(); | 64 | db = new SQLiteInventoryStore(); |
61 | db.Initialise(connect); | 65 | db.Initialise(connect); |
62 | } | 66 | } |
diff --git a/OpenSim/Data/SQLite/Tests/SQLiteRegionTest.cs b/OpenSim/Data/SQLite/Tests/SQLiteRegionTest.cs index e827638..b188ead 100644 --- a/OpenSim/Data/SQLite/Tests/SQLiteRegionTest.cs +++ b/OpenSim/Data/SQLite/Tests/SQLiteRegionTest.cs | |||
@@ -26,6 +26,7 @@ | |||
26 | */ | 26 | */ |
27 | 27 | ||
28 | using System; | 28 | using System; |
29 | using System.IO; | ||
29 | using System.Collections.Generic; | 30 | using System.Collections.Generic; |
30 | using NUnit.Framework; | 31 | using NUnit.Framework; |
31 | using NUnit.Framework.SyntaxHelpers; | 32 | using NUnit.Framework.SyntaxHelpers; |
@@ -47,6 +48,7 @@ namespace OpenSim.Data.SQLite.Tests | |||
47 | public void Init() | 48 | public void Init() |
48 | { | 49 | { |
49 | SuperInit(); | 50 | SuperInit(); |
51 | file = Path.GetTempFileName() + ".db"; | ||
50 | connect = "URI=file:" + file + ",version=3"; | 52 | connect = "URI=file:" + file + ",version=3"; |
51 | db = new SQLiteRegionData(); | 53 | db = new SQLiteRegionData(); |
52 | db.Initialise(connect); | 54 | db.Initialise(connect); |
diff --git a/OpenSim/Data/SQLite/Tests/SQLiteUserTest.cs b/OpenSim/Data/SQLite/Tests/SQLiteUserTest.cs index d9e2867..68a10fb 100644 --- a/OpenSim/Data/SQLite/Tests/SQLiteUserTest.cs +++ b/OpenSim/Data/SQLite/Tests/SQLiteUserTest.cs | |||
@@ -26,6 +26,7 @@ | |||
26 | */ | 26 | */ |
27 | 27 | ||
28 | using System; | 28 | using System; |
29 | using System.IO; | ||
29 | using System.Collections.Generic; | 30 | using System.Collections.Generic; |
30 | using NUnit.Framework; | 31 | using NUnit.Framework; |
31 | using NUnit.Framework.SyntaxHelpers; | 32 | using NUnit.Framework.SyntaxHelpers; |
@@ -40,13 +41,14 @@ namespace OpenSim.Data.SQLite.Tests | |||
40 | [TestFixture] | 41 | [TestFixture] |
41 | public class SQLiteUserTest : BasicUserTest | 42 | public class SQLiteUserTest : BasicUserTest |
42 | { | 43 | { |
43 | public string file = "usertest.db"; | 44 | public string file; |
44 | public string connect; | 45 | public string connect; |
45 | 46 | ||
46 | [TestFixtureSetUp] | 47 | [TestFixtureSetUp] |
47 | public void Init() | 48 | public void Init() |
48 | { | 49 | { |
49 | SuperInit(); | 50 | SuperInit(); |
51 | file = Path.GetTempFileName() + ".db"; | ||
50 | connect = "URI=file:" + file + ",version=3"; | 52 | connect = "URI=file:" + file + ",version=3"; |
51 | db = new SQLiteUserData(); | 53 | db = new SQLiteUserData(); |
52 | db.Initialise(connect); | 54 | db.Initialise(connect); |