From ef62f039a40d33b5d8216597d398b6b7a3067481 Mon Sep 17 00:00:00 2001
From: "Collin M. Barrett" <collinbarrett@users.noreply.github.com>
Date: Wed, 3 Jul 2019 16:01:30 -0500
Subject: [PATCH] tidy some tests

---
 .../ReadOnlyListExtensionsTests.cs            | 32 ++++-----
 .../{ => Extensions}/UriExtensionsTests.cs    |  2 +-
 .../Extensions/CollectionExtensionsTests.cs   | 68 +++++++++----------
 3 files changed, 51 insertions(+), 51 deletions(-)
 rename tests/FilterLists.Agent.Tests/{ => Extensions}/ReadOnlyListExtensionsTests.cs (96%)
 rename tests/FilterLists.Agent.Tests/{ => Extensions}/UriExtensionsTests.cs (96%)

diff --git a/tests/FilterLists.Agent.Tests/ReadOnlyListExtensionsTests.cs b/tests/FilterLists.Agent.Tests/Extensions/ReadOnlyListExtensionsTests.cs
similarity index 96%
rename from tests/FilterLists.Agent.Tests/ReadOnlyListExtensionsTests.cs
rename to tests/FilterLists.Agent.Tests/Extensions/ReadOnlyListExtensionsTests.cs
index f24ccb894..737ab8a3c 100644
--- a/tests/FilterLists.Agent.Tests/ReadOnlyListExtensionsTests.cs
+++ b/tests/FilterLists.Agent.Tests/Extensions/ReadOnlyListExtensionsTests.cs
@@ -3,10 +3,17 @@
 using FilterLists.Agent.Extensions;
 using Xunit;
 
-namespace FilterLists.Agent.Tests
+namespace FilterLists.Agent.Tests.Extensions
 {
     public class ReadOnlyListExtensionsTests
     {
+        [Fact]
+        public void FirstOrDefault_WithNullParameter_ThrowsArgumentNullException()
+        {
+            var list = (IReadOnlyList<int>)null;
+            Assert.Throws<ArgumentNullException>(() => list.FirstOrDefault());
+        }
+
         [Fact]
         public void FirstOrDefault_WithEmptyList_ReturnsDefault()
         {
@@ -15,21 +22,6 @@ public void FirstOrDefault_WithEmptyList_ReturnsDefault()
             Assert.Equal(default, sut);
         }
 
-        [Fact]
-        public void FirstOrDefault_WithMoreThanOneListElement_ReturnsFirstListElement()
-        {
-            var list = (IReadOnlyList<int>)new List<int> {1, 2, 3};
-            var sut = list.FirstOrDefault();
-            Assert.Equal(1, sut);
-        }
-
-        [Fact]
-        public void FirstOrDefault_WithNullParameter_ThrowsArgumentNullException()
-        {
-            var list = (IReadOnlyList<int>)null;
-            Assert.Throws<ArgumentNullException>(() => list.FirstOrDefault());
-        }
-
         [Fact]
         public void FirstOrDefault_WithOneListElement_ReturnsFirstListElement()
         {
@@ -37,5 +29,13 @@ public void FirstOrDefault_WithOneListElement_ReturnsFirstListElement()
             var sut = list.FirstOrDefault();
             Assert.Equal(0, sut);
         }
+
+        [Fact]
+        public void FirstOrDefault_WithMoreThanOneListElement_ReturnsFirstListElement()
+        {
+            var list = (IReadOnlyList<int>)new List<int> {1, 2, 3};
+            var sut = list.FirstOrDefault();
+            Assert.Equal(1, sut);
+        }
     }
 }
\ No newline at end of file
diff --git a/tests/FilterLists.Agent.Tests/UriExtensionsTests.cs b/tests/FilterLists.Agent.Tests/Extensions/UriExtensionsTests.cs
similarity index 96%
rename from tests/FilterLists.Agent.Tests/UriExtensionsTests.cs
rename to tests/FilterLists.Agent.Tests/Extensions/UriExtensionsTests.cs
index b475e9d1c..3b882dca7 100644
--- a/tests/FilterLists.Agent.Tests/UriExtensionsTests.cs
+++ b/tests/FilterLists.Agent.Tests/Extensions/UriExtensionsTests.cs
@@ -3,7 +3,7 @@
 using FilterLists.Agent.Extensions;
 using Xunit;
 
