diff options
Diffstat (limited to '')
3 files changed, 1 insertions, 234 deletions
diff --git a/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/Tests/InventoryArchiverTests.cs b/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/Tests/InventoryArchiverTests.cs index 2d80382..3fb2c8c 100644 --- a/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/Tests/InventoryArchiverTests.cs +++ b/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/Tests/InventoryArchiverTests.cs | |||
@@ -741,7 +741,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver.Tests | |||
741 | public void TestMergeIarPath() | 741 | public void TestMergeIarPath() |
742 | { | 742 | { |
743 | TestHelper.InMethod(); | 743 | TestHelper.InMethod(); |
744 | log4net.Config.XmlConfigurator.Configure(); | 744 | // log4net.Config.XmlConfigurator.Configure(); |
745 | 745 | ||
746 | Scene scene = SceneSetupHelpers.SetupScene("inventory"); | 746 | Scene scene = SceneSetupHelpers.SetupScene("inventory"); |
747 | UserAccount ua1 = UserProfileTestUtils.CreateUserWithInventory(scene); | 747 | UserAccount ua1 = UserProfileTestUtils.CreateUserWithInventory(scene); |
diff --git a/OpenSim/Region/Framework/Scenes/Tests/SceneBaseTests.cs b/OpenSim/Region/Framework/Scenes/Tests/SceneBaseTests.cs deleted file mode 100644 index 42587c1..0000000 --- a/OpenSim/Region/Framework/Scenes/Tests/SceneBaseTests.cs +++ /dev/null | |||
@@ -1,86 +0,0 @@ | |||
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 OpenSimulator 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 | |||
28 | using System; | ||
29 | using NUnit.Framework; | ||
30 | using OpenMetaverse; | ||
31 | using OpenSim.Framework; | ||
32 | using GridRegion = OpenSim.Services.Interfaces.GridRegion; | ||
33 | |||
34 | namespace OpenSim.Region.Framework.Scenes.Tests | ||
35 | { | ||
36 | /// <summary> | ||
37 | /// Scene presence tests | ||
38 | /// </summary> | ||
39 | [TestFixture] | ||
40 | public class SceneBaseTests | ||
41 | { | ||
42 | private class SceneBaseImpl : SceneBase | ||
43 | { | ||
44 | public override void Update() | ||
45 | { | ||
46 | throw new NotImplementedException(); | ||
47 | } | ||
48 | |||
49 | public override void LoadWorldMap() | ||
50 | { | ||
51 | throw new NotImplementedException(); | ||
52 | } | ||
53 | |||
54 | public override void AddNewClient(IClientAPI client) | ||
55 | { | ||
56 | throw new NotImplementedException(); | ||
57 | } | ||
58 | |||
59 | public override void RemoveClient(UUID agentID) | ||
60 | { | ||
61 | throw new NotImplementedException(); | ||
62 | } | ||
63 | |||
64 | public override void OtherRegionUp(GridRegion otherRegion) | ||
65 | { | ||
66 | throw new NotImplementedException(); | ||
67 | } | ||
68 | |||
69 | public override bool TryGetScenePresence(UUID agentID, out ScenePresence scenePresence) | ||
70 | { | ||
71 | throw new NotImplementedException(); | ||
72 | } | ||
73 | |||
74 | public override bool CheckClient(UUID agentID, System.Net.IPEndPoint ep) | ||
75 | { | ||
76 | throw new NotImplementedException(); | ||
77 | } | ||
78 | } | ||
79 | |||
80 | [Test] | ||
81 | public void TestConstructor() | ||
82 | { | ||
83 | new SceneBaseImpl(); | ||
84 | } | ||
85 | } | ||
86 | } | ||
diff --git a/OpenSim/Region/Framework/Scenes/Tests/SceneTests.cs b/OpenSim/Region/Framework/Scenes/Tests/SceneTests.cs deleted file mode 100644 index 8b2d387..0000000 --- a/OpenSim/Region/Framework/Scenes/Tests/SceneTests.cs +++ /dev/null | |||
@@ -1,147 +0,0 @@ | |||
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 OpenSimulator 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 | |||
28 | using System; | ||
29 | using System.Collections.Generic; | ||
30 | using NUnit.Framework; | ||
31 | using OpenMetaverse; | ||
32 | using OpenSim.Framework; | ||
33 | using OpenSim.Region.Framework.Interfaces; | ||
34 | |||
35 | namespace OpenSim.Region.Framework.Scenes.Tests | ||
36 | { | ||
37 | /// <summary> | ||
38 | /// Scene presence tests | ||
39 | /// </summary> | ||
40 | [TestFixture] | ||
41 | public class SceneTests | ||
42 | { | ||
43 | private class FakeStorageManager : StorageManager | ||
44 | { | ||
45 | private class FakeRegionDataStore : IRegionDataStore | ||
46 | { | ||
47 | public void Initialise(string filename) | ||
48 | { | ||
49 | } | ||
50 | |||
51 | public void Dispose() | ||
52 | { | ||
53 | } | ||
54 | |||
55 | public void StoreObject(SceneObjectGroup obj, UUID regionUUID) | ||
56 | { | ||
57 | throw new NotImplementedException(); | ||
58 | } | ||
59 | |||
60 | public void RemoveObject(UUID uuid, UUID regionUUID) | ||
61 | { | ||
62 | throw new NotImplementedException(); | ||
63 | } | ||
64 | |||
65 | public void StorePrimInventory(UUID primID, ICollection<TaskInventoryItem> items) | ||
66 | { | ||
67 | throw new NotImplementedException(); | ||
68 | } | ||
69 | |||
70 | public List<SceneObjectGroup> LoadObjects(UUID regionUUID) | ||
71 | { | ||
72 | throw new NotImplementedException(); | ||
73 | } | ||
74 | |||
75 | public void StoreTerrain(double[,] terrain, UUID regionID) | ||
76 | { | ||
77 | throw new NotImplementedException(); | ||
78 | } | ||
79 | |||
80 | public double[,] LoadTerrain(UUID regionID) | ||
81 | { | ||
82 | throw new NotImplementedException(); | ||
83 | } | ||
84 | |||
85 | public void StoreLandObject(ILandObject Parcel) | ||
86 | { | ||
87 | throw new NotImplementedException(); | ||
88 | } | ||
89 | |||
90 | public void RemoveLandObject(UUID globalID) | ||
91 | { | ||
92 | throw new NotImplementedException(); | ||
93 | } | ||
94 | |||
95 | public List<LandData> LoadLandObjects(UUID regionUUID) | ||
96 | { | ||
97 | throw new NotImplementedException(); | ||
98 | } | ||
99 | |||
100 | public void StoreRegionSettings(RegionSettings rs) | ||
101 | { | ||
102 | throw new NotImplementedException(); | ||
103 | } | ||
104 | public RegionLightShareData LoadRegionWindlightSettings(UUID regionUUID) | ||
105 | { | ||
106 | //This connector doesn't support the windlight module yet | ||
107 | //Return default LL windlight settings | ||
108 | return new RegionLightShareData(); | ||
109 | } | ||
110 | public void StoreRegionWindlightSettings(RegionLightShareData wl) | ||
111 | { | ||
112 | //This connector doesn't support the windlight module yet | ||
113 | } | ||
114 | public RegionSettings LoadRegionSettings(UUID regionUUID) | ||
115 | { | ||
116 | return null; | ||
117 | } | ||
118 | |||
119 | public void Shutdown() | ||
120 | { | ||
121 | throw new NotImplementedException(); | ||
122 | } | ||
123 | } | ||
124 | |||
125 | public FakeStorageManager() : base(new FakeRegionDataStore()) | ||
126 | { | ||
127 | } | ||
128 | |||
129 | public FakeStorageManager(IRegionDataStore storage) : this() | ||
130 | { | ||
131 | } | ||
132 | |||
133 | public FakeStorageManager(string dllName, string connectionstring, string estateconnectionstring) : this() | ||
134 | { | ||
135 | } | ||
136 | } | ||
137 | |||
138 | [Test] | ||
139 | public void TestConstructor() | ||
140 | { | ||
141 | RegionInfo regionInfo = new RegionInfo(0,0,null,null); | ||
142 | FakeStorageManager storageManager = new FakeStorageManager(); | ||
143 | |||
144 | new Scene(regionInfo, null, null, storageManager, null, false, false, false, null, null); | ||
145 | } | ||
146 | } | ||
147 | } | ||