-Added JsonPrimitiveContract and JsonLinqContract

-Removed JsonRaw and replaced with JRaw -Fixed properties on existing derived values not being populated during deserialization
JamesNK · Dec 27, 2009 · 9619456 · 9619456
1 parent 9144bc6
commit 9619456
Show file tree

Hide file tree

Showing 35 changed files with 835 additions and 436 deletions.
diff --git a/Src/Newtonsoft.Json.Tests/JsonRawTests.cs b/Src/Newtonsoft.Json.Tests/JsonRawTests.cs
diff --git a/Src/Newtonsoft.Json.Tests/Linq/JObjectTests.cs b/Src/Newtonsoft.Json.Tests/Linq/JObjectTests.cs
@@ -243,7 +243,7 @@ public void FromObjectRaw()
       PersonRaw raw = new PersonRaw
       {
         FirstName = "FirstNameValue",
-        RawContent = new JsonRaw("[1,2,3,4,5]"),
+        RawContent = new JRaw("[1,2,3,4,5]"),
         LastName = "LastNameValue"
       };
 
@@ -261,7 +261,7 @@ public void JTokenReader()
       PersonRaw raw = new PersonRaw
       {
         FirstName = "FirstNameValue",
-        RawContent = new JsonRaw("[1,2,3,4,5]"),
+        RawContent = new JRaw("[1,2,3,4,5]"),
         LastName = "LastNameValue"
       };
 
@@ -302,7 +302,7 @@ public void DeserializeFromRaw()
       PersonRaw raw = new PersonRaw
       {
         FirstName = "FirstNameValue",
-        RawContent = new JsonRaw("[1,2,3,4,5]"),
+        RawContent = new JRaw("[1,2,3,4,5]"),
         LastName = "LastNameValue"
       };
 
@@ -314,7 +314,7 @@ public void DeserializeFromRaw()
 
       Assert.AreEqual("FirstNameValue", raw.FirstName);
       Assert.AreEqual("LastNameValue", raw.LastName);
-      Assert.AreEqual("[1,2,3,4,5]", raw.RawContent.Content);
+      Assert.AreEqual("[1,2,3,4,5]", raw.RawContent.Value);
     }
 
     [Test]
