Merge pull request #15 from Uchencho/bugfix/balance-response-type

using an interface to accomodate different balance types

switch.go

@@ -62,11 +62,11 @@ type AutoGeneratedMessageRequest struct {
 
 // AutoGeneratedMessageResponse is a representation of a send message response from an auto generated "source" number
 type AutoGeneratedMessageResponse struct {
-	Code      string `json:"code"`
-	MessageID string `json:"message_id"`
-	Message   string `json:"message"`
-	Balance   int    `json:"balance"`
-	User      string `json:"user"`
+	Code      string      `json:"code"`
+	MessageID string      `json:"message_id"`
+	Message   string      `json:"message"`
+	Balance   interface{} `json:"balance"`
+	User      string      `json:"user"`
 }
 
 // SendMesageRequest is a representation of a send message request

termii.go

@@ -65,7 +65,7 @@ func (s *Client) makeRequest(method, rURL string, reqBody interface{}, resp inte
 	}
 
 	if err := json.NewDecoder(res.Body).Decode(&resp); err != nil {
-		return errors.Wrap(err, "unable to unmarshal request body")
+		return errors.Wrap(err, "unable to unmarshal response body")
 	}
 	return nil
 }

termii_test.go

@@ -29,6 +29,13 @@ func fileToStruct(filepath string, s interface{}) io.Reader {
 	return bytes.NewReader(bb)
 }
 
+type row struct {
+	name           string
+	in             interface{}
+	out            interface{}
+	termiiResponse string
+}
+
 func TestSendTokenSuccess(t *testing.T) {
 	os.Setenv("TERMII_API_KEY", termiiTestApiKey)
 	var (
@@ -344,26 +351,51 @@ func TestSendAutoGeneratedMessageSuccess(t *testing.T) {
 		})
 
 		var resp termii.AutoGeneratedMessageResponse
-		fileToStruct(filepath.Join("testdata", "send_auto_message_response.json"), &resp)
+		bb, _ := ioutil.ReadFile(os.Getenv("termiiResponse"))
+		if err := json.Unmarshal(bb, &resp); err != nil {
+			log.Printf("error in marshalling %+v", err)
+			w.WriteHeader(http.StatusInternalServerError)
+			return
+		}
 
 		w.WriteHeader(http.StatusOK)
-		bb, _ := json.Marshal(resp)
-		w.Write(bb)
+		bbb, _ := json.Marshal(resp)
+		w.Write(bbb)
 	}))
 	os.Setenv("TERMII_URL", termiiService.URL)
-	fileToStruct(filepath.Join("testdata", "send_auto_message_request.json"), &req)
 
 	c := termii.NewClient()
 
-	resp, err := c.SendAutoGeneratedMessage(req)
-	t.Run("No error is returned", func(t *testing.T) {
-		assert.NoError(t, err)
-	})
+	table := []row{
+		{
+			name:           "Balance is integer and success is expected",
+			in:             filepath.Join("testdata", "send_auto_message_request.json"),
+			out:            filepath.Join("testdata", "send_auto_message_response.json"),
+			termiiResponse: filepath.Join("testdata", "send_auto_message_response.json"),
+		},
+		{
+			name:           "Balance is float and success is expected",
+			in:             filepath.Join("testdata", "send_auto_message_request.json"),
+			out:            filepath.Join("testdata", "send_auto_message_response_float.json"),
+			termiiResponse: filepath.Join("testdata", "send_auto_message_response_float.json"),
+		},
+	}
+
+	for _, entry := range table {
+		req = termii.AutoGeneratedMessageRequest{}
+		os.Setenv("termiiResponse", entry.termiiResponse)
+		fileToStruct(entry.in.(string), &req)
+
+		resp, err := c.SendAutoGeneratedMessage(req)
+		t.Run(fmt.Sprintf("%s - No error is returned", entry.name), func(t *testing.T) {
+			assert.NoError(t, err)
+		})
 
-	t.Run("Response is as expected", func(t *testing.T) {
-		fileToStruct(filepath.Join("testdata", "send_auto_message_response.json"), &expectedResponse)
-		assert.Equal(t, expectedResponse, resp)
-	})
+		t.Run(fmt.Sprintf("%s - Response is as expected", entry.name), func(t *testing.T) {
+			fileToStruct(entry.out.(string), &expectedResponse)
+			assert.Equal(t, expectedResponse, resp)
+		})
+	}
 }
 
 func TestSetDeviceTemplateSuccess(t *testing.T) {

testdata/send_auto_message_response_float.json

@@ -0,0 +1,7 @@
+{
+  "code": "ok",
+  "message_id": "174749423",
+  "message": "Successfully Sent",
+  "balance": 2745.6,
+  "user": "Seun Junior"
+}