aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
-rw-r--r--OpenSim/Framework/Communications/Tests/Cache/UserProfileCacheServiceTests.cs2
-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/Common/Mock/TestAssetDataPlugin.cs (renamed from OpenSim/Tests/Infra/Mock/TestAssetDataPlugin.cs)2
-rw-r--r--OpenSim/Tests/Common/Mock/TestClient.cs (renamed from OpenSim/Tests/Infra/Mock/TestClient.cs)2
-rw-r--r--OpenSim/Tests/Common/Mock/TestCommunicationsManager.cs (renamed from OpenSim/Tests/Infra/Mock/TestCommunicationsManager.cs)2
-rw-r--r--OpenSim/Tests/Common/Mock/TestInventoryDataPlugin.cs (renamed from OpenSim/Tests/Infra/Mock/TestInventoryDataPlugin.cs)2
-rw-r--r--OpenSim/Tests/Common/Mock/TestLandChannel.cs (renamed from OpenSim/Tests/Infra/Mock/TestLandChannel.cs)2
-rw-r--r--OpenSim/Tests/Common/Mock/TestScene.cs (renamed from OpenSim/Tests/Infra/Mock/TestScene.cs)2
-rw-r--r--OpenSim/Tests/Common/Mock/TestUserDataPlugin.cs (renamed from OpenSim/Tests/Infra/Mock/TestUserDataPlugin.cs)2
-rw-r--r--prebuild.xml42
13 files changed, 23 insertions, 43 deletions
diff --git a/OpenSim/Framework/Communications/Tests/Cache/UserProfileCacheServiceTests.cs b/OpenSim/Framework/Communications/Tests/Cache/UserProfileCacheServiceTests.cs
index 62a42a9..e496e45 100644
--- a/OpenSim/Framework/Communications/Tests/Cache/UserProfileCacheServiceTests.cs
+++ b/OpenSim/Framework/Communications/Tests/Cache/UserProfileCacheServiceTests.cs
@@ -31,7 +31,7 @@ using NUnit.Framework.SyntaxHelpers;
31using OpenMetaverse; 31using OpenMetaverse;
32using OpenSim.Framework.Communications.Cache; 32using OpenSim.Framework.Communications.Cache;
33using OpenSim.Region.Communications.Local; 33using OpenSim.Region.Communications.Local;
34using OpenSim.Tests.Infra.Mock; 34using OpenSim.Tests.Common.Mock;
35 35
36namespace OpenSim.Framework.Communications.Tests 36namespace OpenSim.Framework.Communications.Tests
37{ 37{
diff --git a/OpenSim/Region/Environment/Scenes/Tests/EntityListTests.cs b/OpenSim/Region/Environment/Scenes/Tests/EntityListTests.cs
index c0f2e5e..405eddd 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.Mock; 39using OpenSim.Tests.Common.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 3703414..b073fd1 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.Mock; 37using OpenSim.Tests.Common.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 24c62d1..548fea9 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.Mock; 33using OpenSim.Tests.Common.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 fa4c7ce..8a06eaa 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.Mock; 36using OpenSim.Tests.Common.Mock;
37 37
38namespace OpenSim.Region.Environment.Scenes.Tests 38namespace OpenSim.Region.Environment.Scenes.Tests
39{ 39{
diff --git a/OpenSim/Tests/Infra/Mock/TestAssetDataPlugin.cs b/OpenSim/Tests/Common/Mock/TestAssetDataPlugin.cs
index 6a5c31e..f44339a 100644
--- a/OpenSim/Tests/Infra/Mock/TestAssetDataPlugin.cs
+++ b/OpenSim/Tests/Common/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.Mock 32namespace OpenSim.Tests.Common.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/Mock/TestClient.cs b/OpenSim/Tests/Common/Mock/TestClient.cs
index ba64393..9b44ac4 100644
--- a/OpenSim/Tests/Infra/Mock/TestClient.cs
+++ b/OpenSim/Tests/Common/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.Mock 36namespace OpenSim.Tests.Common.Mock
37{ 37{
38 public class TestClient : IClientAPI 38 public class TestClient : IClientAPI
39 { 39 {
diff --git a/OpenSim/Tests/Infra/Mock/TestCommunicationsManager.cs b/OpenSim/Tests/Common/Mock/TestCommunicationsManager.cs
index 38c1404..a6a025b 100644
--- a/OpenSim/Tests/Infra/Mock/TestCommunicationsManager.cs
+++ b/OpenSim/Tests/Common/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.Mock 34namespace OpenSim.Tests.Common.Mock
35{ 35{
36 public class TestCommunicationsManager : CommunicationsManager 36 public class TestCommunicationsManager : CommunicationsManager
37 { 37 {
diff --git a/OpenSim/Tests/Infra/Mock/TestInventoryDataPlugin.cs b/OpenSim/Tests/Common/Mock/TestInventoryDataPlugin.cs
index 826ce1b..9e2116a 100644
--- a/OpenSim/Tests/Infra/Mock/TestInventoryDataPlugin.cs
+++ b/OpenSim/Tests/Common/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.Mock 33namespace OpenSim.Tests.Common.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/Mock/TestLandChannel.cs b/OpenSim/Tests/Common/Mock/TestLandChannel.cs
index 21a6493..5e9b9ff 100644
--- a/OpenSim/Tests/Infra/Mock/TestLandChannel.cs
+++ b/OpenSim/Tests/Common/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.Mock 33namespace OpenSim.Tests.Common.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/Mock/TestScene.cs b/OpenSim/Tests/Common/Mock/TestScene.cs
index ca66014..6b176a1 100644
--- a/OpenSim/Tests/Infra/Mock/TestScene.cs
+++ b/OpenSim/Tests/Common/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.Mock 36namespace OpenSim.Tests.Common.Mock
37{ 37{
38 public class TestScene : Scene 38 public class TestScene : Scene
39 { 39 {
diff --git a/OpenSim/Tests/Infra/Mock/TestUserDataPlugin.cs b/OpenSim/Tests/Common/Mock/TestUserDataPlugin.cs
index c08fc90..a5e2a37 100644
--- a/OpenSim/Tests/Infra/Mock/TestUserDataPlugin.cs
+++ b/OpenSim/Tests/Common/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.Mock 33namespace OpenSim.Tests.Common.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 49b0ec8..8c418d6 100644
--- a/prebuild.xml
+++ b/prebuild.xml
@@ -2388,34 +2388,6 @@
2388 </Project> 2388 </Project>
2389 2389
2390 <!-- Test assemblies --> 2390 <!-- Test assemblies -->
2391 <Project name="OpenSim.Tests.Infra.Mock" path="OpenSim/Tests/Infra/Mock" type="Library">
2392 <Configuration name="Debug">
2393 <Options>
2394 <OutputPath>../../../../bin/</OutputPath>
2395 </Options>
2396 </Configuration>
2397 <Configuration name="Release">
2398 <Options>
2399 <OutputPath>../../../../bin/</OutputPath>
2400 </Options>
2401 </Configuration>
2402
2403 <ReferencePath>../../../../bin/</ReferencePath>
2404 <Reference name="System" localCopy="false"/>
2405 <Reference name="OpenMetaverse.dll"/>
2406 <Reference name="OpenMetaverseTypes.dll"/>
2407 <Reference name="OpenSim.Framework"/>
2408 <Reference name="OpenSim.Framework.Communications"/>
2409 <Reference name="OpenSim.Framework.Servers"/>
2410 <Reference name="OpenSim.Region.Communications.Local"/>
2411 <Reference name="OpenSim.Region.Environment"/>
2412 <Reference name="Nini.dll" />
2413
2414 <Files>
2415 <Match pattern="*.cs" recurse="true"/>
2416 </Files>
2417 </Project>
2418
2419 <Project name="OpenSim.Tests.Common" path="OpenSim/Tests/Common" type="Library"> 2391 <Project name="OpenSim.Tests.Common" path="OpenSim/Tests/Common" type="Library">
2420 <Configuration name="Debug"> 2392 <Configuration name="Debug">
2421 <Options> 2393 <Options>
@@ -2433,10 +2405,18 @@
2433 <Reference name="System.Drawing"/> 2405 <Reference name="System.Drawing"/>
2434 <Reference name="System.Xml"/> 2406 <Reference name="System.Xml"/>
2435 <Reference name="System.Data"/> 2407 <Reference name="System.Data"/>
2408 <Reference name="Nini.dll" />
2436 <Reference name="nunit.framework.dll" /> 2409 <Reference name="nunit.framework.dll" />
2410 <Reference name="OpenMetaverse.dll"/>
2437 <Reference name="OpenMetaverseTypes.dll"/> 2411 <Reference name="OpenMetaverseTypes.dll"/>
2412 <Reference name="OpenSim.Framework"/>
2413 <Reference name="OpenSim.Framework.Communications"/>
2414 <Reference name="OpenSim.Framework.Servers"/>
2415 <Reference name="OpenSim.Region.Communications.Local"/>
2416 <Reference name="OpenSim.Region.Environment"/>
2417
2438 <Files> 2418 <Files>
2439 <Match pattern="*.cs" recurse="false"/> 2419 <Match pattern="*.cs" recurse="true"/>
2440 </Files> 2420 </Files>
2441 </Project> 2421 </Project>
2442 2422
@@ -2618,7 +2598,7 @@
2618 <Reference name="OpenMetaverseTypes.dll"/> 2598 <Reference name="OpenMetaverseTypes.dll"/>
2619 <Reference name="OpenSim.Framework.Communications"/> 2599 <Reference name="OpenSim.Framework.Communications"/>
2620 <Reference name="OpenSim.Region.Communications.Local"/> 2600 <Reference name="OpenSim.Region.Communications.Local"/>
2621 <Reference name="OpenSim.Tests.Infra.Mock"/> 2601 <Reference name="OpenSim.Tests.Common"/>
2622 2602
2623 <Files> 2603 <Files>
2624 <Match pattern="*.cs" recurse="true"/> 2604 <Match pattern="*.cs" recurse="true"/>
@@ -2657,7 +2637,7 @@
2657 2637
2658 <!-- Unit tests --> 2638 <!-- Unit tests -->
2659 <!-- <Reference name="OpenSim.Tests.Common"/> --> 2639 <!-- <Reference name="OpenSim.Tests.Common"/> -->
2660 <Reference name="OpenSim.Tests.Infra.Mock"/> 2640 <Reference name="OpenSim.Tests.Common"/>
2661 <Reference name="Nini.dll"/> 2641 <Reference name="Nini.dll"/>
2662 <Reference name="nunit.framework.dll"/> 2642 <Reference name="nunit.framework.dll"/>
2663 2643