Commit: c1232a8172a47a88704f43e12a49982c34c96e17 - opentween (git)

開発に使用するリポジトリ

Commit MetaInfo

• Révision: c1232a8172a47a88704f43e12a49982c34c96e17 (tree)
• l'heure: 2012-11-29 10:38:27
• Auteur: Kimura Youichi <kim.upsilon@bucy...>
• Commiter: Kimura Youichi

Message de Log

テストケース追加

Change Summary

• modified: OpenTween.Tests/MyCommonTest.cs
• modified: OpenTween.Tests/OpenTween.Tests.csproj
• add: OpenTween.Tests/Resources/re.gif
• add: OpenTween.Tests/Resources/re1.gif
• add: OpenTween.Tests/Resources/re1.png
• modified: OpenTween/MyCommon.cs

Modification

--- a/OpenTween.Tests/MyCommonTest.cs
+++ b/OpenTween.Tests/MyCommonTest.cs
@@ -3,13 +3,154 @@ using System.Collections.Generic;
 using System.Linq;
 using System.Text;
 using NUnit.Framework;
+using NSubstitute;
 using OpenTween;
+using System.Runtime.InteropServices;
+using System.Reflection;
+using System.Windows.Forms;
+using System.Runtime.Serialization;
 
 namespace OpenTween
 {
     [TestFixture]
     public class MyCommonTest
     {
+        [TestCase("http://ja.wikipedia.org/wiki/Wikipedia", Result = "http://ja.wikipedia.org/wiki/Wikipedia")]
+        [TestCase("http://ja.wikipedia.org/wiki/メインページ",
+            Result = "http://ja.wikipedia.org/wiki/%E3%83%A1%E3%82%A4%E3%83%B3%E3%83%9A%E3%83%BC%E3%82%B8")]
+        [TestCase("http://fr.wikipedia.org/wiki/Café", Result = "http://fr.wikipedia.org/wiki/Caf%E9")]
+        [TestCase("http://ja.wikipedia.org/wiki/勇気100%", Result = "http://ja.wikipedia.org/wiki/%E5%8B%87%E6%B0%97100%25")]
+        [TestCase("http://ja.wikipedia.org/wiki/Bio_100%", Result = "http://ja.wikipedia.org/wiki/Bio_100%25")]
+        public string urlEncodeMultibyteCharTest(string uri)
+        {
+            return MyCommon.urlEncodeMultibyteChar(uri);
+        }
+
+        [TestCase("http://日本語.idn.icann.org/", Result = "http://xn--wgv71a119e.idn.icann.org/")]
+        [TestCase("http://例え.テスト/", Result = "http://xn--r8jz45g.xn--zckzah/")]
+        public string IDNDecodeTest(string uri)
+        {
+            return MyCommon.IDNDecode(uri);
+        }
+
+        [TestCase(new int[] { 1, 2, 3, 4 }, 0, 3, Result = new int[] { 2, 3, 4, 1 })] // 左ローテイト?
+        [TestCase(new int[] { 1, 2, 3, 4 }, 3, 0, Result = new int[] { 4, 1, 2, 3 })] // 右ローテイト?
+        [TestCase(new int[] { 1, 2, 3, 4, 5 }, 1, 3, Result = new int[] { 1, 3, 4, 2, 5 })]
+        [TestCase(new int[] { 1, 2, 3, 4, 5 }, 3, 1, Result = new int[] { 1, 4, 2, 3, 5 })]
+        public int[] MoveArrayItemTest(int[] values, int idx_fr, int idx_to)
+        {
+            // MoveArrayItem は values を直接変更するため複製を用意する
+            var copy = new int[values.Length];
+            Array.Copy(values, copy, values.Length);
+
+            MyCommon.MoveArrayItem(copy, idx_fr, idx_to);
+            return copy;
+        }
+
+        [Test]
+        public void EncryptStringTest()
+        {
+            var str = "hogehoge";
+
+            var crypto = MyCommon.EncryptString(str);
+            Assert.That(crypto, Is.Not.EqualTo(str));
+
+            var decrypt = MyCommon.DecryptString(crypto);
+            Assert.That(decrypt, Is.EqualTo(str));
+        }
+
+        [TestCase(new byte[] { 0x01, 0x02 }, 3, Result = new byte[] { 0x01, 0x02, 0x00 })]
+        [TestCase(new byte[] { 0x01, 0x02 }, 2, Result = new byte[] { 0x01, 0x02 })]
+        [TestCase(new byte[] { 0x01, 0x02 }, 1, Result = new byte[] { 0x03 })]
+        public byte[] ResizeBytesArrayTest(byte[] bytes, int size)
+        {
+            return MyCommon.ResizeBytesArray(bytes, size);
+        }
+
+        [TestCase("Resources/re.gif", Result = true)]
+        [TestCase("Resources/re1.gif", Result = false)]
+        [TestCase("Resources/re1.png", Result = false)]
+        public bool IsAnimatedGifTest(string filename)
+        {
+            return MyCommon.IsAnimatedGif(filename);
+        }
+
+        static object[] DateTimeParse_TestCase =
+        {
+            new object[] {
+                "Sun Nov 25 06:10:00 +00:00 2012",
+                new DateTime(2012, 11, 25, 6, 10, 0, DateTimeKind.Utc)
+            },
+            new object[] {
+                "Sun, 25 Nov 2012 06:10:00 +00:00",
+                new DateTime(2012, 11, 25, 6, 10, 0, DateTimeKind.Utc)
+            },
+        };
+        [TestCaseSource("DateTimeParse_TestCase")]
+        public void DateTimeParseTest(string date, DateTime except)
+        {
+            Assert.That(MyCommon.DateTimeParse(date).ToUniversalTime(), Is.EqualTo(except));
+        }
+
+        [DataContract]
+        public struct JsonData
+        {
+            [DataMember(Name = "id")] public string Id { get; set; }
+            [DataMember(Name = "body")] public string Body { get; set; }
+        }
+        static object[] CreateDataFromJson_TestCase =
+        {
+            new object[] {
+                @"{""id"":""1"", ""body"":""hogehoge""}",
+                new JsonData { Id = "1", Body = "hogehoge" },
+            },
+        };
+        [TestCaseSource("CreateDataFromJson_TestCase")]
+        public void CreateDataFromJsonTest<T>(string json, T expect)
+        {
+            Assert.That(MyCommon.CreateDataFromJson<T>(json), Is.EqualTo(expect));
+        }
+
+        [TestCase("[e-mail]", Result = true)]
+        [TestCase("hogehoge", Result = false)]
+        [TestCase("[e-mail]", Result = true)]
+        [TestCase("[e-mail]", Result = false)]
+        [TestCase("[e-mail]", Result = false)]
+        [TestCase("[e-mail]", Result = true)]
+        public bool IsValidEmailTest(string email)
+        {
+            return MyCommon.IsValidEmail(email);
+        }
+
+        [TestCase(Keys.Shift, Keys.Shift, Result = true)]
+        [TestCase(Keys.Shift, Keys.Control, Result = false)]
+        [TestCase(Keys.Control | Keys.Alt, Keys.Control, Result = true)]
+        [TestCase(Keys.Control | Keys.Alt, Keys.Alt, Result = true)]
+        [TestCase(Keys.Control | Keys.Alt, Keys.Control, Keys.Alt, Result = true)]
+        [TestCase(Keys.Control | Keys.Alt, Keys.Shift, Result = false)]
+        public bool IsKeyDownTest(Keys modifierKeys, params Keys[] checkKeys)
+        {
+            return MyCommon._IsKeyDown(modifierKeys, checkKeys);
+        }
+
+        [Test]
+        public void GetAssemblyNameTest()
+        {
+            var mockAssembly = Substitute.For<_Assembly>();
+            mockAssembly.GetName().Returns(new AssemblyName("OpenTween"));
+            MyCommon.EntryAssembly = mockAssembly;
+
+            Assert.That(MyCommon.GetAssemblyName(), Is.EqualTo("OpenTween"));
+        }
+
+        [TestCase("", "")]
+        [TestCase("%AppName%", "OpenTween")]
+        [TestCase("%AppName% %AppName%", "OpenTween OpenTween")]
+        public void ReplaceAppNameTest(string str, string except)
+        {
+            Assert.That(MyCommon.ReplaceAppName(str, "OpenTween"), Is.EqualTo(except));
+        }
+
         [TestCase("1.0.0.0", "1.0.0")]
         [TestCase("1.0.0.1", "1.0.1-beta1")]
         [TestCase("1.0.0.9", "1.0.1-beta9")]
@@ -21,5 +162,29 @@ namespace OpenTween
         {
             Assert.That(OpenTween.MyCommon.GetReadableVersion(fileVersion), Is.EqualTo(expect));
         }
+
+        static object[] GetStatusUrlTest1_TestCase =
+        {
+            new object[] {
+                new PostClass { StatusId = 249493863826350080L, ScreenName = "Favstar_LM", RetweetedId = 0L, RetweetedBy = null },
+                "https://twitter.com/Favstar_LM/status/249493863826350080",
+            },
+            new object[] {
+                new PostClass { StatusId = 216033842434289664L, ScreenName = "haru067", RetweetedId = 200245741443235840L, RetweetedBy = "re4k"},
+                "https://twitter.com/haru067/status/200245741443235840",
+            },
+        };
+        [TestCaseSource("GetStatusUrlTest1_TestCase")]
+        public void GetStatusUrlTest1(PostClass post, string except)
+        {
+            Assert.That(MyCommon.GetStatusUrl(post), Is.EqualTo(except));
+        }
+
+        [TestCase("Favstar_LM", 249493863826350080L, "https://twitter.com/Favstar_LM/status/249493863826350080")]
+        [TestCase("haru067", 200245741443235840L, "https://twitter.com/haru067/status/200245741443235840")]
+        public void GetStatusUrlTest2(string screenName, long statusId, string except)
+        {
+            Assert.That(MyCommon.GetStatusUrl(screenName, statusId), Is.EqualTo(except));
+        }
     }
 }

