GlucoseStatusTest & fix

app/src/main/java/info/nightscout/androidaps/data/GlucoseStatus.java

@@ -21,6 +21,7 @@ import java.util.List;
 import info.nightscout.androidaps.MainApp;
 import info.nightscout.androidaps.R;
 import info.nightscout.androidaps.db.BgReading;
+import info.nightscout.utils.DateUtil;
 import info.nightscout.utils.DecimalFormatter;
 import info.nightscout.utils.Round;
 
@@ -40,17 +41,10 @@ public class GlucoseStatus {
 
     @Override
     public String toString() {
-        return MainApp.sResources.getString(R.string.glucose) + " " + DecimalFormatter.to0Decimal(glucose) + " mg/dl\n" +
+        return MainApp.gs(R.string.glucose) + " " + DecimalFormatter.to0Decimal(glucose) + " mg/dl\n" +
-                MainApp.sResources.getString(R.string.delta) + " " + DecimalFormatter.to0Decimal(delta) + " mg/dl\n" +
+                MainApp.gs(R.string.delta) + " " + DecimalFormatter.to0Decimal(delta) + " mg/dl\n" +
-                MainApp.sResources.getString(R.string.short_avgdelta) + " " + DecimalFormatter.to2Decimal(short_avgdelta) + " mg/dl\n" +
+                MainApp.gs(R.string.short_avgdelta) + " " + DecimalFormatter.to2Decimal(short_avgdelta) + " mg/dl\n" +
-                MainApp.sResources.getString(R.string.long_avgdelta) + " " + DecimalFormatter.to2Decimal(long_avgdelta) + " mg/dl";
+                MainApp.gs(R.string.long_avgdelta) + " " + DecimalFormatter.to2Decimal(long_avgdelta) + " mg/dl";
-    }
-
-    public Spanned toSpanned() {
-        return Html.fromHtml("<b>" + MainApp.sResources.getString(R.string.glucose) + "</b>: " + DecimalFormatter.to0Decimal(glucose) + " mg/dl<br>" +
-                "<b>" + MainApp.sResources.getString(R.string.delta) + "</b>: " + DecimalFormatter.to0Decimal(delta) + " mg/dl<br>" +
-                "<b>" + MainApp.sResources.getString(R.string.short_avgdelta) + "</b>: " + DecimalFormatter.to2Decimal(short_avgdelta) + " mg/dl<br>" +
-                "<b>" + MainApp.sResources.getString(R.string.long_avgdelta) + "</b>: " + DecimalFormatter.to2Decimal(long_avgdelta) + " mg/dl");
     }
 
     public GlucoseStatus() {
@@ -75,11 +69,15 @@ public class GlucoseStatus {
     @Nullable
     public static GlucoseStatus getGlucoseStatusData(boolean allowOldData) {
         // load 45min
-        long fromtime = (long) (System.currentTimeMillis() - 60 * 1000L * 45);
+        long fromtime = DateUtil.now() - 60 * 1000L * 45;
         List<BgReading> data = MainApp.getDbHelper().getBgreadingsDataFromTime(fromtime, false);
 
         int sizeRecords = data.size();
-        if (sizeRecords < 1 || (data.get(0).date < System.currentTimeMillis() - 7 * 60 * 1000L && !allowOldData)) {
+        if (sizeRecords == 0) {
+            return null;
+        }
+
+        if (data.get(0).date < DateUtil.now() - 7 * 60 * 1000L && !allowOldData) {
             return null;
         }
 
@@ -87,13 +85,14 @@ public class GlucoseStatus {
         long now_date = now.date;
         double change;
 
-        if (sizeRecords < 2) {
+        if (sizeRecords == 1) {
             GlucoseStatus status = new GlucoseStatus();
             status.glucose = now.value;
             status.short_avgdelta = 0d;
             status.delta = 0d;
             status.long_avgdelta = 0d;
             status.avgdelta = 0d; // for OpenAPS MA
+            status.date = now_date;
             return status.round();
         }
 

app/src/main/java/info/nightscout/utils/DateUtil.java

@@ -159,5 +159,8 @@ public class DateUtil {
         return timeFrameString(timestamp - System.currentTimeMillis());
     }
 
+    public static long now() {
+        return System.currentTimeMillis();
+    }
 
 }

app/src/test/java/info/AAPSMocker.java

@@ -15,6 +15,7 @@ import info.nightscout.androidaps.MainApp;
 import info.nightscout.androidaps.R;
 import info.nightscout.androidaps.data.ConstraintChecker;
 import info.nightscout.androidaps.data.Profile;
+import info.nightscout.androidaps.db.DatabaseHelper;
 import info.nightscout.androidaps.plugins.ConfigBuilder.ConfigBuilderPlugin;
 import info.nightscout.utils.SP;
 
@@ -60,6 +61,10 @@ public class AAPSMocker {
         when(MainApp.gs(R.string.smbalwaysdisabled)).thenReturn("SMB always and after carbs disabled because active BG source doesn\\'t support advanced filtering");
         when(MainApp.gs(R.string.smbnotallowedinopenloopmode)).thenReturn("SMB not allowed in open loop mode");
         when(MainApp.gs(R.string.Glimp)).thenReturn("Glimp");
+        when(MainApp.gs(R.string.glucose)).thenReturn("Glucose");
+        when(MainApp.gs(R.string.delta)).thenReturn("Delta");
+        when(MainApp.gs(R.string.short_avgdelta)).thenReturn("Short avg. delta");
+        when(MainApp.gs(R.string.long_avgdelta)).thenReturn("Long avg. delta");
     }
 
     public static MainApp mockMainApp() {
@@ -97,6 +102,11 @@ public class AAPSMocker {
         when(MainApp.instance().getApplicationContext()).thenReturn(context);
     }
 
+    public static void mockDatabaseHelper() {
+        DatabaseHelper databaseHelper = mock(DatabaseHelper.class);
+        when(MainApp.getDbHelper()).thenReturn(databaseHelper);
+    }
+
     public static Profile getValidProfile() throws JSONException {
         if (profile == null)
             profile = new Profile(new JSONObject(validProfile), Constants.MGDL);

app/src/test/java/info/nightscout/androidaps/data/GlucoseStatusTest.java

@@ -0,0 +1,152 @@
+package info.nightscout.androidaps.data;
+
+import org.json.JSONException;
+import org.json.JSONObject;
+import org.junit.Assert;
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.powermock.api.mockito.PowerMockito;
+import org.powermock.core.classloader.annotations.PrepareForTest;
+import org.powermock.modules.junit4.PowerMockRunner;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import info.AAPSMocker;
+import info.nightscout.androidaps.MainApp;
+import info.nightscout.androidaps.db.BgReading;
+import info.nightscout.androidaps.db.DatabaseHelper;
+import info.nightscout.androidaps.plugins.NSClientInternal.data.NSSgv;
+import info.nightscout.utils.DateUtil;
+
+import static org.mockito.ArgumentMatchers.anyBoolean;
+import static org.mockito.ArgumentMatchers.anyLong;
+import static org.powermock.api.mockito.PowerMockito.when;
+
+/**
+ * Created by mike on 26.03.2018.
+ */
+
+@RunWith(PowerMockRunner.class)
+@PrepareForTest({MainApp.class, DatabaseHelper.class, DateUtil.class})
+public class GlucoseStatusTest {
+
+    @Test
+    public void toStringShouldBeOverloaded() {
+        GlucoseStatus glucoseStatus = new GlucoseStatus();
+        Assert.assertEquals(true, glucoseStatus.toString().contains("Delta"));
+    }
+
+    @Test
+    public void roundtest() {
+        GlucoseStatus glucoseStatus = new GlucoseStatus();
+        glucoseStatus.glucose = 100.11111;
+        Assert.assertEquals(100.1, glucoseStatus.round().glucose, 0.0001);
+    }
+
+    @Test
+    public void calculateValidGlucoseStatus() {
+        when(MainApp.getDbHelper().getBgreadingsDataFromTime(anyLong(), anyBoolean())).thenReturn(generateValidBgData());
+
+        GlucoseStatus glucoseStatus = GlucoseStatus.getGlucoseStatusData();
+
+        Assert.assertEquals(214d, glucoseStatus.glucose, 0.001d);
+        Assert.assertEquals(-2d, glucoseStatus.delta, 0.001d);
+        Assert.assertEquals(-2.5d, glucoseStatus.short_avgdelta, 0.001d); // -2 -2.5 -3 deltas are relative to current value
+        Assert.assertEquals(-2.5d, glucoseStatus.avgdelta, 0.001d); // the same as short_avgdelta
+        Assert.assertEquals(-2d, glucoseStatus.long_avgdelta, 0.001d); // -2 -2 -2 -2
+        Assert.assertEquals(1514766900000L, glucoseStatus.date); // latest date
+    }
+
+    @Test
+    public void oneRecordShouldProduceZeroDeltas() {
+        when(MainApp.getDbHelper().getBgreadingsDataFromTime(anyLong(), anyBoolean())).thenReturn(generateOneCurrentRecordBgData());
+
+        GlucoseStatus glucoseStatus = GlucoseStatus.getGlucoseStatusData();
+
+        Assert.assertEquals(214d, glucoseStatus.glucose, 0.001d);
+        Assert.assertEquals(0d, glucoseStatus.delta, 0.001d);
+        Assert.assertEquals(0d, glucoseStatus.short_avgdelta, 0.001d); // -2 -2.5 -3 deltas are relative to current value
+        Assert.assertEquals(0d, glucoseStatus.avgdelta, 0.001d); // the same as short_avgdelta
+        Assert.assertEquals(0d, glucoseStatus.long_avgdelta, 0.001d); // -2 -2 -2 -2
+        Assert.assertEquals(1514766900000L, glucoseStatus.date); // latest date
+    }
+
+    @Test
+    public void insuffientDataShouldReturnNull() {
+        when(MainApp.getDbHelper().getBgreadingsDataFromTime(anyLong(), anyBoolean())).thenReturn(generateInsufficientBgData());
+
+        GlucoseStatus glucoseStatus = GlucoseStatus.getGlucoseStatusData();
+        Assert.assertEquals(null, glucoseStatus);
+    }
+
+    @Test
+    public void oldDataShouldReturnNull() {
+        when(MainApp.getDbHelper().getBgreadingsDataFromTime(anyLong(), anyBoolean())).thenReturn(generateOldBgData());
+
+        GlucoseStatus glucoseStatus = GlucoseStatus.getGlucoseStatusData();
+        Assert.assertEquals(null, glucoseStatus);
+    }
+
+    @Test
+    public void returnOldDataIfAllowed() {
+        when(MainApp.getDbHelper().getBgreadingsDataFromTime(anyLong(), anyBoolean())).thenReturn(generateOldBgData());
+
+        GlucoseStatus glucoseStatus = GlucoseStatus.getGlucoseStatusData(true);
+        Assert.assertNotEquals(null, glucoseStatus);
+    }
+
+    @Before
+    public void initMocking() {
+        AAPSMocker.mockMainApp();
+        AAPSMocker.mockStrings();
+        AAPSMocker.mockDatabaseHelper();
+
+        PowerMockito.mockStatic(DateUtil.class);
+        when(DateUtil.now()).thenReturn(1514766900000L + 60000L);
+    }
+
+    // [{"mgdl":214,"mills":1521895773113,"device":"xDrip-DexcomG5","direction":"Flat","filtered":191040,"unfiltered":205024,"noise":1,"rssi":100},{"mgdl":219,"mills":1521896073352,"device":"xDrip-DexcomG5","direction":"Flat","filtered":200160,"unfiltered":209760,"noise":1,"rssi":100},{"mgdl":222,"mills":1521896372890,"device":"xDrip-DexcomG5","direction":"Flat","filtered":207360,"unfiltered":212512,"noise":1,"rssi":100},{"mgdl":220,"mills":1521896673062,"device":"xDrip-DexcomG5","direction":"Flat","filtered":211488,"unfiltered":210688,"noise":1,"rssi":100},{"mgdl":193,"mills":1521896972933,"device":"xDrip-DexcomG5","direction":"Flat","filtered":212384,"unfiltered":208960,"noise":1,"rssi":100},{"mgdl":181,"mills":1521897273336,"device":"xDrip-DexcomG5","direction":"SingleDown","filtered":210592,"unfiltered":204320,"noise":1,"rssi":100},{"mgdl":176,"mills":1521897572875,"device":"xDrip-DexcomG5","direction":"FortyFiveDown","filtered":206720,"unfiltered":197440,"noise":1,"rssi":100},{"mgdl":168,"mills":1521897872929,"device":"xDrip-DexcomG5","direction":"FortyFiveDown","filtered":201024,"unfiltered":187904,"noise":1,"rssi":100},{"mgdl":161,"mills":1521898172814,"device":"xDrip-DexcomG5","direction":"FortyFiveDown","filtered":193376,"unfiltered":178144,"noise":1,"rssi":100},{"mgdl":148,"mills":1521898472879,"device":"xDrip-DexcomG5","direction":"SingleDown","filtered":183264,"unfiltered":161216,"noise":1,"rssi":100},{"mgdl":139,"mills":1521898772862,"device":"xDrip-DexcomG5","direction":"FortyFiveDown","filtered":170784,"unfiltered":148928,"noise":1,"rssi":100},{"mgdl":132,"mills":1521899072896,"device":"xDrip-DexcomG5","direction":"FortyFiveDown","filtered":157248,"unfiltered":139552,"noise":1,"rssi":100},{"mgdl":125,"mills":1521899372834,"device":"xDrip-DexcomG5","direction":"FortyFiveDown","filtered":144416,"unfiltered":129616.00000000001,"noise":1,"rssi":100},{"mgdl":128,"mills":1521899973456,"device":"xDrip-DexcomG5","direction":"Flat","filtered":130240.00000000001,"unfiltered":133536,"noise":1,"rssi":100},{"mgdl":132,"mills":1521900573287,"device":"xDrip-DexcomG5","direction":"Flat","filtered":133504,"unfiltered":138720,"noise":1,"rssi":100},{"mgdl":127,"mills":1521900873711,"device":"xDrip-DexcomG5","direction":"Flat","filtered":136480,"unfiltered":132992,"noise":1,"rssi":100},{"mgdl":127,"mills":1521901180151,"device":"xDrip-DexcomG5","direction":"Flat","filtered":136896,"unfiltered":132128,"noise":1,"rssi":100},{"mgdl":125,"mills":1521901473582,"device":"xDrip-DexcomG5","direction":"Flat","filtered":134624,"unfiltered":129696,"noise":1,"rssi":100},{"mgdl":120,"mills":1521901773597,"device":"xDrip-DexcomG5","direction":"Flat","filtered":130704.00000000001,"unfiltered":123376,"noise":1,"rssi":100},{"mgdl":116,"mills":1521902075855,"device":"xDrip-DexcomG5","direction":"Flat","filtered":126272,"unfiltered":118448,"noise":1,"rssi":100}]
+    List<BgReading> generateValidBgData() {
+        List<BgReading> list = new ArrayList<>();
+        try {
+            list.add(new BgReading(new NSSgv(new JSONObject("{\"mgdl\":214,\"mills\":1514766900000,\"direction\":\"Flat\"}"))));
+            list.add(new BgReading(new NSSgv(new JSONObject("{\"mgdl\":216,\"mills\":1514766600000,\"direction\":\"Flat\"}")))); // +2
+            list.add(new BgReading(new NSSgv(new JSONObject("{\"mgdl\":219,\"mills\":1514766300000,\"direction\":\"Flat\"}")))); // +3
+            list.add(new BgReading(new NSSgv(new JSONObject("{\"mgdl\":223,\"mills\":1514766000000,\"direction\":\"Flat\"}")))); // +4
+            list.add(new BgReading(new NSSgv(new JSONObject("{\"mgdl\":222,\"mills\":1514765700000,\"direction\":\"Flat\"}"))));
+            list.add(new BgReading(new NSSgv(new JSONObject("{\"mgdl\":224,\"mills\":1514765400000,\"direction\":\"Flat\"}"))));
+            list.add(new BgReading(new NSSgv(new JSONObject("{\"mgdl\":226,\"mills\":1514765100000,\"direction\":\"Flat\"}"))));
+            list.add(new BgReading(new NSSgv(new JSONObject("{\"mgdl\":228,\"mills\":1514764800000,\"direction\":\"Flat\"}"))));
+        } catch (JSONException e) {
+            e.printStackTrace();
+        }
+        return list;
+    }
+
+    List<BgReading> generateInsufficientBgData() {
+        List<BgReading> list = new ArrayList<>();
+        return list;
+    }
+
+    List<BgReading> generateOldBgData() {
+        List<BgReading> list = new ArrayList<>();
+        try {
+            list.add(new BgReading(new NSSgv(new JSONObject("{\"mgdl\":228,\"mills\":1514764800000,\"direction\":\"Flat\"}"))));
+        } catch (JSONException e) {
+            e.printStackTrace();
+        }
+        return list;
+    }
+
+    List<BgReading> generateOneCurrentRecordBgData() {
+        List<BgReading> list = new ArrayList<>();
+        try {
+            list.add(new BgReading(new NSSgv(new JSONObject("{\"mgdl\":214,\"mills\":1514766900000,\"direction\":\"Flat\"}"))));
+        } catch (JSONException e) {
+            e.printStackTrace();
+        }
+        return list;
+    }
+}