More debug output

martinsmith1968 · Aug 21, 2024 · 197f60e · 197f60e
1 parent 7ebb26b
commit 197f60e
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 18 deletions.
diff --git a/.github/workflows/ci-build.yml b/.github/workflows/ci-build.yml
@@ -118,6 +118,17 @@ jobs:
     - name: Test
       run: dotnet test --no-restore --no-build --configuration ${{ env.BUILD_CONFIG }} --verbosity normal --logger:trx;LogFileName=TestOutput.trx --collect:"XPlat Code Coverage"
 
+    - name: Test Results Summary
+      uses: bibipkins/[email protected]
+      if: success() || failure()
+      with:
+        github-token: ${{ secrets.GITHUB_TOKEN }}
+        comment-title: 'Unit Test Results'
+        results-path: "**/*.trx"
+        coverage-type: cobertura
+        #coverage-path: "**/coverage.cobertura.xml"
+        #coverage-threshold: ${{ env.COVERAGE_WARNING_THRESHOLD }}
+
     - name: Code Coverage Report
       uses: irongut/[email protected]
       if: success() || failure()
@@ -132,17 +143,6 @@ jobs:
         output: both
         thresholds: '${{ env.COVERAGE_ERROR_THRESHOLD }} ${{ env.COVERAGE_WARNING_THRESHOLD }}'
 
-    - name: Test Results Summary
-      uses: bibipkins/[email protected]
-      if: success() || failure()
-      with:
-        github-token: ${{ secrets.GITHUB_TOKEN }}
-        comment-title: 'Unit Test Results'
-        results-path: "**/*.trx"
-        coverage-type: cobertura
-        #coverage-path: "**/coverage.cobertura.xml"
-        #coverage-threshold: ${{ env.COVERAGE_WARNING_THRESHOLD }}
-
     - name: Pull Request - Add Coverage Comment
       uses: marocchino/sticky-pull-request-comment@v2
       if: github.event_name == 'pull_request'

diff --git a/...Extensions.Tests/IO/DirectoryInfoTests.cs → ....Tests/IO/DirectoryInfoExtensionsTests.cs b/...Extensions.Tests/IO/DirectoryInfoTests.cs → ....Tests/IO/DirectoryInfoExtensionsTests.cs
@@ -1,5 +1,5 @@
 using DNX.Extensions.IO;
-using DNX.Extensions.Linq;
+using DNX.Extensions.Strings;
 using FluentAssertions;
 using Xunit;
 using Xunit.Abstractions;
@@ -226,7 +226,7 @@ public void FindDirectories_for_multiple_patterns_with_recursion_finds_expected_
         [MemberData(nameof(GetRelativePath_Data))]
         public void GetRelativePath_can_extract_relative_path_correctly(string dirName, string relativeToDirName, string expected)
         {
-            _outputHelper.WriteLine($"{Environment.OSVersion.Platform} - Checking DirName: {dirName} -> {relativeToDirName}");
+            _outputHelper.WriteLine($"{Environment.OSVersion.Platform} - Checking DirName: {dirName} -> {relativeToDirName} = {expected}");
 
             var dirInfo = dirName == null ? null : new DirectoryInfo(dirName);
             var relativeToDirInfo = relativeToDirName == null ? null : new DirectoryInfo(relativeToDirName);
@@ -258,9 +258,9 @@ public static TheoryData<string, string, string> GetRelativePath_Data()
             {
                 data.Add(Path.Combine(Path.GetTempPath(), "folder1"), Path.Combine("D:", "folder2"), Path.Combine(Path.GetTempPath(), "folder1"));
             }
-            else if (Configuration.EnvironmentConfig.IsLinuxStyleFileSystem)
+            if (Configuration.EnvironmentConfig.IsLinuxStyleFileSystem)
             {
-                data.Add(Path.Combine(Path.GetTempPath(), "folder1"), Path.Combine("/etc", "folder2"), Path.Combine("..", "..", Path.GetTempPath(), "folder1"));
+                data.Add(Path.Combine(Path.GetTempPath(), "folder1"), Path.Combine("/etc", "folder2"), Path.Combine(Path.GetTempPath(), "folder1").EnsureStartsWith(Path.Combine("..", "..")));
             }
 
             return data;

diff --git a/tests/DNX.Extensions.Tests/IO/FileInfoExtensionsTests.cs b/tests/DNX.Extensions.Tests/IO/FileInfoExtensionsTests.cs
@@ -1,5 +1,4 @@
 using DNX.Extensions.IO;
-using DNX.Extensions.Linq;
 using FluentAssertions;
 using Xunit;
 using Xunit.Abstractions;
@@ -32,7 +31,7 @@ private static string DriveRoot2
         [MemberData(nameof(GetRelativeFileName_Data))]
         public void GetRelativeFileName_can_extract_relative_filename_correctly(string fileName, string dirName, string expected)
         {
-            outputHelper.WriteLine($"{Environment.OSVersion.Platform} - Checking FileName: {fileName} -> {dirName}");
+            outputHelper.WriteLine($"{Environment.OSVersion.Platform} - Checking FileName: {fileName} -> {dirName} = {expected}");
 
             var fileInfo = new FileInfo(fileName);
             var dirInfo = new DirectoryInfo(dirName);
@@ -46,7 +45,7 @@ public void GetRelativeFileName_can_extract_relative_filename_correctly(string f
         [MemberData(nameof(GetRelativeFilePath_Data))]
         public void GetRelativeFilePath_can_extract_relative_path_correctly(string fileName, string dirName, string expected)
         {
-            outputHelper.WriteLine($"{Environment.OSVersion.Platform} - Checking FileName: {fileName} -> {dirName}");
+            outputHelper.WriteLine($"{Environment.OSVersion.Platform} - Checking FileName: {fileName} -> {dirName} = {expected}");
 
             var fileInfo = new FileInfo(fileName);
             var dirInfo = new DirectoryInfo(dirName);