Skip to content
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.

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

fix unhandled error in cache package tests #2049

Merged
merged 5 commits into from Aug 26, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
9 changes: 6 additions & 3 deletions app_test.go
Expand Up @@ -499,17 +499,20 @@ func Test_App_Order(t *testing.T) {
app := New()

app.Get("/test", func(c *Ctx) error {
c.Write([]byte("1"))
_, err := c.Write([]byte("1"))
utils.AssertEqual(t, nil, err)
return c.Next()
})

app.All("/test", func(c *Ctx) error {
c.Write([]byte("2"))
_, err := c.Write([]byte("2"))
utils.AssertEqual(t, nil, err)
return c.Next()
})

app.Use(func(c *Ctx) error {
c.Write([]byte("3"))
_, err := c.Write([]byte("3"))
utils.AssertEqual(t, nil, err)
return nil
})

Expand Down
4 changes: 2 additions & 2 deletions internal/go-ole/connect.go
Expand Up @@ -44,8 +44,8 @@ func (c *Connection) Release() {

// Load COM object from list of programIDs or strings.
func (c *Connection) Load(names ...string) (errors []error) {
var tempErrors []error = make([]error, len(names))
var numErrors int = 0
var tempErrors = make([]error, len(names))
var numErrors = 0
for _, name := range names {
err := c.Create(name)
if err != nil {
Expand Down
12 changes: 6 additions & 6 deletions internal/schema/decoder.go
Expand Up @@ -74,19 +74,19 @@ func (d *Decoder) Decode(dst interface{}, src map[string][]string) error {
}
v = v.Elem()
t := v.Type()
errors := MultiError{}
multiError := MultiError{}
for path, values := range src {
if parts, err := d.cache.parsePath(path, t); err == nil {
if err = d.decode(v, path, parts, values); err != nil {
errors[path] = err
multiError[path] = err
}
} else if !d.ignoreUnknownKeys {
errors[path] = UnknownKeyError{Key: path}
multiError[path] = UnknownKeyError{Key: path}
}
}
errors.merge(d.checkRequired(t, src))
if len(errors) > 0 {
return errors
multiError.merge(d.checkRequired(t, src))
if len(multiError) > 0 {
return multiError
}
return nil
}
Expand Down
6 changes: 5 additions & 1 deletion middleware/cache/cache_test.go
Expand Up @@ -5,6 +5,7 @@ package cache
import (
"bytes"
"fmt"
"io"
"io/ioutil"
"math"
"net/http"
Expand Down Expand Up @@ -126,7 +127,10 @@ func Test_Cache_WithSeveralRequests(t *testing.T) {
rsp, err := app.Test(httptest.NewRequest(http.MethodGet, fmt.Sprintf("/%d", id), nil))
utils.AssertEqual(t, nil, err)

defer rsp.Body.Close()
defer func(Body io.ReadCloser) {
err := Body.Close()
utils.AssertEqual(t, nil, err)
}(rsp.Body)

idFromServ, err := ioutil.ReadAll(rsp.Body)
utils.AssertEqual(t, nil, err)
Expand Down
6 changes: 3 additions & 3 deletions middleware/session/session_test.go
Expand Up @@ -127,9 +127,9 @@ func Test_Session_Types(t *testing.T) {
Name: "John",
}
// set value
var vbool bool = true
var vstring string = "str"
var vint int = 13
var vbool = true
var vstring = "str"
var vint = 13
var vint8 int8 = 13
var vint16 int16 = 13
var vint32 int32 = 13
Expand Down