diff options
| author | Joey Grover <joeygrover@gmail.com> | 2017-05-02 15:25:44 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-05-02 15:25:44 -0400 |
| commit | 539c11c936974caf59d48506dd3224b53120d945 (patch) | |
| tree | afda2e1f25be505c5c1207f43755bf73981bb889 | |
| parent | ab9be9c963bfa258b5cc3f49f106ebdbc2689a81 (diff) | |
| parent | 46cdae0829fce6b9400ddac4c0c99a3ef3d6d776 (diff) | |
| download | sdl_android-539c11c936974caf59d48506dd3224b53120d945.tar.gz | |
Merge pull request #476 from smartdevicelink/feature/issue_468
Added patch version to SdlMsgVersion.java
| -rw-r--r-- | sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/SdlMsgVersionTest.java | 9 | ||||
| -rw-r--r-- | sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/SdlMsgVersion.java | 29 |
2 files changed, 36 insertions, 2 deletions
diff --git a/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/SdlMsgVersionTest.java b/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/SdlMsgVersionTest.java index c94afc643..645652ea0 100644 --- a/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/SdlMsgVersionTest.java +++ b/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/SdlMsgVersionTest.java @@ -25,6 +25,7 @@ public class SdlMsgVersionTest extends TestCase { msg.setMajorVersion(Test.GENERAL_INT); msg.setMinorVersion(Test.GENERAL_INT); + msg.setPatchVersion(Test.GENERAL_INT); } /** @@ -34,17 +35,20 @@ public class SdlMsgVersionTest extends TestCase { // Test Values Integer major = msg.getMajorVersion(); Integer minor = msg.getMinorVersion(); - + Integer patch = msg.getPatchVersion(); + // Valid Tests assertEquals(Test.MATCH, (Integer) Test.GENERAL_INT, major); assertEquals(Test.MATCH, (Integer) Test.GENERAL_INT, minor); - + assertEquals(Test.MATCH, (Integer) Test.GENERAL_INT, patch); + // Invalid/Null Tests SdlMsgVersion msg = new SdlMsgVersion(); assertNotNull(Test.NOT_NULL, msg); assertNull(Test.NULL, msg.getMajorVersion()); assertNull(Test.NULL, msg.getMinorVersion()); + assertNull(Test.NULL, msg.getPatchVersion()); } public void testJson() { @@ -53,6 +57,7 @@ public class SdlMsgVersionTest extends TestCase { try { reference.put(SdlMsgVersion.KEY_MAJOR_VERSION, Test.GENERAL_INT); reference.put(SdlMsgVersion.KEY_MINOR_VERSION, Test.GENERAL_INT); + reference.put(SdlMsgVersion.KEY_PATCH_VERSION, Test.GENERAL_INT); JSONObject underTest = msg.serializeJSON(); assertEquals(Test.MATCH, reference.length(), underTest.length()); diff --git a/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/SdlMsgVersion.java b/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/SdlMsgVersion.java index cb5df057d..a2388cc7e 100644 --- a/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/SdlMsgVersion.java +++ b/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/SdlMsgVersion.java @@ -42,6 +42,7 @@ import com.smartdevicelink.proxy.RPCStruct; public class SdlMsgVersion extends RPCStruct {
public static final String KEY_MAJOR_VERSION = "majorVersion";
public static final String KEY_MINOR_VERSION = "minorVersion";
+ public static final String KEY_PATCH_VERSION = "patchVersion";
/**
* Constructs a newly allocated SdlMsgVersion object
@@ -106,4 +107,32 @@ public class SdlMsgVersion extends RPCStruct { store.remove(KEY_MINOR_VERSION);
}
}
+
+ /**
+ * Get patch version
+ * <ul>
+ * <li>minvalue="0"</li>
+ * <li>maxvalue="1000"</li>
+ * </ul>
+ * @return the patch version
+ */
+ public Integer getPatchVersion() {
+ return (Integer) store.get( KEY_PATCH_VERSION );
+ }
+ /**
+ * Set patch version
+ * <ul>
+ * <li>minvalue="0"</li>
+ * <li>maxvalue="1000"</li>
+ * </ul>
+ * @param patchVersion min: 0; max: 1000
+ */
+ public void setPatchVersion( Integer patchVersion ) {
+ if (patchVersion != null) {
+ store.put(KEY_PATCH_VERSION, patchVersion );
+ } else {
+ store.remove(KEY_PATCH_VERSION);
+ }
+ }
+
}
|