Skip to content
Merged
Show file tree
Hide file tree
Changes from 2 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
2 changes: 1 addition & 1 deletion eng/CodeAnalysis.ruleset
Original file line number Diff line number Diff line change
Expand Up @@ -139,7 +139,7 @@
<Rule Id="CA2231" Action="None" /> <!-- Overload operator equals on overriding value type Equals -->
<Rule Id="CA2234" Action="None" /> <!-- Pass system uri objects instead of strings -->
<Rule Id="CA2235" Action="None" /> <!-- Mark all non-serializable fields -->
<Rule Id="CA2241" Action="Info" /> <!-- Provide correct arguments to formatting methods -->
<Rule Id="CA2241" Action="Warning" /> <!-- Provide correct arguments to formatting methods -->
<Rule Id="CA2242" Action="Warning" /> <!-- Test for NaN correctly -->
<Rule Id="CA2243" Action="None" /> <!-- Attribute string literals should parse correctly -->
<Rule Id="CA2244" Action="None" /> <!-- Do not duplicate indexed element initializations -->
Expand Down
63 changes: 8 additions & 55 deletions src/Build.UnitTests/FileUtilitiesRegex_Tests.cs
Original file line number Diff line number Diff line change
Expand Up @@ -523,66 +523,19 @@ public void MatchLengthStartWithUncPatternNoShare()
}

[Fact]
public void UncPatternEmptyString_LegacyRegex()
public void PatternEmptyString_LegacyRegex()
{
string winDirectory = string.Format("", _directoryStart);
string unixDirectory = string.Format("", _altDirectoryStart);

UncPattern.IsMatch(winDirectory).ShouldBe(false);
UncPattern.IsMatch(unixDirectory).ShouldBe(false);
}

[Fact]
public void UncPatternEmptyString()
{
string winDirectory = string.Format("", _directoryStart);
string unixDirectory = string.Format("", _altDirectoryStart);

FileUtilitiesRegex.IsUncPattern(winDirectory).ShouldBe(false);
FileUtilitiesRegex.IsUncPattern(unixDirectory).ShouldBe(false);
UncPattern.IsMatch(string.Empty).ShouldBeFalse();
StartsWithUncPattern.IsMatch(string.Empty).ShouldBeFalse();
StartsWithUncPattern.Match(string.Empty).Success.ShouldBeFalse();
}

[Fact]
public void StartWithUncPatternEmptyString_LegacyRegex()
public void PatternEmptyString()
{
string winDirectory = string.Format("", _directoryStart);
string unixDirectory = string.Format("", _altDirectoryStart);

StartsWithUncPattern.IsMatch(winDirectory).ShouldBe(false);
StartsWithUncPattern.IsMatch(unixDirectory).ShouldBe(false);
}

[Fact]
public void StartsWithUncPatternEmptyString()
{
string winDirectory = string.Format("", _directoryStart);
string unixDirectory = string.Format("", _altDirectoryStart);

FileUtilitiesRegex.StartsWithUncPattern(winDirectory).ShouldBe(false);
FileUtilitiesRegex.StartsWithUncPattern(unixDirectory).ShouldBe(false);
}

[Fact]
public void MatchLengthStartWithUncPatternEmptyString_LegacyRegex()
{
string winDirectory = string.Format("", _directoryStart);
string unixDirectory = string.Format("", _altDirectoryStart);

var match = StartsWithUncPattern.Match(winDirectory);
match.Success.ShouldBeFalse();

match = StartsWithUncPattern.Match(unixDirectory);
match.Success.ShouldBeFalse();
}

[Fact]
public void MatchLengthStartWithUncPatternEmptyString()
{
string winDirectory = string.Format("", _directoryStart);
string unixDirectory = string.Format("", _altDirectoryStart);

FileUtilitiesRegex.StartsWithUncPatternMatchLength(winDirectory).ShouldBe(-1);
FileUtilitiesRegex.StartsWithUncPatternMatchLength(unixDirectory).ShouldBe(-1);
FileUtilitiesRegex.IsUncPattern(string.Empty).ShouldBeFalse();
FileUtilitiesRegex.StartsWithUncPattern(string.Empty).ShouldBeFalse();
FileUtilitiesRegex.StartsWithUncPatternMatchLength(string.Empty).ShouldBe(-1);
}
}
}