-Code reformat

This commit is contained in:
James Newton-King
2013-10-20 15:08:39 +13:00
parent d03963016e
commit bcd6982419
466 changed files with 71645 additions and 71598 deletions
@@ -32,12 +32,12 @@ using System.Text;
namespace Newtonsoft.Json.Tests.LinqToSql
{
[MetadataType(typeof(DepartmentMetadata))]
public partial class Department
{
[JsonConverter(typeof(DepartmentConverter))]
public class DepartmentMetadata
[MetadataType(typeof(DepartmentMetadata))]
public partial class Department
{
[JsonConverter(typeof(DepartmentConverter))]
public class DepartmentMetadata
{
}
}
}
}
@@ -31,33 +31,33 @@ using Newtonsoft.Json.Linq;
namespace Newtonsoft.Json.Tests.LinqToSql
{
public class DepartmentConverter : JsonConverter
{
public override void WriteJson(JsonWriter writer, object value, JsonSerializer serializer)
public class DepartmentConverter : JsonConverter
{
Department department = (Department)value;
public override void WriteJson(JsonWriter writer, object value, JsonSerializer serializer)
{
Department department = (Department)value;
JObject o = new JObject();
o["DepartmentId"] = new JValue(department.DepartmentId.ToString());
o["Name"] = new JValue(new string(department.Name.Reverse().ToArray()));
JObject o = new JObject();
o["DepartmentId"] = new JValue(department.DepartmentId.ToString());
o["Name"] = new JValue(new string(department.Name.Reverse().ToArray()));
o.WriteTo(writer);
o.WriteTo(writer);
}
public override object ReadJson(JsonReader reader, Type objectType, object existingValue, JsonSerializer serializer)
{
JObject o = JObject.Load(reader);
Department department = new Department();
department.DepartmentId = new Guid((string)o["DepartmentId"]);
department.Name = new string(((string)o["Name"]).Reverse().ToArray());
return department;
}
public override bool CanConvert(Type objectType)
{
return (objectType == typeof(Department));
}
}
public override object ReadJson(JsonReader reader, Type objectType, object existingValue, JsonSerializer serializer)
{
JObject o = JObject.Load(reader);
Department department = new Department();
department.DepartmentId = new Guid((string)o["DepartmentId"]);
department.Name = new string(((string) o["Name"]).Reverse().ToArray());
return department;
}
public override bool CanConvert(Type objectType)
{
return (objectType == typeof (Department));
}
}
}
@@ -30,24 +30,24 @@ using System.Text;
namespace Newtonsoft.Json.Tests.LinqToSql
{
public class GuidByteArrayConverter : JsonConverter
{
public override void WriteJson(JsonWriter writer, object value, JsonSerializer serializer)
public class GuidByteArrayConverter : JsonConverter
{
Guid guid = (Guid) value;
writer.WriteValue(Convert.ToBase64String(guid.ToByteArray()));
}
public override void WriteJson(JsonWriter writer, object value, JsonSerializer serializer)
{
Guid guid = (Guid)value;
writer.WriteValue(Convert.ToBase64String(guid.ToByteArray()));
}
public override object ReadJson(JsonReader reader, Type objectType, object existingValue, JsonSerializer serializer)
{
string encodedData = (string) reader.Value;
byte[] data = Convert.FromBase64String(encodedData);
return new Guid(data);
}
public override object ReadJson(JsonReader reader, Type objectType, object existingValue, JsonSerializer serializer)
{
string encodedData = (string)reader.Value;
byte[] data = Convert.FromBase64String(encodedData);
return new Guid(data);
}
public override bool CanConvert(Type objectType)
{
return (objectType == typeof (Guid));
public override bool CanConvert(Type objectType)
{
return (objectType == typeof(Guid));
}
}
}
}
@@ -37,34 +37,34 @@ using System.Data.Linq.Mapping;
namespace Newtonsoft.Json.Tests.LinqToSql
{
public class LinqToSqlClassesSerializationTests : TestFixtureBase
{
[Test]
public void Serialize()
public class LinqToSqlClassesSerializationTests : TestFixtureBase
{
Role role = new Role();
role.Name = "Role1";
role.RoleId = new Guid("67EA92B7-4BD3-4718-BD75-3C7EDF800B34");
[Test]
public void Serialize()
{
Role role = new Role();
role.Name = "Role1";
role.RoleId = new Guid("67EA92B7-4BD3-4718-BD75-3C7EDF800B34");
Person person = new Person();
person.FirstName = "FirstName!";
person.LastName = "LastName!";
person.PersonId = new Guid("7AA027AA-C995-4986-908D-999D8063599F");
person.PersonRoles.Add(new PersonRole
{
PersonRoleId = new Guid("B012DD41-71DF-4839-B8D5-D1333FB886BC"),
Role = role
});
Person person = new Person();
person.FirstName = "FirstName!";
person.LastName = "LastName!";
person.PersonId = new Guid("7AA027AA-C995-4986-908D-999D8063599F");
person.PersonRoles.Add(new PersonRole
{
PersonRoleId = new Guid("B012DD41-71DF-4839-B8D5-D1333FB886BC"),
Role = role
});
person.Department = new Department
{
DepartmentId = new Guid("08F68BF9-929B-4434-BC47-C9489D22112B"),
Name = "Name!"
};
person.Department = new Department
{
DepartmentId = new Guid("08F68BF9-929B-4434-BC47-C9489D22112B"),
Name = "Name!"
};
string json = JsonConvert.SerializeObject(person, Formatting.Indented, new JsonSerializerSettings { ReferenceLoopHandling = ReferenceLoopHandling.Ignore });
string json = JsonConvert.SerializeObject(person, Formatting.Indented, new JsonSerializerSettings { ReferenceLoopHandling = ReferenceLoopHandling.Ignore });
Assert.AreEqual(@"{
Assert.AreEqual(@"{
""first_name"": ""FirstName!"",
""LastName"": ""LastName!"",
""PersonId"": ""7aa027aa-c995-4986-908d-999d8063599f"",
@@ -85,12 +85,12 @@ namespace Newtonsoft.Json.Tests.LinqToSql
""Name"": ""!emaN""
}
}", json);
}
}
[Test]
public void Deserialize()
{
string json = @"{
[Test]
public void Deserialize()
{
string json = @"{
""first_name"": ""FirstName!"",
""LastName"": ""LastName!"",
""PersonId"": ""7aa027aa-c995-4986-908d-999d8063599f"",
@@ -111,25 +111,25 @@ namespace Newtonsoft.Json.Tests.LinqToSql
}
}";
Person person = JsonConvert.DeserializeObject<Person>(json);
Assert.IsNotNull(person);
Person person = JsonConvert.DeserializeObject<Person>(json);
Assert.IsNotNull(person);
Assert.AreEqual(new Guid("7AA027AA-C995-4986-908D-999D8063599F"), person.PersonId);
Assert.AreEqual("FirstName!", person.FirstName);
Assert.AreEqual("LastName!", person.LastName);
Assert.AreEqual(1, person.PersonRoles.Count);
Assert.AreEqual(person.PersonId, person.PersonRoles[0].PersonId);
Assert.AreEqual(new Guid("67EA92B7-4BD3-4718-BD75-3C7EDF800B34"), person.PersonRoles[0].RoleId);
Assert.IsNotNull(person.PersonRoles[0].Role);
Assert.AreEqual(1, person.PersonRoles[0].Role.PersonRoles.Count);
Assert.AreEqual(new Guid("7AA027AA-C995-4986-908D-999D8063599F"), person.PersonId);
Assert.AreEqual("FirstName!", person.FirstName);
Assert.AreEqual("LastName!", person.LastName);
Assert.AreEqual(1, person.PersonRoles.Count);
Assert.AreEqual(person.PersonId, person.PersonRoles[0].PersonId);
Assert.AreEqual(new Guid("67EA92B7-4BD3-4718-BD75-3C7EDF800B34"), person.PersonRoles[0].RoleId);
Assert.IsNotNull(person.PersonRoles[0].Role);
Assert.AreEqual(1, person.PersonRoles[0].Role.PersonRoles.Count);
Assert.AreEqual("Name!", person.Department.Name);
Assert.AreEqual("Name!", person.Department.Name);
TableAttribute tableAttribute = JsonTypeReflector.GetAttribute<TableAttribute>(typeof(Person));
Assert.AreEqual("", tableAttribute.Name);
TableAttribute tableAttribute = JsonTypeReflector.GetAttribute<TableAttribute>(typeof(Person));
Assert.AreEqual("", tableAttribute.Name);
ColumnAttribute columnAttribute = JsonTypeReflector.GetAttribute<ColumnAttribute>(typeof(Person).GetProperty("FirstName"));
Assert.AreEqual("_FirstName", columnAttribute.Storage);
ColumnAttribute columnAttribute = JsonTypeReflector.GetAttribute<ColumnAttribute>(typeof(Person).GetProperty("FirstName"));
Assert.AreEqual("_FirstName", columnAttribute.Storage);
}
}
}
}
@@ -31,13 +31,13 @@ using System.Text;
namespace Newtonsoft.Json.Tests.LinqToSql
{
[MetadataType(typeof(PersonMetadata))]
public partial class Person
{
public class PersonMetadata
[MetadataType(typeof(PersonMetadata))]
public partial class Person
{
[JsonProperty("first_name")]
public string FirstName { get; set; }
public class PersonMetadata
{
[JsonProperty("first_name")]
public string FirstName { get; set; }
}
}
}
}
+10 -9
View File
@@ -32,15 +32,16 @@ using System.Text;
namespace Newtonsoft.Json.Tests.LinqToSql
{
[MetadataType(typeof(RoleMetadata))]
public partial class Role
{
public class RoleMetadata
[MetadataType(typeof(RoleMetadata))]
public partial class Role
{
[JsonConverter(typeof(GuidByteArrayConverter))]
public Guid RoleId { get; set; }
[JsonIgnore]
public EntitySet<PersonRole> PersonRoles { get; set; }
public class RoleMetadata
{
[JsonConverter(typeof(GuidByteArrayConverter))]
public Guid RoleId { get; set; }
[JsonIgnore]
public EntitySet<PersonRole> PersonRoles { get; set; }
}
}
}
}