flywithu/usb-serial-for-android
1
0
Fork 0
mirror of https://github.com/mik3y/usb-serial-for-android synced 2025-06-07 16:06:10 +00:00
Code Issues Releases Wiki Activity

slightly more tests

Browse Source
This commit is contained in:
kai-morich 2020-07-19 16:03:03 +02:00
parent a2f0097092
commit ce73857825
2 changed files with 26 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
usbSerialForAndroid/src/androidTest/java/com/hoho/android/usbserial/DeviceTest.java
View File

@ -523,6 +523,8 @@ public class DeviceTest {
if (usb.serialDriver instanceof CdcAcmSerialDriver) { if (usb.serialDriver instanceof CdcAcmSerialDriver) {
// not supported by arduino_leonardo_bridge.ino, other devices might support it // 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 { } else {
usb.setParameters(19200, 7, 1, UsbSerialPort.PARITY_MARK); usb.setParameters(19200, 7, 1, UsbSerialPort.PARITY_MARK);
usb.write(_8n1); usb.write(_8n1);
@ -587,7 +589,7 @@ public class DeviceTest {
} }
if (usb.serialDriver instanceof CdcAcmSerialDriver) { 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 // software based bridge in arduino_leonardo_bridge.ino is to slow for real test, other devices might support it
} else { } else {
// shift stopbits into next byte, by using different databits // shift stopbits into next byte, by using different databits
@ -1413,6 +1415,7 @@ public class DeviceTest {
byte buf[] = new byte[256]; byte buf[] = new byte[256];
usb.open(EnumSet.of(UsbWrapper.OpenCloseFlags.NO_IOMANAGER_THREAD)); usb.open(EnumSet.of(UsbWrapper.OpenCloseFlags.NO_IOMANAGER_THREAD));
usb.setParameters(115200, 8, 1, UsbSerialPort.PARITY_NONE); usb.setParameters(115200, 8, 1, UsbSerialPort.PARITY_NONE);
usb.write("x".getBytes()); usb.write("x".getBytes());
usb.serialPort.read(buf, 1000); usb.serialPort.read(buf, 1000);
usb.serialPort.setRTS(true); usb.serialPort.setRTS(true);
@ -1422,7 +1425,8 @@ public class DeviceTest {
usb.deviceConnection.close(); usb.deviceConnection.close();
try { try {
usb.setParameters(115200, 8, 1, UsbSerialPort.PARITY_NONE); usb.setParameters(115200, 8, 1, UsbSerialPort.PARITY_NONE);
fail("setParameters error expected"); if(!(usb.serialDriver instanceof ProlificSerialDriver))
fail("setParameters error expected");
} catch (IOException ignored) { } catch (IOException ignored) {
} }
try { try {
@ -1441,10 +1445,13 @@ public class DeviceTest {
fail("setRts error expected"); fail("setRts error expected");
} catch (IOException ignored) { } catch (IOException ignored) {
} }
try { if(usb.serialPort.getSupportedControlLines().contains(UsbSerialPort.ControlLine.RI) ) {
usb.serialPort.getRI(); try {
fail("setRts error expected"); usb.serialPort.getRI();
} catch (IOException ignored) { if(!(usb.serialDriver instanceof ProlificSerialDriver))
fail("getRI error expected");
} catch (IOException ignored) {
}
} }
if(purged) { if(purged) {
try { try {
@ -1466,6 +1473,8 @@ public class DeviceTest {
usb.write("x".getBytes()); usb.write("x".getBytes());
otherDeviceConnection.close(); otherDeviceConnection.close();
usb.write("x".getBytes()); usb.write("x".getBytes());
// already queued read request is not interrupted by closing deviceConnection and test would hang
} }
@Test @Test
@ -1492,6 +1501,17 @@ public class DeviceTest {
// PL2303 <null> // PL2303 <null>
// CDC:Microbit 9900000037024e450034200b0000004a0000000097969901 // CDC:Microbit 9900000037024e450034200b0000004a0000000097969901
// CDC:Digispark <null> // 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 @Test

2
usbSerialForAndroid/src/androidTest/java/com/hoho/android/usbserial/util/UsbWrapper.java
View File

@ -150,7 +150,6 @@ public class UsbWrapper implements SerialInputOutputManager.Listener {
UsbManager usbManager = (UsbManager) context.getSystemService(Context.USB_SERVICE); UsbManager usbManager = (UsbManager) context.getSystemService(Context.USB_SERVICE);
deviceConnection = usbManager.openDevice(serialDriver.getDevice()); deviceConnection = usbManager.openDevice(serialDriver.getDevice());
} }
//serialPort = serialDriver.getPorts().get(devicePort);
serialPort.open(deviceConnection); serialPort.open(deviceConnection);
if(!flags.contains(OpenCloseFlags.NO_CONTROL_LINE_INIT)) { if(!flags.contains(OpenCloseFlags.NO_CONTROL_LINE_INIT)) {
serialPort.setDTR(true); serialPort.setDTR(true);
@ -250,7 +249,6 @@ public class UsbWrapper implements SerialInputOutputManager.Listener {
@Override @Override
public void onRunError(Exception e) { public void onRunError(Exception e) {
readError = e; readError = e;
//fail("usb connection lost");
} }
} }