diff options
| author | Joey Grover <joeygrover@gmail.com> | 2016-12-07 16:50:10 -0500 |
|---|---|---|
| committer | Joey Grover <joeygrover@gmail.com> | 2016-12-07 16:50:10 -0500 |
| commit | b2a58e6c7bc6353a2e80a10638531eeebb170b50 (patch) | |
| tree | 562d9060f1fdf17a15d614b7b1e0ca57085c307b | |
| parent | 0f1136f8f0e9c38c94cfb85c31db81789d66697d (diff) | |
| download | sdl_android-b2a58e6c7bc6353a2e80a10638531eeebb170b50.tar.gz | |
Update default router list with extra OEM companion app and unit tests to reflect.
3 files changed, 4 insertions, 4 deletions
diff --git a/sdl_android_lib/src/com/smartdevicelink/transport/RouterServiceValidator.java b/sdl_android_lib/src/com/smartdevicelink/transport/RouterServiceValidator.java index 36e04e9e8..e2ac95a5f 100644 --- a/sdl_android_lib/src/com/smartdevicelink/transport/RouterServiceValidator.java +++ b/sdl_android_lib/src/com/smartdevicelink/transport/RouterServiceValidator.java @@ -40,7 +40,7 @@ public class RouterServiceValidator { private static final String REQUEST_PREFIX = "https://woprjr.smartdevicelink.com/api/1/applications/queryTrustedRouters"; - private static final String DEFAULT_APP_LIST = "{\"response\": {\"com.livio.sdl\" : { \"versionBlacklist\":[] }, \"com.lexus.tcapp\" : { \"versionBlacklist\":[] }, \"com.toyota.tcapp\" : { \"versionBlacklist\": [] } , \"com.sdl.router\":{\"versionBlacklist\": [] } }}"; + private static final String DEFAULT_APP_LIST = "{\"response\": {\"com.livio.sdl\" : { \"versionBlacklist\":[] }, \"com.lexus.tcapp\" : { \"versionBlacklist\":[] }, \"com.toyota.tcapp\" : { \"versionBlacklist\": [] } , \"com.sdl.router\":{\"versionBlacklist\": [] },\"com.ford.fordpass\" : { \"versionBlacklist\":[] } }}"; private static final String JSON_RESPONSE_OBJECT_TAG = "response"; diff --git a/sdl_android_tests/AndroidManifest.xml b/sdl_android_tests/AndroidManifest.xml index 85ad00245..87a9fc7c3 100644 --- a/sdl_android_tests/AndroidManifest.xml +++ b/sdl_android_tests/AndroidManifest.xml @@ -15,7 +15,7 @@ <instrumentation android:name="android.test.InstrumentationTestRunner" - android:targetPackage="com.smartdevicelink" /> + android:targetPackage="com.smartdevicelink.test" /> <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE"/> <application diff --git a/sdl_android_tests/src/com/smartdevicelink/transport/RSVTestCase.java b/sdl_android_tests/src/com/smartdevicelink/transport/RSVTestCase.java index 8fda666e0..4066c23a7 100644 --- a/sdl_android_tests/src/com/smartdevicelink/transport/RSVTestCase.java +++ b/sdl_android_tests/src/com/smartdevicelink/transport/RSVTestCase.java @@ -93,7 +93,7 @@ public class RSVTestCase extends AndroidTestCase { assertFalse(RouterServiceValidator.setTrustedList(mContext,null)); assertFalse(RouterServiceValidator.setTrustedList(null,"test")); assertTrue(RouterServiceValidator.setTrustedList(mContext,"test")); - String test= "{\"response\": {\"com.livio.sdl\" : { \"versionBlacklist\":[] }, \"com.lexus.tcapp\" : { \"versionBlacklist\":[] }, \"com.toyota.tcapp\" : { \"versionBlacklist\": [] } , \"com.sdl.router\":{\"versionBlacklist\": [] } }}"; + String test = "{\"response\": {\"com.livio.sdl\" : { \"versionBlacklist\":[] }, \"com.lexus.tcapp\" : { \"versionBlacklist\":[] }, \"com.toyota.tcapp\" : { \"versionBlacklist\": [] } , \"com.sdl.router\":{\"versionBlacklist\": [] },\"com.ford.fordpass\" : { \"versionBlacklist\":[] } }}"; assertTrue(RouterServiceValidator.setTrustedList(mContext,test)); assertTrue(RouterServiceValidator.setTrustedList(mContext,test+test+test+test+test)); StringBuilder builder = new StringBuilder(); @@ -104,7 +104,7 @@ public class RSVTestCase extends AndroidTestCase { } public void testTrustedListSetAndGet(){ - String test= "{\"response\": {\"com.livio.sdl\" : { \"versionBlacklist\":[] }, \"com.lexus.tcapp\" : { \"versionBlacklist\":[] }, \"com.toyota.tcapp\" : { \"versionBlacklist\": [] } , \"com.sdl.router\":{\"versionBlacklist\": [] } }}"; + String test = "{\"response\": {\"com.livio.sdl\" : { \"versionBlacklist\":[] }, \"com.lexus.tcapp\" : { \"versionBlacklist\":[] }, \"com.toyota.tcapp\" : { \"versionBlacklist\": [] } , \"com.sdl.router\":{\"versionBlacklist\": [] },\"com.ford.fordpass\" : { \"versionBlacklist\":[] } }}"; assertTrue(RouterServiceValidator.setTrustedList(mContext,test)); String retVal = RouterServiceValidator.getTrustedList(mContext); assertNotNull(retVal); |