aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
-rw-r--r--.nant/bamboo.build1
-rw-r--r--.nant/local.include1
-rw-r--r--OpenSim/Data/MySQL/Tests/MySQLInventoryTest.cs74
-rw-r--r--prebuild.xml43
4 files changed, 118 insertions, 1 deletions
diff --git a/.nant/bamboo.build b/.nant/bamboo.build
index 862ff6e..b86e0ba 100644
--- a/.nant/bamboo.build
+++ b/.nant/bamboo.build
@@ -43,6 +43,7 @@
43 <include name="../bin/OpenSim.Region.ScriptEngine.Shared.CodeTools.Tests.dll" /> 43 <include name="../bin/OpenSim.Region.ScriptEngine.Shared.CodeTools.Tests.dll" />
44 <include name="../bin/OpenSim.Region.Environment.Tests.dll" /> 44 <include name="../bin/OpenSim.Region.Environment.Tests.dll" />
45 <include name="../bin/OpenSim.Data.SQLite.Tests.dll" /> 45 <include name="../bin/OpenSim.Data.SQLite.Tests.dll" />
46 <include name="../bin/OpenSim.Data.MySQL.Tests.dll" />
46 47
47 </assemblies> 48 </assemblies>
48 </test> 49 </test>
diff --git a/.nant/local.include b/.nant/local.include
index 8ebc11c..2cf22c6 100644
--- a/.nant/local.include
+++ b/.nant/local.include
@@ -40,6 +40,7 @@
40 <include name="./bin/OpenSim.Region.ScriptEngine.Shared.CodeTools.Tests.dll" /> 40 <include name="./bin/OpenSim.Region.ScriptEngine.Shared.CodeTools.Tests.dll" />
41 <include name="./bin/OpenSim.Region.Environment.Tests.dll" /> 41 <include name="./bin/OpenSim.Region.Environment.Tests.dll" />
42 <include name="./bin/OpenSim.Data.SQLite.Tests.dll" /> 42 <include name="./bin/OpenSim.Data.SQLite.Tests.dll" />
43 <include name="./bin/OpenSim.Data.MySQL.Tests.dll" />
43 </assemblies> 44 </assemblies>
44 </test> 45 </test>
45 </nunit2> 46 </nunit2>
diff --git a/OpenSim/Data/MySQL/Tests/MySQLInventoryTest.cs b/OpenSim/Data/MySQL/Tests/MySQLInventoryTest.cs
new file mode 100644
index 0000000..0e63835
--- /dev/null
+++ b/OpenSim/Data/MySQL/Tests/MySQLInventoryTest.cs
@@ -0,0 +1,74 @@
1/*
2 * Copyright (c) Contributors, http://opensimulator.org/
3 * See CONTRIBUTORS.TXT for a full list of copyright holders.
4 *
5 * Redistribution and use in source and binary forms, with or without
6 * modification, are permitted provided that the following conditions are met:
7 * * Redistributions of source code must retain the above copyright
8 * notice, this list of conditions and the following disclaimer.
9 * * Redistributions in binary form must reproduce the above copyright
10 * notice, this list of conditions and the following disclaimer in the
11 * documentation and/or other materials provided with the distribution.
12 * * Neither the name of the OpenSim Project nor the
13 * names of its contributors may be used to endorse or promote products
14 * derived from this software without specific prior written permission.
15 *
16 * THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY
17 * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
18 * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
19 * DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
20 * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
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
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
25 * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
26 */
27
28using System;
29using System.IO;
30using System.Collections.Generic;
31using NUnit.Framework;
32using NUnit.Framework.SyntaxHelpers;
33using OpenSim.Framework;
34using OpenSim.Data.Tests;
35using OpenSim.Data.MySQL;
36using OpenSim.Region.Environment.Scenes;
37using OpenMetaverse;
38using log4net;
39
40namespace OpenSim.Data.MySQL.Tests
41{
42 [TestFixture]
43 public class MySQLInventoryTest : BasicInventoryTest
44 {
45 public string file;
46 public string connect;
47
48 [TestFixtureSetUp]
49 public void Init()
50 {
51 SuperInit();
52 try
53 {
54 log4net.Config.XmlConfigurator.Configure();
55 }
56 catch (Exception)
57 {
58 // I don't care, just leave log4net off
59 }
60
61 Assert.Ignore();
62
63 file = Path.GetTempFileName() + ".db";
64 connect = "URI=file:" + file + ",version=3";
65
66 }
67
68 [TestFixtureTearDown]
69 public void Cleanup()
70 {
71 db.Dispose();
72 }
73 }
74}
diff --git a/prebuild.xml b/prebuild.xml
index 451760d..5c58391 100644
--- a/prebuild.xml
+++ b/prebuild.xml
@@ -1417,12 +1417,53 @@
1417 <Reference name="Mono.Addins.dll" /> 1417 <Reference name="Mono.Addins.dll" />
1418 1418
1419 <Files> 1419 <Files>
1420 <Match pattern="*.cs" recurse="true"/> 1420 <Match pattern="*.cs" recurse="true" >
1421 <Exclude name="Tests" pattern="Tests" />
1422 </Match>
1421 <Match path="Resources" pattern="*.sql" buildAction="EmbeddedResource"/> 1423 <Match path="Resources" pattern="*.sql" buildAction="EmbeddedResource"/>
1422 <Match pattern="*.addin.xml" path="Resources" buildAction="EmbeddedResource" recurse="true"/> 1424 <Match pattern="*.addin.xml" path="Resources" buildAction="EmbeddedResource" recurse="true"/>
1423 </Files> 1425 </Files>
1424 </Project> 1426 </Project>
1425 1427
1428 <Project name="OpenSim.Data.MySQL.Tests" path="OpenSim/Data/MySQL/Tests" type="Library">
1429 <Configuration name="Debug">
1430 <Options>
1431 <OutputPath>../../../../bin/</OutputPath>
1432 </Options>
1433 </Configuration>
1434 <Configuration name="Release">
1435 <Options>
1436 <OutputPath>../../../../bin/</OutputPath>
1437 </Options>
1438 </Configuration>
1439
1440 <ReferencePath>../../../../bin/</ReferencePath>
1441 <Reference name="System" localCopy="false"/>
1442 <Reference name="System.Xml"/>
1443 <Reference name="System.Data"/>
1444 <Reference name="System.Drawing"/>
1445 <Reference name="OpenSim.Framework"/>
1446 <Reference name="OpenSim.Data"/>
1447 <Reference name="OpenSim.Data.MapperFactory"/>
1448 <Reference name="OpenSim.Data.Base"/>
1449 <Reference name="OpenSim.Data.MySQLMapper"/>
1450 <Reference name="OpenMetaverseTypes.dll"/>
1451 <Reference name="OpenMetaverse.dll"/>
1452 <Reference name="MySql.Data.dll"/>
1453 <Reference name="OpenSim.Data.Tests"/>
1454 <Reference name="OpenSim.Data.MySQL"/>
1455 <Reference name="OpenSim.Framework.Console"/>
1456 <Reference name="OpenSim.Region.Environment"/>
1457 <Reference name="log4net.dll"/>
1458 <Reference name="nunit.framework.dll" />
1459 <Reference name="Mono.Addins.dll" />
1460
1461 <Files>
1462 <Match pattern="*.cs" recurse="true"/>
1463 </Files>
1464 </Project>
1465
1466
1426 <Project name="OpenSim.Data.MSSQL" path="OpenSim/Data/MSSQL" type="Library"> 1467 <Project name="OpenSim.Data.MSSQL" path="OpenSim/Data/MSSQL" type="Library">
1427 <Configuration name="Debug"> 1468 <Configuration name="Debug">
1428 <Options> 1469 <Options>