OpenTween v1.4.2 リリース

[opentween/open-tween.git] / OpenTween.Tests / MediaSelectorTest.cs

diff --git a/OpenTween.Tests/MediaSelectorTest.cs b/OpenTween.Tests/MediaSelectorTest.cs
index a2edced..20ed633 100644 (file)
--- a/OpenTween.Tests/MediaSelectorTest.cs
+++ b/OpenTween.Tests/MediaSelectorTest.cs
@@ -21,7 +21,7 @@ namespace OpenTween
             this.MyCommonSetup();
         }
 
-        public void MyCommonSetup()
+        private void MyCommonSetup()
         {
             var mockAssembly = new Mock<_Assembly>();
             mockAssembly.Setup(m => m.GetName()).Returns(new AssemblyName("OpenTween"));
@@ -53,16 +53,16 @@ namespace OpenTween
         }
 
         [Fact]
-        public void Initialize_yfrogTest()
+        public void Initialize_ImgurTest()
         {
             using (var twitter = new Twitter())
             using (var mediaSelector = new MediaSelector())
             {
                 twitter.Initialize("", "", "", 0L);
-                mediaSelector.Initialize(twitter, TwitterConfiguration.DefaultConfiguration(), "yfrog");
+                mediaSelector.Initialize(twitter, TwitterConfiguration.DefaultConfiguration(), "Imgur");
 
-                // 投稿先に yfrog が選択されている
-                Assert.Equal("yfrog", mediaSelector.ImageServiceCombo.Text);
+                // 投稿先に Imgur が選択されている
+                Assert.Equal("Imgur", mediaSelector.ImageServiceCombo.Text);
 
                 // ページ番号が初期化された状態
                 var pages = mediaSelector.ImagePageCombo.Items;
@@ -165,7 +165,7 @@ namespace OpenTween
 
                 // 1 ページ目が表示されている
                 Assert.Equal("1", mediaSelector.ImagePageCombo.Text);
-                Assert.True(Regex.IsMatch(mediaSelector.ImagefilePathText.Text, @"^<>MemoryImage://\d+.png$"));
+                Assert.Matches(@"^<>MemoryImage://\d+.png$", mediaSelector.ImagefilePathText.Text);
 
                 using (var bitmap = new Bitmap(width: 200, height: 200))
                 using (var image = MemoryImage.CopyFromImage(bitmap))
@@ -458,12 +458,12 @@ namespace OpenTween
                 Assert.Equal(new[] { "1", "2", "3" }, pages.Cast<object>().Select(x => x.ToString()));
                 Assert.True(mediaSelector.ImagePageCombo.Enabled);
 
-                // 投稿先を yfrog に変更
-                var yfrogIndex = mediaSelector.ImageServiceCombo.Items.IndexOf("yfrog");
+                // 投稿先を Imgur に変更
+                var imgurIndex = mediaSelector.ImageServiceCombo.Items.IndexOf("Imgur");
                 Assert.Raises<EventArgs>(
                     x => mediaSelector.SelectedServiceChanged += x,
                     x => mediaSelector.SelectedServiceChanged -= x,
-                    () => mediaSelector.ImageServiceCombo.SelectedIndex = yfrogIndex
+                    () => mediaSelector.ImageServiceCombo.SelectedIndex = imgurIndex
                 );
 
                 // 1 ページ目のみ選択可能な状態 (Disabled)