Merge pull request #27 from gitFurious/dev

v1.5.5.0
gitFurious · Jul 18, 2016 · 2cc8106 · 2cc8106
2 parents 521aa92 + 2ee3b78
commit 2cc8106
Show file tree

Hide file tree

Showing 6 changed files with 24 additions and 12 deletions.
diff --git a/README.md b/README.md
@@ -56,6 +56,14 @@ A Nuget package is available at [www.nuget.org/packages/HaloSharp](https://www.n
 
 ### Changelog ###
 
+###### v.1.5.5.0 (2016-07-16)
+
+1. Updated WarzoneMatch model.
+  * Updated: PveTotalRoundAssistBonuses
+  * Updated: PveTotalRoundKillBonuses
+  * Updated: PveTotalRoundSpeedBonuses
+  * Updated: PveTotalRoundSurvivalBonuses
+
 ###### v.1.5.4.0 (2016-06-30)
 
 1. Updated Player Stat model.

diff --git a/Source/HaloSharp.Test/JSON/Stats/CarnageReport/warzone-match.schema.json b/Source/HaloSharp.Test/JSON/Stats/CarnageReport/warzone-match.schema.json
@@ -181,16 +181,16 @@
           }
         },
         "PveTotalRoundAssistBonuses": {
-          "type": "null"
+          "type": [ "integer", "null" ]
         },
         "PveTotalRoundKillBonuses": {
-          "type": "null"
+          "type": [ "integer", "null" ]
         },
         "PveTotalRoundSpeedBonuses": {
-          "type": "null"
+          "type": [ "integer", "null" ]
         },
         "PveTotalRoundSurvivalBonuses": {
-          "type": "null"
+          "type": [ "integer", "null" ]
         },
         "WarzoneLevel": {
           "type": "integer"

diff --git a/Source/HaloSharp.Test/Properties/AssemblyInfo.cs b/Source/HaloSharp.Test/Properties/AssemblyInfo.cs
@@ -31,5 +31,5 @@
 // You can specify all the values or you can default the Build and Revision Numbers 
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.5.4.0")]
-[assembly: AssemblyFileVersion("1.5.4.0")]
+[assembly: AssemblyVersion("1.5.5.0")]
+[assembly: AssemblyFileVersion("1.5.5.0")]
diff --git a/Source/HaloSharp.Test/Query/Stats/CarnageReport/GetWarzoneMatchDetailsTests.cs b/Source/HaloSharp.Test/Query/Stats/CarnageReport/GetWarzoneMatchDetailsTests.cs
@@ -71,6 +71,7 @@ public async Task Query_DoesNotThrow()
         [Test]
         [TestCase("763208a1-934e-466a-bdbd-318fa4d2e1c6")]
         [TestCase("04725707-da3f-407c-b43c-5f2b8bceb50a")]
+        [TestCase("3bd3945a-3578-4726-aad2-89b2c014a2ad")]
         public async Task GetWarzoneMatchDetails_DoesNotThrow(string guid)
         {
             var query = new GetWarzoneMatchDetails()
@@ -85,6 +86,7 @@ public async Task GetWarzoneMatchDetails_DoesNotThrow(string guid)
         [Test]
         [TestCase("763208a1-934e-466a-bdbd-318fa4d2e1c6")]
         [TestCase("04725707-da3f-407c-b43c-5f2b8bceb50a")]
+        [TestCase("3bd3945a-3578-4726-aad2-89b2c014a2ad")]
         public async Task GetWarzoneMatchDetails_SchemaIsValid(string guid)
         {
             var weaponsSchema = JSchema.Parse(File.ReadAllText(Config.WarzoneMatchJsonSchemaPath), new JSchemaReaderSettings
@@ -105,6 +107,7 @@ public async Task GetWarzoneMatchDetails_SchemaIsValid(string guid)
         [Test]
         [TestCase("763208a1-934e-466a-bdbd-318fa4d2e1c6")]
         [TestCase("04725707-da3f-407c-b43c-5f2b8bceb50a")]
+        [TestCase("3bd3945a-3578-4726-aad2-89b2c014a2ad")]
         public async Task GetWarzoneMatchDetails_ModelMatchesSchema(string guid)
         {
             var schema = JSchema.Parse(File.ReadAllText(Config.WarzoneMatchJsonSchemaPath), new JSchemaReaderSettings
@@ -128,6 +131,7 @@ public async Task GetWarzoneMatchDetails_ModelMatchesSchema(string guid)
         [Test]
         [TestCase("763208a1-934e-466a-bdbd-318fa4d2e1c6")]
         [TestCase("04725707-da3f-407c-b43c-5f2b8bceb50a")]
+        [TestCase("3bd3945a-3578-4726-aad2-89b2c014a2ad")]
         public async Task GetWarzoneMatchDetails_IsSerializable(string guid)
         {
             var query = new GetWarzoneMatchDetails()

diff --git a/Source/HaloSharp/Model/Stats/CarnageReport/WarzoneMatch.cs b/Source/HaloSharp/Model/Stats/CarnageReport/WarzoneMatch.cs
@@ -136,25 +136,25 @@ public class WarzonePlayerStat : BasePlayerStat, IEquatable<WarzonePlayerStat>
         /// TODO
         /// </summary>
         [JsonProperty(PropertyName = "PveTotalRoundAssistBonuses")]
-        public object PveTotalRoundAssistBonuses { get; set; }
+        public int? PveTotalRoundAssistBonuses { get; set; }
 
         /// <summary>
         /// TODO
         /// </summary>
         [JsonProperty(PropertyName = "PveTotalRoundKillBonuses")]
-        public object PveTotalRoundKillBonuses { get; set; }
+        public int? PveTotalRoundKillBonuses { get; set; }
 
         /// <summary>
         /// TODO
         /// </summary>
         [JsonProperty(PropertyName = "PveTotalRoundSpeedBonuses")]
-        public object PveTotalRoundSpeedBonuses { get; set; }
+        public int? PveTotalRoundSpeedBonuses { get; set; }
 
         /// <summary>
         /// TODO
         /// </summary>
         [JsonProperty(PropertyName = "PveTotalRoundSurvivalBonuses")]
-        public object PveTotalRoundSurvivalBonuses { get; set; }
+        public int? PveTotalRoundSurvivalBonuses { get; set; }
 
         /// <summary>
         /// The set of rewards that the player got in this match. Rewards are available via the Metadata API.

diff --git a/Source/HaloSharp/Properties/AssemblyInfo.cs b/Source/HaloSharp/Properties/AssemblyInfo.cs
@@ -32,8 +32,8 @@
 // You can specify all the values or you can default the Build and Revision Numbers 
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.5.4.0")]
-[assembly: AssemblyFileVersion("1.5.4.0")]
+[assembly: AssemblyVersion("1.5.5.0")]
+[assembly: AssemblyFileVersion("1.5.5.0")]
 
 //HaloSharp.Test
 [assembly: InternalsVisibleTo("HaloSharp.Test")]