Ensure JavaScript and Symbol codecs are registered

Register the JavaScript and Symbol encoder and decoder functions when
registering the primitive codecs.
Fix bug in Symbol encoder that wrote JavaScript as the type instead of
Symbol.
Add tests for conversion of bson.D to and from JavaScript and Symbol.
Fix tests for symbol encoding.

GODRIVER-646

Change-Id: I090e19844031d40ae778c460c4eaa7fc1edbce73

Author: skriptble

bson/primitive_codecs.go

@@ -39,6 +39,8 @@ func (pc PrimitiveCodecs) RegisterPrimitiveCodecs(rb *bsoncodec.RegistryBuilder)
 		RegisterEncoder(tDocument, bsoncodec.ValueEncoderFunc(pc.x.DocumentEncodeValue)).
 		RegisterEncoder(tArray, bsoncodec.ValueEncoderFunc(pc.x.ArrayEncodeValue)).
 		RegisterEncoder(tValue, bsoncodec.ValueEncoderFunc(pc.x.ValueEncodeValue)).
+		RegisterEncoder(reflect.PtrTo(tJavaScript), bsoncodec.ValueEncoderFunc(pc.JavaScriptEncodeValue)).
+		RegisterEncoder(reflect.PtrTo(tSymbol), bsoncodec.ValueEncoderFunc(pc.SymbolEncodeValue)).
 		RegisterEncoder(reflect.PtrTo(tRawValue), bsoncodec.ValueEncoderFunc(pc.RawValueEncodeValue)).
 		RegisterEncoder(reflect.PtrTo(tElementSlice), bsoncodec.ValueEncoderFunc(pc.x.ElementSliceEncodeValue)).
 		RegisterEncoder(reflect.PtrTo(tBinary), bsoncodec.ValueEncoderFunc(pc.BinaryEncodeValue)).
@@ -56,6 +58,8 @@ func (pc PrimitiveCodecs) RegisterPrimitiveCodecs(rb *bsoncodec.RegistryBuilder)
 		RegisterDecoder(tDocument, bsoncodec.ValueDecoderFunc(pc.x.DocumentDecodeValue)).
 		RegisterDecoder(tArray, bsoncodec.ValueDecoderFunc(pc.x.ArrayDecodeValue)).
 		RegisterDecoder(tValue, bsoncodec.ValueDecoderFunc(pc.x.ValueDecodeValue)).
+		RegisterDecoder(reflect.PtrTo(tJavaScript), bsoncodec.ValueDecoderFunc(pc.JavaScriptDecodeValue)).
+		RegisterDecoder(reflect.PtrTo(tSymbol), bsoncodec.ValueDecoderFunc(pc.SymbolDecodeValue)).
 		RegisterDecoder(reflect.PtrTo(tRawValue), bsoncodec.ValueDecoderFunc(pc.RawValueDecodeValue)).
 		RegisterDecoder(reflect.PtrTo(tElementSlice), bsoncodec.ValueDecoderFunc(pc.x.ElementSliceDecodeValue)).
 		RegisterDecoder(reflect.PtrTo(tBinary), bsoncodec.ValueDecoderFunc(pc.BinaryDecodeValue)).
@@ -114,7 +118,7 @@ func (PrimitiveCodecs) SymbolEncodeValue(ectx bsoncodec.EncodeContext, vw bsonrw
 		}
 	}
 
-	return vw.WriteJavascript(string(symbol))
+	return vw.WriteSymbol(string(symbol))
 }
 
 // JavaScriptDecodeValue is the ValueDecoderFunc for the primitive.JavaScript type.

bson/primitive_codecs_test.go

@@ -151,8 +151,8 @@ func TestDefaultValueEncoders(t *testing.T) {
 						Received: wrong,
 					},
 				},
-				{"Symbol", primitive.Symbol("foobar"), nil, nil, bsonrwtest.WriteJavascript, nil},
-				{"*Symbol", psymbol, nil, nil, bsonrwtest.WriteJavascript, nil},
+				{"Symbol", primitive.Symbol("foobar"), nil, nil, bsonrwtest.WriteSymbol, nil},
+				{"*Symbol", psymbol, nil, nil, bsonrwtest.WriteSymbol, nil},
 				{"*Symbol/nil", psymbolNil, nil, nil, bsonrwtest.WriteNull, nil},
 			},
 		},
@@ -997,6 +997,18 @@ func TestDefaultValueEncoders(t *testing.T) {
 			b     []byte
 			err   error
 		}{
+			{
+				"D to JavaScript",
+				D{{"a", primitive.JavaScript(`function() { var hello = "world"; }`)}},
+				docToBytes(bsonx.Doc{{"a", bsonx.JavaScript(`function() { var hello = "world"; }`)}}),
+				nil,
+			},
+			{
+				"D to Symbol",
+				D{{"a", primitive.Symbol("foobarbaz")}},
+				docToBytes(bsonx.Doc{{"a", bsonx.Symbol("foobarbaz")}}),
+				nil,
+			},
 			{
 				"struct{}",
 				struct {
@@ -2424,6 +2436,18 @@ func TestDefaultValueDecoders(t *testing.T) {
 				docToBytes(bsonx.Doc{{"a", bsonx.String("bar")}}),
 				nil,
 			},
+			{
+				"JavaScript to D",
+				D{{"a", primitive.JavaScript(`function() { var hello = "world"; }`)}},
+				docToBytes(bsonx.Doc{{"a", bsonx.JavaScript(`function() { var hello = "world"; }`)}}),
+				nil,
+			},
+			{
+				"Symbol to D",
+				D{{"a", primitive.Symbol("foobarbaz")}},
+				docToBytes(bsonx.Doc{{"a", bsonx.Symbol("foobarbaz")}}),
+				nil,
+			},
 			{
 				"struct{}",
 				struct {