aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorSean Dague2008-09-10 17:49:37 +0000
committerSean Dague2008-09-10 17:49:37 +0000
commit1799913593f74b113322118106e8ca221310ba69 (patch)
treed09b3368035901eb47d2db92c27ac500ed03170c
parentRevert the two debug log statements from r6212 as described in Mantis 2126. (diff)
downloadopensim-SC_OLD-1799913593f74b113322118106e8ca221310ba69.zip
opensim-SC_OLD-1799913593f74b113322118106e8ca221310ba69.tar.gz
opensim-SC_OLD-1799913593f74b113322118106e8ca221310ba69.tar.bz2
opensim-SC_OLD-1799913593f74b113322118106e8ca221310ba69.tar.xz
add shell for SQLite testing. No tests yet.
add another nant target for test-xml to get the verbose version
Diffstat (limited to '')
-rw-r--r--.nant/local.include18
-rw-r--r--Makefile3
-rw-r--r--OpenSim/Data/SQLite/Tests/SQLiteRegionTest.cs49
-rw-r--r--prebuild.xml40
4 files changed, 109 insertions, 1 deletions
diff --git a/.nant/local.include b/.nant/local.include
index 1b526e6..1612358 100644
--- a/.nant/local.include
+++ b/.nant/local.include
@@ -37,11 +37,29 @@
37 <include name="./bin/OpenSim.Region.ScriptEngine.Shared.Tests.dll" /> 37 <include name="./bin/OpenSim.Region.ScriptEngine.Shared.Tests.dll" />
38 <include name="./bin/OpenSim.Region.ScriptEngine.Shared.CodeTools.Tests.dll" /> 38 <include name="./bin/OpenSim.Region.ScriptEngine.Shared.CodeTools.Tests.dll" />
39 <include name="./bin/OpenSim.Region.Environment.Tests.dll" /> 39 <include name="./bin/OpenSim.Region.Environment.Tests.dll" />
40 <include name="./bin/OpenSim.Data.SQLite.Tests.dll" />
40 </assemblies> 41 </assemblies>
41 </test> 42 </test>
42 </nunit2> 43 </nunit2>
43</target> 44</target>
44 45
46<target name="test-xml" depends="build">
47 <nunit2 failonerror="true" verbose="true">
48 <formatter type="Xml" usefile="true" extension=".xml" outputdir="./test-results" />
49 <test>
50 <assemblies>
51 <include name="./bin/OpenSim.Framework.Tests.dll" />
52 <include name="./bin/OpenSim.Region.ScriptEngine.Common.Tests.dll" />
53 <include name="./bin/OpenSim.Region.ScriptEngine.Shared.Tests.dll" />
54 <include name="./bin/OpenSim.Region.ScriptEngine.Shared.CodeTools.Tests.dll" />
55 <include name="./bin/OpenSim.Region.Environment.Tests.dll" />
56 <include name="./bin/OpenSim.Data.SQLite.Tests.dll" />
57 </assemblies>
58 </test>
59 </nunit2>
60</target>
61
62
45<target name="dist" depends="distdir"> 63<target name="dist" depends="distdir">
46 <zip zipfile="${projectdir}.zip"> 64 <zip zipfile="${projectdir}.zip">
47 <fileset basedir="."> 65 <fileset basedir=".">
diff --git a/Makefile b/Makefile
index a1858b7..d5c7146 100644
--- a/Makefile
+++ b/Makefile
@@ -13,6 +13,9 @@ clean:
13test: 13test:
14 ${NANT} test 14 ${NANT} test
15 15
16test-xml:
17 ${NANT} test-xml
18
16tags: 19tags:
17 find OpenSim -name \*\.cs | xargs etags 20 find OpenSim -name \*\.cs | xargs etags
18 21
diff --git a/OpenSim/Data/SQLite/Tests/SQLiteRegionTest.cs b/OpenSim/Data/SQLite/Tests/SQLiteRegionTest.cs
new file mode 100644
index 0000000..725573e
--- /dev/null
+++ b/OpenSim/Data/SQLite/Tests/SQLiteRegionTest.cs
@@ -0,0 +1,49 @@
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 NUnit.Framework;
30using OpenSim.Data.SQLite;
31
32namespace OpenSim.Data.SQLite.Tests
33{
34 [TestFixture]
35 public class SQLiteRegionTest
36 {
37 public string file = "regiontest.db";
38 public string connect;
39 public SQLiteRegionData db;
40
41 [SetUp]
42 public void Init()
43 {
44 connect = "URI=file:" + file + ",version=3";
45 db = new SQLiteRegionData();
46 db.Initialise(connect);
47 }
48 }
49} \ No newline at end of file
diff --git a/prebuild.xml b/prebuild.xml
index 00c07b4..dc3e8f6 100644
--- a/prebuild.xml
+++ b/prebuild.xml
@@ -1448,12 +1448,50 @@
1448 <Reference name="log4net.dll"/> 1448 <Reference name="log4net.dll"/>
1449 1449
1450 <Files> 1450 <Files>
1451 <Match pattern="*.cs" recurse="true"/> 1451 <Match pattern="*.cs" recurse="true" >
1452 <Exclude name="Tests" pattern="Tests" />
1453 </Match>
1452 <Match path="Resources" pattern="*.sql" buildAction="EmbeddedResource"/> 1454 <Match path="Resources" pattern="*.sql" buildAction="EmbeddedResource"/>
1453 <Match pattern="*.addin.xml" path="Resources" buildAction="EmbeddedResource" recurse="true"/> 1455 <Match pattern="*.addin.xml" path="Resources" buildAction="EmbeddedResource" recurse="true"/>
1454 </Files> 1456 </Files>
1455 </Project> 1457 </Project>
1456 1458
1459 <Project name="OpenSim.Data.SQLite.Tests" path="OpenSim/Data/SQLite/Tests" type="Library">
1460 <Configuration name="Debug">
1461 <Options>
1462 <OutputPath>../../../../bin/</OutputPath>
1463 </Options>
1464 </Configuration>
1465 <Configuration name="Release">
1466 <Options>
1467 <OutputPath>../../../../bin/</OutputPath>
1468 </Options>
1469 </Configuration>
1470
1471 <ReferencePath>../../../../bin/</ReferencePath>
1472 <Reference name="System" localCopy="false"/>
1473 <Reference name="System.Xml"/>
1474 <Reference name="System.Data"/>
1475 <Reference name="System.Data.SQLite.dll"/>
1476 <Reference name="OpenSim.Data"/>
1477 <Reference name="OpenSim.Data.SQLite" />
1478 <Reference name="System.Drawing"/>
1479 <Reference name="OpenSim.Framework"/>
1480 <Reference name="OpenSim.Framework.Console"/>
1481 <Reference name="OpenSim.Region.Environment"/>
1482 <Reference name="OpenMetaverseTypes.dll"/>
1483 <Reference name="OpenMetaverse.dll"/>
1484 <Reference name="Mono.Data.SqliteClient"/>
1485 <Reference name="Mono.Addins.dll" />
1486 <Reference name="log4net.dll"/>
1487 <Reference name="nunit.framework.dll" />
1488
1489 <Files>
1490 <Match pattern="*.cs" recurse="true"/>
1491 </Files>
1492 </Project>
1493
1494
1457 <Project name="OpenSim.Data.NHibernate" path="OpenSim/Data/NHibernate" type="Library"> 1495 <Project name="OpenSim.Data.NHibernate" path="OpenSim/Data/NHibernate" type="Library">
1458 <Configuration name="Debug"> 1496 <Configuration name="Debug">
1459 <Options> 1497 <Options>