Skip to content

[extend #1191] Unnecessary alloc for XML, JSON, JSONP #1199

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 7 commits into from
Jan 14, 2019
Merged

[extend #1191] Unnecessary alloc for XML, JSON, JSONP #1199

Changes from 1 commit
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
d0b6d07
[extend #1191] Unnecessary alloc for XML, JSON, JSONP
im-kulikov Oct 1, 2018
3dc6c4f
add legacy (JSON/JSONP/XML)Blob tests
im-kulikov Oct 1, 2018
bb09993
fix namings
im-kulikov Oct 1, 2018
e332624
fix `jsonPBlob` allocs
im-kulikov Oct 1, 2018
2cb6d3a
fix review comments (thx @alexaandru)
im-kulikov Oct 10, 2018
521e4e0
fix review comments (thx @alexaandru)
im-kulikov Oct 10, 2018
c939bc1
Merge branch 'master' of git://github.com/labstack/echo into unnecess…
im-kulikov Oct 15, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
add legacy (JSON/JSONP/XML)Blob tests
  • Loading branch information
@im-kulikov
im-kulikov committed Oct 1, 2018
commit 3dc6c4f1605561ee404258a3b0675036e13e6fad
38 changes: 38 additions & 0 deletions context_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ package echo

import (
"bytes"
"encoding/json"
"encoding/xml"
"errors"
"io"
Expand Down Expand Up @@ -147,6 +148,43 @@ func TestContext(t *testing.T) {
assert.Equal(t, xml.Header+userXMLPretty, rec.Body.String())
}

// Legacy JSONBlob
rec = httptest.NewRecorder()
c = e.NewContext(req, rec).(*context)
data, err := json.Marshal(user{1, "Jon Snow"})
assert.NoError(t, err)
err = c.JSONBlob(http.StatusOK, data)
if assert.NoError(t, err) {
assert.Equal(t, http.StatusOK, rec.Code)
assert.Equal(t, MIMEApplicationJSONCharsetUTF8, rec.Header().Get(HeaderContentType))
assert.Equal(t, userJSON, rec.Body.String())
}

// Legacy JSONP
rec = httptest.NewRecorder()
c = e.NewContext(req, rec).(*context)
callback = "callback"
data, err = json.Marshal(user{1, "Jon Snow"})
assert.NoError(t, err)
err = c.JSONPBlob(http.StatusOK, callback, data)
if assert.NoError(t, err) {
assert.Equal(t, http.StatusOK, rec.Code)
assert.Equal(t, MIMEApplicationJavaScriptCharsetUTF8, rec.Header().Get(HeaderContentType))
assert.Equal(t, callback+"("+userJSON+");", rec.Body.String())
}

// Legacy XML
rec = httptest.NewRecorder()
c = e.NewContext(req, rec).(*context)
data, err = xml.Marshal(user{1, "Jon Snow"})
assert.NoError(t, err)
err = c.XMLBlob(http.StatusOK, data)
if assert.NoError(t, err) {
assert.Equal(t, http.StatusOK, rec.Code)
assert.Equal(t, MIMEApplicationXMLCharsetUTF8, rec.Header().Get(HeaderContentType))
assert.Equal(t, xml.Header+userXML, rec.Body.String())
}

// String
rec = httptest.NewRecorder()
c = e.NewContext(req, rec).(*context)
Expand Down