--- a/OpenTween.Tests/OpenTween.Tests.csproj
+++ b/OpenTween.Tests/OpenTween.Tests.csproj
@@ -41,6 +41,8 @@
     </Reference>
     <Reference Include="System" />
     <Reference Include="System.Core" />
+    <Reference Include="System.Runtime.Serialization" />
+    <Reference Include="System.Windows.Forms" />
     <Reference Include="System.Xml.Linq" />
     <Reference Include="System.Data.DataSetExtensions" />
     <Reference Include="Microsoft.CSharp" />
@@ -60,7 +62,17 @@
   <ItemGroup>
     <Content Include="dlls\NSubstitute.dll" />
     <Content Include="dlls\nunit.framework.dll" />
+    <Content Include="Resources\re.gif">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
+    <Content Include="Resources\re1.gif">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
+    <Content Include="Resources\re1.png">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
   </ItemGroup>
+  <ItemGroup />
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.

Binary files /dev/null and b/OpenTween.Tests/Resources/re.gif differ

Binary files /dev/null and b/OpenTween.Tests/Resources/re1.gif differ

Binary files /dev/null and b/OpenTween.Tests/Resources/re1.png differ

--- a/OpenTween/MyCommon.cs
+++ b/OpenTween/MyCommon.cs
@@ -43,6 +43,7 @@ using System.Reflection;
 using System.Diagnostics;
 using System.Text.RegularExpressions;
 using System.Net.NetworkInformation;
