From 47b7c2f00316d6f20d4d5512793b67c9220c34f2 Mon Sep 17 00:00:00 2001 From: Jamie Date: Thu, 16 Nov 2023 16:23:15 +1300 Subject: [PATCH] fix for prescription tests --- data/types/settings/pump/test/pump.go | 2 +- prescription/test/prescription.go | 11 ++++------- 2 files changed, 5 insertions(+), 8 deletions(-) diff --git a/data/types/settings/pump/test/pump.go b/data/types/settings/pump/test/pump.go index 1f5314544..07645b70e 100644 --- a/data/types/settings/pump/test/pump.go +++ b/data/types/settings/pump/test/pump.go @@ -48,7 +48,7 @@ func NewPump(unitsBloodGlucose *string) *pump.Pump { datum.BloodGlucoseTargetPreprandial = dataBloodGlucoseTest.RandomTarget(unitsBloodGlucose) datum.BloodGlucoseTargetSchedules = pump.NewBloodGlucoseTargetStartArrayMap() datum.BloodGlucoseTargetSchedules.Set(scheduleName, RandomBloodGlucoseTargetStartArray(unitsBloodGlucose)) - datum.Boluses = NewRandomBolusMap(2, 4) + datum.Bolus = NewRandomBolus() datum.CarbohydrateRatioSchedules = pump.NewCarbohydrateRatioStartArrayMap() datum.CarbohydrateRatioSchedules.Set(scheduleName, NewCarbohydrateRatioStartArray()) datum.Display = NewDisplay() diff --git a/prescription/test/prescription.go b/prescription/test/prescription.go index a3ace9318..0120d9d22 100644 --- a/prescription/test/prescription.go +++ b/prescription/test/prescription.go @@ -4,15 +4,12 @@ import ( "fmt" "time" - dataTypesSettingsPump "github.com/tidepool-org/platform/data/types/settings/pump" - dataBloodGlucoseTest "github.com/tidepool-org/platform/data/blood/glucose/test" "github.com/tidepool-org/platform/data/types/settings/pump" "github.com/google/uuid" "github.com/tidepool-org/platform/data/blood/glucose" - testUtils "github.com/tidepool-org/platform/test" userTest "github.com/tidepool-org/platform/user/test" @@ -183,7 +180,7 @@ func RandomInitialSettings() *prescription.InitialSettings { func RandomCalculator() *prescription.Calculator { return &prescription.Calculator{ - Method: pointer.FromString(testUtils.RandomStringFromArray(prescription.AllowedCalculatorMethods())), + Method: pointer.FromString(test.RandomStringFromArray(prescription.AllowedCalculatorMethods())), RecommendedBasalRate: pointer.FromFloat64(test.RandomFloat64FromRange(0, 100)), RecommendedCarbohydrateRatio: pointer.FromFloat64(test.RandomFloat64FromRange(0, 100)), RecommendedInsulinSensitivity: pointer.FromFloat64(test.RandomFloat64FromRange(0, 100)), @@ -238,10 +235,10 @@ func RandomBloodGlucoseTargetStart(startMinimum int) *pump.BloodGlucoseTargetSta func RandomInsulinModel() *string { validInsulinTypes := []string{ - dataTypesSettingsPump.InsulinModelModelTypeRapidAdult, - dataTypesSettingsPump.InsulinModelModelTypeRapidChild, + pump.InsulinModelModelTypeRapidAdult, + pump.InsulinModelModelTypeRapidChild, } - return pointer.FromString(testUtils.RandomStringFromArray(validInsulinTypes)) + return pointer.FromString(test.RandomStringFromArray(validInsulinTypes)) } func RandomDeviceID() string {