Updated spatial matcher tests and fixed the implementation.

zxcvbn-core-test/Matcher/SpatialMatcherTests.cs

@@ -0,0 +1,63 @@
+using System.Linq;
+using FluentAssertions;
+using Xunit;
+using Zxcvbn.Matcher;
+using Zxcvbn.Matcher.Matches;
+
+namespace Zxcvbn.Tests.Matcher
+{
+    public class SpatialMatcherTests
+    {
+        private readonly SpatialMatcher _matcher = new SpatialMatcher();
+
+        [Theory, InlineData(""), InlineData("/"), InlineData("qw"), InlineData("*/")]
+        public void DoesNotmatch1And2CharacterPatterns(string password)
+        {
+            var matches = _matcher.MatchPassword(password);
+
+            matches.Should().BeEmpty();
+        }
+
+        [Theory, InlineData("12345", "qwerty", 1, 0), InlineData("@WSX", "qwerty", 1, 4), InlineData("6tfGHJ", "qwerty", 2, 3), InlineData("hGFd", "qwerty", 1, 2),
+         InlineData("/;p09876yhn", "qwerty", 3, 0), InlineData("Xdr%", "qwerty", 1, 2), InlineData("159-", "keypad", 1, 0),
+         InlineData("*84", "keypad", 1, 0), InlineData("/8520", "keypad", 1, 0), InlineData("369", "keypad", 1, 0), InlineData("/963.", "mac_keypad", 1, 0),
+         InlineData("*-632.0214", "mac_keypad", 9, 0), InlineData("aoEP%yIxkjq:", "dvorak", 4, 5), InlineData(";qoaOQ:Aoq;a", "dvorak", 11, 4)]
+        public void MatchesKeyboardPattern(string pattern, string keyboard, int turns, int shifts)
+        {
+            var matches = _matcher.MatchPassword(pattern).OfType<SpatialMatch>().ToList();
+
+            matches.Should().NotBeEmpty();
+            matches.Should().ContainSingle(s => s.Graph == keyboard);
+
+            var match = matches.Single(m => m.Graph == keyboard);
+
+            match.Turns.Should().Be(turns);
+            match.ShiftedCount.Should().Be(shifts);
+            match.i.Should().Be(0);
+            match.j.Should().Be(pattern.Length - 1);
+            match.Pattern.Should().Be("spatial");
+        }
+
+        //        [Fact]
+        //        public void MultipleSequencesMultipleKeyboards()
+        //        {
+        //            var sm = new SpatialMatcher();
+
+        //            var res = sm.MatchPassword("plko14569852pyfdb").ToList();
+        //            res.Count.Should().Be(6);
+        //        }
+
+        //        [Fact]
+        //        public void SingleSequence()
+        //        {
+        //            var sm = new SpatialMatcher();
+
+        //            var res = sm.MatchPassword("qwert").ToList();
+        //            res.Count.Should().Be(1);
+
+        //            res[0].i.Should().Be(0);
+        //            res[0].j.Should().Be(4);
+        //            res[0].Token.Should().Be("qwert");
+        //        }
+    }
+}

zxcvbn-core/Matcher/SpatialMatcher.cs

@@ -85,8 +85,9 @@ private static IEnumerable<Match> SpatialMatch(SpatialGraph graph, string passwo
             var i = 0;
             while (i < password.Length - 1)
             {
-                int turns = 0, shiftedCount = 0;
-                var lastDirection = -1;
+                var turns = 0;
+                var shiftedCount = 0;
+                int? lastDirection = null;
 
                 var j = i + 1;
 
@@ -105,9 +106,13 @@ private static IEnumerable<Match> SpatialMatch(SpatialGraph graph, string passwo
                     if (j < password.Length)
                     {
                         var curChar = password[j].ToString();
-                        foreach (var adjacent in adjacents.Where(a => a != null))
+                        foreach (var adjacent in adjacents)
                         {
                             currentDirection++;
+
+                            if (adjacent == null)
+                                continue;
+
                             if (adjacent.Contains(curChar))
                             {
                                 found = true;