-Refactored enum name writing
-Improved performance of reading and writing enum names -Tests
This commit is contained in:
@@ -201,6 +201,32 @@ namespace Newtonsoft.Json.Tests
|
||||
]
|
||||
}", sw.ToString());
|
||||
}
|
||||
|
||||
[Test]
|
||||
public async Task WriteLazy_Property()
|
||||
{
|
||||
LazyStringWriter sw = new LazyStringWriter(CultureInfo.InvariantCulture);
|
||||
|
||||
using (JsonTextWriter writer = new JsonTextWriter(sw))
|
||||
{
|
||||
writer.Indentation = 4;
|
||||
writer.Formatting = Formatting.Indented;
|
||||
|
||||
await writer.WriteStartArrayAsync();
|
||||
|
||||
await writer.WriteStartObjectAsync();
|
||||
|
||||
await writer.WritePropertyNameAsync("IncompleteProp");
|
||||
|
||||
await writer.WriteEndArrayAsync();
|
||||
}
|
||||
|
||||
StringAssert.AreEqual(@"[
|
||||
{
|
||||
""IncompleteProp"": null
|
||||
}
|
||||
]", sw.ToString());
|
||||
}
|
||||
#endif
|
||||
|
||||
[Test]
|
||||
|
||||
@@ -0,0 +1,311 @@
|
||||
#region License
|
||||
// Copyright (c) 2007 James Newton-King
|
||||
//
|
||||
// Permission is hereby granted, free of charge, to any person
|
||||
// obtaining a copy of this software and associated documentation
|
||||
// files (the "Software"), to deal in the Software without
|
||||
// restriction, including without limitation the rights to use,
|
||||
// copy, modify, merge, publish, distribute, sublicense, and/or sell
|
||||
// copies of the Software, and to permit persons to whom the
|
||||
// Software is furnished to do so, subject to the following
|
||||
// conditions:
|
||||
//
|
||||
// The above copyright notice and this permission notice shall be
|
||||
// included in all copies or substantial portions of the Software.
|
||||
//
|
||||
// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
|
||||
// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
|
||||
// OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
|
||||
// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
|
||||
// HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
|
||||
// WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
|
||||
// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
|
||||
// OTHER DEALINGS IN THE SOFTWARE.
|
||||
#endregion
|
||||
|
||||
#if !(NET20 || NET35)
|
||||
using System;
|
||||
using System.Collections.Generic;
|
||||
using System.Linq;
|
||||
using System.Reflection;
|
||||
using System.Text;
|
||||
using Newtonsoft.Json.Utilities;
|
||||
#if DNXCORE50
|
||||
using Xunit;
|
||||
using Test = Xunit.FactAttribute;
|
||||
using Assert = Newtonsoft.Json.Tests.XUnitAssert;
|
||||
using TestCaseSource = Xunit.MemberDataAttribute;
|
||||
#else
|
||||
using NUnit.Framework;
|
||||
#endif
|
||||
|
||||
namespace Newtonsoft.Json.Tests.Utilities
|
||||
{
|
||||
public class EnumUtilsTests : TestFixtureBase
|
||||
{
|
||||
#if DNXCORE50
|
||||
[Theory]
|
||||
#endif
|
||||
[TestCaseSource(nameof(Parse_TestData))]
|
||||
public void Parse(string value, object expected)
|
||||
{
|
||||
Type enumType = expected.GetType();
|
||||
|
||||
Enum result = (Enum)EnumUtils.ParseEnumName(value, false, false, enumType);
|
||||
Assert.AreEqual(expected, result);
|
||||
}
|
||||
|
||||
#if DNXCORE50
|
||||
[Theory]
|
||||
#endif
|
||||
[TestCaseSource(nameof(Parse_Invalid_TestData))]
|
||||
public void Parse_Invalid(Type enumType, string value, Type exceptionType)
|
||||
{
|
||||
try
|
||||
{
|
||||
EnumUtils.ParseEnumName(value, false, false, enumType);
|
||||
}
|
||||
catch (Exception ex) when (ex.GetType() == exceptionType)
|
||||
{
|
||||
// nom nom nom
|
||||
return;
|
||||
}
|
||||
|
||||
Assert.Fail($"Expected {exceptionType.FullName} exception.");
|
||||
}
|
||||
|
||||
#if DNXCORE50
|
||||
[Theory]
|
||||
#endif
|
||||
[TestCaseSource(nameof(ToString_Format_TestData))]
|
||||
public static void ToString_Format(Enum e, string expected)
|
||||
{
|
||||
EnumUtils.TryToString(e.GetType(), e, false, out string result);
|
||||
|
||||
Assert.AreEqual(expected, result);
|
||||
}
|
||||
|
||||
#region Test data
|
||||
// test data from https://github.com/dotnet/corefx/blob/master/src/System.Runtime/tests/System/EnumTests.cs
|
||||
public static IEnumerable<object[]> Parse_TestData()
|
||||
{
|
||||
// SByte
|
||||
yield return new object[] { "Min", SByteEnum.Min };
|
||||
yield return new object[] { "mAx", SByteEnum.Max };
|
||||
yield return new object[] { "1", SByteEnum.One };
|
||||
yield return new object[] { "5", (SByteEnum)5 };
|
||||
|
||||
// Byte
|
||||
yield return new object[] { "Min", ByteEnum.Min };
|
||||
yield return new object[] { "mAx", ByteEnum.Max };
|
||||
yield return new object[] { "1", ByteEnum.One };
|
||||
yield return new object[] { "5", (ByteEnum)5 };
|
||||
|
||||
// Int16
|
||||
yield return new object[] { "Min", Int16Enum.Min };
|
||||
yield return new object[] { "mAx", Int16Enum.Max };
|
||||
yield return new object[] { "1", Int16Enum.One };
|
||||
yield return new object[] { "5", (Int16Enum)5 };
|
||||
|
||||
// UInt16
|
||||
yield return new object[] { "Min", UInt16Enum.Min };
|
||||
yield return new object[] { "mAx", UInt16Enum.Max };
|
||||
yield return new object[] { "1", UInt16Enum.One };
|
||||
yield return new object[] { "5", (UInt16Enum)5 };
|
||||
|
||||
// Int32
|
||||
yield return new object[] { "Min", Int32Enum.Min };
|
||||
yield return new object[] { "mAx", Int32Enum.Max };
|
||||
yield return new object[] { "1", Int32Enum.One };
|
||||
yield return new object[] { "5", (Int32Enum)5 };
|
||||
|
||||
// UInt32
|
||||
yield return new object[] { "Min", UInt32Enum.Min };
|
||||
yield return new object[] { "mAx", UInt32Enum.Max };
|
||||
yield return new object[] { "1", UInt32Enum.One };
|
||||
yield return new object[] { "5", (UInt32Enum)5 };
|
||||
|
||||
// Int64
|
||||
yield return new object[] { "Min", Int64Enum.Min };
|
||||
yield return new object[] { "mAx", Int64Enum.Max };
|
||||
yield return new object[] { "1", Int64Enum.One };
|
||||
yield return new object[] { "5", (Int64Enum)5 };
|
||||
|
||||
// UInt64
|
||||
yield return new object[] { "Min", UInt64Enum.Min };
|
||||
yield return new object[] { "mAx", UInt64Enum.Max };
|
||||
yield return new object[] { "1", UInt64Enum.One };
|
||||
yield return new object[] { "5", (UInt64Enum)5 };
|
||||
|
||||
// SimpleEnum
|
||||
yield return new object[] { "Red", SimpleEnum.Red };
|
||||
yield return new object[] { " Red", SimpleEnum.Red };
|
||||
yield return new object[] { "Red ", SimpleEnum.Red };
|
||||
yield return new object[] { " red ", SimpleEnum.Red };
|
||||
yield return new object[] { "B", SimpleEnum.B };
|
||||
yield return new object[] { "B,B", SimpleEnum.B };
|
||||
yield return new object[] { " Red , Blue ", SimpleEnum.Red | SimpleEnum.Blue };
|
||||
yield return new object[] { "Blue,Red,Green", SimpleEnum.Red | SimpleEnum.Blue | SimpleEnum.Green };
|
||||
yield return new object[] { "Blue,Red,Red,Red,Green", SimpleEnum.Red | SimpleEnum.Blue | SimpleEnum.Green };
|
||||
yield return new object[] { "Red,Blue, Green", SimpleEnum.Red | SimpleEnum.Blue | SimpleEnum.Green };
|
||||
yield return new object[] { "1", SimpleEnum.Red };
|
||||
yield return new object[] { " 1 ", SimpleEnum.Red };
|
||||
yield return new object[] { "2", SimpleEnum.Blue };
|
||||
yield return new object[] { "99", (SimpleEnum)99 };
|
||||
yield return new object[] { "-42", (SimpleEnum)(-42) };
|
||||
yield return new object[] { " -42", (SimpleEnum)(-42) };
|
||||
yield return new object[] { " -42 ", (SimpleEnum)(-42) };
|
||||
}
|
||||
|
||||
// test data from https://github.com/dotnet/corefx/blob/master/src/System.Runtime/tests/System/EnumTests.cs
|
||||
public static IEnumerable<object[]> Parse_Invalid_TestData()
|
||||
{
|
||||
// SimpleEnum
|
||||
yield return new object[] { null, "", typeof(ArgumentNullException) };
|
||||
yield return new object[] { typeof(SimpleEnum), null, typeof(ArgumentNullException) };
|
||||
yield return new object[] { typeof(object), "", typeof(ArgumentException) };
|
||||
yield return new object[] { typeof(SimpleEnum), "", typeof(ArgumentException) };
|
||||
yield return new object[] { typeof(SimpleEnum), " \t", typeof(ArgumentException) };
|
||||
yield return new object[] { typeof(SimpleEnum), "Purple", typeof(ArgumentException) };
|
||||
yield return new object[] { typeof(SimpleEnum), ",Red", typeof(ArgumentException) };
|
||||
yield return new object[] { typeof(SimpleEnum), "Red,", typeof(ArgumentException) };
|
||||
yield return new object[] { typeof(SimpleEnum), "B,", typeof(ArgumentException) };
|
||||
yield return new object[] { typeof(SimpleEnum), " , , ,", typeof(ArgumentException) };
|
||||
yield return new object[] { typeof(SimpleEnum), "Red,Blue,", typeof(ArgumentException) };
|
||||
yield return new object[] { typeof(SimpleEnum), "Red,,Blue", typeof(ArgumentException) };
|
||||
yield return new object[] { typeof(SimpleEnum), "Red,Blue, ", typeof(ArgumentException) };
|
||||
yield return new object[] { typeof(SimpleEnum), "Red Blue", typeof(ArgumentException) };
|
||||
yield return new object[] { typeof(SimpleEnum), "1,Blue", typeof(ArgumentException) };
|
||||
yield return new object[] { typeof(SimpleEnum), "Blue,1", typeof(ArgumentException) };
|
||||
yield return new object[] { typeof(SimpleEnum), "Blue, 1", typeof(ArgumentException) };
|
||||
yield return new object[] { typeof(SimpleEnum), "2147483649", typeof(OverflowException) };
|
||||
yield return new object[] { typeof(SimpleEnum), "2147483648", typeof(OverflowException) };
|
||||
}
|
||||
|
||||
// test data from https://github.com/dotnet/corefx/blob/master/src/System.Runtime/tests/System/EnumTests.cs
|
||||
public static IEnumerable<object[]> ToString_Format_TestData()
|
||||
{
|
||||
yield return new object[] { SByteEnum.Min, "Min" };
|
||||
yield return new object[] { (SByteEnum)5, null };
|
||||
yield return new object[] { SByteEnum.Max, "Max" };
|
||||
|
||||
yield return new object[] { ByteEnum.Min, "Min" };
|
||||
yield return new object[] { (ByteEnum)5, null };
|
||||
yield return new object[] { (ByteEnum)0xff, "Max" };
|
||||
yield return new object[] { (ByteEnum)3, null };
|
||||
|
||||
yield return new object[] { Int16Enum.Min, "Min" };
|
||||
yield return new object[] { (Int16Enum)5, null };
|
||||
yield return new object[] { Int16Enum.Max, "Max" };
|
||||
yield return new object[] { (Int16Enum)3, null };
|
||||
|
||||
yield return new object[] { UInt16Enum.Min, "Min" };
|
||||
yield return new object[] { (UInt16Enum)5, null };
|
||||
yield return new object[] { UInt16Enum.Max, "Max" };
|
||||
yield return new object[] { (UInt16Enum)3, null };
|
||||
|
||||
yield return new object[] { Int32Enum.Min, "Min" };
|
||||
yield return new object[] { (Int32Enum)5, null };
|
||||
yield return new object[] { Int32Enum.Max, "Max" };
|
||||
yield return new object[] { (Int32Enum)3, null };
|
||||
|
||||
yield return new object[] { UInt32Enum.Min, "Min" };
|
||||
yield return new object[] { (UInt32Enum)5, null };
|
||||
yield return new object[] { UInt32Enum.Max, "Max" };
|
||||
yield return new object[] { (UInt32Enum)3, null };
|
||||
|
||||
yield return new object[] { Int64Enum.Min, "Min" };
|
||||
yield return new object[] { (Int64Enum)5, null };
|
||||
yield return new object[] { Int64Enum.Max, "Max" };
|
||||
yield return new object[] { (Int64Enum)3, null };
|
||||
|
||||
yield return new object[] { UInt64Enum.Min, "Min" };
|
||||
yield return new object[] { (UInt64Enum)5, null };
|
||||
yield return new object[] { UInt64Enum.Max, "Max" };
|
||||
yield return new object[] { (UInt64Enum)3, null };
|
||||
|
||||
yield return new object[] { SimpleEnum.Red, "Red" };
|
||||
yield return new object[] { SimpleEnum.Blue, "Blue" };
|
||||
yield return new object[] { (SimpleEnum)99, null };
|
||||
yield return new object[] { (SimpleEnum)0, null };
|
||||
|
||||
yield return new object[] { AttributeTargets.Class | AttributeTargets.Delegate, "Class, Delegate" };
|
||||
}
|
||||
#endregion
|
||||
}
|
||||
|
||||
public enum SimpleEnum
|
||||
{
|
||||
Red = 1,
|
||||
Blue = 2,
|
||||
Green = 3,
|
||||
Green_a = 3,
|
||||
Green_b = 3,
|
||||
B = 4
|
||||
}
|
||||
|
||||
public enum ByteEnum : byte
|
||||
{
|
||||
Min = byte.MinValue,
|
||||
One = 1,
|
||||
Two = 2,
|
||||
Max = byte.MaxValue,
|
||||
}
|
||||
|
||||
public enum SByteEnum : sbyte
|
||||
{
|
||||
Min = sbyte.MinValue,
|
||||
One = 1,
|
||||
Two = 2,
|
||||
Max = sbyte.MaxValue,
|
||||
}
|
||||
|
||||
public enum UInt16Enum : ushort
|
||||
{
|
||||
Min = ushort.MinValue,
|
||||
One = 1,
|
||||
Two = 2,
|
||||
Max = ushort.MaxValue,
|
||||
}
|
||||
|
||||
public enum Int16Enum : short
|
||||
{
|
||||
Min = short.MinValue,
|
||||
One = 1,
|
||||
Two = 2,
|
||||
Max = short.MaxValue,
|
||||
}
|
||||
|
||||
public enum UInt32Enum : uint
|
||||
{
|
||||
Min = uint.MinValue,
|
||||
One = 1,
|
||||
Two = 2,
|
||||
Max = uint.MaxValue,
|
||||
}
|
||||
|
||||
public enum Int32Enum : int
|
||||
{
|
||||
Min = int.MinValue,
|
||||
One = 1,
|
||||
Two = 2,
|
||||
Max = int.MaxValue,
|
||||
}
|
||||
|
||||
public enum UInt64Enum : ulong
|
||||
{
|
||||
Min = ulong.MinValue,
|
||||
One = 1,
|
||||
Two = 2,
|
||||
Max = ulong.MaxValue,
|
||||
}
|
||||
|
||||
public enum Int64Enum : long
|
||||
{
|
||||
Min = long.MinValue,
|
||||
One = 1,
|
||||
Two = 2,
|
||||
Max = long.MaxValue,
|
||||
}
|
||||
}
|
||||
#endif
|
||||
Reference in New Issue
Block a user