diff options
Diffstat (limited to 'OpenSim/Region/ScriptEngine/Shared/CodeTools/Tests')
-rw-r--r-- | OpenSim/Region/ScriptEngine/Shared/CodeTools/Tests/CompilerTest.cs | 6 | ||||
-rw-r--r-- | OpenSim/Region/ScriptEngine/Shared/CodeTools/Tests/LSL_EventTests.cs | 24 |
2 files changed, 15 insertions, 15 deletions
diff --git a/OpenSim/Region/ScriptEngine/Shared/CodeTools/Tests/CompilerTest.cs b/OpenSim/Region/ScriptEngine/Shared/CodeTools/Tests/CompilerTest.cs index ad4ccf0..12ba4de 100644 --- a/OpenSim/Region/ScriptEngine/Shared/CodeTools/Tests/CompilerTest.cs +++ b/OpenSim/Region/ScriptEngine/Shared/CodeTools/Tests/CompilerTest.cs | |||
@@ -81,7 +81,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.CodeTools.Tests | |||
81 | m_resolveEventHandler = new ResolveEventHandler(AssemblyResolver.OnAssemblyResolve); | 81 | m_resolveEventHandler = new ResolveEventHandler(AssemblyResolver.OnAssemblyResolve); |
82 | 82 | ||
83 | System.AppDomain.CurrentDomain.AssemblyResolve += m_resolveEventHandler; | 83 | System.AppDomain.CurrentDomain.AssemblyResolve += m_resolveEventHandler; |
84 | 84 | ||
85 | m_compilerParameters.ReferencedAssemblies.Add(Path.Combine(rootPath, "OpenSim.Region.ScriptEngine.Shared.dll")); | 85 | m_compilerParameters.ReferencedAssemblies.Add(Path.Combine(rootPath, "OpenSim.Region.ScriptEngine.Shared.dll")); |
86 | m_compilerParameters.ReferencedAssemblies.Add(Path.Combine(rootPath, "OpenSim.Region.ScriptEngine.Shared.Api.Runtime.dll")); | 86 | m_compilerParameters.ReferencedAssemblies.Add(Path.Combine(rootPath, "OpenSim.Region.ScriptEngine.Shared.Api.Runtime.dll")); |
87 | m_compilerParameters.ReferencedAssemblies.Add(Path.Combine(rootPath, "OpenMetaverseTypes.dll")); | 87 | m_compilerParameters.ReferencedAssemblies.Add(Path.Combine(rootPath, "OpenMetaverseTypes.dll")); |
@@ -112,7 +112,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.CodeTools.Tests | |||
112 | CSCodeGenerator cg = new CSCodeGenerator(); | 112 | CSCodeGenerator cg = new CSCodeGenerator(); |
113 | string output = cg.Convert(input); | 113 | string output = cg.Convert(input); |
114 | 114 | ||
115 | output = Compiler.CreateCSCompilerScript(output, "script1", typeof(ScriptBaseClass).FullName, null); | 115 | output = Compiler.CreateCSCompilerScript(output, "script1", typeof(ScriptBaseClass).FullName, null); |
116 | // System.Console.WriteLine(output); | 116 | // System.Console.WriteLine(output); |
117 | 117 | ||
118 | positionMap = cg.PositionMap; | 118 | positionMap = cg.PositionMap; |
@@ -154,7 +154,7 @@ erros position is better tested on viewers | |||
154 | @l; | 154 | @l; |
155 | i = 1; | 155 | i = 1; |
156 | } | 156 | } |
157 | }", out positionMap); | 157 | }", out positionMap); |
158 | 158 | ||
159 | Assert.AreEqual( | 159 | Assert.AreEqual( |
160 | new KeyValuePair<int, int>(7, 9), | 160 | new KeyValuePair<int, int>(7, 9), |
diff --git a/OpenSim/Region/ScriptEngine/Shared/CodeTools/Tests/LSL_EventTests.cs b/OpenSim/Region/ScriptEngine/Shared/CodeTools/Tests/LSL_EventTests.cs index 67ce10a..220ec72 100644 --- a/OpenSim/Region/ScriptEngine/Shared/CodeTools/Tests/LSL_EventTests.cs +++ b/OpenSim/Region/ScriptEngine/Shared/CodeTools/Tests/LSL_EventTests.cs | |||
@@ -150,7 +150,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Tests | |||
150 | // TestHelpers.EnableLogging(); | 150 | // TestHelpers.EnableLogging(); |
151 | 151 | ||
152 | TestIntArgEvent("changed"); | 152 | TestIntArgEvent("changed"); |
153 | } | 153 | } |
154 | 154 | ||
155 | [Test] | 155 | [Test] |
156 | public void TestCollisionEvent() | 156 | public void TestCollisionEvent() |
@@ -159,7 +159,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Tests | |||
159 | // TestHelpers.EnableLogging(); | 159 | // TestHelpers.EnableLogging(); |
160 | 160 | ||
161 | TestIntArgEvent("collision"); | 161 | TestIntArgEvent("collision"); |
162 | } | 162 | } |
163 | 163 | ||
164 | [Test] | 164 | [Test] |
165 | public void TestCollisionStartEvent() | 165 | public void TestCollisionStartEvent() |
@@ -168,7 +168,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Tests | |||
168 | // TestHelpers.EnableLogging(); | 168 | // TestHelpers.EnableLogging(); |
169 | 169 | ||
170 | TestIntArgEvent("collision_start"); | 170 | TestIntArgEvent("collision_start"); |
171 | } | 171 | } |
172 | 172 | ||
173 | [Test] | 173 | [Test] |
174 | public void TestCollisionEndEvent() | 174 | public void TestCollisionEndEvent() |
@@ -177,7 +177,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Tests | |||
177 | // TestHelpers.EnableLogging(); | 177 | // TestHelpers.EnableLogging(); |
178 | 178 | ||
179 | TestIntArgEvent("collision_end"); | 179 | TestIntArgEvent("collision_end"); |
180 | } | 180 | } |
181 | 181 | ||
182 | [Test] | 182 | [Test] |
183 | public void TestOnRezEvent() | 183 | public void TestOnRezEvent() |
@@ -186,7 +186,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Tests | |||
186 | // TestHelpers.EnableLogging(); | 186 | // TestHelpers.EnableLogging(); |
187 | 187 | ||
188 | TestIntArgEvent("on_rez"); | 188 | TestIntArgEvent("on_rez"); |
189 | } | 189 | } |
190 | 190 | ||
191 | [Test] | 191 | [Test] |
192 | public void TestRunTimePermissionsEvent() | 192 | public void TestRunTimePermissionsEvent() |
@@ -195,7 +195,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Tests | |||
195 | // TestHelpers.EnableLogging(); | 195 | // TestHelpers.EnableLogging(); |
196 | 196 | ||
197 | TestIntArgEvent("run_time_permissions"); | 197 | TestIntArgEvent("run_time_permissions"); |
198 | } | 198 | } |
199 | 199 | ||
200 | [Test] | 200 | [Test] |
201 | public void TestSensorEvent() | 201 | public void TestSensorEvent() |
@@ -204,7 +204,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Tests | |||
204 | // TestHelpers.EnableLogging(); | 204 | // TestHelpers.EnableLogging(); |
205 | 205 | ||
206 | TestIntArgEvent("sensor"); | 206 | TestIntArgEvent("sensor"); |
207 | } | 207 | } |
208 | 208 | ||
209 | [Test] | 209 | [Test] |
210 | public void TestTouchEvent() | 210 | public void TestTouchEvent() |
@@ -213,7 +213,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Tests | |||
213 | // TestHelpers.EnableLogging(); | 213 | // TestHelpers.EnableLogging(); |
214 | 214 | ||
215 | TestIntArgEvent("touch"); | 215 | TestIntArgEvent("touch"); |
216 | } | 216 | } |
217 | 217 | ||
218 | [Test] | 218 | [Test] |
219 | public void TestTouchStartEvent() | 219 | public void TestTouchStartEvent() |
@@ -222,7 +222,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Tests | |||
222 | // TestHelpers.EnableLogging(); | 222 | // TestHelpers.EnableLogging(); |
223 | 223 | ||
224 | TestIntArgEvent("touch_start"); | 224 | TestIntArgEvent("touch_start"); |
225 | } | 225 | } |
226 | 226 | ||
227 | [Test] | 227 | [Test] |
228 | public void TestTouchEndEvent() | 228 | public void TestTouchEndEvent() |
@@ -231,7 +231,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Tests | |||
231 | // TestHelpers.EnableLogging(); | 231 | // TestHelpers.EnableLogging(); |
232 | 232 | ||
233 | TestIntArgEvent("touch_end"); | 233 | TestIntArgEvent("touch_end"); |
234 | } | 234 | } |
235 | 235 | ||
236 | [Test] | 236 | [Test] |
237 | public void TestLandCollisionEvent() | 237 | public void TestLandCollisionEvent() |
@@ -351,8 +351,8 @@ namespace OpenSim.Region.ScriptEngine.Shared.Tests | |||
351 | } | 351 | } |
352 | 352 | ||
353 | Assert.That( | 353 | Assert.That( |
354 | gotException, | 354 | gotException, |
355 | Is.EqualTo(expectException), | 355 | Is.EqualTo(expectException), |
356 | "Failed on {0}, exception {1}", script, ge != null ? ge.ToString() : "n/a"); | 356 | "Failed on {0}, exception {1}", script, ge != null ? ge.ToString() : "n/a"); |
357 | } | 357 | } |
358 | } | 358 | } |