Merge pull request #15 from oracle-samples/soft_delete_join_test_fix

Fix TestCustomizeColumn with quoted identifiers and fix misleading TestJoinWithSoftDeleted test with correct checks.

Author: Mitika-d

tests/joins_test.go

@@ -259,7 +259,7 @@ func TestJoinWithSoftDeleted(t *testing.T) {
 
 	var user1 User
 	DB.Model(&User{}).Joins("NamedPet").Joins("Account").First(&user1, user.ID)
-	if user1.NamedPet == nil || user1.Account.ID == 0 {
+	if user1.NamedPet.ID == 0 || user1.Account.ID == 0 {
 		t.Fatalf("joins NamedPet and Account should not empty:%v", user1)
 	}
 
@@ -268,17 +268,17 @@ func TestJoinWithSoftDeleted(t *testing.T) {
 
 	var user2 User
 	DB.Model(&User{}).Joins("NamedPet").Joins("Account").First(&user2, user.ID)
-	if user2.NamedPet == nil || user2.Account.ID != 0 {
-		t.Fatalf("joins Account should not empty:%v", user2)
+	if user2.NamedPet.ID == 0 || user2.Account.ID != 0 {
+		t.Fatalf("joins Account should be empty:%v", user2)
 	}
 
 	// NamedPet should empty
 	DB.Delete(&user1.NamedPet)
 
 	var user3 User
 	DB.Model(&User{}).Joins("NamedPet").Joins("Account").First(&user3, user.ID)
-	if user3.NamedPet != nil || user2.Account.ID != 0 {
-		t.Fatalf("joins NamedPet and Account should not empty:%v", user2)
+	if user3.NamedPet.ID != 0 || user3.Account.ID != 0 {
+		t.Fatalf("joins NamedPet and Account should be empty:%v", user3)
 	}
 }
 

tests/passed-tests.txt

@@ -68,7 +68,7 @@ TestCreateWithAutoIncrementCompositeKey
 TestCreateOnConflictWithDefaultNull
 TestCreateFromMapWithoutPK
 TestCreateFromMapWithTable
-#TestCustomizeColumn
+TestCustomizeColumn
 TestCustomColumnAndIgnoredFieldClash
 TestCustomizeField
 TestDefaultValue
@@ -142,7 +142,7 @@ TestJoinOn
 TestJoinsWithSelect
 TestJoinWithOmit
 TestJoinCount
-#TestJoinWithSoftDeleted
+TestJoinWithSoftDeleted
 TestInnerJoins
 TestJoinWithSameColumnName
 TestJoinArgsWithDB