From 5c80bed1b772a52856a916defe6f12b5e1cfcb81 Mon Sep 17 00:00:00 2001
From: Grant Birchmeier <gbirchmeier@connamara.com>
Date: Mon, 8 Jun 2015 15:02:45 -0500
Subject: [PATCH] (#80) AT: logon with reset after disconnect

---
 AcceptanceTest/cfg/.gitignore                 |  1 -
 AcceptanceTest/cfg/at_44_noreset.cfg          | 15 +++++++
 .../SessionResetAfterDisconnect.def           | 40 +++++++++++++++++++
 QuickFIXn/Session.cs                          |  8 ++--
 acceptance_test.bat                           | 14 ++++++-
 5 files changed, 71 insertions(+), 7 deletions(-)
 delete mode 100644 AcceptanceTest/cfg/.gitignore
 create mode 100644 AcceptanceTest/cfg/at_44_noreset.cfg
 create mode 100644 AcceptanceTest/definitions/server/fix44noreset/SessionResetAfterDisconnect.def

diff --git a/AcceptanceTest/cfg/.gitignore b/AcceptanceTest/cfg/.gitignore
deleted file mode 100644
index 7103328ab..000000000
--- a/AcceptanceTest/cfg/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-*.cfg
diff --git a/AcceptanceTest/cfg/at_44_noreset.cfg b/AcceptanceTest/cfg/at_44_noreset.cfg
new file mode 100644
index 000000000..ca2bab43f
--- /dev/null
+++ b/AcceptanceTest/cfg/at_44_noreset.cfg
@@ -0,0 +1,15 @@
+[DEFAULT] 
+Verbose=Y 
+FileLogPath=log 
+ConnectionType=acceptor 
+SocketAcceptPort=5005 
+SocketReuseAddress=Y 
+StartTime=00:00:00 
+EndTime=00:00:00 
+SenderCompID=ISLD 
+TargetCompID=TW 
+ResetOnLogon=N
+FileStorePath=store 
+[SESSION] 
+BeginString=FIX.4.4 
+DataDictionary=..\spec\fix\FIX44.xml 
diff --git a/AcceptanceTest/definitions/server/fix44noreset/SessionResetAfterDisconnect.def b/AcceptanceTest/definitions/server/fix44noreset/SessionResetAfterDisconnect.def
new file mode 100644
index 000000000..6b22775ab
--- /dev/null
+++ b/AcceptanceTest/definitions/server/fix44noreset/SessionResetAfterDisconnect.def
@@ -0,0 +1,40 @@
+# Issue #80: logon with reset _after_disconnect_
+
+iCONNECT
+# logon with reset, because this config has ResetOnLogon=N
+I8=FIX.4.4
35=A
34=1
49=TW
52=<TIME>
56=ISLD
98=0
108=30
141=Y

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

+I8=FIX.4.4
35=0
34=2
49=TW
52=<TIME>
56=ISLD

+I8=FIX.4.4
35=0
34=3
49=TW
52=<TIME>
56=ISLD

+I8=FIX.4.4
35=0
34=4
49=TW
52=<TIME>
56=ISLD

+I8=FIX.4.4
35=0
34=5
49=TW
52=<TIME>
56=ISLD

+I8=FIX.4.4
35=0
34=6
49=TW
52=<TIME>
56=ISLD

+I8=FIX.4.4
35=0
34=7
49=TW
52=<TIME>
56=ISLD

+I8=FIX.4.4
35=0
34=8
49=TW
52=<TIME>
56=ISLD

+I8=FIX.4.4
35=0
34=9
49=TW
52=<TIME>
56=ISLD

+
+#Send TestRequest, expect HeartBeat response
+I8=FIX.4.4
35=1
34=10
49=TW
52=<TIME>
56=ISLD
112=1

+E8=FIX.4.4
9=55
35=0
34=2
49=ISLD
52=<TIME>
56=TW
112=1

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

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

+
+eDISCONNECT
+iCONNECT
+
+#send a Logon with ResetSeqNumFlag set to Y and with MsgSeqNum of 1
+I8=FIX.4.4
35=A
34=1
49=TW
52=<TIME>
56=ISLD
98=0
108=30
141=Y

+#Expect a response with a Logon with ResetSeqNumFlag set to Y and with MsgSeqNum of 1.
+E8=FIX.4.4
9=67
35=A
34=1
49=ISLD
52=00000000-00:00:00.000
56=TW
98=0
108=30
141=Y
10=0

+
+#Send TestRequest (MsgSeqNum = 2) expect to receive HeartBeat (MsgSeqNum = 2)
+I8=FIX.4.4
35=1
34=2
49=TW
52=<TIME>
56=ISLD
112=1

+E8=FIX.4.4
9=55
35=0
34=2
49=ISLD
52=<TIME>
56=TW
112=1

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

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

+
+eDISCONNECT
diff --git a/QuickFIXn/Session.cs b/QuickFIXn/Session.cs
index fae58a53f..0386f13a4 100755
--- a/QuickFIXn/Session.cs
+++ b/QuickFIXn/Session.cs
@@ -349,7 +349,7 @@ public bool Send(string message)
 
         // TODO for v2 - rename, make internal
         /// <summary>
-        /// Sets some internal state variables.  Despite the name, it does do anything to make a logon occur.
+        /// Sets some internal state variables.  Despite the name, it does not do anything to make a logon occur.
         /// </summary>
         public void Logon()
         {
@@ -667,10 +667,10 @@ protected void NextLogon(Message logon)
 
             if (state_.ReceivedReset)
             {
-                this.Log.OnEvent("Logon contains ResetSeqNumFlag=Y, reseting sequence numbers to 1");
+                this.Log.OnEvent("Sequence numbers reset due to ResetSeqNumFlag=Y");
                 if (!state_.SentReset)
                 {
-                    state_.Reset("Reseting because reset was requested by counterparty.");
+                    state_.Reset("Reset requested by counterparty");
                 }
             }
 
@@ -684,7 +684,7 @@ protected void NextLogon(Message logon)
 
             if (!IsGoodTime(logon))
             {
-                this.Log.OnEvent("Logon had bad sending time");
+                this.Log.OnEvent("Logon has bad sending time");
                 Disconnect("bad sending time");
                 return;
             }
diff --git a/acceptance_test.bat b/acceptance_test.bat
index ae4db993e..7dd1d1ed3 100755
--- a/acceptance_test.bat
+++ b/acceptance_test.bat
@@ -5,6 +5,7 @@ set RESULT41=
 set RESULT42=
 set RESULT43=
 set RESULT44=
+set RESULT44_NORESET=
 set RESULT50=
 set RESULT50SP1=
 set RESULT50SP2=
@@ -48,7 +49,14 @@ pushd AcceptanceTest
     if ERRORLEVEL 1 set RESULT44=1
     echo "44 tests result: %RESULT44%"
     copy TestResult.xml AcceptanceTests_44.xml
-    
+
+    call pause
+    del TestResult.xml
+    call runat release 5005 definitions/server/fix44noreset/*.def cfg/at_44_noreset.cfg
+    if ERRORLEVEL 1 set RESULT44_NORESET=1
+    echo "44 tests result: %RESULT44_NORESET%"
+    copy TestResult.xml AcceptanceTests_44_noreset.xml
+
     call pause
     del TestResult.xml
     call runat release 5006 definitions/server/fix50/*.def cfg/at_50.cfg
@@ -86,12 +94,14 @@ echo "    41: %RESULT41%"
 echo "    42: %RESULT42%"
 echo "    43: %RESULT43%"
 echo "    44: %RESULT44%"
+echo "  44nr: %RESULT44_NORESET%"
 echo "    50: %RESULT50%"
 echo "50 SP1: %RESULT50SP1%"
 echo "50 SP2: %RESULT50SP2%"
 echo "  MISC: %RESULTMISC%"
 
-set /a RETURNVALUE=RESULT40+RESULT41+RESULT42+RESULT43+RESULT44+RESULT50+RESULT50SP1+RESULT50SP2+RESULTMISC
+set /a RETURNVALUE=RESULT40+RESULT41+RESULT42+RESULT43+RESULT44+RESULT44_NORESET+RESULT50+RESULT50SP1+RESULT50SP2+RESULTMISC
 
 echo "Script returns: %RETURNVALUE%"
+echo "(0 means success)"
 exit /B %RETURNVALUE%