aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorJustin Clark-Casey (justincc)2013-02-15 01:00:49 +0000
committerJustin Clark-Casey (justincc)2013-02-15 01:00:49 +0000
commit8d5fe5c22232e23b414531b07c5a8b343bb4b886 (patch)
tree93fbff3cf19234942c03821620fb01e829028787
parentRename JsonSetValueJson() -> JsonSetJson() and JsonGetValueJson() -> JsonGetJ... (diff)
downloadopensim-SC_OLD-8d5fe5c22232e23b414531b07c5a8b343bb4b886.zip
opensim-SC_OLD-8d5fe5c22232e23b414531b07c5a8b343bb4b886.tar.gz
opensim-SC_OLD-8d5fe5c22232e23b414531b07c5a8b343bb4b886.tar.bz2
opensim-SC_OLD-8d5fe5c22232e23b414531b07c5a8b343bb4b886.tar.xz
Enable one sub-test in TestJsonSetValue() which now works (using identifier with embedded .).
Need to look further at other still commented tests. Still need to check coverage against some of Mic's scripts.
-rw-r--r--OpenSim/Region/OptionalModules/Scripting/JsonStore/Tests/JsonStoreScriptModuleTests.cs30
1 files changed, 13 insertions, 17 deletions
diff --git a/OpenSim/Region/OptionalModules/Scripting/JsonStore/Tests/JsonStoreScriptModuleTests.cs b/OpenSim/Region/OptionalModules/Scripting/JsonStore/Tests/JsonStoreScriptModuleTests.cs
index ffa8250..3d9ad16 100644
--- a/OpenSim/Region/OptionalModules/Scripting/JsonStore/Tests/JsonStoreScriptModuleTests.cs
+++ b/OpenSim/Region/OptionalModules/Scripting/JsonStore/Tests/JsonStoreScriptModuleTests.cs
@@ -519,17 +519,16 @@ namespace OpenSim.Region.OptionalModules.Scripting.JsonStore.Tests
519 Assert.That(value, Is.EqualTo("Times")); 519 Assert.That(value, Is.EqualTo("Times"));
520 } 520 }
521 521
522 // Commented out as this currently unexpectedly fails.
523 // Test setting a key containing periods with delineation 522 // Test setting a key containing periods with delineation
524// { 523 {
525// UUID storeId = (UUID)InvokeOp("JsonCreateStore", "{}"); 524 UUID storeId = (UUID)InvokeOp("JsonCreateStore", "{}");
526// 525
527// int result = (int)InvokeOp("JsonSetValue", storeId, "{Fun.Circus}", "Times"); 526 int result = (int)InvokeOp("JsonSetValue", storeId, "{Fun.Circus}", "Times");
528// Assert.That(result, Is.EqualTo(1)); 527 Assert.That(result, Is.EqualTo(1));
529// 528
530// string value = (string)InvokeOp("JsonGetValue", storeId, "{Fun.Circus}"); 529 string value = (string)InvokeOp("JsonGetValue", storeId, "{Fun.Circus}");
531// Assert.That(value, Is.EqualTo("Times")); 530 Assert.That(value, Is.EqualTo("Times"));
532// } 531 }
533 532
534 // *** Test [] *** 533 // *** Test [] ***
535 534
@@ -599,7 +598,7 @@ namespace OpenSim.Region.OptionalModules.Scripting.JsonStore.Tests
599 Assert.That(value, Is.EqualTo("Times")); 598 Assert.That(value, Is.EqualTo("Times"));
600 } 599 }
601 600
602 // Commented out as this currently unexpectedly fails. 601// // Commented out as this currently unexpectedly fails.
603// // Test setting a key containing brackets around an integer with delineation 602// // Test setting a key containing brackets around an integer with delineation
604// { 603// {
605// UUID storeId = (UUID)InvokeOp("JsonCreateStore", "{}"); 604// UUID storeId = (UUID)InvokeOp("JsonCreateStore", "{}");
@@ -607,7 +606,7 @@ namespace OpenSim.Region.OptionalModules.Scripting.JsonStore.Tests
607// int result = (int)InvokeOp("JsonSetValue", storeId, "{Fun[0]Circus}", "Times"); 606// int result = (int)InvokeOp("JsonSetValue", storeId, "{Fun[0]Circus}", "Times");
608// Assert.That(result, Is.EqualTo(1)); 607// Assert.That(result, Is.EqualTo(1));
609// 608//
610// string value = (string)InvokeOp("JsonGetValue", storeId, "{Fun[]Circus}"); 609// string value = (string)InvokeOp("JsonGetValue", storeId, "{Fun[0]Circus}");
611// Assert.That(value, Is.EqualTo("Times")); 610// Assert.That(value, Is.EqualTo("Times"));
612// } 611// }
613 612
@@ -635,16 +634,13 @@ namespace OpenSim.Region.OptionalModules.Scripting.JsonStore.Tests
635 Assert.That(value, Is.EqualTo("")); 634 Assert.That(value, Is.EqualTo(""));
636 } 635 }
637 636
638 // Commented out as this currently unexpectedly fails. 637// // Commented out as this currently unexpectedly fails.
639// // Test setting a key containing unbalanced } 638// // Test setting a key containing unbalanced }
640// { 639// {
641// UUID storeId = (UUID)InvokeOp("JsonCreateStore", "{}"); 640// UUID storeId = (UUID)InvokeOp("JsonCreateStore", "{}");
642// 641//
643// int result = (int)InvokeOp("JsonSetValue", storeId, "{Fun}Circus}", "Times"); 642// int result = (int)InvokeOp("JsonSetValue", storeId, "{Fun}Circus}", "Times");
644// Assert.That(result, Is.EqualTo(1)); 643// Assert.That(result, Is.EqualTo(0));
645//
646// string value = (string)InvokeOp("JsonGetValue", storeId, "{Fun}Circus}");
647// Assert.That(value, Is.EqualTo("Times"));
648// } 644// }
649 645
650 // Test setting a key containing unbalanced { with delineation 646 // Test setting a key containing unbalanced { with delineation