Skip to content

Bump the xunit group with 1 update #2154

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

Closed
wants to merge 2 commits into from
Closed

Bump the xunit group with 1 update #2154

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
df10b2e
Bump the xunit group with 1 update
dependabot[bot] Apr 8, 2024
2cb3adf
Fix deadlocks in tests when there's no sync context
bradwilson Apr 9, 2024
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 test/PowerShellEditorServices.Test.E2E/PowerShellEditorServices.Test.E2E.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
<ItemGroup>
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.9.0" />
<PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
<PackageReference Include="xunit" Version="2.6.6" />
<PackageReference Include="xunit" Version="2.7.0" />
<PackageReference Include="xunit.runner.visualstudio" Version="2.5.7" />
<PackageReference Include="Xunit.SkippableFact" Version="1.4.13" />
</ItemGroup>
Expand Down
38 changes: 19 additions & 19 deletions test/PowerShellEditorServices.Test.E2E/packages.lock.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,13 +41,13 @@
},
"xunit": {
"type": "Direct",
"requested": "[2.6.6, )",
"resolved": "2.6.6",
"contentHash": "MAbOOMtZIKyn2lrAmMlvhX0BhDOX/smyrTB+8WTXnSKkrmTGBS2fm8g1PZtHBPj91Dc5DJA7fY+/81TJ/yUFZw==",
"requested": "[2.7.0, )",
"resolved": "2.7.0",
"contentHash": "KcCI5zxh8zbUfQTeErc4oT7YokViVND2V0p4vDJ2VD4lhF9V5qCYMMDNixme7FdwYy3SwPHF+2xC2Dq4Z9GSlA==",
"dependencies": {
"xunit.analyzers": "1.10.0",
"xunit.assert": "2.6.6",
"xunit.core": "[2.6.6]"
"xunit.analyzers": "1.11.0",
"xunit.assert": "2.7.0",
"xunit.core": "[2.7.0]"
}
},
"xunit.runner.visualstudio": {
Expand Down Expand Up @@ -444,37 +444,37 @@
},
"xunit.analyzers": {
"type": "Transitive",
"resolved": "1.10.0",
"contentHash": "Lw8CiDy5NaAWcO6keqD7iZHYUTIuCOcoFrUHw5Sv84ITZ9gFeDybdkVdH0Y2maSlP9fUjtENyiykT44zwFQIHA=="
"resolved": "1.11.0",
"contentHash": "SCv+Ihxv+fCqotGeM8sVwLhw8nzAJ2aFRN5lcoKn9QtGdbVJ79JqDc+4u8/Ddnp2udxtmv+xYFWkHNlb/sk01w=="
},
"xunit.assert": {
"type": "Transitive",
"resolved": "2.6.6",
"contentHash": "74Cm9lAZOk5TKCz2MvCBCByKsS23yryOKDIMxH3XRDHXmfGM02jKZWzRA7g4mGB41GnBnv/pcWP3vUYkrCtEcg=="
"resolved": "2.7.0",
"contentHash": "CCTs3bUhmIS4tDwK6Cn/IiabG3RhYzdf65eIkO7u9/grKoN9MrN780LzVED3E8v+vwmmj7b5TW3/GFuZHPAzWA=="
},
"xunit.core": {
"type": "Transitive",
"resolved": "2.6.6",
"contentHash": "tqi7RfaNBqM7t8zx6QHryuBPzmotsZXKGaWnopQG2Ez5UV7JoWuyoNdT6gLpDIcKdGYey6YTXJdSr9IXDMKwjg==",
"resolved": "2.7.0",
"contentHash": "98tzqYAbtc/p/2Ba455XTNbD12Qoo8kPehjC4oDT46CAsLli5JOCU9hFF2MV3HHWMw/Y3yFUV2Vcukplbs6kuA==",
"dependencies": {
"xunit.extensibility.core": "[2.6.6]",
"xunit.extensibility.execution": "[2.6.6]"
"xunit.extensibility.core": "[2.7.0]",
"xunit.extensibility.execution": "[2.7.0]"
}
},
"xunit.extensibility.core": {
"type": "Transitive",
"resolved": "2.6.6",
"contentHash": "ty6VKByzbx4Toj4/VGJLEnlmOawqZiMv0in/tLju+ftA+lbWuAWDERM+E52Jfhj4ZYHrAYVa14KHK5T+dq0XxA==",
"resolved": "2.7.0",
"contentHash": "JLnx4PI0vn1Xr1Ust6ydrp2t/ktm2dyGPAVoDJV5gQuvBMSbd2K7WGzODa2ttiz030CeQ8nbsXl05+cvf7QNyA==",
"dependencies": {
"xunit.abstractions": "2.0.3"
}
},
"xunit.extensibility.execution": {
"type": "Transitive",
"resolved": "2.6.6",
"contentHash": "UDjIVGj2TepVKN3n32/qXIdb3U6STwTb9L6YEwoQO2A8OxiJS5QAVv2l1aT6tDwwv/9WBmm8Khh/LyHALipcng==",
"resolved": "2.7.0",
"contentHash": "bjY+crT1jOyxKagFjCMdEVzoenO2v66ru8+CK/0UaXvyG4U9Q3UTieJkbQXbi7/1yZIK1sGh01l5/jh2CwLJtQ==",
"dependencies": {
"xunit.extensibility.core": "[2.6.6]"
"xunit.extensibility.core": "[2.7.0]"
}
},
"Microsoft.PowerShell.EditorServices": {
Expand Down
11 changes: 5 additions & 6 deletions test/PowerShellEditorServices.Test/Debugging/DebugServiceTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ internal class TestReadLine : IReadLine
}

