Use xunit.skippablefact

redis · Nov 29, 2024 · 0f6c630 · 0f6c630
1 parent 3b26804
commit 0f6c630
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 48 deletions.
diff --git a/tests/NRedisStack.Tests/EndpointsFixture.cs b/tests/NRedisStack.Tests/EndpointsFixture.cs
@@ -1,5 +1,6 @@
 using StackExchange.Redis;
 using System.Text.Json;
+using Xunit;
 
 namespace NRedisStack.Tests;
 
@@ -85,10 +86,7 @@ public void Dispose()
 
     public ConnectionMultiplexer GetConnectionById(ConfigurationOptions configurationOptions, string id)
     {
-        if (!redisEndpoints.ContainsKey(id))
-        {
-            throw new Exception($"The connection with id '{id}' is not configured.");
-        }
+        Skip.IfNot(redisEndpoints.ContainsKey(id), $"The connection with id '{id}' is not configured.");
 
         return redisEndpoints[id].CreateConnection(configurationOptions);
     }

diff --git a/tests/NRedisStack.Tests/NRedisStack.Tests.csproj b/tests/NRedisStack.Tests/NRedisStack.Tests.csproj
@@ -28,10 +28,11 @@
     <PackageReference Include="NetTopologySuite" Version="2.5.0" />
     <PackageReference Include="xunit.runner.visualstudio" Version="2.4.3" />
     <PackageReference Include="StackExchange.Redis" Version="2.8.16" />
-    <PackageReference Include="xunit" Version="2.4.1" />
-    <PackageReference Include="xunit.assert" Version="2.4.1" />
-    <PackageReference Include="BouncyCastle.Cryptography" Version="2.2.0" />
+    <PackageReference Include="xunit" Version="2.5.3" />
+    <PackageReference Include="xunit.assert" Version="2.5.3" />
+    <PackageReference Include="BouncyCastle.Cryptography" Version="2.3.1" />
     <PackageReference Include="Microsoft.Azure.StackExchangeRedis" Version="3.1.0" />
+    <PackageReference Include="Xunit.SkippableFact" Version="1.4.13" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/tests/NRedisStack.Tests/SkipIfRedisAttribute.cs b/tests/NRedisStack.Tests/SkipIfRedisAttribute.cs
@@ -14,7 +14,7 @@ public enum Is
 }
 
 [AttributeUsage(AttributeTargets.Method, AllowMultiple = false)]
-public class SkipIfRedisAttribute : TheoryAttribute
+public class SkipIfRedisAttribute : SkippableTheoryAttribute
 {
     private readonly string _targetVersion;
     private readonly Comparison _comparison;

diff --git a/tests/NRedisStack.Tests/TargetEnvironmentAttribute.cs b/tests/NRedisStack.Tests/TargetEnvironmentAttribute.cs
diff --git a/tests/NRedisStack.Tests/TokenBasedAuthentication/AuthenticationTests.cs b/tests/NRedisStack.Tests/TokenBasedAuthentication/AuthenticationTests.cs
@@ -6,24 +6,23 @@
 
 namespace NRedisStack.Tests.TokenBasedAuthentication
 {
-    public class AuthenticationTests : AbstractNRedisStackTest
+    public class AuthenticationTests(EndpointsFixture endpointsFixture) : AbstractNRedisStackTest(endpointsFixture)
     {
         static readonly string key = "myKey";
         static readonly string value = "myValue";
         static readonly string index = "myIndex";
         static readonly string field = "myField";
         static readonly string alias = "myAlias";
-        public AuthenticationTests(RedisFixture redisFixture) : base(redisFixture) { }
 
-        [TargetEnvironment("standalone-entraid-acl")]
+        [SkippableFact]
         public void TestTokenBasedAuthentication()
         {
 
             var configurationOptions = new ConfigurationOptions().ConfigureForAzureWithTokenCredentialAsync(new DefaultAzureCredential()).Result!;
             configurationOptions.Ssl = false;
             configurationOptions.AbortOnConnectFail = true; // Fail fast for the purposes of this sample. In production code, this should remain false to retry connections on startup
 
-            ConnectionMultiplexer? connectionMultiplexer = redisFixture.GetConnectionById(configurationOptions, "standalone-entraid-acl");
+            ConnectionMultiplexer? connectionMultiplexer = GetConnection(configurationOptions, "standalone-entraid-acl");
 
             IDatabase db = connectionMultiplexer.GetDatabase();