Skip to content
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

Implement SDL 0221 Allow Multiple Modules per Module Type #1166

Merged
merged 25 commits into from
Sep 10, 2019
Merged

Conversation

BrettyWhite
Copy link
Contributor

@BrettyWhite BrettyWhite commented Sep 6, 2019

Fixes #1070

This PR is ready for review.

Risk

This PR makes minor API changes.

Testing Plan

Unit tests, test with new data from Core

Summary

Parse new Module Control data, store and send to app when requested

CLA

Also signed by author @Tnnnguyen

Tnnnguyen and others added 25 commits June 6, 2019 10:31
…nd ReleaseInteriorVehicleDataModuleResponse in SdlProxyBase

- change hash keys in Grid and ModuleInfo
- refractor method names and constants
…ReleaseInteriorVehicleDataModuleResponse to ProxyBridge
* develop_mainRepo: (176 commits)
  remove unused import
  Add getBytesAvailable() to FileManagerTest
  Add getBytesAvailable() to FileManager
  Fix formatting issue
  Add unit tests for setting buttonId logic
  Fix borken SoftButton tests
  Calc maxButtonIdsSetByDev manually
  turn default oem icon setting to true
  Extract ids setting logic into a spearate method
  Update setButtonId() javadoc
  Remove additional semicolon BaseSoftButtonManager
  Roll softbutton ids over to 0 when max is reached
  Improve setting softbutton ids logic
  fix broken test
  fix javadoc
  add prerecorded speech to scm
  Add isHighlighted & systemAction to SoftButtonState
  Update base/src/main/java/com/smartdevicelink/proxy/rpc/Alert.java
  Update menu manager comments
  Set menuConfiguration before getting response
  ...

# Conflicts:
#	android/sdl_android/src/androidTest/java/com/smartdevicelink/test/Test.java
#	android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/ClimateControlCapabilitiesTests.java
#	android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/RadioControlCapabilitiesTests.java
#	android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/SystemCapabilityTypeTests.java
#	android/sdl_android/src/main/java/com/smartdevicelink/proxy/SdlProxyBase.java
#	base/src/main/java/com/smartdevicelink/protocol/enums/FunctionID.java
#	base/src/main/java/com/smartdevicelink/proxy/rpc/ClimateControlCapabilities.java
#	base/src/main/java/com/smartdevicelink/proxy/rpc/RadioControlCapabilities.java
#	base/src/main/java/com/smartdevicelink/proxy/rpc/SetGlobalProperties.java
Merge new commits from develop branch and resolve conflicts
* develop_mainRepo:
  Update travis file
  Update changelog for 4.9.1
  Update VERSION_NAME to 4.9.1
  Fix vr optional issue
  Add templateTitle to TextFieldNameTests
  Add templateTitle to TextFieldName enum
  Fix issue with text formatting
  Update javadoc for setTemplateTitle
  Fix issue in setting templateTitle in ScreenManager
  Update templateTitle javadoc
  Add templateTitle unit tests
  Update screenManager to support templateTitle
  Update templateTitle setter/getter
  Fix typo on javadoc
  Add templateTitle param to Show RPC
# Conflicts:
#	android/sdl_android/src/main/java/com/smartdevicelink/proxy/SdlProxyBase.java
#	base/src/main/java/com/smartdevicelink/protocol/enums/FunctionID.java

Pull in develop and resolve conflicts.
…t to fix indentation.

Fix function id to match mobile API spec.
# Conflicts:
#	android/sdl_android/src/androidTest/java/com/smartdevicelink/test/Test.java
#	base/src/main/java/com/smartdevicelink/protocol/enums/FunctionID.java
#	base/src/main/java/com/smartdevicelink/proxy/rpc/SystemCapability.java
@BrettyWhite BrettyWhite changed the title Test mm Implement SDL 0221 Allow Multiple Modules per Module Type Sep 6, 2019
@codecov-io
Copy link

Codecov Report

Merging #1166 into develop will increase coverage by 0.22%.
The diff coverage is 72.78%.

Impacted file tree graph

@@             Coverage Diff              @@
##             develop   #1166      +/-   ##
============================================
+ Coverage      46.97%   47.2%   +0.22%     
- Complexity      4185    4259      +74     
============================================
  Files            470     478       +8     
  Lines          22831   22992     +161     
  Branches        2588    2594       +6     
============================================
+ Hits           10726   10853     +127     
- Misses         11461   11491      +30     
- Partials         644     648       +4
Impacted Files Coverage Δ Complexity Δ
...tdevicelink/proxy/rpc/SeatControlCapabilities.java 94.82% <0%> (-5.18%) 35 <0> (ø)
...java/com/smartdevicelink/managers/ProxyBridge.java 3.82% <0%> (-0.08%) 2 <0> (ø)
...n/java/com/smartdevicelink/proxy/SdlProxyBase.java 8.26% <0%> (-0.05%) 27 <0> (ø)
...smartdevicelink/proxy/rpc/SetGlobalProperties.java 90.32% <0%> (-9.68%) 18 <0> (ø)
...martdevicelink/proxy/rpc/enums/GlobalProperty.java 100% <100%> (ø) 2 <0> (ø) ⬇️
...rtdevicelink/proxy/rpc/SeatLocationCapability.java 100% <100%> (ø) 10 <10> (?)
...vicelink/proxy/rpc/enums/SystemCapabilityType.java 100% <100%> (ø) 4 <0> (ø) ⬇️
...ava/com/smartdevicelink/proxy/rpc/ButtonPress.java 100% <100%> (ø) 11 <2> (+2) ⬆️
...vicelink/proxy/rpc/ClimateControlCapabilities.java 100% <100%> (ø) 39 <2> (+2) ⬆️
...devicelink/proxy/rpc/LightControlCapabilities.java 100% <100%> (ø) 9 <2> (+2) ⬆️
... and 24 more

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update d8cf4e3...7fae28a. Read the comment docs.

@BrettyWhite
Copy link
Contributor Author

Tested again and verified with @ShobhitAd. Approved.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants