From 6533cc36ba219a10328caa9bb569575ce406b454 Mon Sep 17 00:00:00 2001 From: Rustam Agametov Date: Wed, 6 Sep 2017 13:04:08 +0300 Subject: [PATCH 1/2] fix 'if' statements with identical conditional expressions --- src/ServiceStack.Redis/RedisNativeClient.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/ServiceStack.Redis/RedisNativeClient.cs b/src/ServiceStack.Redis/RedisNativeClient.cs index ba8c8c9e..b333382b 100644 --- a/src/ServiceStack.Redis/RedisNativeClient.cs +++ b/src/ServiceStack.Redis/RedisNativeClient.cs @@ -2182,7 +2182,7 @@ public long GeoAdd(string key, double longitude, double latitude, string member) { if (key == null) throw new ArgumentNullException("key"); - if (key == null) + if (member == null) throw new ArgumentNullException("member"); return SendExpectLong(Commands.GeoAdd, key.ToUtf8Bytes(), longitude.ToUtf8Bytes(), latitude.ToUtf8Bytes(), member.ToUtf8Bytes()); From 46a52596a6de2cee21968f4d515451b88e4132fd Mon Sep 17 00:00:00 2001 From: Rustam Agametov Date: Wed, 6 Sep 2017 13:33:10 +0300 Subject: [PATCH 2/2] replace obsolete methods with new methods --- .../Generic/RedisTypedClient.cs | 2 +- src/ServiceStack.Redis/RedisClient.cs | 6 +-- .../Redis3SentinelSetupTests.cs | 6 +-- .../RedisResolverTests.cs | 8 ++-- .../RedisSentinelTests.cs | 4 +- tests/ServiceStack.Redis.Tests/ConfigTests.cs | 8 ++-- .../CultureInfoTests.cs | 8 ++-- .../Examples/SimplePubSub.cs | 4 +- .../Generic/RedisClientTests.cs | 2 +- .../Generic/RedisTypedPipelineTests.cs | 6 +-- .../Generic/RedisTypedTransactionTests.cs | 6 +-- ...ultiThreadedRedisClientIntegrationTests.cs | 4 +- .../Integration/RedisRegressionTestRun.cs | 2 +- .../PooledRedisClientManagerTests.cs | 12 ++--- .../RedisClientEvalTests.cs | 2 +- .../RedisClientTests.cs | 46 +++++++++---------- .../RedisClientTestsBase.cs | 4 +- .../RedisClientsManagerExtensionsTests.cs | 2 +- .../RedisGeoNativeClientTests.cs | 4 +- .../ServiceStack.Redis.Tests/RedisGeoTests.cs | 4 +- .../RedisManagerPoolTests.cs | 8 ++-- .../RedisPasswordTests.cs | 8 ++-- .../RedisStatsTests.cs | 4 +- .../RedisTransactionCommonTests.cs | 2 +- .../RetryCommandTests.cs | 4 +- tests/ServiceStack.Redis.Tests/SslTests.cs | 6 +-- .../TwemproxyTests.cs | 4 +- .../ValueTypeExamples.cs | 6 +-- 28 files changed, 91 insertions(+), 91 deletions(-) diff --git a/src/ServiceStack.Redis/Generic/RedisTypedClient.cs b/src/ServiceStack.Redis/Generic/RedisTypedClient.cs index 85c63704..9de32e55 100644 --- a/src/ServiceStack.Redis/Generic/RedisTypedClient.cs +++ b/src/ServiceStack.Redis/Generic/RedisTypedClient.cs @@ -166,7 +166,7 @@ public IRedisSet TypeIdsSet public T this[string key] { get { return GetValue(key); } - set { SetEntry(key, value); } + set { SetValue(key, value); } } public byte[] SerializeValue(T value) diff --git a/src/ServiceStack.Redis/RedisClient.cs b/src/ServiceStack.Redis/RedisClient.cs index d9a34882..0a039d07 100644 --- a/src/ServiceStack.Redis/RedisClient.cs +++ b/src/ServiceStack.Redis/RedisClient.cs @@ -96,7 +96,7 @@ public void Init() public string this[string key] { get { return GetValue(key); } - set { SetEntry(key, value); } + set { SetValue(key, value); } } public override void OnConnected() { } @@ -675,7 +675,7 @@ public T Store(T entity) var urnKey = UrnKey(entity); var valueString = JsonSerializer.SerializeToString(entity); - this.SetEntry(urnKey, valueString); + this.SetValue(urnKey, valueString); RegisterTypeId(entity); return entity; @@ -690,7 +690,7 @@ public object StoreObject(object entity) var urnKey = UrnKey(entityType, id); var valueString = JsonSerializer.SerializeToString(entity); - this.SetEntry(urnKey, valueString); + this.SetValue(urnKey, valueString); RegisterTypeId(GetTypeIdsSetKey(entityType), id.ToString()); diff --git a/tests/ServiceStack.Redis.Tests.Sentinel/Redis3SentinelSetupTests.cs b/tests/ServiceStack.Redis.Tests.Sentinel/Redis3SentinelSetupTests.cs index e7388cd8..61dbfb95 100644 --- a/tests/ServiceStack.Redis.Tests.Sentinel/Redis3SentinelSetupTests.cs +++ b/tests/ServiceStack.Redis.Tests.Sentinel/Redis3SentinelSetupTests.cs @@ -58,9 +58,9 @@ public void Can_connect_to_GoogleCloud_3SentinelSetup() client.FlushAll(); - client.SetEntry("Sentinel3Setup", "GoogleCloud"); + client.SetValue("Sentinel3Setup", "GoogleCloud"); - var result = client.GetEntry("Sentinel3Setup"); + var result = client.GetValue("Sentinel3Setup"); Assert.That(result, Is.EqualTo("GoogleCloud")); } @@ -68,7 +68,7 @@ public void Can_connect_to_GoogleCloud_3SentinelSetup() { "{0}:{1}".Print(readOnly.Host, readOnly.Port); - var result = readOnly.GetEntry("Sentinel3Setup"); + var result = readOnly.GetValue("Sentinel3Setup"); Assert.That(result, Is.EqualTo("GoogleCloud")); } } diff --git a/tests/ServiceStack.Redis.Tests.Sentinel/RedisResolverTests.cs b/tests/ServiceStack.Redis.Tests.Sentinel/RedisResolverTests.cs index 1186c1fd..473cba7c 100644 --- a/tests/ServiceStack.Redis.Tests.Sentinel/RedisResolverTests.cs +++ b/tests/ServiceStack.Redis.Tests.Sentinel/RedisResolverTests.cs @@ -9,14 +9,14 @@ namespace ServiceStack.Redis.Tests.Sentinel public class RedisResolverTests : RedisSentinelTestBase { - [TestFixtureSetUp] - public void TestFixtureSetUp() + [OneTimeSetUp] + public void OneTimeSetUp() { StartAllRedisServers(); } - [TestFixtureTearDown] - public void TestFixtureTearDown() + [OneTimeTearDown] + public void OneTimeTearDown() { ShutdownAllRedisServers(); } diff --git a/tests/ServiceStack.Redis.Tests.Sentinel/RedisSentinelTests.cs b/tests/ServiceStack.Redis.Tests.Sentinel/RedisSentinelTests.cs index 6d7ce4b5..d148e530 100644 --- a/tests/ServiceStack.Redis.Tests.Sentinel/RedisSentinelTests.cs +++ b/tests/ServiceStack.Redis.Tests.Sentinel/RedisSentinelTests.cs @@ -10,7 +10,7 @@ namespace ServiceStack.Redis.Tests.Sentinel public class RedisSentinelTests : RedisSentinelTestBase { - [TestFixtureSetUp] + [OneTimeSetUp] public void OnBeforeTestFixture() { StartAllRedisServers(); @@ -18,7 +18,7 @@ public void OnBeforeTestFixture() LogManager.LogFactory = new ConsoleLogFactory(debugEnabled:true); } - [TestFixtureTearDown] + [OneTimeTearDown] public void OnAfterTestFixture() { ShutdownAllRedisSentinels(); diff --git a/tests/ServiceStack.Redis.Tests/ConfigTests.cs b/tests/ServiceStack.Redis.Tests/ConfigTests.cs index 9d0baac1..d6199772 100644 --- a/tests/ServiceStack.Redis.Tests/ConfigTests.cs +++ b/tests/ServiceStack.Redis.Tests/ConfigTests.cs @@ -5,14 +5,14 @@ namespace ServiceStack.Redis.Tests [TestFixture] public class ConfigTests { - [TestFixtureSetUp] - public void TestFixtureSetUp() + [OneTimeSetUp] + public void OneTimeSetUp() { RedisConfig.VerifyMasterConnections = false; } - [TestFixtureTearDown] - public void TestFixtureTearDown() + [OneTimeTearDown] + public void OneTimeTearDown() { RedisConfig.VerifyMasterConnections = true; } diff --git a/tests/ServiceStack.Redis.Tests/CultureInfoTests.cs b/tests/ServiceStack.Redis.Tests/CultureInfoTests.cs index 59cb3ff6..897391ff 100644 --- a/tests/ServiceStack.Redis.Tests/CultureInfoTests.cs +++ b/tests/ServiceStack.Redis.Tests/CultureInfoTests.cs @@ -10,8 +10,8 @@ public class CultureInfoTests { private CultureInfo previousCulture = CultureInfo.InvariantCulture; - [TestFixtureSetUp] - public void TestFixtureSetUp() + [OneTimeSetUp] + public void OneTimeSetUp() { #if NETCORE previousCulture = CultureInfo.CurrentCulture; @@ -23,8 +23,8 @@ public void TestFixtureSetUp() #endif } - [TestFixtureTearDown] - public void TestFixtureTearDown() + [OneTimeTearDown] + public void OneTimeTearDown() { #if NETCORE CultureInfo.CurrentCulture = previousCulture; diff --git a/tests/ServiceStack.Redis.Tests/Examples/SimplePubSub.cs b/tests/ServiceStack.Redis.Tests/Examples/SimplePubSub.cs index 11386d53..00a9bb94 100644 --- a/tests/ServiceStack.Redis.Tests/Examples/SimplePubSub.cs +++ b/tests/ServiceStack.Redis.Tests/Examples/SimplePubSub.cs @@ -13,8 +13,8 @@ public class SimplePubSub const string MessagePrefix = "MESSAGE "; const int PublishMessageCount = 5; - [TestFixtureSetUp] - public void TestFixtureSetUp() + [OneTimeSetUp] + public void OneTimeSetUp() { using (var redis = new RedisClient(TestConfig.SingleHost)) { diff --git a/tests/ServiceStack.Redis.Tests/Generic/RedisClientTests.cs b/tests/ServiceStack.Redis.Tests/Generic/RedisClientTests.cs index c82639de..57f1c238 100644 --- a/tests/ServiceStack.Redis.Tests/Generic/RedisClientTests.cs +++ b/tests/ServiceStack.Redis.Tests/Generic/RedisClientTests.cs @@ -8,7 +8,7 @@ namespace ServiceStack.Redis.Tests.Generic [TestFixture, Category("Integration")] public class RedisClientTests : RedisClientTestsBase { - [TestFixtureSetUp] + [OneTimeSetUp] public void TestFixture() { } diff --git a/tests/ServiceStack.Redis.Tests/Generic/RedisTypedPipelineTests.cs b/tests/ServiceStack.Redis.Tests/Generic/RedisTypedPipelineTests.cs index e78e12b2..18b19ee4 100644 --- a/tests/ServiceStack.Redis.Tests/Generic/RedisTypedPipelineTests.cs +++ b/tests/ServiceStack.Redis.Tests/Generic/RedisTypedPipelineTests.cs @@ -40,7 +40,7 @@ public void Can_call_single_operation_in_pipeline() using (var pipeline = typedClient.CreatePipeline()) { - pipeline.QueueCommand(r => r.SetEntry(Key, model)); + pipeline.QueueCommand(r => r.SetValue(Key, model)); pipeline.Flush(); } @@ -55,7 +55,7 @@ public void No_commit_of_atomic_pipelines_discards_all_commands() using (var pipeline = typedClient.CreatePipeline()) { - pipeline.QueueCommand(r => r.SetEntry(Key, model)); + pipeline.QueueCommand(r => r.SetValue(Key, model)); } Assert.That(typedClient.GetValue(Key), Is.Null); @@ -69,7 +69,7 @@ public void Exception_in_atomic_pipelines_discards_all_commands() { using (var pipeline = typedClient.CreatePipeline()) { - pipeline.QueueCommand(r => r.SetEntry(Key, model)); + pipeline.QueueCommand(r => r.SetValue(Key, model)); throw new NotSupportedException(); } } diff --git a/tests/ServiceStack.Redis.Tests/Generic/RedisTypedTransactionTests.cs b/tests/ServiceStack.Redis.Tests/Generic/RedisTypedTransactionTests.cs index 632b76a6..959e1a9b 100644 --- a/tests/ServiceStack.Redis.Tests/Generic/RedisTypedTransactionTests.cs +++ b/tests/ServiceStack.Redis.Tests/Generic/RedisTypedTransactionTests.cs @@ -39,7 +39,7 @@ public void Can_call_single_operation_in_transaction() using (var trans = typedClient.CreateTransaction()) { - trans.QueueCommand(r => r.SetEntry(Key, model)); + trans.QueueCommand(r => r.SetValue(Key, model)); trans.Commit(); } @@ -54,7 +54,7 @@ public void No_commit_of_atomic_transactions_discards_all_commands() using (var trans = typedClient.CreateTransaction()) { - trans.QueueCommand(r => r.SetEntry(Key, model)); + trans.QueueCommand(r => r.SetValue(Key, model)); } Assert.That(typedClient.GetValue(Key), Is.Null); @@ -68,7 +68,7 @@ public void Exception_in_atomic_transactions_discards_all_commands() { using (var trans = typedClient.CreateTransaction()) { - trans.QueueCommand(r => r.SetEntry(Key, model)); + trans.QueueCommand(r => r.SetValue(Key, model)); throw new NotSupportedException(); } } diff --git a/tests/ServiceStack.Redis.Tests/Integration/MultiThreadedRedisClientIntegrationTests.cs b/tests/ServiceStack.Redis.Tests/Integration/MultiThreadedRedisClientIntegrationTests.cs index 8f3a6884..92d0f551 100644 --- a/tests/ServiceStack.Redis.Tests/Integration/MultiThreadedRedisClientIntegrationTests.cs +++ b/tests/ServiceStack.Redis.Tests/Integration/MultiThreadedRedisClientIntegrationTests.cs @@ -17,7 +17,7 @@ public class MultiThreadedRedisClientIntegrationTests { private static string testData; - [TestFixtureSetUp] + [OneTimeSetUp] public void onBeforeTestFixture() { var results = 100.Times(x => ModelWithFieldsOfDifferentTypes.Create(x)); @@ -96,7 +96,7 @@ private static void UseClient(RedisClient client, int clientNo) Log("Client '{0}' is using '{1}'", clientNo, client.Host); var testClientKey = "test:" + host + ":" + clientNo; - client.SetEntry(testClientKey, testData); + client.SetValue(testClientKey, testData); var result = client.GetValue(testClientKey) ?? ""; Log("\t{0} => {1} len {2} {3} len", testClientKey, diff --git a/tests/ServiceStack.Redis.Tests/Integration/RedisRegressionTestRun.cs b/tests/ServiceStack.Redis.Tests/Integration/RedisRegressionTestRun.cs index 3b4786eb..283859a1 100644 --- a/tests/ServiceStack.Redis.Tests/Integration/RedisRegressionTestRun.cs +++ b/tests/ServiceStack.Redis.Tests/Integration/RedisRegressionTestRun.cs @@ -14,7 +14,7 @@ public class RedisRegressionTestRun { private static string testData; - [TestFixtureSetUp] + [OneTimeSetUp] public void onBeforeTestFixture() { var results = 100.Times(x => ModelWithFieldsOfDifferentTypes.Create(x)); diff --git a/tests/ServiceStack.Redis.Tests/PooledRedisClientManagerTests.cs b/tests/ServiceStack.Redis.Tests/PooledRedisClientManagerTests.cs index ded0295a..29aed113 100644 --- a/tests/ServiceStack.Redis.Tests/PooledRedisClientManagerTests.cs +++ b/tests/ServiceStack.Redis.Tests/PooledRedisClientManagerTests.cs @@ -14,14 +14,14 @@ namespace ServiceStack.Redis.Tests [TestFixture, Category("Integration")] public class PooledRedisClientManagerTests { - [TestFixtureSetUp] - public void TestFixtureSetUp() + [OneTimeSetUp] + public void OneTimeSetUp() { RedisConfig.VerifyMasterConnections = false; } - [TestFixtureTearDown] - public void TestFixtureTearDown() + [OneTimeTearDown] + public void OneTimeTearDown() { RedisConfig.VerifyMasterConnections = true; } @@ -387,7 +387,7 @@ public void Does_throw_TimeoutException_when_PoolTimeout_exceeded() } catch (TimeoutException ex) { - Assert.That(ex.Message, Is.StringStarting("Redis Timeout expired.")); + Assert.That(ex.Message, Does.StartWith("Redis Timeout expired.")); } var slaves = 4.Times(i => manager.GetReadOnlyClient()); @@ -399,7 +399,7 @@ public void Does_throw_TimeoutException_when_PoolTimeout_exceeded() } catch (TimeoutException ex) { - Assert.That(ex.Message, Is.StringStarting("Redis Timeout expired.")); + Assert.That(ex.Message, Does.StartWith("Redis Timeout expired.")); } } } diff --git a/tests/ServiceStack.Redis.Tests/RedisClientEvalTests.cs b/tests/ServiceStack.Redis.Tests/RedisClientEvalTests.cs index a7407963..b31ff348 100644 --- a/tests/ServiceStack.Redis.Tests/RedisClientEvalTests.cs +++ b/tests/ServiceStack.Redis.Tests/RedisClientEvalTests.cs @@ -125,7 +125,7 @@ public void Does_flush_all_scripts() } catch (RedisResponseException ex) { - Assert.That(ex.Message, Is.StringContaining("NOSCRIPT")); + Assert.That(ex.Message, Does.Contain("NOSCRIPT")); } } diff --git a/tests/ServiceStack.Redis.Tests/RedisClientTests.cs b/tests/ServiceStack.Redis.Tests/RedisClientTests.cs index d31bd930..620ceeef 100644 --- a/tests/ServiceStack.Redis.Tests/RedisClientTests.cs +++ b/tests/ServiceStack.Redis.Tests/RedisClientTests.cs @@ -26,7 +26,7 @@ public override void OnBeforeEachTest() [Test] public void Can_Set_and_Get_string() { - Redis.SetEntry("key", Value); + Redis.SetValue("key", Value); var valueBytes = Redis.Get("key"); var valueString = GetString(valueBytes); Redis.Remove("key"); @@ -37,7 +37,7 @@ public void Can_Set_and_Get_string() [Test] public void Can_Set_and_Get_key_with_space() { - Redis.SetEntry("key with space", Value); + Redis.SetValue("key with space", Value); var valueBytes = Redis.Get("key with space"); var valueString = GetString(valueBytes); Redis.Remove("key with space"); @@ -50,7 +50,7 @@ public void Can_Set_and_Get_key_with_spaces() { const string key = "key with spaces"; - Redis.SetEntry(key, Value); + Redis.SetValue(key, Value); var valueBytes = Redis.Get(key); var valueString = GetString(valueBytes); @@ -97,7 +97,7 @@ public void GetKeys_on_non_existent_keys_returns_empty_collection() [Test] public void Can_get_Types() { - Redis.SetEntry("string", "string"); + Redis.SetValue("string", "string"); Redis.AddItemToList("list", "list"); Redis.AddItemToSet("set", "set"); Redis.AddItemToSortedSet("sortedset", "sortedset"); @@ -114,7 +114,7 @@ public void Can_get_Types() [Test] public void Can_delete_keys() { - Redis.SetEntry("key", "val"); + Redis.SetValue("key", "val"); Assert.That(Redis.ContainsKey("key"), Is.True); @@ -153,7 +153,7 @@ public void Can_get_RandomKey() [Test] public void Can_RenameKey() { - Redis.SetEntry("oldkey", "val"); + Redis.SetValue("oldkey", "val"); Redis.Rename("oldkey", "newkey"); Assert.That(Redis.ContainsKey("oldkey"), Is.False); @@ -163,7 +163,7 @@ public void Can_RenameKey() [Test] public void Can_Expire() { - Redis.SetEntry("key", "val"); + Redis.SetValue("key", "val"); Redis.Expire("key", 1); Assert.That(Redis.ContainsKey("key"), Is.True); Thread.Sleep(2000); @@ -173,7 +173,7 @@ public void Can_Expire() [Test] public void Can_Expire_Ms() { - Redis.SetEntry("key", "val"); + Redis.SetValue("key", "val"); Redis.ExpireEntryIn("key", TimeSpan.FromMilliseconds(100)); Assert.That(Redis.ContainsKey("key"), Is.True); Thread.Sleep(500); @@ -184,7 +184,7 @@ public void Can_Expire_Ms() [Test] public void Can_ExpireAt() { - Redis.SetEntry("key", "val"); + Redis.SetValue("key", "val"); var unixNow = DateTime.Now.ToUnixTime(); var in2Secs = unixNow + 2; @@ -199,7 +199,7 @@ public void Can_ExpireAt() [Test] public void Can_GetTimeToLive() { - Redis.SetEntry("key", "val"); + Redis.SetValue("key", "val"); Redis.Expire("key", 10); var ttl = Redis.GetTimeToLive("key"); @@ -292,8 +292,8 @@ public void Can_Shutdown() [Test] public void Can_get_Keys_with_pattern() { - 5.Times(i => Redis.SetEntry("k1:" + i, "val")); - 5.Times(i => Redis.SetEntry("k2:" + i, "val")); + 5.Times(i => Redis.SetValue("k1:" + i, "val")); + 5.Times(i => Redis.SetValue("k2:" + i, "val")); var keys = Redis.Keys("k1:*"); Assert.That(keys.Length, Is.EqualTo(5)); @@ -323,7 +323,7 @@ public void Can_GetValues_JSON_strings() { var val = "{\"AuthorId\":0,\"Created\":\"\\/Date(1345961754013)\\/\",\"Name\":\"test\",\"Base64\":\"BQELAAEBWAFYAVgBWAFYAVgBWAFYAVgBWAFYAVgBWAFYAVgBWAFYAVgBWAFYAVgBWAFYAViA/4D/gP+A/4D/gP+A/4D/gP+A/4D/gP+A/4D/gP+A/4D/gP+A/4D/gP8BWAFYgP8BWAFYAViA/wFYAVgBWID/AVgBWAFYgP8BWAFYAViA/4D/gP+A/4D/AVgBWID/gP8BWID/gP8BWID/gP+A/wFYgP+A/4D/gP8BWID/gP+A/4D/gP+A/wFYAViA/4D/AViA/4D/AVgBWAFYgP8BWAFYAViA/4D/AViA/4D/gP+A/4D/gP8BWAFYgP+A/wFYgP+A/wFYgP+A/4D/gP+A/wFYgP+A/wFYgP+A/4D/gP+A/4D/AVgBWID/gP8BWID/gP8BWAFYAViA/wFYAVgBWID/gP8BWID/gP+A/4D/gP+A/wFYAViA/4D/gP+A/4D/gP+A/4D/gP+A/4D/gP+A/4D/gP+A/4D/gP+A/4D/gP8BWAFYgP+A/4D/gP+A/4D/gP+A/4D/gP+A/4D/gP+A/4D/gP+A/4D/gP+A/4D/AVgBWID/gP+A/4D/gP+A/4D/gP+A/4D/gP+A/4D/gP+A/4D/gP+A/4D/gP+A/wFYAViA/4D/gP+A/4D/gP+A/4D/gP+A/4D/gP+A/4D/gP+A/4D/gP+A/4D/gP8BWAFYgP+A/4D/gP+A/4D/gP+A/4D/gP+A/4D/gP+A/4D/gP+A/4D/gP+A/4D/AVgBWID/gP+A/4D/gP+A/4D/gP+A/4D/gP+A/4D/gP+A/4D/gP+A/4D/gP+A/wFYAVgBWAFYAVgBWAFYAVgBWAFYAVgBWAFYAVgBWAFYAVgBWAFYAVgBWAFYAVgBWAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA\"}"; - Redis.SetEntry("UserLevel/1", val); + Redis.SetValue("UserLevel/1", val); var vals = Redis.GetValues(new List(new[] { "UserLevel/1" })); @@ -399,7 +399,7 @@ public void Can_AcquireLock_TimeOut() public void Can_Append() { const string expectedString = "Hello, " + "World!"; - Redis.SetEntry("key", "Hello, "); + Redis.SetValue("key", "Hello, "); var currentLength = Redis.AppendToValue("key", "World!"); Assert.That(currentLength, Is.EqualTo(expectedString.Length)); @@ -412,7 +412,7 @@ public void Can_Append() public void Can_GetRange() { const string helloWorld = "Hello, World!"; - Redis.SetEntry("key", helloWorld); + Redis.SetValue("key", helloWorld); var fromIndex = "Hello, ".Length; var toIndex = "Hello, World".Length - 1; @@ -591,7 +591,7 @@ public void Can_change_db_at_runtime() [Test] public void Can_Set_Expire_Seconds() { - Redis.SetEntry("key", "val", expireIn: TimeSpan.FromSeconds(1)); + Redis.SetValue("key", "val", expireIn: TimeSpan.FromSeconds(1)); Assert.That(Redis.ContainsKey("key"), Is.True); Thread.Sleep(2000); Assert.That(Redis.ContainsKey("key"), Is.False); @@ -600,7 +600,7 @@ public void Can_Set_Expire_Seconds() [Test] public void Can_Set_Expire_MilliSeconds() { - Redis.SetEntry("key", "val", expireIn: TimeSpan.FromMilliseconds(1000)); + Redis.SetValue("key", "val", expireIn: TimeSpan.FromMilliseconds(1000)); Assert.That(Redis.ContainsKey("key"), Is.True); Thread.Sleep(2000); Assert.That(Redis.ContainsKey("key"), Is.False); @@ -609,12 +609,12 @@ public void Can_Set_Expire_MilliSeconds() [Test] public void Can_Set_Expire_Seconds_if_exists() { - Assert.That(Redis.SetEntryIfExists("key", "val", expireIn: TimeSpan.FromMilliseconds(1500)), + Assert.That(Redis.SetValueIfExists("key", "val", expireIn: TimeSpan.FromMilliseconds(1500)), Is.False); Assert.That(Redis.ContainsKey("key"), Is.False); - Redis.SetEntry("key", "val"); - Assert.That(Redis.SetEntryIfExists("key", "val", expireIn: TimeSpan.FromMilliseconds(1000)), + Redis.SetValue("key", "val"); + Assert.That(Redis.SetValueIfExists("key", "val", expireIn: TimeSpan.FromMilliseconds(1000)), Is.True); Assert.That(Redis.ContainsKey("key"), Is.True); @@ -625,18 +625,18 @@ public void Can_Set_Expire_Seconds_if_exists() [Test] public void Can_Set_Expire_Seconds_if_not_exists() { - Assert.That(Redis.SetEntryIfNotExists("key", "val", expireIn: TimeSpan.FromMilliseconds(1000)), + Assert.That(Redis.SetValueIfNotExists("key", "val", expireIn: TimeSpan.FromMilliseconds(1000)), Is.True); Assert.That(Redis.ContainsKey("key"), Is.True); - Assert.That(Redis.SetEntryIfNotExists("key", "val", expireIn: TimeSpan.FromMilliseconds(1000)), + Assert.That(Redis.SetValueIfNotExists("key", "val", expireIn: TimeSpan.FromMilliseconds(1000)), Is.False); Thread.Sleep(2000); Assert.That(Redis.ContainsKey("key"), Is.False); Redis.Remove("key"); - Redis.SetEntryIfNotExists("key", "val", expireIn: TimeSpan.FromMilliseconds(1000)); + Redis.SetValueIfNotExists("key", "val", expireIn: TimeSpan.FromMilliseconds(1000)); Assert.That(Redis.ContainsKey("key"), Is.True); } } diff --git a/tests/ServiceStack.Redis.Tests/RedisClientTestsBase.cs b/tests/ServiceStack.Redis.Tests/RedisClientTestsBase.cs index afa0f780..40386c28 100644 --- a/tests/ServiceStack.Redis.Tests/RedisClientTestsBase.cs +++ b/tests/ServiceStack.Redis.Tests/RedisClientTestsBase.cs @@ -16,7 +16,7 @@ protected void Log(string fmt, params object[] args) Debug.WriteLine("{0}", string.Format(fmt, args).Trim()); } - [TestFixtureSetUp] + [OneTimeSetUp] public virtual void OnBeforeTestFixture() { RedisClient.NewFactoryFn = () => new RedisClient(TestConfig.SingleHost); @@ -26,7 +26,7 @@ public virtual void OnBeforeTestFixture() } } - [TestFixtureTearDown] + [OneTimeTearDown] public virtual void OnAfterTestFixture() { } diff --git a/tests/ServiceStack.Redis.Tests/RedisClientsManagerExtensionsTests.cs b/tests/ServiceStack.Redis.Tests/RedisClientsManagerExtensionsTests.cs index d2c6ac5a..804681a2 100644 --- a/tests/ServiceStack.Redis.Tests/RedisClientsManagerExtensionsTests.cs +++ b/tests/ServiceStack.Redis.Tests/RedisClientsManagerExtensionsTests.cs @@ -34,7 +34,7 @@ public void Can_Exec_Func_string() { string value = redisManager.Exec(r => { - r.SetEntry("key", "value"); + r.SetValue("key", "value"); return r.GetValue("key"); }); Assert.That(value, Is.EqualTo("value")); diff --git a/tests/ServiceStack.Redis.Tests/RedisGeoNativeClientTests.cs b/tests/ServiceStack.Redis.Tests/RedisGeoNativeClientTests.cs index 7bbaaf08..65e12251 100644 --- a/tests/ServiceStack.Redis.Tests/RedisGeoNativeClientTests.cs +++ b/tests/ServiceStack.Redis.Tests/RedisGeoNativeClientTests.cs @@ -16,8 +16,8 @@ public RedisGeoNativeClientTests() redis = new RedisNativeClient(TestConfig.GeoHost); } - [TestFixtureTearDown] - public void TestFixtureTearDown() + [OneTimeTearDown] + public void OneTimeTearDown() { redis.Dispose(); } diff --git a/tests/ServiceStack.Redis.Tests/RedisGeoTests.cs b/tests/ServiceStack.Redis.Tests/RedisGeoTests.cs index 79716eca..5b72c3e1 100644 --- a/tests/ServiceStack.Redis.Tests/RedisGeoTests.cs +++ b/tests/ServiceStack.Redis.Tests/RedisGeoTests.cs @@ -16,8 +16,8 @@ public RedisGeoTests() redis = new RedisClient(TestConfig.GeoHost); } - [TestFixtureTearDown] - public void TestFixtureTearDown() + [OneTimeTearDown] + public void OneTimeTearDown() { redis.Dispose(); } diff --git a/tests/ServiceStack.Redis.Tests/RedisManagerPoolTests.cs b/tests/ServiceStack.Redis.Tests/RedisManagerPoolTests.cs index e34c0ad4..4aca12c2 100644 --- a/tests/ServiceStack.Redis.Tests/RedisManagerPoolTests.cs +++ b/tests/ServiceStack.Redis.Tests/RedisManagerPoolTests.cs @@ -24,14 +24,14 @@ public class RedisManagerPoolTests private string firstReadWriteHost; private string firstReadOnlyHost; - [TestFixtureSetUp] - public void TestFixtureSetUp() + [OneTimeSetUp] + public void OneTimeSetUp() { RedisConfig.VerifyMasterConnections = false; } - [TestFixtureTearDown] - public void TestFixtureTearDown() + [OneTimeTearDown] + public void OneTimeTearDown() { RedisConfig.VerifyMasterConnections = true; } diff --git a/tests/ServiceStack.Redis.Tests/RedisPasswordTests.cs b/tests/ServiceStack.Redis.Tests/RedisPasswordTests.cs index ba3f38f3..3fe5f782 100644 --- a/tests/ServiceStack.Redis.Tests/RedisPasswordTests.cs +++ b/tests/ServiceStack.Redis.Tests/RedisPasswordTests.cs @@ -17,8 +17,8 @@ public void Can_connect_to_Slaves_and_Masters_with_Password() using (var readWrite = factory.GetClient()) using (var readOnly = factory.GetReadOnlyClient()) { - readWrite.SetEntry("Foo", "Bar"); - var value = readOnly.GetEntry("Foo"); + readWrite.SetValue("Foo", "Bar"); + var value = readOnly.GetValue("Foo"); Assert.That(value, Is.EqualTo("Bar")); } @@ -35,12 +35,12 @@ public void Passwords_are_not_leaked_in_exception_messages() var factory = new PooledRedisClientManager(password + "@" + TestConfig.SingleHost); // redis will throw when using password and it's not configured using (var redis = factory.GetClient()) { - redis.SetEntry("Foo", "Bar"); + redis.SetValue("Foo", "Bar"); } } catch (RedisResponseException ex) { - Assert.That(ex.Message, Is.Not.StringContaining(password)); + Assert.That(ex.Message, Is.Not.Contains(password)); throw; } }, diff --git a/tests/ServiceStack.Redis.Tests/RedisStatsTests.cs b/tests/ServiceStack.Redis.Tests/RedisStatsTests.cs index 0b7b5d76..36d6ec78 100644 --- a/tests/ServiceStack.Redis.Tests/RedisStatsTests.cs +++ b/tests/ServiceStack.Redis.Tests/RedisStatsTests.cs @@ -7,8 +7,8 @@ namespace ServiceStack.Redis.Tests public class RedisStatsTests : RedisClientTestsBase { - [TestFixtureSetUp] - public void TestFixtureSetUp() + [OneTimeSetUp] + public void OneTimeSetUp() { RedisConfig.AssumeServerVersion = 2821; } diff --git a/tests/ServiceStack.Redis.Tests/RedisTransactionCommonTests.cs b/tests/ServiceStack.Redis.Tests/RedisTransactionCommonTests.cs index 20ada901..8b4ad350 100644 --- a/tests/ServiceStack.Redis.Tests/RedisTransactionCommonTests.cs +++ b/tests/ServiceStack.Redis.Tests/RedisTransactionCommonTests.cs @@ -25,7 +25,7 @@ public void Can_Set_and_Expire_key_in_atomic_transaction() Assert.That(Redis.GetValue(Prefix + "key"), Is.Null); using (var trans = Redis.CreateTransaction()) //Calls 'MULTI' { - trans.QueueCommand(r => r.SetEntry(Prefix + "key", "a")); //Queues 'SET key a' + trans.QueueCommand(r => r.SetValue(Prefix + "key", "a")); //Queues 'SET key a' trans.QueueCommand(r => r.ExpireEntryIn(Prefix + "key", oneSec)); //Queues 'EXPIRE key 1' trans.Commit(); //Calls 'EXEC' diff --git a/tests/ServiceStack.Redis.Tests/RetryCommandTests.cs b/tests/ServiceStack.Redis.Tests/RetryCommandTests.cs index 4b67896e..b716177d 100644 --- a/tests/ServiceStack.Redis.Tests/RetryCommandTests.cs +++ b/tests/ServiceStack.Redis.Tests/RetryCommandTests.cs @@ -91,7 +91,7 @@ public void Does_Timeout_with_repeated_SocketException() } catch (RedisException ex) { - Assert.That(ex.Message, Is.StringStarting("Exceeded timeout")); + Assert.That(ex.Message, Does.StartWith("Exceeded timeout")); redis.OnBeforeFlush = null; Assert.That(redis.Get("retryCounter"), Is.EqualTo(1)); @@ -127,7 +127,7 @@ public void Does_not_retry_when_RetryTimeout_is_Zero() } catch (Exception ex) { - Assert.That(ex.Message, Is.StringStarting("Exceeded timeout")); + Assert.That(ex.Message, Does.StartWith("Exceeded timeout")); redis.OnBeforeFlush = null; Assert.That(redis.Get("retryCounter"), Is.EqualTo(1)); diff --git a/tests/ServiceStack.Redis.Tests/SslTests.cs b/tests/ServiceStack.Redis.Tests/SslTests.cs index ec947ea5..0a3be45e 100644 --- a/tests/ServiceStack.Redis.Tests/SslTests.cs +++ b/tests/ServiceStack.Redis.Tests/SslTests.cs @@ -23,8 +23,8 @@ public class SslTests private string Password; private string connectionString; - [TestFixtureSetUp] - public void TestFixtureSetUp() + [OneTimeSetUp] + public void OneTimeSetUp() { var settings = new TextFileSettings("~/azureconfig.txt".MapProjectPath()); Host = settings.GetString("Host"); @@ -316,7 +316,7 @@ private static void UseClient(IRedisClient client, int clientNo, string testData Log("Client '{0}' is using '{1}'", clientNo, client.Host); var testClientKey = "test:" + host + ":" + clientNo; - client.SetEntry(testClientKey, testData); + client.SetValue(testClientKey, testData); var result = client.GetValue(testClientKey) ?? ""; Log("\t{0} => {1} len {2} {3} len", testClientKey, diff --git a/tests/ServiceStack.Redis.Tests/TwemproxyTests.cs b/tests/ServiceStack.Redis.Tests/TwemproxyTests.cs index e03d95bd..8514c289 100644 --- a/tests/ServiceStack.Redis.Tests/TwemproxyTests.cs +++ b/tests/ServiceStack.Redis.Tests/TwemproxyTests.cs @@ -14,8 +14,8 @@ public void Can_connect_to_twemproxy() //ServerVersionNumber = 2611 }; //var redis = new RedisClient("10.0.0.14"); - redis.SetEntry("foo", "bar"); - var foo = redis.GetEntry("foo"); + redis.SetValue("foo", "bar"); + var foo = redis.GetValue("foo"); Assert.That(foo, Is.EqualTo("bar")); } diff --git a/tests/ServiceStack.Redis.Tests/ValueTypeExamples.cs b/tests/ServiceStack.Redis.Tests/ValueTypeExamples.cs index efebf37b..f0588d62 100644 --- a/tests/ServiceStack.Redis.Tests/ValueTypeExamples.cs +++ b/tests/ServiceStack.Redis.Tests/ValueTypeExamples.cs @@ -26,7 +26,7 @@ public void Working_with_int_values() //STORING AN INT USING THE BASIC CLIENT using (var redisClient = new RedisClient(TestConfig.SingleHost)) { - redisClient.SetEntry(intKey, intValue.ToString()); + redisClient.SetValue(intKey, intValue.ToString()); string strGetIntValue = redisClient.GetValue(intKey); int toIntValue = int.Parse(strGetIntValue); @@ -39,7 +39,7 @@ public void Working_with_int_values() //Create a generic client that treats all values as ints: IRedisTypedClient intRedis = redisClient.As(); - intRedis.SetEntry(intKey, intValue); + intRedis.SetValue(intKey, intValue); var toIntValue = intRedis.GetValue(intKey); Assert.That(toIntValue, Is.EqualTo(intValue)); @@ -104,7 +104,7 @@ public void Working_with_Generic_types() var typedRedis = redisClient.As(); var pocoValue = new IntAndString { Id = 1, Letter = "A" }; - typedRedis.SetEntry("pocoKey", pocoValue); + typedRedis.SetValue("pocoKey", pocoValue); IntAndString toPocoValue = typedRedis.GetValue("pocoKey"); Assert.That(toPocoValue.Id, Is.EqualTo(pocoValue.Id));