-Fixed flag enum items not being correctly camel cased

-Fixed JsonValidatingReader not validating the first array item twice
-Fixed JsonSchema not correctly validating integers as a subset of decimal
-Changed JsonTextReader.Culture to be CultureInfo.InvariantCulture by default
This commit is contained in:
JamesNK
2011-11-18 09:36:01 +00:00
parent da7e4508d7
commit 5831b11de1
8 changed files with 240 additions and 9 deletions
@@ -23,6 +23,14 @@ namespace Newtonsoft.Json.Tests.Converters
public T Enum { get; set; }
}
[Flags]
public enum FlagsTestEnum
{
Default = 0,
First = 1,
Second = 2
}
public enum NegativeEnum
{
Negative = -1,
@@ -256,5 +264,30 @@ namespace Newtonsoft.Json.Tests.Converters
Assert.AreEqual((StoreColor)1000, enumClass.NullableStoreColor1);
Assert.AreEqual(null, enumClass.NullableStoreColor2);
}
[Test]
public void CamelCaseTextFlagEnumSerialization()
{
EnumContainer<FlagsTestEnum> c = new EnumContainer<FlagsTestEnum>
{
Enum = FlagsTestEnum.First | FlagsTestEnum.Second
};
string json = JsonConvert.SerializeObject(c, Formatting.Indented, new StringEnumConverter { CamelCaseText = true });
Assert.AreEqual(@"{
""Enum"": ""first, second""
}", json);
}
[Test]
public void CamelCaseTextFlagEnumDeserialization()
{
string json = @"{
""Enum"": ""first, second""
}";
EnumContainer<FlagsTestEnum> c = JsonConvert.DeserializeObject<EnumContainer<FlagsTestEnum>>(json, new StringEnumConverter { CamelCaseText = true });
Assert.AreEqual(FlagsTestEnum.First | FlagsTestEnum.Second, c.Enum);
}
}
}