BrowserCookieImplementationsのテストを作成して、リファクタリング

Author: ryu-s

BrowserCookieImplementations/Firefox.cs

@@ -170,6 +170,44 @@ public static FirefoxProfile GetDefaultProfile(string moz_path, string iniFileNa
             }
             return null;
         }
+        public static List<FirefoxProfile> GetProfiles(IEnumerable<string> lines, string moz_path)
+        {
+            var list = new List<FirefoxProfile>();
+            FirefoxProfile profile = null;
+            foreach (var line in lines)
+            {
+                if (line.StartsWith("[Profile"))
+                {
+                    profile = new FirefoxProfile();
+                    list.Add(profile);
+                    continue;
+                }
+                if (profile != null)
+                {
+                    var pair = SplitByEqual(line);
+                    switch (pair.Key)
+                    {
+                        case "Name":
+                            profile.Name = pair.Value;
+                            break;
+                        case "IsRelative":
+                            profile.IsRelative = (pair.Value == "1") ? true : false;
+                            break;
+                        case "Path":
+                            profile.path = pair.Value.Replace("/", "\\");
+                            if (profile.IsRelative)
+                                profile.path = moz_path + "\\" + profile.path;
+                            break;
+                        case "Default":
+                            profile.IsDefault = (pair.Value == "1") ? true : false;
+                            break;
+                        default:
+                            break;
+                    }
+                }
+            }
+            return list;
+        }
         /// <summary>
         /// 
         /// </summary>
@@ -187,54 +225,34 @@ public static List<FirefoxProfile> GetProfiles(string moz_path, string iniFileNa
             }
             using (var sr = new System.IO.StreamReader(path, enc))
             {
-                FirefoxProfile profile = null;
-                while (!sr.EndOfStream)
-                {
-                    var line = sr.ReadLine();
-                    if (line.StartsWith("[Profile"))
-                    {
-                        profile = new FirefoxProfile();
-                        list.Add(profile);
-                    }
-                    if (profile != null)
-                    {
-                        var pair = SplitByEqual(line);
-                        switch (pair.Key)
-                        {
-                            case "Name":
-                                profile.Name = pair.Value;
-                                break;
-                            case "IsRelative":
-                                profile.IsRelative = (pair.Value == "1") ? true : false;
-                                break;
-                            case "Path":
-                                profile.path = pair.Value.Replace("/", "\\");
-                                if (profile.IsRelative)
-                                    profile.path = moz_path + "\\" + profile.path;
-                                break;
-                            case "Default":
-                                profile.IsDefault = (pair.Value == "1") ? true : false;
-                                break;
-                            default:
-                                break;
-                        }
-                    }
-                }
+                list.AddRange(GetProfiles(ReadLines(sr), moz_path));
             }
             return list;
         }
+        public static IEnumerable<string> ReadLines(System.IO.StreamReader sr)
+        {
+            while (!sr.EndOfStream)
+            {
+                yield return sr.ReadLine();
+            }
+        }
         /// <summary>
         /// 文字列を'='で2つに分割する。
         /// </summary>
         /// <param name="line"></param>
         /// <returns></returns>
-        private static KeyValuePair<string, string> SplitByEqual(string line)
+        internal static KeyValuePair<string, string> SplitByEqual(string line)
         {
             var arr = line.Split('=').Where(s => !string.IsNullOrWhiteSpace(s)).ToArray();
-            if (arr.Length == 2)
-                return new KeyValuePair<string, string>(arr[0], arr[1]);
+            if (arr.Length >= 2)
+            {
+                var pos = line.IndexOf('=');
+                return new KeyValuePair<string, string>(arr[0],line.Substring(pos+1));
+            }
             else
+            {
                 return new KeyValuePair<string, string>();
+            }
         }
     }
 }

BrowserCookieImplementations/Properties/AssemblyInfo.cs

@@ -34,3 +34,4 @@
 // [assembly: AssemblyVersion("1.0.*")]
 [assembly: AssemblyVersion("1.0.0.0")]
 [assembly: AssemblyFileVersion("1.0.0.0")]
