aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim
diff options
context:
space:
mode:
authorUbitUmarov2015-11-19 02:43:49 +0000
committerUbitUmarov2015-11-19 02:43:49 +0000
commit759fda087123a6814e52018591fba6ea45f06f2b (patch)
tree6d50872d674a27a5dadef794c797060132b3f840 /OpenSim
parent work around some 'tests' errors: just a test (diff)
downloadopensim-SC-759fda087123a6814e52018591fba6ea45f06f2b.zip
opensim-SC-759fda087123a6814e52018591fba6ea45f06f2b.tar.gz
opensim-SC-759fda087123a6814e52018591fba6ea45f06f2b.tar.bz2
opensim-SC-759fda087123a6814e52018591fba6ea45f06f2b.tar.xz
work around some 'tests' errors: reset the event at start of new test.
Diffstat (limited to 'OpenSim')
-rw-r--r--OpenSim/Region/ScriptEngine/XEngine/Tests/XEngineCrossingTests.cs6
1 files changed, 5 insertions, 1 deletions
diff --git a/OpenSim/Region/ScriptEngine/XEngine/Tests/XEngineCrossingTests.cs b/OpenSim/Region/ScriptEngine/XEngine/Tests/XEngineCrossingTests.cs
index 561b271..b956d25 100644
--- a/OpenSim/Region/ScriptEngine/XEngine/Tests/XEngineCrossingTests.cs
+++ b/OpenSim/Region/ScriptEngine/XEngine/Tests/XEngineCrossingTests.cs
@@ -85,6 +85,7 @@ namespace OpenSim.Region.ScriptEngine.XEngine.Tests
85 85
86 IConfig startupConfig = configSource.AddConfig("Startup"); 86 IConfig startupConfig = configSource.AddConfig("Startup");
87 startupConfig.Set("DefaultScriptEngine", "XEngine"); 87 startupConfig.Set("DefaultScriptEngine", "XEngine");
88 startupConfig.Set("TrustBinaries", "true");
88 89
89 IConfig xEngineConfig = configSource.AddConfig("XEngine"); 90 IConfig xEngineConfig = configSource.AddConfig("XEngine");
90 xEngineConfig.Set("Enabled", "true"); 91 xEngineConfig.Set("Enabled", "true");
@@ -161,6 +162,7 @@ default
161 162
162 EventParams ep = new EventParams("touch_start", new Object[] { new LSL_Types.LSLInteger(1) }, det); 163 EventParams ep = new EventParams("touch_start", new Object[] { new LSL_Types.LSLInteger(1) }, det);
163 164
165 chatEvent.Reset();
164 xEngineA.PostObjectEvent(soSceneA.LocalId, ep); 166 xEngineA.PostObjectEvent(soSceneA.LocalId, ep);
165 chatEvent.WaitOne(60000); 167 chatEvent.WaitOne(60000);
166 168
@@ -169,12 +171,13 @@ default
169 171
170 sceneB.EventManager.OnChatFromWorld += (s, m) => { messageReceived = m; chatEvent.Set(); }; 172 sceneB.EventManager.OnChatFromWorld += (s, m) => { messageReceived = m; chatEvent.Set(); };
171 173
174 chatEvent.Reset();
172 // Cross with a negative value 175 // Cross with a negative value
173 soSceneA.AbsolutePosition = new Vector3(128, -10, 20); 176 soSceneA.AbsolutePosition = new Vector3(128, -10, 20);
174 177
175 chatEvent.WaitOne(60000); 178 chatEvent.WaitOne(60000);
176 Assert.That(messageReceived, Is.Not.Null, "No Changed message received."); 179 Assert.That(messageReceived, Is.Not.Null, "No Changed message received.");
177 Assert.That(messageReceived.Message, Is.Not.Null, "No Changed message received."); 180 Assert.That(messageReceived.Message, Is.Not.Null, "Changed message without content");
178 Assert.That(messageReceived.Message, Is.EqualTo("Changed")); 181 Assert.That(messageReceived.Message, Is.EqualTo("Changed"));
179 182
180 // TEST sending event to moved prim and output 183 // TEST sending event to moved prim and output
@@ -190,6 +193,7 @@ default
190 193
191 EventParams ep = new EventParams("touch_start", new Object[] { new LSL_Types.LSLInteger(1) }, det); 194 EventParams ep = new EventParams("touch_start", new Object[] { new LSL_Types.LSLInteger(1) }, det);
192 195
196 chatEvent.Reset();
193 xEngineB.PostObjectEvent(soSceneB.LocalId, ep); 197 xEngineB.PostObjectEvent(soSceneB.LocalId, ep);
194 chatEvent.WaitOne(60000); 198 chatEvent.WaitOne(60000);
195 199