From cc30fce49f212bea86335d0f6adec2f49e1809bb Mon Sep 17 00:00:00 2001
From: Sean Dague <sean@dague.net>
Date: Mon, 31 Aug 2009 20:15:20 -0400
Subject: [PATCH 1/5] change regular test target to use nunit exec mode detect
 if you have nunit-console2 or nunit-console and use the appropriate one

---
 .nant/local.include | 109 ++++++++++++++++++++++++++++++++------------
 1 file changed, 81 insertions(+), 28 deletions(-)

diff --git a/.nant/local.include b/.nant/local.include
index 1e1c030f57..eaccfdd38b 100644
--- a/.nant/local.include
+++ b/.nant/local.include
@@ -1,6 +1,7 @@
 <!-- -*- xml -*- -->
-<!-- please leve the top comment for us emacs folks -->
+<!-- please leave the top comment for us emacs folks -->
 <property name="projectdir" value="opensim-0.5.5" />
+<property name="nunitcmd" value="nunit-console" />
 
 <target name="distdir">
    <delete dir="${projectdir}" />
@@ -29,24 +30,56 @@
    <touch file="${projectdir}/bin/startup_commands.txt" />
 </target>
 
-<target name="test" depends="build">
+<target name="test" depends="build, find-nunit">
   <setenv name="MONO_THREADS_PER_CPU" value="100" />
-      <nunit2 failonerror="true" verbose="true">
-      <formatter type="Plain" />
-      <test>
-        <assemblies>
-          <include name="./bin/OpenSim.Framework.Tests.dll" />
-          <include name="./bin/OpenSim.Framework.Communications.Tests.dll"/>
-          <include name="./bin/OpenSim.Framework.Servers.Tests.dll" />
-          <include name="./bin/OpenSim.Region.ClientStack.LindenUDP.Tests.dll" />
-          <include name="./bin/OpenSim.Region.ScriptEngine.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" />
-        </assemblies>
-      </test>
-    </nunit2>
+
+  <!-- Unit Test Assembly -->
+  <exec program="${nunitcmd}" failonerror="false" resultproperty="testresult.opensim.framework.tests">
+    <arg value="./bin/OpenSim.Framework.Tests.dll" />
+  </exec>
+
+ <exec program="${nunitcmd}" failonerror="false" resultproperty="testresult.opensim.framework.communications.tests">
+    <arg value="./bin/OpenSim.Framework.Communications.Tests.dll" />
+  </exec>
+
+ <exec program="${nunitcmd}" failonerror="false" resultproperty="testresult.opensim.framework.servers.tests">
+    <arg value="./bin/OpenSim.Framework.Servers.Tests.dll" />
+  </exec>
+
+ <exec program="${nunitcmd}" failonerror="false" resultproperty="testresult.opensim.region.clientstack.lindenudp.tests">
+    <arg value="./bin/OpenSim.Region.ClientStack.LindenUDP.Tests.dll" />
+  </exec>
+
+ <exec program="${nunitcmd}" failonerror="false" resultproperty="testresult.opensim.region.scriptengine.tests">
+    <arg value="./bin/OpenSim.Region.ScriptEngine.Tests.dll" />
+  </exec>
+
+ <exec program="${nunitcmd}" failonerror="false" resultproperty="testresult.opensim.region.coremodules.tests">
+    <arg value="./bin/OpenSim.Region.CoreModules.Tests.dll" />
+  </exec>
+
+ <exec program="${nunitcmd}" failonerror="false" resultproperty="testresult.opensim.region.framework.tests">
+    <arg value="./bin/OpenSim.Region.Framework.Tests.dll" />
+  </exec>
+
+ <exec program="${nunitcmd}" failonerror="false" resultproperty="testresult.opensim.data.sqlite.tests">
+    <arg value="./bin/OpenSim.Data.SQLite.Tests.dll" />
+  </exec>
+
+ <exec program="${nunitcmd}" failonerror="false" resultproperty="testresult.opensim.data.mysql.tests">
+    <arg value="./bin/OpenSim.Data.MySQL.Tests.dll" />
+  </exec>
+
+ <fail message="Failures reported in unit tests." unless="${int::parse(testresult.opensim.framework.tests)==0}" /> 
+ <fail message="Failures reported in unit tests." unless="${int::parse(testresult.opensim.framework.communications.tests)==0}" /> 
+ <fail message="Failures reported in unit tests." unless="${int::parse(testresult.opensim.framework.servers.tests)==0}" /> 
+ <fail message="Failures reported in unit tests." unless="${int::parse(testresult.opensim.region.clientstack.lindenudp.tests)==0}" /> 
+ <fail message="Failures reported in unit tests." unless="${int::parse(testresult.opensim.region.scriptengine.tests)==0}" /> 
+ <fail message="Failures reported in unit tests." unless="${int::parse(testresult.opensim.region.coremodules.tests)==0}" /> 
+ <fail message="Failures reported in unit tests." unless="${int::parse(testresult.opensim.region.framework.tests)==0}" /> 
+ <fail message="Failures reported in unit tests." unless="${int::parse(testresult.opensim.data.sqlite.tests)==0}" /> 
+ <fail message="Failures reported in unit tests." unless="${int::parse(testresult.opensim.data.mysql.tests)==0}" /> 
+
 </target>
 
 <target name="test-cov" depends="build">
