Reverse the dependency between bson and bsonx

GODRIVER-669

Change-Id: I0a25021a7537ec34001cc258fa8909cf18162434

Author: skriptble

bson/bson_corpus_spec_test.go

@@ -7,13 +7,11 @@
 package bson
 
 import (
-	"bytes"
 	"encoding/hex"
 	"encoding/json"
 	"fmt"
 	"io/ioutil"
 	"path"
-	"reflect"
 	"strconv"
 	"strings"
 	"testing"
@@ -23,7 +21,6 @@ import (
 	"github.com/google/go-cmp/cmp"
 	"github.com/mongodb/mongo-go-driver/bson/bsoncodec"
 	"github.com/mongodb/mongo-go-driver/bson/bsonrw"
-	"github.com/mongodb/mongo-go-driver/x/bsonx"
 	"github.com/stretchr/testify/require"
 	"github.com/tidwall/pretty"
 )
@@ -62,7 +59,6 @@ type parseErrorTestCase struct {
 
 const dataDir = "../data"
 
-var pc bsonx.PrimitiveCodecs
 var dvd bsoncodec.DefaultValueDecoders
 var dve bsoncodec.DefaultValueEncoders
 
@@ -163,39 +159,36 @@ func normalizeRelaxedDouble(t *testing.T, key string, rEJ string) string {
 }
 
 // bsonToNative decodes the BSON bytes (b) into a native Document
-func bsonToNative(t *testing.T, b []byte, bType, testDesc string) bsonx.Doc {
-	doc := reflect.New(reflect.TypeOf(bsonx.Doc{})).Elem()
-	err := pc.DocumentDecodeValue(dc, bsonrw.NewBSONDocumentReader(b), doc)
+func bsonToNative(t *testing.T, b []byte, bType, testDesc string) D {
+	var doc D
+	err := Unmarshal(b, &doc)
 	expectNoError(t, err, fmt.Sprintf("%s: decoding %s BSON", testDesc, bType))
-	return doc.Interface().(bsonx.Doc)
+	return doc
 }
 
 // nativeToBSON encodes the native Document (doc) into canonical BSON and compares it to the expected
 // canonical BSON (cB)
-func nativeToBSON(t *testing.T, cB []byte, doc bsonx.Doc, testDesc, bType, docSrcDesc string) {
-	actualB := new(bytes.Buffer)
-	vw, err := bsonrw.NewBSONValueWriter(actualB)
-	expectNoError(t, err, fmt.Sprintf("%s: creating ValueWriter", testDesc))
-	err = pc.DocumentEncodeValue(ec, vw, reflect.ValueOf(doc))
+func nativeToBSON(t *testing.T, cB []byte, doc D, testDesc, bType, docSrcDesc string) {
+	actual, err := Marshal(doc)
 	expectNoError(t, err, fmt.Sprintf("%s: encoding %s BSON", testDesc, bType))
 
-	if diff := cmp.Diff(cB, actualB.Bytes()); diff != "" {
+	if diff := cmp.Diff(cB, actual); diff != "" {
 		t.Errorf("%s: 'native_to_bson(%s) = cB' failed (-want, +got):\n-%v\n+%v\n",
-			testDesc, docSrcDesc, cB, actualB.Bytes())
+			testDesc, docSrcDesc, cB, actual)
 		t.FailNow()
 	}
 }
 
 // jsonToNative decodes the extended JSON string (ej) into a native Document
-func jsonToNative(t *testing.T, ej, ejType, testDesc string) bsonx.Doc {
-	var doc bsonx.Doc
+func jsonToNative(t *testing.T, ej, ejType, testDesc string) D {
+	var doc D
 	err := UnmarshalExtJSON([]byte(ej), ejType != "relaxed", &doc)
 	expectNoError(t, err, fmt.Sprintf("%s: decoding %s extended JSON", testDesc, ejType))
 	return doc
 }
 
 // nativeToJSON encodes the native Document (doc) into an extended JSON string
-func nativeToJSON(t *testing.T, ej string, doc bsonx.Doc, testDesc, ejType, ejShortName, docSrcDesc string) {
+func nativeToJSON(t *testing.T, ej string, doc D, testDesc, ejType, ejShortName, docSrcDesc string) {
 	actualEJ, err := MarshalExtJSON(doc, ejType != "relaxed", true)
 	expectNoError(t, err, fmt.Sprintf("%s: encoding %s extended JSON", testDesc, ejType))
 
@@ -300,8 +293,8 @@ func runTest(t *testing.T, file string) {
 			b, err := hex.DecodeString(d.Bson)
 			expectNoError(t, err, d.Description)
 
-			doc := reflect.New(reflect.TypeOf(bsonx.Doc{})).Elem()
-			err = pc.DocumentDecodeValue(dc, bsonrw.NewBSONDocumentReader(b), doc)
+			var doc D
+			err = Unmarshal(b, &doc)
 			expectError(t, err, fmt.Sprintf("%s: expected decode error", d.Description))
 		}
 
@@ -318,7 +311,7 @@ func runTest(t *testing.T, file string) {
 
 			switch test.BsonType {
 			case "0x00":
-				var doc bsonx.Doc
+				var doc D
 				err := UnmarshalExtJSON([]byte(s), true, &doc)
 				expectError(t, err, fmt.Sprintf("%s: expected parse error", p.Description))
 			case "0x13":

bson/bson_test.go

@@ -12,7 +12,6 @@ import (
 	"time"
 
 	"github.com/google/go-cmp/cmp"
-	"github.com/mongodb/mongo-go-driver/x/bsonx"
 	"github.com/mongodb/mongo-go-driver/x/bsonx/bsoncore"
 	"github.com/stretchr/testify/require"
 )
@@ -27,14 +26,6 @@ func noerr(t *testing.T, err error) {
 
 func requireErrEqual(t *testing.T, err1 error, err2 error) { require.True(t, compareErrors(err1, err2)) }
 
-func elementSliceEqual(t *testing.T, e1 []bsonx.Elem, e2 []bsonx.Elem) {
-	require.Equal(t, len(e1), len(e2))
-
-	for i := range e1 {
-		require.True(t, readerElementComparer(e1[i], e2[i]))
-	}
-}
-
 func TestTimeRoundTrip(t *testing.T) {
 	val := struct {
 		Value time.Time

bson/bsoncodec/default_value_decoders.go

@@ -93,6 +93,7 @@ func (dvd DefaultValueDecoders) RegisterDefaultDecoders(rb *RegistryBuilder) {
 		RegisterTypeMapEntry(bsontype.DBPointer, tDBPointer).
 		RegisterTypeMapEntry(bsontype.JavaScript, tJavaScript).
 		RegisterTypeMapEntry(bsontype.Symbol, tSymbol).
+		RegisterTypeMapEntry(bsontype.CodeWithScope, tCodeWithScope).
 		RegisterTypeMapEntry(bsontype.Int32, tInt32).
 		RegisterTypeMapEntry(bsontype.Int64, tInt64).
 		RegisterTypeMapEntry(bsontype.Timestamp, tTimestamp).

bson/decoder_test.go

@@ -17,7 +17,6 @@ import (
 	"github.com/mongodb/mongo-go-driver/bson/bsonrw"
 	"github.com/mongodb/mongo-go-driver/bson/bsonrw/bsonrwtest"
 	"github.com/mongodb/mongo-go-driver/bson/bsontype"
-	"github.com/mongodb/mongo-go-driver/x/bsonx"
 	"github.com/mongodb/mongo-go-driver/x/bsonx/bsoncore"
 )
 
@@ -182,7 +181,7 @@ func TestDecoderv2(t *testing.T) {
 		var got foo
 		got.Item = "apple"
 		got.Bonus = 2
-		data := docToBytes(bsonx.Doc{{"item", bsonx.String("canvas")}, {"qty", bsonx.Int32(4)}})
+		data := docToBytes(D{{"item", "canvas"}, {"qty", 4}})
 		vr := bsonrw.NewBSONDocumentReader(data)
 		dec, err := NewDecoder(vr)
 		noerr(t, err)

bson/encoder_test.go

@@ -15,7 +15,6 @@ import (
 	"github.com/mongodb/mongo-go-driver/bson/bsoncodec"
 	"github.com/mongodb/mongo-go-driver/bson/bsonrw"
 	"github.com/mongodb/mongo-go-driver/bson/bsonrw/bsonrwtest"
-	"github.com/mongodb/mongo-go-driver/x/bsonx"
 )
 
 func TestBasicEncode(t *testing.T) {
@@ -127,16 +126,8 @@ type testMarshaler struct {
 
 func (tm testMarshaler) MarshalBSON() ([]byte, error) { return tm.buf, tm.err }
 
-func docToBytes(d bsonx.Doc) []byte {
-	b, err := d.MarshalBSON()
-	if err != nil {
-		panic(err)
-	}
-	return b
-}
-
-func arrToBytes(a bsonx.Arr) []byte {
-	_, b, err := a.MarshalBSONValue()
+func docToBytes(d interface{}) []byte {
+	b, err := Marshal(d)
 	if err != nil {
 		panic(err)
 	}

bson/marshal_test.go

@@ -10,8 +10,9 @@ import (
 	"bytes"
 	"testing"
 
+	"github.com/google/go-cmp/cmp"
 	"github.com/mongodb/mongo-go-driver/bson/bsoncodec"
-	"github.com/mongodb/mongo-go-driver/x/bsonx"
+	"github.com/mongodb/mongo-go-driver/bson/primitive"
 	"github.com/stretchr/testify/require"
 )
 
@@ -180,7 +181,7 @@ func TestMarshal_roundtripFromBytes(t *testing.T) {
 		0x0,
 	}
 
-	var doc bsonx.Doc
+	var doc D
 	require.NoError(t, Unmarshal(before, &doc))
 
 	after, err := Marshal(doc)
@@ -190,17 +191,19 @@ func TestMarshal_roundtripFromBytes(t *testing.T) {
 }
 
 func TestMarshal_roundtripFromDoc(t *testing.T) {
-	before := bsonx.Doc{
-		{"foo", bsonx.String("bar")},
-		{"baz", bsonx.Int32(-27)},
-		{"bing", bsonx.Array(bsonx.Arr{bsonx.Null(), bsonx.Regex("word", "i")})},
+	before := D{
+		{"foo", "bar"},
+		{"baz", int64(-27)},
+		{"bing", A{nil, primitive.Regex{Pattern: "word", Options: "i"}}},
 	}
 
 	b, err := Marshal(before)
 	require.NoError(t, err)
 
-	var after bsonx.Doc
+	var after D
 	require.NoError(t, Unmarshal(b, &after))
 
-	require.True(t, before.Equal(after))
+	if !cmp.Equal(after, before) {
+		t.Errorf("Documents to not match. got %v; want %v", after, before)
+	}
 }

bson/marshaling_cases_test.go

@@ -8,7 +8,6 @@ package bson
 
 import (
 	"github.com/mongodb/mongo-go-driver/bson/bsoncodec"
-	"github.com/mongodb/mongo-go-driver/x/bsonx"
 )
 
 type marshalingTestCase struct {
@@ -25,6 +24,6 @@ var marshalingTestCases = []marshalingTestCase{
 		struct {
 			Foo bool
 		}{Foo: true},
-		docToBytes(bsonx.Doc{{"foo", bsonx.Boolean(true)}}),
+		docToBytes(D{{"foo", true}}),
 	},
 }

bson/primitive_codecs.go

@@ -12,7 +12,6 @@ import (
 
 	"github.com/mongodb/mongo-go-driver/bson/bsoncodec"
 	"github.com/mongodb/mongo-go-driver/bson/bsonrw"
-	"github.com/mongodb/mongo-go-driver/x/bsonx"
 )
 
 var primitiveCodecs PrimitiveCodecs
@@ -33,8 +32,6 @@ func (pc PrimitiveCodecs) RegisterPrimitiveCodecs(rb *bsoncodec.RegistryBuilder)
 		RegisterEncoder(tRaw, bsoncodec.ValueEncoderFunc(pc.RawEncodeValue)).
 		RegisterDecoder(tRawValue, bsoncodec.ValueDecoderFunc(pc.RawValueDecodeValue)).
 		RegisterDecoder(tRaw, bsoncodec.ValueDecoderFunc(pc.RawDecodeValue))
-
-	bsonx.PrimitiveCodecs{}.RegisterPrimitiveCodecs(rb)
 }
 
 // RawValueEncodeValue is the ValueEncoderFunc for RawValue.