-namespace FilterLists.Agent.Tests
+namespace FilterLists.Agent.Tests.Extensions
 {
     public class UriExtensionsTests
     {
diff --git a/tests/FilterLists.Services.Tests/Extensions/CollectionExtensionsTests.cs b/tests/FilterLists.Services.Tests/Extensions/CollectionExtensionsTests.cs
index 4d544e513..921e8c801 100644
--- a/tests/FilterLists.Services.Tests/Extensions/CollectionExtensionsTests.cs
+++ b/tests/FilterLists.Services.Tests/Extensions/CollectionExtensionsTests.cs
@@ -8,64 +8,64 @@ namespace FilterLists.Services.Tests.Extensions
 {
     public class CollectionExtensionsTests
     {
-        private readonly ICollection<string> sut = new Collection<string>();
-        private IEnumerable<string> range;
-        private string item;
-
-        [Fact]
-        public void AddIfNotNullOrEmpty_EmptyString_AddsNothing()
-        {
-            item = "";
-            sut.AddIfNotNullOrEmpty(item);
-            Assert.DoesNotContain(item, sut);
-        }
-
-        [Fact]
-        public void AddIfNotNullOrEmpty_NonNullOrEmptyString_AddsParam()
-        {
-            item = "item";
-            sut.AddIfNotNullOrEmpty(item);
-            Assert.Contains(item, sut);
-        }
+        private readonly ICollection<string> _sut = new Collection<string>();
+        private IEnumerable<string> _range;
+        private string _item;
 
         [Fact]
         public void AddIfNotNullOrEmpty_NullString_AddsNothing()
         {
-            item = null;
-            sut.AddIfNotNullOrEmpty(item);
-            Assert.DoesNotContain(item, sut);
+            _item = null;
+            _sut.AddIfNotNullOrEmpty(_item);
+            Assert.DoesNotContain(_item, _sut);
         }
 
         [Fact]
         public void AddRange_EmptyCollection_AddsNothing()
         {
-            range = new Collection<string>();
-            sut.AddRange(range);
-            Assert.Empty(sut);
+            _range = new Collection<string>();
+            _sut.AddRange(_range);
+            Assert.Empty(_sut);
+        }
+
+        [Fact]
+        public void AddIfNotNullOrEmpty_EmptyString_AddsNothing()
+        {
+            _item = "";
+            _sut.AddIfNotNullOrEmpty(_item);
+            Assert.DoesNotContain(_item, _sut);
+        }
+
+        [Fact]
+        public void AddIfNotNullOrEmpty_NonNullOrEmptyString_AddsParam()
+        {
+            _item = "item";
+            _sut.AddIfNotNullOrEmpty(_item);
+            Assert.Contains(_item, _sut);
         }
 
         [Fact]
         public void AddRange_EmptyList_AddsNothing()
         {
-            range = new List<string>();
-            sut.AddRange(range);
-            Assert.Empty(sut);
+            _range = new List<string>();
+            _sut.AddRange(_range);
+            Assert.Empty(_sut);
         }
 
         [Fact]
         public void AddRange_StringCollection_AddsParam()
         {
-            range = new Collection<string> {"item1", "item2"};
-            sut.AddRange(range);
-            Assert.True(!range.Except(sut).Any());
+            _range = new Collection<string> {"item1", "item2"};
+            _sut.AddRange(_range);
+            Assert.True(!_range.Except(_sut).Any());
         }
 
         [Fact]
         public void AddRange_StringList_AddsParam()
         {
-            range = new List<string> {"item1", "item2"};
-            sut.AddRange(range);
-            Assert.True(!range.Except(sut).Any());
+            _range = new List<string> {"item1", "item2"};
+            _sut.AddRange(_range);
+            Assert.True(!_range.Except(_sut).Any());
         }
     }
 }
\ No newline at end of file