From c68711d9a5fa92ac99e81364e5c19c850a1e9903 Mon Sep 17 00:00:00 2001 From: Lunny Xiao Date: Tue, 4 Apr 2017 12:34:56 +0800 Subject: [PATCH] improved test for find --- blongs_to_test.go | 22 ++++++++++------------ 1 file changed, 10 insertions(+), 12 deletions(-) diff --git a/blongs_to_test.go b/blongs_to_test.go index eb0d93e1..b5f3983a 100644 --- a/blongs_to_test.go +++ b/blongs_to_test.go @@ -32,7 +32,7 @@ func TestBelongsTo_Get(t *testing.T) { has, err := testEngine.Get(&cfgFace) assert.NoError(t, err) assert.Equal(t, true, has) - assert.Equal(t, cfgFace, face) + assert.Equal(t, face, cfgFace) var nose = Nose{Face: face} _, err = testEngine.Insert(&nose) @@ -42,13 +42,13 @@ func TestBelongsTo_Get(t *testing.T) { has, err = testEngine.Get(&cfgNose) assert.NoError(t, err) assert.Equal(t, true, has) - assert.Equal(t, cfgNose.Id, nose.Id) - assert.Equal(t, cfgNose.Face.Id, nose.Face.Id) + assert.Equal(t, nose.Id, cfgNose.Id) + assert.Equal(t, nose.Face.Id, cfgNose.Face.Id) assert.Equal(t, "", cfgNose.Face.Name) err = testEngine.EagerLoad(&cfgNose) assert.NoError(t, err) - assert.Equal(t, cfgNose.Id, nose.Id) + assert.Equal(t, nose.Id, cfgNose.Id) assert.Equal(t, nose.Face.Id, cfgNose.Face.Id) assert.Equal(t, "face1", cfgNose.Face.Name) @@ -56,7 +56,7 @@ func TestBelongsTo_Get(t *testing.T) { has, err = testEngine.Cascade().Get(&cfgNose2) assert.NoError(t, err) assert.Equal(t, true, has) - assert.Equal(t, cfgNose2.Id, nose.Id) + assert.Equal(t, nose.Id, cfgNose2.Id) assert.Equal(t, nose.Face.Id, cfgNose2.Face.Id) assert.Equal(t, "face1", cfgNose2.Face.Name) } @@ -87,7 +87,7 @@ func TestBelongsTo_GetPtr(t *testing.T) { has, err := testEngine.Get(&cfgFace) assert.NoError(t, err) assert.Equal(t, true, has) - assert.Equal(t, cfgFace, face) + assert.Equal(t, face, cfgFace) var nose = Nose{Face: &face} _, err = testEngine.Insert(&nose) @@ -151,9 +151,8 @@ func TestBelongsTo_Find(t *testing.T) { err = testEngine.Find(&noses1) assert.NoError(t, err) assert.Equal(t, 2, len(noses1)) - // FIXME: - //assert.Equal(t, face1.Id, noses1[0].Face.Id) - //assert.Equal(t, face2.Id, noses1[1].Face.Id) + assert.Equal(t, face1.Id, noses1[0].Face.Id) + assert.Equal(t, face2.Id, noses1[1].Face.Id) assert.Equal(t, "", noses1[0].Face.Name) assert.Equal(t, "", noses1[1].Face.Name) @@ -161,9 +160,8 @@ func TestBelongsTo_Find(t *testing.T) { err = testEngine.Cascade().Find(&noses2) assert.NoError(t, err) assert.Equal(t, 2, len(noses2)) - // FIXME: - //assert.Equal(t, face1.Id, noses2[0].Face.Id) - //assert.Equal(t, face2.Id, noses2[1].Face.Id) + assert.Equal(t, face1.Id, noses2[0].Face.Id) + assert.Equal(t, face2.Id, noses2[1].Face.Id) assert.Equal(t, "face1", noses2[0].Face.Name) assert.Equal(t, "face2", noses2[1].Face.Name) }