Трофимов Никита

cs/Challenge/Challenge.csproj

@@ -13,6 +13,7 @@
       <PackageReference Include="FluentAssertions" Version="5.10.3" />
       <PackageReference Include="NUnit" Version="3.12.0" />
       <PackageReference Include="NUnit.Engine" Version="3.11.1" />
+      <PackageReference Include="NUnit3TestAdapter" Version="4.5.0" />
       <PackageReference Include="System.Security.Permissions" Version="4.7.0" />
     </ItemGroup>
 

cs/HomeExercises/HomeExercises.csproj

@@ -14,7 +14,8 @@
     <PackageReference Include="JetBrains.Annotations" Version="2020.1.0" />
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.7.1" />
     <PackageReference Include="NUnit" Version="3.12.0" />
-    <PackageReference Include="NUnit3TestAdapter" Version="3.17.0" />
+    <PackageReference Include="NUnit.Engine" Version="3.16.3" />
+    <PackageReference Include="NUnit3TestAdapter" Version="4.5.0" />
   </ItemGroup>
 
 </Project>

cs/HomeExercises/NumberValidator.cs

@@ -0,0 +1,45 @@
+using System;
+using System.Text.RegularExpressions;
+
+namespace HomeExercises
+{
+	public class NumberValidator
+	{
+		private readonly Regex numberRegex;
+		private readonly bool onlyPositive;
+		private readonly int precision;
+		private readonly int scale;
+
+		public NumberValidator(int precision, int scale = 0, bool onlyPositive = false)
+		{
+			this.precision = precision;
+			this.scale = scale;
+			this.onlyPositive = onlyPositive;
+			if (precision <= 0)
+				throw new ArgumentException("precision must be a positive number");
+			if (scale < 0 || scale >= precision)
+				throw new ArgumentException("precision must be a non-negative number less or equal than precision");
+			numberRegex = new Regex(@"^([+-]?)(\d+)([.,](\d+))?$", RegexOptions.IgnoreCase);
+		}
+
+		public bool IsValidNumber(string value)
+		{
+			if (string.IsNullOrEmpty(value))
+				return false;
+
+			var match = numberRegex.Match(value);
+			if (!match.Success)
+				return false;
+
+			var intPart = match.Groups[1].Value.Length + match.Groups[2].Value.Length;
+			var fracPart = match.Groups[4].Value.Length;
+
+			if (intPart + fracPart > precision || fracPart > scale)
+				return false;
+
+			if (onlyPositive && match.Groups[1].Value == "-")
+				return false;
+			return true;
+		}
+	}
+}

cs/HomeExercises/ObjectComparison.cs

