aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorJustin Clarke Casey2008-12-11 16:40:22 +0000
committerJustin Clarke Casey2008-12-11 16:40:22 +0000
commite02aaaf9db6750867fa74f96861a3d3f8d03693f (patch)
tree672f53945d42ac374965bb238b6be14a70f9282e
parentReimplemented running of ShutdownCommandFile. Mantis #2800 (diff)
downloadopensim-SC_OLD-e02aaaf9db6750867fa74f96861a3d3f8d03693f.zip
opensim-SC_OLD-e02aaaf9db6750867fa74f96861a3d3f8d03693f.tar.gz
opensim-SC_OLD-e02aaaf9db6750867fa74f96861a3d3f8d03693f.tar.bz2
opensim-SC_OLD-e02aaaf9db6750867fa74f96861a3d3f8d03693f.tar.xz
* minor: Move mock test classes into mock namespace
-rw-r--r--OpenSim/Region/Environment/Scenes/Tests/EntityListTests.cs2
-rw-r--r--OpenSim/Region/Environment/Scenes/Tests/SceneObjectTests.cs2
-rw-r--r--OpenSim/Region/Environment/Scenes/Tests/ScenePresenceTests.cs2
-rw-r--r--OpenSim/Region/Environment/Scenes/Tests/SceneTestUtils.cs2
-rw-r--r--OpenSim/Tests/Infra/Mock/TestAssetDataPlugin.cs (renamed from OpenSim/Tests/Infra/TestAssetDataPlugin.cs)2
-rw-r--r--OpenSim/Tests/Infra/Mock/TestClient.cs (renamed from OpenSim/Tests/Infra/TestClient.cs)2
-rw-r--r--OpenSim/Tests/Infra/Mock/TestCommunicationsManager.cs (renamed from OpenSim/Tests/Infra/TestCommunicationsManager.cs)2
-rw-r--r--OpenSim/Tests/Infra/Mock/TestInventoryDataPlugin.cs (renamed from OpenSim/Tests/Infra/TestInventoryDataPlugin.cs)2
-rw-r--r--OpenSim/Tests/Infra/Mock/TestLandChannel.cs (renamed from OpenSim/Tests/Infra/TestLandChannel.cs)2
-rw-r--r--OpenSim/Tests/Infra/Mock/TestScene.cs (renamed from OpenSim/Tests/Infra/TestScene.cs)2
-rw-r--r--OpenSim/Tests/Infra/Mock/TestUserDataPlugin.cs (renamed from OpenSim/Tests/Infra/TestUserDataPlugin.cs)2
-rw-r--r--prebuild.xml10
12 files changed, 16 insertions, 16 deletions
diff --git a/OpenSim/Region/Environment/Scenes/Tests/EntityListTests.cs b/OpenSim/Region/Environment/Scenes/Tests/EntityListTests.cs
index d79d003..c0f2e5e 100644
--- a/OpenSim/Region/Environment/Scenes/Tests/EntityListTests.cs
+++ b/OpenSim/Region/Environment/Scenes/Tests/EntityListTests.cs
@@ -36,7 +36,7 @@ using OpenMetaverse;
36using OpenSim.Framework; 36using OpenSim.Framework;
37using OpenSim.Framework.Communications; 37using OpenSim.Framework.Communications;
38using OpenSim.Region.Environment.Scenes; 38using OpenSim.Region.Environment.Scenes;
39using OpenSim.Tests.Infra; 39using OpenSim.Tests.Infra.Mock;
40 40
41namespace OpenSim.Region.Environment.Scenes.Tests 41namespace OpenSim.Region.Environment.Scenes.Tests
42{ 42{
diff --git a/OpenSim/Region/Environment/Scenes/Tests/SceneObjectTests.cs b/OpenSim/Region/Environment/Scenes/Tests/SceneObjectTests.cs
index e8c3b96..3703414 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;
34using OpenSim.Framework.Communications.Cache; 34using OpenSim.Framework.Communications.Cache;
35using OpenSim.Region.Communications.Local; 35using OpenSim.Region.Communications.Local;
36using OpenSim.Region.Environment.Scenes; 36using OpenSim.Region.Environment.Scenes;
37using OpenSim.Tests.Infra; 37using OpenSim.Tests.Infra.Mock;
38 38
39namespace OpenSim.Region.Environment.Scenes.Tests 39namespace OpenSim.Region.Environment.Scenes.Tests
40{ 40{
diff --git a/OpenSim/Region/Environment/Scenes/Tests/ScenePresenceTests.cs b/OpenSim/Region/Environment/Scenes/Tests/ScenePresenceTests.cs
index c4c8d3e..24c62d1 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;
30using OpenMetaverse; 30using OpenMetaverse;
31using OpenSim.Framework; 31using OpenSim.Framework;
32using OpenSim.Region.Environment.Scenes; 32using OpenSim.Region.Environment.Scenes;
33using OpenSim.Tests.Infra; 33using OpenSim.Tests.Infra.Mock;
34 34
35namespace OpenSim.Region.Environment.Scenes.Tests 35namespace OpenSim.Region.Environment.Scenes.Tests
36{ 36{
diff --git a/OpenSim/Region/Environment/Scenes/Tests/SceneTestUtils.cs b/OpenSim/Region/Environment/Scenes/Tests/SceneTestUtils.cs
index be06fe4..fa4c7ce 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;
33using OpenSim.Framework.Servers; 33using OpenSim.Framework.Servers;
34using OpenSim.Region.Physics.Manager; 34using OpenSim.Region.Physics.Manager;
35using OpenSim.Region.Environment.Scenes; 35using OpenSim.Region.Environment.Scenes;
36using OpenSim.Tests.Infra; 36using OpenSim.Tests.Infra.Mock;
37 37
38namespace OpenSim.Region.Environment.Scenes.Tests 38namespace OpenSim.Region.Environment.Scenes.Tests
39{ 39{
diff --git a/OpenSim/Tests/Infra/TestAssetDataPlugin.cs b/OpenSim/Tests/Infra/Mock/TestAssetDataPlugin.cs
index 44276dc..6a5c31e 100644
--- a/OpenSim/Tests/Infra/TestAssetDataPlugin.cs
+++ b/OpenSim/Tests/Infra/Mock/TestAssetDataPlugin.cs
@@ -29,7 +29,7 @@ using OpenMetaverse;
29using OpenSim.Framework; 29using OpenSim.Framework;
30using OpenSim.Framework.Communications; 30using OpenSim.Framework.Communications;
31 31
32namespace OpenSim.Tests.Infra 32namespace OpenSim.Tests.Infra.Mock
33{ 33{
34 /// <summary> 34 /// <summary>
35 /// In memory asset data plugin for test purposes. Could be another dll when properly filled out and when the 35 /// 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
index bc064ad..ba64393 100644
--- a/OpenSim/Tests/Infra/TestClient.cs
+++ b/OpenSim/Tests/Infra/Mock/TestClient.cs
@@ -33,7 +33,7 @@ using OpenMetaverse.Packets;
33using OpenSim.Framework; 33using OpenSim.Framework;
34using OpenSim.Region.Environment.Scenes; 34using OpenSim.Region.Environment.Scenes;
35 35
36namespace OpenSim.Tests.Infra 36namespace OpenSim.Tests.Infra.Mock
37{ 37{
38 public class TestClient : IClientAPI 38 public class TestClient : IClientAPI
39 { 39 {
diff --git a/OpenSim/Tests/Infra/TestCommunicationsManager.cs b/OpenSim/Tests/Infra/Mock/TestCommunicationsManager.cs
index 0018427..38c1404 100644
--- a/OpenSim/Tests/Infra/TestCommunicationsManager.cs
+++ b/OpenSim/Tests/Infra/Mock/TestCommunicationsManager.cs
@@ -31,7 +31,7 @@ using OpenSim.Framework.Communications.Cache;
31using OpenSim.Framework.Servers; 31using OpenSim.Framework.Servers;
32using OpenSim.Region.Communications.Local; 32using OpenSim.Region.Communications.Local;
33 33
34namespace OpenSim.Tests.Infra 34namespace OpenSim.Tests.Infra.Mock
35{ 35{
36 public class TestCommunicationsManager : CommunicationsManager 36 public class TestCommunicationsManager : CommunicationsManager
37 { 37 {
diff --git a/OpenSim/Tests/Infra/TestInventoryDataPlugin.cs b/OpenSim/Tests/Infra/Mock/TestInventoryDataPlugin.cs
index d59c1de..826ce1b 100644
--- a/OpenSim/Tests/Infra/TestInventoryDataPlugin.cs
+++ b/OpenSim/Tests/Infra/Mock/TestInventoryDataPlugin.cs
@@ -30,7 +30,7 @@ using System.Collections.Generic;
30using OpenMetaverse; 30using OpenMetaverse;
31using OpenSim.Framework; 31using OpenSim.Framework;
32 32
33namespace OpenSim.Tests.Infra 33namespace OpenSim.Tests.Infra.Mock
34{ 34{
35 /// <summary> 35 /// <summary>
36 /// In memory inventory data plugin for test purposes. Could be another dll when properly filled out and when the 36 /// 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
index 93ab674..21a6493 100644
--- a/OpenSim/Tests/Infra/TestLandChannel.cs
+++ b/OpenSim/Tests/Infra/Mock/TestLandChannel.cs
@@ -30,7 +30,7 @@ using OpenMetaverse;
30using OpenSim.Framework; 30using OpenSim.Framework;
31using OpenSim.Region.Environment.Interfaces; 31using OpenSim.Region.Environment.Interfaces;
32 32
33namespace OpenSim.Tests.Infra 33namespace OpenSim.Tests.Infra.Mock
34{ 34{
35 /// <summary> 35 /// <summary>
36 /// Land channel for test purposes 36 /// Land channel for test purposes
diff --git a/OpenSim/Tests/Infra/TestScene.cs b/OpenSim/Tests/Infra/Mock/TestScene.cs
index 0d74c52..ca66014 100644
--- a/OpenSim/Tests/Infra/TestScene.cs
+++ b/OpenSim/Tests/Infra/Mock/TestScene.cs
@@ -33,7 +33,7 @@ using OpenSim.Framework.Servers;
33using OpenSim.Region.Environment; 33using OpenSim.Region.Environment;
34using OpenSim.Region.Environment.Scenes; 34using OpenSim.Region.Environment.Scenes;
35 35
36namespace OpenSim.Tests.Infra 36namespace OpenSim.Tests.Infra.Mock
37{ 37{
38 public class TestScene : Scene 38 public class TestScene : Scene
39 { 39 {
diff --git a/OpenSim/Tests/Infra/TestUserDataPlugin.cs b/OpenSim/Tests/Infra/Mock/TestUserDataPlugin.cs
index 23cb89d..c08fc90 100644
--- a/OpenSim/Tests/Infra/TestUserDataPlugin.cs
+++ b/OpenSim/Tests/Infra/Mock/TestUserDataPlugin.cs
@@ -30,7 +30,7 @@ using System.Collections.Generic;
30using OpenMetaverse; 30using OpenMetaverse;
31using OpenSim.Framework; 31using OpenSim.Framework;
32 32
33namespace OpenSim.Tests.Infra 33namespace OpenSim.Tests.Infra.Mock
34{ 34{
35 /// <summary> 35 /// <summary>
36 /// In memory user data provider. Might be quite useful as a proper user data plugin, though getting mono addins 36 /// 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 4308e11..904ea60 100644
--- a/prebuild.xml
+++ b/prebuild.xml
@@ -2387,19 +2387,19 @@
2387 </Files> 2387 </Files>
2388 </Project> 2388 </Project>
2389 2389
2390 <Project name="OpenSim.Tests.Infra" path="OpenSim/Tests/Infra" type="Library"> 2390 <Project name="OpenSim.Tests.Infra.Mock" path="OpenSim/Tests/Infra/Mock" type="Library">
2391 <Configuration name="Debug"> 2391 <Configuration name="Debug">
2392 <Options> 2392 <Options>
2393 <OutputPath>../../../bin/</OutputPath> 2393 <OutputPath>../../../../bin/</OutputPath>
2394 </Options> 2394 </Options>
2395 </Configuration> 2395 </Configuration>
2396 <Configuration name="Release"> 2396 <Configuration name="Release">
2397 <Options> 2397 <Options>
2398 <OutputPath>../../../bin/</OutputPath> 2398 <OutputPath>../../../../bin/</OutputPath>
2399 </Options> 2399 </Options>
2400 </Configuration> 2400 </Configuration>
2401 2401
2402 <ReferencePath>../../../bin/</ReferencePath> 2402 <ReferencePath>../../../../bin/</ReferencePath>
2403 <Reference name="System" localCopy="false"/> 2403 <Reference name="System" localCopy="false"/>
2404 <Reference name="OpenMetaverse.dll"/> 2404 <Reference name="OpenMetaverse.dll"/>
2405 <Reference name="OpenMetaverseTypes.dll"/> 2405 <Reference name="OpenMetaverseTypes.dll"/>
@@ -2652,7 +2652,7 @@
2652 2652
2653 <!-- Unit tests --> 2653 <!-- Unit tests -->
2654 <!-- <Reference name="OpenSim.Tests.Common"/> --> 2654 <!-- <Reference name="OpenSim.Tests.Common"/> -->
2655 <Reference name="OpenSim.Tests.Infra"/> 2655 <Reference name="OpenSim.Tests.Infra.Mock"/>
2656 <Reference name="Nini.dll"/> 2656 <Reference name="Nini.dll"/>
2657 <Reference name="nunit.framework.dll"/> 2657 <Reference name="nunit.framework.dll"/>
2658 2658