Feroze Mohideen 2 jaren geleden
bovenliggende
commit
5b6ad3e96a
2 gewijzigde bestanden met toevoegingen van 6 en 8 verwijderingen
  1. 1 1
      go.mod
  2. 5 7
      internal/porter_app/test/porter_app_to_yaml_test.go

+ 1 - 1
go.mod

@@ -243,7 +243,7 @@ require (
 	github.com/gogo/protobuf v1.3.2 // indirect
 	github.com/gogo/protobuf v1.3.2 // indirect
 	github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
 	github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
 	github.com/google/btree v1.1.2 // indirect
 	github.com/google/btree v1.1.2 // indirect
-	github.com/google/go-cmp v0.5.9 // indirect
+	github.com/google/go-cmp v0.5.9
 	github.com/google/go-containerregistry v0.9.0 // indirect
 	github.com/google/go-containerregistry v0.9.0 // indirect
 	github.com/google/go-querystring v1.1.0 // indirect
 	github.com/google/go-querystring v1.1.0 // indirect
 	github.com/google/gofuzz v1.2.0 // indirect
 	github.com/google/gofuzz v1.2.0 // indirect

+ 5 - 7
internal/porter_app/test/porter_app_to_yaml_test.go

@@ -4,10 +4,9 @@ import (
 	"context"
 	"context"
 	"fmt"
 	"fmt"
 	"os"
 	"os"
-	"reflect"
 	"testing"
 	"testing"
 
 
-	"github.com/kr/pretty"
+	"github.com/google/go-cmp/cmp"
 	"github.com/matryer/is"
 	"github.com/matryer/is"
 	porterv1 "github.com/porter-dev/api-contracts/generated/go/porter/v1"
 	porterv1 "github.com/porter-dev/api-contracts/generated/go/porter/v1"
 	"github.com/porter-dev/porter/internal/porter_app"
 	"github.com/porter-dev/porter/internal/porter_app"
@@ -44,8 +43,8 @@ func TestPorterAppToYAML(t *testing.T) {
 func diffPorterAppWithOriginalYamlTest(t *testing.T, is *is.I, wantYaml []byte, got v2.PorterApp) {
 func diffPorterAppWithOriginalYamlTest(t *testing.T, is *is.I, wantYaml []byte, got v2.PorterApp) {
 	t.Helper()
 	t.Helper()
 
 
-	var want map[string]interface{}
-	err := yaml.Unmarshal(wantYaml, &want)
+	var wantMap map[string]interface{}
+	err := yaml.Unmarshal(wantYaml, &wantMap)
 	is.NoErr(err)
 	is.NoErr(err)
 
 
 	gotYaml, err := yaml.Marshal(got)
 	gotYaml, err := yaml.Marshal(got)
@@ -55,8 +54,7 @@ func diffPorterAppWithOriginalYamlTest(t *testing.T, is *is.I, wantYaml []byte,
 	err = yaml.Unmarshal(gotYaml, &gotMap)
 	err = yaml.Unmarshal(gotYaml, &gotMap)
 	is.NoErr(err)
 	is.NoErr(err)
 
 
-	// Compare the maps for equality
-	if !reflect.DeepEqual(want, gotMap) {
-		t.Errorf("Maps are not equal. Diff: %v", pretty.Diff(want, gotMap))
+	if diff := cmp.Diff(wantMap, gotMap); diff != "" {
+		t.Errorf("diff between want and got: %s", diff)
 	}
 	}
 }
 }