From 8b88e2d270b1e5065ec0c44a79d7ab219f11b4f7 Mon Sep 17 00:00:00 2001 From: Milos Kozak Date: Fri, 27 Dec 2019 21:39:34 +0100 Subject: [PATCH] make tests compile --- app/src/test/java/info/AAPSMocker.java | 7 ++++--- .../androidaps/interfaces/ConstraintsCheckerTest.java | 2 +- .../androidaps/plugins/aps/loop/APSResultTest.java | 8 ++++---- .../plugins/constraints/safety/SafetyPluginTest.java | 1 + .../smsCommunicator/SmsCommunicatorPluginTest.java | 6 ++++-- .../nightscout/androidaps/queue/CommandQueueTest.java | 3 ++- 6 files changed, 16 insertions(+), 11 deletions(-) diff --git a/app/src/test/java/info/AAPSMocker.java b/app/src/test/java/info/AAPSMocker.java index 2fe8c77c9f..0a11093683 100644 --- a/app/src/test/java/info/AAPSMocker.java +++ b/app/src/test/java/info/AAPSMocker.java @@ -14,13 +14,13 @@ import java.util.Locale; import info.nightscout.androidaps.Constants; import info.nightscout.androidaps.MainApp; import info.nightscout.androidaps.R; -import info.nightscout.androidaps.plugins.configBuilder.ConstraintChecker; import info.nightscout.androidaps.data.IobTotal; import info.nightscout.androidaps.data.Profile; import info.nightscout.androidaps.data.ProfileStore; import info.nightscout.androidaps.db.DatabaseHelper; import info.nightscout.androidaps.logging.L; import info.nightscout.androidaps.plugins.configBuilder.ConfigBuilderPlugin; +import info.nightscout.androidaps.plugins.configBuilder.ConstraintChecker; import info.nightscout.androidaps.plugins.configBuilder.ProfileFunctions; import info.nightscout.androidaps.plugins.general.nsclient.NSUpload; import info.nightscout.androidaps.plugins.iob.iobCobCalculator.IobCobCalculatorPlugin; @@ -34,7 +34,6 @@ import static org.mockito.ArgumentMatchers.anyBoolean; import static org.mockito.ArgumentMatchers.anyInt; import static org.mockito.ArgumentMatchers.anyLong; import static org.mockito.ArgumentMatchers.anyString; -import static org.mockito.Mockito.doReturn; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.when; @@ -184,8 +183,10 @@ public class AAPSMocker { } public static ConstraintChecker mockConstraintsChecker() { + PowerMockito.mockStatic(ConstraintChecker.class); constraintChecker = mock(ConstraintChecker.class); - when(MainApp.getConstraintChecker()).thenReturn(constraintChecker); + when(ConstraintChecker.getInstance()) + .thenReturn(constraintChecker); return constraintChecker; } diff --git a/app/src/test/java/info/nightscout/androidaps/interfaces/ConstraintsCheckerTest.java b/app/src/test/java/info/nightscout/androidaps/interfaces/ConstraintsCheckerTest.java index a5112579ff..818c1e2863 100644 --- a/app/src/test/java/info/nightscout/androidaps/interfaces/ConstraintsCheckerTest.java +++ b/app/src/test/java/info/nightscout/androidaps/interfaces/ConstraintsCheckerTest.java @@ -287,7 +287,7 @@ public class ConstraintsCheckerTest { //SafetyPlugin when(ConfigBuilderPlugin.getPlugin().getActivePump()).thenReturn(pump); - constraintChecker = new ConstraintChecker(); + constraintChecker = ConstraintChecker.getInstance(); safetyPlugin = SafetyPlugin.getPlugin(); objectivesPlugin = ObjectivesPlugin.INSTANCE; diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/aps/loop/APSResultTest.java b/app/src/test/java/info/nightscout/androidaps/plugins/aps/loop/APSResultTest.java index 70cbbf5bac..6c30ca910a 100644 --- a/app/src/test/java/info/nightscout/androidaps/plugins/aps/loop/APSResultTest.java +++ b/app/src/test/java/info/nightscout/androidaps/plugins/aps/loop/APSResultTest.java @@ -30,7 +30,7 @@ import static org.mockito.ArgumentMatchers.anyLong; import static org.powermock.api.mockito.PowerMockito.when; @RunWith(PowerMockRunner.class) -@PrepareForTest({MainApp.class, ConfigBuilderPlugin.class, SP.class, Context.class, ProfileFunctions.class, TreatmentsPlugin.class, L.class}) +@PrepareForTest({MainApp.class, ConfigBuilderPlugin.class, SP.class, Context.class, ProfileFunctions.class, TreatmentsPlugin.class, L.class, ConstraintChecker.class}) public class APSResultTest { VirtualPumpPlugin virtualPumpPlugin; TreatmentsPlugin treatmentsPlugin; @@ -183,13 +183,13 @@ public class APSResultTest { AAPSMocker.mockTreatmentService(); AAPSMocker.mockL(); treatmentsPlugin = AAPSMocker.mockTreatmentPlugin(); - ConstraintChecker constraintChecker = AAPSMocker.mockConstraintsChecker(); + AAPSMocker.mockConstraintsChecker(); + when(ConstraintChecker.getInstance().isClosedLoopAllowed()).thenReturn(closedLoopEnabled); + virtualPumpPlugin = VirtualPumpPlugin.getPlugin(); when(ConfigBuilderPlugin.getPlugin().getActivePump()).thenReturn(virtualPumpPlugin); - when(constraintChecker.isClosedLoopAllowed()).thenReturn(closedLoopEnabled); - Mockito.when(SP.getDouble(anyInt(), anyDouble())).thenReturn(30d); } diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/constraints/safety/SafetyPluginTest.java b/app/src/test/java/info/nightscout/androidaps/plugins/constraints/safety/SafetyPluginTest.java index 959e1620cd..f2e5067126 100644 --- a/app/src/test/java/info/nightscout/androidaps/plugins/constraints/safety/SafetyPluginTest.java +++ b/app/src/test/java/info/nightscout/androidaps/plugins/constraints/safety/SafetyPluginTest.java @@ -18,6 +18,7 @@ import info.nightscout.androidaps.interfaces.PluginType; import info.nightscout.androidaps.plugins.configBuilder.ConfigBuilderPlugin; import info.nightscout.androidaps.plugins.aps.openAPSAMA.OpenAPSAMAPlugin; import info.nightscout.androidaps.plugins.aps.openAPSMA.OpenAPSMAPlugin; +import info.nightscout.androidaps.plugins.configBuilder.ConstraintChecker; import info.nightscout.androidaps.plugins.pump.virtual.VirtualPumpPlugin; import info.nightscout.androidaps.plugins.source.SourceGlimpPlugin; import info.nightscout.androidaps.utils.SP; diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/general/smsCommunicator/SmsCommunicatorPluginTest.java b/app/src/test/java/info/nightscout/androidaps/plugins/general/smsCommunicator/SmsCommunicatorPluginTest.java index 641f11bed3..a243464cb1 100644 --- a/app/src/test/java/info/nightscout/androidaps/plugins/general/smsCommunicator/SmsCommunicatorPluginTest.java +++ b/app/src/test/java/info/nightscout/androidaps/plugins/general/smsCommunicator/SmsCommunicatorPluginTest.java @@ -43,6 +43,7 @@ import info.nightscout.androidaps.queue.CommandQueue; import info.nightscout.androidaps.utils.DateUtil; import info.nightscout.androidaps.utils.SP; import info.nightscout.androidaps.utils.XdripCalibrations; +import info.nightscout.androidaps.utils.resources.ResourceHelperImplementation; import static org.mockito.ArgumentMatchers.any; import static org.mockito.ArgumentMatchers.anyBoolean; @@ -889,7 +890,7 @@ public class SmsCommunicatorPluginTest { AAPSMocker.mockConfigBuilder(); AAPSMocker.mockCommandQueue(); AAPSMocker.mockNSUpload(); - AAPSMocker.mockConstraintsChecker(); + ConstraintChecker constraintChecker = AAPSMocker.mockConstraintsChecker(); BgReading reading = new BgReading(); reading.value = 100; @@ -907,7 +908,8 @@ public class SmsCommunicatorPluginTest { when(SP.getString(R.string.key_smscommunicator_allowednumbers, "")).thenReturn("1234;5678"); Lazy insulinOrefRapidActingPlugin = InsulinOrefRapidActingPlugin::new; ConfigBuilderPlugin configBuilderPlugin = new ConfigBuilderPlugin(insulinOrefRapidActingPlugin); - smsCommunicatorPlugin = new SmsCommunicatorPlugin(configBuilderPlugin); + ResourceHelperImplementation resourceHelperImplementation = mock(ResourceHelperImplementation.class); + smsCommunicatorPlugin = new SmsCommunicatorPlugin(configBuilderPlugin, resourceHelperImplementation, constraintChecker); smsCommunicatorPlugin.setPluginEnabled(PluginType.GENERAL, true); mockStatic(LoopPlugin.class); diff --git a/app/src/test/java/info/nightscout/androidaps/queue/CommandQueueTest.java b/app/src/test/java/info/nightscout/androidaps/queue/CommandQueueTest.java index 57be6e1f24..775e7ca051 100644 --- a/app/src/test/java/info/nightscout/androidaps/queue/CommandQueueTest.java +++ b/app/src/test/java/info/nightscout/androidaps/queue/CommandQueueTest.java @@ -113,6 +113,7 @@ public class CommandQueueTest extends CommandQueue { } private void prepareMock(Double insulin, Integer carbs) throws Exception { + PowerMockito.mockStatic(ConstraintChecker.class); ConstraintChecker constraintChecker = mock(ConstraintChecker.class); AAPSMocker.mockMainApp(); @@ -120,7 +121,7 @@ public class CommandQueueTest extends CommandQueue { PumpInterface pump = VirtualPumpPlugin.getPlugin(); when(ConfigBuilderPlugin.getPlugin().getActivePump()).thenReturn(pump); - when(MainApp.getConstraintChecker()).thenReturn(constraintChecker); + when(ConstraintChecker.getInstance()).thenReturn(constraintChecker); when(MainApp.isEngineeringModeOrRelease()).thenReturn(true); Constraint bolusConstraint = new Constraint<>(0d); when(ConstraintChecker.getInstance().applyBolusConstraints(any())).thenReturn(bolusConstraint);