diff options
| author | Anil Dahiya <anil_dahiya@infosys.com> | 2018-08-11 16:31:56 +0530 |
|---|---|---|
| committer | Anil Dahiya <anil_dahiya@infosys.com> | 2018-08-11 16:31:56 +0530 |
| commit | 01287c812f5086a2131e34e695ada59cad75dbe2 (patch) | |
| tree | dfaca98af50c91b90fa580339d3e3153d4686869 | |
| parent | 0fb2eadb5a9093a87e85a76788ee80df661d67fa (diff) | |
| download | sdl_android-01287c812f5086a2131e34e695ada59cad75dbe2.tar.gz | |
Changes for Audio Source AM/FM/XM/DAB instead of RADIO_TUNER.
2 files changed, 20 insertions, 8 deletions
diff --git a/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/PrimaryAudioSourceTests.java b/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/PrimaryAudioSourceTests.java index 35c1bcc01..b3432985d 100644 --- a/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/PrimaryAudioSourceTests.java +++ b/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/PrimaryAudioSourceTests.java @@ -33,10 +33,16 @@ public class PrimaryAudioSourceTests extends TestCase { PrimaryAudioSource enumIpod = PrimaryAudioSource.valueForString(example); example = "MOBILE_APP"; PrimaryAudioSource enumMobileApp = PrimaryAudioSource.valueForString(example); - example = "RADIO_TUNER"; - PrimaryAudioSource enumRadioTuner = PrimaryAudioSource.valueForString(example); example = "CD"; PrimaryAudioSource enumCd = PrimaryAudioSource.valueForString(example); + example = "AM"; + PrimaryAudioSource enumAm = PrimaryAudioSource.valueForString(example); + example = "FM"; + PrimaryAudioSource enumFm = PrimaryAudioSource.valueForString(example); + example = "XM"; + PrimaryAudioSource enumXm = PrimaryAudioSource.valueForString(example); + example = "DAB"; + PrimaryAudioSource enumDab = PrimaryAudioSource.valueForString(example); assertNotNull("NO_SOURCE_SELECTED returned null", enumNoSourceSelected); assertNotNull("USB returned null", enumUsb); @@ -45,8 +51,11 @@ public class PrimaryAudioSourceTests extends TestCase { assertNotNull("LINE_IN returned null", enumLineIn); assertNotNull("IPOD returned null", enumIpod); assertNotNull("MOBILE_APP returned null", enumMobileApp); - assertNotNull("RADIO_TUNER returned null", enumRadioTuner); assertNotNull("CD returned null", enumCd); + assertNotNull("AM returned null", enumAm); + assertNotNull("FM returned null", enumFm); + assertNotNull("XM returned null", enumXm); + assertNotNull("DAB returned null", enumDab); } /** @@ -90,8 +99,11 @@ public class PrimaryAudioSourceTests extends TestCase { enumTestList.add(PrimaryAudioSource.LINE_IN); enumTestList.add(PrimaryAudioSource.IPOD); enumTestList.add(PrimaryAudioSource.MOBILE_APP); - enumTestList.add(PrimaryAudioSource.RADIO_TUNER); enumTestList.add(PrimaryAudioSource.CD); + enumTestList.add(PrimaryAudioSource.AM); + enumTestList.add(PrimaryAudioSource.FM); + enumTestList.add(PrimaryAudioSource.XM); + enumTestList.add(PrimaryAudioSource.DAB); assertTrue("Enum value list does not match enum class list", enumValueList.containsAll(enumTestList) && enumTestList.containsAll(enumValueList)); diff --git a/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/enums/PrimaryAudioSource.java b/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/enums/PrimaryAudioSource.java index 61023c3da..6583a2bed 100644 --- a/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/enums/PrimaryAudioSource.java +++ b/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/enums/PrimaryAudioSource.java @@ -37,10 +37,10 @@ public enum PrimaryAudioSource { * Mobile app is current source
*/
MOBILE_APP,
- /**
- * Radio may be on AM, FM or XM
- */
- RADIO_TUNER,
+ AM,
+ FM,
+ XM,
+ DAB,
;
/**
|