Skip to content

Commit 63e9da0

Browse files
CopiloteNeRGy164
andcommitted
Separate null checks from functional assertions
Co-authored-by: eNeRGy164 <[email protected]>
1 parent 50acbe2 commit 63e9da0

File tree

1 file changed

+16
-10
lines changed

1 file changed

+16
-10
lines changed

tests/DendroDocs.Tool.Tests/AnalyzerSetup/AnalyzerSetupTests.cs

Lines changed: 16 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,8 @@ public void SolutionShouldFilterExcludedProjects()
7878

7979
// Assert
8080
analyzerSetup.Projects.ShouldHaveSingleItem();
81-
analyzerSetup.Projects.ShouldAllBe(p => p.FilePath != null && p.FilePath.EndsWith("Project.csproj"));
81+
analyzerSetup.Projects.ShouldAllBe(p => p.FilePath != null);
82+
analyzerSetup.Projects.ShouldAllBe(p => p.FilePath!.EndsWith("Project.csproj"));
8283
}
8384

8485
[TestMethod]
@@ -92,7 +93,8 @@ public void SolutionShouldLoadProject()
9293

9394
// Assert
9495
analyzerSetup.Projects.ShouldHaveSingleItem();
95-
analyzerSetup.Projects.ShouldAllBe(p => p.FilePath != null && p.FilePath.EndsWith("Project.csproj"));
96+
analyzerSetup.Projects.ShouldAllBe(p => p.FilePath != null);
97+
analyzerSetup.Projects.ShouldAllBe(p => p.FilePath!.EndsWith("Project.csproj"));
9698
}
9799

98100
[TestMethod]
@@ -108,9 +110,10 @@ public void FolderShouldLoadAllProjects()
108110
analyzerSetup.Projects.Count().ShouldBe(3);
109111

110112
var projectPaths = analyzerSetup.Projects.Select(p => p.FilePath).ToList();
111-
projectPaths.ShouldContain(path => path != null && path.EndsWith("Project.csproj"));
112-
projectPaths.ShouldContain(path => path != null && path.EndsWith("OtherProject.csproj"));
113-
projectPaths.ShouldContain(path => path != null && path.EndsWith("AnotherProject.csproj"));
113+
projectPaths.ShouldAllBe(path => path != null);
114+
projectPaths.ShouldContain(path => path!.EndsWith("Project.csproj"));
115+
projectPaths.ShouldContain(path => path!.EndsWith("OtherProject.csproj"));
116+
projectPaths.ShouldContain(path => path!.EndsWith("AnotherProject.csproj"));
114117
}
115118

116119
[TestMethod]
@@ -128,7 +131,8 @@ public void FolderShouldFilterTestProjects()
128131
analyzerSetup.Projects.Count().ShouldBe(3);
129132

130133
var projects = analyzerSetup.Projects.ToList();
131-
projects.ShouldAllBe(p => p.FilePath != null && !p.FilePath.Contains("TestProject"));
134+
projects.ShouldAllBe(p => p.FilePath != null);
135+
projects.ShouldAllBe(p => !p.FilePath!.Contains("TestProject"));
132136
}
133137

134138
[TestMethod]
@@ -144,7 +148,8 @@ public void FolderShouldFilterExcludedProjects()
144148

145149
// Assert
146150
analyzerSetup.Projects.ShouldHaveSingleItem();
147-
analyzerSetup.Projects.ShouldAllBe(p => p.FilePath != null && p.FilePath.EndsWith("Project.csproj"));
151+
analyzerSetup.Projects.ShouldAllBe(p => p.FilePath != null);
152+
analyzerSetup.Projects.ShouldAllBe(p => p.FilePath!.EndsWith("Project.csproj"));
148153
}
149154

150155
[TestMethod]
@@ -168,9 +173,10 @@ public void GlobPatternShouldFindMatchingProjects()
168173
analyzerSetup.Projects.Count().ShouldBe(3);
169174

170175
var projectPaths = analyzerSetup.Projects.Select(p => p.FilePath).ToList();
171-
projectPaths.ShouldContain(path => path != null && path.EndsWith("Project.csproj"));
172-
projectPaths.ShouldContain(path => path != null && path.EndsWith("OtherProject.csproj"));
173-
projectPaths.ShouldContain(path => path != null && path.EndsWith("AnotherProject.csproj"));
176+
projectPaths.ShouldAllBe(path => path != null);
177+
projectPaths.ShouldContain(path => path!.EndsWith("Project.csproj"));
178+
projectPaths.ShouldContain(path => path!.EndsWith("OtherProject.csproj"));
179+
projectPaths.ShouldContain(path => path!.EndsWith("AnotherProject.csproj"));
174180
}
175181
finally
176182
{

0 commit comments

Comments
 (0)