diff options
author | Tuan Nguyen <tnguy238@ford.com> | 2017-05-31 14:07:49 -0700 |
---|---|---|
committer | Tuan Nguyen <tnguy238@ford.com> | 2017-05-31 14:07:49 -0700 |
commit | ad7e533f5292cf7b635431cbddcfdd111ed3f3b3 (patch) | |
tree | 697ef60b2e236eb68ab65a54cd1cf19f2ea645d5 | |
parent | 075cf44626eaf8eaeb4515770e04397ef21ecda5 (diff) | |
download | sdl_android-ad7e533f5292cf7b635431cbddcfdd111ed3f3b3.tar.gz |
#466 Handle inadvertent BT exception when testing with emulator.bugfix/issue_466
-rw-r--r-- | sdl_android/src/androidTest/java/com/smartdevicelink/test/proxy/SdlProxyBaseTests.java | 18 |
1 files changed, 11 insertions, 7 deletions
diff --git a/sdl_android/src/androidTest/java/com/smartdevicelink/test/proxy/SdlProxyBaseTests.java b/sdl_android/src/androidTest/java/com/smartdevicelink/test/proxy/SdlProxyBaseTests.java index 282c01357..8ed8a6fe7 100644 --- a/sdl_android/src/androidTest/java/com/smartdevicelink/test/proxy/SdlProxyBaseTests.java +++ b/sdl_android/src/androidTest/java/com/smartdevicelink/test/proxy/SdlProxyBaseTests.java @@ -5,13 +5,14 @@ import android.telephony.TelephonyManager; import android.test.AndroidTestCase; import android.util.Log; +import com.smartdevicelink.exception.SdlException; +import com.smartdevicelink.exception.SdlExceptionCause; import com.smartdevicelink.proxy.SdlProxyALM; import com.smartdevicelink.proxy.SdlProxyBuilder; import com.smartdevicelink.proxy.SdlProxyConfigurationResources; import com.smartdevicelink.proxy.callbacks.OnServiceEnded; import com.smartdevicelink.proxy.callbacks.OnServiceNACKed; import com.smartdevicelink.proxy.interfaces.IProxyListenerALM; -import com.smartdevicelink.proxy.interfaces.IProxyListenerBase; import com.smartdevicelink.proxy.rpc.AddCommandResponse; import com.smartdevicelink.proxy.rpc.AddSubMenuResponse; import com.smartdevicelink.proxy.rpc.AlertManeuverResponse; @@ -53,7 +54,6 @@ import com.smartdevicelink.proxy.rpc.PutFileResponse; import com.smartdevicelink.proxy.rpc.ReadDIDResponse; import com.smartdevicelink.proxy.rpc.ResetGlobalPropertiesResponse; import com.smartdevicelink.proxy.rpc.ScrollableMessageResponse; -import com.smartdevicelink.proxy.rpc.SdlMsgVersion; import com.smartdevicelink.proxy.rpc.SendLocationResponse; import com.smartdevicelink.proxy.rpc.SetAppIconResponse; import com.smartdevicelink.proxy.rpc.SetDisplayLayoutResponse; @@ -72,13 +72,10 @@ import com.smartdevicelink.proxy.rpc.UnsubscribeButtonResponse; import com.smartdevicelink.proxy.rpc.UnsubscribeVehicleDataResponse; import com.smartdevicelink.proxy.rpc.UnsubscribeWayPointsResponse; import com.smartdevicelink.proxy.rpc.UpdateTurnListResponse; -import com.smartdevicelink.proxy.rpc.enums.Language; import com.smartdevicelink.proxy.rpc.enums.SdlDisconnectedReason; -import com.smartdevicelink.transport.BaseTransportConfig; import junit.framework.Assert; -import java.util.Vector; public class SdlProxyBaseTests extends AndroidTestCase{ public static final String TAG = "SdlProxyBaseTests"; @@ -107,6 +104,9 @@ public class SdlProxyBaseTests extends AndroidTestCase{ proxy = builder.build(); } catch (Exception e) { Log.v(TAG, "Exception in testNullSdlProxyConfigurationResources, testing non null SdlProxyConfigurationResources"); + if (!(e instanceof SdlException) || !((SdlException) e).getSdlExceptionCause().equals(SdlExceptionCause.BLUETOOTH_ADAPTER_NULL)) { + Assert.fail("Exception in testNullSdlProxyConfigurationResources"); + } } //Construct with a null SdlProxyConfigurationResources @@ -115,7 +115,9 @@ public class SdlProxyBaseTests extends AndroidTestCase{ proxy = builder.build(); } catch (Exception e) { Log.v(TAG, "Exception in testNullSdlProxyConfigurationResources, testing null SdlProxyConfigurationResources"); - Assert.fail("Exception in testNullSdlProxyConfigurationResources, testing null SdlProxyConfigurationResources"); + if (!(e instanceof SdlException) || !((SdlException) e).getSdlExceptionCause().equals(SdlExceptionCause.BLUETOOTH_ADAPTER_NULL)) { + Assert.fail("Exception in testNullSdlProxyConfigurationResources, testing null SdlProxyConfigurationResources"); + } } //Construct with a non-null SdlProxyConfigurationResources and a null TelephonyManager @@ -125,7 +127,9 @@ public class SdlProxyBaseTests extends AndroidTestCase{ proxy = builder.build(); } catch (Exception e) { Log.v(TAG, "Exception in testNullSdlProxyConfigurationResources, testing null TelephonyManager"); - Assert.fail("Exception in testNullSdlProxyConfigurationResources, testing null TelephonyManager"); + if (!(e instanceof SdlException) || !((SdlException) e).getSdlExceptionCause().equals(SdlExceptionCause.BLUETOOTH_ADAPTER_NULL)) { + Assert.fail("Exception in testNullSdlProxyConfigurationResources, testing null TelephonyManager"); + } } } |