@@ -156,53 +189,73 @@
 
 </target>
 
+<target name="find-nunit">
+  <exec program="which" failonerror="false"
+        resultproperty="hasnunit2">
+    <arg value="nunit-console2" />
+  </exec>
+
+  <exec program="which" failonerror="false"
+        resultproperty="hasnunit">
+    <arg value="nunit-console" />
+  </exec>
+
+  <property name="nunitcmd" value="nunit-console2"
+    if="${int::parse(hasnunit2)==0}" />
+  <property name="nunitcmd" value="nunit-console"
+    if="${int::parse(hasnunit)==0}" />
+
+</target>
+
 <!-- this is used for panda test execution -->
 <!-- work in progress -->
 
-<target name="test-xml" depends="build">
+<target name="test-xml" depends="build, find-nunit">
+  
+
   <mkdir dir="test-results" failonerror="false" />
   <!-- Unit Test Assembly -->
-  <exec program="nunit-console2" failonerror="false" resultproperty="testresult.opensim.framework.tests">
+  <exec program="${nunitcmd}" failonerror="false" resultproperty="testresult.opensim.framework.tests">
     <arg value="./bin/OpenSim.Framework.Tests.dll" />
     <arg value="-xml=test-results/OpenSim.Framework.Tests.dll-Results.xml" />
   </exec>
 
- <exec program="nunit-console2" failonerror="false" resultproperty="testresult.opensim.framework.communications.tests">
+ <exec program="${nunitcmd}" failonerror="false" resultproperty="testresult.opensim.framework.communications.tests">
     <arg value="./bin/OpenSim.Framework.Communications.Tests.dll" />
     <arg value="-xml=test-results/OpenSim.Framework.Communications.Tests.dll-Results.xml" />
   </exec>
 
- <exec program="nunit-console2" failonerror="false" resultproperty="testresult.opensim.framework.servers.tests">
+ <exec program="${nunitcmd}" failonerror="false" resultproperty="testresult.opensim.framework.servers.tests">
     <arg value="./bin/OpenSim.Framework.Servers.Tests.dll" />
     <arg value="-xml=test-results/OpenSim.Framework.Servers.Tests.dll-Results.xml" />
   </exec>
 
- <exec program="nunit-console2" failonerror="false" resultproperty="testresult.opensim.region.clientstack.lindenudp.tests">
+ <exec program="${nunitcmd}" failonerror="false" resultproperty="testresult.opensim.region.clientstack.lindenudp.tests">
     <arg value="./bin/OpenSim.Region.ClientStack.LindenUDP.Tests.dll" />
     <arg value="-xml=test-results/OpenSim.Region.ClientStack.LindenUDP.Tests.dll-Results.xml" />
   </exec>
 
- <exec program="nunit-console2" failonerror="false" resultproperty="testresult.opensim.region.scriptengine.tests">
+ <exec program="${nunitcmd}" failonerror="false" resultproperty="testresult.opensim.region.scriptengine.tests">
     <arg value="./bin/OpenSim.Region.ScriptEngine.Tests.dll" />
     <arg value="-xml=test-results/OpenSim.Region.ScriptEngine.Tests.dll-Results.xml" />
   </exec>
 
- <exec program="nunit-console2" failonerror="false" resultproperty="testresult.opensim.region.coremodules.tests">
+ <exec program="${nunitcmd}" failonerror="false" resultproperty="testresult.opensim.region.coremodules.tests">
     <arg value="./bin/OpenSim.Region.CoreModules.Tests.dll" />
     <arg value="-xml=test-results/OpenSim.Region.CoreModules.Tests.dll-Results.xml" />
   </exec>
 
- <exec program="nunit-console2" failonerror="false" resultproperty="testresult.opensim.region.framework.tests">
+ <exec program="${nunitcmd}" failonerror="false" resultproperty="testresult.opensim.region.framework.tests">
     <arg value="./bin/OpenSim.Region.Framework.Tests.dll" />
     <arg value="-xml=test-results/OpenSim.Region.Framework.Tests.dll-Results.xml" />
   </exec>
 
