Skip to content

Commit 003cb61

Browse files
author
Chris Busbey
committed
moving and renaming test jigs
1 parent 9cab86a commit 003cb61

10 files changed

+402
-436
lines changed

‎in_session_test.go

+26-26
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ import (
99
)
1010

1111
type InSessionTestSuite struct {
12-
SessionSuite
12+
SessionSuiteRig
1313
}
1414

1515
func TestInSessionTestSuite(t *testing.T) {
@@ -34,84 +34,84 @@ func (s *InSessionTestSuite) TestIsSessionTime() {
3434
}
3535

3636
func (s *InSessionTestSuite) TestLogout() {
37-
s.mockApp.On("FromAdmin").Return(nil)
38-
s.mockApp.On("ToAdmin")
39-
s.mockApp.On("OnLogout")
37+
s.MockApp.On("FromAdmin").Return(nil)
38+
s.MockApp.On("ToAdmin")
39+
s.MockApp.On("OnLogout")
4040
s.session.FixMsgIn(s.session, s.Logout())
4141

42-
s.mockApp.AssertExpectations(s.T())
42+
s.MockApp.AssertExpectations(s.T())
4343
s.State(latentState{})
4444

4545
s.LastToAdminMessageSent()
46-
s.MessageType(enum.MsgType_LOGOUT, s.mockApp.lastToAdmin)
46+
s.MessageType(enum.MsgType_LOGOUT, s.MockApp.lastToAdmin)
4747
s.NextTargetMsgSeqNum(2)
4848
s.NextSenderMsgSeqNum(2)
4949
}
5050

5151
func (s *InSessionTestSuite) TestLogoutResetOnLogout() {
5252
s.session.resetOnLogout = true
5353

54-
s.mockApp.On("ToApp").Return(nil)
54+
s.MockApp.On("ToApp").Return(nil)
5555
s.Nil(s.queueForSend(s.NewOrderSingle()))
56-
s.mockApp.AssertExpectations(s.T())
56+
s.MockApp.AssertExpectations(s.T())
5757

58-
s.mockApp.On("FromAdmin").Return(nil)
59-
s.mockApp.On("ToAdmin")
60-
s.mockApp.On("OnLogout")
58+
s.MockApp.On("FromAdmin").Return(nil)
59+
s.MockApp.On("ToAdmin")
60+
s.MockApp.On("OnLogout")
6161
s.session.FixMsgIn(s.session, s.Logout())
6262

63-
s.mockApp.AssertExpectations(s.T())
63+
s.MockApp.AssertExpectations(s.T())
6464
s.State(latentState{})
6565
s.LastToAppMessageSent()
6666
s.LastToAdminMessageSent()
67-
s.MessageType(enum.MsgType_LOGOUT, s.mockApp.lastToAdmin)
67+
s.MessageType(enum.MsgType_LOGOUT, s.MockApp.lastToAdmin)
6868

6969
s.NextTargetMsgSeqNum(1)
7070
s.NextSenderMsgSeqNum(1)
7171
s.NoMessageQueued()
7272
}
7373

7474
func (s *InSessionTestSuite) TestTimeoutNeedHeartbeat() {
75-
s.mockApp.On("ToAdmin").Return(nil)
75+
s.MockApp.On("ToAdmin").Return(nil)
7676
s.session.Timeout(s.session, internal.NeedHeartbeat)
7777

78-
s.mockApp.AssertExpectations(s.T())
78+
s.MockApp.AssertExpectations(s.T())
7979
s.State(inSession{})
8080
s.LastToAdminMessageSent()
81-
s.MessageType(enum.MsgType_HEARTBEAT, s.mockApp.lastToAdmin)
81+
s.MessageType(enum.MsgType_HEARTBEAT, s.MockApp.lastToAdmin)
8282
s.NextSenderMsgSeqNum(2)
8383
}
8484

8585
func (s *InSessionTestSuite) TestTimeoutPeerTimeout() {
86-
s.mockApp.On("ToAdmin").Return(nil)
86+
s.MockApp.On("ToAdmin").Return(nil)
8787
s.session.Timeout(s.session, internal.PeerTimeout)
8888

89-
s.mockApp.AssertExpectations(s.T())
89+
s.MockApp.AssertExpectations(s.T())
9090
s.State(pendingTimeout{inSession{}})
9191
s.LastToAdminMessageSent()
92-
s.MessageType(enum.MsgType_TEST_REQUEST, s.mockApp.lastToAdmin)
92+
s.MessageType(enum.MsgType_TEST_REQUEST, s.MockApp.lastToAdmin)
9393
s.NextSenderMsgSeqNum(2)
9494
}
9595

9696
func (s *InSessionTestSuite) TestDisconnected() {
97-
s.mockApp.On("OnLogout").Return(nil)
97+
s.MockApp.On("OnLogout").Return(nil)
9898
s.session.Disconnected(s.session)
99-
s.mockApp.AssertExpectations(s.T())
99+
s.MockApp.AssertExpectations(s.T())
100100
s.State(latentState{})
101101
}
102102

103103
func (s *InSessionTestSuite) TestStop() {
104-
s.mockApp.On("ToAdmin")
104+
s.MockApp.On("ToAdmin")
105105
s.session.Stop(s.session)
106106

107-
s.mockApp.AssertExpectations(s.T())
107+
s.MockApp.AssertExpectations(s.T())
108108
s.State(logoutState{})
109109
s.LastToAdminMessageSent()
110-
s.MessageType(enum.MsgType_LOGOUT, s.mockApp.lastToAdmin)
110+
s.MessageType(enum.MsgType_LOGOUT, s.MockApp.lastToAdmin)
111111

112-
s.mockApp.On("OnLogout")
112+
s.MockApp.On("OnLogout")
113113
s.session.Timeout(s.session, <-s.sessionEvent)
114-
s.mockApp.AssertExpectations(s.T())
114+
s.MockApp.AssertExpectations(s.T())
115115
s.Stopped()
116116
s.Disconnected()
117117
}

‎latent_state_test.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ import (
77
)
88

99
type LatentStateTestSuite struct {
10-
SessionSuite
10+
SessionSuiteRig
1111
}
1212

1313
func TestLatentStateTestSuite(t *testing.T) {

‎logon_state_test.go

+17-17
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ import (
1010
)
1111

1212
type LogonStateTestSuite struct {
13-
SessionSuite
13+
SessionSuiteRig
1414
}
1515

1616
func TestLogonStateTestSuite(t *testing.T) {
@@ -36,10 +36,10 @@ func (s *LogonStateTestSuite) TestTimeoutLogonTimeout() {
3636
func (s *LogonStateTestSuite) TestTimeoutLogonTimeoutInitiatedLogon() {
3737
s.session.initiateLogon = true
3838

39-
s.mockApp.On("OnLogout")
39+
s.MockApp.On("OnLogout")
4040
s.Timeout(s.session, internal.LogonTimeout)
4141

42-
s.mockApp.AssertExpectations(s.T())
42+
s.MockApp.AssertExpectations(s.T())
4343
s.State(latentState{})
4444
}
4545

@@ -60,32 +60,32 @@ func (s *LogonStateTestSuite) TestDisconnected() {
6060
func (s *LogonStateTestSuite) TestFixMsgInNotLogon() {
6161
s.FixMsgIn(s.session, s.NewOrderSingle())
6262

63-
s.mockApp.AssertExpectations(s.T())
63+
s.MockApp.AssertExpectations(s.T())
6464
s.State(latentState{})
6565
s.NextTargetMsgSeqNum(1)
6666
}
6767

6868
func (s *LogonStateTestSuite) TestFixMsgInLogon() {
6969
s.store.IncrNextSenderMsgSeqNum()
70-
s.messageFactory.seqNum = 1
70+
s.MessageFactory.seqNum = 1
7171
s.store.IncrNextTargetMsgSeqNum()
7272

7373
logon := s.Logon()
7474
logon.Body.SetField(tagHeartBtInt, FIXInt(32))
7575

76-
s.mockApp.On("FromAdmin").Return(nil)
77-
s.mockApp.On("OnLogon")
78-
s.mockApp.On("ToAdmin")
76+
s.MockApp.On("FromAdmin").Return(nil)
77+
s.MockApp.On("OnLogon")
78+
s.MockApp.On("ToAdmin")
7979
s.FixMsgIn(s.session, logon)
8080

81-
s.mockApp.AssertExpectations(s.T())
81+
s.MockApp.AssertExpectations(s.T())
8282

8383
s.State(inSession{})
8484
s.Equal(32*time.Second, s.session.heartBtInt)
8585

8686
s.LastToAdminMessageSent()
87-
s.MessageType(enum.MsgType_LOGON, s.mockApp.lastToAdmin)
88-
s.FieldEquals(tagHeartBtInt, 32, s.mockApp.lastToAdmin.Body)
87+
s.MessageType(enum.MsgType_LOGON, s.MockApp.lastToAdmin)
88+
s.FieldEquals(tagHeartBtInt, 32, s.MockApp.lastToAdmin.Body)
8989

9090
s.NextTargetMsgSeqNum(3)
9191
s.NextSenderMsgSeqNum(3)
@@ -94,17 +94,17 @@ func (s *LogonStateTestSuite) TestFixMsgInLogon() {
9494
func (s *LogonStateTestSuite) TestFixMsgInLogonInitiateLogon() {
9595
s.session.initiateLogon = true
9696
s.store.IncrNextSenderMsgSeqNum()
97-
s.messageFactory.seqNum = 1
97+
s.MessageFactory.seqNum = 1
9898
s.store.IncrNextTargetMsgSeqNum()
9999

100100
logon := s.Logon()
101101
logon.Body.SetField(tagHeartBtInt, FIXInt(32))
102102

103-
s.mockApp.On("FromAdmin").Return(nil)
104-
s.mockApp.On("OnLogon")
103+
s.MockApp.On("FromAdmin").Return(nil)
104+
s.MockApp.On("OnLogon")
105105
s.FixMsgIn(s.session, logon)
106106

107-
s.mockApp.AssertExpectations(s.T())
107+
s.MockApp.AssertExpectations(s.T())
108108
s.State(inSession{})
109109

110110
s.NextTargetMsgSeqNum(3)
@@ -119,11 +119,11 @@ func (s *LogonStateTestSuite) TestStop() {
119119
s.session.initiateLogon = doInitiateLogon
120120

121121
if doInitiateLogon {
122-
s.mockApp.On("OnLogout")
122+
s.MockApp.On("OnLogout")
123123
}
124124

125125
s.session.Stop(s.session)
126-
s.mockApp.AssertExpectations(s.T())
126+
s.MockApp.AssertExpectations(s.T())
127127
s.Disconnected()
128128
s.Stopped()
129129
}

‎logout_state_test.go

+18-18
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ import (
88
)
99

1010
type LogoutStateTestSuite struct {
11-
SessionSuite
11+
SessionSuiteRig
1212
}
1313

1414
func TestLogoutStateTestSuite(t *testing.T) {
@@ -27,10 +27,10 @@ func (s *LogoutStateTestSuite) TestPreliminary() {
2727
}
2828

2929
func (s *LogoutStateTestSuite) TestTimeoutLogoutTimeout() {
30-
s.mockApp.On("OnLogout").Return(nil)
30+
s.MockApp.On("OnLogout").Return(nil)
3131
s.Timeout(s.session, internal.LogoutTimeout)
3232

33-
s.mockApp.AssertExpectations(s.T())
33+
s.MockApp.AssertExpectations(s.T())
3434
s.State(latentState{})
3535
}
3636

@@ -44,28 +44,28 @@ func (s *LogoutStateTestSuite) TestTimeoutNotLogoutTimeout() {
4444
}
4545

4646
func (s *LogoutStateTestSuite) TestDisconnected() {
47-
s.mockApp.On("OnLogout").Return(nil)
47+
s.MockApp.On("OnLogout").Return(nil)
4848
s.session.Disconnected(s.session)
4949

50-
s.mockApp.AssertExpectations(s.T())
50+
s.MockApp.AssertExpectations(s.T())
5151
s.State(latentState{})
5252
}
5353

5454
func (s *LogoutStateTestSuite) TestFixMsgInNotLogout() {
55-
s.mockApp.On("FromApp").Return(nil)
55+
s.MockApp.On("FromApp").Return(nil)
5656
s.FixMsgIn(s.session, s.NewOrderSingle())
5757

58-
s.mockApp.AssertExpectations(s.T())
58+
s.MockApp.AssertExpectations(s.T())
5959
s.State(logoutState{})
6060
s.NextTargetMsgSeqNum(2)
6161
}
6262

6363
func (s *LogoutStateTestSuite) TestFixMsgInNotLogoutReject() {
64-
s.mockApp.On("FromApp").Return(ConditionallyRequiredFieldMissing(Tag(11)))
65-
s.mockApp.On("ToApp").Return(nil)
64+
s.MockApp.On("FromApp").Return(ConditionallyRequiredFieldMissing(Tag(11)))
65+
s.MockApp.On("ToApp").Return(nil)
6666
s.FixMsgIn(s.session, s.NewOrderSingle())
6767

68-
s.mockApp.AssertExpectations(s.T())
68+
s.MockApp.AssertExpectations(s.T())
6969
s.State(logoutState{})
7070
s.NextTargetMsgSeqNum(2)
7171
s.NextSenderMsgSeqNum(2)
@@ -74,11 +74,11 @@ func (s *LogoutStateTestSuite) TestFixMsgInNotLogoutReject() {
7474
}
7575

7676
func (s *LogoutStateTestSuite) TestFixMsgInLogout() {
77-
s.mockApp.On("FromAdmin").Return(nil)
78-
s.mockApp.On("OnLogout").Return(nil)
77+
s.MockApp.On("FromAdmin").Return(nil)
78+
s.MockApp.On("OnLogout").Return(nil)
7979
s.FixMsgIn(s.session, s.Logout())
8080

81-
s.mockApp.AssertExpectations(s.T())
81+
s.MockApp.AssertExpectations(s.T())
8282
s.State(latentState{})
8383
s.NextTargetMsgSeqNum(2)
8484
s.NextSenderMsgSeqNum(1)
@@ -88,15 +88,15 @@ func (s *LogoutStateTestSuite) TestFixMsgInLogout() {
8888
func (s *LogoutStateTestSuite) TestFixMsgInLogoutResetOnLogout() {
8989
s.session.resetOnLogout = true
9090

91-
s.mockApp.On("ToApp").Return(nil)
91+
s.MockApp.On("ToApp").Return(nil)
9292
s.Nil(s.queueForSend(s.NewOrderSingle()))
93-
s.mockApp.AssertExpectations(s.T())
93+
s.MockApp.AssertExpectations(s.T())
9494

95-
s.mockApp.On("FromAdmin").Return(nil)
96-
s.mockApp.On("OnLogout").Return(nil)
95+
s.MockApp.On("FromAdmin").Return(nil)
96+
s.MockApp.On("OnLogout").Return(nil)
9797
s.FixMsgIn(s.session, s.Logout())
9898

99-
s.mockApp.AssertExpectations(s.T())
99+
s.MockApp.AssertExpectations(s.T())
100100
s.State(latentState{})
101101
s.NextTargetMsgSeqNum(1)
102102
s.NextSenderMsgSeqNum(1)

‎not_session_time_test.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ import (
77
)
88

99
type NotSessionTimeTestSuite struct {
10-
SessionSuite
10+
SessionSuiteRig
1111
}
1212

1313
func TestNotSessionTime(t *testing.T) {

‎pending_timeout_test.go

+5-5
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ import (
88
)
99

1010
type PendingTimeoutTestSuite struct {
11-
SessionSuite
11+
SessionSuiteRig
1212
}
1313

1414
func TestPendingTimeoutTestSuite(t *testing.T) {
@@ -42,10 +42,10 @@ func (s *PendingTimeoutTestSuite) TestSessionTimeout() {
4242
for _, state := range tests {
4343
s.session.State = state
4444

45-
s.mockApp.On("OnLogout").Return(nil)
45+
s.MockApp.On("OnLogout").Return(nil)
4646
s.session.Timeout(s.session, internal.PeerTimeout)
4747

48-
s.mockApp.AssertExpectations(s.T())
48+
s.MockApp.AssertExpectations(s.T())
4949
s.State(latentState{})
5050
}
5151
}
@@ -78,10 +78,10 @@ func (s *PendingTimeoutTestSuite) TestDisconnected() {
7878
s.SetupTest()
7979
s.session.State = state
8080

81-
s.mockApp.On("OnLogout").Return(nil)
81+
s.MockApp.On("OnLogout").Return(nil)
8282
s.session.Disconnected(s.session)
8383

84-
s.mockApp.AssertExpectations(s.T())
84+
s.MockApp.AssertExpectations(s.T())
8585
s.State(latentState{})
8686
}
8787
}

0 commit comments

Comments
 (0)