Update tests to operate on values rather than pointers

Author: lesiw

go.mod

@@ -9,6 +9,7 @@ require (
 )
 
 require (
+	github.com/google/go-cmp v0.6.0 // indirect
 	golang.org/x/mod v0.19.0 // indirect
 	golang.org/x/sync v0.7.0 // indirect
 )

testdata/types.go

@@ -1,12 +1,11 @@
 package testdata
 
-type M0 struct{ *T0 }
+type M0 struct{ T0 }
+type T0 struct{}
 
-type T0 struct {
-	simpleCalled bool
-}
+var simpleCalled bool
 
-func (t *T0) Simple() { t.simpleCalled = true }
+func (T0) Simple() { simpleCalled = true }
 
 func (T0) OneResult() error                    { return nil }
 func (T0) OneNamedResult() (err error)         { return }

testdata/types_test.go

@@ -3,27 +3,32 @@ package testdata
 import (
 	"errors"
 	"testing"
+
+	"github.com/google/go-cmp/cmp"
+	"github.com/google/go-cmp/cmp/cmpopts"
 )
 
 func TestNoMock(t *testing.T) {
-	m0 := &M0{new(T0)}
+	t.Cleanup(func() { simpleCalled = false })
+	var m0 M0
 	m0.Simple()
-	if !m0.simpleCalled {
+	if !simpleCalled {
 		t.Error("want Simple() call")
 	}
 }
 
 func TestStub(t *testing.T) {
-	m0 := &M0{new(T0)}
+	t.Cleanup(func() { simpleCalled = false })
+	var m0 M0
 	m0._Simple_Stub()
 	m0.Simple()
-	if m0.simpleCalled {
+	if simpleCalled {
 		t.Error("want mock, got Simple() call")
 	}
 }
 
 func TestOneResult(t *testing.T) {
-	m0 := &M0{new(T0)}
+	var m0 M0
 	want := errors.New("error result")
 	m0._OneResult_Return(want)
 	if got := m0.OneResult(); want != got {
@@ -36,7 +41,7 @@ func TestOneResult(t *testing.T) {
 }
 
 func TestOneResultQueue(t *testing.T) {
-	m0 := &M0{new(T0)}
+	var m0 M0
 	err1 := errors.New("error one")
 	err2 := errors.New("error two")
 	m0._OneResult_Return(err1)
@@ -51,3 +56,20 @@ func TestOneResultQueue(t *testing.T) {
 		t.Errorf("M0.OneResult() call #3: want %q, got %q", err1, got)
 	}
 }
+
+func TestCalls(t *testing.T) {
+	var m0 M0
+	m0.OneParamNoResult("call one")
+	m0.OneParamNoResult("call two")
+	m0.OneParamNoResult("call three")
+	want := []_M0_OneParamNoResult_Call{
+		{"call one"},
+		{"call two"},
+		{"call three"},
+	}
+	got := m0._OneParamNoResult_Calls()
+	opt := cmpopts.EquateComparable(_M0_OneParamNoResult_Call{})
+	if !cmp.Equal(want, got, opt) {
+		t.Errorf("M0._OneParamNoResult_Calls():\n%s", cmp.Diff(want, got, opt))
+	}
+}