Skip to content

Commit

Permalink
rebase
Browse files Browse the repository at this point in the history
  • Loading branch information
@BrennanConroy
BrennanConroy committed Aug 12, 2022
1 parent df9d875 commit 0c9d83c
Show file tree
Hide file tree
Showing 6 changed files with 41 additions and 41 deletions.
6 changes: 3 additions & 3 deletions src/libraries/System.Threading.RateLimiting/tests/ChainedLimiterTests.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -226,15 +226,15 @@ public void GetStatisticsHasCorrectValues()

using var chainedLimiter = PartitionedRateLimiter.CreateChained<string>(limiter1, limiter2, limiter3);

var lease = chainedLimiter.Acquire("", 10);
var lease = chainedLimiter.AttemptAcquire("", 10);
var stats = chainedLimiter.GetStatistics("");

Assert.Equal(3, stats.CurrentAvailablePermits);
Assert.Equal(0, stats.CurrentQueuedCount);
Assert.Equal(3, stats.TotalSuccessfulLeases);
Assert.Equal(0, stats.TotalFailedLeases);

var lease2 = chainedLimiter.Acquire("", 10);
var lease2 = chainedLimiter.AttemptAcquire("", 10);
Assert.False(lease2.IsAcquired);
stats = chainedLimiter.GetStatistics("");

Expand All @@ -243,7 +243,7 @@ public void GetStatisticsHasCorrectValues()
Assert.Equal(5, stats.TotalSuccessfulLeases);
Assert.Equal(1, stats.TotalFailedLeases);

var task = chainedLimiter.WaitAndAcquireAsync("", 10);
var task = chainedLimiter.AcquireAsync("", 10);
Assert.False(task.IsCompleted);
stats = chainedLimiter.GetStatistics("");

Expand Down
18 changes: 9 additions & 9 deletions src/libraries/System.Threading.RateLimiting/tests/ConcurrencyLimiterTests.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -818,7 +818,7 @@ public override void GetStatisticsReturnsNewInstances()
var stats = limiter.GetStatistics();
Assert.Equal(1, stats.CurrentAvailablePermits);

var lease = limiter.Acquire(1);
var lease = limiter.AttemptAcquire(1);

var stats2 = limiter.GetStatistics();
Assert.NotSame(stats, stats2);
Expand All @@ -843,23 +843,23 @@ public override async Task GetStatisticsHasCorrectValues()
Assert.Equal(0, stats.TotalSuccessfulLeases);

// success from acquire + available
var lease1 = limiter.Acquire(60);
var lease1 = limiter.AttemptAcquire(60);
stats = limiter.GetStatistics();
Assert.Equal(40, stats.CurrentAvailablePermits);
Assert.Equal(0, stats.CurrentQueuedCount);
Assert.Equal(0, stats.TotalFailedLeases);
Assert.Equal(1, stats.TotalSuccessfulLeases);

// queue
var lease2Task = limiter.WaitAndAcquireAsync(50);
var lease2Task = limiter.AcquireAsync(50);
stats = limiter.GetStatistics();
Assert.Equal(40, stats.CurrentAvailablePermits);
Assert.Equal(50, stats.CurrentQueuedCount);
Assert.Equal(0, stats.TotalFailedLeases);
Assert.Equal(1, stats.TotalSuccessfulLeases);

// failure from wait
var lease3 = await limiter.WaitAndAcquireAsync(1);
var lease3 = await limiter.AcquireAsync(1);
Assert.False(lease3.IsAcquired);
stats = limiter.GetStatistics();
Assert.Equal(40, stats.CurrentAvailablePermits);
Expand All @@ -868,7 +868,7 @@ public override async Task GetStatisticsHasCorrectValues()
Assert.Equal(1, stats.TotalSuccessfulLeases);

// failure from acquire
var lease4 = limiter.Acquire(100);
var lease4 = limiter.AttemptAcquire(100);
Assert.False(lease4.IsAcquired);
stats = limiter.GetStatistics();
Assert.Equal(40, stats.CurrentAvailablePermits);
Expand Down Expand Up @@ -896,22 +896,22 @@ public override async Task GetStatisticsWithZeroPermitCount()
QueueProcessingOrder = QueueProcessingOrder.OldestFirst,
QueueLimit = 50
});
var lease = limiter.Acquire(0);
var lease = limiter.AttemptAcquire(0);
Assert.True(lease.IsAcquired);
Assert.Equal(1, limiter.GetStatistics().TotalSuccessfulLeases);
Assert.Equal(100, limiter.GetStatistics().CurrentAvailablePermits);

