Delete trait

redis · Aug 10, 2023 · 5496d02 · 5496d02
1 parent d0f9573
commit 5496d02
Show file tree

Hide file tree

Showing 7 changed files with 14 additions and 37 deletions.
diff --git a/.github/workflows/integration.yml b/.github/workflows/integration.yml
@@ -46,22 +46,14 @@ jobs:
           echo "${{secrets.REDIS_USER_CRT}}" > tests/NRedisStack.Tests/bin/Debug/net6.0/redis_user.crt
           echo "${{secrets.REDIS_USER_PRIVATE_KEY}}" > tests/NRedisStack.Tests/bin/Debug/net6.0/redis_user_private.key
           ls -R
-          if [ "$REDIS_VERSION" != "edge" ]; then
-            dotnet test -f net6.0 --no-build --verbosity normal /p:CollectCoverage=true /p:CoverletOutputFormat=opencover --filter Category!=edge
-          else
-            dotnet test -f net6.0 --no-build --verbosity normal /p:CollectCoverage=true /p:CoverletOutputFormat=opencover
-          fi
+          dotnet test -f net6.0 --no-build --verbosity normal /p:CollectCoverage=true /p:CoverletOutputFormat=opencover
       - name: Test
         run: |
           echo "${{secrets.REDIS_CA_PEM}}" > tests/NRedisStack.Tests/bin/Debug/net7.0/redis_ca.pem
           echo "${{secrets.REDIS_USER_CRT}}" > tests/NRedisStack.Tests/bin/Debug/net7.0/redis_user.crt
           echo "${{secrets.REDIS_USER_PRIVATE_KEY}}" > tests/NRedisStack.Tests/bin/Debug/net7.0/redis_user_private.key
           ls -R
-          if [ "$REDIS_VERSION" != "edge" ]; then
-            dotnet test -f net7.0 --no-build --verbosity normal /p:CollectCoverage=true /p:CoverletOutputFormat=opencover --filter Category!=edge
-          else
-            dotnet test -f net7.0 --no-build --verbosity normal /p:CollectCoverage=true /p:CoverletOutputFormat=opencover
-          fi
+          dotnet test -f net7.0 --no-build --verbosity normal /p:CollectCoverage=true /p:CoverletOutputFormat=opencover
       - name: Codecov
         uses: codecov/codecov-action@v3
         with:
@@ -105,4 +97,4 @@ jobs:
         shell: cmd
         run: |
           START wsl ./redis-stack-server-${{env.redis_stack_version}}/bin/redis-stack-server &
