Бабинцев Григорий

Testing/Basic/Basic.sln

@@ -0,0 +1,25 @@
+
+Microsoft Visual Studio Solution File, Format Version 12.00
+# Visual Studio Version 17
+VisualStudioVersion = 17.11.35327.3
+MinimumVisualStudioVersion = 10.0.40219.1
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Basic", "Basic.csproj", "{ECC863AA-4C3E-4E5C-A2D0-459A2A1D33A3}"
+EndProject
+Global
+	GlobalSection(SolutionConfigurationPlatforms) = preSolution
+		Debug|Any CPU = Debug|Any CPU
+		Release|Any CPU = Release|Any CPU
+	EndGlobalSection
+	GlobalSection(ProjectConfigurationPlatforms) = postSolution
+		{ECC863AA-4C3E-4E5C-A2D0-459A2A1D33A3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{ECC863AA-4C3E-4E5C-A2D0-459A2A1D33A3}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{ECC863AA-4C3E-4E5C-A2D0-459A2A1D33A3}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{ECC863AA-4C3E-4E5C-A2D0-459A2A1D33A3}.Release|Any CPU.Build.0 = Release|Any CPU
+	EndGlobalSection
+	GlobalSection(SolutionProperties) = preSolution
+		HideSolutionNode = FALSE
+	EndGlobalSection
+	GlobalSection(ExtensibilityGlobals) = postSolution
+		SolutionGuid = {2B8F6D26-176B-4CA4-8C5B-A15FA83E5325}
+	EndGlobalSection
+EndGlobal

Testing/Basic/Homework/1. ObjectComparison/ObjectComparison.cs

@@ -13,12 +13,14 @@ 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));
+            new Person("Vasili III of Russia", 28, 170, 60,
+                new Person("Ivan III", 65, 170, 80, null)));
 