- <exec program="nunit-console2" failonerror="false" resultproperty="testresult.opensim.data.sqlite.tests">
+ <exec program="${nunitcmd}" failonerror="false" resultproperty="testresult.opensim.data.sqlite.tests">
     <arg value="./bin/OpenSim.Data.SQLite.Tests.dll" />
     <arg value="-xml=test-results/OpenSim.Data.SQLite.Tests.dll-Results.xml" />
   </exec>
 
- <exec program="nunit-console2" failonerror="false" resultproperty="testresult.opensim.data.mysql.tests">
+ <exec program="${nunitcmd}" failonerror="false" resultproperty="testresult.opensim.data.mysql.tests">
     <arg value="./bin/OpenSim.Data.MySQL.Tests.dll" />
     <arg value="-xml=test-results/OpenSim.Data.MySQL.Tests.dll-Results.xml" />
   </exec>

From 7e9b12ac807510536baa4e86427db25c261ded53 Mon Sep 17 00:00:00 2001
From: Sean Dague <sean@dague.net>
Date: Mon, 31 Aug 2009 20:26:16 -0400
Subject: [PATCH 2/5] change the nunit detection code

---
 .nant/local.include | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

diff --git a/.nant/local.include b/.nant/local.include
index eaccfdd38b..510bdc66dc 100644
--- a/.nant/local.include
+++ b/.nant/local.include
@@ -195,15 +195,10 @@
     <arg value="nunit-console2" />
   </exec>
 
-  <exec program="which" failonerror="false"
-        resultproperty="hasnunit">
-    <arg value="nunit-console" />
-  </exec>
-
   <property name="nunitcmd" value="nunit-console2"
     if="${int::parse(hasnunit2)==0}" />
   <property name="nunitcmd" value="nunit-console"
-    if="${int::parse(hasnunit)==0}" />
+    if="${int::parse(hasnunit2)==1}" />
 
 </target>
 

From fed089971e594ec9a62f9619777c970733b70861 Mon Sep 17 00:00:00 2001
From: "Teravus Ovares (Dan Olivares)" <teravus@gmail.com>
Date: Mon, 31 Aug 2009 20:36:06 -0400
Subject: [PATCH 3/5] * Previously south and west border were required to be -1
 for border crossings diagonally to work..   but..     seems they're working
 now without it..   and maybe it will help attachments.

---
 OpenSim/Region/Framework/Scenes/Border.cs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/OpenSim/Region/Framework/Scenes/Border.cs b/OpenSim/Region/Framework/Scenes/Border.cs
index 8f02a9ccbb..9a08afe904 100644
--- a/OpenSim/Region/Framework/Scenes/Border.cs
+++ b/OpenSim/Region/Framework/Scenes/Border.cs
@@ -103,7 +103,7 @@ namespace OpenSim.Region.Framework.Scenes
                 case Cardinals.SE: // x+1, y-1
                     break;
                 case Cardinals.S:  // x+0, y-1
-                    if (position.X >= BorderLine.X && position.X <= BorderLine.Y && position.Y-1 < BorderLine.Z)
+                    if (position.X >= BorderLine.X && position.X <= BorderLine.Y && position.Y < BorderLine.Z)
                     {
                         return true;
                     }
@@ -111,7 +111,7 @@ namespace OpenSim.Region.Framework.Scenes
                 case Cardinals.SW: // x-1, y-1
                     break;
                 case Cardinals.W:  // x-1, y+0
-                    if (position.Y >= BorderLine.X && position.Y <= BorderLine.Y && position.X-1 < BorderLine.Z)
+                    if (position.Y >= BorderLine.X && position.Y <= BorderLine.Y && position.X < BorderLine.Z)
                     {
                         return true;
                     }

From de1c2a51e2ee6f8cc6286d22cee6d2cabf1a19aa Mon Sep 17 00:00:00 2001
From: "Teravus Ovares (Dan Olivares)" <teravus@gmail.com>
Date: Mon, 31 Aug 2009 21:11:04 -0400
Subject: [PATCH 4/5] * Put Borders back the way they were to resolve the
 endless ---->  crossing into region X,Y

---
 OpenSim/Region/Framework/Scenes/Border.cs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/OpenSim/Region/Framework/Scenes/Border.cs b/OpenSim/Region/Framework/Scenes/Border.cs
index 9a08afe904..8f02a9ccbb 100644
--- a/OpenSim/Region/Framework/Scenes/Border.cs
+++ b/OpenSim/Region/Framework/Scenes/Border.cs
@@ -103,7 +103,7 @@ namespace OpenSim.Region.Framework.Scenes
                 case Cardinals.SE: // x+1, y-1
                     break;
                 case Cardinals.S:  // x+0, y-1
