From 60e395003bff254d53eae67934d9c1605c7ac725 Mon Sep 17 00:00:00 2001 From: Sonja Happ Date: Wed, 24 Apr 2019 15:15:50 +0200 Subject: [PATCH] change variable name that was hiding a package name --- common/database_test.go | 130 ++++++++++++++++++++-------------------- 1 file changed, 65 insertions(+), 65 deletions(-) diff --git a/common/database_test.go b/common/database_test.go index fe058f9..ea4f0e4 100644 --- a/common/database_test.go +++ b/common/database_test.go @@ -16,7 +16,7 @@ func TestDBConnection(t *testing.T) { // Verify that the associations between each model are done properly func TestDummyDBAssociations(t *testing.T) { - assert := assert.New(t) + a := assert.New(t) // find model string lambda fM := func(s string) string { return fmt.Sprintf("Find %s with ID=1", s) } @@ -45,149 +45,149 @@ func TestDummyDBAssociations(t *testing.T) { // Simulation Model - assert.NoError(db.Find(&smo, 1).Error, fM("SimulationModel")) - assert.EqualValues("SimModel_A", smo.Name) + a.NoError(db.Find(&smo, 1).Error, fM("SimulationModel")) + a.EqualValues("SimModel_A", smo.Name) // Simulation Model Associations - assert.NoError(db.Model(&smo).Association("BelongsToSimulation").Find(&simn).Error) - assert.EqualValues("Simulation_A", simn.Name, "Expected Simulation_A") + a.NoError(db.Model(&smo).Association("BelongsToSimulation").Find(&simn).Error) + a.EqualValues("Simulation_A", simn.Name, "Expected Simulation_A") - assert.NoError(db.Model(&smo).Association("BelongsToSimulator").Find(&simr).Error) - assert.EqualValues("Host_A", simr.Host, "Expected Host_A") + a.NoError(db.Model(&smo).Association("BelongsToSimulator").Find(&simr).Error) + a.EqualValues("Host_A", simr.Host, "Expected Host_A") - assert.NoError(db.Model(&smo).Related(&sigs, "OutputMapping").Error) + a.NoError(db.Model(&smo).Related(&sigs, "OutputMapping").Error) if len(sigs) == 2 { - assert.EqualValues("Signal_A", sigs[0].Name, "Expected Signal_A") - assert.EqualValues("Signal_B", sigs[1].Name, "Expected Signal_B") + a.EqualValues("Signal_A", sigs[0].Name, "Expected Signal_A") + a.EqualValues("Signal_B", sigs[1].Name, "Expected Signal_B") } else { - assert.Fail("Simulation Model Associations", + a.Fail("Simulation Model Associations", "Expected to have %v Output Signals. Has %v.", 2, len(sigs)) } - assert.NoError(db.Model(&smo).Related(&sigs, "InputMapping").Error) + a.NoError(db.Model(&smo).Related(&sigs, "InputMapping").Error) if len(sigs) == 2 { - assert.EqualValues("Signal_A", sigs[0].Name, "Expected Signal_A") - assert.EqualValues("Signal_B", sigs[1].Name, "Expected Signal_B") + a.EqualValues("Signal_A", sigs[0].Name, "Expected Signal_A") + a.EqualValues("Signal_B", sigs[1].Name, "Expected Signal_B") } else { - assert.Fail("Simulation Model Associations", + a.Fail("Simulation Model Associations", "Expected to have %v Input Signals. Has %v.", 2, len(sigs)) } // Simulation - assert.NoError(db.Find(&simn, 1).Error, fM("Simulation")) - assert.EqualValues("Simulation_A", simn.Name) + a.NoError(db.Find(&simn, 1).Error, fM("Simulation")) + a.EqualValues("Simulation_A", simn.Name) // Simulation Associations - assert.NoError(db.Model(&simn).Association("User").Find(&usr).Error) - assert.EqualValues("User_A", usr.Username) + a.NoError(db.Model(&simn).Association("User").Find(&usr).Error) + a.EqualValues("User_A", usr.Username) - assert.NoError(db.Model(&simn).Related(&smos, "Models").Error) + a.NoError(db.Model(&simn).Related(&smos, "Models").Error) if len(smos) == 2 { - assert.EqualValues("SimModel_A", smos[0].Name) - assert.EqualValues("SimModel_B", smos[1].Name) + a.EqualValues("SimModel_A", smos[0].Name) + a.EqualValues("SimModel_B", smos[1].Name) } else { - assert.Fail("Simulation Associations", + a.Fail("Simulation Associations", "Expected to have %v Simulation Models. Has %v.", 2, len(smos)) } - assert.NoError(db.Model(&simn).Related(&projs, "Projects").Error) + a.NoError(db.Model(&simn).Related(&projs, "Projects").Error) if len(projs) == 2 { - assert.EqualValues("Project_A", projs[0].Name) - assert.EqualValues("Project_B", projs[1].Name) + a.EqualValues("Project_A", projs[0].Name) + a.EqualValues("Project_B", projs[1].Name) } else { - assert.Fail("Simulation Associations", + a.Fail("Simulation Associations", "Expected to have %v Projects. Has %v.", 2, len(projs)) } // Project - assert.NoError(db.Find(&proj, 1).Error, fM("Project")) - assert.EqualValues("Project_A", proj.Name) + a.NoError(db.Find(&proj, 1).Error, fM("Project")) + a.EqualValues("Project_A", proj.Name) // Project Associations - assert.NoError(db.Model(&proj).Association("Simulation").Find(&simn).Error) - assert.EqualValues("Simulation_A", simn.Name) + a.NoError(db.Model(&proj).Association("Simulation").Find(&simn).Error) + a.EqualValues("Simulation_A", simn.Name) - assert.NoError(db.Model(&proj).Association("User").Find(&usr).Error) - assert.EqualValues("User_A", usr.Username) + a.NoError(db.Model(&proj).Association("User").Find(&usr).Error) + a.EqualValues("User_A", usr.Username) - assert.NoError(db.Model(&proj).Related(&viss, "Visualizations").Error) + a.NoError(db.Model(&proj).Related(&viss, "Visualizations").Error) if len(viss) == 2 { - assert.EqualValues("Visualization_A", viss[0].Name) - assert.EqualValues("Visualization_B", viss[1].Name) + a.EqualValues("Visualization_A", viss[0].Name) + a.EqualValues("Visualization_B", viss[1].Name) } else { - assert.Fail("Project Associations", + a.Fail("Project Associations", "Expected to have %v Visualizations. Has %v.", 2, len(viss)) } // User - assert.NoError(db.Find(&usr, 1).Error, fM("User")) - assert.EqualValues("User_A", usr.Username) + a.NoError(db.Find(&usr, 1).Error, fM("User")) + a.EqualValues("User_A", usr.Username) // User Associations - assert.NoError(db.Model(&usr).Related(&projs, "Projects").Error) + a.NoError(db.Model(&usr).Related(&projs, "Projects").Error) if len(projs) == 2 { - assert.EqualValues("Project_A", projs[0].Name) - assert.EqualValues("Project_B", projs[1].Name) + a.EqualValues("Project_A", projs[0].Name) + a.EqualValues("Project_B", projs[1].Name) } else { - assert.Fail("User Associations", + a.Fail("User Associations", "Expected to have %v Projects. Has %v.", 2, len(projs)) } - assert.NoError(db.Model(&usr).Related(&simns, "Simulations").Error) + a.NoError(db.Model(&usr).Related(&simns, "Simulations").Error) if len(simns) == 2 { - assert.EqualValues("Simulation_A", simns[0].Name) - assert.EqualValues("Simulation_B", simns[1].Name) + a.EqualValues("Simulation_A", simns[0].Name) + a.EqualValues("Simulation_B", simns[1].Name) } else { - assert.Fail("User Associations", + a.Fail("User Associations", "Expected to have %v Simulations. Has %v.", 2, len(simns)) } - assert.NoError(db.Model(&usr).Related(&files, "Files").Error) + a.NoError(db.Model(&usr).Related(&files, "Files").Error) if len(files) == 2 { - assert.EqualValues("File_A", files[0].Name) - assert.EqualValues("File_B", files[1].Name) + a.EqualValues("File_A", files[0].Name) + a.EqualValues("File_B", files[1].Name) } else { - assert.Fail("User Associations", + a.Fail("User Associations", "Expected to have %v Files. Has %v.", 2, len(files)) } // Visualization - assert.NoError(db.Find(&vis, 1).Error, fM("Visualization")) - assert.EqualValues("Visualization_A", vis.Name) + a.NoError(db.Find(&vis, 1).Error, fM("Visualization")) + a.EqualValues("Visualization_A", vis.Name) // Visualization Associations - assert.NoError(db.Model(&vis).Association("Project").Find(&proj).Error) - assert.EqualValues("Project_A", proj.Name) + a.NoError(db.Model(&vis).Association("Project").Find(&proj).Error) + a.EqualValues("Project_A", proj.Name) - assert.NoError(db.Model(&vis).Association("User").Find(&usr).Error) - assert.EqualValues("User_A", usr.Username) + a.NoError(db.Model(&vis).Association("User").Find(&usr).Error) + a.EqualValues("User_A", usr.Username) - assert.NoError(db.Model(&vis).Related(&widgs, "Widgets").Error) + a.NoError(db.Model(&vis).Related(&widgs, "Widgets").Error) if len(widgs) == 2 { - assert.EqualValues("Widget_A", widgs[0].Name) - assert.EqualValues("Widget_B", widgs[1].Name) + a.EqualValues("Widget_A", widgs[0].Name) + a.EqualValues("Widget_B", widgs[1].Name) } else { - assert.Fail("Widget Associations", + a.Fail("Widget Associations", "Expected to have %v Widget. Has %v.", 2, len(widgs)) } // File - assert.NoError(db.Find(&file, 1).Error, fM("File")) - assert.EqualValues("File_A", file.Name) + a.NoError(db.Find(&file, 1).Error, fM("File")) + a.EqualValues("File_A", file.Name) // File Associations - assert.NoError(db.Model(&file).Association("User").Find(&usr).Error) - assert.EqualValues("User_A", usr.Username) + a.NoError(db.Model(&file).Association("User").Find(&usr).Error) + a.EqualValues("User_A", usr.Username) }