Merge pull request #3 from Comcast/standUpMachine

Unit test for conversion utilities + Using new validation library

src/glide.yaml

@@ -3,3 +3,5 @@ homepage: https://github.com/Comcast/tr1d1um
 import:
 - package: github.com/Comcast/webpa-common
   version: cb246362b61aaf042a936fa615a48554d111f9b4
+- package: github.com/go-ozzo/ozzo-validation
+  version: v3.3

src/tr1d1um/WDMP_Type.go

@@ -1,6 +1,11 @@
 package main
 
-const(
+import (
+	"errors"
+	"github.com/go-ozzo/ozzo-validation"
+)
+
+const (
 	COMMAND_GET          = "GET"
 	COMMAND_GET_ATTRS    = "GET_ATTRIBUTES"
 	COMMAND_SET          = "SET"
@@ -16,14 +21,15 @@ const(
 
 	ERR_UNSUCCESSFUL_DATA_PARSE = "Unsuccessful Data Parse"
 )
+
 /*
 	GET-Flavored structs
 */
 
 type GetWDMP struct {
-	Command    string   `json:"command"`
-	Names      []string `json:"names,omitempty"`
-	Attribute string    `json:"attributes,omitempty"`
+	Command   string   `json:"command"`
+	Names     []string `json:"names,omitempty"`
+	Attribute string   `json:"attributes,omitempty"`
 }
 
 /*
@@ -33,8 +39,8 @@ type GetWDMP struct {
 type Attr map[string]interface{}
 
 type SetParam struct {
-	Name*      string      `json:"name"`
-	DataType*   int32      `json:"dataType,omitempty"`
+	Name       *string     `json:"name"`
+	DataType   *int8       `json:"dataType,omitempty"`
 	Value      interface{} `json:"value,omitempty"`
 	Attributes Attr        `json:"attributes,omitempty"`
 }
@@ -68,3 +74,24 @@ type DeleteRowWDMP struct {
 	Row     string `json:"row"`
 }
 
+/* Validation functions */
+
+//Applicable for the SET and TEST_SET
+func (sp SetParam) Validate() error {
+	return validation.ValidateStruct(&sp,
+		validation.Field(&sp.Name, validation.NotNil),
+		validation.Field(&sp.DataType, validation.NotNil),
+		validation.Field(&sp.Value, validation.Required))
+}
+
+func ValidateSETAttrParams(params []SetParam) (err error) {
+	if params == nil || len(params) == 0 {
+		return errors.New("invalid list of params")
+	}
+	for _, param := range params {
+		if err = validation.Validate(param.Attributes, validation.Required.Error("invalid attr")); err != nil {
+			return
+		}
+	}
+	return
+}

src/tr1d1um/WDMP_test.go

@@ -0,0 +1,64 @@
+package main
+
+import (
+	"github.com/stretchr/testify/assert"
+	"testing"
+)
+
+/* tests correct usage of library */
+
+func TestValidateSET(t *testing.T) {
+	assert := assert.New(t)
+	sp := SetParam{Attributes: Attr{"0": 0}, Name: &name, Value: value, DataType: &dataType}
+
+	t.Run("Perfect", func(t *testing.T) {
+		assert.Nil(sp.Validate())
+	})
+
+	t.Run("DataTypeIssue", func(t *testing.T) {
+		sp.DataType = nil
+		dataTypeErr := sp.Validate()
+		assert.Contains(dataTypeErr, "dataType")
+		sp.DataType = &dataType // put back value
+	})
+
+	t.Run("ValueIssue", func(t *testing.T) {
+		sp.Value = nil
+		valueErr := sp.Validate()
+		assert.Contains(valueErr, "value")
+		sp.Value = value
+	})
+
+	t.Run("Name", func(t *testing.T) {
+		sp.Name = nil
+		nameErr := sp.Validate()
+		assert.Contains(nameErr, "name")
+	})
+}
+
+func TestValidateSETAttrParams(t *testing.T) {
+	assert := assert.New(t)
+
+	t.Run("ZeroCases", func(t *testing.T) {
+		errNil := ValidateSETAttrParams(nil)
+		errEmpty := ValidateSETAttrParams([]SetParam{})
+
+		assert.NotNil(errNil)
+		assert.NotNil(errEmpty)
+		assert.Contains(errNil.Error(), "invalid list")
+		assert.Contains(errEmpty.Error(), "invalid list")
+	})
+
+	t.Run("InvalidAttr", func(t *testing.T) {
+		param := SetParam{Attributes: Attr{}}
+		err := ValidateSETAttrParams([]SetParam{param})
+		assert.NotNil(err)
+		assert.Contains(err.Error(), "invalid attr")
+	})
+
+	t.Run("Ideal", func(t *testing.T) {
+		param := SetParam{Attributes: Attr{"notify": 0}}
+		err := ValidateSETAttrParams([]SetParam{param})
+		assert.Nil(err)
+	})
+}