-Formatting

-Build
This commit is contained in:
James Newton-King
2015-12-04 23:54:38 +13:00
parent c96779dc10
commit eb0cbd6a75
334 changed files with 3952 additions and 514 deletions
@@ -500,7 +500,6 @@ namespace Newtonsoft.Json.Tests.Converters
Assert.AreEqual(DuplicateNameEnum.foo_bar, o.Value);
Assert.AreEqual(DuplicateNameEnum2.FooBar, o.Value2);
}, "Type 'Newtonsoft.Json.Tests.Converters.DuplicateNameEnum' contains two members 'foo_bar' 'and 'FooBar' with the same name 'foo_bar'. Multiple members with the same name in one type are not supported. Consider changing one of the member names using EnumMemberAttribute attribute.");
}
#endif
@@ -512,6 +511,7 @@ namespace Newtonsoft.Json.Tests.Converters
{
[DataMember]
public DuplicateNameEnum Value { get; set; }
[DataMember]
public DuplicateNameEnum2 Value2 { get; set; }
}
@@ -521,10 +521,13 @@ namespace Newtonsoft.Json.Tests.Converters
{
[EnumMember]
first = 0,
[EnumMember]
foo_bar = 1,
[EnumMember(Value = "foo_bar")]
FooBar = 2,
[EnumMember]
foo_bar_NOT_USED = 3
}
@@ -534,10 +537,13 @@ namespace Newtonsoft.Json.Tests.Converters
{
[EnumMember]
first = 0,
[EnumMember(Value = "foo_bar")]
FooBar = 1,
[EnumMember]
foo_bar = 2,
[EnumMember(Value = "TEST")]
foo_bar_NOT_USED = 3
}