Merge pull request #196 from govau/fixtests

Add basic tests for new caching

caching/caching.go

@@ -2,10 +2,8 @@ package caching
 
 import (
 	"errors"
-	"net/http"
+	"io"
 	"regexp"
-
-	cfclient "github.com/cloudfoundry-community/go-cfclient"
 )
 
 type App struct {
@@ -40,20 +38,15 @@ type CacheStore interface {
 	Set(key string, value interface{}) error
 }
 
+//go:generate counterfeiter . Caching
 type Caching interface {
 	FillCache() error
 	GetApp(string) (*App, error)
 }
 
+//go:generate counterfeiter . CFSimpleClient
 type CFSimpleClient interface {
-	DoGet(url string) (*http.Response, error)
-}
-
-type AppClient interface {
-	AppByGuid(appGuid string) (cfclient.App, error)
-	ListOrgs() ([]cfclient.Org, error)
-	OrgSpaces(guid string) ([]cfclient.Space, error)
-	GetAppByGuidNoInlineCall(appGuid string) (cfclient.App, error)
+	DoGet(url string) (io.ReadCloser, error)
 }
 
 func IsNeeded(wantedEvents string) bool {

caching/caching_cfclientadapter.go

@@ -1,6 +1,8 @@
 package caching
 
 import (
+	"fmt"
+	"io"
 	"net/http"
 
 	cfclient "github.com/cloudfoundry-community/go-cfclient"
@@ -10,6 +12,16 @@ type CFClientAdapter struct {
 	CF *cfclient.Client
 }
 
-func (c *CFClientAdapter) DoGet(url string) (*http.Response, error) {
-	return c.CF.DoRequestWithoutRedirects(c.CF.NewRequest(http.MethodGet, url))
+func (c *CFClientAdapter) DoGet(url string) (io.ReadCloser, error) {
+	resp, err := c.CF.DoRequestWithoutRedirects(c.CF.NewRequest(http.MethodGet, url))
+	if err != nil {
+		return nil, err
+	}
+
+	if resp.StatusCode != http.StatusOK {
+		resp.Body.Close()
+		return nil, fmt.Errorf("bad status code: %s", resp.Status)
+	}
+
+	return resp.Body, nil
 }

caching/caching_lazyfill.go

@@ -4,7 +4,6 @@ import (
 	"encoding/json"
 	"fmt"
 	"math/rand"
-	"net/http"
 	"strings"
 	"time"
 
@@ -195,13 +194,9 @@ func (c *CacheLazyFill) makeRequestAndDecodeJSON(url string, rv interface{}) err
 	if err != nil {
 		return err
 	}
-	defer resp.Body.Close()
+	defer resp.Close()
 
-	if resp.StatusCode != http.StatusOK {
-		return fmt.Errorf("bad status code: %s", resp.Status)
-	}
-
-	err = json.NewDecoder(resp.Body).Decode(rv)
+	err = json.NewDecoder(resp).Decode(rv)
 	if err != nil {
 		return err
 	}