From 130d5874a83c7bf812fe7f2b32fb760684a0f6a5 Mon Sep 17 00:00:00 2001
From: Milos Kozak <m.kozak@sysop.cz>
Date: Sun, 1 Mar 2020 17:10:13 +0100
Subject: [PATCH] DanaRS tests

---
 ...anaRS_Packet_Bolus_Set_Dual_BolusTest.java | 65 -------------------
 .../DanaRS_Packet_Bolus_Set_Dual_BolusTest.kt | 29 +++++++++
 ...S_Packet_Bolus_Set_Extended_BolusTest.java | 65 -------------------
 ...aRS_Packet_Bolus_Set_Extended_BolusTest.kt | 29 +++++++++
 ...t_Bolus_Set_Extended_Bolus_CancelTest.java | 64 ------------------
 ...ket_Bolus_Set_Extended_Bolus_CancelTest.kt | 28 ++++++++
 ...RS_Packet_Bolus_Set_Initial_BolusTest.java | 62 ------------------
 ...naRS_Packet_Bolus_Set_Initial_BolusTest.kt | 26 ++++++++
 ...DanaRS_Packet_Etc_Keep_ConnectionTest.java | 46 -------------
 .../DanaRS_Packet_Etc_Keep_ConnectionTest.kt  | 25 +++++++
 ...anaRS_Packet_Etc_Set_History_SaveTest.java | 61 -----------------
 .../DanaRS_Packet_Etc_Set_History_SaveTest.kt | 26 ++++++++
 ...RS_Packet_General_Delivery_StatusTest.java | 61 -----------------
 ...naRS_Packet_General_Delivery_StatusTest.kt | 26 ++++++++
 14 files changed, 189 insertions(+), 424 deletions(-)
 delete mode 100644 app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Bolus_Set_Dual_BolusTest.java
 create mode 100644 app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Bolus_Set_Dual_BolusTest.kt
 delete mode 100644 app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Bolus_Set_Extended_BolusTest.java
 create mode 100644 app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Bolus_Set_Extended_BolusTest.kt
 delete mode 100644 app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Bolus_Set_Extended_Bolus_CancelTest.java
 create mode 100644 app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Bolus_Set_Extended_Bolus_CancelTest.kt
 delete mode 100644 app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Bolus_Set_Initial_BolusTest.java
 create mode 100644 app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Bolus_Set_Initial_BolusTest.kt
 delete mode 100644 app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Etc_Keep_ConnectionTest.java
 create mode 100644 app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Etc_Keep_ConnectionTest.kt
 delete mode 100644 app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Etc_Set_History_SaveTest.java
 create mode 100644 app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Etc_Set_History_SaveTest.kt
 delete mode 100644 app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_General_Delivery_StatusTest.java
 create mode 100644 app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_General_Delivery_StatusTest.kt

diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Bolus_Set_Dual_BolusTest.java b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Bolus_Set_Dual_BolusTest.java
deleted file mode 100644
index 5e16f6ef2e..0000000000
--- a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Bolus_Set_Dual_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_Set_Dual_BolusTest {
-
-    @Test
-    public void runTest() {
-        AAPSMocker.mockMainApp();
-        AAPSMocker.mockApplicationContext();
-        AAPSMocker.mockSP();
-        AAPSMocker.mockL();
-        DanaRS_Packet_Bolus_Set_Dual_Bolus packet = new DanaRS_Packet_Bolus_Set_Dual_Bolus(0d, 0d, 1);
-
-        // test params
-        byte[] testparams = packet.getRequestParams();
-        assertEquals(0, testparams[0]);
-        assertEquals(1, testparams[4]);
-
-        // 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_DUAL_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_Set_Dual_BolusTest.kt b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Bolus_Set_Dual_BolusTest.kt
new file mode 100644
index 0000000000..0e60b237d7
--- /dev/null
+++ b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Bolus_Set_Dual_BolusTest.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_Dual_BolusTest : DanaRSTestBase() {
+
+    @Test fun runTest() {
+        val packet = DanaRS_Packet_Bolus_Set_Dual_Bolus(aapsLogger, 0.0, 0.0, 1)
+        // test params
+        val testparams = packet.requestParams
+        Assert.assertEquals(0.toByte(), testparams[0])
+        Assert.assertEquals(1.toByte(), testparams[4])
+        // 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_DUAL_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_Set_Extended_BolusTest.java b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Bolus_Set_Extended_BolusTest.java
deleted file mode 100644
index 630e94e046..0000000000
--- a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Bolus_Set_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.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_Extended_BolusTest {
-
-    @Test
-    public void runTest() {
-        AAPSMocker.mockMainApp();
-        AAPSMocker.mockApplicationContext();
-        AAPSMocker.mockSP();
-        AAPSMocker.mockL();
-        DanaRS_Packet_Bolus_Set_Extended_Bolus packet = new DanaRS_Packet_Bolus_Set_Extended_Bolus(1d, 1);
-
-        // test params
-        byte[] testparams = packet.getRequestParams();
-        assertEquals(100, testparams[0]);
-        assertEquals(1, testparams[2]);
-
-        // 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_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_Set_Extended_BolusTest.kt b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Bolus_Set_Extended_BolusTest.kt
new file mode 100644
index 0000000000..173a87b423
--- /dev/null
+++ b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Bolus_Set_Extended_BolusTest.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_Extended_BolusTest : DanaRSTestBase() {
+
+    @Test fun runTest() {
+        val packet = DanaRS_Packet_Bolus_Set_Extended_Bolus(aapsLogger, 1.0, 1)
+        // test params
+        val testparams = packet.requestParams
+        Assert.assertEquals(100.toByte(), testparams[0])
+        Assert.assertEquals(1.toByte(), testparams[2])
+        // 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_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_Set_Extended_Bolus_CancelTest.java b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Bolus_Set_Extended_Bolus_CancelTest.java
deleted file mode 100644
index 23da9c8863..0000000000
--- a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Bolus_Set_Extended_Bolus_CancelTest.java
+++ /dev/null
@@ -1,64 +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_Extended_Bolus_CancelTest {
-
-    @Test
-    public void runTest() {
-        AAPSMocker.mockMainApp();
-        AAPSMocker.mockApplicationContext();
-        AAPSMocker.mockSP();
-        AAPSMocker.mockL();
-        DanaRS_Packet_Bolus_Set_Extended_Bolus_Cancel packet = new DanaRS_Packet_Bolus_Set_Extended_Bolus_Cancel();
-
-        // 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__SET_EXTENDED_BOLUS_CANCEL", 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_Extended_Bolus_CancelTest.kt b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Bolus_Set_Extended_Bolus_CancelTest.kt
new file mode 100644
index 0000000000..55c5838317
--- /dev/null
+++ b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Bolus_Set_Extended_Bolus_CancelTest.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_Set_Extended_Bolus_CancelTest : DanaRSTestBase() {
+
+    @Test fun runTest() {
+        val packet = DanaRS_Packet_Bolus_Set_Extended_Bolus_Cancel(aapsLogger)
+        // test params
+        val testparams = packet.requestParams
+        Assert.assertEquals(null, packet.requestParams)
+        // 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_EXTENDED_BOLUS_CANCEL", 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_Initial_BolusTest.java b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Bolus_Set_Initial_BolusTest.java
deleted file mode 100644
index ca75e03954..0000000000
--- a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Bolus_Set_Initial_BolusTest.java
+++ /dev/null
@@ -1,62 +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_Initial_BolusTest {
-
-    @Test
-    public void runTest() {
-        AAPSMocker.mockMainApp();
-        AAPSMocker.mockApplicationContext();
-        AAPSMocker.mockSP();
-        AAPSMocker.mockL();
-        DanaRS_Packet_Bolus_Set_Initial_Bolus packet = new DanaRS_Packet_Bolus_Set_Initial_Bolus(0d, 0d, 0d, 100d);
-
-        // test params
-        byte[] testparams = packet.getRequestParams();
-        assertEquals(0, testparams[0]);
-        assertEquals(1, testparams[6]);
-
-        // test message decoding
-        packet.handleMessage(createArray(34, (byte) 0));
-        assertEquals(false, packet.failed);
-
-        packet.handleMessage(createArray(34, (byte) 1));
-        assertEquals(true, packet.failed);
-
-        assertEquals("BOLUS__SET_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_Set_Initial_BolusTest.kt b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Bolus_Set_Initial_BolusTest.kt
new file mode 100644
index 0000000000..29513ced1a
--- /dev/null
+++ b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Bolus_Set_Initial_BolusTest.kt
@@ -0,0 +1,26 @@
+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_Initial_BolusTest : DanaRSTestBase() {
+
+    @Test fun runTest() {
+        val packet = DanaRS_Packet_Bolus_Set_Initial_Bolus(aapsLogger, 0, 0, 0, 100)
+        // test params
+        val testparams = packet.requestParams
+        Assert.assertEquals(0.toByte(), testparams[0])
+        Assert.assertEquals(100.toByte(), testparams[6])
+        // test message decoding
+        packet.handleMessage(createArray(34, 0.toByte()))
+        Assert.assertEquals(false, packet.failed)
+        packet.handleMessage(createArray(34, 1.toByte()))
+        Assert.assertEquals(true, packet.failed)
+        Assert.assertEquals("BOLUS__SET_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_Etc_Keep_ConnectionTest.java b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Etc_Keep_ConnectionTest.java
deleted file mode 100644
index 019cd89459..0000000000
--- a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Etc_Keep_ConnectionTest.java
+++ /dev/null
@@ -1,46 +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_Etc_Keep_ConnectionTest {
-
-    @Test
-    public void runTest() {
-        AAPSMocker.mockMainApp();
-        AAPSMocker.mockApplicationContext();
-        AAPSMocker.mockSP();
-        AAPSMocker.mockL();
-
-        DanaRS_Packet_Etc_Keep_Connection packet = new DanaRS_Packet_Etc_Keep_Connection();
-
-
-        // test params
-        byte[] testparams = packet.getRequestParams();
-        assertEquals(null, packet.getRequestParams());
-
-        // test message decoding
-        packet.handleMessage(new byte[]{(byte) 0, (byte) 0, (byte) 0});
-        assertEquals(false, packet.failed);
-        packet.handleMessage(new byte[]{(byte) 1, (byte) 1, (byte) 1, (byte) 1, (byte) 1, (byte) 1, (byte) 1, (byte) 1});
-        assertEquals(true, packet.failed);
-
-        assertEquals("ETC__KEEP_CONNECTION", packet.getFriendlyName());
-    }
-
-}
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Etc_Keep_ConnectionTest.kt b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Etc_Keep_ConnectionTest.kt
new file mode 100644
index 0000000000..cd225f6d75
--- /dev/null
+++ b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Etc_Keep_ConnectionTest.kt
@@ -0,0 +1,25 @@
+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_Etc_Keep_ConnectionTest : DanaRSTestBase() {
+
+    @Test fun runTest() {
+        val packet = DanaRS_Packet_Etc_Keep_Connection(aapsLogger)
+        // test params
+        val testparams = packet.requestParams
+        Assert.assertEquals(null, packet.requestParams)
+        // test message decoding
+        packet.handleMessage(byteArrayOf(0.toByte(), 0.toByte(), 0.toByte()))
+        Assert.assertEquals(false, packet.failed)
+        packet.handleMessage(byteArrayOf(1.toByte(), 1.toByte(), 1.toByte(), 1.toByte(), 1.toByte(), 1.toByte(), 1.toByte(), 1.toByte()))
+        Assert.assertEquals(true, packet.failed)
+        Assert.assertEquals("ETC__KEEP_CONNECTION", packet.friendlyName)
+    }
+}
\ No newline at end of file
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Etc_Set_History_SaveTest.java b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Etc_Set_History_SaveTest.java
deleted file mode 100644
index 69a314fbb8..0000000000
--- a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Etc_Set_History_SaveTest.java
+++ /dev/null
@@ -1,61 +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 08.08.2018.
- */
-
-@RunWith(PowerMockRunner.class)
-@PrepareForTest({MainApp.class, SP.class, L.class})
-public class DanaRS_Packet_Etc_Set_History_SaveTest {
-
-    @Test
-    public void runTest() {
-        AAPSMocker.mockMainApp();
-        AAPSMocker.mockApplicationContext();
-        AAPSMocker.mockSP();
-        AAPSMocker.mockL();
-        DanaRS_Packet_Etc_Set_History_Save packet = new DanaRS_Packet_Etc_Set_History_Save(0,0,0,0,0,0,0,0,2);
-
-        // test params
-        byte[] testparams = packet.getRequestParams();
-        assertEquals(2, testparams[8]);
-        assertEquals((byte) (2 >>> 8), testparams[9]);
-
-        // test message decoding
-        packet.handleMessage(createArray(34, (byte) 0));
-        assertEquals(false, packet.failed);
-
-        packet.handleMessage(createArray(34, (byte) 1));
-        assertEquals(true, packet.failed);
-
-        assertEquals("ETC__SET_HISTORY_SAVE", 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;
-    }
-}
\ No newline at end of file
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Etc_Set_History_SaveTest.kt b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Etc_Set_History_SaveTest.kt
new file mode 100644
index 0000000000..a089eafd9a
--- /dev/null
+++ b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Etc_Set_History_SaveTest.kt
@@ -0,0 +1,26 @@
+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_Etc_Set_History_SaveTest : DanaRSTestBase() {
+
+    @Test fun runTest() {
+        val packet = DanaRS_Packet_Etc_Set_History_Save(aapsLogger, 0, 0, 0, 0, 0, 0, 0, 0, 2)
+        // test params
+        val testparams = packet.requestParams
+        Assert.assertEquals(2.toByte(), testparams[8])
+        Assert.assertEquals((2 ushr 8).toByte(), testparams[9])
+        // test message decoding
+        packet.handleMessage(createArray(34, 0.toByte()))
+        Assert.assertEquals(false, packet.failed)
+        packet.handleMessage(createArray(34, 1.toByte()))
+        Assert.assertEquals(true, packet.failed)
+        Assert.assertEquals("ETC__SET_HISTORY_SAVE", packet.friendlyName)
+    }
+}
\ No newline at end of file
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_General_Delivery_StatusTest.java b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_General_Delivery_StatusTest.java
deleted file mode 100644
index 907e93020e..0000000000
--- a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_General_Delivery_StatusTest.java
+++ /dev/null
@@ -1,61 +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 08.08.2018.
- */
-
-@RunWith(PowerMockRunner.class)
-@PrepareForTest({MainApp.class, SP.class, L.class})
-public class DanaRS_Packet_General_Delivery_StatusTest {
-
-    @Test
-    public void runTest() {
-        AAPSMocker.mockMainApp();
-        AAPSMocker.mockApplicationContext();
-        AAPSMocker.mockSP();
-        AAPSMocker.mockL();
-        DanaRS_Packet_General_Delivery_Status packet = new DanaRS_Packet_General_Delivery_Status();
-
-        // test params
-        byte[] testparams = packet.getRequestParams();
-        assertEquals(null, packet.getRequestParams());
-
-        // test message decoding
-        // everything ok :)
-        packet.handleMessage(createArray(15, (byte) 0));
-        assertEquals(false, packet.failed);
-
-        packet.handleMessage(createArray(15, (byte) 161));
-        assertEquals(true, packet.failed);
-
-        assertEquals("REVIEW__DELIVERY_STATUS", 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;
-    }
-}
\ No newline at end of file
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_General_Delivery_StatusTest.kt b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_General_Delivery_StatusTest.kt
new file mode 100644
index 0000000000..13d1d9a6dd
--- /dev/null
+++ b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_General_Delivery_StatusTest.kt
@@ -0,0 +1,26 @@
+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_General_Delivery_StatusTest : DanaRSTestBase() {
+
+    @Test fun runTest() {
+        val packet = DanaRS_Packet_General_Delivery_Status(aapsLogger)
+        // test params
+        val testparams = packet.requestParams
+        Assert.assertEquals(null, packet.requestParams)
+        // test message decoding
+// everything ok :)
+        packet.handleMessage(createArray(15, 0.toByte()))
+        Assert.assertEquals(false, packet.failed)
+        packet.handleMessage(createArray(15, 161.toByte()))
+        Assert.assertEquals(true, packet.failed)
+        Assert.assertEquals("REVIEW__DELIVERY_STATUS", packet.friendlyName)
+    }
+}
\ No newline at end of file