Skip to content

Fix soft button object invalid states #1776

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.

Sign up for GitHub

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

Merged
merged 20 commits into from
Feb 3, 2022
Merged

Fix soft button object invalid states #1776

Changes from 1 commit
Commits
Show all changes
20 commits
Select commit Hold shift + click to select a range
2445b37
Resolve #1774
noah-livio Dec 7, 2021
72e24b5
Add tests
noah-livio Dec 7, 2021
c9da956
Update Javadoc with throws annotations
noah-livio Dec 7, 2021
0aebb4e
Removing throwing of IllegalStateException
noah-livio Dec 14, 2021
b00cea5
Remove unused import
noah-livio Dec 14, 2021
8413d94
Make changes discussed in #1776 review
noah-livio Dec 15, 2021
f95aec3
Fix a small typo in the unit test javadoc
noah-livio Dec 15, 2021
648bdc3
Cleanup code and modify tests
noah-livio Dec 17, 2021
9a82059
Move states assignment back to original line
noah-livio Dec 17, 2021
053ac1b
Add duplicate name check to setStates()
noah-livio Dec 17, 2021
9d47512
Add AssertionErrors as per iOS alignment
noah-livio Jan 7, 2022
386027f
Remove redundant conditions and commented code
noah-livio Jan 7, 2022
75d1e1e
Add AssertionError to SoftButtonState
noah-livio Jan 7, 2022
d15498f
Add test for initialStateName check
noah-livio Jan 10, 2022
34c0622
Revert addtion of AssertionErrors
noah-livio Jan 11, 2022
528769f
Update SoftButtonManagerTests test
noah-livio Jan 20, 2022
e183f35
Update ScreenManagerTests test
noah-livio Jan 20, 2022
666f99a
Fixes from PR feedback
noah-livio Jan 26, 2022
14b7569
Review and standup feedback fixes
noah-livio Jan 28, 2022
39efd8e
PR feedback change
noah-livio Feb 1, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Update ScreenManagerTests test 
Update ScreenManagerTests.testAssigningIdsToSoftButtonObjects())
  • Loading branch information
@noah-livio
noah-livio committed Jan 20, 2022
commit e183f3541ac7e78b59aee6e5ce969f5481dd73f8
31 changes: 16 additions & 15 deletions ..._android/src/androidTest/java/com/smartdevicelink/managers/screen/ScreenManagerTests.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -217,14 +217,15 @@ public void testSettingSoftButtonId() {
}
@Test
public void testAssigningIdsToSoftButtonObjects() {
SoftButtonState defaultState = new SoftButtonState("default", "hi", null);
SoftButtonObject sbo1, sbo2, sbo3, sbo4, sbo5;

// Case 1 - don't set id for any button (Manager should set ids automatically starting from 1 and up)
sbo1 = new SoftButtonObject(null, Collections.EMPTY_LIST, null, null);
sbo2 = new SoftButtonObject(null, Collections.EMPTY_LIST, null, null);
sbo3 = new SoftButtonObject(null, Collections.EMPTY_LIST, null, null);
sbo4 = new SoftButtonObject(null, Collections.EMPTY_LIST, null, null);
sbo5 = new SoftButtonObject(null, Collections.EMPTY_LIST, null, null);
sbo1 = new SoftButtonObject(null, defaultState, null);
sbo2 = new SoftButtonObject(null, defaultState, null);
sbo3 = new SoftButtonObject(null, defaultState, null);
sbo4 = new SoftButtonObject(null, defaultState, null);
sbo5 = new SoftButtonObject(null, defaultState, null);
screenManager.checkAndAssignButtonIds(Arrays.asList(sbo1, sbo2, sbo3, sbo4, sbo5), BaseScreenManager.ManagerLocation.SOFTBUTTON_MANAGER);
assertEquals("SoftButtonObject id doesn't match the expected value", 1, sbo1.getButtonId());
assertEquals("SoftButtonObject id doesn't match the expected value", 2, sbo2.getButtonId());
Expand All @@ -234,15 +235,15 @@ public void testAssigningIdsToSoftButtonObjects() {


// Case 2 - Set ids for all buttons (Manager shouldn't alter the ids set by developer)
sbo1 = new SoftButtonObject(null, Collections.EMPTY_LIST, null, null);
sbo1 = new SoftButtonObject(null, defaultState, null);
sbo1.setButtonId(100);
sbo2 = new SoftButtonObject(null, Collections.EMPTY_LIST, null, null);
sbo2 = new SoftButtonObject(null, defaultState, null);
sbo2.setButtonId(200);
sbo3 = new SoftButtonObject(null, Collections.EMPTY_LIST, null, null);
sbo3 = new SoftButtonObject(null, defaultState, null);
sbo3.setButtonId(300);
sbo4 = new SoftButtonObject(null, Collections.EMPTY_LIST, null, null);
sbo4 = new SoftButtonObject(null, defaultState, null);
sbo4.setButtonId(400);
sbo5 = new SoftButtonObject(null, Collections.EMPTY_LIST, null, null);
sbo5 = new SoftButtonObject(null, defaultState, null);
sbo5.setButtonId(500);
screenManager.checkAndAssignButtonIds(Arrays.asList(sbo1, sbo2, sbo3, sbo4, sbo5), BaseScreenManager.ManagerLocation.SOFTBUTTON_MANAGER);
assertEquals("SoftButtonObject id doesn't match the expected value", 100, sbo1.getButtonId());
Expand All @@ -253,13 +254,13 @@ public void testAssigningIdsToSoftButtonObjects() {


// Case 3 - Set ids for some buttons (Manager shouldn't alter the ids set by developer. And it should assign ids for the ones that don't have id)
sbo1 = new SoftButtonObject(null, Collections.EMPTY_LIST, null, null);
sbo1 = new SoftButtonObject(null, defaultState, null);
sbo1.setButtonId(50);
sbo2 = new SoftButtonObject(null, Collections.EMPTY_LIST, null, null);
sbo3 = new SoftButtonObject(null, Collections.EMPTY_LIST, null, null);
sbo4 = new SoftButtonObject(null, Collections.EMPTY_LIST, null, null);
sbo2 = new SoftButtonObject(null, defaultState, null);
sbo3 = new SoftButtonObject(null, defaultState, null);
sbo4 = new SoftButtonObject(null, defaultState, null);
sbo4.setButtonId(100);
sbo5 = new SoftButtonObject(null, Collections.EMPTY_LIST, null, null);
sbo5 = new SoftButtonObject(null, defaultState, null);
screenManager.checkAndAssignButtonIds(Arrays.asList(sbo1, sbo2, sbo3, sbo4, sbo5), BaseScreenManager.ManagerLocation.SOFTBUTTON_MANAGER);
assertEquals("SoftButtonObject id doesn't match the expected value", 50, sbo1.getButtonId());
assertEquals("SoftButtonObject id doesn't match the expected value", 101, sbo2.getButtonId());
Expand Down