From 587d60495e01b1bdacc31acc7e15a87d7f441839 Mon Sep 17 00:00:00 2001
From: Jesse Plamondon-Willard <Pathoschild@users.noreply.github.com>
Date: Wed, 20 Jan 2021 01:02:49 -0500
Subject: add unit tests for KeybindList (#744)

---
 src/SMAPI/Utilities/Keybind.cs     | 10 +++++++++-
 src/SMAPI/Utilities/KeybindList.cs |  2 +-
 2 files changed, 10 insertions(+), 2 deletions(-)

(limited to 'src/SMAPI/Utilities')

diff --git a/src/SMAPI/Utilities/Keybind.cs b/src/SMAPI/Utilities/Keybind.cs
index 9d6cd6ee..dd8d2861 100644
--- a/src/SMAPI/Utilities/Keybind.cs
+++ b/src/SMAPI/Utilities/Keybind.cs
@@ -9,6 +9,14 @@ namespace StardewModdingAPI.Utilities
     /// <remarks>NOTE: this is part of <see cref="KeybindList"/>, and usually shouldn't be used directly.</remarks>
     public class Keybind
     {
+        /*********
+        ** Fields
+        *********/
+        /// <summary>Get the current input state for a button.</summary>
+        [Obsolete("This property should only be used for unit tests.")]
+        internal Func<SButton, SButtonState> GetButtonState { get; set; } = SGame.GetInputState;
+
+
         /*********
         ** Accessors
         *********/
@@ -97,7 +105,7 @@ namespace StardewModdingAPI.Utilities
         /// <summary>Get the keybind state relative to the previous tick.</summary>
         public SButtonState GetState()
         {
-            SButtonState[] states = this.Buttons.Select(SGame.GetInputState).Distinct().ToArray();
+            SButtonState[] states = this.Buttons.Select(this.GetButtonState).Distinct().ToArray();
 
             // single state
             if (states.Length == 1)
diff --git a/src/SMAPI/Utilities/KeybindList.cs b/src/SMAPI/Utilities/KeybindList.cs
index 4ae66ab7..1845285a 100644
--- a/src/SMAPI/Utilities/KeybindList.cs
+++ b/src/SMAPI/Utilities/KeybindList.cs
@@ -72,7 +72,7 @@ namespace StardewModdingAPI.Utilities
             if (rawErrors.Any())
             {
                 parsed = null;
-                errors = rawErrors.ToArray();
+                errors = rawErrors.Distinct().ToArray();
                 return false;
             }
             else
-- 
cgit