* Temporarily revert terrain changes in r6976 and reinstate unit test from r6977.

* If a change is going to affect a unit test, then please could we change the unit test at the same time?  Otherwise this will never get done
* It also seems a bad idea to disable tests which start failing unless there's a very good reason

1 files changed, 28 insertions, 28 deletions

diff --git a/OpenSim/Region/Environment/Modules/World/Terrain/Tests/TerrainTest.cs b/OpenSim/Region/Environment/Modules/World/Terrain/Tests/TerrainTest.cs
index 4d9cf61..5b4bc8c 100644
--- a/OpenSim/Region/Environment/Modules/World/Terrain/Tests/TerrainTest.cs
+++ b/OpenSim/Region/Environment/Modules/World/Terrain/Tests/TerrainTest.cs
@@ -34,34 +34,34 @@ namespace OpenSim.Region.Environment.Modules.World.Terrain.Tests
     [TestFixture]
     public class TerrainTest
     {
-//        [Test]
-//        public void BrushTest()
-//        {
-//            TerrainChannel map = new TerrainChannel(256, 256);
-//            bool[,] allowMask = new bool[map.Width,map.Height];
-//            int x;
-//            int y;
-//            for (x=0; x<map.Width; x++)
-//            {
-//                for (y=0; y<map.Height; y++)
-//                {
-//                    allowMask[x,y] = true;
-//                }
-//            }
-//
-//            ITerrainPaintableEffect effect = new RaiseSphere();
-//
-//            effect.PaintEffect(map, allowMask, 128.0, 128.0, 23.0, 100, 0.1);
-//            Assert.That(map[128, 128] > 0.0, "Raise brush not raising values.");
-//            Assert.That(map[0, 128] > 0.0, "Raise brush lowering edge values.");
-//
-//            map = new TerrainChannel(256, 256);
-//            effect = new LowerSphere();
-//
-//            effect.PaintEffect(map, allowMask, 128.0, 128.0, -1, 100, 0.1);
-//            Assert.That(map[128, 128] < 0.0, "Lower not lowering values.");
-//            Assert.That(map[0, 128] < 0.0, "Lower brush affecting edge values.");
-//        }
+        [Test]
+        public void BrushTest()
+        {
+            TerrainChannel map = new TerrainChannel(256, 256);
+            bool[,] allowMask = new bool[map.Width,map.Height];
+            int x;
+            int y;
+            for (x=0; x<map.Width; x++)
+            {
+                for (y=0; y<map.Height; y++)
+                {
+                    allowMask[x,y] = true;
+                }
+            }
+
+            ITerrainPaintableEffect effect = new RaiseSphere();
+
+            effect.PaintEffect(map, allowMask, 128.0, 128.0, 23.0, 100, 0.1);
+            Assert.That(map[128, 128] > 0.0, "Raise brush not raising values.");
+            Assert.That(map[0, 128] > 0.0, "Raise brush lowering edge values.");
+
+            map = new TerrainChannel(256, 256);
+            effect = new LowerSphere();
+
+            effect.PaintEffect(map, allowMask, 128.0, 128.0, -1, 100, 0.1);
+            Assert.That(map[128, 128] < 0.0, "Lower not lowering values.");
+            Assert.That(map[0, 128] < 0.0, "Lower brush affecting edge values.");
+        }
 
         [Test]
         public void TerrainChannelTest()