Fix json label in audio, add unit test for audio

Author: Francois-Xavier Gsell

audio.go

@@ -25,10 +25,10 @@ type Audio struct {
 	Delivery      []int     `json:"delivery,omitempty"`    // List of supported delivery methods
 	CompanionAd   []Banner  `json:"companionad,omitempty"`
 	CompanionType []int     `json:"companiontype,omitempty"`
-	MaxSequence   int       `json:"maxseq,omitempty"`        // The maximumnumber of ads that canbe played in an ad pod.
-	Feed          int       `json:"companiontype,omitempty"` // Type of audio feed.
-	Stitched      int       `json:"companiontype,omitempty"` // Indicates if the ad is stitched with audio content or delivered independently
-	NVol          int       `json:"companiontype,omitempty"` // Volume normalization mode.
+	MaxSequence   int       `json:"maxseq,omitempty"`   // The maximumnumber of ads that canbe played in an ad pod.
+	Feed          int       `json:"feed,omitempty"`     // Type of audio feed.
+	Stitched      int       `json:"stitched,omitempty"` // Indicates if the ad is stitched with audio content or delivered independently
+	NVol          int       `json:"nvol,omitempty"`     // Volume normalization mode.
 	Ext           Extension `json:"ext,omitempty"`
 }
 

audio_test.go

@@ -0,0 +1,57 @@
+package openrtb
+
+import (
+	. "github.com/onsi/ginkgo"
+	. "github.com/onsi/gomega"
+)
+
+var _ = Describe("Audio", func() {
+	var subject *Audio
+
+	BeforeEach(func() {
+		err := fixture("audio", &subject)
+		Expect(err).NotTo(HaveOccurred())
+	})
+
+	It("should parse correctly", func() {
+		Expect(subject).To(Equal(&Audio{
+			Mimes: []string{
+				"audio/mp4",
+			},
+			MinDuration: 5,
+			MaxDuration: 30,
+			Protocols:   []int{AudioProtocolDAAST1, AudioProtocolDAAST1Wrapper},
+			Sequence:    1,
+			BAttr:       []int{13, 14},
+			MaxExtended: 30,
+			MinBitrate:  300,
+			MaxBitrate:  1500,
+			Delivery:    []int{2},
+			CompanionAd: []Banner{
+				{W: 300, H: 250, ID: "1234567893-1", Pos: 1, BAttr: []int{13, 14}, ExpDir: []int{ExpDirRight, ExpDirDown}},
+				{W: 728, H: 90, ID: "1234567893-2", Pos: 1, BAttr: []int{13, 14}},
+			},
+			CompanionType: []int{1, 2},
+		}))
+	})
+
+	It("should validate", func() {
+		Expect((&Audio{
+			MinDuration: 5,
+			MaxDuration: 30,
+			Protocols:   []int{AudioProtocolDAAST1, AudioProtocolDAAST1Wrapper},
+			Sequence:    1,
+			BAttr:       []int{13, 14},
+			MaxExtended: 30,
+			MinBitrate:  300,
+			MaxBitrate:  1500,
+			Delivery:    []int{2},
+			CompanionAd: []Banner{
+				{W: 300, H: 250, ID: "1234567893-1", Pos: 1, BAttr: []int{13, 14}, ExpDir: []int{ExpDirRight, ExpDirDown}},
+				{W: 728, H: 90, ID: "1234567893-2", Pos: 1, BAttr: []int{13, 14}},
+			},
+			CompanionType: []int{1, 2},
+		}).Validate()).To(Equal(ErrInvalidAudioNoMimes))
+	})
+
+})

testdata/audio.json

@@ -0,0 +1,59 @@
+{
+  "w": 640,
+  "h": 480,
+  "pos": 1,
+  "startdelay": 0,
+  "minduration": 5,
+  "maxduration": 30,
+  "maxextended": 30,
+  "minbitrate": 300,
+  "maxbitrate": 1500,
+  "api": [
+    1,
+    2
+  ],
+  "protocols": [
+    9,
+    10
+  ],
+  "mimes": [
+    "audio/mp4"
+  ],
+  "delivery": [
+    2
+  ],
+  "battr": [
+    13,
+    14
+  ],
+  "companionad": [
+    {
+      "id": "1234567893-1",
+      "w": 300,
+      "h": 250,
+      "pos": 1,
+      "battr": [
+        13,
+        14
+      ],
+      "expdir": [
+        2,
+        4
+      ]
+    },
+    {
+      "id": "1234567893-2",
+      "w": 728,
+      "h": 90,
+      "pos": 1,
+      "battr": [
+        13,
+        14
+      ]
+    }
+  ],
+  "companiontype": [
+    1,
+    2
+  ]
+}