From 488df297fcec495d7da0afb87f74b7f9663c9ef0 Mon Sep 17 00:00:00 2001 From: Chris Cameron Date: Fri, 25 Jan 2019 13:57:19 -0500 Subject: [PATCH] refactor: Removing unused code --- .../Extensions/JsonExtensionsTest.cs | 48 ------------------- ICD.Common.Utils.Tests/Json/JsonUtilsTest.cs | 27 ----------- .../Json/AbstractGenericJsonConverter.cs | 6 --- 3 files changed, 81 deletions(-) diff --git a/ICD.Common.Utils.Tests/Extensions/JsonExtensionsTest.cs b/ICD.Common.Utils.Tests/Extensions/JsonExtensionsTest.cs index c6e77dc..7097a60 100644 --- a/ICD.Common.Utils.Tests/Extensions/JsonExtensionsTest.cs +++ b/ICD.Common.Utils.Tests/Extensions/JsonExtensionsTest.cs @@ -78,53 +78,5 @@ namespace ICD.Common.Utils.Tests.Extensions Assert.IsTrue(deserialized.SequenceEqual(new[] {1, 2, 3, 4})); } - - [Test] - public void SerializeDictionaryTest() - { - Dictionary dict = new Dictionary - { - {1, "Item 1"}, - {10, "Item 2"}, - {15, "Item 3"} - }; - - JsonSerializer serializer = new JsonSerializer(); - StringBuilder stringBuilder = new StringBuilder(); - - using (StringWriter stringWriter = new StringWriter(stringBuilder)) - { - using (JsonWriter writer = new JsonTextWriter(stringWriter)) - { - serializer.SerializeDictionary(writer, dict); - } - } - - string json = stringBuilder.ToString(); - Assert.AreEqual("{\"1\":\"Item 1\",\"10\":\"Item 2\",\"15\":\"Item 3\"}", json); - } - - [Test] - public void DeserializeDictionaryTest() - { - const string json = "{\"1\":\"Item 1\",\"10\":\"Item 2\",\"15\":\"Item 3\"}"; - - JsonSerializer serializer = new JsonSerializer(); - Dictionary deserialized; - - using (StringReader stringReader = new StringReader(json)) - { - using (JsonReader reader = new JsonTextReader(stringReader)) - { - reader.Read(); - deserialized = serializer.DeserializeDictionary(reader).ToDictionary(); - } - } - - Assert.AreEqual(3, deserialized.Count); - Assert.AreEqual("Item 1", deserialized[1]); - Assert.AreEqual("Item 2", deserialized[10]); - Assert.AreEqual("Item 3", deserialized[15]); - } } } diff --git a/ICD.Common.Utils.Tests/Json/JsonUtilsTest.cs b/ICD.Common.Utils.Tests/Json/JsonUtilsTest.cs index 49c5b3d..fe77594 100644 --- a/ICD.Common.Utils.Tests/Json/JsonUtilsTest.cs +++ b/ICD.Common.Utils.Tests/Json/JsonUtilsTest.cs @@ -2,7 +2,6 @@ using ICD.Common.Utils.IO; using ICD.Common.Utils.Json; using Newtonsoft.Json; -using Newtonsoft.Json.Linq; using NUnit.Framework; namespace ICD.Common.Utils.Tests.Json @@ -141,32 +140,6 @@ namespace ICD.Common.Utils.Tests.Json Assert.AreEqual("test message", messageName); } - [Test] - public void DeserializeTypeTest() - { - const string json = "{\"test\":10}"; - - JObject root = JObject.Parse(json); - JToken token = root["test"]; - - int value = (int)JsonUtils.Deserialize(typeof(int), token); - - Assert.AreEqual(10, value); - } - - [Test] - public void DeserializeTestSerializerTest() - { - const string json = "{\"test\":10}"; - - JObject root = JObject.Parse(json); - JToken token = root["test"]; - - int value = (int)JsonUtils.Deserialize(typeof(int), token, new JsonSerializer()); - - Assert.AreEqual(10, value); - } - public sealed class TestSerializable { private const string PROPERTY_NAME = "Test"; diff --git a/ICD.Common.Utils/Json/AbstractGenericJsonConverter.cs b/ICD.Common.Utils/Json/AbstractGenericJsonConverter.cs index a6ea772..4ad9714 100644 --- a/ICD.Common.Utils/Json/AbstractGenericJsonConverter.cs +++ b/ICD.Common.Utils/Json/AbstractGenericJsonConverter.cs @@ -29,12 +29,6 @@ namespace ICD.Common.Utils.Json if (serializer == null) throw new ArgumentNullException("serializer"); - if (value == null) - { - writer.WriteNull(); - return; - } - WriteJson(writer, (T)value, serializer); }