aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
-rw-r--r--.nant/local.include13
-rw-r--r--OpenSim/Framework/Communications/Tests/UserProfileCacheServiceTests.cs48
-rw-r--r--OpenSim/Region/Environment/Scenes/Tests/SceneObjectTests.cs7
-rw-r--r--prebuild.xml29
4 files changed, 89 insertions, 8 deletions
diff --git a/.nant/local.include b/.nant/local.include
index 51146dc..84e775d 100644
--- a/.nant/local.include
+++ b/.nant/local.include
@@ -35,6 +35,7 @@
35 <test> 35 <test>
36 <assemblies> 36 <assemblies>
37 <include name="./bin/OpenSim.Framework.Tests.dll" /> 37 <include name="./bin/OpenSim.Framework.Tests.dll" />
38 <include name="./bin/OpenSim.Framework.Communications.Tests.dll"/>
38 <include name="./bin/OpenSim.Framework.Servers.Tests.dll" /> 39 <include name="./bin/OpenSim.Framework.Servers.Tests.dll" />
39 <include name="./bin/OpenSim.Region.ClientStack.LindenUDP.Tests.dll" /> 40 <include name="./bin/OpenSim.Region.ClientStack.LindenUDP.Tests.dll" />
40 <include name="./bin/OpenSim.Region.ScriptEngine.Shared.Tests.dll" /> 41 <include name="./bin/OpenSim.Region.ScriptEngine.Shared.Tests.dll" />
@@ -60,6 +61,17 @@
60 <exec program="monocov"> 61 <exec program="monocov">
61 <arg value="--export-html=./cov/OpenSim.Framework.Servers ./cov/OpenSim.Framework.Servers.cov" /> 62 <arg value="--export-html=./cov/OpenSim.Framework.Servers ./cov/OpenSim.Framework.Servers.cov" />
62 </exec> 63 </exec>
64
65 <exec program="mono">
66 <arg value="--debug" />
67 <arg value="--profile=monocov:outfile=./cov/OpenSim.Framework.Communications.cov,+[OpenSim.Framework.Communications]" />
68 <arg value="/usr/lib/nunit/nunit-console.exe" />
69 <arg value="./bin/OpenSim.Framework.Communications.Tests.dll" />
70 </exec>
71 <delete dir="./cov/OpenSim.Framework.Communications" />
72 <exec program="monocov">
73 <arg value="--export-html=./cov/OpenSim.Framework.Servers ./cov/OpenSim.Framework.Communications.cov" />
74 </exec>
63 75
64 <exec program="mono"> 76 <exec program="mono">
65 <arg value="--debug" /> 77 <arg value="--debug" />
@@ -137,6 +149,7 @@
137 <test> 149 <test>
138 <assemblies> 150 <assemblies>
139 <include name="./bin/OpenSim.Framework.Tests.dll" /> 151 <include name="./bin/OpenSim.Framework.Tests.dll" />
152 <include name="./bin/OpenSim.Framework.Communications.Tests.dll"/>
140 <include name="./bin/OpenSim.Framework.Servers.Tests.dll" /> 153 <include name="./bin/OpenSim.Framework.Servers.Tests.dll" />
141 <include name="./bin/OpenSim.Region.ClientStack.LindenUDP.Tests.dll" /> 154 <include name="./bin/OpenSim.Region.ClientStack.LindenUDP.Tests.dll" />
142 <include name="./bin/OpenSim.Region.ScriptEngine.Shared.Tests.dll" /> 155 <include name="./bin/OpenSim.Region.ScriptEngine.Shared.Tests.dll" />
diff --git a/OpenSim/Framework/Communications/Tests/UserProfileCacheServiceTests.cs b/OpenSim/Framework/Communications/Tests/UserProfileCacheServiceTests.cs
new file mode 100644
index 0000000..0d239aa
--- /dev/null
+++ b/OpenSim/Framework/Communications/Tests/UserProfileCacheServiceTests.cs
@@ -0,0 +1,48 @@
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 NUnit.Framework;
30
31namespace OpenSim.Framework.Communications.Tests
32{
33 /// <summary>
34 /// User profile cache service tests
35 /// </summary>
36 [TestFixture]
37 public class UserProfileCacheServiceTests
38 {
39 /// <summary>
40 /// Test folder moving. Doesn't do what is says on the tin yet
41 /// </summary>
42 [Test]
43 public void TestMoveFolder()
44 {
45 // Temporarily empty
46 }
47 }
48}
diff --git a/OpenSim/Region/Environment/Scenes/Tests/SceneObjectTests.cs b/OpenSim/Region/Environment/Scenes/Tests/SceneObjectTests.cs
index ba231ca..9e6e4a7 100644
--- a/OpenSim/Region/Environment/Scenes/Tests/SceneObjectTests.cs
+++ b/OpenSim/Region/Environment/Scenes/Tests/SceneObjectTests.cs
@@ -42,12 +42,7 @@ namespace OpenSim.Region.Environment.Scenes.Tests
42 /// </summary> 42 /// </summary>
43 [TestFixture] 43 [TestFixture]
44 public class SceneObjectTests 44 public class SceneObjectTests
45 { 45 {
46 [SetUp]
47 public void Init()
48 {
49 }
50
51 /// <summary> 46 /// <summary>
52 /// Test adding an object to a scene. 47 /// Test adding an object to a scene.
53 /// </summary> 48 /// </summary>
diff --git a/prebuild.xml b/prebuild.xml
index 981c0bb..d2355a7 100644
--- a/prebuild.xml
+++ b/prebuild.xml
@@ -745,10 +745,35 @@
745 <Reference name="Nini.dll" /> 745 <Reference name="Nini.dll" />
746 <Reference name="XMLRPC.dll"/> 746 <Reference name="XMLRPC.dll"/>
747 <Reference name="log4net.dll"/> 747 <Reference name="log4net.dll"/>
748 <Reference name="GlynnTucker.Cache.dll"/> 748 <Reference name="GlynnTucker.Cache.dll"/>
749 749
750 <Files> 750 <Files>
751 <Match pattern="*.cs" recurse="true"/> 751 <Match pattern="*.cs" recurse="true">
752 <Exclude name="Tests" pattern="Tests"/>
753 </Match>
754 </Files>
755 </Project>
756
757 <Project name="OpenSim.Framework.Communications.Tests" path="OpenSim/Framework/Communications/Tests" type="Library">
758 <Configuration name="Debug">
759 <Options>
760 <OutputPath>../../../../bin/</OutputPath>
761 </Options>
762 </Configuration>
763 <Configuration name="Release">
764 <Options>
765 <OutputPath>../../../../bin/</OutputPath>
766 </Options>
767 </Configuration>
768
769 <ReferencePath>../../../../bin/</ReferencePath>
770 <Reference name="System"/>
771 <Reference name="log4net.dll"/>
772 <Reference name="nunit.framework.dll" />
773 <Reference name="OpenSim.Framework.Communications"/>
774
775 <Files>
776 <Match pattern="*.cs" recurse="false"/>
752 </Files> 777 </Files>
753 </Project> 778 </Project>
754 779