Skip to content

Commit

Permalink
fix tests
Browse files Browse the repository at this point in the history
  • Loading branch information
Danilo Luvizotto committed Apr 23, 2018
1 parent 228cee8 commit 60db93b
Show file tree
Hide file tree
Showing 2 changed files with 32 additions and 20 deletions.
36 changes: 22 additions & 14 deletions service/handler_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -163,13 +163,14 @@ func TestHandlerServiceProcessMessage(t *testing.T) {
mockSerializer := serializemocks.NewMockSerializer(ctrl)
mockConn := connmock.NewMockConn(ctrl)
sv := &cluster.Server{}
svc := NewHandlerService(nil, nil, nil, nil, 1*time.Second, 1, 1, 1, sv, &RemoteService{})
svc := NewHandlerService(nil, nil, nil, nil, 1*time.Second, 1, 1, 1, sv, &RemoteService{}, nil)

if table.err != nil {
mockSerializer.EXPECT().Marshal(table.err).Return([]byte("err"), nil)
}

ag := agent.NewAgent(mockConn, nil, packetEncoder, mockSerializer, 1*time.Second, 1, nil)
messageEncoder := message.NewEncoder(false)
ag := agent.NewAgent(mockConn, nil, packetEncoder, mockSerializer, 1*time.Second, 1, nil, messageEncoder)
svc.processMessage(ag, table.msg)

if table.err == nil {
Expand Down Expand Up @@ -210,12 +211,13 @@ func TestHandlerServiceLocalProcess(t *testing.T) {
mockSerializer := serializemocks.NewMockSerializer(ctrl)
mockConn := connmock.NewMockConn(ctrl)
packetEncoder := codec.NewPomeloPacketEncoder()
svc := NewHandlerService(nil, nil, nil, nil, 1*time.Second, 1, 1, 1, nil, nil)
messageEncoder := message.NewEncoder(false)
svc := NewHandlerService(nil, nil, nil, nil, 1*time.Second, 1, 1, 1, nil, nil, nil)

if table.err != nil {
mockSerializer.EXPECT().Marshal(table.err)
}
ag := agent.NewAgent(mockConn, nil, packetEncoder, mockSerializer, 1*time.Second, 1, nil)
ag := agent.NewAgent(mockConn, nil, packetEncoder, mockSerializer, 1*time.Second, 1, nil, messageEncoder)
svc.localProcess(ag, table.rt, table.msg)
})
}
Expand All @@ -228,13 +230,14 @@ func TestHandlerServiceProcessPacketHandshake(t *testing.T) {
mockSerializer := serializemocks.NewMockSerializer(ctrl)
mockConn := connmock.NewMockConn(ctrl)
packetEncoder := codec.NewPomeloPacketEncoder()
svc := NewHandlerService(nil, nil, nil, nil, 1*time.Second, 1, 1, 1, nil, nil)
messageEncoder := message.NewEncoder(false)
svc := NewHandlerService(nil, nil, nil, nil, 1*time.Second, 1, 1, 1, nil, nil, nil)

mockConn.EXPECT().RemoteAddr().Return(&mockAddr{})
mockConn.EXPECT().Write(gomock.Any()).Do(func(d []byte) {
assert.Contains(t, string(d), "heartbeat")
})
ag := agent.NewAgent(mockConn, nil, packetEncoder, mockSerializer, 1*time.Second, 1, nil)
ag := agent.NewAgent(mockConn, nil, packetEncoder, mockSerializer, 1*time.Second, 1, nil, messageEncoder)
err := svc.processPacket(ag, &packet.Packet{Type: packet.Handshake})
assert.NoError(t, err)
assert.Equal(t, constants.StatusHandshake, ag.GetStatus())
Expand All @@ -246,10 +249,11 @@ func TestHandlerServiceProcessPacketHandshakeAck(t *testing.T) {

mockConn := connmock.NewMockConn(ctrl)
packetEncoder := codec.NewPomeloPacketEncoder()
svc := NewHandlerService(nil, nil, nil, nil, 1*time.Second, 1, 1, 1, nil, nil)
messageEncoder := message.NewEncoder(false)
svc := NewHandlerService(nil, nil, nil, nil, 1*time.Second, 1, 1, 1, nil, nil, nil)

mockConn.EXPECT().RemoteAddr().Return(&mockAddr{})
ag := agent.NewAgent(mockConn, nil, packetEncoder, nil, 1*time.Second, 1, nil)
ag := agent.NewAgent(mockConn, nil, packetEncoder, nil, 1*time.Second, 1, nil, messageEncoder)
err := svc.processPacket(ag, &packet.Packet{Type: packet.HandshakeAck})
assert.NoError(t, err)
assert.Equal(t, constants.StatusWorking, ag.GetStatus())
Expand All @@ -261,10 +265,11 @@ func TestHandlerServiceProcessPacketHeartbeat(t *testing.T) {

mockConn := connmock.NewMockConn(ctrl)
packetEncoder := codec.NewPomeloPacketEncoder()
svc := NewHandlerService(nil, nil, nil, nil, 1*time.Second, 1, 1, 1, nil, nil)
messageEncoder := message.NewEncoder(false)
svc := NewHandlerService(nil, nil, nil, nil, 1*time.Second, 1, 1, 1, nil, nil, nil)

mockConn.EXPECT().RemoteAddr().Return(&mockAddr{})
ag := agent.NewAgent(mockConn, nil, packetEncoder, nil, 1*time.Second, 1, nil)
ag := agent.NewAgent(mockConn, nil, packetEncoder, nil, 1*time.Second, 1, nil, messageEncoder)
// wait to check if lastTime is updated. SORRY!
time.Sleep(1 * time.Second)
err := svc.processPacket(ag, &packet.Packet{Type: packet.Heartbeat})
Expand All @@ -274,7 +279,8 @@ func TestHandlerServiceProcessPacketHeartbeat(t *testing.T) {

func TestHandlerServiceProcessPacketData(t *testing.T) {
msg := &message.Message{Type: message.Request, ID: 1, Data: []byte("ok")}
encodedMsg, err := msg.Encode()
messageEncoder := message.NewEncoder(false)
encodedMsg, err := messageEncoder.Encode(msg)
assert.NoError(t, err)
tables := []struct {
name string
Expand All @@ -294,11 +300,12 @@ func TestHandlerServiceProcessPacketData(t *testing.T) {
mockSerializer := serializemocks.NewMockSerializer(ctrl)
mockConn := connmock.NewMockConn(ctrl)
packetEncoder := codec.NewPomeloPacketEncoder()
svc := NewHandlerService(nil, nil, nil, nil, 1*time.Second, 1, 1, 1, nil, nil)
messageEncoder := message.NewEncoder(false)
svc := NewHandlerService(nil, nil, nil, nil, 1*time.Second, 1, 1, 1, nil, nil, nil)
if table.socketStatus < constants.StatusWorking {
mockConn.EXPECT().RemoteAddr().Return(&mockAddr{})
}
ag := agent.NewAgent(mockConn, nil, packetEncoder, mockSerializer, 1*time.Second, 1, nil)
ag := agent.NewAgent(mockConn, nil, packetEncoder, mockSerializer, 1*time.Second, 1, nil, messageEncoder)
ag.SetStatus(table.socketStatus)

if table.errStr == "" {
Expand All @@ -320,7 +327,8 @@ func TestHandlerServiceHandle(t *testing.T) {
mockConn := connmock.NewMockConn(ctrl)
packetEncoder := codec.NewPomeloPacketEncoder()
packetDecoder := codec.NewPomeloPacketDecoder()
svc := NewHandlerService(nil, packetDecoder, packetEncoder, mockSerializer, 1*time.Second, 1, 1, 1, nil, nil)
messageEncoder := message.NewEncoder(false)
svc := NewHandlerService(nil, packetDecoder, packetEncoder, mockSerializer, 1*time.Second, 1, 1, 1, nil, nil, messageEncoder)
var wg sync.WaitGroup
firstCall := mockConn.EXPECT().Read(gomock.Any()).Do(func(b []byte) {
handshakeBuffer := `{
Expand Down
16 changes: 10 additions & 6 deletions service/remote_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -195,7 +195,7 @@ func TestRemoteServiceRemoteCall(t *testing.T) {
defer ctrl.Finish()
mockRPCClient := clustermocks.NewMockRPCClient(ctrl)
router := router.New()
svc := NewRemoteService(mockRPCClient, nil, nil, nil, nil, router)
svc := NewRemoteService(mockRPCClient, nil, nil, nil, nil, router, nil)
assert.NotNil(t, svc)

msg := &message.Message{}
Expand Down Expand Up @@ -257,8 +257,9 @@ func TestRemoteServiceHandleRPCUser(t *testing.T) {
mockSD := clustermocks.NewMockServiceDiscovery(ctrl)
mockRPCClient := clustermocks.NewMockRPCClient(ctrl)
mockRPCServer := clustermocks.NewMockRPCServer(ctrl)
messageEncoder := message.NewEncoder(false)
router := router.New()
svc := NewRemoteService(mockRPCClient, mockRPCServer, mockSD, packetEncoder, mockSerializer, router)
svc := NewRemoteService(mockRPCClient, mockRPCServer, mockSD, packetEncoder, mockSerializer, router, messageEncoder)
assert.NotNil(t, svc)

mockRPCClient.EXPECT().Send(table.req.Msg.Reply, gomock.Any()).Do(func(r string, data []byte) {
Expand Down Expand Up @@ -308,8 +309,9 @@ func TestRemoteServiceHandleRPCSys(t *testing.T) {
mockSD := clustermocks.NewMockServiceDiscovery(ctrl)
mockRPCClient := clustermocks.NewMockRPCClient(ctrl)
mockRPCServer := clustermocks.NewMockRPCServer(ctrl)
messageEncoder := message.NewEncoder(false)
router := router.New()
svc := NewRemoteService(mockRPCClient, mockRPCServer, mockSD, packetEncoder, mockSerializer, router)
svc := NewRemoteService(mockRPCClient, mockRPCServer, mockSD, packetEncoder, mockSerializer, router, messageEncoder)
assert.NotNil(t, svc)

if table.errSubstring == "" {
Expand Down Expand Up @@ -356,8 +358,9 @@ func TestRemoteServiceRemoteProcess(t *testing.T) {
mockSD := clustermocks.NewMockServiceDiscovery(ctrl)
mockRPCClient := clustermocks.NewMockRPCClient(ctrl)
mockRPCServer := clustermocks.NewMockRPCServer(ctrl)
messageEncoder := message.NewEncoder(false)
router := router.New()
svc := NewRemoteService(mockRPCClient, mockRPCServer, mockSD, packetEncoder, mockSerializer, router)
svc := NewRemoteService(mockRPCClient, mockRPCServer, mockSD, packetEncoder, mockSerializer, router, messageEncoder)
assert.NotNil(t, svc)

expectedMsg := &message.Message{
Expand All @@ -374,7 +377,7 @@ func TestRemoteServiceRemoteProcess(t *testing.T) {

encoder := codec.NewPomeloPacketEncoder()
mockConn := connmock.NewMockConn(ctrl)
ag := agent.NewAgent(mockConn, nil, encoder, mockSerializer, 1*time.Second, 1, nil)
ag := agent.NewAgent(mockConn, nil, encoder, mockSerializer, 1*time.Second, 1, nil, messageEncoder)

if table.responseMIDErr {
ag.SetStatus(constants.StatusClosed)
Expand Down Expand Up @@ -411,8 +414,9 @@ func TestRemoteServiceRPC(t *testing.T) {
mockSD := clustermocks.NewMockServiceDiscovery(ctrl)
mockRPCClient := clustermocks.NewMockRPCClient(ctrl)
mockRPCServer := clustermocks.NewMockRPCServer(ctrl)
messageEncoder := message.NewEncoder(false)
router := router.New()
svc := NewRemoteService(mockRPCClient, mockRPCServer, mockSD, packetEncoder, mockSerializer, router)
svc := NewRemoteService(mockRPCClient, mockRPCServer, mockSD, packetEncoder, mockSerializer, router, messageEncoder)
assert.NotNil(t, svc)

if table.serverID != "" {
Expand Down

0 comments on commit 60db93b

Please sign in to comment.