Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ public static class ValueCheckerStringExtensions
public ValueChecker<string> 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;
}

Expand All @@ -32,7 +32,7 @@ public ValueChecker<string> StartWith(string ExpectedPrefix, string? Message = n
public ValueChecker<string> 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;
}

Expand All @@ -43,7 +43,7 @@ public ValueChecker<string> EndWith(string ExpectedSuffix, string? Message = nul
public ValueChecker<string> 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;
}

Expand All @@ -60,7 +60,7 @@ public ValueChecker<string> Contains(string ExpectedSubstring, string? Message =
public ValueChecker<string> 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;
}

Expand All @@ -77,7 +77,7 @@ public ValueChecker<string> Matches(Regex ExpectedRegEx, string? Message = null)
public ValueChecker<string> 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;
}

Expand Down
2 changes: 1 addition & 1 deletion MathCore.TestsExtensions/MathCore.TestsExtensions.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
</PropertyGroup>

<PropertyGroup>
<Version>1.0.0.1</Version>
<Version>1.0.0.2</Version>
<PackageReleaseNotes>Актуализация пакета и зависимостей, поддержка netstandard2.0</PackageReleaseNotes>
</PropertyGroup>

Expand Down