aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--.nant/local.include6
-rw-r--r--OpenSim/Region/ScriptEngine/XEngine/Tests/XEngineTest.cs68
-rwxr-xr-xbin/Prebuild.exebin212992 -> 194048 bytes
-rw-r--r--prebuild.xml47
4 files changed, 90 insertions, 31 deletions
diff --git a/.nant/local.include b/.nant/local.include
index 8652376..839c79b 100644
--- a/.nant/local.include
+++ b/.nant/local.include
@@ -38,8 +38,7 @@
38 <include name="./bin/OpenSim.Framework.Communications.Tests.dll"/> 38 <include name="./bin/OpenSim.Framework.Communications.Tests.dll"/>
39 <include name="./bin/OpenSim.Framework.Servers.Tests.dll" /> 39 <include name="./bin/OpenSim.Framework.Servers.Tests.dll" />
40 <include name="./bin/OpenSim.Region.ClientStack.LindenUDP.Tests.dll" /> 40 <include name="./bin/OpenSim.Region.ClientStack.LindenUDP.Tests.dll" />
41 <include name="./bin/OpenSim.Region.ScriptEngine.Shared.Tests.dll" /> 41 <include name="./bin/OpenSim.Region.ScriptEngine.Tests.dll" />
42 <include name="./bin/OpenSim.Region.ScriptEngine.Shared.CodeTools.Tests.dll" />
43 <include name="./bin/OpenSim.Region.CoreModules.Tests.dll" /> 42 <include name="./bin/OpenSim.Region.CoreModules.Tests.dll" />
44 <include name="./bin/OpenSim.Region.Framework.Tests.dll" /> 43 <include name="./bin/OpenSim.Region.Framework.Tests.dll" />
45 <include name="./bin/OpenSim.Data.SQLite.Tests.dll" /> 44 <include name="./bin/OpenSim.Data.SQLite.Tests.dll" />
@@ -166,8 +165,7 @@
166 <include name="./bin/OpenSim.Framework.Communications.Tests.dll"/> 165 <include name="./bin/OpenSim.Framework.Communications.Tests.dll"/>
167 <include name="./bin/OpenSim.Framework.Servers.Tests.dll" /> 166 <include name="./bin/OpenSim.Framework.Servers.Tests.dll" />
168 <include name="./bin/OpenSim.Region.ClientStack.LindenUDP.Tests.dll" /> 167 <include name="./bin/OpenSim.Region.ClientStack.LindenUDP.Tests.dll" />
169 <include name="./bin/OpenSim.Region.ScriptEngine.Shared.Tests.dll" /> 168 <include name="./bin/OpenSim.Region.ScriptEngine.Tests.dll" />
170 <include name="./bin/OpenSim.Region.ScriptEngine.Shared.CodeTools.Tests.dll" />
171 <include name="./bin/OpenSim.Region.CoreModules.Tests.dll" /> 169 <include name="./bin/OpenSim.Region.CoreModules.Tests.dll" />
172 <include name="./bin/OpenSim.Region.Framework.Tests.dll" /> 170 <include name="./bin/OpenSim.Region.Framework.Tests.dll" />
173 <include name="./bin/OpenSim.Data.SQLite.Tests.dll" /> 171 <include name="./bin/OpenSim.Data.SQLite.Tests.dll" />
diff --git a/OpenSim/Region/ScriptEngine/XEngine/Tests/XEngineTest.cs b/OpenSim/Region/ScriptEngine/XEngine/Tests/XEngineTest.cs
new file mode 100644
index 0000000..17d26ef
--- /dev/null
+++ b/OpenSim/Region/ScriptEngine/XEngine/Tests/XEngineTest.cs
@@ -0,0 +1,68 @@
1/*
2 * Copyright (c) Contributors, http://opensimulator.org/
3 * See CONTRIBUTORS.TXT for a full list of copyright holders.
4 *
5 * Redistribution and use in source and binary forms, with or without
6 * modification, are permitted provided that the following conditions are met:
7 * * Redistributions of source code must retain the above copyright
8 * notice, this list of conditions and the following disclaimer.
9 * * Redistributions in binary form must reproduce the above copyright
10 * notice, this list of conditions and the following disclaimer in the
11 * documentation and/or other materials provided with the distribution.
12 * * Neither the name of the OpenSim Project nor the
13 * names of its contributors may be used to endorse or promote products
14 * derived from this software without specific prior written permission.
15 *
16 * THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY
17 * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
18 * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
19 * DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
20 * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
21 * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
22 * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
23 * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
24 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
25 * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
26 */
27
28using System;
29using System.Collections.Generic;
30using Nini.Config;
31using NUnit.Framework;
32using OpenSim.Tests.Common.Setup;
33using OpenSim.Tests.Common.Mock;
34using OpenSim.Region.Framework.Scenes;
35using OpenMetaverse;
36using OpenSim.Region.Framework.Interfaces;
37
38namespace OpenSim.Region.ScriptEngine.XEngine.Tests
39{
40 /// <summary>
41 /// Scene presence tests
42 /// </summary>
43 [TestFixture]
44 public class XEngineTest
45 {
46 public Scene scene;
47
48 public static Random random;
49 public TestClient testclient;
50 TestCommunicationsManager cm;
51
52 [TestFixtureSetUp]
53 public void Init()
54 {
55 TestCommunicationsManager cm = new TestCommunicationsManager();
56 scene = SceneSetupHelpers.SetupScene("My Test", UUID.Random(), 1000, 1000, cm);
57 random = new Random();
58 }
59
60 [Test]
61 public void T001_XStart()
62 {
63 IRegionModule xengine = new XEngine();
64 SceneSetupHelpers.SetupSceneModules(scene, new IniConfigSource(), xengine);
65 xengine.PostInitialise();
66 }
67 }
68} \ No newline at end of file
diff --git a/bin/Prebuild.exe b/bin/Prebuild.exe
index 7b53d35..1316aad 100755
--- a/bin/Prebuild.exe
+++ b/bin/Prebuild.exe
Binary files differ
diff --git a/prebuild.xml b/prebuild.xml
index 3200131..2cf29db 100644
--- a/prebuild.xml
+++ b/prebuild.xml
@@ -1,6 +1,6 @@
1<?xml version="1.0" encoding="utf-8" ?> 1<?xml version="1.0" encoding="utf-8" ?>
2<Prebuild xmlns="http://dnpb.sourceforge.net/schemas/prebuild-1.7.xsd" version="1.7"> 2<Prebuild xmlns="http://dnpb.sourceforge.net/schemas/prebuild-1.7.xsd" version="1.7">
3 <Solution name="OpenSim" activeConfig="Debug" path="./" version="0.5.0-$Rev$"> 3 <Solution name="OpenSim" activeConfig="Debug" path="./" version="0.5.0-$Rev: 8318 $">
4 <Configuration name="Debug"> 4 <Configuration name="Debug">
5 <Options> 5 <Options>
6 <CompilerDefines>TRACE;DEBUG</CompilerDefines> 6 <CompilerDefines>TRACE;DEBUG</CompilerDefines>
@@ -1848,7 +1848,9 @@
1848 <Reference name="log4net.dll"/> 1848 <Reference name="log4net.dll"/>
1849 1849
1850 <Files> 1850 <Files>
1851 <Match pattern="*.cs" recurse="true"/> 1851 <Match pattern="*.cs" recurse="true">
1852 <Exclude name="Tests" pattern="Tests" />
1853 </Match>
1852 </Files> 1854 </Files>
1853 </Project> 1855 </Project>
1854 1856
@@ -2750,19 +2752,19 @@
2750 </Files> 2752 </Files>
2751 </Project> 2753 </Project>
2752 2754
2753 <Project name="OpenSim.Region.ScriptEngine.Shared.Tests" path="OpenSim/Region/ScriptEngine/Shared/Tests" type="Library"> 2755 <Project name="OpenSim.Region.ScriptEngine.Tests" path="OpenSim/Region/ScriptEngine" type="Library">
2754 <Configuration name="Debug"> 2756 <Configuration name="Debug">
2755 <Options> 2757 <Options>
2756 <OutputPath>../../../../../bin/</OutputPath> 2758 <OutputPath>../../../bin/</OutputPath>
2757 </Options> 2759 </Options>
2758 </Configuration> 2760 </Configuration>
2759 <Configuration name="Release"> 2761 <Configuration name="Release">
2760 <Options> 2762 <Options>
2761 <OutputPath>../../../../../bin/</OutputPath> 2763 <OutputPath>../../../bin/</OutputPath>
2762 </Options> 2764 </Options>
2763 </Configuration> 2765 </Configuration>
2764 2766
2765 <ReferencePath>../../../../../bin/</ReferencePath> 2767 <ReferencePath>../../../bin/</ReferencePath>
2766 <Reference name="System" localCopy="false"/> 2768 <Reference name="System" localCopy="false"/>
2767 <Reference name="OpenSim.Framework"/> 2769 <Reference name="OpenSim.Framework"/>
2768 <Reference name="OpenSim.Region.Framework"/> 2770 <Reference name="OpenSim.Region.Framework"/>
@@ -2773,30 +2775,21 @@
2773 <Reference name="nunit.framework.dll" /> 2775 <Reference name="nunit.framework.dll" />
2774 <Reference name="Nini.dll" /> 2776 <Reference name="Nini.dll" />
2775 <Reference name="OpenMetaverseTypes.dll"/> 2777 <Reference name="OpenMetaverseTypes.dll"/>
2776 <Files>
2777 <Match pattern="*.cs" recurse="false"/>
2778 </Files>
2779 </Project>
2780
2781 <Project name="OpenSim.Region.ScriptEngine.Shared.CodeTools.Tests" path="OpenSim/Region/ScriptEngine/Shared/CodeTools/Tests" type="Library">
2782 <Configuration name="Debug">
2783 <Options>
2784 <OutputPath>../../../../../../bin/</OutputPath>
2785 </Options>
2786 </Configuration>
2787 <Configuration name="Release">
2788 <Options>
2789 <OutputPath>../../../../../../bin/</OutputPath>
2790 </Options>
2791 </Configuration>
2792
2793 <ReferencePath>../../../../../../bin/</ReferencePath>
2794 <Reference name="System" localCopy="false"/>
2795 <Reference name="OpenSim.Region.ScriptEngine.Shared.CodeTools"/> 2778 <Reference name="OpenSim.Region.ScriptEngine.Shared.CodeTools"/>
2796 <Reference name="nunit.framework.dll" /> 2779 <Reference name="OpenSim.Region.ScriptEngine.Shared"/>
2797 <Reference name="Tools.dll" /> 2780 <Reference name="Tools.dll" />
2781
2782 <!--
2783 TODO: this is kind of lame, we basically build a duplicate
2784 assembly but with tests added in, just so that we don't
2785 need to hard code in a bunch of Test directories here. If
2786 pattern="Tests/*.cs" worked, we wouldn't need this.
2787 -->
2798 <Files> 2788 <Files>
2799 <Match pattern="*.cs" recurse="false"/> 2789 <!-- SADLY the way this works means you need to keep adding these paths -->
2790 <Match path="Shared/Tests" pattern="*.cs" recurse="true" />
2791 <Match path="Shared/CodeTools/Tests" pattern="*.cs" recurse="true" />
2792 <Match path="XEngine/Tests" pattern="*.cs" recurse="true" />
2800 </Files> 2793 </Files>
2801 </Project> 2794 </Project>
2802 2795