Simplify accessing the IntermediateOutputPath

0xced · Mar 11, 2024 · 5c96048 · 5c96048
1 parent cf7f515
commit 5c96048
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 8 deletions.
diff --git a/tests/Chisel.Tests/ChiseledAppTests.cs b/tests/Chisel.Tests/ChiseledAppTests.cs
@@ -60,8 +60,7 @@ public async Task RunTestApp(PublishMode publishMode)
         stdOut.Should().Contain("✅");
         stdErr.Should().BeEmpty();
 
-        var intermediateOutputPath = await _testApp.GetIntermediateOutputPathAsync();
-        await Verifier.VerifyFile(Path.Combine(intermediateOutputPath, "TestApp.Chisel.gv")).DisableRequireUniquePrefix();
+        await Verifier.VerifyFile(_testApp.IntermediateOutputPath.File("TestApp.Chisel.gv")).DisableRequireUniquePrefix();
     }
 
     private async Task<(string StdOut, string StdErr)> RunTestAppAsync(PublishMode publishMode, params string[] args)

diff --git a/tests/Chisel.Tests/Support/TestApp.cs b/tests/Chisel.Tests/Support/TestApp.cs
@@ -50,11 +50,7 @@ Task IAsyncLifetime.DisposeAsync()
 
     public string GetExecutablePath(PublishMode publishMode) => _executables[publishMode].FullName;
 
-    public async Task<string> GetIntermediateOutputPathAsync()
-    {
-        var result = await RunDotnetAsync(_workingDirectory, "build", "--getProperty:IntermediateOutputPath", "--configuration", "Release");
-        return Path.Combine(_workingDirectory.FullName, result.TrimEnd());
-    }
+    public DirectoryInfo IntermediateOutputPath { get; private set; }
 
     private async Task CreateTestAppAsync()
     {
@@ -93,6 +89,9 @@ private async Task RestoreAsync()
             "-p:Configuration=Release",
         };
         await RunDotnetAsync(_workingDirectory, restoreArgs);
+
+        var intermediateOutputPath = await RunDotnetAsync(_workingDirectory, "build", "--getProperty:IntermediateOutputPath", "--configuration", "Release");
+        IntermediateOutputPath = _workingDirectory.SubDirectory(intermediateOutputPath.TrimEnd());
     }
 
     private async Task PublishAsync(PublishMode publishMode)
@@ -112,7 +111,7 @@ private async Task PublishAsync(PublishMode publishMode)
         await RunDotnetAsync(_workingDirectory, publishArgs);
 
         var executableFileName = RuntimeInformation.IsOSPlatform(OSPlatform.Windows) ? "TestApp.exe" : "TestApp";
-        var executableFile = new FileInfo(Path.Combine(outputDirectory.FullName, executableFileName));
+        var executableFile = outputDirectory.File(executableFileName);
         executableFile.Exists.Should().BeTrue();
         var dlls = executableFile.Directory!.EnumerateFiles("*.dll");
         if (publishMode == PublishMode.Standard)