Closes labstack#314

Signed-off-by: Vishal Rana <[email protected]>

context_test.go

@@ -253,7 +253,7 @@ func testBindError(t *testing.T, c Context, ct string) {
 	switch ct {
 	case ApplicationJSON, ApplicationXML:
 		if assert.IsType(t, new(HTTPError), err) {
-			assert.Equal(t, http.StatusBadRequest, err.(*HTTPError).code)
+			assert.Equal(t, http.StatusBadRequest, err.(*HTTPError).Code)
 		}
 	default:
 		if assert.IsType(t, new(HTTPError), err) {

echo.go

@@ -41,8 +41,8 @@ type (
 	}
 
 	HTTPError struct {
-		code    int
-		message string
+		Code    int
+		Message string
 	}
 
 	Middleware interface {
@@ -240,8 +240,8 @@ func (e *Echo) DefaultHTTPErrorHandler(err error, c Context) {
 	code := http.StatusInternalServerError
 	msg := http.StatusText(code)
 	if he, ok := err.(*HTTPError); ok {
-		code = he.code
-		msg = he.message
+		code = he.Code
+		msg = he.Message
 	}
 	if e.debug {
 		msg = err.Error()
@@ -426,27 +426,17 @@ func (e *Echo) Run(eng engine.Engine) {
 }
 
 func NewHTTPError(code int, msg ...string) *HTTPError {
-	he := &HTTPError{code: code, message: http.StatusText(code)}
+	he := &HTTPError{Code: code, Message: http.StatusText(code)}
 	if len(msg) > 0 {
 		m := msg[0]
-		he.message = m
+		he.Message = m
 	}
 	return he
 }
 
-// SetCode sets code.
-func (e *HTTPError) SetCode(code int) {
-	e.code = code
-}
-
-// Code returns code.
-func (e *HTTPError) Code() int {
-	return e.code
-}
-
-// Error returns message.
+// Error makes it compatible with `error` interface.
 func (e *HTTPError) Error() string {
-	return e.message
+	return e.Message
 }
 
 func (binder) Bind(i interface{}, c Context) (err error) {

echo_test.go

@@ -263,7 +263,7 @@ func TestEchoMethodNotAllowed(t *testing.T) {
 func TestEchoHTTPError(t *testing.T) {
 	m := http.StatusText(http.StatusBadRequest)
 	he := NewHTTPError(http.StatusBadRequest, m)
-	assert.Equal(t, http.StatusBadRequest, he.Code())
+	assert.Equal(t, http.StatusBadRequest, he.Code)
 	assert.Equal(t, m, he.Error())
 }
 

middleware/auth_test.go

@@ -38,19 +38,19 @@ func TestBasicAuth(t *testing.T) {
 	auth = basic + " " + base64.StdEncoding.EncodeToString([]byte("joe:password"))
 	req.Header().Set(echo.Authorization, auth)
 	he := h.Handle(c).(*echo.HTTPError)
-	assert.Equal(t, http.StatusUnauthorized, he.Code())
+	assert.Equal(t, http.StatusUnauthorized, he.Code)
 	assert.Equal(t, basic+" realm=Restricted", res.Header().Get(echo.WWWAuthenticate))
 
 	// Empty Authorization header
 	req.Header().Set(echo.Authorization, "")
 	he = h.Handle(c).(*echo.HTTPError)
-	assert.Equal(t, http.StatusUnauthorized, he.Code())
+	assert.Equal(t, http.StatusUnauthorized, he.Code)
 	assert.Equal(t, basic+" realm=Restricted", res.Header().Get(echo.WWWAuthenticate))
 
 	// Invalid Authorization header
 	auth = base64.StdEncoding.EncodeToString([]byte("invalid"))
 	req.Header().Set(echo.Authorization, auth)
 	he = h.Handle(c).(*echo.HTTPError)
-	assert.Equal(t, http.StatusUnauthorized, he.Code())
+	assert.Equal(t, http.StatusUnauthorized, he.Code)
 	assert.Equal(t, basic+" realm=Restricted", res.Header().Get(echo.WWWAuthenticate))
 }

router_test.go

@@ -411,7 +411,7 @@ func TestRouterMultiRoute(t *testing.T) {
 	c = NewContext(nil, nil, e)
 	r.Find(GET, "/user", c)
 	he := c.Handle(c).(*HTTPError)
-	assert.Equal(t, http.StatusNotFound, he.code)
+	assert.Equal(t, http.StatusNotFound, he.Code)
 }
 
 func TestRouterPriority(t *testing.T) {
@@ -514,7 +514,7 @@ func TestRouterPriorityNotFound(t *testing.T) {
 	c = NewContext(nil, nil, e)
 	r.Find(GET, "/abc/def", c)
 	he := c.Handle(c).(*HTTPError)
-	assert.Equal(t, http.StatusNotFound, he.Code())
+	assert.Equal(t, http.StatusNotFound, he.Code)
 }
 
 func TestRouterParamNames(t *testing.T) {