diff options
author | Sean Dague | 2009-02-16 19:23:53 +0000 |
---|---|---|
committer | Sean Dague | 2009-02-16 19:23:53 +0000 |
commit | c7a08752c0d49a470534fcebcd13710f517b3d00 (patch) | |
tree | 15fc841c9aff09eacd956bb6e9370cb591f86d0e /OpenSim/Data/NHibernate/Tests | |
parent | * refactor: remove AssetCache field hanging off Scene (diff) | |
download | opensim-SC_OLD-c7a08752c0d49a470534fcebcd13710f517b3d00.zip opensim-SC_OLD-c7a08752c0d49a470534fcebcd13710f517b3d00.tar.gz opensim-SC_OLD-c7a08752c0d49a470534fcebcd13710f517b3d00.tar.bz2 opensim-SC_OLD-c7a08752c0d49a470534fcebcd13710f517b3d00.tar.xz |
line ending fixes and set native eol property
Diffstat (limited to 'OpenSim/Data/NHibernate/Tests')
4 files changed, 307 insertions, 307 deletions
diff --git a/OpenSim/Data/NHibernate/Tests/NHibernateMsSqlEstateTest.cs b/OpenSim/Data/NHibernate/Tests/NHibernateMsSqlEstateTest.cs index ea3c1eb..ac7343b 100644 --- a/OpenSim/Data/NHibernate/Tests/NHibernateMsSqlEstateTest.cs +++ b/OpenSim/Data/NHibernate/Tests/NHibernateMsSqlEstateTest.cs | |||
@@ -1,77 +1,77 @@ | |||
1 | /* | 1 | /* |
2 | * Copyright (c) Contributors, http://opensimulator.org/ | 2 | * Copyright (c) Contributors, http://opensimulator.org/ |
3 | * See CONTRIBUTORS.TXT for a full list of copyright holders. | 3 | * See CONTRIBUTORS.TXT for a full list of copyright holders. |
4 | * | 4 | * |
5 | * Redistribution and use in source and binary forms, with or without | 5 | * Redistribution and use in source and binary forms, with or without |
6 | * modification, are permitted provided that the following conditions are met: | 6 | * modification, are permitted provided that the following conditions are met: |
7 | * * Redistributions of source code must retain the above copyright | 7 | * * Redistributions of source code must retain the above copyright |
8 | * notice, this list of conditions and the following disclaimer. | 8 | * notice, this list of conditions and the following disclaimer. |
9 | * * Redistributions in binary form must reproduce the above copyright | 9 | * * Redistributions in binary form must reproduce the above copyright |
10 | * notice, this list of conditions and the following disclaimer in the | 10 | * notice, this list of conditions and the following disclaimer in the |
11 | * documentation and/or other materials provided with the distribution. | 11 | * documentation and/or other materials provided with the distribution. |
12 | * * Neither the name of the OpenSim Project nor the | 12 | * * Neither the name of the OpenSim Project nor the |
13 | * names of its contributors may be used to endorse or promote products | 13 | * names of its contributors may be used to endorse or promote products |
14 | * derived from this software without specific prior written permission. | 14 | * derived from this software without specific prior written permission. |
15 | * | 15 | * |
16 | * THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY | 16 | * THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY |
17 | * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED | 17 | * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED |
18 | * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE | 18 | * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE |
19 | * DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY | 19 | * DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY |
20 | * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES | 20 | * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES |
21 | * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; | 21 | * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; |
22 | * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND | 22 | * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND |
23 | * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT | 23 | * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT |
24 | * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS | 24 | * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS |
25 | * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | 25 | * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. |
26 | */ | 26 | */ |
27 | 27 | ||
28 | using System; | 28 | using System; |
29 | using NUnit.Framework; | 29 | using NUnit.Framework; |
30 | using OpenSim.Data.Tests; | 30 | using OpenSim.Data.Tests; |
31 | 31 | ||
32 | namespace OpenSim.Data.NHibernate.Tests | 32 | namespace OpenSim.Data.NHibernate.Tests |
33 | { | 33 | { |
34 | [TestFixture] | 34 | [TestFixture] |
35 | public class NHibernateMsSqlEstateTest : BasicEstateTest | 35 | public class NHibernateMsSqlEstateTest : BasicEstateTest |
36 | { | 36 | { |
37 | public string file; | 37 | public string file; |
38 | public NHibernateManager database; | 38 | public NHibernateManager database; |
39 | 39 | ||
40 | [TestFixtureSetUp] | 40 | [TestFixtureSetUp] |
41 | public void Init() | 41 | public void Init() |
42 | { | 42 | { |
43 | SuperInit(); | 43 | SuperInit(); |
44 | // If we manage to connect to the database with the user | 44 | // If we manage to connect to the database with the user |
45 | // and password above it is our test database, and run | 45 | // and password above it is our test database, and run |
46 | // these tests. If anything goes wrong, ignore these | 46 | // these tests. If anything goes wrong, ignore these |
47 | // tests. | 47 | // tests. |
48 | try | 48 | try |
49 | { | 49 | { |
50 | string connect = "MsSql2005Dialect;SqlClientDriver;Data Source=127.0.0.1;Network Library=DBMSSOCN;Initial Catalog=opensim-nunit;User ID=opensim-nunit;Password=opensim-nunit"; | 50 | string connect = "MsSql2005Dialect;SqlClientDriver;Data Source=127.0.0.1;Network Library=DBMSSOCN;Initial Catalog=opensim-nunit;User ID=opensim-nunit;Password=opensim-nunit"; |
51 | 51 | ||
52 | db = new NHibernateEstateData(); | 52 | db = new NHibernateEstateData(); |
53 | db.Initialise(connect); | 53 | db.Initialise(connect); |
54 | database = ((NHibernateEstateData)db).manager; | 54 | database = ((NHibernateEstateData)db).manager; |
55 | } | 55 | } |
56 | catch (Exception e) | 56 | catch (Exception e) |
57 | { | 57 | { |
58 | Console.WriteLine("Exception {0}", e); | 58 | Console.WriteLine("Exception {0}", e); |
59 | Assert.Ignore(); | 59 | Assert.Ignore(); |
60 | } | 60 | } |
61 | } | 61 | } |
62 | 62 | ||
63 | [TestFixtureTearDown] | 63 | [TestFixtureTearDown] |
64 | public void Cleanup() | 64 | public void Cleanup() |
65 | { | 65 | { |
66 | if (db != null) | 66 | if (db != null) |
67 | { | 67 | { |
68 | ((NHibernateEstateData)db).Dispose(); | 68 | ((NHibernateEstateData)db).Dispose(); |
69 | } | 69 | } |
70 | if (database != null) | 70 | if (database != null) |
71 | { | 71 | { |
72 | database.DropSchema(); | 72 | database.DropSchema(); |
73 | } | 73 | } |
74 | } | 74 | } |
75 | 75 | ||
76 | } | 76 | } |
77 | } | 77 | } |
diff --git a/OpenSim/Data/NHibernate/Tests/NHibernateMySqlEstateTest.cs b/OpenSim/Data/NHibernate/Tests/NHibernateMySqlEstateTest.cs index 651ff4e..7e199c7 100644 --- a/OpenSim/Data/NHibernate/Tests/NHibernateMySqlEstateTest.cs +++ b/OpenSim/Data/NHibernate/Tests/NHibernateMySqlEstateTest.cs | |||
@@ -1,76 +1,76 @@ | |||
1 | /* | 1 | /* |
2 | * Copyright (c) Contributors, http://opensimulator.org/ | 2 | * Copyright (c) Contributors, http://opensimulator.org/ |
3 | * See CONTRIBUTORS.TXT for a full list of copyright holders. | 3 | * See CONTRIBUTORS.TXT for a full list of copyright holders. |
4 | * | 4 | * |
5 | * Redistribution and use in source and binary forms, with or without | 5 | * Redistribution and use in source and binary forms, with or without |
6 | * modification, are permitted provided that the following conditions are met: | 6 | * modification, are permitted provided that the following conditions are met: |
7 | * * Redistributions of source code must retain the above copyright | 7 | * * Redistributions of source code must retain the above copyright |
8 | * notice, this list of conditions and the following disclaimer. | 8 | * notice, this list of conditions and the following disclaimer. |
9 | * * Redistributions in binary form must reproduce the above copyright | 9 | * * Redistributions in binary form must reproduce the above copyright |
10 | * notice, this list of conditions and the following disclaimer in the | 10 | * notice, this list of conditions and the following disclaimer in the |
11 | * documentation and/or other materials provided with the distribution. | 11 | * documentation and/or other materials provided with the distribution. |
12 | * * Neither the name of the OpenSim Project nor the | 12 | * * Neither the name of the OpenSim Project nor the |
13 | * names of its contributors may be used to endorse or promote products | 13 | * names of its contributors may be used to endorse or promote products |
14 | * derived from this software without specific prior written permission. | 14 | * derived from this software without specific prior written permission. |
15 | * | 15 | * |
16 | * THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY | 16 | * THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY |
17 | * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED | 17 | * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED |
18 | * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE | 18 | * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE |
19 | * DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY | 19 | * DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY |
20 | * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES | 20 | * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES |
21 | * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; | 21 | * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; |
22 | * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND | 22 | * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND |
23 | * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT | 23 | * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT |
24 | * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS | 24 | * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS |
25 | * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | 25 | * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. |
26 | */ | 26 | */ |
27 | 27 | ||
28 | using System; | 28 | using System; |
29 | using NUnit.Framework; | 29 | using NUnit.Framework; |
30 | using OpenSim.Data.Tests; | 30 | using OpenSim.Data.Tests; |
31 | 31 | ||
32 | namespace OpenSim.Data.NHibernate.Tests | 32 | namespace OpenSim.Data.NHibernate.Tests |
33 | { | 33 | { |
34 | [TestFixture] | 34 | [TestFixture] |
35 | public class NHibernateMySQLEstateTest : BasicEstateTest | 35 | public class NHibernateMySQLEstateTest : BasicEstateTest |
36 | { | 36 | { |
37 | public string file; | 37 | public string file; |
38 | public NHibernateManager database; | 38 | public NHibernateManager database; |
39 | public string connect = "MySQL5Dialect;MySqlDataDriver;Server=localhost;Database=opensim-nunit;User ID=opensim-nunit;Password=opensim-nunit"; | 39 | public string connect = "MySQL5Dialect;MySqlDataDriver;Server=localhost;Database=opensim-nunit;User ID=opensim-nunit;Password=opensim-nunit"; |
40 | 40 | ||
41 | [TestFixtureSetUp] | 41 | [TestFixtureSetUp] |
42 | public void Init() | 42 | public void Init() |
43 | { | 43 | { |
44 | SuperInit(); | 44 | SuperInit(); |
45 | // If we manage to connect to the database with the user | 45 | // If we manage to connect to the database with the user |
46 | // and password above it is our test database, and run | 46 | // and password above it is our test database, and run |
47 | // these tests. If anything goes wrong, ignore these | 47 | // these tests. If anything goes wrong, ignore these |
48 | // tests. | 48 | // tests. |
49 | try | 49 | try |
50 | { | 50 | { |
51 | db = new NHibernateEstateData(); | 51 | db = new NHibernateEstateData(); |
52 | db.Initialise(connect); | 52 | db.Initialise(connect); |
53 | database = ((NHibernateEstateData)db).manager; | 53 | database = ((NHibernateEstateData)db).manager; |
54 | } | 54 | } |
55 | catch (Exception e) | 55 | catch (Exception e) |
56 | { | 56 | { |
57 | Console.WriteLine("Exception {0}", e); | 57 | Console.WriteLine("Exception {0}", e); |
58 | Assert.Ignore(); | 58 | Assert.Ignore(); |
59 | } | 59 | } |
60 | } | 60 | } |
61 | 61 | ||
62 | [TestFixtureTearDown] | 62 | [TestFixtureTearDown] |
63 | public void Cleanup() | 63 | public void Cleanup() |
64 | { | 64 | { |
65 | if (db != null) | 65 | if (db != null) |
66 | { | 66 | { |
67 | ((NHibernateEstateData)db).Dispose(); | 67 | ((NHibernateEstateData)db).Dispose(); |
68 | } | 68 | } |
69 | if (database != null) | 69 | if (database != null) |
70 | { | 70 | { |
71 | database.DropSchema(); | 71 | database.DropSchema(); |
72 | } | 72 | } |
73 | } | 73 | } |
74 | 74 | ||
75 | } | 75 | } |
76 | } | 76 | } |
diff --git a/OpenSim/Data/NHibernate/Tests/NHibernatePostgreSQLEstateTest.cs b/OpenSim/Data/NHibernate/Tests/NHibernatePostgreSQLEstateTest.cs index 1d113c7..6458c98 100644 --- a/OpenSim/Data/NHibernate/Tests/NHibernatePostgreSQLEstateTest.cs +++ b/OpenSim/Data/NHibernate/Tests/NHibernatePostgreSQLEstateTest.cs | |||
@@ -1,76 +1,76 @@ | |||
1 | /* | 1 | /* |
2 | * Copyright (c) Contributors, http://opensimulator.org/ | 2 | * Copyright (c) Contributors, http://opensimulator.org/ |
3 | * See CONTRIBUTORS.TXT for a full list of copyright holders. | 3 | * See CONTRIBUTORS.TXT for a full list of copyright holders. |
4 | * | 4 | * |
5 | * Redistribution and use in source and binary forms, with or without | 5 | * Redistribution and use in source and binary forms, with or without |
6 | * modification, are permitted provided that the following conditions are met: | 6 | * modification, are permitted provided that the following conditions are met: |
7 | * * Redistributions of source code must retain the above copyright | 7 | * * Redistributions of source code must retain the above copyright |
8 | * notice, this list of conditions and the following disclaimer. | 8 | * notice, this list of conditions and the following disclaimer. |
9 | * * Redistributions in binary form must reproduce the above copyright | 9 | * * Redistributions in binary form must reproduce the above copyright |
10 | * notice, this list of conditions and the following disclaimer in the | 10 | * notice, this list of conditions and the following disclaimer in the |
11 | * documentation and/or other materials provided with the distribution. | 11 | * documentation and/or other materials provided with the distribution. |
12 | * * Neither the name of the OpenSim Project nor the | 12 | * * Neither the name of the OpenSim Project nor the |
13 | * names of its contributors may be used to endorse or promote products | 13 | * names of its contributors may be used to endorse or promote products |
14 | * derived from this software without specific prior written permission. | 14 | * derived from this software without specific prior written permission. |
15 | * | 15 | * |
16 | * THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY | 16 | * THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY |
17 | * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED | 17 | * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED |
18 | * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE | 18 | * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE |
19 | * DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY | 19 | * DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY |
20 | * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES | 20 | * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES |
21 | * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; | 21 | * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; |
22 | * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND | 22 | * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND |
23 | * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT | 23 | * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT |
24 | * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS | 24 | * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS |
25 | * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | 25 | * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. |
26 | */ | 26 | */ |
27 | 27 | ||
28 | using System; | 28 | using System; |
29 | using NUnit.Framework; | 29 | using NUnit.Framework; |
30 | using OpenSim.Data.Tests; | 30 | using OpenSim.Data.Tests; |
31 | 31 | ||
32 | namespace OpenSim.Data.NHibernate.Tests | 32 | namespace OpenSim.Data.NHibernate.Tests |
33 | { | 33 | { |
34 | [TestFixture] | 34 | [TestFixture] |
35 | public class NHibernatePostgreSQLEstateTest : BasicEstateTest | 35 | public class NHibernatePostgreSQLEstateTest : BasicEstateTest |
36 | { | 36 | { |
37 | public string file; | 37 | public string file; |
38 | public NHibernateManager database; | 38 | public NHibernateManager database; |
39 | public string connect = "PostgreSQLDialect;NpgsqlDriver;Server=localhost;Database=opensim-nunit;User ID=opensim-nunit;Password=opensim-nunit;"; | 39 | public string connect = "PostgreSQLDialect;NpgsqlDriver;Server=localhost;Database=opensim-nunit;User ID=opensim-nunit;Password=opensim-nunit;"; |
40 | 40 | ||
41 | [TestFixtureSetUp] | 41 | [TestFixtureSetUp] |
42 | public void Init() | 42 | public void Init() |
43 | { | 43 | { |
44 | SuperInit(); | 44 | SuperInit(); |
45 | // If we manage to connect to the database with the user | 45 | // If we manage to connect to the database with the user |
46 | // and password above it is our test database, and run | 46 | // and password above it is our test database, and run |
47 | // these tests. If anything goes wrong, ignore these | 47 | // these tests. If anything goes wrong, ignore these |
48 | // tests. | 48 | // tests. |
49 | try | 49 | try |
50 | { | 50 | { |
51 | db = new NHibernateEstateData(); | 51 | db = new NHibernateEstateData(); |
52 | db.Initialise(connect); | 52 | db.Initialise(connect); |
53 | database = ((NHibernateEstateData)db).manager; | 53 | database = ((NHibernateEstateData)db).manager; |
54 | } | 54 | } |
55 | catch (Exception e) | 55 | catch (Exception e) |
56 | { | 56 | { |
57 | Console.WriteLine("Exception {0}", e); | 57 | Console.WriteLine("Exception {0}", e); |
58 | Assert.Ignore(); | 58 | Assert.Ignore(); |
59 | } | 59 | } |
60 | } | 60 | } |
61 | 61 | ||
62 | [TestFixtureTearDown] | 62 | [TestFixtureTearDown] |
63 | public void Cleanup() | 63 | public void Cleanup() |
64 | { | 64 | { |
65 | if (db != null) | 65 | if (db != null) |
66 | { | 66 | { |
67 | ((NHibernateEstateData)db).Dispose(); | 67 | ((NHibernateEstateData)db).Dispose(); |
68 | } | 68 | } |
69 | if (database != null) | 69 | if (database != null) |
70 | { | 70 | { |
71 | database.DropSchema(); | 71 | database.DropSchema(); |
72 | } | 72 | } |
73 | } | 73 | } |
74 | 74 | ||
75 | } | 75 | } |
76 | } | 76 | } |
diff --git a/OpenSim/Data/NHibernate/Tests/NHibernateSQLiteEstateTest.cs b/OpenSim/Data/NHibernate/Tests/NHibernateSQLiteEstateTest.cs index 86fb573..88f85b0 100644 --- a/OpenSim/Data/NHibernate/Tests/NHibernateSQLiteEstateTest.cs +++ b/OpenSim/Data/NHibernate/Tests/NHibernateSQLiteEstateTest.cs | |||
@@ -1,78 +1,78 @@ | |||
1 | /* | 1 | /* |
2 | * Copyright (c) Contributors, http://opensimulator.org/ | 2 | * Copyright (c) Contributors, http://opensimulator.org/ |
3 | * See CONTRIBUTORS.TXT for a full list of copyright holders. | 3 | * See CONTRIBUTORS.TXT for a full list of copyright holders. |
4 | * | 4 | * |
5 | * Redistribution and use in source and binary forms, with or without | 5 | * Redistribution and use in source and binary forms, with or without |
6 | * modification, are permitted provided that the following conditions are met: | 6 | * modification, are permitted provided that the following conditions are met: |
7 | * * Redistributions of source code must retain the above copyright | 7 | * * Redistributions of source code must retain the above copyright |
8 | * notice, this list of conditions and the following disclaimer. | 8 | * notice, this list of conditions and the following disclaimer. |
9 | * * Redistributions in binary form must reproduce the above copyright | 9 | * * Redistributions in binary form must reproduce the above copyright |
10 | * notice, this list of conditions and the following disclaimer in the | 10 | * notice, this list of conditions and the following disclaimer in the |
11 | * documentation and/or other materials provided with the distribution. | 11 | * documentation and/or other materials provided with the distribution. |
12 | * * Neither the name of the OpenSim Project nor the | 12 | * * Neither the name of the OpenSim Project nor the |
13 | * names of its contributors may be used to endorse or promote products | 13 | * names of its contributors may be used to endorse or promote products |
14 | * derived from this software without specific prior written permission. | 14 | * derived from this software without specific prior written permission. |
15 | * | 15 | * |
16 | * THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY | 16 | * THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY |
17 | * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED | 17 | * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED |
18 | * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE | 18 | * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE |
19 | * DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY | 19 | * DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY |
20 | * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES | 20 | * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES |
21 | * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; | 21 | * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; |
22 | * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND | 22 | * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND |
23 | * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT | 23 | * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT |
24 | * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS | 24 | * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS |
25 | * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | 25 | * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. |
26 | */ | 26 | */ |
27 | 27 | ||
28 | using System; | 28 | using System; |
29 | using System.IO; | 29 | using System.IO; |
30 | using NUnit.Framework; | 30 | using NUnit.Framework; |
31 | using OpenSim.Data.Tests; | 31 | using OpenSim.Data.Tests; |
32 | 32 | ||
33 | namespace OpenSim.Data.NHibernate.Tests | 33 | namespace OpenSim.Data.NHibernate.Tests |
34 | { | 34 | { |
35 | [TestFixture] | 35 | [TestFixture] |
36 | public class NHibernateSQLiteEstateTest : BasicEstateTest | 36 | public class NHibernateSQLiteEstateTest : BasicEstateTest |
37 | { | 37 | { |
38 | public string file; | 38 | public string file; |
39 | public NHibernateManager database; | 39 | public NHibernateManager database; |
40 | 40 | ||
41 | [TestFixtureSetUp] | 41 | [TestFixtureSetUp] |
42 | public void Init() | 42 | public void Init() |
43 | { | 43 | { |
44 | SuperInit(); | 44 | SuperInit(); |
45 | // If we manage to connect to the database with the user | 45 | // If we manage to connect to the database with the user |
46 | // and password above it is our test database, and run | 46 | // and password above it is our test database, and run |
47 | // these tests. If anything goes wrong, ignore these | 47 | // these tests. If anything goes wrong, ignore these |
48 | // tests. | 48 | // tests. |
49 | try | 49 | try |
50 | { | 50 | { |
51 | string connect = "SQLiteDialect;SQLite20Driver;Data Source=" + Path.GetTempFileName() + ".db;Version=3"; | 51 | string connect = "SQLiteDialect;SQLite20Driver;Data Source=" + Path.GetTempFileName() + ".db;Version=3"; |
52 | 52 | ||
53 | db = new NHibernateEstateData(); | 53 | db = new NHibernateEstateData(); |
54 | db.Initialise(connect); | 54 | db.Initialise(connect); |
55 | database = ((NHibernateEstateData)db).manager; | 55 | database = ((NHibernateEstateData)db).manager; |
56 | } | 56 | } |
57 | catch (Exception e) | 57 | catch (Exception e) |
58 | { | 58 | { |
59 | Console.WriteLine("Exception {0}", e); | 59 | Console.WriteLine("Exception {0}", e); |
60 | Assert.Ignore(); | 60 | Assert.Ignore(); |
61 | } | 61 | } |
62 | } | 62 | } |
63 | 63 | ||
64 | [TestFixtureTearDown] | 64 | [TestFixtureTearDown] |
65 | public void Cleanup() | 65 | public void Cleanup() |
66 | { | 66 | { |
67 | if (db != null) | 67 | if (db != null) |
68 | { | 68 | { |
69 | ((NHibernateEstateData)db).Dispose(); | 69 | ((NHibernateEstateData)db).Dispose(); |
70 | } | 70 | } |
71 | if (database != null) | 71 | if (database != null) |
72 | { | 72 | { |
73 | database.DropSchema(); | 73 | database.DropSchema(); |
74 | } | 74 | } |
75 | } | 75 | } |
76 | 76 | ||
77 | } | 77 | } |
78 | } | 78 | } |