-When converting JSON to XML using XmlNodeConverter, changed special JSON properties ($id, $ref, $type) to be attributes rather than child elements

Src/Newtonsoft.Json.Tests/Converters/XmlNodeConverterTest.cs

@@ -25,6 +25,7 @@
 
 #if !SILVERLIGHT
 using System;
+using Newtonsoft.Json.Tests.Serialization;
 using NUnit.Framework;
 using Newtonsoft.Json;
 using System.IO;
@@ -71,12 +72,19 @@ namespace Newtonsoft.Json.Tests.Converters
     }
 
     private XmlNode DeserializeXmlNode(string json)
+    {
+      return DeserializeXmlNode(json, null);
+    }
+
+    private XmlNode DeserializeXmlNode(string json, string deserializeRootElementName)
     {
       JsonTextReader reader;
 
       reader = new JsonTextReader(new StringReader(json));
       reader.Read();
       XmlNodeConverter converter = new XmlNodeConverter();
+      if (deserializeRootElementName != null)
+        converter.DeserializeRootElementName = deserializeRootElementName;
 
       XmlNode node = (XmlNode)converter.ReadJson(reader, typeof (XmlDocument), new JsonSerializer());
 
@@ -848,6 +856,56 @@ namespace Newtonsoft.Json.Tests.Converters
 </person>
 </root>".Replace(Environment.NewLine, string.Empty), doc.InnerXml);
     }
+
+    [Test]
+    public void SerializeDeserializeSpecialProperties()
+    {
+      PreserveReferencesHandlingTests.CircularDictionary circularDictionary = new PreserveReferencesHandlingTests.CircularDictionary();
+      circularDictionary.Add("other", new PreserveReferencesHandlingTests.CircularDictionary { { "blah", null } });
+      circularDictionary.Add("self", circularDictionary);
+
+      string json = JsonConvert.SerializeObject(circularDictionary, Formatting.Indented,
+        new JsonSerializerSettings { PreserveReferencesHandling = PreserveReferencesHandling.All });
+
+      Assert.AreEqual(@"{
+  ""$id"": ""1"",
+  ""other"": {
+    ""$id"": ""2"",
+    ""blah"": null
+  },
+  ""self"": {
+    ""$ref"": ""1""
+  }
+}", json);
+
+      XmlNode node = DeserializeXmlNode(json, "root");
+      string xml = GetIndentedInnerXml(node);
+      string expected = @"<?xml version=""1.0"" encoding=""utf-16""?>
+<root xmlns:json=""http://james.newtonking.com/projects/json"" json:id=""1"">
+  <other json:id=""2"">
+    <blah />
+  </other>
+  <self json:ref=""1"" />
+</root>";
+
+      Assert.AreEqual(expected, xml);
+
+      string xmlJson = SerializeXmlNode(node);
+      string expectedXmlJson = @"{
+  ""root"": {
+    ""$id"": ""1"",
+    ""other"": {
+      ""$id"": ""2"",
+      ""blah"": null
+    },
+    ""self"": {
+      ""$ref"": ""1""
+    }
+  }
+}";
+
+      Assert.AreEqual(expectedXmlJson, xmlJson);
+    }
   }
 }
 #endif

Src/Newtonsoft.Json.Tests/Serialization/JsonSerializerTest.cs

@@ -2939,5 +2939,82 @@ keyword such as type of business.""
       Assert.AreEqual(testObject.Document.InnerXml, newTestObject.Document.InnerXml);
     }
 #endif
+
+    [Test]
+    public void FullClientMapSerialization()
+    {
+      ClientMap source = new ClientMap()
+      {
+        position = new Pos() { X = 100, Y = 200 },
+        center = new PosDouble() { X = 251.6, Y = 361.3 }
+      };
+
+      string json = JsonConvert.SerializeObject(source, new PosConverter(), new PosDoubleConverter());
+      Assert.AreEqual("{\"position\":new Pos(100,200),\"center\":new PosD(251.6,361.3)}", json);
+    }
+
+    public class ClientMap
+    {
+      public Pos position { get; set; }
+      public PosDouble center { get; set; }
+    }
+
+    public class Pos
+    {
+      public int X { get; set; }
+      public int Y { get; set; }
+    }
+
+    public class PosDouble
+    {
+      public double X { get; set; }
+      public double Y { get; set; }
+    }
+
+    public class PosConverter : JsonConverter
+    {
+      public override void WriteJson(JsonWriter writer, object value, JsonSerializer serializer)
+      {
+        Pos p = (Pos)value;
+
+        if (p != null)
+          writer.WriteRawValue(String.Format("new Pos({0},{1})", p.X, p.Y));
+        else
+          writer.WriteNull();
+      }
+
+      public override object ReadJson(JsonReader reader, Type objectType, JsonSerializer serializer)
+      {
+        throw new NotImplementedException();
+      }
+
+      public override bool CanConvert(Type objectType)
+      {
+        return objectType.IsAssignableFrom(typeof(Pos));
+      }
+    }
+
+    public class PosDoubleConverter : JsonConverter
+    {
+      public override void WriteJson(JsonWriter writer, object value, JsonSerializer serializer)
+      {
+        PosDouble p = (PosDouble)value;
+
+        if (p != null)
+          writer.WriteRawValue(String.Format("new PosD({0},{1})", p.X, p.Y));
+        else
+          writer.WriteNull();
+      }
+
+      public override object ReadJson(JsonReader reader, Type objectType, JsonSerializer serializer)
+      {
+        throw new NotImplementedException();
+      }
+
+      public override bool CanConvert(Type objectType)
+      {
+        return objectType.IsAssignableFrom(typeof(PosDouble));
+      }
+    }
   }
 }