[Trait("Category", "DebugService")]
public class DebugServiceTests : IDisposable
public class DebugServiceTests : IAsyncLifetime
{
private readonly PsesInternalHost psesHost;
private readonly BreakpointService breakpointService;
Expand Down Expand Up @@ -76,14 +76,13 @@ public DebugServiceTests()
variableScriptFile = GetDebugScript("VariableTest.ps1");
}

public void Dispose()
public Task InitializeAsync() => Task.CompletedTask;

public async Task DisposeAsync()
{
debugService.Abort();
debuggerStoppedQueue.Dispose();
#pragma warning disable VSTHRD002
psesHost.StopAsync().Wait();
#pragma warning restore VSTHRD002
GC.SuppressFinalize(this);
await Task.Run(psesHost.StopAsync);
}

/// <summary>
Expand Down
20 changes: 6 additions & 14 deletions test/PowerShellEditorServices.Test/Extensions/ExtensionCommandTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,33 +20,25 @@
namespace PowerShellEditorServices.Test.Extensions
{
[Trait("Category", "Extensions")]
public class ExtensionCommandTests : IDisposable
public class ExtensionCommandTests : IAsyncLifetime
{
private readonly PsesInternalHost psesHost;
private PsesInternalHost psesHost;

private readonly ExtensionCommandService extensionCommandService;
private ExtensionCommandService extensionCommandService;

public ExtensionCommandTests()
public async Task InitializeAsync()
{
psesHost = PsesHostFactory.Create(NullLoggerFactory.Instance);
ExtensionService extensionService = new(
languageServer: null,
serviceProvider: null,
editorOperations: null,
executionService: psesHost);
#pragma warning disable VSTHRD002
extensionService.InitializeAsync().Wait();
#pragma warning restore VSTHRD002
await extensionService.InitializeAsync();
extensionCommandService = new(extensionService);
}

public void Dispose()
{
#pragma warning disable VSTHRD002
psesHost.StopAsync().Wait();
#pragma warning restore VSTHRD002
GC.SuppressFinalize(this);
}
public async Task DisposeAsync() => await psesHost.StopAsync();

[Fact]
public async Task CanRegisterAndInvokeCommandWithCmdletName()
Expand Down
13 changes: 4 additions & 9 deletions test/PowerShellEditorServices.Test/Language/CompletionHandlerTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
// Copyright (c) Microsoft Corporation.
// Licensed under the MIT License.

using System;
using System.Collections.Generic;
using System.Linq;
using System.Threading;
Expand All @@ -21,7 +20,7 @@
namespace PowerShellEditorServices.Test.Language
{
[Trait("Category", "Completions")]
public class CompletionHandlerTests : IDisposable
public class CompletionHandlerTests : IAsyncLifetime
{
private readonly PsesInternalHost psesHost;
private readonly WorkspaceService workspace;
Expand All @@ -34,13 +33,9 @@ public CompletionHandlerTests()
completionHandler = new PsesCompletionHandler(NullLoggerFactory.Instance, psesHost, psesHost, workspace);
}

public void Dispose()
{
#pragma warning disable VSTHRD002
psesHost.StopAsync().Wait();
#pragma warning restore VSTHRD002
GC.SuppressFinalize(this);
}
public Task InitializeAsync() => Task.CompletedTask;

public async Task DisposeAsync() => await Task.Run(psesHost.StopAsync);

private ScriptFile GetScriptFile(ScriptRegion scriptRegion) => workspace.GetFile(TestUtilities.GetSharedPath(scriptRegion.File));

Expand Down
12 changes: 5 additions & 7 deletions test/PowerShellEditorServices.Test/Language/SymbolsServiceTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
// Copyright (c) Microsoft Corporation.
// Licensed under the MIT License.

using System;
using System.Collections.Generic;
using System.Linq;
using System.Management.Automation;
Expand Down Expand Up @@ -30,7 +29,7 @@
namespace PowerShellEditorServices.Test.Language
{
[Trait("Category", "Symbols")]
public class SymbolsServiceTests : IDisposable
public class SymbolsServiceTests : IAsyncLifetime
{
private readonly PsesInternalHost psesHost;
private readonly WorkspaceService workspace;
Expand All @@ -53,14 +52,13 @@ public SymbolsServiceTests()
new ConfigurationService());
}

public void Dispose()
public Task InitializeAsync() => Task.CompletedTask;

public async Task DisposeAsync()
{
#pragma warning disable VSTHRD002
psesHost.StopAsync().GetAwaiter().GetResult();
#pragma warning restore VSTHRD002
psesHost.StopAsync();
CommandHelpers.s_cmdletToAliasCache.Clear();
CommandHelpers.s_aliasToCmdletCache.Clear();
GC.SuppressFinalize(this);
}

private static void AssertIsRegion(
Expand Down
2 changes: 1 addition & 1 deletion test/PowerShellEditorServices.Test/PowerShellEditorServices.Test.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@

<ItemGroup>
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.9.0" />
<PackageReference Include="xunit" Version="2.6.6" />
<PackageReference Include="xunit" Version="2.7.0" />
<PackageReference Include="xunit.runner.visualstudio" Version="2.5.7" />
<PackageReference Include="Xunit.SkippableFact" Version="1.4.13" />
</ItemGroup>
Expand Down
24 changes: 8 additions & 16 deletions test/PowerShellEditorServices.Test/Session/PsesInternalHostTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,19 +20,15 @@ namespace PowerShellEditorServices.Test.Session
using System.Management.Automation.Runspaces;

[Trait("Category", "PsesInternalHost")]
public class PsesInternalHostTests : IDisposable
public class PsesInternalHostTests : IAsyncLifetime
{
private readonly PsesInternalHost psesHost;

public PsesInternalHostTests() => psesHost = PsesHostFactory.Create(NullLoggerFactory.Instance);

public void Dispose()
{
#pragma warning disable VSTHRD002
psesHost.StopAsync().Wait();
#pragma warning restore VSTHRD002
GC.SuppressFinalize(this);
}
public Task InitializeAsync() => Task.CompletedTask;

public async Task DisposeAsync() => await psesHost.StopAsync();

[Fact]
public async Task CanExecutePSCommand()
Expand Down Expand Up @@ -238,19 +234,15 @@ public async Task CanHandleBadInitialWorkingDirectory(string path)
}

[Trait("Category", "PsesInternalHost")]
public class PsesInternalHostWithProfileTests : IDisposable
public class PsesInternalHostWithProfileTests : IAsyncLifetime
{
private readonly PsesInternalHost psesHost;

public PsesInternalHostWithProfileTests() => psesHost = PsesHostFactory.Create(NullLoggerFactory.Instance, loadProfiles: true);

public void Dispose()
{
#pragma warning disable VSTHRD002
psesHost.StopAsync().Wait();
#pragma warning restore VSTHRD002
GC.SuppressFinalize(this);
}
public Task InitializeAsync() => Task.CompletedTask;

public async Task DisposeAsync() => await psesHost.StopAsync();

[Fact]
public async Task CanResolveAndLoadProfilesForHostId()
Expand Down
Loading
Loading