From adce58b33a39c9456468f6d25834a8a7bded5adf Mon Sep 17 00:00:00 2001
From: "Justin Clark-Casey (justincc)" <jjustincc@googlemail.com>
Date: Wed, 29 Aug 2012 23:19:21 +0100
Subject: [PATCH] Renaming existing 'torture' tests to 'performance' tests
 instead, since this better matches what they really do.

nant target name changes to test-perf instead of torture, to match test-stress
still not run by default
---
 .nant/local.include                                       | 8 ++++----
 .../NPCPerformanceTests.cs}                               | 6 +++---
 .../ObjectPerformanceTests.cs}                            | 6 +++---
 .../ScriptPerformanceTests.cs}                            | 6 +++---
 prebuild.xml                                              | 2 +-
 5 files changed, 14 insertions(+), 14 deletions(-)
 rename OpenSim/Tests/{Torture/NPCTortureTests.cs => Performance/NPCPerformanceTests.cs} (98%)
 rename OpenSim/Tests/{Torture/ObjectTortureTests.cs => Performance/ObjectPerformanceTests.cs} (98%)
 rename OpenSim/Tests/{Torture/ScriptTortureTests.cs => Performance/ScriptPerformanceTests.cs} (98%)

diff --git a/.nant/local.include b/.nant/local.include
index 181c875a4b..35f00589e8 100644
--- a/.nant/local.include
+++ b/.nant/local.include
@@ -146,14 +146,14 @@
   <delete dir="%temp%"/>
 </target>
 
-<target name="torture" depends="build, find-nunit">
+<target name="test-perf" depends="build, find-nunit">
   <setenv name="MONO_THREADS_PER_CPU" value="100" />
 
-  <exec program="${nunitcmd}" failonerror="true" resultproperty="testresult.opensim.tests.torture">
-    <arg value="./bin/OpenSim.Tests.Torture.dll" />
+  <exec program="${nunitcmd}" failonerror="true" resultproperty="testresult.opensim.tests.performance">
+    <arg value="./bin/OpenSim.Tests.Performance.dll" />
   </exec>
 
-  <fail message="Failures reported in torture tests." unless="${int::parse(testresult.opensim.tests.torture)==0}" /> 
+  <fail message="Failures reported in performance tests." unless="${int::parse(testresult.opensim.tests.performance)==0}" /> 
   <delete dir="%temp%"/>
 </target>
 
diff --git a/OpenSim/Tests/Torture/NPCTortureTests.cs b/OpenSim/Tests/Performance/NPCPerformanceTests.cs
similarity index 98%
rename from OpenSim/Tests/Torture/NPCTortureTests.cs
rename to OpenSim/Tests/Performance/NPCPerformanceTests.cs
index 731df6808c..627765b325 100644
--- a/OpenSim/Tests/Torture/NPCTortureTests.cs
+++ b/OpenSim/Tests/Performance/NPCPerformanceTests.cs
@@ -47,10 +47,10 @@ using OpenSim.Services.AvatarService;
 using OpenSim.Tests.Common;
 using OpenSim.Tests.Common.Mock;
 
-namespace OpenSim.Tests.Torture
+namespace OpenSim.Tests.Performance
 {
     /// <summary>
-    /// NPC torture tests
+    /// NPC performance tests
     /// </summary>
     /// <remarks>
     /// Don't rely on the numbers given by these tests - they will vary a lot depending on what is already cached,
@@ -58,7 +58,7 @@ namespace OpenSim.Tests.Torture
     /// earlier tests.
     /// </remarks>
     [TestFixture]
-    public class NPCTortureTests
+    public class NPCPerformanceTests
     {
         private TestScene scene;
         private AvatarFactoryModule afm;
diff --git a/OpenSim/Tests/Torture/ObjectTortureTests.cs b/OpenSim/Tests/Performance/ObjectPerformanceTests.cs
similarity index 98%
rename from OpenSim/Tests/Torture/ObjectTortureTests.cs
rename to OpenSim/Tests/Performance/ObjectPerformanceTests.cs
index 195d47bd52..2264d86246 100644
--- a/OpenSim/Tests/Torture/ObjectTortureTests.cs
+++ b/OpenSim/Tests/Performance/ObjectPerformanceTests.cs
@@ -36,10 +36,10 @@ using OpenSim.Region.Framework.Scenes;
 using OpenSim.Tests.Common;
 using OpenSim.Tests.Common.Mock;
 
-namespace OpenSim.Tests.Torture
+namespace OpenSim.Tests.Performance
 {
     /// <summary>
-    /// Object torture tests
+    /// Object performance tests
     /// </summary>
     /// <remarks>
     /// Don't rely on the numbers given by these tests - they will vary a lot depending on what is already cached,
@@ -47,7 +47,7 @@ namespace OpenSim.Tests.Torture
     /// earlier tests.
     /// </remarks>
     [TestFixture]
-    public class ObjectTortureTests
+    public class ObjectPerformanceTests
     {
         [TearDown]
         public void TearDown()
diff --git a/OpenSim/Tests/Torture/ScriptTortureTests.cs b/OpenSim/Tests/Performance/ScriptPerformanceTests.cs
similarity index 98%
rename from OpenSim/Tests/Torture/ScriptTortureTests.cs
rename to OpenSim/Tests/Performance/ScriptPerformanceTests.cs
index 24f278f3f8..d708abd1f4 100644
--- a/OpenSim/Tests/Torture/ScriptTortureTests.cs
+++ b/OpenSim/Tests/Performance/ScriptPerformanceTests.cs
@@ -42,10 +42,10 @@ using OpenSim.Region.ScriptEngine.XEngine;
 using OpenSim.Tests.Common;
 using OpenSim.Tests.Common.Mock;
 
-namespace OpenSim.Tests.Torture
+namespace OpenSim.Tests.Performance
 {
     /// <summary>
-    /// Script torture tests
+    /// Script performance tests
     /// </summary>
     /// <remarks>
     /// Don't rely on the numbers given by these tests - they will vary a lot depending on what is already cached,
@@ -53,7 +53,7 @@ namespace OpenSim.Tests.Torture
     /// earlier tests.
     /// </remarks>
     [TestFixture]
-    public class ScriptTortureTests
+    public class ScriptPerformanceTests
     {
         private TestScene m_scene;
         private XEngine m_xEngine;
diff --git a/prebuild.xml b/prebuild.xml
index d9c16078e1..0f3471309d 100644
--- a/prebuild.xml
+++ b/prebuild.xml
@@ -3290,7 +3290,7 @@
       </Files>
     </Project>
 
-    <Project frameworkVersion="v3_5" name="OpenSim.Tests.Torture" path="OpenSim/Tests/Torture" type="Library">
+    <Project frameworkVersion="v3_5" name="OpenSim.Tests.Performance" path="OpenSim/Tests/Performance" type="Library">
       <Configuration name="Debug">
         <Options>
           <OutputPath>../../../bin/</OutputPath>