encodingcom: simplify and add tests to PresetFormat.Stream

Author: Francisco Souza

preset.go

@@ -1,9 +1,6 @@
 package encodingcom
 
-import (
-	"encoding/json"
-	"log"
-)
+import "encoding/json"
 
 const (
 	// AllPresets is used to retrieve all presets in the response of
@@ -86,21 +83,17 @@ type PresetFormat struct {
 // Stream function returns a slice of Advanced HLS stream settings for a
 // preset format.
 func (p PresetFormat) Stream() []Stream {
-	streamSlice := []Stream{}
-	newStream := Stream{}
+	var (
+		stream  Stream
+		streams []Stream
+	)
 	streamRaw, _ := json.Marshal(p.StreamRawMap)
-	err := json.Unmarshal(streamRaw, &newStream)
-	if err != nil {
-		errWithSlice := json.Unmarshal(streamRaw, &streamSlice)
-		if errWithSlice != nil {
-			log.Printf("Could NOT parse Preset stream data into Stream object: %s", err.Error())
-			log.Printf("Could NOT parse Preset stream data into Stream slice: %s", errWithSlice.Error())
-			return streamSlice
-		}
+	if err := json.Unmarshal(streamRaw, &stream); err != nil {
+		json.Unmarshal(streamRaw, &streams)
 	} else {
-		streamSlice = append(streamSlice, newStream)
+		streams = append(streams, stream)
 	}
-	return streamSlice
+	return streams
 }
 
 // SavePresetResponse is the response returned in the SavePreset method.

preset_test.go

@@ -267,6 +267,68 @@ func (s *S) TestGetPresetsList(c *check.C) {
 	}
 }
 
+func (s *S) TestPresetFormatStream(c *check.C) {
+	var tests = []struct {
+		testCase  string
+		streamRaw interface{}
+		expected  []Stream
+	}{
+		{
+			"single stream",
+			map[string]interface{}{
+				"audio_bitrate": "64k",
+				"audio_volume":  "100",
+				"size":          "1080x720",
+				"two_pass":      "yes",
+			},
+			[]Stream{
+				{
+					AudioBitrate: "64k",
+					AudioVolume:  100,
+					Size:         "1080x720",
+					TwoPass:      YesNoBoolean(true),
+				},
+			},
+		},
+		{
+			"multiple streams",
+			[]map[string]interface{}{
+				{
+					"audio_bitrate": "64k",
+					"audio_volume":  "100",
+					"size":          "1080x720",
+					"two_pass":      "yes",
+				},
+				{
+					"audio_bitrate": "128k",
+					"audio_volume":  "100",
+					"size":          "1920x1080",
+					"two_pass":      "yes",
+				},
+			},
+			[]Stream{
+				{
+					AudioBitrate: "64k",
+					AudioVolume:  100,
+					Size:         "1080x720",
+					TwoPass:      YesNoBoolean(true),
+				},
+				{
+					AudioBitrate: "128k",
+					AudioVolume:  100,
+					Size:         "1920x1080",
+					TwoPass:      YesNoBoolean(true),
+				},
+			},
+		},
+	}
+	for _, test := range tests {
+		p := PresetFormat{StreamRawMap: test.streamRaw}
+		streams := p.Stream()
+		c.Check(streams, check.DeepEquals, test.expected)
+	}
+}
+
 func (s *S) TestGetPreset(c *check.C) {
 	server, requests := s.startServer(`
 {