From e02aaaf9db6750867fa74f96861a3d3f8d03693f Mon Sep 17 00:00:00 2001
From: Justin Clarke Casey <jjustincc@googlemail.com>
Date: Thu, 11 Dec 2008 16:40:22 +0000
Subject: [PATCH] * minor: Move mock test classes into mock namespace

---
 .../Region/Environment/Scenes/Tests/EntityListTests.cs |  2 +-
 .../Environment/Scenes/Tests/SceneObjectTests.cs       |  2 +-
 .../Environment/Scenes/Tests/ScenePresenceTests.cs     |  2 +-
 .../Region/Environment/Scenes/Tests/SceneTestUtils.cs  |  2 +-
 OpenSim/Tests/Infra/{ => Mock}/TestAssetDataPlugin.cs  |  2 +-
 OpenSim/Tests/Infra/{ => Mock}/TestClient.cs           |  2 +-
 .../Infra/{ => Mock}/TestCommunicationsManager.cs      |  2 +-
 .../Tests/Infra/{ => Mock}/TestInventoryDataPlugin.cs  |  2 +-
 OpenSim/Tests/Infra/{ => Mock}/TestLandChannel.cs      |  2 +-
 OpenSim/Tests/Infra/{ => Mock}/TestScene.cs            |  2 +-
 OpenSim/Tests/Infra/{ => Mock}/TestUserDataPlugin.cs   |  2 +-
 prebuild.xml                                           | 10 +++++-----
 12 files changed, 16 insertions(+), 16 deletions(-)
 rename OpenSim/Tests/Infra/{ => Mock}/TestAssetDataPlugin.cs (98%)
 rename OpenSim/Tests/Infra/{ => Mock}/TestClient.cs (99%)
 rename OpenSim/Tests/Infra/{ => Mock}/TestCommunicationsManager.cs (98%)
 rename OpenSim/Tests/Infra/{ => Mock}/TestInventoryDataPlugin.cs (99%)
 rename OpenSim/Tests/Infra/{ => Mock}/TestLandChannel.cs (98%)
 rename OpenSim/Tests/Infra/{ => Mock}/TestScene.cs (98%)
 rename OpenSim/Tests/Infra/{ => Mock}/TestUserDataPlugin.cs (99%)

diff --git a/OpenSim/Region/Environment/Scenes/Tests/EntityListTests.cs b/OpenSim/Region/Environment/Scenes/Tests/EntityListTests.cs
index d79d0035e9..c0f2e5e9c2 100644
--- a/OpenSim/Region/Environment/Scenes/Tests/EntityListTests.cs
+++ b/OpenSim/Region/Environment/Scenes/Tests/EntityListTests.cs
@@ -36,7 +36,7 @@ using OpenMetaverse;
 using OpenSim.Framework;
 using OpenSim.Framework.Communications;
 using OpenSim.Region.Environment.Scenes;
-using OpenSim.Tests.Infra;
+using OpenSim.Tests.Infra.Mock;
 
 namespace OpenSim.Region.Environment.Scenes.Tests
 {
diff --git a/OpenSim/Region/Environment/Scenes/Tests/SceneObjectTests.cs b/OpenSim/Region/Environment/Scenes/Tests/SceneObjectTests.cs
index e8c3b96ee4..370341491c 100644
--- a/OpenSim/Region/Environment/Scenes/Tests/SceneObjectTests.cs
+++ b/OpenSim/Region/Environment/Scenes/Tests/SceneObjectTests.cs
@@ -34,7 +34,7 @@ using OpenSim.Framework.Communications;
 using OpenSim.Framework.Communications.Cache;
 using OpenSim.Region.Communications.Local;
 using OpenSim.Region.Environment.Scenes;
-using OpenSim.Tests.Infra;
+using OpenSim.Tests.Infra.Mock;
 
 namespace OpenSim.Region.Environment.Scenes.Tests
 {
diff --git a/OpenSim/Region/Environment/Scenes/Tests/ScenePresenceTests.cs b/OpenSim/Region/Environment/Scenes/Tests/ScenePresenceTests.cs
index c4c8d3e84f..24c62d1c9a 100644
--- a/OpenSim/Region/Environment/Scenes/Tests/ScenePresenceTests.cs
+++ b/OpenSim/Region/Environment/Scenes/Tests/ScenePresenceTests.cs
@@ -30,7 +30,7 @@ using NUnit.Framework.SyntaxHelpers;
 using OpenMetaverse;
 using OpenSim.Framework;
 using OpenSim.Region.Environment.Scenes;
-using OpenSim.Tests.Infra;
+using OpenSim.Tests.Infra.Mock;
 
 namespace OpenSim.Region.Environment.Scenes.Tests
 {  
diff --git a/OpenSim/Region/Environment/Scenes/Tests/SceneTestUtils.cs b/OpenSim/Region/Environment/Scenes/Tests/SceneTestUtils.cs
index be06fe4a67..fa4c7ceda3 100644
--- a/OpenSim/Region/Environment/Scenes/Tests/SceneTestUtils.cs
+++ b/OpenSim/Region/Environment/Scenes/Tests/SceneTestUtils.cs
@@ -33,7 +33,7 @@ using OpenSim.Framework.Communications.Cache;
 using OpenSim.Framework.Servers;
 using OpenSim.Region.Physics.Manager;
 using OpenSim.Region.Environment.Scenes;
-using OpenSim.Tests.Infra;
+using OpenSim.Tests.Infra.Mock;
 
 namespace OpenSim.Region.Environment.Scenes.Tests
 {        
diff --git a/OpenSim/Tests/Infra/TestAssetDataPlugin.cs b/OpenSim/Tests/Infra/Mock/TestAssetDataPlugin.cs
similarity index 98%
rename from OpenSim/Tests/Infra/TestAssetDataPlugin.cs
rename to OpenSim/Tests/Infra/Mock/TestAssetDataPlugin.cs
index 44276dc015..6a5c31e3d8 100644
--- a/OpenSim/Tests/Infra/TestAssetDataPlugin.cs
+++ b/OpenSim/Tests/Infra/Mock/TestAssetDataPlugin.cs
@@ -29,7 +29,7 @@ using OpenMetaverse;
 using OpenSim.Framework;
 using OpenSim.Framework.Communications;
 
-namespace OpenSim.Tests.Infra
+namespace OpenSim.Tests.Infra.Mock
 {
     /// <summary>
     /// In memory asset data plugin for test purposes.  Could be another dll when properly filled out and when the
diff --git a/OpenSim/Tests/Infra/TestClient.cs b/OpenSim/Tests/Infra/Mock/TestClient.cs
similarity index 99%
rename from OpenSim/Tests/Infra/TestClient.cs
rename to OpenSim/Tests/Infra/Mock/TestClient.cs
index bc064add41..ba643936a9 100644
--- a/OpenSim/Tests/Infra/TestClient.cs
+++ b/OpenSim/Tests/Infra/Mock/TestClient.cs
@@ -33,7 +33,7 @@ using OpenMetaverse.Packets;
 using OpenSim.Framework;
 using OpenSim.Region.Environment.Scenes;
 
-namespace OpenSim.Tests.Infra
+namespace OpenSim.Tests.Infra.Mock
 {
     public class TestClient : IClientAPI
     {
diff --git a/OpenSim/Tests/Infra/TestCommunicationsManager.cs b/OpenSim/Tests/Infra/Mock/TestCommunicationsManager.cs
similarity index 98%
rename from OpenSim/Tests/Infra/TestCommunicationsManager.cs
rename to OpenSim/Tests/Infra/Mock/TestCommunicationsManager.cs
index 0018427d28..38c1404438 100644
--- a/OpenSim/Tests/Infra/TestCommunicationsManager.cs
+++ b/OpenSim/Tests/Infra/Mock/TestCommunicationsManager.cs
@@ -31,7 +31,7 @@ using OpenSim.Framework.Communications.Cache;
 using OpenSim.Framework.Servers;
 using OpenSim.Region.Communications.Local;
 
-namespace OpenSim.Tests.Infra
+namespace OpenSim.Tests.Infra.Mock
 {
     public class TestCommunicationsManager : CommunicationsManager
     {
diff --git a/OpenSim/Tests/Infra/TestInventoryDataPlugin.cs b/OpenSim/Tests/Infra/Mock/TestInventoryDataPlugin.cs
similarity index 99%
rename from OpenSim/Tests/Infra/TestInventoryDataPlugin.cs
rename to OpenSim/Tests/Infra/Mock/TestInventoryDataPlugin.cs
index d59c1de59a..826ce1bf55 100644
--- a/OpenSim/Tests/Infra/TestInventoryDataPlugin.cs
+++ b/OpenSim/Tests/Infra/Mock/TestInventoryDataPlugin.cs
@@ -30,7 +30,7 @@ using System.Collections.Generic;
 using OpenMetaverse;
 using OpenSim.Framework;
 
-namespace OpenSim.Tests.Infra
+namespace OpenSim.Tests.Infra.Mock
 {
     /// <summary>
     /// In memory inventory data plugin for test purposes.  Could be another dll when properly filled out and when the
diff --git a/OpenSim/Tests/Infra/TestLandChannel.cs b/OpenSim/Tests/Infra/Mock/TestLandChannel.cs
similarity index 98%
rename from OpenSim/Tests/Infra/TestLandChannel.cs
rename to OpenSim/Tests/Infra/Mock/TestLandChannel.cs
index 93ab6742cf..21a64938d7 100644
--- a/OpenSim/Tests/Infra/TestLandChannel.cs
+++ b/OpenSim/Tests/Infra/Mock/TestLandChannel.cs
@@ -30,7 +30,7 @@ using OpenMetaverse;
 using OpenSim.Framework;
 using OpenSim.Region.Environment.Interfaces;
 
-namespace OpenSim.Tests.Infra
+namespace OpenSim.Tests.Infra.Mock
 {       
     /// <summary>
     /// Land channel for test purposes
diff --git a/OpenSim/Tests/Infra/TestScene.cs b/OpenSim/Tests/Infra/Mock/TestScene.cs
similarity index 98%
rename from OpenSim/Tests/Infra/TestScene.cs
rename to OpenSim/Tests/Infra/Mock/TestScene.cs
index 0d74c521d2..ca66014948 100644
--- a/OpenSim/Tests/Infra/TestScene.cs
+++ b/OpenSim/Tests/Infra/Mock/TestScene.cs
@@ -33,7 +33,7 @@ using OpenSim.Framework.Servers;
 using OpenSim.Region.Environment;
 using OpenSim.Region.Environment.Scenes;
 
-namespace OpenSim.Tests.Infra
+namespace OpenSim.Tests.Infra.Mock
 {        
     public class TestScene : Scene
     {        
diff --git a/OpenSim/Tests/Infra/TestUserDataPlugin.cs b/OpenSim/Tests/Infra/Mock/TestUserDataPlugin.cs
similarity index 99%
rename from OpenSim/Tests/Infra/TestUserDataPlugin.cs
rename to OpenSim/Tests/Infra/Mock/TestUserDataPlugin.cs
index 23cb89d865..c08fc90630 100644
--- a/OpenSim/Tests/Infra/TestUserDataPlugin.cs
+++ b/OpenSim/Tests/Infra/Mock/TestUserDataPlugin.cs
@@ -30,7 +30,7 @@ using System.Collections.Generic;
 using OpenMetaverse;
 using OpenSim.Framework;
 
-namespace OpenSim.Tests.Infra
+namespace OpenSim.Tests.Infra.Mock
 {
     /// <summary>
     /// In memory user data provider.  Might be quite useful as a proper user data plugin, though getting mono addins
diff --git a/prebuild.xml b/prebuild.xml
index 4308e1109d..904ea60282 100644
--- a/prebuild.xml
+++ b/prebuild.xml
@@ -2387,19 +2387,19 @@
       </Files>
     </Project>
 
-    <Project name="OpenSim.Tests.Infra" path="OpenSim/Tests/Infra" type="Library">
+    <Project name="OpenSim.Tests.Infra.Mock" path="OpenSim/Tests/Infra/Mock" type="Library">
       <Configuration name="Debug">
         <Options>
-          <OutputPath>../../../bin/</OutputPath>
+          <OutputPath>../../../../bin/</OutputPath>
         </Options>
       </Configuration>
       <Configuration name="Release">
         <Options>
-          <OutputPath>../../../bin/</OutputPath>
+          <OutputPath>../../../../bin/</OutputPath>
         </Options>
       </Configuration>
 
-      <ReferencePath>../../../bin/</ReferencePath>
+      <ReferencePath>../../../../bin/</ReferencePath>
       <Reference name="System" localCopy="false"/>
       <Reference name="OpenMetaverse.dll"/>
       <Reference name="OpenMetaverseTypes.dll"/>
@@ -2652,7 +2652,7 @@
 
       <!-- Unit tests -->
       <!-- <Reference name="OpenSim.Tests.Common"/> -->
-      <Reference name="OpenSim.Tests.Infra"/>
+      <Reference name="OpenSim.Tests.Infra.Mock"/>
       <Reference name="Nini.dll"/>
       <Reference name="nunit.framework.dll"/>