Apply goimports' modifications

This commit is contained in:
Jihoon Seo
2021-01-28 13:42:03 +09:00
parent 2bb6c45786
commit 113b90531c
34 changed files with 57 additions and 67 deletions

View File

@@ -80,4 +80,4 @@ func decr(originVal interface{}) (interface{}, error) {
default:
return nil, fmt.Errorf("item val is not (u)int (u)int32 (u)int64")
}
}
}

View File

@@ -19,7 +19,7 @@ func TestIncr(t *testing.T) {
t.Errorf("incr failed, expect %v, but %v actually", updateVal, val)
return
}
_, err = incr(int(1 << (strconv.IntSize - 1) - 1))
_, err = incr(int(1<<(strconv.IntSize-1) - 1))
if err == nil {
t.Error("incr failed")
return
@@ -73,7 +73,7 @@ func TestIncr(t *testing.T) {
t.Errorf("incr failed, expect %v, but %v actually", updateVal, val)
return
}
_, err = incr(uint(1 << (strconv.IntSize) - 1))
_, err = incr(uint(1<<(strconv.IntSize) - 1))
if err == nil {
t.Error("incr failed")
return
@@ -238,4 +238,4 @@ func TestDecr(t *testing.T) {
t.Error("decr failed")
return
}
}
}

View File