+using System.Runtime.InteropServices;
 
 namespace OpenTween
 {
@@ -762,7 +763,7 @@ namespace OpenTween
             }
         }
 
-        static bool IsValidEmail(string strIn)
+        public static bool IsValidEmail(string strIn)
         {
             // Return true if strIn is in valid e-mail format.
             return Regex.IsMatch(strIn,
@@ -777,9 +778,14 @@ namespace OpenTween
         /// <returns><paramref name="keys"/> で指定された修飾キーがすべて押されている状態であれば true。それ以外であれば false。</returns>
         public static bool IsKeyDown(params Keys[] keys)
         {
-            foreach (Keys key in keys)
+            return MyCommon._IsKeyDown(Control.ModifierKeys, keys);
+        }
+
+        internal static bool _IsKeyDown(Keys modifierKeys, Keys[] targetKeys)
+        {
+            foreach (Keys key in targetKeys)
             {
-                if ((Control.ModifierKeys & key) != key)
+                if ((modifierKeys & key) != key)
                 {
                     return false;
                 }
@@ -796,9 +802,11 @@ namespace OpenTween
         /// <returns>アプリケーションのアセンブリ名</returns>
         public static string GetAssemblyName()
         {
-            return Assembly.GetEntryAssembly().GetName().Name;
+            return MyCommon.EntryAssembly.GetName().Name;
         }
 
+        internal static _Assembly EntryAssembly = Assembly.GetEntryAssembly();
+
         /// <summary>
         /// 文字列中に含まれる %AppName% をアプリケーション名に置換する
         /// </summary>
@@ -806,7 +814,18 @@ namespace OpenTween
         /// <returns>置換後の文字列</returns>
         public static string ReplaceAppName(string orig)
         {
-            return orig.Replace("%AppName%", Application.ProductName);
+            return MyCommon.ReplaceAppName(orig, Application.ProductName);
+        }
+
+        /// <summary>
+        /// 文字列中に含まれる %AppName% をアプリケーション名に置換する
+        /// </summary>
+        /// <param name="orig">対象となる文字列</param>
+        /// <param name="appname">アプリケーション名</param>
+        /// <returns>置換後の文字列</returns>
+        public static string ReplaceAppName(string orig, string appname)
+        {
+            return orig.Replace("%AppName%", appname);
         }
 
         /// <summary>