optimize validate logic

nager · Jan 14, 2025 · d712b46 · d712b46
1 parent 9fd3b95
commit d712b46
Show file tree

Hide file tree

Showing 8 changed files with 237 additions and 14 deletions.
diff --git a/src/Nager.EmailAuthentication.UnitTest/DmarcRecordParserTests/BasicTest.cs b/src/Nager.EmailAuthentication.UnitTest/DmarcRecordParserTests/BasicTest.cs
@@ -7,6 +7,7 @@ public sealed class BasicTest
         public void TryParse_InvalidDmarcString1_ReturnsTrueAndPopulatesDmarcRecord()
         {
             var isSuccessful = DmarcRecordParser.TryParse("v=DMARC", out var dmarcDataFragment, out var parseErrors);
+
             Assert.IsTrue(isSuccessful);
             Assert.IsNotNull(dmarcDataFragment);
             Assert.IsNotNull(parseErrors, "ParseErrors is null");
@@ -16,6 +17,7 @@ public void TryParse_InvalidDmarcString1_ReturnsTrueAndPopulatesDmarcRecord()
         public void TryParse_InvalidDmarcString2_ReturnsTrueAndPopulatesDmarcRecord()
         {
             var isSuccessful = DmarcRecordParser.TryParse("v=DMARC1", out var dmarcDataFragment, out var parseErrors);
+
             Assert.IsTrue(isSuccessful);
             Assert.IsNotNull(dmarcDataFragment);
             Assert.IsNull(parseErrors, "ParseErrors is not null");
@@ -25,6 +27,7 @@ public void TryParse_InvalidDmarcString2_ReturnsTrueAndPopulatesDmarcRecord()
         public void TryParse_CorruptDmarcString1_ReturnsTrueAndParseErrors()
         {
             var isSuccessful = DmarcRecordParser.TryParse("verification=123456789", out var dmarcDataFragment, out var parseErrors);
+
             Assert.IsTrue(isSuccessful);
             Assert.IsNotNull(dmarcDataFragment);
             Assert.IsNotNull(parseErrors, "ParseErrors is null");
@@ -35,6 +38,7 @@ public void TryParse_CorruptDmarcString1_ReturnsTrueAndParseErrors()
         public void TryParse_CorruptDmarcString2_ReturnsFalse()
         {
             var isSuccessful = DmarcRecordParser.TryParse(" ", out var dmarcDataFragment, out var parseErrors);
+
             Assert.IsFalse(isSuccessful);
             Assert.IsNull(dmarcDataFragment);
             Assert.IsNull(parseErrors, "ParseErrors is not null");

diff --git a/src/Nager.EmailAuthentication.UnitTest/DmarcRecordParserTests/ComplexTest.cs b/src/Nager.EmailAuthentication.UnitTest/DmarcRecordParserTests/ComplexTest.cs
@@ -7,6 +7,7 @@ public sealed class ComplexTest
         public void TryParse_ValidDmarcString1_ReturnsTrueAndPopulatesDmarcRecord()
         {
             var isSuccessful = DmarcRecordParser.TryParse("v=DMARC1; p=reject; rua=mailto:[email protected], mailto:[email protected]; pct=100; adkim=s; aspf=s", out var dmarcDataFragment, out var parseErrors);
+
             Assert.IsTrue(isSuccessful);
             Assert.IsNotNull(dmarcDataFragment);
             Assert.AreEqual("reject", dmarcDataFragment.DomainPolicy);

diff --git a/src/Nager.EmailAuthentication.UnitTest/DmarcRecordParserTests/FailureReportingOptionsTest.cs b/src/Nager.EmailAuthentication.UnitTest/DmarcRecordParserTests/FailureReportingOptionsTest.cs
@@ -7,31 +7,38 @@ public sealed class FailureReportingOptionsTest
         [DataRow("1")]
         [DataRow("d")]
         [DataRow("s")]
+        [DataRow("s:d")]
+        [DataRow("s:d:1")]
         [DataTestMethod]
         public void TryParse_ValidDmarcString1_ReturnsTrueAndPopulatesDmarcRecord(string failureReportingOptions)
         {
             var isSuccessful = DmarcRecordParser.TryParse($"v=DMARC1; p=reject; fo={failureReportingOptions}", out var dmarcDataFragment, out var parseErrors);
+
             Assert.IsTrue(isSuccessful);
             Assert.IsNotNull(dmarcDataFragment);
             Assert.AreEqual("reject", dmarcDataFragment.DomainPolicy);
             Assert.AreEqual(failureReportingOptions, dmarcDataFragment.FailureReportingOptions);
-            Assert.IsNull(parseErrors, "ParseErrors is not null");
+            Assert.IsNotNull(parseErrors, "ParseErrors is null");
+            Assert.IsTrue(parseErrors.Length == 1);
         }
 
-        [DataRow("a")]
-        [DataRow("b")]
-        [DataRow("8")]
-        [DataRow("9")]
+        [DataRow("a", 2)]
+        [DataRow("b", 2)]
+        [DataRow("8", 2)]
+        [DataRow("9", 2)]
+        [DataRow("wrong", 2)]
+        [DataRow("s:x:dd", 3)]
         [DataTestMethod]
-        public void TryParse_InvalidDmarcString1_ReturnsTrueAndPopulatesDmarcRecordWithParseErrors(string failureReportingOptions)
+        public void TryParse_InvalidDmarcString1_ReturnsTrueAndPopulatesDmarcRecordWithParseErrors(string failureReportingOptions, int parseErrorCount)
         {
             var isSuccessful = DmarcRecordParser.TryParse($"v=DMARC1; p=reject; fo={failureReportingOptions}", out var dmarcDataFragment, out var parseErrors);
+
             Assert.IsTrue(isSuccessful);
             Assert.IsNotNull(dmarcDataFragment);
             Assert.AreEqual("reject", dmarcDataFragment.DomainPolicy);
             Assert.AreEqual(failureReportingOptions, dmarcDataFragment.FailureReportingOptions);
             Assert.IsNotNull(parseErrors, "ParseErrors is null");
-            Assert.IsTrue(parseErrors.Length == 1);
+            Assert.IsTrue(parseErrors.Length == parseErrorCount);
         }
     }
 }
diff --git a/src/Nager.EmailAuthentication.UnitTest/DmarcRecordParserTests/PolicyPercentageTest.cs b/src/Nager.EmailAuthentication.UnitTest/DmarcRecordParserTests/PolicyPercentageTest.cs
@@ -7,6 +7,7 @@ public sealed class PolicyPercentageTest
         public void TryParse_ValidDmarcString1_ReturnsTrueAndPopulatesDmarcRecord()
         {
             var isSuccessful = DmarcRecordParser.TryParse("v=DMARC1; p=reject; pct=60;", out var dmarcDataFragment, out var parseErrors);
+
             Assert.IsTrue(isSuccessful);
             Assert.IsNotNull(dmarcDataFragment);
             Assert.AreEqual("reject", dmarcDataFragment.DomainPolicy);
@@ -18,22 +19,26 @@ public void TryParse_ValidDmarcString1_ReturnsTrueAndPopulatesDmarcRecord()
         public void TryParse_InvalidDmarcString1_ReturnsTrueWithErrors()
         {
             var isSuccessful = DmarcRecordParser.TryParse("v=DMARC1; p=reject; pct=;", out var dmarcDataFragment, out var parseErrors);
+
             Assert.IsTrue(isSuccessful);
             Assert.IsNotNull(dmarcDataFragment);
             Assert.AreEqual("reject", dmarcDataFragment.DomainPolicy);
             Assert.AreEqual("", dmarcDataFragment.PolicyPercentage);
             Assert.IsNotNull(parseErrors, "ParseErrors is null");
+            Assert.IsTrue(parseErrors.Length == 1);
         }
 
         [TestMethod]
         public void TryParse_InvalidDmarcString2_ReturnsTrueWithErrors()
         {
             var isSuccessful = DmarcRecordParser.TryParse("v=DMARC1; p=reject; pct=200;", out var dmarcDataFragment, out var parseErrors);
+
             Assert.IsTrue(isSuccessful);
             Assert.IsNotNull(dmarcDataFragment);
             Assert.AreEqual("reject", dmarcDataFragment.DomainPolicy);
             Assert.AreEqual("200", dmarcDataFragment.PolicyPercentage);
             Assert.IsNotNull(parseErrors, "ParseErrors is null");
+            Assert.IsTrue(parseErrors.Length == 1);
         }
     }
 }
diff --git a/src/Nager.EmailAuthentication.UnitTest/DmarcRecordParserTests/PolicyTest.cs b/src/Nager.EmailAuthentication.UnitTest/DmarcRecordParserTests/PolicyTest.cs
@@ -7,6 +7,7 @@ public sealed class PolicyTest
         public void TryParse_InvalidDmarcString1_ReturnsTrueAndPopulatesDmarcRecord()
         {
             var isSuccessful = DmarcRecordParser.TryParse("v=DMARC1; p=Test", out var dmarcDataFragment, out var parseErrors);
+
             Assert.IsTrue(isSuccessful);
             Assert.IsNotNull(dmarcDataFragment);
             Assert.AreEqual("Test", dmarcDataFragment.DomainPolicy);
@@ -18,6 +19,7 @@ public void TryParse_InvalidDmarcString1_ReturnsTrueAndPopulatesDmarcRecord()
         public void TryParse_InvalidDmarcString2_ReturnsTrueAndPopulatesDmarcRecord()
         {
             var isSuccessful = DmarcRecordParser.TryParse("v=DMARC1; p=Test;", out var dmarcDataFragment, out var parseErrors);
+
             Assert.IsTrue(isSuccessful);
             Assert.IsNotNull(dmarcDataFragment);
             Assert.AreEqual("Test", dmarcDataFragment.DomainPolicy);
@@ -29,6 +31,7 @@ public void TryParse_InvalidDmarcString2_ReturnsTrueAndPopulatesDmarcRecord()
         public void TryParse_ValidDmarcString1_ReturnsTrueAndPopulatesDmarcRecord()
         {
             var isSuccessful = DmarcRecordParser.TryParse("v=DMARC1; p=reject;", out var dmarcDataFragment, out var parseErrors);
+
             Assert.IsTrue(isSuccessful);
             Assert.IsNotNull(dmarcDataFragment);
             Assert.AreEqual("reject", dmarcDataFragment.DomainPolicy);

diff --git a/src/Nager.EmailAuthentication.UnitTest/DmarcRecordParserTests/ReportFormatTest.cs b/src/Nager.EmailAuthentication.UnitTest/DmarcRecordParserTests/ReportFormatTest.cs
@@ -7,17 +7,20 @@ public sealed class ReportFormatTest
         public void TryParse_ValidDmarcString1_ReturnsTrueAndPopulatesDmarcRecord()
         {
             var isSuccessful = DmarcRecordParser.TryParse("v=DMARC1; p=reject; rf=afrf", out var dmarcDataFragment, out var parseErrors);
+
             Assert.IsTrue(isSuccessful);
             Assert.IsNotNull(dmarcDataFragment);
             Assert.AreEqual("reject", dmarcDataFragment.DomainPolicy);
             Assert.AreEqual("afrf", dmarcDataFragment.ReportFormat);
-            Assert.IsNull(parseErrors, "ParseErrors is not null");
+            Assert.IsNotNull(parseErrors, "ParseErrors is null");
+            Assert.IsTrue(parseErrors.Length == 1);
         }
 
         [TestMethod]
         public void TryParse_InvalidDmarcString1_ReturnsTrueAndPopulatesDmarcRecordWithParseErrors()
         {
             var isSuccessful = DmarcRecordParser.TryParse("v=DMARC1; p=reject; rf=afrf1", out var dmarcDataFragment, out var parseErrors);
+
             Assert.IsTrue(isSuccessful);
             Assert.IsNotNull(dmarcDataFragment);
             Assert.AreEqual("reject", dmarcDataFragment.DomainPolicy);
@@ -30,6 +33,7 @@ public void TryParse_InvalidDmarcString1_ReturnsTrueAndPopulatesDmarcRecordWithP
         public void TryParse_InvalidDmarcString2_ReturnsTrueAndPopulatesDmarcRecordWithParseErrors()
         {
             var isSuccessful = DmarcRecordParser.TryParse("v=DMARC1; p=reject; rf=", out var dmarcDataFragment, out var parseErrors);
+
             Assert.IsTrue(isSuccessful);
             Assert.IsNotNull(dmarcDataFragment);
             Assert.AreEqual("reject", dmarcDataFragment.DomainPolicy);

diff --git a/src/Nager.EmailAuthentication.UnitTest/DmarcRecordParserTests/ReportingIntervalTest.cs b/src/Nager.EmailAuthentication.UnitTest/DmarcRecordParserTests/ReportingIntervalTest.cs
@@ -0,0 +1,57 @@
+namespace Nager.EmailAuthentication.UnitTest.DmarcRecordParserTests
+{
+    [TestClass]
+    public sealed class ReportingIntervalTest
+    {
+        [TestMethod]
+        public void TryParse_ValidDmarcString1_ReturnsTrueAndPopulatesDmarcRecord()
+        {
+            var isSuccessful = DmarcRecordParser.TryParse("v=DMARC1; p=reject; ri=86400;", out var dmarcDataFragment, out var parseErrors);
+
+            Assert.IsTrue(isSuccessful);
+            Assert.IsNotNull(dmarcDataFragment);
+            Assert.AreEqual("reject", dmarcDataFragment.DomainPolicy);
+            Assert.AreEqual("86400", dmarcDataFragment.ReportingInterval);
+            Assert.IsNull(parseErrors, "ParseErrors is not null");
+        }
+
+        [TestMethod]
+        public void TryParse_InvalidDmarcString1_ReturnsTrueWithErrors()
+        {
+            var isSuccessful = DmarcRecordParser.TryParse("v=DMARC1; p=reject; ri=1000;", out var dmarcDataFragment, out var parseErrors);
+
+            Assert.IsTrue(isSuccessful);
+            Assert.IsNotNull(dmarcDataFragment);
+            Assert.AreEqual("reject", dmarcDataFragment.DomainPolicy);
+            Assert.AreEqual("1000", dmarcDataFragment.ReportingInterval);
+            Assert.IsNotNull(parseErrors, "ParseErrors is null");
+            Assert.IsTrue(parseErrors.Length == 1);
+        }
+
+        [TestMethod]
+        public void TryParse_InvalidDmarcString2_ReturnsTrueWithErrors()
+        {
+            var isSuccessful = DmarcRecordParser.TryParse("v=DMARC1; p=reject; ri=1000000;", out var dmarcDataFragment, out var parseErrors);
+
+            Assert.IsTrue(isSuccessful);
+            Assert.IsNotNull(dmarcDataFragment);
+            Assert.AreEqual("reject", dmarcDataFragment.DomainPolicy);
+            Assert.AreEqual("1000000", dmarcDataFragment.ReportingInterval);
+            Assert.IsNotNull(parseErrors, "ParseErrors is null");
+            Assert.IsTrue(parseErrors.Length == 1);
+        }
+
+        [TestMethod]
+        public void TryParse_InvalidDmarcString3_ReturnsTrueWithErrors()
+        {
+            var isSuccessful = DmarcRecordParser.TryParse("v=DMARC1; p=reject; ri=-1000000;", out var dmarcDataFragment, out var parseErrors);
+
+            Assert.IsTrue(isSuccessful);
+            Assert.IsNotNull(dmarcDataFragment);
+            Assert.AreEqual("reject", dmarcDataFragment.DomainPolicy);
+            Assert.AreEqual("-1000000", dmarcDataFragment.ReportingInterval);
+            Assert.IsNotNull(parseErrors, "ParseErrors is null");
+            Assert.IsTrue(parseErrors.Length == 1);
+        }
+    }
+}