diff options
Diffstat (limited to 'header_test.go')
| -rw-r--r-- | header_test.go | 92 |
1 files changed, 46 insertions, 46 deletions
diff --git a/header_test.go b/header_test.go index b035078..9b984ec 100644 --- a/header_test.go +++ b/header_test.go @@ -79,71 +79,71 @@ var headers = map[string]struct { e error }{ // invalid version - "cnp/0.3ok\n": {e: ErrorSyntax{}}, - "cwp/0.3 ok\n": {e: ErrorSyntax{}}, - "cnp/0.03 ok\n": {e: ErrorSyntax{}}, - "cnp/00.3 ok\n": {e: ErrorSyntax{}}, - "cnp/0..3 ok\n": {e: ErrorSyntax{}}, - "cnp/.3 ok\n": {e: ErrorSyntax{}}, + "cnp/0.4ok\n": {e: ErrorSyntax{}}, + "cwp/0.4 ok\n": {e: ErrorSyntax{}}, + "cnp/0.04 ok\n": {e: ErrorSyntax{}}, + "cnp/00.4 ok\n": {e: ErrorSyntax{}}, + "cnp/0..4 ok\n": {e: ErrorSyntax{}}, + "cnp/.4 ok\n": {e: ErrorSyntax{}}, "cnp/0. ok\n": {e: ErrorSyntax{}}, "cnp/. ok\n": {e: ErrorSyntax{}}, - "cnp/0,3 ok\n": {e: ErrorSyntax{}}, - "/0.3 ok\n": {e: ErrorSyntax{}}, - "0.3 ok\n": {e: ErrorSyntax{}}, + "cnp/0,4 ok\n": {e: ErrorSyntax{}}, + "/0.4 ok\n": {e: ErrorSyntax{}}, + "0.4 ok\n": {e: ErrorSyntax{}}, "cnp/ ok\n": {e: ErrorSyntax{}}, "cnp ok\n": {e: ErrorSyntax{}}, - "cnp.0.3 ok\n": {e: ErrorSyntax{}}, - "cnp/03 ok\n": {e: ErrorSyntax{}}, - "cnp/3 ok\n": {e: ErrorSyntax{}}, + "cnp.0.4 ok\n": {e: ErrorSyntax{}}, + "cnp/04 ok\n": {e: ErrorSyntax{}}, + "cnp/4 ok\n": {e: ErrorSyntax{}}, "cnp/0 ok\n": {e: ErrorSyntax{}}, - "cnp/0 3 ok\n": {e: ErrorSyntax{}}, - "cnp/0/3 ok\n": {e: ErrorSyntax{}}, + "cnp/0 4 ok\n": {e: ErrorSyntax{}}, + "cnp/0/4 ok\n": {e: ErrorSyntax{}}, // missing/invalid intent - "cnp/0.3\n": {e: ErrorSyntax{}}, - "cnp/0.3 \n": {e: ErrorSyntax{}}, - "cnp/0.3 o\x00k\n": {e: ErrorSyntax{}}, - "cnp/0.3 foo=bar\n": {e: ErrorSyntax{}}, + "cnp/0.4\n": {e: ErrorSyntax{}}, + "cnp/0.4 \n": {e: ErrorSyntax{}}, + "cnp/0.4 o\x00k\n": {e: ErrorSyntax{}}, + "cnp/0.4 foo=bar\n": {e: ErrorSyntax{}}, // missing/invalid line end - "cnp/0.3 ok \n": {e: ErrorSyntax{}}, - "cnp/0.3 ok\n\n": {e: ErrorSyntax{}}, - "cnp/0.3 ok": {e: ErrorSyntax{}}, - "cnp/0.3 ok ": {e: ErrorSyntax{}}, - "cnp/0.3 ok foo=bar \n": {e: ErrorSyntax{}}, - "cnp/0.3 ok foo=bar": {e: ErrorSyntax{}}, - "cnp/0.3 ok = =\n": {e: ErrorSyntax{}}, + "cnp/0.4 ok \n": {e: ErrorSyntax{}}, + "cnp/0.4 ok\n\n": {e: ErrorSyntax{}}, + "cnp/0.4 ok": {e: ErrorSyntax{}}, + "cnp/0.4 ok ": {e: ErrorSyntax{}}, + "cnp/0.4 ok foo=bar \n": {e: ErrorSyntax{}}, + "cnp/0.4 ok foo=bar": {e: ErrorSyntax{}}, + "cnp/0.4 ok = =\n": {e: ErrorSyntax{}}, // spaces - "cnp/0.3 ok foo=bar\n": {e: ErrorSyntax{}}, - "cnp/0.3 ok\n": {e: ErrorSyntax{}}, - "cnp/0.3\tok\n": {e: ErrorSyntax{}}, + "cnp/0.4 ok foo=bar\n": {e: ErrorSyntax{}}, + "cnp/0.4 ok\n": {e: ErrorSyntax{}}, + "cnp/0.4\tok\n": {e: ErrorSyntax{}}, // invalid params - "cnp/0.3 ok foo==bar\n": {e: ErrorSyntax{}}, - "cnp/0.3 ok foo=bar=baz\n": {e: ErrorSyntax{}}, - "cnp/0.3 ok foo=bar baz=quux \n": {e: ErrorSyntax{}}, - "cnp/0.3 ok foo\\-bar\n": {e: ErrorSyntax{}}, + "cnp/0.4 ok foo==bar\n": {e: ErrorSyntax{}}, + "cnp/0.4 ok foo=bar=baz\n": {e: ErrorSyntax{}}, + "cnp/0.4 ok foo=bar baz=quux \n": {e: ErrorSyntax{}}, + "cnp/0.4 ok foo\\-bar\n": {e: ErrorSyntax{}}, // invalid escape sequences - "cnp/0.3 o\\k\n": {e: ErrorSyntax{}}, - "cnp/0.3 ok qwe=\\\n": {e: ErrorSyntax{}}, - "cnp/0.3 ok fo\\o=bar\n": {e: ErrorSyntax{}}, + "cnp/0.4 o\\k\n": {e: ErrorSyntax{}}, + "cnp/0.4 ok qwe=\\\n": {e: ErrorSyntax{}}, + "cnp/0.4 ok fo\\o=bar\n": {e: ErrorSyntax{}}, // valid "cnp/0.0 ok\n": {h: Header{0, 0, "ok", nil}}, - "cnp/0.3 ok\n": {h: Header{0, 3, "ok", nil}}, + "cnp/0.4 ok\n": {h: Header{0, 4, "ok", nil}}, "cnp/1.0 ok\n": {h: Header{1, 0, "ok", nil}}, "cnp/123456.987654 ok\n": {h: Header{123456, 987654, "ok", nil}}, "cnp/0.1 ok\n": {h: Header{0, 1, "ok", nil}}, - "cnp/0.3 ok\r\n": {h: Header{0, 3, "ok\r", nil}}, - "cnp/0.3 foo\\nbar\n": {h: Header{0, 3, "foo\nbar", nil}}, - "cnp/0.3 \\-\\_\\n\\0\\\\\n": {h: Header{0, 3, "= \n\x00\\", nil}}, + "cnp/0.4 ok\r\n": {h: Header{0, 4, "ok\r", nil}}, + "cnp/0.4 foo\\nbar\n": {h: Header{0, 4, "foo\nbar", nil}}, + "cnp/0.4 \\-\\_\\n\\0\\\\\n": {h: Header{0, 4, "= \n\x00\\", nil}}, // valid with params - "cnp/0.3 ok type=text/plain\n": {h: Header{0, 3, "ok", Parameters{"type": "text/plain"}}}, - "cnp/0.3 ok baz=quux foo=bar qwe=asd\n": {h: Header{0, 3, "ok", Parameters{"foo": "bar", "baz": "quux", "qwe": "asd"}}}, - "cnp/0.3 ok = \\_=\\0 \\-=\\n\r\n": {h: Header{0, 3, "ok", Parameters{"": "", "=": "\n\r", " ": "\x00"}}}, + "cnp/0.4 ok type=text/plain\n": {h: Header{0, 4, "ok", Parameters{"type": "text/plain"}}}, + "cnp/0.4 ok baz=quux foo=bar qwe=asd\n": {h: Header{0, 4, "ok", Parameters{"foo": "bar", "baz": "quux", "qwe": "asd"}}}, + "cnp/0.4 ok = \\_=\\0 \\-=\\n\r\n": {h: Header{0, 4, "ok", Parameters{"": "", "=": "\n\r", " ": "\x00"}}}, } func TestHeaderParse(t *testing.T) { @@ -176,8 +176,8 @@ func TestHeaderCompose(t *testing.T) { } func TestNewHeader(t *testing.T) { - raw := "cnp/0.3 ok baz=quux foo=bar qwe=asd\n" - hdr := Header{0, 3, "ok", Parameters{"foo": "bar", "baz": "quux", "qwe": "asd"}} + raw := "cnp/0.4 ok baz=quux foo=bar qwe=asd\n" + hdr := Header{0, 4, "ok", Parameters{"foo": "bar", "baz": "quux", "qwe": "asd"}} h := NewHeader("ok", Parameters{"foo": "bar", "baz": "quux", "qwe": "asd"}) if !headerEqual(hdr, h) { t.Errorf("%+v: expected %+v", h, hdr) @@ -187,8 +187,8 @@ func TestNewHeader(t *testing.T) { t.Errorf("%q: expected %q", h, hdr) } - raw = "cnp/0.3 ok\n" - hdr = Header{0, 3, "ok", nil} + raw = "cnp/0.4 ok\n" + hdr = Header{0, 4, "ok", nil} h = NewHeader("ok", nil) if !headerEqual(hdr, h) { t.Errorf("%+v: expected %+v", h, hdr) |