1
0
mirror of https://github.com/golang/go synced 2024-11-18 05:44:47 -07:00

testing/quick: probabilistically generate nil pointers

The documentation for quick.Value says that it "returns an arbitrary
value of the given type." In spite of this, nil values for pointers were
never generated, which seems more like an oversight than an intentional
choice.

The lack of nil values meant that testing recursive type like

  type Node struct {
  	Next *Node
  }

with testing/quick would lead to a stack overflow since the data
structure would never terminate.

This change may break tests that don't check for nil with pointers
returned from quick.Value. Two such instances were found in the standard
library, one of which was in the testing/quick package itself.

Fixes #8818.

Change-Id: Id390dcce649d12fbbaa801ce6f58f5defed77e60
Reviewed-on: https://go-review.googlesource.com/10821
Reviewed-by: Adam Langley <agl@golang.org>
Run-TryBot: Adam Langley <agl@golang.org>
This commit is contained in:
Håvard Haugen 2015-06-07 21:28:58 +02:00 committed by Adam Langley
parent 13e2412876
commit 7089ea4e47
3 changed files with 32 additions and 11 deletions

View File

@ -146,7 +146,7 @@ func TestLineBreaker(t *testing.T) {
} }
func TestFuzz(t *testing.T) { func TestFuzz(t *testing.T) {
testRoundtrip := func(block *Block) bool { testRoundtrip := func(block Block) bool {
for key := range block.Headers { for key := range block.Headers {
if strings.Contains(key, ":") { if strings.Contains(key, ":") {
// Keys with colons cannot be encoded. // Keys with colons cannot be encoded.
@ -155,14 +155,14 @@ func TestFuzz(t *testing.T) {
} }
var buf bytes.Buffer var buf bytes.Buffer
err := Encode(&buf, block) err := Encode(&buf, &block)
decoded, rest := Decode(buf.Bytes()) decoded, rest := Decode(buf.Bytes())
switch { switch {
case err != nil: case err != nil:
t.Errorf("Encode of %#v resulted in error: %s", block, err) t.Errorf("Encode of %#v resulted in error: %s", &block, err)
case !reflect.DeepEqual(block, decoded): case !reflect.DeepEqual(&block, decoded):
t.Errorf("Encode of %#v decoded as %#v", block, decoded) t.Errorf("Encode of %#v decoded as %#v", &block, decoded)
case len(rest) != 0: case len(rest) != 0:
t.Errorf("Encode of %#v decoded correctly, but with %x left over", block, rest) t.Errorf("Encode of %#v decoded correctly, but with %x left over", block, rest)
default: default:
@ -172,7 +172,7 @@ func TestFuzz(t *testing.T) {
} }
// Explicitly test the empty block. // Explicitly test the empty block.
if !testRoundtrip(&Block{ if !testRoundtrip(Block{
Type: "EMPTY", Type: "EMPTY",
Headers: make(map[string]string), Headers: make(map[string]string),
Bytes: []byte{}, Bytes: []byte{},

View File

@ -102,12 +102,16 @@ func Value(t reflect.Type, rand *rand.Rand) (value reflect.Value, ok bool) {
v.SetMapIndex(key, value) v.SetMapIndex(key, value)
} }
case reflect.Ptr: case reflect.Ptr:
if rand.Intn(complexSize) == 0 {
v.Set(reflect.Zero(concrete)) // Generate nil pointer.
} else {
elem, ok := Value(concrete.Elem(), rand) elem, ok := Value(concrete.Elem(), rand)
if !ok { if !ok {
return reflect.Value{}, false return reflect.Value{}, false
} }
v.Set(reflect.New(concrete.Elem())) v.Set(reflect.New(concrete.Elem()))
v.Elem().Set(elem) v.Elem().Set(elem)
}
case reflect.Slice: case reflect.Slice:
numElems := rand.Intn(complexSize) numElems := rand.Intn(complexSize)
v.Set(reflect.MakeSlice(concrete, numElems, numElems)) v.Set(reflect.MakeSlice(concrete, numElems, numElems))

View File

@ -83,6 +83,9 @@ type TestMapAlias map[int]int
func fMapAlias(a TestMapAlias) TestMapAlias { return a } func fMapAlias(a TestMapAlias) TestMapAlias { return a }
func fPtr(a *int) *int { func fPtr(a *int) *int {
if a == nil {
return nil
}
b := *a b := *a
return &b return &b
} }
@ -255,3 +258,17 @@ func TestFailure(t *testing.T) {
t.Errorf("#3 Error was not a SetupError: %s", err) t.Errorf("#3 Error was not a SetupError: %s", err)
} }
} }
// The following test didn't terminate because nil pointers were not
// generated.
// Issue 8818.
func TestNilPointers(t *testing.T) {
type Recursive struct {
Next *Recursive
}
f := func(rec Recursive) bool {
return true
}
Check(f, nil)
}