-                    if (position.X >= BorderLine.X && position.X <= BorderLine.Y && position.Y < BorderLine.Z)
+                    if (position.X >= BorderLine.X && position.X <= BorderLine.Y && position.Y-1 < BorderLine.Z)
                     {
                         return true;
                     }
@@ -111,7 +111,7 @@ namespace OpenSim.Region.Framework.Scenes
                 case Cardinals.SW: // x-1, y-1
                     break;
                 case Cardinals.W:  // x-1, y+0
-                    if (position.Y >= BorderLine.X && position.Y <= BorderLine.Y && position.X < BorderLine.Z)
+                    if (position.Y >= BorderLine.X && position.Y <= BorderLine.Y && position.X-1 < BorderLine.Z)
                     {
                         return true;
                     }

From 2068b6714a6cf78a19340e9c8db7a3cd69a6f8c6 Mon Sep 17 00:00:00 2001
From: "Teravus Ovares (Dan Olivares)" <teravus@gmail.com>
Date: Mon, 31 Aug 2009 21:40:06 -0400
Subject: [PATCH 5/5] * -2 on the south and west side, -1 on the north and east
 side.   Fuzzy borders! yay

---
 OpenSim/Region/Framework/Scenes/Scene.cs | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/OpenSim/Region/Framework/Scenes/Scene.cs b/OpenSim/Region/Framework/Scenes/Scene.cs
index f4a0d2ee67..7527d8c8c2 100644
--- a/OpenSim/Region/Framework/Scenes/Scene.cs
+++ b/OpenSim/Region/Framework/Scenes/Scene.cs
@@ -337,22 +337,22 @@ namespace OpenSim.Region.Framework.Scenes
             BordersLocked = true;
 
             Border northBorder = new Border();
-            northBorder.BorderLine = new Vector3(float.MinValue, float.MaxValue, (int)Constants.RegionSize);  //<---
+            northBorder.BorderLine = new Vector3(float.MinValue, float.MaxValue, (int)Constants.RegionSize + 1);  //<---
             northBorder.CrossDirection = Cardinals.N;
             NorthBorders.Add(northBorder);
 
             Border southBorder = new Border();
-            southBorder.BorderLine = new Vector3(float.MinValue, float.MaxValue, 0);    //--->
+            southBorder.BorderLine = new Vector3(float.MinValue, float.MaxValue, -2);    //--->
             southBorder.CrossDirection = Cardinals.S;
             SouthBorders.Add(southBorder);
 
             Border eastBorder = new Border();
-            eastBorder.BorderLine = new Vector3(float.MinValue, float.MaxValue, (int)Constants.RegionSize);   //<---
+            eastBorder.BorderLine = new Vector3(float.MinValue, float.MaxValue, (int)Constants.RegionSize + 1);   //<---
             eastBorder.CrossDirection = Cardinals.E;
             EastBorders.Add(eastBorder);
 
             Border westBorder = new Border();
-            westBorder.BorderLine = new Vector3(float.MinValue, float.MaxValue, 0);     //--->
+            westBorder.BorderLine = new Vector3(float.MinValue, float.MaxValue, -2);     //--->
             westBorder.CrossDirection = Cardinals.W;
             WestBorders.Add(westBorder);
 
@@ -489,22 +489,22 @@ namespace OpenSim.Region.Framework.Scenes
         {
             BordersLocked = true;
             Border northBorder = new Border();
-            northBorder.BorderLine = new Vector3(float.MinValue, float.MaxValue, (int)Constants.RegionSize);  //<---
+            northBorder.BorderLine = new Vector3(float.MinValue, float.MaxValue, (int)Constants.RegionSize + 1);  //<---
             northBorder.CrossDirection = Cardinals.N;
             NorthBorders.Add(northBorder);
 
             Border southBorder = new Border();
-            southBorder.BorderLine = new Vector3(float.MinValue, float.MaxValue, 0);    //--->
+            southBorder.BorderLine = new Vector3(float.MinValue, float.MaxValue, -2);    //--->
             southBorder.CrossDirection = Cardinals.S;
             SouthBorders.Add(southBorder);
 
             Border eastBorder = new Border();
-            eastBorder.BorderLine = new Vector3(float.MinValue, float.MaxValue, (int)Constants.RegionSize);   //<---
+            eastBorder.BorderLine = new Vector3(float.MinValue, float.MaxValue, (int)Constants.RegionSize + 1);   //<---
             eastBorder.CrossDirection = Cardinals.E;
             EastBorders.Add(eastBorder);
 
             Border westBorder = new Border();
-            westBorder.BorderLine = new Vector3(float.MinValue, float.MaxValue, 0);     //--->
+            westBorder.BorderLine = new Vector3(float.MinValue, float.MaxValue, -2);     //--->
             westBorder.CrossDirection = Cardinals.W;
             WestBorders.Add(westBorder);
             BordersLocked = false;