diff options
| author | RHenigan <heniganr1@gmail.com> | 2020-07-29 15:53:48 -0400 |
|---|---|---|
| committer | RHenigan <heniganr1@gmail.com> | 2020-07-29 15:53:48 -0400 |
| commit | c1c55c127ac3c46252994c42161031c9da6f56b1 (patch) | |
| tree | 9a2ec4b7f86169a598b55a34890b0404f0ccf789 | |
| parent | f608ccdf3a3c4fa8013ded3f45581118d5908e7b (diff) | |
| download | sdl_android-feature/0202_SupportedCharacterSets.tar.gz | |
Update Tests and replace CID2SET referencesfeature/0202_SupportedCharacterSets
4 files changed, 13 insertions, 4 deletions
diff --git a/android/sdl_android/src/androidTest/assets/json/RegisterAppInterface.json b/android/sdl_android/src/androidTest/assets/json/RegisterAppInterface.json index e5c0c181f..3c5271d9c 100644 --- a/android/sdl_android/src/androidTest/assets/json/RegisterAppInterface.json +++ b/android/sdl_android/src/androidTest/assets/json/RegisterAppInterface.json @@ -163,7 +163,7 @@ }, { "width":1980, - "characterSet":"CID2SET", + "characterSet":"UTF_8", "rows":960, "name":"scrollableMessageBody" }, diff --git a/android/sdl_android/src/androidTest/assets/json/SetDisplayLayout.json b/android/sdl_android/src/androidTest/assets/json/SetDisplayLayout.json index ec9e62f54..5ff32ac6a 100644 --- a/android/sdl_android/src/androidTest/assets/json/SetDisplayLayout.json +++ b/android/sdl_android/src/androidTest/assets/json/SetDisplayLayout.json @@ -73,7 +73,7 @@ }, { "width":1980, - "characterSet":"CID2SET", + "characterSet":"UTF_8", "rows":960, "name":"scrollableMessageBody" }, diff --git a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/CharacterSetTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/CharacterSetTests.java index cbbefa488..78a1325f3 100644 --- a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/CharacterSetTests.java +++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/CharacterSetTests.java @@ -26,11 +26,20 @@ public class CharacterSetTests extends TestCase { CharacterSet enumCid1Set = CharacterSet.valueForString(example); example = "CID2SET"; CharacterSet enumCid2Set = CharacterSet.valueForString(example); - + example = "ASCII"; + CharacterSet enumAsciiSet = CharacterSet.valueForString(example); + example = "ISO_8859_1"; + CharacterSet enumIsoSet = CharacterSet.valueForString(example); + example = "UTF_8"; + CharacterSet enumUtfSet = CharacterSet.valueForString(example); + assertNotNull("TYPE2SET returned null", enumType2Set); assertNotNull("TYPE5SET returned null", enumType5Set); assertNotNull("CID1SET returned null", enumCid1Set); assertNotNull("CID2SET returned null", enumCid2Set); + assertNotNull("ASCII returned null", enumAsciiSet); + assertNotNull("ISO_8859_1 returned null", enumIsoSet); + assertNotNull("UTF_8 returned null", enumUtfSet); } /** diff --git a/base/src/main/java/com/smartdevicelink/managers/ManagerUtility.java b/base/src/main/java/com/smartdevicelink/managers/ManagerUtility.java index 9fd8c59f7..2bac81e42 100644 --- a/base/src/main/java/com/smartdevicelink/managers/ManagerUtility.java +++ b/base/src/main/java/com/smartdevicelink/managers/ManagerUtility.java @@ -107,7 +107,7 @@ public class ManagerUtility { public static List<TextField> getAllTextFields() { List<TextField> allTextFields = new ArrayList<>(); for (TextFieldName name : TextFieldName.values()) { - allTextFields.add(new TextField(name, CharacterSet.CID1SET, 500, 8)); + allTextFields.add(new TextField(name, CharacterSet.UTF_8, 500, 8)); } return allTextFields; } |