@@ -366,8 +366,8 @@ public void Blog()
     public void RawChildValues()
     {
       JObject o = new JObject();
-      o["val1"] = JValue.CreateRaw("1");
-      o["val2"] = JValue.CreateRaw("1");
+      o["val1"] = new JRaw("1");
+      o["val2"] = new JRaw("1");
 
       string json = o.ToString();
 

diff --git a/Src/Newtonsoft.Json.Tests/Linq/JRawTests.cs b/Src/Newtonsoft.Json.Tests/Linq/JRawTests.cs
@@ -0,0 +1,32 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using NUnit.Framework;
+using Newtonsoft.Json.Linq;
+
+namespace Newtonsoft.Json.Tests.Linq
+{
+  public class JRawTests : TestFixtureBase
+  {
+    [Test]
+    public void RawEquals()
+    {
+      JRaw r1 = new JRaw("raw1");
+      JRaw r2 = new JRaw("raw1");
+      JRaw r3 = new JRaw("raw2");
+
+      Assert.IsTrue(JToken.DeepEquals(r1, r2));
+      Assert.IsFalse(JToken.DeepEquals(r1, r3));
+    }
+
+    [Test]
+    public void RawClone()
+    {
+      JRaw r1 = new JRaw("raw1");
+      JToken r2 = r1.CloneToken();
+
+      Assert.IsInstanceOfType(typeof(JRaw), r2);
+    }
+  }
+}
diff --git a/Src/Newtonsoft.Json.Tests/Newtonsoft.Json.Tests.Compact.csproj b/Src/Newtonsoft.Json.Tests/Newtonsoft.Json.Tests.Compact.csproj
@@ -68,6 +68,7 @@
     <Compile Include="Linq\ComponentModel\JTypeDescriptionProviderTests.cs" />
     <Compile Include="Linq\ComponentModel\JTypeDescriptorTests.cs" />
     <Compile Include="Linq\JPathTests.cs" />
+    <Compile Include="Linq\JRawTests.cs" />
     <Compile Include="Linq\JTokenReaderTest.cs" />
     <Compile Include="Linq\JTokenWriterTest.cs" />
     <Compile Include="JsonValidatingReaderTests.cs" />
@@ -87,10 +88,14 @@
     <Compile Include="TestObjects\AbstractGenericBase.cs" />
     <Compile Include="TestObjects\ArgumentConverterPrecedenceClassConverter.cs" />
     <Compile Include="TestObjects\BadJsonPropertyClass.cs" />
+    <Compile Include="TestObjects\Bar.cs" />
+    <Compile Include="TestObjects\Car.cs" />
     <Compile Include="TestObjects\CircularReferenceClass.cs" />
     <Compile Include="TestObjects\ClassAndMemberConverterClass.cs" />
     <Compile Include="TestObjects\ClassConverterPrecedenceClassConverter.cs" />
+    <Compile Include="TestObjects\Computer.cs" />
     <Compile Include="TestObjects\ConstructorCaseSensitivityClass.cs" />
+    <Compile Include="TestObjects\ConstructorReadonlyFields.cs" />
     <Compile Include="TestObjects\Container.cs" />
     <Compile Include="TestObjects\Content.cs" />
     <Compile Include="TestObjects\ConverterPrecedenceClass.cs" />
@@ -102,6 +107,7 @@
     <Compile Include="TestObjects\DoubleClass.cs" />
     <Compile Include="TestObjects\EmployeeReference.cs" />
     <Compile Include="TestObjects\Event.cs" />
+    <Compile Include="TestObjects\Foo.cs" />
     <Compile Include="TestObjects\GenericImpl.cs" />
     <Compile Include="TestObjects\GenericListAndDictionaryInterfaceProperties.cs" />
     <Compile Include="TestObjects\GetOnlyPropertyClass.cs" />
@@ -115,16 +121,19 @@
     <Compile Include="TestObjects\JsonPropertyWithHandlingValues.cs" />
     <Compile Include="TestObjects\ListErrorObject.cs" />
     <Compile Include="TestObjects\ListErrorObjectCollection.cs" />
+    <Compile Include="TestObjects\ListOfIds.cs" />
     <Compile Include="TestObjects\ListTestClass.cs" />
     <Compile Include="TestObjects\LogEntry.cs" />
     <Compile Include="TestObjects\MemberConverterPrecedenceClassConverter.cs" />
     <Compile Include="TestObjects\MethodExecutorObject.cs" />
+    <Compile Include="TestObjects\Movie.cs" />
     <Compile Include="TestObjects\MyClass.cs" />
     <Compile Include="TestObjects\Name.cs" />
     <Compile Include="TestObjects\NonRequest.cs" />
     <Compile Include="TestObjects\NullableDateTimeTestClass.cs" />
     <Compile Include="TestObjects\ObjectArrayPropertyTest.cs" />
     <Compile Include="TestObjects\PersonError.cs" />
+    <Compile Include="TestObjects\PersonPropertyClass.cs" />
     <Compile Include="TestObjects\PersonRaw.cs" />
     <Compile Include="TestObjects\PhoneNumber.cs" />
     <Compile Include="TestObjects\PrivateConstructorTestClass.cs" />
@@ -134,6 +143,7 @@
     <Compile Include="TestObjects\RequestOnly.cs" />
     <Compile Include="TestObjects\RequiredMembersClass.cs" />
     <Compile Include="TestObjects\RoleTransfer.cs" />
+    <Compile Include="TestObjects\SearchResult.cs" />
     <Compile Include="TestObjects\SerializationEventTestDictionary.cs" />
     <Compile Include="TestObjects\SerializationEventTestList.cs" />
     <Compile Include="TestObjects\SerializationEventTestObject.cs" />
@@ -159,7 +169,6 @@
     <Compile Include="Schema\JsonSchemaBuilderTests.cs" />
     <Compile Include="Schema\JsonSchemaGeneratorTests.cs" />
     <Compile Include="Schema\JsonSchemaTests.cs" />
-    <Compile Include="JsonRawTests.cs" />
     <Compile Include="TestObjects\DateTimeTestClass.cs" />
     <Compile Include="Converters\IsoDateTimeConverterTests.cs" />
     <Compile Include="JsonConvertTest.cs" />
@@ -177,12 +186,14 @@
     <Compile Include="SilverlightTests.cs" />
     <Compile Include="TestFixtureBase.cs" />
     <Compile Include="Converters\XmlNodeConverterTest.cs" />
+    <Compile Include="TestObjects\StructTest.cs" />
     <Compile Include="TestObjects\SubKlass.cs" />
     <Compile Include="TestObjects\SuperKlass.cs" />
     <Compile Include="TestObjects\TypeClass.cs" />
     <Compile Include="TestObjects\TypedSubHashtable.cs" />
     <Compile Include="TestObjects\UserNullable.cs" />
     <Compile Include="TestObjects\VersionKeyedCollection.cs" />
+    <Compile Include="TestObjects\WagePerson.cs" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\Newtonsoft.Json\Newtonsoft.Json.Compact.csproj">

diff --git a/Src/Newtonsoft.Json.Tests/Newtonsoft.Json.Tests.Net20.csproj b/Src/Newtonsoft.Json.Tests/Newtonsoft.Json.Tests.Net20.csproj
@@ -75,6 +75,7 @@
     <Compile Include="Linq\ComponentModel\JTypeDescriptionProviderTests.cs" />
     <Compile Include="Linq\ComponentModel\JTypeDescriptorTests.cs" />
     <Compile Include="Linq\JPathTests.cs" />
+    <Compile Include="Linq\JRawTests.cs" />
     <Compile Include="Serialization\ConstructorHandlingTests.cs" />
     <Compile Include="TestObjects\Container.cs" />
     <Compile Include="TestObjects\Content.cs" />
@@ -165,7 +166,6 @@
     <Compile Include="Schema\JsonSchemaBuilderTests.cs" />
     <Compile Include="Schema\JsonSchemaGeneratorTests.cs" />
     <Compile Include="Schema\JsonSchemaTests.cs" />
-    <Compile Include="JsonRawTests.cs" />
     <Compile Include="TestObjects\DateTimeTestClass.cs" />
     <Compile Include="Converters\IsoDateTimeConverterTests.cs" />
     <Compile Include="JsonConvertTest.cs" />

diff --git a/Src/Newtonsoft.Json.Tests/Newtonsoft.Json.Tests.Silverlight.csproj b/Src/Newtonsoft.Json.Tests/Newtonsoft.Json.Tests.Silverlight.csproj
@@ -79,6 +79,7 @@
     <Compile Include="Linq\ComponentModel\JTypeDescriptionProviderTests.cs" />
     <Compile Include="Linq\ComponentModel\JTypeDescriptorTests.cs" />
     <Compile Include="Linq\JPathTests.cs" />
+    <Compile Include="Linq\JRawTests.cs" />
     <Compile Include="Linq\JTokenReaderTest.cs" />
     <Compile Include="Linq\JTokenWriterTest.cs" />
     <Compile Include="JsonValidatingReaderTests.cs" />
@@ -98,10 +99,14 @@
     <Compile Include="TestObjects\AbstractGenericBase.cs" />
     <Compile Include="TestObjects\ArgumentConverterPrecedenceClassConverter.cs" />
     <Compile Include="TestObjects\BadJsonPropertyClass.cs" />
+    <Compile Include="TestObjects\Bar.cs" />
+    <Compile Include="TestObjects\Car.cs" />
     <Compile Include="TestObjects\CircularReferenceClass.cs" />
     <Compile Include="TestObjects\ClassAndMemberConverterClass.cs" />
     <Compile Include="TestObjects\ClassConverterPrecedenceClassConverter.cs" />
+    <Compile Include="TestObjects\Computer.cs" />
     <Compile Include="TestObjects\ConstructorCaseSensitivityClass.cs" />
+    <Compile Include="TestObjects\ConstructorReadonlyFields.cs" />
     <Compile Include="TestObjects\Container.cs" />
     <Compile Include="TestObjects\Content.cs" />
     <Compile Include="TestObjects\ConverterPrecedenceClass.cs" />
@@ -113,6 +118,7 @@
     <Compile Include="TestObjects\DoubleClass.cs" />
     <Compile Include="TestObjects\EmployeeReference.cs" />
     <Compile Include="TestObjects\Event.cs" />
+    <Compile Include="TestObjects\Foo.cs" />
     <Compile Include="TestObjects\GenericImpl.cs" />
     <Compile Include="TestObjects\GenericListAndDictionaryInterfaceProperties.cs" />
     <Compile Include="TestObjects\GetOnlyPropertyClass.cs" />
@@ -126,16 +132,19 @@
     <Compile Include="TestObjects\JsonPropertyWithHandlingValues.cs" />
     <Compile Include="TestObjects\ListErrorObject.cs" />
     <Compile Include="TestObjects\ListErrorObjectCollection.cs" />
+    <Compile Include="TestObjects\ListOfIds.cs" />
     <Compile Include="TestObjects\ListTestClass.cs" />
     <Compile Include="TestObjects\LogEntry.cs" />
     <Compile Include="TestObjects\MemberConverterPrecedenceClassConverter.cs" />
     <Compile Include="TestObjects\MethodExecutorObject.cs" />
+    <Compile Include="TestObjects\Movie.cs" />
     <Compile Include="TestObjects\MyClass.cs" />
     <Compile Include="TestObjects\Name.cs" />
     <Compile Include="TestObjects\NonRequest.cs" />
     <Compile Include="TestObjects\NullableDateTimeTestClass.cs" />
     <Compile Include="TestObjects\ObjectArrayPropertyTest.cs" />
     <Compile Include="TestObjects\PersonError.cs" />
+    <Compile Include="TestObjects\PersonPropertyClass.cs" />
     <Compile Include="TestObjects\PersonRaw.cs" />
     <Compile Include="TestObjects\PhoneNumber.cs" />
     <Compile Include="TestObjects\PrivateConstructorTestClass.cs" />
@@ -145,6 +154,7 @@
     <Compile Include="TestObjects\RequestOnly.cs" />
     <Compile Include="TestObjects\RequiredMembersClass.cs" />
     <Compile Include="TestObjects\RoleTransfer.cs" />
+    <Compile Include="TestObjects\SearchResult.cs" />
     <Compile Include="TestObjects\SerializationEventTestDictionary.cs" />
     <Compile Include="TestObjects\SerializationEventTestList.cs" />
     <Compile Include="TestObjects\SerializationEventTestObject.cs" />
@@ -170,7 +180,6 @@
     <Compile Include="Schema\JsonSchemaBuilderTests.cs" />
     <Compile Include="Schema\JsonSchemaGeneratorTests.cs" />
     <Compile Include="Schema\JsonSchemaTests.cs" />
-    <Compile Include="JsonRawTests.cs" />
     <Compile Include="TestObjects\DateTimeTestClass.cs" />
     <Compile Include="Converters\IsoDateTimeConverterTests.cs" />
     <Compile Include="JsonConvertTest.cs" />
@@ -188,12 +197,14 @@
     <Compile Include="SilverlightTests.cs" />
     <Compile Include="TestFixtureBase.cs" />
     <Compile Include="Converters\XmlNodeConverterTest.cs" />
+    <Compile Include="TestObjects\StructTest.cs" />
     <Compile Include="TestObjects\SubKlass.cs" />
     <Compile Include="TestObjects\SuperKlass.cs" />
     <Compile Include="TestObjects\TypeClass.cs" />
     <Compile Include="TestObjects\TypedSubHashtable.cs" />
     <Compile Include="TestObjects\UserNullable.cs" />
     <Compile Include="TestObjects\VersionKeyedCollection.cs" />
+    <Compile Include="TestObjects\WagePerson.cs" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\Newtonsoft.Json\Newtonsoft.Json.Silverlight.csproj">

diff --git a/Src/Newtonsoft.Json.Tests/Newtonsoft.Json.Tests.csproj b/Src/Newtonsoft.Json.Tests/Newtonsoft.Json.Tests.csproj
@@ -114,15 +114,21 @@
     <Compile Include="Linq\ComponentModel\JTypeDescriptionProviderTests.cs" />
     <Compile Include="Linq\ComponentModel\JTypeDescriptorTests.cs" />
     <Compile Include="Linq\JPathTests.cs" />
+    <Compile Include="Linq\JRawTests.cs" />
     <Compile Include="Serialization\ConstructorHandlingTests.cs" />
     <Compile Include="Serialization\ContractResolverTests.cs" />
     <Compile Include="Serialization\DefaultValueHandlingTests.cs" />
     <Compile Include="Serialization\NullValueHandlingTests.cs" />
+    <Compile Include="TestObjects\Bar.cs" />
     <Compile Include="TestObjects\Car.cs" />
     <Compile Include="TestObjects\Computer.cs" />
+    <Compile Include="TestObjects\ConstructorReadonlyFields.cs" />
     <Compile Include="TestObjects\Container.cs" />
+    <Compile Include="TestObjects\Foo.cs" />
+    <Compile Include="TestObjects\ListOfIds.cs" />
     <Compile Include="TestObjects\Movie.cs" />
     <Compile Include="TestObjects\PersonError.cs" />
+    <Compile Include="TestObjects\PersonPropertyClass.cs" />
     <Compile Include="TestObjects\PrivateConstructorTestClass.cs" />
     <Compile Include="TestObjects\PrivateConstructorWithPublicParametizedConstructorTestClass.cs" />
     <Compile Include="TestObjects\Content.cs" />
@@ -149,6 +155,9 @@
     <Compile Include="TestObjects\LogEntry.cs" />
     <Compile Include="TestObjects\NonRequest.cs" />
     <Compile Include="TestObjects\ObjectArrayPropertyTest.cs" />
+    <Compile Include="TestObjects\SearchResult.cs" />
+    <Compile Include="TestObjects\StructTest.cs" />
+    <Compile Include="TestObjects\WagePerson.cs" />
     <Compile Include="TestObjects\PropertyCase.cs" />
     <Compile Include="TestObjects\RequestOnly.cs" />
     <Compile Include="TestObjects\RoleTransfer.cs" />
@@ -209,7 +218,6 @@
     <Compile Include="Schema\JsonSchemaBuilderTests.cs" />
     <Compile Include="Schema\JsonSchemaGeneratorTests.cs" />
     <Compile Include="Schema\JsonSchemaTests.cs" />
-    <Compile Include="JsonRawTests.cs" />
     <Compile Include="TestObjects\NullableDateTimeTestClass.cs" />
     <Compile Include="TestObjects\DateTimeTestClass.cs" />
     <Compile Include="Converters\IsoDateTimeConverterTests.cs" />