fix extension marshaling and tests

Author: rourkewhite

extension.go

@@ -0,0 +1,23 @@
+package openrtb
+
+import (
+	"encoding/json"
+	"errors"
+)
+
+// Extension is a raw encoded JSON value.
+// It implements Marshaler and Unmarshaler, defined in encoding/json package
+type Extension json.RawMessage
+
+// MarshalJSON returns e as the JSON encoding of e.
+func (e Extension) MarshalJSON() ([]byte, error) {
+	return json.RawMessage(e).MarshalJSON()
+}
+
+// UnmarshalJSON sets *e to a copy of data.
+func (e *Extension) UnmarshalJSON(data []byte) error {
+	if e == nil {
+		return errors.New("openrtb.Extension: UnmarshalJSON on nil pointer")
+	}
+	return (*json.RawMessage)(e).UnmarshalJSON(data)
+}

extension_test.go

@@ -0,0 +1,39 @@
+package openrtb_test
+
+import (
+	"encoding/json"
+	"reflect"
+	"testing"
+
+	. "github.com/UnityTech/openrtb"
+)
+
+func TestExtension(t *testing.T) {
+	var _ json.Marshaler = (Extension)(nil)
+	var _ json.Unmarshaler = (*Extension)(nil)
+
+	t.Run("should marshal JSON", func(t *testing.T) {
+		subject := Extension(`{"foo":"bar"}`)
+
+		got, err := json.Marshal(subject)
+		if err != nil {
+			t.Fatal(err.Error())
+		}
+		exp := []byte(`{"foo":"bar"}`)
+		if !reflect.DeepEqual(exp, got) {
+			t.Errorf("expected %+v, got %+v", exp, got)
+		}
+	})
+
+	t.Run("should unmarshal JSON", func(t *testing.T) {
+		subject := Extension([]byte{})
+		err := json.Unmarshal([]byte(`{"foo":"bar"}`), &subject)
+		if err != nil {
+			t.Fatal(err.Error())
+		}
+		exp := Extension(`{"foo":"bar"}`)
+		if got := subject; !reflect.DeepEqual(exp, got) {
+			t.Errorf("expected %+v, got %+v", exp, got)
+		}
+	})
+}

openrtb.go

@@ -1,7 +1,5 @@
 package openrtb
 
-import "encoding/json"
-
 // ContentCategory as defined in section 5.1
 type ContentCategory string
 
@@ -841,8 +839,6 @@ type ChannelEntity struct {
 	Ext    Extension `json:"ext,omitempty"`
 }
 
-type Extension json.RawMessage
-
 // RegExtension Extension object for Regulations
 type RegExtension struct {
 	GDPR      int    `json:"gdpr,omitempty"`

testdata/content.quoted.json

@@ -9,7 +9,7 @@
   "len": 129,
   "series": "book reading",
   "videoquality": 2,
-  "context": "1",
+  "context": 1,
   "season": "1",
   "sourcerelationship": 0,
   "id": "eb9f13ede5fd225333971523f6042f9d"

testdata/device.json

@@ -22,5 +22,6 @@
   "js": 1,
   "connectiontype": 3,
   "mccmnc": "722-341",
-  "devicetype": 1
+  "devicetype": 1,
+  "oaid": "1fe9a970-efbb-29e0-0bdd-f5dbbf751ab5"
 }

testdata/impression.json

@@ -30,5 +30,6 @@
   },
   "qty": {
     "multiplier": 1.0
-  }
+  },
+  "rwdd": 1
 }