Code cleanupfeature/unit_test_coverage

4 files changed, 16 insertions, 7 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 a584b0cca..72cb7c371 100644
--- a/sdl_android/src/androidTest/java/com/smartdevicelink/transport/SdlRouterServiceTests.java
+++ b/sdl_android/src/androidTest/java/com/smartdevicelink/transport/SdlRouterServiceTests.java
@@ -3,14 +3,13 @@ package com.smartdevicelink.transport;
 
 import android.content.Context;
 import android.content.Intent;
+import android.os.Build;
 import android.os.Bundle;
 import android.os.Handler;
 import android.os.IBinder;
 import android.os.Looper;
 import android.os.Message;
-import android.os.Messenger;
 import android.os.RemoteException;
-import android.os.TransactionTooLargeException;
 import android.support.test.InstrumentationRegistry;
 import android.support.test.rule.ServiceTestRule;
 import android.support.test.runner.AndroidJUnit4;
@@ -21,15 +20,14 @@ import com.smartdevicelink.protocol.enums.FrameType;
 
 import junit.framework.Assert;
 
+import org.junit.After;
 import org.junit.Rule;
 import org.junit.Test;
 import org.junit.runner.RunWith;
-import org.mockito.Mock;
 import org.mockito.invocation.InvocationOnMock;
 import org.mockito.stubbing.Answer;
 
 import java.lang.ref.WeakReference;
-import java.util.concurrent.TimeoutException;
 
 import static junit.framework.Assert.assertEquals;
 import static junit.framework.Assert.assertFalse;
@@ -54,6 +52,16 @@ public class SdlRouterServiceTests {
 	@Rule
 	public final ServiceTestRule mServiceRule = new ServiceTestRule();
 
+	@After
+	public void finish(){
+		if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.JELLY_BEAN_MR2) {
+			Looper.myLooper().quitSafely();
+		} else {
+			Looper.myLooper().quit();
+		}
+
+	}
+
 
 	@Test
 	public void testOnPacketRead(){
@@ -200,8 +208,6 @@ public class SdlRouterServiceTests {
 		verify(spyRouterService, times(1)).closeSelf();
 	}
 
-	// WORK IN PROGRESS ======== WORK IN PROGRESS ======== WORK IN PROGRESS ======== WORK IN PROGRESS ======== WORK IN PROGRESS ========
-
 
 
 
diff --git a/sdl_android/src/androidTest/java/com/smartdevicelink/transport/TransportBrokerConnectionTests.java b/sdl_android/src/androidTest/java/com/smartdevicelink/transport/TransportBrokerConnectionTests.java
index d8d308a92..1c6410d1f 100644
--- a/sdl_android/src/androidTest/java/com/smartdevicelink/transport/TransportBrokerConnectionTests.java
+++ b/sdl_android/src/androidTest/java/com/smartdevicelink/transport/TransportBrokerConnectionTests.java
@@ -90,6 +90,8 @@ public class TransportBrokerConnectionTests {
 		brokerThread.requestNewSession();
 
 		assertTrue(brokerThread.broker.isBound);
+		assertTrue(brokerThread.broker.routerServiceMessenger==null);
+
 
 	}
 
diff --git a/sdl_android/src/androidTest/java/com/smartdevicelink/transport/TransportBrokerTest.java b/sdl_android/src/androidTest/java/com/smartdevicelink/transport/TransportBrokerTest.java
index e13105728..a834bf582 100644
--- a/sdl_android/src/androidTest/java/com/smartdevicelink/transport/TransportBrokerTest.java
+++ b/sdl_android/src/androidTest/java/com/smartdevicelink/transport/TransportBrokerTest.java
@@ -38,6 +38,7 @@ import static org.mockito.Mockito.when;
 public class TransportBrokerTest extends AndroidTestCase {
 	RouterServiceValidator rsvp;
 	TransportBrokerThread brokerThread;
+
 	@Rule
 	public MockitoRule mockitoRule = MockitoJUnit.rule();
 
diff --git a/sdl_android/src/main/java/com/smartdevicelink/transport/TransportBroker.java b/sdl_android/src/main/java/com/smartdevicelink/transport/TransportBroker.java
index 6e4ebac3d..e4e4c076c 100644
--- a/sdl_android/src/main/java/com/smartdevicelink/transport/TransportBroker.java
+++ b/sdl_android/src/main/java/com/smartdevicelink/transport/TransportBroker.java
@@ -54,7 +54,7 @@ public class TransportBroker {
 	
 	private ServiceConnection routerConnection;
 	private int routerServiceVersion = 1;
-	
+
 	private void initRouterConnection(){
 		routerConnection= new ServiceConnection() {