diff --git a/session_find_test.go b/session_find_test.go index fe81597e..a3494fa8 100644 --- a/session_find_test.go +++ b/session_find_test.go @@ -120,10 +120,8 @@ func TestFind2(t *testing.T) { assertSync(t, new(Userinfo)) err := testEngine.Find(&users) - if err != nil { - t.Error(err) - panic(err) - } + assert.NoError(t, err) + for _, user := range users { fmt.Println(user) } @@ -139,13 +137,15 @@ type TeamUser struct { TeamId int64 } +func (TeamUser) TableName() string { + return "team_user" +} + func TestFind3(t *testing.T) { + var teamUser = new(TeamUser) assert.NoError(t, prepareEngine()) - err := testEngine.Sync2(new(Team), new(TeamUser)) - if err != nil { - t.Error(err) - panic(err.Error()) - } + err := testEngine.Sync2(new(Team), teamUser) + assert.NoError(t, err) var teams []Team err = testEngine.Cols("`team`.id"). @@ -153,10 +153,15 @@ func TestFind3(t *testing.T) { And("`team_user`.uid=?", 2). Join("INNER", "`team_user`", "`team_user`.team_id=`team`.id"). Find(&teams) - if err != nil { - t.Error(err) - panic(err.Error()) - } + assert.NoError(t, err) + + teams = make([]Team, 0) + err = testEngine.Cols("`team`.id"). + Where("`team_user`.org_id=?", 1). + And("`team_user`.uid=?", 2). + Join("INNER", teamUser, "`team_user`.team_id=`team`.id"). + Find(&teams) + assert.NoError(t, err) } func TestFindMap(t *testing.T) {