aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/OptionalModules/Scripting/JsonStore/Tests
diff options
context:
space:
mode:
authorJustin Clark-Casey (justincc)2013-02-07 23:08:19 +0000
committerJustin Clark-Casey (justincc)2013-02-07 23:08:19 +0000
commitc135c3224fcdc88a610b0d66da0c0dd6cd1211f9 (patch)
tree85b46f38c9b63ed4e6dd5a2e31ff6c910434de57 /OpenSim/Region/OptionalModules/Scripting/JsonStore/Tests
parentEnables script access to the per object dynamic attributes through the JsonStore (diff)
downloadopensim-SC-c135c3224fcdc88a610b0d66da0c0dd6cd1211f9.zip
opensim-SC-c135c3224fcdc88a610b0d66da0c0dd6cd1211f9.tar.gz
opensim-SC-c135c3224fcdc88a610b0d66da0c0dd6cd1211f9.tar.bz2
opensim-SC-c135c3224fcdc88a610b0d66da0c0dd6cd1211f9.tar.xz
Fix a recent regression in e17392a where JsonSetValue() stopped working (probably other functions as well).
Fix is to call through to the no-arg constructor from the string constructor in JsonStore, which I suspect was just forgotten. This was actually picked up by the TestJsonSetValue() regression test failing But this isn't being run on jenkins due to the .net version issue. This commit also puts the full stack trace in logged messages and makes these error level messages instead of info
Diffstat (limited to 'OpenSim/Region/OptionalModules/Scripting/JsonStore/Tests')
-rw-r--r--OpenSim/Region/OptionalModules/Scripting/JsonStore/Tests/JsonStoreScriptModuleTests.cs8
1 files changed, 4 insertions, 4 deletions
diff --git a/OpenSim/Region/OptionalModules/Scripting/JsonStore/Tests/JsonStoreScriptModuleTests.cs b/OpenSim/Region/OptionalModules/Scripting/JsonStore/Tests/JsonStoreScriptModuleTests.cs
index 8042a93..eddae38 100644
--- a/OpenSim/Region/OptionalModules/Scripting/JsonStore/Tests/JsonStoreScriptModuleTests.cs
+++ b/OpenSim/Region/OptionalModules/Scripting/JsonStore/Tests/JsonStoreScriptModuleTests.cs
@@ -184,13 +184,13 @@ namespace OpenSim.Region.OptionalModules.Scripting.JsonStore.Tests
184 TestHelpers.InMethod(); 184 TestHelpers.InMethod();
185// TestHelpers.EnableLogging(); 185// TestHelpers.EnableLogging();
186 186
187 UUID storeId = (UUID)InvokeOp("JsonCreateStore", "{}"); 187 UUID storeId = (UUID)InvokeOp("JsonCreateStore", "{ }");
188 188
189 int result = (int)InvokeOp("JsonSetValue", storeId, "Hello", "World"); 189 int result = (int)InvokeOp("JsonSetValue", storeId, "Fun", "Times");
190 Assert.That(result, Is.EqualTo(1)); 190 Assert.That(result, Is.EqualTo(1));
191 191
192 string value = (string)InvokeOp("JsonGetValue", storeId, "Hello"); 192 string value = (string)InvokeOp("JsonGetValue", storeId, "Fun");
193 Assert.That(value, Is.EqualTo("World")); 193 Assert.That(value, Is.EqualTo("Times"));
194 } 194 }
195 195
196 public object DummyTestMethod(object o1, object o2, object o3, object o4, object o5) { return null; } 196 public object DummyTestMethod(object o1, object o2, object o3, object o4, object o5) { return null; }