+[assembly:InternalsVisibleTo("BrowserCookieImplementationsTests")]

BrowserCookieImplementationsTests/BrowserCookieImplementationsTests.csproj

@@ -0,0 +1,63 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
+  <PropertyGroup>
+    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
+    <ProjectGuid>{EF214EB0-699D-4CF9-9CA5-2FC49B1BEDB4}</ProjectGuid>
+    <OutputType>Library</OutputType>
+    <AppDesignerFolder>Properties</AppDesignerFolder>
+    <RootNamespace>BrowserCookieImplementationsTests</RootNamespace>
+    <AssemblyName>BrowserCookieImplementationsTests</AssemblyName>
+    <TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion>
+    <FileAlignment>512</FileAlignment>
+    <Deterministic>true</Deterministic>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+    <DebugSymbols>true</DebugSymbols>
+    <DebugType>full</DebugType>
+    <Optimize>false</Optimize>
+    <OutputPath>bin\Debug\</OutputPath>
+    <DefineConstants>DEBUG;TRACE</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+    <DebugType>pdbonly</DebugType>
+    <Optimize>true</Optimize>
+    <OutputPath>bin\Release\</OutputPath>
+    <DefineConstants>TRACE</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+  </PropertyGroup>
+  <ItemGroup>
+    <Reference Include="System" />
+    <Reference Include="System.Core" />
+    <Reference Include="System.Xml.Linq" />
+    <Reference Include="System.Data.DataSetExtensions" />
+    <Reference Include="Microsoft.CSharp" />
+    <Reference Include="System.Data" />
+    <Reference Include="System.Net.Http" />
+    <Reference Include="System.Xml" />
+  </ItemGroup>
+  <ItemGroup>
+    <Compile Include="FirefoxProfileTests.cs" />
+    <Compile Include="Tools.cs" />
+    <Content Include="SampleData\profiles.ini.txt">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
+    <Compile Include="Properties\AssemblyInfo.cs" />
+  </ItemGroup>
+  <ItemGroup>
+    <PackageReference Include="NUnit">
+      <Version>3.11.0</Version>
+    </PackageReference>
+  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\BrowserCookieImplementations\BrowserCookieImplementations.csproj">
+      <Project>{dfe01d83-bdbf-4b5c-95d5-9f1034597ede}</Project>
+      <Name>BrowserCookieImplementations</Name>
+    </ProjectReference>
+  </ItemGroup>
+  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+</Project>

BrowserCookieImplementationsTests/FirefoxProfileTests.cs

@@ -0,0 +1,39 @@
+using NUnit.Framework;
+using ryu_s.BrowserCookie.Firefox;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace BrowserCookieImplementationsTests
+{
+    [TestFixture]
+    public class FirefoxProfileTests
+    {
+        [Test]
+        public void GetProfilesTest()
+        {
+            var data = DataLoader.GetSampleData("profiles.ini.txt");
+            var lines = data.Split(new[] { Environment.NewLine }, StringSplitOptions.None);
+            var moz_path = "path";
+            var ps = FirefoxProfile.GetProfiles(lines, moz_path);
+            Assert.AreEqual(2, ps.Count);
+            Assert.AreEqual("default", ps[0].Name);
+            Assert.IsTrue(ps[0].IsRelative);
+            Assert.IsFalse(ps[0].IsDefault);
+            Assert.AreEqual("path\\Profiles\\f3ezfk6m.default", ps[0].path);
+            Assert.AreEqual("dev-edition-default", ps[1].Name);
+            Assert.IsTrue(ps[1].IsRelative);
+            Assert.IsTrue(ps[1].IsDefault);
+            Assert.AreEqual("path\\Profiles\\42522y5w.dev-edition-default-1516971409783", ps[1].path);
+        }
+        [Test]
+        public void SplitByEqualTest()
+        {
+            var a = FirefoxProfile.SplitByEqual("a=b=c");
+            Assert.AreEqual("a", a.Key);
+            Assert.AreEqual("b=c", a.Value);
+        }
+    }
+}

