GODRIVER-2179 Unify testing API. (#1137)

* Removes the testify dependency.
* Removes the tidwall/pretty dependency.
* Modifies the existing internal/assert package to be a copy of a subset of testify/assert and pmezard/go-difflib.
* Adds a new internal/require package that is a copy of a subset of testify/require.
* Changes all assert and require imports to refer to internal.
* Runs go mod tidy and go mod vendor.
* Fixes tests that relied on old test API behavior.

Author: benjirewis

THIRD-PARTY-NOTICES

@@ -716,31 +716,6 @@ LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
 OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 SOFTWARE.
 
-----------------------------------------------------------------------
-License notice for github.com/tidwall/pretty
-----------------------------------------------------------------------
-
-The MIT License (MIT)
-
-Copyright (c) 2017 Josh Baker
-
-Permission is hereby granted, free of charge, to any person obtaining a copy of
-this software and associated documentation files (the "Software"), to deal in
-the Software without restriction, including without limitation the rights to
-use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
-the Software, and to permit persons to whom the Software is furnished to do so,
-subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
-FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
-COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
-IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
-CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
 ----------------------------------------------------------------------
 License notice for github.com/xdg-go/pbkdf2
 ----------------------------------------------------------------------

benchmark/harness.go

@@ -11,7 +11,7 @@ import (
 	"testing"
 	"time"
 
-	"github.com/stretchr/testify/require"
+	"go.mongodb.org/mongo-driver/internal/require"
 )
 
 const (

bson/bson_corpus_spec_test.go

@@ -7,6 +7,7 @@
 package bson
 
 import (
+	"bytes"
 	"encoding/hex"
 	"encoding/json"
 	"fmt"
@@ -20,10 +21,9 @@ import (
 	"unicode/utf8"
 
 	"github.com/google/go-cmp/cmp"
-	"github.com/stretchr/testify/require"
-	"github.com/tidwall/pretty"
 	"go.mongodb.org/mongo-driver/bson/primitive"
-	"go.mongodb.org/mongo-driver/internal/testutil/assert"
+	"go.mongodb.org/mongo-driver/internal/assert"
+	"go.mongodb.org/mongo-driver/internal/require"
 )
 
 type testCase struct {
@@ -312,7 +312,9 @@ func runTest(t *testing.T, file string) {
 					expectNoError(t, err, fmt.Sprintf("%s: reading canonical BSON", v.Description))
 
 					// get canonical extended JSON
-					cEJ := unescapeUnicode(string(pretty.Ugly([]byte(v.CanonicalExtJSON))), test.BsonType)
+					var compactEJ bytes.Buffer
+					require.NoError(t, json.Compact(&compactEJ, []byte(v.CanonicalExtJSON)))
+					cEJ := unescapeUnicode(compactEJ.String(), test.BsonType)
 					if test.BsonType == "0x01" {
 						cEJ = normalizeCanonicalDouble(t, *test.TestKey, cEJ)
 					}
@@ -328,7 +330,9 @@ func runTest(t *testing.T, file string) {
 
 					// native_to_relaxed_extended_json(bson_to_native(cB)) = rEJ (if rEJ exists)
 					if v.RelaxedExtJSON != nil {
-						rEJ := unescapeUnicode(string(pretty.Ugly([]byte(*v.RelaxedExtJSON))), test.BsonType)
+						var compactEJ bytes.Buffer
+						require.NoError(t, json.Compact(&compactEJ, []byte(*v.RelaxedExtJSON)))
+						rEJ := unescapeUnicode(compactEJ.String(), test.BsonType)
 						if test.BsonType == "0x01" {
 							rEJ = normalizeRelaxedDouble(t, *test.TestKey, rEJ)
 						}
@@ -368,7 +372,9 @@ func runTest(t *testing.T, file string) {
 
 					/*** degenerate JSON round-trip tests (if exists) ***/
 					if v.DegenerateExtJSON != nil {
-						dEJ := unescapeUnicode(string(pretty.Ugly([]byte(*v.DegenerateExtJSON))), test.BsonType)
+						var compactEJ bytes.Buffer
+						require.NoError(t, json.Compact(&compactEJ, []byte(*v.DegenerateExtJSON)))
+						dEJ := unescapeUnicode(compactEJ.String(), test.BsonType)
 						if test.BsonType == "0x01" {
 							dEJ = normalizeCanonicalDouble(t, *test.TestKey, dEJ)
 						}
@@ -506,11 +512,18 @@ func TestRelaxedUUIDValidation(t *testing.T) {
 
 	for _, tc := range testCases {
 		t.Run(tc.description, func(t *testing.T) {
-			// get canonical extended JSON
-			cEJ := unescapeUnicode(string(pretty.Ugly([]byte(tc.canonicalExtJSON))), "0x05")
+			// get canonical extended JSON (if provided)
+			cEJ := ""
+			if tc.canonicalExtJSON != "" {
+				var compactCEJ bytes.Buffer
+				require.NoError(t, json.Compact(&compactCEJ, []byte(tc.canonicalExtJSON)))
+				cEJ = unescapeUnicode(compactCEJ.String(), "0x05")
+			}
 
 			// get degenerate extended JSON
-			dEJ := unescapeUnicode(string(pretty.Ugly([]byte(tc.degenerateExtJSON))), "0x05")
+			var compactDEJ bytes.Buffer
+			require.NoError(t, json.Compact(&compactDEJ, []byte(tc.degenerateExtJSON)))
+			dEJ := unescapeUnicode(compactDEJ.String(), "0x05")
 
 			// convert dEJ to native doc
 			var doc D

bson/bson_test.go

@@ -19,7 +19,7 @@ import (
 	"go.mongodb.org/mongo-driver/bson/bsoncodec"
 	"go.mongodb.org/mongo-driver/bson/bsonoptions"
 	"go.mongodb.org/mongo-driver/bson/bsontype"
-	"go.mongodb.org/mongo-driver/internal/testutil/assert"
+	"go.mongodb.org/mongo-driver/internal/assert"
 	"go.mongodb.org/mongo-driver/x/bsonx/bsoncore"
 )
 

bson/bsoncodec/cond_addr_codec_test.go

@@ -12,7 +12,7 @@ import (
 
 	"go.mongodb.org/mongo-driver/bson/bsonrw"
 	"go.mongodb.org/mongo-driver/bson/bsonrw/bsonrwtest"
-	"go.mongodb.org/mongo-driver/internal/testutil/assert"
+	"go.mongodb.org/mongo-driver/internal/assert"
 )
 
 func TestCondAddrCodec(t *testing.T) {

bson/bsoncodec/default_value_decoders_test.go

@@ -23,7 +23,7 @@ import (
 	"go.mongodb.org/mongo-driver/bson/bsonrw/bsonrwtest"
 	"go.mongodb.org/mongo-driver/bson/bsontype"
 	"go.mongodb.org/mongo-driver/bson/primitive"
-	"go.mongodb.org/mongo-driver/internal/testutil/assert"
+	"go.mongodb.org/mongo-driver/internal/assert"
 	"go.mongodb.org/mongo-driver/x/bsonx/bsoncore"
 )
 

bson/bsoncodec/registry_test.go

@@ -13,7 +13,7 @@ import (
 	"github.com/google/go-cmp/cmp"
 	"go.mongodb.org/mongo-driver/bson/bsonrw"
 	"go.mongodb.org/mongo-driver/bson/bsontype"
-	"go.mongodb.org/mongo-driver/internal/testutil/assert"
+	"go.mongodb.org/mongo-driver/internal/assert"
 )
 
 func TestRegistry(t *testing.T) {

bson/bsoncodec/string_codec_test.go

@@ -14,7 +14,7 @@ import (
 	"go.mongodb.org/mongo-driver/bson/bsonrw/bsonrwtest"
 	"go.mongodb.org/mongo-driver/bson/bsontype"
 	"go.mongodb.org/mongo-driver/bson/primitive"
-	"go.mongodb.org/mongo-driver/internal/testutil/assert"
+	"go.mongodb.org/mongo-driver/internal/assert"
 )
 
 func TestStringCodec(t *testing.T) {

bson/bsoncodec/struct_codec_test.go

@@ -10,7 +10,7 @@ import (
 	"testing"
 	"time"
 
-	"github.com/stretchr/testify/assert"
+	"go.mongodb.org/mongo-driver/internal/assert"
 )
 
 func TestZeoerInterfaceUsedByDecoder(t *testing.T) {

bson/bsoncodec/time_codec_test.go

@@ -14,7 +14,7 @@ import (
 	"go.mongodb.org/mongo-driver/bson/bsonoptions"
 	"go.mongodb.org/mongo-driver/bson/bsonrw/bsonrwtest"
 	"go.mongodb.org/mongo-driver/bson/bsontype"
-	"go.mongodb.org/mongo-driver/internal/testutil/assert"
+	"go.mongodb.org/mongo-driver/internal/assert"
 	"go.mongodb.org/mongo-driver/x/bsonx/bsoncore"
 )
 
@@ -43,7 +43,13 @@ func TestTimeCodec(t *testing.T) {
 				actualTime := actual.Interface().(time.Time)
 				assert.Equal(t, actualTime.Location().String() == "UTC", tc.utc,
 					"Expected UTC: %v, got %v", tc.utc, actualTime.Location())
-				assert.Equal(t, now, actualTime, "expected time %v, got %v", now, actualTime)
+
+				if tc.utc {
+					nowUTC := now.UTC()
+					assert.Equal(t, nowUTC, actualTime, "expected time %v, got %v", nowUTC, actualTime)
+				} else {
+					assert.Equal(t, now, actualTime, "expected time %v, got %v", now, actualTime)
+				}
 			})
 		}
 	})
@@ -72,7 +78,8 @@ func TestTimeCodec(t *testing.T) {
 				if tc.name == "timestamp" {
 					now = time.Unix(now.Unix(), 0)
 				}
-				assert.Equal(t, now, actualTime, "expected time %v, got %v", now, actualTime)
+				nowUTC := now.UTC()
+				assert.Equal(t, nowUTC, actualTime, "expected time %v, got %v", nowUTC, actualTime)
 			})
 		}
 	})