lease = await limiter.WaitAndAcquireAsync(0);
lease = await limiter.AcquireAsync(0);
Assert.True(lease.IsAcquired);
Assert.Equal(2, limiter.GetStatistics().TotalSuccessfulLeases);
Assert.Equal(100, limiter.GetStatistics().CurrentAvailablePermits);

lease = limiter.Acquire(100);
lease = limiter.AttemptAcquire(100);
Assert.True(lease.IsAcquired);
Assert.Equal(3, limiter.GetStatistics().TotalSuccessfulLeases);
Assert.Equal(0, limiter.GetStatistics().CurrentAvailablePermits);

var lease2 = limiter.Acquire(0);
var lease2 = limiter.AttemptAcquire(0);
Assert.False(lease2.IsAcquired);
Assert.Equal(3, limiter.GetStatistics().TotalSuccessfulLeases);
Assert.Equal(1, limiter.GetStatistics().TotalFailedLeases);
Expand Down
18 changes: 9 additions & 9 deletions src/libraries/System.Threading.RateLimiting/tests/FixedWindowRateLimiterTests.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1033,7 +1033,7 @@ public override void GetStatisticsReturnsNewInstances()
var stats = limiter.GetStatistics();
Assert.Equal(1, stats.CurrentAvailablePermits);

var lease = limiter.Acquire(1);
var lease = limiter.AttemptAcquire(1);

var stats2 = limiter.GetStatistics();
Assert.NotSame(stats, stats2);
Expand All @@ -1060,23 +1060,23 @@ public override async Task GetStatisticsHasCorrectValues()
Assert.Equal(0, stats.TotalSuccessfulLeases);

// success from acquire + available
var lease1 = limiter.Acquire(60);
var lease1 = limiter.AttemptAcquire(60);
stats = limiter.GetStatistics();
Assert.Equal(40, stats.CurrentAvailablePermits);
Assert.Equal(0, stats.CurrentQueuedCount);
Assert.Equal(0, stats.TotalFailedLeases);
Assert.Equal(1, stats.TotalSuccessfulLeases);

// queue
var lease2Task = limiter.WaitAndAcquireAsync(50);
var lease2Task = limiter.AcquireAsync(50);
stats = limiter.GetStatistics();
Assert.Equal(40, stats.CurrentAvailablePermits);
Assert.Equal(50, stats.CurrentQueuedCount);
Assert.Equal(0, stats.TotalFailedLeases);
Assert.Equal(1, stats.TotalSuccessfulLeases);

// failure from wait
var lease3 = await limiter.WaitAndAcquireAsync(1);
var lease3 = await limiter.AcquireAsync(1);
Assert.False(lease3.IsAcquired);
stats = limiter.GetStatistics();
Assert.Equal(40, stats.CurrentAvailablePermits);
Expand All @@ -1085,7 +1085,7 @@ public override async Task GetStatisticsHasCorrectValues()
Assert.Equal(1, stats.TotalSuccessfulLeases);

// failure from acquire
var lease4 = limiter.Acquire(100);
var lease4 = limiter.AttemptAcquire(100);
Assert.False(lease4.IsAcquired);
stats = limiter.GetStatistics();
Assert.Equal(40, stats.CurrentAvailablePermits);
Expand Down Expand Up @@ -1115,22 +1115,22 @@ public override async Task GetStatisticsWithZeroPermitCount()
Window = TimeSpan.Zero,
AutoReplenishment = false
});
var lease = limiter.Acquire(0);
var lease = limiter.AttemptAcquire(0);
Assert.True(lease.IsAcquired);
Assert.Equal(1, limiter.GetStatistics().TotalSuccessfulLeases);
Assert.Equal(100, limiter.GetStatistics().CurrentAvailablePermits);

lease = await limiter.WaitAndAcquireAsync(0);
lease = await limiter.AcquireAsync(0);
Assert.True(lease.IsAcquired);
Assert.Equal(2, limiter.GetStatistics().TotalSuccessfulLeases);
Assert.Equal(100, limiter.GetStatistics().CurrentAvailablePermits);

lease = limiter.Acquire(100);
lease = limiter.AttemptAcquire(100);
Assert.True(lease.IsAcquired);
Assert.Equal(3, limiter.GetStatistics().TotalSuccessfulLeases);
Assert.Equal(0, limiter.GetStatistics().CurrentAvailablePermits);

