caspervk/AndroidAPS
1
0
Fork 0
Code Releases Activity

Fixes wrong algo

Browse source
This commit is contained in:
Markus M. May 2018-05-01 22:49:44 +02:00
parent 6755df4482
commit de92125967
2 changed files with 2 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/src/main/java/info/nightscout/androidaps/plugins/ConstraintsObjectives/ObjectivesFragment.java
View file

@ -204,7 +204,7 @@ public class ObjectivesFragment extends SubscriberFragment {
return 1; return 1;
} else if (objectiveStartedTime > 0 && !enableFakeValue } else if (objectiveStartedTime > 0 && !enableFakeValue
&& objectiveAccomplishedTime == 0 && objectiveAccomplishedTime == 0
&& !(objectiveStartedTime + durationInDays * 24 * 60 * 60 * 1000 >= now && requirementsMet)) { && !(objectiveStartedTime + durationInDays * 24 * 60 * 60 * 1000 < now && requirementsMet)) {
return 2; return 2;
} else if (objectiveAccomplishedTime == 0) { } else if (objectiveAccomplishedTime == 0) {
return 3; return 3;

17
app/src/test/java/info/nightscout/androidaps/plugins/ConstraintsObjectives/ObjectivesFragmentTest.java
View file

@ -35,25 +35,10 @@ public class ObjectivesFragmentTest {
objectiveStartedTime, durationInDays, objectiveAccomplishedTime, requirementsMet, enableFakeValue)); objectiveStartedTime, durationInDays, objectiveAccomplishedTime, requirementsMet, enableFakeValue));
// started // started
// time calculation is false, requirements met is false // time calculation is true, requirements met is true
objectiveStartedTime = 10; objectiveStartedTime = 10;
durationInDays = 0; durationInDays = 0;
requirementsMet = true; requirementsMet = true;
assertEquals(2, fragment.modifyVisibility(currentPosition, prevObjectiveAccomplishedTime,
objectiveStartedTime, durationInDays, objectiveAccomplishedTime, requirementsMet, enableFakeValue));
// started
// time calculation is false, requirements met is true
objectiveStartedTime = 10;
durationInDays = 999999;
requirementsMet = true;
assertEquals(2, fragment.modifyVisibility(currentPosition, prevObjectiveAccomplishedTime,
objectiveStartedTime, durationInDays, objectiveAccomplishedTime, requirementsMet, enableFakeValue));
// started, after duration, requirements met --> show verify
objectiveStartedTime = Long.MAX_VALUE;
durationInDays = 0;
requirementsMet = true;
assertEquals(3, fragment.modifyVisibility(currentPosition, prevObjectiveAccomplishedTime, assertEquals(3, fragment.modifyVisibility(currentPosition, prevObjectiveAccomplishedTime,
objectiveStartedTime, durationInDays, objectiveAccomplishedTime, requirementsMet, enableFakeValue)); objectiveStartedTime, durationInDays, objectiveAccomplishedTime, requirementsMet, enableFakeValue));