Remove testing dependency from internal

GODRIVER-769

Change-Id: I6cd5f9e1f48b2256f6308b6f59e9a2ba945c260b

Author: Divjot Arora

internal/channel_connection.go

@@ -8,17 +8,17 @@ package internal
 
 import (
 	"context"
-	"testing"
 
 	"github.com/mongodb/mongo-go-driver/bson"
 	"github.com/mongodb/mongo-go-driver/x/bsonx"
 	"github.com/mongodb/mongo-go-driver/x/network/wiremessage"
+	"errors"
+	"fmt"
 )
 
 // Implements the connection.Connection interface by reading and writing wire messages
 // to a channel
 type ChannelConn struct {
-	T        *testing.T
 	WriteErr error
 	Written  chan wiremessage.WireMessage
 	ReadResp chan wiremessage.WireMessage
@@ -29,7 +29,7 @@ func (c *ChannelConn) WriteWireMessage(ctx context.Context, wm wiremessage.WireM
 	select {
 	case c.Written <- wm:
 	default:
-		c.T.Error("could not write wiremessage to written channel")
+		c.WriteErr = errors.New("could not write wiremessage to written channel")
 	}
 	return c.WriteErr
 }
@@ -62,13 +62,13 @@ func (c *ChannelConn) ID() string {
 }
 
 // Create a OP_REPLY wiremessage from a BSON document
-func MakeReply(t *testing.T, doc bsonx.Doc) wiremessage.WireMessage {
+func MakeReply(doc bsonx.Doc) (wiremessage.WireMessage, error) {
 	rdr, err := doc.MarshalBSON()
 	if err != nil {
-		t.Fatalf("Could not create document: %v", err)
+		return nil, errors.New(fmt.Sprintf("could not create document: %v", err))
 	}
 	return wiremessage.Reply{
 		NumberReturned: 1,
 		Documents:      []bson.Raw{rdr},
-	}
+	}, nil
 }

x/mongo/driver/auth/mongodbcr_test.go

@@ -29,13 +29,13 @@ func TestMongoDBCRAuthenticator_Fails(t *testing.T) {
 	}
 
 	resps := make(chan wiremessage.WireMessage, 2)
-	resps <- internal.MakeReply(t, bsonx.Doc{
+	writeReplies(t, resps, bsonx.Doc{
 		{"ok", bsonx.Int32(1)},
 		{"nonce", bsonx.String("2375531c32080ae8")},
+	}, bsonx.Doc{
+		{"ok", bsonx.Int32(0)},
 	})
 
-	resps <- internal.MakeReply(t, bsonx.Doc{{"ok", bsonx.Int32(0)}})
-
 	c := &internal.ChannelConn{Written: make(chan wiremessage.WireMessage, 2), ReadResp: resps}
 
 	err := authenticator.Auth(context.Background(), description.Server{
@@ -63,14 +63,13 @@ func TestMongoDBCRAuthenticator_Succeeds(t *testing.T) {
 	}
 
 	resps := make(chan wiremessage.WireMessage, 2)
-
-	resps <- internal.MakeReply(t, bsonx.Doc{
+	writeReplies(t, resps, bsonx.Doc{
 		{"ok", bsonx.Int32(1)},
 		{"nonce", bsonx.String("2375531c32080ae8")},
+	}, bsonx.Doc{
+		{"ok", bsonx.Int32(1)},
 	})
 
-	resps <- internal.MakeReply(t, bsonx.Doc{{"ok", bsonx.Int32(1)}})
-
 	c := &internal.ChannelConn{Written: make(chan wiremessage.WireMessage, 2), ReadResp: resps}
 
 	err := authenticator.Auth(context.Background(), description.Server{
@@ -97,3 +96,14 @@ func TestMongoDBCRAuthenticator_Succeeds(t *testing.T) {
 	}
 	compareResponses(t, <-c.Written, expectedAuthenticateDoc, "source")
 }
+
+func writeReplies(t *testing.T, c chan wiremessage.WireMessage, docs ...bsonx.Doc) {
+	for _, doc := range docs {
+		reply, err := internal.MakeReply(doc)
+		if err != nil {
+			t.Fatalf("error constructing reply: %v", err)
+		}
+
+		c <- reply
+	}
+}

x/mongo/driver/auth/plain_test.go

@@ -29,13 +29,13 @@ func TestPlainAuthenticator_Fails(t *testing.T) {
 	}
 
 	resps := make(chan wiremessage.WireMessage, 1)
-	resps <- internal.MakeReply(t, bsonx.Doc{
+	writeReplies(t, resps, bsonx.Doc{
 		{"ok", bsonx.Int32(1)},
 		{"conversationId", bsonx.Int32(1)},
 		{"payload", bsonx.Binary(0x00, []byte{})},
 		{"code", bsonx.Int32(143)},
-		{"done", bsonx.Boolean(true)}},
-	)
+		{"done", bsonx.Boolean(true)},
+	})
 
 	c := &internal.ChannelConn{Written: make(chan wiremessage.WireMessage, 1), ReadResp: resps}
 
@@ -63,18 +63,17 @@ func TestPlainAuthenticator_Extra_server_message(t *testing.T) {
 	}
 
 	resps := make(chan wiremessage.WireMessage, 2)
-	resps <- internal.MakeReply(t, bsonx.Doc{
+	writeReplies(t, resps, bsonx.Doc{
 		{"ok", bsonx.Int32(1)},
 		{"conversationId", bsonx.Int32(1)},
 		{"payload", bsonx.Binary(0x00, []byte{})},
-		{"done", bsonx.Boolean(false)}},
-	)
-	resps <- internal.MakeReply(t, bsonx.Doc{
+		{"done", bsonx.Boolean(false)},
+	}, bsonx.Doc{
 		{"ok", bsonx.Int32(1)},
 		{"conversationId", bsonx.Int32(1)},
 		{"payload", bsonx.Binary(0x00, []byte{})},
-		{"done", bsonx.Boolean(true)}},
-	)
+		{"done", bsonx.Boolean(true)},
+	})
 
 	c := &internal.ChannelConn{Written: make(chan wiremessage.WireMessage, 1), ReadResp: resps}
 
@@ -102,12 +101,12 @@ func TestPlainAuthenticator_Succeeds(t *testing.T) {
 	}
 
 	resps := make(chan wiremessage.WireMessage, 1)
-	resps <- internal.MakeReply(t, bsonx.Doc{
+	writeReplies(t, resps, bsonx.Doc{
 		{"ok", bsonx.Int32(1)},
 		{"conversationId", bsonx.Int32(1)},
 		{"payload", bsonx.Binary(0x00, []byte{})},
-		{"done", bsonx.Boolean(true)}},
-	)
+		{"done", bsonx.Boolean(true)},
+	})
 
 	c := &internal.ChannelConn{Written: make(chan wiremessage.WireMessage, 1), ReadResp: resps}
 

x/mongo/driver/topology/cursor_test.go

@@ -172,15 +172,15 @@ func (m *mockConnection) ReadWireMessage(ctx context.Context) (wiremessage.WireM
 		// write empty batch
 		d := createOKBatchReplyDoc(2, bsonx.Arr{})
 
-		return internal.MakeReply(m.t, d), nil
+		return internal.MakeReply(d)
 	} else if m.willErr {
 		// write error
 		return nil, errors.New("intentional mock error")
 	} else {
 		// write non-empty batch
 		d := createOKBatchReplyDoc(2, bsonx.Arr{bsonx.String("a")})
 
-		return internal.MakeReply(m.t, d), nil
+		return internal.MakeReply(d)
 	}
 }