Byte Id Serialization

karlguillotte · karlguillotte · commit 06d55f88349a · 2015-02-13T15:31:32.000-08:00
This pull request allows to have Id of type byte. They will be
serialized properly.
diff --git a/JSONAPI.Tests/Data/ByteIdSerializationTest.json b/JSONAPI.Tests/Data/ByteIdSerializationTest.json
@@ -0,0 +1,14 @@
+{
+    "tags": [
+        {
+            "id": "1",
+            "text":  "Ember"
+        }, {
+            "id": "2",
+            "text":  "React"
+        }, {
+            "id": "3",
+            "text":  "Angular"
+        }
+    ]
+}
diff --git a/JSONAPI.Tests/JSONAPI.Tests.csproj b/JSONAPI.Tests/JSONAPI.Tests.csproj
@@ -84,6 +84,7 @@
     <Compile Include="Json\LinkTemplateTests.cs" />
     <Compile Include="Models\Author.cs" />
     <Compile Include="Models\Comment.cs" />
+    <Compile Include="Models\Tag.cs" />
     <Compile Include="Models\Sample.cs" />
     <Compile Include="Models\Post.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
@@ -96,6 +97,9 @@
   </ItemGroup>
   <ItemGroup>
     <None Include="app.config" />
+    <None Include="Data\ByteIdSerializationTest.json">
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </None>
     <None Include="Data\ReformatsRawJsonStringWithUnquotedKeys.json">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </None>
diff --git a/JSONAPI.Tests/Json/JsonApiMediaFormaterTests.cs b/JSONAPI.Tests/Json/JsonApiMediaFormaterTests.cs
@@ -21,6 +21,7 @@ public class JsonApiMediaFormaterTests
         Author a;
         Post p, p2, p3, p4;
         Sample s1, s2;
+        Tag t1, t2, t3;
 
         private class MockErrorSerializer : IErrorSerializer
         {
@@ -54,6 +55,19 @@ public void SetupModels()
                 Name = "Jason Hater",
             };
 
+            t1 = new Tag {
+                Id = 1,
+                Text = "Ember"
+            };
+            t2 = new Tag {
+                Id = 2,
+                Text = "React"
+            };
+            t3 = new Tag {
+                Id = 3,
+                Text = "Angular"
+            };
+
             p = new Post()
             {
                 Id = 1,
@@ -234,8 +248,7 @@ public void SerializeArrayIntegrationTest()
 
         [TestMethod]
         [DeploymentItem(@"Data\AttributeSerializationTest.json")]
-        public void Serializes_attributes_properly()
-        {
+        public void Serializes_attributes_properly() {
             // Arrang
             JsonApiFormatter formatter = new JsonApiFormatter(new PluralizationService());
             MemoryStream stream = new MemoryStream();
@@ -250,6 +263,23 @@ public void Serializes_attributes_properly()
             Assert.AreEqual(expected, output.Trim());
         }
 
+        [TestMethod]
+        [DeploymentItem(@"Data\ByteIdSerializationTest.json")]
+        public void Serializes_byte_ids_properly() {
+            // Arrang
+            JsonApiFormatter formatter = new JsonApiFormatter(new PluralizationService());
+            MemoryStream stream = new MemoryStream();
+
+            // Act
+            formatter.WriteToStreamAsync(typeof(Tag), new[] { t1, t2, t3 }, stream, null, null);
+
+            // Assert
+            string output = System.Text.Encoding.ASCII.GetString(stream.ToArray());
+            Trace.WriteLine(output);
+            var expected = JsonHelpers.MinifyJson(File.ReadAllText("ByteIdSerializationTest.json"));
+            Assert.AreEqual(expected, output.Trim());
+        }
+
         [TestMethod]
         [DeploymentItem(@"Data\ReformatsRawJsonStringWithUnquotedKeys.json")]
         public void Reformats_raw_json_string_with_unquoted_keys()
diff --git a/JSONAPI.Tests/Models/Tag.cs b/JSONAPI.Tests/Models/Tag.cs
@@ -0,0 +1,12 @@
+&#65279;using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace JSONAPI.Tests.Models {
+    class Tag {
+        public byte Id { get; set; }
+        public string Text { get; set; }
+    }
+}
diff --git a/JSONAPI/Json/JsonApiFormatter.cs b/JSONAPI/Json/JsonApiFormatter.cs
@@ -890,6 +890,8 @@ protected string GetValueForIdProperty(PropertyInfo idprop, object obj)
                     return idprop.GetValue(obj).ToString();
                 if (idprop.PropertyType == typeof(int))
                     return ((int)idprop.GetValue(obj, null)).ToString();
+                if (idprop.PropertyType == typeof(byte))
+                    return ((byte)idprop.GetValue(obj, null)).ToString();
             }
             return "NOIDCOMPUTABLE!";
         }
