Skip to content

Commit 04be977

Browse files
committed
[Tests] Upgrade to xunit v3
Upgrading xunit to v3 to see if this helps our stability issues any.
1 parent 0488c42 commit 04be977

File tree

121 files changed

+381
-801
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

121 files changed

+381
-801
lines changed

Directory.Build.props

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
<PackageProjectUrl>https://stackexchange.github.io/StackExchange.Redis/</PackageProjectUrl>
1616
<PackageLicenseExpression>MIT</PackageLicenseExpression>
1717

18-
<LangVersion>11</LangVersion>
18+
<LangVersion>12</LangVersion>
1919
<RepositoryType>git</RepositoryType>
2020
<RepositoryUrl>https://github.com/StackExchange/StackExchange.Redis/</RepositoryUrl>
2121

Directory.Packages.props

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
<!-- For binding redirect testing, main package gets this transitively -->
2626
<PackageVersion Include="System.IO.Pipelines" Version="9.0.0" />
2727
<PackageVersion Include="System.Runtime.Caching" Version="9.0.0" />
28-
<PackageVersion Include="xunit" Version="2.9.3" />
28+
<PackageVersion Include="xunit.v3" Version="2.0.3" />
2929
<PackageVersion Include="xunit.runner.visualstudio" Version="3.1.1" />
3030
</ItemGroup>
3131
</Project>

tests/StackExchange.Redis.Tests/AbortOnConnectFailTests.cs

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,14 +2,11 @@
22
using System.Threading.Tasks;
33
using StackExchange.Redis.Tests.Helpers;
44
using Xunit;
5-
using Xunit.Abstractions;
65

76
namespace StackExchange.Redis.Tests;
87

9-
public class AbortOnConnectFailTests : TestBase
8+
public class AbortOnConnectFailTests(ITestOutputHelper output) : TestBase(output)
109
{
11-
public AbortOnConnectFailTests(ITestOutputHelper output) : base(output) { }
12-
1310
[Fact]
1411
public void NeverEverConnectedNoBacklogThrowsConnectionNotAvailableSync()
1512
{

tests/StackExchange.Redis.Tests/AdhocTests.cs

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,10 @@
11
using Xunit;
2-
using Xunit.Abstractions;
32

43
namespace StackExchange.Redis.Tests;
54

65
[Collection(SharedConnectionFixture.Key)]
7-
public class AdhocTests : TestBase
6+
public class AdhocTests(ITestOutputHelper output, SharedConnectionFixture fixture) : TestBase(output, fixture)
87
{
9-
public AdhocTests(ITestOutputHelper output, SharedConnectionFixture fixture) : base(output, fixture) { }
10-
118
[Fact]
129
public void TestAdhocCommandsAPI()
1310
{

tests/StackExchange.Redis.Tests/AggressiveTests.cs

Lines changed: 11 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,16 @@
11
using System.Threading;
22
using System.Threading.Tasks;
33
using Xunit;
4-
using Xunit.Abstractions;
54

65
namespace StackExchange.Redis.Tests;
76

87
[Collection(NonParallelCollection.Name)]
9-
public class AggressiveTests : TestBase
8+
public class AggressiveTests(ITestOutputHelper output) : TestBase(output)
109
{
11-
public AggressiveTests(ITestOutputHelper output) : base(output) { }
12-
13-
[FactLongRunning]
10+
[Fact]
1411
public async Task ParallelTransactionsWithConditions()
1512
{
13+
Skip.UnlessLongRunning();
1614
const int Muxers = 4, Workers = 20, PerThread = 250;
1715

1816
var muxers = new IConnectionMultiplexer[Muxers];
@@ -73,9 +71,10 @@ public async Task ParallelTransactionsWithConditions()
7371

7472
private const int IterationCount = 5000, InnerCount = 20;
7573

76-
[FactLongRunning]
74+
[Fact]
7775
public void RunCompetingBatchesOnSameMuxer()
7876
{
77+
Skip.UnlessLongRunning();
7978
using var conn = Create();
8079
var db = conn.GetDatabase();
8180

@@ -132,9 +131,10 @@ private static void BatchRunPings(IDatabase db)
132131
}
133132
}
134133

135-
[FactLongRunning]
134+
[Fact]
136135
public async Task RunCompetingBatchesOnSameMuxerAsync()
137136
{
137+
Skip.UnlessLongRunning();
138138
using var conn = Create();
139139
var db = conn.GetDatabase();
140140

@@ -189,9 +189,10 @@ private static async Task BatchRunPingsAsync(IDatabase db)
189189
}
190190
}
191191

192-
[FactLongRunning]
192+
[Fact]
193193
public void RunCompetingTransactionsOnSameMuxer()
194194
{
195+
Skip.UnlessLongRunning();
195196
using var conn = Create(logTransactionData: false);
196197
var db = conn.GetDatabase();
197198

@@ -252,9 +253,10 @@ private void TranRunPings(IDatabase db)
252253
}
253254
}
254255

255-
[FactLongRunning]
256+
[Fact]
256257
public async Task RunCompetingTransactionsOnSameMuxerAsync()
257258
{
259+
Skip.UnlessLongRunning();
258260
using var conn = Create(logTransactionData: false);
259261
var db = conn.GetDatabase();
260262

tests/StackExchange.Redis.Tests/AsyncTests.cs

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,15 +3,12 @@
33
using System.Linq;
44
using System.Threading.Tasks;
55
using Xunit;
6-
using Xunit.Abstractions;
76

87
namespace StackExchange.Redis.Tests;
98

109
[Collection(NonParallelCollection.Name)]
11-
public class AsyncTests : TestBase
10+
public class AsyncTests(ITestOutputHelper output) : TestBase(output)
1211
{
13-
public AsyncTests(ITestOutputHelper output) : base(output) { }
14-
1512
protected override string GetConfiguration() => TestConfig.Current.PrimaryServerAndPort;
1613

1714
[Fact]

tests/StackExchange.Redis.Tests/AzureMaintenanceEventTests.cs

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,14 +3,11 @@
33
using System.Net;
44
using StackExchange.Redis.Maintenance;
55
using Xunit;
6-
using Xunit.Abstractions;
76

87
namespace StackExchange.Redis.Tests;
98

10-
public class AzureMaintenanceEventTests : TestBase
9+
public class AzureMaintenanceEventTests(ITestOutputHelper output) : TestBase(output)
1110
{
12-
public AzureMaintenanceEventTests(ITestOutputHelper output) : base(output) { }
13-
1411
[Theory]
1512
[InlineData("NotificationType|NodeMaintenanceStarting|StartTimeInUTC|2021-03-02T23:26:57|IsReplica|False|IPAddress||SSLPort|15001|NonSSLPort|13001", AzureNotificationType.NodeMaintenanceStarting, "2021-03-02T23:26:57", false, null, 15001, 13001)]
1613
[InlineData("NotificationType|NodeMaintenanceFailover|StartTimeInUTC||IsReplica|False|IPAddress||SSLPort|15001|NonSSLPort|13001", AzureNotificationType.NodeMaintenanceFailoverComplete, null, false, null, 15001, 13001)]

tests/StackExchange.Redis.Tests/BacklogTests.cs

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,11 @@
11
using System;
22
using System.Threading.Tasks;
33
using Xunit;
4-
using Xunit.Abstractions;
54

65
namespace StackExchange.Redis.Tests;
76

8-
public class BacklogTests : TestBase
7+
public class BacklogTests(ITestOutputHelper output) : TestBase(output)
98
{
10-
public BacklogTests(ITestOutputHelper output) : base(output) { }
11-
129
protected override string GetConfiguration() => TestConfig.Current.PrimaryServerAndPort + "," + TestConfig.Current.ReplicaServerAndPort;
1310

1411
[Fact]

tests/StackExchange.Redis.Tests/BasicOpTests.cs

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -3,23 +3,18 @@
33
using System.Threading.Tasks;
44
using StackExchange.Redis.KeyspaceIsolation;
55
using Xunit;
6-
using Xunit.Abstractions;
76

87
namespace StackExchange.Redis.Tests;
98

109
[Collection(SharedConnectionFixture.Key)]
11-
public class HighIntegrityBasicOpsTests : BasicOpsTests
10+
public class HighIntegrityBasicOpsTests(ITestOutputHelper output, SharedConnectionFixture fixture) : BasicOpsTests(output, fixture)
1211
{
13-
public HighIntegrityBasicOpsTests(ITestOutputHelper output, SharedConnectionFixture fixture) : base(output, fixture) { }
14-
1512
internal override bool HighIntegrity => true;
1613
}
1714

1815
[Collection(SharedConnectionFixture.Key)]
19-
public class BasicOpsTests : TestBase
16+
public class BasicOpsTests(ITestOutputHelper output, SharedConnectionFixture fixture) : TestBase(output, fixture)
2017
{
21-
public BasicOpsTests(ITestOutputHelper output, SharedConnectionFixture fixture) : base(output, fixture) { }
22-
2318
[Fact]
2419
public async Task PingOnce()
2520
{

tests/StackExchange.Redis.Tests/BatchTests.cs

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,15 +2,12 @@
22
using System.Collections.Generic;
33
using System.Threading.Tasks;
44
using Xunit;
5-
using Xunit.Abstractions;
65

76
namespace StackExchange.Redis.Tests;
87

98
[Collection(SharedConnectionFixture.Key)]
10-
public class BatchTests : TestBase
9+
public class BatchTests(ITestOutputHelper output, SharedConnectionFixture fixture) : TestBase(output, fixture)
1110
{
12-
public BatchTests(ITestOutputHelper output, SharedConnectionFixture fixture) : base(output, fixture) { }
13-
1411
[Fact]
1512
public void TestBatchNotSent()
1613
{

0 commit comments

Comments
 (0)