From 215a9e93f53913432e09a4d1b82b0228c4869145 Mon Sep 17 00:00:00 2001 From: smavros Date: Mon, 22 Apr 2019 11:56:05 +0200 Subject: [PATCH] Added inSignals and outSignals in DummyDB Signal model has a `belongs to` associations so it cannot belongs at the same time in OutputMapping and InputMapping of the SimulationModel model. --- common/database.go | 20 ++++++++++++-------- common/database_test.go | 8 ++++---- 2 files changed, 16 insertions(+), 12 deletions(-) diff --git a/common/database.go b/common/database.go index faa2e70..6e805b3 100644 --- a/common/database.go +++ b/common/database.go @@ -82,10 +82,14 @@ func DummyPopulateDB(test_db *gorm.DB) { checkErr(test_db.Create(&simr_A).Error) checkErr(test_db.Create(&simr_B).Error) - sig_A := Signal{Name: "Signal_A"} - sig_B := Signal{Name: "Signal_B"} - checkErr(test_db.Create(&sig_A).Error) - checkErr(test_db.Create(&sig_B).Error) + outSig_A := Signal{Name: "outSignal_A"} + outSig_B := Signal{Name: "outSignal_B"} + inSig_A := Signal{Name: "inSignal_A"} + inSig_B := Signal{Name: "inSignal_B"} + checkErr(test_db.Create(&outSig_A).Error) + checkErr(test_db.Create(&outSig_B).Error) + checkErr(test_db.Create(&inSig_A).Error) + checkErr(test_db.Create(&inSig_B).Error) smo_A := SimulationModel{Name: "SimModel_A"} smo_B := SimulationModel{Name: "SimModel_B"} @@ -128,10 +132,10 @@ func DummyPopulateDB(test_db *gorm.DB) { checkErr(test_db.Model(&smo_A).Association("BelongsToSimulation").Append(&simn_A).Error) checkErr(test_db.Model(&smo_A).Association("BelongsToSimulator").Append(&simr_A).Error) - checkErr(test_db.Model(&smo_A).Association("OutputMapping").Append(&sig_A).Error) - checkErr(test_db.Model(&smo_A).Association("OutputMapping").Append(&sig_B).Error) - checkErr(test_db.Model(&smo_A).Association("InputMapping").Append(&sig_B).Error) - checkErr(test_db.Model(&smo_A).Association("InputMapping").Append(&sig_A).Error) + checkErr(test_db.Model(&smo_A).Association("OutputMapping").Append(&outSig_A).Error) + checkErr(test_db.Model(&smo_A).Association("OutputMapping").Append(&outSig_B).Error) + checkErr(test_db.Model(&smo_A).Association("InputMapping").Append(&inSig_B).Error) + checkErr(test_db.Model(&smo_A).Association("InputMapping").Append(&inSig_A).Error) checkErr(test_db.Model(&simn_A).Association("User").Append(&usr_A).Error) checkErr(test_db.Model(&simn_A).Association("Models").Append(&smo_A).Error) diff --git a/common/database_test.go b/common/database_test.go index fe058f9..0aabd45 100644 --- a/common/database_test.go +++ b/common/database_test.go @@ -58,8 +58,8 @@ func TestDummyDBAssociations(t *testing.T) { assert.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") + assert.EqualValues("outSignal_A", sigs[0].Name, "Expected outSignal_A") + assert.EqualValues("outSignal_B", sigs[1].Name, "Expected outSignal_B") } else { assert.Fail("Simulation Model Associations", "Expected to have %v Output Signals. Has %v.", 2, len(sigs)) @@ -67,8 +67,8 @@ func TestDummyDBAssociations(t *testing.T) { assert.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") + assert.EqualValues("inSignal_A", sigs[0].Name, "Expected inSignal_A") + assert.EqualValues("inSignal_B", sigs[1].Name, "Expected inSignal_B") } else { assert.Fail("Simulation Model Associations", "Expected to have %v Input Signals. Has %v.", 2, len(sigs))