1
0
mirror of https://github.com/labstack/echo.git synced 2025-12-05 23:08:17 +02:00

v2 is compiling now

Signed-off-by: Vishal Rana <vr@labstack.com>
This commit is contained in:
Vishal Rana
2016-01-28 23:46:11 -08:00
parent dbd1e8e230
commit 688293b5ed
37 changed files with 832 additions and 1212 deletions

View File

@@ -1,144 +1,146 @@
package middleware
import (
"bytes"
"compress/gzip"
"net/http"
"net/http/httptest"
"testing"
"time"
"github.com/labstack/echo"
"github.com/stretchr/testify/assert"
)
type closeNotifyingRecorder struct {
*httptest.ResponseRecorder
closed chan bool
}
func newCloseNotifyingRecorder() *closeNotifyingRecorder {
return &closeNotifyingRecorder{
httptest.NewRecorder(),
make(chan bool, 1),
}
}
func (c *closeNotifyingRecorder) close() {
c.closed <- true
}
func (c *closeNotifyingRecorder) CloseNotify() <-chan bool {
return c.closed
}
func TestGzip(t *testing.T) {
e := echo.New()
req, _ := http.NewRequest(echo.GET, "/", nil)
rec := httptest.NewRecorder()
c := echo.NewContext(req, echo.NewResponse(rec, e), e)
h := func(c echo.Context) error {
c.Response().Write([]byte("test")) // For Content-Type sniffing
return nil
}
// Skip if no Accept-Encoding header
Gzip()(h)(c)
assert.Equal(t, http.StatusOK, rec.Code)
assert.Equal(t, "test", rec.Body.String())
req, _ = http.NewRequest(echo.GET, "/", nil)
req.Header.Set(echo.AcceptEncoding, "gzip")
rec = httptest.NewRecorder()
c = echo.NewContext(req, echo.NewResponse(rec, e), e)
// Gzip
Gzip()(h)(c)
assert.Equal(t, http.StatusOK, rec.Code)
assert.Equal(t, "gzip", rec.Header().Get(echo.ContentEncoding))
assert.Contains(t, rec.Header().Get(echo.ContentType), echo.TextPlain)
r, err := gzip.NewReader(rec.Body)
defer r.Close()
if assert.NoError(t, err) {
buf := new(bytes.Buffer)
buf.ReadFrom(r)
assert.Equal(t, "test", buf.String())
}
}
func TestGzipFlush(t *testing.T) {
rec := httptest.NewRecorder()
buf := new(bytes.Buffer)
w := gzip.NewWriter(buf)
gw := gzipWriter{Writer: w, ResponseWriter: rec}
n0 := buf.Len()
if n0 != 0 {
t.Fatalf("buffer size = %d before writes; want 0", n0)
}
if err := gw.Flush(); err != nil {
t.Fatal(err)
}
n1 := buf.Len()
if n1 == 0 {
t.Fatal("no data after first flush")
}
gw.Write([]byte("x"))
n2 := buf.Len()
if n1 != n2 {
t.Fatalf("after writing a single byte, size changed from %d to %d; want no change", n1, n2)
}
if err := gw.Flush(); err != nil {
t.Fatal(err)
}
n3 := buf.Len()
if n2 == n3 {
t.Fatal("Flush didn't flush any data")
}
}
func TestGzipCloseNotify(t *testing.T) {
rec := newCloseNotifyingRecorder()
buf := new(bytes.Buffer)
w := gzip.NewWriter(buf)
gw := gzipWriter{Writer: w, ResponseWriter: rec}
closed := false
notifier := gw.CloseNotify()
rec.close()
select {
case <-notifier:
closed = true
case <-time.After(time.Second):
}
assert.Equal(t, closed, true)
}
func BenchmarkGzip(b *testing.B) {
b.StopTimer()
b.ReportAllocs()
h := func(c echo.Context) error {
c.Response().Write([]byte("test")) // For Content-Type sniffing
return nil
}
req, _ := http.NewRequest(echo.GET, "/", nil)
req.Header.Set(echo.AcceptEncoding, "gzip")
b.StartTimer()
for i := 0; i < b.N; i++ {
e := echo.New()
rec := httptest.NewRecorder()
c := echo.NewContext(req, echo.NewResponse(rec, e), e)
Gzip()(h)(c)
}
}
//
// import (
// "bytes"
// "compress/gzip"
// "net/http"
// "net/http/httptest"
// "testing"
// "time"
//
// "github.com/labstack/echo"
// "github.com/labstack/echo/test"
// "github.com/stretchr/testify/assert"
// )
//
// type closeNotifyingRecorder struct {
// *httptest.ResponseRecorder
// closed chan bool
// }
//
// func newCloseNotifyingRecorder() *closeNotifyingRecorder {
// return &closeNotifyingRecorder{
// test.NewResponseRecorder(),
// make(chan bool, 1),
// }
// }
//
// func (c *closeNotifyingRecorder) close() {
// c.closed <- true
// }
//
// func (c *closeNotifyingRecorder) CloseNotify() <-chan bool {
// return c.closed
// }
//
// func TestGzip(t *testing.T) {
// e := echo.New()
// req := test.NewRequest(echo.GET, "/", nil)
// res := test.NewResponseRecorder()
// c := echo.NewContext(req, res, e)
// h := func(c echo.Context) error {
// c.Response().Write([]byte("test")) // For Content-Type sniffing
// return nil
// }
//
// // Skip if no Accept-Encoding header
// Gzip()(h)(c)
// assert.Equal(t, http.StatusOK, res.Status())
// assert.Equal(t, "test", res.Body().String())
//
// req = test.NewRequest(echo.GET, "/", nil)
// req.Header.Set(echo.AcceptEncoding, "gzip")
// res = test.NewResponseRecorder()
// c = echo.NewContext(req, res, e)
//
// // Gzip
// Gzip()(h)(c)
// assert.Equal(t, http.StatusOK, res.Status())
// assert.Equal(t, "gzip", res.Header().Get(echo.ContentEncoding))
// assert.Contains(t, res.Header().Get(echo.ContentType), echo.TextPlain)
// r, err := gzip.NewReader(res.Body())
// defer r.Close()
// if assert.NoError(t, err) {
// buf := new(bytes.Buffer)
// buf.ReadFrom(r)
// assert.Equal(t, "test", buf.String())
// }
// }
//
// func TestGzipFlush(t *testing.T) {
// res := test.NewResponseRecorder()
// buf := new(bytes.Buffer)
// w := gzip.NewWriter(buf)
// gw := gzipWriter{Writer: w, ResponseWriter: res}
//
// n0 := buf.Len()
// if n0 != 0 {
// t.Fatalf("buffer size = %d before writes; want 0", n0)
// }
//
// if err := gw.Flush(); err != nil {
// t.Fatal(err)
// }
//
// n1 := buf.Len()
// if n1 == 0 {
// t.Fatal("no data after first flush")
// }
//
// gw.Write([]byte("x"))
//
// n2 := buf.Len()
// if n1 != n2 {
// t.Fatalf("after writing a single byte, size changed from %d to %d; want no change", n1, n2)
// }
//
// if err := gw.Flush(); err != nil {
// t.Fatal(err)
// }
//
// n3 := buf.Len()
// if n2 == n3 {
// t.Fatal("Flush didn't flush any data")
// }
// }
//
// func TestGzipCloseNotify(t *testing.T) {
// rec := newCloseNotifyingRecorder()
// buf := new(bytes.Buffer)
// w := gzip.NewWriter(buf)
// gw := gzipWriter{Writer: w, ResponseWriter: rec}
// closed := false
// notifier := gw.CloseNotify()
// rec.close()
//
// select {
// case <-notifier:
// closed = true
// case <-time.After(time.Second):
// }
//
// assert.Equal(t, closed, true)
// }
//
// func BenchmarkGzip(b *testing.B) {
// b.StopTimer()
// b.ReportAllocs()
//
// h := func(c echo.Context) error {
// c.Response().Write([]byte("test")) // For Content-Type sniffing
// return nil
// }
// req, _ := http.NewRequest(echo.GET, "/", nil)
// req.Header().Set(echo.AcceptEncoding, "gzip")
//
// b.StartTimer()
//
// for i := 0; i < b.N; i++ {
// e := echo.New()
// res := test.NewResponseRecorder()
// c := echo.NewContext(req, res, e)
// Gzip()(h)(c)
// }
//
// }