Bring in custom acceptance tests for the resend request chunk size, i…

…n order to avoid copying a quickfix bug where the newseqno field of a gapfill message was being treated incorrectly.

test-fix-42/src/test/java/uk/co/real_logic/artio/acceptance_tests/Fix42ResendRequestChunkSizeAcceptanceTest.java

@@ -10,13 +10,11 @@
 @RunWith(Parameterized.class)
 public class Fix42ResendRequestChunkSizeAcceptanceTest extends AbstractFixSpecAcceptanceTest
 {
-    private static final String QUICKFIX_4_2_ROOT_PATH = QUICKFIX_RESEND_REQUEST_CHUNK_SIZE_DEFINITIONS + "/fix42";
-
     @Parameterized.Parameters(name = "Acceptance: {1}")
     public static Collection<Object[]> data()
     {
         return testsFor(
-            QUICKFIX_4_2_ROOT_PATH,
+            CUSTOM_ROOT_PATH + "/fix42",
             QUICKFIX_RESEND_CHUNK_INCLUDE_LIST,
             () -> Environment.fix42(new NewOrderSingleClonerImpl(), RESEND_REQUEST_CHUNK_SIZE));
     }

test-fix-42/src/test/resources/custom_definitions/fix42/SequenceGapFollowedByMessageResent.def

@@ -0,0 +1,37 @@
+# If message sequence number is too high, send a resend request for
+# missing messages
+
+iCONNECT
+I8=FIX.4.2
35=A
34=1
49=TW
52=<TIME>
56=ISLD
98=0
108=30

+E8=FIX.4.2
9=57
35=A
34=1
49=ISLD
52=00000000-00:00:00
56=TW
98=0
108=30
10=0

+
+I8=FIX.4.2
35=D
34=2
49=TW
52=<TIME>
56=ISLD
11=ID
21=3
38=100
40=1
54=1
55=INTC
60=<TIME>

+E8=FIX.4.2
9=81
35=D
34=2
49=ISLD
52=00000000-00:00:00
56=TW
11=ID
21=3
38=100
40=1
54=1
55=INTC
10=0

+
+I8=FIX.4.2
35=D
34=3
49=TW
52=<TIME>
56=ISLD
11=ID
21=3
38=100
40=1
54=1
55=INTC
60=<TIME>

+E8=FIX.4.2
9=81
35=D
34=3
49=ISLD
52=00000000-00:00:00
56=TW
11=ID
21=3
38=100
40=1
54=1
55=INTC
10=0

+
+# Sending message 10 when last message sent was 3
+I8=FIX.4.2
35=0
34=10
49=TW
52=<TIME>
56=ISLD

+
+# Receive Resend request for messages 4 to (4+5-1 = 8)
+E8=FIX.4.2
9=54
35=2
34=4
49=ISLD
52=00000000-00:00:00
56=TW
7=4
16=8
10=0

+I8=FIX.4.2
35=D
34=4
49=TW
52=<TIME>
56=ISLD
97=Y
11=ID
21=3
38=100
40=1
54=1
55=INTC
60=<TIME>

+I8=FIX.4.2
35=D
34=5
49=TW
52=<TIME>
56=ISLD
97=Y
11=ID
21=3
38=100
40=1
54=1
55=INTC
60=<TIME>

+I8=FIX.4.2
35=D
34=6
49=TW
52=<TIME>
56=ISLD
97=Y
11=ID
21=3
38=100
40=1
54=1
55=INTC
60=<TIME>

+I8=FIX.4.2
35=D
34=7
49=TW
52=<TIME>
56=ISLD
97=Y
11=ID
21=3
38=100
40=1
54=1
55=INTC
60=<TIME>

+I8=FIX.4.2
35=D
34=8
49=TW
52=<TIME>
56=ISLD
97=Y
11=ID
21=3
38=100
40=1
54=1
55=INTC
60=<TIME>

+
+# Receive Resend request for messages 9 to infinity
+E8=FIX.4.2
9=55
35=2
34=5
49=ISLD
52=00000000-00:00:00
56=TW
7=9
16=0
10=0

+I8=FIX.4.2
35=D
34=9
49=TW
52=<TIME>
56=ISLD
97=Y
11=ID
21=3
38=100
40=1
54=1
55=INTC
60=<TIME>

+
+#Sent test request to validate no seq num issue
+I8=FIX.4.2
35=1
34=11
49=TW
52=<TIME>
56=ISLD
112=TEST

+E8=FIX.4.2
9=54
35=0
34=6
49=ISLD
52=00000000-00:00:00
56=TW
112=TEST
10=0

+
+# logout message and response
+I8=FIX.4.2
35=5
34=12
49=TW
52=<TIME>
56=ISLD

+E8=FIX.4.2
9=45
35=5
34=7
49=ISLD
52=00000000-00:00:00
56=TW
10=0

+
+eDISCONNECT

test-fix-42/src/test/resources/custom_definitions/fix42/SequenceGapFollowedBySequenceResetWithGapFill.def

@@ -0,0 +1,43 @@
+# If message sequence number is too high, send a resend request for
+# missing messages
+
+# Modified from quickfix because the newSeqNo field on a gap fill should refer to the sequence number of the next message
+
+iCONNECT
+I8=FIX.4.2
35=A
34=1
49=TW
52=<TIME>
56=ISLD
98=0
108=30

+E8=FIX.4.2
9=57
35=A
34=1
49=ISLD
52=00000000-00:00:00
56=TW
98=0
108=30
10=0

+
+I8=FIX.4.2
35=D
34=2
49=TW
52=<TIME>
56=ISLD
11=ID
21=3
38=100
40=1
54=1
55=INTC
60=<TIME>

+E8=FIX.4.2
9=81
35=D
34=2
49=ISLD
52=00000000-00:00:00
56=TW
11=ID
21=3
38=100
40=1
54=1
55=INTC
10=0

+
+I8=FIX.4.2
35=D
34=3
49=TW
52=<TIME>
56=ISLD
11=ID
21=3
38=100
40=1
54=1
55=INTC
60=<TIME>

+E8=FIX.4.2
9=81
35=D
34=3
49=ISLD
52=00000000-00:00:00
56=TW
11=ID
21=3
38=100
40=1
54=1
55=INTC
10=0

+
+# Sending message 15 when last message sent was 3
+I8=FIX.4.2
35=0
34=15
49=TW
52=<TIME>
56=ISLD

+
+# Receive Resend request for messages 4 to (4+5-1 = 8)
+E8=FIX.4.2
9=54
35=2
34=4
49=ISLD
52=00000000-00:00:00
56=TW
7=4
16=8
10=0

+# Send a GapFill up to the last message 8
+I8=FIX.4.2
35=4
34=4
49=TW
52=<TIME>
56=ISLD
123=Y
36=9

+
+# Receive Resend request for messages 8 to (8+5-1 = 12)
+E8=FIX.4.2
9=55
35=2
34=5
49=ISLD
52=00000000-00:00:00
56=TW
7=9
16=13
10=0

+# Send a GapFill up to the last message 12
+I8=FIX.4.2
35=4
34=9
49=TW
52=<TIME>
56=ISLD
123=Y
36=14

+
+# Receive Resend request for messages 12 to 15)
+E8=FIX.4.2
9=60
35=2
34=6
49=ISLD
52=00000000-00:00:00
56=TW
7=14
16=0
10=0

+# Send a GapFill up to the last message 15
+I8=FIX.4.2
35=4
34=14
49=TW
52=<TIME>
56=ISLD
123=Y
36=16

+
+#Sent test request to validate no seq num issue
+I8=FIX.4.2
35=1
34=16
49=TW
52=<TIME>
56=ISLD
112=TEST

+E8=FIX.4.2
9=54
35=0
34=7
49=ISLD
52=00000000-00:00:00
56=TW
112=TEST
10=0

+
+
+# logout message and response
+I8=FIX.4.2
35=5
34=17
49=TW
52=<TIME>
56=ISLD

+E8=FIX.4.2
9=45
35=5
34=8
49=ISLD
52=00000000-00:00:00
56=TW
10=0

+
+eDISCONNECT

test-fix-44/src/test/java/uk/co/real_logic/artio/acceptance_tests/Fix44ResendRequestChunkSizeAcceptanceTest.java

@@ -10,13 +10,11 @@
 @RunWith(Parameterized.class)
 public class Fix44ResendRequestChunkSizeAcceptanceTest extends AbstractFixSpecAcceptanceTest
 {
-    private static final String QUICKFIX_4_4_ROOT_PATH = QUICKFIX_RESEND_REQUEST_CHUNK_SIZE_DEFINITIONS + "/fix44";
-
     @Parameterized.Parameters(name = "Acceptance: {1}")
     public static Collection<Object[]> data()
     {
         return testsFor(
-            QUICKFIX_4_4_ROOT_PATH,
+            CUSTOM_ROOT_PATH + "/fix44",
             QUICKFIX_RESEND_CHUNK_INCLUDE_LIST,
             () -> Environment.fix44(new NewOrderSingleClonerImpl(), RESEND_REQUEST_CHUNK_SIZE));
     }

test-fix-44/src/test/resources/custom_definitions/fix44/SequenceGapFollowedByMessageResent.def

@@ -0,0 +1,37 @@
+# If message sequence number is too high, send a resend request for
+# missing messages
+
+iCONNECT
+I8=FIX.4.4
35=A
34=1
49=TW
52=<TIME>
56=ISLD
98=0
108=30

+E8=FIX.4.4
9=57
35=A
34=1
49=ISLD
52=00000000-00:00:00
56=TW
98=0
108=30
10=0

+
+I8=FIX.4.4
35=D
34=2
49=TW
52=<TIME>
56=ISLD
11=ID
21=3
38=100
40=1
54=1
55=INTC
60=<TIME>

+E8=FIX.4.4
9=81
35=D
34=2
49=ISLD
52=00000000-00:00:00
56=TW
11=ID
21=3
38=100
40=1
54=1
55=INTC
10=0

+
+I8=FIX.4.4
35=D
34=3
49=TW
52=<TIME>
56=ISLD
11=ID
21=3
38=100
40=1
54=1
55=INTC
60=<TIME>

+E8=FIX.4.4
9=81
35=D
34=3
49=ISLD
52=00000000-00:00:00
56=TW
11=ID
21=3
38=100
40=1
54=1
55=INTC
10=0

+
+# Sending message 10 when last message sent was 3
+I8=FIX.4.4
35=0
34=10
49=TW
52=<TIME>
56=ISLD

+
+# Receive Resend request for messages 4 to (4+5-1 = 8)
+E8=FIX.4.4
9=54
35=2
34=4
49=ISLD
52=00000000-00:00:00
56=TW
7=4
16=8
10=0

+I8=FIX.4.4
35=D
34=4
49=TW
52=<TIME>
56=ISLD
97=Y
11=ID
21=3
38=100
40=1
54=1
55=INTC
60=<TIME>

+I8=FIX.4.4
35=D
34=5
49=TW
52=<TIME>
56=ISLD
97=Y
11=ID
21=3
38=100
40=1
54=1
55=INTC
60=<TIME>

+I8=FIX.4.4
35=D
34=6
49=TW
52=<TIME>
56=ISLD
97=Y
11=ID
21=3
38=100
40=1
54=1
55=INTC
60=<TIME>

+I8=FIX.4.4
35=D
34=7
49=TW
52=<TIME>
56=ISLD
97=Y
11=ID
21=3
38=100
40=1
54=1
55=INTC
60=<TIME>

+I8=FIX.4.4
35=D
34=8
49=TW
52=<TIME>
56=ISLD
97=Y
11=ID
21=3
38=100
40=1
54=1
55=INTC
60=<TIME>

+
+# Receive Resend request for messages 9 to infinity
+E8=FIX.4.4
9=55
35=2
34=5
49=ISLD
52=00000000-00:00:00
56=TW
7=9
16=0
10=0

+I8=FIX.4.4
35=D
34=9
49=TW
52=<TIME>
56=ISLD
97=Y
11=ID
21=3
38=100
40=1
54=1
55=INTC
60=<TIME>

+
+#Sent test request to validate no seq num issue
+I8=FIX.4.4
35=1
34=11
49=TW
52=<TIME>
56=ISLD
112=TEST

+E8=FIX.4.4
9=54
35=0
34=6
49=ISLD
52=00000000-00:00:00
56=TW
112=TEST
10=0

+
+# logout message and response
+I8=FIX.4.4
35=5
34=12
49=TW
52=<TIME>
56=ISLD

+E8=FIX.4.4
9=45
35=5
34=7
49=ISLD
52=00000000-00:00:00
56=TW
10=0

+
+eDISCONNECT

test-fix-44/src/test/resources/custom_definitions/fix44/SequenceGapFollowedBySequenceResetWithGapFill.def

@@ -0,0 +1,43 @@
+# If message sequence number is too high, send a resend request for
+# missing messages
+
+# Modified from quickfix because the newSeqNo field on a gap fill should refer to the sequence number of the next message
+
+iCONNECT
+I8=FIX.4.4
35=A
34=1
49=TW
52=<TIME>
56=ISLD
98=0
108=30

+E8=FIX.4.4
9=57
35=A
34=1
49=ISLD
52=00000000-00:00:00
56=TW
98=0
108=30
10=0

+
+I8=FIX.4.4
35=D
34=2
49=TW
52=<TIME>
56=ISLD
11=ID
21=3
38=100
40=1
54=1
55=INTC
60=<TIME>

+E8=FIX.4.4
9=81
35=D
34=2
49=ISLD
52=00000000-00:00:00
56=TW
11=ID
21=3
38=100
40=1
54=1
55=INTC
10=0

+
+I8=FIX.4.4
35=D
34=3
49=TW
52=<TIME>
56=ISLD
11=ID
21=3
38=100
40=1
54=1
55=INTC
60=<TIME>

+E8=FIX.4.4
9=81
35=D
34=3
49=ISLD
52=00000000-00:00:00
56=TW
11=ID
21=3
38=100
40=1
54=1
55=INTC
10=0

+
+# Sending message 15 when last message sent was 3
+I8=FIX.4.4
35=0
34=15
49=TW
52=<TIME>
56=ISLD

+
+# Receive Resend request for messages 4 to (4+5-1 = 8)
+E8=FIX.4.4
9=54
35=2
34=4
49=ISLD
52=00000000-00:00:00
56=TW
7=4
16=8
10=0

+# Send a GapFill up to the last message 8
+I8=FIX.4.4
35=4
34=4
49=TW
52=<TIME>
56=ISLD
123=Y
36=9

+
+# Receive Resend request for messages 8 to (8+5-1 = 12)
+E8=FIX.4.4
9=55
35=2
34=5
49=ISLD
52=00000000-00:00:00
56=TW
7=9
16=13
10=0

+# Send a GapFill up to the last message 12
+I8=FIX.4.4
35=4
34=9
49=TW
52=<TIME>
56=ISLD
123=Y
36=14

+
+# Receive Resend request for messages 12 to 15)
+E8=FIX.4.4
9=60
35=2
34=6
49=ISLD
52=00000000-00:00:00
56=TW
7=14
16=0
10=0

+# Send a GapFill up to the last message 15
+I8=FIX.4.4
35=4
34=14
49=TW
52=<TIME>
56=ISLD
123=Y
36=16

+
+#Sent test request to validate no seq num issue
+I8=FIX.4.4
35=1
34=16
49=TW
52=<TIME>
56=ISLD
112=TEST

+E8=FIX.4.4
9=54
35=0
34=7
49=ISLD
52=00000000-00:00:00
56=TW
112=TEST
10=0

+
+
+# logout message and response
+I8=FIX.4.4
35=5
34=17
49=TW
52=<TIME>
56=ISLD

+E8=FIX.4.4
9=45
35=5
34=8
49=ISLD
52=00000000-00:00:00
56=TW
10=0

+
+eDISCONNECT

test-fix-50/src/test/java/uk/co/real_logic/artio/acceptance_tests/Fix50ResendRequestChunkSizeAcceptanceTest.java

@@ -10,13 +10,12 @@
 @RunWith(Parameterized.class)
 public class Fix50ResendRequestChunkSizeAcceptanceTest extends AbstractFixSpecAcceptanceTest
 {
-    private static final String QUICKFIX_5_0_ROOT_PATH = QUICKFIX_RESEND_REQUEST_CHUNK_SIZE_DEFINITIONS + "/fix50";
-
     @Parameterized.Parameters(name = "Acceptance: {1}")
     public static Collection<Object[]> data()
     {
         return testsFor(
-            QUICKFIX_5_0_ROOT_PATH, QUICKFIX_RESEND_CHUNK_INCLUDE_LIST,
+            CUSTOM_ROOT_PATH + "/fix50",
+            QUICKFIX_RESEND_CHUNK_INCLUDE_LIST,
             () -> Environment.fix50(
                 new Fix50SessionCustomizationStrategy(),
                 new NewOrderSingleClonerImpl(),

test-fix-50/src/test/resources/custom_definitions/fix50/SequenceGapFollowedByMessageResent.def

@@ -0,0 +1,37 @@
+# If message sequence number is too high, send a resend request for
+# missing messages
+
+iCONNECT
+I8=FIXT.1.1
35=A
34=1
49=TW
52=<TIME>
56=ISLD
98=0
108=30
1137=7

+E8=FIXT.1.1
9=64
35=A
34=1
49=ISLD
52=00000000-00:00:00
56=TW
98=0
108=30
1137=7
10=0

+
+I8=FIXT.1.1
35=D
34=2
49=TW
52=<TIME>
56=ISLD
11=ID
21=3
38=100
40=1
54=1
55=INTC
60=<TIME>

+E8=FIXT.1.1
9=81
35=D
34=2
49=ISLD
52=00000000-00:00:00
56=TW
11=ID
21=3
38=100
40=1
54=1
55=INTC
10=0

+
+I8=FIXT.1.1
35=D
34=3
49=TW
52=<TIME>
56=ISLD
11=ID
21=3
38=100
40=1
54=1
55=INTC
60=<TIME>

+E8=FIXT.1.1
9=81
35=D
34=3
49=ISLD
52=00000000-00:00:00
56=TW
11=ID
21=3
38=100
40=1
54=1
55=INTC
10=0

+
+# Sending message 10 when last message sent was 3
+I8=FIXT.1.1
35=0
34=10
49=TW
52=<TIME>
56=ISLD

+
+# Receive Resend request for messages 4 to (4+5-1 = 8)
+E8=FIXT.1.1
9=54
35=2
34=4
49=ISLD
52=00000000-00:00:00
56=TW
7=4
16=8
10=0

+I8=FIXT.1.1
35=D
34=4
49=TW
52=<TIME>
56=ISLD
97=Y
11=ID
21=3
38=100
40=1
54=1
55=INTC
60=<TIME>

+I8=FIXT.1.1
35=D
34=5
49=TW
52=<TIME>
56=ISLD
97=Y
11=ID
21=3
38=100
40=1
54=1
55=INTC
60=<TIME>

+I8=FIXT.1.1
35=D
34=6
49=TW
52=<TIME>
56=ISLD
97=Y
11=ID
21=3
38=100
40=1
54=1
55=INTC
60=<TIME>

+I8=FIXT.1.1
35=D
34=7
49=TW
52=<TIME>
56=ISLD
97=Y
11=ID
21=3
38=100
40=1
54=1
55=INTC
60=<TIME>

+I8=FIXT.1.1
35=D
34=8
49=TW
52=<TIME>
56=ISLD
97=Y
11=ID
21=3
38=100
40=1
54=1
55=INTC
60=<TIME>

+
+# Receive Resend request for messages 9 to infinity
+E8=FIXT.1.1
9=55
35=2
34=5
49=ISLD
52=00000000-00:00:00
56=TW
7=9
16=0
10=0

+I8=FIXT.1.1
35=D
34=9
49=TW
52=<TIME>
56=ISLD
97=Y
11=ID
21=3
38=100
40=1
54=1
55=INTC
60=<TIME>

+
+#Sent test request to validate no seq num issue
+I8=FIXT.1.1
35=1
34=11
49=TW
52=<TIME>
56=ISLD
112=TEST

+E8=FIXT.1.1
9=54
35=0
34=6
49=ISLD
52=00000000-00:00:00
56=TW
112=TEST
10=0

+
+# logout message and response
+I8=FIXT.1.1
35=5
34=12
49=TW
52=<TIME>
56=ISLD

+E8=FIXT.1.1
9=45
35=5
34=7
49=ISLD
52=00000000-00:00:00
56=TW
10=0

+
+eDISCONNECT

test-fix-50/src/test/resources/custom_definitions/fix50/SequenceGapFollowedBySequenceResetWithGapFill.def

@@ -0,0 +1,43 @@
+# If message sequence number is too high, send a resend request for
+# missing messages
+
+# Modified from quickfix because the newSeqNo field on a gap fill should refer to the sequence number of the next message
+
+iCONNECT
+I8=FIXT.1.1
35=A
34=1
49=TW
52=<TIME>
56=ISLD
98=0
108=2
1137=7

+E8=FIXT.1.1
9=57
35=A
34=1
49=ISLD
52=00000000-00:00:00
56=TW
98=0
108=2
1137=7
10=0

+
+I8=FIXT.1.1
35=D
34=2
49=TW
52=<TIME>
56=ISLD
11=ID
21=3
38=100
40=1
54=1
55=INTC
60=<TIME>

+E8=FIXT.1.1
9=81
35=D
34=2
49=ISLD
52=00000000-00:00:00
56=TW
11=ID
21=3
38=100
40=1
54=1
55=INTC
10=0

+
+I8=FIXT.1.1
35=D
34=3
49=TW
52=<TIME>
56=ISLD
11=ID
21=3
38=100
40=1
54=1
55=INTC
60=<TIME>

+E8=FIXT.1.1
9=81
35=D
34=3
49=ISLD
52=00000000-00:00:00
56=TW
11=ID
21=3
38=100
40=1
54=1
55=INTC
10=0

+
+# Sending message 15 when last message sent was 3
+I8=FIXT.1.1
35=0
34=15
49=TW
52=<TIME>
56=ISLD

+
+# Receive Resend request for messages 4 to (4+5-1 = 8)
+E8=FIXT.1.1
9=54
35=2
34=4
49=ISLD
52=00000000-00:00:00
56=TW
7=4
16=8
10=0

+# Send a GapFill up to the last message 8
+I8=FIXT.1.1
35=4
34=4
49=TW
52=<TIME>
56=ISLD
123=Y
36=9

+
+# Receive Resend request for messages 8 to (8+5-1 = 12)
+E8=FIXT.1.1
9=55
35=2
34=5
49=ISLD
52=00000000-00:00:00
56=TW
7=9
16=13
10=0

+# Send a GapFill up to the last message 12
+I8=FIXT.1.1
35=4
34=9
49=TW
52=<TIME>
56=ISLD
123=Y
36=14

+
+# Receive Resend request for messages 12 to 15)
+E8=FIXT.1.1
9=60
35=2
34=6
49=ISLD
52=00000000-00:00:00
56=TW
7=14
16=0
10=0

+# Send a GapFill up to the last message 15
+I8=FIXT.1.1
35=4
34=14
49=TW
52=<TIME>
56=ISLD
123=Y
36=16

+
+#Sent test request to validate no seq num issue
+I8=FIXT.1.1
35=1
34=16
49=TW
52=<TIME>
56=ISLD
112=TEST

+E8=FIXT.1.1
9=54
35=0
34=7
49=ISLD
52=00000000-00:00:00
56=TW
112=TEST
10=0

+
+
+# logout message and response
+I8=FIXT.1.1
35=5
34=17
49=TW
52=<TIME>
56=ISLD

+E8=FIXT.1.1
9=45
35=5
34=8
49=ISLD
52=00000000-00:00:00
56=TW
10=0

+
+eDISCONNECT

test-framework/src/test/java/uk/co/real_logic/artio/acceptance_tests/AbstractFixSpecAcceptanceTest.java

@@ -49,18 +49,23 @@ public abstract class AbstractFixSpecAcceptanceTest
     @Rule
     public Timeout timeout = Timeout.millis(Long.getLong(FIX_TEST_TIMEOUT_PROP, FIX_TEST_TIMEOUT_DEFAULT));
 
-    protected static List<Object[]> testsFor(
+    protected static List<Object[]>  testsFor(
         final String rootDirPath, final List<String> files, final Supplier<Environment> environment)
     {
         final String rootDir = getCorrectDirectory(rootDirPath);
 
         return files
             .stream()
             .map((file) -> Paths.get(rootDir, file))
-            .map((path) -> new Object[]{ path, path.getFileName(), environment })
+            .map((path) -> testFor(path, environment))
             .collect(toList());
     }
 
+    protected static Object[] testFor(final Path path, final Supplier<Environment> environment)
+    {
+        return new Object[]{path, path.getFileName(), environment};
+    }
+
     private static String getCorrectDirectory(final String rootDirPath)
     {
         final File rootDirFile = new File(rootDirPath);