go back

redis · Aug 9, 2023 · 826afe6 · 826afe6
1 parent ce6d900
commit 826afe6
Show file tree

Hide file tree

Showing 5 changed files with 15 additions and 47 deletions.
diff --git a/.github/workflows/integration.yml b/.github/workflows/integration.yml
@@ -47,9 +47,7 @@ jobs:
           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 RunOnlyOnThisVersion!=edge
-          elif [ "$REDIS_VERSION" == "7.2.0-RC3" ]; then
-            dotnet test -f net6.0 --no-build --verbosity normal /p:CollectCoverage=true /p:CoverletOutputFormat=opencover --filter SkipIfThisIsTheVersoin!=7.2.0-RC3
+            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
@@ -59,10 +57,8 @@ jobs:
           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"  && "$REDIS_VERSION" != "7.2.0-RC3"]; then
-            dotnet test -f net7.0 --no-build --verbosity normal /p:CollectCoverage=true /p:CoverletOutputFormat=opencover --filter RunOnlyOnThisVersion!=edge
-          elif [ "$REDIS_VERSION" == "7.2.0-RC3" ]; then
-            dotnet test -f net7.0 --no-build --verbosity normal /p:CollectCoverage=true /p:CoverletOutputFormat=opencover --filter SkipIfThisIsTheVersoin!=7.2.0-RC3
+          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
@@ -109,4 +105,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 RunOnlyOnThisVersion!=edge
+          dotnet test -f net481 --no-build --verbosity normal --filter Category!=edge
diff --git a/tests/NRedisStack.Tests/Gears/GearsTests.cs b/tests/NRedisStack.Tests/Gears/GearsTests.cs
@@ -17,7 +17,7 @@ public void Dispose()
 
 
     [Fact]
