diff --git a/.idea/.idea.Foundatio.Redis/.idea/.gitignore b/.idea/.idea.Foundatio.Redis/.idea/.gitignore deleted file mode 100644 index dc696ac..0000000 --- a/.idea/.idea.Foundatio.Redis/.idea/.gitignore +++ /dev/null @@ -1,10 +0,0 @@ -# Default ignored files -/shelf/ -/workspace.xml -# Rider ignored files -/modules.xml -/projectSettingsUpdater.xml -/contentModel.xml -/.idea.Foundatio.Redis.iml -# Editor-based HTTP Client requests -/httpRequests/ diff --git a/.idea/.idea.Foundatio.Redis/.idea/misc.xml b/.idea/.idea.Foundatio.Redis/.idea/misc.xml deleted file mode 100644 index 28a804d..0000000 --- a/.idea/.idea.Foundatio.Redis/.idea/misc.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - - - \ No newline at end of file diff --git a/.idea/.idea.Foundatio.Redis/.idea/vcs.xml b/.idea/.idea.Foundatio.Redis/.idea/vcs.xml index 94a25f7..35eb1dd 100644 --- a/.idea/.idea.Foundatio.Redis/.idea/vcs.xml +++ b/.idea/.idea.Foundatio.Redis/.idea/vcs.xml @@ -1,6 +1,6 @@ - + \ No newline at end of file diff --git a/tests/Foundatio.Redis.Tests/Locks/RedisLockTests.cs b/tests/Foundatio.Redis.Tests/Locks/RedisLockTests.cs index 3e646f0..ff2b36f 100644 --- a/tests/Foundatio.Redis.Tests/Locks/RedisLockTests.cs +++ b/tests/Foundatio.Redis.Tests/Locks/RedisLockTests.cs @@ -7,7 +7,6 @@ using Foundatio.Redis.Tests.Extensions; using Foundatio.Tests.Locks; using Foundatio.Utility; -using Foundatio.Xunit; using Microsoft.Extensions.Logging; using Xunit; using Xunit.Abstractions; @@ -37,22 +36,64 @@ protected override ILockProvider GetLockProvider() return new CacheLockProvider(_cache, _messageBus, Log); } + [Fact] + public override Task CanAcquireAndReleaseLockAsync() + { + return base.CanAcquireAndReleaseLockAsync(); + } + + [Fact] + public override Task LockWillTimeoutAsync() + { + return base.LockWillTimeoutAsync(); + } + + [Fact] + public override Task LockOneAtATimeAsync() + { + return base.LockOneAtATimeAsync(); + } + + [Fact] + public override Task CanAcquireMultipleResources() + { + return base.CanAcquireMultipleResources(); + } + [Fact] public override Task CanAcquireLocksInParallel() { return base.CanAcquireLocksInParallel(); } + // [Fact] + // public override Task CanAcquireScopedLocksInParallel() + // { + // return base.CanAcquireScopedLocksInParallel(); + // } + // + // [Fact] + // public override Task CanAcquireMultipleLocksInParallel() + // { + // return base.CanAcquireMultipleLocksInParallel(); + // } + [Fact] - public override Task CanAcquireAndReleaseLockAsync() + public override Task CanAcquireMultipleScopedResources() { - return base.CanAcquireAndReleaseLockAsync(); + return base.CanAcquireMultipleScopedResources(); } [Fact] - public override Task LockWillTimeoutAsync() + public override Task WillThrottleCallsAsync() { - return base.LockWillTimeoutAsync(); + return base.WillThrottleCallsAsync(); + } + + [Fact] + public override Task CanReleaseLockMultipleTimes() + { + return base.CanReleaseLockMultipleTimes(); } [Fact] @@ -91,18 +132,6 @@ public async Task LockWontTimeoutEarly() Assert.True(sw.ElapsedMilliseconds > 400); } - [RetryFact] - public override Task WillThrottleCallsAsync() - { - return base.WillThrottleCallsAsync(); - } - - [Fact] - public override Task LockOneAtATimeAsync() - { - return base.LockOneAtATimeAsync(); - } - public void Dispose() { _cache.Dispose();