added tests, added code to allow regex rule to handle null values. ad…

…ded logging in case of number parse error.
MikePohatu · Apr 17, 2017 · 969fe88 · 969fe88
1 parent 0bc88ab
commit 969fe88
Show file tree

Hide file tree

Showing 3 changed files with 23 additions and 4 deletions.
diff --git a/TsGui.Tests/Validation/MatchingRuleTests.cs b/TsGui.Tests/Validation/MatchingRuleTests.cs
@@ -43,8 +43,14 @@ class MatchingRuleTests
         [TestCase(null, "*NULL", "Equals", false, ExpectedResult = true)]
         [TestCase(null, "", "Equals", false, ExpectedResult = false)]
         [TestCase(null, "Test", "StartsWith", false, ExpectedResult = false)]
+        [TestCase(null, "Test", "Characters", false, ExpectedResult = false)]
         [TestCase(null, "Test", "EndsWith", false, ExpectedResult = false)]
         [TestCase(null, "Test", "Contains", false, ExpectedResult = false)]
+        [TestCase(null, "0", "GreaterThan", false, ExpectedResult = false)]
+        [TestCase(null, "0", "LessThan", false, ExpectedResult = false)]
+        [TestCase(null, "0", "GreaterThanOrEqualTo", false, ExpectedResult = false)]
+        [TestCase(null, "0", "LessThanOrEqualTo", false, ExpectedResult = false)]
+        [TestCase(null, "^[a-z0-9_-]{6,18}$", "RegEx", false, ExpectedResult = false)]
         public bool RuleTest(string TestString, string RuleString, string SearchType, bool CaseSensitive)
         {
             XElement xrule = new XElement("Rule", RuleString);

diff --git a/TsGui/Validation/StringMatching/BaseNumberMatchingRule.cs b/TsGui/Validation/StringMatching/BaseNumberMatchingRule.cs
@@ -13,7 +13,9 @@
 //    with this program; if not, write to the Free Software Foundation, Inc.,
 //    51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 
+using System;
 using System.Xml.Linq;
+using TsGui.Diagnostics.Logging;
 
 namespace TsGui.Validation.StringMatching
 {
@@ -26,8 +28,16 @@ public bool DoesMatch(string input)
             double inputnum;
             double rulenum;
 
-            if (!double.TryParse(input, out inputnum)) { return false; }
-            if (!double.TryParse(this.Content, out rulenum)) { return false; }
+            if (!double.TryParse(input, out inputnum))
+            {
+                LoggerFacade.Warn("Failed to convert input to number: " + input);
+                return false;
+            }
+            if (!double.TryParse(this.Content, out rulenum))
+            {
+                LoggerFacade.Warn("Failed to convert rule content to number: " + this.Content);
+                return false;
+            }
 
             return this.Compare(inputnum, rulenum);
         }

diff --git a/TsGui/Validation/StringMatching/RegEx.cs b/TsGui/Validation/StringMatching/RegEx.cs
@@ -28,10 +28,13 @@ public RegEx(XElement inputxml) : base(inputxml) { }
 
         public bool DoesMatch(string input)
         {
+            string s;
+            if (input == null) { s = string.Empty; }
+            else { s = input; }
             try
             {
-                if (this.IsCaseSensitive == true) { return Regex.IsMatch(input, this.Content); }
-                else { return Regex.IsMatch(input, this.Content, RegexOptions.IgnoreCase); }
+                if (this.IsCaseSensitive == true) { return Regex.IsMatch(s, this.Content); }
+                else { return Regex.IsMatch(s, this.Content, RegexOptions.IgnoreCase); }
             }
             catch (Exception e) { throw new TsGuiKnownException("Error processing RegEx: " + this.Content, e.Message); }
         }