Made the tests more reliable.

trichards57 · Oct 28, 2020 · 865a68f · 865a68f
1 parent 20348eb
commit 865a68f
Show file tree

Hide file tree

Showing 8 changed files with 990 additions and 7 deletions.
diff --git a/zxcvbn-core-test/GlobalSuppressions.cs b/zxcvbn-core-test/GlobalSuppressions.cs
@@ -4,6 +4,7 @@
 // a specific target and scoped to a namespace, type, member, etc.
 
 using System.Diagnostics.CodeAnalysis;
+using Xunit;
 
 [assembly: SuppressMessage("StyleCop.CSharp.ReadabilityRules", "SA1101:Prefix local calls with this", Justification = "To match this project's coding style.")]
 [assembly: SuppressMessage("StyleCop.CSharp.OrderingRules", "SA1200:Using directives should be placed correctly", Justification = "To match this project's coding style.")]
@@ -12,3 +13,4 @@
 [assembly: SuppressMessage("StyleCop.CSharp.OrderingRules", "SA1208:System using directives should be placed before other using directives", Justification = "Using CodeMaid for this task.")]
 [assembly: SuppressMessage("StyleCop.CSharp.DocumentationRules", "SA1600:Elements should be documented", Justification = "This isn't actually publicly released.")]
 [assembly: SuppressMessage("StyleCop.CSharp.DocumentationRules", "SA1633:File should have header", Justification = "No header required.")]
+[assembly: CollectionBehavior(DisableTestParallelization = true)]
diff --git a/zxcvbn-core-test/Matcher/SpatialMatcherTests.cs b/zxcvbn-core-test/Matcher/SpatialMatcherTests.cs
@@ -59,11 +59,9 @@ public void MatchesGeneralPattern(string pattern, string keyboard, int turns, in
         public void MatchesSpatialPatternSurroundedByNonSpatialPatterns()
         {
             var matcher = new SpatialMatcher();
-            SpatialMatcher.SpatialGraphs = SpatialMatcher.SpatialGraphs.Where(g => g.Name == "qwerty").ToList().AsReadOnly();
-
             var pattern = "6tfGHJ";
             var password = $"rz!{pattern}%z";
-            var result = matcher.MatchPassword(password).OfType<SpatialMatch>().ToList();
+            var result = matcher.MatchPassword(password).OfType<SpatialMatch>().Where(m => m.Graph == "qwerty").ToList();
 
             var expected = new[]
             {

diff --git a/zxcvbn-core/FeedbackItem.cs b/zxcvbn-core/FeedbackItem.cs
@@ -13,7 +13,7 @@ public class FeedbackItem
         public IList<string> Suggestions { get; internal set; }
 
         /// <summary>
-        /// Gets or sets the warning that should be the headline for the user.
+        /// Gets the warning that should be the headline for the user.
         /// </summary>
         public string Warning { get; internal set; }
     }

diff --git a/zxcvbn-core/Matcher/DateMatcher.cs b/zxcvbn-core/Matcher/DateMatcher.cs
@@ -23,7 +23,6 @@ namespace Zxcvbn.Matcher
     ///
     /// This isn't true date parsing.  Invalid dates like 31 February will be allowed.
     /// </remarks>
-    /// </summary>
     internal class DateMatcher : IMatcher
     {
         private const int MaxYear = 2050;

diff --git a/zxcvbn-core/Matcher/Matches/DateMatch.cs b/zxcvbn-core/Matcher/Matches/DateMatch.cs
@@ -16,6 +16,9 @@ public class DateMatch : Match
         /// </summary>
         public int Month { get; internal set; }
 
+        /// <summary>
+        /// Gets the name of the pattern matcher used to generate this match.
+        /// </summary>
         public override string Pattern => "date";
 
         /// <summary>

diff --git a/zxcvbn-core/Matcher/SpatialMatcher.cs b/zxcvbn-core/Matcher/SpatialMatcher.cs
@@ -15,9 +15,9 @@ internal class SpatialMatcher : IMatcher
         private const string ShiftedRegex = "[~!@#$%^&*()_+QWERTYUIOP{}|ASDFGHJKL:\"ZXCVBNM<>?]";
 
         /// <summary>
-        /// Gets or sets the spatial graphs to match against.
+        /// Gets the spatial graphs to match against.
         /// </summary>
-        internal static ReadOnlyCollection<SpatialGraph> SpatialGraphs { get; set; } = GenerateSpatialGraphs();
+        internal static ReadOnlyCollection<SpatialGraph> SpatialGraphs { get; } = GenerateSpatialGraphs();
 
         /// <summary>
         /// Find spatial matches in <paramref name="password"/>.

diff --git a/zxcvbn-core/zxcvbn-core.csproj b/zxcvbn-core/zxcvbn-core.csproj
@@ -23,6 +23,10 @@
     <RootNamespace>Zxcvbn</RootNamespace>
   </PropertyGroup>
 
+  <PropertyGroup Condition="'$(Configuration)|$(TargetFramework)|$(Platform)'=='Release|netstandard2.0|AnyCPU'">
+    <DocumentationFile>C:\Users\trich\Source\Repos\trichards57\zxcvbn-cs\zxcvbn-core\zxcvbn-core.xml</DocumentationFile>
+  </PropertyGroup>
+
   <ItemGroup>
     <EmbeddedResource Include="Dictionaries\*.lst" Exclude="bin\**;obj\**;**\*.xproj;packages\**;@(EmbeddedResource)" />
   </ItemGroup>