* Reinstate tests that are now in CoreModules

4 files changed, 61 insertions, 1 deletions

diff --git a/.nant/bamboo.build b/.nant/bamboo.build
index 196d04f..c8756f8 100644
--- a/.nant/bamboo.build
+++ b/.nant/bamboo.build
@@ -42,6 +42,7 @@
           <include name="../bin/OpenSim.Region.ScriptEngine.Common.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.CoreModules.Tests.dll"/>
           <include name="../bin/OpenSim.Region.Environment.Tests.dll"/>
           <include name="../bin/OpenSim.Region.Framework.Tests.dll"/>
           <include name="../bin/OpenSim.Data.SQLite.Tests.dll"/>
diff --git a/.nant/local.include b/.nant/local.include
index 41e0742..d2a8c7c 100644
--- a/.nant/local.include
+++ b/.nant/local.include
@@ -41,6 +41,7 @@
           <include name="./bin/OpenSim.Region.ScriptEngine.Shared.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.CoreModules.Tests.dll" />
           <include name="./bin/OpenSim.Region.Framework.Tests.dll" />
           <include name="./bin/OpenSim.Data.SQLite.Tests.dll" />
           <include name="./bin/OpenSim.Data.MySQL.Tests.dll" />
@@ -168,6 +169,7 @@
           <include name="./bin/OpenSim.Region.ClientStack.LindenUDP.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.CoreModules.Tests.dll" />
           <include name="./bin/OpenSim.Region.Environment.Tests.dll" />
           <include name="./bin/OpenSim.Region.Framework.Tests.dll" />
           <include name="./bin/OpenSim.Data.SQLite.Tests.dll" />
diff --git a/OpenSim/Region/CoreModules/Agent/TextureSender/Tests/TextureSenderTests.cs b/OpenSim/Region/CoreModules/Agent/TextureSender/Tests/TextureSenderTests.cs
index f0587bb..df553ac 100644
--- a/OpenSim/Region/CoreModules/Agent/TextureSender/Tests/TextureSenderTests.cs
+++ b/OpenSim/Region/CoreModules/Agent/TextureSender/Tests/TextureSenderTests.cs
@@ -31,6 +31,7 @@ using NUnit.Framework;
 using NUnit.Framework.SyntaxHelpers;
 using OpenMetaverse;
 using OpenSim.Framework;
+using OpenSim.Region.CoreModules.Agent.TextureSender;
 using OpenSim.Tests.Common.Mock;
 
 namespace OpenSim.Region.CoreModules.Agent.TextureSender
diff --git a/prebuild.xml b/prebuild.xml
index 8031b46..0cdb59e 100644
--- a/prebuild.xml
+++ b/prebuild.xml
@@ -2608,6 +2608,63 @@
       </Files>
     </Project>
 
+    <Project name="OpenSim.Region.CoreModules.Tests" path="OpenSim/Region/CoreModules" type="Library">
+      <Configuration name="Debug">
+        <Options>
+          <OutputPath>../../../bin/</OutputPath>
+        </Options>
+      </Configuration>
+      <Configuration name="Release">
+        <Options>
+          <OutputPath>../../../bin/</OutputPath>
+        </Options>
+      </Configuration>
+
+      <ReferencePath>../../../bin/</ReferencePath>
+      <Reference name="System" localCopy="false"/>
+      <Reference name="System.Xml"/>
+      <Reference name="System.Drawing"/>
+      <Reference name="System.Runtime.Remoting"/>
+      <Reference name="OpenMetaverseTypes.dll"/>
+      <Reference name="OpenMetaverse.dll"/>
+      <Reference name="OpenSim.Data"/>
+      <Reference name="OpenSim.Framework"/>
+      <Reference name="OpenSim.Framework.Communications"/>
+      <Reference name="OpenSim.Framework.Console"/>
+      <Reference name="OpenSim.Framework.Servers"/>
+      <Reference name="OpenSim.Framework.Statistics"/>
+      <Reference name="OpenSim.Region.Communications.Local"/>
+      <Reference name="OpenSim.Region.CoreModules"/>
+      <Reference name="OpenSim.Region.Framework"/>
+      <Reference name="OpenSim.Region.Environment"/>
+      <Reference name="OpenSim.Region.Physics.Manager"/>
+
+      <!-- Unit tests -->
+      <!-- <Reference name="OpenSim.Tests.Common"/> -->
+      <Reference name="OpenSim.Tests.Common"/>
+      <Reference name="Nini.dll"/>
+      <Reference name="nunit.framework.dll"/>
+
+      <!-- For scripting in funny languages by default -->
+      <Reference name="Microsoft.JScript"/>
+      <Reference name="XMLRPC.dll"/>
+      <Reference name="OpenSim.Framework.Communications"/>
+      <Reference name="Nini.dll" />
+      <Reference name="log4net.dll"/>
+      <Reference name="DotNetOpenMail.dll"/>
+
+      <!--
+           TODO: this is kind of lame, we basically build a duplicate
+           assembly but with tests added in, just so that we don't
+           need to hard code in a bunch of Test directories here.  If
+           pattern="Tests/*.cs" worked, we wouldn't need this.
+      -->
+      <Files>
+        <!-- SADLY the way this works means you need to keep adding these paths -->
+        <Match path="Agent/TextureSender/Tests" pattern="*.cs" recurse="true" />
+      </Files>
+    </Project>
+
     <Project name="OpenSim.Region.Environment.Tests" path="OpenSim/Region/Environment" type="Library">
       <Configuration name="Debug">
         <Options>
@@ -2662,7 +2719,6 @@
         <!-- SADLY the way this works means you need to keep adding these paths -->
         <Match path="Modules/World/Terrain/Tests" pattern="*.cs" recurse="true" />
         <Match path="Modules/World/Archiver/Tests" pattern="*.cs" recurse="true" />
-        <Match path="Modules/Agent/TextureSender/Tests" pattern="*.cs" recurse="true" />
       </Files>
     </Project>