From 8b6a6622231278062b79248697e849e12979aa95 Mon Sep 17 00:00:00 2001 From: Lucas Clemente Date: Fri, 9 Jun 2017 12:08:26 +0200 Subject: [PATCH] Move flow control mocks to a separate package This allows the other mocks to be used in the FC tests. --- internal/mocks/gen.go | 2 +- internal/mocks/{ => mocks_fc}/flow_control_manager.go | 2 +- session_test.go | 10 +++++----- stream_framer_test.go | 6 +++--- stream_test.go | 6 +++--- 5 files changed, 13 insertions(+), 13 deletions(-) rename internal/mocks/{ => mocks_fc}/flow_control_manager.go (99%) diff --git a/internal/mocks/gen.go b/internal/mocks/gen.go index b0f34d9b3..e77844769 100644 --- a/internal/mocks/gen.go +++ b/internal/mocks/gen.go @@ -1,4 +1,4 @@ package mocks -//go:generate mockgen -destination flow_control_manager.go -package mocks github.com/lucas-clemente/quic-go/flowcontrol FlowControlManager +//go:generate mockgen -destination mocks_fc/flow_control_manager.go -package mocks_fc github.com/lucas-clemente/quic-go/flowcontrol FlowControlManager //go:generate mockgen -destination cpm.go -package mocks github.com/lucas-clemente/quic-go/handshake ConnectionParametersManager diff --git a/internal/mocks/flow_control_manager.go b/internal/mocks/mocks_fc/flow_control_manager.go similarity index 99% rename from internal/mocks/flow_control_manager.go rename to internal/mocks/mocks_fc/flow_control_manager.go index c9f9915f9..d18bf48fc 100644 --- a/internal/mocks/flow_control_manager.go +++ b/internal/mocks/mocks_fc/flow_control_manager.go @@ -1,7 +1,7 @@ // Automatically generated by MockGen. DO NOT EDIT! // Source: github.com/lucas-clemente/quic-go/flowcontrol (interfaces: FlowControlManager) -package mocks +package mocks_fc import ( gomock "github.com/golang/mock/gomock" diff --git a/session_test.go b/session_test.go index 8937b6ef9..9fd163697 100644 --- a/session_test.go +++ b/session_test.go @@ -17,7 +17,7 @@ import ( "github.com/lucas-clemente/quic-go/crypto" "github.com/lucas-clemente/quic-go/frames" "github.com/lucas-clemente/quic-go/handshake" - "github.com/lucas-clemente/quic-go/internal/mocks" + "github.com/lucas-clemente/quic-go/internal/mocks/mocks_fc" "github.com/lucas-clemente/quic-go/protocol" "github.com/lucas-clemente/quic-go/qerr" "github.com/lucas-clemente/quic-go/testdata" @@ -475,7 +475,7 @@ var _ = Describe("Session", func() { It("passes the byte offset to the flow controller", func() { sess.streamsMap.GetOrOpenStream(5) - fcm := mocks.NewMockFlowControlManager(mockCtrl) + fcm := mocks_fc.NewMockFlowControlManager(mockCtrl) sess.flowControlManager = fcm fcm.EXPECT().ResetStream(protocol.StreamID(5), protocol.ByteCount(0x1337)) err := sess.handleRstStreamFrame(&frames.RstStreamFrame{ @@ -488,7 +488,7 @@ var _ = Describe("Session", func() { It("returns errors from the flow controller", func() { testErr := errors.New("flow control violation") sess.streamsMap.GetOrOpenStream(5) - fcm := mocks.NewMockFlowControlManager(mockCtrl) + fcm := mocks_fc.NewMockFlowControlManager(mockCtrl) sess.flowControlManager = fcm fcm.EXPECT().ResetStream(protocol.StreamID(5), protocol.ByteCount(0x1337)).Return(testErr) err := sess.handleRstStreamFrame(&frames.RstStreamFrame{ @@ -1064,7 +1064,7 @@ var _ = Describe("Session", func() { It("retransmits a WindowUpdates if it hasn't already sent a WindowUpdate with a higher ByteOffset", func() { _, err := sess.GetOrOpenStream(5) Expect(err).ToNot(HaveOccurred()) - fcm := mocks.NewMockFlowControlManager(mockCtrl) + fcm := mocks_fc.NewMockFlowControlManager(mockCtrl) sess.flowControlManager = fcm fcm.EXPECT().GetWindowUpdates() fcm.EXPECT().GetReceiveWindow(protocol.StreamID(5)).Return(protocol.ByteCount(0x1000), nil) @@ -1086,7 +1086,7 @@ var _ = Describe("Session", func() { It("doesn't retransmit WindowUpdates if it already sent a WindowUpdate with a higher ByteOffset", func() { _, err := sess.GetOrOpenStream(5) Expect(err).ToNot(HaveOccurred()) - fcm := mocks.NewMockFlowControlManager(mockCtrl) + fcm := mocks_fc.NewMockFlowControlManager(mockCtrl) sess.flowControlManager = fcm fcm.EXPECT().GetWindowUpdates() fcm.EXPECT().GetReceiveWindow(protocol.StreamID(5)).Return(protocol.ByteCount(0x2000), nil) diff --git a/stream_framer_test.go b/stream_framer_test.go index 12b751274..cf7d7b324 100644 --- a/stream_framer_test.go +++ b/stream_framer_test.go @@ -4,7 +4,7 @@ import ( "bytes" "github.com/lucas-clemente/quic-go/frames" - "github.com/lucas-clemente/quic-go/internal/mocks" + "github.com/lucas-clemente/quic-go/internal/mocks/mocks_fc" "github.com/lucas-clemente/quic-go/protocol" . "github.com/onsi/ginkgo" . "github.com/onsi/gomega" @@ -21,7 +21,7 @@ var _ = Describe("Stream Framer", func() { framer *streamFramer streamsMap *streamsMap stream1, stream2 *stream - mockFcm *mocks.MockFlowControlManager + mockFcm *mocks_fc.MockFlowControlManager ) BeforeEach(func() { @@ -41,7 +41,7 @@ var _ = Describe("Stream Framer", func() { streamsMap.putStream(stream1) streamsMap.putStream(stream2) - mockFcm = mocks.NewMockFlowControlManager(mockCtrl) + mockFcm = mocks_fc.NewMockFlowControlManager(mockCtrl) framer = newStreamFramer(streamsMap, mockFcm) }) diff --git a/stream_test.go b/stream_test.go index 573952880..fd716432d 100644 --- a/stream_test.go +++ b/stream_test.go @@ -6,7 +6,7 @@ import ( "time" "github.com/lucas-clemente/quic-go/frames" - "github.com/lucas-clemente/quic-go/internal/mocks" + "github.com/lucas-clemente/quic-go/internal/mocks/mocks_fc" "github.com/lucas-clemente/quic-go/protocol" . "github.com/onsi/ginkgo" @@ -24,7 +24,7 @@ var _ = Describe("Stream", func() { resetCalledForStream protocol.StreamID resetCalledAtOffset protocol.ByteCount - mockFcm *mocks.MockFlowControlManager + mockFcm *mocks_fc.MockFlowControlManager ) onData := func() { @@ -40,7 +40,7 @@ var _ = Describe("Stream", func() { BeforeEach(func() { onDataCalled = false resetCalled = false - mockFcm = mocks.NewMockFlowControlManager(mockCtrl) + mockFcm = mocks_fc.NewMockFlowControlManager(mockCtrl) str = newStream(streamID, onData, onReset, mockFcm) })