-
Notifications
You must be signed in to change notification settings - Fork 130
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
[0238] Keyboard Enhancements #1587
Merged
bilal-alsharifi
merged 24 commits into
smartdevicelink:develop
from
LuxoftSDL:feature/0298_keyboard_enchancements
Feb 25, 2021
Merged
Changes from 8 commits
Commits
Show all changes
24 commits
Select commit
Hold shift + click to select a range
e845d20
[0238]
69609bd
[0238]
a277562
[0238]
55ec1e1
[0238]
f841c3a
[0298]
bf77bc5
[0298]
cd1136e
Make changes according to revision
AKalinich-Luxoft 55de319
Merge remote-tracking branch 'origin/develop' into feature/0298_keybo…
AKalinich-Luxoft 40766fd
Merge branch 'develop' into feature/0298_keyboard_enchancements
b8d87df
[0238]
e5b110b
[0238]
6843d63
[0238]
76101c4
[0238]
4629a60
[0238]
5a09c44
[0238]
30fdae8
Update base/src/main/java/com/smartdevicelink/managers/screen/choices…
kboskin 65ffa59
Update base/src/main/java/com/smartdevicelink/proxy/rpc/KeyboardPrope…
kboskin 43e14f5
[0238]
68c28a1
Merge remote-tracking branch 'origin/feature/0298_keyboard_enchanceme…
4361c31
[0238]
e9f1d03
[0238]
1daa2ae
[0238]
bf1bc4a
[0238]
ce0c744
[0238]
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
82 changes: 82 additions & 0 deletions
82
...rc/androidTest/java/com/smartdevicelink/test/rpc/datatypes/KeyboardCapabilitiesTests.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,82 @@ | ||
| package com.smartdevicelink.test.rpc.datatypes; | ||
|
|
||
| import com.smartdevicelink.marshal.JsonRPCMarshaller; | ||
| import com.smartdevicelink.proxy.rpc.KeyboardCapabilities; | ||
| import com.smartdevicelink.proxy.rpc.KeyboardLayoutCapability; | ||
| import com.smartdevicelink.test.JsonUtils; | ||
| import com.smartdevicelink.test.TestValues; | ||
| import com.smartdevicelink.test.Validator; | ||
|
|
||
| import junit.framework.TestCase; | ||
|
|
||
| import org.json.JSONArray; | ||
| import org.json.JSONException; | ||
| import org.json.JSONObject; | ||
|
|
||
| import java.util.Hashtable; | ||
| import java.util.Iterator; | ||
| import java.util.List; | ||
|
|
||
| public class KeyboardCapabilitiesTests extends TestCase { | ||
| private KeyboardCapabilities msg; | ||
|
|
||
| @Override | ||
| public void setUp() { | ||
| msg = new KeyboardCapabilities(); | ||
|
|
||
| msg.setMaskInputCharactersSupported(TestValues.GENERAL_BOOLEAN); | ||
| msg.setSupportedKeyboards(TestValues.GENERAL_SUPPORTED_KEYBOARDS_LIST); | ||
| } | ||
|
|
||
| /** | ||
| * Tests the expected values of the RPC message. | ||
| */ | ||
| public void testRpcValues() { | ||
| // Test Values | ||
| Boolean maskInputCharactersSupported = msg.getMaskInputCharactersSupported(); | ||
| List<KeyboardLayoutCapability> supportedKeyboards = msg.getSupportedKeyboards(); | ||
|
|
||
| // Valid Tests | ||
| assertEquals(TestValues.MATCH, TestValues.GENERAL_BOOLEAN, (boolean) maskInputCharactersSupported); | ||
| assertEquals(TestValues.MATCH, TestValues.GENERAL_SUPPORTED_KEYBOARDS_LIST, supportedKeyboards); | ||
|
|
||
| // Invalid/Null Tests | ||
| KeyboardCapabilities msg = new KeyboardCapabilities(); | ||
| assertNotNull(TestValues.NOT_NULL, msg); | ||
|
|
||
| assertNull(TestValues.NULL, msg.getMaskInputCharactersSupported()); | ||
| assertNull(TestValues.NULL, msg.getSupportedKeyboards()); | ||
| } | ||
|
|
||
| public void testJson() { | ||
| JSONObject reference = new JSONObject(); | ||
|
|
||
| try { | ||
| reference.put(KeyboardCapabilities.KEY_MASK_INPUT_CHARACTERS_SUPPORTED, TestValues.GENERAL_BOOLEAN); | ||
| reference.put(KeyboardCapabilities.KEY_SUPPORTED_KEYBOARDS, TestValues.JSON_SUPPORTED_KEYBOARDS_LIST); | ||
|
|
||
| JSONObject underTest = msg.serializeJSON(); | ||
| assertEquals(TestValues.MATCH, reference.length(), underTest.length()); | ||
|
|
||
| Iterator<?> iterator = reference.keys(); | ||
| while (iterator.hasNext()) { | ||
| String key = (String) iterator.next(); | ||
| if (key.equals(KeyboardCapabilities.KEY_SUPPORTED_KEYBOARDS)) { | ||
| JSONArray referenceArray = JsonUtils.readJsonArrayFromJsonObject(reference, key); | ||
| JSONArray underTestArray = JsonUtils.readJsonArrayFromJsonObject(underTest, key); | ||
| assertEquals(TestValues.MATCH, referenceArray.length(), underTestArray.length()); | ||
|
|
||
| for (int i = 0; i < referenceArray.length(); i++) { | ||
| Hashtable<String, Object> hashReference = JsonRPCMarshaller.deserializeJSONObject(referenceArray.getJSONObject(i)); | ||
| Hashtable<String, Object> hashTest = JsonRPCMarshaller.deserializeJSONObject(underTestArray.getJSONObject(i)); | ||
| assertTrue(TestValues.TRUE, Validator.validateKeyboardLayoutCapability(new KeyboardLayoutCapability(hashReference), new KeyboardLayoutCapability(hashTest))); | ||
| } | ||
| } else { | ||
| assertEquals(TestValues.MATCH, JsonUtils.readObjectFromJsonObject(reference, key), JsonUtils.readObjectFromJsonObject(underTest, key)); | ||
| } | ||
| } | ||
| } catch (JSONException e) { | ||
| fail(TestValues.JSON_FAIL); | ||
| } | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
@KostyaBoss On line 102 in the
ifstatement you need to add:|| key.equals(KeyboardProperties.KEY_CUSTOMIZE_KEYS)as a clause in the conditional.So the
ifwould look like:if (key.equals(KeyboardProperties.KEY_LIMITED_CHARACTER_LIST) || key.equals(KeyboardProperties.KEY_AUTO_COMPLETE_LIST) || key.equals(KeyboardProperties.KEY_CUSTOMIZE_KEYS))