LiRuochen_WorkFlow/Newtonsoft.Json
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix tests on environments with different line endings (#1831)

Browse Source
This commit is contained in:
James Newton-King
2018-09-17 03:01:58 -07:00
committed by GitHub
parent d7150871cb
commit 71564ceb16
40 changed files with 54 additions and 55 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Src/Newtonsoft.Json.Tests/Converters/StringEnumConverterTests.cs
+2 -2
View File
@@ -231,7 +231,7 @@ namespace Newtonsoft.Json.Tests.Converters
};
string json = JsonConvert.SerializeObject(c, Formatting.Indented, new StringEnumConverter());
Assert.AreEqual(@"{
StringAssert.AreEqual(@"{
""Enum"": "",third""
}", json);
@@ -248,7 +248,7 @@ namespace Newtonsoft.Json.Tests.Converters
};
string json = JsonConvert.SerializeObject(c, Formatting.Indented, new StringEnumConverter());
Assert.AreEqual(@"{
StringAssert.AreEqual(@"{
""Enum"": "",""
}", json);
Src/Newtonsoft.Json.Tests/Documentation/Samples/Json/WriteJsonWithJsonTextWriter.cs
+1 -1
View File
@@ -80,7 +80,7 @@ namespace Newtonsoft.Json.Tests.Documentation.Samples.Json
// }
#endregion
Assert.AreEqual(@"{
StringAssert.AreEqual(@"{
""CPU"": ""Intel"",
""PSU"": ""500W"",
""Drives"": [
Src/Newtonsoft.Json.Tests/Documentation/Samples/Linq/CreateJsonAnonymousObject.cs
+1 -1
View File
@@ -116,7 +116,7 @@ namespace Newtonsoft.Json.Tests.Documentation.Samples.Linq
// }
#endregion
Assert.AreEqual(@"{
StringAssert.AreEqual(@"{
""channel"": {
""title"": ""Star Wars"",
""link"": ""http://www.starwars.com"",
Src/Newtonsoft.Json.Tests/Documentation/Samples/Linq/CreateJsonCollectionInitializer.cs
+1 -1
View File
@@ -69,7 +69,7 @@ namespace Newtonsoft.Json.Tests.Documentation.Samples.Linq
// }
#endregion
Assert.AreEqual(@"{
StringAssert.AreEqual(@"{
""Cpu"": ""Intel"",
""Memory"": 32,
""Drives"": [
Src/Newtonsoft.Json.Tests/Documentation/Samples/Linq/CreateJsonDeclaratively.cs
+1 -1
View File
@@ -130,7 +130,7 @@ namespace Newtonsoft.Json.Tests.Documentation.Samples.Linq
// }
#endregion
Assert.AreEqual(@"{
StringAssert.AreEqual(@"{
""channel"": {
""title"": ""James Newton-King"",
""link"": ""http://james.newtonking.com"",
Src/Newtonsoft.Json.Tests/Documentation/Samples/Linq/CreateJsonDynamic.cs
+1 -1
View File
@@ -69,7 +69,7 @@ namespace Newtonsoft.Json.Tests.Documentation.Samples.Linq
// }
#endregion
Assert.AreEqual(@"{
StringAssert.AreEqual(@"{
""ProductName"": ""Elbow Grease"",
""Enabled"": true,
""Price"": 4.90,
Src/Newtonsoft.Json.Tests/Documentation/Samples/Linq/CreateJsonJTokenWriter.cs
+1 -1
View File
@@ -68,7 +68,7 @@ namespace Newtonsoft.Json.Tests.Documentation.Samples.Linq
// }
#endregion
Assert.AreEqual(@"{
StringAssert.AreEqual(@"{
""name1"": ""value1"",
""name2"": [
1,
Src/Newtonsoft.Json.Tests/Documentation/Samples/Linq/CreateWriter.cs
+1 -1
View File
@@ -69,7 +69,7 @@ namespace Newtonsoft.Json.Tests.Documentation.Samples.Linq
// }
#endregion
Assert.AreEqual(@"{
StringAssert.AreEqual(@"{
""name1"": ""value1"",
""name2"": ""value2"",
""name3"": [
Src/Newtonsoft.Json.Tests/Documentation/Samples/Linq/DeserializeWithLinq.cs
+1 -1
View File
@@ -93,7 +93,7 @@ namespace Newtonsoft.Json.Tests.Documentation.Samples.Linq
// <p>Content!</p>
#endregion
Assert.AreEqual(@"<h3>Title!</h3>
StringAssert.AreEqual(@"<h3>Title!</h3>
<p>Content!</p>", blogPosts[0].Body);
}
}
Src/Newtonsoft.Json.Tests/Documentation/Samples/Linq/FromObject.cs
+1 -1
View File
@@ -100,7 +100,7 @@ namespace Newtonsoft.Json.Tests.Documentation.Samples.Linq
// ]
#endregion
Assert.AreEqual(@"[
StringAssert.AreEqual(@"[
""DVD"",
""SSD""
]", a.ToString());
Src/Newtonsoft.Json.Tests/Documentation/Samples/Linq/ModifyJson.cs
+1 -1
View File
@@ -85,7 +85,7 @@ namespace Newtonsoft.Json.Tests.Documentation.Samples.Linq
// }
#endregion
Assert.AreEqual(@"{
StringAssert.AreEqual(@"{
""channel"": {
""title"": ""STAR WARS"",
""link"": ""http://www.starwars.com"",
Src/Newtonsoft.Json.Tests/Documentation/Samples/Linq/ParseJsonArray.cs
+1 -1
View File
@@ -61,7 +61,7 @@ namespace Newtonsoft.Json.Tests.Documentation.Samples.Linq
// ]
#endregion
Assert.AreEqual(@"[
StringAssert.AreEqual(@"[
""Small"",
""Medium"",
""Large""
Src/Newtonsoft.Json.Tests/Documentation/Samples/Linq/ParseJsonObject.cs
+1 -1
View File
@@ -65,7 +65,7 @@ namespace Newtonsoft.Json.Tests.Documentation.Samples.Linq
// }
#endregion
Assert.AreEqual(@"{
StringAssert.AreEqual(@"{
""CPU"": ""Intel"",
""Drives"": [
""DVD read/writer"",
Src/Newtonsoft.Json.Tests/Documentation/Samples/Linq/SerializeWithLinq.cs
+4 -5
View File
@@ -72,8 +72,7 @@ namespace Newtonsoft.Json.Tests.Documentation.Samples.Linq
AuthorName = "James Newton-King",
AuthorTwitter = "JamesNK",
PostedDate = new DateTime(2013, 1, 23, 19, 30, 0),
Body = @"<h3>Title!</h3>
<p>Content!</p>"
Body = @"<h3>Title!</h3><p>Content!</p>"
}
};
@@ -102,12 +101,12 @@ namespace Newtonsoft.Json.Tests.Documentation.Samples.Linq
// "Twitter": "JamesNK"
// },
// "Date": "2013-01-23T19:30:00",
// "BodyHtml": "&lt;h3&gt;Title!&lt;/h3&gt;\r\n&lt;p&gt;Content!&lt;/p&gt;"
// "BodyHtml": "&lt;h3&gt;Title!&lt;/h3&gt;&lt;p&gt;Content!&lt;/p&gt;"
// }
// ]
#endregion
Assert.AreEqual(@"[
StringAssert.AreEqual(@"[
{
""Title"": ""Json.NET is awesome!"",
""Author"": {
@@ -115,7 +114,7 @@ namespace Newtonsoft.Json.Tests.Documentation.Samples.Linq
""Twitter"": ""JamesNK""
},
""Date"": ""2013-01-23T19:30:00"",
""BodyHtml"": ""&lt;h3&gt;Title!&lt;/h3&gt;\r\n &lt;p&gt;Content!&lt;/p&gt;""
""BodyHtml"": ""&lt;h3&gt;Title!&lt;/h3&gt;&lt;p&gt;Content!&lt;/p&gt;""
}
]", blogPostsArray.ToString());
}
Src/Newtonsoft.Json.Tests/Documentation/Samples/Serializer/CustomContractResolver.cs
+1 -1
View File
@@ -108,7 +108,7 @@ namespace Newtonsoft.Json.Tests.Documentation.Samples.Serializer
// }
#endregion
Assert.AreEqual(@"{
StringAssert.AreEqual(@"{
""LastName"": ""Deepwater-Diver""
}", startingWithL);
}
Src/Newtonsoft.Json.Tests/Documentation/Samples/Serializer/CustomTraceWriter.cs
+1 -1
View File
@@ -113,7 +113,7 @@ namespace Newtonsoft.Json.Tests.Documentation.Samples.Serializer
// ]
#endregion
Assert.AreEqual(@"[
StringAssert.AreEqual(@"[
""New Zealand"",
""Australia"",
""Denmark"",
Src/Newtonsoft.Json.Tests/Documentation/Samples/Serializer/DataContractAndDataMember.cs
+1 -1
View File
@@ -79,7 +79,7 @@ namespace Newtonsoft.Json.Tests.Documentation.Samples.Serializer
// }
#endregion
Assert.AreEqual(@"{
StringAssert.AreEqual(@"{
""Name"": ""ImportantLegalDocuments.docx"",
""Size"": 51200
}", json);
Src/Newtonsoft.Json.Tests/Documentation/Samples/Serializer/ErrorHandlingAttribute.cs
+1 -1
View File
@@ -96,7 +96,7 @@ namespace Newtonsoft.Json.Tests.Documentation.Samples.Serializer
// }
#endregion
Assert.AreEqual(@"{
StringAssert.AreEqual(@"{
""Name"": ""George Michael Bluth"",
""Age"": 16,
""Title"": ""Mister Manager""
Src/Newtonsoft.Json.Tests/Documentation/Samples/Serializer/JsonConverterAttributeProperty.cs
+1 -1
View File
@@ -77,7 +77,7 @@ namespace Newtonsoft.Json.Tests.Documentation.Samples.Serializer
// }
#endregion
Assert.AreEqual(@"{
StringAssert.AreEqual(@"{
""UserName"": ""domain\\username"",
""Status"": ""Deleted""
}", json);
Src/Newtonsoft.Json.Tests/Documentation/Samples/Serializer/JsonObjectAttributeOptIn.cs
+1 -1
View File
@@ -76,7 +76,7 @@ namespace Newtonsoft.Json.Tests.Documentation.Samples.Serializer
// }
#endregion
Assert.AreEqual(@"{
StringAssert.AreEqual(@"{
""Name"": ""ImportantLegalDocuments.docx"",
""Size"": 51200
}", json);
Src/Newtonsoft.Json.Tests/Documentation/Samples/Serializer/JsonObjectAttributeOverrideIEnumerable.cs
+1 -1
View File
@@ -91,7 +91,7 @@ namespace Newtonsoft.Json.Tests.Documentation.Samples.Serializer
// }
#endregion
Assert.AreEqual(@"{
StringAssert.AreEqual(@"{
""Name"": ""My Documents"",
""Files"": [
""ImportantLegalDocuments.docx"",
Src/Newtonsoft.Json.Tests/Documentation/Samples/Serializer/JsonPropertyItemLevelSetting.cs
+1 -1
View File
@@ -104,7 +104,7 @@ namespace Newtonsoft.Json.Tests.Documentation.Samples.Serializer
// }
#endregion
Assert.AreEqual(@"{
StringAssert.AreEqual(@"{
""Name"": ""Acme Ltd."",
""Employees"": [
{
Src/Newtonsoft.Json.Tests/Documentation/Samples/Serializer/JsonPropertyName.cs
+1 -1
View File
@@ -70,7 +70,7 @@ namespace Newtonsoft.Json.Tests.Documentation.Samples.Serializer
// }
#endregion
Assert.AreEqual(@"{
StringAssert.AreEqual(@"{
""name"": ""Starcraft"",
""release_date"": ""1998-01-01T00:00:00""
}", json);
Src/Newtonsoft.Json.Tests/Documentation/Samples/Serializer/JsonPropertyOrder.cs
+1 -1
View File
@@ -88,7 +88,7 @@ namespace Newtonsoft.Json.Tests.Documentation.Samples.Serializer
// }
#endregion
Assert.AreEqual(@"{
StringAssert.AreEqual(@"{
""FullName"": ""Aaron Account"",
""EmailAddress"": ""aaron@example.com"",
""CreatedDate"": ""2010-10-01T00:00:00"",
Src/Newtonsoft.Json.Tests/Documentation/Samples/Serializer/JsonPropertyPropertyLevelSetting.cs
+1 -1
View File
@@ -70,7 +70,7 @@ namespace Newtonsoft.Json.Tests.Documentation.Samples.Serializer
// }
#endregion
Assert.AreEqual(@"{
StringAssert.AreEqual(@"{
""Name"": ""Red October"",
""Class"": ""Typhoon""
}", json);
Src/Newtonsoft.Json.Tests/Documentation/Samples/Serializer/NullValueHandlingIgnore.cs
+1 -1
View File
@@ -82,7 +82,7 @@ namespace Newtonsoft.Json.Tests.Documentation.Samples.Serializer
// }
#endregion
Assert.AreEqual(@"{
StringAssert.AreEqual(@"{
""Name"": ""Nigal Newborn"",
""Age"": 1
}", jsonIgnoreNullValues);
Src/Newtonsoft.Json.Tests/Documentation/Samples/Serializer/PreserveReferencesHandlingObject.cs
+1 -1
View File
@@ -132,7 +132,7 @@ namespace Newtonsoft.Json.Tests.Documentation.Samples.Serializer
// }
#endregion
Assert.AreEqual(@"{
StringAssert.AreEqual(@"{
""$id"": ""1"",
""Name"": ""My Documents"",
""Parent"": {
Src/Newtonsoft.Json.Tests/Documentation/Samples/Serializer/ReferenceLoopHandlingIgnore.cs
+1 -1
View File
@@ -71,7 +71,7 @@ namespace Newtonsoft.Json.Tests.Documentation.Samples.Serializer
// }
#endregion
Assert.AreEqual(@"{
StringAssert.AreEqual(@"{
""Name"": ""Joe User"",
""Manager"": {
""Name"": ""Mike Manager""
Src/Newtonsoft.Json.Tests/Documentation/Samples/Serializer/SerializeConditionalProperty.cs
+1 -1
View File
@@ -85,7 +85,7 @@ namespace Newtonsoft.Json.Tests.Documentation.Samples.Serializer
// ]
#endregion
Assert.AreEqual(@"[
StringAssert.AreEqual(@"[
{
""Name"": ""Joe Employee"",
""Manager"": {
Src/Newtonsoft.Json.Tests/Documentation/Samples/Serializer/SerializeContractResolver.cs
+1 -1
View File
@@ -77,7 +77,7 @@ namespace Newtonsoft.Json.Tests.Documentation.Samples.Serializer
// }
#endregion
Assert.AreEqual(@"{
StringAssert.AreEqual(@"{
""firstName"": ""Sarah"",
""lastName"": ""Security"",
""fullName"": ""Sarah Security""
Src/Newtonsoft.Json.Tests/Documentation/Samples/Serializer/SerializeDataSet.cs
+1 -1
View File
@@ -84,7 +84,7 @@ namespace Newtonsoft.Json.Tests.Documentation.Samples.Serializer
// }
#endregion
Assert.AreEqual(@"{
StringAssert.AreEqual(@"{
""Table1"": [
{
""id"": 0,
Src/Newtonsoft.Json.Tests/Documentation/Samples/Serializer/SerializeDictionary.cs
+1 -1
View File
@@ -61,7 +61,7 @@ namespace Newtonsoft.Json.Tests.Documentation.Samples.Serializer
// }
#endregion
Assert.AreEqual(@"{
StringAssert.AreEqual(@"{
""James"": 9001,
""Jo"": 3474,
""Jess"": 11926
Src/Newtonsoft.Json.Tests/Documentation/Samples/Serializer/SerializeObject.cs
+1 -1
View File
@@ -80,7 +80,7 @@ namespace Newtonsoft.Json.Tests.Documentation.Samples.Serializer
Console.WriteLine(json);
#endregion
Assert.AreEqual(@"{
StringAssert.AreEqual(@"{
""Email"": ""james@example.com"",
""Active"": true,
""CreatedDate"": ""2013-01-20T00:00:00Z"",
Src/Newtonsoft.Json.Tests/Documentation/Samples/Serializer/SerializeRawJson.cs
+1 -1
View File
@@ -68,7 +68,7 @@ namespace Newtonsoft.Json.Tests.Documentation.Samples.Serializer
// }
#endregion
Assert.AreEqual(@"{
StringAssert.AreEqual(@"{
""OnLoadFunction"": OnLoad,
""OnUnloadFunction"": function(e) { alert(e); }
}", json);
Src/Newtonsoft.Json.Tests/Documentation/Samples/Xml/ConvertJsonToXml.cs
+1 -1
View File
@@ -79,7 +79,7 @@ namespace Newtonsoft.Json.Tests.Documentation.Samples.Xml
// </Root>
#endregion
Assert.AreEqual(@"<Root Id=""1"">
StringAssert.AreEqual(@"<Root Id=""1"">
<Email>james@example.com</Email>
<Active>true</Active>
<CreatedDate>2013-01-20T00:00:00Z</CreatedDate>
Src/Newtonsoft.Json.Tests/Documentation/SerializationTests.cs
+8 -8
View File
@@ -565,7 +565,7 @@ namespace Newtonsoft.Json.Tests.Documentation
//}
#endregion
Assert.AreEqual(@"{
StringAssert.AreEqual(@"{
""name"": ""Widget"",
""expiryDate"": ""2010-12-20T18:01:00Z"",
""price"": 9.99,
@@ -615,7 +615,7 @@ namespace Newtonsoft.Json.Tests.Documentation
//]
#endregion
Assert.AreEqual(@"[
StringAssert.AreEqual(@"[
{
""Name"": ""Product 1"",
""ExpiryDate"": ""2000-12-29T00:00:00Z"",
@@ -790,7 +790,7 @@ namespace Newtonsoft.Json.Tests.Documentation
// }
#endregion
Assert.AreEqual(@"{
StringAssert.AreEqual(@"{
""Name"": ""Bad Boys III"",
""Description"": ""It's no Bad Boys"",
""Classification"": null,
@@ -799,7 +799,7 @@ namespace Newtonsoft.Json.Tests.Documentation
""ReleaseCountries"": null
}", included);
Assert.AreEqual(@"{
StringAssert.AreEqual(@"{
""Name"": ""Bad Boys III"",
""Description"": ""It's no Bad Boys""
}", ignored);
@@ -862,7 +862,7 @@ namespace Newtonsoft.Json.Tests.Documentation
// }
#endregion
Assert.AreEqual(@"{
StringAssert.AreEqual(@"{
""Company"": ""Acme Ltd."",
""Amount"": 50.0,
""Paid"": false,
@@ -871,7 +871,7 @@ namespace Newtonsoft.Json.Tests.Documentation
""FollowUpEmailAddress"": """"
}", included);
Assert.AreEqual(@"{
StringAssert.AreEqual(@"{
""Company"": ""Acme Ltd."",
""Amount"": 50.0
}", ignored);
@@ -940,13 +940,13 @@ namespace Newtonsoft.Json.Tests.Documentation
// }
#endregion
Assert.AreEqual(@"{
StringAssert.AreEqual(@"{
""AuthorName"": ""Brandon Sanderson"",
""AuthorAge"": 34,
""AuthorCountry"": ""United States of America""
}", startingWithA);
Assert.AreEqual(@"{
StringAssert.AreEqual(@"{
""BookName"": ""The Gathering Storm"",
""BookPrice"": 16.19
}", startingWithB);
Src/Newtonsoft.Json.Tests/JsonTextWriterTest.cs
+1 -1
View File
@@ -157,7 +157,7 @@ namespace Newtonsoft.Json.Tests
string result = o.ToString();
Assert.AreEqual(@"{
StringAssert.AreEqual(@"{
""BodyHtml"": ""<h3>Title!</h3>\r\n <p>Content!</p>""
}", result);
}
Src/Newtonsoft.Json.Tests/Serialization/JsonSerializerCollectionsTests.cs
+1 -1
View File
@@ -462,7 +462,7 @@ namespace Newtonsoft.Json.Tests.Serialization
string json = JsonConvert.SerializeObject(d, Formatting.Indented);
Assert.AreEqual(@"{
StringAssert.AreEqual(@"{
""key"": [
{
""Text1"": ""value1""
Src/Newtonsoft.Json.Tests/Serialization/JsonSerializerTest.cs
+3 -3
View File
@@ -441,7 +441,7 @@ namespace Newtonsoft.Json.Tests.Serialization
ContractResolver = new DictionaryKeyContractResolver()
});
Assert.AreEqual(@"{
StringAssert.AreEqual(@"{
""NAME"": ""James"",
""AGE"": 1,
""ROLENAMES"": {
@@ -574,7 +574,7 @@ namespace Newtonsoft.Json.Tests.Serialization
ContractResolver = new IgnoredPropertiesContractResolver()
});
Assert.AreEqual(@"{
StringAssert.AreEqual(@"{
""Name"": ""Name!""
}", json);
@@ -2907,7 +2907,7 @@ keyword such as type of business.""
string json = JsonConvert.SerializeObject(o, Formatting.Indented);
Assert.AreEqual(@"{
StringAssert.AreEqual(@"{
""IEnumerableProperty"": [
4,
5,
Src/Newtonsoft.Json.Tests/Serialization/TraceWriterTests.cs
+2 -2
View File
@@ -269,12 +269,12 @@ Newtonsoft.Json Error: 0 : Error!
$('#element')
]", json);
Assert.IsTrue(traceWriter.ToString().EndsWith(@"Verbose Serialized JSON:
Assert.IsTrue(StringAssert.Normalize(traceWriter.ToString()).EndsWith(StringAssert.Normalize(@"Verbose Serialized JSON:
[
$('#element'),
$('#element'),
$('#element')
]", StringComparison.Ordinal));
]"), StringComparison.Ordinal));
}
[Test]