Reorganized tests (refactoring only)

bid_request_test.go

@@ -0,0 +1,56 @@
+package openrtb_test
+
+import (
+	"encoding/json"
+	"io/ioutil"
+	"path/filepath"
+
+	. "github.com/mxmCherry/openrtb"
+
+	. "github.com/onsi/ginkgo"
+	. "github.com/onsi/ginkgo/extensions/table"
+	. "github.com/onsi/gomega"
+)
+
+var _ = Describe("BidRequest", func() {
+	DescribeTable(
+		"Marshaling",
+
+		func(filename string, subject interface{}) {
+			expected, err := ioutil.ReadFile(filepath.Join("testdata", filename))
+			Expect(err).NotTo(HaveOccurred())
+
+			Expect(json.Unmarshal(expected, subject)).To(Succeed())
+
+			actual, err := json.Marshal(subject)
+			Expect(err).NotTo(HaveOccurred())
+
+			Expect(actual).To(MatchJSON(expected))
+		},
+
+		Entry(
+			"Simple Banner",
+			"bid-request-simple-banner.json",
+			new(BidRequest)),
+		Entry(
+			"Expandable Creative",
+			"bid-request-expandable-creative.json",
+			new(BidRequest)),
+		Entry(
+			"Mobile",
+			"bid-request-mobile.json",
+			new(BidRequest)),
+		Entry(
+			"Video",
+			"bid-request-video.json",
+			new(BidRequest)),
+		Entry(
+			"PMP with Direct Deal",
+			"bid-request-pmp-with-direct-deal.json",
+			new(BidRequest)),
+		Entry(
+			"Native Ad",
+			"bid-request-native-ad.json",
+			new(BidRequest)),
+	)
+})

bid_response_test.go

@@ -0,0 +1,48 @@
+package openrtb_test
+
+import (
+	"encoding/json"
+	"io/ioutil"
+	"path/filepath"
+
+	. "github.com/mxmCherry/openrtb"
+
+	. "github.com/onsi/ginkgo"
+	. "github.com/onsi/ginkgo/extensions/table"
+	. "github.com/onsi/gomega"
+)
+
+var _ = Describe("BidResponse", func() {
+	DescribeTable(
+		"Marshaling",
+
+		func(filename string, subject interface{}) {
+			expected, err := ioutil.ReadFile(filepath.Join("testdata", filename))
+			Expect(err).NotTo(HaveOccurred())
+
+			Expect(json.Unmarshal(expected, subject)).To(Succeed())
+
+			actual, err := json.Marshal(subject)
+			Expect(err).NotTo(HaveOccurred())
+
+			Expect(actual).To(MatchJSON(expected))
+		},
+
+		Entry(
+			"Ad Served on Win Notice",
+			"bid-response-ad-served-on-win-notice.json",
+			new(BidResponse)),
+		Entry(
+			"VAST XML Document Returned Inline",
+			"bid-response-vast-xml-document-returned-inline.json",
+			new(BidResponse)),
+		Entry(
+			"Direct Deal Ad Served on Win Notice",
+			"bid-response-direct-deal-ad-served-on-win-notice.json",
+			new(BidResponse)),
+		Entry(
+			"Native Markup Returned Inline",
+			"bid-response-native-markup-returned-inline.json",
+			new(BidResponse)),
+	)
+})

openrtb_suite_test.go

@@ -0,0 +1,13 @@
+package openrtb_test
+
+import (
+	. "github.com/onsi/ginkgo"
+	. "github.com/onsi/gomega"
+
+	"testing"
+)
+
+func TestOpenrtb(t *testing.T) {
+	RegisterFailHandler(Fail)
+	RunSpecs(t, "Openrtb Suite")
+}

openrtb_test.go

@@ -1,78 +0,0 @@
-package openrtb_test
-
-import (
-	"encoding/json"
-	"io/ioutil"
-	"path/filepath"
-	"testing"
-
-	. "github.com/mxmCherry/openrtb"
-
-	. "github.com/onsi/ginkgo"
-	. "github.com/onsi/ginkgo/extensions/table"
-	. "github.com/onsi/gomega"
-)
-
-func TestOpenRTB(t *testing.T) {
-	RegisterFailHandler(Fail)
-	RunSpecs(t, "OpenRTB")
-}
-
-// ----------------------------------------------------------------------------
-
-var _ = DescribeTable(
-	"Marshalling",
-	func(filename string, subject interface{}) {
-
-		expected, err := ioutil.ReadFile(filepath.Join("testdata", filename))
-		Expect(err).NotTo(HaveOccurred())
-
-		Expect(json.Unmarshal(expected, subject)).To(Succeed())
-
-		actual, err := json.Marshal(subject)
-		Expect(err).NotTo(HaveOccurred())
-
-		Expect(actual).To(MatchJSON(expected))
-	},
-	Entry(
-		"Bid Request - Simple Banner",
-		"bid-request-simple-banner.json",
-		new(BidRequest)),
-	Entry(
-		"Bid Request - Expandable Creative",
-		"bid-request-expandable-creative.json",
-		new(BidRequest)),
-	Entry(
-		"Bid Request - Mobile",
-		"bid-request-mobile.json",
-		new(BidRequest)),
-	Entry(
-		"Bid Request - Video",
-		"bid-request-video.json",
-		new(BidRequest)),
-	Entry(
-		"Bid Request - PMP with Direct Deal",
-		"bid-request-pmp-with-direct-deal.json",
-		new(BidRequest)),
-	Entry(
-		"Bid Request - Native Ad",
-		"bid-request-native-ad.json",
-		new(BidRequest)),
-
-	Entry(
-		"Bid Response - Ad Served on Win Notice",
-		"bid-response-ad-served-on-win-notice.json",
-		new(BidResponse)),
-	Entry(
-		"Bid Response - VAST XML Document Returned Inline",
-		"bid-response-vast-xml-document-returned-inline.json",
-		new(BidResponse)),
-	Entry(
-		"Bid Response - Direct Deal Ad Served on Win Notice",
-		"bid-response-direct-deal-ad-served-on-win-notice.json",
-		new(BidResponse)),
-	Entry(
-		"Bid Response - Native Markup Returned Inline",
-		"bid-response-native-markup-returned-inline.json",
-		new(BidResponse)),
-)