aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorJustin Clark-Casey (justincc)2010-10-16 02:38:46 +0100
committerJustin Clark-Casey (justincc)2010-10-16 02:38:46 +0100
commitfe4e6ff81121bd3c5041fc3cdc6545548b192568 (patch)
treebb7366f89236feb479f50b9dd1bfffefff0adfdf
parentMade OARs use the new serialization procedure. (TPs/crossings still on the ol... (diff)
downloadopensim-SC_OLD-fe4e6ff81121bd3c5041fc3cdc6545548b192568.zip
opensim-SC_OLD-fe4e6ff81121bd3c5041fc3cdc6545548b192568.tar.gz
opensim-SC_OLD-fe4e6ff81121bd3c5041fc3cdc6545548b192568.tar.bz2
opensim-SC_OLD-fe4e6ff81121bd3c5041fc3cdc6545548b192568.tar.xz
Fix test break - TestSerializeXml2() still requires old-guids option
-rw-r--r--OpenSim/Region/CoreModules/World/Serialiser/Tests/SerialiserTests.cs9
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
28using System.Collections.Generic;
29using System.IO;
30using System.Xml;
28using log4net.Config; 31using log4net.Config;
29using NUnit.Framework; 32using NUnit.Framework;
30using NUnit.Framework.SyntaxHelpers; 33using NUnit.Framework.SyntaxHelpers;
@@ -34,8 +37,6 @@ using OpenSim.Region.Framework.Scenes;
34using OpenSim.Region.Framework.Scenes.Serialization; 37using OpenSim.Region.Framework.Scenes.Serialization;
35using OpenSim.Tests.Common; 38using OpenSim.Tests.Common;
36using OpenSim.Tests.Common.Setup; 39using OpenSim.Tests.Common.Setup;
37using System.IO;
38using System.Xml;
39 40
40namespace OpenSim.Region.CoreModules.World.Serialiser.Tests 41namespace 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");