From 382c355bbd7631c1b2c1456e3b7fe2a4cb0d6c28 Mon Sep 17 00:00:00 2001 From: Infarh Date: Mon, 17 Nov 2025 01:31:05 +0300 Subject: [PATCH 1/2] =?UTF-8?q?=D0=98=D1=81=D0=BF=D1=80=D0=B0=D0=B2=D0=BB?= =?UTF-8?q?=D0=B5=D0=BD=D1=8B=20=D0=BF=D1=80=D0=BE=D0=B2=D0=B5=D1=80=D0=BA?= =?UTF-8?q?=D0=B8=20=D1=81=D1=82=D1=80=D0=BE=D0=BA=20=D0=B2=20ValueChecker?= =?UTF-8?q?StringExtensions?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Изменён порядок аргументов в методах `StartWith`, `EndWith` и `Contains` для корректного использования методов `Assert`. Заменены вызовы `StringAssert.Matches` и `StringAssert.DoesNotMatch` на `Assert.MatchesRegex` и `Assert.DoesNotMatchRegex` соответственно для перехода на новый API проверки регулярных выражений. --- .../Extensions/ValueCheckerStringExtensions.cs | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/MathCore.TestsExtensions/Extensions/ValueCheckerStringExtensions.cs b/MathCore.TestsExtensions/Extensions/ValueCheckerStringExtensions.cs index 69d0dec..da8b0bf 100644 --- a/MathCore.TestsExtensions/Extensions/ValueCheckerStringExtensions.cs +++ b/MathCore.TestsExtensions/Extensions/ValueCheckerStringExtensions.cs @@ -21,7 +21,7 @@ public static class ValueCheckerStringExtensions public ValueChecker StartWith(string ExpectedPrefix, string? Message = null) { FormattableString message = $"{Message.AddSeparator()}Указанная строка {Checker.ActualValue} не начинается с ожидаемого префикса {ExpectedPrefix}"; - Assert.StartsWith(Checker.ActualValue, ExpectedPrefix, message.ToStringInvariant()); + Assert.StartsWith(ExpectedPrefix, Checker.ActualValue, message.ToStringInvariant()); return Checker; } @@ -32,7 +32,7 @@ public ValueChecker StartWith(string ExpectedPrefix, string? Message = n public ValueChecker EndWith(string ExpectedSuffix, string? Message = null) { FormattableString msg = $"{Message.AddSeparator()}Указанная строка {Checker.ActualValue} не заканчивается ожидаемым окончанием {ExpectedSuffix}"; - Assert.EndsWith(Checker.ActualValue, ExpectedSuffix, msg.ToStringInvariant()); + Assert.EndsWith(ExpectedSuffix, Checker.ActualValue, msg.ToStringInvariant()); return Checker; } @@ -43,7 +43,7 @@ public ValueChecker EndWith(string ExpectedSuffix, string? Message = nul public ValueChecker Contains(string ExpectedSubstring, string? Message = null) { FormattableString msg = $"{Message.AddSeparator()}Указанная строка {Checker.ActualValue} не содержит ожидаемой подстроки {ExpectedSubstring}"; - Assert.Contains(Checker.ActualValue!, ExpectedSubstring, msg.ToStringInvariant()); + Assert.Contains(ExpectedSubstring, Checker.ActualValue!, msg.ToStringInvariant()); return Checker; } @@ -60,7 +60,7 @@ public ValueChecker Contains(string ExpectedSubstring, string? Message = public ValueChecker Matches(Regex ExpectedRegEx, string? Message = null) { FormattableString msg = $"{Message.AddSeparator()}Указанная строка {Checker.ActualValue} не соответствует ожидаемому регулярному выражению {ExpectedRegEx}"; - StringAssert.Matches(Checker.ActualValue, ExpectedRegEx, msg.ToStringInvariant()); + Assert.MatchesRegex(ExpectedRegEx, Checker.ActualValue, msg.ToStringInvariant()); return Checker; } @@ -77,7 +77,7 @@ public ValueChecker Matches(Regex ExpectedRegEx, string? Message = null) public ValueChecker DoesNotMatch(Regex ExpectedRegEx, string? Message = null) { FormattableString msg = $"{Message.AddSeparator()}Указанная строка {Checker.ActualValue} ошибочно соответствует ожидаемому регулярному выражению {ExpectedRegEx}"; - StringAssert.DoesNotMatch(Checker.ActualValue, ExpectedRegEx, msg.ToStringInvariant()); + Assert.DoesNotMatchRegex(ExpectedRegEx, Checker.ActualValue, msg.ToStringInvariant()); return Checker; } From 64603b8700f637b5a650ebb8ba6a652a35405fa6 Mon Sep 17 00:00:00 2001 From: Infarh Date: Mon, 17 Nov 2025 01:31:40 +0300 Subject: [PATCH 2/2] =?UTF-8?q?=D0=9E=D0=B1=D0=BD=D0=BE=D0=B2=D0=BB=D0=B5?= =?UTF-8?q?=D0=BD=D0=B8=D0=B5=20=D0=B2=D0=B5=D1=80=D1=81=D0=B8=D0=B8=20?= =?UTF-8?q?=D0=BF=D0=B0=D0=BA=D0=B5=D1=82=D0=B0=20=D0=B4=D0=BE=201.0.0.2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- MathCore.TestsExtensions/MathCore.TestsExtensions.csproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/MathCore.TestsExtensions/MathCore.TestsExtensions.csproj b/MathCore.TestsExtensions/MathCore.TestsExtensions.csproj index a3f3226..090e620 100644 --- a/MathCore.TestsExtensions/MathCore.TestsExtensions.csproj +++ b/MathCore.TestsExtensions/MathCore.TestsExtensions.csproj @@ -9,7 +9,7 @@ - 1.0.0.1 + 1.0.0.2 Актуализация пакета и зависимостей, поддержка netstandard2.0