From 76009824a620c339468418b8a4e4b92fdb6df7f3 Mon Sep 17 00:00:00 2001 From: henry Date: Tue, 17 Jun 2025 19:29:51 -0400 Subject: [PATCH] Added helper method to fill access slotsfor testing --- AccessQueueServiceTests/AccessServiceTests.cs | 52 ++++++------------- 1 file changed, 16 insertions(+), 36 deletions(-) diff --git a/AccessQueueServiceTests/AccessServiceTests.cs b/AccessQueueServiceTests/AccessServiceTests.cs index f0100a8..f359266 100644 --- a/AccessQueueServiceTests/AccessServiceTests.cs +++ b/AccessQueueServiceTests/AccessServiceTests.cs @@ -37,6 +37,14 @@ namespace AccessQueueServiceTests _accessService = new AccessService(configuration, accessQueueRepo, logger); } + private void FillSlots(int usersToAdd = CAP_LIMIT) + { + for (int i = 0; i < usersToAdd; i++) + { + _ = _accessService.RequestAccess(Guid.NewGuid().ToString()); + } + } + [Fact] public async Task RequestAccess_ShouldGrantAccess_WhenCapacityIsAvailable() { @@ -71,10 +79,7 @@ namespace AccessQueueServiceTests [Fact] public async Task RequestAccess_ShouldQueueUser_WhenCapacityIsFull() { - for (int i = 0; i < CAP_LIMIT * 2; i++) // Fill double capacity - { - await _accessService.RequestAccess(Guid.NewGuid().ToString()); - } + FillSlots(CAP_LIMIT * 2); var userId = "user"; var response = await _accessService.RequestAccess(userId); @@ -115,10 +120,7 @@ namespace AccessQueueServiceTests var userId = "user"; await _accessService.RequestAccess(userId); - for (int i = 0; i < CAP_LIMIT; i++) // Fill remaining slots - { - await _accessService.RequestAccess(Guid.NewGuid().ToString()); - } + FillSlots(); var response = await _accessService.RequestAccess(userId); // Request access before revoking Assert.NotNull(response); @@ -133,10 +135,7 @@ namespace AccessQueueServiceTests [Fact] public async Task RequestAccess_ShouldNotQueueUser_WhenMultipleRequestsForOtherUsersMade() { - for (int i = 0; i < CAP_LIMIT; i++) // Fill slots without awaiting - { - _ = _accessService.RequestAccess(Guid.NewGuid().ToString()); - } + FillSlots(); var response = await _accessService.RequestAccess(Guid.NewGuid().ToString()); // Request access before revoking Assert.NotNull(response); Assert.False(response.HasAccess); @@ -155,10 +154,7 @@ namespace AccessQueueServiceTests [Fact] public async Task RequestAccess_ShouldGrantAccess_WhenUsersWithAccessInactive() { - for (int i = 0; i < CAP_LIMIT; i++) - { - await _accessService.RequestAccess(Guid.NewGuid().ToString()); - } + FillSlots(); var userId = "user"; var response = await _accessService.RequestAccess(userId); Assert.False(response.HasAccess); @@ -174,10 +170,7 @@ namespace AccessQueueServiceTests var response = await _accessService.RequestAccess(userId); Assert.True(response.HasAccess); await Task.Delay(EXP_MILLIS); - for (int i = 0; i < CAP_LIMIT; i++) - { - await _accessService.RequestAccess(Guid.NewGuid().ToString()); - } + FillSlots(); response = await _accessService.RequestAccess(userId); Assert.False(response.HasAccess); } @@ -203,10 +196,7 @@ namespace AccessQueueServiceTests { var userId = "user"; await _accessService.RequestAccess(userId); - for (int i = 0; i < BULK_COUNT; i++) - { - _ = _accessService.RequestAccess(Guid.NewGuid().ToString()); - } + FillSlots(BULK_COUNT); var response = await _accessService.RequestAccess(userId); Assert.NotNull(response); Assert.True(response.HasAccess); @@ -246,10 +236,7 @@ namespace AccessQueueServiceTests [Fact] public async Task RequestAccess_ShouldShowCorrectRequestsAhead_WhenAccessRerequested() { - for (int i = 0; i < CAP_LIMIT; i++) - { - await _accessService.RequestAccess(Guid.NewGuid().ToString()); - } + FillSlots(); var id1 = "user1"; var id2 = "user2"; @@ -275,15 +262,8 @@ namespace AccessQueueServiceTests [Fact] public async Task Status_ShouldReturnCorrectCounts() { - - // Fill up the queue to force a user into the queue - for (int i = 0; i < CAP_LIMIT; i++) - { - await _accessService.RequestAccess(Guid.NewGuid().ToString()); - } - // Add an additional user + FillSlots(); await _accessService.RequestAccess("user"); - var status = _accessService.Status; Assert.NotNull(status);