-Improved error when serializing FileInfo/DirectoryInfo without ISerializable
This commit is contained in:
@@ -28,7 +28,9 @@ using System;
|
||||
using System.Data;
|
||||
using System.IO;
|
||||
using System.Linq;
|
||||
using System.Runtime.Serialization;
|
||||
using Newtonsoft.Json.Serialization;
|
||||
using Newtonsoft.Json.Utilities;
|
||||
#if DNXCORE50
|
||||
using Xunit;
|
||||
using Test = Xunit.FactAttribute;
|
||||
@@ -45,9 +47,13 @@ namespace Newtonsoft.Json.Tests.Issues
|
||||
[Test]
|
||||
public void Test()
|
||||
{
|
||||
Type t = typeof(FileSystemInfo);
|
||||
|
||||
Assert.IsTrue(t.ImplementInterface(typeof(ISerializable)));
|
||||
|
||||
DefaultContractResolver resolver = new DefaultContractResolver();
|
||||
|
||||
JsonContract contract = resolver.ResolveContract(typeof(DirectoryInfo));
|
||||
JsonContract contract = resolver.ResolveContract(t);
|
||||
|
||||
Assert.AreEqual(JsonContractType.Object, contract.ContractType);
|
||||
}
|
||||
|
||||
@@ -0,0 +1,76 @@
|
||||
#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
|
||||
|
||||
using System;
|
||||
using System.IO;
|
||||
#if DNXCORE50
|
||||
using System.Reflection;
|
||||
using Xunit;
|
||||
using Test = Xunit.FactAttribute;
|
||||
using Assert = Newtonsoft.Json.Tests.XUnitAssert;
|
||||
#else
|
||||
using NUnit.Framework;
|
||||
#endif
|
||||
|
||||
namespace Newtonsoft.Json.Tests.Issues
|
||||
{
|
||||
[TestFixture]
|
||||
public class Issue1541 : TestFixtureBase
|
||||
{
|
||||
#if DNXCORE50
|
||||
[Test]
|
||||
public void Test_DirectoryInfo()
|
||||
{
|
||||
FileInfo fileInfo = new FileInfo(TestFixtureBase.ResolvePath("large.json"));
|
||||
|
||||
ExceptionAssert.Throws<JsonSerializationException>(
|
||||
() => JsonConvert.SerializeObject(fileInfo.Directory),
|
||||
"Unable to serialize instance of 'System.IO.DirectoryInfo'.");
|
||||
}
|
||||
|
||||
[Test]
|
||||
public void Test_FileInfo()
|
||||
{
|
||||
FileInfo fileInfo = new FileInfo(TestFixtureBase.ResolvePath("large.json"));
|
||||
|
||||
ExceptionAssert.Throws<JsonSerializationException>(
|
||||
() => JsonConvert.SerializeObject(fileInfo),
|
||||
"Unable to serialize instance of 'System.IO.FileInfo'.");
|
||||
}
|
||||
|
||||
#if !(NETSTANDARD1_0 || NETSTANDARD1_3)
|
||||
[Test]
|
||||
public void Test_DriveInfo()
|
||||
{
|
||||
DriveInfo drive = DriveInfo.GetDrives()[0];
|
||||
|
||||
ExceptionAssert.Throws<JsonSerializationException>(
|
||||
() => JsonConvert.SerializeObject(drive),
|
||||
"Unable to serialize instance of 'System.IO.DriveInfo'.");
|
||||
}
|
||||
#endif
|
||||
#endif
|
||||
}
|
||||
}
|
||||
@@ -51,7 +51,7 @@ namespace Newtonsoft.Json.Tests.Utilities
|
||||
{
|
||||
Type enumType = expected.GetType();
|
||||
|
||||
Enum result = (Enum)EnumUtils.ParseEnumName(value, false, false, enumType);
|
||||
Enum result = (Enum)EnumUtils.ParseEnum(enumType, value, false);
|
||||
Assert.AreEqual(expected, result);
|
||||
}
|
||||
|
||||
@@ -63,7 +63,7 @@ namespace Newtonsoft.Json.Tests.Utilities
|
||||
{
|
||||
try
|
||||
{
|
||||
EnumUtils.ParseEnumName(value, false, false, enumType);
|
||||
EnumUtils.ParseEnum(enumType, value, false);
|
||||
}
|
||||
catch (Exception ex) when (ex.GetType() == exceptionType)
|
||||
{
|
||||
|
||||
Reference in New Issue
Block a user