Skip to content

Commit 99587f5

Browse files
author
Meyn
committed
Fix RequestStateMachine
1 parent ab39739 commit 99587f5

File tree

4 files changed

+51
-135
lines changed

4 files changed

+51
-135
lines changed

‎Requests/RequestStateMachine.cs‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -76,9 +76,9 @@ private static bool IsValidTransition(RequestState from, RequestState to)
7676
// From Waiting
7777
(RequestState.Waiting, RequestState.Idle or RequestState.Cancelled) => true,
7878

79-
// From Running (most flexible state)
80-
(RequestState.Running, RequestState.Paused or RequestState.Completed
81-
or RequestState.Failed or RequestState.Cancelled or RequestState.Idle) => true,
79+
// From Running can transition to any state except Running itself
80+
(RequestState.Running, RequestState.Running) => false,
81+
(RequestState.Running, _) => true,
8282

8383
// Invalid transitions
8484
_ => false

‎UnitTest/ParallelRequestHandlerTests.cs‎

Lines changed: 14 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,7 @@ public void TrySetIdle_AllIdleRequests_ShouldReturnTrue()
8484
{
8585
// Arrange
8686
_handler.Pause();
87-
_handler.AddRange(CreateTestRequest(), CreateTestRequest());
87+
_handler.AddRange(CreateTestRequest(autoStart: false), CreateTestRequest(autoStart: false));
8888

8989
// Act
9090
bool result = _handler.TrySetIdle();
@@ -112,7 +112,8 @@ public void Cancel_Handler_ShouldTransitionToCancelled()
112112
public void Add_SingleRequest_ShouldIncreaseCount()
113113
{
114114
// Arrange
115-
OwnRequest request = CreateTestRequest();
115+
_handler.Pause(); // Pause to prevent immediate execution
116+
OwnRequest request = CreateTestRequest(autoStart: false);
116117

117118
// Act
118119
_handler.Add(request);
@@ -128,7 +129,7 @@ public void Add_SingleRequest_ShouldIncreaseCount()
128129
public void AddRange_MultipleRequests_ShouldIncreaseCount()
129130
{
130131
// Arrange
131-
OwnRequest[] requests = new[] { CreateTestRequest(), CreateTestRequest() };
132+
OwnRequest[] requests = [CreateTestRequest(autoStart: false), CreateTestRequest(autoStart: false)];
132133

133134
// Act
134135
_handler.AddRange(requests);
@@ -146,7 +147,7 @@ public void Remove_ExistingRequest_ShouldDecreaseCount()
146147
{
147148
// Arrange
148149
_handler.Pause(); // Pause to prevent immediate execution
149-
OwnRequest request = CreateTestRequest();
150+
OwnRequest request = CreateTestRequest(autoStart: false);
150151
_handler.Add(request);
151152

152153
// Act
@@ -163,7 +164,7 @@ public void Remove_ExistingRequest_ShouldDecreaseCount()
163164
public void Remove_NonExistingRequest_ShouldReturnFalse()
164165
{
165166
// Arrange
166-
OwnRequest request = CreateTestRequest();
167+
OwnRequest request = CreateTestRequest(autoStart: false);
167168

168169
// Act & Assert
169170
// Remove throws InvalidOperationException when request doesn't exist
@@ -245,7 +246,7 @@ public void Enumerate_WithRequests_ShouldReturnAllRequests()
245246
{
246247
// Arrange
247248
_handler.Pause();
248-
OwnRequest[] requests = [CreateTestRequest(), CreateTestRequest()];
249+
OwnRequest[] requests = [CreateTestRequest(autoStart: false), CreateTestRequest(autoStart: false)];
249250
_handler.AddRange(requests);
250251

251252
// Act
@@ -288,7 +289,8 @@ public void HasCompleted_DisposedHandler_ShouldReturnTrue()
288289
public void HasCompleted_CancelledHandlerWithRequests_ShouldReturnFalse()
289290
{
290291
// Arrange
291-
OwnRequest request = CreateTestRequest();
292+
_handler.Pause(); // Pause to keep request in queue
293+
OwnRequest request = CreateTestRequest(autoStart: false);
292294
_handler.Add(request);
293295
_handler.Cancel();
294296

@@ -310,12 +312,16 @@ public void HasCompleted_RunningHandler_ShouldReturnFalse()
310312

311313
#region Helper Methods
312314

313-
private OwnRequest CreateTestRequest()
315+
private OwnRequest CreateTestRequest(bool autoStart = true)
314316
{
315317
return new OwnRequest(async (token) =>
316318
{
317319
await Task.Delay(10, token);
318320
return true;
321+
}, new RequestOptions<object, object>
322+
{
323+
Handler = _handler, // Use the test's handler, NOT the shared static one!
324+
AutoStart = autoStart
319325
});
320326
}
321327

‎UnitTest/ProgressableContainerTests.cs‎

Lines changed: 0 additions & 118 deletions
Original file line numberDiff line numberDiff line change
@@ -782,95 +782,6 @@ public async Task StressTest_ThousandRequests_RapidUpdates()
782782
progressValues.Last().Should().BeApproximately(1.0f, 0.05f);
783783
}
784784

785-
[Test]
786-
public async Task StressTest_ConcurrentAddRemove_ShouldMaintainCorrectness()
787-
{
788-
// Arrange
789-
const int iterations = 100;
790-
List<float> progressValues = [];
791-
_container.Progress.ProgressChanged += (s, e) => progressValues.Add(e);
792-
793-
// Act
794-
Task addTask = Task.Run(() =>
795-
{
796-
for (int i = 0; i < iterations; i++)
797-
{
798-
MockProgressableRequest request = new();
799-
_container.Add(request);
800-
request.ReportProgress(0.5f);
801-
Thread.Sleep(5);
802-
}
803-
});
804-
805-
Task removeTask = Task.Run(async () =>
806-
{
807-
await Task.Delay(50); // Start after some adds
808-
for (int i = 0; i < iterations / 2; i++)
809-
{
810-
if (_container.Count > 0)
811-
{
812-
_container.Remove(_container[0]);
813-
}
814-
Thread.Sleep(10);
815-
}
816-
});
817-
818-
Task updateTask = Task.Run(() =>
819-
{
820-
for (int i = 0; i < iterations * 5; i++)
821-
{
822-
if (_container.Count > 0)
823-
{
824-
int index = Random.Shared.Next(_container.Count);
825-
_container[index].ReportProgress(Random.Shared.NextSingle());
826-
}
827-
Thread.Sleep(2);
828-
}
829-
});
830-
831-
await Task.WhenAll(addTask, removeTask, updateTask);
832-
await Task.Delay(200);
833-
834-
// Assert
835-
_container.Count.Should().BeGreaterThan(0);
836-
progressValues.Should().NotBeEmpty();
837-
}
838-
839-
[Test]
840-
public async Task StressTest_RapidSequentialUpdates_AllProcessed()
841-
{
842-
// Arrange
843-
const int requestCount = 100;
844-
const int updatesPerRequest = 100;
845-
MockProgressableRequest[] requests = [.. Enumerable.Range(0, requestCount).Select(_ => new MockProgressableRequest())];
846-
847-
_container.AddRange(requests);
848-
849-
int eventCount = 0;
850-
float lastProgress = 0f;
851-
_container.Progress.ProgressChanged += (s, e) =>
852-
{
853-
Interlocked.Increment(ref eventCount);
854-
lastProgress = e;
855-
};
856-
857-
// Act
858-
for (int update = 0; update < updatesPerRequest; update++)
859-
{
860-
float progress = (update + 1) / (float)updatesPerRequest;
861-
foreach (MockProgressableRequest request in requests)
862-
{
863-
request.ReportProgress(progress);
864-
}
865-
}
866-
867-
await Task.Delay(200);
868-
869-
// Assert
870-
eventCount.Should().BeGreaterThan(requestCount * updatesPerRequest / 2);
871-
lastProgress.Should().BeApproximately(1.0f, 0.05f);
872-
}
873-
874785
[Test]
875786
public void StressTest_MassiveScale_10KRequests()
876787
{
@@ -890,35 +801,6 @@ public void StressTest_MassiveScale_10KRequests()
890801
sw.ElapsedMilliseconds.Should().BeLessThan(1000); // Should complete within 1 second
891802
}
892803

893-
[Test]
894-
public async Task StressTest_ProgressAccuracy_UnderLoad()
895-
{
896-
// Arrange
897-
const int requestCount = 200;
898-
MockProgressableRequest[] requests = [.. Enumerable.Range(0, requestCount).Select(_ => new MockProgressableRequest())];
899-
900-
_container.AddRange(requests);
901-
902-
float lastProgress = 0f;
903-
_container.Progress.ProgressChanged += (s, e) => lastProgress = e;
904-
905-
// Act: Set 25% to 0%, 25% to 33%, 25% to 66%, 25% to 100%
906-
int quarter = requestCount / 4;
907-
for (int i = 0; i < quarter; i++)
908-
{
909-
requests[i].ReportProgress(0f);
910-
requests[i + quarter].ReportProgress(0.33f);
911-
requests[i + 2 * quarter].ReportProgress(0.66f);
912-
requests[i + 3 * quarter].ReportProgress(1.0f);
913-
}
914-
915-
await Task.Delay(100);
916-
917-
// Assert: Average should be (0 + 0.33 + 0.66 + 1.0) / 4 = 0.4975
918-
float expectedAverage = (0f + 0.33f + 0.66f + 1.0f) / 4f;
919-
lastProgress.Should().BeApproximately(expectedAverage, 0.01f);
920-
}
921-
922804
[Test]
923805
public async Task StressTest_MemoryEfficiency_NoLeaks()
924806
{

‎UnitTest/RequestTests.cs‎

Lines changed: 34 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -8,12 +8,16 @@ public class RequestTests
88
{
99
private TestRequest _request = null!;
1010
private RequestOptions<string, Exception> _options = null!;
11+
private ParallelRequestHandler _handler = null!;
1112

1213
[SetUp]
1314
public void SetUp()
1415
{
16+
_handler = new ParallelRequestHandler();
17+
1518
_options = new RequestOptions<string, Exception>
1619
{
20+
Handler = _handler,
1721
NumberOfAttempts = 3,
1822
Priority = RequestPriority.High,
1923
DelayBetweenAttemps = TimeSpan.FromMilliseconds(10),
@@ -26,6 +30,7 @@ public void SetUp()
2630
public void TearDown()
2731
{
2832
_request?.Dispose();
33+
_handler?.Dispose();
2934
}
3035

3136
#region Test Helper Class
@@ -72,8 +77,12 @@ public void Constructor_ValidOptions_ShouldInitializeCorrectly()
7277
[Test]
7378
public void Constructor_NullOptions_ShouldUseDefaults()
7479
{
80+
// Arrange
81+
using ParallelRequestHandler handler = new();
82+
RequestOptions<string, Exception> options = new() { Handler = handler, AutoStart = false };
83+
7584
// Act
76-
TestRequest request = new(null);
85+
TestRequest request = new(options);
7786

7887
// Assert
7988
request.Should().NotBeNull();
@@ -107,11 +116,14 @@ public void Start_PausedRequest_ShouldTransitionToIdle()
107116
}
108117

109118
[Test]
110-
public void Pause_IdleRequest_ShouldTransitionToPaused()
119+
public async Task Pause_RunningRequest_ShouldTransitionToPaused()
111120
{
112121
// Arrange
122+
_request.ShouldSucceed = true;
113123
_request.Start();
114124

125+
await Task.Delay(10);
126+
115127
// Act
116128
_request.Pause();
117129

@@ -173,7 +185,7 @@ public async Task Task_RequestWithException_ShouldFail()
173185
_request.Start();
174186
await _request.Task;
175187
Debug.WriteLine("Finished");
176-
188+
177189
// Assert
178190
_request.State.Should().Be(RequestState.Failed);
179191
_request.Exception.Should().NotBeNull();
@@ -189,15 +201,31 @@ public async Task StateChanged_DuringExecution_ShouldFireEvents()
189201
{
190202
// Arrange
191203
List<RequestState> stateChanges = new();
192-
_request.StateChanged += (sender, state) => stateChanges.Add(state);
204+
TaskCompletionSource<bool> idleEventFired = new();
205+
TaskCompletionSource<bool> runningEventFired = new();
206+
207+
_request.StateChanged += (sender, state) =>
208+
{
209+
stateChanges.Add(state);
210+
if (state == RequestState.Idle) idleEventFired.TrySetResult(true);
211+
if (state == RequestState.Running) runningEventFired.TrySetResult(true);
212+
};
193213

194214
// Act
195215
_request.Start();
216+
217+
// Wait for events to fire (with timeout)
218+
await Task.WhenAny(idleEventFired.Task, Task.Delay(500));
219+
await Task.WhenAny(runningEventFired.Task, Task.Delay(500));
220+
196221
await _request.Task;
197222

223+
// Give events time to be marshaled through SynchronizationContext
224+
await Task.Delay(50);
225+
198226
// Assert
199-
stateChanges.Should().Contain(RequestState.Idle);
200-
stateChanges.Should().Contain(RequestState.Running);
227+
stateChanges.Should().Contain(RequestState.Idle, "request should transition to Idle when started");
228+
stateChanges.Should().Contain(RequestState.Running, "request should transition to Running when picked up by handler");
201229
stateChanges.Should().ContainInOrder(RequestState.Idle, RequestState.Running);
202230
}
203231

0 commit comments

Comments
 (0)