From 28a40d68caaa5deb5cadbec3a584638b8bbd8b02 Mon Sep 17 00:00:00 2001 From: Robert Griesemer Date: Mon, 4 Jan 2010 17:26:01 -0800 Subject: Simplified parser interface. R=rsc, r CC=golang-dev, rog http://codereview.appspot.com/183116 --- src/pkg/go/parser/parser_test.go | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) (limited to 'src/pkg/go/parser/parser_test.go') diff --git a/src/pkg/go/parser/parser_test.go b/src/pkg/go/parser/parser_test.go index 208a7c513..2f7bace6f 100644 --- a/src/pkg/go/parser/parser_test.go +++ b/src/pkg/go/parser/parser_test.go @@ -78,12 +78,17 @@ func dirFilter(d *os.Dir) bool { return nameFilter(d.Name) } func TestParse4(t *testing.T) { path := "." - pkg, err := ParsePackage(path, dirFilter, 0) + pkgs, err := ParseDir(path, dirFilter, 0) if err != nil { - t.Fatalf("ParsePackage(%s): %v", path, err) + t.Fatalf("ParseDir(%s): %v", path, err) } - if pkg.Name != "parser" { - t.Errorf("incorrect package name: %s", pkg.Name) + if len(pkgs) != 1 { + t.Errorf("incorrect number of packages: %d", len(pkgs)) + } + pkg, found := pkgs["parser"] + if pkg == nil || !found { + t.Errorf(`package "parser" not found`) + return } for filename, _ := range pkg.Files { if !nameFilter(filename) { -- cgit v1.2.3