var lease2 = limiter.Acquire(0);
var lease2 = limiter.AttemptAcquire(0);
Assert.False(lease2.IsAcquired);
Assert.Equal(3, limiter.GetStatistics().TotalSuccessfulLeases);
Assert.Equal(1, limiter.GetStatistics().TotalFailedLeases);
Expand Down
4 changes: 2 additions & 2 deletions src/libraries/System.Threading.RateLimiting/tests/RateLimiterPartitionTests.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -86,7 +86,7 @@ public async Task NoLimiter_GetStatistics()
var leaseCount = 0;
for (var i = 0; i < 134; i++)
{
var lease = limiter.Acquire(i);
var lease = limiter.AttemptAcquire(i);
Assert.True(lease.IsAcquired);
++leaseCount;
}
Expand All @@ -99,7 +99,7 @@ public async Task NoLimiter_GetStatistics()

for (var i = 0; i < 165; i++)
{
var wait = limiter.WaitAndAcquireAsync(int.MaxValue);
var wait = limiter.AcquireAsync(int.MaxValue);
Assert.True(wait.IsCompletedSuccessfully);
var lease = await wait;
Assert.True(lease.IsAcquired);
Expand Down
18 changes: 9 additions & 9 deletions src/libraries/System.Threading.RateLimiting/tests/SlidingWindowRateLimiterTests.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1097,7 +1097,7 @@ public override void GetStatisticsReturnsNewInstances()
var stats = limiter.GetStatistics();
Assert.Equal(1, stats.CurrentAvailablePermits);

var lease = limiter.Acquire(1);
var lease = limiter.AttemptAcquire(1);

var stats2 = limiter.GetStatistics();
Assert.NotSame(stats, stats2);
Expand All @@ -1124,14 +1124,14 @@ public override async Task GetStatisticsHasCorrectValues()
Assert.Equal(0, stats.TotalFailedLeases);
Assert.Equal(0, stats.TotalSuccessfulLeases);

var lease1 = limiter.Acquire(60);
var lease1 = limiter.AttemptAcquire(60);
stats = limiter.GetStatistics();
Assert.Equal(40, stats.CurrentAvailablePermits);
Assert.Equal(0, stats.CurrentQueuedCount);
Assert.Equal(0, stats.TotalFailedLeases);
Assert.Equal(1, stats.TotalSuccessfulLeases);

var lease2Task = limiter.WaitAndAcquireAsync(50);
var lease2Task = limiter.AcquireAsync(50);
stats = limiter.GetStatistics();
Assert.Equal(40, stats.CurrentAvailablePermits);
Assert.Equal(50, stats.CurrentQueuedCount);
Expand All @@ -1140,15 +1140,15 @@ public override async Task GetStatisticsHasCorrectValues()

limiter.TryReplenish();

var lease3 = await limiter.WaitAndAcquireAsync(1);
var lease3 = await limiter.AcquireAsync(1);
Assert.False(lease3.IsAcquired);
stats = limiter.GetStatistics();
Assert.Equal(40, stats.CurrentAvailablePermits);
Assert.Equal(50, stats.CurrentQueuedCount);
Assert.Equal(1, stats.TotalFailedLeases);
Assert.Equal(1, stats.TotalSuccessfulLeases);

var lease4 = limiter.Acquire(100);
var lease4 = limiter.AttemptAcquire(100);
Assert.False(lease4.IsAcquired);
stats = limiter.GetStatistics();
Assert.Equal(40, stats.CurrentAvailablePermits);
Expand Down Expand Up @@ -1178,22 +1178,22 @@ public override async Task GetStatisticsWithZeroPermitCount()
SegmentsPerWindow = 3,
AutoReplenishment = false
});
var lease = limiter.Acquire(0);
var lease = limiter.AttemptAcquire(0);
Assert.True(lease.IsAcquired);
Assert.Equal(1, limiter.GetStatistics().TotalSuccessfulLeases);
Assert.Equal(100, limiter.GetStatistics().CurrentAvailablePermits);

lease = await limiter.WaitAndAcquireAsync(0);
lease = await limiter.AcquireAsync(0);
Assert.True(lease.IsAcquired);
Assert.Equal(2, limiter.GetStatistics().TotalSuccessfulLeases);
Assert.Equal(100, limiter.GetStatistics().CurrentAvailablePermits);