@@ -1,76 +1,14 @@
-using FluentAssertions;
-using NUnit.Framework;
-
-namespace HomeExercises
+namespace HomeExercises
 {
 	public class ObjectComparison
-	{
-		[Test]
-		[Description("Проверка текущего царя")]
-		[Category("ToRefactor")]
-		public void CheckCurrentTsar()
-		{
-			var actualTsar = TsarRegistry.GetCurrentTsar();
-
-			var expectedTsar = new Person("Ivan IV The Terrible", 54, 170, 70,
-				new Person("Vasili III of Russia", 28, 170, 60, null));
-
-			// Перепишите код на использование Fluent Assertions.
-			Assert.AreEqual(actualTsar.Name, expectedTsar.Name);
-			Assert.AreEqual(actualTsar.Age, expectedTsar.Age);
-			Assert.AreEqual(actualTsar.Height, expectedTsar.Height);
-			Assert.AreEqual(actualTsar.Weight, expectedTsar.Weight);
-
-			Assert.AreEqual(expectedTsar.Parent!.Name, actualTsar.Parent!.Name);
-			Assert.AreEqual(expectedTsar.Parent.Age, actualTsar.Parent.Age);
-			Assert.AreEqual(expectedTsar.Parent.Height, actualTsar.Parent.Height);
-			Assert.AreEqual(expectedTsar.Parent.Parent, actualTsar.Parent.Parent);
-		}
-
-		[Test]
-		[Description("Альтернативное решение. Какие у него недостатки?")]
-		public void CheckCurrentTsar_WithCustomEquality()
-		{
-			var actualTsar = TsarRegistry.GetCurrentTsar();
-			var expectedTsar = new Person("Ivan IV The Terrible", 54, 170, 70,
-				new Person("Vasili III of Russia", 28, 170, 60, null));
-
-			// Какие недостатки у такого подхода? 
-			Assert.True(AreEqual(actualTsar, expectedTsar));
-		}
-
-		private bool AreEqual(Person? actual, Person? expected)
-		{
-			if (actual == expected) return true;
-			if (actual == null || expected == null) return false;
-			return
-				actual.Name == expected.Name
-				&& actual.Age == expected.Age
-				&& actual.Height == expected.Height
-				&& actual.Weight == expected.Weight
-				&& AreEqual(actual.Parent, expected.Parent);
-		}
-	}
-
-	public class TsarRegistry
-	{
-		public static Person GetCurrentTsar()
-		{
-			return new Person(
-				"Ivan IV The Terrible", 54, 170, 70,
-				new Person("Vasili III of Russia", 28, 170, 60, null));
-		}
-	}
-
-	public class Person
 	{
 		public static int IdCounter = 0;
 		public int Age, Height, Weight;
 		public string Name;
-		public Person? Parent;
+		public ObjectComparison? Parent;
 		public int Id;
 
-		public Person(string name, int age, int height, int weight, Person? parent)
+		public ObjectComparison(string name, int age, int height, int weight, ObjectComparison? parent)
 		{
 			Id = IdCounter++;
 			Name = name;

cs/HomeExercises/tests/NumberValidator_Should.cs

@@ -0,0 +1,56 @@
+using FluentAssertions;
+using NUnit.Framework;
+using System;
+
+namespace HomeExercises.tests
+{
+	public class NumberValidator_Should
+	{
+		[TestCase(-1, 2, false, TestName = "NegativePrecision")]
+		[TestCase(0, 0, false, TestName = "PrecisionIsZero")]
+		[TestCase(3, -1, false, TestName = "NegativeScale")]
+		[TestCase(1, 2, false, TestName = "ScaleIsGreaterThanPrecision")]
+		[TestCase(1, 1, true, TestName = "PrecisionEqualsScale")]
+		public void Creation_ShouldThrowArgumentException(int precision, int scale, bool onlyPositive)
+		{
+			Action creation = () => new NumberValidator(precision, scale, onlyPositive);
+			creation.Should().Throw<ArgumentException>();
+		}
+		[Test]
+		public void Creation_ShouldNotThrow()
+		{
+			Action creation = () => new NumberValidator(1, 0);
+			creation
+				.Should() 
+				.NotThrow<Exception>();
+
+		}
+
+		[TestCase(3, 2, false, "-+0.0", TestName = "TwoSigns")]
+		[TestCase(3, 2, false, " -0.0", TestName = "SpaceFirstDigitInNumber")]
+		[TestCase(3, 2, false, "0,", TestName ="Aren'tDigitsAfterCommas")]
+		[TestCase(3, 2, false, "0.0.0", TestName = "ThreeDigitsInNumberByTwoDots")]
+		[TestCase(3, 2, false, "0,0,0", TestName = "ThreeDigitsInNumberByTwoCommas")]
+		[TestCase(3, 2, false, "00.00", TestName = "NumberPrecisionGreaterThanValidatorPrecision")]
+		[TestCase(3, 2, false, null, TestName = "NumberNull")]
+		[TestCase(3, 2, false, "", TestName = "NumberEmpty")]
+		[TestCase(3, 2, false, "+1.23", TestName = "NumberPrecisionGreaterThanValidatorPrecision")]
+		[TestCase(3, 2, false, "-1.23", TestName = "NumberNegativeInNumberOnlyPositive")]
+		[TestCase(17, 2, true, "0.000", TestName = "NumberScaleGreaterThanValidatorScale")]
+		[TestCase(17, 2, true, "a.sd", TestName = "IncorrectNumberFormatBecauseLettersArePresent")]
+		public void IsValidNumber_ShouldFalse_When(int precision, int scale, bool onlyPositive, string number)
+		{
+			var validator = new NumberValidator(precision, scale, onlyPositive);
+			validator.IsValidNumber(number).Should().BeFalse();
+		}
+
+		[TestCase(17, 2, false, "0.0", TestName = "NumberWithFractionalPart")]
+		[TestCase(17, 2, false, "0", TestName = "OnlyInteger")]
+		[TestCase(4, 2, true, "+1.23", TestName = "NumberWithSign")]
+		public void IsValidNumber_ShouldTrue_When(int precision, int scale, bool onlyPositive, string number)
+		{
+			var validator = new NumberValidator(precision, scale);
+			validator.IsValidNumber(number).Should().BeTrue();
+		}
+	}
+}

cs/HomeExercises/tests/ObjectComparison_Should.cs

@@ -0,0 +1,61 @@
+using FluentAssertions;
+using NUnit.Framework;
+
+namespace HomeExercises.tests
+{
+	public class ObjectComparison_Should
+	{
+		[Test]
+		[Description("Проверка текущего царя")]
+		[Category("ToRefactor")]
+		public void CheckValuesOfTheCurrentTsar()
+		{
+			var actualTsar = TsarRegistry.GetCurrentTsar();
+
+			var expectedTsar = new ObjectComparison("Ivan IV The Terrible", 54, 170, 70,
+				new ObjectComparison("Vasili III of Russia", 28, 170, 60, null));
+
+			actualTsar.Should().BeEquivalentTo(expectedTsar, options => options
+				.Excluding(tsar =>
+					tsar.SelectedMemberInfo.Name == nameof(ObjectComparison.Id)
+					&& tsar.SelectedMemberInfo.DeclaringType == typeof(ObjectComparison)));
+		}
+
+		[Test]
+		[Description("Альтернативное решение. Какие у него недостатки?")]
+		public void CheckCurrentTsar_WithCustomEquality()
+		{
+			var actualTsar = TsarRegistry.GetCurrentTsar();
+			var expectedTsar = new ObjectComparison("Ivan IV The Terrible", 54, 170, 70,
+				new ObjectComparison("Vasili III of Russia", 28, 170, 60, null));
+
+			//Какие недостатки у такого подхода? 
+			//Нужно будет переписывать AreEqual в случае изменения полей ObjectComparison
+			//Возможна ошибка при написании метода
+			//Если тест упадет, сообщение об ошибке будет малоинформативным
+			Assert.True(AreEqual(actualTsar, expectedTsar));
+		}
+
+		private bool AreEqual(ObjectComparison? actual, ObjectComparison? expected)
+		{
+			if (actual == expected) return true;
+			if (actual == null || expected == null) return false;
+			return
+				actual.Name == expected.Name
+				&& actual.Age == expected.Age
+				&& actual.Height == expected.Height
+				&& actual.Weight == expected.Weight
+				&& AreEqual(actual.Parent, expected.Parent);
+		}
+	}
+
+	public class TsarRegistry
+	{
+		public static ObjectComparison GetCurrentTsar()
+		{
+			return new ObjectComparison(
+				"Ivan IV The Terrible", 54, 170, 70,
+				new ObjectComparison("Vasili III of Russia", 28, 170, 60, null));
+		}
+	}
+}

cs/Samples/Samples.csproj

@@ -12,7 +12,6 @@
     <PackageReference Include="FluentAssertions" Version="5.10.3" />
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.7.1" />
     <PackageReference Include="NUnit" Version="3.12.0" />
-    <PackageReference Include="NUnit3TestAdapter" Version="3.17.0" />
   </ItemGroup>
 
   <ItemGroup>