Merge branch 'develop' into feature/optimize_imports

2 files changed, 11 insertions, 9 deletions

diff --git a/android/sdl_android/src/androidTest/java/com/smartdevicelink/transport/RegisteredAppTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/transport/RegisteredAppTests.java
index 3ed6320b4..d9af0faed 100644
--- a/android/sdl_android/src/androidTest/java/com/smartdevicelink/transport/RegisteredAppTests.java
+++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/transport/RegisteredAppTests.java
@@ -5,6 +5,8 @@ import android.os.Messenger;
 
 import androidx.test.ext.junit.runners.AndroidJUnit4;
 
+import com.smartdevicelink.transport.enums.TransportType;
+
 import org.junit.Test;
 import org.junit.runner.RunWith;
 
@@ -31,10 +33,10 @@ public class RegisteredAppTests {
 
         // Instantiate SdlRouterService and Registered App class
         SdlRouterService router = new SdlRouterService();
-        SdlRouterService.RegisteredApp app = router.new RegisteredApp(APP_ID, messenger);
+        SdlRouterService.RegisteredApp app = router.new RegisteredApp(APP_ID, 1, messenger);
 
         // Call Handle Message
-        app.handleMessage(TransportConstants.BYTES_TO_SEND_FLAG_LARGE_PACKET_START,bytes);
+        app.handleMessage(TransportConstants.BYTES_TO_SEND_FLAG_LARGE_PACKET_START,bytes, TransportType.BLUETOOTH);
 
         // Insure that the buffer is not null, if it is the test will fail
         assertNotNull(app.buffer);
@@ -51,13 +53,13 @@ public class RegisteredAppTests {
 
         // Instantiate SdlRouterService and Registered App class
         SdlRouterService router = new SdlRouterService();
-        SdlRouterService.RegisteredApp app = router.new RegisteredApp(APP_ID, messenger);
+        SdlRouterService.RegisteredApp app = router.new RegisteredApp(APP_ID, 1, messenger);
 
         // Force Null Buffer
         app.buffer = null;
 
         // Call Handle Message - Making sure it doesn't init buffer
-        app.handleMessage(TransportConstants.BYTES_TO_SEND_FLAG_NONE,bytes);
+        app.handleMessage(TransportConstants.BYTES_TO_SEND_FLAG_NONE, bytes, TransportType.BLUETOOTH);
 
         // Insure that the buffer is null. and no NPE
         assertNull(app.buffer);
diff --git a/android/sdl_android/src/androidTest/java/com/smartdevicelink/transport/SdlRouterServiceTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/transport/SdlRouterServiceTests.java
index 0099f8e43..2ab12e51a 100644
--- a/android/sdl_android/src/androidTest/java/com/smartdevicelink/transport/SdlRouterServiceTests.java
+++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/transport/SdlRouterServiceTests.java
@@ -188,8 +188,8 @@ public class SdlRouterServiceTests {
 
 			// We need a registered app for this to work
 			Message message = Message.obtain();
-			SdlRouterService.RegisteredApp app1 = sdlRouterService.new RegisteredApp("12345",message.replyTo);
-			SdlRouterService.RegisteredApp app2 = sdlRouterService.new RegisteredApp("12344",message.replyTo);
+			SdlRouterService.RegisteredApp app1 = sdlRouterService.new RegisteredApp("12345", 1, message.replyTo);
+			SdlRouterService.RegisteredApp app2 = sdlRouterService.new RegisteredApp("12344", 1, message.replyTo);
 			HashMap<String,SdlRouterService.RegisteredApp> registeredApps = new HashMap<>();
 			registeredApps.put(app1.getAppId(),app1);
 			registeredApps.put(app2.getAppId(),app2);
@@ -281,8 +281,8 @@ public class SdlRouterServiceTests {
 
 			// We need a registered app for this to work
 			Message message = Message.obtain();
-			SdlRouterService.RegisteredApp app1 = sdlRouterService.new RegisteredApp("12345",message.replyTo);
-			SdlRouterService.RegisteredApp app2 = sdlRouterService.new RegisteredApp("12344",message.replyTo);
+			SdlRouterService.RegisteredApp app1 = sdlRouterService.new RegisteredApp("12345", 1, message.replyTo);
+			SdlRouterService.RegisteredApp app2 = sdlRouterService.new RegisteredApp("12344", 1, message.replyTo);
 			HashMap<String,SdlRouterService.RegisteredApp> registeredApps = new HashMap<>();
 			registeredApps.put(app1.getAppId(),app1);
 			registeredApps.put(app2.getAppId(),app2);
@@ -689,7 +689,7 @@ public class SdlRouterServiceTests {
 	private void addDummyRegisteredApp(SdlRouterService routerService, String appId, int sessionId)
 			throws IllegalAccessException, NoSuchFieldException {
 		Message message = Message.obtain();
-		SdlRouterService.RegisteredApp app = routerService.new RegisteredApp(appId, message.replyTo);
+		SdlRouterService.RegisteredApp app = routerService.new RegisteredApp(appId, 1, message.replyTo);
 
 		Field raf = routerService.getClass().getDeclaredField("registeredApps");
 		raf.setAccessible(true);