diff options
author | Michael Stapelberg <stapelberg@debian.org> | 2014-06-19 09:23:02 +0200 |
---|---|---|
committer | Michael Stapelberg <stapelberg@debian.org> | 2014-06-19 09:23:02 +0200 |
commit | 8fcc691d6fa80c9ddf38bf0d34b803bab0e421d5 (patch) | |
tree | ba71646a10b518372d110532d86fcf0b98edc14f /src/pkg/go/parser/parser_test.go | |
parent | 3bb719bbf3cdb97b3901f3baaa2da9d02a5c3cdb (diff) | |
parent | 8a39ee361feb9bf46d728ff1ba4f07ca1d9610b1 (diff) | |
download | golang-8fcc691d6fa80c9ddf38bf0d34b803bab0e421d5.tar.gz |
Merge tag 'upstream/1.3' into debian-sid
Upstream version 1.3
Diffstat (limited to 'src/pkg/go/parser/parser_test.go')
-rw-r--r-- | src/pkg/go/parser/parser_test.go | 15 |
1 files changed, 11 insertions, 4 deletions
diff --git a/src/pkg/go/parser/parser_test.go b/src/pkg/go/parser/parser_test.go index 0a34b7e50..2797ea518 100644 --- a/src/pkg/go/parser/parser_test.go +++ b/src/pkg/go/parser/parser_test.go @@ -78,7 +78,7 @@ func TestParseExpr(t *testing.T) { } // sanity check if _, ok := x.(*ast.BinaryExpr); !ok { - t.Errorf("ParseExpr(%s): got %T, expected *ast.BinaryExpr", src, x) + t.Errorf("ParseExpr(%s): got %T, want *ast.BinaryExpr", src, x) } // a valid type expression @@ -89,17 +89,24 @@ func TestParseExpr(t *testing.T) { } // sanity check if _, ok := x.(*ast.StructType); !ok { - t.Errorf("ParseExpr(%s): got %T, expected *ast.StructType", src, x) + t.Errorf("ParseExpr(%s): got %T, want *ast.StructType", src, x) } // an invalid expression src = "a + *" _, err = ParseExpr(src) if err == nil { - t.Fatalf("ParseExpr(%s): %v", src, err) + t.Fatalf("ParseExpr(%s): got no error", src) + } + + // a valid expression followed by extra tokens is invalid + src = "a[i] := x" + _, err = ParseExpr(src) + if err == nil { + t.Fatalf("ParseExpr(%s): got no error", src) } - // it must not crash + // ParseExpr must not crash for _, src := range valids { ParseExpr(src) } |