improving unit tests

CHANGELOG.md

@@ -4,10 +4,10 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/)
 and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.html).
 
-## [Unreleased]
+## [1.1.4] - 2017-08-31
 ### Added
-- Store implementation for mock responses.
-- Slack integration for TravisCI.
+- Store interface implementation for mock responses.
+- Slack integration for TravisCI and Coveralls.
 ### Changed
 - Improved test coverage.
 ### Removed

metrics/metrics.go

@@ -36,3 +36,13 @@ func (m *Metrics) Add(metrics ...Metric) {
 		*m = append(*m, metric)
 	}
 }
+
+// Get retrives a specific metric by name
+func (m *Metrics) Get(name string) *Metric {
+	for _, metric := range *m {
+		if metric.Name == name {
+			return &metric
+		}
+	}
+	return nil
+}

metrics/metrics_test.go

@@ -41,3 +41,13 @@ func TestAdd(t *testing.T) {
 	assert.Equal(t, (*f)[1].Value, "valueTwo")
 	assert.Equal(t, (*f)[2].Value, "valueThree")
 }
+
+func TestGet(t *testing.T) {
+	f := &Metrics{}
+	f.Add(Metric{"nameOne", "valueOne", false})
+	f.Add(Metric{"nameTwo", "valueTwo", true}, Metric{"nameThree", "valueThree", false})
+	assert.Nil(t, f.Get("nameFour"))
+	assert.Equal(t, f.Get("nameOne"), &Metric{"nameOne", "valueOne", false})
+	assert.Equal(t, f.Get("nameTwo"), &Metric{"nameTwo", "valueTwo", true})
+	assert.Equal(t, f.Get("nameThree"), &Metric{"nameThree", "valueThree", false})
+}

steps/mockservice_test.go

@@ -21,13 +21,117 @@
 package steps
 
 import (
+  "context"
 	"testing"
+  "net/http"
+  "io/ioutil"
+  "encoding/json"
 
+  "k8s.io/kubernetes/pkg/api"
 	"github.com/stretchr/testify/assert"
+  "k8s.io/kubernetes/pkg/api/unversioned"
+  "github.com/northwesternmutual/kanali/spec"
+  "github.com/northwesternmutual/kanali/metrics"
+  opentracing "github.com/opentracing/opentracing-go"
 )
 
 func TestMockServiceGetName(t *testing.T) {
-	assert := assert.New(t)
 	step := MockServiceStep{}
-	assert.Equal(step.GetName(), "Mock Service", "step name is incorrect")
+	assert.Equal(t, step.GetName(), "Mock Service", "step name is incorrect")
+}
+
+func TestMockServiceDo(t *testing.T) {
+  cms := getTestConfigMaps()
+  spec.MockResponseStore.Clear()
+  spec.MockResponseStore.Set(cms[0])
+  spec.ProxyStore.Set(spec.APIProxy{
+    TypeMeta: unversioned.TypeMeta{},
+    ObjectMeta: api.ObjectMeta{
+      Name:      "proxy-one",
+      Namespace: "foo",
+    },
+    Spec: spec.APIProxySpec{
+      Path: "api/v1/accounts",
+      Target: "/foo",
+      Mock: &spec.Mock{
+        ConfigMapName: "cm-one",
+      },
+    },
+  })
+  spec.ProxyStore.Set(spec.APIProxy{
+    TypeMeta: unversioned.TypeMeta{},
+    ObjectMeta: api.ObjectMeta{
+      Name:      "proxy-one",
+      Namespace: "foo",
+    },
+    Spec: spec.APIProxySpec{
+      Path: "api/v1/balance",
+      Target: "/car",
+      Mock: &spec.Mock{
+        ConfigMapName: "cm-one",
+      },
+    },
+  })
+  spec.ProxyStore.Set(spec.APIProxy{
+    TypeMeta: unversioned.TypeMeta{},
+    ObjectMeta: api.ObjectMeta{
+      Name:      "proxy-one",
+      Namespace: "foo",
+    },
+    Spec: spec.APIProxySpec{
+      Path: "api/v1/address",
+      Target: "/car",
+      Mock: &spec.Mock{
+        ConfigMapName: "cm-two",
+      },
+    },
+  })
+  step := MockServiceStep{}
+
+  m := &metrics.Metrics{}
+  req, _ := http.NewRequest("GET", "http://foo.bar.com/api/v1/accounts", nil)
+  res := &http.Response{}
+  span := opentracing.StartSpan("test span")
+  err := step.Do(context.Background(), m, nil, nil, req, res, span)
+  assert.Nil(t, err)
+  assert.Equal(t, m.Get("http_response_code").Value, "200")
+  assert.Equal(t, res.Header.Get("Content-Type"), "application/json")
+  body, _ := ioutil.ReadAll(res.Body)
+  assert.Equal(t, string(body), `{"foo":"bar"}`)
+  req, _ = http.NewRequest("GET", "http://foo.bar.com/", nil)
+  assert.Equal(t, step.Do(context.Background(), m, nil, nil, req, res, span).Error(), "proxy not found")
+  req, _ = http.NewRequest("GET", "http://foo.bar.com/api/v1/accounts/bar", nil)
+  assert.Nil(t, step.Do(context.Background(), m, nil, nil, req, res, span))
+  req, _ = http.NewRequest("GET", "http://foo.bar.com/api/v1/balance", nil)
+  assert.Equal(t, step.Do(context.Background(), m, nil, nil, req, res, span).Error(), "no mock response found")
+  req, _ = http.NewRequest("GET", "http://foo.bar.com/api/v1/address", nil)
+  assert.Equal(t, step.Do(context.Background(), m, nil, nil, req, res, span).Error(), "no mock response found")
+}
+
+func getTestConfigMaps() []api.ConfigMap {
+
+	mockOne, _ := json.Marshal([]spec.Route{
+		{
+			Route:  "/foo",
+			Code:   200,
+			Method: "GET",
+			Body:   map[string]interface{}{
+        "foo": "bar",
+      },
+		},
+	})
+
+	return []api.ConfigMap{
+		{
+			TypeMeta: unversioned.TypeMeta{},
+			ObjectMeta: api.ObjectMeta{
+				Name:      "cm-one",
+				Namespace: "foo",
+			},
+			Data: map[string]string{
+				"response": string(mockOne),
+			},
+		},
+	}
+
 }