From 412295ccdec05e205557b7d5caaec9befdfe8573 Mon Sep 17 00:00:00 2001
From: Justin Clarke Casey <jjustincc@googlemail.com>
Date: Mon, 1 Jun 2009 18:03:51 +0000
Subject: [PATCH] * Add simple original sog xml serialization test

---
 .../World/Serialiser/SerialiserModule.cs      |  2 +-
 .../World/Serialiser/Tests/SerialiserTests.cs | 33 ++++++++++---------
 .../Interfaces/IRegionSerialiserModule.cs     |  8 ++---
 3 files changed, 22 insertions(+), 21 deletions(-)

diff --git a/OpenSim/Region/CoreModules/World/Serialiser/SerialiserModule.cs b/OpenSim/Region/CoreModules/World/Serialiser/SerialiserModule.cs
index 79062da48b..b6d28abbcf 100644
--- a/OpenSim/Region/CoreModules/World/Serialiser/SerialiserModule.cs
+++ b/OpenSim/Region/CoreModules/World/Serialiser/SerialiserModule.cs
@@ -121,7 +121,7 @@ namespace OpenSim.Region.CoreModules.World.Serialiser
         public void SaveNamedPrimsToXml2(Scene scene, string primName, string fileName)
         {
             SceneXmlLoader.SaveNamedPrimsToXml2(scene, primName, fileName);
-        }
+        }       
 
         public SceneObjectGroup DeserializeGroupFromXml2(string xmlString)
         {
diff --git a/OpenSim/Region/CoreModules/World/Serialiser/Tests/SerialiserTests.cs b/OpenSim/Region/CoreModules/World/Serialiser/Tests/SerialiserTests.cs
index 617cc25632..d028360621 100644
--- a/OpenSim/Region/CoreModules/World/Serialiser/Tests/SerialiserTests.cs
+++ b/OpenSim/Region/CoreModules/World/Serialiser/Tests/SerialiserTests.cs
@@ -31,6 +31,7 @@ using NUnit.Framework.SyntaxHelpers;
 using OpenMetaverse;
 using OpenSim.Framework;
 using OpenSim.Region.Framework.Scenes;
+using OpenSim.Region.Framework.Scenes.Serialization;
 using OpenSim.Tests.Common;
 using OpenSim.Tests.Common.Setup;
 using System.IO;
@@ -53,7 +54,7 @@ namespace OpenSim.Region.CoreModules.World.Serialiser.Tests
                     <ObjectFlags>0</ObjectFlags>
                     <UUID><Guid>e6a5a05e-e8cc-4816-8701-04165e335790</Guid></UUID>
                     <LocalId>2698615125</LocalId>
-                    <Name>Primitive</Name>
+                    <Name>PrimMyRide</Name>
                     <Material>0</Material>
                     <PassTouches>false</PassTouches>
                     <RegionHandle>1099511628032000</RegionHandle>
@@ -241,21 +242,21 @@ namespace OpenSim.Region.CoreModules.World.Serialiser.Tests
             SceneSetupHelpers.SetupSceneModules(m_scene, m_serialiserModule);            
         }
 
-//        [Test]
-//        public void TestLoadXml()
-//        {
-//            TestHelper.InMethod();
-//            //log4net.Config.XmlConfigurator.Configure();
-//
-//            SceneObjectGroup so = m_serialiserModule.DeserializeGroupFromXml2(xml2);
-//            SceneObjectPart rootPart = so.RootPart;
-//
-//            Assert.That(rootPart.UUID, Is.EqualTo(new UUID("9be68fdd-f740-4a0f-9675-dfbbb536b946")));
-//            Assert.That(rootPart.CreatorID, Is.EqualTo(new UUID("b46ef588-411e-4a8b-a284-d7dcfe8e74ef")));
-//            Assert.That(rootPart.Name, Is.EqualTo("PrimFun"));
-//
-//            // TODO: Check other properties
-//        }        
+        [Test]
+        public void TestSerializeXml()
+        {
+            TestHelper.InMethod();
+            //log4net.Config.XmlConfigurator.Configure();
+
+            SceneObjectGroup so = SceneObjectSerializer.FromOriginalXmlFormat(xml);
+            SceneObjectPart rootPart = so.RootPart;
+
+            Assert.That(rootPart.UUID, Is.EqualTo(new UUID("e6a5a05e-e8cc-4816-8701-04165e335790")));
+            Assert.That(rootPart.CreatorID, Is.EqualTo(new UUID("a6dacf01-4636-4bb9-8a97-30609438af9d")));
+            Assert.That(rootPart.Name, Is.EqualTo("PrimMyRide"));
+
+            // TODO: Check other properties
+        }        
 
         [Test]
         public void TestDeserializeXml2()
diff --git a/OpenSim/Region/Framework/Interfaces/IRegionSerialiserModule.cs b/OpenSim/Region/Framework/Interfaces/IRegionSerialiserModule.cs
index e062bbc65c..bfd25d3537 100644
--- a/OpenSim/Region/Framework/Interfaces/IRegionSerialiserModule.cs
+++ b/OpenSim/Region/Framework/Interfaces/IRegionSerialiserModule.cs
@@ -103,13 +103,13 @@ namespace OpenSim.Region.Framework.Interfaces
         /// <param name="max"></param>
         void SavePrimListToXml2(List<EntityBase> entityList, TextWriter stream, Vector3 min, Vector3 max);
         
-        void SaveNamedPrimsToXml2(Scene scene, string primName, string fileName);        
-
+        void SaveNamedPrimsToXml2(Scene scene, string primName, string fileName);
+            
         /// <summary>
         /// Deserializes a scene object from its xml2 representation.  This does not load the object into the scene.
         /// </summary>
         /// <param name="xmlString"></param>
-        /// <returns>The scene object created.  null if the scene object already existed</returns>
+        /// <returns>The scene object created</returns>
         SceneObjectGroup DeserializeGroupFromXml2(string xmlString);
 
         /// <summary>
@@ -117,6 +117,6 @@ namespace OpenSim.Region.Framework.Interfaces
         /// </summary>
         /// <param name="grp"></param>
         /// <returns></returns>
-        string SerializeGroupToXml2(SceneObjectGroup grp);
+        string SerializeGroupToXml2(SceneObjectGroup grp);        
     }
 }