Волков Кирилл

cs/HomeExercises/Tests/NumberValidator_Should.cs

@@ -11,13 +11,15 @@ public class NumberValidator_Should
 
 		private static IEnumerable IncorrectConstructorParamsTests()
 		{
-			yield return new TestCaseData(-1, 2, true)
+			yield return new TestCaseData(-1, 2, true, "precision must be a positive number")
 				.SetName("Constructor_ThrowsArgumentExceptionOnNegativePrecision");
-			yield return new TestCaseData(1, 2, true)
+			yield return new TestCaseData(0, 2, true, "precision must be a positive number")
+				.SetName("Constructor_ThrowsArgumentExceptionOnZeroPrecision");
+			yield return new TestCaseData(1, 2, true, "precision must be a non-negative number less or equal than precision")
 				.SetName("Constructor_ThrowsArgumentExceptionOnPrecisionLessThanScale");
-			yield return new TestCaseData(1, 1, true)
+			yield return new TestCaseData(1, 1, true, "precision must be a non-negative number less or equal than precision")
 				.SetName("Constructor_ThrowsArgumentExceptionSamePrecisionAndScale");
-			yield return new TestCaseData(1, -1, true)
+			yield return new TestCaseData(1, -1, true, "precision must be a non-negative number less or equal than precision")
 				.SetName("Constructor_ThrowsArgumentExceptionOnNegativeScale");
 		}
 
@@ -100,12 +102,12 @@ private static IEnumerable IsValidNumberValueTests()
 		#endregion
 
 		[TestCaseSource(nameof(IncorrectConstructorParamsTests))]
-		public void FailsWithIncorrectConstructorArguments(int precision, int scale, bool onlyPositive)
+		public void FailsWithIncorrectConstructorArguments(int precision, int scale, bool onlyPositive, string message)
 		{
 			new Func<NumberValidator>(() => new NumberValidator(precision, scale, onlyPositive))
 				.Should()
 				.ThrowExactly<ArgumentException>()
-				.Where(e => e.Message.Contains("precision"));
+				.Where(e => e.Message.Equals(message, StringComparison.OrdinalIgnoreCase));
 		}
 
 		[TestCaseSource(nameof(CorrectConstructorParamsTests))]

cs/HomeExercises/Tests/ObjectComparsion_Should.cs

@@ -1,4 +1,5 @@
 using FluentAssertions;
+using FluentAssertions.Equivalency;
 using NUnit.Framework;
 
 namespace HomeExercises.Tests
@@ -24,10 +25,7 @@ public void CheckCurrentTsar()
 			actualTsar.Should().BeEquivalentTo(expectedTsar, options => 
 				options
 					.IncludingFields()
-					.Excluding(p => p.Id)
-					.Excluding(p => p.Parent!.Id)
-					.Excluding(p => p.Parent!.Weight)
-					.Excluding(p => p.Parent!.Parent)
+					.Excluding(memberInfo => memberInfo.SelectedMemberInfo.Name == "Id")
 				);
 		}