From 394ba420aa06b7ff8f315298360ce9c8304f731e Mon Sep 17 00:00:00 2001
From: Milos Kozak <m.kozak@sysop.cz>
Date: Sun, 1 Mar 2020 16:39:23 +0100
Subject: [PATCH] DanaRS tests

---
 ...S_Packet_Bolus_Get_Extended_BolusTest.java | 65 ------------------
 ...aRS_Packet_Bolus_Get_Extended_BolusTest.kt | 28 ++++++++
 ...et_Bolus_Get_Extended_Bolus_StateTest.java | 65 ------------------
 ...cket_Bolus_Get_Extended_Bolus_StateTest.kt | 31 +++++++++
 ...us_Get_Extended_Menu_Option_StateTest.java | 66 -------------------
 ...olus_Get_Extended_Menu_Option_StateTest.kt | 27 ++++++++
 ...RS_Packet_Bolus_Get_Initial_BolusTest.java | 65 ------------------
 ...naRS_Packet_Bolus_Get_Initial_BolusTest.kt | 28 ++++++++
 ..._Bolus_Get_Step_Bolus_InformationTest.java | 65 ------------------
 ...et_Bolus_Get_Step_Bolus_InformationTest.kt | 27 ++++++++
 ...aRS_Packet_Bolus_Set_Bolus_OptionTest.java | 65 ------------------
 ...anaRS_Packet_Bolus_Set_Bolus_OptionTest.kt | 29 ++++++++
 ...aRS_Packet_Bolus_Set_CIR_CF_ArrayTest.java | 65 ------------------
 ...anaRS_Packet_Bolus_Set_CIR_CF_ArrayTest.kt | 29 ++++++++
 14 files changed, 199 insertions(+), 456 deletions(-)
 delete mode 100644 app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Bolus_Get_Extended_BolusTest.java
 create mode 100644 app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Bolus_Get_Extended_BolusTest.kt
 delete mode 100644 app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Bolus_Get_Extended_Bolus_StateTest.java
 create mode 100644 app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Bolus_Get_Extended_Bolus_StateTest.kt
 delete mode 100644 app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Bolus_Get_Extended_Menu_Option_StateTest.java
 create mode 100644 app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Bolus_Get_Extended_Menu_Option_StateTest.kt
 delete mode 100644 app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Bolus_Get_Initial_BolusTest.java
 create mode 100644 app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Bolus_Get_Initial_BolusTest.kt
 delete mode 100644 app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Bolus_Get_Step_Bolus_InformationTest.java
 create mode 100644 app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Bolus_Get_Step_Bolus_InformationTest.kt
 delete mode 100644 app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Bolus_Set_Bolus_OptionTest.java
 create mode 100644 app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Bolus_Set_Bolus_OptionTest.kt
 delete mode 100644 app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Bolus_Set_CIR_CF_ArrayTest.java
 create mode 100644 app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Bolus_Set_CIR_CF_ArrayTest.kt

diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Bolus_Get_Extended_BolusTest.java b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Bolus_Get_Extended_BolusTest.java
deleted file mode 100644
index 920ba7cc86..0000000000
--- a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Bolus_Get_Extended_BolusTest.java
+++ /dev/null
@@ -1,65 +0,0 @@
-package info.nightscout.androidaps.plugins.pump.danaRS.comm;
-
-
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.powermock.core.classloader.annotations.PrepareForTest;
-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.pump.danaR.DanaRPump;
-import info.nightscout.androidaps.utils.SP;
-
-import static org.junit.Assert.assertEquals;
-
-/**
- * Created by Rumen on 06.08.2018.
- */
-
-@RunWith(PowerMockRunner.class)
-@PrepareForTest({MainApp.class, SP.class, L.class})
-public class DanaRS_Packet_Bolus_Get_Extended_BolusTest {
-
-    @Test
-    public void runTest() {
-        AAPSMocker.mockMainApp();
-        AAPSMocker.mockApplicationContext();
-        AAPSMocker.mockSP();
-        AAPSMocker.mockL();
-        DanaRS_Packet_Bolus_Get_Extended_Bolus packet = new DanaRS_Packet_Bolus_Get_Extended_Bolus();
-
-        // test params
-        assertEquals(null, packet.getRequestParams());
-
-        // test message decoding
-        double testValue = 0d;
-        packet.handleMessage(createArray(10, (byte) testValue));
-        assertEquals(testValue != 0d, packet.failed);
-        testValue = 1d;
-        packet.handleMessage(createArray(10, (byte) testValue));
-        // is pump.bolustep set to 1
-        DanaRPump pump = DanaRPump.getInstance();
-        assertEquals(testValue / 100d, pump.bolusStep, 0);
-        assertEquals(testValue != 0d, packet.failed);
-
-        assertEquals("BOLUS__GET_EXTENDED_BOLUS", packet.getFriendlyName());
-    }
-
-    byte[] createArray(int length, byte fillWith){
-        byte[] ret = new byte[length];
-        for(int i = 0; i<length; i++){
-            ret[i] = fillWith;
-        }
-        return ret;
-    }
-
-    double[] createArray(int length, double fillWith){
-        double[] ret = new double[length];
-        for(int i = 0; i<length; i++){
-            ret[i] = fillWith;
-        }
-        return ret;
-    }
-}
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Bolus_Get_Extended_BolusTest.kt b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Bolus_Get_Extended_BolusTest.kt
new file mode 100644
index 0000000000..a62d960cdc
--- /dev/null
+++ b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Bolus_Get_Extended_BolusTest.kt
@@ -0,0 +1,28 @@
+package info.nightscout.androidaps.plugins.pump.danaRS.comm
+
+import org.junit.Assert
+import org.junit.Test
+import org.junit.runner.RunWith
+import org.powermock.core.classloader.annotations.PrepareForTest
+import org.powermock.modules.junit4.PowerMockRunner
+
+@RunWith(PowerMockRunner::class)
+@PrepareForTest()
+class DanaRS_Packet_Bolus_Get_Extended_BolusTest : DanaRSTestBase() {
+
+    @Test fun runTest() {
+        val packet = DanaRS_Packet_Bolus_Get_Extended_Bolus(aapsLogger, danaRPump)
+        // test params
+        Assert.assertEquals(null, packet.requestParams)
+        // test message decoding
+        var testValue = 0.0
+        packet.handleMessage(createArray(10, testValue.toByte()))
+        Assert.assertEquals(testValue != 0.0, packet.failed)
+        testValue = 1.0
+        packet.handleMessage(createArray(10, testValue.toByte()))
+        // is pump.bolustep set to 1
+        Assert.assertEquals(testValue / 100.0, danaRPump.bolusStep, 0.0)
+        Assert.assertEquals(testValue != 0.0, packet.failed)
+        Assert.assertEquals("BOLUS__GET_EXTENDED_BOLUS", packet.friendlyName)
+    }
+}
\ No newline at end of file
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Bolus_Get_Extended_Bolus_StateTest.java b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Bolus_Get_Extended_Bolus_StateTest.java
deleted file mode 100644
index 23bdc76cb4..0000000000
--- a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Bolus_Get_Extended_Bolus_StateTest.java
+++ /dev/null
@@ -1,65 +0,0 @@
-package info.nightscout.androidaps.plugins.pump.danaRS.comm;
-
-
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.powermock.core.classloader.annotations.PrepareForTest;
-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.pump.danaR.DanaRPump;
-import info.nightscout.androidaps.utils.SP;
-
-import static org.junit.Assert.assertEquals;
-
-/**
- * Created by Rumen on 06.08.2018.
- */
-
-@RunWith(PowerMockRunner.class)
-@PrepareForTest({MainApp.class, SP.class, L.class})
-public class DanaRS_Packet_Bolus_Get_Extended_Bolus_StateTest {
-
-    @Test
-    public void runTest() {
-        AAPSMocker.mockMainApp();
-        AAPSMocker.mockApplicationContext();
-        AAPSMocker.mockSP();
-        AAPSMocker.mockL();
-        DanaRS_Packet_Bolus_Get_Extended_Bolus_State packet = new DanaRS_Packet_Bolus_Get_Extended_Bolus_State();
-
-        // test params
-        assertEquals(null, packet.getRequestParams());
-
-        // test message decoding
-        double testValue = 0d;
-        packet.handleMessage(createArray(11, (byte) testValue));
-        assertEquals(testValue != 0d, packet.failed);
-        testValue = 1d;
-        packet.handleMessage(createArray(11, (byte) testValue));
-        // is extended bolus in progress
-        DanaRPump pump = DanaRPump.getInstance();
-        assertEquals(testValue == 1, pump.isExtendedInProgress);
-        assertEquals(testValue != 0d, packet.failed);
-
-        assertEquals("BOLUS__GET_EXTENDED_BOLUS_STATE", packet.getFriendlyName());
-    }
-
-    byte[] createArray(int length, byte fillWith){
-        byte[] ret = new byte[length];
-        for(int i = 0; i<length; i++){
-            ret[i] = fillWith;
-        }
-        return ret;
-    }
-
-    double[] createArray(int length, double fillWith){
-        double[] ret = new double[length];
-        for(int i = 0; i<length; i++){
-            ret[i] = fillWith;
-        }
-        return ret;
-    }
-}
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Bolus_Get_Extended_Bolus_StateTest.kt b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Bolus_Get_Extended_Bolus_StateTest.kt
new file mode 100644
index 0000000000..ed93734c4c
--- /dev/null
+++ b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Bolus_Get_Extended_Bolus_StateTest.kt
@@ -0,0 +1,31 @@
+package info.nightscout.androidaps.plugins.pump.danaRS.comm
+
+import info.nightscout.androidaps.MainApp
+import info.nightscout.androidaps.logging.L
+import info.nightscout.androidaps.utils.SP
+import org.junit.Assert
+import org.junit.Test
+import org.junit.runner.RunWith
+import org.powermock.core.classloader.annotations.PrepareForTest
+import org.powermock.modules.junit4.PowerMockRunner
+
+@RunWith(PowerMockRunner::class)
+@PrepareForTest()
+class DanaRS_Packet_Bolus_Get_Extended_Bolus_StateTest : DanaRSTestBase() {
+
+    @Test fun runTest() {
+        val packet = DanaRS_Packet_Bolus_Get_Extended_Bolus_State(aapsLogger, danaRPump)
+        // test params
+        Assert.assertEquals(null, packet.requestParams)
+        // test message decoding
+        var testValue = 0.0
+        packet.handleMessage(createArray(11, testValue.toByte()))
+        Assert.assertEquals(testValue != 0.0, packet.failed)
+        testValue = 1.0
+        packet.handleMessage(createArray(11, testValue.toByte()))
+        // is extended bolus in progress
+        Assert.assertEquals(testValue == 1.0, danaRPump.isExtendedInProgress)
+        Assert.assertEquals(testValue != 0.0, packet.failed)
+        Assert.assertEquals("BOLUS__GET_EXTENDED_BOLUS_STATE", packet.friendlyName)
+    }
+}
\ No newline at end of file
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Bolus_Get_Extended_Menu_Option_StateTest.java b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Bolus_Get_Extended_Menu_Option_StateTest.java
deleted file mode 100644
index 91a2fb4c51..0000000000
--- a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Bolus_Get_Extended_Menu_Option_StateTest.java
+++ /dev/null
@@ -1,66 +0,0 @@
-package info.nightscout.androidaps.plugins.pump.danaRS.comm;
-
-
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.powermock.core.classloader.annotations.PrepareForTest;
-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.pump.danaR.DanaRPump;
-import info.nightscout.androidaps.utils.SP;
-
-import static org.junit.Assert.assertEquals;
-
-/**
- * Created by Rumen on 06.08.2018.
- */
-
-@RunWith(PowerMockRunner.class)
-@PrepareForTest({MainApp.class, SP.class, L.class})
-public class DanaRS_Packet_Bolus_Get_Extended_Menu_Option_StateTest {
-
-    @Test
-    public void runTest() {
-        AAPSMocker.mockMainApp();
-        AAPSMocker.mockApplicationContext();
-        AAPSMocker.mockSP();
-        AAPSMocker.mockL();
-        DanaRS_Packet_Bolus_Get_Extended_Menu_Option_State packet = new DanaRS_Packet_Bolus_Get_Extended_Menu_Option_State();
-
-        // test params
-        byte[] testparams = packet.getRequestParams();
-        assertEquals(null, packet.getRequestParams());
-
-
-        // test message decoding
-        packet.handleMessage(createArray(34, (byte) 0));
-        // isExtendedinprogres should be false
-        DanaRPump testPump = DanaRPump.getInstance();
-        assertEquals(false, testPump.isExtendedInProgress);
-//        assertEquals(false, packet.failed);
-        packet.handleMessage(createArray(34, (byte) 1));
-        testPump = DanaRPump.getInstance();
-        assertEquals(true, testPump.isExtendedInProgress);
-
-        assertEquals("BOLUS__GET_EXTENDED_MENU_OPTION_STATE", packet.getFriendlyName());
-    }
-
-    byte[] createArray(int length, byte fillWith){
-        byte[] ret = new byte[length];
-        for(int i = 0; i<length; i++){
-            ret[i] = fillWith;
-        }
-        return ret;
-    }
-
-    double[] createArray(int length, double fillWith){
-        double[] ret = new double[length];
-        for(int i = 0; i<length; i++){
-            ret[i] = fillWith;
-        }
-        return ret;
-    }
-}
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Bolus_Get_Extended_Menu_Option_StateTest.kt b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Bolus_Get_Extended_Menu_Option_StateTest.kt
new file mode 100644
index 0000000000..cb9216d126
--- /dev/null
+++ b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Bolus_Get_Extended_Menu_Option_StateTest.kt
@@ -0,0 +1,27 @@
+package info.nightscout.androidaps.plugins.pump.danaRS.comm
+
+import org.junit.Assert
+import org.junit.Test
+import org.junit.runner.RunWith
+import org.powermock.core.classloader.annotations.PrepareForTest
+import org.powermock.modules.junit4.PowerMockRunner
+
+@RunWith(PowerMockRunner::class)
+@PrepareForTest()
+class DanaRS_Packet_Bolus_Get_Extended_Menu_Option_StateTest : DanaRSTestBase() {
+
+    @Test fun runTest() {
+        val packet = DanaRS_Packet_Bolus_Get_Extended_Menu_Option_State(aapsLogger, danaRPump)
+        // test params
+        val testparams = packet.requestParams
+        Assert.assertEquals(null, packet.requestParams)
+        // test message decoding
+        packet.handleMessage(createArray(34, 0.toByte()))
+        // isExtendedinprogres should be false
+        Assert.assertEquals(false, danaRPump.isExtendedInProgress)
+        //        assertEquals(false, packet.failed);
+        packet.handleMessage(createArray(34, 1.toByte()))
+        Assert.assertEquals(true, danaRPump.isExtendedInProgress)
+        Assert.assertEquals("BOLUS__GET_EXTENDED_MENU_OPTION_STATE", packet.friendlyName)
+    }
+}
\ No newline at end of file
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Bolus_Get_Initial_BolusTest.java b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Bolus_Get_Initial_BolusTest.java
deleted file mode 100644
index e329dee330..0000000000
--- a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Bolus_Get_Initial_BolusTest.java
+++ /dev/null
@@ -1,65 +0,0 @@
-package info.nightscout.androidaps.plugins.pump.danaRS.comm;
-
-
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.powermock.core.classloader.annotations.PrepareForTest;
-import org.powermock.modules.junit4.PowerMockRunner;
-
-import info.AAPSMocker;
-import info.nightscout.androidaps.MainApp;
-import info.nightscout.androidaps.logging.L;
-import info.nightscout.androidaps.utils.SP;
-
-import static org.junit.Assert.assertEquals;
-
-/**
- * Created by Rumen on 06.08.2018.
- */
-
-@RunWith(PowerMockRunner.class)
-@PrepareForTest({MainApp.class, SP.class, L.class})
-public class DanaRS_Packet_Bolus_Get_Initial_BolusTest {
-
-    @Test
-    public void runTest() {
-        AAPSMocker.mockMainApp();
-        AAPSMocker.mockApplicationContext();
-        AAPSMocker.mockSP();
-        AAPSMocker.mockL();
-        DanaRS_Packet_Bolus_Get_Initial_Bolus packet = new DanaRS_Packet_Bolus_Get_Initial_Bolus();
-
-        // test params
-        byte[] testparams = packet.getRequestParams();
-        assertEquals(null, packet.getRequestParams());
-
-        // test message decoding
-        packet.handleMessage(createArray(34, (byte) 0));
-        // should fail only if all the initialbolusses are 0
-//        DanaRPump testPump = DanaRPump.getInstance();
-        assertEquals(false, !packet.failed);
-//        assertEquals(false, packet.failed);
-        packet.handleMessage(createArray(34, (byte) 1));
-        int valueRequested = (((byte) 1 & 0x000000FF) << 8) + (((byte) 1) & 0x000000FF);
-        assertEquals(valueRequested /100d, packet.initialBolusValue04, 0);
-        assertEquals(true, !packet.failed);
-
-        assertEquals("BOLUS__GET_BOLUS_RATE", packet.getFriendlyName());
-    }
-
-    byte[] createArray(int length, byte fillWith){
-        byte[] ret = new byte[length];
-        for(int i = 0; i<length; i++){
-            ret[i] = fillWith;
-        }
-        return ret;
-    }
-
-    double[] createArray(int length, double fillWith){
-        double[] ret = new double[length];
-        for(int i = 0; i<length; i++){
-            ret[i] = fillWith;
-        }
-        return ret;
-    }
-}
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Bolus_Get_Initial_BolusTest.kt b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Bolus_Get_Initial_BolusTest.kt
new file mode 100644
index 0000000000..9af566cd34
--- /dev/null
+++ b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Bolus_Get_Initial_BolusTest.kt
@@ -0,0 +1,28 @@
+package info.nightscout.androidaps.plugins.pump.danaRS.comm
+
+import org.junit.Assert
+import org.junit.Test
+import org.junit.runner.RunWith
+import org.powermock.core.classloader.annotations.PrepareForTest
+import org.powermock.modules.junit4.PowerMockRunner
+
+@RunWith(PowerMockRunner::class)
+@PrepareForTest()
+class DanaRS_Packet_Bolus_Get_Initial_BolusTest : DanaRSTestBase() {
+
+    @Test fun runTest() {
+        val packet = DanaRS_Packet_Bolus_Get_Initial_Bolus(aapsLogger)
+        // test params
+        val testparams = packet.requestParams
+        Assert.assertEquals(null, packet.requestParams)
+        // test message decoding
+        packet.handleMessage(createArray(34, 0.toByte()))
+        // should fail only if all the initialbolusses are 0
+//        DanaRPump testPump = DanaRPump.getInstance();
+        Assert.assertEquals(false, !packet.failed)
+        //        assertEquals(false, packet.failed);
+        packet.handleMessage(createArray(34, 1.toByte()))
+        Assert.assertEquals(true, !packet.failed)
+        Assert.assertEquals("BOLUS__GET_BOLUS_RATE", packet.friendlyName)
+    }
+}
\ No newline at end of file
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Bolus_Get_Step_Bolus_InformationTest.java b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Bolus_Get_Step_Bolus_InformationTest.java
deleted file mode 100644
index 8240ae6aff..0000000000
--- a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Bolus_Get_Step_Bolus_InformationTest.java
+++ /dev/null
@@ -1,65 +0,0 @@
-package info.nightscout.androidaps.plugins.pump.danaRS.comm;
-
-
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.powermock.core.classloader.annotations.PrepareForTest;
-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.pump.danaR.DanaRPump;
-import info.nightscout.androidaps.utils.SP;
-
-import static org.junit.Assert.assertEquals;
-
-/**
- * Created by Rumen on 06.08.2018.
- */
-
-@RunWith(PowerMockRunner.class)
-@PrepareForTest({MainApp.class, SP.class, L.class})
-public class DanaRS_Packet_Bolus_Get_Step_Bolus_InformationTest {
-
-    @Test
-    public void runTest() {
-        AAPSMocker.mockMainApp();
-        AAPSMocker.mockApplicationContext();
-        AAPSMocker.mockSP();
-        AAPSMocker.mockL();
-        DanaRS_Packet_Bolus_Get_Step_Bolus_Information packet = new DanaRS_Packet_Bolus_Get_Step_Bolus_Information();
-
-        // test params
-        byte[] testparams = packet.getRequestParams();
-        assertEquals(null, packet.getRequestParams());
-
-        // test message decoding
-        packet.handleMessage(createArray(34, (byte) 0));
-        DanaRPump testPump = DanaRPump.getInstance();
-        assertEquals(false, packet.failed);
-
-        packet.handleMessage(createArray(34, (byte) 1));
-        int valueRequested = (((byte) 1 & 0x000000FF) << 8) + (((byte) 1) & 0x000000FF);
-        assertEquals(valueRequested /100d, testPump.lastBolusAmount, 0);
-        assertEquals(true, packet.failed);
-
-        assertEquals("BOLUS__GET_STEP_BOLUS_INFORMATION", packet.getFriendlyName());
-    }
-
-    byte[] createArray(int length, byte fillWith){
-        byte[] ret = new byte[length];
-        for(int i = 0; i<length; i++){
-            ret[i] = fillWith;
-        }
-        return ret;
-    }
-
-    double[] createArray(int length, double fillWith){
-        double[] ret = new double[length];
-        for(int i = 0; i<length; i++){
-            ret[i] = fillWith;
-        }
-        return ret;
-    }
-}
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Bolus_Get_Step_Bolus_InformationTest.kt b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Bolus_Get_Step_Bolus_InformationTest.kt
new file mode 100644
index 0000000000..fae9d7fd83
--- /dev/null
+++ b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Bolus_Get_Step_Bolus_InformationTest.kt
@@ -0,0 +1,27 @@
+package info.nightscout.androidaps.plugins.pump.danaRS.comm
+
+import org.junit.Assert
+import org.junit.Test
+import org.junit.runner.RunWith
+import org.powermock.core.classloader.annotations.PrepareForTest
+import org.powermock.modules.junit4.PowerMockRunner
+
+@RunWith(PowerMockRunner::class)
+@PrepareForTest()
+class DanaRS_Packet_Bolus_Get_Step_Bolus_InformationTest : DanaRSTestBase() {
+
+    @Test fun runTest() {
+        val packet = DanaRS_Packet_Bolus_Get_Step_Bolus_Information(aapsLogger, danaRPump)
+        // test params
+        val testparams = packet.requestParams
+        Assert.assertEquals(null, packet.requestParams)
+        // test message decoding
+        packet.handleMessage(createArray(34, 0.toByte()))
+        Assert.assertEquals(false, packet.failed)
+        packet.handleMessage(createArray(34, 1.toByte()))
+        val valueRequested: Int = (1 and 0x000000FF shl 8) + (1 and 0x000000FF)
+        Assert.assertEquals(valueRequested / 100.0, danaRPump.lastBolusAmount, 0.0)
+        Assert.assertEquals(true, packet.failed)
+        Assert.assertEquals("BOLUS__GET_STEP_BOLUS_INFORMATION", packet.friendlyName)
+    }
+}
\ No newline at end of file
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Bolus_Set_Bolus_OptionTest.java b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Bolus_Set_Bolus_OptionTest.java
deleted file mode 100644
index bc2010bd7b..0000000000
--- a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Bolus_Set_Bolus_OptionTest.java
+++ /dev/null
@@ -1,65 +0,0 @@
-package info.nightscout.androidaps.plugins.pump.danaRS.comm;
-
-
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.powermock.core.classloader.annotations.PrepareForTest;
-import org.powermock.modules.junit4.PowerMockRunner;
-
-import info.AAPSMocker;
-import info.nightscout.androidaps.MainApp;
-import info.nightscout.androidaps.logging.L;
-import info.nightscout.androidaps.utils.SP;
-
-import static org.junit.Assert.assertEquals;
-
-/**
- * Created by Rumen on 06.08.2018.
- */
-
-@RunWith(PowerMockRunner.class)
-@PrepareForTest({MainApp.class, SP.class, L.class})
-public class DanaRS_Packet_Bolus_Set_Bolus_OptionTest {
-
-    @Test
-    public void runTest() {
-        AAPSMocker.mockMainApp();
-        AAPSMocker.mockApplicationContext();
-        AAPSMocker.mockSP();
-        AAPSMocker.mockL();
-        DanaRS_Packet_Bolus_Set_Bolus_Option packet = new DanaRS_Packet_Bolus_Set_Bolus_Option(0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0);
-
-        // test params
-        byte[] testparams = packet.getRequestParams();
-        assertEquals(0, testparams[0]);
-        assertEquals(0, testparams[18]);
-
-        // test message decoding
-        packet.handleMessage(createArray(34, (byte) 0));
-//        DanaRPump testPump = DanaRPump.getInstance();
-        assertEquals(false, packet.failed);
-
-        packet.handleMessage(createArray(34, (byte) 1));
-//        int valueRequested = (((byte) 1 & 0x000000FF) << 8) + (((byte) 1) & 0x000000FF);
-//        assertEquals(valueRequested /100d, testPump.lastBolusAmount, 0);
-        assertEquals(true, packet.failed);
-
-        assertEquals("BOLUS__SET_BOLUS_OPTION", packet.getFriendlyName());
-    }
-
-    byte[] createArray(int length, byte fillWith){
-        byte[] ret = new byte[length];
-        for(int i = 0; i<length; i++){
-            ret[i] = fillWith;
-        }
-        return ret;
-    }
-
-    double[] createArray(int length, double fillWith){
-        double[] ret = new double[length];
-        for(int i = 0; i<length; i++){
-            ret[i] = fillWith;
-        }
-        return ret;
-    }
-}
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Bolus_Set_Bolus_OptionTest.kt b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Bolus_Set_Bolus_OptionTest.kt
new file mode 100644
index 0000000000..b79f14552b
--- /dev/null
+++ b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Bolus_Set_Bolus_OptionTest.kt
@@ -0,0 +1,29 @@
+package info.nightscout.androidaps.plugins.pump.danaRS.comm
+
+import org.junit.Assert
+import org.junit.Test
+import org.junit.runner.RunWith
+import org.powermock.core.classloader.annotations.PrepareForTest
+import org.powermock.modules.junit4.PowerMockRunner
+
+@RunWith(PowerMockRunner::class)
+@PrepareForTest()
+class DanaRS_Packet_Bolus_Set_Bolus_OptionTest : DanaRSTestBase() {
+
+    @Test fun runTest() {
+        val packet = DanaRS_Packet_Bolus_Set_Bolus_Option(aapsLogger, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0)
+        // test params
+        val testparams = packet.requestParams
+        Assert.assertEquals(0.toByte(), testparams[0])
+        Assert.assertEquals(0.toByte(), testparams[18])
+        // test message decoding
+        packet.handleMessage(createArray(34, 0.toByte()))
+        //        DanaRPump testPump = DanaRPump.getInstance();
+        Assert.assertEquals(false, packet.failed)
+        packet.handleMessage(createArray(34, 1.toByte()))
+        //        int valueRequested = (((byte) 1 & 0x000000FF) << 8) + (((byte) 1) & 0x000000FF);
+//        assertEquals(valueRequested /100d, testPump.lastBolusAmount, 0);
+        Assert.assertEquals(true, packet.failed)
+        Assert.assertEquals("BOLUS__SET_BOLUS_OPTION", packet.friendlyName)
+    }
+}
\ No newline at end of file
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Bolus_Set_CIR_CF_ArrayTest.java b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Bolus_Set_CIR_CF_ArrayTest.java
deleted file mode 100644
index 14e522ab67..0000000000
--- a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Bolus_Set_CIR_CF_ArrayTest.java
+++ /dev/null
@@ -1,65 +0,0 @@
-package info.nightscout.androidaps.plugins.pump.danaRS.comm;
-
-
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.powermock.core.classloader.annotations.PrepareForTest;
-import org.powermock.modules.junit4.PowerMockRunner;
-
-import info.AAPSMocker;
-import info.nightscout.androidaps.MainApp;
-import info.nightscout.androidaps.logging.L;
-import info.nightscout.androidaps.utils.SP;
-
-import static org.junit.Assert.assertEquals;
-
-/**
- * Created by Rumen on 06.08.2018.
- */
-
-@RunWith(PowerMockRunner.class)
-@PrepareForTest({MainApp.class, SP.class, L.class})
-public class DanaRS_Packet_Bolus_Set_CIR_CF_ArrayTest {
-
-    @Test
-    public void runTest() {
-        AAPSMocker.mockMainApp();
-        AAPSMocker.mockApplicationContext();
-        AAPSMocker.mockSP();
-        AAPSMocker.mockL();
-        DanaRS_Packet_Bolus_Set_CIR_CF_Array packet = new DanaRS_Packet_Bolus_Set_CIR_CF_Array(0,0,0,0,0,0,0,0,0,0,0,0,0,0);
-
-        // test params
-        byte[] testparams = packet.getRequestParams();
-        assertEquals(0, testparams[0]);
-        assertEquals(0, testparams[18]);
-
-        // test message decoding
-        packet.handleMessage(createArray(34, (byte) 0));
-//        DanaRPump testPump = DanaRPump.getInstance();
-        assertEquals(false, packet.failed);
-
-        packet.handleMessage(createArray(34, (byte) 1));
-//        int valueRequested = (((byte) 1 & 0x000000FF) << 8) + (((byte) 1) & 0x000000FF);
-//        assertEquals(valueRequested /100d, testPump.lastBolusAmount, 0);
-        assertEquals(true, packet.failed);
-
-        assertEquals("BOLUS__SET_CIR_CF_ARRAY", packet.getFriendlyName());
-    }
-
-    byte[] createArray(int length, byte fillWith){
-        byte[] ret = new byte[length];
-        for(int i = 0; i<length; i++){
-            ret[i] = fillWith;
-        }
-        return ret;
-    }
-
-    double[] createArray(int length, double fillWith){
-        double[] ret = new double[length];
-        for(int i = 0; i<length; i++){
-            ret[i] = fillWith;
-        }
-        return ret;
-    }
-}
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Bolus_Set_CIR_CF_ArrayTest.kt b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Bolus_Set_CIR_CF_ArrayTest.kt
new file mode 100644
index 0000000000..df29bd2439
--- /dev/null
+++ b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Bolus_Set_CIR_CF_ArrayTest.kt
@@ -0,0 +1,29 @@
+package info.nightscout.androidaps.plugins.pump.danaRS.comm
+
+import org.junit.Assert
+import org.junit.Test
+import org.junit.runner.RunWith
+import org.powermock.core.classloader.annotations.PrepareForTest
+import org.powermock.modules.junit4.PowerMockRunner
+
+@RunWith(PowerMockRunner::class)
+@PrepareForTest()
+class DanaRS_Packet_Bolus_Set_CIR_CF_ArrayTest : DanaRSTestBase() {
+
+    @Test fun runTest() {
+        val packet = DanaRS_Packet_Bolus_Set_CIR_CF_Array(aapsLogger, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0)
+        // test params
+        val testparams = packet.requestParams
+        Assert.assertEquals(0.toByte(), testparams[0])
+        Assert.assertEquals(0.toByte(), testparams[18])
+        // test message decoding
+        packet.handleMessage(createArray(34, 0.toByte()))
+        //        DanaRPump testPump = DanaRPump.getInstance();
+        Assert.assertEquals(false, packet.failed)
+        packet.handleMessage(createArray(34, 1.toByte()))
+        //        int valueRequested = (((byte) 1 & 0x000000FF) << 8) + (((byte) 1) & 0x000000FF);
+//        assertEquals(valueRequested /100d, testPump.lastBolusAmount, 0);
+        Assert.assertEquals(true, packet.failed)
+        Assert.assertEquals("BOLUS__SET_CIR_CF_ARRAY", packet.friendlyName)
+    }
+}
\ No newline at end of file