@@ -2,8 +2,6 @@ package mimeheader_test
22
33import (
44 "errors"
5- "fmt"
6- "mime"
75 "reflect"
86 "testing"
97
@@ -19,12 +17,8 @@ func TestParseMediaType(t *testing.T) {
1917 t .Parallel ()
2018
2119 b , err := mimeheader .ParseMediaType (prov .mtype )
22- if (prov .expErr == nil ) != (err == nil ) {
23- t .Errorf ("Unexpected error.\n Expected: %+v\n Actual: %+v\n " , prov .expErr , err )
24- }
25-
26- if err != nil && prov .expErr != nil && prov .expErr .Error () != err .Error () {
27- t .Fatalf ("Enuxpected error message.\n Expected: %s\n Actual: %s\n " , prov .expErr .Error (), err .Error ())
20+ if ! errors .Is (err , prov .expErr ) && ! errors .As (err , & prov .expErr ) {
21+ t .Errorf ("Unexpected error.\n Expected: %#v\n Actual: %#v\n " , prov .expErr , err )
2822 }
2923
3024 if ! reflect .DeepEqual (prov .exp , b ) {
@@ -109,31 +103,31 @@ func providerParseMediaType() []parseMediaType {
109103 {
110104 name : "Empty error" ,
111105 mtype : "" ,
112- expErr : fmt . Errorf ( "%s: %w" , mimeheader .ParseMediaTypeErrMsg , errors . New ( "mime: no media type" )) ,
106+ expErr : mimeheader.MimeParseErr {} ,
113107 exp : mimeheader.MimeType {},
114108 },
115109 {
116110 name : "Wrong wildcard" ,
117111 mtype : "*/plain" ,
118- expErr : mimeheader .ErrMimeTypeWildcard ,
112+ expErr : mimeheader.MimeTypeWildcardErr {} ,
119113 exp : mimeheader.MimeType {},
120114 },
121115 {
122116 name : "Wrong delimiters" ,
123117 mtype : "text/plain;;" ,
124- expErr : fmt . Errorf ( "%s: %w" , mimeheader .ParseMediaTypeErrMsg , errors . New ( "mime: invalid media parameter" )) ,
118+ expErr : mimeheader.MimeParseErr {} ,
125119 exp : mimeheader.MimeType {},
126120 },
127121 {
128122 name : "Invalid parts number" ,
129123 mtype : "*-plain" ,
130- expErr : mimeheader .ErrMimeTypeParts ,
124+ expErr : mimeheader.MimeTypePartsErr {} ,
131125 exp : mimeheader.MimeType {},
132126 },
133127 {
134128 name : "Wrong parameter" ,
135129 mtype : "text/plain; p=" ,
136- expErr : fmt . Errorf ( "%s: %w" , mimeheader .ParseMediaTypeErrMsg , mime . ErrInvalidMediaParameter ) ,
130+ expErr : mimeheader.MimeTypeWildcardErr {} ,
137131 exp : mimeheader.MimeType {},
138132 },
139133 }
0 commit comments