Merge branch 'develop' into stable

1 files changed, 91 insertions, 0 deletions

diff --git a/src/SMAPI.Tests/Utilities/SDateTests.cs b/src/SMAPI.Tests/Utilities/SDateTests.cs
index d25a101a..0461952e 100644
--- a/src/SMAPI.Tests/Utilities/SDateTests.cs
+++ b/src/SMAPI.Tests/Utilities/SDateTests.cs
@@ -5,6 +5,7 @@ using System.Linq;
 using System.Text.RegularExpressions;
 using NUnit.Framework;
 using StardewModdingAPI.Utilities;
+using StardewValley;
 
 namespace SMAPI.Tests.Utilities
 {
@@ -82,6 +83,62 @@ namespace SMAPI.Tests.Utilities
         }
 
         /****
+        ** FromDaysSinceStart
+        ****/
+        [Test(Description = "Assert that FromDaysSinceStart returns the expected date.")]
+        [TestCase(1, ExpectedResult = "01 spring Y1")]
+        [TestCase(2, ExpectedResult = "02 spring Y1")]
+        [TestCase(28, ExpectedResult = "28 spring Y1")]
+        [TestCase(29, ExpectedResult = "01 summer Y1")]
+        [TestCase(141, ExpectedResult = "01 summer Y2")]
+        public string FromDaysSinceStart(int daysSinceStart)
+        {
+            // act
+            return SDate.FromDaysSinceStart(daysSinceStart).ToString();
+        }
+
+        [Test(Description = "Assert that FromDaysSinceStart throws an exception if the number of days is invalid.")]
+        [TestCase(-1)] // day < 0
+        [TestCase(0)] // day == 0
+        [SuppressMessage("ReSharper", "AssignmentIsFullyDiscarded", Justification = "Deliberate for unit test.")]
+        public void FromDaysSinceStart_RejectsInvalidValues(int daysSinceStart)
+        {
+            // act & assert
+            Assert.Throws<ArgumentException>(() => _ = SDate.FromDaysSinceStart(daysSinceStart), "Passing the invalid number of days didn't throw the expected exception.");
+        }
+
+        /****
+        ** From
+        ****/
+        [Test(Description = "Assert that SDate.From constructs the correct instance for a given date.")]
+        [TestCase(0, ExpectedResult = "01 spring Y1")]
+        [TestCase(1, ExpectedResult = "02 spring Y1")]
+        [TestCase(27, ExpectedResult = "28 spring Y1")]
+        [TestCase(28, ExpectedResult = "01 summer Y1")]
+        [TestCase(140, ExpectedResult = "01 summer Y2")]
+        public string From_WorldDate(int totalDays)
+        {
+            return SDate.From(new WorldDate { TotalDays = totalDays }).ToString();
+        }
+
+
+        /****
+        ** SeasonIndex
+        ****/
+        [Test(Description = "Assert the numeric index of the season.")]
+        [TestCase("01 spring Y1", ExpectedResult = 0)]
+        [TestCase("02 summer Y1", ExpectedResult = 1)]
+        [TestCase("28 fall Y1", ExpectedResult = 2)]
+        [TestCase("01 winter Y1", ExpectedResult = 3)]
+        [TestCase("01 winter Y2", ExpectedResult = 3)]
+        public int SeasonIndex(string dateStr)
+        {
+            // act
+            return this.GetDate(dateStr).SeasonIndex;
+        }
+
+
+        /****
         ** DayOfWeek
         ****/
         [Test(Description = "Assert the day of week.")]
@@ -119,6 +176,7 @@ namespace SMAPI.Tests.Utilities
             return this.GetDate(dateStr).DayOfWeek;
         }
 
+
         /****
         ** DaysSinceStart
         ****/
@@ -134,6 +192,7 @@ namespace SMAPI.Tests.Utilities
             return this.GetDate(dateStr).DaysSinceStart;
         }
 
+
         /****
         ** ToString
         ****/
@@ -147,6 +206,7 @@ namespace SMAPI.Tests.Utilities
             return this.GetDate(dateStr).ToString();
         }
 
+
         /****
         ** AddDays
         ****/
@@ -166,6 +226,18 @@ namespace SMAPI.Tests.Utilities
             return this.GetDate(dateStr).AddDays(addDays).ToString();
         }
 
+        [Test(Description = "Assert that AddDays throws an exception if the number of days is invalid.")]
+        [TestCase("01 spring Y1", -1)]
+        [TestCase("01 summer Y1", -29)]
+        [TestCase("01 spring Y2", -113)]
+        [SuppressMessage("ReSharper", "AssignmentIsFullyDiscarded", Justification = "Deliberate for unit test.")]
+        public void AddDays_RejectsInvalidValues(string dateStr, int addDays)
+        {
+            // act & assert
+            Assert.Throws<ArithmeticException>(() => _ = this.GetDate(dateStr).AddDays(addDays), "Passing the invalid number of days didn't throw the expected exception.");
+        }
+
+
         /****
         ** GetHashCode
         ****/
@@ -194,6 +266,25 @@ namespace SMAPI.Tests.Utilities
             }
         }
 
+
+        /****
+        ** ToWorldDate
+        ****/
+        [Test(Description = "Assert that the WorldDate operator returns the corresponding WorldDate.")]
+        [TestCase("01 spring Y1", ExpectedResult = 0)]
+        [TestCase("02 spring Y1", ExpectedResult = 1)]
+        [TestCase("28 spring Y1", ExpectedResult = 27)]
+        [TestCase("01 summer Y1", ExpectedResult = 28)]
+        [TestCase("01 summer Y2", ExpectedResult = 140)]
+        public int ToWorldDate(string dateStr)
+        {
+            return this.GetDate(dateStr).ToWorldDate().TotalDays;
+        }
+
+
+        /****
+        ** Operators
+        ****/
         [Test(Description = "Assert that the == operator returns the expected values. We only need a few test cases, since it's based on GetHashCode which is tested more thoroughly.")]
         [TestCase(Dates.Now, null, ExpectedResult = false)]
         [TestCase(Dates.Now, Dates.PrevDay, ExpectedResult = false)]