diff options
author | Niklas Therning <niklas@therning.org> | 2016-09-20 17:42:24 +0300 |
---|---|---|
committer | Niklas Therning <niklas@therning.org> | 2016-09-20 17:42:24 +0300 |
commit | bf8fc72e1bb021897cb674d8576d367676ad9c66 (patch) | |
tree | bb352fce1c9d5183260d67ab4f175ee8efdea81e | |
parent | 38bf98614251a8b8a1e7dd06e59b17ff2f956305 (diff) |
Fixes line ending issue in XmlReflectionImporterTests.Bug594490_SerializationOfXmlLangAttribute
This test is sensitive to the line ending mode used by git. When LF is used by
git (which is what Cygwin's git defaults to) this test fails on Windows since
CRLF will be used as line ending in the serialized XML. This patch changes the
test to use Environment.NewLine explicitly in the expected string.
-rwxr-xr-x[-rw-r--r--] | mcs/class/System.XML/Test/System.Xml.Serialization/XmlReflectionImporterTests.cs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/mcs/class/System.XML/Test/System.Xml.Serialization/XmlReflectionImporterTests.cs b/mcs/class/System.XML/Test/System.Xml.Serialization/XmlReflectionImporterTests.cs index 98942e59666..bec62323fd8 100644..100755 --- a/mcs/class/System.XML/Test/System.Xml.Serialization/XmlReflectionImporterTests.cs +++ b/mcs/class/System.XML/Test/System.Xml.Serialization/XmlReflectionImporterTests.cs @@ -2052,8 +2052,8 @@ namespace MonoTests.System.XmlSerialization serializer.Serialize (writer, obj); writer.Close (); - Assert.AreEqual (@"<?xml version=""1.0"" encoding=""utf-16""?> -<Bug594490Class xmlns:xsd=""http://www.w3.org/2001/XMLSchema"" xmlns:xsi=""http://www.w3.org/2001/XMLSchema-instance"" xml:lang=""hello world"" />", + Assert.AreEqual (@"<?xml version=""1.0"" encoding=""utf-16""?>" + Environment.NewLine + + @"<Bug594490Class xmlns:xsd=""http://www.w3.org/2001/XMLSchema"" xmlns:xsi=""http://www.w3.org/2001/XMLSchema-instance"" xml:lang=""hello world"" />", writer.ToString (), "Novell bug #594490 (https://bugzilla.novell.com/show_bug.cgi?id=594490) not fixed."); } |