From 365292e38fef33b4dee301f1913190fe0fee2c1a Mon Sep 17 00:00:00 2001
From: "Justin Clark-Casey (justincc)" <jjustincc@googlemail.com>
Date: Thu, 7 Feb 2013 02:19:26 +0000
Subject: [PATCH] Add TestJsonWriteReadNotecard() regression test

---
 .../Tests/JsonStoreScriptModuleTests.cs       | 45 ++++++++++++++++++-
 OpenSim/Tests/Common/Mock/MockScriptEngine.cs |  2 +-
 2 files changed, 45 insertions(+), 2 deletions(-)

diff --git a/OpenSim/Region/OptionalModules/Scripting/JsonStore/Tests/JsonStoreScriptModuleTests.cs b/OpenSim/Region/OptionalModules/Scripting/JsonStore/Tests/JsonStoreScriptModuleTests.cs
index 34422b4338..98b562400e 100644
--- a/OpenSim/Region/OptionalModules/Scripting/JsonStore/Tests/JsonStoreScriptModuleTests.cs
+++ b/OpenSim/Region/OptionalModules/Scripting/JsonStore/Tests/JsonStoreScriptModuleTests.cs
@@ -101,7 +101,12 @@ namespace OpenSim.Region.OptionalModules.Scripting.JsonStore.Tests
 
         private object InvokeOp(string name, params object[] args)
         {
-            return m_smcm.InvokeOperation(UUID.Zero, UUID.Zero, name, args);
+            return InvokeOpOnHost(name, UUID.Zero, args);
+        }
+
+        private object InvokeOpOnHost(string name, UUID hostId, params object[] args)
+        {
+            return m_smcm.InvokeOperation(hostId, UUID.Zero, name, args);
         }
 
         [Test]
@@ -209,6 +214,44 @@ namespace OpenSim.Region.OptionalModules.Scripting.JsonStore.Tests
             Assert.That(value, Is.EqualTo("World"));
         }
 
+        /// <summary>
+        /// Test for reading and writing json to a notecard
+        /// </summary>
+        /// <remarks>
+        /// TODO: Really needs to test correct receipt of the link_message event.  Could do this by directly fetching
+        /// it via the MockScriptEngine or perhaps by a dummy script instance.
+        /// </remarks>
+        [Test]
+        public void TestJsonWriteReadNotecard()
+        {
+            TestHelpers.InMethod();
+            TestHelpers.EnableLogging();
+
+            string notecardName = "nc1";
+
+            SceneObjectGroup so = SceneHelpers.CreateSceneObject(1, TestHelpers.ParseTail(0x1));
+            m_scene.AddSceneObject(so);
+
+            UUID storeId = (UUID)InvokeOp("JsonCreateStore", "{ 'Hello':'World' }"); 
+
+            // Write notecard
+            UUID writeNotecardRequestId = (UUID)InvokeOpOnHost("JsonWriteNotecard", so.UUID, storeId, "/", notecardName);
+            Assert.That(writeNotecardRequestId, Is.Not.EqualTo(UUID.Zero));
+
+            TaskInventoryItem nc1Item = so.RootPart.Inventory.GetInventoryItem(notecardName);
+            Assert.That(nc1Item, Is.Not.Null);
+
+            // TODO: Should probably independently check the contents.
+
+            // Read notecard
+            UUID receivingStoreId = (UUID)InvokeOp("JsonCreateStore", "{ 'Hello':'World' }"); 
+            UUID readNotecardRequestId = (UUID)InvokeOpOnHost("JsonReadNotecard", so.UUID, receivingStoreId, "/", notecardName);
+            Assert.That(readNotecardRequestId, Is.Not.EqualTo(UUID.Zero));
+
+            string value = (string)InvokeOp("JsonGetValue", storeId, "Hello");
+            Assert.That(value, Is.EqualTo("World"));
+        }
+
         public object DummyTestMethod(object o1, object o2, object o3, object o4, object o5) { return null; }
     }
 }
\ No newline at end of file
diff --git a/OpenSim/Tests/Common/Mock/MockScriptEngine.cs b/OpenSim/Tests/Common/Mock/MockScriptEngine.cs
index 51f2712071..78bab5b8fe 100644
--- a/OpenSim/Tests/Common/Mock/MockScriptEngine.cs
+++ b/OpenSim/Tests/Common/Mock/MockScriptEngine.cs
@@ -85,7 +85,7 @@ namespace OpenSim.Tests.Common
 
         public bool PostScriptEvent(UUID itemID, string name, object[] args)
         {
-            throw new System.NotImplementedException ();
+            return false;
         }
 
         public bool PostObjectEvent(UUID itemID, string name, object[] args)