From 74ed7b416564513365a0c394a160a942d7c96d09 Mon Sep 17 00:00:00 2001 From: Chris Cameron Date: Tue, 13 Mar 2018 13:49:47 -0400 Subject: [PATCH] Tidying --- .../Extensions/DictionaryExtensionsTest.cs | 6 +++--- .../Extensions/EnumerableExtensionsTest.cs | 14 +++++++------- .../Extensions/EventHandlerExtensionsTest.cs | 3 +-- .../Extensions/JsonExtensionsTest.cs | 4 ++-- .../Extensions/ListExtensionsTest.cs | 6 +++--- .../Extensions/QueueExtensionsTest.cs | 8 ++++---- .../Extensions/StringBuilderExtensionsTest.cs | 4 ++-- .../Extensions/StringExtensionsTest.cs | 10 +++++----- 8 files changed, 27 insertions(+), 28 deletions(-) diff --git a/ICD.Common.Utils.Tests/Extensions/DictionaryExtensionsTest.cs b/ICD.Common.Utils.Tests/Extensions/DictionaryExtensionsTest.cs index 4cbde49..365cc1c 100644 --- a/ICD.Common.Utils.Tests/Extensions/DictionaryExtensionsTest.cs +++ b/ICD.Common.Utils.Tests/Extensions/DictionaryExtensionsTest.cs @@ -1,7 +1,7 @@ -using ICD.Common.Utils.Extensions; -using NUnit.Framework; -using System.Collections.Generic; +using System.Collections.Generic; using System.Linq; +using ICD.Common.Utils.Extensions; +using NUnit.Framework; namespace ICD.Common.Utils.Tests.Extensions { diff --git a/ICD.Common.Utils.Tests/Extensions/EnumerableExtensionsTest.cs b/ICD.Common.Utils.Tests/Extensions/EnumerableExtensionsTest.cs index 13cdc40..2f5a16a 100644 --- a/ICD.Common.Utils.Tests/Extensions/EnumerableExtensionsTest.cs +++ b/ICD.Common.Utils.Tests/Extensions/EnumerableExtensionsTest.cs @@ -1,8 +1,8 @@ -using ICD.Common.Utils.Collections; +using System.Collections.Generic; +using System.Linq; +using ICD.Common.Utils.Collections; using ICD.Common.Utils.Extensions; using NUnit.Framework; -using System.Collections.Generic; -using System.Linq; namespace ICD.Common.Utils.Tests.Extensions { @@ -117,8 +117,8 @@ namespace ICD.Common.Utils.Tests.Extensions [Test] public void SequenceEqualTest() { - int[] a = new[] {1, 2, 3, 4}; - int[] b = new[] {1, 4, 9, 16}; + int[] a = {1, 2, 3, 4}; + int[] b = {1, 4, 9, 16}; Assert.IsFalse(a.SequenceEqual(b, (x, y) => x == y)); Assert.IsTrue(a.SequenceEqual(b, (x, y) => x * x == y)); @@ -508,7 +508,7 @@ namespace ICD.Common.Utils.Tests.Extensions [Test] public void ConsolidateTest() { - string[] sequence = EnumerableExtensions.Consolidate(new[] {"A", "B", "B", "C"}).ToArray(); + string[] sequence = new[] {"A", "B", "B", "C"}.Consolidate().ToArray(); Assert.AreEqual(3, sequence.Length, StringUtils.ArrayFormat(sequence)); Assert.AreEqual("A", sequence[0]); @@ -519,7 +519,7 @@ namespace ICD.Common.Utils.Tests.Extensions [Test] public void ConsolidateComparerTest() { - string[] sequence = EnumerableExtensions.Consolidate(new[] {"A", "B", "B", "C"}, Comparer.Default).ToArray(); + string[] sequence = new[] {"A", "B", "B", "C"}.Consolidate(Comparer.Default).ToArray(); Assert.AreEqual(3, sequence.Length, StringUtils.ArrayFormat(sequence)); Assert.AreEqual("A", sequence[0]); diff --git a/ICD.Common.Utils.Tests/Extensions/EventHandlerExtensionsTest.cs b/ICD.Common.Utils.Tests/Extensions/EventHandlerExtensionsTest.cs index f3a1973..1fc1aeb 100644 --- a/ICD.Common.Utils.Tests/Extensions/EventHandlerExtensionsTest.cs +++ b/ICD.Common.Utils.Tests/Extensions/EventHandlerExtensionsTest.cs @@ -1,5 +1,4 @@ -using System; -using NUnit.Framework; +using NUnit.Framework; namespace ICD.Common.Utils.Tests.Extensions { diff --git a/ICD.Common.Utils.Tests/Extensions/JsonExtensionsTest.cs b/ICD.Common.Utils.Tests/Extensions/JsonExtensionsTest.cs index b759053..c6e77dc 100644 --- a/ICD.Common.Utils.Tests/Extensions/JsonExtensionsTest.cs +++ b/ICD.Common.Utils.Tests/Extensions/JsonExtensionsTest.cs @@ -51,7 +51,7 @@ namespace ICD.Common.Utils.Tests.Extensions { using (JsonWriter writer = new JsonTextWriter(stringWriter)) { - serializer.SerializeArray(writer, new int[] {1, 2, 3, 4}); + serializer.SerializeArray(writer, new[] {1, 2, 3, 4}); } } @@ -76,7 +76,7 @@ namespace ICD.Common.Utils.Tests.Extensions } } - Assert.IsTrue(deserialized.SequenceEqual(new int[] {1, 2, 3, 4})); + Assert.IsTrue(deserialized.SequenceEqual(new[] {1, 2, 3, 4})); } [Test] diff --git a/ICD.Common.Utils.Tests/Extensions/ListExtensionsTest.cs b/ICD.Common.Utils.Tests/Extensions/ListExtensionsTest.cs index 200b7d1..28775fb 100644 --- a/ICD.Common.Utils.Tests/Extensions/ListExtensionsTest.cs +++ b/ICD.Common.Utils.Tests/Extensions/ListExtensionsTest.cs @@ -1,7 +1,7 @@ -using ICD.Common.Utils.Extensions; -using NUnit.Framework; -using System.Collections.Generic; +using System.Collections.Generic; using System.Linq; +using ICD.Common.Utils.Extensions; +using NUnit.Framework; namespace ICD.Common.Utils.Tests.Extensions { diff --git a/ICD.Common.Utils.Tests/Extensions/QueueExtensionsTest.cs b/ICD.Common.Utils.Tests/Extensions/QueueExtensionsTest.cs index 56bf5f2..dac247a 100644 --- a/ICD.Common.Utils.Tests/Extensions/QueueExtensionsTest.cs +++ b/ICD.Common.Utils.Tests/Extensions/QueueExtensionsTest.cs @@ -1,6 +1,6 @@ -using NUnit.Framework; -using System.Collections.Generic; +using System.Collections.Generic; using ICD.Common.Utils.Extensions; +using NUnit.Framework; namespace ICD.Common.Utils.Tests.Extensions { @@ -12,7 +12,7 @@ namespace ICD.Common.Utils.Tests.Extensions { Queue queue = new Queue(); - queue.EnqueueRange(new int[] { 1, 2, 3 }); + queue.EnqueueRange(new[] { 1, 2, 3 }); Assert.AreEqual(3, queue.Count); Assert.AreEqual(1, queue.Dequeue()); @@ -24,7 +24,7 @@ namespace ICD.Common.Utils.Tests.Extensions public void DequeueTest() { Queue queue = new Queue(); - queue.EnqueueRange(new int[] { 1, 2, 3 }); + queue.EnqueueRange(new[] { 1, 2, 3 }); int output; diff --git a/ICD.Common.Utils.Tests/Extensions/StringBuilderExtensionsTest.cs b/ICD.Common.Utils.Tests/Extensions/StringBuilderExtensionsTest.cs index 54a3071..015fd54 100644 --- a/ICD.Common.Utils.Tests/Extensions/StringBuilderExtensionsTest.cs +++ b/ICD.Common.Utils.Tests/Extensions/StringBuilderExtensionsTest.cs @@ -1,6 +1,6 @@ -using NUnit.Framework; -using System.Text; +using System.Text; using ICD.Common.Utils.Extensions; +using NUnit.Framework; namespace ICD.Common.Utils.Tests.Extensions { diff --git a/ICD.Common.Utils.Tests/Extensions/StringExtensionsTest.cs b/ICD.Common.Utils.Tests/Extensions/StringExtensionsTest.cs index 083b777..5cde184 100644 --- a/ICD.Common.Utils.Tests/Extensions/StringExtensionsTest.cs +++ b/ICD.Common.Utils.Tests/Extensions/StringExtensionsTest.cs @@ -1,6 +1,6 @@ -using ICD.Common.Utils.Extensions; +using System.Linq; +using ICD.Common.Utils.Extensions; using NUnit.Framework; -using System.Linq; namespace ICD.Common.Utils.Tests.Extensions { @@ -11,7 +11,7 @@ namespace ICD.Common.Utils.Tests.Extensions public void IndexOfTest() { string first; - Assert.AreEqual(5, "test1test3test2".IndexOf(new string[] { "test2", "test3" }, out first)); + Assert.AreEqual(5, "test1test3test2".IndexOf(new[] { "test2", "test3" }, out first)); Assert.AreEqual("test3", first); } @@ -63,7 +63,7 @@ namespace ICD.Common.Utils.Tests.Extensions [Test] public void SplitStringDelimitersTest() { - string[] split = "1234567890".Split(new string[] { "23", "67" }).ToArray(); + string[] split = "1234567890".Split(new[] { "23", "67" }).ToArray(); Assert.AreEqual(3, split.Length); Assert.AreEqual("145890", string.Join("", split)); @@ -78,7 +78,7 @@ namespace ICD.Common.Utils.Tests.Extensions [Test] public void RemoveCharactersTest() { - Assert.AreEqual("13457890", "1234567890".Remove(new char[] { '2', '6' })); + Assert.AreEqual("13457890", "1234567890".Remove(new[] { '2', '6' })); } [TestCase(true, "27652")]