Skip to content

S
StackExchange.Redis
Commit 56fea247 authored by Nick Craver's avatar Nick Craver
Browse files
Options

Tests: consolidate Booksleeve suite 

Long overdue collapsing of the two suites
parent f80acb1b
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 1034 additions and 1226 deletions
StackExchange.Redis.Tests/Booksleeve/Batches.cs → StackExchange.Redis.Tests/Batches.cs
View file @ 56fea247
......@@ -4,49 +4,51 @@
using Xunit;
using Xunit.Abstractions;
namespace StackExchange.Redis.Tests.Booksleeve
namespace StackExchange.Redis.Tests
{
public class Batches : BookSleeveTestBase
public class Batches : TestBase
{
public Batches(ITestOutputHelper output) : base(output) { }
[Fact]
public void TestBatchNotSent()
{
using (var muxer = GetUnsecuredConnection())
using (var muxer = Create())
{
var conn = muxer.GetDatabase();
conn.KeyDeleteAsync("batch");
conn.StringSetAsync("batch", "batch-not-sent");
var key = Me();
conn.KeyDeleteAsync(key);
conn.StringSetAsync(key, "batch-not-sent");
var tasks = new List<Task>();
var batch = conn.CreateBatch();
tasks.Add(batch.KeyDeleteAsync("batch"));
tasks.Add(batch.SetAddAsync("batch", "a"));
tasks.Add(batch.SetAddAsync("batch", "b"));
tasks.Add(batch.SetAddAsync("batch", "c"));
tasks.Add(batch.KeyDeleteAsync(key));
tasks.Add(batch.SetAddAsync(key, "a"));
tasks.Add(batch.SetAddAsync(key, "b"));
tasks.Add(batch.SetAddAsync(key, "c"));
Assert.Equal("batch-not-sent", conn.StringGet("batch"));
Assert.Equal("batch-not-sent", conn.StringGet(key));
}
}
[Fact]
public void TestBatchSent()
{
using (var muxer = GetUnsecuredConnection())
using (var muxer = Create())
{
var conn = muxer.GetDatabase();
conn.KeyDeleteAsync("batch");
conn.StringSetAsync("batch", "batch-sent");
var key = Me();
conn.KeyDeleteAsync(key);
conn.StringSetAsync(key, "batch-sent");
var tasks = new List<Task>();
var batch = conn.CreateBatch();
tasks.Add(batch.KeyDeleteAsync("batch"));
tasks.Add(batch.SetAddAsync("batch", "a"));
tasks.Add(batch.SetAddAsync("batch", "b"));
tasks.Add(batch.SetAddAsync("batch", "c"));
tasks.Add(batch.KeyDeleteAsync(key));
tasks.Add(batch.SetAddAsync(key, "a"));
tasks.Add(batch.SetAddAsync(key, "b"));
tasks.Add(batch.SetAddAsync(key, "c"));
batch.Execute();
var result = conn.SetMembersAsync("batch");
var result = conn.SetMembersAsync(key);
tasks.Add(result);
Task.WhenAll(tasks.ToArray());
......
StackExchange.Redis.Tests/Booksleeve/BookSleeveTestBase.cs deleted 100644 → 0
View file @ f80acb1b
using StackExchange.Redis.Tests.Helpers;
using System;
using System.Diagnostics;
using System.IO;
using System.Runtime.CompilerServices;
using System.Threading.Tasks;
using Xunit.Abstractions;
namespace StackExchange.Redis.Tests.Booksleeve
{
public class BookSleeveTestBase
{
public ITestOutputHelper Output { get; }
public BookSleeveTestBase(ITestOutputHelper output)
{
Output = output;
Output.WriteFrameworkVersion();
}
static BookSleeveTestBase()
{
TaskScheduler.UnobservedTaskException += (sender, args) =>
{
Trace.WriteLine(args.Exception, "UnobservedTaskException");
args.SetObserved();
};
}
protected void Log(string message)
{
Output.WriteLine(message);
if (TestConfig.Current.LogToConsole)
{
Console.WriteLine(message);
}
}
protected void Log(string message, params object[] args)
{
Output.WriteLine(message, args);
if (TestConfig.Current.LogToConsole)
{
Console.WriteLine(message, args);
}
}
protected static string Me([CallerFilePath] string filePath = null, [CallerMemberName] string caller = null) => TestBase.Me(filePath, caller);
internal static IServer GetServer(ConnectionMultiplexer conn) => conn.GetServer(conn.GetEndPoints()[0]);
internal static ConnectionMultiplexer GetRemoteConnection(bool open = true, bool allowAdmin = false, bool waitForOpen = false, int syncTimeout = 5000, int ioTimeout = 5000)
{
return GetConnection(TestConfig.Current.RemoteServer, TestConfig.Current.RemotePort, open, allowAdmin, waitForOpen, syncTimeout, ioTimeout);
}
private static ConnectionMultiplexer GetConnection(string host, int port, bool open = true, bool allowAdmin = false, bool waitForOpen = false, int syncTimeout = 5000, int ioTimeout = 5000)
{
var options = new ConfigurationOptions
{
EndPoints = { { host, port } },
AllowAdmin = allowAdmin,
SyncTimeout = syncTimeout,
ResponseTimeout = ioTimeout
};
var conn = ConnectionMultiplexer.Connect(options);
conn.InternalError += (s, args) => Trace.WriteLine(args.Exception.Message, args.Origin);
if (open && waitForOpen)
{
conn.GetDatabase().Ping();
}
return conn;
}
internal static ConnectionMultiplexer GetUnsecuredConnection(bool open = true, bool allowAdmin = false, bool waitForOpen = false, int syncTimeout = 5000, int ioTimeout = 5000)
{
return GetConnection(TestConfig.Current.MasterServer, TestConfig.Current.MasterPort, open, allowAdmin, waitForOpen, syncTimeout, ioTimeout);
}
internal static ConnectionMultiplexer GetSecuredConnection()
{
Skip.IfNoConfig(nameof(TestConfig.Config.SecureServer), TestConfig.Current.SecureServer);
var options = new ConfigurationOptions
{
EndPoints = { { TestConfig.Current.SecureServer, TestConfig.Current.SecurePort } },
Password = "changeme",
SyncTimeout = 6000,
};
var conn = ConnectionMultiplexer.Connect(options);
conn.InternalError += (s, args) => Trace.WriteLine(args.Exception.Message, args.Origin);
return conn;
}
}
}
StackExchange.Redis.Tests/Booksleeve/Config.cs deleted 100644 → 0
View file @ f80acb1b
using System;
using System.IO;
using System.Linq;
using System.Threading.Tasks;
using Xunit;
using Xunit.Abstractions;
using System.Security.Authentication;
namespace StackExchange.Redis.Tests.Booksleeve
{
public class Config : BookSleeveTestBase
{
public Config(ITestOutputHelper output) : base(output) { }
[Fact]
public void CanOpenUnsecuredConnection()
{
using (var conn = GetUnsecuredConnection(false))
{
var server = GetServer(conn);
server.Ping();
}
}
[Fact]
public void CanOpenSecuredConnection()
{
using (var conn = GetSecuredConnection())
{
var server = GetServer(conn);
server.Ping();
}
}
[Fact]
public void CanNotOpenNonsenseConnection_IP()
{
Assert.Throws<RedisConnectionException>(() =>
{
var log = new StringWriter();
try
{
using (var conn = ConnectionMultiplexer.Connect(TestConfig.Current.MasterServer + ":6500")) { }
}
finally
{
Log(log.ToString());
}
});
}
[Fact]
public async Task CanNotOpenNonsenseConnection_DNS()
{
var ex = await Assert.ThrowsAsync<RedisConnectionException>(async () =>
{
var log = new StringWriter();
try
{
using (var conn = await ConnectionMultiplexer.ConnectAsync($"doesnot.exist.ds.{Guid.NewGuid():N}.com:6500", log).ForAwait())
{
}
}
finally
{
Log(log.ToString());
}
}).ForAwait();
Log(ex.ToString());
}
[Fact]
public void CreateDisconnectedNonsenseConnection_IP()
{
var log = new StringWriter();
try
{
using (var conn = ConnectionMultiplexer.Connect(TestConfig.Current.MasterServer + ":6500,abortConnect=false"))
{
Assert.False(conn.GetServer(conn.GetEndPoints().Single()).IsConnected);
Assert.False(conn.GetDatabase().IsConnected(default(RedisKey)));
}
}
finally
{
Log(log.ToString());
}
}
[Fact]
public void CreateDisconnectedNonsenseConnection_DNS()
{
var log = new StringWriter();
try
{
using (var conn = ConnectionMultiplexer.Connect($"doesnot.exist.ds.{Guid.NewGuid():N}.com:6500, abortConnect=false", log))
{
Assert.False(conn.GetServer(conn.GetEndPoints().Single()).IsConnected);
Assert.False(conn.GetDatabase().IsConnected(default(RedisKey)));
}
}
finally
{
Log(log.ToString());
}
}
[Fact]
public void SslProtocols_SingleValue()
{
var options = ConfigurationOptions.Parse("myhost,sslProtocols=Tls11");
Assert.Equal(SslProtocols.Tls11, options.SslProtocols.Value);
}
[Fact]
public void SslProtocols_MultipleValues()
{
var options = ConfigurationOptions.Parse("myhost,sslProtocols=Tls11|Tls12");
Assert.Equal(SslProtocols.Tls11 | SslProtocols.Tls12, options.SslProtocols.Value);
}
[Fact]
public void SslProtocols_UsingIntegerValue()
{
// The below scenario is for cases where the *targeted*
// .NET framework version (e.g. .NET 4.0) doesn't define an enum value (e.g. Tls11)
// but the OS has been patched with support
const int integerValue = (int)(SslProtocols.Tls11 | SslProtocols.Tls12);
var options = ConfigurationOptions.Parse("myhost,sslProtocols=" + integerValue);
Assert.Equal(SslProtocols.Tls11 | SslProtocols.Tls12, options.SslProtocols.Value);
}
[Fact]
public void SslProtocols_InvalidValue()
{
Assert.Throws<ArgumentOutOfRangeException>(() => ConfigurationOptions.Parse("myhost,sslProtocols=InvalidSslProtocol"));
}
[Fact]
public void ConfigurationOptionsDefaultForAzure()
{
var options = ConfigurationOptions.Parse("contoso.redis.cache.windows.net");
Assert.True(options.DefaultVersion.Equals(new Version(3, 0, 0)));
Assert.False(options.AbortOnConnectFail);
}
[Fact]
public void ConfigurationOptionsForAzureWhenSpecified()
{
var options = ConfigurationOptions.Parse("contoso.redis.cache.windows.net,abortConnect=true, version=2.1.1");
Assert.True(options.DefaultVersion.Equals(new Version(2, 1, 1)));
Assert.True(options.AbortOnConnectFail);
}
[Fact]
public void ConfigurationOptionsDefaultForAzureChina()
{
// added a few upper case chars to validate comparison
var options = ConfigurationOptions.Parse("contoso.REDIS.CACHE.chinacloudapi.cn");
Assert.True(options.DefaultVersion.Equals(new Version(3, 0, 0)));
Assert.False(options.AbortOnConnectFail);
}
[Fact]
public void ConfigurationOptionsDefaultForAzureGermany()
{
var options = ConfigurationOptions.Parse("contoso.redis.cache.cloudapi.de");
Assert.True(options.DefaultVersion.Equals(new Version(3, 0, 0)));
Assert.False(options.AbortOnConnectFail);
}
[Fact]
public void ConfigurationOptionsDefaultForAzureUSGov()
{
var options = ConfigurationOptions.Parse("contoso.redis.cache.usgovcloudapi.net");
Assert.True(options.DefaultVersion.Equals(new Version(3, 0, 0)));
Assert.False(options.AbortOnConnectFail);
}
[Fact]
public void ConfigurationOptionsDefaultForNonAzure()
{
var options = ConfigurationOptions.Parse("redis.contoso.com");
Assert.True(options.DefaultVersion.Equals(new Version(2, 0, 0)));
Assert.True(options.AbortOnConnectFail);
}
[Fact]
public void ConfigurationOptionsDefaultWhenNoEndpointsSpecifiedYet()
{
var options = new ConfigurationOptions();
Assert.True(options.DefaultVersion.Equals(new Version(2, 0, 0)));
Assert.True(options.AbortOnConnectFail);
}
[Fact]
public void ConfigurationOptionsSyncTimeout()
{
// Default check
var options = new ConfigurationOptions();
Assert.Equal(5000, options.SyncTimeout);
options = ConfigurationOptions.Parse("syncTimeout=20");
Assert.Equal(20, options.SyncTimeout);
}
}
}
StackExchange.Redis.Tests/Booksleeve/PubSub.cs deleted 100644 → 0
View file @ f80acb1b
This diff is collapsed.
StackExchange.Redis.Tests/Booksleeve/Scripting.cs deleted 100644 → 0
View file @ f80acb1b
This diff is collapsed.
StackExchange.Redis.Tests/Config.cs
View file @ 56fea247
using System;
using System.IO;
using System.Linq;
using System.Threading;
using System.Security.Authentication;
using System.Threading.Tasks;
using Xunit;
using Xunit.Abstractions;
......@@ -12,6 +12,105 @@ public class Config : TestBase
{
public Config(ITestOutputHelper output) : base (output) { }
[Fact]
public void SslProtocols_SingleValue()
{
var options = ConfigurationOptions.Parse("myhost,sslProtocols=Tls11");
Assert.Equal(SslProtocols.Tls11, options.SslProtocols.Value);
}
[Fact]
public void SslProtocols_MultipleValues()
{
var options = ConfigurationOptions.Parse("myhost,sslProtocols=Tls11|Tls12");
Assert.Equal(SslProtocols.Tls11 | SslProtocols.Tls12, options.SslProtocols.Value);
}
[Fact]
public void SslProtocols_UsingIntegerValue()
{
// The below scenario is for cases where the *targeted*
// .NET framework version (e.g. .NET 4.0) doesn't define an enum value (e.g. Tls11)
// but the OS has been patched with support
const int integerValue = (int)(SslProtocols.Tls11 | SslProtocols.Tls12);
var options = ConfigurationOptions.Parse("myhost,sslProtocols=" + integerValue);
Assert.Equal(SslProtocols.Tls11 | SslProtocols.Tls12, options.SslProtocols.Value);
}
[Fact]
public void SslProtocols_InvalidValue()
{
Assert.Throws<ArgumentOutOfRangeException>(() => ConfigurationOptions.Parse("myhost,sslProtocols=InvalidSslProtocol"));
}
[Fact]
public void ConfigurationOptionsDefaultForAzure()
{
var options = ConfigurationOptions.Parse("contoso.redis.cache.windows.net");
Assert.True(options.DefaultVersion.Equals(new Version(3, 0, 0)));
Assert.False(options.AbortOnConnectFail);
}
[Fact]
public void ConfigurationOptionsForAzureWhenSpecified()
{
var options = ConfigurationOptions.Parse("contoso.redis.cache.windows.net,abortConnect=true, version=2.1.1");
Assert.True(options.DefaultVersion.Equals(new Version(2, 1, 1)));
Assert.True(options.AbortOnConnectFail);
}
[Fact]
public void ConfigurationOptionsDefaultForAzureChina()
{
// added a few upper case chars to validate comparison
var options = ConfigurationOptions.Parse("contoso.REDIS.CACHE.chinacloudapi.cn");
Assert.True(options.DefaultVersion.Equals(new Version(3, 0, 0)));
Assert.False(options.AbortOnConnectFail);
}
[Fact]
public void ConfigurationOptionsDefaultForAzureGermany()
{
var options = ConfigurationOptions.Parse("contoso.redis.cache.cloudapi.de");
Assert.True(options.DefaultVersion.Equals(new Version(3, 0, 0)));
Assert.False(options.AbortOnConnectFail);
}
[Fact]
public void ConfigurationOptionsDefaultForAzureUSGov()
{
var options = ConfigurationOptions.Parse("contoso.redis.cache.usgovcloudapi.net");
Assert.True(options.DefaultVersion.Equals(new Version(3, 0, 0)));
Assert.False(options.AbortOnConnectFail);
}
[Fact]
public void ConfigurationOptionsDefaultForNonAzure()
{
var options = ConfigurationOptions.Parse("redis.contoso.com");
Assert.True(options.DefaultVersion.Equals(new Version(2, 0, 0)));
Assert.True(options.AbortOnConnectFail);
}
[Fact]
public void ConfigurationOptionsDefaultWhenNoEndpointsSpecifiedYet()
{
var options = new ConfigurationOptions();
Assert.True(options.DefaultVersion.Equals(new Version(2, 0, 0)));
Assert.True(options.AbortOnConnectFail);
}
[Fact]
public void ConfigurationOptionsSyncTimeout()
{
// Default check
var options = new ConfigurationOptions();
Assert.Equal(5000, options.SyncTimeout);
options = ConfigurationOptions.Parse("syncTimeout=20");
Assert.Equal(20, options.SyncTimeout);
}
[Fact]
public void TalkToNonsenseServer()
{
......
StackExchange.Redis.Tests/ConnectToUnexistingHost.cs
View file @ 56fea247
using System.Diagnostics;
using System;
using System.Diagnostics;
using System.Linq;
using System.Threading;
using System.Threading.Tasks;
using Xunit;
......@@ -10,7 +12,6 @@ public class ConnectToUnexistingHost : TestBase
{
public ConnectToUnexistingHost(ITestOutputHelper output) : base (output) { }
#if DEBUG
[Fact]
public async Task FailsWithinTimeout()
{
......@@ -23,7 +24,7 @@ public async Task FailsWithinTimeout()
EndPoints = { { "invalid", 1234 } },
ConnectTimeout = timeout
};
using (var muxer = ConnectionMultiplexer.Connect(config, Writer))
{
await Task.Delay(10000).ForAwait();
......@@ -39,6 +40,45 @@ public async Task FailsWithinTimeout()
Assert.True(elapsed < 9000, "Connect should fail within ConnectTimeout, ElapsedMs: " + elapsed);
}
}
#endif
[Fact]
public void CanNotOpenNonsenseConnection_IP()
{
var ex = Assert.Throws<RedisConnectionException>(() =>
{
using (var conn = ConnectionMultiplexer.Connect(TestConfig.Current.MasterServer + ":6500", Writer)) { }
});
Log(ex.ToString());
}
[Fact]
public async Task CanNotOpenNonsenseConnection_DNS()
{
var ex = await Assert.ThrowsAsync<RedisConnectionException>(async () =>
{
using (var conn = await ConnectionMultiplexer.ConnectAsync($"doesnot.exist.ds.{Guid.NewGuid():N}.com:6500", Writer).ForAwait()) { }
}).ForAwait();
Log(ex.ToString());
}
[Fact]
public void CreateDisconnectedNonsenseConnection_IP()
{
using (var conn = ConnectionMultiplexer.Connect(TestConfig.Current.MasterServer + ":6500,abortConnect=false", Writer))
{
Assert.False(conn.GetServer(conn.GetEndPoints().Single()).IsConnected);
Assert.False(conn.GetDatabase().IsConnected(default(RedisKey)));
}
}
[Fact]
public void CreateDisconnectedNonsenseConnection_DNS()
{
using (var conn = ConnectionMultiplexer.Connect($"doesnot.exist.ds.{Guid.NewGuid():N}.com:6500, abortConnect=false", Writer))
{
Assert.False(conn.GetServer(conn.GetEndPoints().Single()).IsConnected);
Assert.False(conn.GetDatabase().IsConnected(default(RedisKey)));
}
}
}
}
StackExchange.Redis.Tests/Booksleeve/Constraints.cs → StackExchange.Redis.Tests/Constraints.cs
View file @ 56fea247
using System.Runtime.CompilerServices;
using System.Threading.Tasks;
using System.Threading.Tasks;
using Xunit;
using Xunit.Abstractions;
namespace StackExchange.Redis.Tests.Booksleeve
namespace StackExchange.Redis.Tests
{
public class Constraints : BookSleeveTestBase
public class Constraints : TestBase
{
public Constraints(ITestOutputHelper output) : base(output) { }
......@@ -20,7 +19,7 @@ public void ValueEquals()
[Fact]
public void TestManualIncr()
{
using (var muxer = GetUnsecuredConnection(syncTimeout: 120000)) // big timeout while debugging
using (var muxer = Create(syncTimeout: 120000)) // big timeout while debugging
{
var key = Me();
var conn = muxer.GetDatabase();
......
StackExchange.Redis.Tests/GlobalSuppressions.cs
View file @ 56fea247
......@@ -5,16 +5,13 @@
// a specific target and scoped to a namespace, type, member, etc.
[assembly: System.Diagnostics.CodeAnalysis.SuppressMessage("Redundancy", "RCS1163:Unused parameter.", Justification = "<Pending>", Scope = "member", Target = "~M:StackExchange.Redis.Tests.ConnectionFailedErrors.SSLCertificateValidationError(System.Boolean)")]
[assembly: System.Diagnostics.CodeAnalysis.SuppressMessage("Redundancy", "RCS1163:Unused parameter.", Justification = "<Pending>", Scope = "member", Target = "~M:StackExchange.Redis.Tests.Booksleeve.PubSub.TestMultipleSubscribersGetMessage")]
[assembly: System.Diagnostics.CodeAnalysis.SuppressMessage("Redundancy", "RCS1163:Unused parameter.", Justification = "<Pending>", Scope = "member", Target = "~M:StackExchange.Redis.Tests.PubSub.ExplicitPublishMode")]
[assembly: System.Diagnostics.CodeAnalysis.SuppressMessage("Redundancy", "RCS1163:Unused parameter.", Justification = "<Pending>", Scope = "member", Target = "~M:StackExchange.Redis.Tests.PubSubNonParallel.SubscriptionsSurviveMasterSwitch(System.Boolean)")]
[assembly: System.Diagnostics.CodeAnalysis.SuppressMessage("Redundancy", "RCS1163:Unused parameter.", Justification = "<Pending>", Scope = "member", Target = "~M:StackExchange.Redis.Tests.PubSub.TestBasicPubSubFireAndForget(System.Boolean)")]
[assembly: System.Diagnostics.CodeAnalysis.SuppressMessage("Redundancy", "RCS1163:Unused parameter.", Justification = "<Pending>", Scope = "member", Target = "~M:StackExchange.Redis.Tests.Booksleeve.PubSub.Issue38")]
[assembly: System.Diagnostics.CodeAnalysis.SuppressMessage("Redundancy", "RCS1163:Unused parameter.", Justification = "<Pending>", Scope = "member", Target = "~M:StackExchange.Redis.Tests.SSL.ConnectToSSLServer(System.Boolean,System.Boolean)")]
[assembly: System.Diagnostics.CodeAnalysis.SuppressMessage("Redundancy", "RCS1163:Unused parameter.", Justification = "<Pending>", Scope = "member", Target = "~M:StackExchange.Redis.Tests.PubSub.TestPatternPubSub(System.Boolean)")]
[assembly: System.Diagnostics.CodeAnalysis.SuppressMessage("Redundancy", "RCS1163:Unused parameter.", Justification = "<Pending>", Scope = "member", Target = "~M:StackExchange.Redis.Tests.PubSub.TestBasicPubSub(System.Boolean,System.String,System.Boolean)")]
[assembly: System.Diagnostics.CodeAnalysis.SuppressMessage("Redundancy", "RCS1163:Unused parameter.", Justification = "<Pending>", Scope = "member", Target = "~M:StackExchange.Redis.Tests.SSL.ConnectToSSLServer(System.Boolean,System.Boolean)")]
[assembly: System.Diagnostics.CodeAnalysis.SuppressMessage("Redundancy", "RCS1163:Unused parameter.", Justification = "<Pending>", Scope = "member", Target = "~M:StackExchange.Redis.Tests.Booksleeve.PubSub.PubSubOrder~System.Threading.Tasks.Task")]
[assembly: System.Diagnostics.CodeAnalysis.SuppressMessage("Redundancy", "RCS1163:Unused parameter.", Justification = "<Pending>", Scope = "member", Target = "~M:StackExchange.Redis.Tests.PreserveOrder.Execute(System.Boolean)")]
[assembly: System.Diagnostics.CodeAnalysis.SuppressMessage("Usage", "xUnit1004:Test methods should not be skipped", Justification = "<Pending>", Scope = "member", Target = "~M:StackExchange.Redis.Tests.ConnectionShutdown.ShutdownRaisesConnectionFailedAndRestore")]
[assembly: System.Diagnostics.CodeAnalysis.SuppressMessage("Usage", "xUnit1004:Test methods should not be skipped", Justification = "<Pending>", Scope = "member", Target = "~M:StackExchange.Redis.Tests.Issues.BgSaveResponse.ShouldntThrowException(StackExchange.Redis.SaveType)")]
......
StackExchange.Redis.Tests/Booksleeve/Hashes.cs → StackExchange.Redis.Tests/Hashes.cs
View file @ 56fea247
......@@ -7,16 +7,16 @@
using Xunit.Abstractions;
using System.Threading.Tasks;
namespace StackExchange.Redis.Tests.Booksleeve
namespace StackExchange.Redis.Tests
{
public class Hashes : BookSleeveTestBase // https://redis.io/commands#hash
public class Hashes : TestBase // https://redis.io/commands#hash
{
public Hashes(ITestOutputHelper output) : base(output) { }
[Fact]
public async Task TestIncrBy()
{
using (var muxer = GetUnsecuredConnection())
using (var muxer = Create())
{
var conn = muxer.GetDatabase();
var key = Me();
......@@ -34,7 +34,7 @@ public async Task TestIncrBy()
[Fact]
public void Scan()
{
using (var muxer = GetUnsecuredConnection(waitForOpen: true))
using (var muxer = Create())
{
Skip.IfMissingFeature(muxer, nameof(RedisFeatures.Scan), r => r.Scan);
var conn = muxer.GetDatabase();
......@@ -74,7 +74,7 @@ public void Scan()
[Fact]
public void TestIncrementOnHashThatDoesntExist()
{
using (var muxer = GetUnsecuredConnection())
using (var muxer = Create())
{
var conn = muxer.GetDatabase();
conn.KeyDeleteAsync("keynotexist");
......@@ -88,7 +88,7 @@ public void TestIncrementOnHashThatDoesntExist()
[Fact]
public async Task TestIncrByFloat()
{
using (var muxer = GetUnsecuredConnection(waitForOpen: true))
using (var muxer = Create())
{
Skip.IfMissingFeature(muxer, nameof(RedisFeatures.IncrementFloat), r => r.IncrementFloat);
var conn = muxer.GetDatabase();
......@@ -105,7 +105,7 @@ public async Task TestIncrByFloat()
[Fact]
public async Task TestGetAll()
{
using (var muxer = GetUnsecuredConnection())
using (var muxer = Create())
{
var conn = muxer.GetDatabase();
var key = Me();
......@@ -137,7 +137,7 @@ public async Task TestGetAll()
[Fact]
public async Task TestGet()
{
using (var muxer = GetUnsecuredConnection())
using (var muxer = Create())
{
var key = Me();
var conn = muxer.GetDatabase();
......@@ -167,7 +167,7 @@ public async Task TestGet()
[Fact]
public async Task TestSet() // https://redis.io/commands/hset
{
using (var muxer = GetUnsecuredConnection())
using (var muxer = Create())
{
var conn = muxer.GetDatabase();
var hashkey = Me();
......@@ -206,7 +206,7 @@ public async Task TestGet()
[Fact]
public async Task TestSetNotExists() // https://redis.io/commands/hsetnx
{
using (var muxer = GetUnsecuredConnection())
using (var muxer = Create())
{
var conn = muxer.GetDatabase();
var hashkey = Me();
......@@ -237,7 +237,7 @@ public async Task TestGet()
[Fact]
public async Task TestDelSingle() // https://redis.io/commands/hdel
{
using (var muxer = GetUnsecuredConnection())
using (var muxer = Create())
{
var conn = muxer.GetDatabase();
var hashkey = Me();
......@@ -258,7 +258,7 @@ public async Task TestGet()
[Fact]
public void TestDelMulti() // https://redis.io/commands/hdel
{
using (var muxer = GetUnsecuredConnection())
using (var muxer = Create())
{
var conn = muxer.GetDatabase();
var hashkey = Me();
......@@ -296,7 +296,7 @@ public async Task TestGet()
[Fact]
public void TestDelMultiInsideTransaction() // https://redis.io/commands/hdel
{
using (var outer = GetUnsecuredConnection())
using (var outer = Create())
{
var conn = outer.GetDatabase().CreateTransaction();
{
......@@ -333,7 +333,7 @@ public async Task TestGet()
[Fact]
public async Task TestExists() // https://redis.io/commands/hexists
{
using (var muxer = GetUnsecuredConnection())
using (var muxer = Create())
{
var conn = muxer.GetDatabase();
var hashkey = Me();
......@@ -353,7 +353,7 @@ public async Task TestGet()
[Fact]
public async Task TestHashKeys() // https://redis.io/commands/hkeys
{
using (var muxer = GetUnsecuredConnection())
using (var muxer = Create())
{
var conn = muxer.GetDatabase();
var hashKey = Me();
......@@ -378,7 +378,7 @@ public async Task TestGet()
[Fact]
public async Task TestHashValues() // https://redis.io/commands/hvals
{
using (var muxer = GetUnsecuredConnection())
using (var muxer = Create())
{
var conn = muxer.GetDatabase();
var hashkey = Me();
......@@ -403,7 +403,7 @@ public async Task TestGet()
[Fact]
public async Task TestHashLength() // https://redis.io/commands/hlen
{
using (var muxer = GetUnsecuredConnection())
using (var muxer = Create())
{
var conn = muxer.GetDatabase();
var hashkey = Me();
......@@ -424,7 +424,7 @@ public async Task TestGet()
[Fact]
public async Task TestGetMulti() // https://redis.io/commands/hmget
{
using (var muxer = GetUnsecuredConnection())
using (var muxer = Create())
{
var conn = muxer.GetDatabase();
var hashkey = Me();
......@@ -459,7 +459,7 @@ public async Task TestGet()
[Fact]
public async Task TestGetPairs() // https://redis.io/commands/hgetall
{
using (var muxer = GetUnsecuredConnection())
using (var muxer = Create())
{
var conn = muxer.GetDatabase();
var hashkey = Me();
......@@ -483,7 +483,7 @@ public async Task TestGet()
[Fact]
public async Task TestSetPairs() // https://redis.io/commands/hmset
{
using (var muxer = GetUnsecuredConnection())
using (var muxer = Create())
{
var conn = muxer.GetDatabase();
var hashkey = Me();
......
StackExchange.Redis.Tests/Helpers/TestConfig.cs
View file @ 56fea247
......@@ -75,6 +75,7 @@ public class Config
public string RemoteServer { get; set; } = "127.0.0.1";
public int RemotePort { get; set; } = 6379;
public string RemoteServerAndPort => RemoteServer + ":" + RemotePort.ToString();
public string SentinelServer { get; set; } = "127.0.0.1";
public int SentinelPort { get; set; } = 26379;
......
StackExchange.Redis.Tests/Booksleeve/Issues/Issue10.cs → StackExchange.Redis.Tests/Issues/Issue10.cs
View file @ 56fea247
using Xunit;
using Xunit.Abstractions;
namespace StackExchange.Redis.Tests.Booksleeve.Issues
namespace StackExchange.Redis.Tests.Issues
{
public class Issue10 : BookSleeveTestBase
public class Issue10 : TestBase
{
public Issue10(ITestOutputHelper output) : base(output) { }
[Fact]
public void Execute()
{
using (var muxer = GetUnsecuredConnection())
using (var muxer = Create())
{
var key = Me();
var conn = muxer.GetDatabase();
......
StackExchange.Redis.Tests/Booksleeve/Issues/Massive Delete.cs → StackExchange.Redis.Tests/Issues/Massive Delete.cs
View file @ 56fea247
......@@ -4,16 +4,16 @@
using System.Threading.Tasks;
using Xunit.Abstractions;
namespace StackExchange.Redis.Tests.Booksleeve.Issues
namespace StackExchange.Redis.Tests.Issues
{
public class Massive_Delete : BookSleeveTestBase
public class Massive_Delete : TestBase
{
public Massive_Delete(ITestOutputHelper output) : base(output) { }
private void Prep(int db, string key)
{
var prefix = Me();
using (var muxer = GetUnsecuredConnection(allowAdmin: true))
using (var muxer = Create(allowAdmin: true))
{
Skip.IfMissingDatabase(muxer, db);
GetServer(muxer).FlushDatabase(db);
......@@ -36,7 +36,7 @@ public async Task ExecuteMassiveDelete()
var key = Me();
Prep(dbId, key);
var watch = Stopwatch.StartNew();
using (var muxer = GetUnsecuredConnection())
using (var muxer = Create())
using (var throttle = new SemaphoreSlim(1))
{
var conn = muxer.GetDatabase(dbId);
......
StackExchange.Redis.Tests/Booksleeve/Issues/SO10504853.cs → StackExchange.Redis.Tests/Issues/SO10504853.cs
View file @ 56fea247
......@@ -3,9 +3,9 @@
using Xunit;
using Xunit.Abstractions;
namespace StackExchange.Redis.Tests.Booksleeve.Issues
namespace StackExchange.Redis.Tests.Issues
{
public class SO10504853 : BookSleeveTestBase
public class SO10504853 : TestBase
{
public SO10504853(ITestOutputHelper output) : base(output) { }
......@@ -13,7 +13,7 @@ public class SO10504853 : BookSleeveTestBase
public void LoopLotsOfTrivialStuff()
{
Trace.WriteLine("### init");
using (var muxer = GetUnsecuredConnection())
using (var muxer = Create())
{
var conn = muxer.GetDatabase();
conn.KeyDelete("lots-trivial");
......@@ -22,14 +22,14 @@ public void LoopLotsOfTrivialStuff()
for (int i = 0; i < COUNT; i++)
{
Trace.WriteLine("### incr:" + i);
using (var muxer = GetUnsecuredConnection())
using (var muxer = Create())
{
var conn = muxer.GetDatabase();
Assert.Equal(i + 1, conn.StringIncrement("lots-trivial"));
}
}
Trace.WriteLine("### close");
using (var muxer = GetUnsecuredConnection())
using (var muxer = Create())
{
var conn = muxer.GetDatabase();
Assert.Equal(COUNT, (long)conn.StringGet("lots-trivial"));
......@@ -39,7 +39,7 @@ public void LoopLotsOfTrivialStuff()
[Fact]
public void ExecuteWithEmptyStartingPoint()
{
using (var muxer = GetUnsecuredConnection())
using (var muxer = Create())
{
var conn = muxer.GetDatabase();
var task = new { priority = 3 };
......@@ -62,7 +62,7 @@ public void ExecuteWithNonHashStartingPoint()
{
Assert.Throws<RedisServerException>(() =>
{
using (var muxer = GetUnsecuredConnection())
using (var muxer = Create())
{
var conn = muxer.GetDatabase();
var task = new { priority = 3 };
......
StackExchange.Redis.Tests/Booksleeve/Issues/SO10825542.cs → StackExchange.Redis.Tests/Issues/SO10825542.cs
View file @ 56fea247
......@@ -3,16 +3,16 @@
using Xunit;
using Xunit.Abstractions;
namespace StackExchange.Redis.Tests.Booksleeve.Issues
namespace StackExchange.Redis.Tests.Issues
{
public class SO10825542 : BookSleeveTestBase
public class SO10825542 : TestBase
{
public SO10825542(ITestOutputHelper output) : base(output) { }
[Fact]
public void Execute()
{
using (var muxer = GetUnsecuredConnection())
using (var muxer = Create())
{
var key = Me();
......
StackExchange.Redis.Tests/Booksleeve/Issues/SO11766033.cs → StackExchange.Redis.Tests/Issues/SO11766033.cs
View file @ 56fea247
using Xunit;
using Xunit.Abstractions;
namespace StackExchange.Redis.Tests.Booksleeve.Issues
namespace StackExchange.Redis.Tests.Issues
{
public class SO11766033 : BookSleeveTestBase
public class SO11766033 : TestBase
{
public SO11766033(ITestOutputHelper output) : base(output) { }
[Fact]
public void TestNullString()
{
using (var muxer = GetUnsecuredConnection(true))
using (var muxer = Create())
{
var redis = muxer.GetDatabase();
const string expectedTestValue = null;
......@@ -25,7 +25,7 @@ public void TestNullString()
[Fact]
public void TestEmptyString()
{
using (var muxer = GetUnsecuredConnection(true))
using (var muxer = Create())
{
var redis = muxer.GetDatabase();
const string expectedTestValue = "";
......
StackExchange.Redis.Tests/Booksleeve/Performance.cs → StackExchange.Redis.Tests/Performance.cs
View file @ 56fea247
......@@ -4,9 +4,9 @@
using Xunit;
using Xunit.Abstractions;
namespace StackExchange.Redis.Tests.Booksleeve
namespace StackExchange.Redis.Tests
{
public class Performance : BookSleeveTestBase
public class Performance : TestBase
{
public Performance(ITestOutputHelper output) : base(output) { }
......@@ -15,7 +15,7 @@ public void VerifyPerformanceImprovement()
{
int asyncTimer, sync, op = 0, asyncFaF, syncFaF;
var key = Me();
using (var muxer = GetUnsecuredConnection())
using (var muxer = Create())
{
// do these outside the timings, just to ensure the core methods are JITted etc
for (int db = 0; db < 5; db++)
......@@ -101,7 +101,7 @@ public void VerifyPerformanceImprovement()
[Fact]
public async Task BasicStringGetPerf()
{
using (var conn = GetUnsecuredConnection())
using (var conn = Create())
{
RedisKey key = Me();
var db = conn.GetDatabase();
......
StackExchange.Redis.Tests/PubSub.cs
View file @ 56fea247
This diff is collapsed.
StackExchange.Redis.Tests/Scripting.cs
View file @ 56fea247
This diff is collapsed.
StackExchange.Redis.Tests/Booksleeve/Strings.cs → StackExchange.Redis.Tests/Strings.cs
View file @ 56fea247
......@@ -3,16 +3,16 @@
using Xunit;
using Xunit.Abstractions;
namespace StackExchange.Redis.Tests.Booksleeve
namespace StackExchange.Redis.Tests
{
public class Strings : BookSleeveTestBase // https://redis.io/commands#string
public class Strings : TestBase // https://redis.io/commands#string
{
public Strings(ITestOutputHelper output) : base(output) { }
[Fact]
public void Append()
{
using (var muxer = GetUnsecuredConnection(waitForOpen: true))
using (var muxer = Create())
{
var conn = muxer.GetDatabase();
var server = GetServer(muxer);
......@@ -47,7 +47,7 @@ public void Append()
[Fact]
public void Set()
{
using (var muxer = GetUnsecuredConnection())
using (var muxer = Create())
{
var conn = muxer.GetDatabase();
var key = Me();
......@@ -67,7 +67,7 @@ public void Set()
[Fact]
public void SetNotExists()
{
using (var muxer = GetUnsecuredConnection())
using (var muxer = Create())
{
var conn = muxer.GetDatabase();
var prefix = Me();
......@@ -98,7 +98,7 @@ public void SetNotExists()
[Fact]
public void Ranges()
{
using (var muxer = GetUnsecuredConnection(waitForOpen: true))
using (var muxer = Create())
{
Skip.IfMissingFeature(muxer, nameof(RedisFeatures.StringSetRange), r => r.StringSetRange);
var conn = muxer.GetDatabase();
......@@ -119,7 +119,7 @@ public void Ranges()
[Fact]
public void IncrDecr()
{
using (var muxer = GetUnsecuredConnection())
using (var muxer = Create())
{
var conn = muxer.GetDatabase();
var key = Me();
......@@ -147,7 +147,7 @@ public void IncrDecr()
[Fact]
public void IncrDecrFloat()
{
using (var muxer = GetUnsecuredConnection(waitForOpen: true))
using (var muxer = Create())
{
Skip.IfMissingFeature(muxer, nameof(RedisFeatures.IncrementFloat), r => r.IncrementFloat);
var conn = muxer.GetDatabase();
......@@ -177,7 +177,7 @@ public void IncrDecrFloat()
[Fact]
public void GetRange()
{
using (var muxer = GetUnsecuredConnection(waitForOpen: true))
using (var muxer = Create())
{
var conn = muxer.GetDatabase();
var key = Me();
......@@ -195,7 +195,7 @@ public void GetRange()
[Fact]
public void BitCount()
{
using (var muxer = GetUnsecuredConnection(waitForOpen: true))
using (var muxer = Create())
{
Skip.IfMissingFeature(muxer, nameof(RedisFeatures.BitwiseOperations), r => r.BitwiseOperations);
......@@ -215,7 +215,7 @@ public void BitCount()
[Fact]
public void BitOp()
{
using (var muxer = GetUnsecuredConnection(waitForOpen: true))
using (var muxer = Create())
{
Skip.IfMissingFeature(muxer, nameof(RedisFeatures.BitwiseOperations), r => r.BitwiseOperations);
var conn = muxer.GetDatabase();
......@@ -252,7 +252,7 @@ public void BitOp()
[Fact]
public void RangeString()
{
using (var muxer = GetUnsecuredConnection())
using (var muxer = Create())
{
var conn = muxer.GetDatabase();
var key = Me();
......
StackExchange.Redis.Tests/TestBase.cs
View file @ 56fea247
......@@ -213,9 +213,10 @@ protected IServer GetAnyMaster(ConnectionMultiplexer muxer)
bool fail = true, string[] disabledCommands = null, string[] enabledCommands = null,
bool checkConnect = true, string failMessage = null,
string channelPrefix = null, Proxy? proxy = null,
string configuration = null,
[CallerMemberName] string caller = null)
{
string configuration = GetConfiguration();
configuration = configuration ?? GetConfiguration();
var config = ConfigurationOptions.Parse(configuration);
if (disabledCommands != null && disabledCommands.Length != 0)
{
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment