Skip to content

Commit 4e18719

Browse files
Minor nullability handling and cleanup
1 parent ee7392f commit 4e18719

File tree

4 files changed

+13
-8
lines changed

4 files changed

+13
-8
lines changed

IntelliTect.Multitool.Tests/ClaimsPrincipalExtensionsTests.cs

+5-2
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,9 @@ namespace IntelliTect.Multitool.Security.Tests;
66

77
public class ClaimsPrincipalExtensionsTests
88
{
9+
static readonly string[] roles = new[] { "Foo", "Bar" };
10+
static readonly string[] singleRole = new[] { "Bar" };
11+
912
[Fact]
1013
public void GetRoles_WhenClaimsPrincipalNull_Should_Throw()
1114
{
@@ -25,7 +28,7 @@ public void GetRoles_WhenClaimsPrincipalHasNoRoles_Should_ReturnEmpty()
2528
[Fact]
2629
public void GetRoles_WhenClaimsPrincipalHasRoles_Should_ReturnNotEmpty()
2730
{
28-
ClaimsPrincipal sut = new GenericPrincipal(new GenericIdentity("Uncle Festus"), new[] { "Foo", "Bar" });
31+
ClaimsPrincipal sut = new GenericPrincipal(new GenericIdentity("Uncle Festus"), roles);
2932

3033
Assert.Collection(sut.GetRoles(), s => Assert.Equal("Foo", s), t => Assert.Equal("Bar", t));
3134
}
@@ -49,7 +52,7 @@ public void GetUserId_WhenClaimsPrincipalHasNoProperty_Should_ReturnNull()
4952
[Fact]
5053
public void GetUserId_WhenClaimsPrincipalHasId_Should_ReturnString()
5154
{
52-
ClaimsPrincipal sut = new GenericPrincipal(new GenericIdentity("Taki The Frog"), new[] { "Bar" });
55+
ClaimsPrincipal sut = new GenericPrincipal(new GenericIdentity("Taki The Frog"), singleRole);
5356

5457
Assert.Equal("Taki The Frog", sut.GetUserId());
5558
}

IntelliTect.Multitool.Tests/RepositoryPaths.Tests.cs

+6-4
Original file line numberDiff line numberDiff line change
@@ -15,13 +15,13 @@ public void GetDefaultRepoRoot_ReturnsRepoRootDirectory()
1515
public void BuildVariables_BeingSetProperly()
1616
{
1717
Assert.Equal(3, RepositoryPaths.BuildVariables.Count);
18-
18+
1919
Assert.True(RepositoryPaths.BuildVariables.TryGetValue("BuildingForLiveUnitTesting", out _));
20-
20+
2121
Assert.True(RepositoryPaths.BuildVariables.TryGetValue("ProjectPath", out string? projectPath));
2222
Assert.NotNull(projectPath);
2323
Assert.NotEmpty(projectPath);
24-
24+
2525
Assert.True(RepositoryPaths.BuildVariables.TryGetValue("SolutionDir", out string? solutionDir));
2626
Assert.NotNull(solutionDir);
2727
Assert.NotEmpty(solutionDir);
@@ -38,7 +38,9 @@ public void TrySearchForGitContainingDirectory_ReturnsTrueWhenFound()
3838
[Fact]
3939
public void TrySearchForGitContainingDirectory_ReturnsFalseWhenNotFound()
4040
{
41-
Assert.False(RepositoryPaths.TrySearchForGitContainingDirectory(new DirectoryInfo(Path.GetPathRoot(Directory.GetCurrentDirectory())), out string gitParentDirectory));
41+
string? path = Path.GetPathRoot(Directory.GetCurrentDirectory());
42+
Assert.NotNull(path);
43+
Assert.False(RepositoryPaths.TrySearchForGitContainingDirectory(new DirectoryInfo(path), out string gitParentDirectory));
4244
Assert.Empty(gitParentDirectory);
4345
}
4446
}

IntelliTect.Multitool/ReleaseDateAttribute.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -33,5 +33,5 @@ public ReleaseDateAttribute(string utcDateString)
3333
object[]? attribute = (assembly ?? Assembly.GetEntryAssembly())?.GetCustomAttributes(typeof(ReleaseDateAttribute), false);
3434
return attribute?.Length >= 1 ? ((ReleaseDateAttribute)attribute[0]).ReleaseDate : null;
3535
}
36-
36+
3737
}

IntelliTect.Multitool/RepositoryPaths.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,7 @@ public static bool TrySearchForGitContainingDirectory(DirectoryInfo? searchStart
7878
}
7979

8080
searchStartDirectory = searchStartDirectory.Parent;
81-
}
81+
}
8282
gitParentDirectory = string.Empty;
8383
return false;
8484
}

0 commit comments

Comments
 (0)