lease = limiter.Acquire(100);
lease = limiter.AttemptAcquire(100);
Assert.True(lease.IsAcquired);
Assert.Equal(3, limiter.GetStatistics().TotalSuccessfulLeases);
Assert.Equal(0, limiter.GetStatistics().CurrentAvailablePermits);

var lease2 = limiter.Acquire(0);
var lease2 = limiter.AttemptAcquire(0);
Assert.False(lease2.IsAcquired);
Assert.Equal(3, limiter.GetStatistics().TotalSuccessfulLeases);
Assert.Equal(1, limiter.GetStatistics().TotalFailedLeases);
Expand Down
18 changes: 9 additions & 9 deletions src/libraries/System.Threading.RateLimiting/tests/TokenBucketRateLimiterTests.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1222,7 +1222,7 @@ public override void GetStatisticsReturnsNewInstances()
var stats = limiter.GetStatistics();
Assert.Equal(1, stats.CurrentAvailablePermits);

var lease = limiter.Acquire(1);
var lease = limiter.AttemptAcquire(1);

var stats2 = limiter.GetStatistics();
Assert.NotSame(stats, stats2);
Expand All @@ -1249,29 +1249,29 @@ public override async Task GetStatisticsHasCorrectValues()
Assert.Equal(0, stats.TotalFailedLeases);
Assert.Equal(0, stats.TotalSuccessfulLeases);

var lease1 = limiter.Acquire(60);
var lease1 = limiter.AttemptAcquire(60);
stats = limiter.GetStatistics();
Assert.Equal(40, stats.CurrentAvailablePermits);
Assert.Equal(0, stats.CurrentQueuedCount);
Assert.Equal(0, stats.TotalFailedLeases);
Assert.Equal(1, stats.TotalSuccessfulLeases);

var lease2Task = limiter.WaitAndAcquireAsync(50);
var lease2Task = limiter.AcquireAsync(50);
stats = limiter.GetStatistics();
Assert.Equal(40, stats.CurrentAvailablePermits);
Assert.Equal(50, stats.CurrentQueuedCount);
Assert.Equal(0, stats.TotalFailedLeases);
Assert.Equal(1, stats.TotalSuccessfulLeases);

var lease3 = await limiter.WaitAndAcquireAsync(1);
var lease3 = await limiter.AcquireAsync(1);
Assert.False(lease3.IsAcquired);
stats = limiter.GetStatistics();
Assert.Equal(40, stats.CurrentAvailablePermits);
Assert.Equal(50, stats.CurrentQueuedCount);
Assert.Equal(1, stats.TotalFailedLeases);
Assert.Equal(1, stats.TotalSuccessfulLeases);

var lease4 = limiter.Acquire(100);
var lease4 = limiter.AttemptAcquire(100);
Assert.False(lease4.IsAcquired);
stats = limiter.GetStatistics();
Assert.Equal(40, stats.CurrentAvailablePermits);
Expand Down Expand Up @@ -1301,22 +1301,22 @@ public override async Task GetStatisticsWithZeroPermitCount()
TokensPerPeriod = 30,
AutoReplenishment = false
});
var lease = limiter.Acquire(0);
var lease = limiter.AttemptAcquire(0);
Assert.True(lease.IsAcquired);
Assert.Equal(1, limiter.GetStatistics().TotalSuccessfulLeases);
Assert.Equal(100, limiter.GetStatistics().CurrentAvailablePermits);

lease = await limiter.WaitAndAcquireAsync(0);
lease = await limiter.AcquireAsync(0);
Assert.True(lease.IsAcquired);
Assert.Equal(2, limiter.GetStatistics().TotalSuccessfulLeases);
Assert.Equal(100, limiter.GetStatistics().CurrentAvailablePermits);

lease = limiter.Acquire(100);
lease = limiter.AttemptAcquire(100);
Assert.True(lease.IsAcquired);
Assert.Equal(3, limiter.GetStatistics().TotalSuccessfulLeases);
Assert.Equal(0, limiter.GetStatistics().CurrentAvailablePermits);

var lease2 = limiter.Acquire(0);
var lease2 = limiter.AttemptAcquire(0);
Assert.False(lease2.IsAcquired);
Assert.Equal(3, limiter.GetStatistics().TotalSuccessfulLeases);
Assert.Equal(1, limiter.GetStatistics().TotalFailedLeases);
Expand Down

0 comments on commit 0c9d83c

Please sign in to comment.