not calling main thread anymorebugfix/utest_RegisteredAppTests

new knowledge of loopers :)

1 files changed, 25 insertions, 28 deletions

diff --git a/sdl_android/src/androidTest/java/com/smartdevicelink/transport/RegisteredAppTests.java b/sdl_android/src/androidTest/java/com/smartdevicelink/transport/RegisteredAppTests.java
index a4d4e1395..7d6c922c1 100644
--- a/sdl_android/src/androidTest/java/com/smartdevicelink/transport/RegisteredAppTests.java
+++ b/sdl_android/src/androidTest/java/com/smartdevicelink/transport/RegisteredAppTests.java
@@ -18,47 +18,44 @@ public class RegisteredAppTests extends AndroidTestCase {
 
     public void testHandleMessage() {
 
-        // Run Test in Main Thread
-        new Handler(Looper.getMainLooper()).post(new Runnable() {
-            @Override
-            public void run() {
+        if (Looper.myLooper() == null)
+        {
+            Looper.prepare();
+        }
 
-                // Instantiate SdlRouterService and Registered App class
-                SdlRouterService router = new SdlRouterService();
-                SdlRouterService.RegisteredApp app = router.new RegisteredApp(APP_ID, messenger);
+        // Instantiate SdlRouterService and Registered App class
+        SdlRouterService router = new SdlRouterService();
+        SdlRouterService.RegisteredApp app = router.new RegisteredApp(APP_ID, messenger);
 
-                // Call Handle Message
-                app.handleMessage(TransportConstants.BYTES_TO_SEND_FLAG_LARGE_PACKET_START,bytes);
+        // Call Handle Message
+        app.handleMessage(TransportConstants.BYTES_TO_SEND_FLAG_LARGE_PACKET_START,bytes);
+
+        // Insure that the buffer is not null, if it is the test will fail
+        assertNotNull(app.buffer);
 
-                // Insure that the buffer is not null, if it is the test will fail
-                assertNotNull(app.buffer);
 
-            }
-        });
     }
 
     public void testNullBuffer() {
 
-        // Run Test in Main Thread
-        new Handler(Looper.getMainLooper()).post(new Runnable() {
-            @Override
-            public void run() {
+        if (Looper.myLooper() == null)
+        {
+            Looper.prepare();
+        }
 
-                // Instantiate SdlRouterService and Registered App class
-                SdlRouterService router = new SdlRouterService();
-                SdlRouterService.RegisteredApp app = router.new RegisteredApp(APP_ID, messenger);
+        // Instantiate SdlRouterService and Registered App class
+        SdlRouterService router = new SdlRouterService();
+        SdlRouterService.RegisteredApp app = router.new RegisteredApp(APP_ID, messenger);
 
-                // Force Null Buffer
-                app.buffer = null;
+        // 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);
+        // Call Handle Message - Making sure it doesn't init buffer
+        app.handleMessage(TransportConstants.BYTES_TO_SEND_FLAG_NONE,bytes);
 
-                // Insure that the buffer is null. and no NPE
-                assertNull(app.buffer);
+        // Insure that the buffer is null. and no NPE
+        assertNull(app.buffer);
 
-            }
-        });
     }
 }