diff options
author | teravus | 2012-11-15 10:05:16 -0500 |
---|---|---|
committer | teravus | 2012-11-15 10:05:16 -0500 |
commit | e9153e1d1aae50024d8cd05fe14a9bce34343a0e (patch) | |
tree | bc111d34f95a26b99c7e34d9e495dc14d1802cc3 /OpenSim/Tests | |
parent | Merge master into teravuswork (diff) | |
download | opensim-SC_OLD-e9153e1d1aae50024d8cd05fe14a9bce34343a0e.zip opensim-SC_OLD-e9153e1d1aae50024d8cd05fe14a9bce34343a0e.tar.gz opensim-SC_OLD-e9153e1d1aae50024d8cd05fe14a9bce34343a0e.tar.bz2 opensim-SC_OLD-e9153e1d1aae50024d8cd05fe14a9bce34343a0e.tar.xz |
Revert "Merge master into teravuswork", it should have been avination, not master.
This reverts commit dfac269032300872c4d0dc507f4f9062d102b0f4, reversing
changes made to 619c39e5144f15aca129d6d999bcc5c34133ee64.
Diffstat (limited to 'OpenSim/Tests')
-rw-r--r-- | OpenSim/Tests/Common/Helpers/SceneHelpers.cs | 2 | ||||
-rw-r--r-- | OpenSim/Tests/Common/Helpers/UserInventoryHelpers.cs | 4 | ||||
-rw-r--r-- | OpenSim/Tests/Common/Mock/TestClient.cs | 16 | ||||
-rw-r--r-- | OpenSim/Tests/Common/Mock/TestXInventoryDataPlugin.cs | 131 | ||||
-rw-r--r-- | OpenSim/Tests/Common/TestHelpers.cs | 1 | ||||
-rw-r--r-- | OpenSim/Tests/Stress/VectorRenderModuleStressTests.cs | 132 | ||||
-rw-r--r-- | OpenSim/Tests/Torture/NPCTortureTests.cs (renamed from OpenSim/Tests/Performance/NPCPerformanceTests.cs) | 6 | ||||
-rw-r--r-- | OpenSim/Tests/Torture/ObjectTortureTests.cs (renamed from OpenSim/Tests/Performance/ObjectPerformanceTests.cs) | 6 | ||||
-rw-r--r-- | OpenSim/Tests/Torture/ScriptTortureTests.cs (renamed from OpenSim/Tests/Performance/ScriptPerformanceTests.cs) | 6 |
9 files changed, 21 insertions, 283 deletions
diff --git a/OpenSim/Tests/Common/Helpers/SceneHelpers.cs b/OpenSim/Tests/Common/Helpers/SceneHelpers.cs index fc49169..7598cc3 100644 --- a/OpenSim/Tests/Common/Helpers/SceneHelpers.cs +++ b/OpenSim/Tests/Common/Helpers/SceneHelpers.cs | |||
@@ -245,7 +245,7 @@ namespace OpenSim.Tests.Common | |||
245 | config.AddConfig("Modules"); | 245 | config.AddConfig("Modules"); |
246 | config.AddConfig("InventoryService"); | 246 | config.AddConfig("InventoryService"); |
247 | config.Configs["Modules"].Set("InventoryServices", "LocalInventoryServicesConnector"); | 247 | config.Configs["Modules"].Set("InventoryServices", "LocalInventoryServicesConnector"); |
248 | config.Configs["InventoryService"].Set("LocalServiceModule", "OpenSim.Services.InventoryService.dll:XInventoryService"); | 248 | config.Configs["InventoryService"].Set("LocalServiceModule", "OpenSim.Services.InventoryService.dll:InventoryService"); |
249 | config.Configs["InventoryService"].Set("StorageProvider", "OpenSim.Tests.Common.dll"); | 249 | config.Configs["InventoryService"].Set("StorageProvider", "OpenSim.Tests.Common.dll"); |
250 | 250 | ||
251 | LocalInventoryServicesConnector inventoryService = new LocalInventoryServicesConnector(); | 251 | LocalInventoryServicesConnector inventoryService = new LocalInventoryServicesConnector(); |
diff --git a/OpenSim/Tests/Common/Helpers/UserInventoryHelpers.cs b/OpenSim/Tests/Common/Helpers/UserInventoryHelpers.cs index 87d9410..b3a7c9e 100644 --- a/OpenSim/Tests/Common/Helpers/UserInventoryHelpers.cs +++ b/OpenSim/Tests/Common/Helpers/UserInventoryHelpers.cs | |||
@@ -199,9 +199,7 @@ namespace OpenSim.Tests.Common | |||
199 | string[] components = path.Split(new string[] { PATH_DELIMITER }, 2, StringSplitOptions.None); | 199 | string[] components = path.Split(new string[] { PATH_DELIMITER }, 2, StringSplitOptions.None); |
200 | 200 | ||
201 | InventoryFolderBase newFolder | 201 | InventoryFolderBase newFolder |
202 | = new InventoryFolderBase( | 202 | = new InventoryFolderBase(UUID.Random(), components[0], parentFolder.Owner, parentFolder.ID); |
203 | UUID.Random(), components[0], parentFolder.Owner, (short)AssetType.Unknown, parentFolder.ID, 0); | ||
204 | |||
205 | inventoryService.AddFolder(newFolder); | 203 | inventoryService.AddFolder(newFolder); |
206 | 204 | ||
207 | if (components.Length > 1) | 205 | if (components.Length > 1) |
diff --git a/OpenSim/Tests/Common/Mock/TestClient.cs b/OpenSim/Tests/Common/Mock/TestClient.cs index 5ad3c9f..78bb18e 100644 --- a/OpenSim/Tests/Common/Mock/TestClient.cs +++ b/OpenSim/Tests/Common/Mock/TestClient.cs | |||
@@ -531,9 +531,13 @@ namespace OpenSim.Tests.Common.Mock | |||
531 | { | 531 | { |
532 | } | 532 | } |
533 | 533 | ||
534 | public virtual void SendChatMessage( | 534 | public virtual void SendChatMessage(string message, byte type, Vector3 fromPos, string fromName, |
535 | string message, byte type, Vector3 fromPos, string fromName, | 535 | UUID fromAgentID, byte source, byte audible) |
536 | UUID fromAgentID, UUID ownerID, byte source, byte audible) | 536 | { |
537 | } | ||
538 | |||
539 | public virtual void SendChatMessage(byte[] message, byte type, Vector3 fromPos, string fromName, | ||
540 | UUID fromAgentID, byte source, byte audible) | ||
537 | { | 541 | { |
538 | } | 542 | } |
539 | 543 | ||
@@ -935,12 +939,12 @@ namespace OpenSim.Tests.Common.Mock | |||
935 | Close(); | 939 | Close(); |
936 | } | 940 | } |
937 | 941 | ||
938 | public void Close() | 942 | public void Close(bool c) |
939 | { | 943 | { |
940 | Close(true, false); | 944 | Close(); |
941 | } | 945 | } |
942 | 946 | ||
943 | public void Close(bool sendStop, bool force) | 947 | public void Close() |
944 | { | 948 | { |
945 | // Fire the callback for this connection closing | 949 | // Fire the callback for this connection closing |
946 | // This is necesary to get the presence detector to notice that a client has logged out. | 950 | // This is necesary to get the presence detector to notice that a client has logged out. |
diff --git a/OpenSim/Tests/Common/Mock/TestXInventoryDataPlugin.cs b/OpenSim/Tests/Common/Mock/TestXInventoryDataPlugin.cs deleted file mode 100644 index bca5979..0000000 --- a/OpenSim/Tests/Common/Mock/TestXInventoryDataPlugin.cs +++ /dev/null | |||
@@ -1,131 +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 System.Linq; | ||
31 | using System.Reflection; | ||
32 | using log4net; | ||
33 | using OpenMetaverse; | ||
34 | using OpenSim.Framework; | ||
35 | using OpenSim.Data; | ||
36 | |||
37 | namespace OpenSim.Tests.Common.Mock | ||
38 | { | ||
39 | public class TestXInventoryDataPlugin : IXInventoryData | ||
40 | { | ||
41 | private Dictionary<UUID, XInventoryFolder> m_allFolders = new Dictionary<UUID, XInventoryFolder>(); | ||
42 | private Dictionary<UUID, XInventoryItem> m_allItems = new Dictionary<UUID, XInventoryItem>(); | ||
43 | |||
44 | public TestXInventoryDataPlugin(string conn, string realm) {} | ||
45 | |||
46 | public XInventoryItem[] GetItems(string[] fields, string[] vals) | ||
47 | { | ||
48 | List<XInventoryItem> origItems = Get<XInventoryItem>(fields, vals, m_allItems.Values.ToList()); | ||
49 | |||
50 | return origItems.Select(i => i.Clone()).ToArray(); | ||
51 | } | ||
52 | |||
53 | public XInventoryFolder[] GetFolders(string[] fields, string[] vals) | ||
54 | { | ||
55 | List<XInventoryFolder> origFolders | ||
56 | = Get<XInventoryFolder>(fields, vals, m_allFolders.Values.ToList()); | ||
57 | |||
58 | return origFolders.Select(f => f.Clone()).ToArray(); | ||
59 | } | ||
60 | |||
61 | private List<T> Get<T>(string[] fields, string[] vals, List<T> inputEntities) | ||
62 | { | ||
63 | List<T> entities = inputEntities; | ||
64 | |||
65 | for (int i = 0; i < fields.Length; i++) | ||
66 | { | ||
67 | entities | ||
68 | = entities.Where( | ||
69 | e => | ||
70 | { | ||
71 | FieldInfo fi = typeof(T).GetField(fields[i]); | ||
72 | if (fi == null) | ||
73 | throw new NotImplementedException(string.Format("No field {0} for val {1}", fields[i], vals[i])); | ||
74 | |||
75 | return fi.GetValue(e).ToString() == vals[i]; | ||
76 | } | ||
77 | ).ToList(); | ||
78 | } | ||
79 | |||
80 | return entities; | ||
81 | } | ||
82 | |||
83 | public bool StoreFolder(XInventoryFolder folder) | ||
84 | { | ||
85 | m_allFolders[folder.folderID] = folder.Clone(); | ||
86 | |||
87 | // Console.WriteLine("Added folder {0} {1}", folder.folderName, folder.folderID); | ||
88 | |||
89 | return true; | ||
90 | } | ||
91 | |||
92 | public bool StoreItem(XInventoryItem item) | ||
93 | { | ||
94 | m_allItems[item.inventoryID] = item.Clone(); | ||
95 | |||
96 | // Console.WriteLine("Added item {0} {1}, creator {2}, owner {3}", item.inventoryName, item.inventoryID, item.creatorID, item.avatarID); | ||
97 | |||
98 | return true; | ||
99 | } | ||
100 | |||
101 | public bool DeleteFolders(string field, string val) | ||
102 | { | ||
103 | return DeleteFolders(new string[] { field }, new string[] { val }); | ||
104 | } | ||
105 | |||
106 | public bool DeleteFolders(string[] fields, string[] vals) | ||
107 | { | ||
108 | XInventoryFolder[] foldersToDelete = GetFolders(fields, vals); | ||
109 | Array.ForEach(foldersToDelete, f => m_allFolders.Remove(f.folderID)); | ||
110 | |||
111 | return true; | ||
112 | } | ||
113 | |||
114 | public bool DeleteItems(string field, string val) | ||
115 | { | ||
116 | return DeleteItems(new string[] { field }, new string[] { val }); | ||
117 | } | ||
118 | |||
119 | public bool DeleteItems(string[] fields, string[] vals) | ||
120 | { | ||
121 | XInventoryItem[] itemsToDelete = GetItems(fields, vals); | ||
122 | Array.ForEach(itemsToDelete, i => m_allItems.Remove(i.inventoryID)); | ||
123 | |||
124 | return true; | ||
125 | } | ||
126 | |||
127 | public bool MoveItem(string id, string newParent) { throw new NotImplementedException(); } | ||
128 | public XInventoryItem[] GetActiveGestures(UUID principalID) { throw new NotImplementedException(); } | ||
129 | public int GetAssetPermissions(UUID principalID, UUID assetID) { throw new NotImplementedException(); } | ||
130 | } | ||
131 | } \ No newline at end of file | ||
diff --git a/OpenSim/Tests/Common/TestHelpers.cs b/OpenSim/Tests/Common/TestHelpers.cs index 57da802..30121fe 100644 --- a/OpenSim/Tests/Common/TestHelpers.cs +++ b/OpenSim/Tests/Common/TestHelpers.cs | |||
@@ -95,7 +95,6 @@ namespace OpenSim.Tests.Common | |||
95 | public static void EnableLogging() | 95 | public static void EnableLogging() |
96 | { | 96 | { |
97 | log4net.Config.XmlConfigurator.Configure(EnableLoggingConfigStream); | 97 | log4net.Config.XmlConfigurator.Configure(EnableLoggingConfigStream); |
98 | EnableLoggingConfigStream.Position = 0; | ||
99 | } | 98 | } |
100 | 99 | ||
101 | /// <summary> | 100 | /// <summary> |
diff --git a/OpenSim/Tests/Stress/VectorRenderModuleStressTests.cs b/OpenSim/Tests/Stress/VectorRenderModuleStressTests.cs deleted file mode 100644 index 1f220c0..0000000 --- a/OpenSim/Tests/Stress/VectorRenderModuleStressTests.cs +++ /dev/null | |||
@@ -1,132 +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 System.IO; | ||
31 | using System.Linq; | ||
32 | using System.Reflection; | ||
33 | using System.Threading; | ||
34 | using log4net.Config; | ||
35 | using NUnit.Framework; | ||
36 | using OpenMetaverse; | ||
37 | using OpenMetaverse.Assets; | ||
38 | using OpenSim.Framework; | ||
39 | using OpenSim.Region.CoreModules.Scripting.DynamicTexture; | ||
40 | using OpenSim.Region.CoreModules.Scripting.VectorRender; | ||
41 | using OpenSim.Region.Framework.Scenes; | ||
42 | using OpenSim.Region.Framework.Scenes.Serialization; | ||
43 | using OpenSim.Tests.Common; | ||
44 | using OpenSim.Tests.Common.Mock; | ||
45 | |||
46 | namespace OpenSim.Tests.Stress | ||
47 | { | ||
48 | [TestFixture] | ||
49 | public class VectorRenderModuleStressTests : OpenSimTestCase | ||
50 | { | ||
51 | public Scene Scene { get; private set; } | ||
52 | public DynamicTextureModule Dtm { get; private set; } | ||
53 | public VectorRenderModule Vrm { get; private set; } | ||
54 | |||
55 | private void SetupScene(bool reuseTextures) | ||
56 | { | ||
57 | Scene = new SceneHelpers().SetupScene(); | ||
58 | |||
59 | Dtm = new DynamicTextureModule(); | ||
60 | Dtm.ReuseTextures = reuseTextures; | ||
61 | |||
62 | Vrm = new VectorRenderModule(); | ||
63 | |||
64 | SceneHelpers.SetupSceneModules(Scene, Dtm, Vrm); | ||
65 | } | ||
66 | |||
67 | [Test] | ||
68 | public void TestConcurrentRepeatedDraw() | ||
69 | { | ||
70 | int threads = 4; | ||
71 | TestHelpers.InMethod(); | ||
72 | |||
73 | SetupScene(false); | ||
74 | |||
75 | List<Drawer> drawers = new List<Drawer>(); | ||
76 | |||
77 | for (int i = 0; i < threads; i++) | ||
78 | { | ||
79 | Drawer d = new Drawer(this, i); | ||
80 | drawers.Add(d); | ||
81 | Console.WriteLine("Starting drawer {0}", i); | ||
82 | Util.FireAndForget(o => d.Draw()); | ||
83 | } | ||
84 | |||
85 | Thread.Sleep(10 * 60 * 1000); | ||
86 | |||
87 | drawers.ForEach(d => d.Ready = false); | ||
88 | drawers.ForEach(d => Console.WriteLine("Drawer {0} drew {1} textures", d.Number, d.Pass + 1)); | ||
89 | } | ||
90 | |||
91 | class Drawer | ||
92 | { | ||
93 | public int Number { get; private set; } | ||
94 | public int Pass { get; private set; } | ||
95 | public bool Ready { get; set; } | ||
96 | |||
97 | private VectorRenderModuleStressTests m_tests; | ||
98 | |||
99 | public Drawer(VectorRenderModuleStressTests tests, int number) | ||
100 | { | ||
101 | m_tests = tests; | ||
102 | Number = number; | ||
103 | Ready = true; | ||
104 | } | ||
105 | |||
106 | public void Draw() | ||
107 | { | ||
108 | SceneObjectGroup so = SceneHelpers.AddSceneObject(m_tests.Scene); | ||
109 | |||
110 | while (Ready) | ||
111 | { | ||
112 | UUID originalTextureID = so.RootPart.Shape.Textures.GetFace(0).TextureID; | ||
113 | |||
114 | // Ensure unique text | ||
115 | string text = string.Format("{0:D2}{1}", Number, Pass); | ||
116 | |||
117 | m_tests.Dtm.AddDynamicTextureData( | ||
118 | m_tests.Scene.RegionInfo.RegionID, | ||
119 | so.UUID, | ||
120 | m_tests.Vrm.GetContentType(), | ||
121 | string.Format("PenColour BLACK; MoveTo 40,220; FontSize 32; Text {0};", text), | ||
122 | "", | ||
123 | 0); | ||
124 | |||
125 | Assert.That(originalTextureID, Is.Not.EqualTo(so.RootPart.Shape.Textures.GetFace(0).TextureID)); | ||
126 | |||
127 | Pass++; | ||
128 | } | ||
129 | } | ||
130 | } | ||
131 | } | ||
132 | } \ No newline at end of file | ||
diff --git a/OpenSim/Tests/Performance/NPCPerformanceTests.cs b/OpenSim/Tests/Torture/NPCTortureTests.cs index 627765b..731df68 100644 --- a/OpenSim/Tests/Performance/NPCPerformanceTests.cs +++ b/OpenSim/Tests/Torture/NPCTortureTests.cs | |||
@@ -47,10 +47,10 @@ using OpenSim.Services.AvatarService; | |||
47 | using OpenSim.Tests.Common; | 47 | using OpenSim.Tests.Common; |
48 | using OpenSim.Tests.Common.Mock; | 48 | using OpenSim.Tests.Common.Mock; |
49 | 49 | ||
50 | namespace OpenSim.Tests.Performance | 50 | namespace OpenSim.Tests.Torture |
51 | { | 51 | { |
52 | /// <summary> | 52 | /// <summary> |
53 | /// NPC performance tests | 53 | /// NPC torture tests |
54 | /// </summary> | 54 | /// </summary> |
55 | /// <remarks> | 55 | /// <remarks> |
56 | /// Don't rely on the numbers given by these tests - they will vary a lot depending on what is already cached, | 56 | /// Don't rely on the numbers given by these tests - they will vary a lot depending on what is already cached, |
@@ -58,7 +58,7 @@ namespace OpenSim.Tests.Performance | |||
58 | /// earlier tests. | 58 | /// earlier tests. |
59 | /// </remarks> | 59 | /// </remarks> |
60 | [TestFixture] | 60 | [TestFixture] |
61 | public class NPCPerformanceTests | 61 | public class NPCTortureTests |
62 | { | 62 | { |
63 | private TestScene scene; | 63 | private TestScene scene; |
64 | private AvatarFactoryModule afm; | 64 | private AvatarFactoryModule afm; |
diff --git a/OpenSim/Tests/Performance/ObjectPerformanceTests.cs b/OpenSim/Tests/Torture/ObjectTortureTests.cs index 2264d86..195d47b 100644 --- a/OpenSim/Tests/Performance/ObjectPerformanceTests.cs +++ b/OpenSim/Tests/Torture/ObjectTortureTests.cs | |||
@@ -36,10 +36,10 @@ using OpenSim.Region.Framework.Scenes; | |||
36 | using OpenSim.Tests.Common; | 36 | using OpenSim.Tests.Common; |
37 | using OpenSim.Tests.Common.Mock; | 37 | using OpenSim.Tests.Common.Mock; |
38 | 38 | ||
39 | namespace OpenSim.Tests.Performance | 39 | namespace OpenSim.Tests.Torture |
40 | { | 40 | { |
41 | /// <summary> | 41 | /// <summary> |
42 | /// Object performance tests | 42 | /// Object torture tests |
43 | /// </summary> | 43 | /// </summary> |
44 | /// <remarks> | 44 | /// <remarks> |
45 | /// Don't rely on the numbers given by these tests - they will vary a lot depending on what is already cached, | 45 | /// Don't rely on the numbers given by these tests - they will vary a lot depending on what is already cached, |
@@ -47,7 +47,7 @@ namespace OpenSim.Tests.Performance | |||
47 | /// earlier tests. | 47 | /// earlier tests. |
48 | /// </remarks> | 48 | /// </remarks> |
49 | [TestFixture] | 49 | [TestFixture] |
50 | public class ObjectPerformanceTests | 50 | public class ObjectTortureTests |
51 | { | 51 | { |
52 | [TearDown] | 52 | [TearDown] |
53 | public void TearDown() | 53 | public void TearDown() |
diff --git a/OpenSim/Tests/Performance/ScriptPerformanceTests.cs b/OpenSim/Tests/Torture/ScriptTortureTests.cs index d708abd..24f278f 100644 --- a/OpenSim/Tests/Performance/ScriptPerformanceTests.cs +++ b/OpenSim/Tests/Torture/ScriptTortureTests.cs | |||
@@ -42,10 +42,10 @@ using OpenSim.Region.ScriptEngine.XEngine; | |||
42 | using OpenSim.Tests.Common; | 42 | using OpenSim.Tests.Common; |
43 | using OpenSim.Tests.Common.Mock; | 43 | using OpenSim.Tests.Common.Mock; |
44 | 44 | ||
45 | namespace OpenSim.Tests.Performance | 45 | namespace OpenSim.Tests.Torture |
46 | { | 46 | { |
47 | /// <summary> | 47 | /// <summary> |
48 | /// Script performance tests | 48 | /// Script torture tests |
49 | /// </summary> | 49 | /// </summary> |
50 | /// <remarks> | 50 | /// <remarks> |
51 | /// Don't rely on the numbers given by these tests - they will vary a lot depending on what is already cached, | 51 | /// Don't rely on the numbers given by these tests - they will vary a lot depending on what is already cached, |
@@ -53,7 +53,7 @@ namespace OpenSim.Tests.Performance | |||
53 | /// earlier tests. | 53 | /// earlier tests. |
54 | /// </remarks> | 54 | /// </remarks> |
55 | [TestFixture] | 55 | [TestFixture] |
56 | public class ScriptPerformanceTests | 56 | public class ScriptTortureTests |
57 | { | 57 | { |
58 | private TestScene m_scene; | 58 | private TestScene m_scene; |
59 | private XEngine m_xEngine; | 59 | private XEngine m_xEngine; |