icdsystems/ICD.Common.Utils
1
0
Fork 0
mirror of https://github.com/ICDSystems/ICD.Common.Utils.git synced 2026-02-16 05:05:05 +00:00
Code Issues Packages Projects Releases Wiki Activity

refactor: Removing unused code

Browse Source
This commit is contained in:
Chris Cameron
2019-01-25 13:57:19 -05:00
parent 80a4d94358
commit 488df297fc
3 changed files with 0 additions and 81 deletions
Download Patch File Download Diff File Expand all files Collapse all files

48
ICD.Common.Utils.Tests/Extensions/JsonExtensionsTest.cs
View File

@@ -78,53 +78,5 @@ namespace ICD.Common.Utils.Tests.Extensions
Assert.IsTrue(deserialized.SequenceEqual(new[] {1, 2, 3, 4})); Assert.IsTrue(deserialized.SequenceEqual(new[] {1, 2, 3, 4}));
} }
[Test]
public void SerializeDictionaryTest()
{
Dictionary<int, string> dict = new Dictionary<int, string>
{
{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<int, string> deserialized;
using (StringReader stringReader = new StringReader(json))
{
using (JsonReader reader = new JsonTextReader(stringReader))
{
reader.Read();
deserialized = serializer.DeserializeDictionary<int, string>(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]);
}
} }
} }

27
ICD.Common.Utils.Tests/Json/JsonUtilsTest.cs
View File

@@ -2,7 +2,6 @@
using ICD.Common.Utils.IO; using ICD.Common.Utils.IO;
using ICD.Common.Utils.Json; using ICD.Common.Utils.Json;
using Newtonsoft.Json; using Newtonsoft.Json;
using Newtonsoft.Json.Linq;
using NUnit.Framework; using NUnit.Framework;
namespace ICD.Common.Utils.Tests.Json namespace ICD.Common.Utils.Tests.Json
@@ -141,32 +140,6 @@ namespace ICD.Common.Utils.Tests.Json
Assert.AreEqual("test message", messageName); 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 public sealed class TestSerializable
{ {
private const string PROPERTY_NAME = "Test"; private const string PROPERTY_NAME = "Test";

6
ICD.Common.Utils/Json/AbstractGenericJsonConverter.cs
View File

@@ -29,12 +29,6 @@ namespace ICD.Common.Utils.Json
if (serializer == null) if (serializer == null)
throw new ArgumentNullException("serializer"); throw new ArgumentNullException("serializer");
if (value == null)
{
writer.WriteNull();
return;
}
WriteJson(writer, (T)value, serializer); WriteJson(writer, (T)value, serializer);
} }