@@ -51,7 +51,6 @@ Sometimes you got JSON document and you want to make it as request body. So you
If you do this, you got this code. Instead, you should call Header to set Content-type and call Body to set body data.
`)
// start with 5 --------------------------------------------------------------------------
var CreateFormFileFailed = berror.DefineCode(5001001, moduleName, "CreateFormFileFailed", `
@@ -125,7 +124,3 @@ Make sure that:
1. You pass valid structure pointer to the function;
2. The body is valid YAML document
`)

View File

@@ -20,7 +20,6 @@ import (
"github.com/stretchr/testify/assert"
)
func TestNewHttpResponseWithJsonBody(t *testing.T) {
// string
resp := NewHttpResponseWithJsonBody("{}")

View File

@@ -309,7 +309,6 @@ func TestFilterChainOrder(t *testing.T) {
}
})
req.AddFilters(func(next Filter) Filter {
return func(ctx context.Context, req *BeegoHTTPRequest) (*http.Response, error) {
return NewHttpResponseWithJsonBody("second"), nil
@@ -396,7 +395,7 @@ func TestBeegoHTTPRequest_Param(t *testing.T) {
req.Param(key, value)
assert.Equal(t, value, req.params[key][0])
value1 := "test-param-value-1"
value1 := "test-param-value-1"
req.Param(key, value1)
assert.Equal(t, value1, req.params[key][1])
}
@@ -419,10 +418,10 @@ func TestBeegoHTTPRequest_Body(t *testing.T) {
req.Body(13)
}
type user struct {
Name string `xml:"name"`
}
func TestBeegoHTTPRequest_XMLBody(t *testing.T) {
req := Post("http://beego.me")
body := &user{
@@ -432,4 +431,4 @@ func TestBeegoHTTPRequest_XMLBody(t *testing.T) {
assert.True(t, req.req.ContentLength > 0)
assert.Nil(t, err)
assert.NotNil(t, req.req.GetBody)
}
}

View File

@@ -44,7 +44,7 @@ func StartMock() Stub {
return mockFilter
}
func CtxWithMock(ctx context.Context, mock... *Mock) context.Context {
func CtxWithMock(ctx context.Context, mock ...*Mock) context.Context {
return context.WithValue(ctx, mockCtxKey, mock)
}
@@ -73,8 +73,6 @@ func NewMock(con RequestCondition, resp *http.Response, err error) *Mock {
return &Mock{
cond: con,
resp: resp,
err: err,
err: err,
}
}

View File

@@ -120,7 +120,6 @@ func (sc *SimpleCondition) matchBodyFields(ctx context.Context, req *httplib.Bee
return false
}
m := make(map[string]interface{})
err = json.Unmarshal(bytes, &m)

View File

@@ -72,6 +72,6 @@ func OriginnalCodeUsingHttplibPassCtx(ctx context.Context) (*http.Response, erro
return httplib.Get("http://localhost:7777/abc").DoRequestWithCtx(ctx)
}
func OriginalCodeUsingHttplib() (*http.Response, error){
func OriginalCodeUsingHttplib() (*http.Response, error) {
return httplib.Get("http://localhost:7777/abc").DoRequest()
}

View File

@@ -78,4 +78,4 @@ func AddDefaultFilter(fc FilterChain) {
defaultSetting.FilterChains = make([]FilterChain, 0, 4)
}
defaultSetting.FilterChains = append(defaultSetting.FilterChains, fc)
}
}

View File

@@ -1,6 +1,6 @@
package clauses
const (
ExprSep = "__"
ExprDot = "."
ExprSep = "__"
ExprDot = "."
)

View File

@@ -1,8 +1,9 @@
package order_clause
import (
"github.com/beego/beego/v2/client/orm/clauses"
"strings"
"github.com/beego/beego/v2/client/orm/clauses"
)
type Sort int8

View File

@@ -16,10 +16,11 @@ package orm
import (
"fmt"
"github.com/beego/beego/v2/client/orm/clauses"
"github.com/beego/beego/v2/client/orm/clauses/order_clause"
"strings"
"time"
"github.com/beego/beego/v2/client/orm/clauses"
"github.com/beego/beego/v2/client/orm/clauses/order_clause"
)
// table info struct.

View File

@@ -23,14 +23,14 @@ import (
type Mock struct {
cond Condition
resp []interface{}
cb func(inv *orm.Invocation)
cb func(inv *orm.Invocation)
}
func NewMock(cond Condition, resp []interface{}, cb func(inv *orm.Invocation)) *Mock {
return &Mock{
cond: cond,
resp: resp,
cb: cb,
cb: cb,
}
}

View File

@@ -24,7 +24,9 @@ import (
"github.com/beego/beego/v2/client/orm"
)
const mockErrorMsg = "mock error"
func init() {
orm.RegisterModel(&User{})
}
@@ -239,7 +241,7 @@ func TestTransactionRollback(t *testing.T) {
assert.Equal(t, mock, err)
}
func TestTransactionCommit(t *testing.T) {
func TestTransactionCommit(t *testing.T) {
s := StartMock()
defer s.Clear()
mock := errors.New(mockErrorMsg)

View File

@@ -23,7 +23,6 @@ import (
// DoNothingQueryM2Mer do nothing
// use it to build mock orm.QueryM2Mer
type DoNothingQueryM2Mer struct {
}
func (d *DoNothingQueryM2Mer) AddWithCtx(ctx context.Context, i ...interface{}) (int64, error) {
@@ -68,13 +67,13 @@ func (d *DoNothingQueryM2Mer) Count() (int64, error) {
type QueryM2MerCondition struct {
tableName string
name string
name string
}
func NewQueryM2MerCondition(tableName string, name string) *QueryM2MerCondition {
return &QueryM2MerCondition{
tableName: tableName,
name: name,
name: name,
}
}
@@ -88,5 +87,3 @@ func (q *QueryM2MerCondition) Match(ctx context.Context, inv *orm.Invocation) bo
}
return res
}

View File

@@ -60,4 +60,4 @@ func TestNewQueryM2MerCondition(t *testing.T) {
assert.True(t, cond.Match(context.Background(), &orm.Invocation{
Args: []interface{}{0, "A"},
}))
}
}

View File

@@ -61,4 +61,4 @@ func (d *DoNothingRawSetter) RowsToStruct(ptrStruct interface{}, keyCol, valueCo
func (d *DoNothingRawSetter) Prepare() (orm.RawPreparer, error) {
return nil, nil
}
}

View File

@@ -369,7 +369,7 @@ func (mc *_modelCache) register(prefixOrSuffixStr string, prefixOrSuffix bool, m
}
if _, ok := mc.get(table); ok {
return nil
return nil
}
mi := newModelInfo(val)

View File

@@ -58,11 +58,12 @@ import (
"database/sql"
"errors"
"fmt"
"github.com/beego/beego/v2/client/orm/clauses/order_clause"
"os"
"reflect"
"time"
"github.com/beego/beego/v2/client/orm/clauses/order_clause"
"github.com/beego/beego/v2/client/orm/hints"
"github.com/beego/beego/v2/core/utils"

View File

@@ -16,8 +16,9 @@ package orm
import (
"fmt"
"github.com/beego/beego/v2/client/orm/clauses"
"strings"
"github.com/beego/beego/v2/client/orm/clauses"
)
// ExprSep define the expression separation

View File

@@ -21,7 +21,6 @@ import (
"context"
"database/sql"
"fmt"
"github.com/beego/beego/v2/client/orm/clauses/order_clause"
"io/ioutil"
"math"
"os"
@@ -32,6 +31,8 @@ import (
"testing"
"time"
"github.com/beego/beego/v2/client/orm/clauses/order_clause"
"github.com/beego/beego/v2/client/orm/hints"
"github.com/stretchr/testify/assert"