diff options
author | Justin Clark-Casey (justincc) | 2010-10-16 02:38:46 +0100 |
---|---|---|
committer | Justin Clark-Casey (justincc) | 2010-10-16 02:38:46 +0100 |
commit | fe4e6ff81121bd3c5041fc3cdc6545548b192568 (patch) | |
tree | bb7366f89236feb479f50b9dd1bfffefff0adfdf | |
parent | Made OARs use the new serialization procedure. (TPs/crossings still on the ol... (diff) | |
download | opensim-SC-fe4e6ff81121bd3c5041fc3cdc6545548b192568.zip opensim-SC-fe4e6ff81121bd3c5041fc3cdc6545548b192568.tar.gz opensim-SC-fe4e6ff81121bd3c5041fc3cdc6545548b192568.tar.bz2 opensim-SC-fe4e6ff81121bd3c5041fc3cdc6545548b192568.tar.xz |
Fix test break - TestSerializeXml2() still requires old-guids option
-rw-r--r-- | OpenSim/Region/CoreModules/World/Serialiser/Tests/SerialiserTests.cs | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/OpenSim/Region/CoreModules/World/Serialiser/Tests/SerialiserTests.cs b/OpenSim/Region/CoreModules/World/Serialiser/Tests/SerialiserTests.cs index 49bd466..bac7827 100644 --- a/OpenSim/Region/CoreModules/World/Serialiser/Tests/SerialiserTests.cs +++ b/OpenSim/Region/CoreModules/World/Serialiser/Tests/SerialiserTests.cs | |||
@@ -25,6 +25,9 @@ | |||
25 | * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | 25 | * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. |
26 | */ | 26 | */ |
27 | 27 | ||
28 | using System.Collections.Generic; | ||
29 | using System.IO; | ||
30 | using System.Xml; | ||
28 | using log4net.Config; | 31 | using log4net.Config; |
29 | using NUnit.Framework; | 32 | using NUnit.Framework; |
30 | using NUnit.Framework.SyntaxHelpers; | 33 | using NUnit.Framework.SyntaxHelpers; |
@@ -34,8 +37,6 @@ using OpenSim.Region.Framework.Scenes; | |||
34 | using OpenSim.Region.Framework.Scenes.Serialization; | 37 | using OpenSim.Region.Framework.Scenes.Serialization; |
35 | using OpenSim.Tests.Common; | 38 | using OpenSim.Tests.Common; |
36 | using OpenSim.Tests.Common.Setup; | 39 | using OpenSim.Tests.Common.Setup; |
37 | using System.IO; | ||
38 | using System.Xml; | ||
39 | 40 | ||
40 | namespace OpenSim.Region.CoreModules.World.Serialiser.Tests | 41 | namespace OpenSim.Region.CoreModules.World.Serialiser.Tests |
41 | { | 42 | { |
@@ -369,7 +370,9 @@ namespace OpenSim.Region.CoreModules.World.Serialiser.Tests | |||
369 | // Need to add the object to the scene so that the request to get script state succeeds | 370 | // Need to add the object to the scene so that the request to get script state succeeds |
370 | m_scene.AddSceneObject(so); | 371 | m_scene.AddSceneObject(so); |
371 | 372 | ||
372 | string xml2 = m_serialiserModule.SerializeGroupToXml2(so, new System.Collections.Generic.Dictionary<string,object>()); | 373 | Dictionary<string, object> options = new Dictionary<string, object>(); |
374 | options["old-guids"] = true; | ||
375 | string xml2 = m_serialiserModule.SerializeGroupToXml2(so, options); | ||
373 | 376 | ||
374 | XmlTextReader xtr = new XmlTextReader(new StringReader(xml2)); | 377 | XmlTextReader xtr = new XmlTextReader(new StringReader(xml2)); |
375 | xtr.ReadStartElement("SceneObjectGroup"); | 378 | xtr.ReadStartElement("SceneObjectGroup"); |