-          dotnet test -f net481 --no-build --verbosity normal --filter Category!=edge
+          dotnet test -f net481 --no-build --verbosity normal
diff --git a/tests/NRedisStack.Tests/AbstractNRedisStackTest.cs b/tests/NRedisStack.Tests/AbstractNRedisStackTest.cs
@@ -7,8 +7,6 @@ namespace NRedisStack.Tests
 {
     public abstract class AbstractNRedisStackTest : IClassFixture<RedisFixture>, IAsyncLifetime
     {
-        public Version ServerVersion => redisFixture.ServerVersion;
-
         protected internal RedisFixture redisFixture;
 
         protected internal AbstractNRedisStackTest(RedisFixture redisFixture) => this.redisFixture = redisFixture;

diff --git a/tests/NRedisStack.Tests/Gears/GearsTests.cs b/tests/NRedisStack.Tests/Gears/GearsTests.cs
@@ -16,8 +16,7 @@ public void Dispose()
     }
 
 
-    [Fact]
-    [Trait("Category", "edge")]
+    [SkipIfRedisVersionLt("7.1.242")]
     public void TestTFunctionLoadDelete()
     {
         IDatabase db = redisFixture.Redis.GetDatabase();
@@ -27,8 +26,7 @@ public void TestTFunctionLoadDelete()
     }
 
 
-    [Fact]
-    [Trait("Category", "edge")]
+    [SkipIfRedisVersionLt("7.1.242")]
     public async Task TestTFunctionLoadDeleteAsync()
     {
         IDatabase db = redisFixture.Redis.GetDatabase();
@@ -39,8 +37,7 @@ public async Task TestTFunctionLoadDeleteAsync()
         Assert.True(await db.TFunctionDeleteAsync("lib"));
     }
 
-    [Fact]
-    [Trait("Category", "edge")]
+    [SkipIfRedisVersionLt("7.1.242")]
     public void TestTFunctionList()
     {
         IDatabase db = redisFixture.Redis.GetDatabase();
@@ -71,8 +68,7 @@ public void TestTFunctionList()
         Assert.True(db.TFunctionDelete("lib3"));
     }
 
-    [Fact]
-    [Trait("Category", "edge")]
+    [SkipIfRedisVersionLt("7.1.242")]
     public async Task TestTFunctionListAsync()
     {
         IDatabase db = redisFixture.Redis.GetDatabase();
@@ -101,8 +97,7 @@ public async Task TestTFunctionListAsync()
         Assert.True(await db.TFunctionDeleteAsync("lib3"));
     }
 
-    [Fact]
-    [Trait("Category", "edge")]
+    [SkipIfRedisVersionLt("7.1.242")]
     public void TestTFCall()
     {
         IDatabase db = redisFixture.Redis.GetDatabase();
@@ -116,8 +111,7 @@ public void TestTFCall()
         Assert.True(db.TFunctionDelete("lib"));
     }
 
-    [Fact]
-    [Trait("Category", "edge")]
+    [SkipIfRedisVersionLt("7.1.242")]
     public async Task TestTFCallAsync()
     {
         IDatabase db = redisFixture.Redis.GetDatabase();
@@ -131,8 +125,7 @@ public async Task TestTFCallAsync()
         Assert.True(await db.TFunctionDeleteAsync("lib"));
     }
 
-    [Fact]
-    [Trait("Category", "edge")]
+    [SkipIfRedisVersionLt("7.1.242")]
     public void TestGearsCommandBuilder()
     {
         // TFunctionLoad:

diff --git a/tests/NRedisStack.Tests/Json/JsonTests.cs b/tests/NRedisStack.Tests/Json/JsonTests.cs
@@ -703,8 +703,7 @@ public async Task GetAsync()
         Assert.Equal(35, people[1]!.Age);
     }
 
-    [Fact]
-    [Trait("Category", "edge")]
+    [SkipIfRedisVersionLt("7.1.242")]
     public void MSet()
     {
         IJsonCommands commands = new JsonCommands(redisFixture.Redis.GetDatabase());
@@ -728,8 +727,7 @@ public void MSet()
         Assert.Throws<ArgumentOutOfRangeException>(() => commands.MSet(new KeyPathValue[0]));
     }
 
-    [Fact]
-    [Trait("Category", "edge")]
+    [SkipIfRedisVersionLt("7.1.242")]
     public async Task MSetAsync()
     {
         IJsonCommandsAsync commands = new JsonCommands(redisFixture.Redis.GetDatabase());
@@ -752,8 +750,7 @@ await commands.MSetAsync(values)
         await Assert.ThrowsAsync<ArgumentOutOfRangeException>(async () => await commands.MSetAsync(new KeyPathValue[0]));
     }
 
-    [Fact]
-    [Trait("Category", "edge")]
+    [SkipIfRedisVersionLt("7.1.242")]
     public void Merge()
     {
         // Create a connection to Redis
@@ -772,8 +769,7 @@ public void Merge()
         Assert.Equal("{\"person\":{\"name\":\"John Doe\",\"phone\":\"123-456-7890\",\"address\":{\"home\":\"123 Main Street\",\"work\":\"Redis office\"}}}", commands.Get("test_merge").ToString());
     }
 
-    [Fact]
-    [Trait("Category", "edge")]
+    [SkipIfRedisVersionLt("7.1.242")]
     public async Task MergeAsync()
     {
         // Create a connection to Redis

diff --git a/tests/NRedisStack.Tests/RedisFixture.cs b/tests/NRedisStack.Tests/RedisFixture.cs
@@ -16,7 +16,5 @@ public void Dispose()
         }
 
         public ConnectionMultiplexer Redis { get; private set; }
-
-        public Version ServerVersion => Redis.GetServer(redis).Version;
     }
 }
diff --git a/...kipIfServerVersionGreaterThanAttribute.cs → ...RedisStack.Tests/SkipIfRedisVersionGte.cs b/...kipIfServerVersionGreaterThanAttribute.cs → ...RedisStack.Tests/SkipIfRedisVersionGte.cs
diff --git a/...s/SkipIfServerVersionLessThanAttribute.cs → ...k.Tests/SkipIfServerVersionLtAttribute.cs b/...s/SkipIfServerVersionLessThanAttribute.cs → ...k.Tests/SkipIfServerVersionLtAttribute.cs