* 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.
slimupdates2
Teravus Ovares (Dan Olivares) 2010-05-05 21:22:29 -04:00
parent 8b4f729a21
commit 4183cef409
1 changed files with 10 additions and 6 deletions

View File

@ -96,15 +96,19 @@ namespace OpenSim.Framework.Serialization.Tests
[Test] [Test]
public void LandDataSerializerSerializeTest() 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.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); // 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, Assert.That(serializedWithParcelAccessList.Length > 0,
"Serialize(LandData) returned empty string for LandData object with ParcelAccessList"); "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"); "result of Serialize(LandData) does not match expected result (pre-serialized with parcel access list");
} }