From 4d98c44d74fb1ed8df1fa6b2955801c75a489085 Mon Sep 17 00:00:00 2001 From: Nico Schmitz Date: Mon, 25 Mar 2019 23:35:42 +0100 Subject: [PATCH] Fix tests --- .../automation/triggers/DummyTrigger.java | 7 +++++++ .../automation/triggers/TriggerBgTest.java | 8 ++++---- .../triggers/TriggerConnectorTest.java | 4 ++-- .../automation/triggers/TriggerTimeTest.java | 6 ++---- .../plugins/pump/danaRv2/DanaRv2PluginTest.java | 13 +++++-------- .../danaRv2/comm/MessageHashTable_v2Test.java | 8 +++----- .../pump/danaRv2/comm/MsgCheckValue_v2Test.java | 16 +++++++--------- .../danaRv2/comm/MsgHistoryEvents_v2Test.java | 11 ++++------- .../danaRv2/comm/MsgSetHistoryEntry_v2Test.java | 9 ++++----- .../pump/danaRv2/comm/MsgStatusAPS_v2Test.java | 9 ++++----- .../comm/MsgStatusBolusExtended_v2Test.java | 12 ++++-------- .../danaRv2/comm/MsgStatusTempBasal_v2Test.java | 11 +++++------ 12 files changed, 51 insertions(+), 63 deletions(-) diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/general/automation/triggers/DummyTrigger.java b/app/src/test/java/info/nightscout/androidaps/plugins/general/automation/triggers/DummyTrigger.java index 087df4326e..81d8987639 100644 --- a/app/src/test/java/info/nightscout/androidaps/plugins/general/automation/triggers/DummyTrigger.java +++ b/app/src/test/java/info/nightscout/androidaps/plugins/general/automation/triggers/DummyTrigger.java @@ -1,5 +1,7 @@ package info.nightscout.androidaps.plugins.general.automation.triggers; +import com.google.common.base.Optional; + public class DummyTrigger extends Trigger { private boolean result; @@ -34,6 +36,11 @@ public class DummyTrigger extends Trigger { return null; } + @Override + public Optional icon() { + return Optional.absent(); + } + @Override public Trigger duplicate() { return new DummyTrigger(result); } } diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/general/automation/triggers/TriggerBgTest.java b/app/src/test/java/info/nightscout/androidaps/plugins/general/automation/triggers/TriggerBgTest.java index 00373c0668..d1d95b1ae6 100644 --- a/app/src/test/java/info/nightscout/androidaps/plugins/general/automation/triggers/TriggerBgTest.java +++ b/app/src/test/java/info/nightscout/androidaps/plugins/general/automation/triggers/TriggerBgTest.java @@ -19,10 +19,10 @@ import info.AAPSMocker; import info.nightscout.androidaps.Constants; import info.nightscout.androidaps.MainApp; import info.nightscout.androidaps.db.BgReading; -import info.nightscout.androidaps.plugins.ConfigBuilder.ProfileFunctions; -import info.nightscout.androidaps.plugins.NSClientInternal.data.NSSgv; -import info.nightscout.utils.DateUtil; -import info.nightscout.utils.T; +import info.nightscout.androidaps.plugins.configBuilder.ProfileFunctions; +import info.nightscout.androidaps.plugins.general.nsclient.data.NSSgv; +import info.nightscout.androidaps.utils.DateUtil; +import info.nightscout.androidaps.utils.T; import static org.mockito.ArgumentMatchers.anyBoolean; import static org.mockito.ArgumentMatchers.anyLong; diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/general/automation/triggers/TriggerConnectorTest.java b/app/src/test/java/info/nightscout/androidaps/plugins/general/automation/triggers/TriggerConnectorTest.java index a5ba819b18..cc6068af0d 100644 --- a/app/src/test/java/info/nightscout/androidaps/plugins/general/automation/triggers/TriggerConnectorTest.java +++ b/app/src/test/java/info/nightscout/androidaps/plugins/general/automation/triggers/TriggerConnectorTest.java @@ -76,8 +76,8 @@ public class TriggerConnectorTest { Assert.assertFalse(t.shouldRun()); } - String empty = "{\"data\":{\"connectorType\":\"AND\",\"triggerList\":[]},\"type\":\"info.nightscout.androidaps.plugins.general.automation.triggers.TriggerConnector\"}"; - String oneItem = "{\"data\":{\"connectorType\":\"AND\",\"triggerList\":[\"{\\\"data\\\":{\\\"connectorType\\\":\\\"AND\\\",\\\"triggerList\\\":[]},\\\"type\\\":\\\"info.nightscout.androidaps.plugins.general.automation.triggers.TriggerConnector\\\"}\"]},\"type\":\"info.nightscout.androidaps.plugins.general.automation.triggers.TriggerConnector\"}"; + static public final String empty = "{\"data\":{\"connectorType\":\"AND\",\"triggerList\":[]},\"type\":\"info.nightscout.androidaps.plugins.general.automation.triggers.TriggerConnector\"}"; + static public final String oneItem = "{\"data\":{\"connectorType\":\"AND\",\"triggerList\":[\"{\\\"data\\\":{\\\"connectorType\\\":\\\"AND\\\",\\\"triggerList\\\":[]},\\\"type\\\":\\\"info.nightscout.androidaps.plugins.general.automation.triggers.TriggerConnector\\\"}\"]},\"type\":\"info.nightscout.androidaps.plugins.general.automation.triggers.TriggerConnector\"}"; @Test public void toJSONTest() { diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/general/automation/triggers/TriggerTimeTest.java b/app/src/test/java/info/nightscout/androidaps/plugins/general/automation/triggers/TriggerTimeTest.java index 375253e7bf..e7b051320f 100644 --- a/app/src/test/java/info/nightscout/androidaps/plugins/general/automation/triggers/TriggerTimeTest.java +++ b/app/src/test/java/info/nightscout/androidaps/plugins/general/automation/triggers/TriggerTimeTest.java @@ -16,10 +16,8 @@ import java.util.GregorianCalendar; import info.AAPSMocker; import info.nightscout.androidaps.MainApp; -import info.nightscout.androidaps.plugins.general.automation.triggers.Trigger; -import info.nightscout.androidaps.plugins.general.automation.triggers.TriggerTime; -import info.nightscout.utils.DateUtil; -import info.nightscout.utils.T; +import info.nightscout.androidaps.utils.DateUtil; +import info.nightscout.androidaps.utils.T; import static org.powermock.api.mockito.PowerMockito.when; diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRv2/DanaRv2PluginTest.java b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRv2/DanaRv2PluginTest.java index 140b0165bd..288df852f9 100644 --- a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRv2/DanaRv2PluginTest.java +++ b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRv2/DanaRv2PluginTest.java @@ -1,4 +1,4 @@ -package info.nightscout.androidaps.plugins.PumpdanaRv2; +package info.nightscout.androidaps.plugins.pump.danaRv2; import android.content.Context; @@ -13,17 +13,14 @@ import org.powermock.modules.junit4.PowerMockRunner; import info.AAPSMocker; import info.nightscout.androidaps.Constants; import info.nightscout.androidaps.MainApp; -import info.nightscout.androidaps.R; import info.nightscout.androidaps.interfaces.Constraint; import info.nightscout.androidaps.interfaces.PluginType; -import info.nightscout.androidaps.plugins.ConfigBuilder.ConfigBuilderPlugin; -import info.nightscout.androidaps.plugins.PumpDanaR.DanaRPump; -import info.nightscout.androidaps.plugins.PumpDanaRv2.DanaRv2Plugin; -import info.nightscout.utils.SP; -import info.nightscout.utils.ToastUtils; +import info.nightscout.androidaps.plugins.configBuilder.ConfigBuilderPlugin; +import info.nightscout.androidaps.plugins.pump.danaR.DanaRPump; +import info.nightscout.androidaps.utils.SP; +import info.nightscout.androidaps.utils.ToastUtils; import static org.junit.Assert.assertEquals; -import static org.mockito.Mockito.when; /** * Created by Rumen on 01.08.2018 diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRv2/comm/MessageHashTable_v2Test.java b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRv2/comm/MessageHashTable_v2Test.java index 63e3af0fa4..9fa40854a4 100644 --- a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRv2/comm/MessageHashTable_v2Test.java +++ b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRv2/comm/MessageHashTable_v2Test.java @@ -1,4 +1,4 @@ -package info.nightscout.androidaps.plugins.PumpdanaRv2.comm; +package info.nightscout.androidaps.plugins.pump.danaRv2.comm; import org.junit.Test; import org.junit.runner.RunWith; @@ -8,10 +8,8 @@ import org.powermock.modules.junit4.PowerMockRunner; import info.AAPSMocker; import info.nightscout.androidaps.MainApp; import info.nightscout.androidaps.logging.L; -import info.nightscout.androidaps.plugins.PumpDanaR.comm.MessageBase; -import info.nightscout.androidaps.plugins.PumpDanaRv2.comm.MessageHashTable_v2; -import info.nightscout.androidaps.plugins.PumpDanaRv2.comm.MsgStatusAPS_v2; -import info.nightscout.utils.SP; +import info.nightscout.androidaps.plugins.pump.danaR.comm.MessageBase; +import info.nightscout.androidaps.utils.SP; import static org.junit.Assert.*; /** diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRv2/comm/MsgCheckValue_v2Test.java b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRv2/comm/MsgCheckValue_v2Test.java index 924672f3e0..acc2675c92 100644 --- a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRv2/comm/MsgCheckValue_v2Test.java +++ b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRv2/comm/MsgCheckValue_v2Test.java @@ -1,4 +1,4 @@ -package info.nightscout.androidaps.plugins.PumpdanaRv2.comm; +package info.nightscout.androidaps.plugins.pump.danaRv2.comm; import org.junit.Test; import org.junit.runner.RunWith; @@ -8,15 +8,13 @@ import org.powermock.modules.junit4.PowerMockRunner; import info.AAPSMocker; import info.nightscout.androidaps.MainApp; import info.nightscout.androidaps.logging.L; -import info.nightscout.androidaps.plugins.ConfigBuilder.ConfigBuilderPlugin; -import info.nightscout.androidaps.plugins.PumpDanaR.DanaRPlugin; -import info.nightscout.androidaps.plugins.PumpDanaR.DanaRPump; -import info.nightscout.androidaps.plugins.PumpDanaR.comm.MsgCheckValue; -import info.nightscout.androidaps.plugins.PumpDanaRv2.DanaRv2Plugin; -import info.nightscout.androidaps.plugins.PumpDanaRv2.comm.MsgCheckValue_v2; -import info.nightscout.androidaps.plugins.Treatments.Treatment; +import info.nightscout.androidaps.plugins.configBuilder.ConfigBuilderPlugin; +import info.nightscout.androidaps.plugins.pump.danaR.DanaRPlugin; +import info.nightscout.androidaps.plugins.pump.danaR.DanaRPump; +import info.nightscout.androidaps.plugins.pump.danaRv2.DanaRv2Plugin; +import info.nightscout.androidaps.plugins.treatments.Treatment; import info.nightscout.androidaps.queue.CommandQueue; -import info.nightscout.utils.SP; +import info.nightscout.androidaps.utils.SP; import static org.junit.Assert.*; import static org.powermock.api.mockito.PowerMockito.when; diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRv2/comm/MsgHistoryEvents_v2Test.java b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRv2/comm/MsgHistoryEvents_v2Test.java index f462894924..334c556ccb 100644 --- a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRv2/comm/MsgHistoryEvents_v2Test.java +++ b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRv2/comm/MsgHistoryEvents_v2Test.java @@ -1,4 +1,4 @@ -package info.nightscout.androidaps.plugins.PumpdanaRv2.comm; +package info.nightscout.androidaps.plugins.pump.danaRv2.comm; import org.junit.Test; @@ -9,12 +9,9 @@ import org.powermock.modules.junit4.PowerMockRunner; import info.AAPSMocker; import info.nightscout.androidaps.MainApp; import info.nightscout.androidaps.logging.L; -import info.nightscout.androidaps.plugins.NSClientInternal.NSUpload; -import info.nightscout.androidaps.plugins.PumpDanaRv2.comm.MsgHistoryEvents_v2; -import info.nightscout.androidaps.plugins.Treatments.Treatment; -import info.nightscout.androidaps.plugins.Treatments.TreatmentService; -import info.nightscout.androidaps.plugins.Treatments.TreatmentsPlugin; -import info.nightscout.utils.SP; +import info.nightscout.androidaps.plugins.treatments.TreatmentService; +import info.nightscout.androidaps.plugins.treatments.TreatmentsPlugin; +import info.nightscout.androidaps.utils.SP; import static org.junit.Assert.*; diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRv2/comm/MsgSetHistoryEntry_v2Test.java b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRv2/comm/MsgSetHistoryEntry_v2Test.java index a9e4aee39e..50f80550b5 100644 --- a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRv2/comm/MsgSetHistoryEntry_v2Test.java +++ b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRv2/comm/MsgSetHistoryEntry_v2Test.java @@ -1,4 +1,4 @@ -package info.nightscout.androidaps.plugins.PumpdanaRv2.comm; +package info.nightscout.androidaps.plugins.pump.danaRv2.comm; import org.junit.Test; import org.junit.runner.RunWith; @@ -8,10 +8,9 @@ import org.powermock.modules.junit4.PowerMockRunner; import info.AAPSMocker; import info.nightscout.androidaps.MainApp; import info.nightscout.androidaps.logging.L; -import info.nightscout.androidaps.plugins.PumpDanaR.DanaRPlugin; -import info.nightscout.androidaps.plugins.PumpDanaRv2.DanaRv2Plugin; -import info.nightscout.androidaps.plugins.PumpDanaRv2.comm.MsgSetHistoryEntry_v2; -import info.nightscout.utils.SP; +import info.nightscout.androidaps.plugins.pump.danaR.DanaRPlugin; +import info.nightscout.androidaps.plugins.pump.danaRv2.DanaRv2Plugin; +import info.nightscout.androidaps.utils.SP; import static org.junit.Assert.*; /** diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRv2/comm/MsgStatusAPS_v2Test.java b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRv2/comm/MsgStatusAPS_v2Test.java index c8ae1030ee..63e7011603 100644 --- a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRv2/comm/MsgStatusAPS_v2Test.java +++ b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRv2/comm/MsgStatusAPS_v2Test.java @@ -1,4 +1,4 @@ -package info.nightscout.androidaps.plugins.PumpdanaRv2.comm; +package info.nightscout.androidaps.plugins.pump.danaRv2.comm; import android.content.Context; @@ -11,10 +11,9 @@ import org.powermock.modules.junit4.PowerMockRunner; import info.AAPSMocker; import info.nightscout.androidaps.MainApp; import info.nightscout.androidaps.logging.L; -import info.nightscout.androidaps.plugins.PumpDanaR.DanaRPump; -import info.nightscout.androidaps.plugins.PumpDanaR.comm.MessageBase; -import info.nightscout.androidaps.plugins.PumpDanaRv2.comm.MsgStatusAPS_v2; -import info.nightscout.utils.SP; +import info.nightscout.androidaps.plugins.pump.danaR.DanaRPump; +import info.nightscout.androidaps.plugins.pump.danaR.comm.MessageBase; +import info.nightscout.androidaps.utils.SP; import static org.junit.Assert.*; /** * Created by Rumen Georgiev on 30.10.2018 diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRv2/comm/MsgStatusBolusExtended_v2Test.java b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRv2/comm/MsgStatusBolusExtended_v2Test.java index bde05289c2..2f12a15240 100644 --- a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRv2/comm/MsgStatusBolusExtended_v2Test.java +++ b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRv2/comm/MsgStatusBolusExtended_v2Test.java @@ -1,4 +1,4 @@ -package info.nightscout.androidaps.plugins.PumpdanaRv2.comm; +package info.nightscout.androidaps.plugins.pump.danaRv2.comm; import android.content.Context; @@ -11,13 +11,9 @@ import org.powermock.modules.junit4.PowerMockRunner; import info.AAPSMocker; import info.nightscout.androidaps.MainApp; import info.nightscout.androidaps.logging.L; -import info.nightscout.androidaps.plugins.NSClientInternal.NSUpload; -import info.nightscout.androidaps.plugins.PumpDanaR.DanaRPump; -import info.nightscout.androidaps.plugins.PumpDanaRv2.DanaRv2Plugin; -import info.nightscout.androidaps.plugins.PumpDanaRv2.comm.MsgStatusBolusExtended_v2; -import info.nightscout.androidaps.plugins.PumpDanaR.comm.MessageBase; -import info.nightscout.androidaps.plugins.Treatments.Treatment; -import info.nightscout.utils.SP; +import info.nightscout.androidaps.plugins.pump.danaR.DanaRPump; +import info.nightscout.androidaps.plugins.pump.danaR.comm.MessageBase; +import info.nightscout.androidaps.utils.SP; import static org.junit.Assert.*; diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRv2/comm/MsgStatusTempBasal_v2Test.java b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRv2/comm/MsgStatusTempBasal_v2Test.java index cecb246e5f..70a7a36f0e 100644 --- a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRv2/comm/MsgStatusTempBasal_v2Test.java +++ b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRv2/comm/MsgStatusTempBasal_v2Test.java @@ -1,4 +1,4 @@ -package info.nightscout.androidaps.plugins.PumpdanaRv2.comm; +package info.nightscout.androidaps.plugins.pump.danaRv2.comm; import org.junit.Test; import org.junit.runner.RunWith; @@ -8,11 +8,10 @@ import org.powermock.modules.junit4.PowerMockRunner; import info.AAPSMocker; import info.nightscout.androidaps.MainApp; import info.nightscout.androidaps.logging.L; -import info.nightscout.androidaps.plugins.PumpDanaR.DanaRPlugin; -import info.nightscout.androidaps.plugins.PumpDanaR.DanaRPump; -import info.nightscout.androidaps.plugins.PumpDanaRv2.DanaRv2Plugin; -import info.nightscout.androidaps.plugins.PumpDanaRv2.comm.MsgStatusTempBasal_v2; -import info.nightscout.utils.SP; +import info.nightscout.androidaps.plugins.pump.danaR.DanaRPlugin; +import info.nightscout.androidaps.plugins.pump.danaR.DanaRPump; +import info.nightscout.androidaps.plugins.pump.danaRv2.DanaRv2Plugin; +import info.nightscout.androidaps.utils.SP; import static org.junit.Assert.*; /**