added the first couple of sqlite tests. we'll see how bamboo
handles them.0.6.0-stable
parent
1799913593
commit
f970597194
|
@ -40,6 +40,8 @@
|
||||||
<include name="../bin/OpenSim.Region.ScriptEngine.Shared.Tests.dll" />
|
<include name="../bin/OpenSim.Region.ScriptEngine.Shared.Tests.dll" />
|
||||||
<include name="../bin/OpenSim.Region.ScriptEngine.Shared.CodeTools.Tests.dll" />
|
<include name="../bin/OpenSim.Region.ScriptEngine.Shared.CodeTools.Tests.dll" />
|
||||||
<include name="../bin/OpenSim.Region.Environment.Tests.dll" />
|
<include name="../bin/OpenSim.Region.Environment.Tests.dll" />
|
||||||
|
<include name="../bin/OpenSim.Data.SQLite.Tests.dll" />
|
||||||
|
|
||||||
</assemblies>
|
</assemblies>
|
||||||
</test>
|
</test>
|
||||||
</nunit2>
|
</nunit2>
|
||||||
|
|
|
@ -1,3 +1,5 @@
|
||||||
|
<!-- -*- xml -*- -->
|
||||||
|
<!-- please leve the top comment for us emacs folks -->
|
||||||
<property name="projectdir" value="opensim-0.5.5" />
|
<property name="projectdir" value="opensim-0.5.5" />
|
||||||
|
|
||||||
<target name="distdir">
|
<target name="distdir">
|
||||||
|
|
|
@ -211,7 +211,7 @@ namespace OpenSim.Data.SQLite
|
||||||
&& (prim.GetEffectiveObjectFlags() & (uint)PrimFlags.Temporary) == 0
|
&& (prim.GetEffectiveObjectFlags() & (uint)PrimFlags.Temporary) == 0
|
||||||
&& (prim.GetEffectiveObjectFlags() & (uint)PrimFlags.TemporaryOnRez) == 0)
|
&& (prim.GetEffectiveObjectFlags() & (uint)PrimFlags.TemporaryOnRez) == 0)
|
||||||
{
|
{
|
||||||
//m_log.Info("[REGION DB]: Adding obj: " + obj.UUID + " to region: " + regionUUID);
|
m_log.Info("[REGION DB]: Adding obj: " + obj.UUID + " to region: " + regionUUID);
|
||||||
addPrim(prim, obj.UUID, regionUUID);
|
addPrim(prim, obj.UUID, regionUUID);
|
||||||
}
|
}
|
||||||
else if (prim.Stopped)
|
else if (prim.Stopped)
|
||||||
|
|
|
@ -26,8 +26,12 @@
|
||||||
*/
|
*/
|
||||||
|
|
||||||
using System;
|
using System;
|
||||||
|
using System.Collections.Generic;
|
||||||
using NUnit.Framework;
|
using NUnit.Framework;
|
||||||
|
using OpenSim.Framework;
|
||||||
using OpenSim.Data.SQLite;
|
using OpenSim.Data.SQLite;
|
||||||
|
using OpenSim.Region.Environment.Scenes;
|
||||||
|
using OpenMetaverse;
|
||||||
|
|
||||||
namespace OpenSim.Data.SQLite.Tests
|
namespace OpenSim.Data.SQLite.Tests
|
||||||
{
|
{
|
||||||
|
@ -37,13 +41,60 @@ namespace OpenSim.Data.SQLite.Tests
|
||||||
public string file = "regiontest.db";
|
public string file = "regiontest.db";
|
||||||
public string connect;
|
public string connect;
|
||||||
public SQLiteRegionData db;
|
public SQLiteRegionData db;
|
||||||
|
public UUID region = UUID.Zero;
|
||||||
|
|
||||||
[SetUp]
|
[TestFixtureSetUp]
|
||||||
public void Init()
|
public void Init()
|
||||||
{
|
{
|
||||||
|
log4net.Config.XmlConfigurator.Configure();
|
||||||
|
System.Console.WriteLine("Entering Init");
|
||||||
connect = "URI=file:" + file + ",version=3";
|
connect = "URI=file:" + file + ",version=3";
|
||||||
db = new SQLiteRegionData();
|
db = new SQLiteRegionData();
|
||||||
db.Initialise(connect);
|
db.Initialise(connect);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
[TestFixtureTearDown]
|
||||||
|
public void Cleanup()
|
||||||
|
{
|
||||||
|
System.IO.File.Delete(file);
|
||||||
|
}
|
||||||
|
|
||||||
|
[Test]
|
||||||
|
public void T001_LoadEmpty()
|
||||||
|
{
|
||||||
|
System.Console.WriteLine("Entering T001");
|
||||||
|
List<SceneObjectGroup> objs = db.LoadObjects(region);
|
||||||
|
Assert.AreEqual(0, objs.Count);
|
||||||
|
}
|
||||||
|
|
||||||
|
[Test]
|
||||||
|
public void T010_StoreObject()
|
||||||
|
{
|
||||||
|
System.Console.WriteLine("Entering T010");
|
||||||
|
SceneObjectGroup sog = NewSOG();
|
||||||
|
|
||||||
|
db.StoreObject(sog, region);
|
||||||
|
|
||||||
|
List<SceneObjectGroup> objs = db.LoadObjects(region);
|
||||||
|
Assert.AreEqual(1, objs.Count);
|
||||||
|
}
|
||||||
|
|
||||||
|
private SceneObjectGroup NewSOG()
|
||||||
|
{
|
||||||
|
SceneObjectGroup sog = new SceneObjectGroup();
|
||||||
|
SceneObjectPart sop = new SceneObjectPart();
|
||||||
|
sop.LocalId = 1;
|
||||||
|
sop.Name = "";
|
||||||
|
sop.Description = "";
|
||||||
|
sop.Text = "";
|
||||||
|
sop.SitName = "";
|
||||||
|
sop.TouchName = "";
|
||||||
|
sop.UUID = UUID.Random();
|
||||||
|
sop.Shape = PrimitiveBaseShape.Default;
|
||||||
|
sog.AddPart(sop);
|
||||||
|
sog.RootPart = sop;
|
||||||
|
return sog;
|
||||||
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
}
|
}
|
Loading…
Reference in New Issue