fix the unit tests

Author: Keerthan Mala

Makefile

@@ -12,7 +12,7 @@ DEV_ENV_IMAGE := quay.io/deis/go-dev:0.9.1
 SWAGGER_IMAGE := quay.io/goswagger/swagger:0.5.0
 DEV_ENV_WORK_DIR := /go/src/${REPO_PATH}
 DEV_ENV_PREFIX := docker run --rm -e GO15VENDOREXPERIMENT=1 -v ${CURDIR}:${DEV_ENV_WORK_DIR} -w ${DEV_ENV_WORK_DIR}
-DEV_ENV_CMD := ${DEV_ENV_PREFIX} ${DEV_ENV_IMAGE}
+DEV_ENV_CMD := ${DEV_ENV_PREFIX} -e GODEBUG=cgocheck=0 ${DEV_ENV_IMAGE}
 SWAGGER_CMD := docker run --rm -e GOPATH=/go -v ${CURDIR}:${DEV_ENV_WORK_DIR} -w ${DEV_ENV_WORK_DIR} ${SWAGGER_IMAGE}
 
 # SemVer with build information is defined in the SemVer 2 spec, but Docker

filter_by_age_test.go

@@ -7,7 +7,7 @@ import (
 	"time"
 
 	"github.com/arschles/assert"
-	"github.com/deis/workflow-manager/types"
+	"github.com/deis/workflow-manager-api/pkg/swagger/models"
 	"github.com/jinzhu/gorm"
 )
 
@@ -35,10 +35,10 @@ func newDB() (*gorm.DB, error) {
 	return db, nil
 }
 
-func testCluster() ClusterStateful {
-	cluster := ClusterStateful{}
+func testCluster() models.Cluster {
+	cluster := models.Cluster{}
 	cluster.ID = clusterID
-	cluster.Components = []types.ComponentVersion{testComponentVersion()}
+	cluster.Components = []*models.ComponentVersion{testComponentVersion()}
 	return cluster
 }
 
@@ -47,15 +47,16 @@ func TestClusterRoundTrip(t *testing.T) {
 	assert.NoErr(t, err)
 	cluster, err := GetCluster(sqliteDB, clusterID)
 	assert.True(t, err != nil, "error not returned when expected")
-	assert.Equal(t, cluster, ClusterStateful{}, "returned cluster")
+	assert.Equal(t, cluster, models.Cluster{}, "returned cluster")
 	expectedCluster := testCluster()
 	// the first time we invoke .CheckInAndSetCluster() it will create a new record
 	newCluster, err := UpsertCluster(sqliteDB, clusterID, expectedCluster)
 	assert.NoErr(t, err)
 	assert.Equal(t, newCluster.ID, expectedCluster.ID, "cluster ID property")
 	assert.Equal(t, newCluster.Components[0].Component.Description, expectedCluster.Components[0].Component.Description, "cluster component description property")
 	// modify the cluster object
-	expectedCluster.Components[0].Component.Description = "new description"
+	desc := "new description"
+	expectedCluster.Components[0].Component.Description = &desc
 	// the next time we invoke .CheckInAndSetCluster() it should update the existing record we just created
 	updatedCluster, err := UpsertCluster(sqliteDB, clusterID, expectedCluster)
 	assert.NoErr(t, err)

get_latest_versions_test.go

@@ -1,17 +1,21 @@
 package data
 
+import (
+	"github.com/deis/workflow-manager-api/pkg/swagger/models"
+)
+
 const (
-	clusterID            = "testcluster"
-	componentName        = "testcomponent"
-	componentDescription = "this is a component"
-	version              = "testversion"
-	train                = "stable"
-	released             = "2006-01-02T15:04:05Z"
-	updateAvailable      = "yup"
+	clusterID     = "testcluster"
+	componentName = "testcomponent"
+	version       = "testversion"
+	train         = "stable"
+	released      = "2006-01-02T15:04:05Z"
 )
 
 var (
-	versionData = map[string]interface{}{
-		"notes": "release notes",
+	versionData = models.Data{
+		Description: "release notes",
 	}
+	componentDescription = "this is a component"
+	updateAvailable      = "yup"
 )

pkg/data/cluster_test.go

@@ -3,7 +3,7 @@ package data
 import (
 	"fmt"
 
-	"github.com/deis/workflow-manager/types"
+	"github.com/deis/workflow-manager-api/pkg/swagger/models"
 )
 
 // ComponentAndTrain represents a component and its train. It is used in functions such as
@@ -14,7 +14,7 @@ type ComponentAndTrain struct {
 	Train         string
 }
 
-func componentAndTrainFromComponentVersion(cv types.ComponentVersion) *ComponentAndTrain {
+func componentAndTrainFromComponentVersion(cv *models.ComponentVersion) *ComponentAndTrain {
 	return &ComponentAndTrain{
 		ComponentName: cv.Component.Name,
 		Train:         cv.Version.Train,

pkg/data/common_test.go

@@ -3,15 +3,14 @@ package data
 import (
 	"encoding/json"
 	"github.com/deis/workflow-manager-api/pkg/swagger/models"
-	"github.com/deis/workflow-manager/types"
 	sqlxTypes "github.com/jmoiron/sqlx/types"
 	"log"
 )
 
-func parseJSONComponent(jTxt sqlxTypes.JSONText) (types.ComponentVersion, error) {
-	ret := new(types.ComponentVersion)
+func parseJSONComponent(jTxt sqlxTypes.JSONText) (models.ComponentVersion, error) {
+	ret := new(models.ComponentVersion)
 	if err := json.Unmarshal(jTxt, ret); err != nil {
-		return types.ComponentVersion{}, err
+		return models.ComponentVersion{}, err
 	}
 	return *ret, nil
 }

pkg/data/component_and_train.go

@@ -5,7 +5,7 @@ import (
 	"testing"
 
 	"github.com/arschles/assert"
-	"github.com/deis/workflow-manager/types"
+	"github.com/deis/workflow-manager-api/pkg/swagger/models"
 	sqlxTypes "github.com/jmoiron/sqlx/types"
 )
 
@@ -18,10 +18,10 @@ func TestParseJSONComponentFail(t *testing.T) {
 }
 
 func TestParseJSONComponentSucc(t *testing.T) {
-	cVer := types.ComponentVersion{
-		Component:       types.Component{Name: "test name", Description: "test description"},
-		Version:         types.Version{Train: "stable", Version: "test version", Released: "test release", Data: versionData},
-		UpdateAvailable: "test update avail",
+	cVer := models.ComponentVersion{
+		Component:       &models.Component{Name: "test name", Description: &componentDescription},
+		Version:         &models.Version{Train: "stable", Version: "test version", Released: "test release", Data: &versionData},
+		UpdateAvailable: &updateAvailable,
 	}
 	b, err := json.Marshal(cVer)
 	if err != nil {