fix #43

martinjw · Sep 1, 2020 · 1284a18 · 1284a18
1 parent 19fa0b7
commit 1284a18
Show file tree

Hide file tree

Showing 5 changed files with 95 additions and 13 deletions.
diff --git a/PublicHoliday.vsconfig b/PublicHoliday.vsconfig
@@ -0,0 +1,73 @@
+{
+  "version": "1.0",
+  "components": [
+    "Microsoft.VisualStudio.Component.CoreEditor",
+    "Microsoft.VisualStudio.Workload.CoreEditor",
+    "Microsoft.NetCore.Component.Runtime.3.1",
+    "Microsoft.NetCore.Component.SDK",
+    "Microsoft.VisualStudio.Component.NuGet",
+    "Microsoft.Net.Component.4.6.1.TargetingPack",
+    "Microsoft.VisualStudio.Component.Roslyn.Compiler",
+    "Microsoft.VisualStudio.Component.Roslyn.LanguageServices",
+    "Microsoft.VisualStudio.Component.FSharp",
+    "Microsoft.NetCore.Component.DevelopmentTools",
+    "Microsoft.VisualStudio.Component.FSharp.WebTemplates",
+    "Microsoft.VisualStudio.ComponentGroup.WebToolsExtensions",
+    "Microsoft.VisualStudio.Component.DockerTools",
+    "Microsoft.NetCore.Component.Web",
+    "Microsoft.Net.Component.4.8.SDK",
+    "Microsoft.Net.Component.4.7.2.TargetingPack",
+    "Microsoft.Net.ComponentGroup.DevelopmentPrerequisites",
+    "Microsoft.VisualStudio.Component.TypeScript.3.8",
+    "Microsoft.VisualStudio.Component.JavaScript.TypeScript",
+    "Microsoft.VisualStudio.Component.JavaScript.Diagnostics",
+    "Microsoft.Component.MSBuild",
+    "Microsoft.VisualStudio.Component.TextTemplating",
+    "Component.Microsoft.VisualStudio.RazorExtension",
+    "Microsoft.VisualStudio.Component.IISExpress",
+    "Microsoft.VisualStudio.Component.SQL.ADAL",
+    "Microsoft.VisualStudio.Component.SQL.LocalDB.Runtime",
+    "Microsoft.VisualStudio.Component.Common.Azure.Tools",
+    "Microsoft.VisualStudio.Component.SQL.CLR",
+    "Microsoft.VisualStudio.Component.MSODBC.SQL",
+    "Microsoft.VisualStudio.Component.MSSQL.CMDLnUtils",
+    "Microsoft.VisualStudio.Component.ManagedDesktop.Core",
+    "Microsoft.Net.Component.4.5.2.TargetingPack",
+    "Microsoft.Net.Component.4.5.TargetingPack",
+    "Microsoft.VisualStudio.Component.SQL.SSDT",
+    "Microsoft.VisualStudio.Component.SQL.DataSources",
+    "Component.Microsoft.Web.LibraryManager",
+    "Microsoft.VisualStudio.ComponentGroup.Web",
+    "Microsoft.VisualStudio.Component.Web",
+    "Microsoft.VisualStudio.Component.IntelliCode",
+    "Microsoft.Net.Component.4.TargetingPack",
+    "Microsoft.Net.Component.4.5.1.TargetingPack",
+    "Microsoft.Net.Component.4.6.TargetingPack",
+    "Microsoft.Net.ComponentGroup.TargetingPacks.Common",
+    "Microsoft.Net.Core.Component.SDK.2.1",
+    "Component.Microsoft.VisualStudio.Web.AzureFunctions",
+    "Microsoft.VisualStudio.ComponentGroup.AzureFunctions",
+    "Microsoft.VisualStudio.Component.Azure.Compute.Emulator",
+    "Microsoft.VisualStudio.Component.Azure.Storage.Emulator",
+    "Microsoft.VisualStudio.Component.Azure.ClientLibs",
+    "Microsoft.VisualStudio.Component.Azure.AuthoringTools",
+    "Microsoft.VisualStudio.Component.CloudExplorer",
+    "Microsoft.VisualStudio.Component.Debugger.TimeTravel",
+    "Microsoft.VisualStudio.Component.Debugger.Snapshot",
+    "Microsoft.VisualStudio.ComponentGroup.Web.CloudTools",
+    "Microsoft.VisualStudio.Component.IntelliTrace.FrontEnd",
+    "Microsoft.VisualStudio.Component.DiagnosticTools",
+    "Microsoft.VisualStudio.Component.EntityFramework",
+    "Microsoft.VisualStudio.Component.LiveUnitTesting",
+    "Microsoft.VisualStudio.Component.AspNet45",
+    "Microsoft.VisualStudio.Component.WebDeploy",
+    "Microsoft.VisualStudio.Component.Debugger.JustInTime",
+    "Microsoft.VisualStudio.Workload.NetWeb",
+    "Microsoft.VisualStudio.Component.ManagedDesktop.Prerequisites",
+    "Microsoft.ComponentGroup.Blend",
+    "Microsoft.VisualStudio.Workload.ManagedDesktop",
+    "Microsoft.Net.Component.3.5.DeveloperTools",
+    "Microsoft.VisualStudio.Component.VSSDK",
+    "Microsoft.VisualStudio.Workload.NetCoreTools"
+  ]
+}
diff --git a/src/PublicHoliday/JapanPublicHoliday.cs b/src/PublicHoliday/JapanPublicHoliday.cs
@@ -221,16 +221,21 @@ public override IList<DateTime> PublicHolidays(int year)
         /// <returns>Dictionary of bank holidays</returns>
         public override IDictionary<DateTime, string> PublicHolidayNames(int year)
         {
+            var constitutionMemorialDay = ConstitutionMemorialDay(year);
+            var greeneryDay = GreeneryDay(year);
+            if (greeneryDay == constitutionMemorialDay) greeneryDay = greeneryDay.AddMilliseconds(1);
+            var childrensDay = ChildrensDay(year);
+            if (greeneryDay == childrensDay) childrensDay = childrensDay.AddMilliseconds(1);
             var hols = new Dictionary<DateTime, string>
             {
                 { NewYear(year), "New Year" },
                 { ComingOfAgeDay(year), "Coming Of Age Day" },
                 { FoundationDay(year), "Foundation Day" },
                 { VernalEquinoxDay(year), "Vernal Equinox Day" },
                 { ShōwaDay(year), "Shōwa Day" },
-                { ConstitutionMemorialDay(year), "Constitution Memorial Day" },
-                { GreeneryDay(year), "Greenery Day" },
-                { ChildrensDay(year), "Children's Day" },
+                { constitutionMemorialDay, "Constitution Memorial Day" },
+                { greeneryDay, "Greenery Day" },
+                { childrensDay, "Children's Day" },
                 { MarineDay(year), "Marine Day" },
              };
             if (year >= 2016)

diff --git a/src/PublicHoliday/Properties/AssemblyInfo.cs b/src/PublicHoliday/Properties/AssemblyInfo.cs
@@ -32,5 +32,5 @@
 // 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("2.1.0.0")]
-[assembly: AssemblyFileVersion("2.1.0.0")]
+[assembly: AssemblyVersion("2.2.0.0")]
+[assembly: AssemblyFileVersion("2.2.0.0")]
diff --git a/src/PublicHoliday/PublicHoliday.csproj b/src/PublicHoliday/PublicHoliday.csproj
@@ -14,7 +14,8 @@
 2.0.6: IsWorkingDay added (thanks @MilkyWare)
 2.0.7: DE recent changes (thanks @janaw)
 2.0.8: Austria 2008 error (thanks @OtmarP)
-2.1.0: South Africa added (thanks @cltw666)</PackageReleaseNotes>
+2.1.0: South Africa added (thanks @cltw666)
+2.2.0: Japan 2020 error (thanks @overstimulated)</PackageReleaseNotes>
     <PackageProjectUrl>https://github.com/martinjw/Holiday</PackageProjectUrl>
     <PackageLicenseUrl>http://opensource.org/licenses/MIT</PackageLicenseUrl>
     <RepositoryType>git</RepositoryType>
@@ -28,7 +29,7 @@
     <GenerateAssemblyCopyrightAttribute>false</GenerateAssemblyCopyrightAttribute>
     <GenerateAssemblyVersionAttribute>false</GenerateAssemblyVersionAttribute>
     <GenerateAssemblyFileVersionAttribute>false</GenerateAssemblyFileVersionAttribute>
-    <Version>2.1.0</Version>
+    <Version>2.2.0</Version>
   </PropertyGroup>
   <PropertyGroup>
     <FrameworkPathOverride Condition="'$(TargetFramework)' == 'net35'">C:\Program Files (x86)\Reference Assemblies\Microsoft\Framework\.NETFramework\v3.5\Profile\Client</FrameworkPathOverride>

diff --git a/tests/PublicHolidayTests/TestJapanPublicHoliday.cs b/tests/PublicHolidayTests/TestJapanPublicHoliday.cs
@@ -33,13 +33,16 @@ public void TestHolidays2017(int month, int day, string name)
         }
 
         [TestMethod]
-        public void TestHolidays2017Lists()
+        public void TestHolidaysLists()
         {
-            var holidayCalendar = new JapanPublicHoliday();
-            var hols = holidayCalendar.PublicHolidays(2017);
-            var holNames = holidayCalendar.PublicHolidayNames(2017);
-            Assert.IsTrue(16 == hols.Count, "Should be 16 holidays in 2017");
-            Assert.IsTrue(holNames.Count == hols.Count, "Names and holiday list are same");
+            for (int year = 2017; year < 2035; year++)
+            {
+                var holidayCalendar = new JapanPublicHoliday();
+                var hols = holidayCalendar.PublicHolidays(year);
+                var holNames = holidayCalendar.PublicHolidayNames(year);
+                Assert.IsTrue(16 == hols.Count, $"Should be 16 holidays in {year}");
+                Assert.IsTrue(holNames.Count == hols.Count, "Names and holiday list are same");
+            }
         }
     }
 }