simplify mockgen usage for private interfaces (#3769)

This commit is contained in:
Marten Seemann
2023-04-19 16:57:00 +02:00
committed by GitHub
parent 379e7ec848
commit c9a2f79b1c
35 changed files with 325 additions and 310 deletions

View File

@@ -123,7 +123,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
@@ -156,7 +156,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
@@ -189,7 +189,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
@@ -228,7 +228,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)
@@ -271,7 +271,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)
@@ -318,7 +318,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
@@ -341,7 +341,7 @@ var _ = Describe("Client", func() {
connRunning := make(chan struct{})
defer close(connRunning)
conn := NewMockQuicConn(mockCtrl)
conn := NewMockQUICConn(mockCtrl)
conn.EXPECT().run().Do(func() {
<-connRunning
})
@@ -393,7 +393,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,
@@ -535,7 +535,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
@@ -570,7 +570,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())