Fix #27 - AU NSW 2016. Boxing Day shifted by weekend

martinjw · Apr 28, 2018 · d9c3346 · d9c3346
1 parent 1d87460
commit d9c3346
Show file tree

Hide file tree

Showing 4 changed files with 24 additions and 5 deletions.
diff --git a/src/PublicHoliday/AustraliaPublicHoliday.cs b/src/PublicHoliday/AustraliaPublicHoliday.cs
@@ -290,7 +290,15 @@ public static DateTime Christmas(int year)
         /// <returns></returns>
         public static DateTime BoxingDay(int year)
         {
-            return HolidayCalculator.FixWeekend(new DateTime(year, 12, 26));
+            DateTime hol = new DateTime(year, 12, 26);
+            //if Xmas=Sun, it's shifted to Mon and 26 also gets shifted
+            bool isSundayOrMonday =
+                hol.DayOfWeek == DayOfWeek.Sunday ||
+                hol.DayOfWeek == DayOfWeek.Monday;
+            hol = HolidayCalculator.FixWeekend(hol);
+            if (isSundayOrMonday)
+                hol = hol.AddDays(1);
+            return hol;
         }
 
         #endregion Individual Holidays

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.0.1.0")]
-[assembly: AssemblyFileVersion("2.0.1.0")]
+[assembly: AssemblyVersion("2.0.2.0")]
+[assembly: AssemblyFileVersion("2.0.2.0")]
diff --git a/src/PublicHoliday/PublicHoliday.csproj b/src/PublicHoliday/PublicHoliday.csproj
@@ -7,7 +7,7 @@
     <AssemblyName>PublicHoliday</AssemblyName>
     <PackageId>PublicHoliday</PackageId>
     <PackageTags>Holiday</PackageTags>
-    <PackageReleaseNotes>2.0.1: Fix for US Thanksgiving (thanks @yschiller)</PackageReleaseNotes>
+    <PackageReleaseNotes>2.0.2: Fix for AU-NSW-2016 (thanks @dotnetshadow)</PackageReleaseNotes>
     <PackageProjectUrl>https://github.com/martinjw/Holiday</PackageProjectUrl>
     <PackageLicenseUrl>http://opensource.org/licenses/MIT</PackageLicenseUrl>
     <RepositoryType>git</RepositoryType>
@@ -21,7 +21,7 @@
     <GenerateAssemblyCopyrightAttribute>false</GenerateAssemblyCopyrightAttribute>
     <GenerateAssemblyVersionAttribute>false</GenerateAssemblyVersionAttribute>
     <GenerateAssemblyFileVersionAttribute>false</GenerateAssemblyFileVersionAttribute>
-    <Version>2.0.1</Version>
+    <Version>2.0.2</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/TestAustraliaPublicHoliday.cs b/tests/PublicHolidayTests/TestAustraliaPublicHoliday.cs
@@ -160,5 +160,16 @@ public void TestWesternAustralia2017(int month, int day, string name)
             var actual = holidayCalendar.IsPublicHoliday(holiday);
             Assert.IsTrue(actual, $"{holiday.ToString("D")} is not a holiday - should be {name}");
         }
+
+
+        [TestMethod]
+        public void TestAustralianNSW2016Lists()
+        {
+            var holidayCalendar = new AustraliaPublicHoliday { State = AustraliaPublicHoliday.States.NSW };
+            var hols = holidayCalendar.PublicHolidays(2016);
+            var holNames = holidayCalendar.PublicHolidayNames(2016);
+            Assert.IsTrue(9 == hols.Count, "Should be 9 holidays in 2016");
+            Assert.IsTrue(holNames.Count == hols.Count, "Names and holiday list are same");
+        }
     }
 }