-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
@@ -27,6 +27,7 @@ using System;
using Newtonsoft.Json.Converters;
#if !NETFX_CORE
using NUnit.Framework;
#else
using Microsoft.VisualStudio.TestPlatform.UnitTestFramework;
using TestFixture = Microsoft.VisualStudio.TestPlatform.UnitTestFramework.TestClassAttribute;
@@ -35,96 +36,96 @@ using Test = Microsoft.VisualStudio.TestPlatform.UnitTestFramework.TestMethodAtt
namespace Newtonsoft.Json.Tests.Converters
{
public class VersionClass
{
public VersionClass(string version1, string version2)
public class VersionClass
{
this.StringProperty1 = "StringProperty1";
this.Version1 = new Version(version1);
this.Version2 = new Version(version2);
this.StringProperty2 = "StringProperty2";
public VersionClass(string version1, string version2)
{
StringProperty1 = "StringProperty1";
Version1 = new Version(version1);
Version2 = new Version(version2);
StringProperty2 = "StringProperty2";
}
public VersionClass()
{
}
public string StringProperty1 { get; set; }
public Version Version1 { get; set; }
public Version Version2 { get; set; }
public string StringProperty2 { get; set; }
}
public VersionClass()
[TestFixture]
public class VersionConverterTests : TestFixtureBase
{
}
private void SerializeVersionClass(string version1, string version2)
{
VersionClass versionClass = new VersionClass(version1, version2);
public string StringProperty1 { get; set; }
public Version Version1 { get; set; }
public Version Version2 { get; set; }
public string StringProperty2 { get; set; }
}
string json = JsonConvert.SerializeObject(versionClass, Formatting.Indented, new VersionConverter());
[TestFixture]
public class VersionConverterTests : TestFixtureBase
{
private void SerializeVersionClass(string version1, string version2)
{
VersionClass versionClass = new VersionClass(version1, version2);
string json = JsonConvert.SerializeObject(versionClass, Formatting.Indented, new VersionConverter());
string expectedJson = string.Format(@"{{
string expectedJson = string.Format(@"{{
""StringProperty1"": ""StringProperty1"",
""Version1"": ""{0}"",
""Version2"": ""{1}"",
""StringProperty2"": ""StringProperty2""
}}", version1, version2);
Assert.AreEqual(expectedJson, json);
Assert.AreEqual(expectedJson, json);
}
[Test]
public void SerializeVersionClass()
{
SerializeVersionClass("1.0.0.0", "2.0.0.0");
SerializeVersionClass("1.2.0.0", "2.3.0.0");
SerializeVersionClass("1.2.3.0", "2.3.4.0");
SerializeVersionClass("1.2.3.4", "2.3.4.5");
SerializeVersionClass("1.2", "2.3");
SerializeVersionClass("1.2.3", "2.3.4");
SerializeVersionClass("1.2.3.4", "2.3.4.5");
}
private void DeserializeVersionClass(string version1, string version2)
{
string json = string.Format(@"{{""StringProperty1"": ""StringProperty1"", ""Version1"": ""{0}"", ""Version2"": ""{1}"", ""StringProperty2"": ""StringProperty2""}}", version1, version2);
Version expectedVersion1 = new Version(version1);
Version expectedVersion2 = new Version(version2);
VersionClass versionClass = JsonConvert.DeserializeObject<VersionClass>(json, new VersionConverter());
Assert.AreEqual("StringProperty1", versionClass.StringProperty1);
Assert.AreEqual(expectedVersion1, versionClass.Version1);
Assert.AreEqual(expectedVersion2, versionClass.Version2);
Assert.AreEqual("StringProperty2", versionClass.StringProperty2);
}
[Test]
public void DeserializeVersionClass()
{
DeserializeVersionClass("1.0.0.0", "2.0.0.0");
DeserializeVersionClass("1.2.0.0", "2.3.0.0");
DeserializeVersionClass("1.2.3.0", "2.3.4.0");
DeserializeVersionClass("1.2.3.4", "2.3.4.5");
DeserializeVersionClass("1.2", "2.3");
DeserializeVersionClass("1.2.3", "2.3.4");
DeserializeVersionClass("1.2.3.4", "2.3.4.5");
}
[Test]
public void RoundtripImplicitConverter()
{
var version = new Version(1, 0, 0, 0);
string reportJSON = JsonConvert.SerializeObject(version);
//Test
Version report2 = JsonConvert.DeserializeObject<Version>(reportJSON);
string reportJSON2 = JsonConvert.SerializeObject(report2);
Assert.AreEqual(reportJSON, reportJSON2);
}
}
[Test]
public void SerializeVersionClass()
{
SerializeVersionClass("1.0.0.0", "2.0.0.0");
SerializeVersionClass("1.2.0.0", "2.3.0.0");
SerializeVersionClass("1.2.3.0", "2.3.4.0");
SerializeVersionClass("1.2.3.4", "2.3.4.5");
SerializeVersionClass("1.2", "2.3");
SerializeVersionClass("1.2.3", "2.3.4");
SerializeVersionClass("1.2.3.4", "2.3.4.5");
}
private void DeserializeVersionClass(string version1, string version2)
{
string json = string.Format(@"{{""StringProperty1"": ""StringProperty1"", ""Version1"": ""{0}"", ""Version2"": ""{1}"", ""StringProperty2"": ""StringProperty2""}}", version1, version2);
Version expectedVersion1 = new Version(version1);
Version expectedVersion2 = new Version(version2);
VersionClass versionClass = JsonConvert.DeserializeObject<VersionClass>(json, new VersionConverter());
Assert.AreEqual("StringProperty1", versionClass.StringProperty1);
Assert.AreEqual(expectedVersion1, versionClass.Version1);
Assert.AreEqual(expectedVersion2, versionClass.Version2);
Assert.AreEqual("StringProperty2", versionClass.StringProperty2);
}
[Test]
public void DeserializeVersionClass()
{
DeserializeVersionClass("1.0.0.0", "2.0.0.0");
DeserializeVersionClass("1.2.0.0", "2.3.0.0");
DeserializeVersionClass("1.2.3.0", "2.3.4.0");
DeserializeVersionClass("1.2.3.4", "2.3.4.5");
DeserializeVersionClass("1.2", "2.3");
DeserializeVersionClass("1.2.3", "2.3.4");
DeserializeVersionClass("1.2.3.4", "2.3.4.5");
}
[Test]
public void RoundtripImplicitConverter()
{
var version = new Version(1, 0, 0, 0);
string reportJSON = JsonConvert.SerializeObject(version);
//Test
Version report2 = JsonConvert.DeserializeObject<Version>(reportJSON);
string reportJSON2 = JsonConvert.SerializeObject(report2);
Assert.AreEqual(reportJSON, reportJSON2);
}
}
}