Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion build.cake
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
// Load the recipe
#load nuget:?package=NUnit.Cake.Recipe&version=1.5.0-alpha.4
#load nuget:?package=NUnit.Cake.Recipe&version=1.5.0
// Comment out above line and uncomment below for local tests of recipe changes
//#load ../NUnit.Cake.Recipe/recipe/*.cake

Expand Down
4 changes: 2 additions & 2 deletions src/agent/nunit-agent-net80.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -24,8 +24,8 @@
</ItemGroup>

<ItemGroup>
<PackageReference Include="NUnit.Agent.Core" Version="4.0.0-alpha.39" />
<PackageReference Include="NUnit.Engine.Api" Version="4.0.0-alpha.39" />
<PackageReference Include="NUnit.Agent.Core" Version="4.0.0-alpha.40" />
<PackageReference Include="NUnit.Engine.Api" Version="4.0.0-alpha.40" />
</ItemGroup>

</Project>
2 changes: 1 addition & 1 deletion src/launcher/nunit-agent-launcher-net80.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="NUnit.Agent.Core" Version="4.0.0-alpha.39" />
<PackageReference Include="NUnit.Agent.Core" Version="4.0.0-alpha.40" />
</ItemGroup>

<ItemGroup>
Expand Down
34 changes: 17 additions & 17 deletions src/tests/Net80AgentLauncherTests.cs
Original file line number Diff line number Diff line change
Expand Up @@ -71,8 +71,8 @@ public void SetUp()
[TestCaseSource(nameof(RUNTIMES))]
public void CanCreateProcess(string runtime)
{
_package.Settings[EnginePackageSettings.TargetFrameworkName] = runtime;
_package.Settings[RUN_AS_X86] = false;
_package.AddSetting(SettingDefinitions.TargetFrameworkName.WithValue(runtime));
_package.AddSetting(SettingDefinitions.RunAsX86.WithValue(false));

bool supported = SUPPORTED.Contains(runtime);
Assert.That(_launcher.CanCreateAgent(_package), Is.EqualTo(supported));
Expand All @@ -81,8 +81,8 @@ public void CanCreateProcess(string runtime)
[TestCaseSource(nameof(RUNTIMES))]
public void CanCreateX86Process(string runtime)
{
_package.Settings[EnginePackageSettings.TargetFrameworkName] = runtime;
_package.Settings[RUN_AS_X86] = true;
_package.AddSetting(SettingDefinitions.TargetFrameworkName.WithValue(runtime));
_package.AddSetting(SettingDefinitions.RunAsX86.WithValue(true));

bool supported = SUPPORTED.Contains(runtime);
Assert.That(_launcher.CanCreateAgent(_package), Is.EqualTo(supported));
Expand All @@ -91,8 +91,8 @@ public void CanCreateX86Process(string runtime)
[TestCaseSource(nameof(RUNTIMES))]
public void CreateProcess(string runtime)
{
_package.Settings[EnginePackageSettings.TargetFrameworkName] = runtime;
_package.Settings[RUN_AS_X86] = false;
_package.AddSetting(SettingDefinitions.TargetFrameworkName.WithValue(runtime));
_package.AddSetting(SettingDefinitions.RunAsX86.WithValue(false));

if (SUPPORTED.Contains(runtime))
{
Expand All @@ -116,8 +116,8 @@ private void CheckAgentPath(Process process, bool x86)
[TestCaseSource(nameof(RUNTIMES))]
public void CreateX86Process(string runtime)
{
_package.Settings[EnginePackageSettings.TargetFrameworkName] = runtime;
_package.Settings[RUN_AS_X86] = true;
_package.AddSetting(SettingDefinitions.TargetFrameworkName.WithValue(runtime));
_package.AddSetting(SettingDefinitions.RunAsX86.WithValue(true));

if (SUPPORTED.Contains(runtime))
{
Expand Down Expand Up @@ -153,8 +153,8 @@ private void CheckStandardProcessSettings(Process process)
public void DebugAgentSetting()
{
var runtime = SUPPORTED[0];
_package.Settings[EnginePackageSettings.TargetFrameworkName] = runtime;
_package.Settings[DEBUG_AGENT] = true;
_package.AddSetting(SettingDefinitions.TargetFrameworkName.WithValue(runtime));
_package.AddSetting(SettingDefinitions.DebugAgent.WithValue(true));
var agentProcess = _launcher.CreateAgent(AGENTID, AGENCY_URL, _package);
Assert.That(agentProcess.StartInfo.Arguments, Does.Contain("--debug-agent"));
}
Expand All @@ -163,8 +163,8 @@ public void DebugAgentSetting()
public void TraceLevelSetting()
{
var runtime = SUPPORTED[0];
_package.Settings[EnginePackageSettings.TargetFrameworkName] = runtime;
_package.Settings[TRACE_LEVEL] = "Debug";
_package.AddSetting(SettingDefinitions.TargetFrameworkName.WithValue(runtime));
_package.AddSetting(SettingDefinitions.InternalTraceLevel.WithValue("Debug"));
var agentProcess = _launcher.CreateAgent(AGENTID, AGENCY_URL, _package);
Assert.That(agentProcess.StartInfo.Arguments, Does.Contain("--trace=Debug"));
}
Expand All @@ -173,18 +173,18 @@ public void TraceLevelSetting()
public void WorkDirectorySetting()
{
var runtime = SUPPORTED[0];
_package.Settings[EnginePackageSettings.TargetFrameworkName] = runtime;
_package.Settings[WORK_DIRECTORY] = "WORKDIRECTORY";
_package.AddSetting(SettingDefinitions.TargetFrameworkName.WithValue(runtime));
_package.AddSetting(SettingDefinitions.WorkDirectory.WithValue("WORKDIRECTORY"));
var agentProcess = _launcher.CreateAgent(AGENTID, AGENCY_URL, _package);
Assert.That(agentProcess.StartInfo.Arguments, Does.Contain("--work=WORKDIRECTORY"));
}

[Test]
public void LoadUserProfileSetting()
{
var runtime = SUPPORTED[0];
_package.Settings[EnginePackageSettings.TargetFrameworkName] = runtime;
_package.Settings[LOAD_USER_PROFILE] = true;
_package.AddSetting(SettingDefinitions.TargetFrameworkName.WithValue(runtime));
_package.AddSetting(SettingDefinitions.LoadUserProfile.WithValue(true));
var agentProcess = _launcher.CreateAgent(AGENTID, AGENCY_URL, _package);
Assert.That(agentProcess.StartInfo.LoadUserProfile, Is.True);
}
Expand Down
2 changes: 1 addition & 1 deletion src/tests/nunit-agent-launcher-net80.tests.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
<ItemGroup>
<PackageReference Include="NUnit" Version="4.1.0" />
<PackageReference Include="NUnitLite" Version="4.1.0" />
<PackageReference Include="NUnit.Engine.Api" Version="4.0.0-alpha.39" />
<PackageReference Include="NUnit.Engine.Api" Version="4.0.0-alpha.40" />
</ItemGroup>

<ItemGroup>
Expand Down
Loading