go/echo
go/echo
1
0
Fork 0
mirror of https://github.com/labstack/echo.git synced 2025-05-15 22:16:31 +02:00
Code Issues Releases Activity

Renamed Context#Context => Context#StdContext & Context#SetContext to ContextSetStdContext, 2d772e02cafe06456a1cb5f887248fc79ce9e5f1

Browse Source 
Signed-off-by: Vishal Rana <vr@labstack.com>
This commit is contained in:
Vishal Rana 2016-09-09 11:47:43 -07:00
parent 2d772e02ca
commit 00699ed0db
2 changed files with 12 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
context.go
View File

@ -26,8 +26,11 @@ type (
Context interface { Context interface {
context.Context context.Context
// SetContext sets `context.Context`. // StdContext returns `context.Context`.
SetContext(context.Context) StdContext() context.Context
// SetStdContext sets `context.Context`.
SetStdContext(context.Context)
// Request returns `engine.Request` interface. // Request returns `engine.Request` interface.
Request() engine.Request Request() engine.Request
@ -190,7 +193,11 @@ const (
indexPage = "index.html" indexPage = "index.html"
) )
func (c *echoContext) SetContext(ctx context.Context) { func (c *echoContext) StdContext() context.Context {
return c.context
}
func (c *echoContext) SetStdContext(ctx context.Context) {
c.context = ctx c.context = ctx
} }

4
context_test.go
View File

@ -343,11 +343,11 @@ func TestContextRedirect(t *testing.T) {
func TestContextEmbedded(t *testing.T) { func TestContextEmbedded(t *testing.T) {
var c Context var c Context
c = new(echoContext) c = new(echoContext)
c.SetContext(context.WithValue(c, "key", "val")) c.SetStdContext(context.WithValue(c, "key", "val"))
assert.Equal(t, "val", c.Value("key")) assert.Equal(t, "val", c.Value("key"))
now := time.Now() now := time.Now()
ctx, _ := context.WithDeadline(context.Background(), now) ctx, _ := context.WithDeadline(context.Background(), now)
c.SetContext(ctx) c.SetStdContext(ctx)
n, _ := ctx.Deadline() n, _ := ctx.Deadline()
assert.Equal(t, now, n) assert.Equal(t, now, n)
assert.Equal(t, context.DeadlineExceeded, c.Err()) assert.Equal(t, context.DeadlineExceeded, c.Err())