From 4183cef4094364d28fd4497fdb4332ff4be34914 Mon Sep 17 00:00:00 2001
From: Teravus Ovares (Dan Olivares)
Date: Wed, 5 May 2010 21:22:29 -0400
Subject: * Fixes LandDataSerializerTests on Windows by stripping CR from the
 serialization result since the reference serialization has LF only. * Added a
 bool result and then an Assert.That(result) because resharper was having a
 hard time with the equality compare in Assert.That.

---
 .../Serialization/Tests/LandDataSerializerTests.cs       | 16 ++++++++++------
 1 file changed, 10 insertions(+), 6 deletions(-)

(limited to 'OpenSim/Framework')

diff --git a/OpenSim/Framework/Serialization/Tests/LandDataSerializerTests.cs b/OpenSim/Framework/Serialization/Tests/LandDataSerializerTests.cs
index 14e0462..70e87b3 100644
--- a/OpenSim/Framework/Serialization/Tests/LandDataSerializerTests.cs
+++ b/OpenSim/Framework/Serialization/Tests/LandDataSerializerTests.cs
@@ -96,15 +96,19 @@ namespace OpenSim.Framework.Serialization.Tests
         [Test]
         public void LandDataSerializerSerializeTest()
         {
-            string serialized = LandDataSerializer.Serialize(this.land);
+            string serialized = LandDataSerializer.Serialize(this.land).Replace("\r\n", "\n");
             Assert.That(serialized.Length > 0, "Serialize(LandData) returned empty string");
-            Assert.That(serialized == LandDataSerializerTest.preSerialized, 
-                        "result of Serialize(LandData) does not match expected result");
 
-            string serializedWithParcelAccessList = LandDataSerializer.Serialize(this.landWithParcelAccessList);
-            Assert.That(serializedWithParcelAccessList.Length > 0, 
+            // adding a simple boolean variable because resharper nUnit integration doesn't like this
+            // XML data in the Assert.That statement.   Not sure why.
+            bool result = (serialized == preSerialized);
+            Assert.That(result, "result of Serialize LandData  does not match expected result");
+
+            string serializedWithParcelAccessList = LandDataSerializer.Serialize(this.landWithParcelAccessList).Replace("\r\n", "\n");
+            Assert.That(serializedWithParcelAccessList.Length > 0,
                         "Serialize(LandData) returned empty string for LandData object with ParcelAccessList");
-            Assert.That(serializedWithParcelAccessList == LandDataSerializerTest.preSerializedWithParcelAccessList, 
+            result = (serializedWithParcelAccessList == preSerializedWithParcelAccessList);
+            Assert.That(result,
                         "result of Serialize(LandData) does not match expected result (pre-serialized with parcel access list");
         }
 
-- 
cgit v1.1