aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/OptionalModules/Scripting/JsonStore
diff options
context:
space:
mode:
authorMic Bowman2013-02-08 22:43:56 -0800
committerMic Bowman2013-02-08 22:43:56 -0800
commit0a297a0e52b673427ff61b254f6065c217b1375d (patch)
treeaa337fff2dfda8677a7a76eb08b76a1d07df178a /OpenSim/Region/OptionalModules/Scripting/JsonStore
parentMake JsonStore path parsing more robust. Should fix the (diff)
parentFixed ReadSculptData(): the check whether there are enough bytes to read was ... (diff)
downloadopensim-SC_OLD-0a297a0e52b673427ff61b254f6065c217b1375d.zip
opensim-SC_OLD-0a297a0e52b673427ff61b254f6065c217b1375d.tar.gz
opensim-SC_OLD-0a297a0e52b673427ff61b254f6065c217b1375d.tar.bz2
opensim-SC_OLD-0a297a0e52b673427ff61b254f6065c217b1375d.tar.xz
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
Diffstat (limited to 'OpenSim/Region/OptionalModules/Scripting/JsonStore')
-rw-r--r--OpenSim/Region/OptionalModules/Scripting/JsonStore/Tests/JsonStoreScriptModuleTests.cs7
1 files changed, 2 insertions, 5 deletions
diff --git a/OpenSim/Region/OptionalModules/Scripting/JsonStore/Tests/JsonStoreScriptModuleTests.cs b/OpenSim/Region/OptionalModules/Scripting/JsonStore/Tests/JsonStoreScriptModuleTests.cs
index ca88d1a..af97ac7 100644
--- a/OpenSim/Region/OptionalModules/Scripting/JsonStore/Tests/JsonStoreScriptModuleTests.cs
+++ b/OpenSim/Region/OptionalModules/Scripting/JsonStore/Tests/JsonStoreScriptModuleTests.cs
@@ -144,8 +144,7 @@ namespace OpenSim.Region.OptionalModules.Scripting.JsonStore.Tests
144 144
145 int dsrv = (int)InvokeOp("JsonDestroyStore", fakeStoreId); 145 int dsrv = (int)InvokeOp("JsonDestroyStore", fakeStoreId);
146 146
147 // XXX: Current returns 'true' even though no such store existed. Need to ask if this is best behaviour. 147 Assert.That(dsrv, Is.EqualTo(0));
148 Assert.That(dsrv, Is.EqualTo(1));
149 } 148 }
150 149
151 [Test] 150 [Test]
@@ -211,9 +210,7 @@ namespace OpenSim.Region.OptionalModules.Scripting.JsonStore.Tests
211 210
212 // Test remove of non-existing value 211 // Test remove of non-existing value
213 int fakeValueRemove = (int)InvokeOp("JsonRemoveValue", storeId, "Hello"); 212 int fakeValueRemove = (int)InvokeOp("JsonRemoveValue", storeId, "Hello");
214 213 Assert.That(fakeValueRemove, Is.EqualTo(0));
215 // XXX: Is this the best response to removing a value that isn't there?
216 Assert.That(fakeValueRemove, Is.EqualTo(1));
217 214
218 // Test get from non-existing store 215 // Test get from non-existing store
219 UUID fakeStoreId = TestHelpers.ParseTail(0x500); 216 UUID fakeStoreId = TestHelpers.ParseTail(0x500);