From: Kimura Youichi <kim.upsilon@bucyou.net>
Date: Fri, 4 May 2018 19:56:11 +0000 (+0900)
Subject: コレクションのサイズに対するアサーションをAssert.Empty/Singleで行う (xUnit2013)
X-Git-Tag: OpenTween_v1.4.2~11^2~1
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=22288d0b372f7dd9682b58b3918a3a242a1a8e4d;hp=51aa5dfadca6b073023348c49f2dc8be816d9a9b;p=opentween%2Fopen-tween.git

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

diff --git a/OpenTween.Tests/IndexedSortedSetTest.cs b/OpenTween.Tests/IndexedSortedSetTest.cs
index b15a8c23..68f048c9 100644
--- 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 c18a934a..8908c3d6 100644
--- 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 4da4d704..46542033 100644
--- 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);