Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Update SingleFileApiTests #42971

Closed
wants to merge 1 commit into from
Closed

Update SingleFileApiTests #42971

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
79 changes: 17 additions & 62 deletions src/installer/tests/Microsoft.NET.HostModel.Tests/AppHost.Bundle.Tests/SingleFileApiTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
using System;
using System.IO;
using System.Text.RegularExpressions;
using BundleTests.Helpers;
using Microsoft.DotNet.Cli.Build.Framework;
using Microsoft.DotNet.CoreSetup.Test;
Expand All @@ -22,8 +23,10 @@ public void SelfContained_SingleFile_APITests()
{
var fixture = sharedTestState.TestFixture.Copy();
var singleFile = BundleSelfContainedApp(fixture);
string extractionDir = BundleHelper.GetExtractionRootDir(fixture).Name;
string bundleDir = BundleHelper.GetBundleDir(fixture).FullName;

Command.Create(singleFile, "fullyqualifiedname codebase appcontext cmdlineargs executing_assembly_location basedirectory")
Command.Create(singleFile, "fullyqualifiedname codebase appcontext cmdlineargs executing_assembly_location basedirectory native_search_dirs")
.CaptureStdErr()
.CaptureStdOut()
.Execute()
Expand All @@ -37,20 +40,25 @@ public void SelfContained_SingleFile_APITests()
// For single-file, Environment.GetCommandLineArgs[0] should return the file path of the host.
.And.HaveStdOutContaining("Command line args: " + singleFile)
.And.HaveStdOutContaining("ExecutingAssembly.Location: " + Environment.NewLine)
.And.HaveStdOutContaining("AppContext.BaseDirectory: " + Path.GetDirectoryName(singleFile));
.And.HaveStdOutContaining("AppContext.BaseDirectory: " + Path.GetDirectoryName(singleFile))
// If we don't extract anything to disk, the extraction dir shouldn't
// appear in the native search dirs.
.And.HaveStdOutMatching($"NATIVE_DLL_SEARCH_DIRECTORIES: .*{Regex.Escape(bundleDir)}")
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why not verify the list exactly? The variable shouldn't change much, should it?

.And.NotHaveStdOutContaining(extractionDir);
}

[Fact]
public void SelfContained_NetCoreApp3_CompatMode_SingleFile_APITests()
{
var fixture = sharedTestState.TestFixture.Copy();
var singleFile = BundleSelfContainedApp(fixture, BundleOptions.BundleAllContent);
var extractionBaseDir = BundleHelper.GetExtractionRootDir(fixture);
string bundleDir = BundleHelper.GetBundleDir(fixture).FullName;
string extractionDir = BundleHelper.GetExtractionRootDir(fixture).FullName;

Command.Create(singleFile, "fullyqualifiedname codebase appcontext cmdlineargs executing_assembly_location basedirectory")
Command.Create(singleFile, "fullyqualifiedname codebase appcontext cmdlineargs executing_assembly_location basedirectory native_search_dirs")
.CaptureStdErr()
.CaptureStdOut()
.EnvironmentVariable(BundleHelper.DotnetBundleExtractBaseEnvVariable, extractionBaseDir.FullName)
.EnvironmentVariable(BundleHelper.DotnetBundleExtractBaseEnvVariable, extractionDir)
.Execute()
.Should()
.Pass()
Expand All @@ -62,63 +70,10 @@ public void SelfContained_NetCoreApp3_CompatMode_SingleFile_APITests()
.And.NotHaveStdOutContaining("Microsoft.NETCore.App.deps.json") // No framework - it's self-contained
// For single-file, Environment.GetCommandLineArgs[0] should return the file path of the host.
.And.HaveStdOutContaining("Command line args: " + singleFile)
.And.HaveStdOutContaining("ExecutingAssembly.Location: " + extractionBaseDir.FullName) // Should point to the app's dll
.And.HaveStdOutContaining("AppContext.BaseDirectory: " + extractionBaseDir.FullName); // Should point to the extraction directory
}

[Fact]
public void GetCommandLineArgs_0_Non_Bundled_App()
{
var fixture = sharedTestState.TestFixture.Copy();
var dotnet = fixture.BuiltDotnet;
var appPath = BundleHelper.GetAppPath(fixture);

// For non single-file apps, Environment.GetCommandLineArgs[0]
// should return the file path of the managed entrypoint.
dotnet.Exec(appPath, "cmdlineargs")
.CaptureStdErr()
.CaptureStdOut()
.Execute()
.Should()
.Pass()
.And
.HaveStdOutContaining(appPath);
}

[Fact]
public void AppContext_Native_Search_Dirs_Contains_Bundle_Dir()
{
var fixture = sharedTestState.TestFixture.Copy();
Bundler bundler = BundleHelper.BundleApp(fixture, out string singleFile);
string extractionDir = BundleHelper.GetExtractionDir(fixture, bundler).Name;
string bundleDir = BundleHelper.GetBundleDir(fixture).FullName;

// If we don't extract anything to disk, the extraction dir shouldn't
// appear in the native search dirs.
Command.Create(singleFile, "native_search_dirs")
.CaptureStdErr()
.CaptureStdOut()
.Execute()
.Should().Pass()
.And.HaveStdOutContaining(bundleDir)
.And.NotHaveStdOutContaining(extractionDir);
}

[Fact]
public void AppContext_Native_Search_Dirs_Contains_Bundle_And_Extraction_Dirs()
{
var fixture = sharedTestState.TestFixture.Copy();
Bundler bundler = BundleHelper.BundleApp(fixture, out string singleFile, BundleOptions.BundleNativeBinaries);
string extractionDir = BundleHelper.GetExtractionDir(fixture, bundler).Name;
string bundleDir = BundleHelper.GetBundleDir(fixture).FullName;

Command.Create(singleFile, "native_search_dirs")
.CaptureStdErr()
.CaptureStdOut()
.Execute()
.Should().Pass()
.And.HaveStdOutContaining(extractionDir)
.And.HaveStdOutContaining(bundleDir);
.And.HaveStdOutContaining("ExecutingAssembly.Location: " + extractionDir) // Should point to the app's dll
.And.HaveStdOutContaining("AppContext.BaseDirectory: " + extractionDir) // Should point to the extraction directory
// In extraction mode, we should have both dirs
.And.HaveStdOutMatching($"NATIVE_DLL_SEARCH_DIRECTORIES: .*{Regex.Escape(extractionDir)}.*{Regex.Escape(bundleDir)}");
}

public class SharedTestState : SharedTestStateBase, IDisposable
Expand Down