-        actualTsar.Should().BeEquivalentTo(expectedTsar, 
-            options => options.Excluding(person => person.Id).
-                Excluding(person => person.Parent.Id));
-    }
+
+		actualTsar.Should().BeEquivalentTo(expectedTsar, 
+            options => options
+            .Excluding(p => p.Path.EndsWith("Id")));
+	}
 	/*
 	 * Преимущества подхода:
 	 * 1)   Хорошая информативность: при непрохождении теста ясно показывается, какие поля не совпали.
@@ -32,7 +34,8 @@ 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));
+			new Person("Vasili III of Russia", 28, 170, 60,
+				new Person("Ivan III", 65, 170, 80, null)));
 
         // Какие недостатки у такого подхода? 
         ClassicAssert.True(AreEqual(actualTsar, expectedTsar));

Testing/Basic/Homework/1. ObjectComparison/TsarRegistry.cs

@@ -4,8 +4,9 @@ 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));
-    }
+		return new Person("Ivan IV The Terrible", 54, 170, 70,
+			new Person("Vasili III of Russia", 28, 170, 60,
+				new Person("Ivan III", 65, 170, 80, null)));
+
+	}
 }

Testing/Basic/Homework/2. NumberValidator/NumberValidatorTests.cs

@@ -1,15 +1,31 @@
 
 using FluentAssertions;
+using Newtonsoft.Json.Linq;
 using NUnit.Framework;
 using System.Collections;
 
 namespace HomeExercise.Tasks.NumberValidator;
 
+
+
 [TestFixture]
 public partial class NumberValidatorTests
 {
-	[TestCaseSource(nameof(ValidTestCases))]
-	public void Should_Be_Valid(int precision, int scale, bool onlyPositive, string value)
+
+	[TestCase(17, 1, true, "0.0", TestName = "Number with point separator")]
+	[TestCase(17, 1, true, "0,0", TestName = "Number with comma separator")]
+	[TestCase(17, 2, true, "0", TestName = "Number without fractionl part")]
+	[TestCase(4, 1, true, "1234", TestName = "Number length equals to precision")]
+	[TestCase(17, 1, true, "+1,0", TestName = "Positive number with comma")]
+	[TestCase(4, 1, true, "+123", TestName = "Positive number length with equals to precision")]
+	[TestCase(4, 1, true, "+12.3", TestName = "Positive number length with fractionl part equals to precision")]
+	[TestCase(5, 3, true, "+1.000", TestName = "Positive number length with fractional part equals to precision")]
+	[TestCase(17, 1, false, "-1,0", TestName = "Negative number with comma")]
+	[TestCase(4, 1, false, "-123", TestName = "Negative number length with plus equals to precision")]
+	[TestCase(4, 1, false, "-12.3", TestName = "Negative number length with frctionl part equals to precision")]
+	[TestCase(5, 3, false, "-1.000", TestName = "Negative number length with fractional part and plus equals to precision")]
+
+	public void IsValidNumber_Shoud_BeTrue_WhenArgsCorrect(int precision, int scale, bool onlyPositive, string value)
 	{
 		var validator = new NumberValidator(precision, scale, onlyPositive);
 
@@ -18,8 +34,17 @@ public void Should_Be_Valid(int precision, int scale, bool onlyPositive, string
 		result.Should().BeTrue();
 	}
 
-	[TestCaseSource(nameof(NotValidTestCases))]
-	public void Should_Be_NotValid(int precision, int scale, bool onlyPositive, string value)
+
+	[TestCase(3, 2, true, "00.00", TestName = "Number length with fractionl part more than precision")]
+	[TestCase(3, 2, true, "-0.0", TestName = "Negative number length with fractionl part more than precision")]
+	[TestCase(3, 2, true, "+0.00", TestName = "Positive number length with fractionl part more than precision")]
+	[TestCase(3, 2, true, "a.sd", TestName = "Number consists letters")]
+	[TestCase(17, 2, true, "0.000", TestName = "Length number's frationl part more thn scale")]
+	[TestCase(3, 2, true, "", TestName = "Number is empty string")]
+	[TestCase(3, 2, true, null, TestName = "Number is null")]
+	[TestCase(4, 2, false, "10*00", TestName = "Number with invalid separator")]
+	[TestCase(4, 1, false, "1.0.0", TestName = "Number with more than one separator")]
+	public void IsValidNumber_Shoud_BeFalse_WhenArgsBad(int precision, int scale, bool onlyPositive, string value)
 	{
 		var validator = new NumberValidator(precision, scale, onlyPositive);
 
@@ -28,17 +53,23 @@ public void Should_Be_NotValid(int precision, int scale, bool onlyPositive, stri
 		result.Should().BeFalse();
 	}
 
-	[TestCaseSource(nameof(ThrowArgumentExceptionTestCases))]
-	public void Should_ThrowArgumentException(int precision, int scale, bool onlyPositive)
+
+	[TestCase(-1, 2, TestName = "Negative precision")]
+	[TestCase(1, -2, TestName = "Negative scale")]
+	[TestCase(1, 2, TestName = "Precision less than scale")]
+	[TestCase(1, 1, TestName = "Precision equals with scale")]
+	public void Should_Throw_ArgumentException(int precision, int scale)
 	{
-		var action = () => new NumberValidator(precision, scale, onlyPositive);
+		var action = () => new NumberValidator(precision, scale);
 		action.Should().Throw<ArgumentException>();
 	}
 
-	[TestCaseSource(nameof(NotThrowArgumentExceptionTestCases))]
-	public void Should_NotThrowArgumentException(int precision, int scale, bool onlyPositive)
+
+	[TestCase(1, 0, TestName = "Zero scale")]
+	[TestCase(2, 1, TestName = "Precision more than scale")]
+	public void Should_NotThrow_AnyException(int precision, int scale)
 	{
-		var action = () => new NumberValidator(precision, scale, onlyPositive);
+		var action = () => new NumberValidator(precision, scale);
 		action.Should().NotThrow();
 	}
 }