* Fold mock classes into existing OpenSim/Tests/Common assembly rather than sprouting another one
parent
043fb02c89
commit
bec3993849
|
@ -31,7 +31,7 @@ using NUnit.Framework.SyntaxHelpers;
|
|||
using OpenMetaverse;
|
||||
using OpenSim.Framework.Communications.Cache;
|
||||
using OpenSim.Region.Communications.Local;
|
||||
using OpenSim.Tests.Infra.Mock;
|
||||
using OpenSim.Tests.Common.Mock;
|
||||
|
||||
namespace OpenSim.Framework.Communications.Tests
|
||||
{
|
||||
|
|
|
@ -36,7 +36,7 @@ using OpenMetaverse;
|
|||
using OpenSim.Framework;
|
||||
using OpenSim.Framework.Communications;
|
||||
using OpenSim.Region.Environment.Scenes;
|
||||
using OpenSim.Tests.Infra.Mock;
|
||||
using OpenSim.Tests.Common.Mock;
|
||||
|
||||
namespace OpenSim.Region.Environment.Scenes.Tests
|
||||
{
|
||||
|
|
|
@ -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.Mock;
|
||||
using OpenSim.Tests.Common.Mock;
|
||||
|
||||
namespace OpenSim.Region.Environment.Scenes.Tests
|
||||
{
|
||||
|
|
|
@ -30,7 +30,7 @@ using NUnit.Framework.SyntaxHelpers;
|
|||
using OpenMetaverse;
|
||||
using OpenSim.Framework;
|
||||
using OpenSim.Region.Environment.Scenes;
|
||||
using OpenSim.Tests.Infra.Mock;
|
||||
using OpenSim.Tests.Common.Mock;
|
||||
|
||||
namespace OpenSim.Region.Environment.Scenes.Tests
|
||||
{
|
||||
|
|
|
@ -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.Mock;
|
||||
using OpenSim.Tests.Common.Mock;
|
||||
|
||||
namespace OpenSim.Region.Environment.Scenes.Tests
|
||||
{
|
||||
|
|
|
@ -29,7 +29,7 @@ using OpenMetaverse;
|
|||
using OpenSim.Framework;
|
||||
using OpenSim.Framework.Communications;
|
||||
|
||||
namespace OpenSim.Tests.Infra.Mock
|
||||
namespace OpenSim.Tests.Common.Mock
|
||||
{
|
||||
/// <summary>
|
||||
/// In memory asset data plugin for test purposes. Could be another dll when properly filled out and when the
|
|
@ -33,7 +33,7 @@ using OpenMetaverse.Packets;
|
|||
using OpenSim.Framework;
|
||||
using OpenSim.Region.Environment.Scenes;
|
||||
|
||||
namespace OpenSim.Tests.Infra.Mock
|
||||
namespace OpenSim.Tests.Common.Mock
|
||||
{
|
||||
public class TestClient : IClientAPI
|
||||
{
|
|
@ -31,7 +31,7 @@ using OpenSim.Framework.Communications.Cache;
|
|||
using OpenSim.Framework.Servers;
|
||||
using OpenSim.Region.Communications.Local;
|
||||
|
||||
namespace OpenSim.Tests.Infra.Mock
|
||||
namespace OpenSim.Tests.Common.Mock
|
||||
{
|
||||
public class TestCommunicationsManager : CommunicationsManager
|
||||
{
|
|
@ -30,7 +30,7 @@ using System.Collections.Generic;
|
|||
using OpenMetaverse;
|
||||
using OpenSim.Framework;
|
||||
|
||||
namespace OpenSim.Tests.Infra.Mock
|
||||
namespace OpenSim.Tests.Common.Mock
|
||||
{
|
||||
/// <summary>
|
||||
/// In memory inventory data plugin for test purposes. Could be another dll when properly filled out and when the
|
|
@ -30,7 +30,7 @@ using OpenMetaverse;
|
|||
using OpenSim.Framework;
|
||||
using OpenSim.Region.Environment.Interfaces;
|
||||
|
||||
namespace OpenSim.Tests.Infra.Mock
|
||||
namespace OpenSim.Tests.Common.Mock
|
||||
{
|
||||
/// <summary>
|
||||
/// Land channel for test purposes
|
|
@ -33,7 +33,7 @@ using OpenSim.Framework.Servers;
|
|||
using OpenSim.Region.Environment;
|
||||
using OpenSim.Region.Environment.Scenes;
|
||||
|
||||
namespace OpenSim.Tests.Infra.Mock
|
||||
namespace OpenSim.Tests.Common.Mock
|
||||
{
|
||||
public class TestScene : Scene
|
||||
{
|
|
@ -30,7 +30,7 @@ using System.Collections.Generic;
|
|||
using OpenMetaverse;
|
||||
using OpenSim.Framework;
|
||||
|
||||
namespace OpenSim.Tests.Infra.Mock
|
||||
namespace OpenSim.Tests.Common.Mock
|
||||
{
|
||||
/// <summary>
|
||||
/// In memory user data provider. Might be quite useful as a proper user data plugin, though getting mono addins
|
42
prebuild.xml
42
prebuild.xml
|
@ -2388,34 +2388,6 @@
|
|||
</Project>
|
||||
|
||||
<!-- Test assemblies -->
|
||||
<Project name="OpenSim.Tests.Infra.Mock" path="OpenSim/Tests/Infra/Mock" type="Library">
|
||||
<Configuration name="Debug">
|
||||
<Options>
|
||||
<OutputPath>../../../../bin/</OutputPath>
|
||||
</Options>
|
||||
</Configuration>
|
||||
<Configuration name="Release">
|
||||
<Options>
|
||||
<OutputPath>../../../../bin/</OutputPath>
|
||||
</Options>
|
||||
</Configuration>
|
||||
|
||||
<ReferencePath>../../../../bin/</ReferencePath>
|
||||
<Reference name="System" localCopy="false"/>
|
||||
<Reference name="OpenMetaverse.dll"/>
|
||||
<Reference name="OpenMetaverseTypes.dll"/>
|
||||
<Reference name="OpenSim.Framework"/>
|
||||
<Reference name="OpenSim.Framework.Communications"/>
|
||||
<Reference name="OpenSim.Framework.Servers"/>
|
||||
<Reference name="OpenSim.Region.Communications.Local"/>
|
||||
<Reference name="OpenSim.Region.Environment"/>
|
||||
<Reference name="Nini.dll" />
|
||||
|
||||
<Files>
|
||||
<Match pattern="*.cs" recurse="true"/>
|
||||
</Files>
|
||||
</Project>
|
||||
|
||||
<Project name="OpenSim.Tests.Common" path="OpenSim/Tests/Common" type="Library">
|
||||
<Configuration name="Debug">
|
||||
<Options>
|
||||
|
@ -2433,10 +2405,18 @@
|
|||
<Reference name="System.Drawing"/>
|
||||
<Reference name="System.Xml"/>
|
||||
<Reference name="System.Data"/>
|
||||
<Reference name="Nini.dll" />
|
||||
<Reference name="nunit.framework.dll" />
|
||||
<Reference name="OpenMetaverse.dll"/>
|
||||
<Reference name="OpenMetaverseTypes.dll"/>
|
||||
<Reference name="OpenSim.Framework"/>
|
||||
<Reference name="OpenSim.Framework.Communications"/>
|
||||
<Reference name="OpenSim.Framework.Servers"/>
|
||||
<Reference name="OpenSim.Region.Communications.Local"/>
|
||||
<Reference name="OpenSim.Region.Environment"/>
|
||||
|
||||
<Files>
|
||||
<Match pattern="*.cs" recurse="false"/>
|
||||
<Match pattern="*.cs" recurse="true"/>
|
||||
</Files>
|
||||
</Project>
|
||||
|
||||
|
@ -2618,7 +2598,7 @@
|
|||
<Reference name="OpenMetaverseTypes.dll"/>
|
||||
<Reference name="OpenSim.Framework.Communications"/>
|
||||
<Reference name="OpenSim.Region.Communications.Local"/>
|
||||
<Reference name="OpenSim.Tests.Infra.Mock"/>
|
||||
<Reference name="OpenSim.Tests.Common"/>
|
||||
|
||||
<Files>
|
||||
<Match pattern="*.cs" recurse="true"/>
|
||||
|
@ -2657,7 +2637,7 @@
|
|||
|
||||
<!-- Unit tests -->
|
||||
<!-- <Reference name="OpenSim.Tests.Common"/> -->
|
||||
<Reference name="OpenSim.Tests.Infra.Mock"/>
|
||||
<Reference name="OpenSim.Tests.Common"/>
|
||||
<Reference name="Nini.dll"/>
|
||||
<Reference name="nunit.framework.dll"/>
|
||||
|
||||
|
|
Loading…
Reference in New Issue