caspervk/AndroidAPS
1
0
Fork 0
Code Releases Activity

Finish injecting scripter.

Browse source
This commit is contained in:
Johannes Mockenhaupt 2017-08-23 12:36:19 +02:00
parent 3238cf9c35
commit 7537048a96
No known key found for this signature in database
GPG key ID: 9E1EA6AF7BBBB0D1
3 changed files with 48 additions and 48 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
app/src/main/java/de/jotomo/ruffyscripter/commands/BolusCommand.java
View file

@ -36,10 +36,10 @@ public class BolusCommand extends BaseCommand {
@Override
public CommandResult execute() {
try {
enterBolusMenu(scripter);
enterBolusMenu();
inputBolusAmount(scripter);
verifyDisplayedBolusAmount(scripter);
inputBolusAmount();
verifyDisplayedBolusAmount();
// confirm bolus
scripter.verifyMenuIsDisplayed(MenuType.BOLUS_ENTER);
@ -105,7 +105,7 @@ public class BolusCommand extends BaseCommand {
}
}
private void enterBolusMenu(RuffyScripter scripter) {
private void enterBolusMenu() {
scripter.verifyMenuIsDisplayed(MenuType.MAIN_MENU);
scripter.navigateToMenu(MenuType.BOLUS_MENU);
scripter.verifyMenuIsDisplayed(MenuType.BOLUS_MENU);
@ -114,7 +114,7 @@ public class BolusCommand extends BaseCommand {
scripter.verifyMenuIsDisplayed(MenuType.BOLUS_ENTER);
}
private void inputBolusAmount(RuffyScripter scripter) {
private void inputBolusAmount() {
scripter.verifyMenuIsDisplayed(MenuType.BOLUS_ENTER);
// press 'up' once for each 0.1 U increment
long steps = Math.round(bolus * 10);
@ -128,9 +128,9 @@ public class BolusCommand extends BaseCommand {
SystemClock.sleep(2000);
}
private void verifyDisplayedBolusAmount(RuffyScripter scripter) {
private void verifyDisplayedBolusAmount() {
scripter.verifyMenuIsDisplayed(MenuType.BOLUS_ENTER);
double displayedBolus = readDisplayedBolusAmount(scripter);
double displayedBolus = readDisplayedBolusAmount();
log.debug("Final bolus: " + displayedBolus);
if (Math.abs(displayedBolus - bolus) > 0.05) {
throw new CommandException().message("Failed to set correct bolus. Expected: " + bolus + ", actual: " + displayedBolus);
@ -138,14 +138,14 @@ public class BolusCommand extends BaseCommand {
// check again to ensure the displayed value hasn't change due to due scrolling taking extremely long
SystemClock.sleep(2000);
double refreshedDisplayedBolus = readDisplayedBolusAmount(scripter);
double refreshedDisplayedBolus = readDisplayedBolusAmount();
if (Math.abs(displayedBolus - refreshedDisplayedBolus) > 0.05) {
throw new CommandException().message("Failed to set bolus: bolus changed after input stopped from "
+ displayedBolus + " -> " + refreshedDisplayedBolus);
}
}
private double readDisplayedBolusAmount(RuffyScripter scripter) {
private double readDisplayedBolusAmount() {
// TODO v2 add timeout? Currently the command execution timeout would trigger if exceeded
scripter.verifyMenuIsDisplayed(MenuType.BOLUS_ENTER);
// bolus amount is blinking, so we need to make sure we catch it at the right moment

28
app/src/main/java/de/jotomo/ruffyscripter/commands/DetermineCapabilitiesCommand.java
View file

@ -30,11 +30,11 @@ public class DetermineCapabilitiesCommand extends BaseCommand {
try {
//read main menu 100% or TBR? Read remaining duration.
long durationBefore = readDisplayedTbrDurationMainMenu(scripter);
long percentageBefore = readDisplayedTbrPercentageMainMenu(scripter);
long durationBefore = readDisplayedTbrDurationMainMenu();
long percentageBefore = readDisplayedTbrPercentageMainMenu();
enterTbrMenu(scripter);
long maxTbrPercentage = findMaxTbrPercentage(scripter);
enterTbrMenu();
long maxTbrPercentage = findMaxTbrPercentage();
// TODO v2 this can probably be removed by now
SystemClock.sleep(750);
@ -45,8 +45,8 @@ public class DetermineCapabilitiesCommand extends BaseCommand {
//TODO: check if TBR is still the same or duration was less than 5 minutes
long durationAfter = readDisplayedTbrDurationMainMenu(scripter);
long percentageAfter = readDisplayedTbrPercentageMainMenu(scripter);
long durationAfter = readDisplayedTbrDurationMainMenu();
long percentageAfter = readDisplayedTbrPercentageMainMenu();
if(Math.abs(durationBefore-durationAfter) > 5){
throw new CommandException().message("Duration jump during DetermineCapabilities");
@ -65,7 +65,7 @@ public class DetermineCapabilitiesCommand extends BaseCommand {
}
}
private void enterTbrMenu(RuffyScripter scripter) {
private void enterTbrMenu() {
scripter.verifyMenuIsDisplayed(MenuType.MAIN_MENU);
scripter.navigateToMenu(MenuType.TBR_MENU);
scripter.verifyMenuIsDisplayed(MenuType.TBR_MENU);
@ -74,9 +74,9 @@ public class DetermineCapabilitiesCommand extends BaseCommand {
scripter.verifyMenuIsDisplayed(MenuType.TBR_SET);
}
private long findMaxTbrPercentage(RuffyScripter scripter) {
private long findMaxTbrPercentage() {
scripter.verifyMenuIsDisplayed(MenuType.TBR_SET);
long activeTempBasal = readDisplayedTbrPercentage(scripter);
long activeTempBasal = readDisplayedTbrPercentage();
// pretend to increase the TBR to more than 500%
log.debug("Pressing up " + UP_STEPS + " times to get to maximum");
@ -89,7 +89,7 @@ public class DetermineCapabilitiesCommand extends BaseCommand {
//read the displayed maximum value
scripter.verifyMenuIsDisplayed(MenuType.TBR_SET);
long maximumTempBasal = readDisplayedTbrPercentage(scripter);
long maximumTempBasal = readDisplayedTbrPercentage();
//reset the TBR in a controlled manner
long percentageChange = maximumTempBasal - activeTempBasal;
@ -106,7 +106,7 @@ public class DetermineCapabilitiesCommand extends BaseCommand {
}
//do the rest if button-presses failed.
scripter.verifyMenuIsDisplayed(MenuType.TBR_SET);
long currentPercentage = readDisplayedTbrPercentage(scripter);
long currentPercentage = readDisplayedTbrPercentage();
percentageChange = currentPercentage - activeTempBasal;
percentageSteps = percentageChange / 10;
retries++;
@ -120,7 +120,7 @@ public class DetermineCapabilitiesCommand extends BaseCommand {
}
private long readDisplayedTbrPercentage(RuffyScripter scripter) {
private long readDisplayedTbrPercentage() {
SystemClock.sleep(1000);
// TODO v2 add timeout? Currently the command execution timeout would trigger if exceeded
Object percentageObj = scripter.currentMenu.getAttribute(MenuAttribute.BASAL_RATE);
@ -133,7 +133,7 @@ public class DetermineCapabilitiesCommand extends BaseCommand {
return ((Double) percentageObj).longValue();
}
private int readDisplayedTbrDurationMainMenu(RuffyScripter scripter) {
private int readDisplayedTbrDurationMainMenu() {
scripter.verifyMenuIsDisplayed(MenuType.MAIN_MENU);
if(scripter.currentMenu.attributes().contains(MenuAttribute.RUNTIME)){
// TODO v2 add timeout? Currently the command execution timeout would trigger if exceeded
@ -145,7 +145,7 @@ public class DetermineCapabilitiesCommand extends BaseCommand {
}
}
private int readDisplayedTbrPercentageMainMenu(RuffyScripter scripter) {
private int readDisplayedTbrPercentageMainMenu() {
scripter.verifyMenuIsDisplayed(MenuType.MAIN_MENU);
if(scripter.currentMenu.attributes().contains(MenuAttribute.TBR)){
return (int)((Double) scripter.currentMenu.getAttribute(MenuAttribute.TBR)).doubleValue();

50
app/src/main/java/de/jotomo/ruffyscripter/commands/SetTbrCommandAlt.java
View file

@ -55,12 +55,12 @@ public class SetTbrCommandAlt extends BaseCommand {
@Override
public CommandResult execute() {
try {
enterTbrMenu(scripter);
inputTbrPercentage(scripter);
verifyDisplayedTbrPercentage(scripter);
enterTbrMenu();
inputTbrPercentage();
verifyDisplayedTbrPercentage();
if (percentage == 100) {
cancelTbrAndConfirmCancellationWarning(scripter);
cancelTbrAndConfirmCancellationWarning();
} else {
// switch to TBR_DURATION menu by pressing menu key
scripter.verifyMenuIsDisplayed(MenuType.TBR_SET);
@ -68,8 +68,8 @@ public class SetTbrCommandAlt extends BaseCommand {
scripter.waitForMenuUpdate();
scripter.verifyMenuIsDisplayed(MenuType.TBR_DURATION);
inputTbrDuration(scripter);
verifyDisplayedTbrDuration(scripter);
inputTbrDuration();
verifyDisplayedTbrDuration();
// confirm TBR
scripter.pressCheckKey();
@ -82,10 +82,10 @@ public class SetTbrCommandAlt extends BaseCommand {
// check main menu shows the same values we just set
if (percentage == 100) {
verifyMainMenuShowsNoActiveTbr(scripter);
verifyMainMenuShowsNoActiveTbr();
return new CommandResult().success(true).enacted(true).message("TBR was cancelled");
} else {
verifyMainMenuShowsExpectedTbrActive(scripter);
verifyMainMenuShowsExpectedTbrActive();
return new CommandResult().success(true).enacted(true).message(
String.format(Locale.US, "TBR set to %d%% for %d min", percentage, duration));
}
@ -95,7 +95,7 @@ public class SetTbrCommandAlt extends BaseCommand {
}
}
private void enterTbrMenu(RuffyScripter scripter) {
private void enterTbrMenu() {
scripter.verifyMenuIsDisplayed(MenuType.MAIN_MENU);
scripter.navigateToMenu(MenuType.TBR_MENU);
scripter.verifyMenuIsDisplayed(MenuType.TBR_MENU);
@ -104,9 +104,9 @@ public class SetTbrCommandAlt extends BaseCommand {
scripter.verifyMenuIsDisplayed(MenuType.TBR_SET);
}
private void inputTbrPercentage(RuffyScripter scripter) {
private void inputTbrPercentage() {
scripter.verifyMenuIsDisplayed(MenuType.TBR_SET);
long currentPercent = readDisplayedTbrPercentage(scripter);
long currentPercent = readDisplayedTbrPercentage();
log.debug("Current TBR %: " + currentPercent);
long percentageChange = percentage - currentPercent;
long percentageSteps = percentageChange / 10;
@ -128,9 +128,9 @@ public class SetTbrCommandAlt extends BaseCommand {
SystemClock.sleep(2000);
}
private void verifyDisplayedTbrPercentage(RuffyScripter scripter) {
private void verifyDisplayedTbrPercentage() {
scripter.verifyMenuIsDisplayed(MenuType.TBR_SET);
long displayedPercentage = readDisplayedTbrPercentage(scripter);
long displayedPercentage = readDisplayedTbrPercentage();
if (displayedPercentage != percentage) {
log.debug("Final displayed TBR percentage: " + displayedPercentage);
throw new CommandException().message("Failed to set TBR percentage");
@ -138,7 +138,7 @@ public class SetTbrCommandAlt extends BaseCommand {
// check again to ensure the displayed value hasn't change due to due scrolling taking extremely long
SystemClock.sleep(2000);
long refreshedDisplayedTbrPecentage = readDisplayedTbrPercentage(scripter);
long refreshedDisplayedTbrPecentage = readDisplayedTbrPercentage();
if (displayedPercentage != refreshedDisplayedTbrPecentage) {
throw new CommandException().message("Failed to set TBR percentage: " +
"percentage changed after input stopped from "
@ -146,7 +146,7 @@ public class SetTbrCommandAlt extends BaseCommand {
}
}
private long readDisplayedTbrPercentage(RuffyScripter scripter) {
private long readDisplayedTbrPercentage() {
// TODO v2 add timeout? Currently the command execution timeout would trigger if exceeded
Object percentageObj = scripter.currentMenu.getAttribute(MenuAttribute.BASAL_RATE);
// this as a bit hacky, the display value is blinking, so we might catch that, so
@ -158,9 +158,9 @@ public class SetTbrCommandAlt extends BaseCommand {
return ((Double) percentageObj).longValue();
}
private void inputTbrDuration(RuffyScripter scripter) {
private void inputTbrDuration() {
scripter.verifyMenuIsDisplayed(MenuType.TBR_DURATION);
long currentDuration = readDisplayedTbrDuration(scripter);
long currentDuration = readDisplayedTbrDuration();
if (currentDuration % 15 != 0) {
// The duration displayed is how long an active TBR will still run,
// which might be something like 0:13, hence not in 15 minute steps.
@ -170,7 +170,7 @@ public class SetTbrCommandAlt extends BaseCommand {
scripter.verifyMenuIsDisplayed(MenuType.TBR_DURATION);
scripter.pressUpKey();
scripter.waitForMenuUpdate();
currentDuration = readDisplayedTbrDuration(scripter);
currentDuration = readDisplayedTbrDuration();
}
log.debug("Current TBR duration: " + currentDuration);
long durationChange = duration - currentDuration;
@ -193,9 +193,9 @@ public class SetTbrCommandAlt extends BaseCommand {
SystemClock.sleep(2000);
}
private void verifyDisplayedTbrDuration(RuffyScripter scripter) {
private void verifyDisplayedTbrDuration() {
scripter.verifyMenuIsDisplayed(MenuType.TBR_DURATION);
long displayedDuration = readDisplayedTbrDuration(scripter);
long displayedDuration = readDisplayedTbrDuration();
if (displayedDuration != duration) {
log.debug("Final displayed TBR duration: " + displayedDuration);
throw new CommandException().message("Failed to set TBR duration");
@ -203,7 +203,7 @@ public class SetTbrCommandAlt extends BaseCommand {
// check again to ensure the displayed value hasn't change due to due scrolling taking extremely long
SystemClock.sleep(2000);
long refreshedDisplayedTbrDuration = readDisplayedTbrDuration(scripter);
long refreshedDisplayedTbrDuration = readDisplayedTbrDuration();
if (displayedDuration != refreshedDisplayedTbrDuration) {
throw new CommandException().message("Failed to set TBR duration: " +
"duration changed after input stopped from "
@ -211,7 +211,7 @@ public class SetTbrCommandAlt extends BaseCommand {
}
}
private long readDisplayedTbrDuration(RuffyScripter scripter) {
private long readDisplayedTbrDuration() {
// TODO v2 add timeout? Currently the command execution timeout would trigger if exceeded
scripter.verifyMenuIsDisplayed(MenuType.TBR_DURATION);
Object durationObj = scripter.currentMenu.getAttribute(MenuAttribute.RUNTIME);
@ -225,7 +225,7 @@ public class SetTbrCommandAlt extends BaseCommand {
return duration.getHour() * 60 + duration.getMinute();
}
private void cancelTbrAndConfirmCancellationWarning(RuffyScripter scripter) {
private void cancelTbrAndConfirmCancellationWarning() {
// confirm entered TBR
scripter.verifyMenuIsDisplayed(MenuType.TBR_SET);
scripter.pressCheckKey();
@ -264,7 +264,7 @@ public class SetTbrCommandAlt extends BaseCommand {
}
}
private void verifyMainMenuShowsNoActiveTbr(RuffyScripter scripter) {
private void verifyMainMenuShowsNoActiveTbr() {
scripter.verifyMenuIsDisplayed(MenuType.MAIN_MENU);
Double tbrPercentage = (Double) scripter.currentMenu.getAttribute(MenuAttribute.TBR);
boolean runtimeDisplayed = scripter.currentMenu.attributes().contains(MenuAttribute.RUNTIME);
@ -273,7 +273,7 @@ public class SetTbrCommandAlt extends BaseCommand {
}
}
private void verifyMainMenuShowsExpectedTbrActive(RuffyScripter scripter) {
private void verifyMainMenuShowsExpectedTbrActive() {
scripter.verifyMenuIsDisplayed(MenuType.MAIN_MENU);
// new TBR set; percentage and duration must be displayed ...
if (!scripter.currentMenu.attributes().contains(MenuAttribute.TBR) ||