Update Go library to last weekly.

[pf3gnuchains/gcc-fork.git] / libgo / go / mime / mediatype_test.go

diff --git a/libgo/go/mime/mediatype_test.go b/libgo/go/mime/mediatype_test.go
index 93264bd..884573e 100644 (file)
--- a/libgo/go/mime/mediatype_test.go
+++ b/libgo/go/mime/mediatype_test.go
@@ -219,7 +219,14 @@ func TestParseMediaType(t *testing.T) {
                        m("firstname", "Брэд", "lastname", "Фицпатрик")},
        }
        for _, test := range tests {
-               mt, params := ParseMediaType(test.in)
+               mt, params, err := ParseMediaType(test.in)
+               if err != nil {
+                       if test.t != "" {
+                               t.Errorf("for input %q, unexpected error: %v", test.in, err)
+                               continue
+                       }
+                       continue
+               }
                if g, e := mt, test.t; g != e {
                        t.Errorf("for input %q, expected type %q, got %q",
                                test.in, e, g)
@@ -238,11 +245,11 @@ func TestParseMediaType(t *testing.T) {
 }
 
 func TestParseMediaTypeBogus(t *testing.T) {
-       mt, params := ParseMediaType("bogus ;=========")
-       if mt != "" {
-               t.Error("expected empty type")
+       mt, params, err := ParseMediaType("bogus ;=========")
+       if err == nil {
+               t.Fatalf("expected an error parsing invalid media type; got type %q, params %#v", mt, params)
        }
-       if params != nil {
-               t.Error("expected nil params")
+       if err.String() != "mime: invalid media parameter" {
+               t.Errorf("expected invalid media parameter; got error %q", err)
        }
 }