diff options
author | Melanie | 2013-12-07 01:08:49 +0000 |
---|---|---|
committer | Melanie | 2013-12-07 01:08:49 +0000 |
commit | 6d6b9ab791a6a759b2a3a8469569f536b3525894 (patch) | |
tree | 9b3a1a63f8b6bd4596d11904be04e667747601c7 /OpenSim/Region/ScriptEngine/Shared/CodeTools/Tests | |
parent | Merge branch 'master' into careminster (diff) | |
parent | Adding profile partners fix to SQLite and PgSQL drivers (diff) | |
download | opensim-SC_OLD-6d6b9ab791a6a759b2a3a8469569f536b3525894.zip opensim-SC_OLD-6d6b9ab791a6a759b2a3a8469569f536b3525894.tar.gz opensim-SC_OLD-6d6b9ab791a6a759b2a3a8469569f536b3525894.tar.bz2 opensim-SC_OLD-6d6b9ab791a6a759b2a3a8469569f536b3525894.tar.xz |
Merge branch 'master' into careminster
Conflicts:
OpenSim/Region/ClientStack/Linden/Caps/BunchOfCaps/BunchOfCaps.cs
OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs
OpenSim/Region/Framework/Scenes/ScenePresence.cs
Diffstat (limited to 'OpenSim/Region/ScriptEngine/Shared/CodeTools/Tests')
-rw-r--r-- | OpenSim/Region/ScriptEngine/Shared/CodeTools/Tests/LSL_EventTests.cs | 38 |
1 files changed, 37 insertions, 1 deletions
diff --git a/OpenSim/Region/ScriptEngine/Shared/CodeTools/Tests/LSL_EventTests.cs b/OpenSim/Region/ScriptEngine/Shared/CodeTools/Tests/LSL_EventTests.cs index 53ce405..5dcdf1a 100644 --- a/OpenSim/Region/ScriptEngine/Shared/CodeTools/Tests/LSL_EventTests.cs +++ b/OpenSim/Region/ScriptEngine/Shared/CodeTools/Tests/LSL_EventTests.cs | |||
@@ -213,7 +213,35 @@ namespace OpenSim.Region.ScriptEngine.Shared.Tests | |||
213 | // TestHelpers.EnableLogging(); | 213 | // TestHelpers.EnableLogging(); |
214 | 214 | ||
215 | TestIntArgEvent("touch_end"); | 215 | TestIntArgEvent("touch_end"); |
216 | } | 216 | } |
217 | |||
218 | [Test] | ||
219 | public void TestLandCollisionEvent() | ||
220 | { | ||
221 | TestHelpers.InMethod(); | ||
222 | // TestHelpers.EnableLogging(); | ||
223 | |||
224 | TestVectorArgEvent("land_collision"); | ||
225 | } | ||
226 | |||
227 | [Test] | ||
228 | public void TestLandCollisionStartEvent() | ||
229 | { | ||
230 | TestHelpers.InMethod(); | ||
231 | // TestHelpers.EnableLogging(); | ||
232 | |||
233 | TestVectorArgEvent("land_collision_start"); | ||
234 | } | ||
235 | |||
236 | [Test] | ||
237 | public void TestLandCollisionEndEvent() | ||
238 | { | ||
239 | TestHelpers.InMethod(); | ||
240 | // TestHelpers.EnableLogging(); | ||
241 | |||
242 | TestVectorArgEvent("land_collision_end"); | ||
243 | } | ||
244 | |||
217 | 245 | ||
218 | private void TestIntArgEvent(string eventName) | 246 | private void TestIntArgEvent(string eventName) |
219 | { | 247 | { |
@@ -223,6 +251,14 @@ namespace OpenSim.Region.ScriptEngine.Shared.Tests | |||
223 | TestCompile("default { " + eventName + "(integer n, integer o) {{}} }", true); | 251 | TestCompile("default { " + eventName + "(integer n, integer o) {{}} }", true); |
224 | } | 252 | } |
225 | 253 | ||
254 | private void TestVectorArgEvent(string eventName) | ||
255 | { | ||
256 | TestCompile("default { " + eventName + "(vector v) {} }", false); | ||
257 | TestCompile("default { " + eventName + "{{}} }", true); | ||
258 | TestCompile("default { " + eventName + "(string s) {{}} }", true); | ||
259 | TestCompile("default { " + eventName + "(vector v, vector w) {{}} }", true); | ||
260 | } | ||
261 | |||
226 | private void TestCompile(string script, bool expectException) | 262 | private void TestCompile(string script, bool expectException) |
227 | { | 263 | { |
228 | bool gotException = false; | 264 | bool gotException = false; |