From ce738578254ca11f40ecc7e7c7ca6762e11a617d Mon Sep 17 00:00:00 2001
From: kai-morich <mail@kai-morich.de>
Date: Sun, 19 Jul 2020 16:03:03 +0200
Subject: [PATCH] slightly more tests

---
 .../hoho/android/usbserial/DeviceTest.java    | 32 +++++++++++++++----
 .../android/usbserial/util/UsbWrapper.java    |  2 --
 2 files changed, 26 insertions(+), 8 deletions(-)

diff --git a/usbSerialForAndroid/src/androidTest/java/com/hoho/android/usbserial/DeviceTest.java b/usbSerialForAndroid/src/androidTest/java/com/hoho/android/usbserial/DeviceTest.java
index c203bde..bee9139 100644
--- a/usbSerialForAndroid/src/androidTest/java/com/hoho/android/usbserial/DeviceTest.java
+++ b/usbSerialForAndroid/src/androidTest/java/com/hoho/android/usbserial/DeviceTest.java
@@ -523,6 +523,8 @@ public class DeviceTest {
 
         if (usb.serialDriver instanceof CdcAcmSerialDriver) {
             // not supported by arduino_leonardo_bridge.ino, other devices might support it
+            usb.setParameters(19200, 7, 1, UsbSerialPort.PARITY_MARK);
+            usb.setParameters(19200, 7, 1, UsbSerialPort.PARITY_SPACE);
         } else {
             usb.setParameters(19200, 7, 1, UsbSerialPort.PARITY_MARK);
             usb.write(_8n1);
@@ -587,7 +589,7 @@ public class DeviceTest {
         }
 
         if (usb.serialDriver instanceof CdcAcmSerialDriver) {
-            usb.setParameters(19200, 8, UsbSerialPort.STOPBITS_2, UsbSerialPort.PARITY_NONE);
+            usb.setParameters(19200, 8, UsbSerialPort.STOPBITS_1_5, UsbSerialPort.PARITY_NONE);
             // software based bridge in arduino_leonardo_bridge.ino is to slow for real test, other devices might support it
         } else {
             // shift stopbits into next byte, by using different databits
@@ -1413,6 +1415,7 @@ public class DeviceTest {
         byte buf[] = new byte[256];
         usb.open(EnumSet.of(UsbWrapper.OpenCloseFlags.NO_IOMANAGER_THREAD));
         usb.setParameters(115200, 8, 1, UsbSerialPort.PARITY_NONE);
+
         usb.write("x".getBytes());
         usb.serialPort.read(buf, 1000);
         usb.serialPort.setRTS(true);
@@ -1422,7 +1425,8 @@ public class DeviceTest {
         usb.deviceConnection.close();
         try {
             usb.setParameters(115200, 8, 1, UsbSerialPort.PARITY_NONE);
-            fail("setParameters error expected");
+            if(!(usb.serialDriver instanceof ProlificSerialDriver))
+                fail("setParameters error expected");
         } catch (IOException ignored) {
         }
         try {
@@ -1441,10 +1445,13 @@ public class DeviceTest {
             fail("setRts error expected");
         } catch (IOException ignored) {
         }
-        try {
-            usb.serialPort.getRI();
-            fail("setRts error expected");
-        } catch (IOException ignored) {
+        if(usb.serialPort.getSupportedControlLines().contains(UsbSerialPort.ControlLine.RI) ) {
+            try {
+                usb.serialPort.getRI();
+                if(!(usb.serialDriver instanceof ProlificSerialDriver))
+                    fail("getRI error expected");
+            } catch (IOException ignored) {
+            }
         }
         if(purged) {
             try {
@@ -1466,6 +1473,8 @@ public class DeviceTest {
         usb.write("x".getBytes());
         otherDeviceConnection.close();
         usb.write("x".getBytes());
+
+        // already queued read request is not interrupted by closing deviceConnection and test would hang
     }
 
     @Test
@@ -1492,6 +1501,17 @@ public class DeviceTest {
         // PL2303        <null>
         // CDC:Microbit  9900000037024e450034200b0000004a0000000097969901
         // CDC:Digispark <null>
+
+        try {
+            usb.open();
+            fail("already open error expected");
+        } catch (IOException ignored) {
+        }
+        try {
+            usb.ioManager.run();
+            fail("already running error expected");
+        } catch (IllegalStateException ignored) {
+        }
     }
 
     @Test
diff --git a/usbSerialForAndroid/src/androidTest/java/com/hoho/android/usbserial/util/UsbWrapper.java b/usbSerialForAndroid/src/androidTest/java/com/hoho/android/usbserial/util/UsbWrapper.java
index 301bc0b..cb19bc8 100644
--- a/usbSerialForAndroid/src/androidTest/java/com/hoho/android/usbserial/util/UsbWrapper.java
+++ b/usbSerialForAndroid/src/androidTest/java/com/hoho/android/usbserial/util/UsbWrapper.java
@@ -150,7 +150,6 @@ public class UsbWrapper implements SerialInputOutputManager.Listener {
             UsbManager usbManager = (UsbManager) context.getSystemService(Context.USB_SERVICE);
             deviceConnection = usbManager.openDevice(serialDriver.getDevice());
         }
-        //serialPort = serialDriver.getPorts().get(devicePort);
         serialPort.open(deviceConnection);
         if(!flags.contains(OpenCloseFlags.NO_CONTROL_LINE_INIT)) {
             serialPort.setDTR(true);
@@ -250,7 +249,6 @@ public class UsbWrapper implements SerialInputOutputManager.Listener {
     @Override
     public void onRunError(Exception e) {
         readError = e;
-        //fail("usb connection lost");
     }
 
 }