From e8deeab33123fdaa9443f06031d591bca30da524 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 27 Jul 2026 05:27:58 +0000 Subject: [PATCH 1/2] Bump the nuget-dependencies group with 3 updates Bumps demaconsulting.pandoctool from 3.10.0 to 3.10.1 Bumps demaconsulting.sysml2tools.tool from 0.1.0-beta.13 to 0.1.0 Bumps SonarAnalyzer.CSharp from 10.29.0.143774 to 10.30.0.144632 --- updated-dependencies: - dependency-name: demaconsulting.pandoctool dependency-version: 3.10.1 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: nuget-dependencies - dependency-name: demaconsulting.sysml2tools.tool dependency-version: 0.1.0 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: nuget-dependencies - dependency-name: SonarAnalyzer.CSharp dependency-version: 10.30.0.144632 dependency-type: direct:production update-type: version-update:semver-minor dependency-group: nuget-dependencies - dependency-name: SonarAnalyzer.CSharp dependency-version: 10.30.0.144632 dependency-type: direct:production update-type: version-update:semver-minor dependency-group: nuget-dependencies ... Signed-off-by: dependabot[bot] --- .config/dotnet-tools.json | 4 ++-- .../DemaConsulting.FileAssert.csproj | 2 +- .../DemaConsulting.FileAssert.Tests.csproj | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.config/dotnet-tools.json b/.config/dotnet-tools.json index d17e8e3..6b234a0 100644 --- a/.config/dotnet-tools.json +++ b/.config/dotnet-tools.json @@ -9,7 +9,7 @@ ] }, "demaconsulting.pandoctool": { - "version": "3.10.0", + "version": "3.10.1", "commands": [ "pandoc" ] @@ -63,7 +63,7 @@ ] }, "demaconsulting.sysml2tools.tool": { - "version": "0.1.0-beta.13", + "version": "0.1.0", "commands": [ "sysml2tools" ] diff --git a/src/DemaConsulting.FileAssert/DemaConsulting.FileAssert.csproj b/src/DemaConsulting.FileAssert/DemaConsulting.FileAssert.csproj index e0d0320..9e1b213 100644 --- a/src/DemaConsulting.FileAssert/DemaConsulting.FileAssert.csproj +++ b/src/DemaConsulting.FileAssert/DemaConsulting.FileAssert.csproj @@ -73,7 +73,7 @@ all runtime; build; native; contentfiles; analyzers; buildtransitive - + all runtime; build; native; contentfiles; analyzers; buildtransitive diff --git a/test/DemaConsulting.FileAssert.Tests/DemaConsulting.FileAssert.Tests.csproj b/test/DemaConsulting.FileAssert.Tests/DemaConsulting.FileAssert.Tests.csproj index 397363f..0d50dc9 100644 --- a/test/DemaConsulting.FileAssert.Tests/DemaConsulting.FileAssert.Tests.csproj +++ b/test/DemaConsulting.FileAssert.Tests/DemaConsulting.FileAssert.Tests.csproj @@ -55,7 +55,7 @@ all runtime; build; native; contentfiles; analyzers; buildtransitive - + all runtime; build; native; contentfiles; analyzers; buildtransitive From cd1f4306b42f8f5b8f947dc78af5b8dba3daff86 Mon Sep 17 00:00:00 2001 From: Malcolm Nixon Date: Mon, 27 Jul 2026 11:46:21 -0400 Subject: [PATCH 2/2] Remove redundant null-forgiving operators flagged by updated analyzers The Dependabot analyzer update flags SonarAnalyzer S8969 for the redundant null-forgiving operator on Path.GetFileName(tempFile)!, which is annotated NotNullIfNotNull so the compiler already knows the result is non-null. Removed the operator across the Modeling test suites. Also applied the IDE0301 collection-expression suggestion in DirectoryFileContainer.GetEntries. Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com> --- .../Utilities/DirectoryFileContainer.cs | 2 +- .../Modeling/FileAssertHtmlAssertTests.cs | 22 +++++----- .../Modeling/FileAssertJsonAssertTests.cs | 16 +++---- .../Modeling/FileAssertPdfAssertTests.cs | 26 ++++++------ .../Modeling/FileAssertTextAssertTests.cs | 6 +-- .../Modeling/FileAssertXmlAssertTests.cs | 22 +++++----- .../Modeling/FileAssertYamlAssertTests.cs | 18 ++++---- .../Modeling/FileAssertZipAssertTests.cs | 42 +++++++++---------- 8 files changed, 77 insertions(+), 77 deletions(-) diff --git a/src/DemaConsulting.FileAssert/Utilities/DirectoryFileContainer.cs b/src/DemaConsulting.FileAssert/Utilities/DirectoryFileContainer.cs index c72a85a..d6249ce 100644 --- a/src/DemaConsulting.FileAssert/Utilities/DirectoryFileContainer.cs +++ b/src/DemaConsulting.FileAssert/Utilities/DirectoryFileContainer.cs @@ -62,7 +62,7 @@ public IReadOnlyList GetEntries() // the zero-match behavior expected by glob-based count constraints if (!Directory.Exists(BasePath)) { - return Array.Empty(); + return []; } // Enumerate all files recursively, producing paths relative to BasePath diff --git a/test/DemaConsulting.FileAssert.Tests/Modeling/FileAssertHtmlAssertTests.cs b/test/DemaConsulting.FileAssert.Tests/Modeling/FileAssertHtmlAssertTests.cs index 37b4714..a6e948a 100644 --- a/test/DemaConsulting.FileAssert.Tests/Modeling/FileAssertHtmlAssertTests.cs +++ b/test/DemaConsulting.FileAssert.Tests/Modeling/FileAssertHtmlAssertTests.cs @@ -90,7 +90,7 @@ public void FileAssertHtmlAssert_Run_ExactCount_Matches_NoError() using var context = Context.Create(["--silent"]); var dir = Path.GetDirectoryName(tempFile)!; - var fileName = Path.GetFileName(tempFile)!; + var fileName = Path.GetFileName(tempFile); using var container = new DirectoryFileContainer(dir); // Act @@ -121,7 +121,7 @@ public void FileAssertHtmlAssert_Run_ExactCount_Mismatch_WritesError() using var context = Context.Create(["--silent"]); var dir = Path.GetDirectoryName(tempFile)!; - var fileName = Path.GetFileName(tempFile)!; + var fileName = Path.GetFileName(tempFile); using var container = new DirectoryFileContainer(dir); // Act @@ -152,7 +152,7 @@ public void FileAssertHtmlAssert_Run_MinMaxCount_WithinBounds_NoError() using var context = Context.Create(["--silent"]); var dir = Path.GetDirectoryName(tempFile)!; - var fileName = Path.GetFileName(tempFile)!; + var fileName = Path.GetFileName(tempFile); using var container = new DirectoryFileContainer(dir); // Act @@ -192,7 +192,7 @@ public void FileAssertHtmlAssert_Run_MalformedHtml_ParsesAndQueriesSuccessfully_ using var context = Context.Create(["--silent"]); var dir = Path.GetDirectoryName(tempFile)!; - var fileName = Path.GetFileName(tempFile)!; + var fileName = Path.GetFileName(tempFile); using var container = new DirectoryFileContainer(dir); // Act - the lenient parser repairs the markup so the XPath query can run @@ -243,7 +243,7 @@ public void FileAssertHtmlAssert_Run_InvalidXPathQuery_WritesError() using var context = Context.Create(["--silent"]); var dir = Path.GetDirectoryName(tempFile)!; - var fileName = Path.GetFileName(tempFile)!; + var fileName = Path.GetFileName(tempFile); using var container = new DirectoryFileContainer(dir); // Act @@ -274,7 +274,7 @@ public void FileAssertHtmlAssert_Run_XPathExactTextMatch_Matches_NoError() using var context = Context.Create(["--silent"]); var dir = Path.GetDirectoryName(tempFile)!; - var fileName = Path.GetFileName(tempFile)!; + var fileName = Path.GetFileName(tempFile); using var container = new DirectoryFileContainer(dir); // Act @@ -305,7 +305,7 @@ public void FileAssertHtmlAssert_Run_XPathExactTextMatch_NoMatch_WritesError() using var context = Context.Create(["--silent"]); var dir = Path.GetDirectoryName(tempFile)!; - var fileName = Path.GetFileName(tempFile)!; + var fileName = Path.GetFileName(tempFile); using var container = new DirectoryFileContainer(dir); // Act @@ -336,7 +336,7 @@ public void FileAssertHtmlAssert_Run_XPathContainsText_Matches_NoError() using var context = Context.Create(["--silent"]); var dir = Path.GetDirectoryName(tempFile)!; - var fileName = Path.GetFileName(tempFile)!; + var fileName = Path.GetFileName(tempFile); using var container = new DirectoryFileContainer(dir); // Act @@ -367,7 +367,7 @@ public void FileAssertHtmlAssert_Run_XPathContainsText_NoMatch_WritesError() using var context = Context.Create(["--silent"]); var dir = Path.GetDirectoryName(tempFile)!; - var fileName = Path.GetFileName(tempFile)!; + var fileName = Path.GetFileName(tempFile); using var container = new DirectoryFileContainer(dir); // Act @@ -398,7 +398,7 @@ public void FileAssertHtmlAssert_Run_MinCount_BelowMinimum_WritesError() using var context = Context.Create(["--silent"]); var dir = Path.GetDirectoryName(tempFile)!; - var fileName = Path.GetFileName(tempFile)!; + var fileName = Path.GetFileName(tempFile); using var container = new DirectoryFileContainer(dir); // Act @@ -429,7 +429,7 @@ public void FileAssertHtmlAssert_Run_MaxCount_ExceedsMaximum_WritesError() using var context = Context.Create(["--silent"]); var dir = Path.GetDirectoryName(tempFile)!; - var fileName = Path.GetFileName(tempFile)!; + var fileName = Path.GetFileName(tempFile); using var container = new DirectoryFileContainer(dir); // Act diff --git a/test/DemaConsulting.FileAssert.Tests/Modeling/FileAssertJsonAssertTests.cs b/test/DemaConsulting.FileAssert.Tests/Modeling/FileAssertJsonAssertTests.cs index f5c9611..4e74505 100644 --- a/test/DemaConsulting.FileAssert.Tests/Modeling/FileAssertJsonAssertTests.cs +++ b/test/DemaConsulting.FileAssert.Tests/Modeling/FileAssertJsonAssertTests.cs @@ -88,7 +88,7 @@ public void FileAssertJsonAssert_Run_InvalidFile_WritesError() using var context = Context.Create(["--silent"]); var dir = Path.GetDirectoryName(tempFile)!; - var fileName = Path.GetFileName(tempFile)!; + var fileName = Path.GetFileName(tempFile); using var container = new DirectoryFileContainer(dir); // Act @@ -119,7 +119,7 @@ public void FileAssertJsonAssert_Run_ArrayCount_Matches_NoError() using var context = Context.Create(["--silent"]); var dir = Path.GetDirectoryName(tempFile)!; - var fileName = Path.GetFileName(tempFile)!; + var fileName = Path.GetFileName(tempFile); using var container = new DirectoryFileContainer(dir); // Act @@ -150,7 +150,7 @@ public void FileAssertJsonAssert_Run_ArrayCount_Mismatch_WritesError() using var context = Context.Create(["--silent"]); var dir = Path.GetDirectoryName(tempFile)!; - var fileName = Path.GetFileName(tempFile)!; + var fileName = Path.GetFileName(tempFile); using var container = new DirectoryFileContainer(dir); // Act @@ -181,7 +181,7 @@ public void FileAssertJsonAssert_Run_MinMaxCount_WithinBounds_NoError() using var context = Context.Create(["--silent"]); var dir = Path.GetDirectoryName(tempFile)!; - var fileName = Path.GetFileName(tempFile)!; + var fileName = Path.GetFileName(tempFile); using var container = new DirectoryFileContainer(dir); // Act @@ -212,7 +212,7 @@ public void FileAssertJsonAssert_Run_ScalarValue_CountsAsOne_NoError() using var context = Context.Create(["--silent"]); var dir = Path.GetDirectoryName(tempFile)!; - var fileName = Path.GetFileName(tempFile)!; + var fileName = Path.GetFileName(tempFile); using var container = new DirectoryFileContainer(dir); // Act @@ -243,7 +243,7 @@ public void FileAssertJsonAssert_Run_MinCount_BelowMinimum_WritesError() using var context = Context.Create(["--silent"]); var dir = Path.GetDirectoryName(tempFile)!; - var fileName = Path.GetFileName(tempFile)!; + var fileName = Path.GetFileName(tempFile); using var container = new DirectoryFileContainer(dir); // Act @@ -274,7 +274,7 @@ public void FileAssertJsonAssert_Run_MaxCount_ExceedsMaximum_WritesError() using var context = Context.Create(["--silent"]); var dir = Path.GetDirectoryName(tempFile)!; - var fileName = Path.GetFileName(tempFile)!; + var fileName = Path.GetFileName(tempFile); using var container = new DirectoryFileContainer(dir); // Act @@ -357,7 +357,7 @@ public void FileAssertJsonAssert_Run_InvalidJson_WritesParseError() var context = new CapturingContext(); var dir = Path.GetDirectoryName(tempFile)!; - var fileName = Path.GetFileName(tempFile)!; + var fileName = Path.GetFileName(tempFile); using var container = new DirectoryFileContainer(dir); // Act diff --git a/test/DemaConsulting.FileAssert.Tests/Modeling/FileAssertPdfAssertTests.cs b/test/DemaConsulting.FileAssert.Tests/Modeling/FileAssertPdfAssertTests.cs index e8bf224..541a6e5 100644 --- a/test/DemaConsulting.FileAssert.Tests/Modeling/FileAssertPdfAssertTests.cs +++ b/test/DemaConsulting.FileAssert.Tests/Modeling/FileAssertPdfAssertTests.cs @@ -80,7 +80,7 @@ public void FileAssertPdfAssert_Run_InvalidFile_WritesError() using var context = Context.Create(["--silent"]); var dir = Path.GetDirectoryName(tempFile)!; - var fileName = Path.GetFileName(tempFile)!; + var fileName = Path.GetFileName(tempFile); using var container = new DirectoryFileContainer(dir); // Act @@ -117,7 +117,7 @@ public void FileAssertPdfAssert_Run_ValidPdf_PageCountSatisfied_NoError() using var context = Context.Create(["--silent"]); var dir = Path.GetDirectoryName(tempFile)!; - var fileName = Path.GetFileName(tempFile)!; + var fileName = Path.GetFileName(tempFile); using var container = new DirectoryFileContainer(dir); // Act @@ -154,7 +154,7 @@ public void FileAssertPdfAssert_Run_ValidPdf_TooFewPages_WritesError() using var context = Context.Create(["--silent"]); var dir = Path.GetDirectoryName(tempFile)!; - var fileName = Path.GetFileName(tempFile)!; + var fileName = Path.GetFileName(tempFile); using var container = new DirectoryFileContainer(dir); // Act @@ -193,7 +193,7 @@ public void FileAssertPdfAssert_Run_ValidPdf_TooManyPages_WritesError() using var context = Context.Create(["--silent"]); var dir = Path.GetDirectoryName(tempFile)!; - var fileName = Path.GetFileName(tempFile)!; + var fileName = Path.GetFileName(tempFile); using var container = new DirectoryFileContainer(dir); // Act @@ -233,7 +233,7 @@ public void FileAssertPdfAssert_Run_MetadataContainsRule_FieldMissing_WritesErro using var context = Context.Create(["--silent"]); var dir = Path.GetDirectoryName(tempFile)!; - var fileName = Path.GetFileName(tempFile)!; + var fileName = Path.GetFileName(tempFile); using var container = new DirectoryFileContainer(dir); // Act @@ -273,7 +273,7 @@ public void FileAssertPdfAssert_Run_TextRule_ContentMissing_WritesError() using var context = Context.Create(["--silent"]); var dir = Path.GetDirectoryName(tempFile)!; - var fileName = Path.GetFileName(tempFile)!; + var fileName = Path.GetFileName(tempFile); using var container = new DirectoryFileContainer(dir); // Act @@ -314,7 +314,7 @@ public void FileAssertPdfAssert_Run_MetadataContainsRule_TitleMatches_NoError() using var context = Context.Create(["--silent"]); var dir = Path.GetDirectoryName(tempFile)!; - var fileName = Path.GetFileName(tempFile)!; + var fileName = Path.GetFileName(tempFile); using var container = new DirectoryFileContainer(dir); // Act @@ -355,7 +355,7 @@ public void FileAssertPdfAssert_Run_MetadataContainsRule_AuthorField_NoError() using var context = Context.Create(["--silent"]); var dir = Path.GetDirectoryName(tempFile)!; - var fileName = Path.GetFileName(tempFile)!; + var fileName = Path.GetFileName(tempFile); using var container = new DirectoryFileContainer(dir); // Act @@ -396,7 +396,7 @@ public void FileAssertPdfAssert_Run_MetadataMatchesRule_Matches_NoError() using var context = Context.Create(["--silent"]); var dir = Path.GetDirectoryName(tempFile)!; - var fileName = Path.GetFileName(tempFile)!; + var fileName = Path.GetFileName(tempFile); using var container = new DirectoryFileContainer(dir); // Act @@ -437,7 +437,7 @@ public void FileAssertPdfAssert_Run_MetadataMatchesRule_NoMatch_WritesError() using var context = Context.Create(["--silent"]); var dir = Path.GetDirectoryName(tempFile)!; - var fileName = Path.GetFileName(tempFile)!; + var fileName = Path.GetFileName(tempFile); using var container = new DirectoryFileContainer(dir); // Act @@ -479,7 +479,7 @@ public void FileAssertPdfAssert_Run_TextContainsRule_ContentPresent_NoError() using var context = Context.Create(["--silent"]); var dir = Path.GetDirectoryName(tempFile)!; - var fileName = Path.GetFileName(tempFile)!; + var fileName = Path.GetFileName(tempFile); using var container = new DirectoryFileContainer(dir); // Act @@ -521,7 +521,7 @@ public void FileAssertPdfAssert_Run_TextMatchesRule_PatternMatches_NoError() using var context = Context.Create(["--silent"]); var dir = Path.GetDirectoryName(tempFile)!; - var fileName = Path.GetFileName(tempFile)!; + var fileName = Path.GetFileName(tempFile); using var container = new DirectoryFileContainer(dir); // Act @@ -574,7 +574,7 @@ public void FileAssertPdfAssert_Run_MultiPageText_PageBoundarySeparated_NoError( using var context = Context.Create(["--silent"]); var dir = Path.GetDirectoryName(tempFile)!; - var fileName = Path.GetFileName(tempFile)!; + var fileName = Path.GetFileName(tempFile); using var container = new DirectoryFileContainer(dir); // Act diff --git a/test/DemaConsulting.FileAssert.Tests/Modeling/FileAssertTextAssertTests.cs b/test/DemaConsulting.FileAssert.Tests/Modeling/FileAssertTextAssertTests.cs index 67eb4f2..bc881f8 100644 --- a/test/DemaConsulting.FileAssert.Tests/Modeling/FileAssertTextAssertTests.cs +++ b/test/DemaConsulting.FileAssert.Tests/Modeling/FileAssertTextAssertTests.cs @@ -79,7 +79,7 @@ public void FileAssertTextAssert_Run_FileContainsText_NoError() using var context = Context.Create(["--silent"]); var dir = Path.GetDirectoryName(tempFile)!; - var fileName = Path.GetFileName(tempFile)!; + var fileName = Path.GetFileName(tempFile); using var container = new DirectoryFileContainer(dir); // Act @@ -110,7 +110,7 @@ public void FileAssertTextAssert_Run_FileMissingText_WritesError() using var context = Context.Create(["--silent"]); var dir = Path.GetDirectoryName(tempFile)!; - var fileName = Path.GetFileName(tempFile)!; + var fileName = Path.GetFileName(tempFile); using var container = new DirectoryFileContainer(dir); // Act @@ -167,7 +167,7 @@ public void FileAssertTextAssert_Run_MultipleRulesMultipleViolations_WritesMulti using var context = Context.Create(["--silent"]); var dir = Path.GetDirectoryName(tempFile)!; - var fileName = Path.GetFileName(tempFile)!; + var fileName = Path.GetFileName(tempFile); using var container = new DirectoryFileContainer(dir); // Act diff --git a/test/DemaConsulting.FileAssert.Tests/Modeling/FileAssertXmlAssertTests.cs b/test/DemaConsulting.FileAssert.Tests/Modeling/FileAssertXmlAssertTests.cs index 2ac81cc..d82fb08 100644 --- a/test/DemaConsulting.FileAssert.Tests/Modeling/FileAssertXmlAssertTests.cs +++ b/test/DemaConsulting.FileAssert.Tests/Modeling/FileAssertXmlAssertTests.cs @@ -101,7 +101,7 @@ public void FileAssertXmlAssert_Run_InvalidFile_WritesError() using var context = Context.Create(["--silent"]); var dir = Path.GetDirectoryName(tempFile)!; - var fileName = Path.GetFileName(tempFile)!; + var fileName = Path.GetFileName(tempFile); using var container = new DirectoryFileContainer(dir); // Act @@ -132,7 +132,7 @@ public void FileAssertXmlAssert_Run_ExactCount_Matches_NoError() using var context = Context.Create(["--silent"]); var dir = Path.GetDirectoryName(tempFile)!; - var fileName = Path.GetFileName(tempFile)!; + var fileName = Path.GetFileName(tempFile); using var container = new DirectoryFileContainer(dir); // Act @@ -163,7 +163,7 @@ public void FileAssertXmlAssert_Run_ExactCount_Mismatch_WritesError() using var context = Context.Create(["--silent"]); var dir = Path.GetDirectoryName(tempFile)!; - var fileName = Path.GetFileName(tempFile)!; + var fileName = Path.GetFileName(tempFile); using var container = new DirectoryFileContainer(dir); // Act @@ -194,7 +194,7 @@ public void FileAssertXmlAssert_Run_MinMaxCount_WithinBounds_NoError() using var context = Context.Create(["--silent"]); var dir = Path.GetDirectoryName(tempFile)!; - var fileName = Path.GetFileName(tempFile)!; + var fileName = Path.GetFileName(tempFile); using var container = new DirectoryFileContainer(dir); // Act @@ -225,7 +225,7 @@ public void FileAssertXmlAssert_Run_InvalidXPathQuery_WritesError() using var context = Context.Create(["--silent"]); var dir = Path.GetDirectoryName(tempFile)!; - var fileName = Path.GetFileName(tempFile)!; + var fileName = Path.GetFileName(tempFile); using var container = new DirectoryFileContainer(dir); // Act @@ -256,7 +256,7 @@ public void FileAssertXmlAssert_Run_XPathExactTextMatch_Matches_NoError() using var context = Context.Create(["--silent"]); var dir = Path.GetDirectoryName(tempFile)!; - var fileName = Path.GetFileName(tempFile)!; + var fileName = Path.GetFileName(tempFile); using var container = new DirectoryFileContainer(dir); // Act @@ -287,7 +287,7 @@ public void FileAssertXmlAssert_Run_MaxCount_Exceeded_WritesError() using var context = Context.Create(["--silent"]); var dir = Path.GetDirectoryName(tempFile)!; - var fileName = Path.GetFileName(tempFile)!; + var fileName = Path.GetFileName(tempFile); using var container = new DirectoryFileContainer(dir); // Act @@ -318,7 +318,7 @@ public void FileAssertXmlAssert_Run_MinCount_NotMet_WritesError() using var context = Context.Create(["--silent"]); var dir = Path.GetDirectoryName(tempFile)!; - var fileName = Path.GetFileName(tempFile)!; + var fileName = Path.GetFileName(tempFile); using var container = new DirectoryFileContainer(dir); // Act @@ -349,7 +349,7 @@ public void FileAssertXmlAssert_Run_XPathExactTextMatch_NoMatch_WritesError() using var context = Context.Create(["--silent"]); var dir = Path.GetDirectoryName(tempFile)!; - var fileName = Path.GetFileName(tempFile)!; + var fileName = Path.GetFileName(tempFile); using var container = new DirectoryFileContainer(dir); // Act @@ -380,7 +380,7 @@ public void FileAssertXmlAssert_Run_XPathContainsText_Matches_NoError() using var context = Context.Create(["--silent"]); var dir = Path.GetDirectoryName(tempFile)!; - var fileName = Path.GetFileName(tempFile)!; + var fileName = Path.GetFileName(tempFile); using var container = new DirectoryFileContainer(dir); // Act @@ -411,7 +411,7 @@ public void FileAssertXmlAssert_Run_XPathContainsText_NoMatch_WritesError() using var context = Context.Create(["--silent"]); var dir = Path.GetDirectoryName(tempFile)!; - var fileName = Path.GetFileName(tempFile)!; + var fileName = Path.GetFileName(tempFile); using var container = new DirectoryFileContainer(dir); // Act diff --git a/test/DemaConsulting.FileAssert.Tests/Modeling/FileAssertYamlAssertTests.cs b/test/DemaConsulting.FileAssert.Tests/Modeling/FileAssertYamlAssertTests.cs index 27333f7..fd2deac 100644 --- a/test/DemaConsulting.FileAssert.Tests/Modeling/FileAssertYamlAssertTests.cs +++ b/test/DemaConsulting.FileAssert.Tests/Modeling/FileAssertYamlAssertTests.cs @@ -85,7 +85,7 @@ public void FileAssertYamlAssert_Run_InvalidFile_WritesError() using var context = Context.Create(["--silent"]); var dir = Path.GetDirectoryName(tempFile)!; - var fileName = Path.GetFileName(tempFile)!; + var fileName = Path.GetFileName(tempFile); using var container = new DirectoryFileContainer(dir); // Act @@ -116,7 +116,7 @@ public void FileAssertYamlAssert_Run_SequenceCount_Matches_NoError() using var context = Context.Create(["--silent"]); var dir = Path.GetDirectoryName(tempFile)!; - var fileName = Path.GetFileName(tempFile)!; + var fileName = Path.GetFileName(tempFile); using var container = new DirectoryFileContainer(dir); // Act @@ -147,7 +147,7 @@ public void FileAssertYamlAssert_Run_SequenceCount_Mismatch_WritesError() using var context = Context.Create(["--silent"]); var dir = Path.GetDirectoryName(tempFile)!; - var fileName = Path.GetFileName(tempFile)!; + var fileName = Path.GetFileName(tempFile); using var container = new DirectoryFileContainer(dir); // Act @@ -178,7 +178,7 @@ public void FileAssertYamlAssert_Run_MinMaxCount_WithinBounds_NoError() using var context = Context.Create(["--silent"]); var dir = Path.GetDirectoryName(tempFile)!; - var fileName = Path.GetFileName(tempFile)!; + var fileName = Path.GetFileName(tempFile); using var container = new DirectoryFileContainer(dir); // Act @@ -209,7 +209,7 @@ public void FileAssertYamlAssert_Run_ScalarValue_CountsAsOne_NoError() using var context = Context.Create(["--silent"]); var dir = Path.GetDirectoryName(tempFile)!; - var fileName = Path.GetFileName(tempFile)!; + var fileName = Path.GetFileName(tempFile); using var container = new DirectoryFileContainer(dir); // Act @@ -240,7 +240,7 @@ public void FileAssertYamlAssert_Run_MinCount_BelowMinimum_WritesError() using var context = Context.Create(["--silent"]); var dir = Path.GetDirectoryName(tempFile)!; - var fileName = Path.GetFileName(tempFile)!; + var fileName = Path.GetFileName(tempFile); using var container = new DirectoryFileContainer(dir); // Act @@ -271,7 +271,7 @@ public void FileAssertYamlAssert_Run_MaxCount_ExceedsMaximum_WritesError() using var context = Context.Create(["--silent"]); var dir = Path.GetDirectoryName(tempFile)!; - var fileName = Path.GetFileName(tempFile)!; + var fileName = Path.GetFileName(tempFile); using var container = new DirectoryFileContainer(dir); // Act @@ -395,7 +395,7 @@ public void FileAssertYamlAssert_Run_EmptyDocument_ReportsZeroCount() using var context = Context.Create(["--silent"]); var dir = Path.GetDirectoryName(tempFile)!; - var fileName = Path.GetFileName(tempFile)!; + var fileName = Path.GetFileName(tempFile); using var container = new DirectoryFileContainer(dir); // Act @@ -431,7 +431,7 @@ public void FileAssertYamlAssert_Run_InvalidFile_RemainingAssertionsSkipped() var context = new CapturingContext(); var dir = Path.GetDirectoryName(tempFile)!; - var fileName = Path.GetFileName(tempFile)!; + var fileName = Path.GetFileName(tempFile); using var container = new DirectoryFileContainer(dir); // Act diff --git a/test/DemaConsulting.FileAssert.Tests/Modeling/FileAssertZipAssertTests.cs b/test/DemaConsulting.FileAssert.Tests/Modeling/FileAssertZipAssertTests.cs index 3cba266..883b0b6 100644 --- a/test/DemaConsulting.FileAssert.Tests/Modeling/FileAssertZipAssertTests.cs +++ b/test/DemaConsulting.FileAssert.Tests/Modeling/FileAssertZipAssertTests.cs @@ -322,7 +322,7 @@ public void FileAssertZipAssert_Run_MatchingEntriesMeetConstraints_NoError() using var context = Context.Create(["--silent"]); var dir = Path.GetDirectoryName(tempFile)!; - var fileName = Path.GetFileName(tempFile)!; + var fileName = Path.GetFileName(tempFile); using var container = new DirectoryFileContainer(dir); // Act @@ -361,7 +361,7 @@ public void FileAssertZipAssert_Run_GlobPatternMatchesMultipleEntries_NoError() using var context = Context.Create(["--silent"]); var dir = Path.GetDirectoryName(tempFile)!; - var fileName = Path.GetFileName(tempFile)!; + var fileName = Path.GetFileName(tempFile); using var container = new DirectoryFileContainer(dir); // Act @@ -400,7 +400,7 @@ public void FileAssertZipAssert_Run_TooFewMatchingEntries_WritesError() using var context = Context.Create(["--silent"]); var dir = Path.GetDirectoryName(tempFile)!; - var fileName = Path.GetFileName(tempFile)!; + var fileName = Path.GetFileName(tempFile); using var container = new DirectoryFileContainer(dir); // Act @@ -439,7 +439,7 @@ public void FileAssertZipAssert_Run_TooManyMatchingEntries_WritesError() using var context = Context.Create(["--silent"]); var dir = Path.GetDirectoryName(tempFile)!; - var fileName = Path.GetFileName(tempFile)!; + var fileName = Path.GetFileName(tempFile); using var container = new DirectoryFileContainer(dir); // Act @@ -477,7 +477,7 @@ public void FileAssertZipAssert_Run_InvalidZipFile_WritesError() using var context = Context.Create(["--silent"]); var dir = Path.GetDirectoryName(tempFile)!; - var fileName = Path.GetFileName(tempFile)!; + var fileName = Path.GetFileName(tempFile); using var container = new DirectoryFileContainer(dir); // Act @@ -550,7 +550,7 @@ public void FileAssertZipAssert_Run_EntryContainsRequiredText_NoError() using var context = Context.Create(["--silent"]); var dir = Path.GetDirectoryName(tempFile)!; - var fileName = Path.GetFileName(tempFile)!; + var fileName = Path.GetFileName(tempFile); using var container = new DirectoryFileContainer(dir); // Act @@ -592,7 +592,7 @@ public void FileAssertZipAssert_Run_EntryMissingRequiredText_WritesError() using var context = Context.Create(["--silent"]); var dir = Path.GetDirectoryName(tempFile)!; - var fileName = Path.GetFileName(tempFile)!; + var fileName = Path.GetFileName(tempFile); using var container = new DirectoryFileContainer(dir); // Act @@ -635,7 +635,7 @@ public void FileAssertZipAssert_Run_EntryXmlMatchesXPath_NoError() using var context = Context.Create(["--silent"]); var dir = Path.GetDirectoryName(tempFile)!; - var fileName = Path.GetFileName(tempFile)!; + var fileName = Path.GetFileName(tempFile); using var container = new DirectoryFileContainer(dir); // Act @@ -678,7 +678,7 @@ public void FileAssertZipAssert_Run_EntryXmlFailsXPath_WritesError() using var context = Context.Create(["--silent"]); var dir = Path.GetDirectoryName(tempFile)!; - var fileName = Path.GetFileName(tempFile)!; + var fileName = Path.GetFileName(tempFile); using var container = new DirectoryFileContainer(dir); // Act @@ -728,7 +728,7 @@ public void FileAssertZipAssert_Run_EntryHtmlMatchesXPath_NoError() using var context = Context.Create(["--silent"]); var dir = Path.GetDirectoryName(tempFile)!; - var fileName = Path.GetFileName(tempFile)!; + var fileName = Path.GetFileName(tempFile); using var container = new DirectoryFileContainer(dir); // Act @@ -784,7 +784,7 @@ public void FileAssertZipAssert_Run_EntryPdfMatchesConstraint_NoError() using var context = Context.Create(["--silent"]); var dir = Path.GetDirectoryName(tempFile)!; - var fileName = Path.GetFileName(tempFile)!; + var fileName = Path.GetFileName(tempFile); using var container = new DirectoryFileContainer(dir); // Act @@ -827,7 +827,7 @@ public void FileAssertZipAssert_Run_EntryYamlMatchesQuery_NoError() using var context = Context.Create(["--silent"]); var dir = Path.GetDirectoryName(tempFile)!; - var fileName = Path.GetFileName(tempFile)!; + var fileName = Path.GetFileName(tempFile); using var container = new DirectoryFileContainer(dir); // Act @@ -870,7 +870,7 @@ public void FileAssertZipAssert_Run_EntryYamlFailsQuery_WritesError() using var context = Context.Create(["--silent"]); var dir = Path.GetDirectoryName(tempFile)!; - var fileName = Path.GetFileName(tempFile)!; + var fileName = Path.GetFileName(tempFile); using var container = new DirectoryFileContainer(dir); // Act @@ -913,7 +913,7 @@ public void FileAssertZipAssert_Run_EntryJsonMatchesQuery_NoError() using var context = Context.Create(["--silent"]); var dir = Path.GetDirectoryName(tempFile)!; - var fileName = Path.GetFileName(tempFile)!; + var fileName = Path.GetFileName(tempFile); using var container = new DirectoryFileContainer(dir); // Act @@ -956,7 +956,7 @@ public void FileAssertZipAssert_Run_EntryJsonFailsQuery_WritesError() using var context = Context.Create(["--silent"]); var dir = Path.GetDirectoryName(tempFile)!; - var fileName = Path.GetFileName(tempFile)!; + var fileName = Path.GetFileName(tempFile); using var container = new DirectoryFileContainer(dir); // Act @@ -993,7 +993,7 @@ public void FileAssertZipAssert_Run_EntryMeetsMinSizeConstraint_NoError() using var context = Context.Create(["--silent"]); var dir = Path.GetDirectoryName(tempFile)!; - var fileName = Path.GetFileName(tempFile)!; + var fileName = Path.GetFileName(tempFile); using var container = new DirectoryFileContainer(dir); // Act @@ -1030,7 +1030,7 @@ public void FileAssertZipAssert_Run_EntryBelowMinSizeConstraint_WritesError() using var context = Context.Create(["--silent"]); var dir = Path.GetDirectoryName(tempFile)!; - var fileName = Path.GetFileName(tempFile)!; + var fileName = Path.GetFileName(tempFile); using var container = new DirectoryFileContainer(dir); // Act @@ -1067,7 +1067,7 @@ public void FileAssertZipAssert_Run_EntryMeetsMaxSizeConstraint_NoError() using var context = Context.Create(["--silent"]); var dir = Path.GetDirectoryName(tempFile)!; - var fileName = Path.GetFileName(tempFile)!; + var fileName = Path.GetFileName(tempFile); using var container = new DirectoryFileContainer(dir); // Act @@ -1104,7 +1104,7 @@ public void FileAssertZipAssert_Run_EntryExceedsMaxSizeConstraint_WritesError() using var context = Context.Create(["--silent"]); var dir = Path.GetDirectoryName(tempFile)!; - var fileName = Path.GetFileName(tempFile)!; + var fileName = Path.GetFileName(tempFile); using var container = new DirectoryFileContainer(dir); // Act @@ -1162,7 +1162,7 @@ public void FileAssertZipAssert_Run_NestedZipTextContent_InnerEntryContentMatche using var context = Context.Create(["--silent"]); var dir = Path.GetDirectoryName(tempFile)!; - var fileName = Path.GetFileName(tempFile)!; + var fileName = Path.GetFileName(tempFile); using var container = new DirectoryFileContainer(dir); // Act @@ -1205,7 +1205,7 @@ public void FileAssertZipAssert_Run_ContentAssertionFails_ErrorContainsBreadcrum var capturingContext = new CapturingContext(); var dir = Path.GetDirectoryName(tempFile)!; - var fileName = Path.GetFileName(tempFile)!; + var fileName = Path.GetFileName(tempFile); using var container = new DirectoryFileContainer(dir); // Act