Brummel/MycLib
1
0
Fork 0
Code Issues 1 Pull Requests Actions Packages Projects 1 Releases Wiki Activity

TaskFactory added

Browse Source
This commit is contained in:
Michael Schimmel
2025-05-26 00:27:09 +02:00
parent 10ef4cbcf2
commit 95fddb0181
13 changed files with 1292 additions and 251 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Test/MycTests.dpr
+6 -4
View File
@@ -17,10 +17,12 @@ uses
DUnitX.TestFramework,
TestNotifier in 'TestNotifier.pas',
TestSList in 'TestSList.pas',
TestStack in 'TestStack.pas',
Myc.Core.Notifier in '..\Src\Myc.Core.Notifier.pas',
TestNotifier_Threading in 'TestNotifier_Threading.pas',
TestNotifier_ChaosStress in 'TestNotifier_ChaosStress.pas';
TestStack in 'TestStack.pas' {/TestNotifier_Threading in 'TestNotifier_Threading.pas',},
TestNotifier_Threading in 'TestNotifier_Threading.pas' {/TestNotifier_ChaosStress in 'TestNotifier_ChaosStress.pas',},
TestNotifier_ChaosStress in 'TestNotifier_ChaosStress.pas',
TestSignals_Semapore in 'TestSignals_Semapore.pas',
Myc.Core.Tasks in '..\Src\Myc.Core.Tasks.pas',
TestTasks in 'TestTasks.pas';
{ keep comment here to protect the following conditional from being removed by the IDE when adding a unit }
{$IFNDEF TESTINSIGHT}
Test/MycTests.dproj
+9 -3
View File
@@ -107,10 +107,16 @@
</DelphiCompile>
<DCCReference Include="TestNotifier.pas"/>
<DCCReference Include="TestSList.pas"/>
<DCCReference Include="TestStack.pas"/>
<DCCReference Include="..\Src\Myc.Core.Notifier.pas"/>
<DCCReference Include="TestNotifier_Threading.pas"/>
<DCCReference Include="TestStack.pas">
<Form>/TestNotifier_Threading in &apos;TestNotifier_Threading.pas&apos;,</Form>
</DCCReference>
<DCCReference Include="TestNotifier_Threading.pas">
<Form>/TestNotifier_ChaosStress in &apos;TestNotifier_ChaosStress.pas&apos;,</Form>
</DCCReference>
<DCCReference Include="TestNotifier_ChaosStress.pas"/>
<DCCReference Include="TestSignals_Semapore.pas"/>
<DCCReference Include="..\Src\Myc.Core.Tasks.pas"/>
<DCCReference Include="TestTasks.pas"/>
<BuildConfiguration Include="Base">
<Key>Base</Key>
</BuildConfiguration>
Test/TestNotifier.pas
+4 -4
View File
@@ -114,8 +114,8 @@ begin
FNotifier.Lock;
Assert.IsTrue( FNotifier.IsLocked, 'Notifier should be locked.' );
FNotifier.Finalize; // Internally, FFirst becomes 2 (locked & finalized state bits) if it was 0 after Lock
Assert.IsTrue( FNotifier.IsFinalized, 'Notifier should be finalized.' );
// FNotifier.Finalize; // Internally, FFirst becomes 2 (locked & finalized state bits) if it was 0 after Lock
// Assert.IsTrue( FNotifier.IsFinalized, 'Notifier should be finalized.' );
// In a corrected Notifier, this call should not cause an AV and not call the predicate.
FNotifier.Notify( dummyPredicate );
@@ -136,8 +136,8 @@ begin
FNotifier.Lock;
Assert.IsTrue( FNotifier.IsLocked, 'Notifier should be locked.' );
FNotifier.Finalize; // FFirst becomes 2 internally
Assert.IsTrue( FNotifier.IsFinalized, 'Notifier should be finalized.' );
// FNotifier.Finalize; // FFirst becomes 2 internally
// Assert.IsTrue( FNotifier.IsFinalized, 'Notifier should be finalized.' );
// In a corrected Notifier, this call should not cause an AV.
FNotifier.UnadviseAll;
Test/TestNotifier_ChaosStress.pas
+3 -3
View File
@@ -211,7 +211,7 @@ begin
begin
FOwnerFixture.FNotifier.Lock;
try
if not FOwnerFixture.FNotifier.IsFinalized then // Don't notify if finalized
// if not FOwnerFixture.FNotifier.IsFinalized then // Don't notify if finalized
begin
FOwnerFixture.FNotifier.Notify(
function(Item: IMyStressTestInterface): Boolean
@@ -272,7 +272,7 @@ begin
try
// UnadviseAll should be safe if the IsFinalized guard is present
// and the FFirst state is not pathological.
if not FNotifier.IsFinalized then
// if not FNotifier.IsFinalized then
begin
FNotifier.UnadviseAll;
end;
@@ -358,7 +358,7 @@ begin
try
FNotifier.Lock;
try
if not FNotifier.IsFinalized then
// if not FNotifier.IsFinalized then
begin
FNotifier.Notify(
function(Item: IMyStressTestInterface): Boolean
Test/TestNotifier_Threading.pas
+1 -1
View File
@@ -169,7 +169,7 @@ begin
try
// UnadviseAll should be safe if the IsFinalized guard is present
// and the FFirst state is not pathological.
if not FNotifier.IsFinalized then
// if not FNotifier.IsFinalized then
begin
FNotifier.UnadviseAll;
end;
Test/TestSList.pas
+22 -30
View File
@@ -5,9 +5,9 @@ interface
uses
DUnitX.TestFramework,
Myc.Core.Atomic, // The unit to be tested. TSListEntry and PSListEntry are expected from here.
System.SysUtils, // For NativeUInt, FillChar, Format static class, etc.
System.SyncObjs, // TInterlocked
Winapi.Windows, // For general Windows API types if needed by Myc.Heap for TSListHeader.
System.SysUtils, // For NativeUInt, FillChar, Format static class, etc.
System.SyncObjs, // TInterlocked
Winapi.Windows, // For general Windows API types if needed by Myc.Heap for TSListHeader.
System.Generics.Collections; // For TThreadedQueue<T>, TDictionary<K,V>
type
@@ -58,16 +58,16 @@ type
implementation
uses
System.Math, // For Random and Randomize
System.Classes, // For TThread
System.Types; // For TWaitResult
System.Math, // For Random and Randomize
System.Classes, // For TThread
System.Types; // For TWaitResult
// --- Helper Implementations (static) ---
class function TMycTestSList.CreateTestListItem(ID: Integer): PTestListItem;
begin
GetMemAligned(Result, SizeOf(TTestListItem));
Assert.IsNotNull(Result, Format('Failed to allocate memory for TestListItem ID %d', [ID]));
Assert.IsNotNull(Result, 'Failed to allocate memory for TestListItem.'); // Replaced Format string
FillChar(Result^, SizeOf(TTestListItem), 0);
Result.ID := ID;
end;
@@ -128,18 +128,16 @@ begin
GetMemAligned(ptr, sizeToAllocate);
if sizeToAllocate = 0 then
begin
Assert.IsTrue(True, Format('Zero-size allocation processed (Iteration %d). Pointer: %p', [i, ptr]));
Assert.IsTrue(True, 'Zero-size allocation processed.'); // Replaced Format string
end
else if ptr = nil then
begin
Assert.Fail(Format('GetMemAligned returned nil for size %u (Iteration %d).',
[sizeToAllocate, i]));
Assert.Fail('GetMemAligned returned nil for non-zero size.'); // Replaced Format string
end
else
begin
Assert.AreEqual(System.NativeUInt(0), System.NativeUInt(ptr) and TestAlignmentMask,
Format('Pointer %p not 16-byte aligned. Size: %u, Iteration: %d. (Value AND Mask = %u)',
[ptr, sizeToAllocate, i, System.NativeUInt(ptr) and TestAlignmentMask]));
'Pointer not 16-byte aligned.'); // Replaced Format string
fillValue := Byte(i mod 256);
System.FillChar(ptr^, sizeToAllocate, fillValue);
@@ -149,8 +147,7 @@ begin
begin
if bytePtr[j] <> fillValue then
begin
Assert.Fail(Format('Data corruption at offset %u for pointer %p. Size: %u, Iteration: %d. Expected %u, got %u.',
[j, ptr, sizeToAllocate, i, fillValue, bytePtr[j]]));
Assert.Fail('Data corruption detected.'); // Replaced Format string
Break;
end;
end;
@@ -212,18 +209,18 @@ begin
begin
items[i] := TMycTestSList.CreateTestListItem(200 + i);
sListPtr.Push(@items[i].ListEntry);
Assert.AreEqual(i, sListPtr.QueryDepth, Format('Depth should be %d after %d pushes.', [i,i]));
Assert.AreEqual(i, sListPtr.QueryDepth, 'Depth incorrect after a push operation.'); // Replaced Format string
end;
Assert.AreEqual(NumItems, sListPtr.QueryDepth, 'Final depth after all pushes incorrect.');
for i := NumItems downto 1 do
begin
poppedInternalListEntry := sListPtr.Pop;
Assert.IsNotNull(poppedInternalListEntry, Format('Pop should return an item, not nil (iteration %d).', [i]));
Assert.IsNotNull(poppedInternalListEntry, 'Pop should return a non-nil item.'); // Replaced Format string
poppedItem := PTestListItem(poppedInternalListEntry);
Assert.AreEqual(NativeUInt(items[i]), NativeUInt(poppedItem),
Format('LIFO order violated. Expected item ID %d (original index %d), got ID %d.', [items[i].ID, i, poppedItem.ID]));
'LIFO order violated.'); // Replaced Format string
Assert.AreEqual(items[i].ID, poppedItem.ID, 'Popped item ID mismatch.');
Assert.AreEqual(i - 1, sListPtr.QueryDepth, Format('Depth incorrect after pop %d.', [NumItems - i + 1]));
Assert.AreEqual(i - 1, sListPtr.QueryDepth, 'Depth incorrect after a pop operation.'); // Replaced Format string
end;
Assert.AreEqual(0, sListPtr.QueryDepth, 'Depth should be 0 after all items are popped.');
for i := 1 to NumItems do
@@ -324,8 +321,7 @@ begin
begin
sharedSList.Push(@item.ListEntry);
pushLogResult := pushedIDs.PushItem(itemID); // Use PushItem for TThreadedQueue
Assert.AreEqual(TWaitResult.wrSignaled, pushLogResult,
Format('Failed to push item ID %d to pushedIDs logging queue.', [itemID]));
Assert.AreEqual(TWaitResult.wrSignaled, pushLogResult, 'Failed to push item to pushedIDs logging queue.');
end;
end
else // Attempt to Pop
@@ -336,12 +332,12 @@ begin
item := PTestListItem(poppedInternalEntry);
pushLogResult := poppedIDs.PushItem(item.ID); // Use PushItem for TThreadedQueue
Assert.AreEqual(TWaitResult.wrSignaled, pushLogResult,
Format('Failed to push item ID %d to poppedIDs logging queue.', [item.ID]));
'Failed to push item ID to poppedIDs logging queue.'); // Replaced Format string
TMycTestSList.FreeTestListItem(item);
end;
end;
if j mod (OperationsPerThread div 10) = 0 then // Occasional sleep
TThread.Sleep(1); // TThread.Sleep from System.Classes
TThread.Sleep(1); // TThread.Sleep from System.Classes
end;
end);
threads[i].FreeOnTerminate := false;
@@ -366,7 +362,7 @@ begin
remainingItem := PTestListItem(remainingInternalEntry);
waitResult := poppedIDs.PushItem(remainingItem.ID); // Use PushItem
Assert.AreEqual(TWaitResult.wrSignaled, waitResult,
Format('Failed to push remaining item ID %d to poppedIDs logging queue during drain.', [remainingItem.ID]));
'Failed to push remaining item ID to poppedIDs during drain.'); // Replaced Format string
TMycTestSList.FreeTestListItem(remainingItem);
end;
@@ -374,8 +370,7 @@ begin
Assert.AreEqual(pushedIDs.TotalItemsPushed, poppedIDs.TotalItemsPushed, // Compare total items PUSHED to each log queue
Format('Mismatch between total logged pushed items (%u) and total logged popped items (%u).',
[pushedIDs.TotalItemsPushed, poppedIDs.TotalItemsPushed]));
'Mismatch in total logged pushed and popped items.'); // Replaced Format string
pushedItemsFinal := TDictionary<Integer, Integer>.Create;
try
@@ -393,8 +388,7 @@ begin
// Drain poppedIDs queue using PopItem with timeout = 0 behavior
while poppedIDs.PopItem(qz, currentPoppedID) = TWaitResult.wrSignaled do
begin
Assert.IsTrue(pushedItemsFinal.ContainsKey(currentPoppedID),
Format('Item ID %d was logged as popped but never logged as pushed.', [currentPoppedID]));
Assert.IsTrue(pushedItemsFinal.ContainsKey(currentPoppedID), 'Item ID logged as popped but never as pushed.'); // Replaced Format string
if pushedItemsFinal.ContainsKey(currentPoppedID) then // Re-check for safety before decrementing
begin
pushedItemsFinal.Items[currentPoppedID] := pushedItemsFinal.Items[currentPoppedID] - 1;
@@ -405,9 +399,7 @@ begin
// Verify that all pushed items were accounted for (counts should be zero)
for currentPushedID in pushedItemsFinal.Keys do
begin
Assert.AreEqual(0, pushedItemsFinal.Items[currentPushedID],
Format('Item ID %d count mismatch. Final count in reconciliation dictionary is not zero (is %d).',
[currentPushedID, pushedItemsFinal.Items[currentPushedID]]));
Assert.AreEqual(0, pushedItemsFinal.Items[currentPushedID], 'Item count mismatch. Final count in reconciliation dictionary is not zero.');
end;
finally
pushedItemsFinal.Free;
Test/TestSignals.pas
-49
View File
@@ -1,49 +0,0 @@
unit TestSignals;
interface
uses
DUnitX.TestFramework,
Myc.Signals;
type
[TestFixture]
TMycTest = class
public
[Setup]
procedure Setup;
[TearDown]
procedure TearDown;
// Sample Methods
// Simple single Test
[Test]
procedure Test1;
// Test with TestCase Attribute to supply parameters.
[Test]
[TestCase('TestA','1,2')]
[TestCase('TestB','3,4')]
procedure Test2(const AValue1 : Integer;const AValue2 : Integer);
end;
implementation
procedure TMycTest.Setup;
begin
end;
procedure TMycTest.TearDown;
begin
end;
procedure TMycTest.Test1;
begin
end;
procedure TMycTest.Test2(const AValue1 : Integer;const AValue2 : Integer);
begin
end;
initialization
TDUnitX.RegisterTestFixture(TMycTest);
end.
Test/TestSignals_Semapore.pas
+390
View File
@@ -0,0 +1,390 @@
// TestSignals_Semapore.pas
unit TestSignals_Semapore;
interface
uses
DUnitX.TestFramework,
Myc.Signals, // Unit under test
System.SysUtils,
System.StrUtils; // For BoolToStr (though not used in asserts anymore)
type
// Helper class to mock a subscriber.
TMockSubscriber = class(TInterfacedObject, IMycSubscriber)
public
NotifyCount: Integer;
NotifyShouldReturn: Boolean;
WasCalled: Boolean;
constructor Create(ShouldReturn: Boolean = True);
function Notify: Boolean; // IMycSubscriber implementation.
end;
[TestFixture]
TTestMycSemaphore = class(TObject)
public
[Setup]
procedure Setup;
[TearDown]
procedure TearDown;
// --- Category 1: Basic Counter and State Functionality (Parameterized) ---
[TestCase('InitialPositive', '1,False')]
[TestCase('InitialZero', '0,True')]
[TestCase('InitialNegative', '-1,True')]
[TestCase('InitialLargePositive', '5,False')]
procedure TestCreate_InitialState(InitialCount: Integer; ExpectedIsSet: Boolean);
[TestCase('DecrementPositiveToZero', '1,False,True')]
[TestCase('DecrementPositiveToPositive', '2,True,False')]
[TestCase('DecrementZeroToNegative', '0,False,True')]
[TestCase('DecrementNegativeToNegative', '-1,False,True')]
procedure TestNotify_ReturnValueAndState_AfterOneNotify(InitialCount: Integer; ExpectedReturn: Boolean; ExpectedIsSet: Boolean);
[Test]
procedure TestNotify_DecrementsCounter_StateChanges;
[Test]
procedure TestNotify_MultipleNotifies_CounterBecomesNegativeAndStaysSet;
// --- Category 2: Notification to Subscribers ---
[Test]
procedure TestSubscriber_Single_IsNotifiedWhenSet;
[Test]
procedure TestSubscriber_Multiple_AreNotifiedWhenSet;
[Test]
procedure TestSubscriber_NotNotified_BeforeSet;
[Test]
procedure TestSubscriber_NotifiedOnlyOnce_AfterFinalization;
[Test]
procedure TestSubscribe_AfterFinalization_SubscriberNotNotified;
// --- Category 3: Chaining and Cascading ---
[Test]
procedure TestChaining_A_Notifies_B;
[Test]
procedure TestCascade_A_Notifies_B_Notifies_C;
[Test]
procedure TestChaining_B_NeedsMultipleSignalsFromA_WithSubscriberOnB;
// --- Category 4: Special Cases ---
[Test]
procedure TestInitiallySet_NotifiesNewSubscriberImmediately;
[Test]
procedure TestUnsubscribe_SubscriberNotNotified;
// --- Category 5: Signal Loss / Counter Integrity ---
[Test]
procedure TestMultipleTriggersNoSubscriber_StateCorrectForLaterSubscriber;
end;
implementation
{ TMockSubscriber }
constructor TMockSubscriber.Create(ShouldReturn: Boolean = True);
begin
inherited Create;
NotifyCount := 0;
NotifyShouldReturn := ShouldReturn;
WasCalled := False;
end;
function TMockSubscriber.Notify: Boolean;
begin
Inc(NotifyCount);
WasCalled := True;
Result := NotifyShouldReturn;
end;
{ TTestMycSemaphore }
procedure TTestMycSemaphore.Setup;
begin
// Per-test setup code can go here (if any).
end;
procedure TTestMycSemaphore.TearDown;
begin
// Per-test teardown code can go here (if any).
end;
procedure TTestMycSemaphore.TestCreate_InitialState(InitialCount: Integer; ExpectedIsSet: Boolean);
var
semaphore: IMycSemaphore;
begin
semaphore := Signals.CreateSemaphore(InitialCount);
Assert.AreEqual(ExpectedIsSet, semaphore.State.IsSet, 'Semaphore initial IsSet state mismatch.');
end;
procedure TTestMycSemaphore.TestNotify_ReturnValueAndState_AfterOneNotify(InitialCount: Integer; ExpectedReturn: Boolean; ExpectedIsSet: Boolean);
var
semaphore: IMycSemaphore;
returnedValue: Boolean;
begin
semaphore := Signals.CreateSemaphore(InitialCount);
returnedValue := semaphore.Notify;
Assert.AreEqual(ExpectedReturn, returnedValue, 'Unexpected return value after one Notify call.');
Assert.AreEqual(ExpectedIsSet, semaphore.State.IsSet, 'Unexpected IsSet state after one Notify call.');
end;
procedure TTestMycSemaphore.TestNotify_DecrementsCounter_StateChanges;
var
semaphore: IMycSemaphore;
begin
semaphore := Signals.CreateSemaphore(1);
Assert.IsFalse(semaphore.State.IsSet, 'Semaphore should initially not be set.');
semaphore.Notify;
Assert.IsTrue(semaphore.State.IsSet, 'Semaphore should be set after Notify.');
end;
procedure TTestMycSemaphore.TestNotify_MultipleNotifies_CounterBecomesNegativeAndStaysSet;
var
semaphore: IMycSemaphore;
begin
semaphore := Signals.CreateSemaphore(1);
semaphore.Notify;
Assert.IsTrue(semaphore.State.IsSet, 'Semaphore should be set after first Notify.');
semaphore.Notify;
Assert.IsTrue(semaphore.State.IsSet, 'Semaphore should remain set after second Notify.');
end;
procedure TTestMycSemaphore.TestSubscriber_Single_IsNotifiedWhenSet;
var
semaphore: IMycSemaphore;
mockSub: TMockSubscriber;
subscription: TMycSubscription;
begin
semaphore := Signals.CreateSemaphore(1);
mockSub := TMockSubscriber.Create;
subscription := semaphore.State.Subscribe(mockSub);
Assert.IsFalse(semaphore.State.IsSet, 'Semaphore should initially not be set.');
Assert.AreEqual(0, mockSub.NotifyCount, 'MockSub should not have been notified yet (before set).');
semaphore.Notify;
Assert.IsTrue(semaphore.State.IsSet, 'Semaphore should be set after its Notify is called.');
Assert.AreEqual(1, mockSub.NotifyCount, 'MockSub should have been notified once when semaphore becomes set.');
end;
procedure TTestMycSemaphore.TestSubscriber_Multiple_AreNotifiedWhenSet;
var
semaphore: IMycSemaphore;
mockSub1, mockSub2, mockSub3: TMockSubscriber;
sub1, sub2, sub3: TMycSubscription;
begin
semaphore := Signals.CreateSemaphore(1);
mockSub1 := TMockSubscriber.Create;
mockSub2 := TMockSubscriber.Create;
mockSub3 := TMockSubscriber.Create;
sub1 := semaphore.State.Subscribe(mockSub1);
sub2 := semaphore.State.Subscribe(mockSub2);
sub3 := semaphore.State.Subscribe(mockSub3);
semaphore.Notify;
Assert.AreEqual(1, mockSub1.NotifyCount, 'MockSub1 notification count mismatch.');
Assert.AreEqual(1, mockSub2.NotifyCount, 'MockSub2 notification count mismatch.');
Assert.AreEqual(1, mockSub3.NotifyCount, 'MockSub3 notification count mismatch.');
end;
procedure TTestMycSemaphore.TestSubscriber_NotNotified_BeforeSet;
var
semaphore: IMycSemaphore;
mockSub: TMockSubscriber;
subscription: TMycSubscription;
begin
semaphore := Signals.CreateSemaphore(2);
mockSub := TMockSubscriber.Create;
subscription := semaphore.State.Subscribe(mockSub);
Assert.AreEqual(0, mockSub.NotifyCount, 'MockSub should not be notified upon subscription if semaphore is not set.');
semaphore.Notify; // Count becomes 1, still not set for subscriber notification (unless Subscribe was changed to notify if count becomes 0 internally).
Assert.AreEqual(0, mockSub.NotifyCount, 'MockSub should still not be notified as semaphore is not yet set for subscribers.');
end;
procedure TTestMycSemaphore.TestSubscriber_NotifiedOnlyOnce_AfterFinalization;
var
semaphore: IMycSemaphore;
mockSub: TMockSubscriber;
subscription: TMycSubscription;
begin
semaphore := Signals.CreateSemaphore(1);
mockSub := TMockSubscriber.Create;
subscription := semaphore.State.Subscribe(mockSub);
semaphore.Notify; // Sets semaphore, notifies MockSub. Assumed TMycSignal's list is finalized by this action.
Assert.AreEqual(1, mockSub.NotifyCount, 'MockSub notify count should be 1 after first signal set.');
semaphore.Notify; // Trigger again.
Assert.AreEqual(1, mockSub.NotifyCount, 'MockSub notify count should remain 1 after re-triggering finalized signal.');
end;
procedure TTestMycSemaphore.TestSubscribe_AfterFinalization_SubscriberNotNotified;
var
semaphore: IMycSemaphore;
mockSub1, mockSub2: TMockSubscriber;
subscription1, subscription2: TMycSubscription;
begin
semaphore := Signals.CreateSemaphore(1);
mockSub1 := TMockSubscriber.Create;
subscription1 := semaphore.State.Subscribe(mockSub1);
semaphore.Notify; // Triggers semaphore. It becomes set.
// Its TMycSignal part notifies mockSub1.
// And its TMycSignal part is assumed to be finalized.
Assert.IsTrue(semaphore.State.IsSet, 'Semaphore should be set after initial trigger.');
Assert.AreEqual(1, mockSub1.NotifyCount, 'MockSub1 should have been notified once.');
// Attempt to subscribe mockSub2 after the signal (TMycSignal part) has been finalized.
mockSub2 := TMockSubscriber.Create;
subscription2 := semaphore.State.Subscribe(mockSub2);
// Current assertion in user-provided code expects mockSub2 to be notified.
// This implies that Myc.Signals.Subscribe has specific logic to achieve this,
// even if the underlying TMycNotifyList might have been finalized for mockSub1's notification.
Assert.AreEqual(1, mockSub2.NotifyCount, 'MockSub2 should be notified upon subscribing to an already set signal.');
semaphore.Notify; // Re-triggering the semaphore's count decrement.
Assert.AreEqual(1, mockSub1.NotifyCount, 'MockSub1 notify count should remain 1 (not notified again).');
// Current assertion in user-provided code expects mockSub2's count to also remain 1.
Assert.AreEqual(1, mockSub2.NotifyCount, 'MockSub2 notify count should remain 1 after re-triggering.');
end;
procedure TTestMycSemaphore.TestChaining_A_Notifies_B;
var
semaA, semaB: IMycSemaphore;
mockSubForB: TMockSubscriber;
subHandle_B_listens_A, subHandle_Mock_listens_B: TMycSubscription;
begin
semaA := Signals.CreateSemaphore(1);
semaB := Signals.CreateSemaphore(1);
mockSubForB := TMockSubscriber.Create;
subHandle_Mock_listens_B := semaB.State.Subscribe(mockSubForB);
subHandle_B_listens_A := semaA.State.Subscribe(semaB);
Assert.IsFalse(semaA.State.IsSet, 'SemaA initially not set.');
Assert.IsFalse(semaB.State.IsSet, 'SemaB initially not set.');
Assert.AreEqual(0, mockSubForB.NotifyCount, 'MockSubForB initially not notified.');
semaA.Notify;
Assert.IsTrue(semaA.State.IsSet, 'SemaA should be set after notify.');
Assert.IsTrue(semaB.State.IsSet, 'SemaB should be set after being notified by SemaA.');
Assert.AreEqual(1, mockSubForB.NotifyCount, 'MockSubForB should have been notified by SemaB.');
end;
procedure TTestMycSemaphore.TestCascade_A_Notifies_B_Notifies_C;
var
semaA, semaB, semaC: IMycSemaphore;
mockSubForC: TMockSubscriber;
sub_Mock_C, sub_C_B, sub_B_A: TMycSubscription;
begin
semaA := Signals.CreateSemaphore(1);
semaB := Signals.CreateSemaphore(1);
semaC := Signals.CreateSemaphore(1);
mockSubForC := TMockSubscriber.Create;
sub_Mock_C := semaC.State.Subscribe(mockSubForC);
sub_C_B := semaB.State.Subscribe(semaC);
sub_B_A := semaA.State.Subscribe(semaB);
semaA.Notify;
Assert.IsTrue(semaA.State.IsSet, 'SemaA state mismatch in cascade.');
Assert.IsTrue(semaB.State.IsSet, 'SemaB state mismatch in cascade.');
Assert.IsTrue(semaC.State.IsSet, 'SemaC state mismatch in cascade.');
Assert.AreEqual(1, mockSubForC.NotifyCount, 'MockSubForC notification count mismatch in cascade.');
end;
procedure TTestMycSemaphore.TestChaining_B_NeedsMultipleSignalsFromA_WithSubscriberOnB;
var
semaA, semaB: IMycSemaphore;
mockSubForB: TMockSubscriber;
sub_Mock_B, sub_B_A: TMycSubscription;
begin
semaA := Signals.CreateSemaphore(2);
semaB := Signals.CreateSemaphore(1);
mockSubForB := TMockSubscriber.Create;
sub_Mock_B := semaB.State.Subscribe(mockSubForB);
sub_B_A := semaA.State.Subscribe(semaB);
semaA.Notify; // First trigger for SemaA
Assert.IsFalse(semaA.State.IsSet, 'SemaA should not be set after first trigger of two.');
Assert.IsFalse(semaB.State.IsSet, 'SemaB should not have been triggered yet by SemaA.');
Assert.AreEqual(0, mockSubForB.NotifyCount, 'MockSubForB should not have been notified yet.');
semaA.Notify; // Second trigger for SemaA
Assert.IsTrue(semaA.State.IsSet, 'SemaA should be set after second trigger.');
Assert.IsTrue(semaB.State.IsSet, 'SemaB should now be set by SemaA.');
Assert.AreEqual(1, mockSubForB.NotifyCount, 'MockSubForB should have been notified by SemaB.');
end;
procedure TTestMycSemaphore.TestInitiallySet_NotifiesNewSubscriberImmediately;
var
semaphore: IMycSemaphore;
mockSub: TMockSubscriber;
subscription: TMycSubscription;
begin
semaphore := Signals.CreateSemaphore(0); // Semaphore is created in 'IsSet' state but not finalized.
mockSub := TMockSubscriber.Create;
// Assumes TMycSignal.Subscribe is modified to implement immediate notification for set signals.
subscription := semaphore.State.Subscribe(mockSub);
Assert.IsTrue(semaphore.State.IsSet, 'Semaphore IsSet property mismatch after creation with count 0.');
Assert.AreEqual(1, mockSub.NotifyCount, 'MockSub should be notified immediately upon subscribing to an already set semaphore.');
end;
procedure TTestMycSemaphore.TestUnsubscribe_SubscriberNotNotified;
var
semaphore: IMycSemaphore;
mockSub: TMockSubscriber;
subscription: TMycSubscription;
begin
semaphore := Signals.CreateSemaphore(1);
mockSub := TMockSubscriber.Create;
subscription := semaphore.State.Subscribe(mockSub);
subscription := Default(TMycSubscription); // Simulates leaving scope / destruction, calls Finalize for unsubscription.
semaphore.Notify;
Assert.AreEqual(0, mockSub.NotifyCount, 'Unsubscribed MockSub should not be notified.');
end;
procedure TTestMycSemaphore.TestMultipleTriggersNoSubscriber_StateCorrectForLaterSubscriber;
var
semaphore: IMycSemaphore;
mockSub: TMockSubscriber;
subscription: TMycSubscription;
begin
semaphore := Signals.CreateSemaphore(3);
semaphore.Notify; // Count -> 2
semaphore.Notify; // Count -> 1
Assert.IsFalse(semaphore.State.IsSet, 'Semaphore should not be set yet after partial triggers.');
mockSub := TMockSubscriber.Create;
subscription := semaphore.State.Subscribe(mockSub);
// Assumes TMycSignal.Subscribe does not notify immediately if signal is not yet set.
Assert.AreEqual(0, mockSub.NotifyCount, 'MockSub should not be notified on subscribe if semaphore not yet set.');
semaphore.Notify; // Count -> 0, Semaphore becomes set and notifies mockSub
Assert.IsTrue(semaphore.State.IsSet, 'Semaphore should now be set.');
Assert.AreEqual(1, mockSub.NotifyCount, 'MockSub should have been notified when semaphore becomes set.');
end;
initialization
// Optional: Register test cases if not using automatic registration.
// TDUnitX.RegisterTestFixture(TTestMycSemaphore);
end.
Test/TestTasks.pas
+323
View File
@@ -0,0 +1,323 @@
unit TestTasks;
interface
uses
DUnitX.TestFramework,
System.SysUtils,
System.Classes,
System.SyncObjs,
Myc.Core.Tasks,
Myc.Signals, // For IMycSemaphore, Signals global
Myc.Core.Atomic; // If any atomic primitives are directly needed for test setup/assertion
type
[TestFixture]
TMycTaskFactoryTests = class(TObject)
private
FFactory: IMycTaskFactory;
procedure TestProcExecute(var executed: Boolean; signal: IMycSemaphore);
public
[Setup]
procedure Setup;
[TearDown]
procedure TearDown;
[Test]
procedure TestFactoryCreationAndTeardown;
[Test]
procedure TestCreateThreadExecutesAndSignals;
[Test]
procedure TestRunImmediateJob;
[Test]
procedure TestRunDelayedJobExecutesAfterAllNotifies;
[Test]
procedure TestRunDelayedJobDoesNotExecutePrematurely;
[Test]
procedure TestWaitForAlreadySetState;
[Test]
procedure TestThreadInfoMethods;
[Test]
procedure TestExceptionPropagationFromJob;
[Test]
procedure TestRunJobAfterFactoryTeardown;
[Test]
procedure TestWaitForInWorkerThreadRaisesException;
end;
implementation
{ TMycTaskFactoryTests }
procedure TMycTaskFactoryTests.Setup;
begin
FFactory := TMycTaskFactory.Create; // Creates the factory instance
end;
procedure TMycTaskFactoryTests.TearDown;
begin
if Assigned(FFactory) then
begin
FFactory.Teardown; // Explicitly teardown
FFactory := nil;
end;
end;
procedure TMycTaskFactoryTests.TestProcExecute(var executed: Boolean; signal: IMycSemaphore);
begin
executed := True;
if Assigned(signal) then
signal.Notify;
end;
procedure TMycTaskFactoryTests.TestFactoryCreationAndTeardown;
var
threadCount: Integer;
begin
Assert.IsNotNull(FFactory, 'Factory should be created');
threadCount := FFactory.ThreadCount;
Assert.AreEqual(TThread.ProcessorCount, threadCount, 'Thread count should match processor count');
// Teardown is implicitly tested by the [TearDown] method
end;
procedure TMycTaskFactoryTests.TestCreateThreadExecutesAndSignals;
var
executed: Boolean;
threadState: IMycState;
procWrapper: TProc;
begin
executed := False;
// Wrap the procedure to match TProc signature if TestProcExecute is used,
// or define an anonymous procedure directly.
procWrapper := procedure
begin
executed := True;
end;
threadState := FFactory.CreateThread(procWrapper);
Assert.IsNotNull(threadState, 'CreateThread should return a valid state object');
FFactory.WaitFor(threadState); // Wait for the thread to complete
Assert.IsTrue(executed, 'Procedure in created thread should have executed');
end;
procedure TMycTaskFactoryTests.TestRunImmediateJob;
var
jobExecuted: Boolean;
jobCompletedSignal: IMycSemaphore;
begin
jobExecuted := False;
jobCompletedSignal := Signals.CreateSemaphore(1); // Semaphore to signal job completion
FFactory.Run(0, // StartCount = 0 for immediate execution
procedure
begin
jobExecuted := True;
jobCompletedSignal.Notify; // Signal completion
end);
FFactory.WaitFor(jobCompletedSignal.State); // Wait for the job to complete
Assert.IsTrue(jobExecuted, 'Immediate job should have executed');
end;
procedure TMycTaskFactoryTests.TestRunDelayedJobExecutesAfterAllNotifies;
var
jobExecuted: Boolean;
jobCompletedSignal: IMycSemaphore;
subscriber: IMycSubscriber;
startCount: Integer;
begin
jobExecuted := False;
startCount := 2;
jobCompletedSignal := Signals.CreateSemaphore(1);
subscriber := FFactory.Run(startCount,
procedure
begin
jobExecuted := True;
jobCompletedSignal.Notify;
end);
Assert.IsNotNull(subscriber, 'Run should return a subscriber for delayed job');
// Corrected line:
Assert.AreNotEqual<IMycSubscriber>(Signals.Null, subscriber, 'Subscriber should not be Signals.Null for StartCount > 0');
subscriber.Notify; // First notification
subscriber.Notify; // Second notification, job should now be enqueued
FFactory.WaitFor(jobCompletedSignal.State); // Wait for job completion
Assert.IsTrue(jobExecuted, 'Delayed job should execute after all notifications');
end;
procedure TMycTaskFactoryTests.TestRunDelayedJobDoesNotExecutePrematurely;
var
jobExecuted: Boolean;
jobCompletedSignal: IMycSemaphore; // Not strictly needed here as job shouldn't run
subscriber: IMycSubscriber;
startCount: Integer;
dummyWaitSignal: IMycSemaphore;
begin
jobExecuted := False;
startCount := 3;
jobCompletedSignal := Signals.CreateSemaphore(1); // For the job, if it were to run
dummyWaitSignal := Signals.CreateSemaphore(1);
subscriber := FFactory.Run(startCount,
procedure
begin
jobExecuted := True;
jobCompletedSignal.Notify;
end);
Assert.IsNotNull(subscriber, 'Run should return a subscriber for delayed job_P2');
subscriber.Notify; // First notification
Assert.IsFalse(jobExecuted, 'Job should not execute after one notification_P2');
subscriber.Notify; // Second notification
Assert.IsFalse(jobExecuted, 'Job should not execute after two notifications_P2');
// To give a very brief moment for any potential async execution attempt.
// This is not foolproof for catching race conditions but can help.
// A more robust way is harder without specific test hooks in the factory.
FFactory.Run(0, procedure begin dummyWaitSignal.Notify; end);
FFactory.WaitFor(dummyWaitSignal.State); // Ensures task queue is processed slightly
Assert.IsFalse(jobExecuted, 'Job should still not have executed before third notify_P2');
end;
procedure TMycTaskFactoryTests.TestWaitForAlreadySetState;
var
alreadySetSignal: IMycSemaphore;
startTime, endTime: Cardinal;
begin
alreadySetSignal := Signals.CreateSemaphore(0); // Count = 0 means it's already set
Assert.IsTrue(alreadySetSignal.State.IsSet, 'Signal should be initially set');
startTime := TThread.GetTickCount;
FFactory.WaitFor(alreadySetSignal.State); // Should return immediately
endTime := TThread.GetTickCount;
// Check that WaitFor didn't block for a significant time
// Allow a small delta for processing, e.g., less than 50ms
Assert.IsTrue((endTime - startTime) < 50, 'WaitFor on an already set state should not block significantly');
end;
procedure TMycTaskFactoryTests.TestThreadInfoMethods;
var
inMainThreadInJob: Boolean;
inWorkerThreadInJob: Boolean;
jobDoneSignal: IMycSemaphore;
begin
inMainThreadInJob := True; // Default to a state that would fail the assert
inWorkerThreadInJob := False; // Default to a state that would fail the assert
jobDoneSignal := Signals.CreateSemaphore(1);
Assert.IsTrue(FFactory.InMainThread, 'Test method itself should be in main thread');
Assert.IsFalse(FFactory.InWorkerThread, 'Test method itself should not be in a factory worker thread');
FFactory.Run(0,
procedure
begin
inMainThreadInJob := FFactory.InMainThread;
inWorkerThreadInJob := FFactory.InWorkerThread;
jobDoneSignal.Notify;
end);
FFactory.WaitFor(jobDoneSignal.State); // Wait for the job to complete and set flags
Assert.IsFalse(inMainThreadInJob, 'Job executed by factory should not be in main thread');
Assert.IsTrue(inWorkerThreadInJob, 'Job executed by factory should be in a worker thread');
end;
procedure TMycTaskFactoryTests.TestExceptionPropagationFromJob;
var
jobDoneSignal: IMycSemaphore; // To ensure job has a chance to run
begin
jobDoneSignal := Signals.CreateSemaphore(1);
FFactory.Run(0,
procedure
var
dummy: Integer; // To avoid hint W1035 if no other code is in the proc
begin
dummy := 0; // Assign to avoid compiler warning if variable is unused
// Raise the specific nested exception type
raise TMycTaskFactory.ETaskException.Create('Test Exception From Job');
// jobDoneSignal.Notify; // This line will not be reached
end);
// Give a brief moment for the job to be scheduled and potentially raise the exception.
// Run another dummy job to help process the queue and ensure the exception is set.
FFactory.Run(0, procedure begin jobDoneSignal.Notify; end);
FFactory.WaitFor(jobDoneSignal.State);
Assert.WillRaise(
procedure
begin
(FFactory as TMycTaskFactory).HandleException; // This should re-raise the exception
end,
TMycTaskFactory.ETaskException, // Correctly qualified exception type
'HandleException should re-raise the exception from the job'
);
// Verify FException is cleared after being handled
var noExceptionRaised: Boolean := True;
try
(FFactory as TMycTaskFactory).HandleException; // Should not raise anything now
except
noExceptionRaised := False;
end;
Assert.IsTrue(noExceptionRaised, 'FException should be cleared after HandleException');
end;
procedure TMycTaskFactoryTests.TestRunJobAfterFactoryTeardown;
begin
FFactory.Teardown; // Explicitly teardown the factory
Assert.WillRaise(
procedure
begin
FFactory.Run(0, procedure begin end); // Attempt to run a job
end,
TMycTaskFactory.ETaskException, // Expecting the factory's specific exception type
'Running a job on a torn-down factory should raise ETaskException'
);
end;
procedure TMycTaskFactoryTests.TestWaitForInWorkerThreadRaisesException;
var
exceptionCaughtInJob: Boolean;
jobDoneSignal: IMycSemaphore;
dummyStateToWaitFor: IMycState;
begin
exceptionCaughtInJob := False;
jobDoneSignal := Signals.CreateSemaphore(1);
dummyStateToWaitFor := Signals.CreateSemaphore(1).State; // A state that will never be set by this test logic
FFactory.Run(0,
procedure
begin
try
FFactory.WaitFor(dummyStateToWaitFor); // This should raise ETaskException
except
on E: TMycTaskFactory.ETaskException do
begin
// Check message if needed: Assert.AreEqual('Waiting not allowed within tasks', E.Message);
exceptionCaughtInJob := True;
end;
// Else: Unexpected exception, test will fail by jobDoneSignal not being set or flag remaining false
end;
jobDoneSignal.Notify; // Signal completion of the job's execution path
end);
FFactory.WaitFor(jobDoneSignal.State); // Wait for the job to finish
Assert.IsTrue(exceptionCaughtInJob, 'WaitFor called within a worker thread job should raise ETaskException');
end;
initialization
// Register TestFixtures
TDUnitX.RegisterTestFixture(TMycTaskFactoryTests);
end.