summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBrettyWhite <geekman3454@protonmail.com>2019-09-16 11:01:47 -0400
committerBrettyWhite <geekman3454@protonmail.com>2019-09-16 11:01:47 -0400
commitf4bc7da93ccd53bb85571e35c54e1100924de2c5 (patch)
treeadd2b10949603ba88cc5cae506134b43b382cce6
parent9b7943a711fccc839f272a07d11b0c12e8385da7 (diff)
downloadsdl_android-f4bc7da93ccd53bb85571e35c54e1100924de2c5.tar.gz
tests and docs
-rw-r--r--android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/GridTests.java7
-rw-r--r--android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/ModuleInfoTests.java4
-rw-r--r--android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/GetInteriorVehicleDataConsentTests.java5
-rw-r--r--android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/ReleaseInteriorVehicleDataModuleTests.java4
-rw-r--r--android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/GetInteriorVehicleDataConsentResponseTests.java8
-rw-r--r--base/src/main/java/com/smartdevicelink/proxy/rpc/GetInteriorVehicleDataConsent.java4
-rw-r--r--base/src/main/java/com/smartdevicelink/proxy/rpc/Grid.java5
-rw-r--r--base/src/main/java/com/smartdevicelink/proxy/rpc/ModuleInfo.java4
-rw-r--r--base/src/main/java/com/smartdevicelink/proxy/rpc/ReleaseInteriorVehicleDataModule.java3
9 files changed, 44 insertions, 0 deletions
diff --git a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/GridTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/GridTests.java
index 32e745d10..95f94c3a7 100644
--- a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/GridTests.java
+++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/GridTests.java
@@ -50,6 +50,13 @@ public class GridTests extends TestCase {
assertNull(Test.NULL, msg.getColumnSpan());
assertNull(Test.NULL, msg.getRowSpan());
assertNull(Test.NULL, msg.getLevelSpan());
+
+ //test required constructor
+ Grid msg2 = new Grid(Test.GENERAL_INT, Test.GENERAL_INT);
+ int row2 = msg2.getRow();
+ int col2 = msg2.getColumn();
+ assertEquals(Test.MATCH, col2, Test.GENERAL_INT);
+ assertEquals(Test.MATCH, row2, Test.GENERAL_INT);
}
public void testJson() {
diff --git a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/ModuleInfoTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/ModuleInfoTests.java
index 508c216f6..282e43b4f 100644
--- a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/ModuleInfoTests.java
+++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/ModuleInfoTests.java
@@ -43,6 +43,10 @@ public class ModuleInfoTests extends TestCase {
assertNull(Test.NULL, msg.getModuleLocation());
assertNull(Test.NULL, msg.getModuleServiceArea());
assertNull(Test.NULL, msg.getMultipleAccessAllowance());
+
+ //test required params constructor
+ ModuleInfo msg2 = new ModuleInfo(Test.GENERAL_STRING);
+ assertEquals(Test.MATCH, msg2.getModuleId(), Test.GENERAL_STRING);
}
public void testJson() {
diff --git a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/GetInteriorVehicleDataConsentTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/GetInteriorVehicleDataConsentTests.java
index 0f21a2076..d736e5176 100644
--- a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/GetInteriorVehicleDataConsentTests.java
+++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/GetInteriorVehicleDataConsentTests.java
@@ -62,6 +62,11 @@ public class GetInteriorVehicleDataConsentTests extends BaseRpcTests {
assertNull(Test.NULL, msg.getModuleType());
assertNull(Test.NULL, msg.getModuleIds());
+ //test require param constructor
+ GetInteriorVehicleDataConsent msg2 = new GetInteriorVehicleDataConsent(Test.GENERAL_MODULETYPE, Test.GENERAL_STRING_LIST);
+ assertEquals(Test.MATCH, Test.GENERAL_MODULETYPE, msg2.getModuleType());
+ assertEquals(Test.MATCH, Test.GENERAL_STRING_LIST, msg2.getModuleIds());
+
}
public void testJsonConstructor() {
diff --git a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/ReleaseInteriorVehicleDataModuleTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/ReleaseInteriorVehicleDataModuleTests.java
index 711e4c977..c2bd3b3d6 100644
--- a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/ReleaseInteriorVehicleDataModuleTests.java
+++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/ReleaseInteriorVehicleDataModuleTests.java
@@ -59,6 +59,10 @@ public class ReleaseInteriorVehicleDataModuleTests extends BaseRpcTests {
ReleaseInteriorVehicleDataModule msg = new ReleaseInteriorVehicleDataModule();
assertNull(Test.NULL, msg.getModuleType());
assertNull(Test.NULL, msg.getModuleId());
+
+ // required param tests
+ ReleaseInteriorVehicleDataModule msg2 = new ReleaseInteriorVehicleDataModule(Test.GENERAL_MODULETYPE);
+ assertEquals(Test.MATCH, Test.GENERAL_MODULETYPE, msg2.getModuleType());
}
public void testJsonConstructor() {
diff --git a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/GetInteriorVehicleDataConsentResponseTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/GetInteriorVehicleDataConsentResponseTests.java
index b77e056c9..b96306c62 100644
--- a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/GetInteriorVehicleDataConsentResponseTests.java
+++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/GetInteriorVehicleDataConsentResponseTests.java
@@ -4,6 +4,7 @@ import com.smartdevicelink.marshal.JsonRPCMarshaller;
import com.smartdevicelink.protocol.enums.FunctionID;
import com.smartdevicelink.proxy.RPCMessage;
import com.smartdevicelink.proxy.rpc.GetInteriorVehicleDataConsentResponse;
+import com.smartdevicelink.proxy.rpc.enums.Result;
import com.smartdevicelink.test.BaseRpcTests;
import com.smartdevicelink.test.JsonUtils;
import com.smartdevicelink.test.Test;
@@ -51,6 +52,13 @@ public class GetInteriorVehicleDataConsentResponseTests extends BaseRpcTests {
assertEquals(Test.MATCH, list, Test.GENERAL_BOOLEAN_LIST);
}
+ public void testRequiredParams(){
+ GetInteriorVehicleDataConsentResponse msg = new GetInteriorVehicleDataConsentResponse(true, Result.SUCCESS, Test.GENERAL_BOOLEAN_LIST);
+ assertEquals(Test.MATCH, msg.getAllowances(), Test.GENERAL_BOOLEAN_LIST);
+ assertTrue(msg.getSuccess());
+ assertEquals(Test.MATCH, msg.getResultCode(), Result.SUCCESS);
+ }
+
public void testJsonConstructor() {
JSONObject commandJson = JsonFileReader.readId(this.mContext, getCommandType(), getMessageType());
assertNotNull(Test.NOT_NULL, commandJson);
diff --git a/base/src/main/java/com/smartdevicelink/proxy/rpc/GetInteriorVehicleDataConsent.java b/base/src/main/java/com/smartdevicelink/proxy/rpc/GetInteriorVehicleDataConsent.java
index c7b16ba8d..3daa3804e 100644
--- a/base/src/main/java/com/smartdevicelink/proxy/rpc/GetInteriorVehicleDataConsent.java
+++ b/base/src/main/java/com/smartdevicelink/proxy/rpc/GetInteriorVehicleDataConsent.java
@@ -21,6 +21,10 @@ public class GetInteriorVehicleDataConsent extends RPCRequest {
super(hash);
}
+ /**
+ * @param moduleType Sets the Module Type for this class
+ * @param moduleIds Sets the Module Ids for this class
+ */
public GetInteriorVehicleDataConsent(@NonNull ModuleType moduleType, @NonNull List<String> moduleIds){
this();
setModuleType(moduleType);
diff --git a/base/src/main/java/com/smartdevicelink/proxy/rpc/Grid.java b/base/src/main/java/com/smartdevicelink/proxy/rpc/Grid.java
index 67db3ed4a..b90a35d64 100644
--- a/base/src/main/java/com/smartdevicelink/proxy/rpc/Grid.java
+++ b/base/src/main/java/com/smartdevicelink/proxy/rpc/Grid.java
@@ -24,6 +24,11 @@ public class Grid extends RPCStruct {
super(hash);
}
+ /**
+ * Struct that describes a location (origin coordinates and span) of a vehicle component (Module)
+ * @param row Sets the row's value of this Grid
+ * @param column Sets the column of this Grid
+ */
public Grid(@NonNull Integer row, @NonNull Integer column){
this();
setRow(row);
diff --git a/base/src/main/java/com/smartdevicelink/proxy/rpc/ModuleInfo.java b/base/src/main/java/com/smartdevicelink/proxy/rpc/ModuleInfo.java
index c5c2c689d..ae428319b 100644
--- a/base/src/main/java/com/smartdevicelink/proxy/rpc/ModuleInfo.java
+++ b/base/src/main/java/com/smartdevicelink/proxy/rpc/ModuleInfo.java
@@ -21,6 +21,10 @@ public class ModuleInfo extends RPCStruct {
super(hash);
}
+ /**
+ * Struct that describes a module within different SystemCapabilities
+ * @param moduleId Sets the Module ID for this Module
+ */
public ModuleInfo(@NonNull String moduleId){
this();
setModuleId(moduleId);
diff --git a/base/src/main/java/com/smartdevicelink/proxy/rpc/ReleaseInteriorVehicleDataModule.java b/base/src/main/java/com/smartdevicelink/proxy/rpc/ReleaseInteriorVehicleDataModule.java
index 0c44fa5b6..a45ec70b2 100644
--- a/base/src/main/java/com/smartdevicelink/proxy/rpc/ReleaseInteriorVehicleDataModule.java
+++ b/base/src/main/java/com/smartdevicelink/proxy/rpc/ReleaseInteriorVehicleDataModule.java
@@ -20,6 +20,9 @@ public class ReleaseInteriorVehicleDataModule extends RPCRequest {
super(hash);
}
+ /**
+ * @param moduleType Sets the Module Type for this class
+ */
public ReleaseInteriorVehicleDataModule(@NonNull ModuleType moduleType){
this();
setModuleType(moduleType);