-
Notifications
You must be signed in to change notification settings - Fork 660
Add unit tests for SequenceReset message handling in Session class #1133
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Draft
Copilot
wants to merge
5
commits into
master
Choose a base branch
from
copilot/add-unit-tests-sequencereset
base: master
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Draft
Changes from 4 commits
Commits
Show all changes
5 commits
Select commit
Hold shift + click to select a range
4d49c65
Initial plan
Copilot 2f8f42b
Initial test implementation with checksum fixes
Copilot c12a137
Completed SessionSequenceResetTest with all tests passing
Copilot 13a582b
Use real MemoryStore instead of mocked store and verify queued messag…
Copilot 83fbe7e
Change SequenceReset-GapFill NewSeqNo to 100 to test queued message r…
Copilot File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
286 changes: 286 additions & 0 deletions
286
quickfixj-core/src/test/java/quickfix/SessionSequenceResetTest.java
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,286 @@ | ||
| package quickfix; | ||
|
|
||
| import org.junit.Before; | ||
| import org.junit.Test; | ||
| import org.mockito.ArgumentCaptor; | ||
| import quickfix.field.*; | ||
| import quickfix.fix44.Logon; | ||
| import quickfix.fix44.NewOrderSingle; | ||
| import quickfix.fix44.SequenceReset; | ||
|
|
||
| import java.time.LocalDateTime; | ||
| import java.util.ArrayList; | ||
| import java.util.List; | ||
|
|
||
| import static org.junit.Assert.*; | ||
| import static org.mockito.Mockito.*; | ||
|
|
||
| public class SessionSequenceResetTest { | ||
|
|
||
| private Session session; | ||
| private Application application; | ||
| private Responder responder; | ||
| private SessionID sessionID; | ||
| private DataDictionaryProvider dataDictionaryProvider; | ||
| private List<String> sentMessages; | ||
| private List<Message> receivedAppMessages; | ||
|
|
||
| @Before | ||
| public void setUp() throws Exception { | ||
| // Initialize session ID | ||
| sessionID = new SessionID(FixVersions.BEGINSTRING_FIX44, "SENDER", "TARGET"); | ||
|
|
||
| // Mock application to capture received messages | ||
| application = mock(Application.class); | ||
| receivedAppMessages = new ArrayList<>(); | ||
| doAnswer(invocation -> { | ||
| Message message = invocation.getArgument(0); | ||
| receivedAppMessages.add(message); | ||
| return null; | ||
| }).when(application).fromApp(any(Message.class), any(SessionID.class)); | ||
|
|
||
| // Mock data dictionary provider | ||
| dataDictionaryProvider = mock(DataDictionaryProvider.class); | ||
| DataDictionary dataDictionary = new DataDictionary("FIX44.xml"); | ||
| when(dataDictionaryProvider.getSessionDataDictionary(anyString())).thenReturn(dataDictionary); | ||
| when(dataDictionaryProvider.getApplicationDataDictionary(any(ApplVerID.class))).thenReturn(dataDictionary); | ||
|
|
||
| // Mock responder to capture sent messages | ||
| responder = mock(Responder.class); | ||
| sentMessages = new ArrayList<>(); | ||
| doAnswer(invocation -> { | ||
| String message = invocation.getArgument(0); | ||
| sentMessages.add(message); | ||
| return true; | ||
| }).when(responder).send(anyString()); | ||
|
|
||
| // Create session using SessionFactoryTestSupport Builder with MemoryStore (default) | ||
| session = new SessionFactoryTestSupport.Builder() | ||
| .setSessionId(sessionID) | ||
| .setApplication(application) | ||
| .setDataDictionaryProvider(dataDictionaryProvider) | ||
| .setIsInitiator(false) | ||
| .setValidateSequenceNumbers(true) | ||
| .setPersistMessages(true) | ||
| .build(); | ||
|
|
||
| session.setResponder(responder); | ||
| } | ||
|
|
||
| @Test | ||
| public void testReceiveSequenceResetWithGapFill() throws Exception { | ||
| // Step 1: Establish a logged-on session | ||
| // Receive initial Logon with sequence number 1 | ||
| Logon logon = new Logon(); | ||
| logon.set(new EncryptMethod(EncryptMethod.NONE_OTHER)); | ||
| logon.set(new HeartBtInt(30)); | ||
| logon.getHeader().setString(BeginString.FIELD, FixVersions.BEGINSTRING_FIX44); | ||
| logon.getHeader().setString(SenderCompID.FIELD, "TARGET"); | ||
| logon.getHeader().setString(TargetCompID.FIELD, "SENDER"); | ||
| logon.getHeader().setInt(MsgSeqNum.FIELD, 1); | ||
| logon.getHeader().setUtcTimeStamp(SendingTime.FIELD, LocalDateTime.now()); | ||
| logon.toString(); // calculate length and checksum | ||
|
|
||
| // Process the Logon message to establish session | ||
| session.next(logon); | ||
|
|
||
| // Verify session is logged on | ||
| assertTrue("Session should be logged on", session.isLoggedOn()); | ||
|
|
||
| // Step 2: Receive an application message with seqnum 2 | ||
| NewOrderSingle nos1 = new NewOrderSingle(); | ||
| nos1.set(new ClOrdID("ORDER1")); | ||
| nos1.set(new Symbol("TEST")); | ||
| nos1.set(new Side(Side.BUY)); | ||
| nos1.set(new TransactTime(LocalDateTime.now())); | ||
| nos1.set(new OrdType(OrdType.MARKET)); | ||
| nos1.getHeader().setString(BeginString.FIELD, FixVersions.BEGINSTRING_FIX44); | ||
| nos1.getHeader().setString(SenderCompID.FIELD, "TARGET"); | ||
| nos1.getHeader().setString(TargetCompID.FIELD, "SENDER"); | ||
| nos1.getHeader().setInt(MsgSeqNum.FIELD, 2); | ||
| nos1.getHeader().setUtcTimeStamp(SendingTime.FIELD, LocalDateTime.now()); | ||
| nos1.toString(); // calculate length and checksum | ||
|
|
||
| session.next(nos1); | ||
|
|
||
| // Verify the first message was processed | ||
| assertEquals("Should have received 1 application message", 1, receivedAppMessages.size()); | ||
| assertEquals("First message should be ORDER1", "ORDER1", | ||
| receivedAppMessages.get(0).getString(ClOrdID.FIELD)); | ||
|
|
||
| // Step 3: Receive a message with sequence number 50 (gap from 3 to 49) | ||
| // This should trigger a ResendRequest and queue the message | ||
| sentMessages.clear(); | ||
| receivedAppMessages.clear(); | ||
|
|
||
| NewOrderSingle nos2 = new NewOrderSingle(); | ||
| nos2.set(new ClOrdID("ORDER50")); | ||
| nos2.set(new Symbol("TEST")); | ||
| nos2.set(new Side(Side.BUY)); | ||
| nos2.set(new TransactTime(LocalDateTime.now())); | ||
| nos2.set(new OrdType(OrdType.MARKET)); | ||
| nos2.getHeader().setString(BeginString.FIELD, FixVersions.BEGINSTRING_FIX44); | ||
| nos2.getHeader().setString(SenderCompID.FIELD, "TARGET"); | ||
| nos2.getHeader().setString(TargetCompID.FIELD, "SENDER"); | ||
| nos2.getHeader().setInt(MsgSeqNum.FIELD, 50); | ||
| nos2.getHeader().setUtcTimeStamp(SendingTime.FIELD, LocalDateTime.now()); | ||
| nos2.toString(); // calculate length and checksum | ||
|
|
||
| session.next(nos2); | ||
|
|
||
| // Step 4: Verify that a ResendRequest was sent | ||
| boolean resendRequestFound = false; | ||
| String resendRequestMsg = null; | ||
| for (String msg : sentMessages) { | ||
| if (msg.contains("35=2")) { // MsgType=ResendRequest | ||
| resendRequestFound = true; | ||
| resendRequestMsg = msg; | ||
| break; | ||
| } | ||
| } | ||
|
|
||
| assertTrue("ResendRequest should be sent", resendRequestFound); | ||
| assertNotNull("ResendRequest message should not be null", resendRequestMsg); | ||
|
|
||
| // Parse the ResendRequest to verify the range | ||
| Message parsedResendRequest = new Message(resendRequestMsg, dataDictionaryProvider.getSessionDataDictionary(FixVersions.BEGINSTRING_FIX44), new ValidationSettings(), false); | ||
| assertEquals("ResendRequest BeginSeqNo should be 3", 3, parsedResendRequest.getInt(BeginSeqNo.FIELD)); | ||
| // EndSeqNo should be 0 (infinity) or 49 depending on settings | ||
| int endSeqNo = parsedResendRequest.getInt(EndSeqNo.FIELD); | ||
| assertTrue("ResendRequest EndSeqNo should be 0 or 49", endSeqNo == 0 || endSeqNo == 49); | ||
|
|
||
| // The message with seqnum 50 should NOT have been processed yet (it's queued) | ||
| assertEquals("Queued message should not be processed yet", 0, receivedAppMessages.size()); | ||
|
|
||
| // Step 5: Respond with a SequenceReset-GapFill from 3 to 50 | ||
| sentMessages.clear(); | ||
| SequenceReset sequenceReset = new SequenceReset(); | ||
| sequenceReset.set(new GapFillFlag(true)); | ||
| sequenceReset.set(new NewSeqNo(50)); | ||
| sequenceReset.getHeader().setString(BeginString.FIELD, FixVersions.BEGINSTRING_FIX44); | ||
| sequenceReset.getHeader().setString(SenderCompID.FIELD, "TARGET"); | ||
| sequenceReset.getHeader().setString(TargetCompID.FIELD, "SENDER"); | ||
| sequenceReset.getHeader().setInt(MsgSeqNum.FIELD, 3); | ||
| sequenceReset.getHeader().setUtcTimeStamp(SendingTime.FIELD, LocalDateTime.now()); | ||
| sequenceReset.toString(); // calculate length and checksum | ||
|
|
||
| // Process the SequenceReset | ||
| session.next(sequenceReset); | ||
|
|
||
| // Step 6: Verify that the queued message (seqnum 50) was processed after the gap was filled | ||
| // The SequenceReset-GapFill causes the queued message to be processed immediately | ||
| assertEquals("Queued message should now be processed", 1, receivedAppMessages.size()); | ||
| assertEquals("Processed message should be ORDER50", "ORDER50", | ||
| receivedAppMessages.get(0).getString(ClOrdID.FIELD)); | ||
| assertEquals("Processed message should have seqnum 50", 50, | ||
| receivedAppMessages.get(0).getHeader().getInt(MsgSeqNum.FIELD)); | ||
|
|
||
| // Verify the sequence number advanced to 51 after processing the queued message | ||
| assertEquals("Expected target sequence number should be 51 after processing queued message", 51, | ||
| session.getStore().getNextTargetMsgSeqNum()); | ||
|
|
||
| // Verify no reject was sent | ||
| for (String msg : sentMessages) { | ||
| assertFalse("No reject should be sent", msg.contains("35=3")); // MsgType=Reject | ||
| } | ||
| } | ||
|
|
||
| @Test | ||
| public void testSequenceResetWithoutGapFillShouldResetSequence() throws Exception { | ||
| // Send and receive logon to establish session | ||
| Logon logon = new Logon(); | ||
| logon.set(new EncryptMethod(EncryptMethod.NONE_OTHER)); | ||
| logon.set(new HeartBtInt(30)); | ||
| logon.getHeader().setString(BeginString.FIELD, FixVersions.BEGINSTRING_FIX44); | ||
| logon.getHeader().setString(SenderCompID.FIELD, "TARGET"); | ||
| logon.getHeader().setString(TargetCompID.FIELD, "SENDER"); | ||
| logon.getHeader().setInt(MsgSeqNum.FIELD, 1); | ||
| logon.getHeader().setUtcTimeStamp(SendingTime.FIELD, LocalDateTime.now()); | ||
| logon.toString(); // calculate length and checksum | ||
|
|
||
| session.next(logon); | ||
|
|
||
| // Send SequenceReset WITHOUT GapFill (hard reset) | ||
| SequenceReset sequenceReset = new SequenceReset(); | ||
| sequenceReset.set(new NewSeqNo(50)); | ||
| // GapFillFlag is not set or set to false | ||
|
|
||
| sequenceReset.getHeader().setString(BeginString.FIELD, FixVersions.BEGINSTRING_FIX44); | ||
| sequenceReset.getHeader().setString(SenderCompID.FIELD, "TARGET"); | ||
| sequenceReset.getHeader().setString(TargetCompID.FIELD, "SENDER"); | ||
| sequenceReset.getHeader().setInt(MsgSeqNum.FIELD, 2); | ||
| sequenceReset.getHeader().setUtcTimeStamp(SendingTime.FIELD, LocalDateTime.now()); | ||
| sequenceReset.toString(); // calculate length and checksum | ||
|
|
||
| session.next(sequenceReset); | ||
|
|
||
| // Verify the sequence number was reset to 50 | ||
| assertEquals("Expected target sequence number should be 50", 50, | ||
| session.getStore().getNextTargetMsgSeqNum()); | ||
| } | ||
|
|
||
| @Test | ||
| public void testSequenceResetWithInvalidNewSeqNoShouldGenerateReject() throws Exception { | ||
| // Establish session first | ||
| Logon logon = new Logon(); | ||
| logon.set(new EncryptMethod(EncryptMethod.NONE_OTHER)); | ||
| logon.set(new HeartBtInt(30)); | ||
| logon.getHeader().setString(BeginString.FIELD, FixVersions.BEGINSTRING_FIX44); | ||
| logon.getHeader().setString(SenderCompID.FIELD, "TARGET"); | ||
| logon.getHeader().setString(TargetCompID.FIELD, "SENDER"); | ||
| logon.getHeader().setInt(MsgSeqNum.FIELD, 1); | ||
| logon.getHeader().setUtcTimeStamp(SendingTime.FIELD, LocalDateTime.now()); | ||
| logon.toString(); // calculate length and checksum | ||
|
|
||
| session.next(logon); | ||
|
|
||
| // Send several messages to advance sequence numbers | ||
| for (int i = 2; i <= 10; i++) { | ||
| NewOrderSingle nos = new NewOrderSingle(); | ||
| nos.set(new ClOrdID("ORDER" + i)); | ||
| nos.set(new Symbol("TEST")); | ||
| nos.set(new Side(Side.BUY)); | ||
| nos.set(new TransactTime(LocalDateTime.now())); | ||
| nos.set(new OrdType(OrdType.MARKET)); | ||
| nos.getHeader().setString(BeginString.FIELD, FixVersions.BEGINSTRING_FIX44); | ||
| nos.getHeader().setString(SenderCompID.FIELD, "TARGET"); | ||
| nos.getHeader().setString(TargetCompID.FIELD, "SENDER"); | ||
| nos.getHeader().setInt(MsgSeqNum.FIELD, i); | ||
| nos.getHeader().setUtcTimeStamp(SendingTime.FIELD, LocalDateTime.now()); | ||
| nos.toString(); // calculate length and checksum | ||
|
|
||
| session.next(nos); | ||
| } | ||
|
|
||
| // Now expecting seqnum 11 | ||
| assertEquals("Expected target sequence number should be 11", 11, | ||
| session.getStore().getNextTargetMsgSeqNum()); | ||
| sentMessages.clear(); | ||
|
|
||
| // Send SequenceReset with NewSeqNo LOWER than expected (invalid) | ||
| // Sending seqnum 11 with NewSeqNo=5 (which is less than expected 11) | ||
| SequenceReset sequenceReset = new SequenceReset(); | ||
| sequenceReset.set(new GapFillFlag(true)); | ||
| sequenceReset.set(new NewSeqNo(5)); // Lower than current expected (11) | ||
|
|
||
| sequenceReset.getHeader().setString(BeginString.FIELD, FixVersions.BEGINSTRING_FIX44); | ||
| sequenceReset.getHeader().setString(SenderCompID.FIELD, "TARGET"); | ||
| sequenceReset.getHeader().setString(TargetCompID.FIELD, "SENDER"); | ||
| sequenceReset.getHeader().setInt(MsgSeqNum.FIELD, 11); | ||
| sequenceReset.getHeader().setUtcTimeStamp(SendingTime.FIELD, LocalDateTime.now()); | ||
| sequenceReset.toString(); // calculate length and checksum | ||
|
|
||
| session.next(sequenceReset); | ||
|
|
||
| // Verify a Reject was sent | ||
| boolean rejectFound = false; | ||
| for (String msg : sentMessages) { | ||
| if (msg.contains("35=3")) { // MsgType=Reject | ||
| rejectFound = true; | ||
| break; | ||
| } | ||
| } | ||
|
|
||
| assertTrue("Reject should be sent for invalid NewSeqNo", rejectFound); | ||
| } | ||
| } | ||
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
@copilot
I want to trigger a specific behaviour where queued messages lower than NewSeqNo are removed from the queue.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Done in commit 83fbe7e. Changed NewSeqNo from 50 to 100 to test the behavior where queued messages with sequence numbers lower than NewSeqNo (message at seqnum 50) are removed from the queue when the gap fill extends beyond them.
Test now verifies that the queued message is NOT processed (removed from queue) and sequence advances directly to 100. Log confirms: "Enqueued at pos 50" followed by "Received SequenceReset FROM: 3 TO: 100" with no "Processing queued message" event.