ackhandler: use a typed mock for the ECNHandler (#5311)

No functional change expected.

diff --git a/internal/ackhandler/mock_ecn_handler_test.go b/internal/ackhandler/mock_ecn_handler_test.go
index 850776fd7902d59ec87cfee0b74c2da9bb7fa969..0a8cc9bda7182cd14a77630ce9325d1f0b9aa142 100644 (file)
--- a/internal/ackhandler/mock_ecn_handler_test.go
+++ b/internal/ackhandler/mock_ecn_handler_test.go
@@ -3,7 +3,7 @@
 //
 // Generated by this command:
 //
-//     mockgen -build_flags=-tags=gomock -package ackhandler -destination mock_ecn_handler_test.go github.com/quic-go/quic-go/internal/ackhandler ECNHandler
+//     mockgen -typed -build_flags=-tags=gomock -package ackhandler -destination mock_ecn_handler_test.go github.com/quic-go/quic-go/internal/ackhandler ECNHandler
 //
 
 // Package ackhandler is a generated GoMock package.
@@ -49,9 +49,33 @@ func (m *MockECNHandler) HandleNewlyAcked(packets []*packet, ect0, ect1, ecnce i
 }
 
 // HandleNewlyAcked indicates an expected call of HandleNewlyAcked.
-func (mr *MockECNHandlerMockRecorder) HandleNewlyAcked(packets, ect0, ect1, ecnce any) *gomock.Call {
+func (mr *MockECNHandlerMockRecorder) HandleNewlyAcked(packets, ect0, ect1, ecnce any) *MockECNHandlerHandleNewlyAckedCall {
        mr.mock.ctrl.T.Helper()
-       return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "HandleNewlyAcked", reflect.TypeOf((*MockECNHandler)(nil).HandleNewlyAcked), packets, ect0, ect1, ecnce)
+       call := mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "HandleNewlyAcked", reflect.TypeOf((*MockECNHandler)(nil).HandleNewlyAcked), packets, ect0, ect1, ecnce)
+       return &MockECNHandlerHandleNewlyAckedCall{Call: call}
+}
+
+// MockECNHandlerHandleNewlyAckedCall wrap *gomock.Call
+type MockECNHandlerHandleNewlyAckedCall struct {
+       *gomock.Call
+}
+
+// Return rewrite *gomock.Call.Return
+func (c *MockECNHandlerHandleNewlyAckedCall) Return(congested bool) *MockECNHandlerHandleNewlyAckedCall {
+       c.Call = c.Call.Return(congested)
+       return c
+}
+
+// Do rewrite *gomock.Call.Do
+func (c *MockECNHandlerHandleNewlyAckedCall) Do(f func([]*packet, int64, int64, int64) bool) *MockECNHandlerHandleNewlyAckedCall {
+       c.Call = c.Call.Do(f)
+       return c
+}
+
+// DoAndReturn rewrite *gomock.Call.DoAndReturn
+func (c *MockECNHandlerHandleNewlyAckedCall) DoAndReturn(f func([]*packet, int64, int64, int64) bool) *MockECNHandlerHandleNewlyAckedCall {
+       c.Call = c.Call.DoAndReturn(f)
+       return c
 }
 
 // LostPacket mocks base method.
@@ -61,9 +85,33 @@ func (m *MockECNHandler) LostPacket(arg0 protocol.PacketNumber) {
 }
 
 // LostPacket indicates an expected call of LostPacket.
-func (mr *MockECNHandlerMockRecorder) LostPacket(arg0 any) *gomock.Call {
+func (mr *MockECNHandlerMockRecorder) LostPacket(arg0 any) *MockECNHandlerLostPacketCall {
        mr.mock.ctrl.T.Helper()
-       return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "LostPacket", reflect.TypeOf((*MockECNHandler)(nil).LostPacket), arg0)
+       call := mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "LostPacket", reflect.TypeOf((*MockECNHandler)(nil).LostPacket), arg0)
+       return &MockECNHandlerLostPacketCall{Call: call}
+}
+
+// MockECNHandlerLostPacketCall wrap *gomock.Call
+type MockECNHandlerLostPacketCall struct {
+       *gomock.Call
+}
+
+// Return rewrite *gomock.Call.Return
+func (c *MockECNHandlerLostPacketCall) Return() *MockECNHandlerLostPacketCall {
+       c.Call = c.Call.Return()
+       return c
+}
+
+// Do rewrite *gomock.Call.Do
+func (c *MockECNHandlerLostPacketCall) Do(f func(protocol.PacketNumber)) *MockECNHandlerLostPacketCall {
+       c.Call = c.Call.Do(f)
+       return c
+}
+
+// DoAndReturn rewrite *gomock.Call.DoAndReturn
+func (c *MockECNHandlerLostPacketCall) DoAndReturn(f func(protocol.PacketNumber)) *MockECNHandlerLostPacketCall {
+       c.Call = c.Call.DoAndReturn(f)
+       return c
 }
 
 // Mode mocks base method.
@@ -75,9 +123,33 @@ func (m *MockECNHandler) Mode() protocol.ECN {
 }
 
 // Mode indicates an expected call of Mode.
-func (mr *MockECNHandlerMockRecorder) Mode() *gomock.Call {
+func (mr *MockECNHandlerMockRecorder) Mode() *MockECNHandlerModeCall {
        mr.mock.ctrl.T.Helper()
-       return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Mode", reflect.TypeOf((*MockECNHandler)(nil).Mode))
+       call := mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Mode", reflect.TypeOf((*MockECNHandler)(nil).Mode))
+       return &MockECNHandlerModeCall{Call: call}
+}
+
+// MockECNHandlerModeCall wrap *gomock.Call
+type MockECNHandlerModeCall struct {
+       *gomock.Call
+}
+
+// Return rewrite *gomock.Call.Return
+func (c *MockECNHandlerModeCall) Return(arg0 protocol.ECN) *MockECNHandlerModeCall {
+       c.Call = c.Call.Return(arg0)
+       return c
+}
+
+// Do rewrite *gomock.Call.Do
+func (c *MockECNHandlerModeCall) Do(f func() protocol.ECN) *MockECNHandlerModeCall {
+       c.Call = c.Call.Do(f)
+       return c
+}
+
+// DoAndReturn rewrite *gomock.Call.DoAndReturn
+func (c *MockECNHandlerModeCall) DoAndReturn(f func() protocol.ECN) *MockECNHandlerModeCall {
+       c.Call = c.Call.DoAndReturn(f)
+       return c
 }
 
 // SentPacket mocks base method.
@@ -87,7 +159,31 @@ func (m *MockECNHandler) SentPacket(arg0 protocol.PacketNumber, arg1 protocol.EC
 }
 
 // SentPacket indicates an expected call of SentPacket.
-func (mr *MockECNHandlerMockRecorder) SentPacket(arg0, arg1 any) *gomock.Call {
+func (mr *MockECNHandlerMockRecorder) SentPacket(arg0, arg1 any) *MockECNHandlerSentPacketCall {
        mr.mock.ctrl.T.Helper()
-       return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "SentPacket", reflect.TypeOf((*MockECNHandler)(nil).SentPacket), arg0, arg1)
+       call := mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "SentPacket", reflect.TypeOf((*MockECNHandler)(nil).SentPacket), arg0, arg1)
+       return &MockECNHandlerSentPacketCall{Call: call}
+}
+
+// MockECNHandlerSentPacketCall wrap *gomock.Call
+type MockECNHandlerSentPacketCall struct {
+       *gomock.Call
+}
+
+// Return rewrite *gomock.Call.Return
+func (c *MockECNHandlerSentPacketCall) Return() *MockECNHandlerSentPacketCall {
+       c.Call = c.Call.Return()
+       return c
+}
+
+// Do rewrite *gomock.Call.Do
+func (c *MockECNHandlerSentPacketCall) Do(f func(protocol.PacketNumber, protocol.ECN)) *MockECNHandlerSentPacketCall {
+       c.Call = c.Call.Do(f)
+       return c
+}
+
+// DoAndReturn rewrite *gomock.Call.DoAndReturn
+func (c *MockECNHandlerSentPacketCall) DoAndReturn(f func(protocol.PacketNumber, protocol.ECN)) *MockECNHandlerSentPacketCall {
+       c.Call = c.Call.DoAndReturn(f)
+       return c
 }

diff --git a/internal/ackhandler/mockgen.go b/internal/ackhandler/mockgen.go
index 6e4adbe3750718e5bcf7a9f7993f1d74866c4fb4..323d9fde9f01edd4f4390d0547926958d47d80a7 100644 (file)
--- a/internal/ackhandler/mockgen.go
+++ b/internal/ackhandler/mockgen.go
@@ -5,5 +5,5 @@ package ackhandler
 //go:generate sh -c "go tool mockgen -typed -build_flags=\"-tags=gomock\"  -package ackhandler -destination mock_sent_packet_tracker_test.go github.com/quic-go/quic-go/internal/ackhandler SentPacketTracker"
 type SentPacketTracker = sentPacketTracker
 
-//go:generate sh -c "go tool mockgen -build_flags=\"-tags=gomock\"  -package ackhandler -destination mock_ecn_handler_test.go github.com/quic-go/quic-go/internal/ackhandler ECNHandler"
+//go:generate sh -c "go tool mockgen -typed -build_flags=\"-tags=gomock\"  -package ackhandler -destination mock_ecn_handler_test.go github.com/quic-go/quic-go/internal/ackhandler ECNHandler"
 type ECNHandler = ecnHandler