diff options
author | Melanie Thielker | 2017-01-05 19:07:37 +0000 |
---|---|---|
committer | Melanie Thielker | 2017-01-05 19:07:37 +0000 |
commit | b16abc8166c29585cb76cc55c3bdd76e5833cb4f (patch) | |
tree | 6a34f465a74b7a3a6dc00a3d7aa8dcc25ac3e3a5 /OpenSim/Region/Framework/Scenes/Tests/EntityManagerTests.cs | |
parent | Make it possible to disable the bakes module in the way it is described in co... (diff) | |
download | opensim-SC_OLD-b16abc8166c29585cb76cc55c3bdd76e5833cb4f.zip opensim-SC_OLD-b16abc8166c29585cb76cc55c3bdd76e5833cb4f.tar.gz opensim-SC_OLD-b16abc8166c29585cb76cc55c3bdd76e5833cb4f.tar.bz2 opensim-SC_OLD-b16abc8166c29585cb76cc55c3bdd76e5833cb4f.tar.xz |
Massive tab and trailing space cleanup
Diffstat (limited to 'OpenSim/Region/Framework/Scenes/Tests/EntityManagerTests.cs')
-rw-r--r-- | OpenSim/Region/Framework/Scenes/Tests/EntityManagerTests.cs | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/OpenSim/Region/Framework/Scenes/Tests/EntityManagerTests.cs b/OpenSim/Region/Framework/Scenes/Tests/EntityManagerTests.cs index da18941..fa698a9 100644 --- a/OpenSim/Region/Framework/Scenes/Tests/EntityManagerTests.cs +++ b/OpenSim/Region/Framework/Scenes/Tests/EntityManagerTests.cs | |||
@@ -50,7 +50,7 @@ namespace OpenSim.Region.Framework.Scenes.Tests | |||
50 | public void T010_AddObjects() | 50 | public void T010_AddObjects() |
51 | { | 51 | { |
52 | TestHelpers.InMethod(); | 52 | TestHelpers.InMethod(); |
53 | 53 | ||
54 | random = new Random(); | 54 | random = new Random(); |
55 | SceneObjectGroup found; | 55 | SceneObjectGroup found; |
56 | EntityManager entman = new EntityManager(); | 56 | EntityManager entman = new EntityManager(); |
@@ -62,7 +62,7 @@ namespace OpenSim.Region.Framework.Scenes.Tests | |||
62 | UUID obj2 = sog.UUID; | 62 | UUID obj2 = sog.UUID; |
63 | uint li2 = sog.LocalId; | 63 | uint li2 = sog.LocalId; |
64 | entman.Add(sog); | 64 | entman.Add(sog); |
65 | 65 | ||
66 | found = (SceneObjectGroup)entman[obj1]; | 66 | found = (SceneObjectGroup)entman[obj1]; |
67 | Assert.That(found.UUID ,Is.EqualTo(obj1)); | 67 | Assert.That(found.UUID ,Is.EqualTo(obj1)); |
68 | found = (SceneObjectGroup)entman[li1]; | 68 | found = (SceneObjectGroup)entman[li1]; |
@@ -85,15 +85,15 @@ namespace OpenSim.Region.Framework.Scenes.Tests | |||
85 | public void T011_ThreadAddRemoveTest() | 85 | public void T011_ThreadAddRemoveTest() |
86 | { | 86 | { |
87 | TestHelpers.InMethod(); | 87 | TestHelpers.InMethod(); |
88 | 88 | ||
89 | // This test adds and removes with mutiple threads, attempting to break the | 89 | // This test adds and removes with mutiple threads, attempting to break the |
90 | // uuid and localid dictionary coherence. | 90 | // uuid and localid dictionary coherence. |
91 | EntityManager entman = new EntityManager(); | 91 | EntityManager entman = new EntityManager(); |
92 | SceneObjectGroup sog = NewSOG(); | 92 | SceneObjectGroup sog = NewSOG(); |
93 | for (int j=0; j<20; j++) | 93 | for (int j=0; j<20; j++) |
94 | { | 94 | { |
95 | List<Thread> trdlist = new List<Thread>(); | 95 | List<Thread> trdlist = new List<Thread>(); |
96 | 96 | ||
97 | for (int i=0; i<4; i++) | 97 | for (int i=0; i<4; i++) |
98 | { | 98 | { |
99 | // Adds scene object | 99 | // Adds scene object |
@@ -101,14 +101,14 @@ namespace OpenSim.Region.Framework.Scenes.Tests | |||
101 | Thread start = new Thread(new ThreadStart(test.TestAddSceneObject)); | 101 | Thread start = new Thread(new ThreadStart(test.TestAddSceneObject)); |
102 | start.Start(); | 102 | start.Start(); |
103 | trdlist.Add(start); | 103 | trdlist.Add(start); |
104 | 104 | ||
105 | // Removes it | 105 | // Removes it |
106 | test = new NewTestThreads(entman,sog); | 106 | test = new NewTestThreads(entman,sog); |
107 | start = new Thread(new ThreadStart(test.TestRemoveSceneObject)); | 107 | start = new Thread(new ThreadStart(test.TestRemoveSceneObject)); |
108 | start.Start(); | 108 | start.Start(); |
109 | trdlist.Add(start); | 109 | trdlist.Add(start); |
110 | } | 110 | } |
111 | foreach (Thread thread in trdlist) | 111 | foreach (Thread thread in trdlist) |
112 | { | 112 | { |
113 | thread.Join(); | 113 | thread.Join(); |
114 | } | 114 | } |
@@ -133,14 +133,14 @@ namespace OpenSim.Region.Framework.Scenes.Tests | |||
133 | 133 | ||
134 | SceneObjectGroup sog = new SceneObjectGroup(sop); | 134 | SceneObjectGroup sog = new SceneObjectGroup(sop); |
135 | scene.AddNewSceneObject(sog, false); | 135 | scene.AddNewSceneObject(sog, false); |
136 | 136 | ||
137 | return sog; | 137 | return sog; |
138 | } | 138 | } |
139 | 139 | ||
140 | private static string RandomName() | 140 | private static string RandomName() |
141 | { | 141 | { |
142 | StringBuilder name = new StringBuilder(); | 142 | StringBuilder name = new StringBuilder(); |
143 | int size = random.Next(40,80); | 143 | int size = random.Next(40,80); |
144 | char ch ; | 144 | char ch ; |
145 | for (int i=0; i<size; i++) | 145 | for (int i=0; i<size; i++) |
146 | { | 146 | { |
@@ -156,7 +156,7 @@ namespace OpenSim.Region.Framework.Scenes.Tests | |||
156 | private EntityManager entman; | 156 | private EntityManager entman; |
157 | private SceneObjectGroup sog; | 157 | private SceneObjectGroup sog; |
158 | private Random random; | 158 | private Random random; |
159 | 159 | ||
160 | public NewTestThreads(EntityManager entman, SceneObjectGroup sog) | 160 | public NewTestThreads(EntityManager entman, SceneObjectGroup sog) |
161 | { | 161 | { |
162 | this.entman = entman; | 162 | this.entman = entman; |