summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAustin Kirk <askirk@umich.edu>2018-08-01 16:11:47 -0400
committerAustin Kirk <askirk@umich.edu>2018-08-01 16:11:47 -0400
commit6bc4fcb10f61811e7bf00e18ab8b46b31d7248c6 (patch)
tree820a28b84fbda8cd54f3d30cd18c1c8128b59176
parentdd0346ec285be028662cd4faefc1c14039773f03 (diff)
downloadsdl_android-feature/tcp_multiplexing.tar.gz
Fix unit tests for SdlRouterServicefeature/tcp_multiplexing
-rw-r--r--sdl_android/src/androidTest/java/com/smartdevicelink/transport/SdlRouterServiceTests.java9
1 files changed, 6 insertions, 3 deletions
diff --git a/sdl_android/src/androidTest/java/com/smartdevicelink/transport/SdlRouterServiceTests.java b/sdl_android/src/androidTest/java/com/smartdevicelink/transport/SdlRouterServiceTests.java
index c23b3b624..35ebebbe7 100644
--- a/sdl_android/src/androidTest/java/com/smartdevicelink/transport/SdlRouterServiceTests.java
+++ b/sdl_android/src/androidTest/java/com/smartdevicelink/transport/SdlRouterServiceTests.java
@@ -19,6 +19,7 @@ import com.smartdevicelink.protocol.enums.FunctionID;
import com.smartdevicelink.protocol.enums.MessageType;
import com.smartdevicelink.protocol.enums.SessionType;
import com.smartdevicelink.proxy.rpc.UnregisterAppInterface;
+import com.smartdevicelink.transport.enums.TransportType;
import junit.framework.Assert;
@@ -126,7 +127,7 @@ public class SdlRouterServiceTests extends AndroidTestCase {
//First, set mSerialService to the correct state so we get to test packet being null
MultiplexBluetoothTransport transport = new MultiplexBluetoothTransport(null);
transport.setStateManually(MultiplexBluetoothTransport.STATE_CONNECTED);
- field = SdlRouterService.class.getDeclaredField("mSerialService");
+ field = SdlRouterService.class.getDeclaredField("bluetoothTransport");
field.setAccessible(true);
field.set(sdlRouterService, transport);
bundle = new Bundle();
@@ -177,7 +178,7 @@ public class SdlRouterServiceTests extends AndroidTestCase {
// need a session map too
SparseArray<String> sessionMap = new SparseArray<String>();
sessionMap.put(1, "12345");
- Field sessionMapField = sdlRouterService.getClass().getDeclaredField("sessionMap");
+ Field sessionMapField = sdlRouterService.getClass().getDeclaredField("bluetoothSessionMap");
sessionMapField.setAccessible(true);
sessionMapField.set(sdlRouterService, sessionMap);
@@ -227,6 +228,7 @@ public class SdlRouterServiceTests extends AndroidTestCase {
// create packet and invoke sendPacketToRegisteredApp
SdlPacket packet = new SdlPacket(4, false, SdlPacket.FRAME_TYPE_SINGLE, SdlPacket.SERVICE_TYPE_RPC, 0, sessionId, data.length, 123, data);
+ packet.setTransportType(TransportType.BLUETOOTH);
method = sdlRouterService.getClass().getDeclaredMethod("sendPacketToRegisteredApp", SdlPacket.class);
Boolean success = (Boolean) method.invoke(sdlRouterService, packet);
@@ -268,7 +270,7 @@ public class SdlRouterServiceTests extends AndroidTestCase {
// need a session map too
SparseArray<String> sessionMap = new SparseArray<String>();
sessionMap.put(1, "12345");
- Field sessionMapField = sdlRouterService.getClass().getDeclaredField("sessionMap");
+ Field sessionMapField = sdlRouterService.getClass().getDeclaredField("bluetoothSessionMap");
sessionMapField.setAccessible(true);
sessionMapField.set(sdlRouterService, sessionMap);
@@ -318,6 +320,7 @@ public class SdlRouterServiceTests extends AndroidTestCase {
// create packet and invoke sendPacketToRegisteredApp
SdlPacket packet = new SdlPacket(4, false, SdlPacket.FRAME_TYPE_SINGLE, SdlPacket.SERVICE_TYPE_RPC, 0, sessionId, data.length, 123, data);
+ packet.setTransportType(TransportType.BLUETOOTH);
method = sdlRouterService.getClass().getDeclaredMethod("sendPacketToRegisteredApp", SdlPacket.class);
Boolean success = (Boolean) method.invoke(sdlRouterService, packet);