From 3c4624d17efebf819427c8901156812b8efa723b Mon Sep 17 00:00:00 2001 From: Sonja Happ Date: Wed, 27 Jan 2021 10:41:00 +0100 Subject: [PATCH] WIP: scenario test independent of test data --- helper/test_data.go | 11 ----------- routes/scenario/scenario_test.go | 4 ++-- 2 files changed, 2 insertions(+), 13 deletions(-) diff --git a/helper/test_data.go b/helper/test_data.go index cc8caca..e4fcbd6 100644 --- a/helper/test_data.go +++ b/helper/test_data.go @@ -25,7 +25,6 @@ import ( "encoding/json" "fmt" "git.rwth-aachen.de/acs/public/villas/web-backend-go/database" - "github.com/jinzhu/gorm/dialects/postgres" "golang.org/x/crypto/bcrypt" "io/ioutil" "log" @@ -85,16 +84,6 @@ type UserRequest struct { Active string `json:"active,omitempty"` } -// Scenarios - -var startParametersA = json.RawMessage(`{"parameter1" : "testValue1A", "parameter2" : "testValue2A", "parameter3" : 42}`) - -var ScenarioA = database.Scenario{ - Name: "Scenario_A", - Running: true, - StartParameters: postgres.Jsonb{startParametersA}, -} - func ReadTestDataFromJson(path string) error { jsonFile, err := os.Open(path) diff --git a/routes/scenario/scenario_test.go b/routes/scenario/scenario_test.go index e88368a..15304a9 100644 --- a/routes/scenario/scenario_test.go +++ b/routes/scenario/scenario_test.go @@ -212,8 +212,8 @@ func TestUpdateScenario(t *testing.T) { updatedScenario := ScenarioRequest{ Name: "Updated name", - Running: !helper.ScenarioA.Running, - StartParameters: helper.ScenarioA.StartParameters, + Running: false, + StartParameters: postgres.Jsonb{RawMessage: json.RawMessage(`{"parameter1" : "testValue1A", "parameter2" : "testValue2A", "parameter3" : 42}`)}, } // try to update with non JSON body