Fix test failures caused by adding a new field to Package

gotestyourself · Jun 6, 2020 · dff8591 · dff8591
1 parent c6c06f8
commit dff8591
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 4 deletions.
diff --git a/testjson/execution_test.go b/testjson/execution_test.go
@@ -6,6 +6,7 @@ import (
 	"time"
 
 	"github.com/google/go-cmp/cmp"
+	"github.com/google/go-cmp/cmp/cmpopts"
 	"gotest.tools/v3/assert"
 	"gotest.tools/v3/golden"
 )
@@ -45,7 +46,10 @@ func TestExecution_Add_PackageCoverage(t *testing.T) {
 	assert.DeepEqual(t, pkg, expected, cmpPackage)
 }
 
-var cmpPackage = cmp.AllowUnexported(Package{})
+var cmpPackage = cmp.Options{
+	cmp.AllowUnexported(Package{}),
+	cmpopts.EquateEmpty(),
+}
 
 func TestScanTestOutput_MinimalConfig(t *testing.T) {
 	in := bytes.NewReader(golden.Get(t, "go-test-json.out"))

diff --git a/testjson/format_test.go b/testjson/format_test.go
@@ -6,6 +6,7 @@ import (
 	"time"
 
 	gocmp "github.com/google/go-cmp/cmp"
+	"github.com/google/go-cmp/cmp/cmpopts"
 	"gotest.tools/v3/assert"
 	"gotest.tools/v3/assert/opt"
 	"gotest.tools/v3/golden"
@@ -117,13 +118,14 @@ var expectedExecution = &Execution{
 var cmpExecutionShallow = gocmp.Options{
 	gocmp.AllowUnexported(Execution{}, Package{}),
 	gocmp.FilterPath(stringPath("started"), opt.TimeWithThreshold(10*time.Second)),
+	cmpopts.EquateEmpty(),
 	cmpPackageShallow,
 }
 
 var cmpPackageShallow = gocmp.Options{
-	// TODO: use opt.PathField(Package{}, "output")
-	gocmp.FilterPath(stringPath("packages.output"), gocmp.Ignore()),
-	gocmp.FilterPath(stringPath("packages.Passed"), gocmp.Ignore()),
+	gocmp.FilterPath(opt.PathField(Package{}, "output"), gocmp.Ignore()),
+	gocmp.FilterPath(opt.PathField(Package{}, "Passed"), gocmp.Ignore()),
+	gocmp.FilterPath(opt.PathField(Package{}, "subTests"), gocmp.Ignore()),
 	gocmp.Comparer(func(x, y TestCase) bool {
 		return x.Test == y.Test
 	}),