simplify mockgen usage for private interfaces

quic-go · Apr 12, 2023 · eebf3f1 · eebf3f1
1 parent af517bd
commit eebf3f1
Show file tree

Hide file tree

Showing 35 changed files with 325 additions and 310 deletions.
diff --git a/client_test.go b/client_test.go
@@ -128,7 +128,7 @@ var _ = Describe("Client", func() {
 				_ protocol.VersionNumber,
 			) quicConn {
 				remoteAddrChan <- sconn.RemoteAddr().String()
-				conn := NewMockQuicConn(mockCtrl)
+				conn := NewMockQUICConn(mockCtrl)
 				conn.EXPECT().run()
 				conn.EXPECT().HandshakeComplete().Return(make(chan struct{}))
 				return conn
@@ -161,7 +161,7 @@ var _ = Describe("Client", func() {
 				_ protocol.VersionNumber,
 			) quicConn {
 				hostnameChan <- tlsConf.ServerName
-				conn := NewMockQuicConn(mockCtrl)
+				conn := NewMockQUICConn(mockCtrl)
 				conn.EXPECT().run()
 				conn.EXPECT().HandshakeComplete().Return(make(chan struct{}))
 				return conn
@@ -194,7 +194,7 @@ var _ = Describe("Client", func() {
 				_ protocol.VersionNumber,
 			) quicConn {
 				hostnameChan <- tlsConf.ServerName
-				conn := NewMockQuicConn(mockCtrl)
+				conn := NewMockQUICConn(mockCtrl)
 				conn.EXPECT().HandshakeComplete().Return(make(chan struct{}))
 				conn.EXPECT().run()
 				return conn
@@ -233,7 +233,7 @@ var _ = Describe("Client", func() {
 				_ protocol.VersionNumber,
 			) quicConn {
 				Expect(enable0RTT).To(BeFalse())
-				conn := NewMockQuicConn(mockCtrl)
+				conn := NewMockQUICConn(mockCtrl)
 				conn.EXPECT().run().Do(func() { close(run) })
 				c := make(chan struct{})
 				close(c)
@@ -276,7 +276,7 @@ var _ = Describe("Client", func() {
 				_ protocol.VersionNumber,
 			) quicConn {
 				Expect(enable0RTT).To(BeTrue())
-				conn := NewMockQuicConn(mockCtrl)
+				conn := NewMockQUICConn(mockCtrl)
 				conn.EXPECT().run().Do(func() { <-done })
 				conn.EXPECT().HandshakeComplete().Return(make(chan struct{}))
 				conn.EXPECT().earlyConnReady().Return(readyChan)
@@ -323,7 +323,7 @@ var _ = Describe("Client", func() {
 				_ utils.Logger,
 				_ protocol.VersionNumber,
 			) quicConn {
-				conn := NewMockQuicConn(mockCtrl)
+				conn := NewMockQUICConn(mockCtrl)
 				conn.EXPECT().run().Return(testErr)
 				conn.EXPECT().HandshakeComplete().Return(make(chan struct{}))
 				return conn
@@ -346,7 +346,7 @@ var _ = Describe("Client", func() {
 
 			connRunning := make(chan struct{})
 			defer close(connRunning)
-			conn := NewMockQuicConn(mockCtrl)
+			conn := NewMockQUICConn(mockCtrl)
 			conn.EXPECT().run().Do(func() {
 				<-connRunning
 			})
@@ -402,7 +402,7 @@ var _ = Describe("Client", func() {
 			var sconn sendConn
 			run := make(chan struct{})
 			connCreated := make(chan struct{})
-			conn := NewMockQuicConn(mockCtrl)
+			conn := NewMockQUICConn(mockCtrl)
 			newClientConnection = func(
 				connP sendConn,
 				_ connRunner,
@@ -544,7 +544,7 @@ var _ = Describe("Client", func() {
 				conf = configP
 				close(c)
 				// TODO: check connection IDs?
-				conn := NewMockQuicConn(mockCtrl)
+				conn := NewMockQUICConn(mockCtrl)
 				conn.EXPECT().run()
 				conn.EXPECT().HandshakeComplete().Return(make(chan struct{}))
 				return conn
@@ -579,7 +579,7 @@ var _ = Describe("Client", func() {
 				_ utils.Logger,
 				versionP protocol.VersionNumber,
 			) quicConn {
-				conn := NewMockQuicConn(mockCtrl)
+				conn := NewMockQUICConn(mockCtrl)
 				conn.EXPECT().HandshakeComplete().Return(make(chan struct{}))
 				if counter == 0 {
 					Expect(pn).To(BeZero())

diff --git a/connection_test.go b/connection_test.go
@@ -1631,7 +1631,7 @@ var _ = Describe("Connection", func() {
 		})
 
 		It("sends a Path MTU probe packet", func() {
-			mtuDiscoverer := NewMockMtuDiscoverer(mockCtrl)
+			mtuDiscoverer := NewMockMTUDiscoverer(mockCtrl)
 			conn.mtuDiscoverer = mtuDiscoverer
 			conn.config.DisablePathMTUDiscovery = false
 			sph.EXPECT().SentPacket(gomock.Any())

diff --git a/http3/mock_roundtripcloser_test.go b/http3/mock_roundtripcloser_test.go
diff --git a/http3/mockgen.go b/http3/mockgen.go
@@ -0,0 +1,6 @@
+//go:build gomock || generate
+
+package http3
+
+//go:generate sh -c "go run github.com/golang/mock/mockgen -build_flags=\"-tags=gomock\"  -package http3 -destination mock_roundtripcloser_test.go github.com/quic-go/quic-go/http3 RoundTripCloser"
+type RoundTripCloser = roundTripCloser
diff --git a/http3/roundtrip_test.go b/http3/roundtrip_test.go
@@ -19,8 +19,6 @@ import (
 	. "github.com/onsi/gomega"
 )
 
-//go:generate sh -c "./../mockgen_private.sh http3 mock_roundtripcloser_test.go github.com/quic-go/quic-go/http3 roundTripCloser"
-
 type mockBody struct {
 	reader   bytes.Reader
 	readErr  error

diff --git a/internal/ackhandler/mock_sent_packet_tracker_test.go b/internal/ackhandler/mock_sent_packet_tracker_test.go
diff --git a/internal/ackhandler/mockgen.go b/internal/ackhandler/mockgen.go
@@ -1,3 +1,6 @@
+//go:build gomock || generate
+
 package ackhandler
 
-//go:generate sh -c "../../mockgen_private.sh ackhandler mock_sent_packet_tracker_test.go github.com/quic-go/quic-go/internal/ackhandler sentPacketTracker"
+//go:generate sh -c "go run github.com/golang/mock/mockgen -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
diff --git a/internal/handshake/mock_handshake_runner_test.go b/internal/handshake/mock_handshake_runner_test.go
diff --git a/internal/handshake/mockgen.go b/internal/handshake/mockgen.go
@@ -1,3 +1,6 @@
+//go:build gomock || generate
+
 package handshake
 
-//go:generate sh -c "../../mockgen_private.sh handshake mock_handshake_runner_test.go github.com/quic-go/quic-go/internal/handshake handshakeRunner"
+//go:generate sh -c "go run github.com/golang/mock/mockgen -build_flags=\"-tags=gomock\"  -package handshake -destination mock_handshake_runner_test.go github.com/quic-go/quic-go/internal/handshake HandshakeRunner"
+type HandshakeRunner = handshakeRunner
diff --git a/mock_ack_frame_source_test.go b/mock_ack_frame_source_test.go
diff --git a/mock_batch_conn_test.go b/mock_batch_conn_test.go
diff --git a/mock_conn_runner_test.go b/mock_conn_runner_test.go
diff --git a/mock_crypto_data_handler_test.go b/mock_crypto_data_handler_test.go
diff --git a/mock_crypto_stream_test.go b/mock_crypto_stream_test.go
diff --git a/mock_frame_source_test.go b/mock_frame_source_test.go
diff --git a/mock_mtu_discoverer_test.go b/mock_mtu_discoverer_test.go
diff --git a/mock_multiplexer_test.go b/mock_multiplexer_test.go