From 0cce5efe1442311cc82a831be30f7becac369e7b Mon Sep 17 00:00:00 2001 From: shacharPash Date: Mon, 5 Feb 2024 15:22:12 +0200 Subject: [PATCH 1/4] use redisFixture in all tests --- tests/Doc/SearchQuickstartExample.cs | 7 +++--- tests/Doc/SetGetExample.cs | 7 +++--- tests/Doc/StringSnippets.cs | 6 ++--- .../Core Commands/CoreTests.cs | 24 +++++++------------ tests/NRedisStack.Tests/Search/SearchTests.cs | 3 +-- 5 files changed, 20 insertions(+), 27 deletions(-) diff --git a/tests/Doc/SearchQuickstartExample.cs b/tests/Doc/SearchQuickstartExample.cs index 256e3833..8c196223 100644 --- a/tests/Doc/SearchQuickstartExample.cs +++ b/tests/Doc/SearchQuickstartExample.cs @@ -10,14 +10,15 @@ namespace NRedisStack.Doc; [Collection("DocsTests")] // REMOVE_END -public class SearchQuickstartExample +public class SearchQuickstartExample : AbstractNRedisStackTest, IDisposable { + public SearchQuickstartExample(RedisFixture redisFixture) : base(redisFixture) { } + [SkipIfRedis(Is.OSSCluster)] public void run() { // STEP_START connect - var redis = ConnectionMultiplexer.Connect("localhost:6379"); - var db = redis.GetDatabase(); + var db = redisFixture.Redis.GetDatabase(); var ft = db.FT(); var json = db.JSON(); // STEP_END diff --git a/tests/Doc/SetGetExample.cs b/tests/Doc/SetGetExample.cs index 447d1dbc..f61fc961 100644 --- a/tests/Doc/SetGetExample.cs +++ b/tests/Doc/SetGetExample.cs @@ -8,13 +8,14 @@ namespace NRedisStack.Doc; [Collection("DocsTests")] //REMOVE_END -public class SetGetExample +public class SetGetExample : AbstractNRedisStackTest, IDisposable { + public SetGetExample(RedisFixture redisFixture) : base(redisFixture) { } + [SkipIfRedis(Is.OSSCluster)] public void run() { - var redis = ConnectionMultiplexer.Connect("localhost:6379"); - var db = redis.GetDatabase(); + var db = redisFixture.Redis.GetDatabase(); //HIDE_END bool status = db.StringSet("bike:1", "Process 134"); diff --git a/tests/Doc/StringSnippets.cs b/tests/Doc/StringSnippets.cs index eaa269ce..e05efdf9 100644 --- a/tests/Doc/StringSnippets.cs +++ b/tests/Doc/StringSnippets.cs @@ -9,15 +9,15 @@ namespace NRedisStack.Doc; [Collection("DocsTests")] //REMOVE_END -public class StringSnippets +public class StringSnippets : AbstractNRedisStackTest, IDisposable { + StringSnippets(RedisFixture redisFixture) : base(redisFixture) { } //REMOVE_START [SkipIfRedis(Is.OSSCluster)] //REMOVE_END public void run() { - var redis = ConnectionMultiplexer.Connect("localhost:6379"); - var db = redis.GetDatabase(); + var db = redisFixture.Redis.GetDatabase(); //HIDE_END diff --git a/tests/NRedisStack.Tests/Core Commands/CoreTests.cs b/tests/NRedisStack.Tests/Core Commands/CoreTests.cs index 9a3d763a..cdc91060 100644 --- a/tests/NRedisStack.Tests/Core Commands/CoreTests.cs +++ b/tests/NRedisStack.Tests/Core Commands/CoreTests.cs @@ -18,8 +18,7 @@ public CoreTests(RedisFixture redisFixture) : base(redisFixture) { } [SkipIfRedis(Is.OSSCluster, Comparison.LessThan, "7.1.242")] public void TestSimpleSetInfo() { - var redis = ConnectionMultiplexer.Connect("localhost"); - var db = redis.GetDatabase(); + var db = redisFixture.Redis.GetDatabase(); db.Execute("FLUSHALL"); db.ClientSetInfo(SetInfoAttr.LibraryName, "TestLibraryName"); @@ -32,8 +31,7 @@ public void TestSimpleSetInfo() [SkipIfRedis(Is.OSSCluster, Comparison.LessThan, "7.1.242")] public async Task TestSimpleSetInfoAsync() { - var redis = ConnectionMultiplexer.Connect("localhost"); - var db = redis.GetDatabase(); + var db = redisFixture.Redis.GetDatabase(); db.Execute("FLUSHALL"); await db.ClientSetInfoAsync(SetInfoAttr.LibraryName, "TestLibraryName"); @@ -47,8 +45,7 @@ public async Task TestSimpleSetInfoAsync() public void TestSetInfoDefaultValue() { ResetInfoDefaults(); // demonstrate first connection - var redis = ConnectionMultiplexer.Connect("localhost"); - var db = redis.GetDatabase(); + var db = redisFixture.Redis.GetDatabase(); db.Execute("FLUSHALL"); db.Execute(new SerializedCommand("PING")); // only the extension method of Execute (which is used for all the commands of Redis Stack) will set the library name and version. @@ -61,8 +58,7 @@ public void TestSetInfoDefaultValue() public async Task TestSetInfoDefaultValueAsync() { ResetInfoDefaults(); // demonstrate first connection - var redis = ConnectionMultiplexer.Connect("localhost"); - var db = redis.GetDatabase(); + var db = redisFixture.Redis.GetDatabase(); db.Execute("FLUSHALL"); await db.ExecuteAsync(new SerializedCommand("PING")); // only the extension method of Execute (which is used for all the commands of Redis Stack) will set the library name and version. @@ -75,8 +71,7 @@ public async Task TestSetInfoDefaultValueAsync() public void TestSetInfoWithValue() { ResetInfoDefaults(); // demonstrate first connection - var redis = ConnectionMultiplexer.Connect("localhost"); - var db = redis.GetDatabase("MyLibraryName;v1.0.0"); + var db = redisFixture.Redis.GetDatabase("MyLibraryName;v1.0.0"); db.Execute("FLUSHALL"); db.Execute(new SerializedCommand("PING")); // only the extension method of Execute (which is used for all the commands of Redis Stack) will set the library name and version. @@ -89,8 +84,7 @@ public void TestSetInfoWithValue() public async Task TestSetInfoWithValueAsync() { ResetInfoDefaults(); // demonstrate first connection - var redis = ConnectionMultiplexer.Connect("localhost"); - var db = redis.GetDatabase("MyLibraryName;v1.0.0"); + var db = redisFixture.Redis.GetDatabase("MyLibraryName;v1.0.0"); db.Execute("FLUSHALL"); await db.ExecuteAsync(new SerializedCommand("PING")); // only the extension method of Execute (which is used for all the commands of Redis Stack) will set the library name and version. @@ -103,8 +97,7 @@ public async Task TestSetInfoWithValueAsync() public void TestSetInfoNull() { ResetInfoDefaults(); // demonstrate first connection - var redis = ConnectionMultiplexer.Connect("localhost"); - var db = redis.GetDatabase(null); + var db = redisFixture.Redis.GetDatabase(null); db.Execute("FLUSHALL"); var infoBefore = db.Execute("CLIENT", "INFO").ToString(); @@ -127,8 +120,7 @@ public void TestSetInfoNull() public async Task TestSetInfoNullAsync() { ResetInfoDefaults(); // demonstrate first connection - var redis = ConnectionMultiplexer.Connect("localhost"); - var db = redis.GetDatabase(null); + var db = redisFixture.Redis.GetDatabase(null); db.Execute("FLUSHALL"); var infoBefore = (await db.ExecuteAsync("CLIENT", "INFO")).ToString(); diff --git a/tests/NRedisStack.Tests/Search/SearchTests.cs b/tests/NRedisStack.Tests/Search/SearchTests.cs index 685fc0a2..e4a0affc 100644 --- a/tests/NRedisStack.Tests/Search/SearchTests.cs +++ b/tests/NRedisStack.Tests/Search/SearchTests.cs @@ -2745,8 +2745,7 @@ public void TestProfileCommandBuilder() [SkipIfRedis(Is.OSSCluster)] public void Issue175() { - ConnectionMultiplexer redis = ConnectionMultiplexer.Connect("localhost:6379"); - IDatabase db = redis.GetDatabase(); + IDatabase db = redisFixture.Redis.GetDatabase(); db.Execute("FLUSHALL"); SearchCommands ft = db.FT(); From bab80cf7dc7207f367c72ccb72f4770a2b8c2c78 Mon Sep 17 00:00:00 2001 From: shacharPash Date: Mon, 5 Feb 2024 16:48:28 +0200 Subject: [PATCH 2/4] fix HashExample --- tests/Doc/HashExample.cs | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/tests/Doc/HashExample.cs b/tests/Doc/HashExample.cs index 38c279fd..b98cc4ff 100644 --- a/tests/Doc/HashExample.cs +++ b/tests/Doc/HashExample.cs @@ -7,13 +7,14 @@ namespace NRedisStack.Doc; [Collection("DocsTests")] //REMOVE_END -public class HashExample +public class HashExample : AbstractNRedisStackTest, IDisposable { + HashExample(RedisFixture redisFixture) : base(redisFixture) { } + [SkipIfRedis(Is.OSSCluster)] public void run() { - var muxer = ConnectionMultiplexer.Connect("localhost:6379"); - var db = muxer.GetDatabase(); + var db = redisFixture.Redis.GetDatabase(); db.KeyDelete("bike:1"); //HIDE_END //STEP_START set_get_all From ce38f5a652d576849ce701bc3c2efe6d52cb27b3 Mon Sep 17 00:00:00 2001 From: shacharPash Date: Mon, 5 Feb 2024 17:05:19 +0200 Subject: [PATCH 3/4] make constractors public --- tests/Doc/HashExample.cs | 2 +- tests/Doc/StringSnippets.cs | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/tests/Doc/HashExample.cs b/tests/Doc/HashExample.cs index b98cc4ff..3709d339 100644 --- a/tests/Doc/HashExample.cs +++ b/tests/Doc/HashExample.cs @@ -9,7 +9,7 @@ namespace NRedisStack.Doc; //REMOVE_END public class HashExample : AbstractNRedisStackTest, IDisposable { - HashExample(RedisFixture redisFixture) : base(redisFixture) { } + public HashExample(RedisFixture redisFixture) : base(redisFixture) { } [SkipIfRedis(Is.OSSCluster)] public void run() diff --git a/tests/Doc/StringSnippets.cs b/tests/Doc/StringSnippets.cs index e05efdf9..e5ec4ecc 100644 --- a/tests/Doc/StringSnippets.cs +++ b/tests/Doc/StringSnippets.cs @@ -11,7 +11,8 @@ namespace NRedisStack.Doc; //REMOVE_END public class StringSnippets : AbstractNRedisStackTest, IDisposable { - StringSnippets(RedisFixture redisFixture) : base(redisFixture) { } + public StringSnippets(RedisFixture redisFixture) : base(redisFixture) { } + //REMOVE_START [SkipIfRedis(Is.OSSCluster)] //REMOVE_END From ee4ec88e06233fcea0c6f5fb94ea2a43f851555e Mon Sep 17 00:00:00 2001 From: shacharPash Date: Mon, 12 Feb 2024 12:02:02 +0200 Subject: [PATCH 4/4] return Doc to how it was before --- tests/Doc/HashExample.cs | 7 +++---- tests/Doc/SearchQuickstartExample.cs | 7 +++---- tests/Doc/SetGetExample.cs | 7 +++---- tests/Doc/StringSnippets.cs | 7 +++---- 4 files changed, 12 insertions(+), 16 deletions(-) diff --git a/tests/Doc/HashExample.cs b/tests/Doc/HashExample.cs index 3709d339..38c279fd 100644 --- a/tests/Doc/HashExample.cs +++ b/tests/Doc/HashExample.cs @@ -7,14 +7,13 @@ namespace NRedisStack.Doc; [Collection("DocsTests")] //REMOVE_END -public class HashExample : AbstractNRedisStackTest, IDisposable +public class HashExample { - public HashExample(RedisFixture redisFixture) : base(redisFixture) { } - [SkipIfRedis(Is.OSSCluster)] public void run() { - var db = redisFixture.Redis.GetDatabase(); + var muxer = ConnectionMultiplexer.Connect("localhost:6379"); + var db = muxer.GetDatabase(); db.KeyDelete("bike:1"); //HIDE_END //STEP_START set_get_all diff --git a/tests/Doc/SearchQuickstartExample.cs b/tests/Doc/SearchQuickstartExample.cs index 8c196223..256e3833 100644 --- a/tests/Doc/SearchQuickstartExample.cs +++ b/tests/Doc/SearchQuickstartExample.cs @@ -10,15 +10,14 @@ namespace NRedisStack.Doc; [Collection("DocsTests")] // REMOVE_END -public class SearchQuickstartExample : AbstractNRedisStackTest, IDisposable +public class SearchQuickstartExample { - public SearchQuickstartExample(RedisFixture redisFixture) : base(redisFixture) { } - [SkipIfRedis(Is.OSSCluster)] public void run() { // STEP_START connect - var db = redisFixture.Redis.GetDatabase(); + var redis = ConnectionMultiplexer.Connect("localhost:6379"); + var db = redis.GetDatabase(); var ft = db.FT(); var json = db.JSON(); // STEP_END diff --git a/tests/Doc/SetGetExample.cs b/tests/Doc/SetGetExample.cs index f61fc961..447d1dbc 100644 --- a/tests/Doc/SetGetExample.cs +++ b/tests/Doc/SetGetExample.cs @@ -8,14 +8,13 @@ namespace NRedisStack.Doc; [Collection("DocsTests")] //REMOVE_END -public class SetGetExample : AbstractNRedisStackTest, IDisposable +public class SetGetExample { - public SetGetExample(RedisFixture redisFixture) : base(redisFixture) { } - [SkipIfRedis(Is.OSSCluster)] public void run() { - var db = redisFixture.Redis.GetDatabase(); + var redis = ConnectionMultiplexer.Connect("localhost:6379"); + var db = redis.GetDatabase(); //HIDE_END bool status = db.StringSet("bike:1", "Process 134"); diff --git a/tests/Doc/StringSnippets.cs b/tests/Doc/StringSnippets.cs index e5ec4ecc..eaa269ce 100644 --- a/tests/Doc/StringSnippets.cs +++ b/tests/Doc/StringSnippets.cs @@ -9,16 +9,15 @@ namespace NRedisStack.Doc; [Collection("DocsTests")] //REMOVE_END -public class StringSnippets : AbstractNRedisStackTest, IDisposable +public class StringSnippets { - public StringSnippets(RedisFixture redisFixture) : base(redisFixture) { } - //REMOVE_START [SkipIfRedis(Is.OSSCluster)] //REMOVE_END public void run() { - var db = redisFixture.Redis.GetDatabase(); + var redis = ConnectionMultiplexer.Connect("localhost:6379"); + var db = redis.GetDatabase(); //HIDE_END