-
Notifications
You must be signed in to change notification settings - Fork 3.3k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
-Fixed serializing generated types with duplicate property names
- Loading branch information
Showing
6 changed files
with
153 additions
and
10 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,11 @@ | ||
| <?xml version="1.0" encoding="utf-8" ?> | ||
| <configuration> | ||
| <runtime> | ||
| <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1"> | ||
| <dependentAssembly> | ||
| <assemblyIdentity name="System.ValueTuple" publicKeyToken="cc7b13ffcd2ddd51" /> | ||
| <bindingRedirect oldVersion="0.0.0.0-4.4.0.0" newVersion="4.0.2.0" /> | ||
| </dependentAssembly> | ||
| </assemblyBinding> | ||
| </runtime> | ||
| </configuration> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,105 @@ | ||
| #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 || NET40) | ||
| using Moq; | ||
| using System; | ||
| using System.Collections; | ||
| using System.Collections.Generic; | ||
| using System.Dynamic; | ||
| using System.IO; | ||
| using System.Linq; | ||
| using System.Reflection; | ||
| using System.Runtime.Serialization; | ||
| using Newtonsoft.Json.Linq; | ||
| using Newtonsoft.Json.Serialization; | ||
| using Newtonsoft.Json.Utilities; | ||
| #if PORTABLE && !NETSTANDARD2_0 | ||
| using BindingFlags = Newtonsoft.Json.Utilities.BindingFlags; | ||
| #else | ||
| using BindingFlags = System.Reflection.BindingFlags; | ||
| #endif | ||
| #if DNXCORE50 | ||
| 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 Issue1620 : TestFixtureBase | ||
| { | ||
| [Test] | ||
| public void Test_SerializeMock() | ||
| { | ||
| Mock<IFoo> mock = new Mock<IFoo>(); | ||
| IFoo foo = mock.Object; | ||
|
|
||
| string json = JsonConvert.SerializeObject(foo, new JsonSerializerSettings() { Converters = { new FooConverter() } }); | ||
| Assert.AreEqual(@"""foo""", json); | ||
| } | ||
|
|
||
| [Test] | ||
| public void Test_GetFieldsAndProperties() | ||
| { | ||
| Mock<IFoo> mock = new Mock<IFoo>(); | ||
| IFoo foo = mock.Object; | ||
|
|
||
| List<MemberInfo> properties = ReflectionUtils.GetFieldsAndProperties(foo.GetType(), BindingFlags.Instance | BindingFlags.Static | BindingFlags.Public | BindingFlags.NonPublic).ToList(); | ||
|
|
||
| Assert.AreEqual(1, properties.Count(p => p.Name == "Mock")); | ||
| } | ||
|
|
||
| public interface IFoo | ||
| { | ||
| } | ||
|
|
||
| public class Foo : IFoo | ||
| { | ||
| } | ||
|
|
||
| public class FooConverter : JsonConverter | ||
| { | ||
| public override void WriteJson(JsonWriter writer, object value, JsonSerializer serializer) | ||
| { | ||
| writer.WriteValue("foo"); | ||
| } | ||
|
|
||
| public override object ReadJson(JsonReader reader, Type objectType, object existingValue, JsonSerializer serializer) | ||
| { | ||
| return new Foo(); | ||
| } | ||
|
|
||
| public override bool CanConvert(Type objectType) | ||
| { | ||
| return typeof(IFoo).GetTypeInfo().IsAssignableFrom(objectType); | ||
| } | ||
| } | ||
| } | ||
| } | ||
| #endif |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters