From a08f01e69b7bdbc8cdfb7c18aa5fb6594fe04b5e Mon Sep 17 00:00:00 2001 From: Milos Kozak Date: Thu, 18 Apr 2019 21:06:16 +0200 Subject: [PATCH] more TriggerBg tests --- .../automation/triggers/TriggerBg.java | 9 ++++- .../automation/triggers/TriggerBgTest.java | 37 +++++++++++++++++++ 2 files changed, 44 insertions(+), 2 deletions(-) diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/general/automation/triggers/TriggerBg.java b/app/src/main/java/info/nightscout/androidaps/plugins/general/automation/triggers/TriggerBg.java index 93cf04049b..29b9d5b75a 100644 --- a/app/src/main/java/info/nightscout/androidaps/plugins/general/automation/triggers/TriggerBg.java +++ b/app/src/main/java/info/nightscout/androidaps/plugins/general/automation/triggers/TriggerBg.java @@ -42,7 +42,7 @@ public class TriggerBg extends Trigger { private String units = ProfileFunctions.getInstance().getProfileUnits(); private long lastRun; - final private TextWatcher textWatcher = new TextWatcher() { + final TextWatcher textWatcher = new TextWatcher() { @Override public void afterTextChanged(Editable s) { if (units.equals(Constants.MMOL)) { @@ -68,7 +68,7 @@ public class TriggerBg extends Trigger { threshold = units.equals(Constants.MGDL) ? 100d : 5.5d; } - private TriggerBg(TriggerBg triggerBg) { + TriggerBg(TriggerBg triggerBg) { super(); comparator = triggerBg.comparator; lastRun = triggerBg.lastRun; @@ -88,6 +88,10 @@ public class TriggerBg extends Trigger { return units; } + public long getLastRun() { + return lastRun; + } + @Override public synchronized boolean shouldRun() { GlucoseStatus glucoseStatus = GlucoseStatus.getGlucoseStatusData(); @@ -156,6 +160,7 @@ public class TriggerBg extends Trigger { @Override public void executed(long time) { + lastRun = time; } @Override 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 f971c81927..20e34a0ecf 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 @@ -1,5 +1,6 @@ package info.nightscout.androidaps.plugins.general.automation.triggers; +import com.google.common.base.Optional; import com.squareup.otto.Bus; import org.json.JSONException; @@ -18,6 +19,7 @@ import java.util.List; import info.AAPSMocker; import info.nightscout.androidaps.Constants; import info.nightscout.androidaps.MainApp; +import info.nightscout.androidaps.R; import info.nightscout.androidaps.db.BgReading; import info.nightscout.androidaps.plugins.configBuilder.ProfileFunctions; import info.nightscout.androidaps.plugins.general.nsclient.data.NSSgv; @@ -66,6 +68,35 @@ public class TriggerBgTest { } + @Test + public void textWatcherTest() { + TriggerBg t = new TriggerBg().threshold(1d).units(Constants.MMOL); + t.textWatcher.beforeTextChanged(null, 0,0,0); + t.textWatcher.onTextChanged(null, 0,0,0); + t.textWatcher.afterTextChanged(null); + Assert.assertEquals(4d, t.getThreshold(), 0.01d); + + t = new TriggerBg().threshold(300d).units(Constants.MGDL); + t.textWatcher.afterTextChanged(null); + Assert.assertEquals(270d, t.getThreshold(), 0.01d); + } + + @Test + public void copyConstructorTest() { + TriggerBg t = new TriggerBg().units(Constants.MGDL).threshold(213).comparator(Trigger.Comparator.IS_EQUAL_OR_LESSER); + TriggerBg t1 = (TriggerBg) t.duplicate(); + Assert.assertEquals(213d, t.getThreshold(), 0.01d); + Assert.assertEquals(Constants.MGDL, t.getUnits()); + Assert.assertEquals(Trigger.Comparator.IS_EQUAL_OR_LESSER, t.getComparator()); + } + + @Test + public void executeTest() { + TriggerBg t = new TriggerBg().units(Constants.MGDL).threshold(213).comparator(Trigger.Comparator.IS_EQUAL_OR_LESSER); + t.executed(1); + Assert.assertEquals(1l, t.getLastRun()); + } + String bgJson = "{\"data\":{\"comparator\":\"IS_EQUAL\",\"lastRun\":0,\"threshold\":4.1,\"units\":\"mmol\"},\"type\":\"info.nightscout.androidaps.plugins.general.automation.triggers.TriggerBg\"}"; @Test @@ -84,6 +115,12 @@ public class TriggerBgTest { Assert.assertEquals(Constants.MMOL, t2.getUnits()); } + @Test + public void iconTest() { + Assert.assertEquals(Optional.of(R.drawable.icon_cp_bgcheck), new TriggerBg().icon()); + } + + @Before public void mock() { AAPSMocker.mockMainApp();