Unit test fixes ahead of .net Standard merge

Author: b-levitt

Principle4.DryLogic.Tests/Employee.cs

@@ -163,7 +163,7 @@ internal static readonly PropertyDefinition<Boolean> IsPresidentProperty
 		  .IsRequired()
 		  .IsConvertable()
 		  .IsAdhearingTo(oi => oi.GetValue(IsPresidentProperty) == false)
-			.When(oi => BirthDateProperty[oi].AddYears(40) >= DateTime.Today)
+			.When(oi => BirthDateProperty[oi].AddYears(40) > DateTime.Today)
 			.WithMessage("{0} cannot be true if the employee is not yet 40")
 			.IdentifiedBy("PRES40");
 			//New idea:  I've started TypedPropertyRuleBuilder<T>
@@ -254,13 +254,14 @@ public void MakeValid()
 			HireDate = DateTime.Today;
 			BirthDate = DateTime.Today.AddYears(-25);
 			LastName = "Levitt";
+			FirstName = "Brandon";
+			Score = 0;
 		}
 		public void MakeValidForPresident()
 		{
 			MakeValid();
 			BirthDate = DateTime.Today.AddYears(-40);
 			IsPresident = true;
-
 		}
 
 

Principle4.DryLogic.Tests/EmployeeTests.cs

@@ -86,15 +86,6 @@ public void HireDateShouldBeAValidDate()
             Assert.That(violatedRule.AppliedRule is DBV.TypeConvertableRule, "Employee should not be valid since hire date cannot be converted to an datetime.");
         }
 
-        [Test]
-        public void NeedsAScore()
-        {
-            Employee.MakeValidForPresident();
-            var violatedRule = Employee.ScoreProperty.GetFirstRuleViolation(Employee.OI);
-            Assert.That(Employee.Score == null);
-
-        }
-
 		[Test]
 
         public void PropertyChanged()
@@ -125,13 +116,13 @@ public void PropertyChanged()
         [Test]
         public void TestConditionalRule_IsPresident()
         {
-            Employee.MakeValid();
-            Assert.That(Employee.OI.Validate(), "Employee should be valid.");
-            Employee.BirthDate.AddDays(-1);
+            Employee.MakeValidForPresident();
+            Assert.That(Employee.OI.Validate(), "Employee should be valid." + (Employee.OI.GetRuleViolations().FirstOrDefault()?.ErrorMessage));
+            Employee.BirthDate = Employee.BirthDate.AddDays(1);
 
             var violatedRule = Employee.IsPresidentProperty.GetFirstRuleViolation(Employee.OI);
             //TODO: Need rule ID setter so we can identify the proper rule.
-            Assert.That(violatedRule.AppliedRule.Id == "PRES40", "Employee should have violated the PRES40 rule.");
+            Assert.That(violatedRule?.AppliedRule.Id == "PRES40", "Employee should have violated the PRES40 rule.");