Merge pull request #1 from FINTmodels/suggestions-jarle

Suggestions for improvement

Author: fsjovatsen

FINT.Model.Resource.Test/AbstractCollectionResourcesTest.cs

@@ -0,0 +1,37 @@
+using Xunit;
+using Newtonsoft.Json;
+using System.Diagnostics;
+
+namespace FINT.Model.Resource.Test
+{
+  public class AbstractCollectionResourcesTest
+  {
+    PersonResources personResources;
+    public AbstractCollectionResourcesTest()
+    {
+      personResources = new PersonResources();
+      personResources.AddResource(new PersonResource { Name = "test1" });
+      personResources.AddResource(new PersonResource { Name = "test2" });
+    }
+
+    [Fact]
+    public void Get_Total_items()
+    {
+      Assert.Equal(2, personResources.TotalItems);
+    }
+
+    [Fact]
+    public void Serialize_Deserialize_PersonResources_getContent()
+    {
+      var json = JsonConvert.SerializeObject(personResources, Formatting.Indented);
+      var deserialized = JsonConvert.DeserializeObject<PersonResources>(json);
+      var deserializedContent = deserialized.GetContent();
+      var names = deserializedContent.ConvertAll(p => p.Name);
+
+      Assert.Equal(2, deserializedContent.Count);
+      Assert.True(names.Contains("test1"));
+      Assert.True(names.Contains("test2"));
+    }
+
+  }
+}

FINT.Model.Resource.Test/FINT.Model.Resource.Test.csproj

@@ -8,6 +8,7 @@
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.3.0-preview-20170628-02" />
     <PackageReference Include="xunit" Version="2.2.0" />
     <PackageReference Include="xunit.runner.visualstudio" Version="2.2.0" />
+    <PackageReference Include="Newtonsoft.Json" Version="11.0.2" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\FINT.Model.Resource\FINT.Model.Resource.csproj">

FINT.Model.Resource.Test/LinkTest.cs

@@ -9,15 +9,15 @@ public void Create_Link_with_PersonResource_placeholder()
         {
             var link = Link.with(typeof(PersonResource), "/id");
 
-            Assert.Equal(link.href, "${test.person}/id");
+            Assert.Equal("${test.person}/id", link.href);
         }
 
         [Fact]
         public void Create_Link_with_Person_placeholder()
         {
             var link = Link.with(typeof(Person), "/id");
 
-            Assert.Equal(link.href, "${test.person}/id");
+            Assert.Equal("${test.person}/id", link.href);
         }
     }
 }

FINT.Model.Resource.Test/Person.cs

@@ -2,6 +2,5 @@
 {
     public class Person
     {
-        
     }
 }

FINT.Model.Resource.Test/PersonResource.cs

@@ -2,6 +2,6 @@
 {
     public class PersonResource
     {
-        
+        public string Name { get; set; }
     }
 }

FINT.Model.Resource.Test/PersonResources.cs

@@ -0,0 +1,7 @@
+namespace FINT.Model.Resource.Test
+{
+    public class PersonResources : AbstractCollectionResources<PersonResource>
+    {
+        
+    }
+}

FINT.Model.Resource/AbstractCollectionResources.cs

@@ -4,48 +4,47 @@
 
 namespace FINT.Model.Resource
 {
-    public abstract class AbstractCollectionResources<T>
+  public abstract class AbstractCollectionResources<T>
+  {
+    [JsonProperty(PropertyName = "_links")]
+    protected readonly Dictionary<string, List<Link>> Links = new Dictionary<string, List<Link>>();
+
+    [JsonProperty(PropertyName = "_embedded")]
+    protected EmbeddedResources<T> Embedded = new EmbeddedResources<T>();
+
+    [JsonProperty(PropertyName = "total_items")]
+    public int TotalItems
+    {
+      get
+      {
+        return Embedded.Entries.Count;
+      }
+    }
+
+    public void AddResource(T resource)
+    {
+      Embedded.Entries.Add(resource);
+    }
+
+    public List<Link> GetSelfLinks()
     {
-        [JsonProperty(PropertyName = "_links")]
-        protected readonly Dictionary<string, List<Link>> Links = new Dictionary<string, List<Link>>();
-
-        [JsonProperty(PropertyName = "_embedded")]
-        protected EmbeddedResources<T> Embedded = new EmbeddedResources<T>();
-
-        [JsonProperty(PropertyName = "total_items")]
-        public int TotalItems { get; set; }
-
-
-        [OnSerialized]
-        internal void OnSerializedMethod(StreamingContext context)
-        {
-            TotalItems = Embedded.Entries.Count;
-        }
-
-        public void AddResource(T resource)
-        {
-            Embedded.Entries.Add(resource);
-        }
-
-        public List<Link> GetSelfLinks()
-        {
-            return Links["self"];
-        }
-
-        public List<T> GetContent()
-        {
-            return Embedded.Entries;
-        }
-
-        public class EmbeddedResources<T>
-        {
-            public EmbeddedResources()
-            {
-                Entries = new List<T>();
-            }
-
-            [JsonProperty(PropertyName = "_entries")]
-            public List<T> Entries { get; set; }
-        }
+      return Links["self"];
+    }
+
+    public List<T> GetContent()
+    {
+      return Embedded.Entries;
+    }
+
+    public class EmbeddedResources<T>
+    {
+      public EmbeddedResources()
+      {
+        Entries = new List<T>();
+      }
+
+      [JsonProperty(PropertyName = "_entries")]
+      public List<T> Entries { get; set; }
     }
+  }
 }

FINT.Model.Resource/FINT.Model.Resource.csproj

@@ -5,11 +5,6 @@
     <Authors>FINT</Authors>
     <PackageTags>fint</PackageTags>
   </PropertyGroup>
-  <ItemGroup>
-    <Reference Include="Newtonsoft.Json, Version=9.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed">
-      <HintPath>..\..\..\..\.nuget\packages\newtonsoft.json\9.0.1\lib\netstandard1.0\Newtonsoft.Json.dll</HintPath>
-    </Reference>
-  </ItemGroup>
   <ItemGroup>
     <PackageReference Include="Newtonsoft.Json" Version="11.0.2" />
   </ItemGroup>