1 files changed, 76 insertions, 76 deletions
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 @@
-/*
+/*
- * Copyright (c) Contributors, http://opensimulator.org/
+ * Copyright (c) Contributors, http://opensimulator.org/
- * See CONTRIBUTORS.TXT for a full list of copyright holders.
+ * See CONTRIBUTORS.TXT for a full list of copyright holders.
- *
+ *
- * Redistribution and use in source and binary forms, with or without
+ * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
+ * modification, are permitted provided that the following conditions are met:
- *     * Redistributions of source code must retain the above copyright
+ *     * Redistributions of source code must retain the above copyright
- *       notice, this list of conditions and the following disclaimer.
+ *       notice, this list of conditions and the following disclaimer.
- *     * Redistributions in binary form must reproduce the above copyright
+ *     * Redistributions in binary form must reproduce the above copyright
- *       notice, this list of conditions and the following disclaimer in the
+ *       notice, this list of conditions and the following disclaimer in the
- *       documentation and/or other materials provided with the distribution.
+ *       documentation and/or other materials provided with the distribution.
- *     * Neither the name of the OpenSim Project nor the
+ *     * Neither the name of the OpenSim Project nor the
- *       names of its contributors may be used to endorse or promote products
+ *       names of its contributors may be used to endorse or promote products
- *       derived from this software without specific prior written permission.
+ *       derived from this software without specific prior written permission.
- *
+ *
- * THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY
+ * THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY
- * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
+ * DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
- * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
+ */
-using System;
+using System;
-using NUnit.Framework;
+using NUnit.Framework;
-using OpenSim.Data.Tests;
+using OpenSim.Data.Tests;
-namespace OpenSim.Data.NHibernate.Tests
+namespace OpenSim.Data.NHibernate.Tests
-{
+{
-    [TestFixture]
+    [TestFixture]
-    public class NHibernateMySQLEstateTest : BasicEstateTest
+    public class NHibernateMySQLEstateTest : BasicEstateTest
-    {
+    {
-        public string file;
+        public string file;
-        public NHibernateManager database;
+        public NHibernateManager database;
-        public string connect = "MySQL5Dialect;MySqlDataDriver;Server=localhost;Database=opensim-nunit;User ID=opensim-nunit;Password=opensim-nunit";
+        public string connect = "MySQL5Dialect;MySqlDataDriver;Server=localhost;Database=opensim-nunit;User ID=opensim-nunit;Password=opensim-nunit";
-        [TestFixtureSetUp]
+        [TestFixtureSetUp]
-        public void Init()
+        public void Init()
-        {
+        {
-            SuperInit();
+            SuperInit();
-            // If we manage to connect to the database with the user
+            // If we manage to connect to the database with the user
-            // and password above it is our test database, and run
+            // and password above it is our test database, and run
-            // these tests.  If anything goes wrong, ignore these
+            // these tests.  If anything goes wrong, ignore these
-            // tests.
+            // tests.
-            try 
+            try 
-            {
+            {
-                db = new NHibernateEstateData();
+                db = new NHibernateEstateData();
-                db.Initialise(connect);
+                db.Initialise(connect);
-                database = ((NHibernateEstateData)db).manager;
+                database = ((NHibernateEstateData)db).manager;
-            } 
+            } 
-            catch (Exception e)
+            catch (Exception e)
-            {
+            {
-                Console.WriteLine("Exception {0}", e);
+                Console.WriteLine("Exception {0}", e);
-                Assert.Ignore();
+                Assert.Ignore();
-            }
+            }
-        }
+        }
-        [TestFixtureTearDown]
+        [TestFixtureTearDown]
-        public void Cleanup()
+        public void Cleanup()
-        {
+        {
-            if (db != null)
+            if (db != null)
-            {
+            {
-                ((NHibernateEstateData)db).Dispose();
+                ((NHibernateEstateData)db).Dispose();
-            }
+            }
-            if (database != null)
+            if (database != null)
-            {
+            {
-                database.DropSchema();
+                database.DropSchema();
-            }
+            }
-        }
+        }
-        
+        
-    }
+    }
-}
+}

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	}