From fae20712a925926d562b43e79b8a383b754f77fc Mon Sep 17 00:00:00 2001
From: Justin Clarke Casey
Date: Fri, 6 Feb 2009 21:37:10 +0000
Subject: * reinstate OpenSim/Region/Framework/Scenes/Tests * should bring us
back up to 240 tests
---
.nant/bamboo.build | 19 ++++----
.nant/local.include | 13 +++++
.../Scenes/Tests/SceneObjectBasicTests.cs | 4 +-
.../Scenes/Tests/SceneObjectLinkingTests.cs | 2 +-
.../Scenes/Tests/StandaloneTeleportTests.cs | 1 -
prebuild.xml | 56 ++++++++++++++++++++++
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 @@
-
+
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
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 @@
+
@@ -116,6 +117,17 @@
+
+
+
+
+
+
+
+
+
+
+
@@ -157,6 +169,7 @@
+
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;
using OpenSim.Framework.Communications;
using OpenSim.Framework.Communications.Cache;
using OpenSim.Region.Communications.Local;
-using OpenSim.Region.Environment.Scenes;
+using OpenSim.Region.Framework.Scenes;
using OpenSim.Tests.Common.Mock;
using OpenSim.Tests.Common.Setup;
@@ -133,7 +133,7 @@ namespace OpenSim.Region.Environment.Scenes.Tests
// Check that the taken part has actually disappeared
SceneObjectPart retrievedPart = scene.GetSceneObjectPart(part.LocalId);
- Assert.That(retrievedPart, Is.Null);
+ Assert.That(retrievedPart, Is.Null);
}
}
}
\ 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;
using OpenSim.Framework.Communications;
using OpenSim.Framework.Communications.Cache;
using OpenSim.Region.Communications.Local;
-using OpenSim.Region.Environment.Scenes;
+using OpenSim.Region.Framework.Scenes;
using OpenSim.Tests.Common.Mock;
using OpenSim.Tests.Common.Setup;
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;
using OpenMetaverse;
using OpenSim.Framework;
using OpenSim.Framework.Communications;
-using OpenSim.Region.Environment;
using OpenSim.Region.Framework.Interfaces;
using OpenSim.Region.Environment.Modules.Communications.REST;
using 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 @@
+
+
+
+
+
+
+ ../../../bin/
+
+
+
+
+ ../../../bin/
+
+
+
+ ../../../bin/
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
--
cgit v1.1