-    [Trait("RunOnlyOnThisVersion", "edge")]
+    [Trait("Category", "edge")]
     public void TestTFunctionLoadDelete()
     {
         IDatabase db = redisFixture.Redis.GetDatabase();
@@ -28,7 +28,7 @@ public void TestTFunctionLoadDelete()
 
 
     [Fact]
-    [Trait("RunOnlyOnThisVersion", "edge")]
+    [Trait("Category", "edge")]
     public async Task TestTFunctionLoadDeleteAsync()
     {
         IDatabase db = redisFixture.Redis.GetDatabase();
@@ -40,7 +40,7 @@ public async Task TestTFunctionLoadDeleteAsync()
     }
 
     [Fact]
-    [Trait("RunOnlyOnThisVersion", "edge")]
+    [Trait("Category", "edge")]
     public void TestTFunctionList()
     {
         IDatabase db = redisFixture.Redis.GetDatabase();
@@ -72,7 +72,7 @@ public void TestTFunctionList()
     }
 
     [Fact]
-    [Trait("RunOnlyOnThisVersion", "edge")]
+    [Trait("Category", "edge")]
     public async Task TestTFunctionListAsync()
     {
         IDatabase db = redisFixture.Redis.GetDatabase();
@@ -102,7 +102,7 @@ public async Task TestTFunctionListAsync()
     }
 
     [Fact]
-    [Trait("RunOnlyOnThisVersion", "edge")]
+    [Trait("Category", "edge")]
     public void TestTFCall()
     {
         IDatabase db = redisFixture.Redis.GetDatabase();
@@ -117,7 +117,7 @@ public void TestTFCall()
     }
 
     [Fact]
-    [Trait("RunOnlyOnThisVersion", "edge")]
+    [Trait("Category", "edge")]
     public async Task TestTFCallAsync()
     {
         IDatabase db = redisFixture.Redis.GetDatabase();
@@ -132,7 +132,7 @@ public async Task TestTFCallAsync()
     }
 
     [Fact]
-    [Trait("RunOnlyOnThisVersion", "edge")]
+    [Trait("Category", "edge")]
     public void TestGearsCommandBuilder()
     {
         // TFunctionLoad:

diff --git a/tests/NRedisStack.Tests/Graph/GraphTests.cs b/tests/NRedisStack.Tests/Graph/GraphTests.cs
@@ -23,7 +23,6 @@ public void Dispose()
     [SkipIfRedisVersionLt("7.2.0")]
     public void TestReserveBasic()
     {
-        Skip.IfServerLessThan(ServerVersion, "7.2.0");
         IDatabase db = redisFixture.Redis.GetDatabase();
         db.Execute("FLUSHALL");
         var graph = db.GRAPH();
@@ -32,7 +31,6 @@ public void TestReserveBasic()
     [SkipIfRedisVersionLt("7.2.0")]
     public void TestCreateNode()
     {
-        Skip.IfServerLessThan(ServerVersion, "7.2.0");
         IDatabase db = redisFixture.Redis.GetDatabase();
         db.Execute("FLUSHALL");
         var graph = db.GRAPH();
@@ -56,7 +54,6 @@ public void TestCreateNode()
     [SkipIfRedisVersionLt("7.2.0")]
     public void TestCreateLabeledNode()
     {
-        Skip.IfServerLessThan(ServerVersion, "7.2.0");
         IDatabase db = redisFixture.Redis.GetDatabase();
         db.Execute("FLUSHALL");
         var graph = db.GRAPH();
@@ -78,7 +75,6 @@ public void TestCreateLabeledNode()
     [SkipIfRedisVersionLt("7.2.0")]
     public void TestConnectNodes()
     {
-        Skip.IfServerLessThan(ServerVersion, "7.2.0");
         IDatabase db = redisFixture.Redis.GetDatabase();
         db.Execute("FLUSHALL");
         var graph = db.GRAPH();
@@ -106,7 +102,6 @@ public void TestConnectNodes()
     [SkipIfRedisVersionLt("7.2.0")]
     public void TestDeleteNodes()
     {
-        Skip.IfServerLessThan(ServerVersion, "7.2.0");
         IDatabase db = redisFixture.Redis.GetDatabase();
         db.Execute("FLUSHALL");
         var graph = db.GRAPH();
@@ -184,7 +179,6 @@ public void TestDeleteRelationship()
     [SkipIfRedisVersionLt("7.2.0")]
     public void TestIndex()
     {
-        Skip.IfServerLessThan(ServerVersion, "7.2.0");
         IDatabase db = redisFixture.Redis.GetDatabase();
         db.Execute("FLUSHALL");
         var graph = db.GRAPH();
@@ -241,7 +235,6 @@ public void TestHeader()
     }
 
     [SkipIfRedisVersionLt("7.2.0")]
-    // [Trait("SkipIfThisIsTheVersoin", "7.2.0")]
     public void TestRecord()
     {
         IDatabase db = redisFixture.Redis.GetDatabase();

diff --git a/tests/NRedisStack.Tests/Json/JsonTests.cs b/tests/NRedisStack.Tests/Json/JsonTests.cs
@@ -704,7 +704,7 @@ public async Task GetAsync()
     }
 
     [Fact]
-    [Trait("RunOnlyOnThisVersion", "edge")]
+    [Trait("Category", "edge")]
     public void MSet()
     {
         IJsonCommands commands = new JsonCommands(redisFixture.Redis.GetDatabase());
@@ -729,7 +729,7 @@ public void MSet()
     }
 
     [Fact]
-    [Trait("RunOnlyOnThisVersion", "edge")]
+    [Trait("Category", "edge")]
     public async Task MSetAsync()
     {
         IJsonCommandsAsync commands = new JsonCommands(redisFixture.Redis.GetDatabase());
@@ -753,7 +753,7 @@ await commands.MSetAsync(values)
     }
 
     [Fact]
-    [Trait("RunOnlyOnThisVersion", "edge")]
+    [Trait("Category", "edge")]
     public void Merge()
     {
         // Create a connection to Redis
@@ -773,7 +773,7 @@ public void Merge()
     }
 
     [Fact]
-    [Trait("RunOnlyOnThisVersion", "edge")]
+    [Trait("Category", "edge")]
     public async Task MergeAsync()
     {
         // Create a connection to Redis

diff --git a/tests/NRedisStack.Tests/RedisFixture.cs b/tests/NRedisStack.Tests/RedisFixture.cs
@@ -18,26 +18,5 @@ public void Dispose()
         public ConnectionMultiplexer Redis { get; private set; }
 
         public Version ServerVersion => Redis.GetServer(redis).Version;
-
-
-        public string? SkipIfServerLessThan(string minVersion)
-        {
-            if (ServerVersion < new Version(minVersion))
-            {
-                return $"Test skipped because Redis server version ({ServerVersion}) is less than {minVersion}.";
-            }
-
-            return null;
-        }
-
-        public string? SkipIfServerGreaterThan(string maxVersion)
-        {
-            if (ServerVersion > new Version(maxVersion))
-            {
-                return $"Test skipped because Redis server version ({ServerVersion}) is greater than {maxVersion}.";
-            }
-
-            return null;
-        }
     }
 }