BrowserCookieImplementationsTests/Properties/AssemblyInfo.cs

@@ -0,0 +1,36 @@
+using System.Reflection;
+using System.Runtime.CompilerServices;
+using System.Runtime.InteropServices;
+
+// General Information about an assembly is controlled through the following
+// set of attributes. Change these attribute values to modify the information
+// associated with an assembly.
+[assembly: AssemblyTitle("BrowserCookieImplementationsTests")]
+[assembly: AssemblyDescription("")]
+[assembly: AssemblyConfiguration("")]
+[assembly: AssemblyCompany("")]
+[assembly: AssemblyProduct("BrowserCookieImplementationsTests")]
+[assembly: AssemblyCopyright("Copyright ©  2019")]
+[assembly: AssemblyTrademark("")]
+[assembly: AssemblyCulture("")]
+
+// Setting ComVisible to false makes the types in this assembly not visible
+// to COM components.  If you need to access a type in this assembly from
+// COM, set the ComVisible attribute to true on that type.
+[assembly: ComVisible(false)]
+
+// The following GUID is for the ID of the typelib if this project is exposed to COM
+[assembly: Guid("ef214eb0-699d-4cf9-9ca5-2fc49b1bedb4")]
+
+// Version information for an assembly consists of the following four values:
+//
+//      Major Version
+//      Minor Version
+//      Build Number
+//      Revision
+//
+// You can specify all the values or you can default the Build and Revision Numbers
+// by using the '*' as shown below:
+// [assembly: AssemblyVersion("1.0.*")]
+[assembly: AssemblyVersion("1.0.0.0")]
+[assembly: AssemblyFileVersion("1.0.0.0")]

BrowserCookieImplementationsTests/SampleData/profiles.ini.txt

@@ -0,0 +1,14 @@
+[General]
+StartWithLastProfile=1
+
+[Profile0]
+Name=default
+IsRelative=1
+Path=Profiles/f3ezfk6m.default
+
+[Profile1]
+Name=dev-edition-default
+IsRelative=1
+Path=Profiles/42522y5w.dev-edition-default-1516971409783
+Default=1
+

BrowserCookieImplementationsTests/Tools.cs

@@ -0,0 +1,23 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace BrowserCookieImplementationsTests
+{
+    internal static class DataLoader
+    {
+        public static string GetSampleData(string filename)
+        {
+            var path = System.IO.Path.Combine(AppDomain.CurrentDomain.BaseDirectory, @"SampleData\" + filename);
+            string sample = "";
+
+            using (var sr = new System.IO.StreamReader(path))
+            {
+                sample = sr.ReadToEnd();
+            }
+            return sample;
+        }
+    }
+}

MultiCommentViewer.sln

@@ -95,6 +95,8 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "TestSitePlugin", "TestSiteP
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "TestSiteIF", "TestSiteIF\TestSiteIF.csproj", "{FF176BCD-7F7E-4C42-9E8D-17912097B3C7}"
 EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "BrowserCookieImplementationsTests", "BrowserCookieImplementationsTests\BrowserCookieImplementationsTests.csproj", "{EF214EB0-699D-4CF9-9CA5-2FC49B1BEDB4}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -269,6 +271,10 @@ Global
 		{FF176BCD-7F7E-4C42-9E8D-17912097B3C7}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{FF176BCD-7F7E-4C42-9E8D-17912097B3C7}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{FF176BCD-7F7E-4C42-9E8D-17912097B3C7}.Release|Any CPU.Build.0 = Release|Any CPU
+		{EF214EB0-699D-4CF9-9CA5-2FC49B1BEDB4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{EF214EB0-699D-4CF9-9CA5-2FC49B1BEDB4}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{EF214EB0-699D-4CF9-9CA5-2FC49B1BEDB4}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{EF214EB0-699D-4CF9-9CA5-2FC49B1BEDB4}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE