From ba19c90cae727857bc13528909f222c2882364fd Mon Sep 17 00:00:00 2001 From: shacharPash Date: Mon, 24 Apr 2023 15:36:01 +0300 Subject: [PATCH 1/2] add ability to test on a differeent endpoint --- .../Examples/ExamplesTests.cs | 48 +++++++++++-------- tests/NRedisStack.Tests/Graph/GraphTests.cs | 23 --------- tests/NRedisStack.Tests/RedisFixture.cs | 5 +- 3 files changed, 33 insertions(+), 43 deletions(-) diff --git a/tests/NRedisStack.Tests/Examples/ExamplesTests.cs b/tests/NRedisStack.Tests/Examples/ExamplesTests.cs index ddf7f7fd..ef37aa63 100644 --- a/tests/NRedisStack.Tests/Examples/ExamplesTests.cs +++ b/tests/NRedisStack.Tests/Examples/ExamplesTests.cs @@ -1,4 +1,3 @@ -using System.Text; using Moq; using NRedisStack.DataTypes; using NRedisStack.RedisStackCommands; @@ -26,10 +25,11 @@ public void Dispose() public void HSETandSearch() { // Connect to the Redis server - var redis = ConnectionMultiplexer.Connect("localhost"); + // var redis = ConnectionMultiplexer.Connect("localhost"); // Get a reference to the database and for search commands: - var db = redis.GetDatabase(); + // var db = redis.GetDatabase(); + var db = redisFixture.Redis.GetDatabase(); db.Execute("FLUSHALL"); var ft = db.FT(); @@ -77,8 +77,9 @@ public void HSETandSearch() public async Task AsyncExample() { // Connect to the Redis server - var redis = await ConnectionMultiplexer.ConnectAsync("localhost"); - var db = redis.GetDatabase(); + // var redis = await ConnectionMultiplexer.ConnectAsync("localhost"); + // var db = redis.GetDatabase(); + var db = redisFixture.Redis.GetDatabase(); db.Execute("FLUSHALL"); var json = db.JSON(); @@ -169,10 +170,11 @@ public async Task JsonWithSearchPipeline() public async Task PipelineWithAsync() { // Connect to the Redis server - var redis = ConnectionMultiplexer.Connect("localhost"); + // var redis = ConnectionMultiplexer.Connect("localhost"); // Get a reference to the database - var db = redis.GetDatabase(); + // var db = redis.GetDatabase(); + var db = redisFixture.Redis.GetDatabase(); db.Execute("FLUSHALL"); // Setup pipeline connection @@ -226,10 +228,12 @@ public async Task PipelineWithAsync() public async Task TransactionExample() { // Connect to the Redis server - var redis = ConnectionMultiplexer.Connect("localhost"); + // var redis = ConnectionMultiplexer.Connect("localhost"); // Get a reference to the database - var db = redis.GetDatabase(); + // var db = redis.GetDatabase(); + + var db = redisFixture.Redis.GetDatabase(); db.Execute("FLUSHALL"); // Setup transaction with IDatabase @@ -267,8 +271,10 @@ public async Task TransactionExample() [Fact] public void TestJsonConvert() { - ConnectionMultiplexer redis = ConnectionMultiplexer.Connect("localhost"); - IDatabase db = redis.GetDatabase(); + // ConnectionMultiplexer redis = ConnectionMultiplexer.Connect("localhost"); + // IDatabase db = redis.GetDatabase(); + + var db = redisFixture.Redis.GetDatabase(); db.Execute("FLUSHALL"); ISearchCommands ft = db.FT(); IJsonCommands json = db.JSON(); @@ -289,8 +295,9 @@ public void TestJsonConvert() [Fact] public void BasicJsonExamplesTest() { - ConnectionMultiplexer redis = ConnectionMultiplexer.Connect("localhost"); - IDatabase db = redis.GetDatabase(); + // ConnectionMultiplexer redis = ConnectionMultiplexer.Connect("localhost"); + // IDatabase db = redis.GetDatabase(); + var db = redisFixture.Redis.GetDatabase(); db.Execute("FLUSHALL"); IJsonCommands json = db.JSON(); @@ -543,8 +550,9 @@ public void BasicJsonExamplesTest() [Fact] public void AdvancedJsonExamplesTest() { - ConnectionMultiplexer redis = ConnectionMultiplexer.Connect("localhost"); - IDatabase db = redis.GetDatabase(); + // ConnectionMultiplexer redis = ConnectionMultiplexer.Connect("localhost"); + // IDatabase db = redis.GetDatabase(); + var db = redisFixture.Redis.GetDatabase(); db.Execute("FLUSHALL"); IJsonCommands json = db.JSON(); @@ -676,8 +684,9 @@ public void AdvancedJsonExamplesTest() [Fact] public void BasicQueryOperationsTest() { - ConnectionMultiplexer redis = ConnectionMultiplexer.Connect("localhost"); - IDatabase db = redis.GetDatabase(); + // ConnectionMultiplexer redis = ConnectionMultiplexer.Connect("localhost"); + // IDatabase db = redis.GetDatabase(); + var db = redisFixture.Redis.GetDatabase(); db.Execute("FLUSHALL"); IJsonCommands json = db.JSON(); ISearchCommands ft = db.FT(); @@ -835,8 +844,9 @@ public void BasicQueryOperationsTest() [Fact] public void AdvancedQueryOperationsTest() { - ConnectionMultiplexer redis = ConnectionMultiplexer.Connect("localhost"); - IDatabase db = redis.GetDatabase(); + // ConnectionMultiplexer redis = ConnectionMultiplexer.Connect("localhost"); + // IDatabase db = redis.GetDatabase(); + var db = redisFixture.Redis.GetDatabase(); db.Execute("FLUSHALL"); IJsonCommands json = db.JSON(); ISearchCommands ft = db.FT(); diff --git a/tests/NRedisStack.Tests/Graph/GraphTests.cs b/tests/NRedisStack.Tests/Graph/GraphTests.cs index b1ff64c1..d6f6e170 100644 --- a/tests/NRedisStack.Tests/Graph/GraphTests.cs +++ b/tests/NRedisStack.Tests/Graph/GraphTests.cs @@ -1923,29 +1923,6 @@ public void TestParseInfinity() Assert.Equal(double.PositiveInfinity, r.Values[0]); } - [Fact] - public async Task TestModulePrefixs1Async() - { - { - var conn = ConnectionMultiplexer.Connect("localhost"); - IDatabase db = conn.GetDatabase(); - - var graph = db.GRAPH(); - // ... - conn.Dispose(); - } - - { - var conn = ConnectionMultiplexer.Connect("localhost"); - IDatabase db = conn.GetDatabase(); - - var graph = db.GRAPH(); - // ... - conn.Dispose(); - } - - } - [Fact] public void TestEqualsAndToString() { diff --git a/tests/NRedisStack.Tests/RedisFixture.cs b/tests/NRedisStack.Tests/RedisFixture.cs index b318f132..c5c4b1c4 100644 --- a/tests/NRedisStack.Tests/RedisFixture.cs +++ b/tests/NRedisStack.Tests/RedisFixture.cs @@ -4,7 +4,10 @@ namespace NRedisStack.Tests { public class RedisFixture : IDisposable { - public RedisFixture() => Redis = ConnectionMultiplexer.Connect("localhost"); + + string server = Environment.GetEnvironmentVariable("REDIS_SERVER") ?? "localhost"; + string port = Environment.GetEnvironmentVariable("REDIS_PORT") ?? "6379"; + public RedisFixture() => Redis = ConnectionMultiplexer.Connect($"{server}:{port}"); public void Dispose() { From e5900a78b37d2d16852931f28dd59e7691a53569 Mon Sep 17 00:00:00 2001 From: shacharPash Date: Tue, 25 Apr 2023 10:12:50 +0300 Subject: [PATCH 2/2] change pattern to host:port --- tests/NRedisStack.Tests/RedisFixture.cs | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/tests/NRedisStack.Tests/RedisFixture.cs b/tests/NRedisStack.Tests/RedisFixture.cs index c5c4b1c4..8ae470f2 100644 --- a/tests/NRedisStack.Tests/RedisFixture.cs +++ b/tests/NRedisStack.Tests/RedisFixture.cs @@ -5,9 +5,10 @@ namespace NRedisStack.Tests public class RedisFixture : IDisposable { - string server = Environment.GetEnvironmentVariable("REDIS_SERVER") ?? "localhost"; - string port = Environment.GetEnvironmentVariable("REDIS_PORT") ?? "6379"; - public RedisFixture() => Redis = ConnectionMultiplexer.Connect($"{server}:{port}"); + + // Set the enviroment variable to specify your own alternet host and port: + string redis = Environment.GetEnvironmentVariable("REDIS") ?? "localhost:6379"; + public RedisFixture() => Redis = ConnectionMultiplexer.Connect($"{redis}"); public void Dispose() {