aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
-rw-r--r--.nant/bamboo.build19
-rw-r--r--.nant/local.include13
-rw-r--r--OpenSim/Region/Framework/Scenes/Tests/SceneObjectBasicTests.cs4
-rw-r--r--OpenSim/Region/Framework/Scenes/Tests/SceneObjectLinkingTests.cs2
-rw-r--r--OpenSim/Region/Framework/Scenes/Tests/StandaloneTeleportTests.cs1
-rw-r--r--prebuild.xml56
6 files changed, 82 insertions, 13 deletions
diff --git a/.nant/bamboo.build b/.nant/bamboo.build
index 2e5d7a6..196d04f 100644
--- a/.nant/bamboo.build
+++ b/.nant/bamboo.build
@@ -36,16 +36,17 @@
36 <formatter type="Xml" usefile="true" extension=".xml" outputdir="../test-results" /> 36 <formatter type="Xml" usefile="true" extension=".xml" outputdir="../test-results" />
37 <test> 37 <test>
38 <assemblies> 38 <assemblies>
39 <include name="../bin/OpenSim.Framework.Tests.dll" /> 39 <include name="../bin/OpenSim.Framework.Tests.dll"/>
40 <include name="../bin/OpenSim.Framework.Communications.Tests.dll"/> 40 <include name="../bin/OpenSim.Framework.Communications.Tests.dll"/>
41 <include name="../bin/OpenSim.Framework.Servers.Tests.dll" /> 41 <include name="../bin/OpenSim.Framework.Servers.Tests.dll"/>
42 <include name="../bin/OpenSim.Region.ScriptEngine.Common.Tests.dll" /> 42 <include name="../bin/OpenSim.Region.ScriptEngine.Common.Tests.dll"/>
43 <include name="../bin/OpenSim.Region.ScriptEngine.Shared.Tests.dll" /> 43 <include name="../bin/OpenSim.Region.ScriptEngine.Shared.Tests.dll"/>
44 <include name="../bin/OpenSim.Region.ScriptEngine.Shared.CodeTools.Tests.dll" /> 44 <include name="../bin/OpenSim.Region.ScriptEngine.Shared.CodeTools.Tests.dll"/>
45 <include name="../bin/OpenSim.Region.Environment.Tests.dll" /> 45 <include name="../bin/OpenSim.Region.Environment.Tests.dll"/>
46 <include name="../bin/OpenSim.Data.SQLite.Tests.dll" /> 46 <include name="../bin/OpenSim.Region.Framework.Tests.dll"/>
47 <include name="../bin/OpenSim.Data.MySQL.Tests.dll" /> 47 <include name="../bin/OpenSim.Data.SQLite.Tests.dll"/>
48 <include name="../bin/OpenSim.Region.Physics.OdePlugin.dll" /> 48 <include name="../bin/OpenSim.Data.MySQL.Tests.dll"/>
49 <include name="../bin/OpenSim.Region.Physics.OdePlugin.dll"/>
49 50
50 51
51 </assemblies> 52 </assemblies>
diff --git a/.nant/local.include b/.nant/local.include
index 899bb2f..41e0742 100644
--- a/.nant/local.include
+++ b/.nant/local.include
@@ -41,6 +41,7 @@
41 <include name="./bin/OpenSim.Region.ScriptEngine.Shared.Tests.dll" /> 41 <include name="./bin/OpenSim.Region.ScriptEngine.Shared.Tests.dll" />
42 <include name="./bin/OpenSim.Region.ScriptEngine.Shared.CodeTools.Tests.dll" /> 42 <include name="./bin/OpenSim.Region.ScriptEngine.Shared.CodeTools.Tests.dll" />
43 <include name="./bin/OpenSim.Region.Environment.Tests.dll" /> 43 <include name="./bin/OpenSim.Region.Environment.Tests.dll" />
44 <include name="./bin/OpenSim.Region.Framework.Tests.dll" />
44 <include name="./bin/OpenSim.Data.SQLite.Tests.dll" /> 45 <include name="./bin/OpenSim.Data.SQLite.Tests.dll" />
45 <include name="./bin/OpenSim.Data.MySQL.Tests.dll" /> 46 <include name="./bin/OpenSim.Data.MySQL.Tests.dll" />
46 </assemblies> 47 </assemblies>
@@ -116,6 +117,17 @@
116 <exec program="monocov"> 117 <exec program="monocov">
117 <arg value="--export-html=./cov/OpenSim.Region.Environment ./cov/OpenSim.Region.Environment.cov" /> 118 <arg value="--export-html=./cov/OpenSim.Region.Environment ./cov/OpenSim.Region.Environment.cov" />
118 </exec> 119 </exec>
120
121 <exec program="mono">
122 <arg value="--debug" />
123 <arg value="--profile=monocov:outfile=./cov/OpenSim.Region.Framework.cov,+[OpenSim.Region.Framework]" />
124 <arg value="/usr/lib/nunit/nunit-console.exe" />
125 <arg value="./bin/OpenSim.Region.Framework.Tests.dll" />
126 </exec>
127 <delete dir="./cov/OpenSim.Region.Framework" />
128 <exec program="monocov">
129 <arg value="--export-html=./cov/OpenSim.Region.Framework ./cov/OpenSim.Region.Framework.cov" />
130 </exec>
119 131
120 <exec program="mono"> 132 <exec program="mono">
121 <arg value="--debug" /> 133 <arg value="--debug" />
@@ -157,6 +169,7 @@
157 <include name="./bin/OpenSim.Region.ScriptEngine.Shared.Tests.dll" /> 169 <include name="./bin/OpenSim.Region.ScriptEngine.Shared.Tests.dll" />
158 <include name="./bin/OpenSim.Region.ScriptEngine.Shared.CodeTools.Tests.dll" /> 170 <include name="./bin/OpenSim.Region.ScriptEngine.Shared.CodeTools.Tests.dll" />
159 <include name="./bin/OpenSim.Region.Environment.Tests.dll" /> 171 <include name="./bin/OpenSim.Region.Environment.Tests.dll" />
172 <include name="./bin/OpenSim.Region.Framework.Tests.dll" />
160 <include name="./bin/OpenSim.Data.SQLite.Tests.dll" /> 173 <include name="./bin/OpenSim.Data.SQLite.Tests.dll" />
161 <include name="./bin/OpenSim.Data.MySQL.Tests.dll" /> 174 <include name="./bin/OpenSim.Data.MySQL.Tests.dll" />
162 </assemblies> 175 </assemblies>
diff --git a/OpenSim/Region/Framework/Scenes/Tests/SceneObjectBasicTests.cs b/OpenSim/Region/Framework/Scenes/Tests/SceneObjectBasicTests.cs
index d063eae..dc27a55 100644
--- a/OpenSim/Region/Framework/Scenes/Tests/SceneObjectBasicTests.cs
+++ b/OpenSim/Region/Framework/Scenes/Tests/SceneObjectBasicTests.cs
@@ -33,7 +33,7 @@ using OpenSim.Framework;
33using OpenSim.Framework.Communications; 33using OpenSim.Framework.Communications;
34using OpenSim.Framework.Communications.Cache; 34using OpenSim.Framework.Communications.Cache;
35using OpenSim.Region.Communications.Local; 35using OpenSim.Region.Communications.Local;
36using OpenSim.Region.Environment.Scenes; 36using OpenSim.Region.Framework.Scenes;
37using OpenSim.Tests.Common.Mock; 37using OpenSim.Tests.Common.Mock;
38using OpenSim.Tests.Common.Setup; 38using OpenSim.Tests.Common.Setup;
39 39
@@ -133,7 +133,7 @@ namespace OpenSim.Region.Environment.Scenes.Tests
133 133
134 // Check that the taken part has actually disappeared 134 // Check that the taken part has actually disappeared
135 SceneObjectPart retrievedPart = scene.GetSceneObjectPart(part.LocalId); 135 SceneObjectPart retrievedPart = scene.GetSceneObjectPart(part.LocalId);
136 Assert.That(retrievedPart, Is.Null); 136 Assert.That(retrievedPart, Is.Null);
137 } 137 }
138 } 138 }
139} \ No newline at end of file 139} \ No newline at end of file
diff --git a/OpenSim/Region/Framework/Scenes/Tests/SceneObjectLinkingTests.cs b/OpenSim/Region/Framework/Scenes/Tests/SceneObjectLinkingTests.cs
index 30b0987..3efb886 100644
--- a/OpenSim/Region/Framework/Scenes/Tests/SceneObjectLinkingTests.cs
+++ b/OpenSim/Region/Framework/Scenes/Tests/SceneObjectLinkingTests.cs
@@ -33,7 +33,7 @@ using OpenSim.Framework;
33using OpenSim.Framework.Communications; 33using OpenSim.Framework.Communications;
34using OpenSim.Framework.Communications.Cache; 34using OpenSim.Framework.Communications.Cache;
35using OpenSim.Region.Communications.Local; 35using OpenSim.Region.Communications.Local;
36using OpenSim.Region.Environment.Scenes; 36using OpenSim.Region.Framework.Scenes;
37using OpenSim.Tests.Common.Mock; 37using OpenSim.Tests.Common.Mock;
38using OpenSim.Tests.Common.Setup; 38using OpenSim.Tests.Common.Setup;
39 39
diff --git a/OpenSim/Region/Framework/Scenes/Tests/StandaloneTeleportTests.cs b/OpenSim/Region/Framework/Scenes/Tests/StandaloneTeleportTests.cs
index a78faa6..0b9937a 100644
--- a/OpenSim/Region/Framework/Scenes/Tests/StandaloneTeleportTests.cs
+++ b/OpenSim/Region/Framework/Scenes/Tests/StandaloneTeleportTests.cs
@@ -31,7 +31,6 @@ using NUnit.Framework.SyntaxHelpers;
31using OpenMetaverse; 31using OpenMetaverse;
32using OpenSim.Framework; 32using OpenSim.Framework;
33using OpenSim.Framework.Communications; 33using OpenSim.Framework.Communications;
34using OpenSim.Region.Environment;
35using OpenSim.Region.Framework.Interfaces; 34using OpenSim.Region.Framework.Interfaces;
36using OpenSim.Region.Environment.Modules.Communications.REST; 35using OpenSim.Region.Environment.Modules.Communications.REST;
37using OpenSim.Tests.Common.Mock; 36using OpenSim.Tests.Common.Mock;
diff --git a/prebuild.xml b/prebuild.xml
index f46a1aa..0ebc3f8 100644
--- a/prebuild.xml
+++ b/prebuild.xml
@@ -2617,6 +2617,62 @@
2617 <Match path="Modules/World/Terrain/Tests" pattern="*.cs" recurse="true" /> 2617 <Match path="Modules/World/Terrain/Tests" pattern="*.cs" recurse="true" />
2618 <Match path="Modules/World/Archiver/Tests" pattern="*.cs" recurse="true" /> 2618 <Match path="Modules/World/Archiver/Tests" pattern="*.cs" recurse="true" />
2619 <Match path="Modules/Agent/TextureSender/Tests" pattern="*.cs" recurse="true" /> 2619 <Match path="Modules/Agent/TextureSender/Tests" pattern="*.cs" recurse="true" />
2620 </Files>
2621 </Project>
2622
2623 <Project name="OpenSim.Region.Framework.Tests" path="OpenSim/Region/Framework" type="Library">
2624 <Configuration name="Debug">
2625 <Options>
2626 <OutputPath>../../../bin/</OutputPath>
2627 </Options>
2628 </Configuration>
2629 <Configuration name="Release">
2630 <Options>
2631 <OutputPath>../../../bin/</OutputPath>
2632 </Options>
2633 </Configuration>
2634
2635 <ReferencePath>../../../bin/</ReferencePath>
2636 <Reference name="System" localCopy="false"/>
2637 <Reference name="System.Xml"/>
2638 <Reference name="System.Drawing"/>
2639 <Reference name="System.Runtime.Remoting"/>
2640 <Reference name="OpenMetaverseTypes.dll"/>
2641 <Reference name="OpenMetaverse.dll"/>
2642 <Reference name="OpenSim.Data"/>
2643 <Reference name="OpenSim.Framework"/>
2644 <Reference name="OpenSim.Framework.Communications"/>
2645 <Reference name="OpenSim.Framework.Console"/>
2646 <Reference name="OpenSim.Framework.Servers"/>
2647 <Reference name="OpenSim.Framework.Statistics"/>
2648 <Reference name="OpenSim.Region.Communications.Local"/>
2649 <Reference name="OpenSim.Region.Framework"/>
2650 <Reference name="OpenSim.Region.Environment"/>
2651 <Reference name="OpenSim.Region.Physics.Manager"/>
2652
2653 <!-- Unit tests -->
2654 <!-- <Reference name="OpenSim.Tests.Common"/> -->
2655 <Reference name="OpenSim.Tests.Common"/>
2656 <Reference name="Nini.dll"/>
2657 <Reference name="nunit.framework.dll"/>
2658
2659 <!-- For scripting in funny languages by default -->
2660 <Reference name="Microsoft.JScript"/>
2661 <Reference name="XMLRPC.dll"/>
2662 <Reference name="OpenSim.Framework.Communications"/>
2663 <Reference name="OpenSim.Data.Base"/>
2664 <Reference name="Nini.dll" />
2665 <Reference name="log4net.dll"/>
2666 <Reference name="DotNetOpenMail.dll"/>
2667
2668 <!--
2669 TODO: this is kind of lame, we basically build a duplicate
2670 assembly but with tests added in, just so that we don't
2671 need to hard code in a bunch of Test directories here. If
2672 pattern="Tests/*.cs" worked, we wouldn't need this.
2673 -->
2674 <Files>
2675 <!-- SADLY the way this works means you need to keep adding these paths -->
2620 <Match path="Scenes/Tests" pattern="*.cs" recurse="false" /> 2676 <Match path="Scenes/Tests" pattern="*.cs" recurse="false" />
2621 </Files> 2677 </Files>
2622 </Project> 2678 </Project>