-Tests
This commit is contained in:
@@ -25,11 +25,9 @@
|
|||||||
|
|
||||||
using System;
|
using System;
|
||||||
using System.Collections.Generic;
|
using System.Collections.Generic;
|
||||||
using System.Globalization;
|
|
||||||
using System.IO;
|
using System.IO;
|
||||||
using System.Runtime.Serialization;
|
using System.Runtime.Serialization;
|
||||||
using System.Text;
|
using System.Text;
|
||||||
using System.Text.RegularExpressions;
|
|
||||||
using Newtonsoft.Json.Converters;
|
using Newtonsoft.Json.Converters;
|
||||||
#if DNXCORE50
|
#if DNXCORE50
|
||||||
using Xunit;
|
using Xunit;
|
||||||
@@ -257,10 +255,12 @@ namespace Newtonsoft.Json.Tests.Converters
|
|||||||
[Test]
|
[Test]
|
||||||
public void SerializeEnumClass()
|
public void SerializeEnumClass()
|
||||||
{
|
{
|
||||||
EnumClass enumClass = new EnumClass();
|
EnumClass enumClass = new EnumClass()
|
||||||
enumClass.StoreColor = StoreColor.Red;
|
{
|
||||||
enumClass.NullableStoreColor1 = StoreColor.White;
|
StoreColor = StoreColor.Red,
|
||||||
enumClass.NullableStoreColor2 = null;
|
NullableStoreColor1 = StoreColor.White,
|
||||||
|
NullableStoreColor2 = null
|
||||||
|
};
|
||||||
|
|
||||||
string json = JsonConvert.SerializeObject(enumClass, Formatting.Indented, new StringEnumConverter());
|
string json = JsonConvert.SerializeObject(enumClass, Formatting.Indented, new StringEnumConverter());
|
||||||
|
|
||||||
@@ -274,10 +274,12 @@ namespace Newtonsoft.Json.Tests.Converters
|
|||||||
[Test]
|
[Test]
|
||||||
public void SerializeEnumClassWithCamelCase()
|
public void SerializeEnumClassWithCamelCase()
|
||||||
{
|
{
|
||||||
EnumClass enumClass = new EnumClass();
|
EnumClass enumClass = new EnumClass()
|
||||||
enumClass.StoreColor = StoreColor.Red;
|
{
|
||||||
enumClass.NullableStoreColor1 = StoreColor.DarkGoldenrod;
|
StoreColor = StoreColor.Red,
|
||||||
enumClass.NullableStoreColor2 = null;
|
NullableStoreColor1 = StoreColor.DarkGoldenrod,
|
||||||
|
NullableStoreColor2 = null
|
||||||
|
};
|
||||||
|
|
||||||
string json = JsonConvert.SerializeObject(enumClass, Formatting.Indented, new StringEnumConverter { CamelCaseText = true });
|
string json = JsonConvert.SerializeObject(enumClass, Formatting.Indented, new StringEnumConverter { CamelCaseText = true });
|
||||||
|
|
||||||
@@ -291,10 +293,12 @@ namespace Newtonsoft.Json.Tests.Converters
|
|||||||
[Test]
|
[Test]
|
||||||
public void SerializeEnumClassUndefined()
|
public void SerializeEnumClassUndefined()
|
||||||
{
|
{
|
||||||
EnumClass enumClass = new EnumClass();
|
EnumClass enumClass = new EnumClass()
|
||||||
enumClass.StoreColor = (StoreColor)1000;
|
{
|
||||||
enumClass.NullableStoreColor1 = (StoreColor)1000;
|
StoreColor = (StoreColor)1000,
|
||||||
enumClass.NullableStoreColor2 = null;
|
NullableStoreColor1 = (StoreColor)1000,
|
||||||
|
NullableStoreColor2 = null
|
||||||
|
};
|
||||||
|
|
||||||
string json = JsonConvert.SerializeObject(enumClass, Formatting.Indented, new StringEnumConverter());
|
string json = JsonConvert.SerializeObject(enumClass, Formatting.Indented, new StringEnumConverter());
|
||||||
|
|
||||||
@@ -308,10 +312,12 @@ namespace Newtonsoft.Json.Tests.Converters
|
|||||||
[Test]
|
[Test]
|
||||||
public void SerializeFlagEnum()
|
public void SerializeFlagEnum()
|
||||||
{
|
{
|
||||||
EnumClass enumClass = new EnumClass();
|
EnumClass enumClass = new EnumClass()
|
||||||
enumClass.StoreColor = StoreColor.Red | StoreColor.White;
|
{
|
||||||
enumClass.NullableStoreColor1 = StoreColor.White & StoreColor.Yellow;
|
StoreColor = StoreColor.Red | StoreColor.White,
|
||||||
enumClass.NullableStoreColor2 = StoreColor.Red | StoreColor.White | StoreColor.Black;
|
NullableStoreColor1 = StoreColor.White & StoreColor.Yellow,
|
||||||
|
NullableStoreColor2 = StoreColor.Red | StoreColor.White | StoreColor.Black
|
||||||
|
};
|
||||||
|
|
||||||
string json = JsonConvert.SerializeObject(enumClass, Formatting.Indented, new StringEnumConverter());
|
string json = JsonConvert.SerializeObject(enumClass, Formatting.Indented, new StringEnumConverter());
|
||||||
|
|
||||||
@@ -354,9 +360,11 @@ namespace Newtonsoft.Json.Tests.Converters
|
|||||||
[Test]
|
[Test]
|
||||||
public void SerializeNegativeEnum()
|
public void SerializeNegativeEnum()
|
||||||
{
|
{
|
||||||
NegativeEnumClass negativeEnumClass = new NegativeEnumClass();
|
NegativeEnumClass negativeEnumClass = new NegativeEnumClass()
|
||||||
negativeEnumClass.Value1 = NegativeEnum.Negative;
|
{
|
||||||
negativeEnumClass.Value2 = (NegativeEnum)int.MinValue;
|
Value1 = NegativeEnum.Negative,
|
||||||
|
Value2 = (NegativeEnum)int.MinValue
|
||||||
|
};
|
||||||
|
|
||||||
string json = JsonConvert.SerializeObject(negativeEnumClass, Formatting.Indented, new StringEnumConverter());
|
string json = JsonConvert.SerializeObject(negativeEnumClass, Formatting.Indented, new StringEnumConverter());
|
||||||
|
|
||||||
@@ -744,15 +752,78 @@ namespace Newtonsoft.Json.Tests.Converters
|
|||||||
public void DeserializeEnumWithDifferentCases()
|
public void DeserializeEnumWithDifferentCases()
|
||||||
{
|
{
|
||||||
EnumWithDifferentCases e = JsonConvert.DeserializeObject<EnumWithDifferentCases>(@"""M""", new StringEnumConverter());
|
EnumWithDifferentCases e = JsonConvert.DeserializeObject<EnumWithDifferentCases>(@"""M""", new StringEnumConverter());
|
||||||
|
|
||||||
Assert.AreEqual(EnumWithDifferentCases.M, e);
|
Assert.AreEqual(EnumWithDifferentCases.M, e);
|
||||||
|
|
||||||
e = JsonConvert.DeserializeObject<EnumWithDifferentCases>(@"""m""", new StringEnumConverter());
|
e = JsonConvert.DeserializeObject<EnumWithDifferentCases>(@"""m""", new StringEnumConverter());
|
||||||
|
|
||||||
Assert.AreEqual(EnumWithDifferentCases.m, e);
|
Assert.AreEqual(EnumWithDifferentCases.m, e);
|
||||||
}
|
}
|
||||||
|
|
||||||
#if !NET20
|
#if !NET20
|
||||||
|
[JsonConverter(typeof(StringEnumConverter))]
|
||||||
|
public enum EnumMemberDoesNotMatchName
|
||||||
|
{
|
||||||
|
[EnumMember(Value = "first_value")]
|
||||||
|
First
|
||||||
|
}
|
||||||
|
|
||||||
|
[Test]
|
||||||
|
public void DeserializeEnumCaseIncensitive_ByEnumMemberValue_UpperCase()
|
||||||
|
{
|
||||||
|
var e = JsonConvert.DeserializeObject<EnumMemberDoesNotMatchName>(@"""FIRST_VALUE""", new StringEnumConverter());
|
||||||
|
Assert.AreEqual(EnumMemberDoesNotMatchName.First, e);
|
||||||
|
}
|
||||||
|
|
||||||
|
[Test]
|
||||||
|
public void DeserializeEnumCaseIncensitive_ByEnumMemberValue_MixedCase()
|
||||||
|
{
|
||||||
|
var e = JsonConvert.DeserializeObject<EnumMemberDoesNotMatchName>(@"""First_Value""", new StringEnumConverter());
|
||||||
|
Assert.AreEqual(EnumMemberDoesNotMatchName.First, e);
|
||||||
|
}
|
||||||
|
|
||||||
|
[Test]
|
||||||
|
public void DeserializeEnumCaseIncensitive_ByName_LowerCase()
|
||||||
|
{
|
||||||
|
var e = JsonConvert.DeserializeObject<EnumMemberDoesNotMatchName>(@"""first""", new StringEnumConverter());
|
||||||
|
Assert.AreEqual(EnumMemberDoesNotMatchName.First, e);
|
||||||
|
}
|
||||||
|
|
||||||
|
[Test]
|
||||||
|
public void DeserializeEnumCaseIncensitive_ByName_UperCase()
|
||||||
|
{
|
||||||
|
var e = JsonConvert.DeserializeObject<EnumMemberDoesNotMatchName>(@"""FIRST""", new StringEnumConverter());
|
||||||
|
Assert.AreEqual(EnumMemberDoesNotMatchName.First, e);
|
||||||
|
}
|
||||||
|
|
||||||
|
[Test]
|
||||||
|
public void DeserializeEnumCaseIncensitive_FromAttribute()
|
||||||
|
{
|
||||||
|
var e = JsonConvert.DeserializeObject<EnumMemberDoesNotMatchName>(@"""FIRST_VALUE""");
|
||||||
|
Assert.AreEqual(EnumMemberDoesNotMatchName.First, e);
|
||||||
|
}
|
||||||
|
|
||||||
|
[JsonConverter(typeof(StringEnumConverter))]
|
||||||
|
public enum EnumMemberWithDiffrentCases
|
||||||
|
{
|
||||||
|
[EnumMember(Value = "first_value")]
|
||||||
|
First,
|
||||||
|
[EnumMember(Value = "second_value")]
|
||||||
|
first
|
||||||
|
}
|
||||||
|
|
||||||
|
[Test]
|
||||||
|
public void DeserializeEnumMemberWithDifferentCasing_ByEnumMemberValue_First()
|
||||||
|
{
|
||||||
|
var e = JsonConvert.DeserializeObject<EnumMemberWithDiffrentCases>(@"""first_value""", new StringEnumConverter());
|
||||||
|
Assert.AreEqual(EnumMemberWithDiffrentCases.First, e);
|
||||||
|
}
|
||||||
|
|
||||||
|
[Test]
|
||||||
|
public void DeserializeEnumMemberWithDifferentCasing_ByEnumMemberValue_Second()
|
||||||
|
{
|
||||||
|
var e = JsonConvert.DeserializeObject<EnumMemberWithDiffrentCases>(@"""second_value""", new StringEnumConverter());
|
||||||
|
Assert.AreEqual(EnumMemberWithDiffrentCases.first, e);
|
||||||
|
}
|
||||||
|
|
||||||
[DataContract(Name = "DateFormats")]
|
[DataContract(Name = "DateFormats")]
|
||||||
public enum EnumMemberWithDifferentCases
|
public enum EnumMemberWithDifferentCases
|
||||||
{
|
{
|
||||||
|
|||||||
Reference in New Issue
Block a user