コレクションのサイズに対するアサーションをAssert.Empty/Singleで行う (xUnit2013)

diff --git a/OpenTween.Tests/IndexedSortedSetTest.cs b/OpenTween.Tests/IndexedSortedSetTest.cs
index b15a8c2..68f048c 100644 (file)
--- a/OpenTween.Tests/IndexedSortedSetTest.cs
+++ b/OpenTween.Tests/IndexedSortedSetTest.cs
@@ -102,10 +102,10 @@ namespace OpenTween
         {
             var set = new IndexedSortedSet<int>();
 
-            Assert.Equal(0, set.Count);
+            Assert.Empty(set);
 
             set.Add(1);
-            Assert.Equal(1, set.Count);
+            Assert.Single(set);
         }
 
         [Fact]

diff --git a/OpenTween.Tests/LRUCacheDictionaryTest.cs b/OpenTween.Tests/LRUCacheDictionaryTest.cs
index c18a934..8908c3d 100644 (file)
--- a/OpenTween.Tests/LRUCacheDictionaryTest.cs
+++ b/OpenTween.Tests/LRUCacheDictionaryTest.cs
@@ -185,7 +185,7 @@ namespace OpenTween
 
             dict.Add("key1", "value1");
 
-            Assert.Equal(1, dict.innerDict.Count);
+            Assert.Single(dict.innerDict);
             Assert.True(dict.innerDict.ContainsKey("key1"));
             var internalNode = dict.innerDict["key1"];
             Assert.Equal("key1", internalNode.Value.Key);
@@ -396,19 +396,19 @@ namespace OpenTween
         {
             var dict = new LRUCacheDictionary<string, string>();
 
-            Assert.Equal(0, dict.Count);
+            Assert.Empty(dict);
 
             dict.Add("key1", "value1");
-            Assert.Equal(1, dict.Count);
+            Assert.Single(dict);
 
             dict.Add("key2", "value2");
             Assert.Equal(2, dict.Count);
 
             dict.Remove("key1");
-            Assert.Equal(1, dict.Count);
+            Assert.Single(dict);
 
             dict.Clear();
-            Assert.Equal(0, dict.Count);
+            Assert.Empty(dict);
         }
 
         [Fact]

diff --git a/OpenTween.Tests/TweetThumbnailTest.cs b/OpenTween.Tests/TweetThumbnailTest.cs
index 4da4d70..4654203 100644 (file)
--- a/OpenTween.Tests/TweetThumbnailTest.cs
+++ b/OpenTween.Tests/TweetThumbnailTest.cs
@@ -199,7 +199,7 @@ namespace OpenTween
                 Assert.Equal(0, thumbbox.scrollBar.Maximum);
                 Assert.False(thumbbox.scrollBar.Enabled);
 
-                Assert.Equal(1, thumbbox.pictureBox.Count);
+                Assert.Single(thumbbox.pictureBox);
                 Assert.NotNull(thumbbox.pictureBox[0].Image);
 
                 Assert.IsAssignableFrom<ThumbnailInfo>(thumbbox.pictureBox[0].Tag);