diff options
| author | Robert Henigan <robert.henigan@livio.io> | 2020-09-21 10:55:03 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-09-21 10:55:03 -0400 |
| commit | 925d9c5b6e0c41fd5af166aa45bdd72125585ad8 (patch) | |
| tree | 67cafde80b2663faa85e51530ffe7bd008758ad8 /android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc | |
| parent | c003e108393c51dff1ec4971987ef38c793673f1 (diff) | |
| parent | 9bf45a71a2649ea9f874c0b5138d4495cdd5abc4 (diff) | |
| download | sdl_android-925d9c5b6e0c41fd5af166aa45bdd72125585ad8.tar.gz | |
Merge pull request #1505 from smartdevicelink/feature/code_formatting
Reformat project code
Diffstat (limited to 'android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc')
354 files changed, 21539 insertions, 21756 deletions
diff --git a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/RPCGenericTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/RPCGenericTests.java index 06d0aeef0..04c12850b 100644 --- a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/RPCGenericTests.java +++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/RPCGenericTests.java @@ -108,7 +108,7 @@ public class RPCGenericTests { } @Before - public void setUp(){ + public void setUp() { // Map that has keys correspond to the RPC names and values correspond to the params for that RPC. rpcMandatoryParamsMapFromXml = getRPCParamsMap(XML_FILE_NAME, true); rpcAllParamsMapFromXml = getRPCParamsMap(XML_FILE_NAME, false); @@ -131,30 +131,30 @@ public class RPCGenericTests { String getterMethodName2; Class<?> javaParamType; boolean skipParam; - while (event != XmlPullParser.END_DOCUMENT) { + while (event != XmlPullParser.END_DOCUMENT) { String name = myParser.getName(); - switch (event){ + switch (event) { case XmlPullParser.START_TAG: // Store the RPC name in the map - if(name.equals("function") || name.equals("struct")){ - rpcName = myParser.getAttributeValue(null,"name"); + if (name.equals("function") || name.equals("struct")) { + rpcName = myParser.getAttributeValue(null, "name"); ignoreRPC = false; - if (name.equals("function") && myParser.getAttributeValue(null, "messagetype").equals("response") && !rpcName.contains("Response")){ + if (name.equals("function") && myParser.getAttributeValue(null, "messagetype").equals("response") && !rpcName.contains("Response")) { rpcName += "Response"; } // -------------- Exceptional cases because of mismatch between the RPC spec and the Android code -------------- - if(rpcName.equals("SyncMsgVersion")){ - rpcName = "SdlMsgVersion"; - } else if(rpcName.equals("ShowConstantTBTResponse")){ - rpcName = "ShowConstantTbtResponse"; - } else if(rpcName.equals("OASISAddress")) { - rpcName = "OasisAddress"; - } else if(rpcName.equals("ShowConstantTBT")) { - rpcName = "ShowConstantTbt"; - } else if (rpcName.equals("EncodedSyncPData") || rpcName.equals("OnEncodedSyncPData") || rpcName.equals("EncodedSyncPDataResponse")){ - ignoreRPC = true; - } + if (rpcName.equals("SyncMsgVersion")) { + rpcName = "SdlMsgVersion"; + } else if (rpcName.equals("ShowConstantTBTResponse")) { + rpcName = "ShowConstantTbtResponse"; + } else if (rpcName.equals("OASISAddress")) { + rpcName = "OasisAddress"; + } else if (rpcName.equals("ShowConstantTBT")) { + rpcName = "ShowConstantTbt"; + } else if (rpcName.equals("EncodedSyncPData") || rpcName.equals("OnEncodedSyncPData") || rpcName.equals("EncodedSyncPDataResponse")) { + ignoreRPC = true; + } // ------------------------------------------------------------------------------------------------------------- if (!ignoreRPC) { @@ -162,38 +162,38 @@ public class RPCGenericTests { } } // Store the params for the current RPC in the map - if(name.equals("param") && myParser.getAttributeValue(null, "until") == null && !ignoreRPC){ + if (name.equals("param") && myParser.getAttributeValue(null, "until") == null && !ignoreRPC) { setterMethodName = null; getterMethodName1 = null; getterMethodName2 = null; javaParamType = null; skipParam = false; - boolean isMandatory = Boolean.valueOf(myParser.getAttributeValue(null,"mandatory")); + boolean isMandatory = Boolean.valueOf(myParser.getAttributeValue(null, "mandatory")); if (isMandatory || !includeMandatoryOnly) { String paramName = myParser.getAttributeValue(null, "name"); String paramType = myParser.getAttributeValue(null, "type"); boolean isArray = Boolean.valueOf(myParser.getAttributeValue(null, "array")); // -------------- Exceptional cases because of mismatch between the RPC spec and the Android code -------------- - if (paramName.equals("syncFileName")){ + if (paramName.equals("syncFileName")) { paramName = "sdlFileName"; - } else if (paramName.equals("syncMsgVersion")){ + } else if (paramName.equals("syncMsgVersion")) { paramName = "sdlMsgVersion"; - } else if (paramName.equals("hmiPermissions")){ + } else if (paramName.equals("hmiPermissions")) { paramName = "HMIPermissions"; - } else if (paramName.equals("resolution")){ + } else if (paramName.equals("resolution")) { paramName = "imageResolution"; } setterMethodName = "set" + paramName.substring(0, 1).toUpperCase() + paramName.substring(1); - if (paramType.equals("SyncMsgVersion")){ + if (paramType.equals("SyncMsgVersion")) { paramType = "SdlMsgVersion"; } else if (paramType.equals("OASISAddress")) { paramType = "OasisAddress"; - } else if (rpcName.equals("TouchEvent") && paramType.equals("Integer") && isArray){ + } else if (rpcName.equals("TouchEvent") && paramType.equals("Integer") && isArray) { paramType = "Long"; - } else if (Arrays.asList("GPSData", "VideoStreamingCapability").contains(rpcName) && paramType.equals("Float")){ + } else if (Arrays.asList("GPSData", "VideoStreamingCapability").contains(rpcName) && paramType.equals("Float")) { paramType = "Double"; } else if (Arrays.asList("GetVehicleDataResponse", "OnVehicleData").contains(rpcName) && Arrays.asList("setInstantFuelConsumption", "setFuelLevel", "setSpeed", "setExternalTemperature", "setEngineTorque", "setAccPedalPosition", "setSteeringWheelAngle").contains(setterMethodName)) { paramType = "Double"; @@ -310,8 +310,7 @@ public class RPCGenericTests { .setSkip(skipParam) .setSetterName(setterMethodName) .setGetterName1(getterMethodName1) - .setGetterName2(getterMethodName2) - ; + .setGetterName2(getterMethodName2); rpcParamsMap.get(rpcName).add(param); } @@ -353,16 +352,16 @@ public class RPCGenericTests { for (Parameter param : rpcMandatoryParamsMapFromXml.get(rpcName)) { String type = param.type; // If the param is a list of objects, the type should be like "List<Object>" - if (param.isArray){ + if (param.isArray) { type = String.format("List<%s>", type); } mandatoryParamsListFromXML.add(type); } List<String> mandatoryParamsListFromCode = new ArrayList<>(); boolean rpcHasValidConstructor = false; - for (Constructor constructor : aClass.getConstructors()){ + for (Constructor constructor : aClass.getConstructors()) { mandatoryParamsListFromCode.clear(); - for (Type paramType : constructor.getGenericParameterTypes()){ + for (Type paramType : constructor.getGenericParameterTypes()) { String paramFullType = paramType.toString(); String paramSimpleType; @@ -371,20 +370,19 @@ public class RPCGenericTests { paramSimpleType = String.format("List<%s>", paramFullType.substring(paramFullType.lastIndexOf('.') + 1, paramFullType.length() - 1)); } // If the param is a simple object for example "java.lang.String", the type should be the last part "String" - else if (!paramFullType.contains(">")){ + else if (!paramFullType.contains(">")) { paramSimpleType = paramFullType.substring(paramFullType.lastIndexOf('.') + 1, paramFullType.length()); - } - else { + } else { paramSimpleType = paramFullType; } mandatoryParamsListFromCode.add(paramSimpleType); } - if (mandatoryParamsListFromCode.containsAll(mandatoryParamsListFromXML) && mandatoryParamsListFromXML.containsAll(mandatoryParamsListFromCode)){ + if (mandatoryParamsListFromCode.containsAll(mandatoryParamsListFromXML) && mandatoryParamsListFromXML.containsAll(mandatoryParamsListFromCode)) { rpcHasValidConstructor = true; break; } } - if (!rpcHasValidConstructor){ + if (!rpcHasValidConstructor) { rpcsWithInvalidConstructor.add(rpcName); } } @@ -496,14 +494,14 @@ public class RPCGenericTests { try { // --------------------------------------------- Exceptional cases --------------------------------------------- // This case is exceptional because the setter changes the input if it is not all digits - if (rpcName.equals("DialNumber") && param.type.equals("String")){ + if (rpcName.equals("DialNumber") && param.type.equals("String")) { value = "5558675309"; } // ------------------------------------------------------------------------------------------------------------- if (value == null) { valueString = "GENERAL_" + param.type.toUpperCase(); - if (param.isArray){ + if (param.isArray) { valueString += "_LIST"; } value = Class.forName(TEST_VALUES_CLASS).getDeclaredField(valueString).get(null); @@ -524,7 +522,7 @@ public class RPCGenericTests { try { Constructor constructor = aClass.getConstructor(mandatoryParamsTypes.toArray(new Class<?>[mandatoryParamsTypes.size()])); instance = constructor.newInstance(mandatoryParamsValues.toArray(new Object[mandatoryParamsValues.size()])); - } catch (NoSuchMethodException | IllegalAccessException | InstantiationException | InvocationTargetException e) { + } catch (NoSuchMethodException | IllegalAccessException | InstantiationException | InvocationTargetException e) { e.printStackTrace(); fail("Constructor for RPC " + rpcName + " cannot be invoked. Make sure that the constructor parameters order and types are identical to the RPC specs"); } @@ -568,7 +566,7 @@ public class RPCGenericTests { aClass = Class.forName(RPC_PACKAGE_PREFIX + rpcName); } catch (ClassNotFoundException e) { e.printStackTrace(); - errors.add("Class not found for rpc: "+ rpcName + ". \n"); + errors.add("Class not found for rpc: " + rpcName + ". \n"); continue; } @@ -603,7 +601,7 @@ public class RPCGenericTests { getterMethod = getMethod(aClass, parameter, parameter.getterName2, true); } catch (NoSuchMethodException ex) { ex.printStackTrace(); - String errMsg = String.format(rpcName + "." + parameter.getterName1 + "()" + "%s" + " cannot be found. Make sure that the method exists. \n", parameter.type.equalsIgnoreCase("boolean")? "/" + parameter.getterName2 + "()" : ""); + String errMsg = String.format(rpcName + "." + parameter.getterName1 + "()" + "%s" + " cannot be found. Make sure that the method exists. \n", parameter.type.equalsIgnoreCase("boolean") ? "/" + parameter.getterName2 + "()" : ""); errors.add(errMsg); } } diff --git a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/AirbagStatusTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/AirbagStatusTests.java index 2eff1f828..d82bed010 100644 --- a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/AirbagStatusTests.java +++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/AirbagStatusTests.java @@ -13,18 +13,18 @@ import org.json.JSONObject; import java.util.Iterator; /** - * This is a unit test class for the SmartDeviceLink library project class : + * This is a unit test class for the SmartDeviceLink library project class : * {@link com.smartdevicelink.proxy.rpc.AirbagStatus} */ -public class AirbagStatusTests extends TestCase{ +public class AirbagStatusTests extends TestCase { private AirbagStatus msg; @Override - public void setUp(){ + public void setUp() { msg = new AirbagStatus(); assertNotNull(TestValues.NOT_NULL, msg); - + msg.setDriverAirbagDeployed(TestValues.GENERAL_VEHCILEDATAEVENTSTATUS); msg.setDriverCurtainAirbagDeployed(TestValues.GENERAL_VEHCILEDATAEVENTSTATUS); msg.setDriverKneeAirbagDeployed(TestValues.GENERAL_VEHCILEDATAEVENTSTATUS); @@ -33,14 +33,14 @@ public class AirbagStatusTests extends TestCase{ msg.setPassengerCurtainAirbagDeployed(TestValues.GENERAL_VEHCILEDATAEVENTSTATUS); msg.setPassengerKneeAirbagDeployed(TestValues.GENERAL_VEHCILEDATAEVENTSTATUS); msg.setPassengerSideAirbagDeployed(TestValues.GENERAL_VEHCILEDATAEVENTSTATUS); - + } - + /** - * Tests the expected values of the RPC message. - */ - public void testRpcValues () { - // Test Values + * Tests the expected values of the RPC message. + */ + public void testRpcValues() { + // Test Values VehicleDataEventStatus airbagStatus = msg.getDriverAirbagDeployed(); VehicleDataEventStatus curtainStatus = msg.getDriverCurtainAirbagDeployed(); VehicleDataEventStatus kneeStatus = msg.getDriverKneeAirbagDeployed(); @@ -49,7 +49,7 @@ public class AirbagStatusTests extends TestCase{ VehicleDataEventStatus passengerCurtainStatus = msg.getPassengerCurtainAirbagDeployed(); VehicleDataEventStatus passengerKneeStatus = msg.getPassengerKneeAirbagDeployed(); VehicleDataEventStatus passengerSideStatus = msg.getPassengerSideAirbagDeployed(); - + // Valid Tests assertEquals(TestValues.MATCH, TestValues.GENERAL_VEHCILEDATAEVENTSTATUS, airbagStatus); assertEquals(TestValues.MATCH, TestValues.GENERAL_VEHCILEDATAEVENTSTATUS, curtainStatus); @@ -59,11 +59,11 @@ public class AirbagStatusTests extends TestCase{ assertEquals(TestValues.MATCH, TestValues.GENERAL_VEHCILEDATAEVENTSTATUS, passengerCurtainStatus); assertEquals(TestValues.MATCH, TestValues.GENERAL_VEHCILEDATAEVENTSTATUS, passengerKneeStatus); assertEquals(TestValues.MATCH, TestValues.GENERAL_VEHCILEDATAEVENTSTATUS, passengerSideStatus); - + // Invalid/Null Tests AirbagStatus msg = new AirbagStatus(); assertNotNull(TestValues.NOT_NULL, msg); - + assertNull(TestValues.NULL, msg.getDriverAirbagDeployed()); assertNull(TestValues.NULL, msg.getDriverSideAirbagDeployed()); assertNull(TestValues.NULL, msg.getDriverCurtainAirbagDeployed()); @@ -74,10 +74,10 @@ public class AirbagStatusTests extends TestCase{ assertNull(TestValues.NULL, msg.getPassengerKneeAirbagDeployed()); } - public void testJson(){ + public void testJson() { JSONObject reference = new JSONObject(); - try{ + try { reference.put(AirbagStatus.KEY_DRIVER_AIRBAG_DEPLOYED, TestValues.GENERAL_VEHCILEDATAEVENTSTATUS); reference.put(AirbagStatus.KEY_DRIVER_CURTAIN_AIRBAG_DEPLOYED, TestValues.GENERAL_VEHCILEDATAEVENTSTATUS); reference.put(AirbagStatus.KEY_DRIVER_KNEE_AIRBAG_DEPLOYED, TestValues.GENERAL_VEHCILEDATAEVENTSTATUS); @@ -91,12 +91,12 @@ public class AirbagStatusTests extends TestCase{ assertEquals(TestValues.MATCH, reference.length(), underTest.length()); Iterator<?> iterator = reference.keys(); - while(iterator.hasNext()){ + while (iterator.hasNext()) { String key = (String) iterator.next(); assertEquals(TestValues.MATCH, JsonUtils.readObjectFromJsonObject(reference, key), JsonUtils.readObjectFromJsonObject(underTest, key)); } - } catch(JSONException e){ - fail(TestValues.JSON_FAIL); + } catch (JSONException e) { + fail(TestValues.JSON_FAIL); } } }
\ No newline at end of file diff --git a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/AppInfoTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/AppInfoTests.java index 1f143cb61..1c8fd568c 100644 --- a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/AppInfoTests.java +++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/AppInfoTests.java @@ -49,64 +49,64 @@ import java.util.Iterator; */ public class AppInfoTests extends TestCase { - private AppInfo msg; - - @Override - public void setUp() { - - msg = new AppInfo(); - msg.setAppDisplayName(TestValues.GENERAL_STRING); - msg.setAppBundleID(TestValues.GENERAL_STRING); - msg.setAppVersion(TestValues.GENERAL_STRING); - msg.setAppIcon(TestValues.GENERAL_STRING); - } - - /** - * Tests the expected values of the RPC message. - */ - public void testRpcValues () { - // Test Values - String appDisplayName = msg.getAppDisplayName(); - String appBundleID = msg.getAppBundleID(); - String appVersion = msg.getAppVersion(); - String appIcon = msg.getAppIcon(); - - // Valid Tests - assertEquals(TestValues.GENERAL_STRING, appDisplayName); - assertEquals(TestValues.GENERAL_STRING, appBundleID); - assertEquals(TestValues.GENERAL_STRING, appVersion); - assertEquals(TestValues.GENERAL_STRING, appIcon); - - // Invalid/Null Tests - AppInfo msg = new AppInfo(); - assertNotNull(TestValues.NOT_NULL, msg); - - assertNull(TestValues.NULL, msg.getAppDisplayName()); - assertNull(TestValues.NULL, msg.getAppBundleID()); - assertNull(TestValues.NULL, msg.getAppVersion()); - assertNull(TestValues.NULL, msg.getAppIcon()); - } - - public void testJson(){ - JSONObject reference = new JSONObject(); - - try{ - reference.put(AppInfo.KEY_APP_DISPLAY_NAME, TestValues.GENERAL_STRING); - reference.put(AppInfo.KEY_APP_BUNDLE_ID, TestValues.GENERAL_STRING); - reference.put(AppInfo.KEY_APP_VERSION, TestValues.GENERAL_STRING); - reference.put(AppInfo.KEY_APP_ICON, TestValues.GENERAL_STRING); - - JSONObject underTest = msg.serializeJSON(); - assertEquals(TestValues.MATCH, reference.length(), underTest.length()); - - Iterator<?> iterator = reference.keys(); - while(iterator.hasNext()){ - String key = (String) iterator.next(); - assertEquals(TestValues.MATCH, JsonUtils.readObjectFromJsonObject(reference, key), JsonUtils.readObjectFromJsonObject(underTest, key)); - } - } catch(JSONException e){ - fail(TestValues.JSON_FAIL); - } - } + private AppInfo msg; + + @Override + public void setUp() { + + msg = new AppInfo(); + msg.setAppDisplayName(TestValues.GENERAL_STRING); + msg.setAppBundleID(TestValues.GENERAL_STRING); + msg.setAppVersion(TestValues.GENERAL_STRING); + msg.setAppIcon(TestValues.GENERAL_STRING); + } + + /** + * Tests the expected values of the RPC message. + */ + public void testRpcValues() { + // Test Values + String appDisplayName = msg.getAppDisplayName(); + String appBundleID = msg.getAppBundleID(); + String appVersion = msg.getAppVersion(); + String appIcon = msg.getAppIcon(); + + // Valid Tests + assertEquals(TestValues.GENERAL_STRING, appDisplayName); + assertEquals(TestValues.GENERAL_STRING, appBundleID); + assertEquals(TestValues.GENERAL_STRING, appVersion); + assertEquals(TestValues.GENERAL_STRING, appIcon); + + // Invalid/Null Tests + AppInfo msg = new AppInfo(); + assertNotNull(TestValues.NOT_NULL, msg); + + assertNull(TestValues.NULL, msg.getAppDisplayName()); + assertNull(TestValues.NULL, msg.getAppBundleID()); + assertNull(TestValues.NULL, msg.getAppVersion()); + assertNull(TestValues.NULL, msg.getAppIcon()); + } + + public void testJson() { + JSONObject reference = new JSONObject(); + + try { + reference.put(AppInfo.KEY_APP_DISPLAY_NAME, TestValues.GENERAL_STRING); + reference.put(AppInfo.KEY_APP_BUNDLE_ID, TestValues.GENERAL_STRING); + reference.put(AppInfo.KEY_APP_VERSION, TestValues.GENERAL_STRING); + reference.put(AppInfo.KEY_APP_ICON, TestValues.GENERAL_STRING); + + JSONObject underTest = msg.serializeJSON(); + assertEquals(TestValues.MATCH, reference.length(), underTest.length()); + + Iterator<?> iterator = reference.keys(); + while (iterator.hasNext()) { + String key = (String) iterator.next(); + assertEquals(TestValues.MATCH, JsonUtils.readObjectFromJsonObject(reference, key), JsonUtils.readObjectFromJsonObject(underTest, key)); + } + } catch (JSONException e) { + fail(TestValues.JSON_FAIL); + } + } } diff --git a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/AppServiceCapabilityTest.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/AppServiceCapabilityTest.java index 1579e1ec1..15f55dd6c 100644 --- a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/AppServiceCapabilityTest.java +++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/AppServiceCapabilityTest.java @@ -28,107 +28,107 @@ import java.util.List; */ public class AppServiceCapabilityTest extends TestCase { - private AppServiceCapability msg; + private AppServiceCapability msg; - @Override - public void setUp(){ + @Override + public void setUp() { - msg = new AppServiceCapability(); - msg.setUpdatedAppServiceRecord(TestValues.GENERAL_APPSERVICERECORD); - msg.setUpdateReason(TestValues.GENERAL_SERVICE_UPDATE_REASON); - } + msg = new AppServiceCapability(); + msg.setUpdatedAppServiceRecord(TestValues.GENERAL_APPSERVICERECORD); + msg.setUpdateReason(TestValues.GENERAL_SERVICE_UPDATE_REASON); + } - /** - * Tests the expected values of the RPC message. - */ - public void testRpcValues () { - // Test Values - AppServiceRecord serviceRecord = msg.getUpdatedAppServiceRecord(); - ServiceUpdateReason updateReason = msg.getUpdateReason(); + /** + * Tests the expected values of the RPC message. + */ + public void testRpcValues() { + // Test Values + AppServiceRecord serviceRecord = msg.getUpdatedAppServiceRecord(); + ServiceUpdateReason updateReason = msg.getUpdateReason(); - // Valid Tests - assertEquals(TestValues.MATCH, serviceRecord, TestValues.GENERAL_APPSERVICERECORD); - assertEquals(TestValues.MATCH, updateReason, TestValues.GENERAL_SERVICE_UPDATE_REASON); + // Valid Tests + assertEquals(TestValues.MATCH, serviceRecord, TestValues.GENERAL_APPSERVICERECORD); + assertEquals(TestValues.MATCH, updateReason, TestValues.GENERAL_SERVICE_UPDATE_REASON); - // Invalid/Null Tests - AppServiceCapability msg = new AppServiceCapability(); - assertNotNull(TestValues.NOT_NULL, msg); + // Invalid/Null Tests + AppServiceCapability msg = new AppServiceCapability(); + assertNotNull(TestValues.NOT_NULL, msg); - assertNull(TestValues.NULL, msg.getUpdatedAppServiceRecord()); - assertNull(TestValues.NULL, msg.getUpdateReason()); - } + assertNull(TestValues.NULL, msg.getUpdatedAppServiceRecord()); + assertNull(TestValues.NULL, msg.getUpdateReason()); + } - public void testRequiredParamsConstructor(){ - msg = new AppServiceCapability(TestValues.GENERAL_APPSERVICERECORD); - AppServiceRecord serviceRecord = msg.getUpdatedAppServiceRecord(); - assertEquals(TestValues.MATCH, serviceRecord, TestValues.GENERAL_APPSERVICERECORD); - } + public void testRequiredParamsConstructor() { + msg = new AppServiceCapability(TestValues.GENERAL_APPSERVICERECORD); + AppServiceRecord serviceRecord = msg.getUpdatedAppServiceRecord(); + assertEquals(TestValues.MATCH, serviceRecord, TestValues.GENERAL_APPSERVICERECORD); + } - public void testJson(){ - JSONObject reference = new JSONObject(); + public void testJson() { + JSONObject reference = new JSONObject(); - try{ - reference.put(AppServiceCapability.KEY_UPDATE_REASON, TestValues.GENERAL_SERVICE_UPDATE_REASON); - reference.put(AppServiceCapability.KEY_UPDATED_APP_SERVICE_RECORD, TestValues.GENERAL_APPSERVICERECORD); + try { + reference.put(AppServiceCapability.KEY_UPDATE_REASON, TestValues.GENERAL_SERVICE_UPDATE_REASON); + reference.put(AppServiceCapability.KEY_UPDATED_APP_SERVICE_RECORD, TestValues.GENERAL_APPSERVICERECORD); - JSONObject underTest = msg.serializeJSON(); - assertEquals(TestValues.MATCH, reference.length(), underTest.length()); + 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(AppServiceCapability.KEY_UPDATED_APP_SERVICE_RECORD)){ - JSONObject testEquals = (JSONObject) JsonUtils.readObjectFromJsonObject(underTest, key); - Hashtable<String, Object> hashTest = JsonRPCMarshaller.deserializeJSONObject(testEquals); - assertTrue(TestValues.TRUE, Validator.validateAppServiceRecord(TestValues.GENERAL_APPSERVICERECORD, new AppServiceRecord(hashTest))); - } else{ - assertEquals(TestValues.MATCH, JsonUtils.readObjectFromJsonObject(reference, key), JsonUtils.readObjectFromJsonObject(underTest, key)); - } - } - } catch(JSONException e){ - fail(TestValues.JSON_FAIL); - } - } + Iterator<?> iterator = reference.keys(); + while (iterator.hasNext()) { + String key = (String) iterator.next(); + if (key.equals(AppServiceCapability.KEY_UPDATED_APP_SERVICE_RECORD)) { + JSONObject testEquals = (JSONObject) JsonUtils.readObjectFromJsonObject(underTest, key); + Hashtable<String, Object> hashTest = JsonRPCMarshaller.deserializeJSONObject(testEquals); + assertTrue(TestValues.TRUE, Validator.validateAppServiceRecord(TestValues.GENERAL_APPSERVICERECORD, new AppServiceRecord(hashTest))); + } else { + assertEquals(TestValues.MATCH, JsonUtils.readObjectFromJsonObject(reference, key), JsonUtils.readObjectFromJsonObject(underTest, key)); + } + } + } catch (JSONException e) { + fail(TestValues.JSON_FAIL); + } + } - public void testMatchesAppService(){ + public void testMatchesAppService() { - String baseName = "NavTest", baseID = "37F98053AE"; + String baseName = "NavTest", baseID = "37F98053AE"; - AppServiceCapability capability1 = AppServiceFactory.createAppServiceCapability(AppServiceType.NAVIGATION, baseName, baseID, true, null); - AppServiceCapability capability2 = AppServiceFactory.createAppServiceCapability(AppServiceType.NAVIGATION, baseName, baseID, true, null); + AppServiceCapability capability1 = AppServiceFactory.createAppServiceCapability(AppServiceType.NAVIGATION, baseName, baseID, true, null); + AppServiceCapability capability2 = AppServiceFactory.createAppServiceCapability(AppServiceType.NAVIGATION, baseName, baseID, true, null); - assertTrue(capability1.matchesAppService(capability2)); + assertTrue(capability1.matchesAppService(capability2)); - //Remove the service id from record 2 - capability2.getUpdatedAppServiceRecord().setServiceID(null); - assertNull(capability2.getUpdatedAppServiceRecord().getServiceID()); - assertTrue(capability1.matchesAppService(capability2)); + //Remove the service id from record 2 + capability2.getUpdatedAppServiceRecord().setServiceID(null); + assertNull(capability2.getUpdatedAppServiceRecord().getServiceID()); + assertTrue(capability1.matchesAppService(capability2)); - /* UPDATE WITH NEW SERVICE MANIFEST CHANGES */ + /* UPDATE WITH NEW SERVICE MANIFEST CHANGES */ - AppServiceManifest appServiceManifest2 = capability2.getUpdatedAppServiceRecord().getServiceManifest(); + AppServiceManifest appServiceManifest2 = capability2.getUpdatedAppServiceRecord().getServiceManifest(); - List<FunctionID> handledRPCs2 = new ArrayList<>(); - handledRPCs2.add(FunctionID.SEND_LOCATION); - handledRPCs2.add(FunctionID.GET_WAY_POINTS); - appServiceManifest2.setHandledRpcsUsingFunctionIDs(handledRPCs2); - capability2.getUpdatedAppServiceRecord().setServiceManifest(appServiceManifest2); + List<FunctionID> handledRPCs2 = new ArrayList<>(); + handledRPCs2.add(FunctionID.SEND_LOCATION); + handledRPCs2.add(FunctionID.GET_WAY_POINTS); + appServiceManifest2.setHandledRpcsUsingFunctionIDs(handledRPCs2); + capability2.getUpdatedAppServiceRecord().setServiceManifest(appServiceManifest2); - assertTrue(capability1.matchesAppService(capability2)); + assertTrue(capability1.matchesAppService(capability2)); - /* UPDATE WITH NEW SERVICE MANIFEST APP NAME */ - capability2.getUpdatedAppServiceRecord().getServiceManifest().setServiceName("Nav-Test"); - assertFalse(capability1.matchesAppService(capability2)); + /* UPDATE WITH NEW SERVICE MANIFEST APP NAME */ + capability2.getUpdatedAppServiceRecord().getServiceManifest().setServiceName("Nav-Test"); + assertFalse(capability1.matchesAppService(capability2)); - /* UPDATE WITH NEW SERVICE ID */ - //Reset name - capability2.getUpdatedAppServiceRecord().getServiceManifest().setServiceName(baseName); + /* UPDATE WITH NEW SERVICE ID */ + //Reset name + capability2.getUpdatedAppServiceRecord().getServiceManifest().setServiceName(baseName); - capability2.getUpdatedAppServiceRecord().setServiceID("EEEEEEEEEE"); - assertFalse(capability1.matchesAppService(capability2)); - } + capability2.getUpdatedAppServiceRecord().setServiceID("EEEEEEEEEE"); + assertFalse(capability1.matchesAppService(capability2)); + } }
\ No newline at end of file diff --git a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/AppServiceDataTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/AppServiceDataTests.java index d909d0d5d..7e18554c5 100644 --- a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/AppServiceDataTests.java +++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/AppServiceDataTests.java @@ -23,96 +23,96 @@ import java.util.Iterator; */ public class AppServiceDataTests extends TestCase { - private AppServiceData msg; - - @Override - public void setUp() { - - msg = new AppServiceData(); - msg.setServiceType(TestValues.GENERAL_STRING); - msg.setServiceID(TestValues.GENERAL_STRING); - msg.setMediaServiceData(TestValues.GENERAL_MEDIASERVICEDATA); - msg.setWeatherServiceData(TestValues.GENERAL_WEATHERSERVICEDATA); - msg.setNavigationServiceData(TestValues.GENERAL_NAVIGATIONSERVICEDATA); - - } - - /** - * Tests the expected values of the RPC message. - */ - public void testRpcValues () { - // Test Values - String appServiceType = msg.getServiceType(); - String serviceId = msg.getServiceID(); - MediaServiceData mediaServiceData = msg.getMediaServiceData(); - WeatherServiceData weatherServiceData = msg.getWeatherServiceData(); - NavigationServiceData navigationServiceData = msg.getNavigationServiceData(); - - // Valid Tests - assertEquals(TestValues.GENERAL_STRING, appServiceType); - assertEquals(TestValues.GENERAL_STRING, serviceId); - assertEquals(TestValues.GENERAL_MEDIASERVICEDATA, mediaServiceData); - assertEquals(TestValues.GENERAL_WEATHERSERVICEDATA, weatherServiceData); - assertEquals(TestValues.GENERAL_NAVIGATIONSERVICEDATA, navigationServiceData); - - // Invalid/Null Tests - AppServiceData msg = new AppServiceData(); - assertNotNull(TestValues.NOT_NULL, msg); - - assertNull(TestValues.NULL, msg.getServiceType()); - assertNull(TestValues.NULL, msg.getServiceID()); - assertNull(TestValues.NULL, msg.getMediaServiceData()); - assertNull(TestValues.NULL, msg.getWeatherServiceData()); - assertNull(TestValues.NULL, msg.getNavigationServiceData()); - - } - - public void testRequiredParamsConstructor(){ - - msg = new AppServiceData(TestValues.GENERAL_STRING, TestValues.GENERAL_STRING); - String appServiceType = msg.getServiceType(); - String serviceId = msg.getServiceID(); - assertEquals(TestValues.GENERAL_STRING, appServiceType); - assertEquals(TestValues.GENERAL_STRING, serviceId); - - } - - public void testJson(){ - JSONObject reference = new JSONObject(); - - try{ - reference.put(AppServiceData.KEY_SERVICE_TYPE, TestValues.GENERAL_STRING); - reference.put(AppServiceData.KEY_SERVICE_ID, TestValues.GENERAL_STRING); - reference.put(AppServiceData.KEY_MEDIA_SERVICE_DATA, TestValues.GENERAL_MEDIASERVICEDATA); - reference.put(AppServiceData.KEY_WEATHER_SERVICE_DATA, TestValues.GENERAL_WEATHERSERVICEDATA); - reference.put(AppServiceData.KEY_NAVIGATION_SERVICE_DATA, TestValues.GENERAL_NAVIGATIONSERVICEDATA); - - 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(AppServiceData.KEY_MEDIA_SERVICE_DATA)){ - JSONObject testEquals = (JSONObject) JsonUtils.readObjectFromJsonObject(underTest, key); - Hashtable<String, Object> hashTest = JsonRPCMarshaller.deserializeJSONObject(testEquals); - assertTrue(TestValues.TRUE, Validator.validateMediaServiceData(TestValues.GENERAL_MEDIASERVICEDATA, new MediaServiceData(hashTest))); - } else if (key.equals(AppServiceData.KEY_WEATHER_SERVICE_DATA)){ - JSONObject testEquals = (JSONObject) JsonUtils.readObjectFromJsonObject(underTest, key); - Hashtable<String, Object> hashTest = JsonRPCMarshaller.deserializeJSONObject(testEquals); - assertTrue(TestValues.TRUE, Validator.validateWeatherServiceData(TestValues.GENERAL_WEATHERSERVICEDATA, new WeatherServiceData(hashTest))); - } else if (key.equals(AppServiceData.KEY_NAVIGATION_SERVICE_DATA)){ - JSONObject testEquals = (JSONObject) JsonUtils.readObjectFromJsonObject(underTest, key); - Hashtable<String, Object> hashTest = JsonRPCMarshaller.deserializeJSONObject(testEquals); - assertTrue(TestValues.TRUE, Validator.validateNavigationServiceData(TestValues.GENERAL_NAVIGATIONSERVICEDATA, new NavigationServiceData(hashTest))); - } else { - assertEquals(TestValues.MATCH, JsonUtils.readObjectFromJsonObject(reference, key), JsonUtils.readObjectFromJsonObject(underTest, key)); - } - } - } catch(JSONException e){ - fail(TestValues.JSON_FAIL); - } - } + private AppServiceData msg; + + @Override + public void setUp() { + + msg = new AppServiceData(); + msg.setServiceType(TestValues.GENERAL_STRING); + msg.setServiceID(TestValues.GENERAL_STRING); + msg.setMediaServiceData(TestValues.GENERAL_MEDIASERVICEDATA); + msg.setWeatherServiceData(TestValues.GENERAL_WEATHERSERVICEDATA); + msg.setNavigationServiceData(TestValues.GENERAL_NAVIGATIONSERVICEDATA); + + } + + /** + * Tests the expected values of the RPC message. + */ + public void testRpcValues() { + // Test Values + String appServiceType = msg.getServiceType(); + String serviceId = msg.getServiceID(); + MediaServiceData mediaServiceData = msg.getMediaServiceData(); + WeatherServiceData weatherServiceData = msg.getWeatherServiceData(); + NavigationServiceData navigationServiceData = msg.getNavigationServiceData(); + + // Valid Tests + assertEquals(TestValues.GENERAL_STRING, appServiceType); + assertEquals(TestValues.GENERAL_STRING, serviceId); + assertEquals(TestValues.GENERAL_MEDIASERVICEDATA, mediaServiceData); + assertEquals(TestValues.GENERAL_WEATHERSERVICEDATA, weatherServiceData); + assertEquals(TestValues.GENERAL_NAVIGATIONSERVICEDATA, navigationServiceData); + + // Invalid/Null Tests + AppServiceData msg = new AppServiceData(); + assertNotNull(TestValues.NOT_NULL, msg); + + assertNull(TestValues.NULL, msg.getServiceType()); + assertNull(TestValues.NULL, msg.getServiceID()); + assertNull(TestValues.NULL, msg.getMediaServiceData()); + assertNull(TestValues.NULL, msg.getWeatherServiceData()); + assertNull(TestValues.NULL, msg.getNavigationServiceData()); + + } + + public void testRequiredParamsConstructor() { + + msg = new AppServiceData(TestValues.GENERAL_STRING, TestValues.GENERAL_STRING); + String appServiceType = msg.getServiceType(); + String serviceId = msg.getServiceID(); + assertEquals(TestValues.GENERAL_STRING, appServiceType); + assertEquals(TestValues.GENERAL_STRING, serviceId); + + } + + public void testJson() { + JSONObject reference = new JSONObject(); + + try { + reference.put(AppServiceData.KEY_SERVICE_TYPE, TestValues.GENERAL_STRING); + reference.put(AppServiceData.KEY_SERVICE_ID, TestValues.GENERAL_STRING); + reference.put(AppServiceData.KEY_MEDIA_SERVICE_DATA, TestValues.GENERAL_MEDIASERVICEDATA); + reference.put(AppServiceData.KEY_WEATHER_SERVICE_DATA, TestValues.GENERAL_WEATHERSERVICEDATA); + reference.put(AppServiceData.KEY_NAVIGATION_SERVICE_DATA, TestValues.GENERAL_NAVIGATIONSERVICEDATA); + + 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(AppServiceData.KEY_MEDIA_SERVICE_DATA)) { + JSONObject testEquals = (JSONObject) JsonUtils.readObjectFromJsonObject(underTest, key); + Hashtable<String, Object> hashTest = JsonRPCMarshaller.deserializeJSONObject(testEquals); + assertTrue(TestValues.TRUE, Validator.validateMediaServiceData(TestValues.GENERAL_MEDIASERVICEDATA, new MediaServiceData(hashTest))); + } else if (key.equals(AppServiceData.KEY_WEATHER_SERVICE_DATA)) { + JSONObject testEquals = (JSONObject) JsonUtils.readObjectFromJsonObject(underTest, key); + Hashtable<String, Object> hashTest = JsonRPCMarshaller.deserializeJSONObject(testEquals); + assertTrue(TestValues.TRUE, Validator.validateWeatherServiceData(TestValues.GENERAL_WEATHERSERVICEDATA, new WeatherServiceData(hashTest))); + } else if (key.equals(AppServiceData.KEY_NAVIGATION_SERVICE_DATA)) { + JSONObject testEquals = (JSONObject) JsonUtils.readObjectFromJsonObject(underTest, key); + Hashtable<String, Object> hashTest = JsonRPCMarshaller.deserializeJSONObject(testEquals); + assertTrue(TestValues.TRUE, Validator.validateNavigationServiceData(TestValues.GENERAL_NAVIGATIONSERVICEDATA, new NavigationServiceData(hashTest))); + } else { + assertEquals(TestValues.MATCH, JsonUtils.readObjectFromJsonObject(reference, key), JsonUtils.readObjectFromJsonObject(underTest, key)); + } + } + } catch (JSONException e) { + fail(TestValues.JSON_FAIL); + } + } } diff --git a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/AppServiceManifestTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/AppServiceManifestTests.java index 8a9f2b0ff..94b1b799c 100644 --- a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/AppServiceManifestTests.java +++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/AppServiceManifestTests.java @@ -26,123 +26,123 @@ import java.util.List; */ public class AppServiceManifestTests extends TestCase { - private AppServiceManifest msg; - - @Override - public void setUp(){ - - msg = new AppServiceManifest(); - msg.setServiceType(TestValues.GENERAL_STRING); - msg.setAllowAppConsumers(TestValues.GENERAL_BOOLEAN); - msg.setHandledRpcs(TestValues.GENERAL_FUNCTION_ID_LIST); - msg.setMediaServiceManifest(TestValues.GENERAL_MEDIA_SERVICE_MANIFEST); - msg.setRpcSpecVersion(TestValues.GENERAL_SDLMSGVERSION); - msg.setServiceIcon(TestValues.GENERAL_IMAGE); - msg.setServiceName(TestValues.GENERAL_STRING); - msg.setWeatherServiceManifest(TestValues.GENERAL_WEATHER_SERVICE_MANIFEST); - msg.setNavigationServiceManifest(TestValues.GENERAL_NAVIGATION_SERVICE_MANIFEST); - } - - /** - * Tests the expected values of the RPC message. - */ - public void testRpcValues () { - // Test Values - Image serviceIcon = msg.getServiceIcon(); - String serviceName = msg.getServiceName(); - String appServiceType = msg.getServiceType(); - boolean allowAppConsumers = msg.getAllowAppConsumers(); - SdlMsgVersion version = msg.getRpcSpecVersion(); - List<Integer> handledRPCs = msg.getHandledRpcs(); - WeatherServiceManifest weatherServiceManifestTest = msg.getWeatherServiceManifest(); - MediaServiceManifest mediaServiceManifestTest = msg.getMediaServiceManifest(); - NavigationServiceManifest navigationServiceManifest = msg.getNavigationServiceManifest(); - - // Valid Tests - assertEquals(TestValues.GENERAL_BOOLEAN, allowAppConsumers); - assertEquals(TestValues.GENERAL_IMAGE, serviceIcon); - assertEquals(TestValues.GENERAL_STRING, serviceName); - assertEquals(TestValues.GENERAL_STRING, appServiceType); - assertEquals(TestValues.GENERAL_SDLMSGVERSION, version); - assertEquals(TestValues.MATCH, TestValues.GENERAL_FUNCTION_ID_LIST, handledRPCs); - assertEquals(TestValues.GENERAL_WEATHER_SERVICE_MANIFEST, weatherServiceManifestTest); - assertEquals(TestValues.GENERAL_MEDIA_SERVICE_MANIFEST, mediaServiceManifestTest); - assertEquals(TestValues.GENERAL_NAVIGATION_SERVICE_MANIFEST, navigationServiceManifest); - - // Invalid/Null Tests - AppServiceManifest msg = new AppServiceManifest(); - assertNotNull(TestValues.NOT_NULL, msg); - - assertNull(TestValues.NULL, msg.getServiceIcon()); - assertNull(TestValues.NULL, msg.getServiceName()); - assertNull(TestValues.NULL, msg.getServiceType()); - assertNull(TestValues.NULL, msg.getAllowAppConsumers()); - assertNull(TestValues.NULL, msg.getRpcSpecVersion()); - assertNull(TestValues.NULL, msg.getHandledRpcs()); - assertNull(TestValues.NULL, msg.getWeatherServiceManifest()); - assertNull(TestValues.NULL, msg.getMediaServiceManifest()); - assertNull(TestValues.NULL, msg.getNavigationServiceManifest()); - } - - public void testRequiredParamsConstructor(){ - msg = new AppServiceManifest(TestValues.GENERAL_STRING); - String appServiceType = msg.getServiceType(); - assertEquals(TestValues.GENERAL_STRING, appServiceType); - } - - public void testJson(){ - JSONObject reference = new JSONObject(); - - try{ - reference.put(AppServiceManifest.KEY_SERVICE_NAME, TestValues.GENERAL_STRING); - reference.put(AppServiceManifest.KEY_SERVICE_ICON, TestValues.GENERAL_IMAGE); - reference.put(AppServiceManifest.KEY_SERVICE_TYPE, TestValues.GENERAL_STRING); - reference.put(AppServiceManifest.KEY_ALLOW_APP_CONSUMERS, TestValues.GENERAL_BOOLEAN); - reference.put(AppServiceManifest.KEY_RPC_SPEC_VERSION, TestValues.GENERAL_SDLMSGVERSION.serializeJSON()); - reference.put(AppServiceManifest.KEY_HANDLED_RPCS, TestValues.GENERAL_FUNCTION_ID_LIST); - reference.put(AppServiceManifest.KEY_WEATHER_SERVICE_MANIFEST, TestValues.GENERAL_WEATHER_SERVICE_MANIFEST); - reference.put(AppServiceManifest.KEY_MEDIA_SERVICE_MANIFEST, TestValues.GENERAL_MEDIA_SERVICE_MANIFEST); - reference.put(AppServiceManifest.KEY_NAVIGATION_SERVICE_MANIFEST, TestValues.GENERAL_NAVIGATION_SERVICE_MANIFEST); - - 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(AppServiceManifest.KEY_RPC_SPEC_VERSION)){ - JSONObject objectEquals = (JSONObject) JsonUtils.readObjectFromJsonObject(reference, key); - JSONObject testEquals = (JSONObject) JsonUtils.readObjectFromJsonObject(underTest, key); - Hashtable<String, Object> hashReference = JsonRPCMarshaller.deserializeJSONObject(objectEquals); - Hashtable<String, Object> hashTest = JsonRPCMarshaller.deserializeJSONObject(testEquals); - assertTrue(TestValues.TRUE, Validator.validateSdlMsgVersion( new SdlMsgVersion(hashReference), new SdlMsgVersion(hashTest))); - }else if(key.equals(AppServiceManifest.KEY_HANDLED_RPCS)){ - List<Integer> list1 = TestValues.GENERAL_FUNCTION_ID_LIST; - List<Integer> list2 = JsonUtils.readIntegerListFromJsonObject(underTest, key); - assertTrue(TestValues.TRUE, Validator.validateIntegerList(list1,list2)); - }else if(key.equals(AppServiceManifest.KEY_WEATHER_SERVICE_MANIFEST)){ - JSONObject testEquals = (JSONObject) JsonUtils.readObjectFromJsonObject(underTest, key); - Hashtable<String, Object> hashTest = JsonRPCMarshaller.deserializeJSONObject(testEquals); - assertTrue(TestValues.TRUE, Validator.validateWeatherServiceManifest( TestValues.GENERAL_WEATHER_SERVICE_MANIFEST, new WeatherServiceManifest(hashTest))); - }else if(key.equals(AppServiceManifest.KEY_MEDIA_SERVICE_MANIFEST)){ - JSONObject testEquals = (JSONObject) JsonUtils.readObjectFromJsonObject(underTest, key); - Hashtable<String, Object> hashTest = JsonRPCMarshaller.deserializeJSONObject(testEquals); - assertTrue(TestValues.TRUE, Validator.validateMediaServiceManifest( TestValues.GENERAL_MEDIA_SERVICE_MANIFEST, new MediaServiceManifest(hashTest))); - } else if(key.equals(AppServiceManifest.KEY_NAVIGATION_SERVICE_MANIFEST)){ - JSONObject testEquals = (JSONObject) JsonUtils.readObjectFromJsonObject(underTest, key); - Hashtable<String, Object> hashTest = JsonRPCMarshaller.deserializeJSONObject(testEquals); - assertTrue(TestValues.TRUE, Validator.validateNavigationServiceManifest( TestValues.GENERAL_NAVIGATION_SERVICE_MANIFEST, new NavigationServiceManifest(hashTest))); - }else if(key.equals(AppServiceManifest.KEY_SERVICE_ICON)){ - JSONObject testEquals = (JSONObject) JsonUtils.readObjectFromJsonObject(underTest, key); - Image refIcon1 = new Image(JsonRPCMarshaller.deserializeJSONObject(testEquals)); - assertTrue(TestValues.TRUE, Validator.validateImage(refIcon1, msg.getServiceIcon())); - }else { - assertEquals(TestValues.MATCH, JsonUtils.readObjectFromJsonObject(reference, key), JsonUtils.readObjectFromJsonObject(underTest, key)); - } - } - } catch(JSONException e){ - fail(TestValues.JSON_FAIL); - } - } + private AppServiceManifest msg; + + @Override + public void setUp() { + + msg = new AppServiceManifest(); + msg.setServiceType(TestValues.GENERAL_STRING); + msg.setAllowAppConsumers(TestValues.GENERAL_BOOLEAN); + msg.setHandledRpcs(TestValues.GENERAL_FUNCTION_ID_LIST); + msg.setMediaServiceManifest(TestValues.GENERAL_MEDIA_SERVICE_MANIFEST); + msg.setRpcSpecVersion(TestValues.GENERAL_SDLMSGVERSION); + msg.setServiceIcon(TestValues.GENERAL_IMAGE); + msg.setServiceName(TestValues.GENERAL_STRING); + msg.setWeatherServiceManifest(TestValues.GENERAL_WEATHER_SERVICE_MANIFEST); + msg.setNavigationServiceManifest(TestValues.GENERAL_NAVIGATION_SERVICE_MANIFEST); + } + + /** + * Tests the expected values of the RPC message. + */ + public void testRpcValues() { + // Test Values + Image serviceIcon = msg.getServiceIcon(); + String serviceName = msg.getServiceName(); + String appServiceType = msg.getServiceType(); + boolean allowAppConsumers = msg.getAllowAppConsumers(); + SdlMsgVersion version = msg.getRpcSpecVersion(); + List<Integer> handledRPCs = msg.getHandledRpcs(); + WeatherServiceManifest weatherServiceManifestTest = msg.getWeatherServiceManifest(); + MediaServiceManifest mediaServiceManifestTest = msg.getMediaServiceManifest(); + NavigationServiceManifest navigationServiceManifest = msg.getNavigationServiceManifest(); + + // Valid Tests + assertEquals(TestValues.GENERAL_BOOLEAN, allowAppConsumers); + assertEquals(TestValues.GENERAL_IMAGE, serviceIcon); + assertEquals(TestValues.GENERAL_STRING, serviceName); + assertEquals(TestValues.GENERAL_STRING, appServiceType); + assertEquals(TestValues.GENERAL_SDLMSGVERSION, version); + assertEquals(TestValues.MATCH, TestValues.GENERAL_FUNCTION_ID_LIST, handledRPCs); + assertEquals(TestValues.GENERAL_WEATHER_SERVICE_MANIFEST, weatherServiceManifestTest); + assertEquals(TestValues.GENERAL_MEDIA_SERVICE_MANIFEST, mediaServiceManifestTest); + assertEquals(TestValues.GENERAL_NAVIGATION_SERVICE_MANIFEST, navigationServiceManifest); + + // Invalid/Null Tests + AppServiceManifest msg = new AppServiceManifest(); + assertNotNull(TestValues.NOT_NULL, msg); + + assertNull(TestValues.NULL, msg.getServiceIcon()); + assertNull(TestValues.NULL, msg.getServiceName()); + assertNull(TestValues.NULL, msg.getServiceType()); + assertNull(TestValues.NULL, msg.getAllowAppConsumers()); + assertNull(TestValues.NULL, msg.getRpcSpecVersion()); + assertNull(TestValues.NULL, msg.getHandledRpcs()); + assertNull(TestValues.NULL, msg.getWeatherServiceManifest()); + assertNull(TestValues.NULL, msg.getMediaServiceManifest()); + assertNull(TestValues.NULL, msg.getNavigationServiceManifest()); + } + + public void testRequiredParamsConstructor() { + msg = new AppServiceManifest(TestValues.GENERAL_STRING); + String appServiceType = msg.getServiceType(); + assertEquals(TestValues.GENERAL_STRING, appServiceType); + } + + public void testJson() { + JSONObject reference = new JSONObject(); + + try { + reference.put(AppServiceManifest.KEY_SERVICE_NAME, TestValues.GENERAL_STRING); + reference.put(AppServiceManifest.KEY_SERVICE_ICON, TestValues.GENERAL_IMAGE); + reference.put(AppServiceManifest.KEY_SERVICE_TYPE, TestValues.GENERAL_STRING); + reference.put(AppServiceManifest.KEY_ALLOW_APP_CONSUMERS, TestValues.GENERAL_BOOLEAN); + reference.put(AppServiceManifest.KEY_RPC_SPEC_VERSION, TestValues.GENERAL_SDLMSGVERSION.serializeJSON()); + reference.put(AppServiceManifest.KEY_HANDLED_RPCS, TestValues.GENERAL_FUNCTION_ID_LIST); + reference.put(AppServiceManifest.KEY_WEATHER_SERVICE_MANIFEST, TestValues.GENERAL_WEATHER_SERVICE_MANIFEST); + reference.put(AppServiceManifest.KEY_MEDIA_SERVICE_MANIFEST, TestValues.GENERAL_MEDIA_SERVICE_MANIFEST); + reference.put(AppServiceManifest.KEY_NAVIGATION_SERVICE_MANIFEST, TestValues.GENERAL_NAVIGATION_SERVICE_MANIFEST); + + 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(AppServiceManifest.KEY_RPC_SPEC_VERSION)) { + JSONObject objectEquals = (JSONObject) JsonUtils.readObjectFromJsonObject(reference, key); + JSONObject testEquals = (JSONObject) JsonUtils.readObjectFromJsonObject(underTest, key); + Hashtable<String, Object> hashReference = JsonRPCMarshaller.deserializeJSONObject(objectEquals); + Hashtable<String, Object> hashTest = JsonRPCMarshaller.deserializeJSONObject(testEquals); + assertTrue(TestValues.TRUE, Validator.validateSdlMsgVersion(new SdlMsgVersion(hashReference), new SdlMsgVersion(hashTest))); + } else if (key.equals(AppServiceManifest.KEY_HANDLED_RPCS)) { + List<Integer> list1 = TestValues.GENERAL_FUNCTION_ID_LIST; + List<Integer> list2 = JsonUtils.readIntegerListFromJsonObject(underTest, key); + assertTrue(TestValues.TRUE, Validator.validateIntegerList(list1, list2)); + } else if (key.equals(AppServiceManifest.KEY_WEATHER_SERVICE_MANIFEST)) { + JSONObject testEquals = (JSONObject) JsonUtils.readObjectFromJsonObject(underTest, key); + Hashtable<String, Object> hashTest = JsonRPCMarshaller.deserializeJSONObject(testEquals); + assertTrue(TestValues.TRUE, Validator.validateWeatherServiceManifest(TestValues.GENERAL_WEATHER_SERVICE_MANIFEST, new WeatherServiceManifest(hashTest))); + } else if (key.equals(AppServiceManifest.KEY_MEDIA_SERVICE_MANIFEST)) { + JSONObject testEquals = (JSONObject) JsonUtils.readObjectFromJsonObject(underTest, key); + Hashtable<String, Object> hashTest = JsonRPCMarshaller.deserializeJSONObject(testEquals); + assertTrue(TestValues.TRUE, Validator.validateMediaServiceManifest(TestValues.GENERAL_MEDIA_SERVICE_MANIFEST, new MediaServiceManifest(hashTest))); + } else if (key.equals(AppServiceManifest.KEY_NAVIGATION_SERVICE_MANIFEST)) { + JSONObject testEquals = (JSONObject) JsonUtils.readObjectFromJsonObject(underTest, key); + Hashtable<String, Object> hashTest = JsonRPCMarshaller.deserializeJSONObject(testEquals); + assertTrue(TestValues.TRUE, Validator.validateNavigationServiceManifest(TestValues.GENERAL_NAVIGATION_SERVICE_MANIFEST, new NavigationServiceManifest(hashTest))); + } else if (key.equals(AppServiceManifest.KEY_SERVICE_ICON)) { + JSONObject testEquals = (JSONObject) JsonUtils.readObjectFromJsonObject(underTest, key); + Image refIcon1 = new Image(JsonRPCMarshaller.deserializeJSONObject(testEquals)); + assertTrue(TestValues.TRUE, Validator.validateImage(refIcon1, msg.getServiceIcon())); + } else { + assertEquals(TestValues.MATCH, JsonUtils.readObjectFromJsonObject(reference, key), JsonUtils.readObjectFromJsonObject(underTest, key)); + } + } + } catch (JSONException e) { + fail(TestValues.JSON_FAIL); + } + } }
\ No newline at end of file diff --git a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/AppServiceRecordTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/AppServiceRecordTests.java index c8c70f0de..af0b20f91 100644 --- a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/AppServiceRecordTests.java +++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/AppServiceRecordTests.java @@ -21,87 +21,87 @@ import java.util.Iterator; */ public class AppServiceRecordTests extends TestCase { - private AppServiceRecord msg; - - @Override - public void setUp(){ - - msg = new AppServiceRecord(); - msg.setServicePublished(TestValues.GENERAL_BOOLEAN); - msg.setServiceActive(TestValues.GENERAL_BOOLEAN); - msg.setServiceManifest(TestValues.GENERAL_APPSERVICEMANIFEST); - msg.setServiceID(TestValues.GENERAL_STRING); - - } - - /** - * Tests the expected values of the RPC message. - */ - public void testRpcValues () { - // Test Values - - boolean isServicePublished = msg.getServicePublished(); - boolean isServiceActive = msg.getServiceActive(); - AppServiceManifest serviceManifest = msg.getServiceManifest(); - String serviceID = msg.getServiceID(); - - // Valid Tests - assertEquals(TestValues.GENERAL_BOOLEAN, isServicePublished); - assertEquals(TestValues.GENERAL_BOOLEAN, isServiceActive); - assertEquals(TestValues.GENERAL_APPSERVICEMANIFEST, serviceManifest); - assertEquals(TestValues.GENERAL_STRING, serviceID); - - // Invalid/Null Tests - AppServiceRecord msg = new AppServiceRecord(); - assertNotNull(TestValues.NOT_NULL, msg); - - assertNull(TestValues.NULL, msg.getServicePublished()); - assertNull(TestValues.NULL, msg.getServiceActive()); - assertNull(TestValues.NULL, msg.getServiceManifest()); - assertNull(TestValues.NULL, msg.getServiceID()); - } - - public void testRequiredParamsConstructor(){ - msg = new AppServiceRecord(TestValues.GENERAL_STRING, TestValues.GENERAL_APPSERVICEMANIFEST, TestValues.GENERAL_BOOLEAN, TestValues.GENERAL_BOOLEAN); - - boolean isServicePublished = msg.getServicePublished(); - boolean isServiceActive = msg.getServiceActive(); - AppServiceManifest serviceManifest = msg.getServiceManifest(); - String serviceID = msg.getServiceID(); - - // Valid Tests - assertEquals(TestValues.GENERAL_BOOLEAN, isServicePublished); - assertEquals(TestValues.GENERAL_BOOLEAN, isServiceActive); - assertEquals(TestValues.GENERAL_APPSERVICEMANIFEST, serviceManifest); - assertEquals(TestValues.GENERAL_STRING, serviceID); - } - - public void testJson(){ - JSONObject reference = new JSONObject(); - - try{ - reference.put(AppServiceRecord.KEY_SERVICE_ACTIVE, TestValues.GENERAL_BOOLEAN); - reference.put(AppServiceRecord.KEY_SERVICE_PUBLISHED, TestValues.GENERAL_BOOLEAN); - reference.put(AppServiceRecord.KEY_SERVICE_ID, TestValues.GENERAL_STRING); - reference.put(AppServiceRecord.KEY_SERVICE_MANIFEST, TestValues.GENERAL_APPSERVICEMANIFEST); - - 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(AppServiceRecord.KEY_SERVICE_MANIFEST)){ - JSONObject testEquals = (JSONObject) JsonUtils.readObjectFromJsonObject(underTest, key); - Hashtable<String, Object> hashTest = JsonRPCMarshaller.deserializeJSONObject(testEquals); - assertTrue(TestValues.TRUE, Validator.validateAppServiceManifest( TestValues.GENERAL_APPSERVICEMANIFEST, new AppServiceManifest(hashTest))); - }else { - assertEquals(TestValues.MATCH, JsonUtils.readObjectFromJsonObject(reference, key), JsonUtils.readObjectFromJsonObject(underTest, key)); - } - } - } catch(JSONException e){ - fail(TestValues.JSON_FAIL); - } - } + private AppServiceRecord msg; + + @Override + public void setUp() { + + msg = new AppServiceRecord(); + msg.setServicePublished(TestValues.GENERAL_BOOLEAN); + msg.setServiceActive(TestValues.GENERAL_BOOLEAN); + msg.setServiceManifest(TestValues.GENERAL_APPSERVICEMANIFEST); + msg.setServiceID(TestValues.GENERAL_STRING); + + } + + /** + * Tests the expected values of the RPC message. + */ + public void testRpcValues() { + // Test Values + + boolean isServicePublished = msg.getServicePublished(); + boolean isServiceActive = msg.getServiceActive(); + AppServiceManifest serviceManifest = msg.getServiceManifest(); + String serviceID = msg.getServiceID(); + + // Valid Tests + assertEquals(TestValues.GENERAL_BOOLEAN, isServicePublished); + assertEquals(TestValues.GENERAL_BOOLEAN, isServiceActive); + assertEquals(TestValues.GENERAL_APPSERVICEMANIFEST, serviceManifest); + assertEquals(TestValues.GENERAL_STRING, serviceID); + + // Invalid/Null Tests + AppServiceRecord msg = new AppServiceRecord(); + assertNotNull(TestValues.NOT_NULL, msg); + + assertNull(TestValues.NULL, msg.getServicePublished()); + assertNull(TestValues.NULL, msg.getServiceActive()); + assertNull(TestValues.NULL, msg.getServiceManifest()); + assertNull(TestValues.NULL, msg.getServiceID()); + } + + public void testRequiredParamsConstructor() { + msg = new AppServiceRecord(TestValues.GENERAL_STRING, TestValues.GENERAL_APPSERVICEMANIFEST, TestValues.GENERAL_BOOLEAN, TestValues.GENERAL_BOOLEAN); + + boolean isServicePublished = msg.getServicePublished(); + boolean isServiceActive = msg.getServiceActive(); + AppServiceManifest serviceManifest = msg.getServiceManifest(); + String serviceID = msg.getServiceID(); + + // Valid Tests + assertEquals(TestValues.GENERAL_BOOLEAN, isServicePublished); + assertEquals(TestValues.GENERAL_BOOLEAN, isServiceActive); + assertEquals(TestValues.GENERAL_APPSERVICEMANIFEST, serviceManifest); + assertEquals(TestValues.GENERAL_STRING, serviceID); + } + + public void testJson() { + JSONObject reference = new JSONObject(); + + try { + reference.put(AppServiceRecord.KEY_SERVICE_ACTIVE, TestValues.GENERAL_BOOLEAN); + reference.put(AppServiceRecord.KEY_SERVICE_PUBLISHED, TestValues.GENERAL_BOOLEAN); + reference.put(AppServiceRecord.KEY_SERVICE_ID, TestValues.GENERAL_STRING); + reference.put(AppServiceRecord.KEY_SERVICE_MANIFEST, TestValues.GENERAL_APPSERVICEMANIFEST); + + 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(AppServiceRecord.KEY_SERVICE_MANIFEST)) { + JSONObject testEquals = (JSONObject) JsonUtils.readObjectFromJsonObject(underTest, key); + Hashtable<String, Object> hashTest = JsonRPCMarshaller.deserializeJSONObject(testEquals); + assertTrue(TestValues.TRUE, Validator.validateAppServiceManifest(TestValues.GENERAL_APPSERVICEMANIFEST, new AppServiceManifest(hashTest))); + } else { + assertEquals(TestValues.MATCH, JsonUtils.readObjectFromJsonObject(reference, key), JsonUtils.readObjectFromJsonObject(underTest, key)); + } + } + } catch (JSONException e) { + fail(TestValues.JSON_FAIL); + } + } }
\ No newline at end of file diff --git a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/AppServicesCapabilitiesTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/AppServicesCapabilitiesTests.java index f39df464a..f9195f85d 100644 --- a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/AppServicesCapabilitiesTests.java +++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/AppServicesCapabilitiesTests.java @@ -25,119 +25,119 @@ import java.util.List; */ public class AppServicesCapabilitiesTests extends TestCase { - private AppServicesCapabilities msg; + private AppServicesCapabilities msg; - @Override - public void setUp(){ + @Override + public void setUp() { - msg = new AppServicesCapabilities(); - msg.setAppServices(TestValues.GENERAL_APPSERVICECAPABILITY_LIST); - } + msg = new AppServicesCapabilities(); + msg.setAppServices(TestValues.GENERAL_APPSERVICECAPABILITY_LIST); + } - /** - * Tests the expected values of the RPC message. - */ - public void testRpcValues () { - // Test Values - List<AppServiceCapability> serviceCapabilityList = msg.getAppServices(); + /** + * Tests the expected values of the RPC message. + */ + public void testRpcValues() { + // Test Values + List<AppServiceCapability> serviceCapabilityList = msg.getAppServices(); - // Valid Tests - assertEquals(TestValues.MATCH, serviceCapabilityList, TestValues.GENERAL_APPSERVICECAPABILITY_LIST); + // Valid Tests + assertEquals(TestValues.MATCH, serviceCapabilityList, TestValues.GENERAL_APPSERVICECAPABILITY_LIST); - // Invalid/Null Tests - AppServicesCapabilities msg = new AppServicesCapabilities(); - assertNotNull(TestValues.NOT_NULL, msg); + // Invalid/Null Tests + AppServicesCapabilities msg = new AppServicesCapabilities(); + assertNotNull(TestValues.NOT_NULL, msg); - assertNull(TestValues.NULL, msg.getAppServices()); - } + assertNull(TestValues.NULL, msg.getAppServices()); + } - public void testJson(){ - JSONObject reference = new JSONObject(); + public void testJson() { + JSONObject reference = new JSONObject(); - try{ - reference.put(AppServicesCapabilities.KEY_APP_SERVICES, TestValues.GENERAL_APPSERVICETYPE_LIST); + try { + reference.put(AppServicesCapabilities.KEY_APP_SERVICES, TestValues.GENERAL_APPSERVICETYPE_LIST); - JSONObject underTest = msg.serializeJSON(); - assertEquals(TestValues.MATCH, reference.length(), underTest.length()); + 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(AppServicesCapabilities.KEY_APP_SERVICES)) { - List<AppServiceCapability> list1 = TestValues.GENERAL_APPSERVICECAPABILITY_LIST; - List<AppServiceCapability> list2 = JsonUtils.readAppServiceCapabilityListFromJsonObject(underTest, key); - assertTrue(TestValues.TRUE, Validator.validateAppServiceCapabilityList(list1,list2)); - }else{ - assertEquals(TestValues.MATCH, JsonUtils.readObjectFromJsonObject(reference, key), JsonUtils.readObjectFromJsonObject(underTest, key)); - } - } - } catch(JSONException e){ - fail(TestValues.JSON_FAIL); - } - } + Iterator<?> iterator = reference.keys(); + while (iterator.hasNext()) { + String key = (String) iterator.next(); + if (key.equals(AppServicesCapabilities.KEY_APP_SERVICES)) { + List<AppServiceCapability> list1 = TestValues.GENERAL_APPSERVICECAPABILITY_LIST; + List<AppServiceCapability> list2 = JsonUtils.readAppServiceCapabilityListFromJsonObject(underTest, key); + assertTrue(TestValues.TRUE, Validator.validateAppServiceCapabilityList(list1, list2)); + } else { + assertEquals(TestValues.MATCH, JsonUtils.readObjectFromJsonObject(reference, key), JsonUtils.readObjectFromJsonObject(underTest, key)); + } + } + } catch (JSONException e) { + fail(TestValues.JSON_FAIL); + } + } - public void testUpdate(){ - String baseName = "NavTest", baseID = "37F98053AE"; - AppServiceCapability capability1 = AppServiceFactory.createAppServiceCapability(AppServiceType.NAVIGATION, baseName, null, true, null); - AppServicesCapabilities capabilities1 = new AppServicesCapabilities(); - capabilities1.setAppServices(Collections.singletonList(capability1)); + public void testUpdate() { + String baseName = "NavTest", baseID = "37F98053AE"; + AppServiceCapability capability1 = AppServiceFactory.createAppServiceCapability(AppServiceType.NAVIGATION, baseName, null, true, null); + AppServicesCapabilities capabilities1 = new AppServicesCapabilities(); + capabilities1.setAppServices(Collections.singletonList(capability1)); - assertNotNull(capabilities1.getAppServices()); - assertEquals(capabilities1.getAppServices().size(), 1); - /* TEST TO ENSURE A THE RECORD HAS THE CORRECT "NULL" VALUE FOR SERVICE ID */ - assertNull(capabilities1.getAppServices().get(0).getUpdatedAppServiceRecord().getServiceID()); + assertNotNull(capabilities1.getAppServices()); + assertEquals(capabilities1.getAppServices().size(), 1); + /* TEST TO ENSURE A THE RECORD HAS THE CORRECT "NULL" VALUE FOR SERVICE ID */ + assertNull(capabilities1.getAppServices().get(0).getUpdatedAppServiceRecord().getServiceID()); - /* TEST TO ENSURE THAT THE LIST DOES NOT GET UPDATED FOR NULL OR EMPTY LISTS */ - assertFalse(capabilities1.updateAppServices(null)); - assertFalse(capabilities1.updateAppServices(new ArrayList<AppServiceCapability>())); + /* TEST TO ENSURE THAT THE LIST DOES NOT GET UPDATED FOR NULL OR EMPTY LISTS */ + assertFalse(capabilities1.updateAppServices(null)); + assertFalse(capabilities1.updateAppServices(new ArrayList<AppServiceCapability>())); - AppServiceCapability capability2 = AppServiceFactory.createAppServiceCapability(AppServiceType.NAVIGATION, baseName, baseID, true, null); + AppServiceCapability capability2 = AppServiceFactory.createAppServiceCapability(AppServiceType.NAVIGATION, baseName, baseID, true, null); - /* TEST TO ENSURE A THE LIST BEING STORED WAS MODIFIED */ - assertTrue(capabilities1.updateAppServices(Collections.singletonList(capability2))); + /* TEST TO ENSURE A THE LIST BEING STORED WAS MODIFIED */ + assertTrue(capabilities1.updateAppServices(Collections.singletonList(capability2))); - /* TEST TO ENSURE A NEW RECORD WAS NOT ADDED */ - assertEquals(capabilities1.getAppServices().size(), 1); + /* TEST TO ENSURE A NEW RECORD WAS NOT ADDED */ + assertEquals(capabilities1.getAppServices().size(), 1); - assertTrue(capabilities1.getAppServices().get(0).getUpdatedAppServiceRecord().getServiceID().equals(baseID)); + assertTrue(capabilities1.getAppServices().get(0).getUpdatedAppServiceRecord().getServiceID().equals(baseID)); - AppServiceCapability capability3 = AppServiceFactory.createAppServiceCapability(AppServiceType.NAVIGATION, "NewNav", null, true, null); + AppServiceCapability capability3 = AppServiceFactory.createAppServiceCapability(AppServiceType.NAVIGATION, "NewNav", null, true, null); - /* TEST TO ENSURE A THE LIST BEING STORED WAS MODIFIED */ - assertTrue(capabilities1.updateAppServices(Collections.singletonList(capability3))); + /* TEST TO ENSURE A THE LIST BEING STORED WAS MODIFIED */ + assertTrue(capabilities1.updateAppServices(Collections.singletonList(capability3))); - /* TEST TO ENSURE A NEW RECORD WAS ADDED */ - assertEquals(capabilities1.getAppServices().size(), 2); + /* TEST TO ENSURE A NEW RECORD WAS ADDED */ + assertEquals(capabilities1.getAppServices().size(), 2); - AppServiceCapability capability4 = AppServiceFactory.createAppServiceCapability(AppServiceType.NAVIGATION, "NewNav", "eeeeeeeee", true, null); + AppServiceCapability capability4 = AppServiceFactory.createAppServiceCapability(AppServiceType.NAVIGATION, "NewNav", "eeeeeeeee", true, null); - /* TEST TO ENSURE A THE LIST BEING STORED WAS MODIFIED */ - assertTrue(capabilities1.updateAppServices(Collections.singletonList(capability4))); + /* TEST TO ENSURE A THE LIST BEING STORED WAS MODIFIED */ + assertTrue(capabilities1.updateAppServices(Collections.singletonList(capability4))); - /* TEST TO ENSURE A NEW RECORD WAS NOT ADDED */ - assertEquals(capabilities1.getAppServices().size(), 2); + /* TEST TO ENSURE A NEW RECORD WAS NOT ADDED */ + assertEquals(capabilities1.getAppServices().size(), 2); - AppServiceCapability capability5 = AppServiceFactory.createAppServiceCapability(AppServiceType.NAVIGATION, "NewNav", "fffffff", true, null); + AppServiceCapability capability5 = AppServiceFactory.createAppServiceCapability(AppServiceType.NAVIGATION, "NewNav", "fffffff", true, null); - /* TEST TO ENSURE A THE LIST BEING STORED WAS MODIFIED */ - assertTrue(capabilities1.updateAppServices(Collections.singletonList(capability5))); + /* TEST TO ENSURE A THE LIST BEING STORED WAS MODIFIED */ + assertTrue(capabilities1.updateAppServices(Collections.singletonList(capability5))); - /* TEST TO ENSURE A NEW RECORD WAS NOT ADDED */ - assertEquals(capabilities1.getAppServices().size(), 3); + /* TEST TO ENSURE A NEW RECORD WAS NOT ADDED */ + assertEquals(capabilities1.getAppServices().size(), 3); - capability5.setUpdateReason(ServiceUpdateReason.REMOVED); + capability5.setUpdateReason(ServiceUpdateReason.REMOVED); - /* TEST TO ENSURE A THE LIST BEING STORED WAS MODIFIED */ - assertTrue(capabilities1.updateAppServices(Collections.singletonList(capability5))); + /* TEST TO ENSURE A THE LIST BEING STORED WAS MODIFIED */ + assertTrue(capabilities1.updateAppServices(Collections.singletonList(capability5))); - /* TEST TO ENSURE THE RECORD WAS REMOVED */ - assertEquals(capabilities1.getAppServices().size(), 2); + /* TEST TO ENSURE THE RECORD WAS REMOVED */ + assertEquals(capabilities1.getAppServices().size(), 2); - /* TEST TO ENSURE THE RECORD REMOVED WAS THE CORRECT ONE */ - assertFalse(capabilities1.getAppServices().contains(capability5)); + /* TEST TO ENSURE THE RECORD REMOVED WAS THE CORRECT ONE */ + assertFalse(capabilities1.getAppServices().contains(capability5)); - } + } }
\ No newline at end of file diff --git a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/AudioControlCapabilitiesTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/AudioControlCapabilitiesTests.java index 905c568c9..cf2b88604 100644 --- a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/AudioControlCapabilitiesTests.java +++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/AudioControlCapabilitiesTests.java @@ -21,89 +21,89 @@ import java.util.Iterator; */ public class AudioControlCapabilitiesTests extends TestCase { - private AudioControlCapabilities msg; - - @Override - public void setUp() { - msg = new AudioControlCapabilities(); - - msg.setModuleName(TestValues.GENERAL_STRING); - msg.setSourceAvailable(TestValues.GENERAL_BOOLEAN); - msg.setKeepContextAvailable(TestValues.GENERAL_BOOLEAN); - msg.setVolumeAvailable(TestValues.GENERAL_BOOLEAN); - msg.setEqualizerAvailable(TestValues.GENERAL_BOOLEAN); - msg.setVolumeAvailable(TestValues.GENERAL_BOOLEAN); - msg.setEqualizerMaxChannelId(TestValues.GENERAL_INT); - msg.setModuleInfo(TestValues.GENERAL_MODULE_INFO); - } - - /** - * Tests the expected values of the RPC message. - */ - public void testRpcValues() { - // Test Values - - String moduleName = msg.getModuleName(); - Boolean sourceAvailable = msg.getSourceAvailable(); - Boolean keepContextAvailable = msg.getKeepContextAvailable(); - Boolean volumeAvailable = msg.getVolumeAvailable(); - Boolean equalizerAvailable = msg.getEqualizerAvailable(); - int equalizerMaxChannelId = msg.getEqualizerMaxChannelId(); - ModuleInfo info = msg.getModuleInfo(); - - // Valid Tests - assertEquals(TestValues.MATCH, TestValues.GENERAL_STRING, moduleName); - assertEquals(TestValues.MATCH, TestValues.GENERAL_BOOLEAN, (boolean) sourceAvailable); - assertEquals(TestValues.MATCH, TestValues.GENERAL_BOOLEAN, (boolean) keepContextAvailable); - assertEquals(TestValues.MATCH, TestValues.GENERAL_BOOLEAN, (boolean) volumeAvailable); - assertEquals(TestValues.MATCH, TestValues.GENERAL_BOOLEAN, (boolean) equalizerAvailable); - assertEquals(TestValues.MATCH, TestValues.GENERAL_INT, equalizerMaxChannelId); - assertEquals(TestValues.MATCH, TestValues.GENERAL_MODULE_INFO, info); - - // Invalid/Null Tests - AudioControlCapabilities msg = new AudioControlCapabilities(); - assertNotNull(TestValues.NOT_NULL, msg); - - assertNull(TestValues.NULL, msg.getModuleName()); - assertNull(TestValues.NULL, msg.getSourceAvailable()); - assertNull(TestValues.NULL, msg.getKeepContextAvailable()); - assertNull(TestValues.NULL, msg.getVolumeAvailable()); - assertNull(TestValues.NULL, msg.getEqualizerAvailable()); - assertNull(TestValues.NULL, msg.getEqualizerMaxChannelId()); - assertNull(TestValues.NULL, msg.getModuleInfo()); - } - - public void testJson() { - JSONObject reference = new JSONObject(); - - try { - - reference.put(AudioControlCapabilities.KEY_MODULE_NAME, TestValues.GENERAL_STRING); - reference.put(AudioControlCapabilities.KEY_SOURCE_AVAILABLE, TestValues.GENERAL_BOOLEAN); - reference.put(AudioControlCapabilities.KEY_KEEP_CONTEXT_AVAILABLE, TestValues.GENERAL_BOOLEAN); - reference.put(AudioControlCapabilities.KEY_VOLUME_AVAILABLE, TestValues.GENERAL_BOOLEAN); - reference.put(AudioControlCapabilities.KEY_EQUALIZER_AVAILABLE, TestValues.GENERAL_BOOLEAN); - reference.put(AudioControlCapabilities.KEY_EQUALIZER_MAX_CHANNEL_ID, TestValues.GENERAL_INT); - reference.put(AudioControlCapabilities.KEY_MODULE_INFO, TestValues.JSON_MODULE_INFO); - - 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(AudioControlCapabilities.KEY_MODULE_INFO)) { - JSONObject o1 = (JSONObject) JsonUtils.readObjectFromJsonObject(reference, key); - JSONObject o2 = (JSONObject) JsonUtils.readObjectFromJsonObject(underTest, key); - Hashtable<String, Object> h1 = JsonRPCMarshaller.deserializeJSONObject(o1); - Hashtable<String, Object> h2 = JsonRPCMarshaller.deserializeJSONObject(o2); - assertTrue(TestValues.TRUE, Validator.validateModuleInfo(new ModuleInfo(h1), new ModuleInfo(h2))); - } else { - assertEquals(TestValues.MATCH, JsonUtils.readObjectFromJsonObject(reference, key), JsonUtils.readObjectFromJsonObject(underTest, key)); - } - } - } catch (JSONException e) { - fail(TestValues.JSON_FAIL); - } - } + private AudioControlCapabilities msg; + + @Override + public void setUp() { + msg = new AudioControlCapabilities(); + + msg.setModuleName(TestValues.GENERAL_STRING); + msg.setSourceAvailable(TestValues.GENERAL_BOOLEAN); + msg.setKeepContextAvailable(TestValues.GENERAL_BOOLEAN); + msg.setVolumeAvailable(TestValues.GENERAL_BOOLEAN); + msg.setEqualizerAvailable(TestValues.GENERAL_BOOLEAN); + msg.setVolumeAvailable(TestValues.GENERAL_BOOLEAN); + msg.setEqualizerMaxChannelId(TestValues.GENERAL_INT); + msg.setModuleInfo(TestValues.GENERAL_MODULE_INFO); + } + + /** + * Tests the expected values of the RPC message. + */ + public void testRpcValues() { + // Test Values + + String moduleName = msg.getModuleName(); + Boolean sourceAvailable = msg.getSourceAvailable(); + Boolean keepContextAvailable = msg.getKeepContextAvailable(); + Boolean volumeAvailable = msg.getVolumeAvailable(); + Boolean equalizerAvailable = msg.getEqualizerAvailable(); + int equalizerMaxChannelId = msg.getEqualizerMaxChannelId(); + ModuleInfo info = msg.getModuleInfo(); + + // Valid Tests + assertEquals(TestValues.MATCH, TestValues.GENERAL_STRING, moduleName); + assertEquals(TestValues.MATCH, TestValues.GENERAL_BOOLEAN, (boolean) sourceAvailable); + assertEquals(TestValues.MATCH, TestValues.GENERAL_BOOLEAN, (boolean) keepContextAvailable); + assertEquals(TestValues.MATCH, TestValues.GENERAL_BOOLEAN, (boolean) volumeAvailable); + assertEquals(TestValues.MATCH, TestValues.GENERAL_BOOLEAN, (boolean) equalizerAvailable); + assertEquals(TestValues.MATCH, TestValues.GENERAL_INT, equalizerMaxChannelId); + assertEquals(TestValues.MATCH, TestValues.GENERAL_MODULE_INFO, info); + + // Invalid/Null Tests + AudioControlCapabilities msg = new AudioControlCapabilities(); + assertNotNull(TestValues.NOT_NULL, msg); + + assertNull(TestValues.NULL, msg.getModuleName()); + assertNull(TestValues.NULL, msg.getSourceAvailable()); + assertNull(TestValues.NULL, msg.getKeepContextAvailable()); + assertNull(TestValues.NULL, msg.getVolumeAvailable()); + assertNull(TestValues.NULL, msg.getEqualizerAvailable()); + assertNull(TestValues.NULL, msg.getEqualizerMaxChannelId()); + assertNull(TestValues.NULL, msg.getModuleInfo()); + } + + public void testJson() { + JSONObject reference = new JSONObject(); + + try { + + reference.put(AudioControlCapabilities.KEY_MODULE_NAME, TestValues.GENERAL_STRING); + reference.put(AudioControlCapabilities.KEY_SOURCE_AVAILABLE, TestValues.GENERAL_BOOLEAN); + reference.put(AudioControlCapabilities.KEY_KEEP_CONTEXT_AVAILABLE, TestValues.GENERAL_BOOLEAN); + reference.put(AudioControlCapabilities.KEY_VOLUME_AVAILABLE, TestValues.GENERAL_BOOLEAN); + reference.put(AudioControlCapabilities.KEY_EQUALIZER_AVAILABLE, TestValues.GENERAL_BOOLEAN); + reference.put(AudioControlCapabilities.KEY_EQUALIZER_MAX_CHANNEL_ID, TestValues.GENERAL_INT); + reference.put(AudioControlCapabilities.KEY_MODULE_INFO, TestValues.JSON_MODULE_INFO); + + 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(AudioControlCapabilities.KEY_MODULE_INFO)) { + JSONObject o1 = (JSONObject) JsonUtils.readObjectFromJsonObject(reference, key); + JSONObject o2 = (JSONObject) JsonUtils.readObjectFromJsonObject(underTest, key); + Hashtable<String, Object> h1 = JsonRPCMarshaller.deserializeJSONObject(o1); + Hashtable<String, Object> h2 = JsonRPCMarshaller.deserializeJSONObject(o2); + assertTrue(TestValues.TRUE, Validator.validateModuleInfo(new ModuleInfo(h1), new ModuleInfo(h2))); + } else { + assertEquals(TestValues.MATCH, JsonUtils.readObjectFromJsonObject(reference, key), JsonUtils.readObjectFromJsonObject(underTest, key)); + } + } + } catch (JSONException e) { + fail(TestValues.JSON_FAIL); + } + } }
\ No newline at end of file diff --git a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/AudioControlDataTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/AudioControlDataTests.java index 8975c898d..8a09342db 100644 --- a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/AudioControlDataTests.java +++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/AudioControlDataTests.java @@ -23,76 +23,76 @@ import java.util.List; */ public class AudioControlDataTests extends TestCase { - private AudioControlData msg; - - @Override - public void setUp() { - msg = new AudioControlData(); - - msg.setSource(TestValues.GENERAL_PRIMARYAUDIOSOURCE); - msg.setKeepContext(TestValues.GENERAL_BOOLEAN); - msg.setVolume(TestValues.GENERAL_INT); - msg.setEqualizerSettings(TestValues.GENERAL_EQUALIZERSETTINGS_LIST); - } - - /** - * Tests the expected values of the RPC message. - */ - public void testRpcValues() { - // Test Values - PrimaryAudioSource source = msg.getSource(); - Boolean keepContext = msg.getKeepContext(); - int volume = msg.getVolume(); - List<EqualizerSettings> equalizerSettings = msg.getEqualizerSettings(); - - // Valid Tests - assertEquals(TestValues.MATCH, TestValues.GENERAL_PRIMARYAUDIOSOURCE, source); - assertEquals(TestValues.MATCH, TestValues.GENERAL_BOOLEAN, (boolean) keepContext); - assertEquals(TestValues.MATCH, TestValues.GENERAL_INT, volume); - assertEquals(TestValues.MATCH, TestValues.GENERAL_EQUALIZERSETTINGS_LIST.size(), equalizerSettings.size()); - - assertTrue(TestValues.TRUE, Validator.validateEqualizerSettingsList(TestValues.GENERAL_EQUALIZERSETTINGS_LIST, equalizerSettings)); - - // Invalid/Null Tests - AudioControlData msg = new AudioControlData(); - assertNotNull(TestValues.NOT_NULL, msg); - - assertNull(TestValues.NULL, msg.getSource()); - assertNull(TestValues.NULL, msg.getVolume()); - assertNull(TestValues.NULL, msg.getKeepContext()); - assertNull(TestValues.NULL, msg.getEqualizerSettings()); - } - - public void testJson() { - JSONObject reference = new JSONObject(); - - try { - reference.put(AudioControlData.KEY_SOURCE, TestValues.GENERAL_PRIMARYAUDIOSOURCE); - reference.put(AudioControlData.KEY_KEEP_CONTEXT, TestValues.GENERAL_BOOLEAN); - reference.put(AudioControlData.KEY_VOLUME, TestValues.GENERAL_INT); - reference.put(AudioControlData.KEY_EQUALIZER_SETTINGS, TestValues.GENERAL_EQUALIZERSETTINGS_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(AudioControlData.KEY_EQUALIZER_SETTINGS)) { - List<EqualizerSettings> esReference = (List<EqualizerSettings>) JsonUtils.readObjectFromJsonObject(reference, key); - JSONArray esArray = JsonUtils.readJsonArrayFromJsonObject(underTest, key); - int i = 0; - for (EqualizerSettings es : esReference) { - assertTrue(Validator.validateEqualizerSettings(es, new EqualizerSettings(JsonRPCMarshaller.deserializeJSONObject(esArray.getJSONObject(i++))))); - } - } else { - assertEquals(TestValues.MATCH, JsonUtils.readObjectFromJsonObject(reference, key), JsonUtils.readObjectFromJsonObject(underTest, key)); - } - - } - } catch (JSONException e) { - fail(TestValues.JSON_FAIL); - } - } + private AudioControlData msg; + + @Override + public void setUp() { + msg = new AudioControlData(); + + msg.setSource(TestValues.GENERAL_PRIMARYAUDIOSOURCE); + msg.setKeepContext(TestValues.GENERAL_BOOLEAN); + msg.setVolume(TestValues.GENERAL_INT); + msg.setEqualizerSettings(TestValues.GENERAL_EQUALIZERSETTINGS_LIST); + } + + /** + * Tests the expected values of the RPC message. + */ + public void testRpcValues() { + // Test Values + PrimaryAudioSource source = msg.getSource(); + Boolean keepContext = msg.getKeepContext(); + int volume = msg.getVolume(); + List<EqualizerSettings> equalizerSettings = msg.getEqualizerSettings(); + + // Valid Tests + assertEquals(TestValues.MATCH, TestValues.GENERAL_PRIMARYAUDIOSOURCE, source); + assertEquals(TestValues.MATCH, TestValues.GENERAL_BOOLEAN, (boolean) keepContext); + assertEquals(TestValues.MATCH, TestValues.GENERAL_INT, volume); + assertEquals(TestValues.MATCH, TestValues.GENERAL_EQUALIZERSETTINGS_LIST.size(), equalizerSettings.size()); + + assertTrue(TestValues.TRUE, Validator.validateEqualizerSettingsList(TestValues.GENERAL_EQUALIZERSETTINGS_LIST, equalizerSettings)); + + // Invalid/Null Tests + AudioControlData msg = new AudioControlData(); + assertNotNull(TestValues.NOT_NULL, msg); + + assertNull(TestValues.NULL, msg.getSource()); + assertNull(TestValues.NULL, msg.getVolume()); + assertNull(TestValues.NULL, msg.getKeepContext()); + assertNull(TestValues.NULL, msg.getEqualizerSettings()); + } + + public void testJson() { + JSONObject reference = new JSONObject(); + + try { + reference.put(AudioControlData.KEY_SOURCE, TestValues.GENERAL_PRIMARYAUDIOSOURCE); + reference.put(AudioControlData.KEY_KEEP_CONTEXT, TestValues.GENERAL_BOOLEAN); + reference.put(AudioControlData.KEY_VOLUME, TestValues.GENERAL_INT); + reference.put(AudioControlData.KEY_EQUALIZER_SETTINGS, TestValues.GENERAL_EQUALIZERSETTINGS_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(AudioControlData.KEY_EQUALIZER_SETTINGS)) { + List<EqualizerSettings> esReference = (List<EqualizerSettings>) JsonUtils.readObjectFromJsonObject(reference, key); + JSONArray esArray = JsonUtils.readJsonArrayFromJsonObject(underTest, key); + int i = 0; + for (EqualizerSettings es : esReference) { + assertTrue(Validator.validateEqualizerSettings(es, new EqualizerSettings(JsonRPCMarshaller.deserializeJSONObject(esArray.getJSONObject(i++))))); + } + } else { + assertEquals(TestValues.MATCH, JsonUtils.readObjectFromJsonObject(reference, key), JsonUtils.readObjectFromJsonObject(underTest, key)); + } + + } + } catch (JSONException e) { + fail(TestValues.JSON_FAIL); + } + } }
\ No newline at end of file diff --git a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/AudioPassThruCapabilitiesTest.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/AudioPassThruCapabilitiesTest.java index 6af615dd4..4940391cc 100644 --- a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/AudioPassThruCapabilitiesTest.java +++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/AudioPassThruCapabilitiesTest.java @@ -15,37 +15,37 @@ import org.json.JSONObject; import java.util.Iterator; /** - * This is a unit test class for the SmartDeviceLink library project class : + * This is a unit test class for the SmartDeviceLink library project class : * {@link com.smartdevicelink.proxy.rpc.AudioPassThruCapabilities} */ -public class AudioPassThruCapabilitiesTest extends TestCase{ +public class AudioPassThruCapabilitiesTest extends TestCase { - private AudioPassThruCapabilities msg; + private AudioPassThruCapabilities msg; @Override - public void setUp(){ + public void setUp() { msg = new AudioPassThruCapabilities(); assertNotNull(TestValues.NOT_NULL, msg); - + msg.setAudioType(TestValues.GENERAL_AUDIOTYPE); msg.setBitsPerSample(TestValues.GENERAL_BITSPERSAMPLE); msg.setSamplingRate(TestValues.GENERAL_SAMPLINGRATE); } /** - * Tests the expected values of the RPC message. - */ - public void testRpcValues () { - // Test Values + * Tests the expected values of the RPC message. + */ + public void testRpcValues() { + // Test Values SamplingRate samplingRate = msg.getSamplingRate(); BitsPerSample bitsPerSample = msg.getBitsPerSample(); AudioType audioType = msg.getAudioType(); - + // Valid Tests assertEquals(TestValues.MATCH, TestValues.GENERAL_SAMPLINGRATE, samplingRate); assertEquals(TestValues.MATCH, TestValues.GENERAL_BITSPERSAMPLE, bitsPerSample); assertEquals(TestValues.MATCH, TestValues.GENERAL_AUDIOTYPE, audioType); - + // Invalid/Null Tests AudioPassThruCapabilities msg = new AudioPassThruCapabilities(); assertNotNull(TestValues.NOT_NULL, msg); @@ -54,11 +54,11 @@ public class AudioPassThruCapabilitiesTest extends TestCase{ assertNull(TestValues.NULL, msg.getBitsPerSample()); assertNull(TestValues.NULL, msg.getSamplingRate()); } - - public void testJson(){ + + public void testJson() { JSONObject reference = new JSONObject(); - try{ + try { reference.put(AudioPassThruCapabilities.KEY_AUDIO_TYPE, TestValues.GENERAL_AUDIOTYPE); reference.put(AudioPassThruCapabilities.KEY_BITS_PER_SAMPLE, TestValues.GENERAL_BITSPERSAMPLE); reference.put(AudioPassThruCapabilities.KEY_SAMPLING_RATE, TestValues.GENERAL_SAMPLINGRATE); @@ -67,12 +67,12 @@ public class AudioPassThruCapabilitiesTest extends TestCase{ assertEquals(TestValues.MATCH, reference.length(), underTest.length()); Iterator<?> iterator = reference.keys(); - while(iterator.hasNext()){ + while (iterator.hasNext()) { String key = (String) iterator.next(); assertEquals(TestValues.MATCH, JsonUtils.readObjectFromJsonObject(reference, key), JsonUtils.readObjectFromJsonObject(underTest, key)); } - } catch(JSONException e){ - fail(TestValues.JSON_FAIL); + } catch (JSONException e) { + fail(TestValues.JSON_FAIL); } } }
\ No newline at end of file diff --git a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/BeltStatusTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/BeltStatusTests.java index 2d1607be0..72bf52a7d 100644 --- a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/BeltStatusTests.java +++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/BeltStatusTests.java @@ -13,18 +13,18 @@ import org.json.JSONObject; import java.util.Iterator; /** - * This is a unit test class for the SmartDeviceLink library project class : + * This is a unit test class for the SmartDeviceLink library project class : * {@link com.smartdevicelink.proxy.rpc.BeltStatus} */ -public class BeltStatusTests extends TestCase{ - - private BeltStatus msg; +public class BeltStatusTests extends TestCase { + + private BeltStatus msg; @Override - protected void setUp() throws Exception{ + protected void setUp() throws Exception { msg = new BeltStatus(); assertNotNull(TestValues.NOT_NULL, msg); - + msg.setLeftRearInflatableBelted(TestValues.GENERAL_VEHCILEDATAEVENTSTATUS); msg.setPassengerChildDetected(TestValues.GENERAL_VEHCILEDATAEVENTSTATUS); msg.setRightRearInflatableBelted(TestValues.GENERAL_VEHCILEDATAEVENTSTATUS); @@ -43,46 +43,46 @@ public class BeltStatusTests extends TestCase{ } /** - * Tests the expected values of the RPC message. - */ - public void testRpcValues () { - // Valid Tests + * Tests the expected values of the RPC message. + */ + public void testRpcValues() { + // Valid Tests VehicleDataEventStatus leftRearInflatable = msg.getLeftRearInflatableBelted(); assertEquals(TestValues.MATCH, TestValues.GENERAL_VEHCILEDATAEVENTSTATUS, leftRearInflatable); - + VehicleDataEventStatus rightRearInflatable = msg.getRightRearInflatableBelted(); assertEquals(TestValues.MATCH, TestValues.GENERAL_VEHCILEDATAEVENTSTATUS, rightRearInflatable); - + VehicleDataEventStatus passengerChild = msg.getPassengerChildDetected(); assertEquals(TestValues.MATCH, TestValues.GENERAL_VEHCILEDATAEVENTSTATUS, passengerChild); - - VehicleDataEventStatus driverBuckled = msg.getDriverBuckleBelted(); - assertEquals(TestValues.MATCH, TestValues.GENERAL_VEHCILEDATAEVENTSTATUS, driverBuckled); - driverBuckled = msg.getPassengerBuckleBelted(); - assertEquals(TestValues.MATCH, TestValues.GENERAL_VEHCILEDATAEVENTSTATUS, driverBuckled); - driverBuckled = msg.getRightRow2BuckleBelted(); - assertEquals(TestValues.MATCH, TestValues.GENERAL_VEHCILEDATAEVENTSTATUS, driverBuckled); - driverBuckled = msg.getMiddleRow1BuckleBelted(); - assertEquals(TestValues.MATCH, TestValues.GENERAL_VEHCILEDATAEVENTSTATUS, driverBuckled); - driverBuckled = msg.getLeftRow2BuckleBelted(); - assertEquals(TestValues.MATCH, TestValues.GENERAL_VEHCILEDATAEVENTSTATUS, driverBuckled); - driverBuckled = msg.getMiddleRow2BuckleBelted(); - assertEquals(TestValues.MATCH, TestValues.GENERAL_VEHCILEDATAEVENTSTATUS, driverBuckled); - driverBuckled = msg.getMiddleRow3BuckleBelted(); - assertEquals(TestValues.MATCH, TestValues.GENERAL_VEHCILEDATAEVENTSTATUS, driverBuckled); - driverBuckled = msg.getLeftRow3BuckleBelted(); - assertEquals(TestValues.MATCH, TestValues.GENERAL_VEHCILEDATAEVENTSTATUS, driverBuckled); - driverBuckled = msg.getRightRow3BuckleBelted(); - assertEquals(TestValues.MATCH, TestValues.GENERAL_VEHCILEDATAEVENTSTATUS, driverBuckled); - - VehicleDataEventStatus driverBeltDeployed = msg.getDriverBeltDeployed(); - assertEquals(TestValues.MATCH, TestValues.GENERAL_VEHCILEDATAEVENTSTATUS, driverBeltDeployed); - driverBeltDeployed = msg.getPassengerBeltDeployed(); - assertEquals(TestValues.MATCH, TestValues.GENERAL_VEHCILEDATAEVENTSTATUS, driverBeltDeployed); - driverBeltDeployed = msg.getMiddleRow1BeltDeployed(); - assertEquals(TestValues.MATCH, TestValues.GENERAL_VEHCILEDATAEVENTSTATUS, driverBeltDeployed); - - // Invalid/Null Tests + + VehicleDataEventStatus driverBuckled = msg.getDriverBuckleBelted(); + assertEquals(TestValues.MATCH, TestValues.GENERAL_VEHCILEDATAEVENTSTATUS, driverBuckled); + driverBuckled = msg.getPassengerBuckleBelted(); + assertEquals(TestValues.MATCH, TestValues.GENERAL_VEHCILEDATAEVENTSTATUS, driverBuckled); + driverBuckled = msg.getRightRow2BuckleBelted(); + assertEquals(TestValues.MATCH, TestValues.GENERAL_VEHCILEDATAEVENTSTATUS, driverBuckled); + driverBuckled = msg.getMiddleRow1BuckleBelted(); + assertEquals(TestValues.MATCH, TestValues.GENERAL_VEHCILEDATAEVENTSTATUS, driverBuckled); + driverBuckled = msg.getLeftRow2BuckleBelted(); + assertEquals(TestValues.MATCH, TestValues.GENERAL_VEHCILEDATAEVENTSTATUS, driverBuckled); + driverBuckled = msg.getMiddleRow2BuckleBelted(); + assertEquals(TestValues.MATCH, TestValues.GENERAL_VEHCILEDATAEVENTSTATUS, driverBuckled); + driverBuckled = msg.getMiddleRow3BuckleBelted(); + assertEquals(TestValues.MATCH, TestValues.GENERAL_VEHCILEDATAEVENTSTATUS, driverBuckled); + driverBuckled = msg.getLeftRow3BuckleBelted(); + assertEquals(TestValues.MATCH, TestValues.GENERAL_VEHCILEDATAEVENTSTATUS, driverBuckled); + driverBuckled = msg.getRightRow3BuckleBelted(); + assertEquals(TestValues.MATCH, TestValues.GENERAL_VEHCILEDATAEVENTSTATUS, driverBuckled); + + VehicleDataEventStatus driverBeltDeployed = msg.getDriverBeltDeployed(); + assertEquals(TestValues.MATCH, TestValues.GENERAL_VEHCILEDATAEVENTSTATUS, driverBeltDeployed); + driverBeltDeployed = msg.getPassengerBeltDeployed(); + assertEquals(TestValues.MATCH, TestValues.GENERAL_VEHCILEDATAEVENTSTATUS, driverBeltDeployed); + driverBeltDeployed = msg.getMiddleRow1BeltDeployed(); + assertEquals(TestValues.MATCH, TestValues.GENERAL_VEHCILEDATAEVENTSTATUS, driverBeltDeployed); + + // Invalid/Null Tests BeltStatus msg = new BeltStatus(); assertNotNull(TestValues.NOT_NULL, msg); @@ -102,10 +102,10 @@ public class BeltStatusTests extends TestCase{ assertNull(TestValues.NULL, msg.getMiddleRow1BeltDeployed()); } - public void testJson(){ + public void testJson() { JSONObject reference = new JSONObject(); - try{ + try { reference.put(BeltStatus.KEY_PASSENGER_CHILD_DETECTED, TestValues.GENERAL_VEHCILEDATAEVENTSTATUS); reference.put(BeltStatus.KEY_LEFT_REAR_INFLATABLE_BELTED, TestValues.GENERAL_VEHCILEDATAEVENTSTATUS); reference.put(BeltStatus.KEY_RIGHT_REAR_INFLATABLE_BELTED, TestValues.GENERAL_VEHCILEDATAEVENTSTATUS); @@ -122,16 +122,16 @@ public class BeltStatusTests extends TestCase{ reference.put(BeltStatus.KEY_MIDDLE_ROW_1_BELT_DEPLOYED, TestValues.GENERAL_VEHCILEDATAEVENTSTATUS); reference.put(BeltStatus.KEY_MIDDLE_ROW_1_BUCKLE_BELTED, TestValues.GENERAL_VEHCILEDATAEVENTSTATUS); - JSONObject underTest = msg.serializeJSON(); + JSONObject underTest = msg.serializeJSON(); assertEquals(TestValues.MATCH, reference.length(), underTest.length()); Iterator<?> iterator = reference.keys(); - while(iterator.hasNext()){ + while (iterator.hasNext()) { String key = (String) iterator.next(); assertEquals(TestValues.MATCH, JsonUtils.readObjectFromJsonObject(reference, key), JsonUtils.readObjectFromJsonObject(underTest, key)); } - }catch(JSONException e){ - fail(TestValues.JSON_FAIL); + } catch (JSONException e) { + fail(TestValues.JSON_FAIL); } } }
\ No newline at end of file diff --git a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/BodyInformationTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/BodyInformationTests.java index 0a090606a..1db5aa77a 100644 --- a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/BodyInformationTests.java +++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/BodyInformationTests.java @@ -14,15 +14,15 @@ import org.json.JSONObject; import java.util.Iterator; /** - * This is a unit test class for the SmartDeviceLink library project class : + * This is a unit test class for the SmartDeviceLink library project class : * {@link com.smartdevicelink.proxy.rpc.BodyInformation} */ -public class BodyInformationTests extends TestCase{ - - private BodyInformation msg; +public class BodyInformationTests extends TestCase { + + private BodyInformation msg; @Override - public void setUp(){ + public void setUp() { msg = new BodyInformation(); msg.setParkBrakeActive(TestValues.GENERAL_BOOLEAN); msg.setIgnitionStatus(TestValues.GENERAL_IGNITIONSTATUS); @@ -35,25 +35,25 @@ public class BodyInformationTests extends TestCase{ } /** - * Tests the expected values of the RPC message. - */ - public void testRpcValues () { - // Test Values + * Tests the expected values of the RPC message. + */ + public void testRpcValues() { + // Test Values boolean parkBrake = msg.getParkBrakeActive(); IgnitionStatus ignitionStatus = msg.getIgnitionStatus(); IgnitionStableStatus ignitionStable = msg.getIgnitionStableStatus(); - + // Valid Tests assertEquals(TestValues.MATCH, TestValues.GENERAL_BOOLEAN, parkBrake); assertEquals(TestValues.MATCH, TestValues.GENERAL_IGNITIONSTATUS, ignitionStatus); assertEquals(TestValues.MATCH, TestValues.GENERAL_IGNITIONSTABLESTATUS, ignitionStable); - - assertEquals(TestValues.MATCH, TestValues.GENERAL_BOOLEAN, (boolean) msg.getDriverDoorAjar()); - assertEquals(TestValues.MATCH, TestValues.GENERAL_BOOLEAN, (boolean) msg.getPassengerDoorAjar()); - assertEquals(TestValues.MATCH, TestValues.GENERAL_BOOLEAN, (boolean) msg.getRearLeftDoorAjar()); - assertEquals(TestValues.MATCH, TestValues.GENERAL_BOOLEAN, (boolean) msg.getRearRightDoorAjar()); - - // Invalid/Null Tests + + assertEquals(TestValues.MATCH, TestValues.GENERAL_BOOLEAN, (boolean) msg.getDriverDoorAjar()); + assertEquals(TestValues.MATCH, TestValues.GENERAL_BOOLEAN, (boolean) msg.getPassengerDoorAjar()); + assertEquals(TestValues.MATCH, TestValues.GENERAL_BOOLEAN, (boolean) msg.getRearLeftDoorAjar()); + assertEquals(TestValues.MATCH, TestValues.GENERAL_BOOLEAN, (boolean) msg.getRearRightDoorAjar()); + + // Invalid/Null Tests BodyInformation msg = new BodyInformation(); assertNotNull(TestValues.NOT_NULL, msg); @@ -66,10 +66,10 @@ public class BodyInformationTests extends TestCase{ assertNull(TestValues.NULL, msg.getRearRightDoorAjar()); } - public void testJson(){ + public void testJson() { JSONObject reference = new JSONObject(); - try{ + try { reference.put(BodyInformation.KEY_PARK_BRAKE_ACTIVE, TestValues.GENERAL_BOOLEAN); reference.put(BodyInformation.KEY_IGNITION_STATUS, TestValues.GENERAL_IGNITIONSTATUS); reference.put(BodyInformation.KEY_IGNITION_STABLE_STATUS, TestValues.GENERAL_IGNITIONSTABLESTATUS); @@ -78,16 +78,16 @@ public class BodyInformationTests extends TestCase{ reference.put(BodyInformation.KEY_REAR_LEFT_DOOR_AJAR, TestValues.GENERAL_BOOLEAN); reference.put(BodyInformation.KEY_REAR_RIGHT_DOOR_AJAR, TestValues.GENERAL_BOOLEAN); - JSONObject underTest = msg.serializeJSON(); + JSONObject underTest = msg.serializeJSON(); assertEquals(TestValues.MATCH, reference.length(), underTest.length()); Iterator<?> iterator = reference.keys(); - while(iterator.hasNext()){ + while (iterator.hasNext()) { String key = (String) iterator.next(); assertEquals(TestValues.MATCH, JsonUtils.readObjectFromJsonObject(reference, key), JsonUtils.readObjectFromJsonObject(underTest, key)); } - }catch(JSONException e){ - fail(TestValues.JSON_FAIL); + } catch (JSONException e) { + fail(TestValues.JSON_FAIL); } } }
\ No newline at end of file diff --git a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/ButtonCapabilitiesTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/ButtonCapabilitiesTests.java index ef9b8ec69..99c80fe39 100644 --- a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/ButtonCapabilitiesTests.java +++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/ButtonCapabilitiesTests.java @@ -17,15 +17,15 @@ import java.util.Hashtable; import java.util.Iterator; /** - * This is a unit test class for the SmartDeviceLink library project class : + * This is a unit test class for the SmartDeviceLink library project class : * {@link com.smartdevicelink.proxy.rpc.ButtonCapabilities} */ -public class ButtonCapabilitiesTests extends TestCase{ +public class ButtonCapabilitiesTests extends TestCase { private ButtonCapabilities msg; @Override - public void setUp(){ + public void setUp() { msg = new ButtonCapabilities(); msg.setLongPressAvailable(TestValues.GENERAL_BOOLEAN); @@ -37,23 +37,23 @@ public class ButtonCapabilitiesTests extends TestCase{ /** - * Tests the expected values of the RPC message. - */ - public void testRpcValues () { - // Test Values + * Tests the expected values of the RPC message. + */ + public void testRpcValues() { + // Test Values boolean shortPress = msg.getShortPressAvailable(); boolean longPress = msg.getLongPressAvailable(); boolean upDown = msg.getUpDownAvailable(); ButtonName buttonName = msg.getName(); ModuleInfo info = msg.getModuleInfo(); - + // Valid Tests assertEquals(TestValues.MATCH, TestValues.GENERAL_BOOLEAN, shortPress); assertEquals(TestValues.MATCH, TestValues.GENERAL_BOOLEAN, longPress); assertEquals(TestValues.MATCH, TestValues.GENERAL_BOOLEAN, upDown); assertEquals(TestValues.MATCH, TestValues.GENERAL_BUTTONNAME, buttonName); assertEquals(TestValues.MATCH, TestValues.GENERAL_MODULE_INFO, info); - + // Invalid/Null Tests ButtonCapabilities msg = new ButtonCapabilities(); assertNotNull(TestValues.NOT_NULL, msg); @@ -64,10 +64,10 @@ public class ButtonCapabilitiesTests extends TestCase{ assertNull(TestValues.NULL, msg.getName()); } - public void testJson(){ + public void testJson() { JSONObject reference = new JSONObject(); - try{ + try { reference.put(ButtonCapabilities.KEY_SHORT_PRESS_AVAILABLE, TestValues.GENERAL_BOOLEAN); reference.put(ButtonCapabilities.KEY_LONG_PRESS_AVAILABLE, TestValues.GENERAL_BOOLEAN); reference.put(ButtonCapabilities.KEY_UP_DOWN_AVAILABLE, TestValues.GENERAL_BOOLEAN); @@ -91,8 +91,8 @@ public class ButtonCapabilitiesTests extends TestCase{ assertEquals(TestValues.MATCH, JsonUtils.readObjectFromJsonObject(reference, key), JsonUtils.readObjectFromJsonObject(underTest, key)); } } - } catch(JSONException e){ - fail(TestValues.JSON_FAIL); + } catch (JSONException e) { + fail(TestValues.JSON_FAIL); } - } + } }
\ No newline at end of file diff --git a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/ChoiceTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/ChoiceTests.java index 6eecece4e..d4f24e186 100644 --- a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/ChoiceTests.java +++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/ChoiceTests.java @@ -17,15 +17,15 @@ import java.util.Iterator; import java.util.List; /** - * This is a unit test class for the SmartDeviceLink library project class : + * This is a unit test class for the SmartDeviceLink library project class : * {@link com.smartdevicelink.proxy.rpc.Choice} */ -public class ChoiceTests extends TestCase{ - +public class ChoiceTests extends TestCase { + private Choice msg; @Override - public void setUp(){ + public void setUp() { msg = new Choice(); msg.setChoiceID(TestValues.GENERAL_INT); @@ -38,10 +38,10 @@ public class ChoiceTests extends TestCase{ } /** - * Tests the expected values of the RPC message. - */ - public void testRpcValues () { - // Test Values + * Tests the expected values of the RPC message. + */ + public void testRpcValues() { + // Test Values String text3 = msg.getTertiaryText(); String text2 = msg.getSecondaryText(); String menuName = msg.getMenuName(); @@ -49,7 +49,7 @@ public class ChoiceTests extends TestCase{ List<String> vrCommands = msg.getVrCommands(); Image image2 = msg.getSecondaryImage(); Image image = msg.getImage(); - + // Valid Tests assertEquals(TestValues.MATCH, TestValues.GENERAL_STRING, text3); assertEquals(TestValues.MATCH, TestValues.GENERAL_STRING, text2); @@ -58,7 +58,7 @@ public class ChoiceTests extends TestCase{ assertTrue(TestValues.TRUE, Validator.validateStringList(TestValues.GENERAL_STRING_LIST, vrCommands)); assertTrue(TestValues.TRUE, Validator.validateImage(TestValues.GENERAL_IMAGE, image2)); assertTrue(TestValues.TRUE, Validator.validateImage(TestValues.GENERAL_IMAGE, image)); - + // Invalid/Null Tests Choice msg = new Choice(); assertNotNull(TestValues.NOT_NULL, msg); @@ -72,10 +72,10 @@ public class ChoiceTests extends TestCase{ assertNull(TestValues.NULL, msg.getVrCommands()); } - public void testJson(){ + public void testJson() { JSONObject reference = new JSONObject(); - try{ + try { reference.put(Choice.KEY_CHOICE_ID, TestValues.GENERAL_INT); reference.put(Choice.KEY_MENU_NAME, TestValues.GENERAL_STRING); reference.put(Choice.KEY_SECONDARY_TEXT, TestValues.GENERAL_STRING); @@ -83,31 +83,31 @@ public class ChoiceTests extends TestCase{ reference.put(Choice.KEY_IMAGE, TestValues.JSON_IMAGE); reference.put(Choice.KEY_SECONDARY_IMAGE, TestValues.JSON_IMAGE); reference.put(Choice.KEY_VR_COMMANDS, JsonUtils.createJsonArray(TestValues.GENERAL_STRING_LIST)); - + JSONObject underTest = msg.serializeJSON(); assertEquals(TestValues.MATCH, reference.length(), underTest.length()); Iterator<?> iterator = reference.keys(); - while(iterator.hasNext()){ + while (iterator.hasNext()) { String key = (String) iterator.next(); - if(key.equals(Choice.KEY_VR_COMMANDS)){ + if (key.equals(Choice.KEY_VR_COMMANDS)) { assertTrue(TestValues.TRUE, Validator.validateStringList(JsonUtils.readStringListFromJsonObject(reference, key), JsonUtils.readStringListFromJsonObject(underTest, key))); - } else if(key.equals(Choice.KEY_IMAGE) || key.equals(Choice.KEY_SECONDARY_IMAGE)){ - JSONObject objectEquals = JsonUtils.readJsonObjectFromJsonObject(reference, key); - JSONObject testEquals = JsonUtils.readJsonObjectFromJsonObject(underTest, key); - Hashtable<String, Object> hashReference = JsonRPCMarshaller.deserializeJSONObject(objectEquals); - Hashtable<String, Object> hashTest = JsonRPCMarshaller.deserializeJSONObject(testEquals); - + } else if (key.equals(Choice.KEY_IMAGE) || key.equals(Choice.KEY_SECONDARY_IMAGE)) { + JSONObject objectEquals = JsonUtils.readJsonObjectFromJsonObject(reference, key); + JSONObject testEquals = JsonUtils.readJsonObjectFromJsonObject(underTest, key); + Hashtable<String, Object> hashReference = JsonRPCMarshaller.deserializeJSONObject(objectEquals); + Hashtable<String, Object> hashTest = JsonRPCMarshaller.deserializeJSONObject(testEquals); + assertTrue(TestValues.TRUE, Validator.validateImage(new Image(hashReference), new Image(hashTest))); - } else{ + } else { assertEquals(TestValues.MATCH, JsonUtils.readObjectFromJsonObject(reference, key), JsonUtils.readObjectFromJsonObject(underTest, key)); } } - } catch(JSONException e){ - fail(TestValues.JSON_FAIL); + } catch (JSONException e) { + fail(TestValues.JSON_FAIL); } } }
\ No newline at end of file diff --git a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/ClimateControlCapabilitiesTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/ClimateControlCapabilitiesTests.java index d0ce94de1..22cdc427e 100644 --- a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/ClimateControlCapabilitiesTests.java +++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/ClimateControlCapabilitiesTests.java @@ -24,12 +24,12 @@ import java.util.List; * This is a unit test class for the SmartDeviceLink library project class : * {@link com.smartdevicelink.proxy.rpc.ClimateControlCapabilities} */ -public class ClimateControlCapabilitiesTests extends TestCase{ - +public class ClimateControlCapabilitiesTests extends TestCase { + private ClimateControlCapabilities msg; @Override - public void setUp(){ + public void setUp() { msg = new ClimateControlCapabilities(); msg.setModuleName(TestValues.GENERAL_STRING); @@ -54,9 +54,9 @@ public class ClimateControlCapabilitiesTests extends TestCase{ } /** - * Tests the expected values of the RPC message. - */ - public void testRpcValues () { + * Tests the expected values of the RPC message. + */ + public void testRpcValues() { // Test Values String moduleName = msg.getModuleName(); boolean fanSpeedAvailable = msg.getFanSpeedAvailable(); @@ -95,10 +95,10 @@ public class ClimateControlCapabilitiesTests extends TestCase{ assertEquals(TestValues.MATCH, TestValues.GENERAL_DEFROSTZONE_LIST.size(), defrostZone.size()); assertEquals(TestValues.MATCH, TestValues.GENERAL_VENTILATIONMODE_LIST.size(), ventilationMode.size()); - for(int i = 0; i < TestValues.GENERAL_DEFROSTZONE_LIST.size(); i++){ + for (int i = 0; i < TestValues.GENERAL_DEFROSTZONE_LIST.size(); i++) { assertEquals(TestValues.MATCH, TestValues.GENERAL_DEFROSTZONE_LIST.get(i), defrostZone.get(i)); } - for(int i = 0; i < TestValues.GENERAL_VENTILATIONMODE_LIST.size(); i++){ + for (int i = 0; i < TestValues.GENERAL_VENTILATIONMODE_LIST.size(); i++) { assertEquals(TestValues.MATCH, TestValues.GENERAL_VENTILATIONMODE_LIST.get(i), ventilationMode.get(i)); } @@ -132,10 +132,10 @@ public class ClimateControlCapabilitiesTests extends TestCase{ assertNull(TestValues.NULL, msg.getClimateEnableAvailable()); } - public void testJson(){ + public void testJson() { JSONObject reference = new JSONObject(); - try{ + try { reference.put(ClimateControlCapabilities.KEY_MODULE_NAME, TestValues.GENERAL_STRING); reference.put(ClimateControlCapabilities.KEY_FAN_SPEED_AVAILABLE, TestValues.GENERAL_BOOLEAN); reference.put(ClimateControlCapabilities.KEY_DESIRED_TEMPERATURE_AVAILABLE, TestValues.GENERAL_BOOLEAN); @@ -160,10 +160,10 @@ public class ClimateControlCapabilitiesTests extends TestCase{ assertEquals(TestValues.MATCH, reference.length(), underTest.length()); Iterator<?> iterator = reference.keys(); - while(iterator.hasNext()){ + while (iterator.hasNext()) { String key = (String) iterator.next(); - if(key.equals(ClimateControlCapabilities.KEY_DEFROST_ZONE)) { + if (key.equals(ClimateControlCapabilities.KEY_DEFROST_ZONE)) { JSONArray defrostZoneArrayReference = JsonUtils.readJsonArrayFromJsonObject(reference, key); JSONArray defrostZoneArrayTest = JsonUtils.readJsonArrayFromJsonObject(underTest, key); List<DefrostZone> defrostZoneListReference = new ArrayList<DefrostZone>(); @@ -171,12 +171,12 @@ public class ClimateControlCapabilitiesTests extends TestCase{ assertEquals(TestValues.MATCH, defrostZoneArrayReference.length(), defrostZoneArrayTest.length()); - for (int index = 0 ; index < defrostZoneArrayReference.length(); index++) { - defrostZoneListReference.add( (DefrostZone)defrostZoneArrayReference.get(index) ); - defrostZoneListTest.add( (DefrostZone)defrostZoneArrayTest.get(index) ); + for (int index = 0; index < defrostZoneArrayReference.length(); index++) { + defrostZoneListReference.add((DefrostZone) defrostZoneArrayReference.get(index)); + defrostZoneListTest.add((DefrostZone) defrostZoneArrayTest.get(index)); } assertTrue(TestValues.TRUE, defrostZoneListReference.containsAll(defrostZoneListTest) && defrostZoneListTest.containsAll(defrostZoneListReference)); - } else if(key.equals(ClimateControlCapabilities.KEY_VENTILATION_MODE)) { + } else if (key.equals(ClimateControlCapabilities.KEY_VENTILATION_MODE)) { JSONArray ventilationModeArrayReference = JsonUtils.readJsonArrayFromJsonObject(reference, key); JSONArray ventilationModeArrayTest = JsonUtils.readJsonArrayFromJsonObject(underTest, key); List<VentilationMode> ventilationModeListReference = new ArrayList<VentilationMode>(); @@ -184,9 +184,9 @@ public class ClimateControlCapabilitiesTests extends TestCase{ assertEquals(TestValues.MATCH, ventilationModeArrayReference.length(), ventilationModeArrayTest.length()); - for (int index = 0 ; index < ventilationModeArrayReference.length(); index++) { - ventilationModeListReference.add( (VentilationMode)ventilationModeArrayReference.get(index) ); - ventilationModeListTest.add( (VentilationMode)ventilationModeArrayTest.get(index) ); + for (int index = 0; index < ventilationModeArrayReference.length(); index++) { + ventilationModeListReference.add((VentilationMode) ventilationModeArrayReference.get(index)); + ventilationModeListTest.add((VentilationMode) ventilationModeArrayTest.get(index)); } assertTrue(TestValues.TRUE, ventilationModeListReference.containsAll(ventilationModeListTest) && ventilationModeListTest.containsAll(ventilationModeListReference)); } else if (key.equals(ClimateControlCapabilities.KEY_MODULE_INFO)) { @@ -195,12 +195,12 @@ public class ClimateControlCapabilitiesTests extends TestCase{ Hashtable<String, Object> h1 = JsonRPCMarshaller.deserializeJSONObject(o1); Hashtable<String, Object> h2 = JsonRPCMarshaller.deserializeJSONObject(o2); assertTrue(TestValues.TRUE, Validator.validateModuleInfo(new ModuleInfo(h1), new ModuleInfo(h2))); - } else{ + } else { assertEquals(TestValues.MATCH, JsonUtils.readObjectFromJsonObject(reference, key), JsonUtils.readObjectFromJsonObject(underTest, key)); } } - } catch(JSONException e){ - fail(TestValues.JSON_FAIL); + } catch (JSONException e) { + fail(TestValues.JSON_FAIL); } } }
\ No newline at end of file diff --git a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/ClimateControlDataTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/ClimateControlDataTests.java index 53af43a48..81c654c43 100644 --- a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/ClimateControlDataTests.java +++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/ClimateControlDataTests.java @@ -21,12 +21,12 @@ import java.util.Iterator; * This is a unit test class for the SmartDeviceLink library project class : * {@link com.smartdevicelink.proxy.rpc.ClimateControlData} */ -public class ClimateControlDataTests extends TestCase{ - +public class ClimateControlDataTests extends TestCase { + private ClimateControlData msg; @Override - public void setUp(){ + public void setUp() { msg = new ClimateControlData(); msg.setFanSpeed(TestValues.GENERAL_INT); @@ -47,9 +47,9 @@ public class ClimateControlDataTests extends TestCase{ } /** - * Tests the expected values of the RPC message. - */ - public void testRpcValues () { + * Tests the expected values of the RPC message. + */ + public void testRpcValues() { // Test Values int fanSpeed = msg.getFanSpeed(); Temperature currentTemperature = msg.getCurrentTemperature(); @@ -105,10 +105,10 @@ public class ClimateControlDataTests extends TestCase{ assertNull(TestValues.NULL, msg.getClimateEnable()); } - public void testJson(){ + public void testJson() { JSONObject reference = new JSONObject(); - try{ + try { reference.put(ClimateControlData.KEY_FAN_SPEED, TestValues.GENERAL_INT); reference.put(ClimateControlData.KEY_CURRENT_TEMPERATURE, JsonRPCMarshaller.serializeHashtable(TestValues.GENERAL_TEMPERATURE.getStore())); reference.put(ClimateControlData.KEY_DESIRED_TEMPERATURE, JsonRPCMarshaller.serializeHashtable(TestValues.GENERAL_TEMPERATURE.getStore())); @@ -129,27 +129,27 @@ public class ClimateControlDataTests extends TestCase{ assertEquals(TestValues.MATCH, reference.length(), underTest.length()); Iterator<?> iterator = reference.keys(); - while(iterator.hasNext()){ + while (iterator.hasNext()) { String key = (String) iterator.next(); - if(key.equals(ClimateControlData.KEY_CURRENT_TEMPERATURE)){ + if (key.equals(ClimateControlData.KEY_CURRENT_TEMPERATURE)) { JSONObject objectEquals = (JSONObject) JsonUtils.readObjectFromJsonObject(reference, key); JSONObject testEquals = (JSONObject) JsonUtils.readObjectFromJsonObject(underTest, key); Hashtable<String, Object> hashReference = JsonRPCMarshaller.deserializeJSONObject(objectEquals); Hashtable<String, Object> hashTest = JsonRPCMarshaller.deserializeJSONObject(testEquals); - assertTrue(TestValues.TRUE, Validator.validateTemperature( new Temperature(hashReference), new Temperature(hashTest))); - } else if(key.equals(ClimateControlData.KEY_DESIRED_TEMPERATURE)){ + assertTrue(TestValues.TRUE, Validator.validateTemperature(new Temperature(hashReference), new Temperature(hashTest))); + } else if (key.equals(ClimateControlData.KEY_DESIRED_TEMPERATURE)) { JSONObject objectEquals = (JSONObject) JsonUtils.readObjectFromJsonObject(reference, key); JSONObject testEquals = (JSONObject) JsonUtils.readObjectFromJsonObject(underTest, key); Hashtable<String, Object> hashReference = JsonRPCMarshaller.deserializeJSONObject(objectEquals); Hashtable<String, Object> hashTest = JsonRPCMarshaller.deserializeJSONObject(testEquals); - assertTrue(TestValues.TRUE, Validator.validateTemperature( new Temperature(hashReference), new Temperature(hashTest))); - } else{ + assertTrue(TestValues.TRUE, Validator.validateTemperature(new Temperature(hashReference), new Temperature(hashTest))); + } else { assertEquals(TestValues.MATCH, JsonUtils.readObjectFromJsonObject(reference, key), JsonUtils.readObjectFromJsonObject(underTest, key)); } } - } catch(JSONException e){ - fail(TestValues.JSON_FAIL); + } catch (JSONException e) { + fail(TestValues.JSON_FAIL); } } }
\ No newline at end of file diff --git a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/CloudAppPropertiesTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/CloudAppPropertiesTests.java index 5b1ac322d..121f988f7 100644 --- a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/CloudAppPropertiesTests.java +++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/CloudAppPropertiesTests.java @@ -18,87 +18,87 @@ import java.util.List; * This is a unit test class for the SmartDeviceLink library project class : * {@link com.smartdevicelink.proxy.rpc.CloudAppProperties} */ -public class CloudAppPropertiesTests extends TestCase{ - - private CloudAppProperties msg; - - @Override - public void setUp(){ - msg = new CloudAppProperties(); - - msg.setNicknames(TestValues.GENERAL_STRING_LIST); - msg.setAppID(TestValues.GENERAL_STRING); - msg.setEnabled(TestValues.GENERAL_BOOLEAN); - msg.setAuthToken(TestValues.GENERAL_STRING); - msg.setCloudTransportType(TestValues.GENERAL_STRING); - msg.setHybridAppPreference(TestValues.GENERAL_HYBRID_APP_PREFERENCE); - msg.setEndpoint(TestValues.GENERAL_STRING); - } - - /** - * Tests the expected values of the RPC message. - */ - public void testRpcValues () { - // Test Values - List<String> nicknames = msg.getNicknames(); - String appID = msg.getAppID(); - boolean enabled = msg.isEnabled(); - String authToken = msg.getAuthToken(); - String cloudTransportType = msg.getCloudTransportType(); - HybridAppPreference hybridAppPreference = msg.getHybridAppPreference(); - String endpoint = msg.getEndpoint(); - - // Valid Tests - assertEquals(TestValues.MATCH, TestValues.GENERAL_STRING_LIST, nicknames); - assertEquals(TestValues.MATCH, TestValues.GENERAL_STRING, appID); - assertEquals(TestValues.MATCH, TestValues.GENERAL_BOOLEAN, enabled); - assertEquals(TestValues.MATCH, TestValues.GENERAL_STRING, authToken); - assertEquals(TestValues.MATCH, TestValues.GENERAL_STRING, cloudTransportType); - assertEquals(TestValues.MATCH, TestValues.GENERAL_HYBRID_APP_PREFERENCE, hybridAppPreference); - assertEquals(TestValues.MATCH, TestValues.GENERAL_STRING, endpoint); - - // Invalid/Null Tests - CloudAppProperties msg = new CloudAppProperties(); - assertNotNull(TestValues.NOT_NULL, msg); - - assertNull(TestValues.NULL, msg.getNicknames()); - assertNull(TestValues.NULL, msg.getAppID()); - assertNull(TestValues.NULL, msg.isEnabled()); - assertNull(TestValues.NULL, msg.getAuthToken()); - assertNull(TestValues.NULL, msg.getCloudTransportType()); - assertNull(TestValues.NULL, msg.getHybridAppPreference()); - assertNull(TestValues.NULL, msg.getEndpoint()); - } - - public void testJson(){ - JSONObject reference = new JSONObject(); - - try{ - reference.put(CloudAppProperties.KEY_NICKNAMES, TestValues.GENERAL_STRING_LIST); - reference.put(CloudAppProperties.KEY_APP_ID, TestValues.GENERAL_STRING); - reference.put(CloudAppProperties.KEY_ENABLED, TestValues.GENERAL_BOOLEAN); - reference.put(CloudAppProperties.KEY_AUTH_TOKEN, TestValues.GENERAL_STRING); - reference.put(CloudAppProperties.KEY_CLOUD_TRANSPORT_TYPE, TestValues.GENERAL_STRING); - reference.put(CloudAppProperties.KEY_HYBRID_APP_PREFERENCE, TestValues.GENERAL_HYBRID_APP_PREFERENCE); - reference.put(CloudAppProperties.KEY_ENDPOINT, TestValues.GENERAL_STRING); - - 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(CloudAppProperties.KEY_NICKNAMES)){ - Validator.validateStringList(JsonUtils.readStringListFromJsonObject(reference, key), - JsonUtils.readStringListFromJsonObject(underTest, key)); - }else { - assertEquals(TestValues.MATCH, JsonUtils.readObjectFromJsonObject(reference, key), JsonUtils.readObjectFromJsonObject(underTest, key)); - } - } - } catch(JSONException e){ - fail(TestValues.JSON_FAIL); - } - } +public class CloudAppPropertiesTests extends TestCase { + + private CloudAppProperties msg; + + @Override + public void setUp() { + msg = new CloudAppProperties(); + + msg.setNicknames(TestValues.GENERAL_STRING_LIST); + msg.setAppID(TestValues.GENERAL_STRING); + msg.setEnabled(TestValues.GENERAL_BOOLEAN); + msg.setAuthToken(TestValues.GENERAL_STRING); + msg.setCloudTransportType(TestValues.GENERAL_STRING); + msg.setHybridAppPreference(TestValues.GENERAL_HYBRID_APP_PREFERENCE); + msg.setEndpoint(TestValues.GENERAL_STRING); + } + + /** + * Tests the expected values of the RPC message. + */ + public void testRpcValues() { + // Test Values + List<String> nicknames = msg.getNicknames(); + String appID = msg.getAppID(); + boolean enabled = msg.isEnabled(); + String authToken = msg.getAuthToken(); + String cloudTransportType = msg.getCloudTransportType(); + HybridAppPreference hybridAppPreference = msg.getHybridAppPreference(); + String endpoint = msg.getEndpoint(); + + // Valid Tests + assertEquals(TestValues.MATCH, TestValues.GENERAL_STRING_LIST, nicknames); + assertEquals(TestValues.MATCH, TestValues.GENERAL_STRING, appID); + assertEquals(TestValues.MATCH, TestValues.GENERAL_BOOLEAN, enabled); + assertEquals(TestValues.MATCH, TestValues.GENERAL_STRING, authToken); + assertEquals(TestValues.MATCH, TestValues.GENERAL_STRING, cloudTransportType); + assertEquals(TestValues.MATCH, TestValues.GENERAL_HYBRID_APP_PREFERENCE, hybridAppPreference); + assertEquals(TestValues.MATCH, TestValues.GENERAL_STRING, endpoint); + + // Invalid/Null Tests + CloudAppProperties msg = new CloudAppProperties(); + assertNotNull(TestValues.NOT_NULL, msg); + + assertNull(TestValues.NULL, msg.getNicknames()); + assertNull(TestValues.NULL, msg.getAppID()); + assertNull(TestValues.NULL, msg.isEnabled()); + assertNull(TestValues.NULL, msg.getAuthToken()); + assertNull(TestValues.NULL, msg.getCloudTransportType()); + assertNull(TestValues.NULL, msg.getHybridAppPreference()); + assertNull(TestValues.NULL, msg.getEndpoint()); + } + + public void testJson() { + JSONObject reference = new JSONObject(); + + try { + reference.put(CloudAppProperties.KEY_NICKNAMES, TestValues.GENERAL_STRING_LIST); + reference.put(CloudAppProperties.KEY_APP_ID, TestValues.GENERAL_STRING); + reference.put(CloudAppProperties.KEY_ENABLED, TestValues.GENERAL_BOOLEAN); + reference.put(CloudAppProperties.KEY_AUTH_TOKEN, TestValues.GENERAL_STRING); + reference.put(CloudAppProperties.KEY_CLOUD_TRANSPORT_TYPE, TestValues.GENERAL_STRING); + reference.put(CloudAppProperties.KEY_HYBRID_APP_PREFERENCE, TestValues.GENERAL_HYBRID_APP_PREFERENCE); + reference.put(CloudAppProperties.KEY_ENDPOINT, TestValues.GENERAL_STRING); + + 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(CloudAppProperties.KEY_NICKNAMES)) { + Validator.validateStringList(JsonUtils.readStringListFromJsonObject(reference, key), + JsonUtils.readStringListFromJsonObject(underTest, key)); + } else { + assertEquals(TestValues.MATCH, JsonUtils.readObjectFromJsonObject(reference, key), JsonUtils.readObjectFromJsonObject(underTest, key)); + } + } + } catch (JSONException e) { + fail(TestValues.JSON_FAIL); + } + } }
\ No newline at end of file diff --git a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/ClusterModeStatusTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/ClusterModeStatusTests.java index 22a316e9a..7eb76cc2c 100644 --- a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/ClusterModeStatusTests.java +++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/ClusterModeStatusTests.java @@ -15,15 +15,15 @@ import org.json.JSONObject; import java.util.Iterator; /** - * This is a unit test class for the SmartDeviceLink library project class : + * This is a unit test class for the SmartDeviceLink library project class : * {@link com.smartdevicelink.proxy.rpc.ClusterModeStatus} */ -public class ClusterModeStatusTests extends TestCase{ +public class ClusterModeStatusTests extends TestCase { - private ClusterModeStatus msg; + private ClusterModeStatus msg; @Override - public void setUp(){ + public void setUp() { msg = new ClusterModeStatus(); msg.setPowerModeActive(TestValues.GENERAL_BOOLEAN); @@ -33,21 +33,21 @@ public class ClusterModeStatusTests extends TestCase{ } /** - * Tests the expected values of the RPC message. - */ - public void testRpcValues () { - // Test Values + * Tests the expected values of the RPC message. + */ + public void testRpcValues() { + // Test Values boolean powerMode = msg.getPowerModeActive(); PowerModeQualificationStatus qualification = msg.getPowerModeQualificationStatus(); PowerModeStatus status = msg.getPowerModeStatus(); CarModeStatus carStatus = msg.getCarModeStatus(); - + // Valid Tests assertEquals(TestValues.MATCH, TestValues.GENERAL_BOOLEAN, powerMode); assertEquals(TestValues.MATCH, TestValues.GENERAL_POWERMODEQUALIFICATIONSTATUS, qualification); assertEquals(TestValues.MATCH, TestValues.GENERAL_POWERMODESTATUS, status); assertEquals(TestValues.MATCH, TestValues.GENERAL_CARMODESTATUS, carStatus); - + // Invalid/Null Tests ClusterModeStatus msg = new ClusterModeStatus(); assertNotNull(TestValues.NOT_NULL, msg); @@ -57,11 +57,11 @@ public class ClusterModeStatusTests extends TestCase{ assertNull(TestValues.NULL, msg.getPowerModeQualificationStatus()); assertNull(TestValues.NULL, msg.getCarModeStatus()); } - - public void testJson(){ + + public void testJson() { JSONObject reference = new JSONObject(); - try{ + try { reference.put(ClusterModeStatus.KEY_POWER_MODE_ACTIVE, TestValues.GENERAL_BOOLEAN); reference.put(ClusterModeStatus.KEY_POWER_MODE_STATUS, TestValues.GENERAL_POWERMODESTATUS); reference.put(ClusterModeStatus.KEY_POWER_MODE_QUALIFICATION_STATUS, TestValues.GENERAL_POWERMODEQUALIFICATIONSTATUS); @@ -71,12 +71,12 @@ public class ClusterModeStatusTests extends TestCase{ assertEquals(TestValues.MATCH, reference.length(), underTest.length()); Iterator<?> iterator = reference.keys(); - while(iterator.hasNext()){ + while (iterator.hasNext()) { String key = (String) iterator.next(); assertEquals(TestValues.MATCH, JsonUtils.readObjectFromJsonObject(reference, key), JsonUtils.readObjectFromJsonObject(underTest, key)); } - } catch(JSONException e){ - fail(TestValues.JSON_FAIL); + } catch (JSONException e) { + fail(TestValues.JSON_FAIL); } } }
\ No newline at end of file diff --git a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/CoordinateTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/CoordinateTests.java index 40931dc1e..8c32ea7c1 100644 --- a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/CoordinateTests.java +++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/CoordinateTests.java @@ -20,7 +20,7 @@ public class CoordinateTests extends TestCase { private Coordinate msg; @Override - public void setUp(){ + public void setUp() { msg = new Coordinate(); msg.setLatitudeDegrees(TestValues.GENERAL_FLOAT); @@ -30,7 +30,7 @@ public class CoordinateTests extends TestCase { /** * Tests the expected values of the RPC message. */ - public void testRpcValues () { + public void testRpcValues() { // Test Values float floatLat = msg.getLatitudeDegrees(); float floatLong = msg.getLongitudeDegrees(); @@ -46,10 +46,10 @@ public class CoordinateTests extends TestCase { assertNull(TestValues.NULL, msg.getLongitudeDegrees()); } - public void testJson(){ + public void testJson() { JSONObject reference = new JSONObject(); - try{ + try { reference.put(Coordinate.KEY_LATITUDE_DEGREES, (Float) TestValues.GENERAL_FLOAT); reference.put(Coordinate.KEY_LONGITUDE_DEGREES, (Float) TestValues.GENERAL_FLOAT); @@ -58,7 +58,7 @@ public class CoordinateTests extends TestCase { assertEquals(TestValues.MATCH, reference.length(), underTest.length()); Iterator<?> iterator = reference.keys(); - while(iterator.hasNext()){ + while (iterator.hasNext()) { String key = (String) iterator.next(); Object a = JsonUtils.readObjectFromJsonObject(reference, key); @@ -66,7 +66,7 @@ public class CoordinateTests extends TestCase { assertEquals(TestValues.MATCH, a, b); } - } catch(JSONException e){ + } catch (JSONException e) { fail(TestValues.JSON_FAIL); } } diff --git a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/DIDResultTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/DIDResultTests.java index 3fa76b93a..441d71562 100644 --- a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/DIDResultTests.java +++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/DIDResultTests.java @@ -13,7 +13,7 @@ import org.json.JSONObject; import java.util.Iterator; /** - * This is a unit test class for the SmartDeviceLink library project class : + * This is a unit test class for the SmartDeviceLink library project class : * {@link com.smartdevicelink.proxy.rpc.DIDResult} */ public class DIDResultTests extends TestCase { @@ -21,7 +21,7 @@ public class DIDResultTests extends TestCase { private DIDResult msg; @Override - public void setUp(){ + public void setUp() { msg = new DIDResult(); msg.setData(TestValues.GENERAL_STRING); @@ -29,17 +29,17 @@ public class DIDResultTests extends TestCase { } /** - * Tests the expected values of the RPC message. - */ - public void testRpcValues () { - // Test Values + * Tests the expected values of the RPC message. + */ + public void testRpcValues() { + // Test Values String data = msg.getData(); VehicleDataResultCode resultCode = msg.getResultCode(); - + // Valid Tests assertEquals(TestValues.MATCH, TestValues.GENERAL_STRING, data); assertEquals(TestValues.MATCH, TestValues.GENERAL_VEHICLEDATARESULTCODE, resultCode); - + // Invalid/Null Tests DIDResult msg = new DIDResult(); assertNotNull(TestValues.NOT_NULL, msg); @@ -48,10 +48,10 @@ public class DIDResultTests extends TestCase { assertNull(TestValues.NULL, msg.getResultCode()); } - public void testJson(){ + public void testJson() { JSONObject reference = new JSONObject(); - try{ + try { reference.put(DIDResult.KEY_DATA, TestValues.GENERAL_STRING); reference.put(DIDResult.KEY_RESULT_CODE, TestValues.GENERAL_VEHICLEDATARESULTCODE); @@ -59,12 +59,12 @@ public class DIDResultTests extends TestCase { assertEquals(TestValues.MATCH, reference.length(), underTest.length()); Iterator<?> iterator = reference.keys(); - while(iterator.hasNext()){ + while (iterator.hasNext()) { String key = (String) iterator.next(); assertEquals(TestValues.MATCH, JsonUtils.readObjectFromJsonObject(reference, key), JsonUtils.readObjectFromJsonObject(underTest, key)); } - } catch(JSONException e){ - fail(TestValues.JSON_FAIL); + } catch (JSONException e) { + fail(TestValues.JSON_FAIL); } } }
\ No newline at end of file diff --git a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/DTCTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/DTCTests.java index a31a897ae..ba5ce05a0 100644 --- a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/DTCTests.java +++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/DTCTests.java @@ -12,15 +12,15 @@ import org.json.JSONObject; import java.util.Iterator; /** - * This is a unit test class for the SmartDeviceLink library project class : + * This is a unit test class for the SmartDeviceLink library project class : * {@link com.smartdevicelink.proxy.rpc.DTC} */ -public class DTCTests extends TestCase{ +public class DTCTests extends TestCase { private DTC msg; @Override - public void setUp(){ + public void setUp() { msg = new DTC(); msg.setIdentifier(TestValues.GENERAL_STRING); @@ -28,17 +28,17 @@ public class DTCTests extends TestCase{ } /** - * Tests the expected values of the RPC message. - */ - public void testRpcValues () { - // Test Values + * Tests the expected values of the RPC message. + */ + public void testRpcValues() { + // Test Values String identifier = msg.getIdentifier(); String statusByte = msg.getStatusByte(); - + // Valid Tests assertEquals(TestValues.MATCH, TestValues.GENERAL_STRING, identifier); assertEquals(TestValues.MATCH, TestValues.GENERAL_STRING, statusByte); - + // Invalid/Null Tests DTC msg = new DTC(); assertNotNull(TestValues.NOT_NULL, msg); @@ -47,10 +47,10 @@ public class DTCTests extends TestCase{ assertNull(TestValues.NULL, msg.getStatusByte()); } - public void testJson(){ + public void testJson() { JSONObject reference = new JSONObject(); - try{ + try { reference.put(DTC.KEY_IDENTIFIER, TestValues.GENERAL_STRING); reference.put(DTC.KEY_STATUS_BYTE, TestValues.GENERAL_STRING); @@ -58,12 +58,12 @@ public class DTCTests extends TestCase{ assertEquals(TestValues.MATCH, reference.length(), underTest.length()); Iterator<?> iterator = reference.keys(); - while(iterator.hasNext()){ + while (iterator.hasNext()) { String key = (String) iterator.next(); assertEquals(TestValues.MATCH, JsonUtils.readObjectFromJsonObject(reference, key), JsonUtils.readObjectFromJsonObject(underTest, key)); } - }catch(JSONException e){ - fail(TestValues.JSON_FAIL); + } catch (JSONException e) { + fail(TestValues.JSON_FAIL); } } }
\ No newline at end of file diff --git a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/DateTimeTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/DateTimeTests.java index b0bd3a2dd..7ef000abd 100644 --- a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/DateTimeTests.java +++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/DateTimeTests.java @@ -20,7 +20,7 @@ public class DateTimeTests extends TestCase { private DateTime msg; @Override - public void setUp(){ + public void setUp() { msg = new DateTime(); msg.setYear(TestValues.GENERAL_INT); @@ -37,7 +37,7 @@ public class DateTimeTests extends TestCase { /** * Tests the expected values of the RPC message. */ - public void testRpcValues () { + public void testRpcValues() { // Test Values Integer year = msg.getYear(); Integer month = msg.getMonth(); @@ -75,10 +75,10 @@ public class DateTimeTests extends TestCase { assertNull(TestValues.NULL, msg.getTzMinute()); } - public void testJson(){ + public void testJson() { JSONObject reference = new JSONObject(); - try{ + try { reference.put(DateTime.KEY_YEAR, (Integer) TestValues.GENERAL_INT); reference.put(DateTime.KEY_MONTH, (Integer) TestValues.GENERAL_INT); reference.put(DateTime.KEY_DAY, (Integer) TestValues.GENERAL_INT); @@ -94,7 +94,7 @@ public class DateTimeTests extends TestCase { assertEquals(TestValues.MATCH, reference.length(), underTest.length()); Iterator<?> iterator = reference.keys(); - while(iterator.hasNext()){ + while (iterator.hasNext()) { String key = (String) iterator.next(); Object a = JsonUtils.readObjectFromJsonObject(reference, key); @@ -102,7 +102,7 @@ public class DateTimeTests extends TestCase { assertEquals(TestValues.MATCH, a, b); } - } catch(JSONException e){ + } catch (JSONException e) { fail(TestValues.JSON_FAIL); } } diff --git a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/DeviceInfoTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/DeviceInfoTests.java index c08b5e525..2274d512f 100644 --- a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/DeviceInfoTests.java +++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/DeviceInfoTests.java @@ -12,15 +12,15 @@ import org.json.JSONObject; import java.util.Iterator; /** - * This is a unit test class for the SmartDeviceLink library project class : + * This is a unit test class for the SmartDeviceLink library project class : * {@link com.smartdevicelink.proxy.rpc.DeviceInfo} */ -public class DeviceInfoTests extends TestCase{ +public class DeviceInfoTests extends TestCase { - private DeviceInfo msg; + private DeviceInfo msg; @Override - public void setUp(){ + public void setUp() { msg = new DeviceInfo(); msg.setCarrier(TestValues.GENERAL_STRING); @@ -32,17 +32,17 @@ public class DeviceInfoTests extends TestCase{ } /** - * Tests the expected values of the RPC message. - */ - public void testRpcValues () { - // Test Values + * Tests the expected values of the RPC message. + */ + public void testRpcValues() { + // Test Values String carrier = msg.getCarrier(); String hardware = msg.getHardware(); String firmwareRev = msg.getFirmwareRev(); String os = msg.getOs(); String osVer = msg.getOsVersion(); int maxNum = msg.getMaxNumberRFCOMMPorts(); - + // Valid Tests assertEquals(TestValues.MATCH, TestValues.GENERAL_INT, maxNum); assertEquals(TestValues.MATCH, TestValues.GENERAL_STRING, osVer); @@ -50,7 +50,7 @@ public class DeviceInfoTests extends TestCase{ assertEquals(TestValues.MATCH, TestValues.GENERAL_STRING, firmwareRev); assertEquals(TestValues.MATCH, TestValues.GENERAL_STRING, hardware); assertEquals(TestValues.MATCH, TestValues.GENERAL_STRING, carrier); - + // Invalid/Null Tests DeviceInfo msg = new DeviceInfo(); assertNotNull(TestValues.NOT_NULL, msg); @@ -63,10 +63,10 @@ public class DeviceInfoTests extends TestCase{ assertNull(TestValues.NULL, msg.getMaxNumberRFCOMMPorts()); } - public void testJson(){ + public void testJson() { JSONObject reference = new JSONObject(); - try{ + try { reference.put(DeviceInfo.KEY_CARRIER, TestValues.GENERAL_STRING); reference.put(DeviceInfo.KEY_HARDWARE, TestValues.GENERAL_STRING); reference.put(DeviceInfo.KEY_FIRMWARE_REV, TestValues.GENERAL_STRING); @@ -78,12 +78,12 @@ public class DeviceInfoTests extends TestCase{ assertEquals(TestValues.MATCH, reference.length(), underTest.length()); Iterator<?> iterator = reference.keys(); - while(iterator.hasNext()){ + while (iterator.hasNext()) { String key = (String) iterator.next(); assertEquals(TestValues.MATCH, JsonUtils.readObjectFromJsonObject(reference, key), JsonUtils.readObjectFromJsonObject(underTest, key)); } - } catch(JSONException e){ - fail(TestValues.JSON_FAIL); + } catch (JSONException e) { + fail(TestValues.JSON_FAIL); } } }
\ No newline at end of file diff --git a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/DeviceStatusTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/DeviceStatusTests.java index 610ded046..65dfea4e3 100644 --- a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/DeviceStatusTests.java +++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/DeviceStatusTests.java @@ -14,7 +14,7 @@ import org.json.JSONObject; import java.util.Iterator; /** - * This is a unit test class for the SmartDeviceLink library project class : + * This is a unit test class for the SmartDeviceLink library project class : * {@link com.smartdevicelink.proxy.rpc.DeviceStatus} */ public class DeviceStatusTests extends TestCase { @@ -22,7 +22,7 @@ public class DeviceStatusTests extends TestCase { private DeviceStatus msg; @Override - public void setUp(){ + public void setUp() { msg = new DeviceStatus(); msg.setBattLevelStatus(TestValues.GENERAL_DEVICELEVELSTATUS); @@ -39,10 +39,10 @@ public class DeviceStatusTests extends TestCase { } /** - * Tests the expected values of the RPC message. - */ - public void testRpcValues () { - // Test Values + * Tests the expected values of the RPC message. + */ + public void testRpcValues() { + // Test Values DeviceLevelStatus battLevel = msg.getBattLevelStatus(); boolean btIcon = msg.getBtIconOn(); boolean callActive = msg.getCallActive(); @@ -54,7 +54,7 @@ public class DeviceStatusTests extends TestCase { boolean stereoAudio = msg.getStereoAudioOutputMuted(); boolean textAvailable = msg.getTextMsgAvailable(); boolean voiceRec = msg.getVoiceRecOn(); - + // Valid Tests assertEquals(TestValues.MATCH, TestValues.GENERAL_DEVICELEVELSTATUS, battLevel); assertEquals(TestValues.MATCH, TestValues.GENERAL_BOOLEAN, btIcon); @@ -67,7 +67,7 @@ public class DeviceStatusTests extends TestCase { assertEquals(TestValues.MATCH, TestValues.GENERAL_BOOLEAN, stereoAudio); assertEquals(TestValues.MATCH, TestValues.GENERAL_BOOLEAN, textAvailable); assertEquals(TestValues.MATCH, TestValues.GENERAL_BOOLEAN, voiceRec); - + // Invalid/Null Tests DeviceStatus msg = new DeviceStatus(); assertNotNull(TestValues.NOT_NULL, msg); @@ -85,10 +85,10 @@ public class DeviceStatusTests extends TestCase { assertNull(TestValues.NULL, msg.getVoiceRecOn()); } - public void testJson(){ + public void testJson() { JSONObject reference = new JSONObject(); - try{ + try { reference.put(DeviceStatus.KEY_BATT_LEVEL_STATUS, TestValues.GENERAL_DEVICELEVELSTATUS); reference.put(DeviceStatus.KEY_SIGNAL_LEVEL_STATUS, TestValues.GENERAL_DEVICELEVELSTATUS); reference.put(DeviceStatus.KEY_PRIMARY_AUDIO_SOURCE, TestValues.GENERAL_PRIMARYAUDIOSOURCE); @@ -105,12 +105,12 @@ public class DeviceStatusTests extends TestCase { assertEquals(TestValues.MATCH, reference.length(), underTest.length()); Iterator<?> iterator = reference.keys(); - while(iterator.hasNext()){ + while (iterator.hasNext()) { String key = (String) iterator.next(); assertEquals(TestValues.MATCH, JsonUtils.readObjectFromJsonObject(reference, key), JsonUtils.readObjectFromJsonObject(underTest, key)); } - } catch(JSONException e){ - fail(TestValues.JSON_FAIL); + } catch (JSONException e) { + fail(TestValues.JSON_FAIL); } } }
\ No newline at end of file diff --git a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/DisplayCapabilitiesTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/DisplayCapabilitiesTests.java index a533df277..186f75992 100644 --- a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/DisplayCapabilitiesTests.java +++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/DisplayCapabilitiesTests.java @@ -22,16 +22,16 @@ import java.util.Iterator; import java.util.List; /** - * This is a unit test class for the SmartDeviceLink library project class : + * This is a unit test class for the SmartDeviceLink library project class : * {@link com.smartdevicelink.proxy.rpc.DisplayCapabilities} */ -public class DisplayCapabilitiesTests extends TestCase{ - +public class DisplayCapabilitiesTests extends TestCase { + private DisplayCapabilities msg; @Override - public void setUp(){ - msg = new DisplayCapabilities(); + public void setUp() { + msg = new DisplayCapabilities(); msg.setGraphicSupported(TestValues.GENERAL_BOOLEAN); msg.setNumCustomPresetsAvailable(TestValues.GENERAL_INT); @@ -45,10 +45,10 @@ public class DisplayCapabilitiesTests extends TestCase{ } /** - * Tests the expected values of the RPC message. - */ - public void testRpcValues () { - // Test Values + * Tests the expected values of the RPC message. + */ + public void testRpcValues() { + // Test Values boolean graphicSupported = msg.getGraphicSupported(); int numPresets = msg.getNumCustomPresetsAvailable(); DisplayType displayType = msg.getDisplayType(); @@ -66,27 +66,27 @@ public class DisplayCapabilitiesTests extends TestCase{ assertEquals(TestValues.MATCH, TestValues.GENERAL_STRING, displayName); assertTrue(TestValues.TRUE, Validator.validateScreenParams(TestValues.GENERAL_SCREENPARAMS, screenParams)); assertEquals(TestValues.MATCH, TestValues.GENERAL_STRING_LIST.size(), templatesAvailable.size()); - assertEquals(TestValues.MATCH, TestValues.GENERAL_MEDIACLOCKFORMAT_LIST.size(), mediaClock.size()); - assertEquals(TestValues.MATCH, TestValues.GENERAL_TEXTFIELD_LIST.size(), textFields.size()); - assertEquals(TestValues.MATCH, TestValues.GENERAL_IMAGEFIELD_LIST.size(), imageFields.size()); + assertEquals(TestValues.MATCH, TestValues.GENERAL_MEDIACLOCKFORMAT_LIST.size(), mediaClock.size()); + assertEquals(TestValues.MATCH, TestValues.GENERAL_TEXTFIELD_LIST.size(), textFields.size()); + assertEquals(TestValues.MATCH, TestValues.GENERAL_IMAGEFIELD_LIST.size(), imageFields.size()); - for(int i = 0; i < TestValues.GENERAL_STRING_LIST.size(); i++){ + for (int i = 0; i < TestValues.GENERAL_STRING_LIST.size(); i++) { assertEquals(TestValues.MATCH, TestValues.GENERAL_STRING_LIST.get(i), templatesAvailable.get(i)); } - - for(int i = 0; i < TestValues.GENERAL_MEDIACLOCKFORMAT_LIST.size(); i++){ + + for (int i = 0; i < TestValues.GENERAL_MEDIACLOCKFORMAT_LIST.size(); i++) { assertEquals(TestValues.MATCH, TestValues.GENERAL_MEDIACLOCKFORMAT_LIST.get(i), mediaClock.get(i)); } - for(int i = 0; i < TestValues.GENERAL_TEXTFIELD_LIST.size(); i++){ + for (int i = 0; i < TestValues.GENERAL_TEXTFIELD_LIST.size(); i++) { assertTrue(TestValues.TRUE, Validator.validateTextFields(TestValues.GENERAL_TEXTFIELD_LIST.get(i), textFields.get(i))); } - for(int i = 0; i < TestValues.GENERAL_IMAGEFIELD_LIST.size(); i++){ + for (int i = 0; i < TestValues.GENERAL_IMAGEFIELD_LIST.size(); i++) { assertTrue(TestValues.TRUE, Validator.validateImageFields(TestValues.GENERAL_IMAGEFIELD_LIST.get(i), imageFields.get(i))); } - + // Invalid/Null Tests DisplayCapabilities msg = new DisplayCapabilities(); assertNotNull(TestValues.NOT_NULL, msg); @@ -101,11 +101,11 @@ public class DisplayCapabilitiesTests extends TestCase{ assertNull(TestValues.NULL, msg.getTemplatesAvailable()); assertNull(TestValues.NULL, msg.getTextFields()); } - - public void testJson(){ + + public void testJson() { JSONObject reference = new JSONObject(); - try{ + try { reference.put(DisplayCapabilities.KEY_NUM_CUSTOM_PRESETS_AVAILABLE, TestValues.GENERAL_INT); reference.put(DisplayCapabilities.KEY_GRAPHIC_SUPPORTED, TestValues.GENERAL_BOOLEAN); reference.put(DisplayCapabilities.KEY_DISPLAY_TYPE, TestValues.GENERAL_DISPLAYTYPE); @@ -118,56 +118,56 @@ public class DisplayCapabilitiesTests extends TestCase{ JSONObject underTest = msg.serializeJSON(); assertEquals(TestValues.MATCH, reference.length(), underTest.length()); - + Iterator<?> iterator = reference.keys(); - while(iterator.hasNext()){ + while (iterator.hasNext()) { String key = (String) iterator.next(); - if(key.equals(DisplayCapabilities.KEY_IMAGE_FIELDS)){ + if (key.equals(DisplayCapabilities.KEY_IMAGE_FIELDS)) { 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.validateImageFields(new ImageField(hashReference), new ImageField(hashTest))); + 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.validateImageFields(new ImageField(hashReference), new ImageField(hashTest))); } - } else if(key.equals(DisplayCapabilities.KEY_TEXT_FIELDS)){ - JSONArray referenceArray = JsonUtils.readJsonArrayFromJsonObject(reference, key); + } else if (key.equals(DisplayCapabilities.KEY_TEXT_FIELDS)) { + 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.validateTextFields(new TextField(hashReference), new TextField(hashTest))); + + 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.validateTextFields(new TextField(hashReference), new TextField(hashTest))); } - } else if(key.equals(DisplayCapabilities.KEY_TEMPLATES_AVAILABLE)){ + } else if (key.equals(DisplayCapabilities.KEY_TEMPLATES_AVAILABLE)) { JSONArray referenceArray = JsonUtils.readJsonArrayFromJsonObject(reference, key); JSONArray underTestArray = JsonUtils.readJsonArrayFromJsonObject(underTest, key); assertEquals(TestValues.MATCH, referenceArray.length(), underTestArray.length()); assertTrue(TestValues.TRUE, Validator.validateStringList(JsonUtils.readStringListFromJsonObject(reference, key), JsonUtils.readStringListFromJsonObject(underTest, key))); - } else if(key.equals(DisplayCapabilities.KEY_SCREEN_PARAMS)){ + } else if (key.equals(DisplayCapabilities.KEY_SCREEN_PARAMS)) { JSONObject referenceArray = JsonUtils.readJsonObjectFromJsonObject(reference, key); JSONObject underTestArray = JsonUtils.readJsonObjectFromJsonObject(underTest, key); - Hashtable<String, Object> hashReference = JsonRPCMarshaller.deserializeJSONObject(referenceArray); - Hashtable<String, Object> hashTest= JsonRPCMarshaller.deserializeJSONObject(underTestArray); - + Hashtable<String, Object> hashReference = JsonRPCMarshaller.deserializeJSONObject(referenceArray); + Hashtable<String, Object> hashTest = JsonRPCMarshaller.deserializeJSONObject(underTestArray); + assertTrue(TestValues.TRUE, Validator.validateScreenParams(new ScreenParams(hashReference), new ScreenParams(hashTest))); - } else if(key.equals(DisplayCapabilities.KEY_MEDIA_CLOCK_FORMATS)){ + } else if (key.equals(DisplayCapabilities.KEY_MEDIA_CLOCK_FORMATS)) { 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++){ + for (int i = 0; i < referenceArray.length(); i++) { assertTrue(TestValues.TRUE, Validator.validateText(referenceArray.getString(i), underTestArray.getString(i)));// not a string? } - } else{ + } else { assertEquals(TestValues.MATCH, JsonUtils.readObjectFromJsonObject(reference, key), JsonUtils.readObjectFromJsonObject(underTest, key)); } } - }catch(JSONException e){ - fail(TestValues.JSON_FAIL); + } catch (JSONException e) { + fail(TestValues.JSON_FAIL); } } }
\ No newline at end of file diff --git a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/DriverDistractionCapabilityTest.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/DriverDistractionCapabilityTest.java index 767c264fa..274dadc3b 100644 --- a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/DriverDistractionCapabilityTest.java +++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/DriverDistractionCapabilityTest.java @@ -57,7 +57,7 @@ public class DriverDistractionCapabilityTest extends TestCase { assertEquals(TestValues.MATCH, reference.length(), underTest.length()); Iterator<?> iterator = reference.keys(); - while(iterator.hasNext()){ + while (iterator.hasNext()) { String key = (String) iterator.next(); assertEquals(TestValues.MATCH, JsonUtils.readObjectFromJsonObject(reference, key), JsonUtils.readObjectFromJsonObject(underTest, key)); } diff --git a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/DynamicUpdateCapabilitiesTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/DynamicUpdateCapabilitiesTests.java index 01e318e8a..60d7b7a15 100644 --- a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/DynamicUpdateCapabilitiesTests.java +++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/DynamicUpdateCapabilitiesTests.java @@ -76,15 +76,15 @@ public class DynamicUpdateCapabilitiesTests extends TestCase { assertEquals(TestValues.MATCH, referenceArray.length(), underTestArray.length()); for (int i = 0; i < referenceArray.length(); i++) { - imageFieldNameListReference.add( (ImageFieldName) referenceArray.get(i)); - imageFieldNameListTest.add( (ImageFieldName) underTestArray.get(i)); + imageFieldNameListReference.add((ImageFieldName) referenceArray.get(i)); + imageFieldNameListTest.add((ImageFieldName) underTestArray.get(i)); } assertTrue(TestValues.TRUE, imageFieldNameListReference.containsAll(imageFieldNameListTest) && imageFieldNameListTest.containsAll(imageFieldNameListReference)); } else if (key.equals(DynamicUpdateCapabilities.KEY_SUPPORTS_DYNAMIC_SUB_MENUS)) { boolean referenceBool = JsonUtils.readBooleanFromJsonObject(reference, key); boolean underTestBool = JsonUtils.readBooleanFromJsonObject(underTest, key); assertEquals(TestValues.MATCH, referenceBool, underTestBool); - } else { + } else { assertEquals(TestValues.MATCH, JsonUtils.readObjectFromJsonObject(reference, key), JsonUtils.readObjectFromJsonObject(underTest, key)); } } diff --git a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/ECallInfoTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/ECallInfoTests.java index eaf777f23..621223110 100644 --- a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/ECallInfoTests.java +++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/ECallInfoTests.java @@ -14,15 +14,15 @@ import org.json.JSONObject; import java.util.Iterator; /** - * This is a unit test class for the SmartDeviceLink library project class : + * This is a unit test class for the SmartDeviceLink library project class : * {@link com.smartdevicelink.proxy.rpc.ECallInfo} */ -public class ECallInfoTests extends TestCase{ +public class ECallInfoTests extends TestCase { private ECallInfo msg; @Override - public void setUp(){ + public void setUp() { msg = new ECallInfo(); msg.setAuxECallNotificationStatus(TestValues.GENERAL_VEHICLEDATANOTIFICATIONSTATUS); @@ -31,19 +31,19 @@ public class ECallInfoTests extends TestCase{ } /** - * Tests the expected values of the RPC message. - */ - public void testRpcValues () { - // Test Values + * Tests the expected values of the RPC message. + */ + public void testRpcValues() { + // Test Values VehicleDataNotificationStatus auxEcall = msg.getAuxECallNotificationStatus(); VehicleDataNotificationStatus ecallNotify = msg.getECallNotificationStatus(); ECallConfirmationStatus ecallConfirm = msg.getECallConfirmationStatus(); - + // Valid Tests assertEquals(TestValues.MATCH, TestValues.GENERAL_VEHICLEDATANOTIFICATIONSTATUS, auxEcall); assertEquals(TestValues.MATCH, TestValues.GENERAL_VEHICLEDATANOTIFICATIONSTATUS, ecallNotify); assertEquals(TestValues.MATCH, TestValues.GENERAL_ECALLCONFIRMATIONSTATUS, ecallConfirm); - + // Invalid/Null Tests ECallInfo msg = new ECallInfo(); assertNotNull(TestValues.NOT_NULL, msg); @@ -53,10 +53,10 @@ public class ECallInfoTests extends TestCase{ assertNull(TestValues.NULL, msg.getAuxECallNotificationStatus()); } - public void testJson(){ + public void testJson() { JSONObject reference = new JSONObject(); - try{ + try { reference.put(ECallInfo.KEY_AUX_E_CALL_NOTIFICATION_STATUS, TestValues.GENERAL_VEHICLEDATANOTIFICATIONSTATUS); reference.put(ECallInfo.KEY_E_CALL_NOTIFICATION_STATUS, TestValues.GENERAL_VEHICLEDATANOTIFICATIONSTATUS); reference.put(ECallInfo.KEY_E_CALL_CONFIRMATION_STATUS, TestValues.GENERAL_ECALLCONFIRMATIONSTATUS); @@ -65,12 +65,12 @@ public class ECallInfoTests extends TestCase{ assertEquals(TestValues.MATCH, reference.length(), underTest.length()); Iterator<?> iterator = reference.keys(); - while(iterator.hasNext()){ + while (iterator.hasNext()) { String key = (String) iterator.next(); assertEquals(TestValues.MATCH, JsonUtils.readObjectFromJsonObject(reference, key), JsonUtils.readObjectFromJsonObject(underTest, key)); } - }catch(JSONException e){ - fail(TestValues.JSON_FAIL); + } catch (JSONException e) { + fail(TestValues.JSON_FAIL); } } }
\ No newline at end of file diff --git a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/EmergencyEventTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/EmergencyEventTests.java index 6bfd4b094..4a97fe9ef 100644 --- a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/EmergencyEventTests.java +++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/EmergencyEventTests.java @@ -15,15 +15,15 @@ import org.json.JSONObject; import java.util.Iterator; /** - * This is a unit test class for the SmartDeviceLink library project class : + * This is a unit test class for the SmartDeviceLink library project class : * {@link com.smartdevicelink.proxy.rpc.EmergencyEvent} */ -public class EmergencyEventTests extends TestCase{ +public class EmergencyEventTests extends TestCase { private EmergencyEvent msg; @Override - public void setUp(){ + public void setUp() { msg = new EmergencyEvent(); msg.setEmergencyEventType(TestValues.GENERAL_EMERGENCYEVENTTYPE); @@ -34,23 +34,23 @@ public class EmergencyEventTests extends TestCase{ } /** - * Tests the expected values of the RPC message. - */ - public void testRpcValues () { - // Test Values + * Tests the expected values of the RPC message. + */ + public void testRpcValues() { + // Test Values EmergencyEventType type = msg.getEmergencyEventType(); FuelCutoffStatus cutoffStatus = msg.getFuelCutoffStatus(); VehicleDataEventStatus multipleEvents = msg.getMultipleEvents(); int changeVelocity = msg.getMaximumChangeVelocity(); VehicleDataEventStatus rollover = msg.getRolloverEvent(); - + // Valid Tests assertEquals(TestValues.MATCH, TestValues.GENERAL_EMERGENCYEVENTTYPE, type); assertEquals(TestValues.MATCH, TestValues.GENERAL_FUELCUTOFFSTATUS, cutoffStatus); assertEquals(TestValues.MATCH, TestValues.GENERAL_INT, changeVelocity); assertEquals(TestValues.MATCH, TestValues.GENERAL_VEHCILEDATAEVENTSTATUS, multipleEvents); assertEquals(TestValues.MATCH, TestValues.GENERAL_VEHCILEDATAEVENTSTATUS, rollover); - + // Invalid/Null Tests EmergencyEvent msg = new EmergencyEvent(); assertNotNull(TestValues.NOT_NULL, msg); @@ -62,10 +62,10 @@ public class EmergencyEventTests extends TestCase{ assertNull(TestValues.NULL, msg.getRolloverEvent()); } - public void testJson(){ + public void testJson() { JSONObject reference = new JSONObject(); - try{ + try { reference.put(EmergencyEvent.KEY_FUEL_CUTOFF_STATUS, TestValues.GENERAL_FUELCUTOFFSTATUS); reference.put(EmergencyEvent.KEY_MULTIPLE_EVENTS, TestValues.GENERAL_VEHCILEDATAEVENTSTATUS); reference.put(EmergencyEvent.KEY_ROLLOVER_EVENT, TestValues.GENERAL_VEHCILEDATAEVENTSTATUS); @@ -76,12 +76,12 @@ public class EmergencyEventTests extends TestCase{ assertEquals(TestValues.MATCH, reference.length(), underTest.length()); Iterator<?> iterator = reference.keys(); - while(iterator.hasNext()){ + while (iterator.hasNext()) { String key = (String) iterator.next(); assertEquals(TestValues.MATCH, JsonUtils.readObjectFromJsonObject(reference, key), JsonUtils.readObjectFromJsonObject(underTest, key)); } - }catch(JSONException e){ - fail(TestValues.JSON_FAIL); + } catch (JSONException e) { + fail(TestValues.JSON_FAIL); } } }
\ No newline at end of file diff --git a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/EqualizerSettingsTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/EqualizerSettingsTests.java index 7df963cd8..b9ab22812 100644 --- a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/EqualizerSettingsTests.java +++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/EqualizerSettingsTests.java @@ -17,62 +17,62 @@ import java.util.Iterator; */ public class EqualizerSettingsTests extends TestCase { - private EqualizerSettings msg; + private EqualizerSettings msg; - @Override - public void setUp() { - msg = new EqualizerSettings(); + @Override + public void setUp() { + msg = new EqualizerSettings(); - msg.setChannelId(TestValues.GENERAL_INT); - msg.setChannelName(TestValues.GENERAL_STRING); - msg.setChannelSetting(TestValues.GENERAL_INT); - } + msg.setChannelId(TestValues.GENERAL_INT); + msg.setChannelName(TestValues.GENERAL_STRING); + msg.setChannelSetting(TestValues.GENERAL_INT); + } - /** - * Tests the expected values of the RPC message. - */ - public void testRpcValues() { - // Test Values + /** + * Tests the expected values of the RPC message. + */ + public void testRpcValues() { + // Test Values - int channelId = msg.getChannelId(); - String channelName = msg.getChannelName(); - int channelSetting = msg.getChannelSetting(); + int channelId = msg.getChannelId(); + String channelName = msg.getChannelName(); + int channelSetting = msg.getChannelSetting(); - // Valid Tests - assertEquals(TestValues.MATCH, TestValues.GENERAL_INT, channelId); - assertEquals(TestValues.MATCH, TestValues.GENERAL_STRING, channelName); - assertEquals(TestValues.MATCH, TestValues.GENERAL_INT, channelSetting); + // Valid Tests + assertEquals(TestValues.MATCH, TestValues.GENERAL_INT, channelId); + assertEquals(TestValues.MATCH, TestValues.GENERAL_STRING, channelName); + assertEquals(TestValues.MATCH, TestValues.GENERAL_INT, channelSetting); - // Invalid/Null Tests - EqualizerSettings msg = new EqualizerSettings(); - assertNotNull(TestValues.NOT_NULL, msg); + // Invalid/Null Tests + EqualizerSettings msg = new EqualizerSettings(); + assertNotNull(TestValues.NOT_NULL, msg); - assertNull(TestValues.NULL, msg.getChannelId()); - assertNull(TestValues.NULL, msg.getChannelName()); - assertNull(TestValues.NULL, msg.getChannelSetting()); - } + assertNull(TestValues.NULL, msg.getChannelId()); + assertNull(TestValues.NULL, msg.getChannelName()); + assertNull(TestValues.NULL, msg.getChannelSetting()); + } - public void testJson() { - JSONObject reference = new JSONObject(); + public void testJson() { + JSONObject reference = new JSONObject(); - try { + try { - reference.put(EqualizerSettings.KEY_CHANNEL_ID, TestValues.GENERAL_INT); - reference.put(EqualizerSettings.KEY_CHANNEL_NAME, TestValues.GENERAL_STRING); - reference.put(EqualizerSettings.KEY_CHANNEL_SETTING, TestValues.GENERAL_INT); + reference.put(EqualizerSettings.KEY_CHANNEL_ID, TestValues.GENERAL_INT); + reference.put(EqualizerSettings.KEY_CHANNEL_NAME, TestValues.GENERAL_STRING); + reference.put(EqualizerSettings.KEY_CHANNEL_SETTING, TestValues.GENERAL_INT); - JSONObject underTest = msg.serializeJSON(); - assertEquals(TestValues.MATCH, reference.length(), underTest.length()); + JSONObject underTest = msg.serializeJSON(); + assertEquals(TestValues.MATCH, reference.length(), underTest.length()); - Iterator<?> iterator = reference.keys(); - while (iterator.hasNext()) { - String key = (String) iterator.next(); + Iterator<?> iterator = reference.keys(); + while (iterator.hasNext()) { + String key = (String) iterator.next(); - assertEquals(TestValues.MATCH, JsonUtils.readObjectFromJsonObject(reference, key), JsonUtils.readObjectFromJsonObject(underTest, key)); + assertEquals(TestValues.MATCH, JsonUtils.readObjectFromJsonObject(reference, key), JsonUtils.readObjectFromJsonObject(underTest, key)); - } - } catch (JSONException e) { - fail(TestValues.JSON_FAIL); - } - } + } + } catch (JSONException e) { + fail(TestValues.JSON_FAIL); + } + } }
\ No newline at end of file diff --git a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/FuelRangeTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/FuelRangeTests.java index 547aae247..586050a72 100644 --- a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/FuelRangeTests.java +++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/FuelRangeTests.java @@ -15,15 +15,15 @@ import org.json.JSONObject; import java.util.Iterator; /** - * This is a unit test class for the SmartDeviceLink library project class : + * This is a unit test class for the SmartDeviceLink library project class : * {@link com.smartdevicelink.proxy.rpc.FuelRange} */ -public class FuelRangeTests extends TestCase{ +public class FuelRangeTests extends TestCase { private FuelRange msg; @Override - public void setUp(){ + public void setUp() { msg = new FuelRange(); msg.setType(TestValues.GENERAL_FUELTYPE); @@ -35,10 +35,10 @@ public class FuelRangeTests extends TestCase{ } /** - * Tests the expected values of the RPC message. - */ - public void testRpcValues () { - // Test Values + * Tests the expected values of the RPC message. + */ + public void testRpcValues() { + // Test Values FuelType fuelType = msg.getType(); float range = msg.getRange(); float level = msg.getLevel(); @@ -53,7 +53,7 @@ public class FuelRangeTests extends TestCase{ assertEquals(TestValues.MATCH, TestValues.GENERAL_COMPONENTVOLUMESTATUS, levelState); assertEquals(TestValues.MATCH, TestValues.GENERAL_CAPACITYUNIT, capacityUnit); assertEquals(TestValues.MATCH, TestValues.GENERAL_FLOAT, capacity); - + // Invalid/Null Tests FuelRange msg = new FuelRange(); assertNotNull(TestValues.NOT_NULL, msg); @@ -66,10 +66,10 @@ public class FuelRangeTests extends TestCase{ assertNull(TestValues.NULL, msg.getCapacity()); } - public void testJson(){ + public void testJson() { JSONObject reference = new JSONObject(); - try{ + try { reference.put(FuelRange.KEY_TYPE, TestValues.GENERAL_FUELTYPE); reference.put(FuelRange.KEY_RANGE, (Float) TestValues.GENERAL_FLOAT); reference.put(FuelRange.KEY_LEVEL, TestValues.GENERAL_FLOAT); @@ -81,13 +81,13 @@ public class FuelRangeTests extends TestCase{ assertEquals(TestValues.MATCH, reference.length(), underTest.length()); Iterator<?> iterator = reference.keys(); - while(iterator.hasNext()) { + while (iterator.hasNext()) { String key = (String) iterator.next(); assertEquals(TestValues.MATCH, JsonUtils.readObjectFromJsonObject(reference, key), JsonUtils.readObjectFromJsonObject(underTest, key)); } - }catch(JSONException e){ - fail(TestValues.JSON_FAIL); + } catch (JSONException e) { + fail(TestValues.JSON_FAIL); } } }
\ No newline at end of file diff --git a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/GPSDataTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/GPSDataTests.java index dbbdd2ac8..ccd85154d 100644 --- a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/GPSDataTests.java +++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/GPSDataTests.java @@ -14,15 +14,15 @@ import org.json.JSONObject; import java.util.Iterator; /** - * This is a unit test class for the SmartDeviceLink library project class : + * This is a unit test class for the SmartDeviceLink library project class : * {@link com.smartdevicelink.proxy.rpc.GPSData} */ -public class GPSDataTests extends TestCase{ +public class GPSDataTests extends TestCase { private GPSData msg; @Override - public void setUp(){ + public void setUp() { msg = new GPSData(); msg.setActual(TestValues.GENERAL_BOOLEAN); @@ -47,10 +47,10 @@ public class GPSDataTests extends TestCase{ } /** - * Tests the expected values of the RPC message. - */ - public void testRpcValues () { - // Test Values + * Tests the expected values of the RPC message. + */ + public void testRpcValues() { + // Test Values boolean actual = msg.getActual(); double latitude = msg.getLatitudeDegrees(); double longitude = msg.getLongitudeDegrees(); @@ -70,7 +70,7 @@ public class GPSDataTests extends TestCase{ Dimension dimension = msg.getDimension(); CompassDirection direction = msg.getCompassDirection(); boolean shifted = msg.getShifted(); - + // Valid Tests assertEquals(TestValues.MATCH, TestValues.GENERAL_BOOLEAN, actual); assertEquals(TestValues.MATCH, TestValues.GENERAL_DOUBLE, latitude); @@ -91,7 +91,7 @@ public class GPSDataTests extends TestCase{ assertEquals(TestValues.MATCH, TestValues.GENERAL_DIMENSION, dimension); assertEquals(TestValues.MATCH, TestValues.GENERAL_COMPASSDIRECTION, direction); assertEquals(TestValues.MATCH, TestValues.GENERAL_BOOLEAN, shifted); - + // Invalid/Null Tests GPSData msg = new GPSData(); assertNotNull(TestValues.NOT_NULL, msg); @@ -117,10 +117,10 @@ public class GPSDataTests extends TestCase{ assertNull(TestValues.NULL, msg.getShifted()); } - public void testJson(){ + public void testJson() { JSONObject reference = new JSONObject(); - try{ + try { reference.put(GPSData.KEY_ACTUAL, TestValues.GENERAL_BOOLEAN); reference.put(GPSData.KEY_LATITUDE_DEGREES, TestValues.GENERAL_DOUBLE); reference.put(GPSData.KEY_LONGITUDE_DEGREES, TestValues.GENERAL_DOUBLE); @@ -145,12 +145,12 @@ public class GPSDataTests extends TestCase{ assertEquals(TestValues.MATCH, reference.length(), underTest.length()); Iterator<?> iterator = reference.keys(); - while(iterator.hasNext()){ + while (iterator.hasNext()) { String key = (String) iterator.next(); assertEquals(TestValues.MATCH, JsonUtils.readObjectFromJsonObject(reference, key), JsonUtils.readObjectFromJsonObject(underTest, key)); } - }catch(JSONException e){ - fail(TestValues.JSON_FAIL); + } catch (JSONException e) { + fail(TestValues.JSON_FAIL); } } } 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 ab45ec434..44ed2c581 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 @@ -13,88 +13,88 @@ import java.util.Iterator; public class GridTests extends TestCase { - private Grid msg; + private Grid msg; - @Override - public void setUp() { - msg = new Grid(); - msg.setCol(TestValues.GENERAL_INT); - msg.setRow(TestValues.GENERAL_INT); - msg.setLevel(TestValues.GENERAL_INT); - msg.setColSpan(TestValues.GENERAL_INT); - msg.setRowSpan(TestValues.GENERAL_INT); - msg.setLevelSpan(TestValues.GENERAL_INT); - } + @Override + public void setUp() { + msg = new Grid(); + msg.setCol(TestValues.GENERAL_INT); + msg.setRow(TestValues.GENERAL_INT); + msg.setLevel(TestValues.GENERAL_INT); + msg.setColSpan(TestValues.GENERAL_INT); + msg.setRowSpan(TestValues.GENERAL_INT); + msg.setLevelSpan(TestValues.GENERAL_INT); + } - public void testRpcValues() { - int col = msg.getCol(); - int row = msg.getRow(); - int level = msg.getLevel(); - int colSpan = msg.getColSpan(); - int rowSpan = msg.getRowSpan(); - int levelSpan = msg.getLevelSpan(); + public void testRpcValues() { + int col = msg.getCol(); + int row = msg.getRow(); + int level = msg.getLevel(); + int colSpan = msg.getColSpan(); + int rowSpan = msg.getRowSpan(); + int levelSpan = msg.getLevelSpan(); - //valid tests - assertEquals(TestValues.MATCH, col, TestValues.GENERAL_INT); - assertEquals(TestValues.MATCH, row, TestValues.GENERAL_INT); - assertEquals(TestValues.MATCH, level, TestValues.GENERAL_INT); - assertEquals(TestValues.MATCH, colSpan, TestValues.GENERAL_INT); - assertEquals(TestValues.MATCH, rowSpan, TestValues.GENERAL_INT); - assertEquals(TestValues.MATCH, levelSpan, TestValues.GENERAL_INT); + //valid tests + assertEquals(TestValues.MATCH, col, TestValues.GENERAL_INT); + assertEquals(TestValues.MATCH, row, TestValues.GENERAL_INT); + assertEquals(TestValues.MATCH, level, TestValues.GENERAL_INT); + assertEquals(TestValues.MATCH, colSpan, TestValues.GENERAL_INT); + assertEquals(TestValues.MATCH, rowSpan, TestValues.GENERAL_INT); + assertEquals(TestValues.MATCH, levelSpan, TestValues.GENERAL_INT); - //null tests - Grid msg = new Grid(); - assertNull(TestValues.NULL, msg.getCol()); - assertNull(TestValues.NULL, msg.getRow()); - assertNull(TestValues.NULL, msg.getLevel()); - assertNull(TestValues.NULL, msg.getColSpan()); - assertNull(TestValues.NULL, msg.getRowSpan()); - assertNull(TestValues.NULL, msg.getLevelSpan()); + //null tests + Grid msg = new Grid(); + assertNull(TestValues.NULL, msg.getCol()); + assertNull(TestValues.NULL, msg.getRow()); + assertNull(TestValues.NULL, msg.getLevel()); + assertNull(TestValues.NULL, msg.getColSpan()); + assertNull(TestValues.NULL, msg.getRowSpan()); + assertNull(TestValues.NULL, msg.getLevelSpan()); - //test required constructor - Grid msg2 = new Grid(TestValues.GENERAL_INT, TestValues.GENERAL_INT); - int row2 = msg2.getRow(); - int col2 = msg2.getCol(); - assertEquals(TestValues.MATCH, col2, TestValues.GENERAL_INT); - assertEquals(TestValues.MATCH, row2, TestValues.GENERAL_INT); - } + //test required constructor + Grid msg2 = new Grid(TestValues.GENERAL_INT, TestValues.GENERAL_INT); + int row2 = msg2.getRow(); + int col2 = msg2.getCol(); + assertEquals(TestValues.MATCH, col2, TestValues.GENERAL_INT); + assertEquals(TestValues.MATCH, row2, TestValues.GENERAL_INT); + } - public void testJson() { - JSONObject original = new JSONObject(); - try { - original.put(Grid.KEY_COL, TestValues.GENERAL_INT); - original.put(Grid.KEY_ROW, TestValues.GENERAL_INT); - original.put(Grid.KEY_LEVEL, TestValues.GENERAL_INT); - original.put(Grid.KEY_COL_SPAN, TestValues.GENERAL_INT); - original.put(Grid.KEY_ROW_SPAN, TestValues.GENERAL_INT); - original.put(Grid.KEY_LEVEL_SPAN, TestValues.GENERAL_INT); + public void testJson() { + JSONObject original = new JSONObject(); + try { + original.put(Grid.KEY_COL, TestValues.GENERAL_INT); + original.put(Grid.KEY_ROW, TestValues.GENERAL_INT); + original.put(Grid.KEY_LEVEL, TestValues.GENERAL_INT); + original.put(Grid.KEY_COL_SPAN, TestValues.GENERAL_INT); + original.put(Grid.KEY_ROW_SPAN, TestValues.GENERAL_INT); + original.put(Grid.KEY_LEVEL_SPAN, TestValues.GENERAL_INT); - JSONObject serialized = msg.serializeJSON(); - assertEquals(serialized.length(), original.length()); + JSONObject serialized = msg.serializeJSON(); + assertEquals(serialized.length(), original.length()); - Iterator<String> iter = original.keys(); - String key = ""; - Grid grid1, grid2; - while (iter.hasNext()) { - key = iter.next(); - grid1 = new Grid(JsonRPCMarshaller.deserializeJSONObject(original)); - grid2 = new Grid(JsonRPCMarshaller.deserializeJSONObject(serialized)); - if (key.equals(Grid.KEY_COL)) { - assertEquals(TestValues.MATCH, grid1.getCol(), grid2.getCol()); - } else if (key.equals(Grid.KEY_ROW)) { - assertEquals(TestValues.MATCH, grid1.getRow(), grid2.getRow()); - } else if (key.equals(Grid.KEY_LEVEL)) { - assertEquals(TestValues.MATCH, grid1.getLevel(), grid2.getLevel()); - } else if (key.equals(Grid.KEY_COL_SPAN)) { - assertEquals(TestValues.MATCH, grid1.getColSpan(), grid2.getColSpan()); - } else if (key.equals(Grid.KEY_ROW_SPAN)) { - assertEquals(TestValues.MATCH, grid1.getRowSpan(), grid2.getRowSpan()); - } else if (key.equals(Grid.KEY_LEVEL_SPAN)) { - assertEquals(TestValues.MATCH, grid1.getLevelSpan(), grid2.getLevelSpan()); - } - } - } catch (JSONException e) { - fail(TestValues.JSON_FAIL); - } - } + Iterator<String> iter = original.keys(); + String key = ""; + Grid grid1, grid2; + while (iter.hasNext()) { + key = iter.next(); + grid1 = new Grid(JsonRPCMarshaller.deserializeJSONObject(original)); + grid2 = new Grid(JsonRPCMarshaller.deserializeJSONObject(serialized)); + if (key.equals(Grid.KEY_COL)) { + assertEquals(TestValues.MATCH, grid1.getCol(), grid2.getCol()); + } else if (key.equals(Grid.KEY_ROW)) { + assertEquals(TestValues.MATCH, grid1.getRow(), grid2.getRow()); + } else if (key.equals(Grid.KEY_LEVEL)) { + assertEquals(TestValues.MATCH, grid1.getLevel(), grid2.getLevel()); + } else if (key.equals(Grid.KEY_COL_SPAN)) { + assertEquals(TestValues.MATCH, grid1.getColSpan(), grid2.getColSpan()); + } else if (key.equals(Grid.KEY_ROW_SPAN)) { + assertEquals(TestValues.MATCH, grid1.getRowSpan(), grid2.getRowSpan()); + } else if (key.equals(Grid.KEY_LEVEL_SPAN)) { + assertEquals(TestValues.MATCH, grid1.getLevelSpan(), grid2.getLevelSpan()); + } + } + } catch (JSONException e) { + fail(TestValues.JSON_FAIL); + } + } } diff --git a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/HMICapabilitiesTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/HMICapabilitiesTests.java index 40c873285..4ab264787 100644 --- a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/HMICapabilitiesTests.java +++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/HMICapabilitiesTests.java @@ -18,7 +18,7 @@ public class HMICapabilitiesTests extends TestCase { private HMICapabilities msg; @Override - public void setUp(){ + public void setUp() { msg = new HMICapabilities(); msg.setNavigationAvilable(TestValues.GENERAL_BOOLEAN); @@ -30,7 +30,7 @@ public class HMICapabilitiesTests extends TestCase { /** * Tests the expected values of the RPC message. */ - public void testRpcValues () { + public void testRpcValues() { // Test Values Boolean navAvail = msg.isNavigationAvailable(); Boolean phoneAvail = msg.isPhoneCallAvailable(); @@ -40,8 +40,8 @@ public class HMICapabilitiesTests extends TestCase { // Valid Tests assertEquals(TestValues.MATCH, (Boolean) TestValues.GENERAL_BOOLEAN, navAvail); assertEquals(TestValues.MATCH, (Boolean) TestValues.GENERAL_BOOLEAN, phoneAvail); - assertEquals(TestValues.MATCH, (Boolean) TestValues.GENERAL_BOOLEAN, vidStreamAvail); - assertEquals(TestValues.MATCH, (Boolean) TestValues.GENERAL_BOOLEAN, driverDistractionAvail); + assertEquals(TestValues.MATCH, (Boolean) TestValues.GENERAL_BOOLEAN, vidStreamAvail); + assertEquals(TestValues.MATCH, (Boolean) TestValues.GENERAL_BOOLEAN, driverDistractionAvail); // Invalid/Null Tests HMICapabilities msg = new HMICapabilities(); @@ -54,10 +54,10 @@ public class HMICapabilitiesTests extends TestCase { } - public void testJson(){ + public void testJson() { JSONObject reference = new JSONObject(); - try{ + try { reference.put(KEY_NAVIGATION, TestValues.GENERAL_BOOLEAN); reference.put(HMICapabilities.KEY_PHONE_CALL, TestValues.GENERAL_BOOLEAN); reference.put(HMICapabilities.KEY_VIDEO_STREAMING, TestValues.GENERAL_BOOLEAN); @@ -73,11 +73,11 @@ public class HMICapabilitiesTests extends TestCase { JsonUtils.readStringListFromJsonObject(underTest, KEY_PHONE_CALL)); assertEquals(TestValues.MATCH, JsonUtils.readStringListFromJsonObject(reference, KEY_VIDEO_STREAMING), - JsonUtils.readStringListFromJsonObject(underTest, KEY_VIDEO_STREAMING)); + JsonUtils.readStringListFromJsonObject(underTest, KEY_VIDEO_STREAMING)); assertEquals(TestValues.MATCH, JsonUtils.readStringFromJsonObject(reference, KEY_DRIVER_DISTRACTION), JsonUtils.readStringFromJsonObject(underTest, KEY_DRIVER_DISTRACTION)); - } catch(JSONException e){ + } catch (JSONException e) { fail(TestValues.JSON_FAIL); } } diff --git a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/HMIPermissionsTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/HMIPermissionsTests.java index 98bf2f549..6c3279a6a 100644 --- a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/HMIPermissionsTests.java +++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/HMIPermissionsTests.java @@ -14,15 +14,15 @@ import java.util.Iterator; import java.util.List; /** - * This is a unit test class for the SmartDeviceLink library project class : + * This is a unit test class for the SmartDeviceLink library project class : * {@link com.smartdevicelink.proxy.rpc.HMIPermissions} */ -public class HMIPermissionsTests extends TestCase{ +public class HMIPermissionsTests extends TestCase { private HMIPermissions msg; @Override - public void setUp(){ + public void setUp() { msg = new HMIPermissions(); msg.setAllowed(TestValues.GENERAL_HMILEVEL_LIST); @@ -30,24 +30,24 @@ public class HMIPermissionsTests extends TestCase{ } /** - * Tests the expected values of the RPC message. - */ - public void testRpcValues () { - // Test Values + * Tests the expected values of the RPC message. + */ + public void testRpcValues() { + // Test Values List<HMILevel> allowed = msg.getAllowed(); List<HMILevel> disallowed = msg.getUserDisallowed(); // Valid Tests assertEquals(TestValues.MATCH, TestValues.GENERAL_HMILEVEL_LIST.size(), allowed.size()); assertEquals(TestValues.MATCH, TestValues.GENERAL_HMILEVEL_LIST.size(), disallowed.size()); - - for(int i = 0; i < TestValues.GENERAL_HMILEVEL_LIST.size(); i++){ + + for (int i = 0; i < TestValues.GENERAL_HMILEVEL_LIST.size(); i++) { assertEquals(TestValues.MATCH, TestValues.GENERAL_HMILEVEL_LIST.get(i), allowed.get(i)); } - for(int i = 0; i < TestValues.GENERAL_HMILEVEL_LIST.size(); i++){ + for (int i = 0; i < TestValues.GENERAL_HMILEVEL_LIST.size(); i++) { assertEquals(TestValues.MATCH, TestValues.GENERAL_HMILEVEL_LIST.get(i), disallowed.get(i)); } - + // Invalid/Null Tests HMIPermissions msg = new HMIPermissions(); assertNotNull(TestValues.NOT_NULL, msg); @@ -56,10 +56,10 @@ public class HMIPermissionsTests extends TestCase{ assertNull(TestValues.NULL, msg.getUserDisallowed()); } - public void testJson(){ + public void testJson() { JSONObject reference = new JSONObject(); - try{ + try { reference.put(HMIPermissions.KEY_ALLOWED, TestValues.JSON_HMILEVELS); reference.put(HMIPermissions.KEY_USER_DISALLOWED, TestValues.JSON_HMILEVELS); @@ -67,18 +67,18 @@ public class HMIPermissionsTests extends TestCase{ assertEquals(TestValues.MATCH, reference.length(), underTest.length()); Iterator<?> iterator = reference.keys(); - while(iterator.hasNext()){ + while (iterator.hasNext()) { String key = (String) iterator.next(); List<String> referenceList = JsonUtils.readStringListFromJsonObject(reference, key); List<String> underTestList = JsonUtils.readStringListFromJsonObject(underTest, key); assertEquals(TestValues.MATCH, referenceList.size(), underTestList.size()); - for(int i = 0; i < referenceList.size(); i++){ + for (int i = 0; i < referenceList.size(); i++) { assertEquals(TestValues.MATCH, referenceList.get(i), underTestList.get(i)); } } - } catch(JSONException e){ - fail(TestValues.JSON_FAIL); + } catch (JSONException e) { + fail(TestValues.JSON_FAIL); } } }
\ No newline at end of file diff --git a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/HMISettingsControlCapabilitiesTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/HMISettingsControlCapabilitiesTests.java index f91cc9fdf..2d0851568 100644 --- a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/HMISettingsControlCapabilitiesTests.java +++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/HMISettingsControlCapabilitiesTests.java @@ -21,76 +21,76 @@ import java.util.Iterator; */ public class HMISettingsControlCapabilitiesTests extends TestCase { - private HMISettingsControlCapabilities msg; - - @Override - public void setUp() { - msg = new HMISettingsControlCapabilities(); - - msg.setModuleName(TestValues.GENERAL_STRING); - msg.setDistanceUnitAvailable(TestValues.GENERAL_BOOLEAN); - msg.setTemperatureUnitAvailable(TestValues.GENERAL_BOOLEAN); - msg.setDisplayModeUnitAvailable(TestValues.GENERAL_BOOLEAN); - msg.setModuleInfo(TestValues.GENERAL_MODULE_INFO); - } - - /** - * Tests the expected values of the RPC message. - */ - public void testRpcValues() { - // Test Values - String moduleName = msg.getModuleName(); - Boolean distanceUnitAvailable = msg.getDistanceUnitAvailable(); - Boolean temperatureUnitAvailable = msg.getTemperatureUnitAvailable(); - Boolean displayModeUnitAvailable = msg.getDisplayModeUnitAvailable(); - ModuleInfo info = msg.getModuleInfo(); - - // Valid Tests - assertEquals(TestValues.MATCH, TestValues.GENERAL_STRING, moduleName); - assertEquals(TestValues.MATCH, TestValues.GENERAL_BOOLEAN, (boolean) distanceUnitAvailable); - assertEquals(TestValues.MATCH, TestValues.GENERAL_BOOLEAN, (boolean) temperatureUnitAvailable); - assertEquals(TestValues.MATCH, TestValues.GENERAL_BOOLEAN, (boolean) displayModeUnitAvailable); - assertEquals(TestValues.MATCH, TestValues.GENERAL_MODULE_INFO, info); - - // Invalid/Null Tests - HMISettingsControlCapabilities msg = new HMISettingsControlCapabilities(); - assertNotNull(TestValues.NOT_NULL, msg); - - assertNull(TestValues.NULL, msg.getModuleName()); - assertNull(TestValues.NULL, msg.getDistanceUnitAvailable()); - assertNull(TestValues.NULL, msg.getTemperatureUnitAvailable()); - assertNull(TestValues.NULL, msg.getDisplayModeUnitAvailable()); - assertNull(TestValues.NULL, msg.getModuleInfo()); - } - - public void testJson() { - JSONObject reference = new JSONObject(); - - try { - reference.put(HMISettingsControlCapabilities.KEY_MODULE_NAME, TestValues.GENERAL_STRING); - reference.put(HMISettingsControlCapabilities.KEY_DISTANCE_UNIT_AVAILABLE, TestValues.GENERAL_BOOLEAN); - reference.put(HMISettingsControlCapabilities.KEY_TEMPERATURE_UNIT_AVAILABLE, TestValues.GENERAL_BOOLEAN); - reference.put(HMISettingsControlCapabilities.KEY_DISPLAY_MODE_UNIT_AVAILABLE, TestValues.GENERAL_BOOLEAN); - reference.put(HMISettingsControlCapabilities.KEY_MODULE_INFO, TestValues.JSON_MODULE_INFO); - - 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(HMISettingsControlCapabilities.KEY_MODULE_INFO)) { - JSONObject o1 = (JSONObject) JsonUtils.readObjectFromJsonObject(reference, key); - JSONObject o2 = (JSONObject) JsonUtils.readObjectFromJsonObject(underTest, key); - Hashtable<String, Object> h1 = JsonRPCMarshaller.deserializeJSONObject(o1); - Hashtable<String, Object> h2 = JsonRPCMarshaller.deserializeJSONObject(o2); - assertTrue(TestValues.TRUE, Validator.validateModuleInfo(new ModuleInfo(h1), new ModuleInfo(h2))); - } else { - assertEquals(TestValues.MATCH, JsonUtils.readObjectFromJsonObject(reference, key), JsonUtils.readObjectFromJsonObject(underTest, key)); - } - } - } catch (JSONException e) { - fail(TestValues.JSON_FAIL); - } - } + private HMISettingsControlCapabilities msg; + + @Override + public void setUp() { + msg = new HMISettingsControlCapabilities(); + + msg.setModuleName(TestValues.GENERAL_STRING); + msg.setDistanceUnitAvailable(TestValues.GENERAL_BOOLEAN); + msg.setTemperatureUnitAvailable(TestValues.GENERAL_BOOLEAN); + msg.setDisplayModeUnitAvailable(TestValues.GENERAL_BOOLEAN); + msg.setModuleInfo(TestValues.GENERAL_MODULE_INFO); + } + + /** + * Tests the expected values of the RPC message. + */ + public void testRpcValues() { + // Test Values + String moduleName = msg.getModuleName(); + Boolean distanceUnitAvailable = msg.getDistanceUnitAvailable(); + Boolean temperatureUnitAvailable = msg.getTemperatureUnitAvailable(); + Boolean displayModeUnitAvailable = msg.getDisplayModeUnitAvailable(); + ModuleInfo info = msg.getModuleInfo(); + + // Valid Tests + assertEquals(TestValues.MATCH, TestValues.GENERAL_STRING, moduleName); + assertEquals(TestValues.MATCH, TestValues.GENERAL_BOOLEAN, (boolean) distanceUnitAvailable); + assertEquals(TestValues.MATCH, TestValues.GENERAL_BOOLEAN, (boolean) temperatureUnitAvailable); + assertEquals(TestValues.MATCH, TestValues.GENERAL_BOOLEAN, (boolean) displayModeUnitAvailable); + assertEquals(TestValues.MATCH, TestValues.GENERAL_MODULE_INFO, info); + + // Invalid/Null Tests + HMISettingsControlCapabilities msg = new HMISettingsControlCapabilities(); + assertNotNull(TestValues.NOT_NULL, msg); + + assertNull(TestValues.NULL, msg.getModuleName()); + assertNull(TestValues.NULL, msg.getDistanceUnitAvailable()); + assertNull(TestValues.NULL, msg.getTemperatureUnitAvailable()); + assertNull(TestValues.NULL, msg.getDisplayModeUnitAvailable()); + assertNull(TestValues.NULL, msg.getModuleInfo()); + } + + public void testJson() { + JSONObject reference = new JSONObject(); + + try { + reference.put(HMISettingsControlCapabilities.KEY_MODULE_NAME, TestValues.GENERAL_STRING); + reference.put(HMISettingsControlCapabilities.KEY_DISTANCE_UNIT_AVAILABLE, TestValues.GENERAL_BOOLEAN); + reference.put(HMISettingsControlCapabilities.KEY_TEMPERATURE_UNIT_AVAILABLE, TestValues.GENERAL_BOOLEAN); + reference.put(HMISettingsControlCapabilities.KEY_DISPLAY_MODE_UNIT_AVAILABLE, TestValues.GENERAL_BOOLEAN); + reference.put(HMISettingsControlCapabilities.KEY_MODULE_INFO, TestValues.JSON_MODULE_INFO); + + 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(HMISettingsControlCapabilities.KEY_MODULE_INFO)) { + JSONObject o1 = (JSONObject) JsonUtils.readObjectFromJsonObject(reference, key); + JSONObject o2 = (JSONObject) JsonUtils.readObjectFromJsonObject(underTest, key); + Hashtable<String, Object> h1 = JsonRPCMarshaller.deserializeJSONObject(o1); + Hashtable<String, Object> h2 = JsonRPCMarshaller.deserializeJSONObject(o2); + assertTrue(TestValues.TRUE, Validator.validateModuleInfo(new ModuleInfo(h1), new ModuleInfo(h2))); + } else { + assertEquals(TestValues.MATCH, JsonUtils.readObjectFromJsonObject(reference, key), JsonUtils.readObjectFromJsonObject(underTest, key)); + } + } + } catch (JSONException e) { + fail(TestValues.JSON_FAIL); + } + } }
\ No newline at end of file diff --git a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/HMISettingsControlDataTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/HMISettingsControlDataTests.java index 3a193b14f..4182b2a1c 100644 --- a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/HMISettingsControlDataTests.java +++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/HMISettingsControlDataTests.java @@ -20,59 +20,59 @@ import java.util.Iterator; */ public class HMISettingsControlDataTests extends TestCase { - private HMISettingsControlData msg; - - @Override - public void setUp() { - msg = new HMISettingsControlData(); - - msg.setDisplayMode(TestValues.GENERAL_DISPLAYMODE); - msg.setTemperatureUnit(TestValues.GENERAL_TEMPERATUREUNIT); - msg.setDistanceUnit(TestValues.GENERAL_DISTANCEUNIT); - } - - /** - * Tests the expected values of the RPC message. - */ - public void testRpcValues() { - // Test Values - DisplayMode displayMode = msg.getDisplayMode(); - TemperatureUnit temperatureUnit = msg.getTemperatureUnit(); - DistanceUnit distanceUnit = msg.getDistanceUnit(); - - // Valid Tests - assertEquals(TestValues.MATCH, TestValues.GENERAL_DISPLAYMODE, displayMode); - assertEquals(TestValues.MATCH, TestValues.GENERAL_TEMPERATUREUNIT, temperatureUnit); - assertEquals(TestValues.MATCH, TestValues.GENERAL_DISTANCEUNIT, distanceUnit); - - // Invalid/Null Tests - HMISettingsControlData msg = new HMISettingsControlData(); - assertNotNull(TestValues.NOT_NULL, msg); - - assertNull(TestValues.NULL, msg.getDisplayMode()); - assertNull(TestValues.NULL, msg.getTemperatureUnit()); - assertNull(TestValues.NULL, msg.getDistanceUnit()); - } - - public void testJson() { - JSONObject reference = new JSONObject(); - - try { - reference.put(HMISettingsControlData.KEY_DISPLAY_MODE, TestValues.GENERAL_DISPLAYMODE); - reference.put(HMISettingsControlData.KEY_TEMPERATURE_UNIT, TestValues.GENERAL_TEMPERATUREUNIT); - reference.put(HMISettingsControlData.KEY_DISTANCE_UNIT, TestValues.GENERAL_DISTANCEUNIT); - - JSONObject underTest = msg.serializeJSON(); - assertEquals(TestValues.MATCH, reference.length(), underTest.length()); - - Iterator<?> iterator = reference.keys(); - while (iterator.hasNext()) { - String key = (String) iterator.next(); - - assertEquals(TestValues.MATCH, JsonUtils.readObjectFromJsonObject(reference, key), JsonUtils.readObjectFromJsonObject(underTest, key)); - } - } catch (JSONException e) { - fail(TestValues.JSON_FAIL); - } - } + private HMISettingsControlData msg; + + @Override + public void setUp() { + msg = new HMISettingsControlData(); + + msg.setDisplayMode(TestValues.GENERAL_DISPLAYMODE); + msg.setTemperatureUnit(TestValues.GENERAL_TEMPERATUREUNIT); + msg.setDistanceUnit(TestValues.GENERAL_DISTANCEUNIT); + } + + /** + * Tests the expected values of the RPC message. + */ + public void testRpcValues() { + // Test Values + DisplayMode displayMode = msg.getDisplayMode(); + TemperatureUnit temperatureUnit = msg.getTemperatureUnit(); + DistanceUnit distanceUnit = msg.getDistanceUnit(); + + // Valid Tests + assertEquals(TestValues.MATCH, TestValues.GENERAL_DISPLAYMODE, displayMode); + assertEquals(TestValues.MATCH, TestValues.GENERAL_TEMPERATUREUNIT, temperatureUnit); + assertEquals(TestValues.MATCH, TestValues.GENERAL_DISTANCEUNIT, distanceUnit); + + // Invalid/Null Tests + HMISettingsControlData msg = new HMISettingsControlData(); + assertNotNull(TestValues.NOT_NULL, msg); + + assertNull(TestValues.NULL, msg.getDisplayMode()); + assertNull(TestValues.NULL, msg.getTemperatureUnit()); + assertNull(TestValues.NULL, msg.getDistanceUnit()); + } + + public void testJson() { + JSONObject reference = new JSONObject(); + + try { + reference.put(HMISettingsControlData.KEY_DISPLAY_MODE, TestValues.GENERAL_DISPLAYMODE); + reference.put(HMISettingsControlData.KEY_TEMPERATURE_UNIT, TestValues.GENERAL_TEMPERATUREUNIT); + reference.put(HMISettingsControlData.KEY_DISTANCE_UNIT, TestValues.GENERAL_DISTANCEUNIT); + + JSONObject underTest = msg.serializeJSON(); + assertEquals(TestValues.MATCH, reference.length(), underTest.length()); + + Iterator<?> iterator = reference.keys(); + while (iterator.hasNext()) { + String key = (String) iterator.next(); + + assertEquals(TestValues.MATCH, JsonUtils.readObjectFromJsonObject(reference, key), JsonUtils.readObjectFromJsonObject(underTest, key)); + } + } catch (JSONException e) { + fail(TestValues.JSON_FAIL); + } + } }
\ No newline at end of file diff --git a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/HapticRectTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/HapticRectTests.java index f235761bf..a5e348947 100644 --- a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/HapticRectTests.java +++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/HapticRectTests.java @@ -18,56 +18,56 @@ import org.json.JSONObject; public class HapticRectTests extends TestCase { - private HapticRect msg; - - @Override - public void setUp() { - msg = new HapticRect(); - - msg.setId(TestValues.GENERAL_INTEGER); - msg.setRect(TestValues.GENERAL_RECTANGLE); - } - - /** - * Tests the expected values of the RPC message. - */ - public void testRpcValues () { - // Test Values - Integer id = msg.getId(); - Rectangle rect = msg.getRect(); - - // Valid Tests - assertEquals(TestValues.MATCH, TestValues.GENERAL_INTEGER, id); - assertEquals(TestValues.MATCH, TestValues.GENERAL_RECTANGLE, rect); - - // Invalid/Null Tests - HapticRect msg = new HapticRect(); - assertNotNull(TestValues.NOT_NULL, msg); - - assertNull(TestValues.NULL, msg.getId()); - assertNull(TestValues.NULL, msg.getRect()); - } - - public void testJson(){ - JSONObject reference = new JSONObject(); - - try{ - reference.put(HapticRect.KEY_ID, TestValues.GENERAL_INTEGER); - reference.put(HapticRect.KEY_RECT, TestValues.GENERAL_RECTANGLE); - - JSONObject underTest = msg.serializeJSON(); - assertEquals(TestValues.MATCH, reference.length(), underTest.length()); - - assertEquals(TestValues.MATCH, JsonUtils.readIntegerFromJsonObject(reference, HapticRect.KEY_ID), - JsonUtils.readIntegerFromJsonObject(underTest, HapticRect.KEY_ID)); - - assertTrue(Validator.validateRectangle( - (Rectangle) JsonUtils.readObjectFromJsonObject(reference, HapticRect.KEY_RECT), - new Rectangle(JsonRPCMarshaller.deserializeJSONObject( (JSONObject) JsonUtils.readObjectFromJsonObject(underTest, HapticRect.KEY_RECT)))) - ); - - } catch(JSONException e){ - fail(TestValues.JSON_FAIL); - } - } + private HapticRect msg; + + @Override + public void setUp() { + msg = new HapticRect(); + + msg.setId(TestValues.GENERAL_INTEGER); + msg.setRect(TestValues.GENERAL_RECTANGLE); + } + + /** + * Tests the expected values of the RPC message. + */ + public void testRpcValues() { + // Test Values + Integer id = msg.getId(); + Rectangle rect = msg.getRect(); + + // Valid Tests + assertEquals(TestValues.MATCH, TestValues.GENERAL_INTEGER, id); + assertEquals(TestValues.MATCH, TestValues.GENERAL_RECTANGLE, rect); + + // Invalid/Null Tests + HapticRect msg = new HapticRect(); + assertNotNull(TestValues.NOT_NULL, msg); + + assertNull(TestValues.NULL, msg.getId()); + assertNull(TestValues.NULL, msg.getRect()); + } + + public void testJson() { + JSONObject reference = new JSONObject(); + + try { + reference.put(HapticRect.KEY_ID, TestValues.GENERAL_INTEGER); + reference.put(HapticRect.KEY_RECT, TestValues.GENERAL_RECTANGLE); + + JSONObject underTest = msg.serializeJSON(); + assertEquals(TestValues.MATCH, reference.length(), underTest.length()); + + assertEquals(TestValues.MATCH, JsonUtils.readIntegerFromJsonObject(reference, HapticRect.KEY_ID), + JsonUtils.readIntegerFromJsonObject(underTest, HapticRect.KEY_ID)); + + assertTrue(Validator.validateRectangle( + (Rectangle) JsonUtils.readObjectFromJsonObject(reference, HapticRect.KEY_RECT), + new Rectangle(JsonRPCMarshaller.deserializeJSONObject((JSONObject) JsonUtils.readObjectFromJsonObject(underTest, HapticRect.KEY_RECT)))) + ); + + } catch (JSONException e) { + fail(TestValues.JSON_FAIL); + } + } } diff --git a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/HeadLampStatusTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/HeadLampStatusTests.java index c236d5355..e9860b5a4 100644 --- a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/HeadLampStatusTests.java +++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/HeadLampStatusTests.java @@ -13,15 +13,15 @@ import org.json.JSONObject; import java.util.Iterator; /** - * This is a unit test class for the SmartDeviceLink library project class : + * This is a unit test class for the SmartDeviceLink library project class : * {@link com.smartdevicelink.proxy.rpc.HeadLampStatus} */ -public class HeadLampStatusTests extends TestCase{ - +public class HeadLampStatusTests extends TestCase { + private HeadLampStatus msg; @Override - public void setUp(){ + public void setUp() { msg = new HeadLampStatus(); msg.setAmbientLightStatus(TestValues.GENERAL_AMBIENTLIGHTSTATUS); @@ -30,19 +30,19 @@ public class HeadLampStatusTests extends TestCase{ } /** - * Tests the expected values of the RPC message. - */ - public void testRpcValues () { - // Test Values + * Tests the expected values of the RPC message. + */ + public void testRpcValues() { + // Test Values boolean lowBeams = msg.getLowBeamsOn(); boolean highBeams = msg.getHighBeamsOn(); AmbientLightStatus ambientLights = msg.getAmbientLightStatus(); - + // Valid Tests assertEquals(TestValues.MATCH, TestValues.GENERAL_AMBIENTLIGHTSTATUS, ambientLights); assertEquals(TestValues.MATCH, TestValues.GENERAL_BOOLEAN, highBeams); assertEquals(TestValues.MATCH, TestValues.GENERAL_BOOLEAN, lowBeams); - + // Invalid/Null Tests HeadLampStatus msg = new HeadLampStatus(); assertNotNull(TestValues.NOT_NULL, msg); @@ -52,10 +52,10 @@ public class HeadLampStatusTests extends TestCase{ assertNull(TestValues.NULL, msg.getAmbientLightStatus()); } - public void testJson(){ + public void testJson() { JSONObject reference = new JSONObject(); - try{ + try { reference.put(HeadLampStatus.KEY_HIGH_BEAMS_ON, TestValues.GENERAL_BOOLEAN); reference.put(HeadLampStatus.KEY_LOW_BEAMS_ON, TestValues.GENERAL_BOOLEAN); reference.put(HeadLampStatus.KEY_AMBIENT_LIGHT_SENSOR_STATUS, TestValues.GENERAL_AMBIENTLIGHTSTATUS); @@ -64,12 +64,12 @@ public class HeadLampStatusTests extends TestCase{ assertEquals(TestValues.MATCH, reference.length(), underTest.length()); Iterator<?> iterator = reference.keys(); - while(iterator.hasNext()){ + while (iterator.hasNext()) { String key = (String) iterator.next(); assertEquals(TestValues.MATCH, JsonUtils.readObjectFromJsonObject(reference, key), JsonUtils.readObjectFromJsonObject(underTest, key)); } - } catch(JSONException e){ - fail(TestValues.JSON_FAIL); + } catch (JSONException e) { + fail(TestValues.JSON_FAIL); } } }
\ No newline at end of file diff --git a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/HeadersTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/HeadersTests.java index 814c92467..435f4cc76 100644 --- a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/HeadersTests.java +++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/HeadersTests.java @@ -12,15 +12,15 @@ import org.json.JSONObject; import java.util.Iterator; /** - * This is a unit test class for the SmartDeviceLink library project class : + * This is a unit test class for the SmartDeviceLink library project class : * {@link com.smartdevicelink.proxy.rpc.Headers} */ -public class HeadersTests extends TestCase{ +public class HeadersTests extends TestCase { private Headers msg; @Override - public void setUp(){ + public void setUp() { msg = new Headers(); msg.setCharset(TestValues.GENERAL_STRING); @@ -36,10 +36,10 @@ public class HeadersTests extends TestCase{ } /** - * Tests the expected values of the RPC message. - */ - public void testRpcValues () { - // Test Values + * Tests the expected values of the RPC message. + */ + public void testRpcValues() { + // Test Values String charset = msg.getCharset(); String contentType = msg.getContentType(); String requestMode = msg.getRequestMethod(); @@ -50,7 +50,7 @@ public class HeadersTests extends TestCase{ boolean doInput = msg.getDoInput(); boolean useCache = msg.getUseCaches(); boolean instanceFollow = msg.getInstanceFollowRedirects(); - + // Valid Tests assertEquals(TestValues.MATCH, TestValues.GENERAL_STRING, charset); assertEquals(TestValues.MATCH, TestValues.GENERAL_STRING, contentType); @@ -62,7 +62,7 @@ public class HeadersTests extends TestCase{ assertEquals(TestValues.MATCH, TestValues.GENERAL_BOOLEAN, doInput); assertEquals(TestValues.MATCH, TestValues.GENERAL_BOOLEAN, useCache); assertEquals(TestValues.MATCH, TestValues.GENERAL_BOOLEAN, instanceFollow); - + // Invalid/Null Tests Headers msg = new Headers(); assertNotNull(TestValues.NOT_NULL, msg); @@ -79,10 +79,10 @@ public class HeadersTests extends TestCase{ assertNull(TestValues.NULL, msg.getUseCaches()); } - public void testJson(){ + public void testJson() { JSONObject reference = new JSONObject(); - try{ + try { reference.put(Headers.KEY_CHARSET, TestValues.GENERAL_STRING); reference.put(Headers.KEY_CONTENT_TYPE, TestValues.GENERAL_STRING); reference.put(Headers.KEY_REQUEST_METHOD, TestValues.GENERAL_STRING); @@ -98,12 +98,12 @@ public class HeadersTests extends TestCase{ assertEquals(TestValues.MATCH, reference.length(), underTest.length()); Iterator<?> iterator = reference.keys(); - while(iterator.hasNext()){ + while (iterator.hasNext()) { String key = (String) iterator.next(); assertEquals(TestValues.MATCH, JsonUtils.readObjectFromJsonObject(reference, key), JsonUtils.readObjectFromJsonObject(underTest, key)); } - }catch(JSONException e){ - fail(TestValues.JSON_FAIL); + } catch (JSONException e) { + fail(TestValues.JSON_FAIL); } } }
\ No newline at end of file diff --git a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/ImageFieldTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/ImageFieldTests.java index 0c4090870..630a7157c 100644 --- a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/ImageFieldTests.java +++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/ImageFieldTests.java @@ -21,15 +21,15 @@ import java.util.Iterator; import java.util.List; /** - * This is a unit test class for the SmartDeviceLink library project class : + * This is a unit test class for the SmartDeviceLink library project class : * {@link com.smartdevicelink.proxy.rpc.ImageField} */ -public class ImageFieldTests extends TestCase{ +public class ImageFieldTests extends TestCase { private ImageField msg; @Override - public void setUp(){ + public void setUp() { msg = new ImageField(); msg.setImageResolution(TestValues.GENERAL_IMAGERESOLUTION); @@ -38,19 +38,19 @@ public class ImageFieldTests extends TestCase{ } /** - * Tests the expected values of the RPC message. - */ - public void testRpcValues () { - // Test Values + * Tests the expected values of the RPC message. + */ + public void testRpcValues() { + // Test Values ImageResolution imageRes = msg.getImageResolution(); List<FileType> imageTypes = msg.getImageTypeSupported(); ImageFieldName name = msg.getName(); - + // Valid Tests assertTrue(TestValues.TRUE, Validator.validateImageResolution(TestValues.GENERAL_IMAGERESOLUTION, imageRes)); assertEquals(TestValues.MATCH, TestValues.GENERAL_IMAGEFIELDNAME, name); assertTrue(TestValues.TRUE, Validator.validateFileTypes(TestValues.GENERAL_FILETYPE_LIST, imageTypes)); - + // Invalid/Null Tests ImageField msg = new ImageField(); assertNotNull(TestValues.NOT_NULL, msg); @@ -60,46 +60,46 @@ public class ImageFieldTests extends TestCase{ assertNull(TestValues.NULL, msg.getName()); } - public void testJson(){ + public void testJson() { JSONObject reference = new JSONObject(); - try{ + try { reference.put(ImageField.KEY_IMAGE_RESOLUTION, TestValues.JSON_IMAGERESOLUTION); reference.put(ImageField.KEY_IMAGE_TYPE_SUPPORTED, JsonUtils.createJsonArray(TestValues.GENERAL_FILETYPE_LIST)); reference.put(ImageField.KEY_NAME, TestValues.GENERAL_IMAGEFIELDNAME); - + JSONObject underTest = msg.serializeJSON(); assertEquals(TestValues.MATCH, reference.length(), underTest.length()); Iterator<?> iterator = reference.keys(); - while(iterator.hasNext()){ + while (iterator.hasNext()) { String key = (String) iterator.next(); - if(key.equals(ImageField.KEY_IMAGE_RESOLUTION)){ - JSONObject objectEquals = JsonUtils.readJsonObjectFromJsonObject(reference, key); - JSONObject testEquals = JsonUtils.readJsonObjectFromJsonObject(underTest, key); - Hashtable<String, Object> hashReference = JsonRPCMarshaller.deserializeJSONObject(objectEquals); - Hashtable<String, Object> hashTest = JsonRPCMarshaller.deserializeJSONObject(testEquals); - assertTrue(TestValues.TRUE, Validator.validateImageResolution( new ImageResolution(hashReference), new ImageResolution(hashTest))); - } else if(key.equals(ImageField.KEY_IMAGE_TYPE_SUPPORTED)) { - JSONArray imageTypeArrayReference = JsonUtils.readJsonArrayFromJsonObject(reference, key); - JSONArray imageTypeArrayTest = JsonUtils.readJsonArrayFromJsonObject(underTest, key); - List<FileType> imageTypeListReference = new ArrayList<FileType>(); - List<FileType> imageTypeListTest = new ArrayList<FileType>(); - - assertEquals(TestValues.MATCH, imageTypeArrayReference.length(), imageTypeArrayTest.length()); - - for (int index = 0 ; index < imageTypeArrayReference.length(); index++) { - imageTypeListReference.add( (FileType)imageTypeArrayReference.get(index) ); - imageTypeListTest.add( (FileType)imageTypeArrayTest.get(index) ); - } - assertTrue(TestValues.TRUE, imageTypeListReference.containsAll(imageTypeListTest) && imageTypeListTest.containsAll(imageTypeListReference)); - } else{ + if (key.equals(ImageField.KEY_IMAGE_RESOLUTION)) { + JSONObject objectEquals = JsonUtils.readJsonObjectFromJsonObject(reference, key); + JSONObject testEquals = JsonUtils.readJsonObjectFromJsonObject(underTest, key); + Hashtable<String, Object> hashReference = JsonRPCMarshaller.deserializeJSONObject(objectEquals); + Hashtable<String, Object> hashTest = JsonRPCMarshaller.deserializeJSONObject(testEquals); + assertTrue(TestValues.TRUE, Validator.validateImageResolution(new ImageResolution(hashReference), new ImageResolution(hashTest))); + } else if (key.equals(ImageField.KEY_IMAGE_TYPE_SUPPORTED)) { + JSONArray imageTypeArrayReference = JsonUtils.readJsonArrayFromJsonObject(reference, key); + JSONArray imageTypeArrayTest = JsonUtils.readJsonArrayFromJsonObject(underTest, key); + List<FileType> imageTypeListReference = new ArrayList<FileType>(); + List<FileType> imageTypeListTest = new ArrayList<FileType>(); + + assertEquals(TestValues.MATCH, imageTypeArrayReference.length(), imageTypeArrayTest.length()); + + for (int index = 0; index < imageTypeArrayReference.length(); index++) { + imageTypeListReference.add((FileType) imageTypeArrayReference.get(index)); + imageTypeListTest.add((FileType) imageTypeArrayTest.get(index)); + } + assertTrue(TestValues.TRUE, imageTypeListReference.containsAll(imageTypeListTest) && imageTypeListTest.containsAll(imageTypeListReference)); + } else { assertEquals(TestValues.MATCH, JsonUtils.readObjectFromJsonObject(reference, key), JsonUtils.readObjectFromJsonObject(underTest, key)); } } - }catch(JSONException e){ - fail(TestValues.JSON_FAIL); + } catch (JSONException e) { + fail(TestValues.JSON_FAIL); } } }
\ No newline at end of file diff --git a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/ImageResolutionTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/ImageResolutionTests.java index bdabce23b..ba1352e23 100644 --- a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/ImageResolutionTests.java +++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/ImageResolutionTests.java @@ -13,15 +13,15 @@ import java.util.Iterator; /** - * This is a unit test class for the SmartDeviceLink library project class : + * This is a unit test class for the SmartDeviceLink library project class : * {@link com.smartdevicelink.proxy.rpc.ImageResolution} */ -public class ImageResolutionTests extends TestCase{ +public class ImageResolutionTests extends TestCase { private ImageResolution msg; @Override - public void setUp(){ + public void setUp() { msg = new ImageResolution(); msg.setResolutionHeight(TestValues.GENERAL_INT); @@ -29,17 +29,17 @@ public class ImageResolutionTests extends TestCase{ } /** - * Tests the expected values of the RPC message. - */ - public void testRpcValues () { - // Test Values + * Tests the expected values of the RPC message. + */ + public void testRpcValues() { + // Test Values int height = msg.getResolutionHeight(); int width = msg.getResolutionWidth(); - + // Valid Tests assertEquals(TestValues.MATCH, TestValues.GENERAL_INT, height); assertEquals(TestValues.MATCH, TestValues.GENERAL_INT, width); - + // Invalid/Null Tests ImageResolution msg = new ImageResolution(); assertNotNull(TestValues.NOT_NULL, msg); @@ -48,10 +48,10 @@ public class ImageResolutionTests extends TestCase{ assertNull(TestValues.NULL, msg.getResolutionWidth()); } - public void testJson(){ + public void testJson() { JSONObject reference = new JSONObject(); - try{ + try { reference.put(ImageResolution.KEY_RESOLUTION_HEIGHT, TestValues.GENERAL_INT); reference.put(ImageResolution.KEY_RESOLUTION_WIDTH, TestValues.GENERAL_INT); @@ -59,34 +59,34 @@ public class ImageResolutionTests extends TestCase{ assertEquals(TestValues.MATCH, reference.length(), underTest.length()); Iterator<?> iterator = reference.keys(); - while(iterator.hasNext()){ + while (iterator.hasNext()) { String key = (String) iterator.next(); assertEquals(TestValues.MATCH, JsonUtils.readObjectFromJsonObject(reference, key), JsonUtils.readObjectFromJsonObject(underTest, key)); } - } catch(JSONException e){ - fail(TestValues.JSON_FAIL); + } catch (JSONException e) { + fail(TestValues.JSON_FAIL); } } public void testSetResolutionWidth_Odd() { msg.setResolutionWidth(175); - assertEquals(176, (int)msg.getResolutionWidth()); + assertEquals(176, (int) msg.getResolutionWidth()); } public void testSetResolutionHeight_Odd() { msg.setResolutionHeight(175); - assertEquals(176, (int)msg.getResolutionHeight()); + assertEquals(176, (int) msg.getResolutionHeight()); } public void testSetResolutionWidth_Pair() { msg.setResolutionWidth(176); - assertEquals(176, (int)msg.getResolutionWidth()); + assertEquals(176, (int) msg.getResolutionWidth()); } public void testSetResolutionHeight_Pair() { msg.setResolutionHeight(176); - assertEquals(176, (int)msg.getResolutionHeight()); + assertEquals(176, (int) msg.getResolutionHeight()); } }
\ No newline at end of file diff --git a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/ImageTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/ImageTests.java index 108686879..24405857c 100644 --- a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/ImageTests.java +++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/ImageTests.java @@ -13,15 +13,15 @@ import org.json.JSONObject; import java.util.Iterator; /** - * This is a unit test class for the SmartDeviceLink library project class : + * This is a unit test class for the SmartDeviceLink library project class : * {@link com.smartdevicelink.proxy.rpc.Image} */ -public class ImageTests extends TestCase{ +public class ImageTests extends TestCase { private Image msg; @Override - public void setUp(){ + public void setUp() { msg = new Image(); msg.setImageType(TestValues.GENERAL_IMAGETYPE); @@ -30,19 +30,19 @@ public class ImageTests extends TestCase{ } /** - * Tests the expected values of the RPC message. - */ - public void testRpcValues () { - // Test Values + * Tests the expected values of the RPC message. + */ + public void testRpcValues() { + // Test Values ImageType imageType = msg.getImageType(); String value = msg.getValue(); Boolean isTemplate = msg.getIsTemplate(); - + // Valid Tests assertEquals(TestValues.MATCH, TestValues.GENERAL_IMAGETYPE, imageType); assertEquals(TestValues.MATCH, TestValues.GENERAL_STRING, value); assertEquals(TestValues.MATCH, (Boolean) TestValues.GENERAL_BOOLEAN, isTemplate); - + // Invalid/Null Tests Image msg = new Image(); assertNotNull(TestValues.NOT_NULL, msg); @@ -53,10 +53,10 @@ public class ImageTests extends TestCase{ assertNull(TestValues.NULL, msg.getIsTemplate()); } - public void testJson(){ + public void testJson() { JSONObject reference = new JSONObject(); - try{ + try { reference.put(Image.KEY_IMAGE_TYPE, TestValues.GENERAL_IMAGETYPE); reference.put(Image.KEY_VALUE, TestValues.GENERAL_STRING); reference.put(Image.KEY_IS_TEMPLATE, TestValues.GENERAL_BOOLEAN); @@ -65,12 +65,12 @@ public class ImageTests extends TestCase{ assertEquals(TestValues.MATCH, reference.length(), underTest.length()); Iterator<?> iterator = reference.keys(); - while(iterator.hasNext()){ + while (iterator.hasNext()) { String key = (String) iterator.next(); assertEquals(TestValues.MATCH, JsonUtils.readObjectFromJsonObject(reference, key), JsonUtils.readObjectFromJsonObject(underTest, key)); } - }catch(JSONException e){ - fail(TestValues.JSON_FAIL); + } catch (JSONException e) { + fail(TestValues.JSON_FAIL); } } }
\ No newline at end of file diff --git a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/KeyboardPropertiesTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/KeyboardPropertiesTests.java index cfb0c1c7d..e06bd5e0b 100644 --- a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/KeyboardPropertiesTests.java +++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/KeyboardPropertiesTests.java @@ -17,15 +17,15 @@ import java.util.Iterator; import java.util.List; /** - * This is a unit test class for the SmartDeviceLink library project class : + * This is a unit test class for the SmartDeviceLink library project class : * {@link com.smartdevicelink.proxy.rpc.KeyboardProperties} */ -public class KeyboardPropertiesTests extends TestCase{ +public class KeyboardPropertiesTests extends TestCase { private KeyboardProperties msg; @Override - public void setUp(){ + public void setUp() { msg = new KeyboardProperties(); msg.setAutoCompleteText(TestValues.GENERAL_STRING); @@ -37,17 +37,17 @@ public class KeyboardPropertiesTests extends TestCase{ } /** - * Tests the expected values of the RPC message. - */ - public void testRpcValues () { - // Test Values + * Tests the expected values of the RPC message. + */ + public void testRpcValues() { + // Test Values String autoCompleteText = msg.getAutoCompleteText(); List<String> autoCompleteList = msg.getAutoCompleteList(); KeyboardLayout keyboardLayout = msg.getKeyboardLayout(); KeypressMode keypressMode = msg.getKeypressMode(); Language language = msg.getLanguage(); List<String> limitedChars = msg.getLimitedCharacterList(); - + // Valid Tests assertEquals(TestValues.MATCH, TestValues.GENERAL_STRING, autoCompleteText); assertEquals(TestValues.MATCH, TestValues.GENERAL_STRING_LIST.size(), autoCompleteList.size()); @@ -57,11 +57,11 @@ public class KeyboardPropertiesTests extends TestCase{ assertEquals(TestValues.MATCH, TestValues.GENERAL_LANGUAGE, language); assertEquals(TestValues.MATCH, TestValues.GENERAL_STRING_LIST.size(), limitedChars.size()); assertTrue(TestValues.TRUE, Validator.validateStringList(TestValues.GENERAL_STRING_LIST, limitedChars)); - + // Invalid/Null Tests KeyboardProperties msg = new KeyboardProperties(); assertNotNull(TestValues.NOT_NULL, msg); - + // Keypress mode is created in the object constructor assertNotNull(TestValues.NOT_NULL, msg.getKeypressMode()); assertNull(TestValues.NULL, msg.getAutoCompleteText()); @@ -71,10 +71,10 @@ public class KeyboardPropertiesTests extends TestCase{ assertNull(TestValues.NULL, msg.getLimitedCharacterList()); } - public void testJson(){ + public void testJson() { JSONObject reference = new JSONObject(); - try{ + try { reference.put(KeyboardProperties.KEY_AUTO_COMPLETE_TEXT, TestValues.GENERAL_STRING); reference.put(KeyboardProperties.KEY_AUTO_COMPLETE_LIST, JsonUtils.createJsonArray(TestValues.GENERAL_STRING_LIST)); reference.put(KeyboardProperties.KEY_KEYBOARD_LAYOUT, TestValues.GENERAL_KEYBOARDLAYOUT); @@ -86,16 +86,16 @@ public class KeyboardPropertiesTests extends TestCase{ assertEquals(TestValues.MATCH, reference.length(), underTest.length()); Iterator<?> iterator = reference.keys(); - while(iterator.hasNext()){ + while (iterator.hasNext()) { String key = (String) iterator.next(); - if(key.equals(KeyboardProperties.KEY_LIMITED_CHARACTER_LIST) || key.equals(KeyboardProperties.KEY_AUTO_COMPLETE_LIST)){ + if (key.equals(KeyboardProperties.KEY_LIMITED_CHARACTER_LIST) || key.equals(KeyboardProperties.KEY_AUTO_COMPLETE_LIST)) { assertTrue(TestValues.TRUE, Validator.validateStringList(JsonUtils.readStringListFromJsonObject(reference, key), JsonUtils.readStringListFromJsonObject(underTest, key))); - } else{ + } else { assertEquals(TestValues.MATCH, JsonUtils.readObjectFromJsonObject(reference, key), JsonUtils.readObjectFromJsonObject(underTest, key)); } } - } catch(JSONException e){ - fail(TestValues.JSON_FAIL); + } catch (JSONException e) { + fail(TestValues.JSON_FAIL); } } }
\ No newline at end of file diff --git a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/LightCapabilitiesTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/LightCapabilitiesTests.java index ba4df001f..c58f0d35b 100644 --- a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/LightCapabilitiesTests.java +++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/LightCapabilitiesTests.java @@ -18,64 +18,64 @@ import java.util.Iterator; */ public class LightCapabilitiesTests extends TestCase { - private LightCapabilities msg; - - @Override - public void setUp() { - msg = new LightCapabilities(); - - msg.setName(TestValues.GENERAL_LIGHTNAME); - msg.setDensityAvailable(TestValues.GENERAL_BOOLEAN); - msg.setRGBColorSpaceAvailable(TestValues.GENERAL_BOOLEAN); - msg.setStatusAvailable(TestValues.GENERAL_BOOLEAN); - } - - /** - * Tests the expected values of the RPC message. - */ - public void testRpcValues() { - // Test Values - LightName name = msg.getName(); - Boolean densityAvailable = msg.getDensityAvailable(); - Boolean rgbColorSpaceAvailable = msg.getRGBColorSpaceAvailable(); - Boolean statusAvailable = msg.getStatusAvailable(); - - // Valid Tests - assertEquals(TestValues.MATCH, TestValues.GENERAL_LIGHTNAME, name); - assertEquals(TestValues.MATCH, TestValues.GENERAL_BOOLEAN, (boolean) densityAvailable); - assertEquals(TestValues.MATCH, TestValues.GENERAL_BOOLEAN, (boolean) rgbColorSpaceAvailable); - assertEquals(TestValues.MATCH, TestValues.GENERAL_BOOLEAN, (boolean) statusAvailable); - - // Invalid/Null Tests - LightCapabilities msg = new LightCapabilities(); - assertNotNull(TestValues.NOT_NULL, msg); - - assertNull(TestValues.NULL, msg.getName()); - assertNull(TestValues.NULL, msg.getDensityAvailable()); - assertNull(TestValues.NULL, msg.getRGBColorSpaceAvailable()); - assertNull(TestValues.NULL, msg.getStatusAvailable()); - } - - public void testJson() { - JSONObject reference = new JSONObject(); - - try { - reference.put(LightCapabilities.KEY_NAME, TestValues.GENERAL_LIGHTNAME); - reference.put(LightCapabilities.KEY_DENSITY_AVAILABLE, TestValues.GENERAL_BOOLEAN); - reference.put(LightCapabilities.KEY_RGB_COLOR_SPACE_AVAILABLE, TestValues.GENERAL_BOOLEAN); - reference.put(LightCapabilities.KEY_STATUS_AVAILABLE, TestValues.GENERAL_BOOLEAN); - - JSONObject underTest = msg.serializeJSON(); - assertEquals(TestValues.MATCH, reference.length(), underTest.length()); - - Iterator<?> iterator = reference.keys(); - while (iterator.hasNext()) { - String key = (String) iterator.next(); - - assertEquals(TestValues.MATCH, JsonUtils.readObjectFromJsonObject(reference, key), JsonUtils.readObjectFromJsonObject(underTest, key)); - } - } catch (JSONException e) { - fail(TestValues.JSON_FAIL); - } - } + private LightCapabilities msg; + + @Override + public void setUp() { + msg = new LightCapabilities(); + + msg.setName(TestValues.GENERAL_LIGHTNAME); + msg.setDensityAvailable(TestValues.GENERAL_BOOLEAN); + msg.setRGBColorSpaceAvailable(TestValues.GENERAL_BOOLEAN); + msg.setStatusAvailable(TestValues.GENERAL_BOOLEAN); + } + + /** + * Tests the expected values of the RPC message. + */ + public void testRpcValues() { + // Test Values + LightName name = msg.getName(); + Boolean densityAvailable = msg.getDensityAvailable(); + Boolean rgbColorSpaceAvailable = msg.getRGBColorSpaceAvailable(); + Boolean statusAvailable = msg.getStatusAvailable(); + + // Valid Tests + assertEquals(TestValues.MATCH, TestValues.GENERAL_LIGHTNAME, name); + assertEquals(TestValues.MATCH, TestValues.GENERAL_BOOLEAN, (boolean) densityAvailable); + assertEquals(TestValues.MATCH, TestValues.GENERAL_BOOLEAN, (boolean) rgbColorSpaceAvailable); + assertEquals(TestValues.MATCH, TestValues.GENERAL_BOOLEAN, (boolean) statusAvailable); + + // Invalid/Null Tests + LightCapabilities msg = new LightCapabilities(); + assertNotNull(TestValues.NOT_NULL, msg); + + assertNull(TestValues.NULL, msg.getName()); + assertNull(TestValues.NULL, msg.getDensityAvailable()); + assertNull(TestValues.NULL, msg.getRGBColorSpaceAvailable()); + assertNull(TestValues.NULL, msg.getStatusAvailable()); + } + + public void testJson() { + JSONObject reference = new JSONObject(); + + try { + reference.put(LightCapabilities.KEY_NAME, TestValues.GENERAL_LIGHTNAME); + reference.put(LightCapabilities.KEY_DENSITY_AVAILABLE, TestValues.GENERAL_BOOLEAN); + reference.put(LightCapabilities.KEY_RGB_COLOR_SPACE_AVAILABLE, TestValues.GENERAL_BOOLEAN); + reference.put(LightCapabilities.KEY_STATUS_AVAILABLE, TestValues.GENERAL_BOOLEAN); + + JSONObject underTest = msg.serializeJSON(); + assertEquals(TestValues.MATCH, reference.length(), underTest.length()); + + Iterator<?> iterator = reference.keys(); + while (iterator.hasNext()) { + String key = (String) iterator.next(); + + assertEquals(TestValues.MATCH, JsonUtils.readObjectFromJsonObject(reference, key), JsonUtils.readObjectFromJsonObject(underTest, key)); + } + } catch (JSONException e) { + fail(TestValues.JSON_FAIL); + } + } }
\ No newline at end of file diff --git a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/LightControlCapabilitiesTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/LightControlCapabilitiesTests.java index 8487bf17f..e92ce7c6f 100644 --- a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/LightControlCapabilitiesTests.java +++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/LightControlCapabilitiesTests.java @@ -24,77 +24,76 @@ import java.util.List; */ public class LightControlCapabilitiesTests extends TestCase { - private LightControlCapabilities msg; - - @Override - public void setUp() { - msg = new LightControlCapabilities(); - - msg.setModuleName(TestValues.GENERAL_STRING); - msg.setSupportedLights(TestValues.GENERAL_LIGHTCAPABILITIES_LIST); - msg.setModuleInfo(TestValues.GENERAL_MODULE_INFO); - } - - /** - * Tests the expected values of the RPC message. - */ - public void testRpcValues() { - // Test Values - String moduleName = msg.getModuleName(); - List<LightCapabilities> supportedLights = msg.getSupportedLights(); - ModuleInfo info = msg.getModuleInfo(); - - // Valid Tests - assertEquals(TestValues.MATCH, TestValues.GENERAL_STRING, moduleName); - assertEquals(TestValues.MATCH, TestValues.GENERAL_LIGHTCAPABILITIES_LIST.size(), supportedLights.size()); - assertEquals(TestValues.MATCH, TestValues.GENERAL_MODULE_INFO, info); - - assertTrue(TestValues.TRUE, Validator.validateLightCapabilitiesList(TestValues.GENERAL_LIGHTCAPABILITIES_LIST, supportedLights)); - - // Invalid/Null Tests - LightControlCapabilities msg = new LightControlCapabilities(); - assertNotNull(TestValues.NOT_NULL, msg); - - assertNull(TestValues.NULL, msg.getModuleName()); - assertNull(TestValues.NULL, msg.getSupportedLights()); - assertNull(TestValues.NULL, msg.getModuleInfo()); - } - - public void testJson() { - JSONObject reference = new JSONObject(); - - try { - reference.put(LightControlCapabilities.KEY_MODULE_NAME, TestValues.GENERAL_STRING); - reference.put(LightControlCapabilities.KEY_SUPPORTED_LIGHTS, TestValues.GENERAL_LIGHTCAPABILITIES_LIST); - reference.put(LightControlCapabilities.KEY_MODULE_INFO, TestValues.JSON_MODULE_INFO); - - 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(LightControlCapabilities.KEY_SUPPORTED_LIGHTS)) { - List<LightCapabilities> lcReference = (List<LightCapabilities>) JsonUtils.readObjectFromJsonObject(reference, key); - JSONArray lsArray = JsonUtils.readJsonArrayFromJsonObject(underTest, key); - int i = 0; - for (LightCapabilities lc : lcReference) { - assertTrue(Validator.validateLightCapabilities(lc, new LightCapabilities(JsonRPCMarshaller.deserializeJSONObject(lsArray.getJSONObject(i++))))); - } - } else if(key.equals(LightControlCapabilities.KEY_MODULE_INFO)) { - JSONObject o1 = (JSONObject) JsonUtils.readObjectFromJsonObject(reference, key); - JSONObject o2 = (JSONObject) JsonUtils.readObjectFromJsonObject(underTest, key); - Hashtable<String, Object> h1 = JsonRPCMarshaller.deserializeJSONObject(o1); - Hashtable<String, Object> h2 = JsonRPCMarshaller.deserializeJSONObject(o2); - assertTrue(TestValues.TRUE, Validator.validateModuleInfo(new ModuleInfo(h1), new ModuleInfo(h2))); - } - else { - assertEquals(TestValues.MATCH, JsonUtils.readObjectFromJsonObject(reference, key), JsonUtils.readObjectFromJsonObject(underTest, key)); - } - } - } catch (JSONException e) { - fail(TestValues.JSON_FAIL); - } - } + private LightControlCapabilities msg; + + @Override + public void setUp() { + msg = new LightControlCapabilities(); + + msg.setModuleName(TestValues.GENERAL_STRING); + msg.setSupportedLights(TestValues.GENERAL_LIGHTCAPABILITIES_LIST); + msg.setModuleInfo(TestValues.GENERAL_MODULE_INFO); + } + + /** + * Tests the expected values of the RPC message. + */ + public void testRpcValues() { + // Test Values + String moduleName = msg.getModuleName(); + List<LightCapabilities> supportedLights = msg.getSupportedLights(); + ModuleInfo info = msg.getModuleInfo(); + + // Valid Tests + assertEquals(TestValues.MATCH, TestValues.GENERAL_STRING, moduleName); + assertEquals(TestValues.MATCH, TestValues.GENERAL_LIGHTCAPABILITIES_LIST.size(), supportedLights.size()); + assertEquals(TestValues.MATCH, TestValues.GENERAL_MODULE_INFO, info); + + assertTrue(TestValues.TRUE, Validator.validateLightCapabilitiesList(TestValues.GENERAL_LIGHTCAPABILITIES_LIST, supportedLights)); + + // Invalid/Null Tests + LightControlCapabilities msg = new LightControlCapabilities(); + assertNotNull(TestValues.NOT_NULL, msg); + + assertNull(TestValues.NULL, msg.getModuleName()); + assertNull(TestValues.NULL, msg.getSupportedLights()); + assertNull(TestValues.NULL, msg.getModuleInfo()); + } + + public void testJson() { + JSONObject reference = new JSONObject(); + + try { + reference.put(LightControlCapabilities.KEY_MODULE_NAME, TestValues.GENERAL_STRING); + reference.put(LightControlCapabilities.KEY_SUPPORTED_LIGHTS, TestValues.GENERAL_LIGHTCAPABILITIES_LIST); + reference.put(LightControlCapabilities.KEY_MODULE_INFO, TestValues.JSON_MODULE_INFO); + + 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(LightControlCapabilities.KEY_SUPPORTED_LIGHTS)) { + List<LightCapabilities> lcReference = (List<LightCapabilities>) JsonUtils.readObjectFromJsonObject(reference, key); + JSONArray lsArray = JsonUtils.readJsonArrayFromJsonObject(underTest, key); + int i = 0; + for (LightCapabilities lc : lcReference) { + assertTrue(Validator.validateLightCapabilities(lc, new LightCapabilities(JsonRPCMarshaller.deserializeJSONObject(lsArray.getJSONObject(i++))))); + } + } else if (key.equals(LightControlCapabilities.KEY_MODULE_INFO)) { + JSONObject o1 = (JSONObject) JsonUtils.readObjectFromJsonObject(reference, key); + JSONObject o2 = (JSONObject) JsonUtils.readObjectFromJsonObject(underTest, key); + Hashtable<String, Object> h1 = JsonRPCMarshaller.deserializeJSONObject(o1); + Hashtable<String, Object> h2 = JsonRPCMarshaller.deserializeJSONObject(o2); + assertTrue(TestValues.TRUE, Validator.validateModuleInfo(new ModuleInfo(h1), new ModuleInfo(h2))); + } else { + assertEquals(TestValues.MATCH, JsonUtils.readObjectFromJsonObject(reference, key), JsonUtils.readObjectFromJsonObject(underTest, key)); + } + } + } catch (JSONException e) { + fail(TestValues.JSON_FAIL); + } + } }
\ No newline at end of file diff --git a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/LightControlDataTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/LightControlDataTests.java index 48989a3d9..5d4417f36 100644 --- a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/LightControlDataTests.java +++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/LightControlDataTests.java @@ -22,58 +22,58 @@ import java.util.List; */ public class LightControlDataTests extends TestCase { - private LightControlData msg; - - @Override - public void setUp() { - msg = new LightControlData(); - - msg.setLightState(TestValues.GENERAL_LIGHTSTATE_LIST); - } - - /** - * Tests the expected values of the RPC message. - */ - public void testRpcValues() { - // Test Values - List<LightState> lightState = msg.getLightState(); - - // Valid Tests - assertEquals(TestValues.MATCH, TestValues.GENERAL_LIGHTSTATE_LIST.size(), lightState.size()); - - assertTrue(TestValues.TRUE, Validator.validateLightStateList(TestValues.GENERAL_LIGHTSTATE_LIST, lightState)); - - // Invalid/Null Tests - LightControlData msg = new LightControlData(); - assertNotNull(TestValues.NOT_NULL, msg); - - assertNull(TestValues.NULL, msg.getLightState()); - } - - public void testJson() { - JSONObject reference = new JSONObject(); - - try { - reference.put(LightControlData.KEY_LIGHT_STATE, TestValues.GENERAL_LIGHTSTATE_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(LightControlData.KEY_LIGHT_STATE)) { - List<LightState> lsReference = (List<LightState>) JsonUtils.readObjectFromJsonObject(reference, key); - JSONArray lsArray = JsonUtils.readJsonArrayFromJsonObject(underTest, key); - int i = 0; - for (LightState ls : lsReference) { - assertTrue(Validator.validateLightState(ls, new LightState(JsonRPCMarshaller.deserializeJSONObject(lsArray.getJSONObject(i++))))); - } - } - } - } catch (JSONException e) { - fail(TestValues.JSON_FAIL); - } - } + private LightControlData msg; + + @Override + public void setUp() { + msg = new LightControlData(); + + msg.setLightState(TestValues.GENERAL_LIGHTSTATE_LIST); + } + + /** + * Tests the expected values of the RPC message. + */ + public void testRpcValues() { + // Test Values + List<LightState> lightState = msg.getLightState(); + + // Valid Tests + assertEquals(TestValues.MATCH, TestValues.GENERAL_LIGHTSTATE_LIST.size(), lightState.size()); + + assertTrue(TestValues.TRUE, Validator.validateLightStateList(TestValues.GENERAL_LIGHTSTATE_LIST, lightState)); + + // Invalid/Null Tests + LightControlData msg = new LightControlData(); + assertNotNull(TestValues.NOT_NULL, msg); + + assertNull(TestValues.NULL, msg.getLightState()); + } + + public void testJson() { + JSONObject reference = new JSONObject(); + + try { + reference.put(LightControlData.KEY_LIGHT_STATE, TestValues.GENERAL_LIGHTSTATE_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(LightControlData.KEY_LIGHT_STATE)) { + List<LightState> lsReference = (List<LightState>) JsonUtils.readObjectFromJsonObject(reference, key); + JSONArray lsArray = JsonUtils.readJsonArrayFromJsonObject(underTest, key); + int i = 0; + for (LightState ls : lsReference) { + assertTrue(Validator.validateLightState(ls, new LightState(JsonRPCMarshaller.deserializeJSONObject(lsArray.getJSONObject(i++))))); + } + } + } + } catch (JSONException e) { + fail(TestValues.JSON_FAIL); + } + } }
\ No newline at end of file diff --git a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/LightStateTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/LightStateTests.java index 272880ff0..0fc59d32d 100644 --- a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/LightStateTests.java +++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/LightStateTests.java @@ -23,72 +23,72 @@ import java.util.Iterator; */ public class LightStateTests extends TestCase { - private LightState msg; - - @Override - public void setUp() { - msg = new LightState(); - - msg.setId(TestValues.GENERAL_LIGHTNAME); - msg.setStatus(TestValues.GENERAL_LIGHTSTATUS); - msg.setDensity(TestValues.GENERAL_FLOAT); - msg.setColor(TestValues.GENERAL_RGBCOLOR); - } - - /** - * Tests the expected values of the RPC message. - */ - public void testRpcValues() { - // Test Values - LightName id = msg.getId(); - LightStatus status = msg.getStatus(); - Float density = msg.getDensity(); - RGBColor color = msg.getColor(); - - // Valid Tests - assertEquals(TestValues.MATCH, TestValues.GENERAL_LIGHTNAME, id); - assertEquals(TestValues.MATCH, TestValues.GENERAL_LIGHTSTATUS, status); - assertEquals(TestValues.MATCH, TestValues.GENERAL_FLOAT, (float) density); - assertEquals(TestValues.MATCH, TestValues.GENERAL_RGBCOLOR, color); - - // Invalid/Null Tests - LightState msg = new LightState(); - assertNotNull(TestValues.NOT_NULL, msg); - - assertNull(TestValues.NULL, msg.getId()); - assertNull(TestValues.NULL, msg.getStatus()); - assertNull(TestValues.NULL, msg.getDensity()); - assertNull(TestValues.NULL, msg.getColor()); - } - - public void testJson() { - JSONObject reference = new JSONObject(); - - try { - reference.put(LightState.KEY_ID, TestValues.GENERAL_LIGHTNAME); - reference.put(LightState.KEY_STATUS, TestValues.GENERAL_LIGHTSTATUS); - reference.put(LightState.KEY_DENSITY, TestValues.GENERAL_FLOAT); - reference.put(LightState.KEY_COLOR, JsonRPCMarshaller.serializeHashtable(TestValues.GENERAL_RGBCOLOR.getStore())); - - 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(LightState.KEY_COLOR)) { - JSONObject objectEquals = (JSONObject) JsonUtils.readObjectFromJsonObject(reference, key); - JSONObject testEquals = (JSONObject) JsonUtils.readObjectFromJsonObject(underTest, key); - Hashtable<String, Object> hashReference = JsonRPCMarshaller.deserializeJSONObject(objectEquals); - Hashtable<String, Object> hashTest = JsonRPCMarshaller.deserializeJSONObject(testEquals); - assertTrue(TestValues.TRUE, Validator.validateRGBColor(new RGBColor(hashReference), new RGBColor(hashTest))); - } else { - assertEquals(TestValues.MATCH, JsonUtils.readObjectFromJsonObject(reference, key), JsonUtils.readObjectFromJsonObject(underTest, key)); - } - } - } catch (JSONException e) { - fail(TestValues.JSON_FAIL); - } - } + private LightState msg; + + @Override + public void setUp() { + msg = new LightState(); + + msg.setId(TestValues.GENERAL_LIGHTNAME); + msg.setStatus(TestValues.GENERAL_LIGHTSTATUS); + msg.setDensity(TestValues.GENERAL_FLOAT); + msg.setColor(TestValues.GENERAL_RGBCOLOR); + } + + /** + * Tests the expected values of the RPC message. + */ + public void testRpcValues() { + // Test Values + LightName id = msg.getId(); + LightStatus status = msg.getStatus(); + Float density = msg.getDensity(); + RGBColor color = msg.getColor(); + + // Valid Tests + assertEquals(TestValues.MATCH, TestValues.GENERAL_LIGHTNAME, id); + assertEquals(TestValues.MATCH, TestValues.GENERAL_LIGHTSTATUS, status); + assertEquals(TestValues.MATCH, TestValues.GENERAL_FLOAT, (float) density); + assertEquals(TestValues.MATCH, TestValues.GENERAL_RGBCOLOR, color); + + // Invalid/Null Tests + LightState msg = new LightState(); + assertNotNull(TestValues.NOT_NULL, msg); + + assertNull(TestValues.NULL, msg.getId()); + assertNull(TestValues.NULL, msg.getStatus()); + assertNull(TestValues.NULL, msg.getDensity()); + assertNull(TestValues.NULL, msg.getColor()); + } + + public void testJson() { + JSONObject reference = new JSONObject(); + + try { + reference.put(LightState.KEY_ID, TestValues.GENERAL_LIGHTNAME); + reference.put(LightState.KEY_STATUS, TestValues.GENERAL_LIGHTSTATUS); + reference.put(LightState.KEY_DENSITY, TestValues.GENERAL_FLOAT); + reference.put(LightState.KEY_COLOR, JsonRPCMarshaller.serializeHashtable(TestValues.GENERAL_RGBCOLOR.getStore())); + + 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(LightState.KEY_COLOR)) { + JSONObject objectEquals = (JSONObject) JsonUtils.readObjectFromJsonObject(reference, key); + JSONObject testEquals = (JSONObject) JsonUtils.readObjectFromJsonObject(underTest, key); + Hashtable<String, Object> hashReference = JsonRPCMarshaller.deserializeJSONObject(objectEquals); + Hashtable<String, Object> hashTest = JsonRPCMarshaller.deserializeJSONObject(testEquals); + assertTrue(TestValues.TRUE, Validator.validateRGBColor(new RGBColor(hashReference), new RGBColor(hashTest))); + } else { + assertEquals(TestValues.MATCH, JsonUtils.readObjectFromJsonObject(reference, key), JsonUtils.readObjectFromJsonObject(underTest, key)); + } + } + } catch (JSONException e) { + fail(TestValues.JSON_FAIL); + } + } }
\ No newline at end of file diff --git a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/LocationDetailsTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/LocationDetailsTests.java index 3792f64b7..c1a2b78f7 100644 --- a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/LocationDetailsTests.java +++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/LocationDetailsTests.java @@ -24,14 +24,14 @@ public class LocationDetailsTests extends TestCase { private LocationDetails msg; @Override - public void setUp(){ + public void setUp() { msg = TestValues.GENERAL_LOCATIONDETAILS; } /** * Tests the expected values of the RPC message. */ - public void testRpcValues () { + public void testRpcValues() { // Test Values List<String> field1 = msg.getAddressLines(); String field2 = msg.getLocationDescription(); @@ -64,10 +64,10 @@ public class LocationDetailsTests extends TestCase { assertNull(msg.getSearchAddress()); } - public void testJson(){ + public void testJson() { JSONObject reference = new JSONObject(); - try{ + try { reference.put(LocationDetails.KEY_ADDRESS_LINES, JsonUtils.createJsonArray(TestValues.GENERAL_STRING_LIST)); reference.put(LocationDetails.KEY_LOCATION_DESCRIPTION, TestValues.GENERAL_STRING); reference.put(LocationDetails.KEY_LOCATION_NAME, TestValues.GENERAL_STRING); @@ -93,20 +93,20 @@ public class LocationDetailsTests extends TestCase { assertTrue(Validator.validateCoordinate( (Coordinate) JsonUtils.readObjectFromJsonObject(reference, LocationDetails.KEY_COORDINATE), - new Coordinate(JsonRPCMarshaller.deserializeJSONObject( (JSONObject) JsonUtils.readObjectFromJsonObject(underTest, LocationDetails.KEY_COORDINATE)))) - ); + new Coordinate(JsonRPCMarshaller.deserializeJSONObject((JSONObject) JsonUtils.readObjectFromJsonObject(underTest, LocationDetails.KEY_COORDINATE)))) + ); assertTrue(Validator.validateImage( (Image) JsonUtils.readObjectFromJsonObject(reference, LocationDetails.KEY_LOCATION_IMAGE), new Image(JsonRPCMarshaller.deserializeJSONObject((JSONObject) JsonUtils.readObjectFromJsonObject(underTest, LocationDetails.KEY_LOCATION_IMAGE))) - )); + )); assertTrue(Validator.validateOasisAddress( (OasisAddress) JsonUtils.readObjectFromJsonObject(reference, LocationDetails.KEY_SEARCH_ADDRESS), new OasisAddress(JsonRPCMarshaller.deserializeJSONObject((JSONObject) JsonUtils.readObjectFromJsonObject(underTest, LocationDetails.KEY_SEARCH_ADDRESS))) )); - } catch(JSONException e){ + } catch (JSONException e) { fail(TestValues.JSON_FAIL); } } diff --git a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/MassageCushionFirmnessTest.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/MassageCushionFirmnessTest.java index fb3e9a764..f4485698b 100644 --- a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/MassageCushionFirmnessTest.java +++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/MassageCushionFirmnessTest.java @@ -18,54 +18,54 @@ import java.util.Iterator; */ public class MassageCushionFirmnessTest extends TestCase { - private MassageCushionFirmness msg; - - @Override - public void setUp() { - msg = new MassageCushionFirmness(); - - msg.setCushion(TestValues.GENERAL_MASSAGECUSHION); - msg.setFirmness(TestValues.GENERAL_INT); - } - - /** - * Tests the expected values of the RPC message. - */ - public void testRpcValues() { - // Test Values - MassageCushion cushion = msg.getCushion(); - Integer firmness = msg.getFirmness(); - - // Valid Tests - assertEquals(TestValues.MATCH, TestValues.GENERAL_MASSAGECUSHION, cushion); - assertEquals(TestValues.MATCH, (Integer) TestValues.GENERAL_INT, firmness); - - // Invalid/Null Tests - MassageCushionFirmness msg = new MassageCushionFirmness(); - assertNotNull(TestValues.NOT_NULL, msg); - - assertNull(TestValues.NULL, msg.getCushion()); - assertNull(TestValues.NULL, msg.getFirmness()); - } - - public void testJson() { - JSONObject reference = new JSONObject(); - - try { - reference.put(MassageCushionFirmness.KEY_CUSHION, TestValues.GENERAL_MASSAGECUSHION); - reference.put(MassageCushionFirmness.KEY_FIRMNESS, TestValues.GENERAL_INT); - - JSONObject underTest = msg.serializeJSON(); - assertEquals(TestValues.MATCH, reference.length(), underTest.length()); - - Iterator<?> iterator = reference.keys(); - while (iterator.hasNext()) { - String key = (String) iterator.next(); - - assertEquals(TestValues.MATCH, JsonUtils.readObjectFromJsonObject(reference, key), JsonUtils.readObjectFromJsonObject(underTest, key)); - } - } catch (JSONException e) { - fail(TestValues.JSON_FAIL); - } - } + private MassageCushionFirmness msg; + + @Override + public void setUp() { + msg = new MassageCushionFirmness(); + + msg.setCushion(TestValues.GENERAL_MASSAGECUSHION); + msg.setFirmness(TestValues.GENERAL_INT); + } + + /** + * Tests the expected values of the RPC message. + */ + public void testRpcValues() { + // Test Values + MassageCushion cushion = msg.getCushion(); + Integer firmness = msg.getFirmness(); + + // Valid Tests + assertEquals(TestValues.MATCH, TestValues.GENERAL_MASSAGECUSHION, cushion); + assertEquals(TestValues.MATCH, (Integer) TestValues.GENERAL_INT, firmness); + + // Invalid/Null Tests + MassageCushionFirmness msg = new MassageCushionFirmness(); + assertNotNull(TestValues.NOT_NULL, msg); + + assertNull(TestValues.NULL, msg.getCushion()); + assertNull(TestValues.NULL, msg.getFirmness()); + } + + public void testJson() { + JSONObject reference = new JSONObject(); + + try { + reference.put(MassageCushionFirmness.KEY_CUSHION, TestValues.GENERAL_MASSAGECUSHION); + reference.put(MassageCushionFirmness.KEY_FIRMNESS, TestValues.GENERAL_INT); + + JSONObject underTest = msg.serializeJSON(); + assertEquals(TestValues.MATCH, reference.length(), underTest.length()); + + Iterator<?> iterator = reference.keys(); + while (iterator.hasNext()) { + String key = (String) iterator.next(); + + assertEquals(TestValues.MATCH, JsonUtils.readObjectFromJsonObject(reference, key), JsonUtils.readObjectFromJsonObject(underTest, key)); + } + } catch (JSONException e) { + fail(TestValues.JSON_FAIL); + } + } }
\ No newline at end of file diff --git a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/MassageModeDataTest.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/MassageModeDataTest.java index 7f89422a0..5cd86343b 100644 --- a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/MassageModeDataTest.java +++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/MassageModeDataTest.java @@ -19,56 +19,56 @@ import java.util.Iterator; */ public class MassageModeDataTest extends TestCase { - private MassageModeData msg; + private MassageModeData msg; - @Override - public void setUp() { - msg = new MassageModeData(); + @Override + public void setUp() { + msg = new MassageModeData(); - msg.setMassageZone(TestValues.GENERAL_MASSAGEZONE); - msg.setMassageMode(TestValues.GENERAL_MASSAGEMODE); - } + msg.setMassageZone(TestValues.GENERAL_MASSAGEZONE); + msg.setMassageMode(TestValues.GENERAL_MASSAGEMODE); + } - /** - * Tests the expected values of the RPC message. - */ - public void testRpcValues() { - // Test Values - MassageZone massageZone = msg.getMassageZone(); - MassageMode massageMode = msg.getMassageMode(); + /** + * Tests the expected values of the RPC message. + */ + public void testRpcValues() { + // Test Values + MassageZone massageZone = msg.getMassageZone(); + MassageMode massageMode = msg.getMassageMode(); - // Valid Tests - assertEquals(TestValues.MATCH, TestValues.GENERAL_MASSAGEZONE, massageZone); - assertEquals(TestValues.MATCH, TestValues.GENERAL_MASSAGEMODE, massageMode); + // Valid Tests + assertEquals(TestValues.MATCH, TestValues.GENERAL_MASSAGEZONE, massageZone); + assertEquals(TestValues.MATCH, TestValues.GENERAL_MASSAGEMODE, massageMode); - // Invalid/Null Tests - MassageModeData msg = new MassageModeData(); - assertNotNull(TestValues.NOT_NULL, msg); + // Invalid/Null Tests + MassageModeData msg = new MassageModeData(); + assertNotNull(TestValues.NOT_NULL, msg); - assertNull(TestValues.NULL, msg.getMassageMode()); - assertNull(TestValues.NULL, msg.getMassageZone()); - } + assertNull(TestValues.NULL, msg.getMassageMode()); + assertNull(TestValues.NULL, msg.getMassageZone()); + } - public void testJson() { - JSONObject reference = new JSONObject(); + public void testJson() { + JSONObject reference = new JSONObject(); - try { - reference.put(MassageModeData.KEY_MASSAGE_MODE, TestValues.GENERAL_MASSAGEMODE); - reference.put(MassageModeData.KEY_MASSAGE_ZONE, TestValues.GENERAL_MASSAGEZONE); + try { + reference.put(MassageModeData.KEY_MASSAGE_MODE, TestValues.GENERAL_MASSAGEMODE); + reference.put(MassageModeData.KEY_MASSAGE_ZONE, TestValues.GENERAL_MASSAGEZONE); - JSONObject underTest = msg.serializeJSON(); - assertEquals(TestValues.MATCH, reference.length(), underTest.length()); + JSONObject underTest = msg.serializeJSON(); + assertEquals(TestValues.MATCH, reference.length(), underTest.length()); - Iterator<?> iterator = reference.keys(); - while (iterator.hasNext()) { - String key = (String) iterator.next(); + Iterator<?> iterator = reference.keys(); + while (iterator.hasNext()) { + String key = (String) iterator.next(); - assertEquals(TestValues.MATCH, JsonUtils.readObjectFromJsonObject(reference, key), JsonUtils.readObjectFromJsonObject(underTest, key)); + assertEquals(TestValues.MATCH, JsonUtils.readObjectFromJsonObject(reference, key), JsonUtils.readObjectFromJsonObject(underTest, key)); - } - } catch (JSONException e) { - fail(TestValues.JSON_FAIL); - } - } + } + } catch (JSONException e) { + fail(TestValues.JSON_FAIL); + } + } }
\ No newline at end of file diff --git a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/MediaServiceDataTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/MediaServiceDataTests.java index 5d1baded5..6f7dd148a 100644 --- a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/MediaServiceDataTests.java +++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/MediaServiceDataTests.java @@ -22,116 +22,116 @@ import java.util.Iterator; */ public class MediaServiceDataTests extends TestCase { - private MediaServiceData msg; - - @Override - public void setUp(){ - - msg = new MediaServiceData(); - msg.setMediaType(TestValues.GENERAL_MEDIATYPE); - msg.setMediaTitle(TestValues.GENERAL_STRING); - msg.setMediaArtist(TestValues.GENERAL_STRING); - msg.setMediaAlbum(TestValues.GENERAL_STRING); - msg.setMediaImage(TestValues.GENERAL_IMAGE); - msg.setPlaylistName(TestValues.GENERAL_STRING); - msg.setIsExplicit(TestValues.GENERAL_BOOLEAN); - msg.setTrackPlaybackProgress(TestValues.GENERAL_INTEGER); - msg.setTrackPlaybackDuration(TestValues.GENERAL_INTEGER); - msg.setQueuePlaybackProgress(TestValues.GENERAL_INTEGER); - msg.setQueuePlaybackDuration(TestValues.GENERAL_INTEGER); - msg.setQueueCurrentTrackNumber(TestValues.GENERAL_INTEGER); - msg.setQueueTotalTrackCount(TestValues.GENERAL_INTEGER); - } - - /** - * Tests the expected values of the RPC message. - */ - public void testRpcValues () { - // Test Values - MediaType mediaType = msg.getMediaType(); - String mediaTitle = msg.getMediaTitle(); - String mediaArtist = msg.getMediaArtist(); - String mediaAlbum = msg.getMediaAlbum(); - Image mediaImage = msg.getMediaImage(); - String playlistName = msg.getPlaylistName(); - boolean isExplicit = msg.getIsExplicit(); - Integer trackPlaybackProgress = msg.getTrackPlaybackProgress(); - Integer trackPlaybackDuration = msg.getTrackPlaybackDuration(); - Integer queuePlaybackProgress = msg.getQueuePlaybackProgress(); - Integer queuePlaybackDuration = msg.getQueuePlaybackDuration(); - Integer queueCurrentTrackNumber = msg.getQueueCurrentTrackNumber(); - Integer queueTotalTrackCount = msg.getQueueTotalTrackCount(); - - // Valid Tests - assertEquals(TestValues.GENERAL_MEDIATYPE, mediaType); - assertEquals(TestValues.GENERAL_STRING, mediaTitle); - assertEquals(TestValues.GENERAL_STRING, mediaArtist); - assertEquals(TestValues.GENERAL_STRING, mediaAlbum); - assertEquals(TestValues.GENERAL_IMAGE, mediaImage); - assertEquals(TestValues.GENERAL_STRING, playlistName); - assertEquals(TestValues.GENERAL_BOOLEAN, isExplicit); - assertEquals(TestValues.GENERAL_INTEGER, trackPlaybackProgress); - assertEquals(TestValues.GENERAL_INTEGER, trackPlaybackDuration); - assertEquals(TestValues.GENERAL_INTEGER, queuePlaybackProgress); - assertEquals(TestValues.GENERAL_INTEGER, queuePlaybackDuration); - assertEquals(TestValues.GENERAL_INTEGER, queueCurrentTrackNumber); - assertEquals(TestValues.GENERAL_INTEGER, queueTotalTrackCount); - - // Invalid/Null Tests - MediaServiceData msg = new MediaServiceData(); - assertNotNull(TestValues.NOT_NULL, msg); - - assertNull(TestValues.NULL, msg.getMediaType()); - assertNull(TestValues.NULL, msg.getMediaTitle()); - assertNull(TestValues.NULL, msg.getMediaArtist()); - assertNull(TestValues.NULL, msg.getMediaAlbum()); - assertNull(TestValues.NULL, msg.getMediaImage()); - assertNull(TestValues.NULL, msg.getPlaylistName()); - assertNull(TestValues.NULL, msg.getIsExplicit()); - assertNull(TestValues.NULL, msg.getTrackPlaybackProgress()); - assertNull(TestValues.NULL, msg.getTrackPlaybackDuration()); - assertNull(TestValues.NULL, msg.getQueuePlaybackProgress()); - assertNull(TestValues.NULL, msg.getQueuePlaybackDuration()); - assertNull(TestValues.NULL, msg.getQueueCurrentTrackNumber()); - assertNull(TestValues.NULL, msg.getQueueTotalTrackCount()); - } - - public void testJson(){ - JSONObject reference = new JSONObject(); - - try{ - reference.put(MediaServiceData.KEY_MEDIA_TYPE, TestValues.GENERAL_MEDIATYPE); - reference.put(MediaServiceData.KEY_MEDIA_TITLE, TestValues.GENERAL_STRING); - reference.put(MediaServiceData.KEY_MEDIA_ARTIST, TestValues.GENERAL_STRING); - reference.put(MediaServiceData.KEY_MEDIA_ALBUM, TestValues.GENERAL_STRING); - reference.put(MediaServiceData.KEY_MEDIA_IMAGE, TestValues.GENERAL_IMAGE); - reference.put(MediaServiceData.KEY_PLAYLIST_NAME, TestValues.GENERAL_STRING); - reference.put(MediaServiceData.KEY_IS_EXPLICIT, TestValues.GENERAL_BOOLEAN); - reference.put(MediaServiceData.KEY_TRACK_PLAYBACK_PROGRESS, TestValues.GENERAL_INTEGER); - reference.put(MediaServiceData.KEY_TRACK_PLAYBACK_DURATION, TestValues.GENERAL_INTEGER); - reference.put(MediaServiceData.KEY_QUEUE_PLAYBACK_PROGRESS, TestValues.GENERAL_INTEGER); - reference.put(MediaServiceData.KEY_QUEUE_PLAYBACK_DURATION, TestValues.GENERAL_INTEGER); - reference.put(MediaServiceData.KEY_QUEUE_CURRENT_TRACK_NUMBER, TestValues.GENERAL_INTEGER); - reference.put(MediaServiceData.KEY_QUEUE_TOTAL_TRACK_COUNT, TestValues.GENERAL_INTEGER); - - 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(MediaServiceData.KEY_MEDIA_IMAGE)){ - JSONObject testEquals = (JSONObject) JsonUtils.readObjectFromJsonObject(underTest, key); - Hashtable<String, Object> hashTest = JsonRPCMarshaller.deserializeJSONObject(testEquals); - assertTrue(TestValues.TRUE, Validator.validateImage(TestValues.GENERAL_IMAGE, new Image(hashTest))); - } else { - assertEquals(TestValues.MATCH, JsonUtils.readObjectFromJsonObject(reference, key), JsonUtils.readObjectFromJsonObject(underTest, key)); - } - } - } catch(JSONException e){ - fail(TestValues.JSON_FAIL); - } - } + private MediaServiceData msg; + + @Override + public void setUp() { + + msg = new MediaServiceData(); + msg.setMediaType(TestValues.GENERAL_MEDIATYPE); + msg.setMediaTitle(TestValues.GENERAL_STRING); + msg.setMediaArtist(TestValues.GENERAL_STRING); + msg.setMediaAlbum(TestValues.GENERAL_STRING); + msg.setMediaImage(TestValues.GENERAL_IMAGE); + msg.setPlaylistName(TestValues.GENERAL_STRING); + msg.setIsExplicit(TestValues.GENERAL_BOOLEAN); + msg.setTrackPlaybackProgress(TestValues.GENERAL_INTEGER); + msg.setTrackPlaybackDuration(TestValues.GENERAL_INTEGER); + msg.setQueuePlaybackProgress(TestValues.GENERAL_INTEGER); + msg.setQueuePlaybackDuration(TestValues.GENERAL_INTEGER); + msg.setQueueCurrentTrackNumber(TestValues.GENERAL_INTEGER); + msg.setQueueTotalTrackCount(TestValues.GENERAL_INTEGER); + } + + /** + * Tests the expected values of the RPC message. + */ + public void testRpcValues() { + // Test Values + MediaType mediaType = msg.getMediaType(); + String mediaTitle = msg.getMediaTitle(); + String mediaArtist = msg.getMediaArtist(); + String mediaAlbum = msg.getMediaAlbum(); + Image mediaImage = msg.getMediaImage(); + String playlistName = msg.getPlaylistName(); + boolean isExplicit = msg.getIsExplicit(); + Integer trackPlaybackProgress = msg.getTrackPlaybackProgress(); + Integer trackPlaybackDuration = msg.getTrackPlaybackDuration(); + Integer queuePlaybackProgress = msg.getQueuePlaybackProgress(); + Integer queuePlaybackDuration = msg.getQueuePlaybackDuration(); + Integer queueCurrentTrackNumber = msg.getQueueCurrentTrackNumber(); + Integer queueTotalTrackCount = msg.getQueueTotalTrackCount(); + + // Valid Tests + assertEquals(TestValues.GENERAL_MEDIATYPE, mediaType); + assertEquals(TestValues.GENERAL_STRING, mediaTitle); + assertEquals(TestValues.GENERAL_STRING, mediaArtist); + assertEquals(TestValues.GENERAL_STRING, mediaAlbum); + assertEquals(TestValues.GENERAL_IMAGE, mediaImage); + assertEquals(TestValues.GENERAL_STRING, playlistName); + assertEquals(TestValues.GENERAL_BOOLEAN, isExplicit); + assertEquals(TestValues.GENERAL_INTEGER, trackPlaybackProgress); + assertEquals(TestValues.GENERAL_INTEGER, trackPlaybackDuration); + assertEquals(TestValues.GENERAL_INTEGER, queuePlaybackProgress); + assertEquals(TestValues.GENERAL_INTEGER, queuePlaybackDuration); + assertEquals(TestValues.GENERAL_INTEGER, queueCurrentTrackNumber); + assertEquals(TestValues.GENERAL_INTEGER, queueTotalTrackCount); + + // Invalid/Null Tests + MediaServiceData msg = new MediaServiceData(); + assertNotNull(TestValues.NOT_NULL, msg); + + assertNull(TestValues.NULL, msg.getMediaType()); + assertNull(TestValues.NULL, msg.getMediaTitle()); + assertNull(TestValues.NULL, msg.getMediaArtist()); + assertNull(TestValues.NULL, msg.getMediaAlbum()); + assertNull(TestValues.NULL, msg.getMediaImage()); + assertNull(TestValues.NULL, msg.getPlaylistName()); + assertNull(TestValues.NULL, msg.getIsExplicit()); + assertNull(TestValues.NULL, msg.getTrackPlaybackProgress()); + assertNull(TestValues.NULL, msg.getTrackPlaybackDuration()); + assertNull(TestValues.NULL, msg.getQueuePlaybackProgress()); + assertNull(TestValues.NULL, msg.getQueuePlaybackDuration()); + assertNull(TestValues.NULL, msg.getQueueCurrentTrackNumber()); + assertNull(TestValues.NULL, msg.getQueueTotalTrackCount()); + } + + public void testJson() { + JSONObject reference = new JSONObject(); + + try { + reference.put(MediaServiceData.KEY_MEDIA_TYPE, TestValues.GENERAL_MEDIATYPE); + reference.put(MediaServiceData.KEY_MEDIA_TITLE, TestValues.GENERAL_STRING); + reference.put(MediaServiceData.KEY_MEDIA_ARTIST, TestValues.GENERAL_STRING); + reference.put(MediaServiceData.KEY_MEDIA_ALBUM, TestValues.GENERAL_STRING); + reference.put(MediaServiceData.KEY_MEDIA_IMAGE, TestValues.GENERAL_IMAGE); + reference.put(MediaServiceData.KEY_PLAYLIST_NAME, TestValues.GENERAL_STRING); + reference.put(MediaServiceData.KEY_IS_EXPLICIT, TestValues.GENERAL_BOOLEAN); + reference.put(MediaServiceData.KEY_TRACK_PLAYBACK_PROGRESS, TestValues.GENERAL_INTEGER); + reference.put(MediaServiceData.KEY_TRACK_PLAYBACK_DURATION, TestValues.GENERAL_INTEGER); + reference.put(MediaServiceData.KEY_QUEUE_PLAYBACK_PROGRESS, TestValues.GENERAL_INTEGER); + reference.put(MediaServiceData.KEY_QUEUE_PLAYBACK_DURATION, TestValues.GENERAL_INTEGER); + reference.put(MediaServiceData.KEY_QUEUE_CURRENT_TRACK_NUMBER, TestValues.GENERAL_INTEGER); + reference.put(MediaServiceData.KEY_QUEUE_TOTAL_TRACK_COUNT, TestValues.GENERAL_INTEGER); + + 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(MediaServiceData.KEY_MEDIA_IMAGE)) { + JSONObject testEquals = (JSONObject) JsonUtils.readObjectFromJsonObject(underTest, key); + Hashtable<String, Object> hashTest = JsonRPCMarshaller.deserializeJSONObject(testEquals); + assertTrue(TestValues.TRUE, Validator.validateImage(TestValues.GENERAL_IMAGE, new Image(hashTest))); + } else { + assertEquals(TestValues.MATCH, JsonUtils.readObjectFromJsonObject(reference, key), JsonUtils.readObjectFromJsonObject(underTest, key)); + } + } + } catch (JSONException e) { + fail(TestValues.JSON_FAIL); + } + } } diff --git a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/MediaServiceManifestTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/MediaServiceManifestTests.java index d85e064f4..e81f207fe 100644 --- a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/MediaServiceManifestTests.java +++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/MediaServiceManifestTests.java @@ -11,20 +11,20 @@ import junit.framework.TestCase; */ public class MediaServiceManifestTests extends TestCase { - @Override - public void setUp(){ - // nothing to setup yet, this class doesn't contain anything - } + @Override + public void setUp() { + // nothing to setup yet, this class doesn't contain anything + } - /** - * Tests the expected values of the RPC message. - */ - public void testRpcValues () { - // Test Values + /** + * Tests the expected values of the RPC message. + */ + public void testRpcValues() { + // Test Values - // Invalid/Null Tests - MediaServiceManifest msg = new MediaServiceManifest(); - assertNotNull(TestValues.NOT_NULL, msg); - } + // Invalid/Null Tests + MediaServiceManifest msg = new MediaServiceManifest(); + assertNotNull(TestValues.NOT_NULL, msg); + } }
\ No newline at end of file diff --git a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/MenuParamsTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/MenuParamsTests.java index c3670f9df..998d8f4d4 100644 --- a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/MenuParamsTests.java +++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/MenuParamsTests.java @@ -12,15 +12,15 @@ import org.json.JSONObject; import java.util.Iterator; /** - * This is a unit test class for the SmartDeviceLink library project class : + * This is a unit test class for the SmartDeviceLink library project class : * {@link com.smartdevicelink.proxy.rpc.MenuParams} */ -public class MenuParamsTests extends TestCase{ +public class MenuParamsTests extends TestCase { private MenuParams msg; @Override - public void setUp(){ + public void setUp() { msg = new MenuParams(); msg.setMenuName(TestValues.GENERAL_STRING); @@ -29,19 +29,19 @@ public class MenuParamsTests extends TestCase{ } /** - * Tests the expected values of the RPC message. - */ - public void testRpcValues () { - // Test Values + * Tests the expected values of the RPC message. + */ + public void testRpcValues() { + // Test Values String menuName = msg.getMenuName(); int parentId = msg.getParentID(); int position = msg.getPosition(); - + // Valid Tests assertEquals(TestValues.MATCH, TestValues.GENERAL_STRING, menuName); assertEquals(TestValues.MATCH, TestValues.GENERAL_INT, parentId); assertEquals(TestValues.MATCH, TestValues.GENERAL_INT, position); - + // Invalid/Null Tests MenuParams msg = new MenuParams(); assertNotNull(TestValues.NOT_NULL, msg); @@ -51,10 +51,10 @@ public class MenuParamsTests extends TestCase{ assertNull(TestValues.NULL, msg.getPosition()); } - public void testJson(){ + public void testJson() { JSONObject reference = new JSONObject(); - try{ + try { reference.put(MenuParams.KEY_MENU_NAME, TestValues.GENERAL_STRING); reference.put(MenuParams.KEY_PARENT_ID, TestValues.GENERAL_INT); reference.put(MenuParams.KEY_POSITION, TestValues.GENERAL_INT); @@ -63,12 +63,12 @@ public class MenuParamsTests extends TestCase{ assertEquals(TestValues.MATCH, reference.length(), underTest.length()); Iterator<?> iterator = reference.keys(); - while(iterator.hasNext()){ + while (iterator.hasNext()) { String key = (String) iterator.next(); assertEquals(TestValues.MATCH, JsonUtils.readObjectFromJsonObject(reference, key), JsonUtils.readObjectFromJsonObject(underTest, key)); } - }catch(JSONException e){ - fail(TestValues.JSON_FAIL); + } catch (JSONException e) { + fail(TestValues.JSON_FAIL); } } }
\ No newline at end of file diff --git a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/MetadataTagsTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/MetadataTagsTests.java index 9b08c8e73..44d5d758a 100644 --- a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/MetadataTagsTests.java +++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/MetadataTagsTests.java @@ -22,89 +22,89 @@ import java.util.List; public class MetadataTagsTests extends TestCase { - private MetadataTags msg; - private MetadataTags msg2; - private List<MetadataType> exampleList; - - @Override - public void setUp() { - // Create List for Testing - exampleList = new ArrayList<>(); - exampleList.add(0, MetadataType.CURRENT_TEMPERATURE); - exampleList.add(1, MetadataType.MEDIA_ALBUM); - exampleList.add(2, MetadataType.MEDIA_ARTIST); - - msg = new MetadataTags(); - msg.setMainField1(exampleList); - msg.setMainField2(exampleList); - msg.setMainField3(exampleList); - msg.setMainField4(exampleList); - - // Setup without a list - msg2 = new MetadataTags(); - msg2.setMainField1(MetadataType.CURRENT_TEMPERATURE); - msg2.setMainField2(MetadataType.HUMIDITY); - msg2.setMainField3(MetadataType.MAXIMUM_TEMPERATURE); - msg2.setMainField4(MetadataType.MEDIA_ALBUM); - } - - /** - * Tests the expected values of the RPC message. - */ - public void testRpcValues () { - // Test Values - List<MetadataType> mainField1Types = msg.getMainField1(); - List<MetadataType> mainField2Types = msg.getMainField2(); - List<MetadataType> mainField3Types = msg.getMainField3(); - List<MetadataType> mainField4Types = msg.getMainField4(); - - // Valid Tests - assertEquals(TestValues.MATCH, exampleList, mainField1Types); - assertEquals(TestValues.MATCH, exampleList, mainField2Types); - assertEquals(TestValues.MATCH, exampleList, mainField3Types); - assertEquals(TestValues.MATCH, exampleList, mainField4Types); - - // Test metadata set without a list - mainField1Types = msg2.getMainField1(); - mainField2Types = msg2.getMainField2(); - mainField3Types = msg2.getMainField3(); - mainField4Types = msg2.getMainField4(); - - // Valid Tests - assertEquals(TestValues.MATCH, MetadataType.CURRENT_TEMPERATURE, mainField1Types.get(0)); - assertEquals(TestValues.MATCH, MetadataType.HUMIDITY, mainField2Types.get(0)); - assertEquals(TestValues.MATCH, MetadataType.MAXIMUM_TEMPERATURE, mainField3Types.get(0)); - assertEquals(TestValues.MATCH, MetadataType.MEDIA_ALBUM, mainField4Types.get(0)); - - // Invalid/Null Tests - MetadataTags msg = new MetadataTags(); - assertNotNull(TestValues.NOT_NULL, msg); - - assertNull(TestValues.NULL, msg.getMainField1()); - assertNull(TestValues.NULL, msg.getMainField2()); - assertNull(TestValues.NULL, msg.getMainField3()); - assertNull(TestValues.NULL, msg.getMainField4()); - } - - public void testJson() { - JSONObject reference = new JSONObject(); - - try { - reference.put(MetadataTags.KEY_MAIN_FIELD_1_TYPE, TestValues.JSON_TEXTFIELDTYPES); - reference.put(MetadataTags.KEY_MAIN_FIELD_2_TYPE, TestValues.JSON_TEXTFIELDTYPES); - reference.put(MetadataTags.KEY_MAIN_FIELD_3_TYPE, TestValues.JSON_TEXTFIELDTYPES); - reference.put(MetadataTags.KEY_MAIN_FIELD_4_TYPE, TestValues.JSON_TEXTFIELDTYPES); - - JSONObject underTest = msg.serializeJSON(); - assertEquals(TestValues.MATCH, reference.length(), underTest.length()); - - Iterator<?> iterator = reference.keys(); - while (iterator.hasNext()) { - String key = (String) iterator.next(); - assertEquals(TestValues.MATCH, JsonUtils.readObjectFromJsonObject(reference, key), JsonUtils.readObjectFromJsonObject(underTest, key)); - } - } catch (JSONException e) { - fail(TestValues.JSON_FAIL); - } - } + private MetadataTags msg; + private MetadataTags msg2; + private List<MetadataType> exampleList; + + @Override + public void setUp() { + // Create List for Testing + exampleList = new ArrayList<>(); + exampleList.add(0, MetadataType.CURRENT_TEMPERATURE); + exampleList.add(1, MetadataType.MEDIA_ALBUM); + exampleList.add(2, MetadataType.MEDIA_ARTIST); + + msg = new MetadataTags(); + msg.setMainField1(exampleList); + msg.setMainField2(exampleList); + msg.setMainField3(exampleList); + msg.setMainField4(exampleList); + + // Setup without a list + msg2 = new MetadataTags(); + msg2.setMainField1(MetadataType.CURRENT_TEMPERATURE); + msg2.setMainField2(MetadataType.HUMIDITY); + msg2.setMainField3(MetadataType.MAXIMUM_TEMPERATURE); + msg2.setMainField4(MetadataType.MEDIA_ALBUM); + } + + /** + * Tests the expected values of the RPC message. + */ + public void testRpcValues() { + // Test Values + List<MetadataType> mainField1Types = msg.getMainField1(); + List<MetadataType> mainField2Types = msg.getMainField2(); + List<MetadataType> mainField3Types = msg.getMainField3(); + List<MetadataType> mainField4Types = msg.getMainField4(); + + // Valid Tests + assertEquals(TestValues.MATCH, exampleList, mainField1Types); + assertEquals(TestValues.MATCH, exampleList, mainField2Types); + assertEquals(TestValues.MATCH, exampleList, mainField3Types); + assertEquals(TestValues.MATCH, exampleList, mainField4Types); + + // Test metadata set without a list + mainField1Types = msg2.getMainField1(); + mainField2Types = msg2.getMainField2(); + mainField3Types = msg2.getMainField3(); + mainField4Types = msg2.getMainField4(); + + // Valid Tests + assertEquals(TestValues.MATCH, MetadataType.CURRENT_TEMPERATURE, mainField1Types.get(0)); + assertEquals(TestValues.MATCH, MetadataType.HUMIDITY, mainField2Types.get(0)); + assertEquals(TestValues.MATCH, MetadataType.MAXIMUM_TEMPERATURE, mainField3Types.get(0)); + assertEquals(TestValues.MATCH, MetadataType.MEDIA_ALBUM, mainField4Types.get(0)); + + // Invalid/Null Tests + MetadataTags msg = new MetadataTags(); + assertNotNull(TestValues.NOT_NULL, msg); + + assertNull(TestValues.NULL, msg.getMainField1()); + assertNull(TestValues.NULL, msg.getMainField2()); + assertNull(TestValues.NULL, msg.getMainField3()); + assertNull(TestValues.NULL, msg.getMainField4()); + } + + public void testJson() { + JSONObject reference = new JSONObject(); + + try { + reference.put(MetadataTags.KEY_MAIN_FIELD_1_TYPE, TestValues.JSON_TEXTFIELDTYPES); + reference.put(MetadataTags.KEY_MAIN_FIELD_2_TYPE, TestValues.JSON_TEXTFIELDTYPES); + reference.put(MetadataTags.KEY_MAIN_FIELD_3_TYPE, TestValues.JSON_TEXTFIELDTYPES); + reference.put(MetadataTags.KEY_MAIN_FIELD_4_TYPE, TestValues.JSON_TEXTFIELDTYPES); + + JSONObject underTest = msg.serializeJSON(); + assertEquals(TestValues.MATCH, reference.length(), underTest.length()); + + Iterator<?> iterator = reference.keys(); + while (iterator.hasNext()) { + String key = (String) iterator.next(); + assertEquals(TestValues.MATCH, JsonUtils.readObjectFromJsonObject(reference, key), JsonUtils.readObjectFromJsonObject(underTest, key)); + } + } catch (JSONException e) { + fail(TestValues.JSON_FAIL); + } + } } diff --git a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/ModuleDataTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/ModuleDataTests.java index c6a88dcc3..dd48b1baf 100644 --- a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/ModuleDataTests.java +++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/ModuleDataTests.java @@ -27,121 +27,121 @@ import java.util.Iterator; */ public class ModuleDataTests extends TestCase { - private ModuleData msg; - - @Override - public void setUp() { - msg = new ModuleData(); - msg.setModuleType(TestValues.GENERAL_MODULETYPE); - msg.setRadioControlData(TestValues.GENERAL_RADIOCONTROLDATA); - msg.setClimateControlData(TestValues.GENERAL_CLIMATECONTROLDATA); - msg.setSeatControlData(TestValues.GENERAL_SEATCONTROLDATA); - msg.setAudioControlData(TestValues.GENERAL_AUDIOCONTROLDATA); - msg.setHmiSettingsControlData(TestValues.GENERAL_HMISETTINGSCONTROLDATA); - msg.setLightControlData(TestValues.GENERAL_LIGHTCONTROLDATA); - msg.setModuleId(TestValues.GENERAL_STRING); - } - - /** - * Tests the expected values of the RPC message. - */ - public void testRpcValues() { - // Test Values - ModuleType moduleType = msg.getModuleType(); - RadioControlData radioControlData = msg.getRadioControlData(); - ClimateControlData climateControlData = msg.getClimateControlData(); - SeatControlData seatControlData = msg.getSeatControlData(); - AudioControlData audioControlData = msg.getAudioControlData(); - HMISettingsControlData hmiSettingsControlData = msg.getHmiSettingsControlData(); - LightControlData lightControlData = msg.getLightControlData(); - String moduleId = msg.getModuleId(); - - // Valid Tests - assertEquals(TestValues.MATCH, TestValues.GENERAL_MODULETYPE, moduleType); - assertTrue(TestValues.TRUE, Validator.validateRadioControlData(TestValues.GENERAL_RADIOCONTROLDATA, radioControlData)); - assertTrue(TestValues.TRUE, Validator.validateClimateControlData(TestValues.GENERAL_CLIMATECONTROLDATA, climateControlData)); - assertTrue(TestValues.TRUE, Validator.validateSeatControlData(TestValues.GENERAL_SEATCONTROLDATA, seatControlData)); - assertTrue(TestValues.TRUE, Validator.validateAudioControlData(TestValues.GENERAL_AUDIOCONTROLDATA, audioControlData)); - assertTrue(TestValues.TRUE, Validator.validateHMISettingsControlData(TestValues.GENERAL_HMISETTINGSCONTROLDATA, hmiSettingsControlData)); - assertTrue(TestValues.TRUE, Validator.validateLightControlData(TestValues.GENERAL_LIGHTCONTROLDATA, lightControlData)); - assertEquals(TestValues.MATCH, TestValues.GENERAL_STRING, moduleId); - - // Invalid/Null Tests - ModuleData msg = new ModuleData(); - assertNotNull(TestValues.NOT_NULL, msg); - - assertNull(TestValues.NULL, msg.getModuleType()); - assertNull(TestValues.NULL, msg.getRadioControlData()); - assertNull(TestValues.NULL, msg.getClimateControlData()); - assertNull(TestValues.NULL, msg.getSeatControlData()); - assertNull(TestValues.NULL, msg.getAudioControlData()); - assertNull(TestValues.NULL, msg.getHmiSettingsControlData()); - assertNull(TestValues.NULL, msg.getLightControlData()); - assertNull(TestValues.NULL, msg.getModuleId()); - } - - public void testJson() { - JSONObject reference = new JSONObject(); - - try { - reference.put(ModuleData.KEY_MODULE_TYPE, TestValues.GENERAL_MODULETYPE); - reference.put(ModuleData.KEY_RADIO_CONTROL_DATA, JsonRPCMarshaller.serializeHashtable(TestValues.GENERAL_RADIOCONTROLDATA.getStore())); - reference.put(ModuleData.KEY_CLIMATE_CONTROL_DATA, JsonRPCMarshaller.serializeHashtable(TestValues.GENERAL_CLIMATECONTROLDATA.getStore())); - reference.put(ModuleData.KEY_SEAT_CONTROL_DATA, JsonRPCMarshaller.serializeHashtable(TestValues.GENERAL_SEATCONTROLDATA.getStore())); - reference.put(ModuleData.KEY_AUDIO_CONTROL_DATA, JsonRPCMarshaller.serializeHashtable(TestValues.GENERAL_AUDIOCONTROLDATA.getStore())); - reference.put(ModuleData.KEY_HMI_SETTINGS_CONTROL_DATA, JsonRPCMarshaller.serializeHashtable(TestValues.GENERAL_HMISETTINGSCONTROLDATA.getStore())); - reference.put(ModuleData.KEY_LIGHT_CONTROL_DATA, JsonRPCMarshaller.serializeHashtable(TestValues.GENERAL_LIGHTCONTROLDATA.getStore())); - reference.put(ModuleData.KEY_MODULE_ID, TestValues.GENERAL_STRING); - - 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(ModuleData.KEY_RADIO_CONTROL_DATA)) { - JSONObject objectEquals = (JSONObject) JsonUtils.readObjectFromJsonObject(reference, key); - JSONObject testEquals = (JSONObject) JsonUtils.readObjectFromJsonObject(underTest, key); - Hashtable<String, Object> hashReference = JsonRPCMarshaller.deserializeJSONObject(objectEquals); - Hashtable<String, Object> hashTest = JsonRPCMarshaller.deserializeJSONObject(testEquals); - assertTrue(TestValues.TRUE, Validator.validateRadioControlData(new RadioControlData(hashReference), new RadioControlData(hashTest))); - } else if (key.equals(ModuleData.KEY_CLIMATE_CONTROL_DATA)) { - JSONObject objectEquals = (JSONObject) JsonUtils.readObjectFromJsonObject(reference, key); - JSONObject testEquals = (JSONObject) JsonUtils.readObjectFromJsonObject(underTest, key); - Hashtable<String, Object> hashReference = JsonRPCMarshaller.deserializeJSONObject(objectEquals); - Hashtable<String, Object> hashTest = JsonRPCMarshaller.deserializeJSONObject(testEquals); - assertTrue(TestValues.TRUE, Validator.validateClimateControlData(new ClimateControlData(hashReference), new ClimateControlData(hashTest))); - } else if (key.equals(ModuleData.KEY_SEAT_CONTROL_DATA)) { - JSONObject objectEquals = (JSONObject) JsonUtils.readObjectFromJsonObject(reference, key); - JSONObject testEquals = (JSONObject) JsonUtils.readObjectFromJsonObject(underTest, key); - Hashtable<String, Object> hashReference = JsonRPCMarshaller.deserializeJSONObject(objectEquals); - Hashtable<String, Object> hashTest = JsonRPCMarshaller.deserializeJSONObject(testEquals); - assertTrue(TestValues.TRUE, Validator.validateSeatControlData(new SeatControlData(hashReference), new SeatControlData(hashTest))); - } else if (key.equals(ModuleData.KEY_AUDIO_CONTROL_DATA)) { - JSONObject objectEquals = (JSONObject) JsonUtils.readObjectFromJsonObject(reference, key); - JSONObject testEquals = (JSONObject) JsonUtils.readObjectFromJsonObject(underTest, key); - Hashtable<String, Object> hashReference = JsonRPCMarshaller.deserializeJSONObject(objectEquals); - Hashtable<String, Object> hashTest = JsonRPCMarshaller.deserializeJSONObject(testEquals); - assertTrue(TestValues.TRUE, Validator.validateAudioControlData(new AudioControlData(hashReference), new AudioControlData(hashTest))); - } else if (key.equals(ModuleData.KEY_HMI_SETTINGS_CONTROL_DATA)) { - JSONObject objectEquals = (JSONObject) JsonUtils.readObjectFromJsonObject(reference, key); - JSONObject testEquals = (JSONObject) JsonUtils.readObjectFromJsonObject(underTest, key); - Hashtable<String, Object> hashReference = JsonRPCMarshaller.deserializeJSONObject(objectEquals); - Hashtable<String, Object> hashTest = JsonRPCMarshaller.deserializeJSONObject(testEquals); - assertTrue(TestValues.TRUE, Validator.validateHMISettingsControlData(new HMISettingsControlData(hashReference), new HMISettingsControlData(hashTest))); - } else if (key.equals(ModuleData.KEY_LIGHT_CONTROL_DATA)) { - JSONObject objectEquals = (JSONObject) JsonUtils.readObjectFromJsonObject(reference, key); - JSONObject testEquals = (JSONObject) JsonUtils.readObjectFromJsonObject(underTest, key); - Hashtable<String, Object> hashReference = JsonRPCMarshaller.deserializeJSONObject(objectEquals); - Hashtable<String, Object> hashTest = JsonRPCMarshaller.deserializeJSONObject(testEquals); - assertTrue(TestValues.TRUE, Validator.validateLightControlData(new LightControlData(hashReference), new LightControlData(hashTest))); - } else { - assertEquals(TestValues.MATCH, JsonUtils.readObjectFromJsonObject(reference, key), JsonUtils.readObjectFromJsonObject(underTest, key)); - } - } - } catch (JSONException e) { - fail(TestValues.JSON_FAIL); - } - } + private ModuleData msg; + + @Override + public void setUp() { + msg = new ModuleData(); + msg.setModuleType(TestValues.GENERAL_MODULETYPE); + msg.setRadioControlData(TestValues.GENERAL_RADIOCONTROLDATA); + msg.setClimateControlData(TestValues.GENERAL_CLIMATECONTROLDATA); + msg.setSeatControlData(TestValues.GENERAL_SEATCONTROLDATA); + msg.setAudioControlData(TestValues.GENERAL_AUDIOCONTROLDATA); + msg.setHmiSettingsControlData(TestValues.GENERAL_HMISETTINGSCONTROLDATA); + msg.setLightControlData(TestValues.GENERAL_LIGHTCONTROLDATA); + msg.setModuleId(TestValues.GENERAL_STRING); + } + + /** + * Tests the expected values of the RPC message. + */ + public void testRpcValues() { + // Test Values + ModuleType moduleType = msg.getModuleType(); + RadioControlData radioControlData = msg.getRadioControlData(); + ClimateControlData climateControlData = msg.getClimateControlData(); + SeatControlData seatControlData = msg.getSeatControlData(); + AudioControlData audioControlData = msg.getAudioControlData(); + HMISettingsControlData hmiSettingsControlData = msg.getHmiSettingsControlData(); + LightControlData lightControlData = msg.getLightControlData(); + String moduleId = msg.getModuleId(); + + // Valid Tests + assertEquals(TestValues.MATCH, TestValues.GENERAL_MODULETYPE, moduleType); + assertTrue(TestValues.TRUE, Validator.validateRadioControlData(TestValues.GENERAL_RADIOCONTROLDATA, radioControlData)); + assertTrue(TestValues.TRUE, Validator.validateClimateControlData(TestValues.GENERAL_CLIMATECONTROLDATA, climateControlData)); + assertTrue(TestValues.TRUE, Validator.validateSeatControlData(TestValues.GENERAL_SEATCONTROLDATA, seatControlData)); + assertTrue(TestValues.TRUE, Validator.validateAudioControlData(TestValues.GENERAL_AUDIOCONTROLDATA, audioControlData)); + assertTrue(TestValues.TRUE, Validator.validateHMISettingsControlData(TestValues.GENERAL_HMISETTINGSCONTROLDATA, hmiSettingsControlData)); + assertTrue(TestValues.TRUE, Validator.validateLightControlData(TestValues.GENERAL_LIGHTCONTROLDATA, lightControlData)); + assertEquals(TestValues.MATCH, TestValues.GENERAL_STRING, moduleId); + + // Invalid/Null Tests + ModuleData msg = new ModuleData(); + assertNotNull(TestValues.NOT_NULL, msg); + + assertNull(TestValues.NULL, msg.getModuleType()); + assertNull(TestValues.NULL, msg.getRadioControlData()); + assertNull(TestValues.NULL, msg.getClimateControlData()); + assertNull(TestValues.NULL, msg.getSeatControlData()); + assertNull(TestValues.NULL, msg.getAudioControlData()); + assertNull(TestValues.NULL, msg.getHmiSettingsControlData()); + assertNull(TestValues.NULL, msg.getLightControlData()); + assertNull(TestValues.NULL, msg.getModuleId()); + } + + public void testJson() { + JSONObject reference = new JSONObject(); + + try { + reference.put(ModuleData.KEY_MODULE_TYPE, TestValues.GENERAL_MODULETYPE); + reference.put(ModuleData.KEY_RADIO_CONTROL_DATA, JsonRPCMarshaller.serializeHashtable(TestValues.GENERAL_RADIOCONTROLDATA.getStore())); + reference.put(ModuleData.KEY_CLIMATE_CONTROL_DATA, JsonRPCMarshaller.serializeHashtable(TestValues.GENERAL_CLIMATECONTROLDATA.getStore())); + reference.put(ModuleData.KEY_SEAT_CONTROL_DATA, JsonRPCMarshaller.serializeHashtable(TestValues.GENERAL_SEATCONTROLDATA.getStore())); + reference.put(ModuleData.KEY_AUDIO_CONTROL_DATA, JsonRPCMarshaller.serializeHashtable(TestValues.GENERAL_AUDIOCONTROLDATA.getStore())); + reference.put(ModuleData.KEY_HMI_SETTINGS_CONTROL_DATA, JsonRPCMarshaller.serializeHashtable(TestValues.GENERAL_HMISETTINGSCONTROLDATA.getStore())); + reference.put(ModuleData.KEY_LIGHT_CONTROL_DATA, JsonRPCMarshaller.serializeHashtable(TestValues.GENERAL_LIGHTCONTROLDATA.getStore())); + reference.put(ModuleData.KEY_MODULE_ID, TestValues.GENERAL_STRING); + + 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(ModuleData.KEY_RADIO_CONTROL_DATA)) { + JSONObject objectEquals = (JSONObject) JsonUtils.readObjectFromJsonObject(reference, key); + JSONObject testEquals = (JSONObject) JsonUtils.readObjectFromJsonObject(underTest, key); + Hashtable<String, Object> hashReference = JsonRPCMarshaller.deserializeJSONObject(objectEquals); + Hashtable<String, Object> hashTest = JsonRPCMarshaller.deserializeJSONObject(testEquals); + assertTrue(TestValues.TRUE, Validator.validateRadioControlData(new RadioControlData(hashReference), new RadioControlData(hashTest))); + } else if (key.equals(ModuleData.KEY_CLIMATE_CONTROL_DATA)) { + JSONObject objectEquals = (JSONObject) JsonUtils.readObjectFromJsonObject(reference, key); + JSONObject testEquals = (JSONObject) JsonUtils.readObjectFromJsonObject(underTest, key); + Hashtable<String, Object> hashReference = JsonRPCMarshaller.deserializeJSONObject(objectEquals); + Hashtable<String, Object> hashTest = JsonRPCMarshaller.deserializeJSONObject(testEquals); + assertTrue(TestValues.TRUE, Validator.validateClimateControlData(new ClimateControlData(hashReference), new ClimateControlData(hashTest))); + } else if (key.equals(ModuleData.KEY_SEAT_CONTROL_DATA)) { + JSONObject objectEquals = (JSONObject) JsonUtils.readObjectFromJsonObject(reference, key); + JSONObject testEquals = (JSONObject) JsonUtils.readObjectFromJsonObject(underTest, key); + Hashtable<String, Object> hashReference = JsonRPCMarshaller.deserializeJSONObject(objectEquals); + Hashtable<String, Object> hashTest = JsonRPCMarshaller.deserializeJSONObject(testEquals); + assertTrue(TestValues.TRUE, Validator.validateSeatControlData(new SeatControlData(hashReference), new SeatControlData(hashTest))); + } else if (key.equals(ModuleData.KEY_AUDIO_CONTROL_DATA)) { + JSONObject objectEquals = (JSONObject) JsonUtils.readObjectFromJsonObject(reference, key); + JSONObject testEquals = (JSONObject) JsonUtils.readObjectFromJsonObject(underTest, key); + Hashtable<String, Object> hashReference = JsonRPCMarshaller.deserializeJSONObject(objectEquals); + Hashtable<String, Object> hashTest = JsonRPCMarshaller.deserializeJSONObject(testEquals); + assertTrue(TestValues.TRUE, Validator.validateAudioControlData(new AudioControlData(hashReference), new AudioControlData(hashTest))); + } else if (key.equals(ModuleData.KEY_HMI_SETTINGS_CONTROL_DATA)) { + JSONObject objectEquals = (JSONObject) JsonUtils.readObjectFromJsonObject(reference, key); + JSONObject testEquals = (JSONObject) JsonUtils.readObjectFromJsonObject(underTest, key); + Hashtable<String, Object> hashReference = JsonRPCMarshaller.deserializeJSONObject(objectEquals); + Hashtable<String, Object> hashTest = JsonRPCMarshaller.deserializeJSONObject(testEquals); + assertTrue(TestValues.TRUE, Validator.validateHMISettingsControlData(new HMISettingsControlData(hashReference), new HMISettingsControlData(hashTest))); + } else if (key.equals(ModuleData.KEY_LIGHT_CONTROL_DATA)) { + JSONObject objectEquals = (JSONObject) JsonUtils.readObjectFromJsonObject(reference, key); + JSONObject testEquals = (JSONObject) JsonUtils.readObjectFromJsonObject(underTest, key); + Hashtable<String, Object> hashReference = JsonRPCMarshaller.deserializeJSONObject(objectEquals); + Hashtable<String, Object> hashTest = JsonRPCMarshaller.deserializeJSONObject(testEquals); + assertTrue(TestValues.TRUE, Validator.validateLightControlData(new LightControlData(hashReference), new LightControlData(hashTest))); + } else { + assertEquals(TestValues.MATCH, JsonUtils.readObjectFromJsonObject(reference, key), JsonUtils.readObjectFromJsonObject(underTest, key)); + } + } + } catch (JSONException e) { + fail(TestValues.JSON_FAIL); + } + } }
\ No newline at end of file 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 ef09a270f..e1af40a70 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 @@ -14,57 +14,57 @@ import org.json.JSONObject; import java.util.Hashtable; public class ModuleInfoTests extends TestCase { - private ModuleInfo msg; + private ModuleInfo msg; - @Override - public void setUp() { - msg = new ModuleInfo(); - msg.setModuleId(TestValues.GENERAL_STRING); - msg.setModuleLocation(TestValues.GENERAL_GRID); - msg.setModuleServiceArea(TestValues.GENERAL_GRID); - msg.setMultipleAccessAllowance(TestValues.GENERAL_BOOLEAN); - } + @Override + public void setUp() { + msg = new ModuleInfo(); + msg.setModuleId(TestValues.GENERAL_STRING); + msg.setModuleLocation(TestValues.GENERAL_GRID); + msg.setModuleServiceArea(TestValues.GENERAL_GRID); + msg.setMultipleAccessAllowance(TestValues.GENERAL_BOOLEAN); + } - public void testRpcValues() { - String id = msg.getModuleId(); - Grid loc = msg.getModuleLocation(); - Grid area = msg.getModuleServiceArea(); - boolean isAllowed = msg.getMultipleAccessAllowance(); + public void testRpcValues() { + String id = msg.getModuleId(); + Grid loc = msg.getModuleLocation(); + Grid area = msg.getModuleServiceArea(); + boolean isAllowed = msg.getMultipleAccessAllowance(); - //valid tests - assertEquals(TestValues.MATCH, TestValues.GENERAL_STRING, id); - assertEquals(TestValues.MATCH, TestValues.GENERAL_GRID, loc); - assertEquals(TestValues.MATCH, TestValues.GENERAL_GRID, area); - assertEquals(TestValues.MATCH, TestValues.GENERAL_BOOLEAN, isAllowed); + //valid tests + assertEquals(TestValues.MATCH, TestValues.GENERAL_STRING, id); + assertEquals(TestValues.MATCH, TestValues.GENERAL_GRID, loc); + assertEquals(TestValues.MATCH, TestValues.GENERAL_GRID, area); + assertEquals(TestValues.MATCH, TestValues.GENERAL_BOOLEAN, isAllowed); - //null test - ModuleInfo msg = new ModuleInfo(); - assertNull(TestValues.NULL, msg.getModuleId()); - assertNull(TestValues.NULL, msg.getModuleLocation()); - assertNull(TestValues.NULL, msg.getModuleServiceArea()); - assertNull(TestValues.NULL, msg.getMultipleAccessAllowance()); + //null test + ModuleInfo msg = new ModuleInfo(); + assertNull(TestValues.NULL, msg.getModuleId()); + assertNull(TestValues.NULL, msg.getModuleLocation()); + assertNull(TestValues.NULL, msg.getModuleServiceArea()); + assertNull(TestValues.NULL, msg.getMultipleAccessAllowance()); - //test required params constructor - ModuleInfo msg2 = new ModuleInfo(TestValues.GENERAL_STRING); - assertEquals(TestValues.MATCH, msg2.getModuleId(), TestValues.GENERAL_STRING); - } + //test required params constructor + ModuleInfo msg2 = new ModuleInfo(TestValues.GENERAL_STRING); + assertEquals(TestValues.MATCH, msg2.getModuleId(), TestValues.GENERAL_STRING); + } - public void testJson() { - JSONObject original = new JSONObject(); - try { - original.put(ModuleInfo.KEY_MODULE_ID, TestValues.GENERAL_STRING); - original.put(ModuleInfo.KEY_MODULE_LOCATION, JsonRPCMarshaller.serializeHashtable(TestValues.GENERAL_GRID.getStore())); - original.put(ModuleInfo.KEY_MODULE_SERVICE_AREA, JsonRPCMarshaller.serializeHashtable(TestValues.GENERAL_GRID.getStore())); - original.put(ModuleInfo.KEY_MULTIPLE_ACCESS_ALLOWED, TestValues.GENERAL_BOOLEAN); + public void testJson() { + JSONObject original = new JSONObject(); + try { + original.put(ModuleInfo.KEY_MODULE_ID, TestValues.GENERAL_STRING); + original.put(ModuleInfo.KEY_MODULE_LOCATION, JsonRPCMarshaller.serializeHashtable(TestValues.GENERAL_GRID.getStore())); + original.put(ModuleInfo.KEY_MODULE_SERVICE_AREA, JsonRPCMarshaller.serializeHashtable(TestValues.GENERAL_GRID.getStore())); + original.put(ModuleInfo.KEY_MULTIPLE_ACCESS_ALLOWED, TestValues.GENERAL_BOOLEAN); - JSONObject serialized = msg.serializeJSON(); - assertEquals(TestValues.MATCH, original.length(), serialized.length()); + JSONObject serialized = msg.serializeJSON(); + assertEquals(TestValues.MATCH, original.length(), serialized.length()); - Hashtable<String, Object> h1 = JsonRPCMarshaller.deserializeJSONObject(original); - Hashtable<String, Object> h2 = JsonRPCMarshaller.deserializeJSONObject(serialized); - assertTrue(TestValues.TRUE, Validator.validateModuleInfo(new ModuleInfo(h1), new ModuleInfo(h2))); - } catch (JSONException e) { - fail(TestValues.JSON_FAIL); - } - } + Hashtable<String, Object> h1 = JsonRPCMarshaller.deserializeJSONObject(original); + Hashtable<String, Object> h2 = JsonRPCMarshaller.deserializeJSONObject(serialized); + assertTrue(TestValues.TRUE, Validator.validateModuleInfo(new ModuleInfo(h1), new ModuleInfo(h2))); + } catch (JSONException e) { + fail(TestValues.JSON_FAIL); + } + } } diff --git a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/MyKeyTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/MyKeyTests.java index c5dabaf50..05ebd66ff 100644 --- a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/MyKeyTests.java +++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/MyKeyTests.java @@ -13,29 +13,29 @@ import org.json.JSONObject; import java.util.Iterator; /** - * This is a unit test class for the SmartDeviceLink library project class : + * This is a unit test class for the SmartDeviceLink library project class : * {@link com.smartdevicelink.proxy.rpc.MyKey} */ -public class MyKeyTests extends TestCase{ +public class MyKeyTests extends TestCase { private MyKey msg; @Override - public void setUp(){ + public void setUp() { msg = new MyKey(); msg.setE911Override(TestValues.GENERAL_VEHICLEDATASTATUS); } /** - * Tests the expected values of the RPC message. - */ - public void testRpcValues () { - // Test Values + * Tests the expected values of the RPC message. + */ + public void testRpcValues() { + // Test Values VehicleDataStatus override = msg.getE911Override(); - + // Valid Tests assertEquals(TestValues.MATCH, TestValues.GENERAL_VEHICLEDATASTATUS, override); - + // Invalid/Null Tests MyKey msg = new MyKey(); assertNotNull(TestValues.NOT_NULL, msg); @@ -43,22 +43,22 @@ public class MyKeyTests extends TestCase{ assertNull(TestValues.NULL, msg.getE911Override()); } - public void testJson(){ + public void testJson() { JSONObject reference = new JSONObject(); - try{ + try { reference.put(MyKey.KEY_E_911_OVERRIDE, TestValues.GENERAL_VEHICLEDATASTATUS); JSONObject underTest = msg.serializeJSON(); assertEquals(TestValues.MATCH, reference.length(), underTest.length()); Iterator<?> iterator = reference.keys(); - while(iterator.hasNext()){ + while (iterator.hasNext()) { String key = (String) iterator.next(); assertEquals(TestValues.MATCH, JsonUtils.readObjectFromJsonObject(reference, key), JsonUtils.readObjectFromJsonObject(underTest, key)); } - }catch(JSONException e){ - fail(TestValues.JSON_FAIL); + } catch (JSONException e) { + fail(TestValues.JSON_FAIL); } } }
\ No newline at end of file diff --git a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/NavigationCapabilityTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/NavigationCapabilityTests.java index af2410155..200d33fbe 100644 --- a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/NavigationCapabilityTests.java +++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/NavigationCapabilityTests.java @@ -12,15 +12,15 @@ import org.json.JSONObject; import java.util.Iterator; /** - * This is a unit test class for the SmartDeviceLink library project class : + * This is a unit test class for the SmartDeviceLink library project class : * {@link com.smartdevicelink.proxy.rpc.NavigationCapability} */ -public class NavigationCapabilityTests extends TestCase{ +public class NavigationCapabilityTests extends TestCase { private NavigationCapability msg; @Override - public void setUp(){ + public void setUp() { msg = new NavigationCapability(); msg.setSendLocationEnabled(TestValues.GENERAL_BOOLEAN); @@ -28,10 +28,10 @@ public class NavigationCapabilityTests extends TestCase{ } /** - * Tests the expected values of the RPC message. - */ - public void testRpcValues () { - // Test Values + * Tests the expected values of the RPC message. + */ + public void testRpcValues() { + // Test Values boolean sendLocationEnabled = msg.getSendLocationEnabled(); boolean getWayPointsEnabled = msg.getWayPointsEnabled(); @@ -47,10 +47,10 @@ public class NavigationCapabilityTests extends TestCase{ assertNull(TestValues.NULL, msg.getWayPointsEnabled()); } - public void testJson(){ + public void testJson() { JSONObject reference = new JSONObject(); - try{ + try { reference.put(NavigationCapability.KEY_GETWAYPOINTS_ENABLED, TestValues.GENERAL_BOOLEAN); reference.put(NavigationCapability.KEY_LOCATION_ENABLED, TestValues.GENERAL_BOOLEAN); @@ -58,12 +58,12 @@ public class NavigationCapabilityTests extends TestCase{ assertEquals(TestValues.MATCH, reference.length(), underTest.length()); Iterator<?> iterator = reference.keys(); - while(iterator.hasNext()){ + while (iterator.hasNext()) { String key = (String) iterator.next(); assertEquals(TestValues.MATCH, JsonUtils.readObjectFromJsonObject(reference, key), JsonUtils.readObjectFromJsonObject(underTest, key)); } - }catch(JSONException e){ - fail(TestValues.JSON_FAIL); + } catch (JSONException e) { + fail(TestValues.JSON_FAIL); } } }
\ No newline at end of file diff --git a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/NavigationInstructionTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/NavigationInstructionTests.java index cfb791f02..ff7e9e13e 100644 --- a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/NavigationInstructionTests.java +++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/NavigationInstructionTests.java @@ -26,109 +26,109 @@ import java.util.Iterator; */ public class NavigationInstructionTests extends TestCase { - private NavigationInstruction msg; - - @Override - public void setUp(){ - msg = new NavigationInstruction(); - - msg.setLocationDetails(TestValues.GENERAL_LOCATIONDETAILS); - msg.setAction(TestValues.GENERAL_NAVIGATIONACTION); - msg.setEta(TestValues.GENERAL_DATETIME); - msg.setBearing(TestValues.GENERAL_INTEGER); - msg.setJunctionType(TestValues.GENERAL_NAVIGATION_JUNCTION); - msg.setDrivingSide(TestValues.GENERAL_DIRECTION); - msg.setDetails(TestValues.GENERAL_STRING); - msg.setImage(TestValues.GENERAL_IMAGE); - } - - /** - * Tests the expected values of the RPC message. - */ - public void testRpcValues () { - // Test Values - LocationDetails locationDetails = msg.getLocationDetails(); - NavigationAction action = msg.getAction(); - DateTime eta = msg.getEta(); - Integer bearing = msg.getBearing(); - NavigationJunction junctionType = msg.getJunctionType(); - Direction drivingSide = msg.getDrivingSide(); - String details = msg.getDetails(); - Image image = msg.getImage(); - - // Valid Tests - assertEquals(TestValues.GENERAL_LOCATIONDETAILS, locationDetails); - assertEquals(TestValues.GENERAL_NAVIGATIONACTION, action); - assertEquals(TestValues.GENERAL_DATETIME, eta); - assertEquals(TestValues.GENERAL_INTEGER, bearing); - assertEquals(TestValues.GENERAL_NAVIGATION_JUNCTION, junctionType); - assertEquals(TestValues.GENERAL_DIRECTION, drivingSide); - assertEquals(TestValues.GENERAL_STRING, details); - assertEquals(TestValues.GENERAL_IMAGE, image); - - // Invalid/Null Tests - NavigationInstruction msg = new NavigationInstruction(); - assertNotNull(TestValues.NOT_NULL, msg); - - assertNull(TestValues.NULL, msg.getLocationDetails()); - assertNull(TestValues.NULL, msg.getAction()); - assertNull(TestValues.NULL, msg.getEta()); - assertNull(TestValues.NULL, msg.getBearing()); - assertNull(TestValues.NULL, msg.getJunctionType()); - assertNull(TestValues.NULL, msg.getDrivingSide()); - assertNull(TestValues.NULL, msg.getDetails()); - assertNull(TestValues.NULL, msg.getImage()); - } - - public void testRequiredConstructor(){ - NavigationInstruction msg = new NavigationInstruction(TestValues.GENERAL_LOCATIONDETAILS, TestValues.GENERAL_NAVIGATIONACTION); - assertNotNull(TestValues.NOT_NULL, msg); - - LocationDetails locationDetails = msg.getLocationDetails(); - NavigationAction action = msg.getAction(); - - assertEquals(TestValues.GENERAL_LOCATIONDETAILS, locationDetails); - assertEquals(TestValues.GENERAL_NAVIGATIONACTION, action); - } - - public void testJson(){ - JSONObject reference = new JSONObject(); - - try{ - reference.put(NavigationInstruction.KEY_LOCATION_DETAILS, TestValues.GENERAL_LOCATIONDETAILS); - reference.put(NavigationInstruction.KEY_ACTION, TestValues.GENERAL_NAVIGATIONACTION); - reference.put(NavigationInstruction.KEY_ETA, TestValues.GENERAL_DATETIME); - reference.put(NavigationInstruction.KEY_BEARING, TestValues.GENERAL_INTEGER); - reference.put(NavigationInstruction.KEY_JUNCTION_TYPE, TestValues.GENERAL_NAVIGATION_JUNCTION); - reference.put(NavigationInstruction.KEY_DRIVING_SIDE, TestValues.GENERAL_DIRECTION); - reference.put(NavigationInstruction.KEY_DETAILS, TestValues.GENERAL_STRING); - reference.put(NavigationInstruction.KEY_IMAGE, TestValues.GENERAL_IMAGE); - - 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(NavigationInstruction.KEY_IMAGE)){ - JSONObject testEquals = (JSONObject) JsonUtils.readObjectFromJsonObject(underTest, key); - Image refIcon1 = new Image(JsonRPCMarshaller.deserializeJSONObject(testEquals)); - assertTrue(TestValues.TRUE, Validator.validateImage(refIcon1, msg.getImage())); - }else if(key.equals(NavigationInstruction.KEY_LOCATION_DETAILS)){ - JSONObject testEquals = (JSONObject) JsonUtils.readObjectFromJsonObject(underTest, key); - Hashtable<String, Object> hashTest = JsonRPCMarshaller.deserializeJSONObject(testEquals); - assertTrue(TestValues.TRUE, Validator.validateLocationDetails( TestValues.GENERAL_LOCATIONDETAILS, new LocationDetails(hashTest))); - }else if (key.equals(NavigationInstruction.KEY_ETA)){ - JSONObject testEquals = (JSONObject) JsonUtils.readObjectFromJsonObject(underTest, key); - Hashtable<String, Object> hashTest = JsonRPCMarshaller.deserializeJSONObject(testEquals); - assertTrue(TestValues.TRUE, Validator.validateDateTime(TestValues.GENERAL_DATETIME, new DateTime(hashTest))); - }else { - assertEquals(TestValues.MATCH, JsonUtils.readObjectFromJsonObject(reference, key), JsonUtils.readObjectFromJsonObject(underTest, key)); - } - } - } catch(JSONException e){ - fail(TestValues.JSON_FAIL); - } - } + private NavigationInstruction msg; + + @Override + public void setUp() { + msg = new NavigationInstruction(); + + msg.setLocationDetails(TestValues.GENERAL_LOCATIONDETAILS); + msg.setAction(TestValues.GENERAL_NAVIGATIONACTION); + msg.setEta(TestValues.GENERAL_DATETIME); + msg.setBearing(TestValues.GENERAL_INTEGER); + msg.setJunctionType(TestValues.GENERAL_NAVIGATION_JUNCTION); + msg.setDrivingSide(TestValues.GENERAL_DIRECTION); + msg.setDetails(TestValues.GENERAL_STRING); + msg.setImage(TestValues.GENERAL_IMAGE); + } + + /** + * Tests the expected values of the RPC message. + */ + public void testRpcValues() { + // Test Values + LocationDetails locationDetails = msg.getLocationDetails(); + NavigationAction action = msg.getAction(); + DateTime eta = msg.getEta(); + Integer bearing = msg.getBearing(); + NavigationJunction junctionType = msg.getJunctionType(); + Direction drivingSide = msg.getDrivingSide(); + String details = msg.getDetails(); + Image image = msg.getImage(); + + // Valid Tests + assertEquals(TestValues.GENERAL_LOCATIONDETAILS, locationDetails); + assertEquals(TestValues.GENERAL_NAVIGATIONACTION, action); + assertEquals(TestValues.GENERAL_DATETIME, eta); + assertEquals(TestValues.GENERAL_INTEGER, bearing); + assertEquals(TestValues.GENERAL_NAVIGATION_JUNCTION, junctionType); + assertEquals(TestValues.GENERAL_DIRECTION, drivingSide); + assertEquals(TestValues.GENERAL_STRING, details); + assertEquals(TestValues.GENERAL_IMAGE, image); + + // Invalid/Null Tests + NavigationInstruction msg = new NavigationInstruction(); + assertNotNull(TestValues.NOT_NULL, msg); + + assertNull(TestValues.NULL, msg.getLocationDetails()); + assertNull(TestValues.NULL, msg.getAction()); + assertNull(TestValues.NULL, msg.getEta()); + assertNull(TestValues.NULL, msg.getBearing()); + assertNull(TestValues.NULL, msg.getJunctionType()); + assertNull(TestValues.NULL, msg.getDrivingSide()); + assertNull(TestValues.NULL, msg.getDetails()); + assertNull(TestValues.NULL, msg.getImage()); + } + + public void testRequiredConstructor() { + NavigationInstruction msg = new NavigationInstruction(TestValues.GENERAL_LOCATIONDETAILS, TestValues.GENERAL_NAVIGATIONACTION); + assertNotNull(TestValues.NOT_NULL, msg); + + LocationDetails locationDetails = msg.getLocationDetails(); + NavigationAction action = msg.getAction(); + + assertEquals(TestValues.GENERAL_LOCATIONDETAILS, locationDetails); + assertEquals(TestValues.GENERAL_NAVIGATIONACTION, action); + } + + public void testJson() { + JSONObject reference = new JSONObject(); + + try { + reference.put(NavigationInstruction.KEY_LOCATION_DETAILS, TestValues.GENERAL_LOCATIONDETAILS); + reference.put(NavigationInstruction.KEY_ACTION, TestValues.GENERAL_NAVIGATIONACTION); + reference.put(NavigationInstruction.KEY_ETA, TestValues.GENERAL_DATETIME); + reference.put(NavigationInstruction.KEY_BEARING, TestValues.GENERAL_INTEGER); + reference.put(NavigationInstruction.KEY_JUNCTION_TYPE, TestValues.GENERAL_NAVIGATION_JUNCTION); + reference.put(NavigationInstruction.KEY_DRIVING_SIDE, TestValues.GENERAL_DIRECTION); + reference.put(NavigationInstruction.KEY_DETAILS, TestValues.GENERAL_STRING); + reference.put(NavigationInstruction.KEY_IMAGE, TestValues.GENERAL_IMAGE); + + 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(NavigationInstruction.KEY_IMAGE)) { + JSONObject testEquals = (JSONObject) JsonUtils.readObjectFromJsonObject(underTest, key); + Image refIcon1 = new Image(JsonRPCMarshaller.deserializeJSONObject(testEquals)); + assertTrue(TestValues.TRUE, Validator.validateImage(refIcon1, msg.getImage())); + } else if (key.equals(NavigationInstruction.KEY_LOCATION_DETAILS)) { + JSONObject testEquals = (JSONObject) JsonUtils.readObjectFromJsonObject(underTest, key); + Hashtable<String, Object> hashTest = JsonRPCMarshaller.deserializeJSONObject(testEquals); + assertTrue(TestValues.TRUE, Validator.validateLocationDetails(TestValues.GENERAL_LOCATIONDETAILS, new LocationDetails(hashTest))); + } else if (key.equals(NavigationInstruction.KEY_ETA)) { + JSONObject testEquals = (JSONObject) JsonUtils.readObjectFromJsonObject(underTest, key); + Hashtable<String, Object> hashTest = JsonRPCMarshaller.deserializeJSONObject(testEquals); + assertTrue(TestValues.TRUE, Validator.validateDateTime(TestValues.GENERAL_DATETIME, new DateTime(hashTest))); + } else { + assertEquals(TestValues.MATCH, JsonUtils.readObjectFromJsonObject(reference, key), JsonUtils.readObjectFromJsonObject(underTest, key)); + } + } + } catch (JSONException e) { + fail(TestValues.JSON_FAIL); + } + } }
\ No newline at end of file diff --git a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/NavigationServiceDataTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/NavigationServiceDataTests.java index 9276fc091..d80bfab14 100644 --- a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/NavigationServiceDataTests.java +++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/NavigationServiceDataTests.java @@ -26,118 +26,118 @@ import java.util.List; */ public class NavigationServiceDataTests extends TestCase { - private NavigationServiceData msg; - - @Override - public void setUp(){ - msg = new NavigationServiceData(); - - msg.setTimeStamp(TestValues.GENERAL_DATETIME); - msg.setOrigin(TestValues.GENERAL_LOCATIONDETAILS); - msg.setDestination(TestValues.GENERAL_LOCATIONDETAILS); - msg.setDestinationETA(TestValues.GENERAL_DATETIME); - msg.setInstructions(TestValues.GENERAL_NAVIGATION_INSTRUCTION_LIST); - msg.setNextInstructionETA(TestValues.GENERAL_DATETIME); - msg.setNextInstructionDistance(TestValues.GENERAL_FLOAT); - msg.setNextInstructionDistanceScale(TestValues.GENERAL_FLOAT); - msg.setPrompt(TestValues.GENERAL_STRING); - } - - /** - * Tests the expected values of the RPC message. - */ - public void testRpcValues () { - // Test Values - DateTime timestamp = msg.getTimeStamp(); - LocationDetails origin = msg.getOrigin(); - LocationDetails destination = msg.getDestination(); - DateTime destinationETA = msg.getDestinationETA(); - List<NavigationInstruction> instructions = msg.getInstructions(); - DateTime nextInstructionETA = msg.getNextInstructionETA(); - Float nextInstructionDistance = msg.getNextInstructionDistance(); - Float nextInstructionDistanceScale = msg.getNextInstructionDistanceScale(); - String prompt = msg.getPrompt(); - - // Valid Tests - assertEquals(TestValues.GENERAL_DATETIME, timestamp); - assertEquals(TestValues.GENERAL_LOCATIONDETAILS, origin); - assertEquals(TestValues.GENERAL_LOCATIONDETAILS, destination); - assertEquals(TestValues.GENERAL_DATETIME, destinationETA); - assertEquals(TestValues.GENERAL_NAVIGATION_INSTRUCTION_LIST, instructions); - assertEquals(TestValues.GENERAL_DATETIME, nextInstructionETA); - assertEquals(TestValues.GENERAL_FLOAT, nextInstructionDistance); - assertEquals(TestValues.GENERAL_FLOAT, nextInstructionDistanceScale); - assertEquals(TestValues.GENERAL_STRING, prompt); - - // Invalid/Null Tests - NavigationServiceData msg = new NavigationServiceData(); - assertNotNull(TestValues.NOT_NULL, msg); - - assertNull(TestValues.NULL, msg.getTimeStamp()); - assertNull(TestValues.NULL, msg.getOrigin()); - assertNull(TestValues.NULL, msg.getDestination()); - assertNull(TestValues.NULL, msg.getDestinationETA()); - assertNull(TestValues.NULL, msg.getInstructions()); - assertNull(TestValues.NULL, msg.getNextInstructionETA()); - assertNull(TestValues.NULL, msg.getNextInstructionDistance()); - assertNull(TestValues.NULL, msg.getNextInstructionDistanceScale()); - assertNull(TestValues.NULL, msg.getPrompt()); - } - - public void testRequiredConstructor(){ - NavigationServiceData msg = new NavigationServiceData(TestValues.GENERAL_DATETIME); - assertNotNull(TestValues.NOT_NULL, msg); - - DateTime locationDetails = msg.getTimeStamp(); - - assertEquals(TestValues.GENERAL_DATETIME, locationDetails); - } - - public void testJson(){ - JSONObject reference = new JSONObject(); - - try{ - reference.put(NavigationServiceData.KEY_TIMESTAMP, TestValues.GENERAL_DATETIME); - reference.put(NavigationServiceData.KEY_ORIGIN, TestValues.GENERAL_LOCATIONDETAILS); - reference.put(NavigationServiceData.KEY_DESTINATION, TestValues.GENERAL_LOCATIONDETAILS); - reference.put(NavigationServiceData.KEY_DESTINATION_ETA, TestValues.GENERAL_DATETIME); - reference.put(NavigationServiceData.KEY_INSTRUCTIONS, TestValues.GENERAL_NAVIGATION_INSTRUCTION_LIST); - reference.put(NavigationServiceData.KEY_NEXT_INSTRUCTION_ETA, TestValues.GENERAL_DATETIME); - reference.put(NavigationServiceData.KEY_NEXT_INSTRUCTION_DISTANCE, TestValues.GENERAL_FLOAT); - reference.put(NavigationServiceData.KEY_NEXT_INSTRUCTION_DISTANCE_SCALE, TestValues.GENERAL_FLOAT); - reference.put(NavigationServiceData.KEY_PROMPT, TestValues.GENERAL_STRING); - - - 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(NavigationServiceData.KEY_TIMESTAMP)||key.equals(NavigationServiceData.KEY_DESTINATION_ETA)||key.equals(NavigationServiceData.KEY_NEXT_INSTRUCTION_ETA)){ - JSONObject testEquals = (JSONObject) JsonUtils.readObjectFromJsonObject(underTest, key); - Hashtable<String, Object> hashTest = JsonRPCMarshaller.deserializeJSONObject(testEquals); - assertTrue(TestValues.TRUE, Validator.validateDateTime(TestValues.GENERAL_DATETIME, new DateTime(hashTest))); - }else if(key.equals(NavigationServiceData.KEY_DESTINATION)||key.equals(NavigationServiceData.KEY_ORIGIN)){ - JSONObject testEquals = (JSONObject) JsonUtils.readObjectFromJsonObject(underTest, key); - Hashtable<String, Object> hashTest = JsonRPCMarshaller.deserializeJSONObject(testEquals); - assertTrue(TestValues.TRUE, Validator.validateLocationDetails( TestValues.GENERAL_LOCATIONDETAILS, new LocationDetails(hashTest))); - }else if (key.equals(NavigationServiceData.KEY_INSTRUCTIONS)){ - JSONArray NavigationInstructionUnderTestListArrayObjTest = JsonUtils.readJsonArrayFromJsonObject(underTest, key); - List<NavigationInstruction> NavigationInstructionUnderTestList = new ArrayList<>(); - for (int index = 0; index < NavigationInstructionUnderTestListArrayObjTest.length(); index++) { - NavigationInstruction NavigationInstructionData = new NavigationInstruction(JsonRPCMarshaller.deserializeJSONObject( (JSONObject)NavigationInstructionUnderTestListArrayObjTest.get(index) )); - NavigationInstructionUnderTestList.add(NavigationInstructionData); - } - assertTrue("JSON value didn't match expected value for key \"" + key + "\".", - Validator.validateNavigationInstructionList(TestValues.GENERAL_NAVIGATION_INSTRUCTION_LIST, NavigationInstructionUnderTestList)); - }else { - assertEquals(TestValues.MATCH, JsonUtils.readObjectFromJsonObject(reference, key), JsonUtils.readObjectFromJsonObject(underTest, key)); - } - } - } catch(JSONException e){ - fail(TestValues.JSON_FAIL); - } - } + private NavigationServiceData msg; + + @Override + public void setUp() { + msg = new NavigationServiceData(); + + msg.setTimeStamp(TestValues.GENERAL_DATETIME); + msg.setOrigin(TestValues.GENERAL_LOCATIONDETAILS); + msg.setDestination(TestValues.GENERAL_LOCATIONDETAILS); + msg.setDestinationETA(TestValues.GENERAL_DATETIME); + msg.setInstructions(TestValues.GENERAL_NAVIGATION_INSTRUCTION_LIST); + msg.setNextInstructionETA(TestValues.GENERAL_DATETIME); + msg.setNextInstructionDistance(TestValues.GENERAL_FLOAT); + msg.setNextInstructionDistanceScale(TestValues.GENERAL_FLOAT); + msg.setPrompt(TestValues.GENERAL_STRING); + } + + /** + * Tests the expected values of the RPC message. + */ + public void testRpcValues() { + // Test Values + DateTime timestamp = msg.getTimeStamp(); + LocationDetails origin = msg.getOrigin(); + LocationDetails destination = msg.getDestination(); + DateTime destinationETA = msg.getDestinationETA(); + List<NavigationInstruction> instructions = msg.getInstructions(); + DateTime nextInstructionETA = msg.getNextInstructionETA(); + Float nextInstructionDistance = msg.getNextInstructionDistance(); + Float nextInstructionDistanceScale = msg.getNextInstructionDistanceScale(); + String prompt = msg.getPrompt(); + + // Valid Tests + assertEquals(TestValues.GENERAL_DATETIME, timestamp); + assertEquals(TestValues.GENERAL_LOCATIONDETAILS, origin); + assertEquals(TestValues.GENERAL_LOCATIONDETAILS, destination); + assertEquals(TestValues.GENERAL_DATETIME, destinationETA); + assertEquals(TestValues.GENERAL_NAVIGATION_INSTRUCTION_LIST, instructions); + assertEquals(TestValues.GENERAL_DATETIME, nextInstructionETA); + assertEquals(TestValues.GENERAL_FLOAT, nextInstructionDistance); + assertEquals(TestValues.GENERAL_FLOAT, nextInstructionDistanceScale); + assertEquals(TestValues.GENERAL_STRING, prompt); + + // Invalid/Null Tests + NavigationServiceData msg = new NavigationServiceData(); + assertNotNull(TestValues.NOT_NULL, msg); + + assertNull(TestValues.NULL, msg.getTimeStamp()); + assertNull(TestValues.NULL, msg.getOrigin()); + assertNull(TestValues.NULL, msg.getDestination()); + assertNull(TestValues.NULL, msg.getDestinationETA()); + assertNull(TestValues.NULL, msg.getInstructions()); + assertNull(TestValues.NULL, msg.getNextInstructionETA()); + assertNull(TestValues.NULL, msg.getNextInstructionDistance()); + assertNull(TestValues.NULL, msg.getNextInstructionDistanceScale()); + assertNull(TestValues.NULL, msg.getPrompt()); + } + + public void testRequiredConstructor() { + NavigationServiceData msg = new NavigationServiceData(TestValues.GENERAL_DATETIME); + assertNotNull(TestValues.NOT_NULL, msg); + + DateTime locationDetails = msg.getTimeStamp(); + + assertEquals(TestValues.GENERAL_DATETIME, locationDetails); + } + + public void testJson() { + JSONObject reference = new JSONObject(); + + try { + reference.put(NavigationServiceData.KEY_TIMESTAMP, TestValues.GENERAL_DATETIME); + reference.put(NavigationServiceData.KEY_ORIGIN, TestValues.GENERAL_LOCATIONDETAILS); + reference.put(NavigationServiceData.KEY_DESTINATION, TestValues.GENERAL_LOCATIONDETAILS); + reference.put(NavigationServiceData.KEY_DESTINATION_ETA, TestValues.GENERAL_DATETIME); + reference.put(NavigationServiceData.KEY_INSTRUCTIONS, TestValues.GENERAL_NAVIGATION_INSTRUCTION_LIST); + reference.put(NavigationServiceData.KEY_NEXT_INSTRUCTION_ETA, TestValues.GENERAL_DATETIME); + reference.put(NavigationServiceData.KEY_NEXT_INSTRUCTION_DISTANCE, TestValues.GENERAL_FLOAT); + reference.put(NavigationServiceData.KEY_NEXT_INSTRUCTION_DISTANCE_SCALE, TestValues.GENERAL_FLOAT); + reference.put(NavigationServiceData.KEY_PROMPT, TestValues.GENERAL_STRING); + + + 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(NavigationServiceData.KEY_TIMESTAMP) || key.equals(NavigationServiceData.KEY_DESTINATION_ETA) || key.equals(NavigationServiceData.KEY_NEXT_INSTRUCTION_ETA)) { + JSONObject testEquals = (JSONObject) JsonUtils.readObjectFromJsonObject(underTest, key); + Hashtable<String, Object> hashTest = JsonRPCMarshaller.deserializeJSONObject(testEquals); + assertTrue(TestValues.TRUE, Validator.validateDateTime(TestValues.GENERAL_DATETIME, new DateTime(hashTest))); + } else if (key.equals(NavigationServiceData.KEY_DESTINATION) || key.equals(NavigationServiceData.KEY_ORIGIN)) { + JSONObject testEquals = (JSONObject) JsonUtils.readObjectFromJsonObject(underTest, key); + Hashtable<String, Object> hashTest = JsonRPCMarshaller.deserializeJSONObject(testEquals); + assertTrue(TestValues.TRUE, Validator.validateLocationDetails(TestValues.GENERAL_LOCATIONDETAILS, new LocationDetails(hashTest))); + } else if (key.equals(NavigationServiceData.KEY_INSTRUCTIONS)) { + JSONArray NavigationInstructionUnderTestListArrayObjTest = JsonUtils.readJsonArrayFromJsonObject(underTest, key); + List<NavigationInstruction> NavigationInstructionUnderTestList = new ArrayList<>(); + for (int index = 0; index < NavigationInstructionUnderTestListArrayObjTest.length(); index++) { + NavigationInstruction NavigationInstructionData = new NavigationInstruction(JsonRPCMarshaller.deserializeJSONObject((JSONObject) NavigationInstructionUnderTestListArrayObjTest.get(index))); + NavigationInstructionUnderTestList.add(NavigationInstructionData); + } + assertTrue("JSON value didn't match expected value for key \"" + key + "\".", + Validator.validateNavigationInstructionList(TestValues.GENERAL_NAVIGATION_INSTRUCTION_LIST, NavigationInstructionUnderTestList)); + } else { + assertEquals(TestValues.MATCH, JsonUtils.readObjectFromJsonObject(reference, key), JsonUtils.readObjectFromJsonObject(underTest, key)); + } + } + } catch (JSONException e) { + fail(TestValues.JSON_FAIL); + } + } }
\ No newline at end of file diff --git a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/NavigationServiceManifestTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/NavigationServiceManifestTests.java index b9298dcf6..3a95f1341 100644 --- a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/NavigationServiceManifestTests.java +++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/NavigationServiceManifestTests.java @@ -17,48 +17,48 @@ import java.util.Iterator; */ public class NavigationServiceManifestTests extends TestCase { - private NavigationServiceManifest msg; - - @Override - public void setUp(){ - msg = new NavigationServiceManifest(); - - msg.setAcceptsWayPoints(TestValues.GENERAL_BOOLEAN); - } - - /** - * Tests the expected values of the RPC message. - */ - public void testRpcValues () { - // Test Values - boolean acceptsWayPoints = msg.getAcceptsWayPoints(); - - // Valid Tests - assertEquals(TestValues.GENERAL_BOOLEAN, acceptsWayPoints); - - // Invalid/Null Tests - NavigationServiceManifest msg = new NavigationServiceManifest(); - assertNotNull(TestValues.NOT_NULL, msg); - - assertNull(TestValues.NULL, msg.getAcceptsWayPoints()); - } - - public void testJson(){ - JSONObject reference = new JSONObject(); - - try{ - reference.put(NavigationServiceManifest.KEY_ACCEPTS_WAY_POINTS, TestValues.GENERAL_BOOLEAN); - - JSONObject underTest = msg.serializeJSON(); - assertEquals(TestValues.MATCH, reference.length(), underTest.length()); - - Iterator<?> iterator = reference.keys(); - while(iterator.hasNext()){ - String key = (String) iterator.next(); - assertEquals(TestValues.MATCH, JsonUtils.readObjectFromJsonObject(reference, key), JsonUtils.readObjectFromJsonObject(underTest, key)); - } - } catch(JSONException e){ - fail(TestValues.JSON_FAIL); - } - } + private NavigationServiceManifest msg; + + @Override + public void setUp() { + msg = new NavigationServiceManifest(); + + msg.setAcceptsWayPoints(TestValues.GENERAL_BOOLEAN); + } + + /** + * Tests the expected values of the RPC message. + */ + public void testRpcValues() { + // Test Values + boolean acceptsWayPoints = msg.getAcceptsWayPoints(); + + // Valid Tests + assertEquals(TestValues.GENERAL_BOOLEAN, acceptsWayPoints); + + // Invalid/Null Tests + NavigationServiceManifest msg = new NavigationServiceManifest(); + assertNotNull(TestValues.NOT_NULL, msg); + + assertNull(TestValues.NULL, msg.getAcceptsWayPoints()); + } + + public void testJson() { + JSONObject reference = new JSONObject(); + + try { + reference.put(NavigationServiceManifest.KEY_ACCEPTS_WAY_POINTS, TestValues.GENERAL_BOOLEAN); + + JSONObject underTest = msg.serializeJSON(); + assertEquals(TestValues.MATCH, reference.length(), underTest.length()); + + Iterator<?> iterator = reference.keys(); + while (iterator.hasNext()) { + String key = (String) iterator.next(); + assertEquals(TestValues.MATCH, JsonUtils.readObjectFromJsonObject(reference, key), JsonUtils.readObjectFromJsonObject(underTest, key)); + } + } catch (JSONException e) { + fail(TestValues.JSON_FAIL); + } + } }
\ No newline at end of file diff --git a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/OasisAddressTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/OasisAddressTests.java index 2ea76cd1d..15f096713 100644 --- a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/OasisAddressTests.java +++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/OasisAddressTests.java @@ -18,14 +18,14 @@ public class OasisAddressTests extends TestCase { private OasisAddress msg; @Override - public void setUp(){ + public void setUp() { msg = TestValues.GENERAL_OASISADDRESS; } /** * Tests the expected values of the RPC message. */ - public void testRpcValues () { + public void testRpcValues() { // Test Values String f1 = msg.getAdministrativeArea(); String f2 = msg.getSubAdministrativeArea(); @@ -64,10 +64,10 @@ public class OasisAddressTests extends TestCase { assertNull(msg.getSubThoroughfare()); } - public void testJson(){ + public void testJson() { JSONObject reference = new JSONObject(); - try{ + try { reference.put(OasisAddress.KEY_ADMINISTRATIVE_AREA, TestValues.GENERAL_STRING); reference.put(OasisAddress.KEY_SUB_ADMINISTRATIVE_AREA, TestValues.GENERAL_STRING); reference.put(OasisAddress.KEY_COUNTRY_CODE, TestValues.GENERAL_STRING); @@ -88,7 +88,7 @@ public class OasisAddressTests extends TestCase { underTest.get(key)); } - } catch(JSONException e){ + } catch (JSONException e) { fail(TestValues.JSON_FAIL); } } diff --git a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/ParameterPermissionsTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/ParameterPermissionsTests.java index 1b7074831..f9becd9f2 100644 --- a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/ParameterPermissionsTests.java +++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/ParameterPermissionsTests.java @@ -14,15 +14,15 @@ import java.util.Iterator; import java.util.List; /** - * This is a unit test class for the SmartDeviceLink library project class : + * This is a unit test class for the SmartDeviceLink library project class : * {@link com.smartdevicelink.proxy.rpc.ParameterPermissions} */ -public class ParameterPermissionsTests extends TestCase{ - +public class ParameterPermissionsTests extends TestCase { + private ParameterPermissions msg; @Override - public void setUp(){ + public void setUp() { msg = new ParameterPermissions(); msg.setAllowed(TestValues.GENERAL_STRING_LIST); @@ -30,29 +30,29 @@ public class ParameterPermissionsTests extends TestCase{ } /** - * Tests the expected values of the RPC message. - */ - public void testRpcValues () { - // Test Values - List<String> allowed = msg.getAllowed(); - List<String> disallowed = msg.getUserDisallowed(); - - // Valid Tests - assertTrue(TestValues.TRUE, Validator.validateStringList(TestValues.GENERAL_STRING_LIST, allowed)); - assertTrue(TestValues.TRUE, Validator.validateStringList(TestValues.GENERAL_STRING_LIST, disallowed)); - - // Invalid/Null Tests - ParameterPermissions msg = new ParameterPermissions(); + * Tests the expected values of the RPC message. + */ + public void testRpcValues() { + // Test Values + List<String> allowed = msg.getAllowed(); + List<String> disallowed = msg.getUserDisallowed(); + + // Valid Tests + assertTrue(TestValues.TRUE, Validator.validateStringList(TestValues.GENERAL_STRING_LIST, allowed)); + assertTrue(TestValues.TRUE, Validator.validateStringList(TestValues.GENERAL_STRING_LIST, disallowed)); + + // Invalid/Null Tests + ParameterPermissions msg = new ParameterPermissions(); assertNotNull(TestValues.NOT_NULL, msg); - + assertNull(TestValues.NULL, msg.getAllowed()); assertNull(TestValues.NULL, msg.getUserDisallowed()); } - - public void testJson(){ + + public void testJson() { JSONObject reference = new JSONObject(); - try{ + try { reference.put(ParameterPermissions.KEY_ALLOWED, JsonUtils.createJsonArray(TestValues.GENERAL_STRING_LIST)); reference.put(ParameterPermissions.KEY_USER_DISALLOWED, JsonUtils.createJsonArray(TestValues.GENERAL_STRING_LIST)); @@ -60,12 +60,12 @@ public class ParameterPermissionsTests extends TestCase{ assertEquals(TestValues.MATCH, reference.length(), underTest.length()); Iterator<?> iterator = reference.keys(); - while(iterator.hasNext()){ + while (iterator.hasNext()) { String key = (String) iterator.next(); assertTrue(TestValues.TRUE, Validator.validateStringList(JsonUtils.readStringListFromJsonObject(reference, key), JsonUtils.readStringListFromJsonObject(underTest, key))); } - } catch(JSONException e){ - fail(TestValues.JSON_FAIL); + } catch (JSONException e) { + fail(TestValues.JSON_FAIL); } } }
\ No newline at end of file diff --git a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/PermissionItemTest.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/PermissionItemTest.java index 9fa3d7e2c..38eb020ea 100644 --- a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/PermissionItemTest.java +++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/PermissionItemTest.java @@ -15,77 +15,77 @@ import org.json.JSONObject; import java.util.Iterator; /** - * This is a unit test class for the SmartDeviceLink library project class : + * This is a unit test class for the SmartDeviceLink library project class : * {@link com.smartdevicelink.proxy.rpc.PermissionItem} */ public class PermissionItemTest extends TestCase { - private PermissionItem msg; + private PermissionItem msg; - @Override - public void setUp() { - msg = new PermissionItem(); - - msg.setRpcName(TestValues.GENERAL_STRING); - msg.setHMIPermissions(TestValues.GENERAL_HMIPERMISSIONS); - msg.setParameterPermissions(TestValues.GENERAL_PARAMETERPERMISSIONS); - msg.setRequireEncryption(TestValues.GENERAL_BOOLEAN); - } + @Override + public void setUp() { + msg = new PermissionItem(); + + msg.setRpcName(TestValues.GENERAL_STRING); + msg.setHMIPermissions(TestValues.GENERAL_HMIPERMISSIONS); + msg.setParameterPermissions(TestValues.GENERAL_PARAMETERPERMISSIONS); + msg.setRequireEncryption(TestValues.GENERAL_BOOLEAN); + } /** - * Tests the expected values of the RPC message. - */ - public void testRpcValues () { - // Test Values - String rpcName = msg.getRpcName(); - HMIPermissions hmiPermissions = msg.getHMIPermissions(); - ParameterPermissions parameterPermissions = msg.getParameterPermissions(); - boolean isEncryptionRequired = msg.getRequireEncryption(); - - // Valid Tests - assertEquals(TestValues.MATCH, TestValues.GENERAL_STRING, rpcName); - assertTrue(TestValues.TRUE, Validator.validateHmiPermissions(TestValues.GENERAL_HMIPERMISSIONS, hmiPermissions)); - assertTrue(TestValues.TRUE, Validator.validateParameterPermissions(TestValues.GENERAL_PARAMETERPERMISSIONS, parameterPermissions)); - assertEquals(TestValues.MATCH, TestValues.GENERAL_BOOLEAN, isEncryptionRequired); - - // Invalid/Null Tests - PermissionItem msg = new PermissionItem(); - assertNotNull(TestValues.NOT_NULL, msg); - - assertNull(TestValues.NULL, msg.getRpcName()); - assertNull(TestValues.NULL, msg.getHMIPermissions()); - assertNull(TestValues.NULL, msg.getParameterPermissions()); - assertNull(TestValues.NULL, msg.getRequireEncryption()); - } - - public void testJson() { - JSONObject reference = new JSONObject(); - - try { - reference.put(PermissionItem.KEY_RPC_NAME, TestValues.GENERAL_STRING); - reference.put(PermissionItem.KEY_HMI_PERMISSIONS, TestValues.JSON_HMIPERMISSIONS); - reference.put(PermissionItem.KEY_PARAMETER_PERMISSIONS, TestValues.JSON_PARAMETERPERMISSIONS); - reference.put(PermissionItem.KEY_REQUIRE_ENCRYPTION, TestValues.GENERAL_BOOLEAN); - - 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(PermissionItem.KEY_HMI_PERMISSIONS)) { - assertTrue(TestValues.TRUE, Validator.validateStringList(JsonUtils.readStringListFromJsonObject(reference, key), JsonUtils.readStringListFromJsonObject(underTest, key))); - } else if (key.equals(PermissionItem.KEY_PARAMETER_PERMISSIONS)) { - assertTrue(TestValues.TRUE, Validator.validateStringList(JsonUtils.readStringListFromJsonObject(reference, key), JsonUtils.readStringListFromJsonObject(underTest, key))); - } else if (key.equals(PermissionItem.KEY_REQUIRE_ENCRYPTION)) { - assertEquals(TestValues.MATCH, JsonUtils.readBooleanFromJsonObject(reference, key), JsonUtils.readBooleanFromJsonObject(underTest, key)); - } else { - assertEquals(TestValues.MATCH, JsonUtils.readObjectFromJsonObject(reference, key), JsonUtils.readObjectFromJsonObject(underTest, key)); - } - } - } catch (JSONException e) { - fail(TestValues.JSON_FAIL); - } - } + * Tests the expected values of the RPC message. + */ + public void testRpcValues() { + // Test Values + String rpcName = msg.getRpcName(); + HMIPermissions hmiPermissions = msg.getHMIPermissions(); + ParameterPermissions parameterPermissions = msg.getParameterPermissions(); + boolean isEncryptionRequired = msg.getRequireEncryption(); + + // Valid Tests + assertEquals(TestValues.MATCH, TestValues.GENERAL_STRING, rpcName); + assertTrue(TestValues.TRUE, Validator.validateHmiPermissions(TestValues.GENERAL_HMIPERMISSIONS, hmiPermissions)); + assertTrue(TestValues.TRUE, Validator.validateParameterPermissions(TestValues.GENERAL_PARAMETERPERMISSIONS, parameterPermissions)); + assertEquals(TestValues.MATCH, TestValues.GENERAL_BOOLEAN, isEncryptionRequired); + + // Invalid/Null Tests + PermissionItem msg = new PermissionItem(); + assertNotNull(TestValues.NOT_NULL, msg); + + assertNull(TestValues.NULL, msg.getRpcName()); + assertNull(TestValues.NULL, msg.getHMIPermissions()); + assertNull(TestValues.NULL, msg.getParameterPermissions()); + assertNull(TestValues.NULL, msg.getRequireEncryption()); + } + + public void testJson() { + JSONObject reference = new JSONObject(); + + try { + reference.put(PermissionItem.KEY_RPC_NAME, TestValues.GENERAL_STRING); + reference.put(PermissionItem.KEY_HMI_PERMISSIONS, TestValues.JSON_HMIPERMISSIONS); + reference.put(PermissionItem.KEY_PARAMETER_PERMISSIONS, TestValues.JSON_PARAMETERPERMISSIONS); + reference.put(PermissionItem.KEY_REQUIRE_ENCRYPTION, TestValues.GENERAL_BOOLEAN); + + 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(PermissionItem.KEY_HMI_PERMISSIONS)) { + assertTrue(TestValues.TRUE, Validator.validateStringList(JsonUtils.readStringListFromJsonObject(reference, key), JsonUtils.readStringListFromJsonObject(underTest, key))); + } else if (key.equals(PermissionItem.KEY_PARAMETER_PERMISSIONS)) { + assertTrue(TestValues.TRUE, Validator.validateStringList(JsonUtils.readStringListFromJsonObject(reference, key), JsonUtils.readStringListFromJsonObject(underTest, key))); + } else if (key.equals(PermissionItem.KEY_REQUIRE_ENCRYPTION)) { + assertEquals(TestValues.MATCH, JsonUtils.readBooleanFromJsonObject(reference, key), JsonUtils.readBooleanFromJsonObject(underTest, key)); + } else { + assertEquals(TestValues.MATCH, JsonUtils.readObjectFromJsonObject(reference, key), JsonUtils.readObjectFromJsonObject(underTest, key)); + } + } + } catch (JSONException e) { + fail(TestValues.JSON_FAIL); + } + } }
\ No newline at end of file diff --git a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/PhoneCapabilityTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/PhoneCapabilityTests.java index 2125eca16..f85890cbe 100644 --- a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/PhoneCapabilityTests.java +++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/PhoneCapabilityTests.java @@ -12,25 +12,25 @@ import org.json.JSONObject; import java.util.Iterator; /** - * This is a unit test class for the SmartDeviceLink library project class : + * This is a unit test class for the SmartDeviceLink library project class : * {@link com.smartdevicelink.proxy.rpc.PhoneCapability} */ -public class PhoneCapabilityTests extends TestCase{ +public class PhoneCapabilityTests extends TestCase { private PhoneCapability msg; @Override - public void setUp(){ + public void setUp() { msg = new PhoneCapability(); msg.setDialNumberEnabled(TestValues.GENERAL_BOOLEAN); } /** - * Tests the expected values of the RPC message. - */ - public void testRpcValues () { - // Test Values + * Tests the expected values of the RPC message. + */ + public void testRpcValues() { + // Test Values boolean dialNumberEnabled = msg.getDialNumberEnabled(); // Valid Tests @@ -43,22 +43,22 @@ public class PhoneCapabilityTests extends TestCase{ assertNull(TestValues.NULL, msg.getDialNumberEnabled()); } - public void testJson(){ + public void testJson() { JSONObject reference = new JSONObject(); - try{ + try { reference.put(PhoneCapability.KEY_DIALNUMBER_ENABLED, TestValues.GENERAL_BOOLEAN); JSONObject underTest = msg.serializeJSON(); assertEquals(TestValues.MATCH, reference.length(), underTest.length()); Iterator<?> iterator = reference.keys(); - while(iterator.hasNext()){ + while (iterator.hasNext()) { String key = (String) iterator.next(); assertEquals(TestValues.MATCH, JsonUtils.readObjectFromJsonObject(reference, key), JsonUtils.readObjectFromJsonObject(underTest, key)); } - }catch(JSONException e){ - fail(TestValues.JSON_FAIL); + } catch (JSONException e) { + fail(TestValues.JSON_FAIL); } } }
\ No newline at end of file diff --git a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/PresetBankCapabilitiesTest.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/PresetBankCapabilitiesTest.java index b614ce272..5556c8223 100644 --- a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/PresetBankCapabilitiesTest.java +++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/PresetBankCapabilitiesTest.java @@ -12,53 +12,53 @@ import org.json.JSONObject; import java.util.Iterator; /** - * This is a unit test class for the SmartDeviceLink library project class : + * This is a unit test class for the SmartDeviceLink library project class : * {@link com.smartdevicelink.proxy.rpc.PresetBankCapabilities} */ public class PresetBankCapabilitiesTest extends TestCase { - - private PresetBankCapabilities msg; - @Override - public void setUp() { - msg = new PresetBankCapabilities(); - - msg.setOnScreenPresetsAvailable(TestValues.GENERAL_BOOLEAN); - } + private PresetBankCapabilities msg; + + @Override + public void setUp() { + msg = new PresetBankCapabilities(); + + msg.setOnScreenPresetsAvailable(TestValues.GENERAL_BOOLEAN); + } /** - * Tests the expected values of the RPC message. - */ - public void testRpcValues () { - // Test Values - boolean presets = msg.onScreenPresetsAvailable(); - - // Valid Tests - assertEquals(TestValues.MATCH, TestValues.GENERAL_BOOLEAN, presets); - - // Invalid/Null Tests - PresetBankCapabilities msg = new PresetBankCapabilities(); - assertNotNull(TestValues.NOT_NULL, msg); - - assertNull(TestValues.NULL, msg.onScreenPresetsAvailable()); - } - - public void testJson() { - JSONObject reference = new JSONObject(); - - try { - reference.put(PresetBankCapabilities.KEY_ON_SCREEN_PRESETS_AVAILABLE, TestValues.GENERAL_BOOLEAN); - - JSONObject underTest = msg.serializeJSON(); - assertEquals(TestValues.MATCH, reference.length(), underTest.length()); - - Iterator<?> iterator = reference.keys(); - while (iterator.hasNext()) { - String key = (String) iterator.next(); - assertEquals(TestValues.MATCH, JsonUtils.readObjectFromJsonObject(reference, key), JsonUtils.readObjectFromJsonObject(underTest, key)); - } - } catch (JSONException e) { - fail(TestValues.JSON_FAIL); - } - } + * Tests the expected values of the RPC message. + */ + public void testRpcValues() { + // Test Values + boolean presets = msg.onScreenPresetsAvailable(); + + // Valid Tests + assertEquals(TestValues.MATCH, TestValues.GENERAL_BOOLEAN, presets); + + // Invalid/Null Tests + PresetBankCapabilities msg = new PresetBankCapabilities(); + assertNotNull(TestValues.NOT_NULL, msg); + + assertNull(TestValues.NULL, msg.onScreenPresetsAvailable()); + } + + public void testJson() { + JSONObject reference = new JSONObject(); + + try { + reference.put(PresetBankCapabilities.KEY_ON_SCREEN_PRESETS_AVAILABLE, TestValues.GENERAL_BOOLEAN); + + JSONObject underTest = msg.serializeJSON(); + assertEquals(TestValues.MATCH, reference.length(), underTest.length()); + + Iterator<?> iterator = reference.keys(); + while (iterator.hasNext()) { + String key = (String) iterator.next(); + assertEquals(TestValues.MATCH, JsonUtils.readObjectFromJsonObject(reference, key), JsonUtils.readObjectFromJsonObject(underTest, key)); + } + } catch (JSONException e) { + fail(TestValues.JSON_FAIL); + } + } }
\ No newline at end of file diff --git a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/RGBColorTest.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/RGBColorTest.java index d2f0254f4..ebf7fb31c 100644 --- a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/RGBColorTest.java +++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/RGBColorTest.java @@ -12,59 +12,59 @@ import org.json.JSONObject; import java.util.Iterator; /** - * This is a unit test class for the SmartDeviceLink library project class : + * This is a unit test class for the SmartDeviceLink library project class : * {@link com.smartdevicelink.proxy.rpc.RGBColor} */ public class RGBColorTest extends TestCase { - - private RGBColor msg; - @Override - public void setUp() { - msg = new RGBColor(TestValues.GENERAL_INT, TestValues.GENERAL_INT, TestValues.GENERAL_INT); - } + private RGBColor msg; + + @Override + public void setUp() { + msg = new RGBColor(TestValues.GENERAL_INT, TestValues.GENERAL_INT, TestValues.GENERAL_INT); + } /** - * Tests the expected values of the RPC message. - */ - public void testRpcValues () { - // Test Values - Integer red = msg.getRed(); - Integer green = msg.getGreen(); - Integer blue = msg.getBlue(); + * Tests the expected values of the RPC message. + */ + public void testRpcValues() { + // Test Values + Integer red = msg.getRed(); + Integer green = msg.getGreen(); + Integer blue = msg.getBlue(); - // Valid Tests - assertEquals(TestValues.MATCH, (Integer) TestValues.GENERAL_INT, red); - assertEquals(TestValues.MATCH, (Integer) TestValues.GENERAL_INT, green); - assertEquals(TestValues.MATCH, (Integer) TestValues.GENERAL_INT, blue); + // Valid Tests + assertEquals(TestValues.MATCH, (Integer) TestValues.GENERAL_INT, red); + assertEquals(TestValues.MATCH, (Integer) TestValues.GENERAL_INT, green); + assertEquals(TestValues.MATCH, (Integer) TestValues.GENERAL_INT, blue); - // Invalid/Null Tests - RGBColor msg = new RGBColor(); - assertNotNull(TestValues.NOT_NULL, msg); + // Invalid/Null Tests + RGBColor msg = new RGBColor(); + assertNotNull(TestValues.NOT_NULL, msg); - assertEquals(TestValues.MATCH, msg.getRed(), (Integer) 0); - assertEquals(TestValues.MATCH, msg.getGreen(), (Integer) 0); - assertEquals(TestValues.MATCH, msg.getBlue(), (Integer) 0); - } + assertEquals(TestValues.MATCH, msg.getRed(), (Integer) 0); + assertEquals(TestValues.MATCH, msg.getGreen(), (Integer) 0); + assertEquals(TestValues.MATCH, msg.getBlue(), (Integer) 0); + } - public void testJson() { - JSONObject reference = new JSONObject(); + public void testJson() { + JSONObject reference = new JSONObject(); - try { - reference.put(RGBColor.KEY_RED, TestValues.GENERAL_INT); - reference.put(RGBColor.KEY_GREEN, TestValues.GENERAL_INT); - reference.put(RGBColor.KEY_BLUE, TestValues.GENERAL_INT); + try { + reference.put(RGBColor.KEY_RED, TestValues.GENERAL_INT); + reference.put(RGBColor.KEY_GREEN, TestValues.GENERAL_INT); + reference.put(RGBColor.KEY_BLUE, TestValues.GENERAL_INT); - JSONObject underTest = msg.serializeJSON(); - assertEquals(TestValues.MATCH, reference.length(), underTest.length()); + JSONObject underTest = msg.serializeJSON(); + assertEquals(TestValues.MATCH, reference.length(), underTest.length()); - Iterator<?> iterator = reference.keys(); - while (iterator.hasNext()) { - String key = (String) iterator.next(); - assertEquals(TestValues.MATCH, JsonUtils.readObjectFromJsonObject(reference, key), JsonUtils.readObjectFromJsonObject(underTest, key)); - } - } catch (JSONException e) { - fail(TestValues.JSON_FAIL); - } - } + Iterator<?> iterator = reference.keys(); + while (iterator.hasNext()) { + String key = (String) iterator.next(); + assertEquals(TestValues.MATCH, JsonUtils.readObjectFromJsonObject(reference, key), JsonUtils.readObjectFromJsonObject(underTest, key)); + } + } catch (JSONException e) { + fail(TestValues.JSON_FAIL); + } + } }
\ No newline at end of file diff --git a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/RadioControlCapabilitiesTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/RadioControlCapabilitiesTests.java index 143c6cb99..dd57d9b16 100644 --- a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/RadioControlCapabilitiesTests.java +++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/RadioControlCapabilitiesTests.java @@ -19,12 +19,12 @@ import java.util.Iterator; * This is a unit test class for the SmartDeviceLink library project class : * {@link com.smartdevicelink.proxy.rpc.RadioControlCapabilities} */ -public class RadioControlCapabilitiesTests extends TestCase{ - +public class RadioControlCapabilitiesTests extends TestCase { + private RadioControlCapabilities msg; @Override - public void setUp(){ + public void setUp() { msg = new RadioControlCapabilities(); msg.setModuleName(TestValues.GENERAL_STRING); @@ -45,9 +45,9 @@ public class RadioControlCapabilitiesTests extends TestCase{ } /** - * Tests the expected values of the RPC message. - */ - public void testRpcValues () { + * Tests the expected values of the RPC message. + */ + public void testRpcValues() { // Test Values String moduleName = msg.getModuleName(); boolean radioEnableAvailable = msg.getRadioEnableAvailable(); @@ -104,10 +104,10 @@ public class RadioControlCapabilitiesTests extends TestCase{ assertNull(TestValues.NULL, msg.getAvailableHdChannelsAvailable()); } - public void testJson(){ + public void testJson() { JSONObject reference = new JSONObject(); - try{ + try { reference.put(RadioControlCapabilities.KEY_MODULE_NAME, TestValues.GENERAL_STRING); reference.put(RadioControlCapabilities.KEY_RADIO_ENABLE_AVAILABLE, TestValues.GENERAL_BOOLEAN); reference.put(RadioControlCapabilities.KEY_RADIO_BAND_AVAILABLE, TestValues.GENERAL_BOOLEAN); @@ -128,7 +128,7 @@ public class RadioControlCapabilitiesTests extends TestCase{ assertEquals(TestValues.MATCH, reference.length(), underTest.length()); Iterator<?> iterator = reference.keys(); - while(iterator.hasNext()){ + while (iterator.hasNext()) { String key = (String) iterator.next(); if (key.equals(RadioControlCapabilities.KEY_MODULE_INFO)) { JSONObject o1 = (JSONObject) JsonUtils.readObjectFromJsonObject(reference, key); @@ -141,8 +141,8 @@ public class RadioControlCapabilitiesTests extends TestCase{ } } - } catch(JSONException e){ - fail(TestValues.JSON_FAIL); + } catch (JSONException e) { + fail(TestValues.JSON_FAIL); } } }
\ No newline at end of file diff --git a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/RadioControlDataTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/RadioControlDataTests.java index e5ac58518..de934e2bc 100644 --- a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/RadioControlDataTests.java +++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/RadioControlDataTests.java @@ -23,12 +23,12 @@ import java.util.List; * This is a unit test class for the SmartDeviceLink library project class : * {@link com.smartdevicelink.proxy.rpc.RadioControlData} */ -public class RadioControlDataTests extends TestCase{ - +public class RadioControlDataTests extends TestCase { + private RadioControlData msg; @Override - public void setUp(){ + public void setUp() { msg = new RadioControlData(); msg.setFrequencyInteger(TestValues.GENERAL_INT); @@ -47,9 +47,9 @@ public class RadioControlDataTests extends TestCase{ } /** - * Tests the expected values of the RPC message. - */ - public void testRpcValues () { + * Tests the expected values of the RPC message. + */ + public void testRpcValues() { // Test Values int frequencyInteger = msg.getFrequencyInteger(); int frequencyFraction = msg.getFrequencyFraction(); @@ -99,10 +99,10 @@ public class RadioControlDataTests extends TestCase{ assertNull(TestValues.NULL, msg.getAvailableHdChannels()); } - public void testJson(){ + public void testJson() { JSONObject reference = new JSONObject(); - try{ + try { reference.put(RadioControlData.KEY_FREQUENCY_INTEGER, TestValues.GENERAL_INT); reference.put(RadioControlData.KEY_FREQUENCY_FRACTION, TestValues.GENERAL_INT); reference.put(RadioControlData.KEY_BAND, TestValues.GENERAL_RADIOBAND); @@ -121,31 +121,31 @@ public class RadioControlDataTests extends TestCase{ assertEquals(TestValues.MATCH, reference.length(), underTest.length()); Iterator<?> iterator = reference.keys(); - while(iterator.hasNext()){ + while (iterator.hasNext()) { String key = (String) iterator.next(); - if(key.equals(RadioControlData.KEY_RDS_DATA)){ + if (key.equals(RadioControlData.KEY_RDS_DATA)) { JSONObject objectEquals = (JSONObject) JsonUtils.readObjectFromJsonObject(reference, key); JSONObject testEquals = (JSONObject) JsonUtils.readObjectFromJsonObject(underTest, key); Hashtable<String, Object> hashReference = JsonRPCMarshaller.deserializeJSONObject(objectEquals); Hashtable<String, Object> hashTest = JsonRPCMarshaller.deserializeJSONObject(testEquals); assertTrue(TestValues.TRUE, Validator.validateRdsData(new RdsData(hashReference), new RdsData(hashTest))); } else if (key.equals(RadioControlData.KEY_SIS_DATA)) { - JSONObject objectEquals = (JSONObject) JsonUtils.readObjectFromJsonObject(reference, key); - JSONObject testEquals = (JSONObject) JsonUtils.readObjectFromJsonObject(underTest, key); - Hashtable<String, Object> hashReference = JsonRPCMarshaller.deserializeJSONObject(objectEquals); - Hashtable<String, Object> hashTest = JsonRPCMarshaller.deserializeJSONObject(testEquals); - assertTrue(TestValues.TRUE, Validator.validateSisData(new SisData(hashReference), new SisData(hashTest))); - } else if(key.equals(RadioControlData.KEY_AVAILABLE_HD_CHANNELS)){ + JSONObject objectEquals = (JSONObject) JsonUtils.readObjectFromJsonObject(reference, key); + JSONObject testEquals = (JSONObject) JsonUtils.readObjectFromJsonObject(underTest, key); + Hashtable<String, Object> hashReference = JsonRPCMarshaller.deserializeJSONObject(objectEquals); + Hashtable<String, Object> hashTest = JsonRPCMarshaller.deserializeJSONObject(testEquals); + assertTrue(TestValues.TRUE, Validator.validateSisData(new SisData(hashReference), new SisData(hashTest))); + } else if (key.equals(RadioControlData.KEY_AVAILABLE_HD_CHANNELS)) { List<Integer> list1 = TestValues.GENERAL_AVAILABLE_HD_CHANNELS_LIST; List<Integer> list2 = JsonUtils.readIntegerListFromJsonObject(underTest, key); - assertTrue(TestValues.TRUE, Validator.validateIntegerList(list1,list2)); - } else{ + assertTrue(TestValues.TRUE, Validator.validateIntegerList(list1, list2)); + } else { assertEquals(TestValues.MATCH, JsonUtils.readObjectFromJsonObject(reference, key), JsonUtils.readObjectFromJsonObject(underTest, key)); } } - } catch(JSONException e){ - fail(TestValues.JSON_FAIL); + } catch (JSONException e) { + fail(TestValues.JSON_FAIL); } } }
\ No newline at end of file diff --git a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/RdsDataTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/RdsDataTests.java index b7b468751..61e5ac127 100644 --- a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/RdsDataTests.java +++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/RdsDataTests.java @@ -12,15 +12,15 @@ import org.json.JSONObject; import java.util.Iterator; /** - * This is a unit test class for the SmartDeviceLink library project class : + * This is a unit test class for the SmartDeviceLink library project class : * {@link com.smartdevicelink.proxy.rpc.RdsData} */ -public class RdsDataTests extends TestCase{ - +public class RdsDataTests extends TestCase { + private RdsData msg; @Override - public void setUp(){ + public void setUp() { msg = new RdsData(); msg.setProgramService(TestValues.GENERAL_STRING); @@ -34,9 +34,9 @@ public class RdsDataTests extends TestCase{ } /** - * Tests the expected values of the RPC message. - */ - public void testRpcValues () { + * Tests the expected values of the RPC message. + */ + public void testRpcValues() { // Test Values String ps = msg.getProgramService(); String rt = msg.getRadioText(); @@ -71,10 +71,10 @@ public class RdsDataTests extends TestCase{ assertNull(TestValues.NULL, msg.getProgramType()); } - public void testJson(){ + public void testJson() { JSONObject reference = new JSONObject(); - try{ + try { reference.put(RdsData.KEY_PS, TestValues.GENERAL_STRING); reference.put(RdsData.KEY_RT, TestValues.GENERAL_STRING); reference.put(RdsData.KEY_CT, TestValues.GENERAL_STRING); @@ -88,14 +88,14 @@ public class RdsDataTests extends TestCase{ assertEquals(TestValues.MATCH, reference.length(), underTest.length()); Iterator<?> iterator = reference.keys(); - while(iterator.hasNext()){ + while (iterator.hasNext()) { String key = (String) iterator.next(); assertEquals(TestValues.MATCH, JsonUtils.readObjectFromJsonObject(reference, key), JsonUtils.readObjectFromJsonObject(underTest, key)); } - } catch(JSONException e){ - fail(TestValues.JSON_FAIL); + } catch (JSONException e) { + fail(TestValues.JSON_FAIL); } } }
\ No newline at end of file diff --git a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/RectangleTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/RectangleTests.java index ec8bcad9c..c30a8e5a1 100644 --- a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/RectangleTests.java +++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/RectangleTests.java @@ -17,63 +17,63 @@ import java.util.Iterator; */ public class RectangleTests extends TestCase { - private Rectangle msg; - - @Override - public void setUp() { - msg = new Rectangle(); - - msg.setX(TestValues.GENERAL_FLOAT); - msg.setY(TestValues.GENERAL_FLOAT); - msg.setWidth(TestValues.GENERAL_FLOAT); - msg.setHeight(TestValues.GENERAL_FLOAT); - } - - /** - * Tests the expected values of the RPC message. - */ - public void testRpcValues () { - // Test Values - Float x = msg.getX(); - Float y = msg.getY(); - Float width = msg.getWidth(); - Float height = msg.getHeight(); - - // Valid Tests - assertEquals(TestValues.MATCH, TestValues.GENERAL_FLOAT, x); - assertEquals(TestValues.MATCH, TestValues.GENERAL_FLOAT, y); - assertEquals(TestValues.MATCH, TestValues.GENERAL_FLOAT, width); - assertEquals(TestValues.MATCH, TestValues.GENERAL_FLOAT, height); - - // Invalid/Null Tests - Rectangle msg = new Rectangle(); - assertNotNull(TestValues.NOT_NULL, msg); - - assertNull(TestValues.NULL, msg.getX()); - assertNull(TestValues.NULL, msg.getY()); - assertNull(TestValues.NULL, msg.getWidth()); - assertNull(TestValues.NULL, msg.getHeight()); - } - - public void testJson() { - JSONObject reference = new JSONObject(); - - try { - reference.put(Rectangle.KEY_X, (TestValues.GENERAL_FLOAT)); - reference.put(Rectangle.KEY_Y, (TestValues.GENERAL_FLOAT)); - reference.put(Rectangle.KEY_WIDTH, (TestValues.GENERAL_FLOAT)); - reference.put(Rectangle.KEY_HEIGHT, (TestValues.GENERAL_FLOAT)); - - JSONObject underTest = msg.serializeJSON(); - assertEquals(TestValues.MATCH, reference.length(), underTest.length()); - - Iterator<?> iterator = reference.keys(); - while (iterator.hasNext()) { - String key = (String) iterator.next(); - assertEquals(TestValues.MATCH, JsonUtils.readObjectFromJsonObject(reference, key), JsonUtils.readObjectFromJsonObject(underTest, key)); - } - } catch (JSONException e) { - fail(TestValues.JSON_FAIL); - } - } + private Rectangle msg; + + @Override + public void setUp() { + msg = new Rectangle(); + + msg.setX(TestValues.GENERAL_FLOAT); + msg.setY(TestValues.GENERAL_FLOAT); + msg.setWidth(TestValues.GENERAL_FLOAT); + msg.setHeight(TestValues.GENERAL_FLOAT); + } + + /** + * Tests the expected values of the RPC message. + */ + public void testRpcValues() { + // Test Values + Float x = msg.getX(); + Float y = msg.getY(); + Float width = msg.getWidth(); + Float height = msg.getHeight(); + + // Valid Tests + assertEquals(TestValues.MATCH, TestValues.GENERAL_FLOAT, x); + assertEquals(TestValues.MATCH, TestValues.GENERAL_FLOAT, y); + assertEquals(TestValues.MATCH, TestValues.GENERAL_FLOAT, width); + assertEquals(TestValues.MATCH, TestValues.GENERAL_FLOAT, height); + + // Invalid/Null Tests + Rectangle msg = new Rectangle(); + assertNotNull(TestValues.NOT_NULL, msg); + + assertNull(TestValues.NULL, msg.getX()); + assertNull(TestValues.NULL, msg.getY()); + assertNull(TestValues.NULL, msg.getWidth()); + assertNull(TestValues.NULL, msg.getHeight()); + } + + public void testJson() { + JSONObject reference = new JSONObject(); + + try { + reference.put(Rectangle.KEY_X, (TestValues.GENERAL_FLOAT)); + reference.put(Rectangle.KEY_Y, (TestValues.GENERAL_FLOAT)); + reference.put(Rectangle.KEY_WIDTH, (TestValues.GENERAL_FLOAT)); + reference.put(Rectangle.KEY_HEIGHT, (TestValues.GENERAL_FLOAT)); + + JSONObject underTest = msg.serializeJSON(); + assertEquals(TestValues.MATCH, reference.length(), underTest.length()); + + Iterator<?> iterator = reference.keys(); + while (iterator.hasNext()) { + String key = (String) iterator.next(); + assertEquals(TestValues.MATCH, JsonUtils.readObjectFromJsonObject(reference, key), JsonUtils.readObjectFromJsonObject(underTest, key)); + } + } catch (JSONException e) { + fail(TestValues.JSON_FAIL); + } + } } diff --git a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/RemoteControlCapabilitiesTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/RemoteControlCapabilitiesTests.java index fed1fafda..88dde9f75 100644 --- a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/RemoteControlCapabilitiesTests.java +++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/RemoteControlCapabilitiesTests.java @@ -30,151 +30,151 @@ import java.util.List; */ public class RemoteControlCapabilitiesTests extends TestCase { - private RemoteControlCapabilities msg; - - @Override - public void setUp() { - msg = new RemoteControlCapabilities(); - msg.setButtonCapabilities(TestValues.GENERAL_BUTTONCAPABILITIES_LIST); - msg.setRadioControlCapabilities(TestValues.GENERAL_RADIOCONTROLCAPABILITIES_LIST); - msg.setClimateControlCapabilities(TestValues.GENERAL_CLIMATECONTROLCAPABILITIES_LIST); - msg.setSeatControlCapabilities(TestValues.GENERAL_SEATCONTROLCAPABILITIES_LIST); - msg.setAudioControlCapabilities(TestValues.GENERAL_AUDIOCONTROLCAPABILITIES_LIST); - msg.setHmiSettingsControlCapabilities(TestValues.GENERAL_HMISETTINGSCONTROLCAPABILITIES); - msg.setLightControlCapabilities(TestValues.GENERAL_LIGHTCONTROLCAPABILITIES); - } - - /** - * Tests the expected values of the RPC message. - */ - public void testRpcValues() { - // Test Values - List<ButtonCapabilities> buttonCapabilities = msg.getButtonCapabilities(); - List<RadioControlCapabilities> radioControlCapabilities = msg.getRadioControlCapabilities(); - List<ClimateControlCapabilities> climateControlCapabilities = msg.getClimateControlCapabilities(); - List<SeatControlCapabilities> seatControlCapabilities = msg.getSeatControlCapabilities(); - List<AudioControlCapabilities> audioControlCapabilities = msg.getAudioControlCapabilities(); - HMISettingsControlCapabilities hmiSettingsControlCapabilities = msg.getHmiSettingsControlCapabilities(); - LightControlCapabilities lightControlCapabilities = msg.getLightControlCapabilities(); - - // Valid Tests - assertEquals(TestValues.MATCH, TestValues.GENERAL_BUTTONCAPABILITIES_LIST.size(), buttonCapabilities.size()); - assertEquals(TestValues.MATCH, TestValues.GENERAL_RADIOCONTROLCAPABILITIES_LIST.size(), radioControlCapabilities.size()); - assertEquals(TestValues.MATCH, TestValues.GENERAL_CLIMATECONTROLCAPABILITIES_LIST.size(), climateControlCapabilities.size()); - assertEquals(TestValues.MATCH, TestValues.GENERAL_SEATCONTROLCAPABILITIES_LIST.size(), seatControlCapabilities.size()); - - assertTrue(TestValues.TRUE, Validator.validateButtonCapabilities(TestValues.GENERAL_BUTTONCAPABILITIES_LIST, buttonCapabilities)); - assertTrue(TestValues.TRUE, Validator.validateRadioControlCapabilities(TestValues.GENERAL_RADIOCONTROLCAPABILITIES_LIST, radioControlCapabilities)); - assertTrue(TestValues.TRUE, Validator.validateClimateControlCapabilities(TestValues.GENERAL_CLIMATECONTROLCAPABILITIES_LIST, climateControlCapabilities)); - assertTrue(TestValues.TRUE, Validator.validateSeatControlCapabilitiesList(TestValues.GENERAL_SEATCONTROLCAPABILITIES_LIST, seatControlCapabilities)); - assertTrue(TestValues.TRUE, Validator.validateAudioControlCapabilitiesList(TestValues.GENERAL_AUDIOCONTROLCAPABILITIES_LIST, audioControlCapabilities)); - assertTrue(TestValues.TRUE, Validator.validateHMISettingsControlCapabilities(TestValues.GENERAL_HMISETTINGSCONTROLCAPABILITIES, hmiSettingsControlCapabilities)); - assertTrue(TestValues.TRUE, Validator.validateLightControlCapabilities(TestValues.GENERAL_LIGHTCONTROLCAPABILITIES, lightControlCapabilities)); - - // Invalid/Null Tests - RemoteControlCapabilities msg = new RemoteControlCapabilities(); - assertNotNull(TestValues.NOT_NULL, msg); - - assertNull(TestValues.NULL, msg.getButtonCapabilities()); - assertNull(TestValues.NULL, msg.getRadioControlCapabilities()); - assertNull(TestValues.NULL, msg.getClimateControlCapabilities()); - assertNull(TestValues.NULL, msg.getSeatControlCapabilities()); - assertNull(TestValues.NULL, msg.getAudioControlCapabilities()); - assertNull(TestValues.NULL, msg.getHmiSettingsControlCapabilities()); - assertNull(TestValues.NULL, msg.getLightControlCapabilities()); - } - - public void testJson() { - JSONObject reference = new JSONObject(); - - try { - reference.put(RemoteControlCapabilities.KEY_BUTTON_CAPABILITIES, TestValues.JSON_BUTTONCAPABILITIES); - reference.put(RemoteControlCapabilities.KEY_RADIO_CONTROL_CAPABILITIES, TestValues.JSON_RADIOCONTROLCAPABILITIES); - reference.put(RemoteControlCapabilities.KEY_CLIMATE_CONTROL_CAPABILITIES, TestValues.JSON_CLIMATECONTROLCAPABILITIES); - reference.put(RemoteControlCapabilities.KEY_SEAT_CONTROL_CAPABILITIES, TestValues.GENERAL_SEATCONTROLCAPABILITIES_LIST); - reference.put(RemoteControlCapabilities.KEY_AUDIO_CONTROL_CAPABILITIES, TestValues.GENERAL_AUDIOCONTROLCAPABILITIES_LIST); - reference.put(RemoteControlCapabilities.KEY_HMI_SETTINGS_CONTROL_CAPABILITIES, JsonRPCMarshaller.serializeHashtable(TestValues.GENERAL_HMISETTINGSCONTROLCAPABILITIES.getStore())); - reference.put(RemoteControlCapabilities.KEY_LIGHT_CONTROL_CAPABILITIES, JsonRPCMarshaller.serializeHashtable(TestValues.GENERAL_LIGHTCONTROLCAPABILITIES.getStore())); - - 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(RemoteControlCapabilities.KEY_BUTTON_CAPABILITIES)) { - JSONArray referenceArray = JsonUtils.readJsonArrayFromJsonObject(reference, key); - JSONArray underTestArray = JsonUtils.readJsonArrayFromJsonObject(underTest, key); - assertEquals(TestValues.MATCH, referenceArray.length(), underTestArray.length()); - - List<ButtonCapabilities> referenceList = new ArrayList<ButtonCapabilities>(); - List<ButtonCapabilities> testList = new ArrayList<ButtonCapabilities>(); - for (int i = 0; i < referenceArray.length(); i++) { - Hashtable<String, Object> hashReference = JsonRPCMarshaller.deserializeJSONObject(referenceArray.getJSONObject(i)); - referenceList.add(new ButtonCapabilities(hashReference)); - Hashtable<String, Object> hashTest = JsonRPCMarshaller.deserializeJSONObject(underTestArray.getJSONObject(i)); - testList.add(new ButtonCapabilities(hashTest)); - } - assertTrue(TestValues.TRUE, Validator.validateButtonCapabilities(referenceList, testList)); - } else if (key.equals(RemoteControlCapabilities.KEY_RADIO_CONTROL_CAPABILITIES)) { - JSONArray referenceArray = JsonUtils.readJsonArrayFromJsonObject(reference, key); - JSONArray underTestArray = JsonUtils.readJsonArrayFromJsonObject(underTest, key); - assertEquals(TestValues.MATCH, referenceArray.length(), underTestArray.length()); - - List<RadioControlCapabilities> referenceList = new ArrayList<RadioControlCapabilities>(); - List<RadioControlCapabilities> testList = new ArrayList<RadioControlCapabilities>(); - for (int i = 0; i < referenceArray.length(); i++) { - Hashtable<String, Object> hashReference = JsonRPCMarshaller.deserializeJSONObject(referenceArray.getJSONObject(i)); - referenceList.add(new RadioControlCapabilities(hashReference)); - Hashtable<String, Object> hashTest = JsonRPCMarshaller.deserializeJSONObject(underTestArray.getJSONObject(i)); - testList.add(new RadioControlCapabilities(hashTest)); - } - assertTrue(TestValues.TRUE, Validator.validateRadioControlCapabilities(referenceList, testList)); - } else if (key.equals(RemoteControlCapabilities.KEY_CLIMATE_CONTROL_CAPABILITIES)) { - JSONArray referenceArray = JsonUtils.readJsonArrayFromJsonObject(reference, key); - JSONArray underTestArray = JsonUtils.readJsonArrayFromJsonObject(underTest, key); - assertEquals(TestValues.MATCH, referenceArray.length(), underTestArray.length()); - - List<ClimateControlCapabilities> referenceList = new ArrayList<ClimateControlCapabilities>(); - List<ClimateControlCapabilities> testList = new ArrayList<ClimateControlCapabilities>(); - for (int i = 0; i < referenceArray.length(); i++) { - Hashtable<String, Object> hashReference = JsonRPCMarshaller.deserializeJSONObject(referenceArray.getJSONObject(i)); - referenceList.add(new ClimateControlCapabilities(hashReference)); - Hashtable<String, Object> hashTest = JsonRPCMarshaller.deserializeJSONObject(underTestArray.getJSONObject(i)); - testList.add(new ClimateControlCapabilities(hashTest)); - } - assertTrue(TestValues.TRUE, Validator.validateClimateControlCapabilities(referenceList, testList)); - } else if (key.equals(RemoteControlCapabilities.KEY_SEAT_CONTROL_CAPABILITIES)) { - List<SeatControlCapabilities> sccReference = (List<SeatControlCapabilities>) JsonUtils.readObjectFromJsonObject(reference, key); - JSONArray sccArray = JsonUtils.readJsonArrayFromJsonObject(underTest, key); - int i = 0; - for (SeatControlCapabilities scc : sccReference) { - assertTrue(Validator.validateSeatControlCapabilities(scc, new SeatControlCapabilities(JsonRPCMarshaller.deserializeJSONObject(sccArray.getJSONObject(i++))))); - } - } else if (key.equals(RemoteControlCapabilities.KEY_AUDIO_CONTROL_CAPABILITIES)) { - List<AudioControlCapabilities> accReference = (List<AudioControlCapabilities>) JsonUtils.readObjectFromJsonObject(reference, key); - JSONArray accArray = JsonUtils.readJsonArrayFromJsonObject(underTest, key); - int i = 0; - for (AudioControlCapabilities acc : accReference) { - assertTrue(Validator.validateAudioControlCapabilities(acc, new AudioControlCapabilities(JsonRPCMarshaller.deserializeJSONObject(accArray.getJSONObject(i++))))); - } - } else if (key.equals(RemoteControlCapabilities.KEY_HMI_SETTINGS_CONTROL_CAPABILITIES)) { - JSONObject objectEquals = (JSONObject) JsonUtils.readObjectFromJsonObject(reference, key); - JSONObject testEquals = (JSONObject) JsonUtils.readObjectFromJsonObject(underTest, key); - Hashtable<String, Object> hashReference = JsonRPCMarshaller.deserializeJSONObject(objectEquals); - Hashtable<String, Object> hashTest = JsonRPCMarshaller.deserializeJSONObject(testEquals); - assertTrue(TestValues.TRUE, Validator.validateHMISettingsControlCapabilities(new HMISettingsControlCapabilities(hashReference), new HMISettingsControlCapabilities(hashTest))); - } else if (key.equals(RemoteControlCapabilities.KEY_LIGHT_CONTROL_CAPABILITIES)) { - JSONObject objectEquals = (JSONObject) JsonUtils.readObjectFromJsonObject(reference, key); - JSONObject testEquals = (JSONObject) JsonUtils.readObjectFromJsonObject(underTest, key); - Hashtable<String, Object> hashReference = JsonRPCMarshaller.deserializeJSONObject(objectEquals); - Hashtable<String, Object> hashTest = JsonRPCMarshaller.deserializeJSONObject(testEquals); - assertTrue(TestValues.TRUE, Validator.validateLightControlCapabilities(new LightControlCapabilities(hashReference), new LightControlCapabilities(hashTest))); - } - } - } catch (JSONException e) { - fail(TestValues.JSON_FAIL); - } - } + private RemoteControlCapabilities msg; + + @Override + public void setUp() { + msg = new RemoteControlCapabilities(); + msg.setButtonCapabilities(TestValues.GENERAL_BUTTONCAPABILITIES_LIST); + msg.setRadioControlCapabilities(TestValues.GENERAL_RADIOCONTROLCAPABILITIES_LIST); + msg.setClimateControlCapabilities(TestValues.GENERAL_CLIMATECONTROLCAPABILITIES_LIST); + msg.setSeatControlCapabilities(TestValues.GENERAL_SEATCONTROLCAPABILITIES_LIST); + msg.setAudioControlCapabilities(TestValues.GENERAL_AUDIOCONTROLCAPABILITIES_LIST); + msg.setHmiSettingsControlCapabilities(TestValues.GENERAL_HMISETTINGSCONTROLCAPABILITIES); + msg.setLightControlCapabilities(TestValues.GENERAL_LIGHTCONTROLCAPABILITIES); + } + + /** + * Tests the expected values of the RPC message. + */ + public void testRpcValues() { + // Test Values + List<ButtonCapabilities> buttonCapabilities = msg.getButtonCapabilities(); + List<RadioControlCapabilities> radioControlCapabilities = msg.getRadioControlCapabilities(); + List<ClimateControlCapabilities> climateControlCapabilities = msg.getClimateControlCapabilities(); + List<SeatControlCapabilities> seatControlCapabilities = msg.getSeatControlCapabilities(); + List<AudioControlCapabilities> audioControlCapabilities = msg.getAudioControlCapabilities(); + HMISettingsControlCapabilities hmiSettingsControlCapabilities = msg.getHmiSettingsControlCapabilities(); + LightControlCapabilities lightControlCapabilities = msg.getLightControlCapabilities(); + + // Valid Tests + assertEquals(TestValues.MATCH, TestValues.GENERAL_BUTTONCAPABILITIES_LIST.size(), buttonCapabilities.size()); + assertEquals(TestValues.MATCH, TestValues.GENERAL_RADIOCONTROLCAPABILITIES_LIST.size(), radioControlCapabilities.size()); + assertEquals(TestValues.MATCH, TestValues.GENERAL_CLIMATECONTROLCAPABILITIES_LIST.size(), climateControlCapabilities.size()); + assertEquals(TestValues.MATCH, TestValues.GENERAL_SEATCONTROLCAPABILITIES_LIST.size(), seatControlCapabilities.size()); + + assertTrue(TestValues.TRUE, Validator.validateButtonCapabilities(TestValues.GENERAL_BUTTONCAPABILITIES_LIST, buttonCapabilities)); + assertTrue(TestValues.TRUE, Validator.validateRadioControlCapabilities(TestValues.GENERAL_RADIOCONTROLCAPABILITIES_LIST, radioControlCapabilities)); + assertTrue(TestValues.TRUE, Validator.validateClimateControlCapabilities(TestValues.GENERAL_CLIMATECONTROLCAPABILITIES_LIST, climateControlCapabilities)); + assertTrue(TestValues.TRUE, Validator.validateSeatControlCapabilitiesList(TestValues.GENERAL_SEATCONTROLCAPABILITIES_LIST, seatControlCapabilities)); + assertTrue(TestValues.TRUE, Validator.validateAudioControlCapabilitiesList(TestValues.GENERAL_AUDIOCONTROLCAPABILITIES_LIST, audioControlCapabilities)); + assertTrue(TestValues.TRUE, Validator.validateHMISettingsControlCapabilities(TestValues.GENERAL_HMISETTINGSCONTROLCAPABILITIES, hmiSettingsControlCapabilities)); + assertTrue(TestValues.TRUE, Validator.validateLightControlCapabilities(TestValues.GENERAL_LIGHTCONTROLCAPABILITIES, lightControlCapabilities)); + + // Invalid/Null Tests + RemoteControlCapabilities msg = new RemoteControlCapabilities(); + assertNotNull(TestValues.NOT_NULL, msg); + + assertNull(TestValues.NULL, msg.getButtonCapabilities()); + assertNull(TestValues.NULL, msg.getRadioControlCapabilities()); + assertNull(TestValues.NULL, msg.getClimateControlCapabilities()); + assertNull(TestValues.NULL, msg.getSeatControlCapabilities()); + assertNull(TestValues.NULL, msg.getAudioControlCapabilities()); + assertNull(TestValues.NULL, msg.getHmiSettingsControlCapabilities()); + assertNull(TestValues.NULL, msg.getLightControlCapabilities()); + } + + public void testJson() { + JSONObject reference = new JSONObject(); + + try { + reference.put(RemoteControlCapabilities.KEY_BUTTON_CAPABILITIES, TestValues.JSON_BUTTONCAPABILITIES); + reference.put(RemoteControlCapabilities.KEY_RADIO_CONTROL_CAPABILITIES, TestValues.JSON_RADIOCONTROLCAPABILITIES); + reference.put(RemoteControlCapabilities.KEY_CLIMATE_CONTROL_CAPABILITIES, TestValues.JSON_CLIMATECONTROLCAPABILITIES); + reference.put(RemoteControlCapabilities.KEY_SEAT_CONTROL_CAPABILITIES, TestValues.GENERAL_SEATCONTROLCAPABILITIES_LIST); + reference.put(RemoteControlCapabilities.KEY_AUDIO_CONTROL_CAPABILITIES, TestValues.GENERAL_AUDIOCONTROLCAPABILITIES_LIST); + reference.put(RemoteControlCapabilities.KEY_HMI_SETTINGS_CONTROL_CAPABILITIES, JsonRPCMarshaller.serializeHashtable(TestValues.GENERAL_HMISETTINGSCONTROLCAPABILITIES.getStore())); + reference.put(RemoteControlCapabilities.KEY_LIGHT_CONTROL_CAPABILITIES, JsonRPCMarshaller.serializeHashtable(TestValues.GENERAL_LIGHTCONTROLCAPABILITIES.getStore())); + + 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(RemoteControlCapabilities.KEY_BUTTON_CAPABILITIES)) { + JSONArray referenceArray = JsonUtils.readJsonArrayFromJsonObject(reference, key); + JSONArray underTestArray = JsonUtils.readJsonArrayFromJsonObject(underTest, key); + assertEquals(TestValues.MATCH, referenceArray.length(), underTestArray.length()); + + List<ButtonCapabilities> referenceList = new ArrayList<ButtonCapabilities>(); + List<ButtonCapabilities> testList = new ArrayList<ButtonCapabilities>(); + for (int i = 0; i < referenceArray.length(); i++) { + Hashtable<String, Object> hashReference = JsonRPCMarshaller.deserializeJSONObject(referenceArray.getJSONObject(i)); + referenceList.add(new ButtonCapabilities(hashReference)); + Hashtable<String, Object> hashTest = JsonRPCMarshaller.deserializeJSONObject(underTestArray.getJSONObject(i)); + testList.add(new ButtonCapabilities(hashTest)); + } + assertTrue(TestValues.TRUE, Validator.validateButtonCapabilities(referenceList, testList)); + } else if (key.equals(RemoteControlCapabilities.KEY_RADIO_CONTROL_CAPABILITIES)) { + JSONArray referenceArray = JsonUtils.readJsonArrayFromJsonObject(reference, key); + JSONArray underTestArray = JsonUtils.readJsonArrayFromJsonObject(underTest, key); + assertEquals(TestValues.MATCH, referenceArray.length(), underTestArray.length()); + + List<RadioControlCapabilities> referenceList = new ArrayList<RadioControlCapabilities>(); + List<RadioControlCapabilities> testList = new ArrayList<RadioControlCapabilities>(); + for (int i = 0; i < referenceArray.length(); i++) { + Hashtable<String, Object> hashReference = JsonRPCMarshaller.deserializeJSONObject(referenceArray.getJSONObject(i)); + referenceList.add(new RadioControlCapabilities(hashReference)); + Hashtable<String, Object> hashTest = JsonRPCMarshaller.deserializeJSONObject(underTestArray.getJSONObject(i)); + testList.add(new RadioControlCapabilities(hashTest)); + } + assertTrue(TestValues.TRUE, Validator.validateRadioControlCapabilities(referenceList, testList)); + } else if (key.equals(RemoteControlCapabilities.KEY_CLIMATE_CONTROL_CAPABILITIES)) { + JSONArray referenceArray = JsonUtils.readJsonArrayFromJsonObject(reference, key); + JSONArray underTestArray = JsonUtils.readJsonArrayFromJsonObject(underTest, key); + assertEquals(TestValues.MATCH, referenceArray.length(), underTestArray.length()); + + List<ClimateControlCapabilities> referenceList = new ArrayList<ClimateControlCapabilities>(); + List<ClimateControlCapabilities> testList = new ArrayList<ClimateControlCapabilities>(); + for (int i = 0; i < referenceArray.length(); i++) { + Hashtable<String, Object> hashReference = JsonRPCMarshaller.deserializeJSONObject(referenceArray.getJSONObject(i)); + referenceList.add(new ClimateControlCapabilities(hashReference)); + Hashtable<String, Object> hashTest = JsonRPCMarshaller.deserializeJSONObject(underTestArray.getJSONObject(i)); + testList.add(new ClimateControlCapabilities(hashTest)); + } + assertTrue(TestValues.TRUE, Validator.validateClimateControlCapabilities(referenceList, testList)); + } else if (key.equals(RemoteControlCapabilities.KEY_SEAT_CONTROL_CAPABILITIES)) { + List<SeatControlCapabilities> sccReference = (List<SeatControlCapabilities>) JsonUtils.readObjectFromJsonObject(reference, key); + JSONArray sccArray = JsonUtils.readJsonArrayFromJsonObject(underTest, key); + int i = 0; + for (SeatControlCapabilities scc : sccReference) { + assertTrue(Validator.validateSeatControlCapabilities(scc, new SeatControlCapabilities(JsonRPCMarshaller.deserializeJSONObject(sccArray.getJSONObject(i++))))); + } + } else if (key.equals(RemoteControlCapabilities.KEY_AUDIO_CONTROL_CAPABILITIES)) { + List<AudioControlCapabilities> accReference = (List<AudioControlCapabilities>) JsonUtils.readObjectFromJsonObject(reference, key); + JSONArray accArray = JsonUtils.readJsonArrayFromJsonObject(underTest, key); + int i = 0; + for (AudioControlCapabilities acc : accReference) { + assertTrue(Validator.validateAudioControlCapabilities(acc, new AudioControlCapabilities(JsonRPCMarshaller.deserializeJSONObject(accArray.getJSONObject(i++))))); + } + } else if (key.equals(RemoteControlCapabilities.KEY_HMI_SETTINGS_CONTROL_CAPABILITIES)) { + JSONObject objectEquals = (JSONObject) JsonUtils.readObjectFromJsonObject(reference, key); + JSONObject testEquals = (JSONObject) JsonUtils.readObjectFromJsonObject(underTest, key); + Hashtable<String, Object> hashReference = JsonRPCMarshaller.deserializeJSONObject(objectEquals); + Hashtable<String, Object> hashTest = JsonRPCMarshaller.deserializeJSONObject(testEquals); + assertTrue(TestValues.TRUE, Validator.validateHMISettingsControlCapabilities(new HMISettingsControlCapabilities(hashReference), new HMISettingsControlCapabilities(hashTest))); + } else if (key.equals(RemoteControlCapabilities.KEY_LIGHT_CONTROL_CAPABILITIES)) { + JSONObject objectEquals = (JSONObject) JsonUtils.readObjectFromJsonObject(reference, key); + JSONObject testEquals = (JSONObject) JsonUtils.readObjectFromJsonObject(underTest, key); + Hashtable<String, Object> hashReference = JsonRPCMarshaller.deserializeJSONObject(objectEquals); + Hashtable<String, Object> hashTest = JsonRPCMarshaller.deserializeJSONObject(testEquals); + assertTrue(TestValues.TRUE, Validator.validateLightControlCapabilities(new LightControlCapabilities(hashReference), new LightControlCapabilities(hashTest))); + } + } + } catch (JSONException e) { + fail(TestValues.JSON_FAIL); + } + } }
\ No newline at end of file diff --git a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/ScreenParamsTest.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/ScreenParamsTest.java index eb618abcf..0e69ca513 100644 --- a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/ScreenParamsTest.java +++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/ScreenParamsTest.java @@ -16,75 +16,75 @@ import org.json.JSONObject; import java.util.Iterator; /** - * This is a unit test class for the SmartDeviceLink library project class : + * This is a unit test class for the SmartDeviceLink library project class : * {@link com.smartdevicelink.proxy.rpc.ScreenParams} */ public class ScreenParamsTest extends TestCase { - - private ScreenParams msg; - @Override - public void setUp() { - msg = new ScreenParams(); - - msg.setImageResolution(TestValues.GENERAL_IMAGERESOLUTION); - msg.setTouchEventAvailable(TestValues.GENERAL_TOUCHEVENTCAPABILITIES); - } + private ScreenParams msg; + + @Override + public void setUp() { + msg = new ScreenParams(); + + msg.setImageResolution(TestValues.GENERAL_IMAGERESOLUTION); + msg.setTouchEventAvailable(TestValues.GENERAL_TOUCHEVENTCAPABILITIES); + } /** - * Tests the expected values of the RPC message. - */ - public void testRpcValues () { - // Test Values - ImageResolution imageRes = msg.getImageResolution(); - TouchEventCapabilities touchEvent = msg.getTouchEventAvailable(); - - // Valid Tests - assertTrue(TestValues.TRUE, Validator.validateImageResolution(TestValues.GENERAL_IMAGERESOLUTION, imageRes)); - assertTrue(TestValues.TRUE, Validator.validateTouchEventCapabilities(TestValues.GENERAL_TOUCHEVENTCAPABILITIES, touchEvent)); - - // Invalid/Null Tests - ScreenParams msg = new ScreenParams(); - assertNotNull(TestValues.NOT_NULL, msg); - - assertNull(TestValues.NULL, msg.getImageResolution()); - assertNull(TestValues.NULL, msg.getTouchEventAvailable()); - } - - public void testJson() { - JSONObject reference = new JSONObject(); - - try { - reference.put(ScreenParams.KEY_RESOLUTION, TestValues.JSON_IMAGERESOLUTION); - reference.put(ScreenParams.KEY_TOUCH_EVENT_AVAILABLE, TestValues.JSON_TOUCHEVENTCAPABILITIES); - - 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(ScreenParams.KEY_TOUCH_EVENT_AVAILABLE)) { - JSONObject touchEventObjReference = JsonUtils.readJsonObjectFromJsonObject(reference, key); - JSONObject touchEventObjTest = JsonUtils.readJsonObjectFromJsonObject(underTest, key); - - assertTrue(TestValues.TRUE, Validator.validateTouchEventCapabilities( - new TouchEventCapabilities(JsonRPCMarshaller.deserializeJSONObject(touchEventObjReference)), - new TouchEventCapabilities(JsonRPCMarshaller.deserializeJSONObject(touchEventObjTest)))); - } else if (key.equals(ScreenParams.KEY_RESOLUTION)) { - JSONObject resolutionObjReference = JsonUtils.readJsonObjectFromJsonObject(reference, key); - JSONObject resolutionObjTest = JsonUtils.readJsonObjectFromJsonObject(underTest, key); - - assertTrue(TestValues.TRUE, Validator.validateImageResolution( - new ImageResolution(JsonRPCMarshaller.deserializeJSONObject(resolutionObjReference)), - new ImageResolution(JsonRPCMarshaller.deserializeJSONObject(resolutionObjTest)))); - } else { - assertEquals(TestValues.MATCH, JsonUtils.readObjectFromJsonObject(reference, key), JsonUtils.readObjectFromJsonObject(underTest, key)); - } - } - } catch (JSONException e) { - fail(TestValues.JSON_FAIL); - } - } + * Tests the expected values of the RPC message. + */ + public void testRpcValues() { + // Test Values + ImageResolution imageRes = msg.getImageResolution(); + TouchEventCapabilities touchEvent = msg.getTouchEventAvailable(); + + // Valid Tests + assertTrue(TestValues.TRUE, Validator.validateImageResolution(TestValues.GENERAL_IMAGERESOLUTION, imageRes)); + assertTrue(TestValues.TRUE, Validator.validateTouchEventCapabilities(TestValues.GENERAL_TOUCHEVENTCAPABILITIES, touchEvent)); + + // Invalid/Null Tests + ScreenParams msg = new ScreenParams(); + assertNotNull(TestValues.NOT_NULL, msg); + + assertNull(TestValues.NULL, msg.getImageResolution()); + assertNull(TestValues.NULL, msg.getTouchEventAvailable()); + } + + public void testJson() { + JSONObject reference = new JSONObject(); + + try { + reference.put(ScreenParams.KEY_RESOLUTION, TestValues.JSON_IMAGERESOLUTION); + reference.put(ScreenParams.KEY_TOUCH_EVENT_AVAILABLE, TestValues.JSON_TOUCHEVENTCAPABILITIES); + + 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(ScreenParams.KEY_TOUCH_EVENT_AVAILABLE)) { + JSONObject touchEventObjReference = JsonUtils.readJsonObjectFromJsonObject(reference, key); + JSONObject touchEventObjTest = JsonUtils.readJsonObjectFromJsonObject(underTest, key); + + assertTrue(TestValues.TRUE, Validator.validateTouchEventCapabilities( + new TouchEventCapabilities(JsonRPCMarshaller.deserializeJSONObject(touchEventObjReference)), + new TouchEventCapabilities(JsonRPCMarshaller.deserializeJSONObject(touchEventObjTest)))); + } else if (key.equals(ScreenParams.KEY_RESOLUTION)) { + JSONObject resolutionObjReference = JsonUtils.readJsonObjectFromJsonObject(reference, key); + JSONObject resolutionObjTest = JsonUtils.readJsonObjectFromJsonObject(underTest, key); + + assertTrue(TestValues.TRUE, Validator.validateImageResolution( + new ImageResolution(JsonRPCMarshaller.deserializeJSONObject(resolutionObjReference)), + new ImageResolution(JsonRPCMarshaller.deserializeJSONObject(resolutionObjTest)))); + } else { + assertEquals(TestValues.MATCH, JsonUtils.readObjectFromJsonObject(reference, key), JsonUtils.readObjectFromJsonObject(underTest, key)); + } + } + } catch (JSONException e) { + fail(TestValues.JSON_FAIL); + } + } }
\ No newline at end of file diff --git a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/SdlMsgVersionTest.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/SdlMsgVersionTest.java index 8cadc99bf..0b8eb2842 100644 --- a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/SdlMsgVersionTest.java +++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/SdlMsgVersionTest.java @@ -12,63 +12,63 @@ import org.json.JSONObject; import java.util.Iterator; /** - * This is a unit test class for the SmartDeviceLink library project class : + * This is a unit test class for the SmartDeviceLink library project class : * {@link com.smartdevicelink.proxy.rpc.SdlMsgVersion} */ public class SdlMsgVersionTest extends TestCase { - - private SdlMsgVersion msg; - @Override - public void setUp() { - msg = new SdlMsgVersion(); + private SdlMsgVersion msg; - msg.setMajorVersion(TestValues.GENERAL_INT); - msg.setMinorVersion(TestValues.GENERAL_INT); - msg.setPatchVersion(TestValues.GENERAL_INT); - } + @Override + public void setUp() { + msg = new SdlMsgVersion(); + + msg.setMajorVersion(TestValues.GENERAL_INT); + msg.setMinorVersion(TestValues.GENERAL_INT); + msg.setPatchVersion(TestValues.GENERAL_INT); + } /** - * Tests the expected values of the RPC message. - */ - public void testRpcValues () { - // Test Values - Integer major = msg.getMajorVersion(); - Integer minor = msg.getMinorVersion(); - Integer patch = msg.getPatchVersion(); - - // Valid Tests - assertEquals(TestValues.MATCH, (Integer) TestValues.GENERAL_INT, major); - assertEquals(TestValues.MATCH, (Integer) TestValues.GENERAL_INT, minor); - assertEquals(TestValues.MATCH, (Integer) TestValues.GENERAL_INT, patch); - - // Invalid/Null Tests - SdlMsgVersion msg = new SdlMsgVersion(); - assertNotNull(TestValues.NOT_NULL, msg); - - assertNull(TestValues.NULL, msg.getMajorVersion()); - assertNull(TestValues.NULL, msg.getMinorVersion()); - assertNull(TestValues.NULL, msg.getPatchVersion()); - } - - public void testJson() { - JSONObject reference = new JSONObject(); - - try { - reference.put(SdlMsgVersion.KEY_MAJOR_VERSION, TestValues.GENERAL_INT); - reference.put(SdlMsgVersion.KEY_MINOR_VERSION, TestValues.GENERAL_INT); - reference.put(SdlMsgVersion.KEY_PATCH_VERSION, TestValues.GENERAL_INT); - - JSONObject underTest = msg.serializeJSON(); - assertEquals(TestValues.MATCH, reference.length(), underTest.length()); - - Iterator<?> iterator = reference.keys(); - while (iterator.hasNext()) { - String key = (String) iterator.next(); - assertEquals(TestValues.MATCH, JsonUtils.readObjectFromJsonObject(reference, key), JsonUtils.readObjectFromJsonObject(underTest, key)); - } - } catch (JSONException e) { - fail(TestValues.JSON_FAIL); - } - } + * Tests the expected values of the RPC message. + */ + public void testRpcValues() { + // Test Values + Integer major = msg.getMajorVersion(); + Integer minor = msg.getMinorVersion(); + Integer patch = msg.getPatchVersion(); + + // Valid Tests + assertEquals(TestValues.MATCH, (Integer) TestValues.GENERAL_INT, major); + assertEquals(TestValues.MATCH, (Integer) TestValues.GENERAL_INT, minor); + assertEquals(TestValues.MATCH, (Integer) TestValues.GENERAL_INT, patch); + + // Invalid/Null Tests + SdlMsgVersion msg = new SdlMsgVersion(); + assertNotNull(TestValues.NOT_NULL, msg); + + assertNull(TestValues.NULL, msg.getMajorVersion()); + assertNull(TestValues.NULL, msg.getMinorVersion()); + assertNull(TestValues.NULL, msg.getPatchVersion()); + } + + public void testJson() { + JSONObject reference = new JSONObject(); + + try { + reference.put(SdlMsgVersion.KEY_MAJOR_VERSION, TestValues.GENERAL_INT); + reference.put(SdlMsgVersion.KEY_MINOR_VERSION, TestValues.GENERAL_INT); + reference.put(SdlMsgVersion.KEY_PATCH_VERSION, TestValues.GENERAL_INT); + + JSONObject underTest = msg.serializeJSON(); + assertEquals(TestValues.MATCH, reference.length(), underTest.length()); + + Iterator<?> iterator = reference.keys(); + while (iterator.hasNext()) { + String key = (String) iterator.next(); + assertEquals(TestValues.MATCH, JsonUtils.readObjectFromJsonObject(reference, key), JsonUtils.readObjectFromJsonObject(underTest, key)); + } + } catch (JSONException e) { + fail(TestValues.JSON_FAIL); + } + } }
\ No newline at end of file diff --git a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/SeatControlCapabilitiesTest.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/SeatControlCapabilitiesTest.java index 2831d2416..8e5001035 100644 --- a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/SeatControlCapabilitiesTest.java +++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/SeatControlCapabilitiesTest.java @@ -17,125 +17,125 @@ import java.util.Iterator; */ public class SeatControlCapabilitiesTest extends TestCase { - private SeatControlCapabilities msg; - - @Override - public void setUp() { - msg = new SeatControlCapabilities(); - msg.setModuleName(TestValues.GENERAL_STRING); - msg.setHeatingEnabledAvailable(TestValues.GENERAL_BOOLEAN); - msg.setCoolingEnabledAvailable(TestValues.GENERAL_BOOLEAN); - msg.setHeatingLevelAvailable(TestValues.GENERAL_BOOLEAN); - msg.setCoolingLevelAvailable(TestValues.GENERAL_BOOLEAN); - msg.setHorizontalPositionAvailable(TestValues.GENERAL_BOOLEAN); - msg.setVerticalPositionAvailable(TestValues.GENERAL_BOOLEAN); - msg.setFrontVerticalPositionAvailable(TestValues.GENERAL_BOOLEAN); - msg.setBackVerticalPositionAvailable(TestValues.GENERAL_BOOLEAN); - msg.setBackTiltAngleAvailable(TestValues.GENERAL_BOOLEAN); - msg.setHeadSupportVerticalPositionAvailable(TestValues.GENERAL_BOOLEAN); - msg.setHeadSupportHorizontalPositionAvailable(TestValues.GENERAL_BOOLEAN); - msg.setMassageEnabledAvailable(TestValues.GENERAL_BOOLEAN); - msg.setMassageModeAvailable(TestValues.GENERAL_BOOLEAN); - msg.setMassageCushionFirmnessAvailable(TestValues.GENERAL_BOOLEAN); - msg.setMemoryAvailable(TestValues.GENERAL_BOOLEAN); - } - - /** - * Tests the expected values of the RPC message. - */ - public void testRpcValues() { - // Test Values - String moduleName = msg.getModuleName(); - Boolean heatingEnabledAvailable = msg.getHeatingEnabledAvailable(); - Boolean coolingEnabledAvailable = msg.getCoolingEnabledAvailable(); - Boolean heatingLevelAvailable = msg.getHeatingLevelAvailable(); - Boolean coolingLevelAvailable = msg.getCoolingLevelAvailable(); - Boolean horizontalPositionAvailable = msg.getHorizontalPositionAvailable(); - Boolean verticalPositionAvailable = msg.getVerticalPositionAvailable(); - Boolean frontVerticalPositionAvailable = msg.getFrontVerticalPositionAvailable(); - Boolean backVerticalPositionAvailable = msg.getBackVerticalPositionAvailable(); - Boolean backTiltAngleAvailable = msg.getBackTiltAngleAvailable(); - Boolean headSupportHorizontalPositionAvailable = msg.getHeadSupportHorizontalPositionAvailable(); - Boolean headSupportVerticalPositionAvailable = msg.getHeadSupportVerticalPositionAvailable(); - Boolean massageEnabledAvailable = msg.getMassageEnabledAvailable(); - Boolean massageModeAvailable = msg.getMassageModeAvailable(); - Boolean massageCushionFirmnessAvailable = msg.getMassageCushionFirmnessAvailable(); - - Boolean memoryAvailable = msg.getMemoryAvailable(); - - // Valid Tests - assertEquals(TestValues.MATCH, TestValues.GENERAL_STRING, moduleName); - assertEquals(TestValues.MATCH, (Boolean) TestValues.GENERAL_BOOLEAN, heatingEnabledAvailable); - assertEquals(TestValues.MATCH, (Boolean) TestValues.GENERAL_BOOLEAN, coolingEnabledAvailable); - assertEquals(TestValues.MATCH, (Boolean) TestValues.GENERAL_BOOLEAN, heatingLevelAvailable); - assertEquals(TestValues.MATCH, (Boolean) TestValues.GENERAL_BOOLEAN, coolingLevelAvailable); - assertEquals(TestValues.MATCH, (Boolean) TestValues.GENERAL_BOOLEAN, horizontalPositionAvailable); - assertEquals(TestValues.MATCH, (Boolean) TestValues.GENERAL_BOOLEAN, verticalPositionAvailable); - assertEquals(TestValues.MATCH, (Boolean) TestValues.GENERAL_BOOLEAN, frontVerticalPositionAvailable); - assertEquals(TestValues.MATCH, (Boolean) TestValues.GENERAL_BOOLEAN, backVerticalPositionAvailable); - assertEquals(TestValues.MATCH, (Boolean) TestValues.GENERAL_BOOLEAN, backTiltAngleAvailable); - assertEquals(TestValues.MATCH, (Boolean) TestValues.GENERAL_BOOLEAN, headSupportHorizontalPositionAvailable); - assertEquals(TestValues.MATCH, (Boolean) TestValues.GENERAL_BOOLEAN, headSupportVerticalPositionAvailable); - assertEquals(TestValues.MATCH, (Boolean) TestValues.GENERAL_BOOLEAN, massageEnabledAvailable); - assertEquals(TestValues.MATCH, (Boolean) TestValues.GENERAL_BOOLEAN, massageModeAvailable); - assertEquals(TestValues.MATCH, (Boolean) TestValues.GENERAL_BOOLEAN, massageCushionFirmnessAvailable); - assertEquals(TestValues.MATCH, (Boolean) TestValues.GENERAL_BOOLEAN, memoryAvailable); - - // Invalid/Null Tests - SeatControlCapabilities msg = new SeatControlCapabilities(); - assertNotNull(TestValues.NOT_NULL, msg); - - assertNull(TestValues.NULL, msg.getModuleName()); - assertNull(TestValues.NULL, msg.getHeatingEnabledAvailable()); - assertNull(TestValues.NULL, msg.getCoolingEnabledAvailable()); - assertNull(TestValues.NULL, msg.getHeatingLevelAvailable()); - assertNull(TestValues.NULL, msg.getCoolingLevelAvailable()); - assertNull(TestValues.NULL, msg.getHorizontalPositionAvailable()); - assertNull(TestValues.NULL, msg.getVerticalPositionAvailable()); - assertNull(TestValues.NULL, msg.getFrontVerticalPositionAvailable()); - assertNull(TestValues.NULL, msg.getBackVerticalPositionAvailable()); - assertNull(TestValues.NULL, msg.getBackTiltAngleAvailable()); - assertNull(TestValues.NULL, msg.getHeadSupportHorizontalPositionAvailable()); - assertNull(TestValues.NULL, msg.getHeadSupportVerticalPositionAvailable()); - assertNull(TestValues.NULL, msg.getMassageEnabledAvailable()); - assertNull(TestValues.NULL, msg.getMassageModeAvailable()); - assertNull(TestValues.NULL, msg.getMassageCushionFirmnessAvailable()); - assertNull(TestValues.NULL, msg.getMemoryAvailable()); - } - - public void testJson() { - JSONObject reference = new JSONObject(); - - try { - reference.put(SeatControlCapabilities.KEY_MODULE_NAME, TestValues.GENERAL_STRING); - reference.put(SeatControlCapabilities.KEY_HEATING_ENABLED_AVAILABLE, TestValues.GENERAL_BOOLEAN); - reference.put(SeatControlCapabilities.KEY_COOLING_ENABLED_AVAILABLE, TestValues.GENERAL_BOOLEAN); - reference.put(SeatControlCapabilities.KEY_HEATING_LEVEL_AVAILABLE, TestValues.GENERAL_BOOLEAN); - reference.put(SeatControlCapabilities.KEY_COOLING_LEVEL_AVAILABLE, TestValues.GENERAL_BOOLEAN); - reference.put(SeatControlCapabilities.KEY_HORIZONTAL_POSITION_AVAILABLE, TestValues.GENERAL_BOOLEAN); - reference.put(SeatControlCapabilities.KEY_VERTICAL_POSITION_AVAILABLE, TestValues.GENERAL_BOOLEAN); - reference.put(SeatControlCapabilities.KEY_FRONT_VERTICAL_POSITION_AVAILABLE, TestValues.GENERAL_BOOLEAN); - reference.put(SeatControlCapabilities.KEY_BACK_VERTICAL_POSITION_AVAILABLE, TestValues.GENERAL_BOOLEAN); - reference.put(SeatControlCapabilities.KEY_BACK_TILT_ANGLE_AVAILABLE, TestValues.GENERAL_BOOLEAN); - reference.put(SeatControlCapabilities.KEY_HEAD_SUPPORT_HORIZONTAL_POSITION_AVAILABLE, TestValues.GENERAL_BOOLEAN); - reference.put(SeatControlCapabilities.KEY_HEAD_SUPPORT_VERTICAL_POSITION_AVAILABLE, TestValues.GENERAL_BOOLEAN); - reference.put(SeatControlCapabilities.KEY_MASSAGE_ENABLED_AVAILABLE, TestValues.GENERAL_BOOLEAN); - - reference.put(SeatControlCapabilities.KEY_MASSAGE_MODE_AVAILABLE, TestValues.GENERAL_BOOLEAN); - reference.put(SeatControlCapabilities.KEY_MASSAGE_CUSHION_FIRMNESS_AVAILABLE, TestValues.GENERAL_BOOLEAN); - - reference.put(SeatControlCapabilities.KEY_MEMORY_AVAILABLE, TestValues.GENERAL_BOOLEAN); - - JSONObject underTest = msg.serializeJSON(); - assertEquals(TestValues.MATCH, reference.length(), underTest.length()); - - Iterator<?> iterator = reference.keys(); - while (iterator.hasNext()) { - String key = (String) iterator.next(); - assertEquals(TestValues.MATCH, JsonUtils.readObjectFromJsonObject(reference, key), JsonUtils.readObjectFromJsonObject(underTest, key)); - } - } catch (JSONException e) { - fail(TestValues.JSON_FAIL); - } - } + private SeatControlCapabilities msg; + + @Override + public void setUp() { + msg = new SeatControlCapabilities(); + msg.setModuleName(TestValues.GENERAL_STRING); + msg.setHeatingEnabledAvailable(TestValues.GENERAL_BOOLEAN); + msg.setCoolingEnabledAvailable(TestValues.GENERAL_BOOLEAN); + msg.setHeatingLevelAvailable(TestValues.GENERAL_BOOLEAN); + msg.setCoolingLevelAvailable(TestValues.GENERAL_BOOLEAN); + msg.setHorizontalPositionAvailable(TestValues.GENERAL_BOOLEAN); + msg.setVerticalPositionAvailable(TestValues.GENERAL_BOOLEAN); + msg.setFrontVerticalPositionAvailable(TestValues.GENERAL_BOOLEAN); + msg.setBackVerticalPositionAvailable(TestValues.GENERAL_BOOLEAN); + msg.setBackTiltAngleAvailable(TestValues.GENERAL_BOOLEAN); + msg.setHeadSupportVerticalPositionAvailable(TestValues.GENERAL_BOOLEAN); + msg.setHeadSupportHorizontalPositionAvailable(TestValues.GENERAL_BOOLEAN); + msg.setMassageEnabledAvailable(TestValues.GENERAL_BOOLEAN); + msg.setMassageModeAvailable(TestValues.GENERAL_BOOLEAN); + msg.setMassageCushionFirmnessAvailable(TestValues.GENERAL_BOOLEAN); + msg.setMemoryAvailable(TestValues.GENERAL_BOOLEAN); + } + + /** + * Tests the expected values of the RPC message. + */ + public void testRpcValues() { + // Test Values + String moduleName = msg.getModuleName(); + Boolean heatingEnabledAvailable = msg.getHeatingEnabledAvailable(); + Boolean coolingEnabledAvailable = msg.getCoolingEnabledAvailable(); + Boolean heatingLevelAvailable = msg.getHeatingLevelAvailable(); + Boolean coolingLevelAvailable = msg.getCoolingLevelAvailable(); + Boolean horizontalPositionAvailable = msg.getHorizontalPositionAvailable(); + Boolean verticalPositionAvailable = msg.getVerticalPositionAvailable(); + Boolean frontVerticalPositionAvailable = msg.getFrontVerticalPositionAvailable(); + Boolean backVerticalPositionAvailable = msg.getBackVerticalPositionAvailable(); + Boolean backTiltAngleAvailable = msg.getBackTiltAngleAvailable(); + Boolean headSupportHorizontalPositionAvailable = msg.getHeadSupportHorizontalPositionAvailable(); + Boolean headSupportVerticalPositionAvailable = msg.getHeadSupportVerticalPositionAvailable(); + Boolean massageEnabledAvailable = msg.getMassageEnabledAvailable(); + Boolean massageModeAvailable = msg.getMassageModeAvailable(); + Boolean massageCushionFirmnessAvailable = msg.getMassageCushionFirmnessAvailable(); + + Boolean memoryAvailable = msg.getMemoryAvailable(); + + // Valid Tests + assertEquals(TestValues.MATCH, TestValues.GENERAL_STRING, moduleName); + assertEquals(TestValues.MATCH, (Boolean) TestValues.GENERAL_BOOLEAN, heatingEnabledAvailable); + assertEquals(TestValues.MATCH, (Boolean) TestValues.GENERAL_BOOLEAN, coolingEnabledAvailable); + assertEquals(TestValues.MATCH, (Boolean) TestValues.GENERAL_BOOLEAN, heatingLevelAvailable); + assertEquals(TestValues.MATCH, (Boolean) TestValues.GENERAL_BOOLEAN, coolingLevelAvailable); + assertEquals(TestValues.MATCH, (Boolean) TestValues.GENERAL_BOOLEAN, horizontalPositionAvailable); + assertEquals(TestValues.MATCH, (Boolean) TestValues.GENERAL_BOOLEAN, verticalPositionAvailable); + assertEquals(TestValues.MATCH, (Boolean) TestValues.GENERAL_BOOLEAN, frontVerticalPositionAvailable); + assertEquals(TestValues.MATCH, (Boolean) TestValues.GENERAL_BOOLEAN, backVerticalPositionAvailable); + assertEquals(TestValues.MATCH, (Boolean) TestValues.GENERAL_BOOLEAN, backTiltAngleAvailable); + assertEquals(TestValues.MATCH, (Boolean) TestValues.GENERAL_BOOLEAN, headSupportHorizontalPositionAvailable); + assertEquals(TestValues.MATCH, (Boolean) TestValues.GENERAL_BOOLEAN, headSupportVerticalPositionAvailable); + assertEquals(TestValues.MATCH, (Boolean) TestValues.GENERAL_BOOLEAN, massageEnabledAvailable); + assertEquals(TestValues.MATCH, (Boolean) TestValues.GENERAL_BOOLEAN, massageModeAvailable); + assertEquals(TestValues.MATCH, (Boolean) TestValues.GENERAL_BOOLEAN, massageCushionFirmnessAvailable); + assertEquals(TestValues.MATCH, (Boolean) TestValues.GENERAL_BOOLEAN, memoryAvailable); + + // Invalid/Null Tests + SeatControlCapabilities msg = new SeatControlCapabilities(); + assertNotNull(TestValues.NOT_NULL, msg); + + assertNull(TestValues.NULL, msg.getModuleName()); + assertNull(TestValues.NULL, msg.getHeatingEnabledAvailable()); + assertNull(TestValues.NULL, msg.getCoolingEnabledAvailable()); + assertNull(TestValues.NULL, msg.getHeatingLevelAvailable()); + assertNull(TestValues.NULL, msg.getCoolingLevelAvailable()); + assertNull(TestValues.NULL, msg.getHorizontalPositionAvailable()); + assertNull(TestValues.NULL, msg.getVerticalPositionAvailable()); + assertNull(TestValues.NULL, msg.getFrontVerticalPositionAvailable()); + assertNull(TestValues.NULL, msg.getBackVerticalPositionAvailable()); + assertNull(TestValues.NULL, msg.getBackTiltAngleAvailable()); + assertNull(TestValues.NULL, msg.getHeadSupportHorizontalPositionAvailable()); + assertNull(TestValues.NULL, msg.getHeadSupportVerticalPositionAvailable()); + assertNull(TestValues.NULL, msg.getMassageEnabledAvailable()); + assertNull(TestValues.NULL, msg.getMassageModeAvailable()); + assertNull(TestValues.NULL, msg.getMassageCushionFirmnessAvailable()); + assertNull(TestValues.NULL, msg.getMemoryAvailable()); + } + + public void testJson() { + JSONObject reference = new JSONObject(); + + try { + reference.put(SeatControlCapabilities.KEY_MODULE_NAME, TestValues.GENERAL_STRING); + reference.put(SeatControlCapabilities.KEY_HEATING_ENABLED_AVAILABLE, TestValues.GENERAL_BOOLEAN); + reference.put(SeatControlCapabilities.KEY_COOLING_ENABLED_AVAILABLE, TestValues.GENERAL_BOOLEAN); + reference.put(SeatControlCapabilities.KEY_HEATING_LEVEL_AVAILABLE, TestValues.GENERAL_BOOLEAN); + reference.put(SeatControlCapabilities.KEY_COOLING_LEVEL_AVAILABLE, TestValues.GENERAL_BOOLEAN); + reference.put(SeatControlCapabilities.KEY_HORIZONTAL_POSITION_AVAILABLE, TestValues.GENERAL_BOOLEAN); + reference.put(SeatControlCapabilities.KEY_VERTICAL_POSITION_AVAILABLE, TestValues.GENERAL_BOOLEAN); + reference.put(SeatControlCapabilities.KEY_FRONT_VERTICAL_POSITION_AVAILABLE, TestValues.GENERAL_BOOLEAN); + reference.put(SeatControlCapabilities.KEY_BACK_VERTICAL_POSITION_AVAILABLE, TestValues.GENERAL_BOOLEAN); + reference.put(SeatControlCapabilities.KEY_BACK_TILT_ANGLE_AVAILABLE, TestValues.GENERAL_BOOLEAN); + reference.put(SeatControlCapabilities.KEY_HEAD_SUPPORT_HORIZONTAL_POSITION_AVAILABLE, TestValues.GENERAL_BOOLEAN); + reference.put(SeatControlCapabilities.KEY_HEAD_SUPPORT_VERTICAL_POSITION_AVAILABLE, TestValues.GENERAL_BOOLEAN); + reference.put(SeatControlCapabilities.KEY_MASSAGE_ENABLED_AVAILABLE, TestValues.GENERAL_BOOLEAN); + + reference.put(SeatControlCapabilities.KEY_MASSAGE_MODE_AVAILABLE, TestValues.GENERAL_BOOLEAN); + reference.put(SeatControlCapabilities.KEY_MASSAGE_CUSHION_FIRMNESS_AVAILABLE, TestValues.GENERAL_BOOLEAN); + + reference.put(SeatControlCapabilities.KEY_MEMORY_AVAILABLE, TestValues.GENERAL_BOOLEAN); + + JSONObject underTest = msg.serializeJSON(); + assertEquals(TestValues.MATCH, reference.length(), underTest.length()); + + Iterator<?> iterator = reference.keys(); + while (iterator.hasNext()) { + String key = (String) iterator.next(); + assertEquals(TestValues.MATCH, JsonUtils.readObjectFromJsonObject(reference, key), JsonUtils.readObjectFromJsonObject(underTest, key)); + } + } catch (JSONException e) { + fail(TestValues.JSON_FAIL); + } + } }
\ No newline at end of file diff --git a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/SeatControlDataTest.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/SeatControlDataTest.java index b275f784f..b8dfe214d 100644 --- a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/SeatControlDataTest.java +++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/SeatControlDataTest.java @@ -26,148 +26,148 @@ import java.util.List; */ public class SeatControlDataTest extends TestCase { - private SeatControlData msg; - - @Override - public void setUp() { - msg = new SeatControlData(); - msg.setId(TestValues.GENERAL_SUPPORTEDSEAT); - msg.setHeatingEnabled(TestValues.GENERAL_BOOLEAN); - msg.setCoolingEnabled(TestValues.GENERAL_BOOLEAN); - msg.setHeatingLevel(TestValues.GENERAL_INT); - msg.setCoolingLevel(TestValues.GENERAL_INT); - msg.setHorizontalPosition(TestValues.GENERAL_INT); - msg.setVerticalPosition(TestValues.GENERAL_INT); - msg.setFrontVerticalPosition(TestValues.GENERAL_INT); - msg.setBackVerticalPosition(TestValues.GENERAL_INT); - msg.setBackTiltAngle(TestValues.GENERAL_INT); - msg.setHeadSupportVerticalPosition(TestValues.GENERAL_INT); - msg.setHeadSupportHorizontalPosition(TestValues.GENERAL_INT); - msg.setMassageEnabled(TestValues.GENERAL_BOOLEAN); - msg.setMassageMode(TestValues.GENERAL_MASSAGEMODEDATA_LIST); - msg.setMassageCushionFirmness(TestValues.GENERAL_MASSAGECUSHIONFIRMNESS_LIST); - msg.setMemory(TestValues.GENERAL_SEATMEMORYACTION); - } - - /** - * Tests the expected values of the RPC message. - */ - public void testRpcValues() { - // Test Values - SupportedSeat id = msg.getId(); - Boolean heatingEnabled = msg.getHeatingEnabled(); - Boolean coolingEnabled = msg.getCoolingEnabled(); - Integer heatingLevel = msg.getHeatingLevel(); - Integer coolingLevel = msg.getCoolingLevel(); - Integer horizontalPosition = msg.getHorizontalPosition(); - Integer verticalPosition = msg.getVerticalPosition(); - Integer frontVerticalPosition = msg.getFrontVerticalPosition(); - Integer backVerticalPosition = msg.getBackVerticalPosition(); - Integer backTiltAngle = msg.getBackTiltAngle(); - Integer headSupportHorizontalPosition = msg.getHeadSupportHorizontalPosition(); - Integer headSupportVerticalPosition = msg.getHeadSupportVerticalPosition(); - Boolean massageEnabled = msg.getMassageEnabled(); - - List<MassageModeData> massageMode = msg.getMassageMode(); - List<MassageCushionFirmness> massageCushionFirmness = msg.getMassageCushionFirmness(); - SeatMemoryAction memory = msg.getMemory(); - - // Valid Tests - assertEquals(TestValues.MATCH, TestValues.GENERAL_SUPPORTEDSEAT, id); - assertEquals(TestValues.MATCH, (Boolean) TestValues.GENERAL_BOOLEAN, heatingEnabled); - assertEquals(TestValues.MATCH, (Boolean) TestValues.GENERAL_BOOLEAN, coolingEnabled); - assertEquals(TestValues.MATCH, (Integer) TestValues.GENERAL_INT, heatingLevel); - assertEquals(TestValues.MATCH, (Integer) TestValues.GENERAL_INT, coolingLevel); - assertEquals(TestValues.MATCH, (Integer) TestValues.GENERAL_INT, horizontalPosition); - assertEquals(TestValues.MATCH, (Integer) TestValues.GENERAL_INT, verticalPosition); - assertEquals(TestValues.MATCH, (Integer) TestValues.GENERAL_INT, frontVerticalPosition); - assertEquals(TestValues.MATCH, (Integer) TestValues.GENERAL_INT, backVerticalPosition); - assertEquals(TestValues.MATCH, (Integer) TestValues.GENERAL_INT, backTiltAngle); - assertEquals(TestValues.MATCH, (Integer) TestValues.GENERAL_INT, headSupportHorizontalPosition); - assertEquals(TestValues.MATCH, (Integer) TestValues.GENERAL_INT, headSupportVerticalPosition); - assertEquals(TestValues.MATCH, (Boolean) TestValues.GENERAL_BOOLEAN, massageEnabled); - - assertTrue(TestValues.TRUE, Validator.validateMassageModeDataList(TestValues.GENERAL_MASSAGEMODEDATA_LIST, massageMode)); - assertTrue(TestValues.TRUE, Validator.validateMassageCushionFirmnessList(TestValues.GENERAL_MASSAGECUSHIONFIRMNESS_LIST, massageCushionFirmness)); - - assertTrue(TestValues.TRUE, Validator.validateSeatMemoryAction(TestValues.GENERAL_SEATMEMORYACTION, memory)); - - // Invalid/Null Tests - SeatControlData msg = new SeatControlData(); - assertNotNull(TestValues.NOT_NULL, msg); - - assertNull(TestValues.NULL, msg.getId()); - assertNull(TestValues.NULL, msg.getHeatingEnabled()); - assertNull(TestValues.NULL, msg.getCoolingEnabled()); - assertNull(TestValues.NULL, msg.getHeatingLevel()); - assertNull(TestValues.NULL, msg.getCoolingLevel()); - assertNull(TestValues.NULL, msg.getHorizontalPosition()); - assertNull(TestValues.NULL, msg.getVerticalPosition()); - assertNull(TestValues.NULL, msg.getFrontVerticalPosition()); - assertNull(TestValues.NULL, msg.getBackVerticalPosition()); - assertNull(TestValues.NULL, msg.getBackTiltAngle()); - assertNull(TestValues.NULL, msg.getHeadSupportHorizontalPosition()); - assertNull(TestValues.NULL, msg.getHeadSupportVerticalPosition()); - assertNull(TestValues.NULL, msg.getMassageEnabled()); - assertNull(TestValues.NULL, msg.getMassageMode()); - assertNull(TestValues.NULL, msg.getMassageCushionFirmness()); - assertNull(TestValues.NULL, msg.getMemory()); - } - - public void testJson() { - JSONObject reference = new JSONObject(); - - try { - reference.put(SeatControlData.KEY_ID, TestValues.GENERAL_SUPPORTEDSEAT); - reference.put(SeatControlData.KEY_HEATING_ENABLED, TestValues.GENERAL_BOOLEAN); - reference.put(SeatControlData.KEY_COOLING_ENABLED, TestValues.GENERAL_BOOLEAN); - reference.put(SeatControlData.KEY_HEATING_LEVEL, TestValues.GENERAL_INT); - reference.put(SeatControlData.KEY_COOLING_LEVEL, TestValues.GENERAL_INT); - reference.put(SeatControlData.KEY_HORIZONTAL_POSITION, TestValues.GENERAL_INT); - reference.put(SeatControlData.KEY_VERTICAL_POSITION, TestValues.GENERAL_INT); - reference.put(SeatControlData.KEY_FRONT_VERTICAL_POSITION, TestValues.GENERAL_INT); - reference.put(SeatControlData.KEY_BACK_VERTICAL_POSITION, TestValues.GENERAL_INT); - reference.put(SeatControlData.KEY_BACK_TILT_ANGLE, TestValues.GENERAL_INT); - reference.put(SeatControlData.KEY_HEAD_SUPPORT_HORIZONTAL_POSITION, TestValues.GENERAL_INT); - reference.put(SeatControlData.KEY_HEAD_SUPPORT_VERTICAL_POSITION, TestValues.GENERAL_INT); - reference.put(SeatControlData.KEY_MASSAGE_ENABLED, TestValues.GENERAL_BOOLEAN); - - reference.put(SeatControlData.KEY_MASSAGE_MODE, TestValues.GENERAL_MASSAGEMODEDATA_LIST); - reference.put(SeatControlData.KEY_MASSAGE_CUSHION_FIRMNESS, TestValues.GENERAL_MASSAGECUSHIONFIRMNESS_LIST); - - reference.put(SeatControlData.KEY_MEMORY, TestValues.GENERAL_SEATMEMORYACTION); - - 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(SeatControlData.KEY_MASSAGE_MODE)) { - List<MassageModeData> mmdReference = (List<MassageModeData>) JsonUtils.readObjectFromJsonObject(reference, key); - JSONArray mmdArray = JsonUtils.readJsonArrayFromJsonObject(underTest, key); - int i = 0; - for (MassageModeData mmd : mmdReference) { - assertTrue(Validator.validateMassageModeData(mmd, new MassageModeData(JsonRPCMarshaller.deserializeJSONObject(mmdArray.getJSONObject(i++))))); - } - } else if (key.equals(SeatControlData.KEY_MASSAGE_CUSHION_FIRMNESS)) { - List<MassageCushionFirmness> mcfReference = (List<MassageCushionFirmness>) JsonUtils.readObjectFromJsonObject(reference, key); - JSONArray mcfArray = JsonUtils.readJsonArrayFromJsonObject(underTest, key); - int i = 0; - for (MassageCushionFirmness mcf : mcfReference) { - assertTrue(Validator.validateMassageCushionFirmness(mcf, new MassageCushionFirmness(JsonRPCMarshaller.deserializeJSONObject(mcfArray.getJSONObject(i++))))); - } - } else if (key.equals(SeatControlData.KEY_MEMORY)) { - SeatMemoryAction mReference = (SeatMemoryAction) JsonUtils.readObjectFromJsonObject(reference, key); - Hashtable<String, Object> hashTest = JsonRPCMarshaller.deserializeJSONObject(JsonUtils.readJsonObjectFromJsonObject(underTest, key)); - assertTrue(Validator.validateSeatMemoryAction(mReference, new SeatMemoryAction(hashTest))); - } else { - assertEquals(TestValues.MATCH, JsonUtils.readObjectFromJsonObject(reference, key), JsonUtils.readObjectFromJsonObject(underTest, key)); - } - } - } catch (JSONException e) { - fail(TestValues.JSON_FAIL); - } - } + private SeatControlData msg; + + @Override + public void setUp() { + msg = new SeatControlData(); + msg.setId(TestValues.GENERAL_SUPPORTEDSEAT); + msg.setHeatingEnabled(TestValues.GENERAL_BOOLEAN); + msg.setCoolingEnabled(TestValues.GENERAL_BOOLEAN); + msg.setHeatingLevel(TestValues.GENERAL_INT); + msg.setCoolingLevel(TestValues.GENERAL_INT); + msg.setHorizontalPosition(TestValues.GENERAL_INT); + msg.setVerticalPosition(TestValues.GENERAL_INT); + msg.setFrontVerticalPosition(TestValues.GENERAL_INT); + msg.setBackVerticalPosition(TestValues.GENERAL_INT); + msg.setBackTiltAngle(TestValues.GENERAL_INT); + msg.setHeadSupportVerticalPosition(TestValues.GENERAL_INT); + msg.setHeadSupportHorizontalPosition(TestValues.GENERAL_INT); + msg.setMassageEnabled(TestValues.GENERAL_BOOLEAN); + msg.setMassageMode(TestValues.GENERAL_MASSAGEMODEDATA_LIST); + msg.setMassageCushionFirmness(TestValues.GENERAL_MASSAGECUSHIONFIRMNESS_LIST); + msg.setMemory(TestValues.GENERAL_SEATMEMORYACTION); + } + + /** + * Tests the expected values of the RPC message. + */ + public void testRpcValues() { + // Test Values + SupportedSeat id = msg.getId(); + Boolean heatingEnabled = msg.getHeatingEnabled(); + Boolean coolingEnabled = msg.getCoolingEnabled(); + Integer heatingLevel = msg.getHeatingLevel(); + Integer coolingLevel = msg.getCoolingLevel(); + Integer horizontalPosition = msg.getHorizontalPosition(); + Integer verticalPosition = msg.getVerticalPosition(); + Integer frontVerticalPosition = msg.getFrontVerticalPosition(); + Integer backVerticalPosition = msg.getBackVerticalPosition(); + Integer backTiltAngle = msg.getBackTiltAngle(); + Integer headSupportHorizontalPosition = msg.getHeadSupportHorizontalPosition(); + Integer headSupportVerticalPosition = msg.getHeadSupportVerticalPosition(); + Boolean massageEnabled = msg.getMassageEnabled(); + + List<MassageModeData> massageMode = msg.getMassageMode(); + List<MassageCushionFirmness> massageCushionFirmness = msg.getMassageCushionFirmness(); + SeatMemoryAction memory = msg.getMemory(); + + // Valid Tests + assertEquals(TestValues.MATCH, TestValues.GENERAL_SUPPORTEDSEAT, id); + assertEquals(TestValues.MATCH, (Boolean) TestValues.GENERAL_BOOLEAN, heatingEnabled); + assertEquals(TestValues.MATCH, (Boolean) TestValues.GENERAL_BOOLEAN, coolingEnabled); + assertEquals(TestValues.MATCH, (Integer) TestValues.GENERAL_INT, heatingLevel); + assertEquals(TestValues.MATCH, (Integer) TestValues.GENERAL_INT, coolingLevel); + assertEquals(TestValues.MATCH, (Integer) TestValues.GENERAL_INT, horizontalPosition); + assertEquals(TestValues.MATCH, (Integer) TestValues.GENERAL_INT, verticalPosition); + assertEquals(TestValues.MATCH, (Integer) TestValues.GENERAL_INT, frontVerticalPosition); + assertEquals(TestValues.MATCH, (Integer) TestValues.GENERAL_INT, backVerticalPosition); + assertEquals(TestValues.MATCH, (Integer) TestValues.GENERAL_INT, backTiltAngle); + assertEquals(TestValues.MATCH, (Integer) TestValues.GENERAL_INT, headSupportHorizontalPosition); + assertEquals(TestValues.MATCH, (Integer) TestValues.GENERAL_INT, headSupportVerticalPosition); + assertEquals(TestValues.MATCH, (Boolean) TestValues.GENERAL_BOOLEAN, massageEnabled); + + assertTrue(TestValues.TRUE, Validator.validateMassageModeDataList(TestValues.GENERAL_MASSAGEMODEDATA_LIST, massageMode)); + assertTrue(TestValues.TRUE, Validator.validateMassageCushionFirmnessList(TestValues.GENERAL_MASSAGECUSHIONFIRMNESS_LIST, massageCushionFirmness)); + + assertTrue(TestValues.TRUE, Validator.validateSeatMemoryAction(TestValues.GENERAL_SEATMEMORYACTION, memory)); + + // Invalid/Null Tests + SeatControlData msg = new SeatControlData(); + assertNotNull(TestValues.NOT_NULL, msg); + + assertNull(TestValues.NULL, msg.getId()); + assertNull(TestValues.NULL, msg.getHeatingEnabled()); + assertNull(TestValues.NULL, msg.getCoolingEnabled()); + assertNull(TestValues.NULL, msg.getHeatingLevel()); + assertNull(TestValues.NULL, msg.getCoolingLevel()); + assertNull(TestValues.NULL, msg.getHorizontalPosition()); + assertNull(TestValues.NULL, msg.getVerticalPosition()); + assertNull(TestValues.NULL, msg.getFrontVerticalPosition()); + assertNull(TestValues.NULL, msg.getBackVerticalPosition()); + assertNull(TestValues.NULL, msg.getBackTiltAngle()); + assertNull(TestValues.NULL, msg.getHeadSupportHorizontalPosition()); + assertNull(TestValues.NULL, msg.getHeadSupportVerticalPosition()); + assertNull(TestValues.NULL, msg.getMassageEnabled()); + assertNull(TestValues.NULL, msg.getMassageMode()); + assertNull(TestValues.NULL, msg.getMassageCushionFirmness()); + assertNull(TestValues.NULL, msg.getMemory()); + } + + public void testJson() { + JSONObject reference = new JSONObject(); + + try { + reference.put(SeatControlData.KEY_ID, TestValues.GENERAL_SUPPORTEDSEAT); + reference.put(SeatControlData.KEY_HEATING_ENABLED, TestValues.GENERAL_BOOLEAN); + reference.put(SeatControlData.KEY_COOLING_ENABLED, TestValues.GENERAL_BOOLEAN); + reference.put(SeatControlData.KEY_HEATING_LEVEL, TestValues.GENERAL_INT); + reference.put(SeatControlData.KEY_COOLING_LEVEL, TestValues.GENERAL_INT); + reference.put(SeatControlData.KEY_HORIZONTAL_POSITION, TestValues.GENERAL_INT); + reference.put(SeatControlData.KEY_VERTICAL_POSITION, TestValues.GENERAL_INT); + reference.put(SeatControlData.KEY_FRONT_VERTICAL_POSITION, TestValues.GENERAL_INT); + reference.put(SeatControlData.KEY_BACK_VERTICAL_POSITION, TestValues.GENERAL_INT); + reference.put(SeatControlData.KEY_BACK_TILT_ANGLE, TestValues.GENERAL_INT); + reference.put(SeatControlData.KEY_HEAD_SUPPORT_HORIZONTAL_POSITION, TestValues.GENERAL_INT); + reference.put(SeatControlData.KEY_HEAD_SUPPORT_VERTICAL_POSITION, TestValues.GENERAL_INT); + reference.put(SeatControlData.KEY_MASSAGE_ENABLED, TestValues.GENERAL_BOOLEAN); + + reference.put(SeatControlData.KEY_MASSAGE_MODE, TestValues.GENERAL_MASSAGEMODEDATA_LIST); + reference.put(SeatControlData.KEY_MASSAGE_CUSHION_FIRMNESS, TestValues.GENERAL_MASSAGECUSHIONFIRMNESS_LIST); + + reference.put(SeatControlData.KEY_MEMORY, TestValues.GENERAL_SEATMEMORYACTION); + + 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(SeatControlData.KEY_MASSAGE_MODE)) { + List<MassageModeData> mmdReference = (List<MassageModeData>) JsonUtils.readObjectFromJsonObject(reference, key); + JSONArray mmdArray = JsonUtils.readJsonArrayFromJsonObject(underTest, key); + int i = 0; + for (MassageModeData mmd : mmdReference) { + assertTrue(Validator.validateMassageModeData(mmd, new MassageModeData(JsonRPCMarshaller.deserializeJSONObject(mmdArray.getJSONObject(i++))))); + } + } else if (key.equals(SeatControlData.KEY_MASSAGE_CUSHION_FIRMNESS)) { + List<MassageCushionFirmness> mcfReference = (List<MassageCushionFirmness>) JsonUtils.readObjectFromJsonObject(reference, key); + JSONArray mcfArray = JsonUtils.readJsonArrayFromJsonObject(underTest, key); + int i = 0; + for (MassageCushionFirmness mcf : mcfReference) { + assertTrue(Validator.validateMassageCushionFirmness(mcf, new MassageCushionFirmness(JsonRPCMarshaller.deserializeJSONObject(mcfArray.getJSONObject(i++))))); + } + } else if (key.equals(SeatControlData.KEY_MEMORY)) { + SeatMemoryAction mReference = (SeatMemoryAction) JsonUtils.readObjectFromJsonObject(reference, key); + Hashtable<String, Object> hashTest = JsonRPCMarshaller.deserializeJSONObject(JsonUtils.readJsonObjectFromJsonObject(underTest, key)); + assertTrue(Validator.validateSeatMemoryAction(mReference, new SeatMemoryAction(hashTest))); + } else { + assertEquals(TestValues.MATCH, JsonUtils.readObjectFromJsonObject(reference, key), JsonUtils.readObjectFromJsonObject(underTest, key)); + } + } + } catch (JSONException e) { + fail(TestValues.JSON_FAIL); + } + } }
\ No newline at end of file diff --git a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/SeatLocationCapabilityTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/SeatLocationCapabilityTests.java index 1666c89fb..23e15aee1 100644 --- a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/SeatLocationCapabilityTests.java +++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/SeatLocationCapabilityTests.java @@ -20,80 +20,80 @@ import java.util.List; public class SeatLocationCapabilityTests extends TestCase { - private SeatLocationCapability msg; + private SeatLocationCapability msg; - @Override - public void setUp() { - msg = new SeatLocationCapability(); - msg.setCols(TestValues.GENERAL_INT); - msg.setRows(TestValues.GENERAL_INT); - msg.setLevels(TestValues.GENERAL_INT); - msg.setSeats(TestValues.GENERAL_SEAT_LIST); - } + @Override + public void setUp() { + msg = new SeatLocationCapability(); + msg.setCols(TestValues.GENERAL_INT); + msg.setRows(TestValues.GENERAL_INT); + msg.setLevels(TestValues.GENERAL_INT); + msg.setSeats(TestValues.GENERAL_SEAT_LIST); + } - public void testRpcValues() { - int row = msg.getRows(); - int col = msg.getCols(); - int level = msg.getLevels(); - List<SeatLocation> seats = msg.getSeats(); + public void testRpcValues() { + int row = msg.getRows(); + int col = msg.getCols(); + int level = msg.getLevels(); + List<SeatLocation> seats = msg.getSeats(); - //valid tests - assertEquals(TestValues.MATCH, row, TestValues.GENERAL_INT); - assertEquals(TestValues.MATCH, col, TestValues.GENERAL_INT); - assertEquals(TestValues.MATCH, level, TestValues.GENERAL_INT); - assertEquals(TestValues.MATCH, seats.size(), TestValues.GENERAL_SEAT_LIST.size()); - for (int i = 0; i < TestValues.GENERAL_SEAT_LIST.size(); i++) { - assertTrue(TestValues.TRUE, Validator.validateGrid(TestValues.GENERAL_SEAT_LIST.get(i).getGrid(), seats.get(i).getGrid())); - } + //valid tests + assertEquals(TestValues.MATCH, row, TestValues.GENERAL_INT); + assertEquals(TestValues.MATCH, col, TestValues.GENERAL_INT); + assertEquals(TestValues.MATCH, level, TestValues.GENERAL_INT); + assertEquals(TestValues.MATCH, seats.size(), TestValues.GENERAL_SEAT_LIST.size()); + for (int i = 0; i < TestValues.GENERAL_SEAT_LIST.size(); i++) { + assertTrue(TestValues.TRUE, Validator.validateGrid(TestValues.GENERAL_SEAT_LIST.get(i).getGrid(), seats.get(i).getGrid())); + } - //null tests - SeatLocationCapability msg = new SeatLocationCapability(); - assertNull(TestValues.NULL, msg.getCols()); - assertNull(TestValues.NULL, msg.getRows()); - assertNull(TestValues.NULL, msg.getLevels()); - assertNull(TestValues.NULL, msg.getSeats()); - } + //null tests + SeatLocationCapability msg = new SeatLocationCapability(); + assertNull(TestValues.NULL, msg.getCols()); + assertNull(TestValues.NULL, msg.getRows()); + assertNull(TestValues.NULL, msg.getLevels()); + assertNull(TestValues.NULL, msg.getSeats()); + } - public void testJson() { - JSONObject original = new JSONObject(); - try { - original.put(SeatLocationCapability.KEY_COLS, TestValues.GENERAL_INT); - original.put(SeatLocationCapability.KEY_ROWS, TestValues.GENERAL_INT); - original.put(SeatLocationCapability.KEY_LEVELS, TestValues.GENERAL_INT); - original.put(SeatLocationCapability.KEY_SEATS, TestValues.JSON_SEAT_LOCATIONS); + public void testJson() { + JSONObject original = new JSONObject(); + try { + original.put(SeatLocationCapability.KEY_COLS, TestValues.GENERAL_INT); + original.put(SeatLocationCapability.KEY_ROWS, TestValues.GENERAL_INT); + original.put(SeatLocationCapability.KEY_LEVELS, TestValues.GENERAL_INT); + original.put(SeatLocationCapability.KEY_SEATS, TestValues.JSON_SEAT_LOCATIONS); - JSONObject serialized = msg.serializeJSON(); - assertEquals(serialized.length(), original.length()); + JSONObject serialized = msg.serializeJSON(); + assertEquals(serialized.length(), original.length()); - Iterator<String> iter = original.keys(); - String key = ""; - while (iter.hasNext()) { - key = iter.next(); - if (key.equals(SeatLocationCapability.KEY_COLS)) { - int i1 = new SeatLocationCapability(JsonRPCMarshaller.deserializeJSONObject(original)).getCols(); - int i2 = new SeatLocationCapability(JsonRPCMarshaller.deserializeJSONObject(serialized)).getCols(); - assertEquals(TestValues.MATCH, i1, i2); - } else if (key.equals(SeatLocationCapability.KEY_ROWS)) { - int i1 = new SeatLocationCapability(JsonRPCMarshaller.deserializeJSONObject(original)).getRows(); - int i2 = new SeatLocationCapability(JsonRPCMarshaller.deserializeJSONObject(serialized)).getRows(); - assertEquals(TestValues.MATCH, i1, i2); - } else if (key.equals(SeatLocationCapability.KEY_LEVELS)) { - int i1 = new SeatLocationCapability(JsonRPCMarshaller.deserializeJSONObject(original)).getLevels(); - int i2 = new SeatLocationCapability(JsonRPCMarshaller.deserializeJSONObject(serialized)).getLevels(); - assertEquals(TestValues.MATCH, i1, i2); - } else if (key.equals(SeatLocationCapability.KEY_SEATS)) { - JSONArray arr1 = JsonUtils.readJsonArrayFromJsonObject(original, key); - JSONArray arr2 = JsonUtils.readJsonArrayFromJsonObject(serialized, key); - assertEquals(TestValues.MATCH, arr1.length(), arr2.length()); - for (int i = 0; i < TestValues.GENERAL_SEAT_LIST.size(); i++) { - Hashtable<String, Object> h1 = JsonRPCMarshaller.deserializeJSONObject(arr1.getJSONObject(i)); - Hashtable<String, Object> h2 = JsonRPCMarshaller.deserializeJSONObject(arr2.getJSONObject(i)); - assertTrue(TestValues.MATCH, Validator.validateSeatLocation(new SeatLocation(h1), new SeatLocation(h2))); - } - } - } - } catch (JSONException e) { - fail(TestValues.JSON_FAIL); - } - } + Iterator<String> iter = original.keys(); + String key = ""; + while (iter.hasNext()) { + key = iter.next(); + if (key.equals(SeatLocationCapability.KEY_COLS)) { + int i1 = new SeatLocationCapability(JsonRPCMarshaller.deserializeJSONObject(original)).getCols(); + int i2 = new SeatLocationCapability(JsonRPCMarshaller.deserializeJSONObject(serialized)).getCols(); + assertEquals(TestValues.MATCH, i1, i2); + } else if (key.equals(SeatLocationCapability.KEY_ROWS)) { + int i1 = new SeatLocationCapability(JsonRPCMarshaller.deserializeJSONObject(original)).getRows(); + int i2 = new SeatLocationCapability(JsonRPCMarshaller.deserializeJSONObject(serialized)).getRows(); + assertEquals(TestValues.MATCH, i1, i2); + } else if (key.equals(SeatLocationCapability.KEY_LEVELS)) { + int i1 = new SeatLocationCapability(JsonRPCMarshaller.deserializeJSONObject(original)).getLevels(); + int i2 = new SeatLocationCapability(JsonRPCMarshaller.deserializeJSONObject(serialized)).getLevels(); + assertEquals(TestValues.MATCH, i1, i2); + } else if (key.equals(SeatLocationCapability.KEY_SEATS)) { + JSONArray arr1 = JsonUtils.readJsonArrayFromJsonObject(original, key); + JSONArray arr2 = JsonUtils.readJsonArrayFromJsonObject(serialized, key); + assertEquals(TestValues.MATCH, arr1.length(), arr2.length()); + for (int i = 0; i < TestValues.GENERAL_SEAT_LIST.size(); i++) { + Hashtable<String, Object> h1 = JsonRPCMarshaller.deserializeJSONObject(arr1.getJSONObject(i)); + Hashtable<String, Object> h2 = JsonRPCMarshaller.deserializeJSONObject(arr2.getJSONObject(i)); + assertTrue(TestValues.MATCH, Validator.validateSeatLocation(new SeatLocation(h1), new SeatLocation(h2))); + } + } + } + } catch (JSONException e) { + fail(TestValues.JSON_FAIL); + } + } } diff --git a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/SeatLocationTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/SeatLocationTests.java index cf954b702..958b55317 100644 --- a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/SeatLocationTests.java +++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/SeatLocationTests.java @@ -13,36 +13,36 @@ import org.json.JSONObject; public class SeatLocationTests extends TestCase { - private SeatLocation msg; - - @Override - public void setUp() { - msg = new SeatLocation(); - msg.setGrid(TestValues.GENERAL_GRID); - } - - public void testRpcValues() { - Grid grid = msg.getGrid(); - - //valid test - assertTrue(Validator.validateGrid(TestValues.GENERAL_GRID, grid)); - - //null test - SeatLocation msg = new SeatLocation(); - assertNull(TestValues.NULL, msg.getGrid()); - } - - public void testJson() { - JSONObject original = new JSONObject(); - try { - original.put(SeatLocation.KEY_GRID, TestValues.GENERAL_GRID); - - JSONObject serialized = msg.serializeJSON(); - assertEquals(serialized.length(), original.length()); - assertTrue(TestValues.TRUE, Validator.validateSeatLocation(new SeatLocation(JsonRPCMarshaller.deserializeJSONObject(original)), - new SeatLocation(JsonRPCMarshaller.deserializeJSONObject(serialized)))); - } catch (JSONException e) { - fail(TestValues.JSON_FAIL); - } - } + private SeatLocation msg; + + @Override + public void setUp() { + msg = new SeatLocation(); + msg.setGrid(TestValues.GENERAL_GRID); + } + + public void testRpcValues() { + Grid grid = msg.getGrid(); + + //valid test + assertTrue(Validator.validateGrid(TestValues.GENERAL_GRID, grid)); + + //null test + SeatLocation msg = new SeatLocation(); + assertNull(TestValues.NULL, msg.getGrid()); + } + + public void testJson() { + JSONObject original = new JSONObject(); + try { + original.put(SeatLocation.KEY_GRID, TestValues.GENERAL_GRID); + + JSONObject serialized = msg.serializeJSON(); + assertEquals(serialized.length(), original.length()); + assertTrue(TestValues.TRUE, Validator.validateSeatLocation(new SeatLocation(JsonRPCMarshaller.deserializeJSONObject(original)), + new SeatLocation(JsonRPCMarshaller.deserializeJSONObject(serialized)))); + } catch (JSONException e) { + fail(TestValues.JSON_FAIL); + } + } } diff --git a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/SeatMemoryActionTest.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/SeatMemoryActionTest.java index 54b99be2d..c949c9216 100644 --- a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/SeatMemoryActionTest.java +++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/SeatMemoryActionTest.java @@ -18,58 +18,58 @@ import java.util.Iterator; */ public class SeatMemoryActionTest extends TestCase { - private SeatMemoryAction msg; - - @Override - public void setUp() { - msg = new SeatMemoryAction(); - - msg.setId(TestValues.GENERAL_INT); - msg.setLabel(TestValues.GENERAL_STRING); - msg.setAction(TestValues.GENERAL_SEATMEMORYACTIONTYPE); - } - - /** - * Tests the expected values of the RPC message. - */ - public void testRpcValues() { - // Test Values - Integer id = msg.getId(); - String label = msg.getLabel(); - SeatMemoryActionType action = msg.getAction(); - - // Valid Tests - assertEquals(TestValues.MATCH, (Integer) TestValues.GENERAL_INT, id); - assertEquals(TestValues.MATCH, TestValues.GENERAL_STRING, label); - assertEquals(TestValues.MATCH, TestValues.GENERAL_SEATMEMORYACTIONTYPE, action); - - // Invalid/Null Tests - SeatMemoryAction msg = new SeatMemoryAction(); - assertNotNull(TestValues.NOT_NULL, msg); - - assertNull(TestValues.NULL, msg.getId()); - assertNull(TestValues.NULL, msg.getLabel()); - assertNull(TestValues.NULL, msg.getAction()); - } - - public void testJson() { - JSONObject reference = new JSONObject(); - - try { - reference.put(SeatMemoryAction.KEY_ID, TestValues.GENERAL_INT); - reference.put(SeatMemoryAction.KEY_LABEL, TestValues.GENERAL_STRING); - reference.put(SeatMemoryAction.KEY_ACTION, TestValues.GENERAL_SEATMEMORYACTIONTYPE); - - JSONObject underTest = msg.serializeJSON(); - assertEquals(TestValues.MATCH, reference.length(), underTest.length()); - - Iterator<?> iterator = reference.keys(); - while (iterator.hasNext()) { - String key = (String) iterator.next(); - assertEquals(TestValues.MATCH, JsonUtils.readObjectFromJsonObject(reference, key), JsonUtils.readObjectFromJsonObject(underTest, key)); - } - } catch (JSONException e) { - fail(TestValues.JSON_FAIL); - } - } + private SeatMemoryAction msg; + + @Override + public void setUp() { + msg = new SeatMemoryAction(); + + msg.setId(TestValues.GENERAL_INT); + msg.setLabel(TestValues.GENERAL_STRING); + msg.setAction(TestValues.GENERAL_SEATMEMORYACTIONTYPE); + } + + /** + * Tests the expected values of the RPC message. + */ + public void testRpcValues() { + // Test Values + Integer id = msg.getId(); + String label = msg.getLabel(); + SeatMemoryActionType action = msg.getAction(); + + // Valid Tests + assertEquals(TestValues.MATCH, (Integer) TestValues.GENERAL_INT, id); + assertEquals(TestValues.MATCH, TestValues.GENERAL_STRING, label); + assertEquals(TestValues.MATCH, TestValues.GENERAL_SEATMEMORYACTIONTYPE, action); + + // Invalid/Null Tests + SeatMemoryAction msg = new SeatMemoryAction(); + assertNotNull(TestValues.NOT_NULL, msg); + + assertNull(TestValues.NULL, msg.getId()); + assertNull(TestValues.NULL, msg.getLabel()); + assertNull(TestValues.NULL, msg.getAction()); + } + + public void testJson() { + JSONObject reference = new JSONObject(); + + try { + reference.put(SeatMemoryAction.KEY_ID, TestValues.GENERAL_INT); + reference.put(SeatMemoryAction.KEY_LABEL, TestValues.GENERAL_STRING); + reference.put(SeatMemoryAction.KEY_ACTION, TestValues.GENERAL_SEATMEMORYACTIONTYPE); + + JSONObject underTest = msg.serializeJSON(); + assertEquals(TestValues.MATCH, reference.length(), underTest.length()); + + Iterator<?> iterator = reference.keys(); + while (iterator.hasNext()) { + String key = (String) iterator.next(); + assertEquals(TestValues.MATCH, JsonUtils.readObjectFromJsonObject(reference, key), JsonUtils.readObjectFromJsonObject(underTest, key)); + } + } catch (JSONException e) { + fail(TestValues.JSON_FAIL); + } + } }
\ No newline at end of file diff --git a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/SingleTireStatusTest.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/SingleTireStatusTest.java index 14f9890f2..7a231d7f5 100644 --- a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/SingleTireStatusTest.java +++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/SingleTireStatusTest.java @@ -14,63 +14,63 @@ import org.json.JSONObject; import java.util.Iterator; /** - * This is a unit test class for the SmartDeviceLink library project class : + * This is a unit test class for the SmartDeviceLink library project class : * {@link com.smartdevicelink.proxy.rpc.SingleTireStatus} */ public class SingleTireStatusTest extends TestCase { - - private SingleTireStatus msg; - - @Override - public void setUp() { - msg = new SingleTireStatus(); - - msg.setStatus(TestValues.GENERAL_COMPONENTVOLUMESTATUS); - msg.setTPMS(TestValues.GENERAL_TPMS); - msg.setPressure(TestValues.GENERAL_FLOAT); - } + + private SingleTireStatus msg; + + @Override + public void setUp() { + msg = new SingleTireStatus(); + + msg.setStatus(TestValues.GENERAL_COMPONENTVOLUMESTATUS); + msg.setTPMS(TestValues.GENERAL_TPMS); + msg.setPressure(TestValues.GENERAL_FLOAT); + } /** - * Tests the expected values of the RPC message. - */ - public void testRpcValues () { - // Test Values - ComponentVolumeStatus status = msg.getStatus(); - TPMS tpms = msg.getTPMS(); - Float pressure = msg.getPressure(); - - // Valid Tests - assertEquals(TestValues.MATCH, TestValues.GENERAL_COMPONENTVOLUMESTATUS, status); - assertEquals(TestValues.MATCH, TestValues.GENERAL_TPMS, tpms); - assertEquals(TestValues.MATCH, TestValues.GENERAL_FLOAT, pressure); - - // Invalid/Null Tests - SingleTireStatus msg = new SingleTireStatus(); - assertNotNull(TestValues.NOT_NULL, msg); - - assertNull(TestValues.NULL, msg.getStatus()); - assertNull(TestValues.NULL, msg.getTPMS()); - assertNull(TestValues.NULL, msg.getPressure()); - } - - public void testJson() { - JSONObject reference = new JSONObject(); - - try { - reference.put(SingleTireStatus.KEY_STATUS, TestValues.GENERAL_COMPONENTVOLUMESTATUS); - reference.put(SingleTireStatus.KEY_TPMS, TestValues.GENERAL_TPMS); - reference.put(SingleTireStatus.KEY_PRESSURE, TestValues.GENERAL_FLOAT); - - JSONObject underTest = msg.serializeJSON(); - assertEquals(TestValues.MATCH, reference.length(), underTest.length()); - - Iterator<?> iterator = reference.keys(); - while (iterator.hasNext()) { - String key = (String) iterator.next(); - assertEquals(TestValues.MATCH, JsonUtils.readObjectFromJsonObject(reference, key), JsonUtils.readObjectFromJsonObject(underTest, key)); - } - } catch (JSONException e) { - fail(TestValues.JSON_FAIL); - } - } + * Tests the expected values of the RPC message. + */ + public void testRpcValues() { + // Test Values + ComponentVolumeStatus status = msg.getStatus(); + TPMS tpms = msg.getTPMS(); + Float pressure = msg.getPressure(); + + // Valid Tests + assertEquals(TestValues.MATCH, TestValues.GENERAL_COMPONENTVOLUMESTATUS, status); + assertEquals(TestValues.MATCH, TestValues.GENERAL_TPMS, tpms); + assertEquals(TestValues.MATCH, TestValues.GENERAL_FLOAT, pressure); + + // Invalid/Null Tests + SingleTireStatus msg = new SingleTireStatus(); + assertNotNull(TestValues.NOT_NULL, msg); + + assertNull(TestValues.NULL, msg.getStatus()); + assertNull(TestValues.NULL, msg.getTPMS()); + assertNull(TestValues.NULL, msg.getPressure()); + } + + public void testJson() { + JSONObject reference = new JSONObject(); + + try { + reference.put(SingleTireStatus.KEY_STATUS, TestValues.GENERAL_COMPONENTVOLUMESTATUS); + reference.put(SingleTireStatus.KEY_TPMS, TestValues.GENERAL_TPMS); + reference.put(SingleTireStatus.KEY_PRESSURE, TestValues.GENERAL_FLOAT); + + JSONObject underTest = msg.serializeJSON(); + assertEquals(TestValues.MATCH, reference.length(), underTest.length()); + + Iterator<?> iterator = reference.keys(); + while (iterator.hasNext()) { + String key = (String) iterator.next(); + assertEquals(TestValues.MATCH, JsonUtils.readObjectFromJsonObject(reference, key), JsonUtils.readObjectFromJsonObject(underTest, key)); + } + } catch (JSONException e) { + fail(TestValues.JSON_FAIL); + } + } }
\ No newline at end of file diff --git a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/SisDataTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/SisDataTests.java index c33a69a5f..86d0058be 100644 --- a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/SisDataTests.java +++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/SisDataTests.java @@ -23,83 +23,83 @@ import java.util.Iterator; */ public class SisDataTests extends TestCase { - private SisData msg; - - @Override - public void setUp() { - msg = new SisData(); - - msg.setStationShortName(TestValues.GENERAL_STRING); - msg.setStationIDNumber(TestValues.GENERAL_STATIONIDNUMBER); - msg.setStationLongName(TestValues.GENERAL_STRING); - msg.setStationLocation(VehicleDataHelper.GPS); - msg.setStationMessage(TestValues.GENERAL_STRING); - } - - /** - * Tests the expected values of the RPC message. - */ - public void testRpcValues() { - // Test Values - String stationShortName = msg.getStationShortName(); - StationIDNumber stationIDNumber = msg.getStationIDNumber(); - String stationLongName = msg.getStationLongName(); - GPSData stationLocation = msg.getStationLocation(); - String stationMessage = msg.getStationMessage(); - - // Valid Tests - assertEquals(TestValues.MATCH, TestValues.GENERAL_STRING, stationShortName); - assertEquals(TestValues.MATCH, TestValues.GENERAL_STATIONIDNUMBER, stationIDNumber); - assertEquals(TestValues.MATCH, TestValues.GENERAL_STRING, stationLongName); - assertEquals(TestValues.MATCH, VehicleDataHelper.GPS, stationLocation); - assertEquals(TestValues.MATCH, TestValues.GENERAL_STRING, stationMessage); - - // Invalid/Null Tests - SisData msg = new SisData(); - assertNotNull(TestValues.NOT_NULL, msg); - - assertNull(TestValues.NULL, msg.getStationShortName()); - assertNull(TestValues.NULL, msg.getStationIDNumber()); - assertNull(TestValues.NULL, msg.getStationLongName()); - assertNull(TestValues.NULL, msg.getStationLocation()); - assertNull(TestValues.NULL, msg.getStationMessage()); - } - - public void testJson() { - JSONObject reference = new JSONObject(); - - try { - reference.put(SisData.KEY_STATION_SHORT_NAME, TestValues.GENERAL_STRING); - reference.put(SisData.KEY_STATION_ID_NUMBER, JsonRPCMarshaller.serializeHashtable(TestValues.GENERAL_STATIONIDNUMBER.getStore())); - reference.put(SisData.KEY_STATION_LONG_NAME, TestValues.GENERAL_STRING); - reference.put(SisData.KEY_STATION_LOCATION, JsonRPCMarshaller.serializeHashtable(VehicleDataHelper.GPS.getStore())); - reference.put(SisData.KEY_STATION_MESSAGE, TestValues.GENERAL_STRING); - - 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(SisData.KEY_STATION_ID_NUMBER)) { - JSONObject objectEquals = (JSONObject) JsonUtils.readObjectFromJsonObject(reference, key); - JSONObject testEquals = (JSONObject) JsonUtils.readObjectFromJsonObject(underTest, key); - Hashtable<String, Object> hashReference = JsonRPCMarshaller.deserializeJSONObject(objectEquals); - Hashtable<String, Object> hashTest = JsonRPCMarshaller.deserializeJSONObject(testEquals); - assertTrue(TestValues.TRUE, Validator.validateStationIDNumber(new StationIDNumber(hashReference), new StationIDNumber(hashTest))); - } else if (key.equals(SisData.KEY_STATION_LOCATION)) { - JSONObject objectEquals = (JSONObject) JsonUtils.readObjectFromJsonObject(reference, key); - JSONObject testEquals = (JSONObject) JsonUtils.readObjectFromJsonObject(underTest, key); - Hashtable<String, Object> hashReference = JsonRPCMarshaller.deserializeJSONObject(objectEquals); - Hashtable<String, Object> hashTest = JsonRPCMarshaller.deserializeJSONObject(testEquals); - assertTrue(TestValues.TRUE, Validator.validateGpsData(new GPSData(hashReference), new GPSData(hashTest))); - } else { - assertEquals(TestValues.MATCH, JsonUtils.readObjectFromJsonObject(reference, key), JsonUtils.readObjectFromJsonObject(underTest, key)); - } - } - } catch (JSONException e) { - fail(TestValues.JSON_FAIL); - } - } + private SisData msg; + + @Override + public void setUp() { + msg = new SisData(); + + msg.setStationShortName(TestValues.GENERAL_STRING); + msg.setStationIDNumber(TestValues.GENERAL_STATIONIDNUMBER); + msg.setStationLongName(TestValues.GENERAL_STRING); + msg.setStationLocation(VehicleDataHelper.GPS); + msg.setStationMessage(TestValues.GENERAL_STRING); + } + + /** + * Tests the expected values of the RPC message. + */ + public void testRpcValues() { + // Test Values + String stationShortName = msg.getStationShortName(); + StationIDNumber stationIDNumber = msg.getStationIDNumber(); + String stationLongName = msg.getStationLongName(); + GPSData stationLocation = msg.getStationLocation(); + String stationMessage = msg.getStationMessage(); + + // Valid Tests + assertEquals(TestValues.MATCH, TestValues.GENERAL_STRING, stationShortName); + assertEquals(TestValues.MATCH, TestValues.GENERAL_STATIONIDNUMBER, stationIDNumber); + assertEquals(TestValues.MATCH, TestValues.GENERAL_STRING, stationLongName); + assertEquals(TestValues.MATCH, VehicleDataHelper.GPS, stationLocation); + assertEquals(TestValues.MATCH, TestValues.GENERAL_STRING, stationMessage); + + // Invalid/Null Tests + SisData msg = new SisData(); + assertNotNull(TestValues.NOT_NULL, msg); + + assertNull(TestValues.NULL, msg.getStationShortName()); + assertNull(TestValues.NULL, msg.getStationIDNumber()); + assertNull(TestValues.NULL, msg.getStationLongName()); + assertNull(TestValues.NULL, msg.getStationLocation()); + assertNull(TestValues.NULL, msg.getStationMessage()); + } + + public void testJson() { + JSONObject reference = new JSONObject(); + + try { + reference.put(SisData.KEY_STATION_SHORT_NAME, TestValues.GENERAL_STRING); + reference.put(SisData.KEY_STATION_ID_NUMBER, JsonRPCMarshaller.serializeHashtable(TestValues.GENERAL_STATIONIDNUMBER.getStore())); + reference.put(SisData.KEY_STATION_LONG_NAME, TestValues.GENERAL_STRING); + reference.put(SisData.KEY_STATION_LOCATION, JsonRPCMarshaller.serializeHashtable(VehicleDataHelper.GPS.getStore())); + reference.put(SisData.KEY_STATION_MESSAGE, TestValues.GENERAL_STRING); + + 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(SisData.KEY_STATION_ID_NUMBER)) { + JSONObject objectEquals = (JSONObject) JsonUtils.readObjectFromJsonObject(reference, key); + JSONObject testEquals = (JSONObject) JsonUtils.readObjectFromJsonObject(underTest, key); + Hashtable<String, Object> hashReference = JsonRPCMarshaller.deserializeJSONObject(objectEquals); + Hashtable<String, Object> hashTest = JsonRPCMarshaller.deserializeJSONObject(testEquals); + assertTrue(TestValues.TRUE, Validator.validateStationIDNumber(new StationIDNumber(hashReference), new StationIDNumber(hashTest))); + } else if (key.equals(SisData.KEY_STATION_LOCATION)) { + JSONObject objectEquals = (JSONObject) JsonUtils.readObjectFromJsonObject(reference, key); + JSONObject testEquals = (JSONObject) JsonUtils.readObjectFromJsonObject(underTest, key); + Hashtable<String, Object> hashReference = JsonRPCMarshaller.deserializeJSONObject(objectEquals); + Hashtable<String, Object> hashTest = JsonRPCMarshaller.deserializeJSONObject(testEquals); + assertTrue(TestValues.TRUE, Validator.validateGpsData(new GPSData(hashReference), new GPSData(hashTest))); + } else { + assertEquals(TestValues.MATCH, JsonUtils.readObjectFromJsonObject(reference, key), JsonUtils.readObjectFromJsonObject(underTest, key)); + } + } + } catch (JSONException e) { + fail(TestValues.JSON_FAIL); + } + } }
\ No newline at end of file diff --git a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/SoftButtonCapabilitiesTest.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/SoftButtonCapabilitiesTest.java index 25feeb6f8..7778c60a4 100644 --- a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/SoftButtonCapabilitiesTest.java +++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/SoftButtonCapabilitiesTest.java @@ -12,73 +12,73 @@ import org.json.JSONObject; import java.util.Iterator; /** - * This is a unit test class for the SmartDeviceLink library project class : + * This is a unit test class for the SmartDeviceLink library project class : * {@link com.smartdevicelink.proxy.rpc.SoftButtonCapabilities} */ public class SoftButtonCapabilitiesTest extends TestCase { - private SoftButtonCapabilities msg; + private SoftButtonCapabilities msg; - @Override - public void setUp() { - msg = new SoftButtonCapabilities(); - - msg.setImageSupported(TestValues.GENERAL_BOOLEAN); - msg.setShortPressAvailable(TestValues.GENERAL_BOOLEAN); - msg.setLongPressAvailable(TestValues.GENERAL_BOOLEAN); - msg.setUpDownAvailable(TestValues.GENERAL_BOOLEAN); - msg.setTextSupported(TestValues.GENERAL_BOOLEAN); - } + @Override + public void setUp() { + msg = new SoftButtonCapabilities(); + + msg.setImageSupported(TestValues.GENERAL_BOOLEAN); + msg.setShortPressAvailable(TestValues.GENERAL_BOOLEAN); + msg.setLongPressAvailable(TestValues.GENERAL_BOOLEAN); + msg.setUpDownAvailable(TestValues.GENERAL_BOOLEAN); + msg.setTextSupported(TestValues.GENERAL_BOOLEAN); + } /** - * Tests the expected values of the RPC message. - */ - public void testRpcValues () { - // Test Values - Boolean imageSupp = msg.getImageSupported(); - Boolean updown = msg.getUpDownAvailable(); - Boolean longPress = msg.getLongPressAvailable(); - Boolean shortPress = msg.getShortPressAvailable(); - Boolean textSupported = msg.getTextSupported(); - - // Valid Tests - assertEquals(TestValues.MATCH, (Boolean) TestValues.GENERAL_BOOLEAN, imageSupp); - assertEquals(TestValues.MATCH, (Boolean) TestValues.GENERAL_BOOLEAN, updown); - assertEquals(TestValues.MATCH, (Boolean) TestValues.GENERAL_BOOLEAN, longPress); - assertEquals(TestValues.MATCH, (Boolean) TestValues.GENERAL_BOOLEAN, shortPress); - assertEquals(TestValues.MATCH, (Boolean) TestValues.GENERAL_BOOLEAN, textSupported); - - // Invalid/Null Tests - SoftButtonCapabilities msg = new SoftButtonCapabilities(); - assertNotNull(TestValues.NOT_NULL, msg); - - assertNull(TestValues.NULL, msg.getImageSupported()); - assertNull(TestValues.NULL, msg.getLongPressAvailable()); - assertNull(TestValues.NULL, msg.getShortPressAvailable()); - assertNull(TestValues.NULL, msg.getUpDownAvailable()); - assertNull(TestValues.NULL, msg.getTextSupported()); - } - - public void testJson() { - JSONObject reference = new JSONObject(); - - try { - reference.put(SoftButtonCapabilities.KEY_IMAGE_SUPPORTED, TestValues.GENERAL_BOOLEAN); - reference.put(SoftButtonCapabilities.KEY_UP_DOWN_AVAILABLE, TestValues.GENERAL_BOOLEAN); - reference.put(SoftButtonCapabilities.KEY_LONG_PRESS_AVAILABLE, TestValues.GENERAL_BOOLEAN); - reference.put(SoftButtonCapabilities.KEY_SHORT_PRESS_AVAILABLE, TestValues.GENERAL_BOOLEAN); - reference.put(SoftButtonCapabilities.KEY_TEXT_SUPPORTED, TestValues.GENERAL_BOOLEAN); - - JSONObject underTest = msg.serializeJSON(); - assertEquals(TestValues.MATCH, reference.length(), underTest.length()); - - Iterator<?> iterator = reference.keys(); - while (iterator.hasNext()) { - String key = (String) iterator.next(); - assertEquals(TestValues.MATCH, JsonUtils.readObjectFromJsonObject(reference, key), JsonUtils.readObjectFromJsonObject(underTest, key)); - } - } catch (JSONException e) { - fail(TestValues.JSON_FAIL); - } - } + * Tests the expected values of the RPC message. + */ + public void testRpcValues() { + // Test Values + Boolean imageSupp = msg.getImageSupported(); + Boolean updown = msg.getUpDownAvailable(); + Boolean longPress = msg.getLongPressAvailable(); + Boolean shortPress = msg.getShortPressAvailable(); + Boolean textSupported = msg.getTextSupported(); + + // Valid Tests + assertEquals(TestValues.MATCH, (Boolean) TestValues.GENERAL_BOOLEAN, imageSupp); + assertEquals(TestValues.MATCH, (Boolean) TestValues.GENERAL_BOOLEAN, updown); + assertEquals(TestValues.MATCH, (Boolean) TestValues.GENERAL_BOOLEAN, longPress); + assertEquals(TestValues.MATCH, (Boolean) TestValues.GENERAL_BOOLEAN, shortPress); + assertEquals(TestValues.MATCH, (Boolean) TestValues.GENERAL_BOOLEAN, textSupported); + + // Invalid/Null Tests + SoftButtonCapabilities msg = new SoftButtonCapabilities(); + assertNotNull(TestValues.NOT_NULL, msg); + + assertNull(TestValues.NULL, msg.getImageSupported()); + assertNull(TestValues.NULL, msg.getLongPressAvailable()); + assertNull(TestValues.NULL, msg.getShortPressAvailable()); + assertNull(TestValues.NULL, msg.getUpDownAvailable()); + assertNull(TestValues.NULL, msg.getTextSupported()); + } + + public void testJson() { + JSONObject reference = new JSONObject(); + + try { + reference.put(SoftButtonCapabilities.KEY_IMAGE_SUPPORTED, TestValues.GENERAL_BOOLEAN); + reference.put(SoftButtonCapabilities.KEY_UP_DOWN_AVAILABLE, TestValues.GENERAL_BOOLEAN); + reference.put(SoftButtonCapabilities.KEY_LONG_PRESS_AVAILABLE, TestValues.GENERAL_BOOLEAN); + reference.put(SoftButtonCapabilities.KEY_SHORT_PRESS_AVAILABLE, TestValues.GENERAL_BOOLEAN); + reference.put(SoftButtonCapabilities.KEY_TEXT_SUPPORTED, TestValues.GENERAL_BOOLEAN); + + JSONObject underTest = msg.serializeJSON(); + assertEquals(TestValues.MATCH, reference.length(), underTest.length()); + + Iterator<?> iterator = reference.keys(); + while (iterator.hasNext()) { + String key = (String) iterator.next(); + assertEquals(TestValues.MATCH, JsonUtils.readObjectFromJsonObject(reference, key), JsonUtils.readObjectFromJsonObject(underTest, key)); + } + } catch (JSONException e) { + fail(TestValues.JSON_FAIL); + } + } }
\ No newline at end of file diff --git a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/SoftButtonTest.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/SoftButtonTest.java index fda0b8cc6..964eb8834 100644 --- a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/SoftButtonTest.java +++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/SoftButtonTest.java @@ -18,87 +18,87 @@ import java.util.Hashtable; import java.util.Iterator; /** - * This is a unit test class for the SmartDeviceLink library project class : + * This is a unit test class for the SmartDeviceLink library project class : * {@link com.smartdevicelink.proxy.rpc.SoftButton} */ public class SoftButtonTest extends TestCase { - - private SoftButton msg; - - @Override - public void setUp() { - msg = new SoftButton(); - - msg.setType(TestValues.GENERAL_SOFTBUTTONTYPE); - msg.setText(TestValues.GENERAL_STRING); - msg.setSystemAction(TestValues.GENERAL_SYSTEMACTION); - msg.setImage(TestValues.GENERAL_IMAGE); - msg.setIsHighlighted(TestValues.GENERAL_BOOLEAN); - msg.setSoftButtonID(TestValues.GENERAL_INT); - } + + private SoftButton msg; + + @Override + public void setUp() { + msg = new SoftButton(); + + msg.setType(TestValues.GENERAL_SOFTBUTTONTYPE); + msg.setText(TestValues.GENERAL_STRING); + msg.setSystemAction(TestValues.GENERAL_SYSTEMACTION); + msg.setImage(TestValues.GENERAL_IMAGE); + msg.setIsHighlighted(TestValues.GENERAL_BOOLEAN); + msg.setSoftButtonID(TestValues.GENERAL_INT); + } /** - * Tests the expected values of the RPC message. - */ - public void testRpcValues () { - // Test Values - SoftButtonType type = msg.getType(); - String text = msg.getText(); - SystemAction sysAction = msg.getSystemAction(); - Image image = msg.getImage(); - Boolean isHighlighted = msg.getIsHighlighted(); - Integer id = msg.getSoftButtonID(); - - // Valid Tests - assertEquals(TestValues.MATCH, TestValues.GENERAL_SOFTBUTTONTYPE, type); - assertEquals(TestValues.MATCH, TestValues.GENERAL_STRING, text); - assertEquals(TestValues.MATCH, TestValues.GENERAL_SYSTEMACTION, sysAction); - assertTrue(TestValues.TRUE, Validator.validateImage(TestValues.GENERAL_IMAGE, image)); - assertEquals(TestValues.MATCH, (Boolean) TestValues.GENERAL_BOOLEAN, isHighlighted); - assertEquals(TestValues.MATCH, (Integer) TestValues.GENERAL_INT, id); - - // Invalid/Null Tests - SoftButton msg = new SoftButton(); - assertNotNull(TestValues.NOT_NULL, msg); - - assertNull(TestValues.NULL, msg.getSoftButtonID()); - assertNull(TestValues.NULL, msg.getImage()); - assertNull(TestValues.NULL, msg.getIsHighlighted()); - assertNull(TestValues.NULL, msg.getSystemAction()); - assertNull(TestValues.NULL, msg.getText()); - assertNull(TestValues.NULL, msg.getType()); - } - - public void testJson() { - JSONObject reference = new JSONObject(); - - try { - reference.put(SoftButton.KEY_SOFT_BUTTON_ID, TestValues.GENERAL_INT); - reference.put(SoftButton.KEY_TYPE, TestValues.GENERAL_SOFTBUTTONTYPE); - reference.put(SoftButton.KEY_TEXT, TestValues.GENERAL_STRING); - reference.put(SoftButton.KEY_IMAGE, TestValues.JSON_IMAGE); - reference.put(SoftButton.KEY_SYSTEM_ACTION, TestValues.GENERAL_SYSTEMACTION); - reference.put(SoftButton.KEY_IS_HIGHLIGHTED, TestValues.GENERAL_BOOLEAN); - - 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(SoftButton.KEY_IMAGE)){ + * Tests the expected values of the RPC message. + */ + public void testRpcValues() { + // Test Values + SoftButtonType type = msg.getType(); + String text = msg.getText(); + SystemAction sysAction = msg.getSystemAction(); + Image image = msg.getImage(); + Boolean isHighlighted = msg.getIsHighlighted(); + Integer id = msg.getSoftButtonID(); + + // Valid Tests + assertEquals(TestValues.MATCH, TestValues.GENERAL_SOFTBUTTONTYPE, type); + assertEquals(TestValues.MATCH, TestValues.GENERAL_STRING, text); + assertEquals(TestValues.MATCH, TestValues.GENERAL_SYSTEMACTION, sysAction); + assertTrue(TestValues.TRUE, Validator.validateImage(TestValues.GENERAL_IMAGE, image)); + assertEquals(TestValues.MATCH, (Boolean) TestValues.GENERAL_BOOLEAN, isHighlighted); + assertEquals(TestValues.MATCH, (Integer) TestValues.GENERAL_INT, id); + + // Invalid/Null Tests + SoftButton msg = new SoftButton(); + assertNotNull(TestValues.NOT_NULL, msg); + + assertNull(TestValues.NULL, msg.getSoftButtonID()); + assertNull(TestValues.NULL, msg.getImage()); + assertNull(TestValues.NULL, msg.getIsHighlighted()); + assertNull(TestValues.NULL, msg.getSystemAction()); + assertNull(TestValues.NULL, msg.getText()); + assertNull(TestValues.NULL, msg.getType()); + } + + public void testJson() { + JSONObject reference = new JSONObject(); + + try { + reference.put(SoftButton.KEY_SOFT_BUTTON_ID, TestValues.GENERAL_INT); + reference.put(SoftButton.KEY_TYPE, TestValues.GENERAL_SOFTBUTTONTYPE); + reference.put(SoftButton.KEY_TEXT, TestValues.GENERAL_STRING); + reference.put(SoftButton.KEY_IMAGE, TestValues.JSON_IMAGE); + reference.put(SoftButton.KEY_SYSTEM_ACTION, TestValues.GENERAL_SYSTEMACTION); + reference.put(SoftButton.KEY_IS_HIGHLIGHTED, TestValues.GENERAL_BOOLEAN); + + 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(SoftButton.KEY_IMAGE)) { JSONObject referenceArray = JsonUtils.readJsonObjectFromJsonObject(reference, key); JSONObject underTestArray = JsonUtils.readJsonObjectFromJsonObject(underTest, key); - Hashtable<String, Object> hashReference = JsonRPCMarshaller.deserializeJSONObject(referenceArray); - Hashtable<String, Object> hashTest= JsonRPCMarshaller.deserializeJSONObject(underTestArray); - assertTrue(TestValues.TRUE, Validator.validateImage(new Image(hashReference), new Image(hashTest))); - } else { - assertEquals(TestValues.MATCH, JsonUtils.readObjectFromJsonObject(reference, key), JsonUtils.readObjectFromJsonObject(underTest, key)); - } - } - } catch (JSONException e) { - fail(TestValues.JSON_FAIL); - } - } + Hashtable<String, Object> hashReference = JsonRPCMarshaller.deserializeJSONObject(referenceArray); + Hashtable<String, Object> hashTest = JsonRPCMarshaller.deserializeJSONObject(underTestArray); + assertTrue(TestValues.TRUE, Validator.validateImage(new Image(hashReference), new Image(hashTest))); + } else { + assertEquals(TestValues.MATCH, JsonUtils.readObjectFromJsonObject(reference, key), JsonUtils.readObjectFromJsonObject(underTest, key)); + } + } + } catch (JSONException e) { + fail(TestValues.JSON_FAIL); + } + } }
\ No newline at end of file diff --git a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/StabilityControlsStatusTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/StabilityControlsStatusTests.java index 1de8abfdf..3cf46b7ab 100644 --- a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/StabilityControlsStatusTests.java +++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/StabilityControlsStatusTests.java @@ -26,7 +26,7 @@ public class StabilityControlsStatusTests extends TestCase { /** * Tests the expected values of the RPC message. */ - public void testRpcValues () { + public void testRpcValues() { // Test Values VehicleDataStatus esc = msg.getEscSystem(); VehicleDataStatus sTrailer = msg.getTrailerSwayControl(); diff --git a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/StartTimeTest.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/StartTimeTest.java index 54752d5ef..d33cc1ac0 100644 --- a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/StartTimeTest.java +++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/StartTimeTest.java @@ -12,68 +12,68 @@ import org.json.JSONObject; import java.util.Iterator; /** - * This is a unit test class for the SmartDeviceLink library project class : + * This is a unit test class for the SmartDeviceLink library project class : * {@link com.smartdevicelink.proxy.rpc.StartTime} */ public class StartTimeTest extends TestCase { - - private StartTime msg; - - @Override - public void setUp() { - msg = new StartTime(); - - msg.setHours(TestValues.GENERAL_INT); - msg.setMinutes(TestValues.GENERAL_INT); - msg.setSeconds(TestValues.GENERAL_INT); - } + + private StartTime msg; + + @Override + public void setUp() { + msg = new StartTime(); + + msg.setHours(TestValues.GENERAL_INT); + msg.setMinutes(TestValues.GENERAL_INT); + msg.setSeconds(TestValues.GENERAL_INT); + } /** - * Tests the expected values of the RPC message. - */ - public void testRpcValues () { - // Test Values - Integer hours = msg.getHours(); - Integer minutes = msg.getMinutes(); - Integer seconds = msg.getSeconds(); - - // Valid Tests - assertEquals(TestValues.MATCH, (Integer) TestValues.GENERAL_INT, hours); - assertEquals(TestValues.MATCH, (Integer) TestValues.GENERAL_INT, minutes); - assertEquals(TestValues.MATCH, (Integer) TestValues.GENERAL_INT, seconds); - - // TimeInterval constructor test - StartTime startTime = new StartTime(7000); - assertEquals(TestValues.MATCH, (Integer) 1, startTime.getHours()); - assertEquals(TestValues.MATCH, (Integer) 56, startTime.getMinutes()); - assertEquals(TestValues.MATCH, (Integer) 40, startTime.getSeconds()); - - // Invalid/Null Tests - StartTime msg = new StartTime(); - assertNotNull(TestValues.NOT_NULL, msg); - assertNull(TestValues.NULL, msg.getHours()); - assertNull(TestValues.NULL, msg.getMinutes()); - assertNull(TestValues.NULL, msg.getSeconds()); - } - - public void testJson() { - JSONObject reference = new JSONObject(); - - try { - reference.put(StartTime.KEY_HOURS, TestValues.GENERAL_INT); - reference.put(StartTime.KEY_MINUTES, TestValues.GENERAL_INT); - reference.put(StartTime.KEY_SECONDS, TestValues.GENERAL_INT); - - JSONObject underTest = msg.serializeJSON(); - assertEquals(TestValues.MATCH, reference.length(), underTest.length()); - - Iterator<?> iterator = reference.keys(); - while (iterator.hasNext()) { - String key = (String) iterator.next(); - assertEquals(TestValues.MATCH, JsonUtils.readObjectFromJsonObject(reference, key), JsonUtils.readObjectFromJsonObject(underTest, key)); - } - } catch (JSONException e) { - fail(TestValues.JSON_FAIL); - } - } + * Tests the expected values of the RPC message. + */ + public void testRpcValues() { + // Test Values + Integer hours = msg.getHours(); + Integer minutes = msg.getMinutes(); + Integer seconds = msg.getSeconds(); + + // Valid Tests + assertEquals(TestValues.MATCH, (Integer) TestValues.GENERAL_INT, hours); + assertEquals(TestValues.MATCH, (Integer) TestValues.GENERAL_INT, minutes); + assertEquals(TestValues.MATCH, (Integer) TestValues.GENERAL_INT, seconds); + + // TimeInterval constructor test + StartTime startTime = new StartTime(7000); + assertEquals(TestValues.MATCH, (Integer) 1, startTime.getHours()); + assertEquals(TestValues.MATCH, (Integer) 56, startTime.getMinutes()); + assertEquals(TestValues.MATCH, (Integer) 40, startTime.getSeconds()); + + // Invalid/Null Tests + StartTime msg = new StartTime(); + assertNotNull(TestValues.NOT_NULL, msg); + assertNull(TestValues.NULL, msg.getHours()); + assertNull(TestValues.NULL, msg.getMinutes()); + assertNull(TestValues.NULL, msg.getSeconds()); + } + + public void testJson() { + JSONObject reference = new JSONObject(); + + try { + reference.put(StartTime.KEY_HOURS, TestValues.GENERAL_INT); + reference.put(StartTime.KEY_MINUTES, TestValues.GENERAL_INT); + reference.put(StartTime.KEY_SECONDS, TestValues.GENERAL_INT); + + JSONObject underTest = msg.serializeJSON(); + assertEquals(TestValues.MATCH, reference.length(), underTest.length()); + + Iterator<?> iterator = reference.keys(); + while (iterator.hasNext()) { + String key = (String) iterator.next(); + assertEquals(TestValues.MATCH, JsonUtils.readObjectFromJsonObject(reference, key), JsonUtils.readObjectFromJsonObject(underTest, key)); + } + } catch (JSONException e) { + fail(TestValues.JSON_FAIL); + } + } }
\ No newline at end of file diff --git a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/StationIDNumberTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/StationIDNumberTests.java index f35f0913d..04da073df 100644 --- a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/StationIDNumberTests.java +++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/StationIDNumberTests.java @@ -17,57 +17,57 @@ import java.util.Iterator; */ public class StationIDNumberTests extends TestCase { - private StationIDNumber msg; + private StationIDNumber msg; - @Override - public void setUp() { - msg = new StationIDNumber(); + @Override + public void setUp() { + msg = new StationIDNumber(); - msg.setCountryCode(TestValues.GENERAL_INT); - msg.setFccFacilityId(TestValues.GENERAL_INT); - } + msg.setCountryCode(TestValues.GENERAL_INT); + msg.setFccFacilityId(TestValues.GENERAL_INT); + } - /** - * Tests the expected values of the RPC message. - */ - public void testRpcValues() { - // Test Values + /** + * Tests the expected values of the RPC message. + */ + public void testRpcValues() { + // Test Values - int countryCode = msg.getCountryCode(); - int fccFacilityId = msg.getFccFacilityId(); + int countryCode = msg.getCountryCode(); + int fccFacilityId = msg.getFccFacilityId(); - // Valid Tests - assertEquals(TestValues.MATCH, TestValues.GENERAL_INT, countryCode); - assertEquals(TestValues.MATCH, TestValues.GENERAL_INT, fccFacilityId); + // Valid Tests + assertEquals(TestValues.MATCH, TestValues.GENERAL_INT, countryCode); + assertEquals(TestValues.MATCH, TestValues.GENERAL_INT, fccFacilityId); - // Invalid/Null Tests - StationIDNumber msg = new StationIDNumber(); - assertNotNull(TestValues.NOT_NULL, msg); + // Invalid/Null Tests + StationIDNumber msg = new StationIDNumber(); + assertNotNull(TestValues.NOT_NULL, msg); - assertNull(TestValues.NULL, msg.getCountryCode()); - assertNull(TestValues.NULL, msg.getFccFacilityId()); - } + assertNull(TestValues.NULL, msg.getCountryCode()); + assertNull(TestValues.NULL, msg.getFccFacilityId()); + } - public void testJson() { - JSONObject reference = new JSONObject(); + public void testJson() { + JSONObject reference = new JSONObject(); - try { + try { - reference.put(StationIDNumber.KEY_COUNTRY_CODE, TestValues.GENERAL_INT); - reference.put(StationIDNumber.KEY_FCC_FACILITY_ID, TestValues.GENERAL_INT); + reference.put(StationIDNumber.KEY_COUNTRY_CODE, TestValues.GENERAL_INT); + reference.put(StationIDNumber.KEY_FCC_FACILITY_ID, TestValues.GENERAL_INT); - JSONObject underTest = msg.serializeJSON(); - assertEquals(TestValues.MATCH, reference.length(), underTest.length()); + JSONObject underTest = msg.serializeJSON(); + assertEquals(TestValues.MATCH, reference.length(), underTest.length()); - Iterator<?> iterator = reference.keys(); - while (iterator.hasNext()) { - String key = (String) iterator.next(); + Iterator<?> iterator = reference.keys(); + while (iterator.hasNext()) { + String key = (String) iterator.next(); - assertEquals(TestValues.MATCH, JsonUtils.readObjectFromJsonObject(reference, key), JsonUtils.readObjectFromJsonObject(underTest, key)); + assertEquals(TestValues.MATCH, JsonUtils.readObjectFromJsonObject(reference, key), JsonUtils.readObjectFromJsonObject(underTest, key)); - } - } catch (JSONException e) { - fail(TestValues.JSON_FAIL); - } - } + } + } catch (JSONException e) { + fail(TestValues.JSON_FAIL); + } + } }
\ No newline at end of file diff --git a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/SystemCapabilityTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/SystemCapabilityTests.java index 4ba99dda0..bbccdd042 100644 --- a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/SystemCapabilityTests.java +++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/SystemCapabilityTests.java @@ -51,7 +51,7 @@ public class SystemCapabilityTests extends TestCase { /** * Tests the expected values of the RPC message. */ - public void testRpcValues () { + public void testRpcValues() { // Test Values SystemCapabilityType testType = msg.getSystemCapabilityType(); NavigationCapability testNavigationCapability = (NavigationCapability) msg.getCapabilityForType(SystemCapabilityType.NAVIGATION); @@ -70,7 +70,7 @@ public class SystemCapabilityTests extends TestCase { assertTrue(TestValues.TRUE, Validator.validateDriverDistractionCapability(TestValues.GENERAL_DRIVERDISTRACTIONCAPABILITY, testDriverDistractionCapability)); - for(int i = 0; i < TestValues.GENERAL_DISPLAYCAPABILITY_LIST.size(); i++){ + for (int i = 0; i < TestValues.GENERAL_DISPLAYCAPABILITY_LIST.size(); i++) { assertTrue(TestValues.TRUE, Validator.validateDisplayCapability(TestValues.GENERAL_DISPLAYCAPABILITY_LIST.get(i), displayCapabilities.get(i))); } @@ -112,40 +112,40 @@ public class SystemCapabilityTests extends TestCase { while (iterator.hasNext()) { String key = (String) iterator.next(); - if(key.equals(SystemCapability.KEY_NAVIGATION_CAPABILITY)){ + if (key.equals(SystemCapability.KEY_NAVIGATION_CAPABILITY)) { JSONObject objectEquals = (JSONObject) JsonUtils.readObjectFromJsonObject(reference, key); JSONObject testEquals = (JSONObject) JsonUtils.readObjectFromJsonObject(underTest, key); Hashtable<String, Object> hashReference = JsonRPCMarshaller.deserializeJSONObject(objectEquals); Hashtable<String, Object> hashTest = JsonRPCMarshaller.deserializeJSONObject(testEquals); - assertTrue(TestValues.TRUE, Validator.validateNavigationCapability( new NavigationCapability(hashReference), new NavigationCapability(hashTest))); - } else if(key.equals(SystemCapability.KEY_PHONE_CAPABILITY)){ + assertTrue(TestValues.TRUE, Validator.validateNavigationCapability(new NavigationCapability(hashReference), new NavigationCapability(hashTest))); + } else if (key.equals(SystemCapability.KEY_PHONE_CAPABILITY)) { JSONObject objectEquals = (JSONObject) JsonUtils.readObjectFromJsonObject(reference, key); JSONObject testEquals = (JSONObject) JsonUtils.readObjectFromJsonObject(underTest, key); Hashtable<String, Object> hashReference = JsonRPCMarshaller.deserializeJSONObject(objectEquals); Hashtable<String, Object> hashTest = JsonRPCMarshaller.deserializeJSONObject(testEquals); - assertTrue(TestValues.TRUE, Validator.validatePhoneCapability( new PhoneCapability(hashReference), new PhoneCapability(hashTest))); - } else if(key.equals(SystemCapability.KEY_REMOTE_CONTROL_CAPABILITY)){ + assertTrue(TestValues.TRUE, Validator.validatePhoneCapability(new PhoneCapability(hashReference), new PhoneCapability(hashTest))); + } else if (key.equals(SystemCapability.KEY_REMOTE_CONTROL_CAPABILITY)) { JSONObject objectEquals = (JSONObject) JsonUtils.readObjectFromJsonObject(reference, key); JSONObject testEquals = (JSONObject) JsonUtils.readObjectFromJsonObject(underTest, key); Hashtable<String, Object> hashReference = JsonRPCMarshaller.deserializeJSONObject(objectEquals); Hashtable<String, Object> hashTest = JsonRPCMarshaller.deserializeJSONObject(testEquals); - assertTrue(TestValues.TRUE, Validator.validateRemoteControlCapabilities( new RemoteControlCapabilities(hashReference), new RemoteControlCapabilities(hashTest))); - } else if(key.equals(SystemCapability.KEY_APP_SERVICES_CAPABILITIES)){ + assertTrue(TestValues.TRUE, Validator.validateRemoteControlCapabilities(new RemoteControlCapabilities(hashReference), new RemoteControlCapabilities(hashTest))); + } else if (key.equals(SystemCapability.KEY_APP_SERVICES_CAPABILITIES)) { JSONObject objectEquals = (JSONObject) JsonUtils.readObjectFromJsonObject(reference, key); JSONObject testEquals = (JSONObject) JsonUtils.readObjectFromJsonObject(underTest, key); Hashtable<String, Object> hashReference = JsonRPCMarshaller.deserializeJSONObject(objectEquals); Hashtable<String, Object> hashTest = JsonRPCMarshaller.deserializeJSONObject(testEquals); Log.i("TEST REF", hashReference.toString()); Log.i("TEST TEST", hashTest.toString()); - assertTrue(TestValues.TRUE, Validator.validateAppServiceCapabilities( new AppServicesCapabilities(hashReference), new AppServicesCapabilities(hashTest))); - } else if(key.equals(SystemCapability.KEY_DISPLAY_CAPABILITIES)){ + assertTrue(TestValues.TRUE, Validator.validateAppServiceCapabilities(new AppServicesCapabilities(hashReference), new AppServicesCapabilities(hashTest))); + } else if (key.equals(SystemCapability.KEY_DISPLAY_CAPABILITIES)) { 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++){ + 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)); + Hashtable<String, Object> hashTest = JsonRPCMarshaller.deserializeJSONObject(underTestArray.getJSONObject(i)); assertTrue(TestValues.TRUE, Validator.validateDisplayCapability(new DisplayCapability(hashReference), new DisplayCapability(hashTest))); } } else if (key.equals(SystemCapability.KEY_DRIVER_DISTRACTION_CAPABILITY)) { diff --git a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/TTSChunkTest.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/TTSChunkTest.java index 8a30b1c21..9d04b07de 100644 --- a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/TTSChunkTest.java +++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/TTSChunkTest.java @@ -13,54 +13,54 @@ import org.json.JSONObject; import java.util.Iterator; public class TTSChunkTest extends TestCase { - - private TTSChunk msg; - @Override - public void setUp() { - msg = new TTSChunk(); - - msg.setText(TestValues.GENERAL_STRING); - msg.setType(TestValues.GENERAL_SPEECHCAPABILITIES); - } + private TTSChunk msg; + + @Override + public void setUp() { + msg = new TTSChunk(); + + msg.setText(TestValues.GENERAL_STRING); + msg.setType(TestValues.GENERAL_SPEECHCAPABILITIES); + } /** - * Tests the expected values of the RPC message. - */ - public void testRpcValues () { - // Test Values - String text = msg.getText(); - SpeechCapabilities speechType = msg.getType(); - - // Valid Tests - assertEquals(TestValues.MATCH, TestValues.GENERAL_STRING, text); - assertEquals(TestValues.MATCH, TestValues.GENERAL_SPEECHCAPABILITIES, speechType); - - // Invalid/Null Tests - TTSChunk msg = new TTSChunk(); - assertNotNull(TestValues.NOT_NULL, msg); - - assertNull(TestValues.NULL, msg.getText()); - assertNull(TestValues.NULL, msg.getType()); - } - - public void testJson() { - JSONObject reference = new JSONObject(); - - try { - reference.put(TTSChunk.KEY_TEXT, TestValues.GENERAL_STRING); - reference.put(TTSChunk.KEY_TYPE, TestValues.GENERAL_SPEECHCAPABILITIES); - - JSONObject underTest = msg.serializeJSON(); - assertEquals(TestValues.MATCH, reference.length(), underTest.length()); - - Iterator<?> iterator = reference.keys(); - while (iterator.hasNext()) { - String key = (String) iterator.next(); - assertEquals(TestValues.MATCH, JsonUtils.readObjectFromJsonObject(reference, key), JsonUtils.readObjectFromJsonObject(underTest, key)); - } - } catch (JSONException e) { - fail(TestValues.JSON_FAIL); - } - } + * Tests the expected values of the RPC message. + */ + public void testRpcValues() { + // Test Values + String text = msg.getText(); + SpeechCapabilities speechType = msg.getType(); + + // Valid Tests + assertEquals(TestValues.MATCH, TestValues.GENERAL_STRING, text); + assertEquals(TestValues.MATCH, TestValues.GENERAL_SPEECHCAPABILITIES, speechType); + + // Invalid/Null Tests + TTSChunk msg = new TTSChunk(); + assertNotNull(TestValues.NOT_NULL, msg); + + assertNull(TestValues.NULL, msg.getText()); + assertNull(TestValues.NULL, msg.getType()); + } + + public void testJson() { + JSONObject reference = new JSONObject(); + + try { + reference.put(TTSChunk.KEY_TEXT, TestValues.GENERAL_STRING); + reference.put(TTSChunk.KEY_TYPE, TestValues.GENERAL_SPEECHCAPABILITIES); + + JSONObject underTest = msg.serializeJSON(); + assertEquals(TestValues.MATCH, reference.length(), underTest.length()); + + Iterator<?> iterator = reference.keys(); + while (iterator.hasNext()) { + String key = (String) iterator.next(); + assertEquals(TestValues.MATCH, JsonUtils.readObjectFromJsonObject(reference, key), JsonUtils.readObjectFromJsonObject(underTest, key)); + } + } catch (JSONException e) { + fail(TestValues.JSON_FAIL); + } + } }
\ No newline at end of file diff --git a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/TemperatureTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/TemperatureTests.java index 2bff0d31b..98bb58fb7 100644 --- a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/TemperatureTests.java +++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/TemperatureTests.java @@ -13,15 +13,15 @@ import org.json.JSONObject; import java.util.Iterator; /** - * This is a unit test class for the SmartDeviceLink library project class : + * This is a unit test class for the SmartDeviceLink library project class : * {@link com.smartdevicelink.proxy.rpc.Temperature} */ -public class TemperatureTests extends TestCase{ - +public class TemperatureTests extends TestCase { + private Temperature msg; @Override - public void setUp(){ + public void setUp() { msg = new Temperature(); msg.setUnit(TestValues.GENERAL_TEMPERATUREUNIT); @@ -29,9 +29,9 @@ public class TemperatureTests extends TestCase{ } /** - * Tests the expected values of the RPC message. - */ - public void testRpcValues () { + * Tests the expected values of the RPC message. + */ + public void testRpcValues() { // Test Values TemperatureUnit unit = msg.getUnit(); float value = msg.getValue(); @@ -48,10 +48,10 @@ public class TemperatureTests extends TestCase{ assertNull(TestValues.NULL, msg.getValue()); } - public void testJson(){ + public void testJson() { JSONObject reference = new JSONObject(); - try{ + try { reference.put(Temperature.KEY_VALUE, (Float) TestValues.GENERAL_FLOAT); reference.put(Temperature.KEY_UNIT, TestValues.GENERAL_TEMPERATUREUNIT); @@ -59,14 +59,14 @@ public class TemperatureTests extends TestCase{ assertEquals(TestValues.MATCH, reference.length(), underTest.length()); Iterator<?> iterator = reference.keys(); - while(iterator.hasNext()){ + while (iterator.hasNext()) { String key = (String) iterator.next(); assertEquals(TestValues.MATCH, JsonUtils.readObjectFromJsonObject(reference, key), JsonUtils.readObjectFromJsonObject(underTest, key)); } - } catch(JSONException e){ - fail(TestValues.JSON_FAIL); + } catch (JSONException e) { + fail(TestValues.JSON_FAIL); } } }
\ No newline at end of file diff --git a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/TemplateColorSchemeTest.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/TemplateColorSchemeTest.java index 22ef586d2..be1150c5b 100644 --- a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/TemplateColorSchemeTest.java +++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/TemplateColorSchemeTest.java @@ -15,66 +15,66 @@ import org.json.JSONObject; import java.util.Iterator; /** - * This is a unit test class for the SmartDeviceLink library project class : + * This is a unit test class for the SmartDeviceLink library project class : * {@link com.smartdevicelink.proxy.rpc.TemplateColorScheme} */ public class TemplateColorSchemeTest extends TestCase { - - private TemplateColorScheme msg; - @Override - public void setUp() { - msg = new TemplateColorScheme(); - msg.setPrimaryColor(TestValues.GENERAL_RGBCOLOR); - msg.setSecondaryColor(TestValues.GENERAL_RGBCOLOR); - msg.setBackgroundColor(TestValues.GENERAL_RGBCOLOR); - } + private TemplateColorScheme msg; + + @Override + public void setUp() { + msg = new TemplateColorScheme(); + msg.setPrimaryColor(TestValues.GENERAL_RGBCOLOR); + msg.setSecondaryColor(TestValues.GENERAL_RGBCOLOR); + msg.setBackgroundColor(TestValues.GENERAL_RGBCOLOR); + } /** - * Tests the expected values of the RPC message. - */ - public void testRpcValues () { - // Test Values - RGBColor primaryColor = msg.getPrimaryColor(); - RGBColor secondaryColor = msg.getSecondaryColor(); - RGBColor backgroundColor = msg.getBackgroundColor(); + * Tests the expected values of the RPC message. + */ + public void testRpcValues() { + // Test Values + RGBColor primaryColor = msg.getPrimaryColor(); + RGBColor secondaryColor = msg.getSecondaryColor(); + RGBColor backgroundColor = msg.getBackgroundColor(); - // Valid Tests - assertTrue(TestValues.TRUE, Validator.validateRGBColor(TestValues.GENERAL_RGBCOLOR, primaryColor)); - assertTrue(TestValues.TRUE, Validator.validateRGBColor(TestValues.GENERAL_RGBCOLOR, secondaryColor)); - assertTrue(TestValues.TRUE, Validator.validateRGBColor(TestValues.GENERAL_RGBCOLOR, backgroundColor)); + // Valid Tests + assertTrue(TestValues.TRUE, Validator.validateRGBColor(TestValues.GENERAL_RGBCOLOR, primaryColor)); + assertTrue(TestValues.TRUE, Validator.validateRGBColor(TestValues.GENERAL_RGBCOLOR, secondaryColor)); + assertTrue(TestValues.TRUE, Validator.validateRGBColor(TestValues.GENERAL_RGBCOLOR, backgroundColor)); - // Invalid/Null Tests - TemplateColorScheme msg = new TemplateColorScheme(); - assertNotNull(TestValues.NOT_NULL, msg); + // Invalid/Null Tests + TemplateColorScheme msg = new TemplateColorScheme(); + assertNotNull(TestValues.NOT_NULL, msg); - assertNull(TestValues.NULL, msg.getPrimaryColor()); - assertNull(TestValues.NULL, msg.getSecondaryColor()); - assertNull(TestValues.NULL, msg.getBackgroundColor()); - } + assertNull(TestValues.NULL, msg.getPrimaryColor()); + assertNull(TestValues.NULL, msg.getSecondaryColor()); + assertNull(TestValues.NULL, msg.getBackgroundColor()); + } - public void testJson() { - JSONObject reference = new JSONObject(); + public void testJson() { + JSONObject reference = new JSONObject(); - try { - reference.put(TemplateColorScheme.KEY_PRIMARY_COLOR, TestValues.JSON_RGBCOLOR); - reference.put(TemplateColorScheme.KEY_SECONDARY_COLOR, TestValues.JSON_RGBCOLOR); - reference.put(TemplateColorScheme.KEY_BACKGROUND_COLOR, TestValues.JSON_RGBCOLOR); + try { + reference.put(TemplateColorScheme.KEY_PRIMARY_COLOR, TestValues.JSON_RGBCOLOR); + reference.put(TemplateColorScheme.KEY_SECONDARY_COLOR, TestValues.JSON_RGBCOLOR); + reference.put(TemplateColorScheme.KEY_BACKGROUND_COLOR, TestValues.JSON_RGBCOLOR); - JSONObject underTest = msg.serializeJSON(); - assertEquals(TestValues.MATCH, reference.length(), underTest.length()); + JSONObject underTest = msg.serializeJSON(); + assertEquals(TestValues.MATCH, reference.length(), underTest.length()); - Iterator<?> iterator = reference.keys(); - while (iterator.hasNext()) { - String key = (String) iterator.next(); - JSONObject referenceColorObj = JsonUtils.readJsonObjectFromJsonObject(reference, key); - RGBColor referenceColor = new RGBColor(JsonRPCMarshaller.deserializeJSONObject(referenceColorObj)); - JSONObject underTestColorObj = JsonUtils.readJsonObjectFromJsonObject(underTest, key); - RGBColor underTestColor = new RGBColor(JsonRPCMarshaller.deserializeJSONObject(underTestColorObj)); - assertTrue(TestValues.TRUE, Validator.validateRGBColor(referenceColor, underTestColor)); - } - } catch (JSONException e) { - fail(TestValues.JSON_FAIL); - } - } + Iterator<?> iterator = reference.keys(); + while (iterator.hasNext()) { + String key = (String) iterator.next(); + JSONObject referenceColorObj = JsonUtils.readJsonObjectFromJsonObject(reference, key); + RGBColor referenceColor = new RGBColor(JsonRPCMarshaller.deserializeJSONObject(referenceColorObj)); + JSONObject underTestColorObj = JsonUtils.readJsonObjectFromJsonObject(underTest, key); + RGBColor underTestColor = new RGBColor(JsonRPCMarshaller.deserializeJSONObject(underTestColorObj)); + assertTrue(TestValues.TRUE, Validator.validateRGBColor(referenceColor, underTestColor)); + } + } catch (JSONException e) { + fail(TestValues.JSON_FAIL); + } + } }
\ No newline at end of file diff --git a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/TemplateConfigurationTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/TemplateConfigurationTests.java index d01bb92fd..6b0ea016f 100644 --- a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/TemplateConfigurationTests.java +++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/TemplateConfigurationTests.java @@ -16,7 +16,7 @@ import java.util.Hashtable; import java.util.Iterator; /** - * This is a unit test class for the SmartDeviceLink library project class : + * This is a unit test class for the SmartDeviceLink library project class : * {@link com.smartdevicelink.proxy.rpc.TemplateConfiguration} */ public class TemplateConfigurationTests extends TestCase { @@ -24,7 +24,7 @@ public class TemplateConfigurationTests extends TestCase { private TemplateConfiguration msg; @Override - public void setUp(){ + public void setUp() { msg = new TemplateConfiguration(); msg.setTemplate(TestValues.GENERAL_STRING); @@ -36,17 +36,17 @@ public class TemplateConfigurationTests extends TestCase { /** * Tests the expected values of the RPC message. */ - public void testRpcValues () { - // Test Values + public void testRpcValues() { + // Test Values String testTemplate = msg.getTemplate(); TemplateColorScheme testDayColorScheme = msg.getDayColorScheme(); TemplateColorScheme testNightColorScheme = msg.getNightColorScheme(); - + // Valid Tests assertEquals(TestValues.MATCH, TestValues.GENERAL_STRING, testTemplate); assertEquals(TestValues.MATCH, TestValues.GENERAL_DAYCOLORSCHEME, testDayColorScheme); assertEquals(TestValues.MATCH, TestValues.GENERAL_NIGHTCOLORSCHEME, testNightColorScheme); - + // Invalid/Null Tests TemplateConfiguration msg = new TemplateConfiguration(); assertNotNull(TestValues.NOT_NULL, msg); @@ -56,10 +56,10 @@ public class TemplateConfigurationTests extends TestCase { assertNull(TestValues.NULL, msg.getNightColorScheme()); } - public void testJson(){ + public void testJson() { JSONObject reference = new JSONObject(); - try{ + try { reference.put(TemplateConfiguration.KEY_TEMPLATE, TestValues.GENERAL_STRING); reference.put(TemplateConfiguration.KEY_DAY_COLOR_SCHEME, JsonRPCMarshaller.serializeHashtable(TestValues.GENERAL_DAYCOLORSCHEME.getStore())); reference.put(TemplateConfiguration.KEY_NIGHT_COLOR_SCHEME, JsonRPCMarshaller.serializeHashtable(TestValues.GENERAL_NIGHTCOLORSCHEME.getStore())); @@ -68,7 +68,7 @@ public class TemplateConfigurationTests extends TestCase { assertEquals(TestValues.MATCH, reference.length(), underTest.length()); Iterator<?> iterator = reference.keys(); - while(iterator.hasNext()){ + while (iterator.hasNext()) { String key = (String) iterator.next(); if (key.equals(TemplateConfiguration.KEY_DAY_COLOR_SCHEME)) { @@ -87,8 +87,8 @@ public class TemplateConfigurationTests extends TestCase { assertEquals(TestValues.MATCH, JsonUtils.readObjectFromJsonObject(reference, key), JsonUtils.readObjectFromJsonObject(underTest, key)); } } - } catch(JSONException e){ - fail(TestValues.JSON_FAIL); + } catch (JSONException e) { + fail(TestValues.JSON_FAIL); } } }
\ No newline at end of file diff --git a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/TextFieldTest.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/TextFieldTest.java index cf12f3d1f..affa8c624 100644 --- a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/TextFieldTest.java +++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/TextFieldTest.java @@ -14,68 +14,68 @@ import org.json.JSONObject; import java.util.Iterator; /** - * This is a unit test class for the SmartDeviceLink library project class : + * This is a unit test class for the SmartDeviceLink library project class : * {@link com.smartdevicelink.proxy.rpc.TextField} */ public class TextFieldTest extends TestCase { - - private TextField msg; - - @Override - public void setUp() { - msg = new TextField(); - - msg.setName(TestValues.GENERAL_TEXTFIELDNAME); - msg.setCharacterSet(TestValues.GENERAL_CHARACTERSET); - msg.setWidth(TestValues.GENERAL_INT); - msg.setRows(TestValues.GENERAL_INT); - } + + private TextField msg; + + @Override + public void setUp() { + msg = new TextField(); + + msg.setName(TestValues.GENERAL_TEXTFIELDNAME); + msg.setCharacterSet(TestValues.GENERAL_CHARACTERSET); + msg.setWidth(TestValues.GENERAL_INT); + msg.setRows(TestValues.GENERAL_INT); + } /** - * Tests the expected values of the RPC message. - */ - public void testRpcValues () { - // Test Values - TextFieldName name = msg.getName(); - CharacterSet charSet = msg.getCharacterSet(); - Integer width = msg.getWidth(); - Integer rows = msg.getRows(); - - // Valid Tests - assertEquals(TestValues.MATCH, TestValues.GENERAL_TEXTFIELDNAME, name); - assertEquals(TestValues.MATCH, TestValues.GENERAL_CHARACTERSET, charSet); - assertEquals(TestValues.MATCH, (Integer) TestValues.GENERAL_INT, width); - assertEquals(TestValues.MATCH, (Integer) TestValues.GENERAL_INT, rows); - - // Invalid/Null Tests - TextField msg = new TextField(); - assertNotNull(TestValues.NOT_NULL, msg); - - assertNull(TestValues.NULL, msg.getName()); - assertNull(TestValues.NULL, msg.getWidth()); - assertNull(TestValues.NULL, msg.getRows()); - assertNull(TestValues.NULL, msg.getCharacterSet()); - } - - public void testJson() { - JSONObject reference = new JSONObject(); - - try { - reference.put(TextField.KEY_CHARACTER_SET, TestValues.GENERAL_CHARACTERSET); - reference.put(TextField.KEY_WIDTH, TestValues.GENERAL_INT); - reference.put(TextField.KEY_ROWS, TestValues.GENERAL_INT); - reference.put(TextField.KEY_NAME, TestValues.GENERAL_TEXTFIELDNAME); - - JSONObject underTest = msg.serializeJSON(); - assertEquals(TestValues.MATCH, reference.length(), underTest.length()); - - Iterator<?> iterator = reference.keys(); - while (iterator.hasNext()) { - String key = (String) iterator.next(); - assertEquals(TestValues.MATCH, JsonUtils.readObjectFromJsonObject(reference, key), JsonUtils.readObjectFromJsonObject(underTest, key)); - } - } catch (JSONException e) { - fail(TestValues.JSON_FAIL); - } - } + * Tests the expected values of the RPC message. + */ + public void testRpcValues() { + // Test Values + TextFieldName name = msg.getName(); + CharacterSet charSet = msg.getCharacterSet(); + Integer width = msg.getWidth(); + Integer rows = msg.getRows(); + + // Valid Tests + assertEquals(TestValues.MATCH, TestValues.GENERAL_TEXTFIELDNAME, name); + assertEquals(TestValues.MATCH, TestValues.GENERAL_CHARACTERSET, charSet); + assertEquals(TestValues.MATCH, (Integer) TestValues.GENERAL_INT, width); + assertEquals(TestValues.MATCH, (Integer) TestValues.GENERAL_INT, rows); + + // Invalid/Null Tests + TextField msg = new TextField(); + assertNotNull(TestValues.NOT_NULL, msg); + + assertNull(TestValues.NULL, msg.getName()); + assertNull(TestValues.NULL, msg.getWidth()); + assertNull(TestValues.NULL, msg.getRows()); + assertNull(TestValues.NULL, msg.getCharacterSet()); + } + + public void testJson() { + JSONObject reference = new JSONObject(); + + try { + reference.put(TextField.KEY_CHARACTER_SET, TestValues.GENERAL_CHARACTERSET); + reference.put(TextField.KEY_WIDTH, TestValues.GENERAL_INT); + reference.put(TextField.KEY_ROWS, TestValues.GENERAL_INT); + reference.put(TextField.KEY_NAME, TestValues.GENERAL_TEXTFIELDNAME); + + JSONObject underTest = msg.serializeJSON(); + assertEquals(TestValues.MATCH, reference.length(), underTest.length()); + + Iterator<?> iterator = reference.keys(); + while (iterator.hasNext()) { + String key = (String) iterator.next(); + assertEquals(TestValues.MATCH, JsonUtils.readObjectFromJsonObject(reference, key), JsonUtils.readObjectFromJsonObject(underTest, key)); + } + } catch (JSONException e) { + fail(TestValues.JSON_FAIL); + } + } }
\ No newline at end of file diff --git a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/TireStatusTest.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/TireStatusTest.java index 59d289546..dfbf4bc7c 100644 --- a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/TireStatusTest.java +++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/TireStatusTest.java @@ -13,96 +13,96 @@ import org.json.JSONException; import org.json.JSONObject; /** - * This is a unit test class for the SmartDeviceLink library project class : + * This is a unit test class for the SmartDeviceLink library project class : * {@link com.smartdevicelink.proxy.rpc.TireStatus} */ public class TireStatusTest extends TestCase { - - private TireStatus msg; - @Override - public void setUp() { - msg = new TireStatus(); - msg.setPressureTellTale(TestValues.GENERAL_WARNINGLIGHTSTATUS); - SingleTireStatus tireLeftFront = new SingleTireStatus(); - tireLeftFront.setStatus(TestValues.GENERAL_COMPONENTVOLUMESTATUS); - msg.setLeftFront(tireLeftFront); - SingleTireStatus tireRightFront = new SingleTireStatus(); - tireRightFront.setStatus(TestValues.GENERAL_COMPONENTVOLUMESTATUS); - msg.setRightFront(tireRightFront); - SingleTireStatus tireLeftRear = new SingleTireStatus(); - tireLeftRear.setStatus(TestValues.GENERAL_COMPONENTVOLUMESTATUS); - msg.setLeftRear(tireLeftRear); - SingleTireStatus tireRightRear = new SingleTireStatus(); - tireRightRear.setStatus(TestValues.GENERAL_COMPONENTVOLUMESTATUS); - msg.setRightRear(tireRightRear); - SingleTireStatus tireInnerLeftRear = new SingleTireStatus(); - tireInnerLeftRear.setStatus(TestValues.GENERAL_COMPONENTVOLUMESTATUS); - msg.setInnerLeftRear(tireInnerLeftRear); - SingleTireStatus tireInnerRightRear = new SingleTireStatus(); - tireInnerRightRear.setStatus(TestValues.GENERAL_COMPONENTVOLUMESTATUS); - msg.setInnerRightRear(tireInnerRightRear); - } + private TireStatus msg; + + @Override + public void setUp() { + msg = new TireStatus(); + msg.setPressureTellTale(TestValues.GENERAL_WARNINGLIGHTSTATUS); + SingleTireStatus tireLeftFront = new SingleTireStatus(); + tireLeftFront.setStatus(TestValues.GENERAL_COMPONENTVOLUMESTATUS); + msg.setLeftFront(tireLeftFront); + SingleTireStatus tireRightFront = new SingleTireStatus(); + tireRightFront.setStatus(TestValues.GENERAL_COMPONENTVOLUMESTATUS); + msg.setRightFront(tireRightFront); + SingleTireStatus tireLeftRear = new SingleTireStatus(); + tireLeftRear.setStatus(TestValues.GENERAL_COMPONENTVOLUMESTATUS); + msg.setLeftRear(tireLeftRear); + SingleTireStatus tireRightRear = new SingleTireStatus(); + tireRightRear.setStatus(TestValues.GENERAL_COMPONENTVOLUMESTATUS); + msg.setRightRear(tireRightRear); + SingleTireStatus tireInnerLeftRear = new SingleTireStatus(); + tireInnerLeftRear.setStatus(TestValues.GENERAL_COMPONENTVOLUMESTATUS); + msg.setInnerLeftRear(tireInnerLeftRear); + SingleTireStatus tireInnerRightRear = new SingleTireStatus(); + tireInnerRightRear.setStatus(TestValues.GENERAL_COMPONENTVOLUMESTATUS); + msg.setInnerRightRear(tireInnerRightRear); + } /** - * Tests the expected values of the RPC message. - */ - public void testRpcValues () { - // Test Values - WarningLightStatus pressure = msg.getPressureTellTale(); - SingleTireStatus leftFront = msg.getLeftFront(); - SingleTireStatus rightFront = msg.getRightFront(); - SingleTireStatus leftRear = msg.getLeftRear(); - SingleTireStatus rightRear = msg.getRightRear(); - SingleTireStatus innerLeftRear = msg.getInnerLeftRear(); - SingleTireStatus innerRightRear = msg.getInnerRightRear(); - - // Valid Tests - assertEquals(TestValues.MATCH, TestValues.GENERAL_WARNINGLIGHTSTATUS, pressure); - assertEquals(TestValues.MATCH, TestValues.GENERAL_COMPONENTVOLUMESTATUS, leftFront.getStatus()); - assertEquals(TestValues.MATCH, TestValues.GENERAL_COMPONENTVOLUMESTATUS, rightFront.getStatus()); - assertEquals(TestValues.MATCH, TestValues.GENERAL_COMPONENTVOLUMESTATUS, leftRear.getStatus()); - assertEquals(TestValues.MATCH, TestValues.GENERAL_COMPONENTVOLUMESTATUS, rightRear.getStatus()); - assertEquals(TestValues.MATCH, TestValues.GENERAL_COMPONENTVOLUMESTATUS, innerLeftRear.getStatus()); - assertEquals(TestValues.MATCH, TestValues.GENERAL_COMPONENTVOLUMESTATUS, innerRightRear.getStatus()); - - // Invalid/Null Tests - TireStatus msg = new TireStatus(); - assertNotNull(TestValues.NOT_NULL, msg); - } + * Tests the expected values of the RPC message. + */ + public void testRpcValues() { + // Test Values + WarningLightStatus pressure = msg.getPressureTellTale(); + SingleTireStatus leftFront = msg.getLeftFront(); + SingleTireStatus rightFront = msg.getRightFront(); + SingleTireStatus leftRear = msg.getLeftRear(); + SingleTireStatus rightRear = msg.getRightRear(); + SingleTireStatus innerLeftRear = msg.getInnerLeftRear(); + SingleTireStatus innerRightRear = msg.getInnerRightRear(); + + // Valid Tests + assertEquals(TestValues.MATCH, TestValues.GENERAL_WARNINGLIGHTSTATUS, pressure); + assertEquals(TestValues.MATCH, TestValues.GENERAL_COMPONENTVOLUMESTATUS, leftFront.getStatus()); + assertEquals(TestValues.MATCH, TestValues.GENERAL_COMPONENTVOLUMESTATUS, rightFront.getStatus()); + assertEquals(TestValues.MATCH, TestValues.GENERAL_COMPONENTVOLUMESTATUS, leftRear.getStatus()); + assertEquals(TestValues.MATCH, TestValues.GENERAL_COMPONENTVOLUMESTATUS, rightRear.getStatus()); + assertEquals(TestValues.MATCH, TestValues.GENERAL_COMPONENTVOLUMESTATUS, innerLeftRear.getStatus()); + assertEquals(TestValues.MATCH, TestValues.GENERAL_COMPONENTVOLUMESTATUS, innerRightRear.getStatus()); + + // Invalid/Null Tests + TireStatus msg = new TireStatus(); + assertNotNull(TestValues.NOT_NULL, msg); + } + + public void testJson() { + JSONObject reference = new JSONObject(); + + try { + reference.put(TireStatus.KEY_PRESSURE_TELL_TALE, TestValues.GENERAL_WARNINGLIGHTSTATUS); + JSONObject tireLeftFront = new JSONObject(); + tireLeftFront.put(SingleTireStatus.KEY_STATUS, TestValues.GENERAL_COMPONENTVOLUMESTATUS); + reference.put(TireStatus.KEY_LEFT_FRONT, tireLeftFront); + JSONObject tireRightFront = new JSONObject(); + tireRightFront.put(SingleTireStatus.KEY_STATUS, TestValues.GENERAL_COMPONENTVOLUMESTATUS); + reference.put(TireStatus.KEY_RIGHT_FRONT, tireRightFront); + JSONObject tireLeftRear = new JSONObject(); + tireLeftRear.put(SingleTireStatus.KEY_STATUS, TestValues.GENERAL_COMPONENTVOLUMESTATUS); + reference.put(TireStatus.KEY_LEFT_REAR, tireLeftRear); + JSONObject tireRightRear = new JSONObject(); + tireRightRear.put(SingleTireStatus.KEY_STATUS, TestValues.GENERAL_COMPONENTVOLUMESTATUS); + reference.put(TireStatus.KEY_RIGHT_REAR, tireRightRear); + JSONObject tireInnerLeftRear = new JSONObject(); + tireInnerLeftRear.put(SingleTireStatus.KEY_STATUS, TestValues.GENERAL_COMPONENTVOLUMESTATUS); + reference.put(TireStatus.KEY_INNER_LEFT_REAR, tireInnerLeftRear); + JSONObject tireInnerRightRear = new JSONObject(); + tireInnerRightRear.put(SingleTireStatus.KEY_STATUS, TestValues.GENERAL_COMPONENTVOLUMESTATUS); + reference.put(TireStatus.KEY_INNER_RIGHT_REAR, tireInnerRightRear); + + JSONObject underTest = msg.serializeJSON(); + assertEquals(TestValues.MATCH, reference.length(), underTest.length()); - public void testJson() { - JSONObject reference = new JSONObject(); - - try { - reference.put(TireStatus.KEY_PRESSURE_TELL_TALE, TestValues.GENERAL_WARNINGLIGHTSTATUS); - JSONObject tireLeftFront = new JSONObject(); - tireLeftFront.put(SingleTireStatus.KEY_STATUS, TestValues.GENERAL_COMPONENTVOLUMESTATUS); - reference.put(TireStatus.KEY_LEFT_FRONT, tireLeftFront); - JSONObject tireRightFront = new JSONObject(); - tireRightFront.put(SingleTireStatus.KEY_STATUS, TestValues.GENERAL_COMPONENTVOLUMESTATUS); - reference.put(TireStatus.KEY_RIGHT_FRONT, tireRightFront); - JSONObject tireLeftRear = new JSONObject(); - tireLeftRear.put(SingleTireStatus.KEY_STATUS, TestValues.GENERAL_COMPONENTVOLUMESTATUS); - reference.put(TireStatus.KEY_LEFT_REAR, tireLeftRear); - JSONObject tireRightRear = new JSONObject(); - tireRightRear.put(SingleTireStatus.KEY_STATUS, TestValues.GENERAL_COMPONENTVOLUMESTATUS); - reference.put(TireStatus.KEY_RIGHT_REAR, tireRightRear); - JSONObject tireInnerLeftRear = new JSONObject(); - tireInnerLeftRear.put(SingleTireStatus.KEY_STATUS, TestValues.GENERAL_COMPONENTVOLUMESTATUS); - reference.put(TireStatus.KEY_INNER_LEFT_REAR, tireInnerLeftRear); - JSONObject tireInnerRightRear = new JSONObject(); - tireInnerRightRear.put(SingleTireStatus.KEY_STATUS, TestValues.GENERAL_COMPONENTVOLUMESTATUS); - reference.put(TireStatus.KEY_INNER_RIGHT_REAR, tireInnerRightRear); - - JSONObject underTest = msg.serializeJSON(); - assertEquals(TestValues.MATCH, reference.length(), underTest.length()); - - assertTrue(TestValues.TRUE, Validator.validateTireStatus( - new TireStatus(JsonRPCMarshaller.deserializeJSONObject(reference)), - new TireStatus(JsonRPCMarshaller.deserializeJSONObject(underTest)))); - } catch (JSONException e) { - fail(TestValues.JSON_FAIL); - } - } + assertTrue(TestValues.TRUE, Validator.validateTireStatus( + new TireStatus(JsonRPCMarshaller.deserializeJSONObject(reference)), + new TireStatus(JsonRPCMarshaller.deserializeJSONObject(underTest)))); + } catch (JSONException e) { + fail(TestValues.JSON_FAIL); + } + } }
\ No newline at end of file diff --git a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/TouchCoordTest.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/TouchCoordTest.java index bf0242bd9..6bb4626f3 100644 --- a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/TouchCoordTest.java +++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/TouchCoordTest.java @@ -12,58 +12,58 @@ import org.json.JSONObject; import java.util.Iterator; /** - * This is a unit test class for the SmartDeviceLink library project class : + * This is a unit test class for the SmartDeviceLink library project class : * {@link com.smartdevicelink.proxy.rpc.TouchCoord} */ public class TouchCoordTest extends TestCase { - - private TouchCoord msg; - @Override - public void setUp() { - msg = new TouchCoord(); - - msg.setX(TestValues.GENERAL_INT); - msg.setY(TestValues.GENERAL_INT); - } + private TouchCoord msg; + + @Override + public void setUp() { + msg = new TouchCoord(); + + msg.setX(TestValues.GENERAL_INT); + msg.setY(TestValues.GENERAL_INT); + } /** - * Tests the expected values of the RPC message. - */ - public void testRpcValues () { - // Test Values - Integer x = msg.getX(); - Integer y = msg.getY(); - - // Valid Tests - assertEquals(TestValues.MATCH, (Integer) TestValues.GENERAL_INT, x); - assertEquals(TestValues.MATCH, (Integer) TestValues.GENERAL_INT, y); - - // Invalid/Null Tests - TouchCoord msg = new TouchCoord(); - assertNotNull(TestValues.NOT_NULL, msg); - - assertNull(TestValues.NULL, msg.getX()); - assertNull(TestValues.NULL, msg.getY()); - } - - public void testJson() { - JSONObject reference = new JSONObject(); - - try { - reference.put(TouchCoord.KEY_X, TestValues.GENERAL_INT); - reference.put(TouchCoord.KEY_Y, TestValues.GENERAL_INT); - - JSONObject underTest = msg.serializeJSON(); - assertEquals(TestValues.MATCH, reference.length(), underTest.length()); - - Iterator<?> iterator = reference.keys(); - while (iterator.hasNext()) { - String key = (String) iterator.next(); - assertEquals(TestValues.MATCH, JsonUtils.readObjectFromJsonObject(reference, key), JsonUtils.readObjectFromJsonObject(underTest, key)); - } - } catch (JSONException e) { - fail(TestValues.JSON_FAIL); - } - } + * Tests the expected values of the RPC message. + */ + public void testRpcValues() { + // Test Values + Integer x = msg.getX(); + Integer y = msg.getY(); + + // Valid Tests + assertEquals(TestValues.MATCH, (Integer) TestValues.GENERAL_INT, x); + assertEquals(TestValues.MATCH, (Integer) TestValues.GENERAL_INT, y); + + // Invalid/Null Tests + TouchCoord msg = new TouchCoord(); + assertNotNull(TestValues.NOT_NULL, msg); + + assertNull(TestValues.NULL, msg.getX()); + assertNull(TestValues.NULL, msg.getY()); + } + + public void testJson() { + JSONObject reference = new JSONObject(); + + try { + reference.put(TouchCoord.KEY_X, TestValues.GENERAL_INT); + reference.put(TouchCoord.KEY_Y, TestValues.GENERAL_INT); + + JSONObject underTest = msg.serializeJSON(); + assertEquals(TestValues.MATCH, reference.length(), underTest.length()); + + Iterator<?> iterator = reference.keys(); + while (iterator.hasNext()) { + String key = (String) iterator.next(); + assertEquals(TestValues.MATCH, JsonUtils.readObjectFromJsonObject(reference, key), JsonUtils.readObjectFromJsonObject(underTest, key)); + } + } catch (JSONException e) { + fail(TestValues.JSON_FAIL); + } + } }
\ No newline at end of file diff --git a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/TouchEventCapabilitiesTest.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/TouchEventCapabilitiesTest.java index 82085632f..dba539b81 100644 --- a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/TouchEventCapabilitiesTest.java +++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/TouchEventCapabilitiesTest.java @@ -12,63 +12,63 @@ import org.json.JSONObject; import java.util.Iterator; /** - * This is a unit test class for the SmartDeviceLink library project class : + * This is a unit test class for the SmartDeviceLink library project class : * {@link com.smartdevicelink.proxy.rpc.TouchEventCapabilities} */ public class TouchEventCapabilitiesTest extends TestCase { - - private TouchEventCapabilities msg; - - @Override - public void setUp() { - msg = new TouchEventCapabilities(); - - msg.setPressAvailable(TestValues.GENERAL_BOOLEAN); - msg.setDoublePressAvailable(TestValues.GENERAL_BOOLEAN); - msg.setMultiTouchAvailable(TestValues.GENERAL_BOOLEAN); - } + + private TouchEventCapabilities msg; + + @Override + public void setUp() { + msg = new TouchEventCapabilities(); + + msg.setPressAvailable(TestValues.GENERAL_BOOLEAN); + msg.setDoublePressAvailable(TestValues.GENERAL_BOOLEAN); + msg.setMultiTouchAvailable(TestValues.GENERAL_BOOLEAN); + } /** - * Tests the expected values of the RPC message. - */ - public void testRpcValues () { - // Test Values - Boolean press = msg.getPressAvailable(); - Boolean multiTouch = msg.getMultiTouchAvailable(); - Boolean doublePress = msg.getDoublePressAvailable(); - - // Valid Tests - assertEquals(TestValues.MATCH, (Boolean) TestValues.GENERAL_BOOLEAN, press); - assertEquals(TestValues.MATCH, (Boolean) TestValues.GENERAL_BOOLEAN, multiTouch); - assertEquals(TestValues.MATCH, (Boolean) TestValues.GENERAL_BOOLEAN, doublePress); - - // Invalid/Null Tests - TouchEventCapabilities msg = new TouchEventCapabilities(); - assertNotNull(TestValues.NOT_NULL, msg); - - assertNull(TestValues.NULL, msg.getPressAvailable()); - assertNull(TestValues.NULL, msg.getMultiTouchAvailable()); - assertNull(TestValues.NULL, msg.getDoublePressAvailable()); - } - - public void testJson() { - JSONObject reference = new JSONObject(); - - try { - reference.put(TouchEventCapabilities.KEY_PRESS_AVAILABLE, TestValues.GENERAL_BOOLEAN); - reference.put(TouchEventCapabilities.KEY_MULTI_TOUCH_AVAILABLE, TestValues.GENERAL_BOOLEAN); - reference.put(TouchEventCapabilities.KEY_DOUBLE_PRESS_AVAILABLE, TestValues.GENERAL_BOOLEAN); - - JSONObject underTest = msg.serializeJSON(); - assertEquals(TestValues.MATCH, reference.length(), underTest.length()); - - Iterator<?> iterator = reference.keys(); - while (iterator.hasNext()) { - String key = (String) iterator.next(); - assertEquals(TestValues.MATCH, JsonUtils.readObjectFromJsonObject(reference, key), JsonUtils.readObjectFromJsonObject(underTest, key)); - } - } catch (JSONException e) { - fail(TestValues.JSON_FAIL); - } - } + * Tests the expected values of the RPC message. + */ + public void testRpcValues() { + // Test Values + Boolean press = msg.getPressAvailable(); + Boolean multiTouch = msg.getMultiTouchAvailable(); + Boolean doublePress = msg.getDoublePressAvailable(); + + // Valid Tests + assertEquals(TestValues.MATCH, (Boolean) TestValues.GENERAL_BOOLEAN, press); + assertEquals(TestValues.MATCH, (Boolean) TestValues.GENERAL_BOOLEAN, multiTouch); + assertEquals(TestValues.MATCH, (Boolean) TestValues.GENERAL_BOOLEAN, doublePress); + + // Invalid/Null Tests + TouchEventCapabilities msg = new TouchEventCapabilities(); + assertNotNull(TestValues.NOT_NULL, msg); + + assertNull(TestValues.NULL, msg.getPressAvailable()); + assertNull(TestValues.NULL, msg.getMultiTouchAvailable()); + assertNull(TestValues.NULL, msg.getDoublePressAvailable()); + } + + public void testJson() { + JSONObject reference = new JSONObject(); + + try { + reference.put(TouchEventCapabilities.KEY_PRESS_AVAILABLE, TestValues.GENERAL_BOOLEAN); + reference.put(TouchEventCapabilities.KEY_MULTI_TOUCH_AVAILABLE, TestValues.GENERAL_BOOLEAN); + reference.put(TouchEventCapabilities.KEY_DOUBLE_PRESS_AVAILABLE, TestValues.GENERAL_BOOLEAN); + + JSONObject underTest = msg.serializeJSON(); + assertEquals(TestValues.MATCH, reference.length(), underTest.length()); + + Iterator<?> iterator = reference.keys(); + while (iterator.hasNext()) { + String key = (String) iterator.next(); + assertEquals(TestValues.MATCH, JsonUtils.readObjectFromJsonObject(reference, key), JsonUtils.readObjectFromJsonObject(underTest, key)); + } + } catch (JSONException e) { + fail(TestValues.JSON_FAIL); + } + } }
\ No newline at end of file diff --git a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/TouchEventTest.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/TouchEventTest.java index f26558ad8..56654b679 100644 --- a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/TouchEventTest.java +++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/TouchEventTest.java @@ -15,75 +15,75 @@ import java.util.Iterator; import java.util.List; /** - * This is a unit test class for the SmartDeviceLink library project class : + * This is a unit test class for the SmartDeviceLink library project class : * {@link com.smartdevicelink.proxy.rpc.TouchEvent} */ public class TouchEventTest extends TestCase { - - private TouchEvent msg; - @Override - public void setUp() { - msg = new TouchEvent(); - msg.setId(TestValues.GENERAL_INT); - msg.setTs(TestValues.GENERAL_LONG_LIST); - msg.setC(TestValues.GENERAL_TOUCHCOORD_LIST); - } + private TouchEvent msg; + + @Override + public void setUp() { + msg = new TouchEvent(); + msg.setId(TestValues.GENERAL_INT); + msg.setTs(TestValues.GENERAL_LONG_LIST); + msg.setC(TestValues.GENERAL_TOUCHCOORD_LIST); + } /** - * Tests the expected values of the RPC message. - */ - public void testRpcValues () { - // Test Values - Integer id = msg.getId(); - List<Long> timestamp = msg.getTs(); - List<TouchCoord> coordTest = msg.getC(); - - // Valid Tests - assertEquals(TestValues.MATCH, (Integer) TestValues.GENERAL_INT, id); - assertTrue(TestValues.TRUE, Validator.validateLongList(TestValues.GENERAL_LONG_LIST, timestamp)); - assertEquals(TestValues.MATCH, TestValues.GENERAL_TOUCHCOORD_LIST.size(), coordTest.size()); - - for (int index = 0; index < TestValues.GENERAL_TOUCHCOORD_LIST.size(); index++) { - assertTrue(TestValues.TRUE, Validator.validateTouchCoord(TestValues.GENERAL_TOUCHCOORD_LIST.get(index), coordTest.get(index))); - } - - // Invalid/Null Tests - TouchEvent msg = new TouchEvent(); - assertNotNull(TestValues.NOT_NULL, msg); - - assertNull(TestValues.NULL, msg.getId()); - assertNull(TestValues.NULL, msg.getTs()); - assertNull(TestValues.NULL, msg.getC()); - } - - public void testJson() { - JSONObject reference = new JSONObject(); - - try { - reference.put(TouchEvent.KEY_ID, TestValues.GENERAL_INT); - reference.put(TouchEvent.KEY_TS, JsonUtils.createJsonArray(TestValues.GENERAL_LONG_LIST)); - reference.put(TouchEvent.KEY_C, TestValues.JSON_TOUCHCOORDS); - - 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(TouchEvent.KEY_C)) { - assertTrue(TestValues.TRUE, JsonUtils.readIntegerFromJsonObject(reference, key) == JsonUtils.readIntegerFromJsonObject(underTest, key)); - } else if (key.equals(TouchEvent.KEY_TS)) { - List<Long> tsListReference = JsonUtils.readLongListFromJsonObject(reference, key); - List<Long> tsListTest = JsonUtils.readLongListFromJsonObject(underTest, key); - assertTrue(TestValues.TRUE, tsListReference.containsAll(tsListTest) && tsListTest.containsAll(tsListReference)); - } else { - assertEquals(TestValues.MATCH, JsonUtils.readObjectFromJsonObject(reference, key), JsonUtils.readObjectFromJsonObject(underTest, key)); - } - } - } catch (JSONException e) { - fail(TestValues.JSON_FAIL); - } - } + * Tests the expected values of the RPC message. + */ + public void testRpcValues() { + // Test Values + Integer id = msg.getId(); + List<Long> timestamp = msg.getTs(); + List<TouchCoord> coordTest = msg.getC(); + + // Valid Tests + assertEquals(TestValues.MATCH, (Integer) TestValues.GENERAL_INT, id); + assertTrue(TestValues.TRUE, Validator.validateLongList(TestValues.GENERAL_LONG_LIST, timestamp)); + assertEquals(TestValues.MATCH, TestValues.GENERAL_TOUCHCOORD_LIST.size(), coordTest.size()); + + for (int index = 0; index < TestValues.GENERAL_TOUCHCOORD_LIST.size(); index++) { + assertTrue(TestValues.TRUE, Validator.validateTouchCoord(TestValues.GENERAL_TOUCHCOORD_LIST.get(index), coordTest.get(index))); + } + + // Invalid/Null Tests + TouchEvent msg = new TouchEvent(); + assertNotNull(TestValues.NOT_NULL, msg); + + assertNull(TestValues.NULL, msg.getId()); + assertNull(TestValues.NULL, msg.getTs()); + assertNull(TestValues.NULL, msg.getC()); + } + + public void testJson() { + JSONObject reference = new JSONObject(); + + try { + reference.put(TouchEvent.KEY_ID, TestValues.GENERAL_INT); + reference.put(TouchEvent.KEY_TS, JsonUtils.createJsonArray(TestValues.GENERAL_LONG_LIST)); + reference.put(TouchEvent.KEY_C, TestValues.JSON_TOUCHCOORDS); + + 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(TouchEvent.KEY_C)) { + assertTrue(TestValues.TRUE, JsonUtils.readIntegerFromJsonObject(reference, key) == JsonUtils.readIntegerFromJsonObject(underTest, key)); + } else if (key.equals(TouchEvent.KEY_TS)) { + List<Long> tsListReference = JsonUtils.readLongListFromJsonObject(reference, key); + List<Long> tsListTest = JsonUtils.readLongListFromJsonObject(underTest, key); + assertTrue(TestValues.TRUE, tsListReference.containsAll(tsListTest) && tsListTest.containsAll(tsListReference)); + } else { + assertEquals(TestValues.MATCH, JsonUtils.readObjectFromJsonObject(reference, key), JsonUtils.readObjectFromJsonObject(underTest, key)); + } + } + } catch (JSONException e) { + fail(TestValues.JSON_FAIL); + } + } }
\ No newline at end of file diff --git a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/TurnTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/TurnTests.java index 6b4b71988..b40d4ca6c 100644 --- a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/TurnTests.java +++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/TurnTests.java @@ -11,46 +11,46 @@ import org.json.JSONException; import org.json.JSONObject; public class TurnTests extends TestCase { - - private Turn msg; - @Override - public void setUp(){ + private Turn msg; + + @Override + public void setUp() { msg = new Turn(); assertNotNull(TestValues.NOT_NULL, msg); - + msg.setTurnIcon(TestValues.GENERAL_IMAGE); msg.setNavigationText(TestValues.GENERAL_STRING); - } + } /** - * Tests the expected values of the RPC message. - */ - public void testRpcValues () { - // Test Values - Image icon = msg.getTurnIcon(); - String text = msg.getNavigationText(); - - // Valid Tests - assertTrue(TestValues.MATCH, Validator.validateImage(TestValues.GENERAL_IMAGE, icon)); - assertEquals(TestValues.MATCH, TestValues.GENERAL_STRING, text); - - // Invalid/Null Tests - Turn msg = new Turn(); - assertNotNull(TestValues.NOT_NULL, msg); - - assertNull(TestValues.NULL, msg.getNavigationText()); - assertNull(TestValues.NULL, msg.getTurnIcon()); - } - - public void testJson(){ + * Tests the expected values of the RPC message. + */ + public void testRpcValues() { + // Test Values + Image icon = msg.getTurnIcon(); + String text = msg.getNavigationText(); + + // Valid Tests + assertTrue(TestValues.MATCH, Validator.validateImage(TestValues.GENERAL_IMAGE, icon)); + assertEquals(TestValues.MATCH, TestValues.GENERAL_STRING, text); + + // Invalid/Null Tests + Turn msg = new Turn(); + assertNotNull(TestValues.NOT_NULL, msg); + + assertNull(TestValues.NULL, msg.getNavigationText()); + assertNull(TestValues.NULL, msg.getTurnIcon()); + } + + public void testJson() { JSONObject reference = new JSONObject(); - try{ - reference.put(Turn.KEY_NAVIGATION_TEXT, TestValues.GENERAL_STRING); - reference.put(Turn.KEY_TURN_IMAGE, TestValues.JSON_IMAGE); - } catch(JSONException e){ - fail(TestValues.JSON_FAIL); + try { + reference.put(Turn.KEY_NAVIGATION_TEXT, TestValues.GENERAL_STRING); + reference.put(Turn.KEY_TURN_IMAGE, TestValues.JSON_IMAGE); + } catch (JSONException e) { + fail(TestValues.JSON_FAIL); } - } + } }
\ No newline at end of file diff --git a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/VehicleDataResultTest.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/VehicleDataResultTest.java index c3b9034f0..13cdea4da 100644 --- a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/VehicleDataResultTest.java +++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/VehicleDataResultTest.java @@ -14,61 +14,61 @@ import org.json.JSONObject; import java.util.Iterator; public class VehicleDataResultTest extends TestCase { - - private VehicleDataResult msg; - - @Override - public void setUp() { - msg = new VehicleDataResult(); - - msg.setDataType(TestValues.GENERAL_VEHICLEDATATYPE); - msg.setResultCode(TestValues.GENERAL_VEHICLEDATARESULTCODE); - msg.setOEMCustomVehicleDataType(TestValues.GENERAL_OEM_CUSTOM_VEHICLE_DATA_NAME); - } + + private VehicleDataResult msg; + + @Override + public void setUp() { + msg = new VehicleDataResult(); + + msg.setDataType(TestValues.GENERAL_VEHICLEDATATYPE); + msg.setResultCode(TestValues.GENERAL_VEHICLEDATARESULTCODE); + msg.setOEMCustomVehicleDataType(TestValues.GENERAL_OEM_CUSTOM_VEHICLE_DATA_NAME); + } /** - * Tests the expected values of the RPC message. - */ - public void testRpcValues () { - // Test Values - VehicleDataResultCode result = msg.getResultCode(); - VehicleDataType type = msg.getDataType(); - String oemCustomDataType = msg.getOEMCustomVehicleDataType(); - - // Valid Tests - assertEquals(TestValues.MATCH, TestValues.GENERAL_VEHICLEDATARESULTCODE, result); - assertEquals(TestValues.MATCH, TestValues.GENERAL_VEHICLEDATATYPE, type); - assertEquals(TestValues.MATCH, TestValues.GENERAL_OEM_CUSTOM_VEHICLE_DATA_NAME, oemCustomDataType); - - // Invalid/Null Tests - VehicleDataResult msg = new VehicleDataResult(); - assertNotNull(TestValues.NOT_NULL, msg); - - assertNull(TestValues.NULL, msg.getDataType()); - assertNull(TestValues.NULL, msg.getResultCode()); - assertNull(TestValues.NULL, msg.getOEMCustomVehicleDataType()); - } - - public void testJson() { - JSONObject reference = new JSONObject(); - - try { - reference.put(VehicleDataResult.KEY_RESULT_CODE, TestValues.GENERAL_VEHICLEDATARESULTCODE); - reference.put(VehicleDataResult.KEY_DATA_TYPE, TestValues.GENERAL_VEHICLEDATATYPE); - reference.put(VehicleDataResult.KEY_OEM_CUSTOM_DATA_TYPE, TestValues.GENERAL_OEM_CUSTOM_VEHICLE_DATA_NAME); - - JSONObject underTest = msg.serializeJSON(); - assertEquals(TestValues.MATCH, reference.length(), underTest.length()); - - Iterator<?> iterator = reference.keys(); - while (iterator.hasNext()) { - String key = (String) iterator.next(); - assertEquals(TestValues.MATCH, - JsonUtils.readObjectFromJsonObject(reference, key), - JsonUtils.readObjectFromJsonObject(underTest, key)); - } - } catch (JSONException e) { - fail(TestValues.JSON_FAIL); - } - } + * Tests the expected values of the RPC message. + */ + public void testRpcValues() { + // Test Values + VehicleDataResultCode result = msg.getResultCode(); + VehicleDataType type = msg.getDataType(); + String oemCustomDataType = msg.getOEMCustomVehicleDataType(); + + // Valid Tests + assertEquals(TestValues.MATCH, TestValues.GENERAL_VEHICLEDATARESULTCODE, result); + assertEquals(TestValues.MATCH, TestValues.GENERAL_VEHICLEDATATYPE, type); + assertEquals(TestValues.MATCH, TestValues.GENERAL_OEM_CUSTOM_VEHICLE_DATA_NAME, oemCustomDataType); + + // Invalid/Null Tests + VehicleDataResult msg = new VehicleDataResult(); + assertNotNull(TestValues.NOT_NULL, msg); + + assertNull(TestValues.NULL, msg.getDataType()); + assertNull(TestValues.NULL, msg.getResultCode()); + assertNull(TestValues.NULL, msg.getOEMCustomVehicleDataType()); + } + + public void testJson() { + JSONObject reference = new JSONObject(); + + try { + reference.put(VehicleDataResult.KEY_RESULT_CODE, TestValues.GENERAL_VEHICLEDATARESULTCODE); + reference.put(VehicleDataResult.KEY_DATA_TYPE, TestValues.GENERAL_VEHICLEDATATYPE); + reference.put(VehicleDataResult.KEY_OEM_CUSTOM_DATA_TYPE, TestValues.GENERAL_OEM_CUSTOM_VEHICLE_DATA_NAME); + + JSONObject underTest = msg.serializeJSON(); + assertEquals(TestValues.MATCH, reference.length(), underTest.length()); + + Iterator<?> iterator = reference.keys(); + while (iterator.hasNext()) { + String key = (String) iterator.next(); + assertEquals(TestValues.MATCH, + JsonUtils.readObjectFromJsonObject(reference, key), + JsonUtils.readObjectFromJsonObject(underTest, key)); + } + } catch (JSONException e) { + fail(TestValues.JSON_FAIL); + } + } }
\ No newline at end of file diff --git a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/VehicleTypeTest.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/VehicleTypeTest.java index 1b0d5730e..a77de7473 100644 --- a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/VehicleTypeTest.java +++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/VehicleTypeTest.java @@ -12,64 +12,64 @@ import org.json.JSONObject; import java.util.Iterator; public class VehicleTypeTest extends TestCase { - - private VehicleType msg; - - @Override - public void setUp() { - msg = new VehicleType(); - - msg.setModel(TestValues.GENERAL_STRING); - msg.setMake(TestValues.GENERAL_STRING); - msg.setTrim(TestValues.GENERAL_STRING); - msg.setModelYear(TestValues.GENERAL_STRING); - } + + private VehicleType msg; + + @Override + public void setUp() { + msg = new VehicleType(); + + msg.setModel(TestValues.GENERAL_STRING); + msg.setMake(TestValues.GENERAL_STRING); + msg.setTrim(TestValues.GENERAL_STRING); + msg.setModelYear(TestValues.GENERAL_STRING); + } /** - * Tests the expected values of the RPC message. - */ - public void testRpcValues () { - // Test Values - String year = msg.getModelYear(); - String trim = msg.getTrim(); - String make = msg.getMake(); - String model = msg.getModel(); - - // Valid Tests - assertEquals(TestValues.MATCH, TestValues.GENERAL_STRING, year); - assertEquals(TestValues.MATCH, TestValues.GENERAL_STRING, model); - assertEquals(TestValues.MATCH, TestValues.GENERAL_STRING, make); - assertEquals(TestValues.MATCH, TestValues.GENERAL_STRING, trim); - - // Invalid/Null Tests - VehicleType msg = new VehicleType(); - assertNotNull(TestValues.NOT_NULL, msg); - - assertNull(TestValues.NULL, msg.getModel()); - assertNull(TestValues.NULL, msg.getMake()); - assertNull(TestValues.NULL, msg.getModelYear()); - assertNull(TestValues.NULL, msg.getTrim()); - } - - public void testJson() { - JSONObject reference = new JSONObject(); - - try { - reference.put(VehicleType.KEY_MODEL, TestValues.GENERAL_STRING); - reference.put(VehicleType.KEY_MAKE, TestValues.GENERAL_STRING); - reference.put(VehicleType.KEY_MODEL_YEAR, TestValues.GENERAL_STRING); - reference.put(VehicleType.KEY_TRIM, TestValues.GENERAL_STRING); - - JSONObject underTest = msg.serializeJSON(); - assertEquals(TestValues.MATCH, reference.length(), underTest.length()); - - Iterator<?> iterator = reference.keys(); - while (iterator.hasNext()) { - String key = (String) iterator.next(); - assertEquals(TestValues.MATCH, JsonUtils.readObjectFromJsonObject(reference, key), JsonUtils.readObjectFromJsonObject(underTest, key)); - } - } catch (JSONException e) { - fail(TestValues.JSON_FAIL); - } - } + * Tests the expected values of the RPC message. + */ + public void testRpcValues() { + // Test Values + String year = msg.getModelYear(); + String trim = msg.getTrim(); + String make = msg.getMake(); + String model = msg.getModel(); + + // Valid Tests + assertEquals(TestValues.MATCH, TestValues.GENERAL_STRING, year); + assertEquals(TestValues.MATCH, TestValues.GENERAL_STRING, model); + assertEquals(TestValues.MATCH, TestValues.GENERAL_STRING, make); + assertEquals(TestValues.MATCH, TestValues.GENERAL_STRING, trim); + + // Invalid/Null Tests + VehicleType msg = new VehicleType(); + assertNotNull(TestValues.NOT_NULL, msg); + + assertNull(TestValues.NULL, msg.getModel()); + assertNull(TestValues.NULL, msg.getMake()); + assertNull(TestValues.NULL, msg.getModelYear()); + assertNull(TestValues.NULL, msg.getTrim()); + } + + public void testJson() { + JSONObject reference = new JSONObject(); + + try { + reference.put(VehicleType.KEY_MODEL, TestValues.GENERAL_STRING); + reference.put(VehicleType.KEY_MAKE, TestValues.GENERAL_STRING); + reference.put(VehicleType.KEY_MODEL_YEAR, TestValues.GENERAL_STRING); + reference.put(VehicleType.KEY_TRIM, TestValues.GENERAL_STRING); + + JSONObject underTest = msg.serializeJSON(); + assertEquals(TestValues.MATCH, reference.length(), underTest.length()); + + Iterator<?> iterator = reference.keys(); + while (iterator.hasNext()) { + String key = (String) iterator.next(); + assertEquals(TestValues.MATCH, JsonUtils.readObjectFromJsonObject(reference, key), JsonUtils.readObjectFromJsonObject(underTest, key)); + } + } catch (JSONException e) { + fail(TestValues.JSON_FAIL); + } + } }
\ No newline at end of file diff --git a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/VideoStreamingCapabilityTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/VideoStreamingCapabilityTests.java index 0fb0288e2..422cd5ddc 100644 --- a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/VideoStreamingCapabilityTests.java +++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/VideoStreamingCapabilityTests.java @@ -21,94 +21,94 @@ import java.util.List; public class VideoStreamingCapabilityTests extends TestCase { - private VideoStreamingCapability msg; - - @Override - public void setUp() { - msg = new VideoStreamingCapability(); - msg.setSupportedFormats(TestValues.GENERAL_VIDEOSTREAMINGFORMAT_LIST); - msg.setPreferredResolution(TestValues.GENERAL_IMAGERESOLUTION); - msg.setMaxBitrate(TestValues.GENERAL_INT); - msg.setIsHapticSpatialDataSupported(TestValues.GENERAL_BOOLEAN); - msg.setDiagonalScreenSize(TestValues.GENERAL_DOUBLE); - msg.setPixelPerInch(TestValues.GENERAL_DOUBLE); - msg.setScale(TestValues.GENERAL_DOUBLE); - } - - /** - * Tests the expected values of the RPC message. - */ - public void testRpcValues () { - // Test Values - List<VideoStreamingFormat> format = msg.getSupportedFormats(); - ImageResolution res = msg.getPreferredResolution(); - Integer maxBitrate = msg.getMaxBitrate(); - Boolean isHapticSpatialDataSupported = msg.getIsHapticSpatialDataSupported(); - Double diagonalScreenSize = msg.getDiagonalScreenSize(); - Double pixelPerInch = msg.getPixelPerInch(); - Double scale = msg.getScale(); - - // Valid Tests - assertEquals(TestValues.MATCH, (List<VideoStreamingFormat>) TestValues.GENERAL_VIDEOSTREAMINGFORMAT_LIST, format); - assertEquals(TestValues.MATCH, (ImageResolution) TestValues.GENERAL_IMAGERESOLUTION, res); - assertEquals(TestValues.MATCH, (Integer) TestValues.GENERAL_INT, maxBitrate); - assertEquals(TestValues.MATCH, (Boolean) TestValues.GENERAL_BOOLEAN, isHapticSpatialDataSupported); - assertEquals(TestValues.MATCH, TestValues.GENERAL_DOUBLE, diagonalScreenSize); - assertEquals(TestValues.MATCH, TestValues.GENERAL_DOUBLE, pixelPerInch); - assertEquals(TestValues.MATCH, TestValues.GENERAL_DOUBLE, scale); - - // Invalid/Null Tests - VideoStreamingCapability msg = new VideoStreamingCapability(); - assertNotNull(TestValues.NOT_NULL, msg); - - assertNull(TestValues.NULL, msg.getMaxBitrate()); - assertNull(TestValues.NULL, msg.getPreferredResolution()); - assertNull(TestValues.NULL, msg.getSupportedFormats()); - assertNull(TestValues.NULL, msg.getIsHapticSpatialDataSupported()); - assertNull(TestValues.NULL, msg.getDiagonalScreenSize()); - assertNull(TestValues.NULL, msg.getPixelPerInch()); - assertNull(TestValues.NULL, msg.getScale()); - } - - public void testJson() { - JSONObject reference = new JSONObject(); - - try { - reference.put(VideoStreamingCapability.KEY_MAX_BITRATE, TestValues.GENERAL_INT); - reference.put(VideoStreamingCapability.KEY_PREFERRED_RESOLUTION, TestValues.GENERAL_IMAGERESOLUTION); - reference.put(VideoStreamingCapability.KEY_SUPPORTED_FORMATS, TestValues.GENERAL_VIDEOSTREAMINGFORMAT_LIST); - reference.put(VideoStreamingCapability.KEY_HAPTIC_SPATIAL_DATA_SUPPORTED, TestValues.GENERAL_BOOLEAN); - reference.put(VideoStreamingCapability.KEY_DIAGONAL_SCREEN_SIZE, TestValues.GENERAL_DOUBLE); - reference.put(VideoStreamingCapability.KEY_PIXEL_PER_INCH, TestValues.GENERAL_DOUBLE); - reference.put(VideoStreamingCapability.KEY_SCALE, TestValues.GENERAL_DOUBLE); - - 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(VideoStreamingCapability.KEY_MAX_BITRATE) || key.equals(VideoStreamingCapability.KEY_HAPTIC_SPATIAL_DATA_SUPPORTED)) { - assertTrue(TestValues.TRUE, JsonUtils.readIntegerFromJsonObject(reference, key) == JsonUtils.readIntegerFromJsonObject(underTest, key)); - } else if (key.equals(VideoStreamingCapability.KEY_PREFERRED_RESOLUTION)) { - ImageResolution irReference = (ImageResolution) JsonUtils.readObjectFromJsonObject(reference, key); - Hashtable<String, Object> hashTest = JsonRPCMarshaller.deserializeJSONObject(JsonUtils.readJsonObjectFromJsonObject(underTest, key)); - assertTrue(Validator.validateImageResolution(irReference, new ImageResolution(hashTest))); - } else if (key.equals(VideoStreamingCapability.KEY_SUPPORTED_FORMATS)){ - List<VideoStreamingFormat> vsfReference = (List<VideoStreamingFormat>) JsonUtils.readObjectFromJsonObject(reference, key); - JSONArray vsfArray = JsonUtils.readJsonArrayFromJsonObject(underTest, key); - int i = 0; - for(VideoStreamingFormat vsf : vsfReference){ - assertTrue(Validator.validateSupportedFormats(vsf, new VideoStreamingFormat(JsonRPCMarshaller.deserializeJSONObject(vsfArray.getJSONObject(i++))))); - } - } else if (key.equals(VideoStreamingCapability.KEY_DIAGONAL_SCREEN_SIZE) || key.equals(VideoStreamingCapability.KEY_PIXEL_PER_INCH) || - key.equals(VideoStreamingCapability.KEY_SCALE)) { - assertEquals(JsonUtils.readDoubleFromJsonObject(reference, key), JsonUtils.readDoubleFromJsonObject(underTest, key), 0.0005); - } - } - } catch (JSONException e) { - fail(TestValues.JSON_FAIL); - } - } + private VideoStreamingCapability msg; + + @Override + public void setUp() { + msg = new VideoStreamingCapability(); + msg.setSupportedFormats(TestValues.GENERAL_VIDEOSTREAMINGFORMAT_LIST); + msg.setPreferredResolution(TestValues.GENERAL_IMAGERESOLUTION); + msg.setMaxBitrate(TestValues.GENERAL_INT); + msg.setIsHapticSpatialDataSupported(TestValues.GENERAL_BOOLEAN); + msg.setDiagonalScreenSize(TestValues.GENERAL_DOUBLE); + msg.setPixelPerInch(TestValues.GENERAL_DOUBLE); + msg.setScale(TestValues.GENERAL_DOUBLE); + } + + /** + * Tests the expected values of the RPC message. + */ + public void testRpcValues() { + // Test Values + List<VideoStreamingFormat> format = msg.getSupportedFormats(); + ImageResolution res = msg.getPreferredResolution(); + Integer maxBitrate = msg.getMaxBitrate(); + Boolean isHapticSpatialDataSupported = msg.getIsHapticSpatialDataSupported(); + Double diagonalScreenSize = msg.getDiagonalScreenSize(); + Double pixelPerInch = msg.getPixelPerInch(); + Double scale = msg.getScale(); + + // Valid Tests + assertEquals(TestValues.MATCH, (List<VideoStreamingFormat>) TestValues.GENERAL_VIDEOSTREAMINGFORMAT_LIST, format); + assertEquals(TestValues.MATCH, (ImageResolution) TestValues.GENERAL_IMAGERESOLUTION, res); + assertEquals(TestValues.MATCH, (Integer) TestValues.GENERAL_INT, maxBitrate); + assertEquals(TestValues.MATCH, (Boolean) TestValues.GENERAL_BOOLEAN, isHapticSpatialDataSupported); + assertEquals(TestValues.MATCH, TestValues.GENERAL_DOUBLE, diagonalScreenSize); + assertEquals(TestValues.MATCH, TestValues.GENERAL_DOUBLE, pixelPerInch); + assertEquals(TestValues.MATCH, TestValues.GENERAL_DOUBLE, scale); + + // Invalid/Null Tests + VideoStreamingCapability msg = new VideoStreamingCapability(); + assertNotNull(TestValues.NOT_NULL, msg); + + assertNull(TestValues.NULL, msg.getMaxBitrate()); + assertNull(TestValues.NULL, msg.getPreferredResolution()); + assertNull(TestValues.NULL, msg.getSupportedFormats()); + assertNull(TestValues.NULL, msg.getIsHapticSpatialDataSupported()); + assertNull(TestValues.NULL, msg.getDiagonalScreenSize()); + assertNull(TestValues.NULL, msg.getPixelPerInch()); + assertNull(TestValues.NULL, msg.getScale()); + } + + public void testJson() { + JSONObject reference = new JSONObject(); + + try { + reference.put(VideoStreamingCapability.KEY_MAX_BITRATE, TestValues.GENERAL_INT); + reference.put(VideoStreamingCapability.KEY_PREFERRED_RESOLUTION, TestValues.GENERAL_IMAGERESOLUTION); + reference.put(VideoStreamingCapability.KEY_SUPPORTED_FORMATS, TestValues.GENERAL_VIDEOSTREAMINGFORMAT_LIST); + reference.put(VideoStreamingCapability.KEY_HAPTIC_SPATIAL_DATA_SUPPORTED, TestValues.GENERAL_BOOLEAN); + reference.put(VideoStreamingCapability.KEY_DIAGONAL_SCREEN_SIZE, TestValues.GENERAL_DOUBLE); + reference.put(VideoStreamingCapability.KEY_PIXEL_PER_INCH, TestValues.GENERAL_DOUBLE); + reference.put(VideoStreamingCapability.KEY_SCALE, TestValues.GENERAL_DOUBLE); + + 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(VideoStreamingCapability.KEY_MAX_BITRATE) || key.equals(VideoStreamingCapability.KEY_HAPTIC_SPATIAL_DATA_SUPPORTED)) { + assertTrue(TestValues.TRUE, JsonUtils.readIntegerFromJsonObject(reference, key) == JsonUtils.readIntegerFromJsonObject(underTest, key)); + } else if (key.equals(VideoStreamingCapability.KEY_PREFERRED_RESOLUTION)) { + ImageResolution irReference = (ImageResolution) JsonUtils.readObjectFromJsonObject(reference, key); + Hashtable<String, Object> hashTest = JsonRPCMarshaller.deserializeJSONObject(JsonUtils.readJsonObjectFromJsonObject(underTest, key)); + assertTrue(Validator.validateImageResolution(irReference, new ImageResolution(hashTest))); + } else if (key.equals(VideoStreamingCapability.KEY_SUPPORTED_FORMATS)) { + List<VideoStreamingFormat> vsfReference = (List<VideoStreamingFormat>) JsonUtils.readObjectFromJsonObject(reference, key); + JSONArray vsfArray = JsonUtils.readJsonArrayFromJsonObject(underTest, key); + int i = 0; + for (VideoStreamingFormat vsf : vsfReference) { + assertTrue(Validator.validateSupportedFormats(vsf, new VideoStreamingFormat(JsonRPCMarshaller.deserializeJSONObject(vsfArray.getJSONObject(i++))))); + } + } else if (key.equals(VideoStreamingCapability.KEY_DIAGONAL_SCREEN_SIZE) || key.equals(VideoStreamingCapability.KEY_PIXEL_PER_INCH) || + key.equals(VideoStreamingCapability.KEY_SCALE)) { + assertEquals(JsonUtils.readDoubleFromJsonObject(reference, key), JsonUtils.readDoubleFromJsonObject(underTest, key), 0.0005); + } + } + } catch (JSONException e) { + fail(TestValues.JSON_FAIL); + } + } } diff --git a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/VideoStreamingFormatTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/VideoStreamingFormatTests.java index 935751483..8a8390726 100644 --- a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/VideoStreamingFormatTests.java +++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/VideoStreamingFormatTests.java @@ -15,54 +15,54 @@ import java.util.Iterator; public class VideoStreamingFormatTests extends TestCase { - private VideoStreamingFormat msg; - - @Override - public void setUp() { - msg = new VideoStreamingFormat(); - msg.setProtocol(TestValues.GENERAL_VIDEOSTREAMINGPROTOCOL); - msg.setCodec(TestValues.GENERAL_VIDEOSTREAMINGCODEC); - } - - /** - * Tests the expected values of the RPC message. - */ - public void testRpcValues () { - // Test Values - VideoStreamingProtocol protocol = msg.getProtocol(); - VideoStreamingCodec codec = msg.getCodec(); - - // Valid Tests - assertEquals(TestValues.MATCH, (VideoStreamingProtocol) TestValues.GENERAL_VIDEOSTREAMINGPROTOCOL, protocol); - assertEquals(TestValues.MATCH, (VideoStreamingCodec) TestValues.GENERAL_VIDEOSTREAMINGCODEC, codec); - - // Invalid/Null Tests - VideoStreamingFormat msg = new VideoStreamingFormat(); - assertNotNull(TestValues.NOT_NULL, msg); - - assertNull(TestValues.NULL, msg.getProtocol()); - assertNull(TestValues.NULL, msg.getCodec()); - } - - public void testJson() { - JSONObject reference = new JSONObject(); - - try { - reference.put(VideoStreamingFormat.KEY_PROTOCOL, TestValues.GENERAL_VIDEOSTREAMINGPROTOCOL); - reference.put(VideoStreamingFormat.KEY_CODEC, TestValues.GENERAL_VIDEOSTREAMINGCODEC); - - JSONObject underTest = msg.serializeJSON(); - assertEquals(TestValues.MATCH, reference.length(), underTest.length()); - - Iterator<?> iterator = reference.keys(); - while (iterator.hasNext()) { - String key = (String) iterator.next(); - - assertEquals(TestValues.MATCH, JsonUtils.readObjectFromJsonObject(reference, key), JsonUtils.readObjectFromJsonObject(underTest, key)); - } - } catch (JSONException e) { - fail(TestValues.JSON_FAIL); - } - } + private VideoStreamingFormat msg; + + @Override + public void setUp() { + msg = new VideoStreamingFormat(); + msg.setProtocol(TestValues.GENERAL_VIDEOSTREAMINGPROTOCOL); + msg.setCodec(TestValues.GENERAL_VIDEOSTREAMINGCODEC); + } + + /** + * Tests the expected values of the RPC message. + */ + public void testRpcValues() { + // Test Values + VideoStreamingProtocol protocol = msg.getProtocol(); + VideoStreamingCodec codec = msg.getCodec(); + + // Valid Tests + assertEquals(TestValues.MATCH, (VideoStreamingProtocol) TestValues.GENERAL_VIDEOSTREAMINGPROTOCOL, protocol); + assertEquals(TestValues.MATCH, (VideoStreamingCodec) TestValues.GENERAL_VIDEOSTREAMINGCODEC, codec); + + // Invalid/Null Tests + VideoStreamingFormat msg = new VideoStreamingFormat(); + assertNotNull(TestValues.NOT_NULL, msg); + + assertNull(TestValues.NULL, msg.getProtocol()); + assertNull(TestValues.NULL, msg.getCodec()); + } + + public void testJson() { + JSONObject reference = new JSONObject(); + + try { + reference.put(VideoStreamingFormat.KEY_PROTOCOL, TestValues.GENERAL_VIDEOSTREAMINGPROTOCOL); + reference.put(VideoStreamingFormat.KEY_CODEC, TestValues.GENERAL_VIDEOSTREAMINGCODEC); + + JSONObject underTest = msg.serializeJSON(); + assertEquals(TestValues.MATCH, reference.length(), underTest.length()); + + Iterator<?> iterator = reference.keys(); + while (iterator.hasNext()) { + String key = (String) iterator.next(); + + assertEquals(TestValues.MATCH, JsonUtils.readObjectFromJsonObject(reference, key), JsonUtils.readObjectFromJsonObject(underTest, key)); + } + } catch (JSONException e) { + fail(TestValues.JSON_FAIL); + } + } } diff --git a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/VrHelpItemTest.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/VrHelpItemTest.java index a60615042..b1db6a7e5 100644 --- a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/VrHelpItemTest.java +++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/VrHelpItemTest.java @@ -16,70 +16,70 @@ import java.util.Hashtable; import java.util.Iterator; public class VrHelpItemTest extends TestCase { - - private VrHelpItem msg; - @Override - public void setUp() { - msg = new VrHelpItem(); - - msg.setText(TestValues.GENERAL_STRING); - msg.setImage(TestValues.GENERAL_IMAGE); - msg.setPosition(TestValues.GENERAL_INT); + private VrHelpItem msg; - } + @Override + public void setUp() { + msg = new VrHelpItem(); + + msg.setText(TestValues.GENERAL_STRING); + msg.setImage(TestValues.GENERAL_IMAGE); + msg.setPosition(TestValues.GENERAL_INT); + + } /** - * Tests the expected values of the RPC message. - */ - public void testRpcValues () { - // Test Values - String text = msg.getText(); - Image image = msg.getImage(); - Integer position = msg.getPosition(); - - // Valid Tests - assertEquals(TestValues.MATCH, TestValues.GENERAL_STRING, text); - assertEquals(TestValues.MATCH, (Integer) TestValues.GENERAL_INT, position); - assertTrue(TestValues.TRUE, Validator.validateImage(TestValues.GENERAL_IMAGE, image)); - - // Invalid/Null Tests - VrHelpItem msg = new VrHelpItem(); - assertNotNull(TestValues.NOT_NULL, msg); - - assertNull(TestValues.NULL, msg.getImage()); - assertNull(TestValues.NULL, msg.getText()); - assertNull(TestValues.NULL, msg.getPosition()); - } - - public void testJson() { - JSONObject reference = new JSONObject(); - - try { - reference.put(VrHelpItem.KEY_IMAGE, TestValues.JSON_IMAGE); - reference.put(VrHelpItem.KEY_TEXT, TestValues.GENERAL_STRING); - reference.put(VrHelpItem.KEY_POSITION, TestValues.GENERAL_INT); - - 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(VrHelpItem.KEY_IMAGE)){ - JSONObject objectEquals = JsonUtils.readJsonObjectFromJsonObject(reference, key); - JSONObject testEquals = JsonUtils.readJsonObjectFromJsonObject(underTest, key); - Hashtable<String, Object> hashReference = JsonRPCMarshaller.deserializeJSONObject(objectEquals); - Hashtable<String, Object> hashTest = JsonRPCMarshaller.deserializeJSONObject(testEquals); - - assertTrue(TestValues.TRUE, Validator.validateImage(new Image(hashReference), new Image(hashTest))); - } else { - assertEquals(TestValues.MATCH, JsonUtils.readObjectFromJsonObject(reference, key), JsonUtils.readObjectFromJsonObject(underTest, key)); - } - } - } catch (JSONException e) { - fail(TestValues.JSON_FAIL); - } - } + * Tests the expected values of the RPC message. + */ + public void testRpcValues() { + // Test Values + String text = msg.getText(); + Image image = msg.getImage(); + Integer position = msg.getPosition(); + + // Valid Tests + assertEquals(TestValues.MATCH, TestValues.GENERAL_STRING, text); + assertEquals(TestValues.MATCH, (Integer) TestValues.GENERAL_INT, position); + assertTrue(TestValues.TRUE, Validator.validateImage(TestValues.GENERAL_IMAGE, image)); + + // Invalid/Null Tests + VrHelpItem msg = new VrHelpItem(); + assertNotNull(TestValues.NOT_NULL, msg); + + assertNull(TestValues.NULL, msg.getImage()); + assertNull(TestValues.NULL, msg.getText()); + assertNull(TestValues.NULL, msg.getPosition()); + } + + public void testJson() { + JSONObject reference = new JSONObject(); + + try { + reference.put(VrHelpItem.KEY_IMAGE, TestValues.JSON_IMAGE); + reference.put(VrHelpItem.KEY_TEXT, TestValues.GENERAL_STRING); + reference.put(VrHelpItem.KEY_POSITION, TestValues.GENERAL_INT); + + 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(VrHelpItem.KEY_IMAGE)) { + JSONObject objectEquals = JsonUtils.readJsonObjectFromJsonObject(reference, key); + JSONObject testEquals = JsonUtils.readJsonObjectFromJsonObject(underTest, key); + Hashtable<String, Object> hashReference = JsonRPCMarshaller.deserializeJSONObject(objectEquals); + Hashtable<String, Object> hashTest = JsonRPCMarshaller.deserializeJSONObject(testEquals); + + assertTrue(TestValues.TRUE, Validator.validateImage(new Image(hashReference), new Image(hashTest))); + } else { + assertEquals(TestValues.MATCH, JsonUtils.readObjectFromJsonObject(reference, key), JsonUtils.readObjectFromJsonObject(underTest, key)); + } + } + } catch (JSONException e) { + fail(TestValues.JSON_FAIL); + } + } }
\ No newline at end of file diff --git a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/WeatherAlertTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/WeatherAlertTests.java index f3537a29b..9fa289cb5 100644 --- a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/WeatherAlertTests.java +++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/WeatherAlertTests.java @@ -23,90 +23,90 @@ import java.util.List; */ public class WeatherAlertTests extends TestCase { - private WeatherAlert msg; - - @Override - public void setUp(){ - - msg = new WeatherAlert(); - msg.setExpires(TestValues.GENERAL_DATETIME); - msg.setTimeIssued(TestValues.GENERAL_DATETIME); - msg.setRegions(TestValues.GENERAL_STRING_LIST); - msg.setSeverity(TestValues.GENERAL_STRING); - msg.setSummary(TestValues.GENERAL_STRING); - msg.setTitle(TestValues.GENERAL_STRING); - } - - /** - * Tests the expected values of the RPC message. - */ - public void testRpcValues () { - // Test Values - DateTime expires = msg.getExpires(); - DateTime issued = msg.getTimeIssued(); - List<String> regions = msg.getRegions(); - String severity = msg.getSeverity(); - String summary = msg.getSummary(); - String title = msg.getTitle(); - - // Valid Tests - assertEquals(TestValues.MATCH, expires, TestValues.GENERAL_DATETIME); - assertEquals(TestValues.MATCH, issued, TestValues.GENERAL_DATETIME); - assertEquals(TestValues.MATCH, regions, TestValues.GENERAL_STRING_LIST); - assertEquals(TestValues.MATCH, severity, TestValues.GENERAL_STRING); - assertEquals(TestValues.MATCH, summary, TestValues.GENERAL_STRING); - assertEquals(TestValues.MATCH, title, TestValues.GENERAL_STRING); - - // Invalid/Null Tests - WeatherAlert msg = new WeatherAlert(); - assertNotNull(TestValues.NOT_NULL, msg); - - assertNull(TestValues.NULL, msg.getExpires()); - assertNull(TestValues.NULL, msg.getTimeIssued()); - assertNull(TestValues.NULL, msg.getRegions()); - assertNull(TestValues.NULL, msg.getSeverity()); - assertNull(TestValues.NULL, msg.getSummary()); - assertNull(TestValues.NULL, msg.getTitle()); - } - - public void testRequiredParamsConstructor(){ - msg = new WeatherAlert(TestValues.GENERAL_STRING_LIST); - List<String> regions = msg.getRegions(); - assertEquals(TestValues.MATCH, regions, TestValues.GENERAL_STRING_LIST); - } - - public void testJson(){ - JSONObject reference = new JSONObject(); - - try{ - reference.put(WeatherAlert.KEY_EXPIRES, TestValues.GENERAL_DATETIME); - reference.put(WeatherAlert.KEY_TIME_ISSUED, TestValues.GENERAL_DATETIME); - reference.put(WeatherAlert.KEY_REGIONS, JsonUtils.createJsonArray(TestValues.GENERAL_STRING_LIST)); - reference.put(WeatherAlert.KEY_SEVERITY, TestValues.GENERAL_STRING); - reference.put(WeatherAlert.KEY_SUMMARY, TestValues.GENERAL_STRING); - reference.put(WeatherAlert.KEY_TITLE, TestValues.GENERAL_STRING); - - 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(WeatherAlert.KEY_EXPIRES)||key.equals(WeatherAlert.KEY_TIME_ISSUED)){ - JSONObject testEquals = (JSONObject) JsonUtils.readObjectFromJsonObject(underTest, key); - Hashtable<String, Object> hashTest = JsonRPCMarshaller.deserializeJSONObject(testEquals); - assertTrue(TestValues.TRUE, Validator.validateDateTime(TestValues.GENERAL_DATETIME, new DateTime(hashTest))); - } else if (key.equals(WeatherAlert.KEY_REGIONS)){ - JSONArray referenceArray = JsonUtils.readJsonArrayFromJsonObject(reference, key); - JSONArray underTestArray = JsonUtils.readJsonArrayFromJsonObject(underTest, key); - assertEquals(TestValues.MATCH, referenceArray.length(), underTestArray.length()); - assertTrue(TestValues.TRUE, Validator.validateStringList(JsonUtils.readStringListFromJsonObject(reference, key), JsonUtils.readStringListFromJsonObject(underTest, key))); - } else { - assertEquals(TestValues.MATCH, JsonUtils.readObjectFromJsonObject(reference, key), JsonUtils.readObjectFromJsonObject(underTest, key)); - } - } - } catch(JSONException e){ - fail(TestValues.JSON_FAIL); - } - } + private WeatherAlert msg; + + @Override + public void setUp() { + + msg = new WeatherAlert(); + msg.setExpires(TestValues.GENERAL_DATETIME); + msg.setTimeIssued(TestValues.GENERAL_DATETIME); + msg.setRegions(TestValues.GENERAL_STRING_LIST); + msg.setSeverity(TestValues.GENERAL_STRING); + msg.setSummary(TestValues.GENERAL_STRING); + msg.setTitle(TestValues.GENERAL_STRING); + } + + /** + * Tests the expected values of the RPC message. + */ + public void testRpcValues() { + // Test Values + DateTime expires = msg.getExpires(); + DateTime issued = msg.getTimeIssued(); + List<String> regions = msg.getRegions(); + String severity = msg.getSeverity(); + String summary = msg.getSummary(); + String title = msg.getTitle(); + + // Valid Tests + assertEquals(TestValues.MATCH, expires, TestValues.GENERAL_DATETIME); + assertEquals(TestValues.MATCH, issued, TestValues.GENERAL_DATETIME); + assertEquals(TestValues.MATCH, regions, TestValues.GENERAL_STRING_LIST); + assertEquals(TestValues.MATCH, severity, TestValues.GENERAL_STRING); + assertEquals(TestValues.MATCH, summary, TestValues.GENERAL_STRING); + assertEquals(TestValues.MATCH, title, TestValues.GENERAL_STRING); + + // Invalid/Null Tests + WeatherAlert msg = new WeatherAlert(); + assertNotNull(TestValues.NOT_NULL, msg); + + assertNull(TestValues.NULL, msg.getExpires()); + assertNull(TestValues.NULL, msg.getTimeIssued()); + assertNull(TestValues.NULL, msg.getRegions()); + assertNull(TestValues.NULL, msg.getSeverity()); + assertNull(TestValues.NULL, msg.getSummary()); + assertNull(TestValues.NULL, msg.getTitle()); + } + + public void testRequiredParamsConstructor() { + msg = new WeatherAlert(TestValues.GENERAL_STRING_LIST); + List<String> regions = msg.getRegions(); + assertEquals(TestValues.MATCH, regions, TestValues.GENERAL_STRING_LIST); + } + + public void testJson() { + JSONObject reference = new JSONObject(); + + try { + reference.put(WeatherAlert.KEY_EXPIRES, TestValues.GENERAL_DATETIME); + reference.put(WeatherAlert.KEY_TIME_ISSUED, TestValues.GENERAL_DATETIME); + reference.put(WeatherAlert.KEY_REGIONS, JsonUtils.createJsonArray(TestValues.GENERAL_STRING_LIST)); + reference.put(WeatherAlert.KEY_SEVERITY, TestValues.GENERAL_STRING); + reference.put(WeatherAlert.KEY_SUMMARY, TestValues.GENERAL_STRING); + reference.put(WeatherAlert.KEY_TITLE, TestValues.GENERAL_STRING); + + 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(WeatherAlert.KEY_EXPIRES) || key.equals(WeatherAlert.KEY_TIME_ISSUED)) { + JSONObject testEquals = (JSONObject) JsonUtils.readObjectFromJsonObject(underTest, key); + Hashtable<String, Object> hashTest = JsonRPCMarshaller.deserializeJSONObject(testEquals); + assertTrue(TestValues.TRUE, Validator.validateDateTime(TestValues.GENERAL_DATETIME, new DateTime(hashTest))); + } else if (key.equals(WeatherAlert.KEY_REGIONS)) { + JSONArray referenceArray = JsonUtils.readJsonArrayFromJsonObject(reference, key); + JSONArray underTestArray = JsonUtils.readJsonArrayFromJsonObject(underTest, key); + assertEquals(TestValues.MATCH, referenceArray.length(), underTestArray.length()); + assertTrue(TestValues.TRUE, Validator.validateStringList(JsonUtils.readStringListFromJsonObject(reference, key), JsonUtils.readStringListFromJsonObject(underTest, key))); + } else { + assertEquals(TestValues.MATCH, JsonUtils.readObjectFromJsonObject(reference, key), JsonUtils.readObjectFromJsonObject(underTest, key)); + } + } + } catch (JSONException e) { + fail(TestValues.JSON_FAIL); + } + } }
\ No newline at end of file diff --git a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/WeatherDataTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/WeatherDataTests.java index cbebce592..66ba0a0e5 100644 --- a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/WeatherDataTests.java +++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/WeatherDataTests.java @@ -23,167 +23,167 @@ import java.util.Iterator; */ public class WeatherDataTests extends TestCase { - private WeatherData msg; - - @Override - public void setUp(){ - - msg = new WeatherData(); - msg.setCurrentTemperature(TestValues.GENERAL_TEMPERATURE); - msg.setTemperatureHigh(TestValues.GENERAL_TEMPERATURE); - msg.setTemperatureLow(TestValues.GENERAL_TEMPERATURE); - msg.setApparentTemperature(TestValues.GENERAL_TEMPERATURE); - msg.setApparentTemperatureHigh(TestValues.GENERAL_TEMPERATURE); - msg.setApparentTemperatureLow(TestValues.GENERAL_TEMPERATURE); - msg.setWeatherSummary(TestValues.GENERAL_STRING); - msg.setTime(TestValues.GENERAL_DATETIME); - msg.setHumidity(TestValues.GENERAL_FLOAT); - msg.setCloudCover(TestValues.GENERAL_FLOAT); - msg.setMoonPhase(TestValues.GENERAL_FLOAT); - msg.setWindBearing(TestValues.GENERAL_INTEGER); - msg.setWindGust(TestValues.GENERAL_FLOAT); - msg.setWindSpeed(TestValues.GENERAL_FLOAT); - msg.setNearestStormBearing(TestValues.GENERAL_INTEGER); - msg.setNearestStormDistance(TestValues.GENERAL_INTEGER); - msg.setPrecipAccumulation(TestValues.GENERAL_FLOAT); - msg.setPrecipIntensity(TestValues.GENERAL_FLOAT); - msg.setPrecipProbability(TestValues.GENERAL_FLOAT); - msg.setPrecipType(TestValues.GENERAL_STRING); - msg.setVisibility(TestValues.GENERAL_FLOAT); - msg.setWeatherIcon(TestValues.GENERAL_IMAGE); - } - - /** - * Tests the expected values of the RPC message. - */ - public void testRpcValues () { - // Test Values - Temperature currentTemperature = msg.getCurrentTemperature(); - Temperature temperatureHigh = msg.getTemperatureHigh(); - Temperature temperatureLow = msg.getTemperatureLow(); - Temperature apparentTemperature = msg.getApparentTemperature(); - Temperature apparentTemperatureHigh = msg.getApparentTemperatureHigh(); - String weatherSummary = msg.getWeatherSummary(); - DateTime time = msg.getTime(); - Float humidity = msg.getHumidity(); - Float cloudCover = msg.getCloudCover(); - Float moonPhase = msg.getMoonPhase(); - Integer windBearing = msg.getWindBearing(); - Float windGust = msg.getWindGust(); - Float windSpeed = msg.getWindSpeed(); - Integer nearestStormBearing = msg.getNearestStormBearing(); - Integer nearestStormDistance = msg.getNearestStormDistance(); - Float precipAccumulation = msg.getPrecipAccumulation(); - Float precipIntensity = msg.getPrecipIntensity(); - Float precipProbability = msg.getPrecipProbability(); - String precipType = msg.getPrecipType(); - Float visibility = msg.getVisibility(); - Image weatherIcon = msg.getWeatherIcon(); - - // Valid Tests - assertEquals(TestValues.MATCH, currentTemperature, TestValues.GENERAL_TEMPERATURE); - assertEquals(TestValues.MATCH, temperatureHigh, TestValues.GENERAL_TEMPERATURE); - assertEquals(TestValues.MATCH, temperatureLow, TestValues.GENERAL_TEMPERATURE); - assertEquals(TestValues.MATCH, apparentTemperature, TestValues.GENERAL_TEMPERATURE); - assertEquals(TestValues.MATCH, apparentTemperatureHigh, TestValues.GENERAL_TEMPERATURE); - assertEquals(TestValues.MATCH, weatherSummary, TestValues.GENERAL_STRING); - assertEquals(TestValues.MATCH, time, TestValues.GENERAL_DATETIME); - assertEquals(TestValues.MATCH, humidity, TestValues.GENERAL_FLOAT); - assertEquals(TestValues.MATCH, cloudCover, TestValues.GENERAL_FLOAT); - assertEquals(TestValues.MATCH, moonPhase, TestValues.GENERAL_FLOAT); - assertEquals(TestValues.MATCH, windBearing, TestValues.GENERAL_INTEGER); - assertEquals(TestValues.MATCH, windGust, TestValues.GENERAL_FLOAT); - assertEquals(TestValues.MATCH, windSpeed, TestValues.GENERAL_FLOAT); - assertEquals(TestValues.MATCH, nearestStormBearing, TestValues.GENERAL_INTEGER); - assertEquals(TestValues.MATCH, nearestStormDistance, TestValues.GENERAL_INTEGER); - assertEquals(TestValues.MATCH, precipAccumulation, TestValues.GENERAL_FLOAT); - assertEquals(TestValues.MATCH, precipIntensity, TestValues.GENERAL_FLOAT); - assertEquals(TestValues.MATCH, precipProbability, TestValues.GENERAL_FLOAT); - assertEquals(TestValues.MATCH, precipType, TestValues.GENERAL_STRING); - assertEquals(TestValues.MATCH, visibility, TestValues.GENERAL_FLOAT); - assertEquals(TestValues.MATCH, weatherIcon, TestValues.GENERAL_IMAGE); - - // Invalid/Null Tests - WeatherData msg = new WeatherData(); - assertNotNull(TestValues.NOT_NULL, msg); - - assertNull(TestValues.NULL, msg.getCurrentTemperature()); - assertNull(TestValues.NULL, msg.getTemperatureHigh()); - assertNull(TestValues.NULL, msg.getTemperatureLow()); - assertNull(TestValues.NULL, msg.getApparentTemperature()); - assertNull(TestValues.NULL, msg.getApparentTemperatureHigh()); - assertNull(TestValues.NULL, msg.getApparentTemperatureLow()); - assertNull(TestValues.NULL, msg.getWeatherSummary()); - assertNull(TestValues.NULL, msg.getTime()); - assertNull(TestValues.NULL, msg.getHumidity()); - assertNull(TestValues.NULL, msg.getCloudCover()); - assertNull(TestValues.NULL, msg.getMoonPhase()); - assertNull(TestValues.NULL, msg.getWindBearing()); - assertNull(TestValues.NULL, msg.getWindGust()); - assertNull(TestValues.NULL, msg.getWindSpeed()); - assertNull(TestValues.NULL, msg.getNearestStormBearing()); - assertNull(TestValues.NULL, msg.getNearestStormDistance()); - assertNull(TestValues.NULL, msg.getPrecipAccumulation()); - assertNull(TestValues.NULL, msg.getPrecipIntensity()); - assertNull(TestValues.NULL, msg.getPrecipProbability()); - assertNull(TestValues.NULL, msg.getPrecipType()); - assertNull(TestValues.NULL, msg.getVisibility()); - assertNull(TestValues.NULL, msg.getWeatherIcon()); - } - - public void testJson(){ - JSONObject reference = new JSONObject(); - - try{ - reference.put(WeatherData.KEY_CURRENT_TEMPERATURE, TestValues.GENERAL_TEMPERATURE); - reference.put(WeatherData.KEY_TEMPERATURE_HIGH, TestValues.GENERAL_TEMPERATURE); - reference.put(WeatherData.KEY_TEMPERATURE_LOW, TestValues.GENERAL_TEMPERATURE); - reference.put(WeatherData.KEY_APPARENT_TEMPERATURE, TestValues.GENERAL_TEMPERATURE); - reference.put(WeatherData.KEY_APPARENT_TEMPERATURE_HIGH, TestValues.GENERAL_TEMPERATURE); - reference.put(WeatherData.KEY_APPARENT_TEMPERATURE_LOW, TestValues.GENERAL_TEMPERATURE); - reference.put(WeatherData.KEY_WEATHER_SUMMARY, TestValues.GENERAL_STRING); - reference.put(WeatherData.KEY_TIME, TestValues.GENERAL_DATETIME); - reference.put(WeatherData.KEY_HUMIDITY, TestValues.GENERAL_FLOAT); - reference.put(WeatherData.KEY_CLOUD_COVER, TestValues.GENERAL_FLOAT); - reference.put(WeatherData.KEY_MOON_PHASE, TestValues.GENERAL_FLOAT); - reference.put(WeatherData.KEY_WIND_BEARING, TestValues.GENERAL_INTEGER); - reference.put(WeatherData.KEY_WIND_GUST, TestValues.GENERAL_FLOAT); - reference.put(WeatherData.KEY_WIND_SPEED, TestValues.GENERAL_FLOAT); - reference.put(WeatherData.KEY_NEAREST_STORM_BEARING, TestValues.GENERAL_INTEGER); - reference.put(WeatherData.KEY_NEAREST_STORM_DISTANCE, TestValues.GENERAL_INTEGER); - reference.put(WeatherData.KEY_PRECIP_ACCUMULATION, TestValues.GENERAL_FLOAT); - reference.put(WeatherData.KEY_PRECIP_INTENSITY, TestValues.GENERAL_FLOAT); - reference.put(WeatherData.KEY_PRECIP_PROBABILITY, TestValues.GENERAL_FLOAT); - reference.put(WeatherData.KEY_PRECIP_TYPE, TestValues.GENERAL_STRING); - reference.put(WeatherData.KEY_VISIBILITY, TestValues.GENERAL_FLOAT); - reference.put(WeatherData.KEY_WEATHER_ICON, TestValues.GENERAL_STRING); - - 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(WeatherData.KEY_CURRENT_TEMPERATURE) || key.equals(WeatherData.KEY_TEMPERATURE_HIGH)|| - key.equals(WeatherData.KEY_TEMPERATURE_LOW) || key.equals(WeatherData.KEY_APPARENT_TEMPERATURE)|| - key.equals(WeatherData.KEY_APPARENT_TEMPERATURE_HIGH) || key.equals(WeatherData.KEY_APPARENT_TEMPERATURE_LOW)){ - JSONObject testEquals = (JSONObject) JsonUtils.readObjectFromJsonObject(underTest, key); - Hashtable<String, Object> hashTest = JsonRPCMarshaller.deserializeJSONObject(testEquals); - assertTrue(TestValues.TRUE, Validator.validateTemperature(TestValues.GENERAL_TEMPERATURE, new Temperature(hashTest))); - } else if (key.equals(WeatherData.KEY_TIME)){ - JSONObject testEquals = (JSONObject) JsonUtils.readObjectFromJsonObject(underTest, key); - Hashtable<String, Object> hashTest = JsonRPCMarshaller.deserializeJSONObject(testEquals); - assertTrue(TestValues.TRUE, Validator.validateDateTime(TestValues.GENERAL_DATETIME, new DateTime(hashTest))); - } else if (key.equals(WeatherData.KEY_WEATHER_ICON)){ - JSONObject testEquals = (JSONObject) JsonUtils.readObjectFromJsonObject(underTest, key); - Hashtable<String, Object> hashTest = JsonRPCMarshaller.deserializeJSONObject(testEquals); - assertTrue(TestValues.TRUE, Validator.validateImage(TestValues.GENERAL_IMAGE, new Image(hashTest))); - } else { - assertEquals(TestValues.MATCH, JsonUtils.readObjectFromJsonObject(reference, key), JsonUtils.readObjectFromJsonObject(underTest, key)); - } - } - } catch(JSONException e){ - fail(TestValues.JSON_FAIL); - } - } + private WeatherData msg; + + @Override + public void setUp() { + + msg = new WeatherData(); + msg.setCurrentTemperature(TestValues.GENERAL_TEMPERATURE); + msg.setTemperatureHigh(TestValues.GENERAL_TEMPERATURE); + msg.setTemperatureLow(TestValues.GENERAL_TEMPERATURE); + msg.setApparentTemperature(TestValues.GENERAL_TEMPERATURE); + msg.setApparentTemperatureHigh(TestValues.GENERAL_TEMPERATURE); + msg.setApparentTemperatureLow(TestValues.GENERAL_TEMPERATURE); + msg.setWeatherSummary(TestValues.GENERAL_STRING); + msg.setTime(TestValues.GENERAL_DATETIME); + msg.setHumidity(TestValues.GENERAL_FLOAT); + msg.setCloudCover(TestValues.GENERAL_FLOAT); + msg.setMoonPhase(TestValues.GENERAL_FLOAT); + msg.setWindBearing(TestValues.GENERAL_INTEGER); + msg.setWindGust(TestValues.GENERAL_FLOAT); + msg.setWindSpeed(TestValues.GENERAL_FLOAT); + msg.setNearestStormBearing(TestValues.GENERAL_INTEGER); + msg.setNearestStormDistance(TestValues.GENERAL_INTEGER); + msg.setPrecipAccumulation(TestValues.GENERAL_FLOAT); + msg.setPrecipIntensity(TestValues.GENERAL_FLOAT); + msg.setPrecipProbability(TestValues.GENERAL_FLOAT); + msg.setPrecipType(TestValues.GENERAL_STRING); + msg.setVisibility(TestValues.GENERAL_FLOAT); + msg.setWeatherIcon(TestValues.GENERAL_IMAGE); + } + + /** + * Tests the expected values of the RPC message. + */ + public void testRpcValues() { + // Test Values + Temperature currentTemperature = msg.getCurrentTemperature(); + Temperature temperatureHigh = msg.getTemperatureHigh(); + Temperature temperatureLow = msg.getTemperatureLow(); + Temperature apparentTemperature = msg.getApparentTemperature(); + Temperature apparentTemperatureHigh = msg.getApparentTemperatureHigh(); + String weatherSummary = msg.getWeatherSummary(); + DateTime time = msg.getTime(); + Float humidity = msg.getHumidity(); + Float cloudCover = msg.getCloudCover(); + Float moonPhase = msg.getMoonPhase(); + Integer windBearing = msg.getWindBearing(); + Float windGust = msg.getWindGust(); + Float windSpeed = msg.getWindSpeed(); + Integer nearestStormBearing = msg.getNearestStormBearing(); + Integer nearestStormDistance = msg.getNearestStormDistance(); + Float precipAccumulation = msg.getPrecipAccumulation(); + Float precipIntensity = msg.getPrecipIntensity(); + Float precipProbability = msg.getPrecipProbability(); + String precipType = msg.getPrecipType(); + Float visibility = msg.getVisibility(); + Image weatherIcon = msg.getWeatherIcon(); + + // Valid Tests + assertEquals(TestValues.MATCH, currentTemperature, TestValues.GENERAL_TEMPERATURE); + assertEquals(TestValues.MATCH, temperatureHigh, TestValues.GENERAL_TEMPERATURE); + assertEquals(TestValues.MATCH, temperatureLow, TestValues.GENERAL_TEMPERATURE); + assertEquals(TestValues.MATCH, apparentTemperature, TestValues.GENERAL_TEMPERATURE); + assertEquals(TestValues.MATCH, apparentTemperatureHigh, TestValues.GENERAL_TEMPERATURE); + assertEquals(TestValues.MATCH, weatherSummary, TestValues.GENERAL_STRING); + assertEquals(TestValues.MATCH, time, TestValues.GENERAL_DATETIME); + assertEquals(TestValues.MATCH, humidity, TestValues.GENERAL_FLOAT); + assertEquals(TestValues.MATCH, cloudCover, TestValues.GENERAL_FLOAT); + assertEquals(TestValues.MATCH, moonPhase, TestValues.GENERAL_FLOAT); + assertEquals(TestValues.MATCH, windBearing, TestValues.GENERAL_INTEGER); + assertEquals(TestValues.MATCH, windGust, TestValues.GENERAL_FLOAT); + assertEquals(TestValues.MATCH, windSpeed, TestValues.GENERAL_FLOAT); + assertEquals(TestValues.MATCH, nearestStormBearing, TestValues.GENERAL_INTEGER); + assertEquals(TestValues.MATCH, nearestStormDistance, TestValues.GENERAL_INTEGER); + assertEquals(TestValues.MATCH, precipAccumulation, TestValues.GENERAL_FLOAT); + assertEquals(TestValues.MATCH, precipIntensity, TestValues.GENERAL_FLOAT); + assertEquals(TestValues.MATCH, precipProbability, TestValues.GENERAL_FLOAT); + assertEquals(TestValues.MATCH, precipType, TestValues.GENERAL_STRING); + assertEquals(TestValues.MATCH, visibility, TestValues.GENERAL_FLOAT); + assertEquals(TestValues.MATCH, weatherIcon, TestValues.GENERAL_IMAGE); + + // Invalid/Null Tests + WeatherData msg = new WeatherData(); + assertNotNull(TestValues.NOT_NULL, msg); + + assertNull(TestValues.NULL, msg.getCurrentTemperature()); + assertNull(TestValues.NULL, msg.getTemperatureHigh()); + assertNull(TestValues.NULL, msg.getTemperatureLow()); + assertNull(TestValues.NULL, msg.getApparentTemperature()); + assertNull(TestValues.NULL, msg.getApparentTemperatureHigh()); + assertNull(TestValues.NULL, msg.getApparentTemperatureLow()); + assertNull(TestValues.NULL, msg.getWeatherSummary()); + assertNull(TestValues.NULL, msg.getTime()); + assertNull(TestValues.NULL, msg.getHumidity()); + assertNull(TestValues.NULL, msg.getCloudCover()); + assertNull(TestValues.NULL, msg.getMoonPhase()); + assertNull(TestValues.NULL, msg.getWindBearing()); + assertNull(TestValues.NULL, msg.getWindGust()); + assertNull(TestValues.NULL, msg.getWindSpeed()); + assertNull(TestValues.NULL, msg.getNearestStormBearing()); + assertNull(TestValues.NULL, msg.getNearestStormDistance()); + assertNull(TestValues.NULL, msg.getPrecipAccumulation()); + assertNull(TestValues.NULL, msg.getPrecipIntensity()); + assertNull(TestValues.NULL, msg.getPrecipProbability()); + assertNull(TestValues.NULL, msg.getPrecipType()); + assertNull(TestValues.NULL, msg.getVisibility()); + assertNull(TestValues.NULL, msg.getWeatherIcon()); + } + + public void testJson() { + JSONObject reference = new JSONObject(); + + try { + reference.put(WeatherData.KEY_CURRENT_TEMPERATURE, TestValues.GENERAL_TEMPERATURE); + reference.put(WeatherData.KEY_TEMPERATURE_HIGH, TestValues.GENERAL_TEMPERATURE); + reference.put(WeatherData.KEY_TEMPERATURE_LOW, TestValues.GENERAL_TEMPERATURE); + reference.put(WeatherData.KEY_APPARENT_TEMPERATURE, TestValues.GENERAL_TEMPERATURE); + reference.put(WeatherData.KEY_APPARENT_TEMPERATURE_HIGH, TestValues.GENERAL_TEMPERATURE); + reference.put(WeatherData.KEY_APPARENT_TEMPERATURE_LOW, TestValues.GENERAL_TEMPERATURE); + reference.put(WeatherData.KEY_WEATHER_SUMMARY, TestValues.GENERAL_STRING); + reference.put(WeatherData.KEY_TIME, TestValues.GENERAL_DATETIME); + reference.put(WeatherData.KEY_HUMIDITY, TestValues.GENERAL_FLOAT); + reference.put(WeatherData.KEY_CLOUD_COVER, TestValues.GENERAL_FLOAT); + reference.put(WeatherData.KEY_MOON_PHASE, TestValues.GENERAL_FLOAT); + reference.put(WeatherData.KEY_WIND_BEARING, TestValues.GENERAL_INTEGER); + reference.put(WeatherData.KEY_WIND_GUST, TestValues.GENERAL_FLOAT); + reference.put(WeatherData.KEY_WIND_SPEED, TestValues.GENERAL_FLOAT); + reference.put(WeatherData.KEY_NEAREST_STORM_BEARING, TestValues.GENERAL_INTEGER); + reference.put(WeatherData.KEY_NEAREST_STORM_DISTANCE, TestValues.GENERAL_INTEGER); + reference.put(WeatherData.KEY_PRECIP_ACCUMULATION, TestValues.GENERAL_FLOAT); + reference.put(WeatherData.KEY_PRECIP_INTENSITY, TestValues.GENERAL_FLOAT); + reference.put(WeatherData.KEY_PRECIP_PROBABILITY, TestValues.GENERAL_FLOAT); + reference.put(WeatherData.KEY_PRECIP_TYPE, TestValues.GENERAL_STRING); + reference.put(WeatherData.KEY_VISIBILITY, TestValues.GENERAL_FLOAT); + reference.put(WeatherData.KEY_WEATHER_ICON, TestValues.GENERAL_STRING); + + 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(WeatherData.KEY_CURRENT_TEMPERATURE) || key.equals(WeatherData.KEY_TEMPERATURE_HIGH) || + key.equals(WeatherData.KEY_TEMPERATURE_LOW) || key.equals(WeatherData.KEY_APPARENT_TEMPERATURE) || + key.equals(WeatherData.KEY_APPARENT_TEMPERATURE_HIGH) || key.equals(WeatherData.KEY_APPARENT_TEMPERATURE_LOW)) { + JSONObject testEquals = (JSONObject) JsonUtils.readObjectFromJsonObject(underTest, key); + Hashtable<String, Object> hashTest = JsonRPCMarshaller.deserializeJSONObject(testEquals); + assertTrue(TestValues.TRUE, Validator.validateTemperature(TestValues.GENERAL_TEMPERATURE, new Temperature(hashTest))); + } else if (key.equals(WeatherData.KEY_TIME)) { + JSONObject testEquals = (JSONObject) JsonUtils.readObjectFromJsonObject(underTest, key); + Hashtable<String, Object> hashTest = JsonRPCMarshaller.deserializeJSONObject(testEquals); + assertTrue(TestValues.TRUE, Validator.validateDateTime(TestValues.GENERAL_DATETIME, new DateTime(hashTest))); + } else if (key.equals(WeatherData.KEY_WEATHER_ICON)) { + JSONObject testEquals = (JSONObject) JsonUtils.readObjectFromJsonObject(underTest, key); + Hashtable<String, Object> hashTest = JsonRPCMarshaller.deserializeJSONObject(testEquals); + assertTrue(TestValues.TRUE, Validator.validateImage(TestValues.GENERAL_IMAGE, new Image(hashTest))); + } else { + assertEquals(TestValues.MATCH, JsonUtils.readObjectFromJsonObject(reference, key), JsonUtils.readObjectFromJsonObject(underTest, key)); + } + } + } catch (JSONException e) { + fail(TestValues.JSON_FAIL); + } + } }
\ No newline at end of file diff --git a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/WeatherServiceDataTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/WeatherServiceDataTests.java index 3e3e26d95..10d40ddfc 100644 --- a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/WeatherServiceDataTests.java +++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/WeatherServiceDataTests.java @@ -27,116 +27,116 @@ import java.util.List; */ public class WeatherServiceDataTests extends TestCase { - private WeatherServiceData msg; - - @Override - public void setUp(){ - - msg = new WeatherServiceData(); - msg.setLocation(TestValues.GENERAL_LOCATIONDETAILS); - msg.setCurrentForecast(TestValues.GENERAL_WEATHERDATA); - msg.setMinuteForecast(TestValues.GENERAL_WEATHERDATA_LIST); - msg.setHourlyForecast(TestValues.GENERAL_WEATHERDATA_LIST); - msg.setMultidayForecast(TestValues.GENERAL_WEATHERDATA_LIST); - msg.setAlerts(TestValues.GENERAL_WEATHERALERT_LIST); - } - - /** - * Tests the expected values of the RPC message. - */ - public void testRpcValues () { - // Test Values - LocationDetails location = msg.getLocation(); - WeatherData currentForecast = msg.getCurrentForecast(); - List<WeatherData> minuteForecast = msg.getMinuteForecast(); - List<WeatherData> hourlyForecast = msg.getHourlyForecast(); - List<WeatherData> multidayForecast = msg.getMultidayForecast(); - List<WeatherAlert> alerts = msg.getAlerts(); - - // Valid Tests - assertEquals(TestValues.GENERAL_LOCATIONDETAILS, location); - assertEquals(TestValues.GENERAL_WEATHERDATA, currentForecast); - assertEquals(TestValues.GENERAL_WEATHERDATA_LIST, minuteForecast); - assertEquals(TestValues.GENERAL_WEATHERDATA_LIST, hourlyForecast); - assertEquals(TestValues.GENERAL_WEATHERDATA_LIST, multidayForecast); - assertEquals(TestValues.GENERAL_WEATHERALERT_LIST, alerts); - - // Invalid/Null Tests - WeatherServiceData msg = new WeatherServiceData(); - assertNotNull(TestValues.NOT_NULL, msg); - - assertNull(TestValues.NULL, msg.getLocation()); - assertNull(TestValues.NULL, msg.getCurrentForecast()); - assertNull(TestValues.NULL, msg.getMinuteForecast()); - assertNull(TestValues.NULL, msg.getHourlyForecast()); - assertNull(TestValues.NULL, msg.getMultidayForecast()); - assertNull(TestValues.NULL, msg.getAlerts()); - } - - public void testRequiredParamsConstructor(){ - msg = new WeatherServiceData(TestValues.GENERAL_LOCATIONDETAILS); - LocationDetails location = msg.getLocation(); - assertEquals(TestValues.GENERAL_LOCATIONDETAILS, location); - } - - public void testJson(){ - JSONObject reference = new JSONObject(); - - try{ - reference.put(WeatherServiceData.KEY_LOCATION, TestValues.GENERAL_LOCATIONDETAILS); - reference.put(WeatherServiceData.KEY_CURRENT_FORECAST, TestValues.GENERAL_WEATHERDATA); - reference.put(WeatherServiceData.KEY_MINUTE_FORECAST, TestValues.GENERAL_WEATHERDATA_LIST); - reference.put(WeatherServiceData.KEY_HOURLY_FORECAST, TestValues.GENERAL_WEATHERDATA_LIST); - reference.put(WeatherServiceData.KEY_MULTIDAY_FORECAST, TestValues.GENERAL_WEATHERDATA_LIST); - reference.put(WeatherServiceData.KEY_ALERTS, TestValues.GENERAL_WEATHERALERT_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(WeatherServiceData.KEY_LOCATION)){ - - JSONObject testEquals = (JSONObject) JsonUtils.readObjectFromJsonObject(underTest, key); - Hashtable<String, Object> hashTest = JsonRPCMarshaller.deserializeJSONObject(testEquals); - assertTrue(TestValues.TRUE, Validator.validateLocationDetails( TestValues.GENERAL_LOCATIONDETAILS, new LocationDetails(hashTest))); - - } else if(key.equals(WeatherServiceData.KEY_CURRENT_FORECAST)){ - - JSONObject testEquals = (JSONObject) JsonUtils.readObjectFromJsonObject(underTest, key); - Hashtable<String, Object> hashTest = JsonRPCMarshaller.deserializeJSONObject(testEquals); - assertTrue(TestValues.TRUE, Validator.validateWeatherData( TestValues.GENERAL_WEATHERDATA, new WeatherData(hashTest))); - - } else if(key.equals(WeatherServiceData.KEY_MINUTE_FORECAST) || key.equals(WeatherServiceData.KEY_HOURLY_FORECAST) - || key.equals(WeatherServiceData.KEY_MULTIDAY_FORECAST)){ - - JSONArray weatherDataArrayObjTest = JsonUtils.readJsonArrayFromJsonObject(underTest, key); - List<WeatherData> weatherDataUnderTestList = new ArrayList<>(); - for (int index = 0; index < weatherDataArrayObjTest.length(); index++) { - WeatherData weatherData1 = new WeatherData(JsonRPCMarshaller.deserializeJSONObject( (JSONObject)weatherDataArrayObjTest.get(index) )); - weatherDataUnderTestList.add(weatherData1); - } - - assertTrue("JSON value didn't match expected value for key \"" + key + "\".", - Validator.validateWeatherDataList(TestValues.GENERAL_WEATHERDATA_LIST, weatherDataUnderTestList)); - - } else if(key.equals(WeatherServiceData.KEY_ALERTS)){ - - JSONArray weatherAlertArrayObjTest = JsonUtils.readJsonArrayFromJsonObject(underTest, key); - List<WeatherAlert> weatherAlertUnderTestList = new ArrayList<>(); - for (int index = 0; index < weatherAlertArrayObjTest.length(); index++) { - WeatherAlert weatherAlert1 = new WeatherAlert(JsonRPCMarshaller.deserializeJSONObject( (JSONObject)weatherAlertArrayObjTest.get(index) )); - weatherAlertUnderTestList.add(weatherAlert1); - } - - assertTrue("JSON value didn't match expected value for key \"" + key + "\".", - Validator.validateWeatherAlertList(TestValues.GENERAL_WEATHERALERT_LIST, weatherAlertUnderTestList)); - } - } - } catch(JSONException e){ - fail(TestValues.JSON_FAIL); - } - } + private WeatherServiceData msg; + + @Override + public void setUp() { + + msg = new WeatherServiceData(); + msg.setLocation(TestValues.GENERAL_LOCATIONDETAILS); + msg.setCurrentForecast(TestValues.GENERAL_WEATHERDATA); + msg.setMinuteForecast(TestValues.GENERAL_WEATHERDATA_LIST); + msg.setHourlyForecast(TestValues.GENERAL_WEATHERDATA_LIST); + msg.setMultidayForecast(TestValues.GENERAL_WEATHERDATA_LIST); + msg.setAlerts(TestValues.GENERAL_WEATHERALERT_LIST); + } + + /** + * Tests the expected values of the RPC message. + */ + public void testRpcValues() { + // Test Values + LocationDetails location = msg.getLocation(); + WeatherData currentForecast = msg.getCurrentForecast(); + List<WeatherData> minuteForecast = msg.getMinuteForecast(); + List<WeatherData> hourlyForecast = msg.getHourlyForecast(); + List<WeatherData> multidayForecast = msg.getMultidayForecast(); + List<WeatherAlert> alerts = msg.getAlerts(); + + // Valid Tests + assertEquals(TestValues.GENERAL_LOCATIONDETAILS, location); + assertEquals(TestValues.GENERAL_WEATHERDATA, currentForecast); + assertEquals(TestValues.GENERAL_WEATHERDATA_LIST, minuteForecast); + assertEquals(TestValues.GENERAL_WEATHERDATA_LIST, hourlyForecast); + assertEquals(TestValues.GENERAL_WEATHERDATA_LIST, multidayForecast); + assertEquals(TestValues.GENERAL_WEATHERALERT_LIST, alerts); + + // Invalid/Null Tests + WeatherServiceData msg = new WeatherServiceData(); + assertNotNull(TestValues.NOT_NULL, msg); + + assertNull(TestValues.NULL, msg.getLocation()); + assertNull(TestValues.NULL, msg.getCurrentForecast()); + assertNull(TestValues.NULL, msg.getMinuteForecast()); + assertNull(TestValues.NULL, msg.getHourlyForecast()); + assertNull(TestValues.NULL, msg.getMultidayForecast()); + assertNull(TestValues.NULL, msg.getAlerts()); + } + + public void testRequiredParamsConstructor() { + msg = new WeatherServiceData(TestValues.GENERAL_LOCATIONDETAILS); + LocationDetails location = msg.getLocation(); + assertEquals(TestValues.GENERAL_LOCATIONDETAILS, location); + } + + public void testJson() { + JSONObject reference = new JSONObject(); + + try { + reference.put(WeatherServiceData.KEY_LOCATION, TestValues.GENERAL_LOCATIONDETAILS); + reference.put(WeatherServiceData.KEY_CURRENT_FORECAST, TestValues.GENERAL_WEATHERDATA); + reference.put(WeatherServiceData.KEY_MINUTE_FORECAST, TestValues.GENERAL_WEATHERDATA_LIST); + reference.put(WeatherServiceData.KEY_HOURLY_FORECAST, TestValues.GENERAL_WEATHERDATA_LIST); + reference.put(WeatherServiceData.KEY_MULTIDAY_FORECAST, TestValues.GENERAL_WEATHERDATA_LIST); + reference.put(WeatherServiceData.KEY_ALERTS, TestValues.GENERAL_WEATHERALERT_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(WeatherServiceData.KEY_LOCATION)) { + + JSONObject testEquals = (JSONObject) JsonUtils.readObjectFromJsonObject(underTest, key); + Hashtable<String, Object> hashTest = JsonRPCMarshaller.deserializeJSONObject(testEquals); + assertTrue(TestValues.TRUE, Validator.validateLocationDetails(TestValues.GENERAL_LOCATIONDETAILS, new LocationDetails(hashTest))); + + } else if (key.equals(WeatherServiceData.KEY_CURRENT_FORECAST)) { + + JSONObject testEquals = (JSONObject) JsonUtils.readObjectFromJsonObject(underTest, key); + Hashtable<String, Object> hashTest = JsonRPCMarshaller.deserializeJSONObject(testEquals); + assertTrue(TestValues.TRUE, Validator.validateWeatherData(TestValues.GENERAL_WEATHERDATA, new WeatherData(hashTest))); + + } else if (key.equals(WeatherServiceData.KEY_MINUTE_FORECAST) || key.equals(WeatherServiceData.KEY_HOURLY_FORECAST) + || key.equals(WeatherServiceData.KEY_MULTIDAY_FORECAST)) { + + JSONArray weatherDataArrayObjTest = JsonUtils.readJsonArrayFromJsonObject(underTest, key); + List<WeatherData> weatherDataUnderTestList = new ArrayList<>(); + for (int index = 0; index < weatherDataArrayObjTest.length(); index++) { + WeatherData weatherData1 = new WeatherData(JsonRPCMarshaller.deserializeJSONObject((JSONObject) weatherDataArrayObjTest.get(index))); + weatherDataUnderTestList.add(weatherData1); + } + + assertTrue("JSON value didn't match expected value for key \"" + key + "\".", + Validator.validateWeatherDataList(TestValues.GENERAL_WEATHERDATA_LIST, weatherDataUnderTestList)); + + } else if (key.equals(WeatherServiceData.KEY_ALERTS)) { + + JSONArray weatherAlertArrayObjTest = JsonUtils.readJsonArrayFromJsonObject(underTest, key); + List<WeatherAlert> weatherAlertUnderTestList = new ArrayList<>(); + for (int index = 0; index < weatherAlertArrayObjTest.length(); index++) { + WeatherAlert weatherAlert1 = new WeatherAlert(JsonRPCMarshaller.deserializeJSONObject((JSONObject) weatherAlertArrayObjTest.get(index))); + weatherAlertUnderTestList.add(weatherAlert1); + } + + assertTrue("JSON value didn't match expected value for key \"" + key + "\".", + Validator.validateWeatherAlertList(TestValues.GENERAL_WEATHERALERT_LIST, weatherAlertUnderTestList)); + } + } + } catch (JSONException e) { + fail(TestValues.JSON_FAIL); + } + } } diff --git a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/WeatherServiceManifestTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/WeatherServiceManifestTests.java index 7a576569b..87c1e4639 100644 --- a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/WeatherServiceManifestTests.java +++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/WeatherServiceManifestTests.java @@ -17,68 +17,68 @@ import java.util.Iterator; */ public class WeatherServiceManifestTests extends TestCase { - private WeatherServiceManifest msg; - - @Override - public void setUp(){ - msg = new WeatherServiceManifest(); - - msg.setCurrentForecastSupported(TestValues.GENERAL_BOOLEAN); - msg.setMaxHourlyForecastAmount(TestValues.GENERAL_INT); - msg.setMaxMinutelyForecastAmount(TestValues.GENERAL_INT); - msg.setMaxMultidayForecastAmount(TestValues.GENERAL_INT); - msg.setWeatherForLocationSupported(TestValues.GENERAL_BOOLEAN); - } - - /** - * Tests the expected values of the RPC message. - */ - public void testRpcValues () { - // Test Values - boolean currentForecastSupported = msg.getCurrentForecastSupported(); - boolean weatherForLocationSupported = msg.getWeatherForLocationSupported(); - Integer getMaxHourlyForecastAmt = msg.getMaxHourlyForecastAmount(); - Integer getMaxMinutelyForecastAmt = msg.getMaxMinutelyForecastAmount(); - Integer getMaxMultidayForecastAmt = msg.getMaxMultidayForecastAmount(); - - // Valid Tests - assertEquals(TestValues.GENERAL_BOOLEAN, currentForecastSupported); - assertEquals(TestValues.GENERAL_BOOLEAN, weatherForLocationSupported); - assertEquals(TestValues.MATCH, TestValues.GENERAL_INTEGER, getMaxHourlyForecastAmt); - assertEquals(TestValues.MATCH, TestValues.GENERAL_INTEGER, getMaxMinutelyForecastAmt); - assertEquals(TestValues.MATCH, TestValues.GENERAL_INTEGER, getMaxMultidayForecastAmt); - - // Invalid/Null Tests - WeatherServiceManifest msg = new WeatherServiceManifest(); - assertNotNull(TestValues.NOT_NULL, msg); - - assertNull(TestValues.NULL, msg.getCurrentForecastSupported()); - assertNull(TestValues.NULL, msg.getWeatherForLocationSupported()); - assertNull(TestValues.NULL, msg.getMaxHourlyForecastAmount()); - assertNull(TestValues.NULL, msg.getMaxMinutelyForecastAmount()); - assertNull(TestValues.NULL, msg.getMaxMultidayForecastAmount()); - } - - public void testJson(){ - JSONObject reference = new JSONObject(); - - try{ - reference.put(WeatherServiceManifest.KEY_CURRENT_FORECAST_SUPPORTED, TestValues.GENERAL_BOOLEAN); - reference.put(WeatherServiceManifest.KEY_WEATHER_FOR_LOCATION_SUPPORTED, TestValues.GENERAL_BOOLEAN); - reference.put(WeatherServiceManifest.KEY_MAX_HOURLY_FORECAST_AMOUNT, TestValues.GENERAL_INTEGER); - reference.put(WeatherServiceManifest.KEY_MAX_MINUTELY_FORECAST_AMOUNT, TestValues.GENERAL_INTEGER); - reference.put(WeatherServiceManifest.KEY_MAX_MULTIDAY_FORECAST_AMOUNT, TestValues.GENERAL_INTEGER); - - JSONObject underTest = msg.serializeJSON(); - assertEquals(TestValues.MATCH, reference.length(), underTest.length()); - - Iterator<?> iterator = reference.keys(); - while(iterator.hasNext()){ - String key = (String) iterator.next(); - assertEquals(TestValues.MATCH, JsonUtils.readObjectFromJsonObject(reference, key), JsonUtils.readObjectFromJsonObject(underTest, key)); - } - } catch(JSONException e){ - fail(TestValues.JSON_FAIL); - } - } + private WeatherServiceManifest msg; + + @Override + public void setUp() { + msg = new WeatherServiceManifest(); + + msg.setCurrentForecastSupported(TestValues.GENERAL_BOOLEAN); + msg.setMaxHourlyForecastAmount(TestValues.GENERAL_INT); + msg.setMaxMinutelyForecastAmount(TestValues.GENERAL_INT); + msg.setMaxMultidayForecastAmount(TestValues.GENERAL_INT); + msg.setWeatherForLocationSupported(TestValues.GENERAL_BOOLEAN); + } + + /** + * Tests the expected values of the RPC message. + */ + public void testRpcValues() { + // Test Values + boolean currentForecastSupported = msg.getCurrentForecastSupported(); + boolean weatherForLocationSupported = msg.getWeatherForLocationSupported(); + Integer getMaxHourlyForecastAmt = msg.getMaxHourlyForecastAmount(); + Integer getMaxMinutelyForecastAmt = msg.getMaxMinutelyForecastAmount(); + Integer getMaxMultidayForecastAmt = msg.getMaxMultidayForecastAmount(); + + // Valid Tests + assertEquals(TestValues.GENERAL_BOOLEAN, currentForecastSupported); + assertEquals(TestValues.GENERAL_BOOLEAN, weatherForLocationSupported); + assertEquals(TestValues.MATCH, TestValues.GENERAL_INTEGER, getMaxHourlyForecastAmt); + assertEquals(TestValues.MATCH, TestValues.GENERAL_INTEGER, getMaxMinutelyForecastAmt); + assertEquals(TestValues.MATCH, TestValues.GENERAL_INTEGER, getMaxMultidayForecastAmt); + + // Invalid/Null Tests + WeatherServiceManifest msg = new WeatherServiceManifest(); + assertNotNull(TestValues.NOT_NULL, msg); + + assertNull(TestValues.NULL, msg.getCurrentForecastSupported()); + assertNull(TestValues.NULL, msg.getWeatherForLocationSupported()); + assertNull(TestValues.NULL, msg.getMaxHourlyForecastAmount()); + assertNull(TestValues.NULL, msg.getMaxMinutelyForecastAmount()); + assertNull(TestValues.NULL, msg.getMaxMultidayForecastAmount()); + } + + public void testJson() { + JSONObject reference = new JSONObject(); + + try { + reference.put(WeatherServiceManifest.KEY_CURRENT_FORECAST_SUPPORTED, TestValues.GENERAL_BOOLEAN); + reference.put(WeatherServiceManifest.KEY_WEATHER_FOR_LOCATION_SUPPORTED, TestValues.GENERAL_BOOLEAN); + reference.put(WeatherServiceManifest.KEY_MAX_HOURLY_FORECAST_AMOUNT, TestValues.GENERAL_INTEGER); + reference.put(WeatherServiceManifest.KEY_MAX_MINUTELY_FORECAST_AMOUNT, TestValues.GENERAL_INTEGER); + reference.put(WeatherServiceManifest.KEY_MAX_MULTIDAY_FORECAST_AMOUNT, TestValues.GENERAL_INTEGER); + + JSONObject underTest = msg.serializeJSON(); + assertEquals(TestValues.MATCH, reference.length(), underTest.length()); + + Iterator<?> iterator = reference.keys(); + while (iterator.hasNext()) { + String key = (String) iterator.next(); + assertEquals(TestValues.MATCH, JsonUtils.readObjectFromJsonObject(reference, key), JsonUtils.readObjectFromJsonObject(underTest, key)); + } + } catch (JSONException e) { + fail(TestValues.JSON_FAIL); + } + } }
\ No newline at end of file diff --git a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/WindowCapabilityTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/WindowCapabilityTests.java index 6ddee819b..cee5b5f84 100644 --- a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/WindowCapabilityTests.java +++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/WindowCapabilityTests.java @@ -92,7 +92,7 @@ public class WindowCapabilityTests extends TestCase { assertEquals(TestValues.MATCH, TestValues.GENERAL_STRING_LIST.get(i), templatesAvailable.get(i)); } - for(int i = 0; i < TestValues.GENERAL_MENU_LAYOUT_LIST.size(); i++){ + for (int i = 0; i < TestValues.GENERAL_MENU_LAYOUT_LIST.size(); i++) { assertEquals(TestValues.MATCH, TestValues.GENERAL_MENU_LAYOUT_LIST.get(i), menuLayouts.get(i)); } @@ -210,8 +210,8 @@ public class WindowCapabilityTests extends TestCase { assertEquals(TestValues.MATCH, referenceArray.length(), underTestArray.length()); for (int i = 0; i < referenceArray.length(); i++) { - imageFieldNameListReference.add( (ImageFieldName) referenceArray.get(i)); - imageFieldNameListTest.add( (ImageFieldName) underTestArray.get(i)); + imageFieldNameListReference.add((ImageFieldName) referenceArray.get(i)); + imageFieldNameListTest.add((ImageFieldName) underTestArray.get(i)); } assertTrue(TestValues.TRUE, imageFieldNameListReference.containsAll(imageFieldNameListTest) && imageFieldNameListTest.containsAll(imageFieldNameListReference)); } else { diff --git a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/AmbientLightStatusTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/AmbientLightStatusTests.java index adc398eff..5c90c09ed 100644 --- a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/AmbientLightStatusTests.java +++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/AmbientLightStatusTests.java @@ -9,89 +9,87 @@ import java.util.Arrays; import java.util.List; /** - * This is a unit test class for the SmartDeviceLink library project class : + * This is a unit test class for the SmartDeviceLink library project class : * {@link com.smartdevicelink.proxy.rpc.enums.AmbientLightStatus} */ public class AmbientLightStatusTests extends TestCase { - /** - * Verifies that the enum values are not null upon valid assignment. - */ - public void testValidEnums () { - - String example = "DAY"; - AmbientLightStatus enumDay = AmbientLightStatus.valueForString(example); - example = "NIGHT"; - AmbientLightStatus enumNight = AmbientLightStatus.valueForString(example); - example = "UNKNOWN"; - AmbientLightStatus enumUnknown = AmbientLightStatus.valueForString(example); - example = "INVALID"; - AmbientLightStatus enumInvalid = AmbientLightStatus.valueForString(example); - example = "TWILIGHT_1"; - AmbientLightStatus enumTwilight1 = AmbientLightStatus.valueForString(example); - example = "TWILIGHT_2"; - AmbientLightStatus enumTwilight2 = AmbientLightStatus.valueForString(example); - example = "TWILIGHT_3"; - AmbientLightStatus enumTwilight3 = AmbientLightStatus.valueForString(example); - example = "TWILIGHT_4"; - AmbientLightStatus enumTwilight4 = AmbientLightStatus.valueForString(example); - - assertNotNull("DAY returned null", enumDay); - assertNotNull("NIGHT returned null", enumNight); - assertNotNull("UNKNOWN returned null", enumUnknown); - assertNotNull("INVALID returned null", enumInvalid); - assertNotNull("TWILIGHT_1 returned null", enumTwilight1); - assertNotNull("TWILIGHT_2 returned null", enumTwilight2); - assertNotNull("TWILIGHT_3 returned null", enumTwilight3); - assertNotNull("TWILIGHT_4 returned null", enumTwilight4); - } - - /** - * Verifies that an invalid assignment is null. - */ - public void testInvalidEnum () { - String example = "niGHt"; - try { - AmbientLightStatus temp = AmbientLightStatus.valueForString(example); + /** + * Verifies that the enum values are not null upon valid assignment. + */ + public void testValidEnums() { + + String example = "DAY"; + AmbientLightStatus enumDay = AmbientLightStatus.valueForString(example); + example = "NIGHT"; + AmbientLightStatus enumNight = AmbientLightStatus.valueForString(example); + example = "UNKNOWN"; + AmbientLightStatus enumUnknown = AmbientLightStatus.valueForString(example); + example = "INVALID"; + AmbientLightStatus enumInvalid = AmbientLightStatus.valueForString(example); + example = "TWILIGHT_1"; + AmbientLightStatus enumTwilight1 = AmbientLightStatus.valueForString(example); + example = "TWILIGHT_2"; + AmbientLightStatus enumTwilight2 = AmbientLightStatus.valueForString(example); + example = "TWILIGHT_3"; + AmbientLightStatus enumTwilight3 = AmbientLightStatus.valueForString(example); + example = "TWILIGHT_4"; + AmbientLightStatus enumTwilight4 = AmbientLightStatus.valueForString(example); + + assertNotNull("DAY returned null", enumDay); + assertNotNull("NIGHT returned null", enumNight); + assertNotNull("UNKNOWN returned null", enumUnknown); + assertNotNull("INVALID returned null", enumInvalid); + assertNotNull("TWILIGHT_1 returned null", enumTwilight1); + assertNotNull("TWILIGHT_2 returned null", enumTwilight2); + assertNotNull("TWILIGHT_3 returned null", enumTwilight3); + assertNotNull("TWILIGHT_4 returned null", enumTwilight4); + } + + /** + * Verifies that an invalid assignment is null. + */ + public void testInvalidEnum() { + String example = "niGHt"; + try { + AmbientLightStatus temp = AmbientLightStatus.valueForString(example); assertNull("Result of valueForString should be null.", temp); - } - catch (IllegalArgumentException exception) { - fail("Invalid enum throws IllegalArgumentException."); - } - } - - /** - * Verifies that a null assignment is invalid. - */ - public void testNullEnum () { - String example = null; - try { - AmbientLightStatus temp = AmbientLightStatus.valueForString(example); + } catch (IllegalArgumentException exception) { + fail("Invalid enum throws IllegalArgumentException."); + } + } + + /** + * Verifies that a null assignment is invalid. + */ + public void testNullEnum() { + String example = null; + try { + AmbientLightStatus temp = AmbientLightStatus.valueForString(example); assertNull("Result of valueForString should be null.", temp); - } - catch (NullPointerException exception) { + } catch (NullPointerException exception) { fail("Null string throws NullPointerException."); - } - } - - /** - * Verifies the possible enum values of AmbientLightStatus. - */ - public void testListEnum() { - List<AmbientLightStatus> enumValueList = Arrays.asList(AmbientLightStatus.values()); - List<AmbientLightStatus> enumTestList = new ArrayList<AmbientLightStatus>(); - - enumTestList.add(AmbientLightStatus.DAY); - enumTestList.add(AmbientLightStatus.NIGHT); - enumTestList.add(AmbientLightStatus.UNKNOWN); - enumTestList.add(AmbientLightStatus.INVALID); - enumTestList.add(AmbientLightStatus.TWILIGHT_1); - enumTestList.add(AmbientLightStatus.TWILIGHT_2); - enumTestList.add(AmbientLightStatus.TWILIGHT_3); - enumTestList.add(AmbientLightStatus.TWILIGHT_4); + } + } + + /** + * Verifies the possible enum values of AmbientLightStatus. + */ + public void testListEnum() { + List<AmbientLightStatus> enumValueList = Arrays.asList(AmbientLightStatus.values()); + List<AmbientLightStatus> enumTestList = new ArrayList<AmbientLightStatus>(); + + enumTestList.add(AmbientLightStatus.DAY); + enumTestList.add(AmbientLightStatus.NIGHT); + enumTestList.add(AmbientLightStatus.UNKNOWN); + enumTestList.add(AmbientLightStatus.INVALID); + enumTestList.add(AmbientLightStatus.TWILIGHT_1); + enumTestList.add(AmbientLightStatus.TWILIGHT_2); + enumTestList.add(AmbientLightStatus.TWILIGHT_3); + enumTestList.add(AmbientLightStatus.TWILIGHT_4); - assertTrue("Enum value list does not match enum class list.", - enumValueList.containsAll(enumTestList) && - enumTestList.containsAll(enumValueList)); - } + assertTrue("Enum value list does not match enum class list.", + enumValueList.containsAll(enumTestList) && + enumTestList.containsAll(enumValueList)); + } }
\ No newline at end of file diff --git a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/AppHmiTypeTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/AppHmiTypeTests.java index af0881ad6..32e1d1284 100644 --- a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/AppHmiTypeTests.java +++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/AppHmiTypeTests.java @@ -9,107 +9,105 @@ import java.util.Arrays; import java.util.List; /** - * This is a unit test class for the SmartDeviceLink library project class : + * This is a unit test class for the SmartDeviceLink library project class : * {@link com.smartdevicelink.proxy.rpc.enums.AppHMIType} */ public class AppHmiTypeTests extends TestCase { - /** - * Verifies that the enum values are not null upon valid assignment. - */ - public void testValidEnums () { - String example = "DEFAULT"; - AppHMIType enumDefault = AppHMIType.valueForString(example); - example = "COMMUNICATION"; - AppHMIType enumCommunication = AppHMIType.valueForString(example); - example = "MEDIA"; - AppHMIType enumMedia = AppHMIType.valueForString(example); - example = "MESSAGING"; - AppHMIType enumMessaging = AppHMIType.valueForString(example); - example = "NAVIGATION"; - AppHMIType enumNavigation = AppHMIType.valueForString(example); - example = "INFORMATION"; - AppHMIType enumInformation = AppHMIType.valueForString(example); - example = "SOCIAL"; - AppHMIType enumSocial = AppHMIType.valueForString(example); - example = "BACKGROUND_PROCESS"; - AppHMIType enumBackgroundProcess = AppHMIType.valueForString(example); - example = "PROJECTION"; - AppHMIType enumProjection = AppHMIType.valueForString(example); - example = "TESTING"; - AppHMIType enumTesting = AppHMIType.valueForString(example); - example = "SYSTEM"; - AppHMIType enumSystem = AppHMIType.valueForString(example); - example = "REMOTE_CONTROL"; - AppHMIType enumRemoteControl = AppHMIType.valueForString(example); - example = "WEB_VIEW"; - AppHMIType enumWebView = AppHMIType.valueForString(example); - - assertNotNull("DEFAULT returned null", enumDefault); - assertNotNull("COMMUNICATION returned null", enumCommunication); - assertNotNull("MEDIA returned null", enumMedia); - assertNotNull("MESSAGING returned null", enumMessaging); - assertNotNull("NAVIGATION returned null", enumNavigation); - assertNotNull("INFORMATION returned null", enumInformation); - assertNotNull("SOCIAL returned null", enumSocial); - assertNotNull("BACKGROUND_PROCESS returned null", enumBackgroundProcess); - assertNotNull("PROJECTION returned null", enumProjection); - assertNotNull("TESTING returned null", enumTesting); - assertNotNull("SYSTEM returned null", enumSystem); - assertNotNull("REMOTE_CONTROL returned null", enumRemoteControl); - assertNotNull("WEB_VIEW returned null", enumWebView); - } - - /** - * Verifies that an invalid assignment is null. - */ - public void testInvalidEnum () { - String example = "deFaUlt"; - try { - AppHMIType temp = AppHMIType.valueForString(example); + /** + * Verifies that the enum values are not null upon valid assignment. + */ + public void testValidEnums() { + String example = "DEFAULT"; + AppHMIType enumDefault = AppHMIType.valueForString(example); + example = "COMMUNICATION"; + AppHMIType enumCommunication = AppHMIType.valueForString(example); + example = "MEDIA"; + AppHMIType enumMedia = AppHMIType.valueForString(example); + example = "MESSAGING"; + AppHMIType enumMessaging = AppHMIType.valueForString(example); + example = "NAVIGATION"; + AppHMIType enumNavigation = AppHMIType.valueForString(example); + example = "INFORMATION"; + AppHMIType enumInformation = AppHMIType.valueForString(example); + example = "SOCIAL"; + AppHMIType enumSocial = AppHMIType.valueForString(example); + example = "BACKGROUND_PROCESS"; + AppHMIType enumBackgroundProcess = AppHMIType.valueForString(example); + example = "PROJECTION"; + AppHMIType enumProjection = AppHMIType.valueForString(example); + example = "TESTING"; + AppHMIType enumTesting = AppHMIType.valueForString(example); + example = "SYSTEM"; + AppHMIType enumSystem = AppHMIType.valueForString(example); + example = "REMOTE_CONTROL"; + AppHMIType enumRemoteControl = AppHMIType.valueForString(example); + example = "WEB_VIEW"; + AppHMIType enumWebView = AppHMIType.valueForString(example); + + assertNotNull("DEFAULT returned null", enumDefault); + assertNotNull("COMMUNICATION returned null", enumCommunication); + assertNotNull("MEDIA returned null", enumMedia); + assertNotNull("MESSAGING returned null", enumMessaging); + assertNotNull("NAVIGATION returned null", enumNavigation); + assertNotNull("INFORMATION returned null", enumInformation); + assertNotNull("SOCIAL returned null", enumSocial); + assertNotNull("BACKGROUND_PROCESS returned null", enumBackgroundProcess); + assertNotNull("PROJECTION returned null", enumProjection); + assertNotNull("TESTING returned null", enumTesting); + assertNotNull("SYSTEM returned null", enumSystem); + assertNotNull("REMOTE_CONTROL returned null", enumRemoteControl); + assertNotNull("WEB_VIEW returned null", enumWebView); + } + + /** + * Verifies that an invalid assignment is null. + */ + public void testInvalidEnum() { + String example = "deFaUlt"; + try { + AppHMIType temp = AppHMIType.valueForString(example); assertNull("Result of valueForString should be null.", temp); - } - catch (IllegalArgumentException exception) { + } catch (IllegalArgumentException exception) { fail("Invalid enum throws IllegalArgumentException."); - } - } - - /** - * Verifies that a null assignment is invalid. - */ - public void testNullEnum () { - String example = null; - try { - AppHMIType temp = AppHMIType.valueForString(example); + } + } + + /** + * Verifies that a null assignment is invalid. + */ + public void testNullEnum() { + String example = null; + try { + AppHMIType temp = AppHMIType.valueForString(example); assertNull("Result of valueForString should be null.", temp); - } - catch (NullPointerException exception) { + } catch (NullPointerException exception) { fail("Null string throws NullPointerException."); - } - } - - /** - * Verifies the possible enum values of AmbientLightStatus. - */ - public void testListEnum() { - List<AppHMIType> enumValueList = Arrays.asList(AppHMIType.values()); - - List<AppHMIType> enumTestList = new ArrayList<AppHMIType>(); - enumTestList.add(AppHMIType.DEFAULT); - enumTestList.add(AppHMIType.COMMUNICATION); - enumTestList.add(AppHMIType.MEDIA); - enumTestList.add(AppHMIType.MESSAGING); - enumTestList.add(AppHMIType.NAVIGATION); - enumTestList.add(AppHMIType.INFORMATION); - enumTestList.add(AppHMIType.SOCIAL); - enumTestList.add(AppHMIType.BACKGROUND_PROCESS); - enumTestList.add(AppHMIType.PROJECTION); - enumTestList.add(AppHMIType.TESTING); - enumTestList.add(AppHMIType.SYSTEM); - enumTestList.add(AppHMIType.REMOTE_CONTROL); - enumTestList.add(AppHMIType.WEB_VIEW); + } + } + + /** + * Verifies the possible enum values of AmbientLightStatus. + */ + public void testListEnum() { + List<AppHMIType> enumValueList = Arrays.asList(AppHMIType.values()); + + List<AppHMIType> enumTestList = new ArrayList<AppHMIType>(); + enumTestList.add(AppHMIType.DEFAULT); + enumTestList.add(AppHMIType.COMMUNICATION); + enumTestList.add(AppHMIType.MEDIA); + enumTestList.add(AppHMIType.MESSAGING); + enumTestList.add(AppHMIType.NAVIGATION); + enumTestList.add(AppHMIType.INFORMATION); + enumTestList.add(AppHMIType.SOCIAL); + enumTestList.add(AppHMIType.BACKGROUND_PROCESS); + enumTestList.add(AppHMIType.PROJECTION); + enumTestList.add(AppHMIType.TESTING); + enumTestList.add(AppHMIType.SYSTEM); + enumTestList.add(AppHMIType.REMOTE_CONTROL); + enumTestList.add(AppHMIType.WEB_VIEW); - assertTrue("Enum value list does not match enum class list", - enumValueList.containsAll(enumTestList) && enumTestList.containsAll(enumValueList)); - } + assertTrue("Enum value list does not match enum class list", + enumValueList.containsAll(enumTestList) && enumTestList.containsAll(enumValueList)); + } }
\ No newline at end of file diff --git a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/AppInterfaceUnregisteredReasonTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/AppInterfaceUnregisteredReasonTests.java index 333ff8d52..056f57597 100644 --- a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/AppInterfaceUnregisteredReasonTests.java +++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/AppInterfaceUnregisteredReasonTests.java @@ -9,111 +9,109 @@ import java.util.Arrays; import java.util.List; /** - * This is a unit test class for the SmartDeviceLink library project class : + * This is a unit test class for the SmartDeviceLink library project class : * {@link com.smartdevicelink.proxy.rpc.enums.AppInterfaceUnregisteredReason} */ public class AppInterfaceUnregisteredReasonTests extends TestCase { - /** - * Verifies that the enum values are not null upon valid assignment. - */ - public void testValidEnums () { - String example = "USER_EXIT"; - AppInterfaceUnregisteredReason enumUserExit = AppInterfaceUnregisteredReason.valueForString(example); - example = "IGNITION_OFF"; - AppInterfaceUnregisteredReason enumIgnitionOff = AppInterfaceUnregisteredReason.valueForString(example); - example = "BLUETOOTH_OFF"; - AppInterfaceUnregisteredReason enumBluetoothOff = AppInterfaceUnregisteredReason.valueForString(example); - example = "USB_DISCONNECTED"; - AppInterfaceUnregisteredReason enumUsbDisconnected = AppInterfaceUnregisteredReason.valueForString(example); - example = "REQUEST_WHILE_IN_NONE_HMI_LEVEL"; - AppInterfaceUnregisteredReason enumRequestWhileInNoneHmiLevel = AppInterfaceUnregisteredReason.valueForString(example); - example = "TOO_MANY_REQUESTS"; - AppInterfaceUnregisteredReason enumTooManyRequests = AppInterfaceUnregisteredReason.valueForString(example); - example = "DRIVER_DISTRACTION_VIOLATION"; - AppInterfaceUnregisteredReason enumDriverDistractionViolation = AppInterfaceUnregisteredReason.valueForString(example); - example = "LANGUAGE_CHANGE"; - AppInterfaceUnregisteredReason enumLanguageChange = AppInterfaceUnregisteredReason.valueForString(example); - example = "MASTER_RESET"; - AppInterfaceUnregisteredReason enumMasterReset = AppInterfaceUnregisteredReason.valueForString(example); - example = "FACTORY_DEFAULTS"; - AppInterfaceUnregisteredReason enumFactoryDefaults = AppInterfaceUnregisteredReason.valueForString(example); - example = "APP_UNAUTHORIZED"; - AppInterfaceUnregisteredReason enumAppAuthorized = AppInterfaceUnregisteredReason.valueForString(example); - example = "PROTOCOL_VIOLATION"; - AppInterfaceUnregisteredReason enumProtocolViolation = AppInterfaceUnregisteredReason.valueForString(example); - example = "UNSUPPORTED_HMI_RESOURCE"; - AppInterfaceUnregisteredReason enumUnsupportedHMIResource = AppInterfaceUnregisteredReason.valueForString(example); - example = "RESOURCE_CONSTRAINT"; - AppInterfaceUnregisteredReason enumResourceConstraint = AppInterfaceUnregisteredReason.valueForString(example); - - assertNotNull("USER_EXIT returned null", enumUserExit); - assertNotNull("IGNITION_OFF returned null", enumIgnitionOff); - assertNotNull("BLUETOOTH_OFF returned null", enumBluetoothOff); - assertNotNull("USB_DISCONNECTED returned null", enumUsbDisconnected); - assertNotNull("REQUEST_WHILE_IN_NONE_HMI_LEVEL returned null", enumRequestWhileInNoneHmiLevel); - assertNotNull("TOO_MANY_REQUESTS returned null", enumTooManyRequests); - assertNotNull("DRIVER_DISTRACTION_VIOLATION returned null", enumDriverDistractionViolation); - assertNotNull("LANGUAGE_CHANGE returned null", enumLanguageChange); - assertNotNull("MASTER_RESET returned null", enumMasterReset); - assertNotNull("FACTORY_DEFAULTS returned null", enumFactoryDefaults); - assertNotNull("APP_UNAUTHORIZED returned null", enumAppAuthorized); - assertNotNull("PROTOCOL_VIOLATION returned null", enumProtocolViolation); - assertNotNull("UNSUPPORTED_HMI_RESOURCE returned null", enumUnsupportedHMIResource); - assertNotNull("RESOURCE_CONSTRAINT returned null", enumResourceConstraint); - } - - /** - * Verifies that an invalid assignment is null. - */ - public void testInvalidEnum () { - String example = "uSer_ExiT"; - try { - AppInterfaceUnregisteredReason temp = AppInterfaceUnregisteredReason.valueForString(example); + /** + * Verifies that the enum values are not null upon valid assignment. + */ + public void testValidEnums() { + String example = "USER_EXIT"; + AppInterfaceUnregisteredReason enumUserExit = AppInterfaceUnregisteredReason.valueForString(example); + example = "IGNITION_OFF"; + AppInterfaceUnregisteredReason enumIgnitionOff = AppInterfaceUnregisteredReason.valueForString(example); + example = "BLUETOOTH_OFF"; + AppInterfaceUnregisteredReason enumBluetoothOff = AppInterfaceUnregisteredReason.valueForString(example); + example = "USB_DISCONNECTED"; + AppInterfaceUnregisteredReason enumUsbDisconnected = AppInterfaceUnregisteredReason.valueForString(example); + example = "REQUEST_WHILE_IN_NONE_HMI_LEVEL"; + AppInterfaceUnregisteredReason enumRequestWhileInNoneHmiLevel = AppInterfaceUnregisteredReason.valueForString(example); + example = "TOO_MANY_REQUESTS"; + AppInterfaceUnregisteredReason enumTooManyRequests = AppInterfaceUnregisteredReason.valueForString(example); + example = "DRIVER_DISTRACTION_VIOLATION"; + AppInterfaceUnregisteredReason enumDriverDistractionViolation = AppInterfaceUnregisteredReason.valueForString(example); + example = "LANGUAGE_CHANGE"; + AppInterfaceUnregisteredReason enumLanguageChange = AppInterfaceUnregisteredReason.valueForString(example); + example = "MASTER_RESET"; + AppInterfaceUnregisteredReason enumMasterReset = AppInterfaceUnregisteredReason.valueForString(example); + example = "FACTORY_DEFAULTS"; + AppInterfaceUnregisteredReason enumFactoryDefaults = AppInterfaceUnregisteredReason.valueForString(example); + example = "APP_UNAUTHORIZED"; + AppInterfaceUnregisteredReason enumAppAuthorized = AppInterfaceUnregisteredReason.valueForString(example); + example = "PROTOCOL_VIOLATION"; + AppInterfaceUnregisteredReason enumProtocolViolation = AppInterfaceUnregisteredReason.valueForString(example); + example = "UNSUPPORTED_HMI_RESOURCE"; + AppInterfaceUnregisteredReason enumUnsupportedHMIResource = AppInterfaceUnregisteredReason.valueForString(example); + example = "RESOURCE_CONSTRAINT"; + AppInterfaceUnregisteredReason enumResourceConstraint = AppInterfaceUnregisteredReason.valueForString(example); + + assertNotNull("USER_EXIT returned null", enumUserExit); + assertNotNull("IGNITION_OFF returned null", enumIgnitionOff); + assertNotNull("BLUETOOTH_OFF returned null", enumBluetoothOff); + assertNotNull("USB_DISCONNECTED returned null", enumUsbDisconnected); + assertNotNull("REQUEST_WHILE_IN_NONE_HMI_LEVEL returned null", enumRequestWhileInNoneHmiLevel); + assertNotNull("TOO_MANY_REQUESTS returned null", enumTooManyRequests); + assertNotNull("DRIVER_DISTRACTION_VIOLATION returned null", enumDriverDistractionViolation); + assertNotNull("LANGUAGE_CHANGE returned null", enumLanguageChange); + assertNotNull("MASTER_RESET returned null", enumMasterReset); + assertNotNull("FACTORY_DEFAULTS returned null", enumFactoryDefaults); + assertNotNull("APP_UNAUTHORIZED returned null", enumAppAuthorized); + assertNotNull("PROTOCOL_VIOLATION returned null", enumProtocolViolation); + assertNotNull("UNSUPPORTED_HMI_RESOURCE returned null", enumUnsupportedHMIResource); + assertNotNull("RESOURCE_CONSTRAINT returned null", enumResourceConstraint); + } + + /** + * Verifies that an invalid assignment is null. + */ + public void testInvalidEnum() { + String example = "uSer_ExiT"; + try { + AppInterfaceUnregisteredReason temp = AppInterfaceUnregisteredReason.valueForString(example); assertNull("Result of valueForString should be null.", temp); - } - catch (IllegalArgumentException exception) { + } catch (IllegalArgumentException exception) { fail("Invalid enum throws IllegalArgumentException."); - } - } + } + } - /** - * Verifies that a null assignment is invalid. - */ - public void testNullEnum () { - String example = null; - try { - AppInterfaceUnregisteredReason temp = AppInterfaceUnregisteredReason.valueForString(example); + /** + * Verifies that a null assignment is invalid. + */ + public void testNullEnum() { + String example = null; + try { + AppInterfaceUnregisteredReason temp = AppInterfaceUnregisteredReason.valueForString(example); assertNull("Result of valueForString should be null.", temp); - } - catch (NullPointerException exception) { + } catch (NullPointerException exception) { fail("Null string throws NullPointerException."); - } - } + } + } - /** - * Verifies the possible enum values of AppInterfaceUnregisteredReason. - */ - public void testListEnum() { - List<AppInterfaceUnregisteredReason> enumValueList = Arrays.asList(AppInterfaceUnregisteredReason.values()); + /** + * Verifies the possible enum values of AppInterfaceUnregisteredReason. + */ + public void testListEnum() { + List<AppInterfaceUnregisteredReason> enumValueList = Arrays.asList(AppInterfaceUnregisteredReason.values()); - List<AppInterfaceUnregisteredReason> enumTestList = new ArrayList<AppInterfaceUnregisteredReason>(); - enumTestList.add(AppInterfaceUnregisteredReason.USER_EXIT); - enumTestList.add(AppInterfaceUnregisteredReason.IGNITION_OFF); - enumTestList.add(AppInterfaceUnregisteredReason.BLUETOOTH_OFF); - enumTestList.add(AppInterfaceUnregisteredReason.USB_DISCONNECTED); - enumTestList.add(AppInterfaceUnregisteredReason.REQUEST_WHILE_IN_NONE_HMI_LEVEL); - enumTestList.add(AppInterfaceUnregisteredReason.TOO_MANY_REQUESTS); - enumTestList.add(AppInterfaceUnregisteredReason.DRIVER_DISTRACTION_VIOLATION); - enumTestList.add(AppInterfaceUnregisteredReason.LANGUAGE_CHANGE); - enumTestList.add(AppInterfaceUnregisteredReason.MASTER_RESET); - enumTestList.add(AppInterfaceUnregisteredReason.FACTORY_DEFAULTS); - enumTestList.add(AppInterfaceUnregisteredReason.APP_UNAUTHORIZED); - enumTestList.add(AppInterfaceUnregisteredReason.PROTOCOL_VIOLATION); - enumTestList.add(AppInterfaceUnregisteredReason.UNSUPPORTED_HMI_RESOURCE); - enumTestList.add(AppInterfaceUnregisteredReason.RESOURCE_CONSTRAINT); + List<AppInterfaceUnregisteredReason> enumTestList = new ArrayList<AppInterfaceUnregisteredReason>(); + enumTestList.add(AppInterfaceUnregisteredReason.USER_EXIT); + enumTestList.add(AppInterfaceUnregisteredReason.IGNITION_OFF); + enumTestList.add(AppInterfaceUnregisteredReason.BLUETOOTH_OFF); + enumTestList.add(AppInterfaceUnregisteredReason.USB_DISCONNECTED); + enumTestList.add(AppInterfaceUnregisteredReason.REQUEST_WHILE_IN_NONE_HMI_LEVEL); + enumTestList.add(AppInterfaceUnregisteredReason.TOO_MANY_REQUESTS); + enumTestList.add(AppInterfaceUnregisteredReason.DRIVER_DISTRACTION_VIOLATION); + enumTestList.add(AppInterfaceUnregisteredReason.LANGUAGE_CHANGE); + enumTestList.add(AppInterfaceUnregisteredReason.MASTER_RESET); + enumTestList.add(AppInterfaceUnregisteredReason.FACTORY_DEFAULTS); + enumTestList.add(AppInterfaceUnregisteredReason.APP_UNAUTHORIZED); + enumTestList.add(AppInterfaceUnregisteredReason.PROTOCOL_VIOLATION); + enumTestList.add(AppInterfaceUnregisteredReason.UNSUPPORTED_HMI_RESOURCE); + enumTestList.add(AppInterfaceUnregisteredReason.RESOURCE_CONSTRAINT); - assertTrue("Enum value list does not match enum class list", - enumValueList.containsAll(enumTestList) && enumTestList.containsAll(enumValueList)); - } + assertTrue("Enum value list does not match enum class list", + enumValueList.containsAll(enumTestList) && enumTestList.containsAll(enumValueList)); + } }
\ No newline at end of file diff --git a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/AppServiceTypeTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/AppServiceTypeTests.java index ce4867e41..5cecebdd2 100644 --- a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/AppServiceTypeTests.java +++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/AppServiceTypeTests.java @@ -14,62 +14,60 @@ import java.util.List; */ public class AppServiceTypeTests extends TestCase { - /** - * Verifies that the enum values are not null upon valid assignment. - */ - public void testValidEnums () { - String example = "MEDIA"; - AppServiceType enumMedia = AppServiceType.valueForString(example); - example = "WEATHER"; - AppServiceType enumWeather = AppServiceType.valueForString(example); - example = "NAVIGATION"; - AppServiceType enumNavigation = AppServiceType.valueForString(example); + /** + * Verifies that the enum values are not null upon valid assignment. + */ + public void testValidEnums() { + String example = "MEDIA"; + AppServiceType enumMedia = AppServiceType.valueForString(example); + example = "WEATHER"; + AppServiceType enumWeather = AppServiceType.valueForString(example); + example = "NAVIGATION"; + AppServiceType enumNavigation = AppServiceType.valueForString(example); - assertNotNull("MEDIA returned null", enumMedia); - assertNotNull("WEATHER returned null", enumWeather); - assertNotNull("NAVIGATION returned null", enumNavigation); - } + assertNotNull("MEDIA returned null", enumMedia); + assertNotNull("WEATHER returned null", enumWeather); + assertNotNull("NAVIGATION returned null", enumNavigation); + } - /** - * Verifies that an invalid assignment is null. - */ - public void testInvalidEnum () { - String example = "MedIas"; - try { - AppServiceType temp = AppServiceType.valueForString(example); - assertNull("Result of valueForString should be null.", temp); - } - catch (IllegalArgumentException exception) { - fail("Invalid enum throws IllegalArgumentException."); - } - } + /** + * Verifies that an invalid assignment is null. + */ + public void testInvalidEnum() { + String example = "MedIas"; + try { + AppServiceType temp = AppServiceType.valueForString(example); + assertNull("Result of valueForString should be null.", temp); + } catch (IllegalArgumentException exception) { + fail("Invalid enum throws IllegalArgumentException."); + } + } - /** - * Verifies that a null assignment is invalid. - */ - public void testNullEnum () { - String example = null; - try { - AppServiceType temp = AppServiceType.valueForString(example); - assertNull("Result of valueForString should be null.", temp); - } - catch (NullPointerException exception) { - fail("Null string throws NullPointerException."); - } - } + /** + * Verifies that a null assignment is invalid. + */ + public void testNullEnum() { + String example = null; + try { + AppServiceType temp = AppServiceType.valueForString(example); + assertNull("Result of valueForString should be null.", temp); + } catch (NullPointerException exception) { + fail("Null string throws NullPointerException."); + } + } - /** - * Verifies the possible enum values of AppServiceType. - */ - public void testListEnum() { - List<AppServiceType> enumValueList = Arrays.asList(AppServiceType.values()); + /** + * Verifies the possible enum values of AppServiceType. + */ + public void testListEnum() { + List<AppServiceType> enumValueList = Arrays.asList(AppServiceType.values()); - List<AppServiceType> enumTestList = new ArrayList<>(); - enumTestList.add(AppServiceType.MEDIA); - enumTestList.add(AppServiceType.NAVIGATION); - enumTestList.add(AppServiceType.WEATHER); + List<AppServiceType> enumTestList = new ArrayList<>(); + enumTestList.add(AppServiceType.MEDIA); + enumTestList.add(AppServiceType.NAVIGATION); + enumTestList.add(AppServiceType.WEATHER); - assertTrue("Enum value list does not match enum class list", - enumValueList.containsAll(enumTestList) && enumTestList.containsAll(enumValueList)); - } + assertTrue("Enum value list does not match enum class list", + enumValueList.containsAll(enumTestList) && enumTestList.containsAll(enumValueList)); + } }
\ No newline at end of file diff --git a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/AudioStreamingIndicatorTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/AudioStreamingIndicatorTests.java index 0d7f17c76..81c4dbd84 100644 --- a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/AudioStreamingIndicatorTests.java +++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/AudioStreamingIndicatorTests.java @@ -14,67 +14,65 @@ import java.util.List; */ public class AudioStreamingIndicatorTests extends TestCase { - /** - * Verifies that the enum values are not null upon valid assignment. - */ - public void testValidEnums () { - String example = "PLAY_PAUSE"; - AudioStreamingIndicator enumPlayPause = AudioStreamingIndicator.valueForString(example); - example = "PLAY"; - AudioStreamingIndicator enumPlay = AudioStreamingIndicator.valueForString(example); - example = "PAUSE"; - AudioStreamingIndicator enumPause = AudioStreamingIndicator.valueForString(example); - example = "STOP"; - AudioStreamingIndicator enumStop = AudioStreamingIndicator.valueForString(example); + /** + * Verifies that the enum values are not null upon valid assignment. + */ + public void testValidEnums() { + String example = "PLAY_PAUSE"; + AudioStreamingIndicator enumPlayPause = AudioStreamingIndicator.valueForString(example); + example = "PLAY"; + AudioStreamingIndicator enumPlay = AudioStreamingIndicator.valueForString(example); + example = "PAUSE"; + AudioStreamingIndicator enumPause = AudioStreamingIndicator.valueForString(example); + example = "STOP"; + AudioStreamingIndicator enumStop = AudioStreamingIndicator.valueForString(example); - assertNotNull("PLAY_PAUSE returned null", enumPlayPause); - assertNotNull("PLAY returned null", enumPlay); - assertNotNull("PAUSE returned null", enumPause); - assertNotNull("STOP returned null", enumStop); - } + assertNotNull("PLAY_PAUSE returned null", enumPlayPause); + assertNotNull("PLAY returned null", enumPlay); + assertNotNull("PAUSE returned null", enumPause); + assertNotNull("STOP returned null", enumStop); + } - /** - * Verifies that an invalid assignment is null. - */ - public void testInvalidEnum () { - String example = "pLayPauZe"; - try { - AudioStreamingIndicator temp = AudioStreamingIndicator.valueForString(example); - assertNull("Result of valueForString should be null.", temp); - } - catch (IllegalArgumentException exception) { - fail("Invalid enum throws IllegalArgumentException."); - } - } + /** + * Verifies that an invalid assignment is null. + */ + public void testInvalidEnum() { + String example = "pLayPauZe"; + try { + AudioStreamingIndicator temp = AudioStreamingIndicator.valueForString(example); + assertNull("Result of valueForString should be null.", temp); + } catch (IllegalArgumentException exception) { + fail("Invalid enum throws IllegalArgumentException."); + } + } - /** - * Verifies that a null assignment is invalid. - */ - public void testNullEnum () { - String example = null; - try { - AudioStreamingIndicator temp = AudioStreamingIndicator.valueForString(example); - assertNull("Result of valueForString should be null.", temp); - } - catch (NullPointerException exception) { - fail("Null string throws NullPointerException."); - } - } + /** + * Verifies that a null assignment is invalid. + */ + public void testNullEnum() { + String example = null; + try { + AudioStreamingIndicator temp = AudioStreamingIndicator.valueForString(example); + assertNull("Result of valueForString should be null.", temp); + } catch (NullPointerException exception) { + fail("Null string throws NullPointerException."); + } + } - /** - * Verifies the possible enum values of AudioStreamingIndicator. - */ - public void testListEnum() { - List<AudioStreamingIndicator> enumValueList = Arrays.asList(AudioStreamingIndicator.values()); + /** + * Verifies the possible enum values of AudioStreamingIndicator. + */ + public void testListEnum() { + List<AudioStreamingIndicator> enumValueList = Arrays.asList(AudioStreamingIndicator.values()); - List<AudioStreamingIndicator> enumTestList = new ArrayList<>(); - enumTestList.add(AudioStreamingIndicator.PLAY_PAUSE); - enumTestList.add(AudioStreamingIndicator.PLAY); - enumTestList.add(AudioStreamingIndicator.PAUSE); - enumTestList.add(AudioStreamingIndicator.STOP); + List<AudioStreamingIndicator> enumTestList = new ArrayList<>(); + enumTestList.add(AudioStreamingIndicator.PLAY_PAUSE); + enumTestList.add(AudioStreamingIndicator.PLAY); + enumTestList.add(AudioStreamingIndicator.PAUSE); + enumTestList.add(AudioStreamingIndicator.STOP); - assertTrue("Enum value list does not match enum class list", - enumValueList.containsAll(enumTestList) && enumTestList.containsAll(enumValueList)); - } + assertTrue("Enum value list does not match enum class list", + enumValueList.containsAll(enumTestList) && enumTestList.containsAll(enumValueList)); + } }
\ No newline at end of file diff --git a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/AudioStreamingStateTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/AudioStreamingStateTests.java index cf9cd87d4..ab6fe5369 100644 --- a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/AudioStreamingStateTests.java +++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/AudioStreamingStateTests.java @@ -9,68 +9,66 @@ import java.util.Arrays; import java.util.List; /** - * This is a unit test class for the SmartDeviceLink library project class : + * This is a unit test class for the SmartDeviceLink library project class : * {@link com.smartdevicelink.proxy.rpc.enums.AudioStreamingState} */ public class AudioStreamingStateTests extends TestCase { - /** - * Verifies that the enum values are not null upon valid assignment. - */ - public void testValidEnums () { - String example = "AUDIBLE"; - AudioStreamingState enumAudible = AudioStreamingState.valueForString(example); - example = "ATTENUATED"; - AudioStreamingState enumAttentuated = AudioStreamingState.valueForString(example); - example = "NOT_AUDIBLE"; - AudioStreamingState enumNotAudible = AudioStreamingState.valueForString(example); + /** + * Verifies that the enum values are not null upon valid assignment. + */ + public void testValidEnums() { + String example = "AUDIBLE"; + AudioStreamingState enumAudible = AudioStreamingState.valueForString(example); + example = "ATTENUATED"; + AudioStreamingState enumAttentuated = AudioStreamingState.valueForString(example); + example = "NOT_AUDIBLE"; + AudioStreamingState enumNotAudible = AudioStreamingState.valueForString(example); - - assertNotNull("AUDIBLE returned null", enumAudible); - assertNotNull("ATTENUATED returned null", enumAttentuated); - assertNotNull("NOT_AUDIBLE returned null", enumNotAudible); - } - /** - * Verifies that an invalid assignment is null. - */ - public void testInvalidEnum () { - String example = "aUDibLE"; - try { - AudioStreamingState temp = AudioStreamingState.valueForString(example); + assertNotNull("AUDIBLE returned null", enumAudible); + assertNotNull("ATTENUATED returned null", enumAttentuated); + assertNotNull("NOT_AUDIBLE returned null", enumNotAudible); + } + + /** + * Verifies that an invalid assignment is null. + */ + public void testInvalidEnum() { + String example = "aUDibLE"; + try { + AudioStreamingState temp = AudioStreamingState.valueForString(example); assertNull("Result of valueForString should be null.", temp); - } - catch (IllegalArgumentException exception) { + } catch (IllegalArgumentException exception) { fail("Invalid enum throws IllegalArgumentException."); - } - } + } + } - /** - * Verifies that a null assignment is invalid. - */ - public void testNullEnum () { - String example = null; - try { - AudioStreamingState temp = AudioStreamingState.valueForString(example); + /** + * Verifies that a null assignment is invalid. + */ + public void testNullEnum() { + String example = null; + try { + AudioStreamingState temp = AudioStreamingState.valueForString(example); assertNull("Result of valueForString should be null.", temp); - } - catch (NullPointerException exception) { + } catch (NullPointerException exception) { fail("Null string throws NullPointerException."); - } - } + } + } - /** - * Verifies the possible enum values of AudioStreamingState. - */ - public void testListEnum() { - List<AudioStreamingState> enumValueList = Arrays.asList(AudioStreamingState.values()); + /** + * Verifies the possible enum values of AudioStreamingState. + */ + public void testListEnum() { + List<AudioStreamingState> enumValueList = Arrays.asList(AudioStreamingState.values()); - List<AudioStreamingState> enumTestList = new ArrayList<AudioStreamingState>(); - enumTestList.add(AudioStreamingState.AUDIBLE); - enumTestList.add(AudioStreamingState.ATTENUATED); - enumTestList.add(AudioStreamingState.NOT_AUDIBLE); + List<AudioStreamingState> enumTestList = new ArrayList<AudioStreamingState>(); + enumTestList.add(AudioStreamingState.AUDIBLE); + enumTestList.add(AudioStreamingState.ATTENUATED); + enumTestList.add(AudioStreamingState.NOT_AUDIBLE); - assertTrue("Enum value list does not match enum class list", - enumValueList.containsAll(enumTestList) && enumTestList.containsAll(enumValueList)); - } + assertTrue("Enum value list does not match enum class list", + enumValueList.containsAll(enumTestList) && enumTestList.containsAll(enumValueList)); + } }
\ No newline at end of file diff --git a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/AudioTypeTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/AudioTypeTests.java index 8daea233f..714265d3a 100644 --- a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/AudioTypeTests.java +++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/AudioTypeTests.java @@ -9,60 +9,58 @@ import java.util.Arrays; import java.util.List; /** - * This is a unit test class for the SmartDeviceLink library project class : + * This is a unit test class for the SmartDeviceLink library project class : * {@link com.smartdevicelink.proxy.rpc.enums.AudioType} */ public class AudioTypeTests extends TestCase { - /** - * Verifies that the enum values are not null upon valid assignment. - */ - public void testValidEnums () { - String example = "PCM"; - AudioType enumPcm = AudioType.valueForString(example); - - assertNotNull("PCM returned null", enumPcm); - } + /** + * Verifies that the enum values are not null upon valid assignment. + */ + public void testValidEnums() { + String example = "PCM"; + AudioType enumPcm = AudioType.valueForString(example); - /** - * Verifies that an invalid assignment is null. - */ - public void testInvalidEnum () { - String example = "pCM"; - try { - AudioType temp = AudioType.valueForString(example); + assertNotNull("PCM returned null", enumPcm); + } + + /** + * Verifies that an invalid assignment is null. + */ + public void testInvalidEnum() { + String example = "pCM"; + try { + AudioType temp = AudioType.valueForString(example); assertNull("Result of valueForString should be null.", temp); - } - catch (IllegalArgumentException exception) { + } catch (IllegalArgumentException exception) { fail("Invalid enum throws IllegalArgumentException."); - } - } + } + } - /** - * Verifies that a null assignment is invalid. - */ - public void testNullEnum () { - String example = null; - try { - AudioType temp = AudioType.valueForString(example); + /** + * Verifies that a null assignment is invalid. + */ + public void testNullEnum() { + String example = null; + try { + AudioType temp = AudioType.valueForString(example); assertNull("Result of valueForString should be null.", temp); - } - catch (NullPointerException exception) { + } catch (NullPointerException exception) { fail("Null string throws NullPointerException."); - } - } - + } + } + - /** - * Verifies the possible enum values of AudioType. - */ - public void testListEnum() { - List<AudioType> enumValueList = Arrays.asList(AudioType.values()); + /** + * Verifies the possible enum values of AudioType. + */ + public void testListEnum() { + List<AudioType> enumValueList = Arrays.asList(AudioType.values()); - List<AudioType> enumTestList = new ArrayList<AudioType>(); - enumTestList.add(AudioType.PCM); + List<AudioType> enumTestList = new ArrayList<AudioType>(); + enumTestList.add(AudioType.PCM); - assertTrue("Enum value list does not match enum class list", - enumValueList.containsAll(enumTestList) && enumTestList.containsAll(enumValueList)); - } + assertTrue("Enum value list does not match enum class list", + enumValueList.containsAll(enumTestList) && enumTestList.containsAll(enumValueList)); + } }
\ No newline at end of file diff --git a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/BitsPerSampleTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/BitsPerSampleTests.java index f45b6a1de..43ae36e1e 100644 --- a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/BitsPerSampleTests.java +++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/BitsPerSampleTests.java @@ -9,63 +9,61 @@ import java.util.Arrays; import java.util.List; /** - * This is a unit test class for the SmartDeviceLink library project class : + * This is a unit test class for the SmartDeviceLink library project class : * {@link com.smartdevicelink.proxy.rpc.enums.BitsPerSample} */ public class BitsPerSampleTests extends TestCase { - /** - * Verifies that the enum values are not null upon valid assignment. - */ - public void testValidEnums () { - String example = "8_BIT"; - BitsPerSample enum8Bit = BitsPerSample.valueForString(example); - example = "16_BIT"; - BitsPerSample enum16Bit = BitsPerSample.valueForString(example); - - assertNotNull("8_BIT returned null", enum8Bit); - assertNotNull("16_BIT returned null", enum16Bit); - } + /** + * Verifies that the enum values are not null upon valid assignment. + */ + public void testValidEnums() { + String example = "8_BIT"; + BitsPerSample enum8Bit = BitsPerSample.valueForString(example); + example = "16_BIT"; + BitsPerSample enum16Bit = BitsPerSample.valueForString(example); - /** - * Verifies that an invalid assignment is null. - */ - public void testInvalidEnum () { - String example = "8_biT"; - try { - BitsPerSample temp = BitsPerSample.valueForString(example); + assertNotNull("8_BIT returned null", enum8Bit); + assertNotNull("16_BIT returned null", enum16Bit); + } + + /** + * Verifies that an invalid assignment is null. + */ + public void testInvalidEnum() { + String example = "8_biT"; + try { + BitsPerSample temp = BitsPerSample.valueForString(example); assertNull("Result of valueForString should be null.", temp); - } - catch (IllegalArgumentException exception) { + } catch (IllegalArgumentException exception) { fail("Invalid enum throws IllegalArgumentException."); - } - } + } + } - /** - * Verifies that a null assignment is invalid. - */ - public void testNullEnum () { - String example = null; - try { - BitsPerSample temp = BitsPerSample.valueForString(example); + /** + * Verifies that a null assignment is invalid. + */ + public void testNullEnum() { + String example = null; + try { + BitsPerSample temp = BitsPerSample.valueForString(example); assertNull("Result of valueForString should be null.", temp); - } - catch (NullPointerException exception) { + } catch (NullPointerException exception) { fail("Null string throws NullPointerException."); - } - } + } + } - /** - * Verifies the possible enum values of BitsPerSample. - */ - public void testListEnum() { - List<BitsPerSample> enumValueList = Arrays.asList(BitsPerSample.values()); + /** + * Verifies the possible enum values of BitsPerSample. + */ + public void testListEnum() { + List<BitsPerSample> enumValueList = Arrays.asList(BitsPerSample.values()); - List<BitsPerSample> enumTestList = new ArrayList<BitsPerSample>(); - enumTestList.add(BitsPerSample._8_BIT); - enumTestList.add(BitsPerSample._16_BIT); + List<BitsPerSample> enumTestList = new ArrayList<BitsPerSample>(); + enumTestList.add(BitsPerSample._8_BIT); + enumTestList.add(BitsPerSample._16_BIT); - assertTrue("Enum value list does not match enum class list", - enumValueList.containsAll(enumTestList) && enumTestList.containsAll(enumValueList)); - } + assertTrue("Enum value list does not match enum class list", + enumValueList.containsAll(enumTestList) && enumTestList.containsAll(enumValueList)); + } }
\ No newline at end of file diff --git a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/ButtonEventModeTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/ButtonEventModeTests.java index 330d739a2..97d775be9 100644 --- a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/ButtonEventModeTests.java +++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/ButtonEventModeTests.java @@ -9,63 +9,61 @@ import java.util.Arrays; import java.util.List; /** - * This is a unit test class for the SmartDeviceLink library project class : + * This is a unit test class for the SmartDeviceLink library project class : * {@link com.smartdevicelink.proxy.rpc.enums.ButtonEventMode} */ public class ButtonEventModeTests extends TestCase { - /** - * Verifies that the enum values are not null upon valid assignment. - */ - public void testValidEnums () { - String example = "BUTTONUP"; - ButtonEventMode enumButtonUp = ButtonEventMode.valueForString(example); - example = "BUTTONDOWN"; - ButtonEventMode enumButtonDown = ButtonEventMode.valueForString(example); - - assertNotNull("BUTTONUP returned null", enumButtonUp); - assertNotNull("BUTTONDOWN returned null", enumButtonDown); - } + /** + * Verifies that the enum values are not null upon valid assignment. + */ + public void testValidEnums() { + String example = "BUTTONUP"; + ButtonEventMode enumButtonUp = ButtonEventMode.valueForString(example); + example = "BUTTONDOWN"; + ButtonEventMode enumButtonDown = ButtonEventMode.valueForString(example); - /** - * Verifies that an invalid assignment is null. - */ - public void testInvalidEnum () { - String example = "buTTonUp"; - try { - ButtonEventMode temp = ButtonEventMode.valueForString(example); - assertNull("Result of valueForString should be null.", temp); - } - catch (IllegalArgumentException exception) { + assertNotNull("BUTTONUP returned null", enumButtonUp); + assertNotNull("BUTTONDOWN returned null", enumButtonDown); + } + + /** + * Verifies that an invalid assignment is null. + */ + public void testInvalidEnum() { + String example = "buTTonUp"; + try { + ButtonEventMode temp = ButtonEventMode.valueForString(example); + assertNull("Result of valueForString should be null.", temp); + } catch (IllegalArgumentException exception) { fail("Invalid enum throws IllegalArgumentException."); - } - } + } + } - /** - * Verifies that a null assignment is invalid. - */ - public void testNullEnum () { - String example = null; - try { - ButtonEventMode temp = ButtonEventMode.valueForString(example); + /** + * Verifies that a null assignment is invalid. + */ + public void testNullEnum() { + String example = null; + try { + ButtonEventMode temp = ButtonEventMode.valueForString(example); assertNull("Result of valueForString should be null.", temp); - } - catch (NullPointerException exception) { + } catch (NullPointerException exception) { fail("Invalid enum throws IllegalArgumentException."); - } - } + } + } - /** - * Verifies the possible enum values of ButtonEventMode. - */ - public void testListEnum() { - List<ButtonEventMode> enumValueList = Arrays.asList(ButtonEventMode.values()); + /** + * Verifies the possible enum values of ButtonEventMode. + */ + public void testListEnum() { + List<ButtonEventMode> enumValueList = Arrays.asList(ButtonEventMode.values()); - List<ButtonEventMode> enumTestList = new ArrayList<ButtonEventMode>(); - enumTestList.add(ButtonEventMode.BUTTONUP); - enumTestList.add(ButtonEventMode.BUTTONDOWN); + List<ButtonEventMode> enumTestList = new ArrayList<ButtonEventMode>(); + enumTestList.add(ButtonEventMode.BUTTONUP); + enumTestList.add(ButtonEventMode.BUTTONDOWN); - assertTrue("Enum value list does not match enum class list", - enumValueList.containsAll(enumTestList) && enumTestList.containsAll(enumValueList)); - } + assertTrue("Enum value list does not match enum class list", + enumValueList.containsAll(enumTestList) && enumTestList.containsAll(enumValueList)); + } }
\ No newline at end of file diff --git a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/ButtonNameTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/ButtonNameTests.java index da768fc0d..10075849a 100644 --- a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/ButtonNameTests.java +++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/ButtonNameTests.java @@ -9,250 +9,246 @@ import java.util.Arrays; import java.util.List; /** - * This is a unit test class for the SmartDeviceLink library project class : + * This is a unit test class for the SmartDeviceLink library project class : * {@link com.smartdevicelink.proxy.rpc.enums.ButtonName} */ public class ButtonNameTests extends TestCase { - /** - * Verifies that the enum values are not null upon valid assignment. - */ - public void testValidEnums () { - String example = "OK"; - ButtonName enumOk = ButtonName.valueForString(example); - example = "SEEKLEFT"; - ButtonName enumSeekLeft = ButtonName.valueForString(example); - example = "SEEKRIGHT"; - ButtonName enumSeekRight = ButtonName.valueForString(example); - example = "TUNEUP"; - ButtonName enumTuneUp = ButtonName.valueForString(example); - example = "TUNEDOWN"; - ButtonName enumTuneDown = ButtonName.valueForString(example); - example = "PRESET_0"; - ButtonName enumPreset0 = ButtonName.valueForString(example); - example = "PRESET_1"; - ButtonName enumPreset1 = ButtonName.valueForString(example); - example = "PRESET_2"; - ButtonName enumPreset2 = ButtonName.valueForString(example); - example = "PRESET_3"; - ButtonName enumPreset3 = ButtonName.valueForString(example); - example = "PRESET_4"; - ButtonName enumPreset4 = ButtonName.valueForString(example); - example = "PRESET_5"; - ButtonName enumPreset5 = ButtonName.valueForString(example); - example = "PRESET_6"; - ButtonName enumPreset6 = ButtonName.valueForString(example); - example = "PRESET_7"; - ButtonName enumPreset7 = ButtonName.valueForString(example); - example = "PRESET_8"; - ButtonName enumPreset8 = ButtonName.valueForString(example); - example = "PRESET_9"; - ButtonName enumPreset9 = ButtonName.valueForString(example); - example = "CUSTOM_BUTTON"; - ButtonName enumCustomButton = ButtonName.valueForString(example); - example = "SEARCH"; - ButtonName enumSearch = ButtonName.valueForString(example); - example = "AC_MAX"; - ButtonName enumAcMax = ButtonName.valueForString(example); - example = "AC"; - ButtonName enumAc = ButtonName.valueForString(example); - example = "RECIRCULATE"; - ButtonName enumRecirculate = ButtonName.valueForString(example); - example = "FAN_UP"; - ButtonName enumFanUp = ButtonName.valueForString(example); - example = "FAN_DOWN"; - ButtonName enumFanDown = ButtonName.valueForString(example); - example = "TEMP_UP"; - ButtonName enumTempUp = ButtonName.valueForString(example); - example = "TEMP_DOWN"; - ButtonName enumTempDown = ButtonName.valueForString(example); - example = "DEFROST_MAX"; - ButtonName enumDefrostMax = ButtonName.valueForString(example); - example = "DEFROST"; - ButtonName enumDefrost = ButtonName.valueForString(example); - example = "DEFROST_REAR"; - ButtonName enumDefrostRear = ButtonName.valueForString(example); - example = "UPPER_VENT"; - ButtonName enumUpperVent = ButtonName.valueForString(example); - example = "LOWER_VENT"; - ButtonName enumLowerVent = ButtonName.valueForString(example); - example = "VOLUME_UP"; - ButtonName enumVolumeUp = ButtonName.valueForString(example); - example = "VOLUME_DOWN"; - ButtonName enumVolumeDown = ButtonName.valueForString(example); - example = "EJECT"; - ButtonName enumEject = ButtonName.valueForString(example); - example = "SOURCE"; - ButtonName enumSource = ButtonName.valueForString(example); - example = "SHUFFLE"; - ButtonName enumShuffle = ButtonName.valueForString(example); - example = "REPEAT"; - ButtonName enumRepeat = ButtonName.valueForString(example); - - - - assertNotNull("OK returned null", enumOk); - assertNotNull("SEEKLEFT returned null", enumSeekLeft); - assertNotNull("SEEKRIGHT returned null", enumSeekRight); - assertNotNull("TUNEUP returned null", enumTuneUp); - assertNotNull("TUNEDOWN returned null", enumTuneDown); - assertNotNull("PRESET_0 returned null", enumPreset0); - assertNotNull("PRESET_1 returned null", enumPreset1); - assertNotNull("PRESET_2 returned null", enumPreset2); - assertNotNull("PRESET_3 returned null", enumPreset3); - assertNotNull("PRESET_4 returned null", enumPreset4); - assertNotNull("PRESET_5 returned null", enumPreset5); - assertNotNull("PRESET_6 returned null", enumPreset6); - assertNotNull("PRESET_7 returned null", enumPreset7); - assertNotNull("PRESET_8 returned null", enumPreset8); - assertNotNull("PRESET_9 returned null", enumPreset9); - assertNotNull("CUSTOM_BUTTON returned null", enumCustomButton); - assertNotNull("SEARCH returned null", enumSearch); - assertNotNull("AC_MAX returned null", enumAcMax); - assertNotNull("AC returned null", enumAc); - assertNotNull("RECIRCULATE returned null", enumRecirculate); - assertNotNull("FAN_UP returned null", enumFanUp); - assertNotNull("FAN_DOWN returned null", enumFanDown); - assertNotNull("TEMP_UP returned null", enumTempUp); - assertNotNull("TEMP_DOWN returned null", enumTempDown); - assertNotNull("DEFROST_MAX returned null", enumDefrostMax); - assertNotNull("DEFROST returned null", enumDefrost); - assertNotNull("DEFROST_REAR returned null", enumDefrostRear); - assertNotNull("UPPER_VENT returned null", enumUpperVent); - assertNotNull("LOWER_VENT returned null", enumLowerVent); - assertNotNull("VOLUME_UP returned null", enumVolumeUp); - assertNotNull("VOLUME_DOWN returned null", enumVolumeDown); - assertNotNull("EJECT returned null", enumEject); - assertNotNull("SOURCE returned null", enumSource); - assertNotNull("SHUFFLE returned null", enumShuffle); - assertNotNull("REPEAT returned null", enumRepeat); - } - - /** - * Verifies that an invalid assignment is null. - */ - public void testInvalidEnum () { - String example = "oK"; - try { - ButtonName temp = ButtonName.valueForString(example); + /** + * Verifies that the enum values are not null upon valid assignment. + */ + public void testValidEnums() { + String example = "OK"; + ButtonName enumOk = ButtonName.valueForString(example); + example = "SEEKLEFT"; + ButtonName enumSeekLeft = ButtonName.valueForString(example); + example = "SEEKRIGHT"; + ButtonName enumSeekRight = ButtonName.valueForString(example); + example = "TUNEUP"; + ButtonName enumTuneUp = ButtonName.valueForString(example); + example = "TUNEDOWN"; + ButtonName enumTuneDown = ButtonName.valueForString(example); + example = "PRESET_0"; + ButtonName enumPreset0 = ButtonName.valueForString(example); + example = "PRESET_1"; + ButtonName enumPreset1 = ButtonName.valueForString(example); + example = "PRESET_2"; + ButtonName enumPreset2 = ButtonName.valueForString(example); + example = "PRESET_3"; + ButtonName enumPreset3 = ButtonName.valueForString(example); + example = "PRESET_4"; + ButtonName enumPreset4 = ButtonName.valueForString(example); + example = "PRESET_5"; + ButtonName enumPreset5 = ButtonName.valueForString(example); + example = "PRESET_6"; + ButtonName enumPreset6 = ButtonName.valueForString(example); + example = "PRESET_7"; + ButtonName enumPreset7 = ButtonName.valueForString(example); + example = "PRESET_8"; + ButtonName enumPreset8 = ButtonName.valueForString(example); + example = "PRESET_9"; + ButtonName enumPreset9 = ButtonName.valueForString(example); + example = "CUSTOM_BUTTON"; + ButtonName enumCustomButton = ButtonName.valueForString(example); + example = "SEARCH"; + ButtonName enumSearch = ButtonName.valueForString(example); + example = "AC_MAX"; + ButtonName enumAcMax = ButtonName.valueForString(example); + example = "AC"; + ButtonName enumAc = ButtonName.valueForString(example); + example = "RECIRCULATE"; + ButtonName enumRecirculate = ButtonName.valueForString(example); + example = "FAN_UP"; + ButtonName enumFanUp = ButtonName.valueForString(example); + example = "FAN_DOWN"; + ButtonName enumFanDown = ButtonName.valueForString(example); + example = "TEMP_UP"; + ButtonName enumTempUp = ButtonName.valueForString(example); + example = "TEMP_DOWN"; + ButtonName enumTempDown = ButtonName.valueForString(example); + example = "DEFROST_MAX"; + ButtonName enumDefrostMax = ButtonName.valueForString(example); + example = "DEFROST"; + ButtonName enumDefrost = ButtonName.valueForString(example); + example = "DEFROST_REAR"; + ButtonName enumDefrostRear = ButtonName.valueForString(example); + example = "UPPER_VENT"; + ButtonName enumUpperVent = ButtonName.valueForString(example); + example = "LOWER_VENT"; + ButtonName enumLowerVent = ButtonName.valueForString(example); + example = "VOLUME_UP"; + ButtonName enumVolumeUp = ButtonName.valueForString(example); + example = "VOLUME_DOWN"; + ButtonName enumVolumeDown = ButtonName.valueForString(example); + example = "EJECT"; + ButtonName enumEject = ButtonName.valueForString(example); + example = "SOURCE"; + ButtonName enumSource = ButtonName.valueForString(example); + example = "SHUFFLE"; + ButtonName enumShuffle = ButtonName.valueForString(example); + example = "REPEAT"; + ButtonName enumRepeat = ButtonName.valueForString(example); + + + assertNotNull("OK returned null", enumOk); + assertNotNull("SEEKLEFT returned null", enumSeekLeft); + assertNotNull("SEEKRIGHT returned null", enumSeekRight); + assertNotNull("TUNEUP returned null", enumTuneUp); + assertNotNull("TUNEDOWN returned null", enumTuneDown); + assertNotNull("PRESET_0 returned null", enumPreset0); + assertNotNull("PRESET_1 returned null", enumPreset1); + assertNotNull("PRESET_2 returned null", enumPreset2); + assertNotNull("PRESET_3 returned null", enumPreset3); + assertNotNull("PRESET_4 returned null", enumPreset4); + assertNotNull("PRESET_5 returned null", enumPreset5); + assertNotNull("PRESET_6 returned null", enumPreset6); + assertNotNull("PRESET_7 returned null", enumPreset7); + assertNotNull("PRESET_8 returned null", enumPreset8); + assertNotNull("PRESET_9 returned null", enumPreset9); + assertNotNull("CUSTOM_BUTTON returned null", enumCustomButton); + assertNotNull("SEARCH returned null", enumSearch); + assertNotNull("AC_MAX returned null", enumAcMax); + assertNotNull("AC returned null", enumAc); + assertNotNull("RECIRCULATE returned null", enumRecirculate); + assertNotNull("FAN_UP returned null", enumFanUp); + assertNotNull("FAN_DOWN returned null", enumFanDown); + assertNotNull("TEMP_UP returned null", enumTempUp); + assertNotNull("TEMP_DOWN returned null", enumTempDown); + assertNotNull("DEFROST_MAX returned null", enumDefrostMax); + assertNotNull("DEFROST returned null", enumDefrost); + assertNotNull("DEFROST_REAR returned null", enumDefrostRear); + assertNotNull("UPPER_VENT returned null", enumUpperVent); + assertNotNull("LOWER_VENT returned null", enumLowerVent); + assertNotNull("VOLUME_UP returned null", enumVolumeUp); + assertNotNull("VOLUME_DOWN returned null", enumVolumeDown); + assertNotNull("EJECT returned null", enumEject); + assertNotNull("SOURCE returned null", enumSource); + assertNotNull("SHUFFLE returned null", enumShuffle); + assertNotNull("REPEAT returned null", enumRepeat); + } + + /** + * Verifies that an invalid assignment is null. + */ + public void testInvalidEnum() { + String example = "oK"; + try { + ButtonName temp = ButtonName.valueForString(example); assertNull("Result of valueForString should be null.", temp); - } - catch (IllegalArgumentException exception) { + } catch (IllegalArgumentException exception) { fail("Invalid enum throws IllegalArgumentException."); - } - } - - /** - * Verifies that a null assignment is invalid. - */ - public void testNullEnum () { - String example = null; - try { - ButtonName temp = ButtonName.valueForString(example); + } + } + + /** + * Verifies that a null assignment is invalid. + */ + public void testNullEnum() { + String example = null; + try { + ButtonName temp = ButtonName.valueForString(example); assertNull("Result of valueForString should be null.", temp); - } - catch (NullPointerException exception) { + } catch (NullPointerException exception) { fail("Null string throws NullPointerException."); - } - } - - /** - * Verifies the possible enum values of ButtonName. - */ - public void testListEnum() { - List<ButtonName> enumValueList = Arrays.asList(ButtonName.values()); - - List<ButtonName> enumTestList = new ArrayList<ButtonName>(); - - enumTestList.add(ButtonName.OK); - enumTestList.add(ButtonName.SEEKLEFT); - enumTestList.add(ButtonName.SEEKRIGHT); - enumTestList.add(ButtonName.TUNEUP); - enumTestList.add(ButtonName.TUNEDOWN); - enumTestList.add(ButtonName.PRESET_0); - enumTestList.add(ButtonName.PRESET_1); - enumTestList.add(ButtonName.PRESET_2); - enumTestList.add(ButtonName.PRESET_3); - enumTestList.add(ButtonName.PRESET_4); - enumTestList.add(ButtonName.PRESET_5); - enumTestList.add(ButtonName.PRESET_6); - enumTestList.add(ButtonName.PRESET_7); - enumTestList.add(ButtonName.PRESET_8); - enumTestList.add(ButtonName.PRESET_9); - enumTestList.add(ButtonName.CUSTOM_BUTTON); - enumTestList.add(ButtonName.SEARCH); - enumTestList.add(ButtonName.AC_MAX); - enumTestList.add(ButtonName.AC); - enumTestList.add(ButtonName.RECIRCULATE); - enumTestList.add(ButtonName.FAN_UP); - enumTestList.add(ButtonName.FAN_DOWN); - enumTestList.add(ButtonName.TEMP_UP); - enumTestList.add(ButtonName.TEMP_DOWN); - enumTestList.add(ButtonName.DEFROST_MAX); - enumTestList.add(ButtonName.DEFROST); - enumTestList.add(ButtonName.DEFROST_REAR); - enumTestList.add(ButtonName.UPPER_VENT); - enumTestList.add(ButtonName.LOWER_VENT); - enumTestList.add(ButtonName.VOLUME_UP); - enumTestList.add(ButtonName.VOLUME_DOWN); - enumTestList.add(ButtonName.EJECT); - enumTestList.add(ButtonName.SOURCE); - enumTestList.add(ButtonName.SHUFFLE); - enumTestList.add(ButtonName.REPEAT); - enumTestList.add(ButtonName.PLAY_PAUSE); - enumTestList.add(ButtonName.NAV_CENTER_LOCATION); - enumTestList.add(ButtonName.NAV_ZOOM_IN); - enumTestList.add(ButtonName.NAV_ZOOM_OUT); - enumTestList.add(ButtonName.NAV_PAN_UP); - enumTestList.add(ButtonName.NAV_PAN_UP_RIGHT); - enumTestList.add(ButtonName.NAV_PAN_RIGHT); - enumTestList.add(ButtonName.NAV_PAN_DOWN_RIGHT); - enumTestList.add(ButtonName.NAV_PAN_DOWN); - enumTestList.add(ButtonName.NAV_PAN_DOWN_LEFT); - enumTestList.add(ButtonName.NAV_PAN_LEFT); - enumTestList.add(ButtonName.NAV_PAN_UP_LEFT); - enumTestList.add(ButtonName.NAV_TILT_TOGGLE); - enumTestList.add(ButtonName.NAV_ROTATE_CLOCKWISE); - enumTestList.add(ButtonName.NAV_ROTATE_COUNTERCLOCKWISE); - enumTestList.add(ButtonName.NAV_HEADING_TOGGLE); - - - assertTrue("Enum value list does not match enum class list", - enumValueList.containsAll(enumTestList) && enumTestList.containsAll(enumValueList)); - } - - - /** - * Tests the preset numeric order. - */ - public void testPresetIndeces () { - ButtonName[] inputPresetArray = new ButtonName[] { - ButtonName.PRESET_0, ButtonName.PRESET_1, ButtonName.PRESET_2, ButtonName.PRESET_3, ButtonName.PRESET_4, - ButtonName.PRESET_5, ButtonName.PRESET_6, ButtonName.PRESET_7, ButtonName.PRESET_8, ButtonName.PRESET_9, - ButtonName.OK}; - - Integer[] expectedValuesArray = new Integer[] {0, 1, 2, 3, 4, 5, 6, 7, 8, 9, null}; - - for (int index = 0; index < inputPresetArray.length; index++) { - ButtonName input = inputPresetArray[index]; - Integer expect = expectedValuesArray[index]; - - Integer result = ButtonName.indexForPresetButton(input); - assertSame("Enum input " + result + " does not match expected value " + expect, result, expect); - } - } + } + } + + /** + * Verifies the possible enum values of ButtonName. + */ + public void testListEnum() { + List<ButtonName> enumValueList = Arrays.asList(ButtonName.values()); + + List<ButtonName> enumTestList = new ArrayList<ButtonName>(); + + enumTestList.add(ButtonName.OK); + enumTestList.add(ButtonName.SEEKLEFT); + enumTestList.add(ButtonName.SEEKRIGHT); + enumTestList.add(ButtonName.TUNEUP); + enumTestList.add(ButtonName.TUNEDOWN); + enumTestList.add(ButtonName.PRESET_0); + enumTestList.add(ButtonName.PRESET_1); + enumTestList.add(ButtonName.PRESET_2); + enumTestList.add(ButtonName.PRESET_3); + enumTestList.add(ButtonName.PRESET_4); + enumTestList.add(ButtonName.PRESET_5); + enumTestList.add(ButtonName.PRESET_6); + enumTestList.add(ButtonName.PRESET_7); + enumTestList.add(ButtonName.PRESET_8); + enumTestList.add(ButtonName.PRESET_9); + enumTestList.add(ButtonName.CUSTOM_BUTTON); + enumTestList.add(ButtonName.SEARCH); + enumTestList.add(ButtonName.AC_MAX); + enumTestList.add(ButtonName.AC); + enumTestList.add(ButtonName.RECIRCULATE); + enumTestList.add(ButtonName.FAN_UP); + enumTestList.add(ButtonName.FAN_DOWN); + enumTestList.add(ButtonName.TEMP_UP); + enumTestList.add(ButtonName.TEMP_DOWN); + enumTestList.add(ButtonName.DEFROST_MAX); + enumTestList.add(ButtonName.DEFROST); + enumTestList.add(ButtonName.DEFROST_REAR); + enumTestList.add(ButtonName.UPPER_VENT); + enumTestList.add(ButtonName.LOWER_VENT); + enumTestList.add(ButtonName.VOLUME_UP); + enumTestList.add(ButtonName.VOLUME_DOWN); + enumTestList.add(ButtonName.EJECT); + enumTestList.add(ButtonName.SOURCE); + enumTestList.add(ButtonName.SHUFFLE); + enumTestList.add(ButtonName.REPEAT); + enumTestList.add(ButtonName.PLAY_PAUSE); + enumTestList.add(ButtonName.NAV_CENTER_LOCATION); + enumTestList.add(ButtonName.NAV_ZOOM_IN); + enumTestList.add(ButtonName.NAV_ZOOM_OUT); + enumTestList.add(ButtonName.NAV_PAN_UP); + enumTestList.add(ButtonName.NAV_PAN_UP_RIGHT); + enumTestList.add(ButtonName.NAV_PAN_RIGHT); + enumTestList.add(ButtonName.NAV_PAN_DOWN_RIGHT); + enumTestList.add(ButtonName.NAV_PAN_DOWN); + enumTestList.add(ButtonName.NAV_PAN_DOWN_LEFT); + enumTestList.add(ButtonName.NAV_PAN_LEFT); + enumTestList.add(ButtonName.NAV_PAN_UP_LEFT); + enumTestList.add(ButtonName.NAV_TILT_TOGGLE); + enumTestList.add(ButtonName.NAV_ROTATE_CLOCKWISE); + enumTestList.add(ButtonName.NAV_ROTATE_COUNTERCLOCKWISE); + enumTestList.add(ButtonName.NAV_HEADING_TOGGLE); + + + assertTrue("Enum value list does not match enum class list", + enumValueList.containsAll(enumTestList) && enumTestList.containsAll(enumValueList)); + } + + + /** + * Tests the preset numeric order. + */ + public void testPresetIndeces() { + ButtonName[] inputPresetArray = new ButtonName[]{ + ButtonName.PRESET_0, ButtonName.PRESET_1, ButtonName.PRESET_2, ButtonName.PRESET_3, ButtonName.PRESET_4, + ButtonName.PRESET_5, ButtonName.PRESET_6, ButtonName.PRESET_7, ButtonName.PRESET_8, ButtonName.PRESET_9, + ButtonName.OK}; + + Integer[] expectedValuesArray = new Integer[]{0, 1, 2, 3, 4, 5, 6, 7, 8, 9, null}; + + for (int index = 0; index < inputPresetArray.length; index++) { + ButtonName input = inputPresetArray[index]; + Integer expect = expectedValuesArray[index]; + + Integer result = ButtonName.indexForPresetButton(input); + assertSame("Enum input " + result + " does not match expected value " + expect, result, expect); + } + } + + /** + * Verifies that a null preset lookup is invalid. + */ + public void testPresetNull() { + try { + assertNull("Passing null as a parameter does not return null", ButtonName.indexForPresetButton(null)); + } catch (NullPointerException exc) { + fail("Passing null as a parameter throws a NullPointerException"); + } + + } - /** - * Verifies that a null preset lookup is invalid. - */ - public void testPresetNull () { - try { - assertNull("Passing null as a parameter does not return null", ButtonName.indexForPresetButton(null)); - } - catch (NullPointerException exc){ - fail("Passing null as a parameter throws a NullPointerException"); - } - - } - } diff --git a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/ButtonPressModeTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/ButtonPressModeTests.java index 57f354dc0..5f2de389d 100644 --- a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/ButtonPressModeTests.java +++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/ButtonPressModeTests.java @@ -9,63 +9,61 @@ import java.util.Arrays; import java.util.List; /** - * This is a unit test class for the SmartDeviceLink library project class : + * This is a unit test class for the SmartDeviceLink library project class : * {@link com.smartdevicelink.proxy.rpc.enums.ButtonPressMode} */ public class ButtonPressModeTests extends TestCase { - /** - * Verifies that the enum values are not null upon valid assignment. - */ - public void testValidEnums () { - String example = "LONG"; - ButtonPressMode enumLong = ButtonPressMode.valueForString(example); - example = "SHORT"; - ButtonPressMode enumShort = ButtonPressMode.valueForString(example); - - assertNotNull("LONG returned null", enumLong); - assertNotNull("SHORT returned null", enumShort); - } + /** + * Verifies that the enum values are not null upon valid assignment. + */ + public void testValidEnums() { + String example = "LONG"; + ButtonPressMode enumLong = ButtonPressMode.valueForString(example); + example = "SHORT"; + ButtonPressMode enumShort = ButtonPressMode.valueForString(example); - /** - * Verifies that an invalid assignment is null. - */ - public void testInvalidEnum () { - String example = "lONg"; - try { - ButtonPressMode temp = ButtonPressMode.valueForString(example); + assertNotNull("LONG returned null", enumLong); + assertNotNull("SHORT returned null", enumShort); + } + + /** + * Verifies that an invalid assignment is null. + */ + public void testInvalidEnum() { + String example = "lONg"; + try { + ButtonPressMode temp = ButtonPressMode.valueForString(example); assertNull("Result of valueForString should be null.", temp); - } - catch (IllegalArgumentException exception) { + } catch (IllegalArgumentException exception) { fail("Invalid enum throws IllegalArgumentException."); - } - } + } + } - /** - * Verifies that a null assignment is invalid. - */ - public void testNullEnum () { - String example = null; - try { - ButtonPressMode temp = ButtonPressMode.valueForString(example); + /** + * Verifies that a null assignment is invalid. + */ + public void testNullEnum() { + String example = null; + try { + ButtonPressMode temp = ButtonPressMode.valueForString(example); assertNull("Result of valueForString should be null.", temp); - } - catch (NullPointerException exception) { + } catch (NullPointerException exception) { fail("Null string throws NullPointerException."); - } - } + } + } - /** - * Verifies the possible enum values of ButtonPressMode. - */ - public void testListEnum() { - List<ButtonPressMode> enumValueList = Arrays.asList(ButtonPressMode.values()); + /** + * Verifies the possible enum values of ButtonPressMode. + */ + public void testListEnum() { + List<ButtonPressMode> enumValueList = Arrays.asList(ButtonPressMode.values()); - List<ButtonPressMode> enumTestList = new ArrayList<ButtonPressMode>(); - enumTestList.add(ButtonPressMode.LONG); - enumTestList.add(ButtonPressMode.SHORT); + List<ButtonPressMode> enumTestList = new ArrayList<ButtonPressMode>(); + enumTestList.add(ButtonPressMode.LONG); + enumTestList.add(ButtonPressMode.SHORT); - assertTrue("Enum value list does not match enum class list", - enumValueList.containsAll(enumTestList) && enumTestList.containsAll(enumValueList)); - } + assertTrue("Enum value list does not match enum class list", + enumValueList.containsAll(enumTestList) && enumTestList.containsAll(enumValueList)); + } }
\ No newline at end of file diff --git a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/CapacityUnitTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/CapacityUnitTests.java index 4da32bebf..755f03637 100644 --- a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/CapacityUnitTests.java +++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/CapacityUnitTests.java @@ -13,7 +13,7 @@ public class CapacityUnitTests extends TestCase { /** * Verifies that the enum values are not null upon valid assignment. */ - public void testValidEnums () { + public void testValidEnums() { String example = "LITERS"; CapacityUnit enumLiters = CapacityUnit.valueForString(example); example = "KILOWATTHOURS"; @@ -29,13 +29,12 @@ public class CapacityUnitTests extends TestCase { /** * Verifies that an invalid assignment is null. */ - public void testInvalidEnum () { + public void testInvalidEnum() { String example = "lONg"; try { CapacityUnit temp = CapacityUnit.valueForString(example); assertNull("Result of valueForString should be null.", temp); - } - catch (IllegalArgumentException exception) { + } catch (IllegalArgumentException exception) { fail("Invalid enum throws IllegalArgumentException."); } } @@ -43,13 +42,12 @@ public class CapacityUnitTests extends TestCase { /** * Verifies that a null assignment is invalid. */ - public void testNullEnum () { + public void testNullEnum() { String example = null; try { CapacityUnit temp = CapacityUnit.valueForString(example); assertNull("Result of valueForString should be null.", temp); - } - catch (NullPointerException exception) { + } catch (NullPointerException exception) { fail("Null string throws NullPointerException."); } } diff --git a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/CarModeStatusTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/CarModeStatusTests.java index 74a32defa..1ff08ed47 100644 --- a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/CarModeStatusTests.java +++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/CarModeStatusTests.java @@ -9,71 +9,69 @@ import java.util.Arrays; import java.util.List; /** - * This is a unit test class for the SmartDeviceLink library project class : + * This is a unit test class for the SmartDeviceLink library project class : * {@link com.smartdevicelink.proxy.rpc.enums.CarModeStatus} */ public class CarModeStatusTests extends TestCase { - /** - * Verifies that the enum values are not null upon valid assignment. - */ - public void testValidEnums () { - String example = "NORMAL"; - CarModeStatus enumNormal = CarModeStatus.valueForString(example); - example = "FACTORY"; - CarModeStatus enumFactory = CarModeStatus.valueForString(example); - example = "TRANSPORT"; - CarModeStatus enumTransport = CarModeStatus.valueForString(example); - example = "CRASH"; - CarModeStatus enumCrash = CarModeStatus.valueForString(example); - - assertNotNull("NORMAL returned null", enumNormal); - assertNotNull("FACTORY returned null", enumFactory); - assertNotNull("TRANSPORT returned null", enumTransport); - assertNotNull("CRASH returned null", enumCrash); - } + /** + * Verifies that the enum values are not null upon valid assignment. + */ + public void testValidEnums() { + String example = "NORMAL"; + CarModeStatus enumNormal = CarModeStatus.valueForString(example); + example = "FACTORY"; + CarModeStatus enumFactory = CarModeStatus.valueForString(example); + example = "TRANSPORT"; + CarModeStatus enumTransport = CarModeStatus.valueForString(example); + example = "CRASH"; + CarModeStatus enumCrash = CarModeStatus.valueForString(example); - /** - * Verifies that an invalid assignment is null. - */ - public void testInvalidEnum () { - String example = "noRmaL"; - try { - CarModeStatus temp = CarModeStatus.valueForString(example); + assertNotNull("NORMAL returned null", enumNormal); + assertNotNull("FACTORY returned null", enumFactory); + assertNotNull("TRANSPORT returned null", enumTransport); + assertNotNull("CRASH returned null", enumCrash); + } + + /** + * Verifies that an invalid assignment is null. + */ + public void testInvalidEnum() { + String example = "noRmaL"; + try { + CarModeStatus temp = CarModeStatus.valueForString(example); assertNull("Result of valueForString should be null.", temp); - } - catch (IllegalArgumentException exception) { + } catch (IllegalArgumentException exception) { fail("Invalid enum throws IllegalArgumentException."); - } - } + } + } - /** - * Verifies that a null assignment is invalid. - */ - public void testNullEnum () { - String example = null; - try { - CarModeStatus temp = CarModeStatus.valueForString(example); + /** + * Verifies that a null assignment is invalid. + */ + public void testNullEnum() { + String example = null; + try { + CarModeStatus temp = CarModeStatus.valueForString(example); assertNull("Result of valueForString should be null.", temp); - } - catch (NullPointerException exception) { + } catch (NullPointerException exception) { fail("Null string throws NullPointerException."); - } - } + } + } - /** - * Verifies the possible enum values of CarModeStatus. - */ - public void testListEnum() { - List<CarModeStatus> enumValueList = Arrays.asList(CarModeStatus.values()); + /** + * Verifies the possible enum values of CarModeStatus. + */ + public void testListEnum() { + List<CarModeStatus> enumValueList = Arrays.asList(CarModeStatus.values()); - List<CarModeStatus> enumTestList = new ArrayList<CarModeStatus>(); - enumTestList.add(CarModeStatus.NORMAL); - enumTestList.add(CarModeStatus.FACTORY); - enumTestList.add(CarModeStatus.TRANSPORT); - enumTestList.add(CarModeStatus.CRASH); + List<CarModeStatus> enumTestList = new ArrayList<CarModeStatus>(); + enumTestList.add(CarModeStatus.NORMAL); + enumTestList.add(CarModeStatus.FACTORY); + enumTestList.add(CarModeStatus.TRANSPORT); + enumTestList.add(CarModeStatus.CRASH); - assertTrue("Enum value list does not match enum class list", - enumValueList.containsAll(enumTestList) && enumTestList.containsAll(enumValueList)); - } + assertTrue("Enum value list does not match enum class list", + enumValueList.containsAll(enumTestList) && enumTestList.containsAll(enumValueList)); + } }
\ No newline at end of file diff --git a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/CharacterSetTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/CharacterSetTests.java index f84e9c595..1128833d9 100644 --- a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/CharacterSetTests.java +++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/CharacterSetTests.java @@ -9,83 +9,81 @@ import java.util.Arrays; import java.util.List; /** - * This is a unit test class for the SmartDeviceLink library project class : + * This is a unit test class for the SmartDeviceLink library project class : * {@link com.smartdevicelink.proxy.rpc.enums.CharacterSet} */ public class CharacterSetTests extends TestCase { - /** - * Verifies that the enum values are not null upon valid assignment. - */ - public void testValidEnums () { - String example = "TYPE2SET"; - CharacterSet enumType2Set = CharacterSet.valueForString(example); - example = "TYPE5SET"; - CharacterSet enumType5Set = CharacterSet.valueForString(example); - example = "CID1SET"; - CharacterSet enumCid1Set = CharacterSet.valueForString(example); - example = "CID2SET"; - CharacterSet enumCid2Set = CharacterSet.valueForString(example); - example = "ASCII"; - CharacterSet enumAsciiSet = CharacterSet.valueForString(example); - example = "ISO_8859_1"; - CharacterSet enumIsoSet = CharacterSet.valueForString(example); - example = "UTF_8"; - CharacterSet enumUtfSet = CharacterSet.valueForString(example); + /** + * Verifies that the enum values are not null upon valid assignment. + */ + public void testValidEnums() { + String example = "TYPE2SET"; + CharacterSet enumType2Set = CharacterSet.valueForString(example); + example = "TYPE5SET"; + CharacterSet enumType5Set = CharacterSet.valueForString(example); + example = "CID1SET"; + CharacterSet enumCid1Set = CharacterSet.valueForString(example); + example = "CID2SET"; + CharacterSet enumCid2Set = CharacterSet.valueForString(example); + example = "ASCII"; + CharacterSet enumAsciiSet = CharacterSet.valueForString(example); + example = "ISO_8859_1"; + CharacterSet enumIsoSet = CharacterSet.valueForString(example); + example = "UTF_8"; + CharacterSet enumUtfSet = CharacterSet.valueForString(example); - assertNotNull("TYPE2SET returned null", enumType2Set); - assertNotNull("TYPE5SET returned null", enumType5Set); - assertNotNull("CID1SET returned null", enumCid1Set); - assertNotNull("CID2SET returned null", enumCid2Set); - assertNotNull("ASCII returned null", enumAsciiSet); - assertNotNull("ISO_8859_1 returned null", enumIsoSet); - assertNotNull("UTF_8 returned null", enumUtfSet); - } + assertNotNull("TYPE2SET returned null", enumType2Set); + assertNotNull("TYPE5SET returned null", enumType5Set); + assertNotNull("CID1SET returned null", enumCid1Set); + assertNotNull("CID2SET returned null", enumCid2Set); + assertNotNull("ASCII returned null", enumAsciiSet); + assertNotNull("ISO_8859_1 returned null", enumIsoSet); + assertNotNull("UTF_8 returned null", enumUtfSet); + } - /** - * Verifies that an invalid assignment is null. - */ - public void testInvalidEnum () { - String example = "tyPe2SeT"; - try { - CharacterSet temp = CharacterSet.valueForString(example); + /** + * Verifies that an invalid assignment is null. + */ + public void testInvalidEnum() { + String example = "tyPe2SeT"; + try { + CharacterSet temp = CharacterSet.valueForString(example); assertNull("Result of valueForString should be null.", temp); - } - catch (IllegalArgumentException exception) { + } catch (IllegalArgumentException exception) { fail("Invalid enum throws IllegalArgumentException."); - } - } + } + } - /** - * Verifies that a null assignment is invalid. - */ - public void testNullEnum () { - String example = null; - try { - CharacterSet temp = CharacterSet.valueForString(example); + /** + * Verifies that a null assignment is invalid. + */ + public void testNullEnum() { + String example = null; + try { + CharacterSet temp = CharacterSet.valueForString(example); assertNull("Result of valueForString should be null.", temp); - } - catch (NullPointerException exception) { + } catch (NullPointerException exception) { fail("Null string throws NullPointerException."); - } - } + } + } - /** - * Verifies the possible enum values of CharacterSet. - */ - public void testListEnum() { - List<CharacterSet> enumValueList = Arrays.asList(CharacterSet.values()); + /** + * Verifies the possible enum values of CharacterSet. + */ + public void testListEnum() { + List<CharacterSet> enumValueList = Arrays.asList(CharacterSet.values()); - List<CharacterSet> enumTestList = new ArrayList<CharacterSet>(); - enumTestList.add(CharacterSet.TYPE2SET); - enumTestList.add(CharacterSet.TYPE5SET); - enumTestList.add(CharacterSet.CID1SET); - enumTestList.add(CharacterSet.CID2SET); - enumTestList.add(CharacterSet.ASCII); - enumTestList.add(CharacterSet.ISO_8859_1); - enumTestList.add(CharacterSet.UTF_8); + List<CharacterSet> enumTestList = new ArrayList<CharacterSet>(); + enumTestList.add(CharacterSet.TYPE2SET); + enumTestList.add(CharacterSet.TYPE5SET); + enumTestList.add(CharacterSet.CID1SET); + enumTestList.add(CharacterSet.CID2SET); + enumTestList.add(CharacterSet.ASCII); + enumTestList.add(CharacterSet.ISO_8859_1); + enumTestList.add(CharacterSet.UTF_8); - assertTrue("Enum value list does not match enum class list", - enumValueList.containsAll(enumTestList) && enumTestList.containsAll(enumValueList)); - } + assertTrue("Enum value list does not match enum class list", + enumValueList.containsAll(enumTestList) && enumTestList.containsAll(enumValueList)); + } }
\ No newline at end of file diff --git a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/CompassDirectionTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/CompassDirectionTests.java index 3f776bb00..4f7d7267e 100644 --- a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/CompassDirectionTests.java +++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/CompassDirectionTests.java @@ -9,87 +9,85 @@ import java.util.Arrays; import java.util.List; /** - * This is a unit test class for the SmartDeviceLink library project class : + * This is a unit test class for the SmartDeviceLink library project class : * {@link com.smartdevicelink.proxy.rpc.enums.CompassDirection} */ public class CompassDirectionTests extends TestCase { - /** - * Verifies that the enum values are not null upon valid assignment. - */ - public void testValidEnums () { - String example = "NORTH"; - CompassDirection enumNorth = CompassDirection.valueForString(example); - example = "NORTHWEST"; - CompassDirection enumNorthWest = CompassDirection.valueForString(example); - example = "WEST"; - CompassDirection enumWest = CompassDirection.valueForString(example); - example = "SOUTHWEST"; - CompassDirection enumSouthWest = CompassDirection.valueForString(example); - example = "SOUTH"; - CompassDirection enumSouth = CompassDirection.valueForString(example); - example = "SOUTHEAST"; - CompassDirection enumSouthEast = CompassDirection.valueForString(example); - example = "EAST"; - CompassDirection enumEast = CompassDirection.valueForString(example); - example = "NORTHEAST"; - CompassDirection enumNorthEast = CompassDirection.valueForString(example); - - assertNotNull("NORTH returned null", enumNorth); - assertNotNull("NORTHWEST returned null", enumNorthWest); - assertNotNull("WEST returned null", enumWest); - assertNotNull("SOUTHWEST returned null", enumSouthWest); - assertNotNull("SOUTH returned null", enumSouth); - assertNotNull("SOUTHEAST returned null", enumSouthEast); - assertNotNull("EAST returned null", enumEast); - assertNotNull("NORTHEAST returned null", enumNorthEast); - } + /** + * Verifies that the enum values are not null upon valid assignment. + */ + public void testValidEnums() { + String example = "NORTH"; + CompassDirection enumNorth = CompassDirection.valueForString(example); + example = "NORTHWEST"; + CompassDirection enumNorthWest = CompassDirection.valueForString(example); + example = "WEST"; + CompassDirection enumWest = CompassDirection.valueForString(example); + example = "SOUTHWEST"; + CompassDirection enumSouthWest = CompassDirection.valueForString(example); + example = "SOUTH"; + CompassDirection enumSouth = CompassDirection.valueForString(example); + example = "SOUTHEAST"; + CompassDirection enumSouthEast = CompassDirection.valueForString(example); + example = "EAST"; + CompassDirection enumEast = CompassDirection.valueForString(example); + example = "NORTHEAST"; + CompassDirection enumNorthEast = CompassDirection.valueForString(example); - /** - * Verifies that an invalid assignment is null. - */ - public void testInvalidEnum () { - String example = "noRTh"; - try { - CompassDirection temp = CompassDirection.valueForString(example); + assertNotNull("NORTH returned null", enumNorth); + assertNotNull("NORTHWEST returned null", enumNorthWest); + assertNotNull("WEST returned null", enumWest); + assertNotNull("SOUTHWEST returned null", enumSouthWest); + assertNotNull("SOUTH returned null", enumSouth); + assertNotNull("SOUTHEAST returned null", enumSouthEast); + assertNotNull("EAST returned null", enumEast); + assertNotNull("NORTHEAST returned null", enumNorthEast); + } + + /** + * Verifies that an invalid assignment is null. + */ + public void testInvalidEnum() { + String example = "noRTh"; + try { + CompassDirection temp = CompassDirection.valueForString(example); assertNull("Result of valueForString should be null.", temp); - } - catch (IllegalArgumentException exception) { + } catch (IllegalArgumentException exception) { fail("Invalid enum throws IllegalArgumentException."); - } - } + } + } - /** - * Verifies that a null assignment is invalid. - */ - public void testNullEnum () { - String example = null; - try { - CompassDirection temp = CompassDirection.valueForString(example); + /** + * Verifies that a null assignment is invalid. + */ + public void testNullEnum() { + String example = null; + try { + CompassDirection temp = CompassDirection.valueForString(example); assertNull("Result of valueForString should be null.", temp); - } - catch (NullPointerException exception) { + } catch (NullPointerException exception) { fail("Null string throws NullPointerException."); - } - } + } + } - /** - * Verifies the possible enum values of CompassDirection. - */ - public void testListEnum() { - List<CompassDirection> enumValueList = Arrays.asList(CompassDirection.values()); + /** + * Verifies the possible enum values of CompassDirection. + */ + public void testListEnum() { + List<CompassDirection> enumValueList = Arrays.asList(CompassDirection.values()); - List<CompassDirection> enumTestList = new ArrayList<CompassDirection>(); - enumTestList.add(CompassDirection.NORTH); - enumTestList.add(CompassDirection.NORTHWEST); - enumTestList.add(CompassDirection.WEST); - enumTestList.add(CompassDirection.SOUTHWEST); - enumTestList.add(CompassDirection.SOUTH); - enumTestList.add(CompassDirection.SOUTHEAST); - enumTestList.add(CompassDirection.EAST); - enumTestList.add(CompassDirection.NORTHEAST); + List<CompassDirection> enumTestList = new ArrayList<CompassDirection>(); + enumTestList.add(CompassDirection.NORTH); + enumTestList.add(CompassDirection.NORTHWEST); + enumTestList.add(CompassDirection.WEST); + enumTestList.add(CompassDirection.SOUTHWEST); + enumTestList.add(CompassDirection.SOUTH); + enumTestList.add(CompassDirection.SOUTHEAST); + enumTestList.add(CompassDirection.EAST); + enumTestList.add(CompassDirection.NORTHEAST); - assertTrue("Enum value list does not match enum class list", - enumValueList.containsAll(enumTestList) && enumTestList.containsAll(enumValueList)); - } + assertTrue("Enum value list does not match enum class list", + enumValueList.containsAll(enumTestList) && enumTestList.containsAll(enumValueList)); + } }
\ No newline at end of file diff --git a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/ComponentVolumeStatusTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/ComponentVolumeStatusTests.java index 4583efe16..4ba6b8ebb 100644 --- a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/ComponentVolumeStatusTests.java +++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/ComponentVolumeStatusTests.java @@ -9,79 +9,77 @@ import java.util.Arrays; import java.util.List; /** - * This is a unit test class for the SmartDeviceLink library project class : + * This is a unit test class for the SmartDeviceLink library project class : * {@link com.smartdevicelink.proxy.rpc.enums.ComponentVolumeStatus} */ public class ComponentVolumeStatusTests extends TestCase { - /** - * Verifies that the enum values are not null upon valid assignment. - */ - public void testValidEnums () { - String example = "UNKNOWN"; - ComponentVolumeStatus enumUnknown = ComponentVolumeStatus.valueForString(example); - example = "NORMAL"; - ComponentVolumeStatus enumNormal = ComponentVolumeStatus.valueForString(example); - example = "LOW"; - ComponentVolumeStatus enumLow = ComponentVolumeStatus.valueForString(example); - example = "FAULT"; - ComponentVolumeStatus enumFault = ComponentVolumeStatus.valueForString(example); - example = "ALERT"; - ComponentVolumeStatus enumAlert = ComponentVolumeStatus.valueForString(example); - example = "NOT_SUPPORTED"; - ComponentVolumeStatus enumNotSupported = ComponentVolumeStatus.valueForString(example); - - assertNotNull("UNKNOWN returned null", enumUnknown); - assertNotNull("NORMAL returned null", enumNormal); - assertNotNull("LOW returned null", enumLow); - assertNotNull("FAULT returned null", enumFault); - assertNotNull("ALERT returned null", enumAlert); - assertNotNull("NOT_SUPPORTED returned null", enumNotSupported); - } + /** + * Verifies that the enum values are not null upon valid assignment. + */ + public void testValidEnums() { + String example = "UNKNOWN"; + ComponentVolumeStatus enumUnknown = ComponentVolumeStatus.valueForString(example); + example = "NORMAL"; + ComponentVolumeStatus enumNormal = ComponentVolumeStatus.valueForString(example); + example = "LOW"; + ComponentVolumeStatus enumLow = ComponentVolumeStatus.valueForString(example); + example = "FAULT"; + ComponentVolumeStatus enumFault = ComponentVolumeStatus.valueForString(example); + example = "ALERT"; + ComponentVolumeStatus enumAlert = ComponentVolumeStatus.valueForString(example); + example = "NOT_SUPPORTED"; + ComponentVolumeStatus enumNotSupported = ComponentVolumeStatus.valueForString(example); - /** - * Verifies that an invalid assignment is null. - */ - public void testInvalidEnum () { - String example = "unKNowN"; - try { - ComponentVolumeStatus temp = ComponentVolumeStatus.valueForString(example); + assertNotNull("UNKNOWN returned null", enumUnknown); + assertNotNull("NORMAL returned null", enumNormal); + assertNotNull("LOW returned null", enumLow); + assertNotNull("FAULT returned null", enumFault); + assertNotNull("ALERT returned null", enumAlert); + assertNotNull("NOT_SUPPORTED returned null", enumNotSupported); + } + + /** + * Verifies that an invalid assignment is null. + */ + public void testInvalidEnum() { + String example = "unKNowN"; + try { + ComponentVolumeStatus temp = ComponentVolumeStatus.valueForString(example); assertNull("Result of valueForString should be null.", temp); - } - catch (IllegalArgumentException exception) { + } catch (IllegalArgumentException exception) { fail("Invalid enum throws IllegalArgumentException."); - } - } + } + } - /** - * Verifies that a null assignment is invalid. - */ - public void testNullEnum () { - String example = null; - try { - ComponentVolumeStatus temp = ComponentVolumeStatus.valueForString(example); + /** + * Verifies that a null assignment is invalid. + */ + public void testNullEnum() { + String example = null; + try { + ComponentVolumeStatus temp = ComponentVolumeStatus.valueForString(example); assertNull("Result of valueForString should be null.", temp); - } - catch (NullPointerException exception) { + } catch (NullPointerException exception) { fail("Null string throws NullPointerException."); - } - } + } + } - /** - * Verifies the possible enum values of ComponentVolumeStatus. - */ - public void testListEnum() { - List<ComponentVolumeStatus> enumValueList = Arrays.asList(ComponentVolumeStatus.values()); + /** + * Verifies the possible enum values of ComponentVolumeStatus. + */ + public void testListEnum() { + List<ComponentVolumeStatus> enumValueList = Arrays.asList(ComponentVolumeStatus.values()); - List<ComponentVolumeStatus> enumTestList = new ArrayList<ComponentVolumeStatus>(); - enumTestList.add(ComponentVolumeStatus.UNKNOWN); - enumTestList.add(ComponentVolumeStatus.NORMAL); - enumTestList.add(ComponentVolumeStatus.LOW); - enumTestList.add(ComponentVolumeStatus.FAULT); - enumTestList.add(ComponentVolumeStatus.ALERT); - enumTestList.add(ComponentVolumeStatus.NOT_SUPPORTED); + List<ComponentVolumeStatus> enumTestList = new ArrayList<ComponentVolumeStatus>(); + enumTestList.add(ComponentVolumeStatus.UNKNOWN); + enumTestList.add(ComponentVolumeStatus.NORMAL); + enumTestList.add(ComponentVolumeStatus.LOW); + enumTestList.add(ComponentVolumeStatus.FAULT); + enumTestList.add(ComponentVolumeStatus.ALERT); + enumTestList.add(ComponentVolumeStatus.NOT_SUPPORTED); - assertTrue("Enum value list does not match enum class list", - enumValueList.containsAll(enumTestList) && enumTestList.containsAll(enumValueList)); - } + assertTrue("Enum value list does not match enum class list", + enumValueList.containsAll(enumTestList) && enumTestList.containsAll(enumValueList)); + } }
\ No newline at end of file diff --git a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/DefrostZoneTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/DefrostZoneTests.java index 44d7a6241..422bb4428 100644 --- a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/DefrostZoneTests.java +++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/DefrostZoneTests.java @@ -9,71 +9,69 @@ import java.util.Arrays; import java.util.List; /** - * This is a unit test class for the SmartDeviceLink library project class : + * This is a unit test class for the SmartDeviceLink library project class : * {@link com.smartdevicelink.proxy.rpc.enums.DefrostZone} */ public class DefrostZoneTests extends TestCase { - /** - * Verifies that the enum values are not null upon valid assignment. - */ - public void testValidEnums () { - String example = "FRONT"; - DefrostZone enumFront = DefrostZone.valueForString(example); - example = "REAR"; - DefrostZone enumRear = DefrostZone.valueForString(example); - example = "ALL"; - DefrostZone enumAll = DefrostZone.valueForString(example); - example = "NONE"; - DefrostZone enumNone = DefrostZone.valueForString(example); - - assertNotNull("FRONT returned null", enumFront); - assertNotNull("REAR returned null", enumRear); - assertNotNull("ALL returned null", enumAll); - assertNotNull("NONE returned null", enumNone); - } + /** + * Verifies that the enum values are not null upon valid assignment. + */ + public void testValidEnums() { + String example = "FRONT"; + DefrostZone enumFront = DefrostZone.valueForString(example); + example = "REAR"; + DefrostZone enumRear = DefrostZone.valueForString(example); + example = "ALL"; + DefrostZone enumAll = DefrostZone.valueForString(example); + example = "NONE"; + DefrostZone enumNone = DefrostZone.valueForString(example); - /** - * Verifies that an invalid assignment is null. - */ - public void testInvalidEnum () { - String example = "fRONT"; - try { - DefrostZone temp = DefrostZone.valueForString(example); + assertNotNull("FRONT returned null", enumFront); + assertNotNull("REAR returned null", enumRear); + assertNotNull("ALL returned null", enumAll); + assertNotNull("NONE returned null", enumNone); + } + + /** + * Verifies that an invalid assignment is null. + */ + public void testInvalidEnum() { + String example = "fRONT"; + try { + DefrostZone temp = DefrostZone.valueForString(example); assertNull("Result of valueForString should be null.", temp); - } - catch (IllegalArgumentException exception) { + } catch (IllegalArgumentException exception) { fail("Invalid enum throws IllegalArgumentException."); - } - } + } + } - /** - * Verifies that a null assignment is invalid. - */ - public void testNullEnum () { - String example = null; - try { - DefrostZone temp = DefrostZone.valueForString(example); + /** + * Verifies that a null assignment is invalid. + */ + public void testNullEnum() { + String example = null; + try { + DefrostZone temp = DefrostZone.valueForString(example); assertNull("Result of valueForString should be null.", temp); - } - catch (NullPointerException exception) { + } catch (NullPointerException exception) { fail("Null string throws NullPointerException."); - } - } + } + } - /** - * Verifies the possible enum values of DefrostZone. - */ - public void testListEnum() { - List<DefrostZone> enumValueList = Arrays.asList(DefrostZone.values()); + /** + * Verifies the possible enum values of DefrostZone. + */ + public void testListEnum() { + List<DefrostZone> enumValueList = Arrays.asList(DefrostZone.values()); - List<DefrostZone> enumTestList = new ArrayList<DefrostZone>(); - enumTestList.add(DefrostZone.FRONT); - enumTestList.add(DefrostZone.REAR); - enumTestList.add(DefrostZone.ALL); - enumTestList.add(DefrostZone.NONE); + List<DefrostZone> enumTestList = new ArrayList<DefrostZone>(); + enumTestList.add(DefrostZone.FRONT); + enumTestList.add(DefrostZone.REAR); + enumTestList.add(DefrostZone.ALL); + enumTestList.add(DefrostZone.NONE); - assertTrue("Enum value list does not match enum class list", - enumValueList.containsAll(enumTestList) && enumTestList.containsAll(enumValueList)); - } + assertTrue("Enum value list does not match enum class list", + enumValueList.containsAll(enumTestList) && enumTestList.containsAll(enumValueList)); + } }
\ No newline at end of file diff --git a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/DeviceLevelStatusTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/DeviceLevelStatusTests.java index 5b60dc6d2..cb8b23120 100644 --- a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/DeviceLevelStatusTests.java +++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/DeviceLevelStatusTests.java @@ -9,79 +9,77 @@ import java.util.Arrays; import java.util.List; /** - * This is a unit test class for the SmartDeviceLink library project class : + * This is a unit test class for the SmartDeviceLink library project class : * {@link com.smartdevicelink.proxy.rpc.enums.DeviceLevelStatus} */ -public class DeviceLevelStatusTests extends TestCase{ +public class DeviceLevelStatusTests extends TestCase { - /** - * Verifies that the enum values are not null upon valid assignment. - */ - public void testValidEnums () { - String example = "ZERO_LEVEL_BARS"; - DeviceLevelStatus enumZeroLevel = DeviceLevelStatus.valueForString(example); - example = "ONE_LEVEL_BARS"; - DeviceLevelStatus enumOneLevel = DeviceLevelStatus.valueForString(example); - example = "TWO_LEVEL_BARS"; - DeviceLevelStatus enumTwoLevel = DeviceLevelStatus.valueForString(example); - example = "THREE_LEVEL_BARS"; - DeviceLevelStatus enumThreeLevel = DeviceLevelStatus.valueForString(example); - example = "FOUR_LEVEL_BARS"; - DeviceLevelStatus enumFourLevel = DeviceLevelStatus.valueForString(example); - example = "NOT_PROVIDED"; - DeviceLevelStatus enumNotProvided = DeviceLevelStatus.valueForString(example); - - assertNotNull("ZERO_LEVEL_BARS returned null", enumZeroLevel); - assertNotNull("ONE_LEVEL_BARS returned null", enumOneLevel); - assertNotNull("TWO_LEVEL_BARS returned null", enumTwoLevel); - assertNotNull("THREE_LEVEL_BARS returned null", enumThreeLevel); - assertNotNull("FOUR_LEVEL_BARS returned null", enumFourLevel); - assertNotNull("NOT_PROVIDED returned null", enumNotProvided); - } + /** + * Verifies that the enum values are not null upon valid assignment. + */ + public void testValidEnums() { + String example = "ZERO_LEVEL_BARS"; + DeviceLevelStatus enumZeroLevel = DeviceLevelStatus.valueForString(example); + example = "ONE_LEVEL_BARS"; + DeviceLevelStatus enumOneLevel = DeviceLevelStatus.valueForString(example); + example = "TWO_LEVEL_BARS"; + DeviceLevelStatus enumTwoLevel = DeviceLevelStatus.valueForString(example); + example = "THREE_LEVEL_BARS"; + DeviceLevelStatus enumThreeLevel = DeviceLevelStatus.valueForString(example); + example = "FOUR_LEVEL_BARS"; + DeviceLevelStatus enumFourLevel = DeviceLevelStatus.valueForString(example); + example = "NOT_PROVIDED"; + DeviceLevelStatus enumNotProvided = DeviceLevelStatus.valueForString(example); - /** - * Verifies that an invalid assignment is null. - */ - public void testInvalidEnum () { - String example = "onE_LeVeL_barS"; - try { - DeviceLevelStatus temp = DeviceLevelStatus.valueForString(example); + assertNotNull("ZERO_LEVEL_BARS returned null", enumZeroLevel); + assertNotNull("ONE_LEVEL_BARS returned null", enumOneLevel); + assertNotNull("TWO_LEVEL_BARS returned null", enumTwoLevel); + assertNotNull("THREE_LEVEL_BARS returned null", enumThreeLevel); + assertNotNull("FOUR_LEVEL_BARS returned null", enumFourLevel); + assertNotNull("NOT_PROVIDED returned null", enumNotProvided); + } + + /** + * Verifies that an invalid assignment is null. + */ + public void testInvalidEnum() { + String example = "onE_LeVeL_barS"; + try { + DeviceLevelStatus temp = DeviceLevelStatus.valueForString(example); assertNull("Result of valueForString should be null.", temp); - } - catch (IllegalArgumentException exception) { + } catch (IllegalArgumentException exception) { fail("Invalid enum throws IllegalArgumentException."); - } - } + } + } - /** - * Verifies that a null assignment is invalid. - */ - public void testNullEnum () { - String example = null; - try { - DeviceLevelStatus temp = DeviceLevelStatus.valueForString(example); + /** + * Verifies that a null assignment is invalid. + */ + public void testNullEnum() { + String example = null; + try { + DeviceLevelStatus temp = DeviceLevelStatus.valueForString(example); assertNull("Result of valueForString should be null.", temp); - } - catch (NullPointerException exception) { + } catch (NullPointerException exception) { fail("Null string throws NullPointerException."); - } - } + } + } + + /** + * Verifies the possible enum values of DeviceLevelStatus. + */ + public void testListEnum() { + List<DeviceLevelStatus> enumValueList = Arrays.asList(DeviceLevelStatus.values()); - /** - * Verifies the possible enum values of DeviceLevelStatus. - */ - public void testListEnum() { - List<DeviceLevelStatus> enumValueList = Arrays.asList(DeviceLevelStatus.values()); - - List<DeviceLevelStatus> enumTestList = new ArrayList<DeviceLevelStatus>(); - enumTestList.add(DeviceLevelStatus.ZERO_LEVEL_BARS); - enumTestList.add(DeviceLevelStatus.ONE_LEVEL_BARS); - enumTestList.add(DeviceLevelStatus.TWO_LEVEL_BARS); - enumTestList.add(DeviceLevelStatus.THREE_LEVEL_BARS); - enumTestList.add(DeviceLevelStatus.FOUR_LEVEL_BARS); - enumTestList.add(DeviceLevelStatus.NOT_PROVIDED); + List<DeviceLevelStatus> enumTestList = new ArrayList<DeviceLevelStatus>(); + enumTestList.add(DeviceLevelStatus.ZERO_LEVEL_BARS); + enumTestList.add(DeviceLevelStatus.ONE_LEVEL_BARS); + enumTestList.add(DeviceLevelStatus.TWO_LEVEL_BARS); + enumTestList.add(DeviceLevelStatus.THREE_LEVEL_BARS); + enumTestList.add(DeviceLevelStatus.FOUR_LEVEL_BARS); + enumTestList.add(DeviceLevelStatus.NOT_PROVIDED); - assertTrue("Enum value list does not match enum class list", - enumValueList.containsAll(enumTestList) && enumTestList.containsAll(enumValueList)); - } + assertTrue("Enum value list does not match enum class list", + enumValueList.containsAll(enumTestList) && enumTestList.containsAll(enumValueList)); + } }
\ No newline at end of file diff --git a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/DimensionTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/DimensionTests.java index ec2d9ec23..60e8d2255 100644 --- a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/DimensionTests.java +++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/DimensionTests.java @@ -9,67 +9,65 @@ import java.util.Arrays; import java.util.List; /** - * This is a unit test class for the SmartDeviceLink library project class : + * This is a unit test class for the SmartDeviceLink library project class : * {@link com.smartdevicelink.proxy.rpc.enums.Dimension} */ public class DimensionTests extends TestCase { - /** - * Verifies that the enum values are not null upon valid assignment. - */ - public void testValidEnums () { - String example = "NO_FIX"; - Dimension enumNoFix = Dimension.valueForString(example); - example = "2D"; - Dimension enum2D = Dimension.valueForString(example); - example = "3D"; - Dimension enum3D = Dimension.valueForString(example); - - assertNotNull("NO_FIX returned null", enumNoFix); - assertNotNull("2D returned null", enum2D); - assertNotNull("3D returned null", enum3D); - } + /** + * Verifies that the enum values are not null upon valid assignment. + */ + public void testValidEnums() { + String example = "NO_FIX"; + Dimension enumNoFix = Dimension.valueForString(example); + example = "2D"; + Dimension enum2D = Dimension.valueForString(example); + example = "3D"; + Dimension enum3D = Dimension.valueForString(example); - /** - * Verifies that an invalid assignment is null. - */ - public void testInvalidEnum () { - String example = "no_FiX"; - try { - Dimension temp = Dimension.valueForString(example); + assertNotNull("NO_FIX returned null", enumNoFix); + assertNotNull("2D returned null", enum2D); + assertNotNull("3D returned null", enum3D); + } + + /** + * Verifies that an invalid assignment is null. + */ + public void testInvalidEnum() { + String example = "no_FiX"; + try { + Dimension temp = Dimension.valueForString(example); assertNull("Result of valueForString should be null.", temp); - } - catch (IllegalArgumentException exception) { + } catch (IllegalArgumentException exception) { fail("Invalid enum throws IllegalArgumentException."); - } - } + } + } - /** - * Verifies that a null assignment is invalid. - */ - public void testNullEnum () { - String example = null; - try { - Dimension temp = Dimension.valueForString(example); + /** + * Verifies that a null assignment is invalid. + */ + public void testNullEnum() { + String example = null; + try { + Dimension temp = Dimension.valueForString(example); assertNull("Result of valueForString should be null.", temp); - } - catch (NullPointerException exception) { + } catch (NullPointerException exception) { fail("Null string throws NullPointerException."); - } - } - - /** - * Verifies the possible enum values of Dimension. - */ - public void testListEnum() { - List<Dimension> enumValueList = Arrays.asList(Dimension.values()); + } + } + + /** + * Verifies the possible enum values of Dimension. + */ + public void testListEnum() { + List<Dimension> enumValueList = Arrays.asList(Dimension.values()); - List<Dimension> enumTestList = new ArrayList<Dimension>(); - enumTestList.add(Dimension.NO_FIX); - enumTestList.add(Dimension._2D); - enumTestList.add(Dimension._3D); + List<Dimension> enumTestList = new ArrayList<Dimension>(); + enumTestList.add(Dimension.NO_FIX); + enumTestList.add(Dimension._2D); + enumTestList.add(Dimension._3D); - assertTrue("Enum value list does not match enum class list", - enumValueList.containsAll(enumTestList) && enumTestList.containsAll(enumValueList)); - } + assertTrue("Enum value list does not match enum class list", + enumValueList.containsAll(enumTestList) && enumTestList.containsAll(enumValueList)); + } }
\ No newline at end of file diff --git a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/DirectionTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/DirectionTests.java index 76492878d..1d6c67f1d 100644 --- a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/DirectionTests.java +++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/DirectionTests.java @@ -14,58 +14,56 @@ import java.util.List; */ public class DirectionTests extends TestCase { - /** - * Verifies that the enum values are not null upon valid assignment. - */ - public void testValidEnums () { - String example = "LEFT"; - Direction enumLeft = Direction.valueForString(example); - example = "RIGHT"; - Direction enumRight = Direction.valueForString(example); + /** + * Verifies that the enum values are not null upon valid assignment. + */ + public void testValidEnums() { + String example = "LEFT"; + Direction enumLeft = Direction.valueForString(example); + example = "RIGHT"; + Direction enumRight = Direction.valueForString(example); - assertNotNull("LEFT returned null", enumLeft); - assertNotNull("RIGHT returned null", enumRight); - } + assertNotNull("LEFT returned null", enumLeft); + assertNotNull("RIGHT returned null", enumRight); + } - /** - * Verifies that an invalid assignment is null. - */ - public void testInvalidEnum () { - String example = "fRONT"; - try { - Direction temp = Direction.valueForString(example); - assertNull("Result of valueForString should be null.", temp); - } - catch (IllegalArgumentException exception) { - fail("Invalid enum throws IllegalArgumentException."); - } - } + /** + * Verifies that an invalid assignment is null. + */ + public void testInvalidEnum() { + String example = "fRONT"; + try { + Direction temp = Direction.valueForString(example); + assertNull("Result of valueForString should be null.", temp); + } catch (IllegalArgumentException exception) { + fail("Invalid enum throws IllegalArgumentException."); + } + } - /** - * Verifies that a null assignment is invalid. - */ - public void testNullEnum () { - String example = null; - try { - Direction temp = Direction.valueForString(example); - assertNull("Result of valueForString should be null.", temp); - } - catch (NullPointerException exception) { - fail("Null string throws NullPointerException."); - } - } + /** + * Verifies that a null assignment is invalid. + */ + public void testNullEnum() { + String example = null; + try { + Direction temp = Direction.valueForString(example); + assertNull("Result of valueForString should be null.", temp); + } catch (NullPointerException exception) { + fail("Null string throws NullPointerException."); + } + } - /** - * Verifies the possible enum values of Direction. - */ - public void testListEnum() { - List<Direction> enumValueList = Arrays.asList(Direction.values()); + /** + * Verifies the possible enum values of Direction. + */ + public void testListEnum() { + List<Direction> enumValueList = Arrays.asList(Direction.values()); - List<Direction> enumTestList = new ArrayList<>(); - enumTestList.add(Direction.LEFT); - enumTestList.add(Direction.RIGHT); + List<Direction> enumTestList = new ArrayList<>(); + enumTestList.add(Direction.LEFT); + enumTestList.add(Direction.RIGHT); - assertTrue("Enum value list does not match enum class list", - enumValueList.containsAll(enumTestList) && enumTestList.containsAll(enumValueList)); - } + assertTrue("Enum value list does not match enum class list", + enumValueList.containsAll(enumTestList) && enumTestList.containsAll(enumValueList)); + } } diff --git a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/DisplayModeTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/DisplayModeTests.java index cb8073804..07d6a2f7d 100644 --- a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/DisplayModeTests.java +++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/DisplayModeTests.java @@ -15,60 +15,60 @@ import java.util.List; */ public class DisplayModeTests extends TestCase { - /** - * Verifies that the enum values are not null upon valid assignment. - */ - public void testValidEnums() { - String example = "DAY"; - DisplayMode enumDay = DisplayMode.valueForString(example); - example = "NIGHT"; - DisplayMode enumNight = DisplayMode.valueForString(example); - example = "AUTO"; - DisplayMode enumAuto = DisplayMode.valueForString(example); + /** + * Verifies that the enum values are not null upon valid assignment. + */ + public void testValidEnums() { + String example = "DAY"; + DisplayMode enumDay = DisplayMode.valueForString(example); + example = "NIGHT"; + DisplayMode enumNight = DisplayMode.valueForString(example); + example = "AUTO"; + DisplayMode enumAuto = DisplayMode.valueForString(example); - assertNotNull("DAY returned null", enumDay); - assertNotNull("NIGHT returned null", enumNight); - assertNotNull("AUTO returned null", enumAuto); - } + assertNotNull("DAY returned null", enumDay); + assertNotNull("NIGHT returned null", enumNight); + assertNotNull("AUTO returned null", enumAuto); + } - /** - * Verifies that an invalid assignment is null. - */ - public void testInvalidEnum() { - String example = "dAY"; - try { - DisplayMode temp = DisplayMode.valueForString(example); - assertNull("Result of valueForString should be null.", temp); - } catch (IllegalArgumentException exception) { - fail("Invalid enum throws IllegalArgumentException."); - } - } + /** + * Verifies that an invalid assignment is null. + */ + public void testInvalidEnum() { + String example = "dAY"; + try { + DisplayMode temp = DisplayMode.valueForString(example); + assertNull("Result of valueForString should be null.", temp); + } catch (IllegalArgumentException exception) { + fail("Invalid enum throws IllegalArgumentException."); + } + } - /** - * Verifies that a null assignment is invalid. - */ - public void testNullEnum() { - String example = null; - try { - DisplayMode temp = DisplayMode.valueForString(example); - assertNull("Result of valueForString should be null.", temp); - } catch (NullPointerException exception) { - fail("Null string throws NullPointerException."); - } - } + /** + * Verifies that a null assignment is invalid. + */ + public void testNullEnum() { + String example = null; + try { + DisplayMode temp = DisplayMode.valueForString(example); + assertNull("Result of valueForString should be null.", temp); + } catch (NullPointerException exception) { + fail("Null string throws NullPointerException."); + } + } - /** - * Verifies the possible enum values of DisplayMode. - */ - public void testListEnum() { - List<DisplayMode> enumValueList = Arrays.asList(DisplayMode.values()); + /** + * Verifies the possible enum values of DisplayMode. + */ + public void testListEnum() { + List<DisplayMode> enumValueList = Arrays.asList(DisplayMode.values()); - List<DisplayMode> enumTestList = new ArrayList<DisplayMode>(); - enumTestList.add(DisplayMode.DAY); - enumTestList.add(DisplayMode.NIGHT); - enumTestList.add(DisplayMode.AUTO); + List<DisplayMode> enumTestList = new ArrayList<DisplayMode>(); + enumTestList.add(DisplayMode.DAY); + enumTestList.add(DisplayMode.NIGHT); + enumTestList.add(DisplayMode.AUTO); - assertTrue("Enum value list does not match enum class list", - enumValueList.containsAll(enumTestList) && enumTestList.containsAll(enumValueList)); - } + assertTrue("Enum value list does not match enum class list", + enumValueList.containsAll(enumTestList) && enumTestList.containsAll(enumValueList)); + } }
\ No newline at end of file diff --git a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/DisplayTypeTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/DisplayTypeTests.java index 71b738782..a60183e42 100644 --- a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/DisplayTypeTests.java +++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/DisplayTypeTests.java @@ -14,94 +14,92 @@ import java.util.List; */ public class DisplayTypeTests extends TestCase { - /** - * Verifies that the enum values are not null upon valid assignment. - */ - public void testValidEnums () { - String example = "CID"; - DisplayType enumCid = DisplayType.valueForString(example); - example = "TYPE2"; - DisplayType enumType2 = DisplayType.valueForString(example); - example = "TYPE5"; - DisplayType enumType5 = DisplayType.valueForString(example); - example = "NGN"; - DisplayType enumNgn = DisplayType.valueForString(example); - example = "GEN2_8_DMA"; - DisplayType enumGen2_8Dma = DisplayType.valueForString(example); - example = "GEN2_6_DMA"; - DisplayType enumGen2_6Dma = DisplayType.valueForString(example); - example = "MFD3"; - DisplayType enumMfd3 = DisplayType.valueForString(example); - example = "MFD4"; - DisplayType enumMfd4 = DisplayType.valueForString(example); - example = "MFD5"; - DisplayType enumMfd5 = DisplayType.valueForString(example); - example = "GEN3_8-INCH"; - DisplayType enumGen3_8Inch = DisplayType.valueForString(example); - example = "SDL_GENERIC"; - DisplayType enumGeneric = DisplayType.valueForString(example); + /** + * Verifies that the enum values are not null upon valid assignment. + */ + public void testValidEnums() { + String example = "CID"; + DisplayType enumCid = DisplayType.valueForString(example); + example = "TYPE2"; + DisplayType enumType2 = DisplayType.valueForString(example); + example = "TYPE5"; + DisplayType enumType5 = DisplayType.valueForString(example); + example = "NGN"; + DisplayType enumNgn = DisplayType.valueForString(example); + example = "GEN2_8_DMA"; + DisplayType enumGen2_8Dma = DisplayType.valueForString(example); + example = "GEN2_6_DMA"; + DisplayType enumGen2_6Dma = DisplayType.valueForString(example); + example = "MFD3"; + DisplayType enumMfd3 = DisplayType.valueForString(example); + example = "MFD4"; + DisplayType enumMfd4 = DisplayType.valueForString(example); + example = "MFD5"; + DisplayType enumMfd5 = DisplayType.valueForString(example); + example = "GEN3_8-INCH"; + DisplayType enumGen3_8Inch = DisplayType.valueForString(example); + example = "SDL_GENERIC"; + DisplayType enumGeneric = DisplayType.valueForString(example); - assertNotNull("CID returned null", enumCid); - assertNotNull("TYPE2 returned null", enumType2); - assertNotNull("TYPE5 returned null", enumType5); - assertNotNull("NGN returned null", enumNgn); - assertNotNull("GEN2_8_DMA returned null", enumGen2_8Dma); - assertNotNull("GEN2_6_DMA returned null", enumGen2_6Dma); - assertNotNull("MFD3 returned null", enumMfd3); - assertNotNull("MFD4 returned null", enumMfd4); - assertNotNull("MFD5 returned null", enumMfd5); - assertNotNull("GEN3_8-INCH returned null", enumGen3_8Inch); - assertNotNull("SDL_GENERIC returned null", enumGeneric); - } + assertNotNull("CID returned null", enumCid); + assertNotNull("TYPE2 returned null", enumType2); + assertNotNull("TYPE5 returned null", enumType5); + assertNotNull("NGN returned null", enumNgn); + assertNotNull("GEN2_8_DMA returned null", enumGen2_8Dma); + assertNotNull("GEN2_6_DMA returned null", enumGen2_6Dma); + assertNotNull("MFD3 returned null", enumMfd3); + assertNotNull("MFD4 returned null", enumMfd4); + assertNotNull("MFD5 returned null", enumMfd5); + assertNotNull("GEN3_8-INCH returned null", enumGen3_8Inch); + assertNotNull("SDL_GENERIC returned null", enumGeneric); + } - /** - * Verifies that an invalid assignment is null. - */ - public void testInvalidEnum () { - String example = "cId"; - try { - DisplayType temp = DisplayType.valueForString(example); - assertNull("Result of valueForString should be null.", temp); - } - catch (IllegalArgumentException exception) { - fail("Invalid enum throws IllegalArgumentException."); - } - } + /** + * Verifies that an invalid assignment is null. + */ + public void testInvalidEnum() { + String example = "cId"; + try { + DisplayType temp = DisplayType.valueForString(example); + assertNull("Result of valueForString should be null.", temp); + } catch (IllegalArgumentException exception) { + fail("Invalid enum throws IllegalArgumentException."); + } + } - /** - * Verifies that a null assignment is invalid. - */ - public void testNullEnum () { - String example = null; - try { - DisplayType temp = DisplayType.valueForString(example); - assertNull("Result of valueForString should be null.", temp); - } - catch (NullPointerException exception) { - fail("Null string throws NullPointerException."); - } - } + /** + * Verifies that a null assignment is invalid. + */ + public void testNullEnum() { + String example = null; + try { + DisplayType temp = DisplayType.valueForString(example); + assertNull("Result of valueForString should be null.", temp); + } catch (NullPointerException exception) { + fail("Null string throws NullPointerException."); + } + } - /** - * Verifies the possible enum values of DisplayType. - */ - public void testListEnum() { - List<DisplayType> enumValueList = Arrays.asList(DisplayType.values()); + /** + * Verifies the possible enum values of DisplayType. + */ + public void testListEnum() { + List<DisplayType> enumValueList = Arrays.asList(DisplayType.values()); - List<DisplayType> enumTestList = new ArrayList<DisplayType>(); - enumTestList.add(DisplayType.CID); - enumTestList.add(DisplayType.TYPE2); - enumTestList.add(DisplayType.TYPE5); - enumTestList.add(DisplayType.NGN); - enumTestList.add(DisplayType.GEN2_8_DMA); - enumTestList.add(DisplayType.GEN2_6_DMA); - enumTestList.add(DisplayType.MFD3); - enumTestList.add(DisplayType.MFD4); - enumTestList.add(DisplayType.MFD5); - enumTestList.add(DisplayType.GEN3_8_INCH); - enumTestList.add(DisplayType.SDL_GENERIC); + List<DisplayType> enumTestList = new ArrayList<DisplayType>(); + enumTestList.add(DisplayType.CID); + enumTestList.add(DisplayType.TYPE2); + enumTestList.add(DisplayType.TYPE5); + enumTestList.add(DisplayType.NGN); + enumTestList.add(DisplayType.GEN2_8_DMA); + enumTestList.add(DisplayType.GEN2_6_DMA); + enumTestList.add(DisplayType.MFD3); + enumTestList.add(DisplayType.MFD4); + enumTestList.add(DisplayType.MFD5); + enumTestList.add(DisplayType.GEN3_8_INCH); + enumTestList.add(DisplayType.SDL_GENERIC); - assertTrue("Enum value list does not match enum class list", - enumValueList.containsAll(enumTestList) && enumTestList.containsAll(enumValueList)); - } + assertTrue("Enum value list does not match enum class list", + enumValueList.containsAll(enumTestList) && enumTestList.containsAll(enumValueList)); + } }
\ No newline at end of file diff --git a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/DistanceUnitTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/DistanceUnitTests.java index a0e491e37..6d2933e62 100644 --- a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/DistanceUnitTests.java +++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/DistanceUnitTests.java @@ -15,55 +15,55 @@ import java.util.List; */ public class DistanceUnitTests extends TestCase { - /** - * Verifies that the enum values are not null upon valid assignment. - */ - public void testValidEnums() { - String example = "MILES"; - DistanceUnit enumMiles = DistanceUnit.valueForString(example); - example = "KILOMETERS"; - DistanceUnit enumKilometers = DistanceUnit.valueForString(example); + /** + * Verifies that the enum values are not null upon valid assignment. + */ + public void testValidEnums() { + String example = "MILES"; + DistanceUnit enumMiles = DistanceUnit.valueForString(example); + example = "KILOMETERS"; + DistanceUnit enumKilometers = DistanceUnit.valueForString(example); - assertNotNull("MILES returned null", enumMiles); - assertNotNull("KILOMETERS returned null", enumKilometers); - } + assertNotNull("MILES returned null", enumMiles); + assertNotNull("KILOMETERS returned null", enumKilometers); + } - /** - * Verifies that an invalid assignment is null. - */ - public void testInvalidEnum() { - String example = "mILES"; - try { - DistanceUnit temp = DistanceUnit.valueForString(example); - assertNull("Result of valueForString should be null.", temp); - } catch (IllegalArgumentException exception) { - fail("Invalid enum throws IllegalArgumentException."); - } - } + /** + * Verifies that an invalid assignment is null. + */ + public void testInvalidEnum() { + String example = "mILES"; + try { + DistanceUnit temp = DistanceUnit.valueForString(example); + assertNull("Result of valueForString should be null.", temp); + } catch (IllegalArgumentException exception) { + fail("Invalid enum throws IllegalArgumentException."); + } + } - /** - * Verifies that a null assignment is invalid. - */ - public void testNullEnum() { - String example = null; - try { - DistanceUnit temp = DistanceUnit.valueForString(example); - assertNull("Result of valueForString should be null.", temp); - } catch (NullPointerException exception) { - fail("Null string throws NullPointerException."); - } - } + /** + * Verifies that a null assignment is invalid. + */ + public void testNullEnum() { + String example = null; + try { + DistanceUnit temp = DistanceUnit.valueForString(example); + assertNull("Result of valueForString should be null.", temp); + } catch (NullPointerException exception) { + fail("Null string throws NullPointerException."); + } + } - /** - * Verifies the possible enum values of DistanceUnit. - */ - public void testListEnum() { - List<DistanceUnit> enumValueList = Arrays.asList(DistanceUnit.values()); - List<DistanceUnit> enumTestList = new ArrayList<DistanceUnit>(); - enumTestList.add(DistanceUnit.MILES); - enumTestList.add(DistanceUnit.KILOMETERS); + /** + * Verifies the possible enum values of DistanceUnit. + */ + public void testListEnum() { + List<DistanceUnit> enumValueList = Arrays.asList(DistanceUnit.values()); + List<DistanceUnit> enumTestList = new ArrayList<DistanceUnit>(); + enumTestList.add(DistanceUnit.MILES); + enumTestList.add(DistanceUnit.KILOMETERS); - assertTrue("Enum value list does not match enum class list", - enumValueList.containsAll(enumTestList) && enumTestList.containsAll(enumValueList)); - } + assertTrue("Enum value list does not match enum class list", + enumValueList.containsAll(enumTestList) && enumTestList.containsAll(enumValueList)); + } }
\ No newline at end of file diff --git a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/DriverDistractionStateTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/DriverDistractionStateTests.java index 672b8b91d..d63d9ff15 100644 --- a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/DriverDistractionStateTests.java +++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/DriverDistractionStateTests.java @@ -9,63 +9,61 @@ import java.util.Arrays; import java.util.List; /** - * This is a unit test class for the SmartDeviceLink library project class : + * This is a unit test class for the SmartDeviceLink library project class : * {@link com.smartdevicelink.proxy.rpc.enums.DriverDistractionState} */ public class DriverDistractionStateTests extends TestCase { - /** - * Verifies that the enum values are not null upon valid assignment. - */ - public void testValidEnums () { - String example = "DD_ON"; - DriverDistractionState enumDdOn = DriverDistractionState.valueForString(example); - example = "DD_OFF"; - DriverDistractionState enumDdOff = DriverDistractionState.valueForString(example); - - assertNotNull("DD_ON returned null", enumDdOn); - assertNotNull("DD_OFF returned null", enumDdOff); - } + /** + * Verifies that the enum values are not null upon valid assignment. + */ + public void testValidEnums() { + String example = "DD_ON"; + DriverDistractionState enumDdOn = DriverDistractionState.valueForString(example); + example = "DD_OFF"; + DriverDistractionState enumDdOff = DriverDistractionState.valueForString(example); - /** - * Verifies that an invalid assignment is null. - */ - public void testInvalidEnum () { - String example = "dD_oN"; - try { - DriverDistractionState temp = DriverDistractionState.valueForString(example); + assertNotNull("DD_ON returned null", enumDdOn); + assertNotNull("DD_OFF returned null", enumDdOff); + } + + /** + * Verifies that an invalid assignment is null. + */ + public void testInvalidEnum() { + String example = "dD_oN"; + try { + DriverDistractionState temp = DriverDistractionState.valueForString(example); assertNull("Result of valueForString should be null.", temp); - } - catch (IllegalArgumentException exception) { + } catch (IllegalArgumentException exception) { fail("Invalid enum throws IllegalArgumentException."); - } - } + } + } - /** - * Verifies that a null assignment is invalid. - */ - public void testNullEnum () { - String example = null; - try { - DriverDistractionState temp = DriverDistractionState.valueForString(example); + /** + * Verifies that a null assignment is invalid. + */ + public void testNullEnum() { + String example = null; + try { + DriverDistractionState temp = DriverDistractionState.valueForString(example); assertNull("Result of valueForString should be null.", temp); - } - catch (NullPointerException exception) { + } catch (NullPointerException exception) { fail("Null string throws NullPointerException."); - } - } + } + } - /** - * Verifies the possible enum values of DriverDistractionState. - */ - public void testListEnum() { - List<DriverDistractionState> enumValueList = Arrays.asList(DriverDistractionState.values()); + /** + * Verifies the possible enum values of DriverDistractionState. + */ + public void testListEnum() { + List<DriverDistractionState> enumValueList = Arrays.asList(DriverDistractionState.values()); - List<DriverDistractionState> enumTestList = new ArrayList<DriverDistractionState>(); - enumTestList.add(DriverDistractionState.DD_ON); - enumTestList.add(DriverDistractionState.DD_OFF); + List<DriverDistractionState> enumTestList = new ArrayList<DriverDistractionState>(); + enumTestList.add(DriverDistractionState.DD_ON); + enumTestList.add(DriverDistractionState.DD_OFF); - assertTrue("Enum value list does not match enum class list", - enumValueList.containsAll(enumTestList) && enumTestList.containsAll(enumValueList)); - } + assertTrue("Enum value list does not match enum class list", + enumValueList.containsAll(enumTestList) && enumTestList.containsAll(enumValueList)); + } }
\ No newline at end of file diff --git a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/ECallConfirmationStatusTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/ECallConfirmationStatusTests.java index b7b79fcaf..9135281fa 100644 --- a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/ECallConfirmationStatusTests.java +++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/ECallConfirmationStatusTests.java @@ -9,83 +9,81 @@ import java.util.Arrays; import java.util.List; /** - * This is a unit test class for the SmartDeviceLink library project class : + * This is a unit test class for the SmartDeviceLink library project class : * {@link com.smartdevicelink.proxy.rpc.enums.ECallConfirmationStatus} */ public class ECallConfirmationStatusTests extends TestCase { - /** - * Verifies that the enum values are not null upon valid assignment. - */ - public void testValidEnums () { - String example = "NORMAL"; - ECallConfirmationStatus enumNormal = ECallConfirmationStatus.valueForString(example); - example = "CALL_IN_PROGRESS"; - ECallConfirmationStatus enumCallInProgress = ECallConfirmationStatus.valueForString(example); - example = "CALL_CANCELLED"; - ECallConfirmationStatus enumCancelled = ECallConfirmationStatus.valueForString(example); - example = "CALL_COMPLETED"; - ECallConfirmationStatus enumCompleted = ECallConfirmationStatus.valueForString(example); - example = "CALL_UNSUCCESSFUL"; - ECallConfirmationStatus enumUnsuccessful = ECallConfirmationStatus.valueForString(example); - example = "ECALL_CONFIGURED_OFF"; - ECallConfirmationStatus enumConfiguredOff = ECallConfirmationStatus.valueForString(example); - example = "CALL_COMPLETE_DTMF_TIMEOUT"; - ECallConfirmationStatus enumCompleteDtmfTimeout = ECallConfirmationStatus.valueForString(example); - - assertNotNull("NORMAL returned null", enumNormal); - assertNotNull("CALL_IN_PROGRESS returned null", enumCallInProgress); - assertNotNull("CALL_CANCELLED returned null", enumCancelled); - assertNotNull("CALL_COMPLETED returned null", enumCompleted); - assertNotNull("CALL_UNSUCCESSFUL returned null", enumUnsuccessful); - assertNotNull("ECALL_CONFIGURED_OFF returned null", enumConfiguredOff); - assertNotNull("CALL_COMPLETE_DTMF_TIMEOUT returned null", enumCompleteDtmfTimeout); - } + /** + * Verifies that the enum values are not null upon valid assignment. + */ + public void testValidEnums() { + String example = "NORMAL"; + ECallConfirmationStatus enumNormal = ECallConfirmationStatus.valueForString(example); + example = "CALL_IN_PROGRESS"; + ECallConfirmationStatus enumCallInProgress = ECallConfirmationStatus.valueForString(example); + example = "CALL_CANCELLED"; + ECallConfirmationStatus enumCancelled = ECallConfirmationStatus.valueForString(example); + example = "CALL_COMPLETED"; + ECallConfirmationStatus enumCompleted = ECallConfirmationStatus.valueForString(example); + example = "CALL_UNSUCCESSFUL"; + ECallConfirmationStatus enumUnsuccessful = ECallConfirmationStatus.valueForString(example); + example = "ECALL_CONFIGURED_OFF"; + ECallConfirmationStatus enumConfiguredOff = ECallConfirmationStatus.valueForString(example); + example = "CALL_COMPLETE_DTMF_TIMEOUT"; + ECallConfirmationStatus enumCompleteDtmfTimeout = ECallConfirmationStatus.valueForString(example); - /** - * Verifies that an invalid assignment is null. - */ - public void testInvalidEnum () { - String example = "noRMal"; - try { - ECallConfirmationStatus temp = ECallConfirmationStatus.valueForString(example); + assertNotNull("NORMAL returned null", enumNormal); + assertNotNull("CALL_IN_PROGRESS returned null", enumCallInProgress); + assertNotNull("CALL_CANCELLED returned null", enumCancelled); + assertNotNull("CALL_COMPLETED returned null", enumCompleted); + assertNotNull("CALL_UNSUCCESSFUL returned null", enumUnsuccessful); + assertNotNull("ECALL_CONFIGURED_OFF returned null", enumConfiguredOff); + assertNotNull("CALL_COMPLETE_DTMF_TIMEOUT returned null", enumCompleteDtmfTimeout); + } + + /** + * Verifies that an invalid assignment is null. + */ + public void testInvalidEnum() { + String example = "noRMal"; + try { + ECallConfirmationStatus temp = ECallConfirmationStatus.valueForString(example); assertNull("Result of valueForString should be null.", temp); - } - catch (IllegalArgumentException exception) { + } catch (IllegalArgumentException exception) { fail("Null string throws NullPointerException."); - } - } + } + } - /** - * Verifies that a null assignment is invalid. - */ - public void testNullEnum () { - String example = null; - try { - ECallConfirmationStatus temp = ECallConfirmationStatus.valueForString(example); + /** + * Verifies that a null assignment is invalid. + */ + public void testNullEnum() { + String example = null; + try { + ECallConfirmationStatus temp = ECallConfirmationStatus.valueForString(example); assertNull("Result of valueForString should be null.", temp); - } - catch (NullPointerException exception) { + } catch (NullPointerException exception) { fail("Null string throws NullPointerException."); - } - } + } + } - /** - * Verifies the possible enum values of ECallConfirmationStatus. - */ - public void testListEnum() { - List<ECallConfirmationStatus> enumValueList = Arrays.asList(ECallConfirmationStatus.values()); + /** + * Verifies the possible enum values of ECallConfirmationStatus. + */ + public void testListEnum() { + List<ECallConfirmationStatus> enumValueList = Arrays.asList(ECallConfirmationStatus.values()); - List<ECallConfirmationStatus> enumTestList = new ArrayList<ECallConfirmationStatus>(); - enumTestList.add(ECallConfirmationStatus.NORMAL); - enumTestList.add(ECallConfirmationStatus.CALL_IN_PROGRESS); - enumTestList.add(ECallConfirmationStatus.CALL_CANCELLED); - enumTestList.add(ECallConfirmationStatus.CALL_COMPLETED); - enumTestList.add(ECallConfirmationStatus.CALL_UNSUCCESSFUL); - enumTestList.add(ECallConfirmationStatus.ECALL_CONFIGURED_OFF); - enumTestList.add(ECallConfirmationStatus.CALL_COMPLETE_DTMF_TIMEOUT); + List<ECallConfirmationStatus> enumTestList = new ArrayList<ECallConfirmationStatus>(); + enumTestList.add(ECallConfirmationStatus.NORMAL); + enumTestList.add(ECallConfirmationStatus.CALL_IN_PROGRESS); + enumTestList.add(ECallConfirmationStatus.CALL_CANCELLED); + enumTestList.add(ECallConfirmationStatus.CALL_COMPLETED); + enumTestList.add(ECallConfirmationStatus.CALL_UNSUCCESSFUL); + enumTestList.add(ECallConfirmationStatus.ECALL_CONFIGURED_OFF); + enumTestList.add(ECallConfirmationStatus.CALL_COMPLETE_DTMF_TIMEOUT); - assertTrue("Enum value list does not match enum class list", - enumValueList.containsAll(enumTestList) && enumTestList.containsAll(enumValueList)); - } + assertTrue("Enum value list does not match enum class list", + enumValueList.containsAll(enumTestList) && enumTestList.containsAll(enumValueList)); + } }
\ No newline at end of file diff --git a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/ElectronicParkBrakeStatusTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/ElectronicParkBrakeStatusTests.java index 10e89fe7f..1d775d710 100644 --- a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/ElectronicParkBrakeStatusTests.java +++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/ElectronicParkBrakeStatusTests.java @@ -13,70 +13,68 @@ import java.util.List; * {@link com.smartdevicelink.proxy.rpc.enums.ElectronicParkBrakeStatus} */ public class ElectronicParkBrakeStatusTests extends TestCase { - /** - * Verifies that the enum values are not null upon valid assignment. - */ - public void testValidEnums () { - String example = "CLOSED"; - ElectronicParkBrakeStatus enumClosed = ElectronicParkBrakeStatus.valueForString(example); - example = "TRANSITION"; - ElectronicParkBrakeStatus enumTransition = ElectronicParkBrakeStatus.valueForString(example); - example = "OPEN"; - ElectronicParkBrakeStatus enumOpen = ElectronicParkBrakeStatus.valueForString(example); - example = "DRIVE_ACTIVE"; - ElectronicParkBrakeStatus enumDriveActive = ElectronicParkBrakeStatus.valueForString(example); - example = "FAULT"; - ElectronicParkBrakeStatus enumFault = ElectronicParkBrakeStatus.valueForString(example); + /** + * Verifies that the enum values are not null upon valid assignment. + */ + public void testValidEnums() { + String example = "CLOSED"; + ElectronicParkBrakeStatus enumClosed = ElectronicParkBrakeStatus.valueForString(example); + example = "TRANSITION"; + ElectronicParkBrakeStatus enumTransition = ElectronicParkBrakeStatus.valueForString(example); + example = "OPEN"; + ElectronicParkBrakeStatus enumOpen = ElectronicParkBrakeStatus.valueForString(example); + example = "DRIVE_ACTIVE"; + ElectronicParkBrakeStatus enumDriveActive = ElectronicParkBrakeStatus.valueForString(example); + example = "FAULT"; + ElectronicParkBrakeStatus enumFault = ElectronicParkBrakeStatus.valueForString(example); - assertNotNull("CLOSED returned null", enumClosed); - assertNotNull("TRANSITION returned null", enumTransition); - assertNotNull("OPEN returned null", enumOpen); - assertNotNull("DRIVE_ACTIVE returned null", enumDriveActive); - assertNotNull("FAULT returned null", enumFault); - } + assertNotNull("CLOSED returned null", enumClosed); + assertNotNull("TRANSITION returned null", enumTransition); + assertNotNull("OPEN returned null", enumOpen); + assertNotNull("DRIVE_ACTIVE returned null", enumDriveActive); + assertNotNull("FAULT returned null", enumFault); + } - /** - * Verifies that an invalid assignment is null. - */ - public void testInvalidEnum () { - String example = "Clsoed"; - try { - ElectronicParkBrakeStatus temp = ElectronicParkBrakeStatus.valueForString(example); - assertNull("Result of valueForString should be null.", temp); - } - catch (IllegalArgumentException exception) { - fail("Invalid enum throws IllegalArgumentException."); - } - } + /** + * Verifies that an invalid assignment is null. + */ + public void testInvalidEnum() { + String example = "Clsoed"; + try { + ElectronicParkBrakeStatus temp = ElectronicParkBrakeStatus.valueForString(example); + assertNull("Result of valueForString should be null.", temp); + } catch (IllegalArgumentException exception) { + fail("Invalid enum throws IllegalArgumentException."); + } + } - /** - * Verifies that a null assignment is invalid. - */ - public void testNullEnum () { - String example = null; - try { - ElectronicParkBrakeStatus temp = ElectronicParkBrakeStatus.valueForString(example); - assertNull("Result of valueForString should be null.", temp); - } - catch (NullPointerException exception) { - fail("Null string throws NullPointerException."); - } - } + /** + * Verifies that a null assignment is invalid. + */ + public void testNullEnum() { + String example = null; + try { + ElectronicParkBrakeStatus temp = ElectronicParkBrakeStatus.valueForString(example); + assertNull("Result of valueForString should be null.", temp); + } catch (NullPointerException exception) { + fail("Null string throws NullPointerException."); + } + } - /** - * Verifies the possible enum values of Electronic Brake Status. - */ - public void testListEnum() { - List<ElectronicParkBrakeStatus> enumValueList = Arrays.asList(ElectronicParkBrakeStatus.values()); + /** + * Verifies the possible enum values of Electronic Brake Status. + */ + public void testListEnum() { + List<ElectronicParkBrakeStatus> enumValueList = Arrays.asList(ElectronicParkBrakeStatus.values()); - List<ElectronicParkBrakeStatus> enumTestList = new ArrayList<ElectronicParkBrakeStatus>(); - enumTestList.add(ElectronicParkBrakeStatus.CLOSED); - enumTestList.add(ElectronicParkBrakeStatus.TRANSITION); - enumTestList.add(ElectronicParkBrakeStatus.OPEN); - enumTestList.add(ElectronicParkBrakeStatus.DRIVE_ACTIVE); - enumTestList.add(ElectronicParkBrakeStatus.FAULT); + List<ElectronicParkBrakeStatus> enumTestList = new ArrayList<ElectronicParkBrakeStatus>(); + enumTestList.add(ElectronicParkBrakeStatus.CLOSED); + enumTestList.add(ElectronicParkBrakeStatus.TRANSITION); + enumTestList.add(ElectronicParkBrakeStatus.OPEN); + enumTestList.add(ElectronicParkBrakeStatus.DRIVE_ACTIVE); + enumTestList.add(ElectronicParkBrakeStatus.FAULT); - assertTrue("Enum value list does not match enum class list", - enumValueList.containsAll(enumTestList) && enumTestList.containsAll(enumValueList)); - } + assertTrue("Enum value list does not match enum class list", + enumValueList.containsAll(enumTestList) && enumTestList.containsAll(enumValueList)); + } } diff --git a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/EmergencyEventTypeTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/EmergencyEventTypeTests.java index 9931af71a..ae4e23e09 100644 --- a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/EmergencyEventTypeTests.java +++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/EmergencyEventTypeTests.java @@ -9,83 +9,81 @@ import java.util.Arrays; import java.util.List; /** - * This is a unit test class for the SmartDeviceLink library project class : + * This is a unit test class for the SmartDeviceLink library project class : * {@link com.smartdevicelink.proxy.rpc.enums.EmergencyEventType} */ public class EmergencyEventTypeTests extends TestCase { - /** - * Verifies that the enum values are not null upon valid assignment. - */ - public void testValidEnums () { - String example = "NO_EVENT"; - EmergencyEventType enumEventType = EmergencyEventType.valueForString(example); - example = "FRONTAL"; - EmergencyEventType enumFrontal = EmergencyEventType.valueForString(example); - example = "SIDE"; - EmergencyEventType enumSide = EmergencyEventType.valueForString(example); - example = "REAR"; - EmergencyEventType enumRear = EmergencyEventType.valueForString(example); - example = "ROLLOVER"; - EmergencyEventType enumRollover = EmergencyEventType.valueForString(example); - example = "NOT_SUPPORTED"; - EmergencyEventType enumNotSupported = EmergencyEventType.valueForString(example); - example = "FAULT"; - EmergencyEventType enumFault = EmergencyEventType.valueForString(example); - - assertNotNull("NO_EVENT returned null", enumEventType); - assertNotNull("FRONTAL returned null", enumFrontal); - assertNotNull("SIDE returned null", enumSide); - assertNotNull("REAR returned null", enumRear); - assertNotNull("ROLLOVER returned null", enumRollover); - assertNotNull("NOT_SUPPORTED returned null", enumNotSupported); - assertNotNull("FAULT returned null", enumFault); - } + /** + * Verifies that the enum values are not null upon valid assignment. + */ + public void testValidEnums() { + String example = "NO_EVENT"; + EmergencyEventType enumEventType = EmergencyEventType.valueForString(example); + example = "FRONTAL"; + EmergencyEventType enumFrontal = EmergencyEventType.valueForString(example); + example = "SIDE"; + EmergencyEventType enumSide = EmergencyEventType.valueForString(example); + example = "REAR"; + EmergencyEventType enumRear = EmergencyEventType.valueForString(example); + example = "ROLLOVER"; + EmergencyEventType enumRollover = EmergencyEventType.valueForString(example); + example = "NOT_SUPPORTED"; + EmergencyEventType enumNotSupported = EmergencyEventType.valueForString(example); + example = "FAULT"; + EmergencyEventType enumFault = EmergencyEventType.valueForString(example); - /** - * Verifies that an invalid assignment is null. - */ - public void testInvalidEnum () { - String example = "nO_EvenT"; - try { - EmergencyEventType temp = EmergencyEventType.valueForString(example); + assertNotNull("NO_EVENT returned null", enumEventType); + assertNotNull("FRONTAL returned null", enumFrontal); + assertNotNull("SIDE returned null", enumSide); + assertNotNull("REAR returned null", enumRear); + assertNotNull("ROLLOVER returned null", enumRollover); + assertNotNull("NOT_SUPPORTED returned null", enumNotSupported); + assertNotNull("FAULT returned null", enumFault); + } + + /** + * Verifies that an invalid assignment is null. + */ + public void testInvalidEnum() { + String example = "nO_EvenT"; + try { + EmergencyEventType temp = EmergencyEventType.valueForString(example); assertNull("Result of valueForString should be null.", temp); - } - catch (IllegalArgumentException exception) { + } catch (IllegalArgumentException exception) { fail("Invalid enum throws IllegalArgumentException."); - } - } + } + } - /** - * Verifies that a null assignment is invalid. - */ - public void testNullEnum () { - String example = null; - try { - EmergencyEventType temp = EmergencyEventType.valueForString(example); + /** + * Verifies that a null assignment is invalid. + */ + public void testNullEnum() { + String example = null; + try { + EmergencyEventType temp = EmergencyEventType.valueForString(example); assertNull("Result of valueForString should be null.", temp); - } - catch (NullPointerException exception) { + } catch (NullPointerException exception) { fail("Null string throws NullPointerException."); - } - } + } + } - /** - * Verifies the possible enum values of EmergencyEvent. - */ - public void testListEnum() { - List<EmergencyEventType> enumValueList = Arrays.asList(EmergencyEventType.values()); + /** + * Verifies the possible enum values of EmergencyEvent. + */ + public void testListEnum() { + List<EmergencyEventType> enumValueList = Arrays.asList(EmergencyEventType.values()); - List<EmergencyEventType> enumTestList = new ArrayList<EmergencyEventType>(); - enumTestList.add(EmergencyEventType.NO_EVENT); - enumTestList.add(EmergencyEventType.FRONTAL); - enumTestList.add(EmergencyEventType.SIDE); - enumTestList.add(EmergencyEventType.REAR); - enumTestList.add(EmergencyEventType.ROLLOVER); - enumTestList.add(EmergencyEventType.NOT_SUPPORTED); - enumTestList.add(EmergencyEventType.FAULT); + List<EmergencyEventType> enumTestList = new ArrayList<EmergencyEventType>(); + enumTestList.add(EmergencyEventType.NO_EVENT); + enumTestList.add(EmergencyEventType.FRONTAL); + enumTestList.add(EmergencyEventType.SIDE); + enumTestList.add(EmergencyEventType.REAR); + enumTestList.add(EmergencyEventType.ROLLOVER); + enumTestList.add(EmergencyEventType.NOT_SUPPORTED); + enumTestList.add(EmergencyEventType.FAULT); - assertTrue("Enum value list does not match enum class list", - enumValueList.containsAll(enumTestList) && enumTestList.containsAll(enumValueList)); - } + assertTrue("Enum value list does not match enum class list", + enumValueList.containsAll(enumTestList) && enumTestList.containsAll(enumValueList)); + } }
\ No newline at end of file diff --git a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/FileTypeTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/FileTypeTests.java index d63e232dd..ea728c07a 100644 --- a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/FileTypeTests.java +++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/FileTypeTests.java @@ -9,87 +9,85 @@ import java.util.Arrays; import java.util.List; /** - * This is a unit test class for the SmartDeviceLink library project class : + * This is a unit test class for the SmartDeviceLink library project class : * {@link com.smartdevicelink.proxy.rpc.enums.FileType} */ public class FileTypeTests extends TestCase { - /** - * Verifies that the enum values are not null upon valid assignment. - */ - public void testValidEnums () { - String example = "GRAPHIC_BMP"; - FileType enumGraphicBmp = FileType.valueForString(example); - example = "GRAPHIC_JPEG"; - FileType enumGraphicJpeg = FileType.valueForString(example); - example = "GRAPHIC_PNG"; - FileType enumGraphicPng = FileType.valueForString(example); - example = "AUDIO_WAVE"; - FileType enumAudioWave = FileType.valueForString(example); - example = "AUDIO_AAC"; - FileType enumAudioAac = FileType.valueForString(example); - example = "AUDIO_MP3"; - FileType enumAudioMp3 = FileType.valueForString(example); - example = "BINARY"; - FileType enumBinary = FileType.valueForString(example); - example = "JSON"; - FileType enumJson = FileType.valueForString(example); - - assertNotNull("GRAPHIC_BMP returned null", enumGraphicBmp); - assertNotNull("GRAPHIC_JPEG returned null", enumGraphicJpeg); - assertNotNull("GRAPHIC_PNG returned null", enumGraphicPng); - assertNotNull("AUDIO_WAVE returned null", enumAudioWave); - assertNotNull("AUDIO_AAC returned null", enumAudioAac); - assertNotNull("AUDIO_MP3 returned null", enumAudioMp3); - assertNotNull("BINARY returned null", enumBinary); - assertNotNull("JSON returned null", enumJson); - } + /** + * Verifies that the enum values are not null upon valid assignment. + */ + public void testValidEnums() { + String example = "GRAPHIC_BMP"; + FileType enumGraphicBmp = FileType.valueForString(example); + example = "GRAPHIC_JPEG"; + FileType enumGraphicJpeg = FileType.valueForString(example); + example = "GRAPHIC_PNG"; + FileType enumGraphicPng = FileType.valueForString(example); + example = "AUDIO_WAVE"; + FileType enumAudioWave = FileType.valueForString(example); + example = "AUDIO_AAC"; + FileType enumAudioAac = FileType.valueForString(example); + example = "AUDIO_MP3"; + FileType enumAudioMp3 = FileType.valueForString(example); + example = "BINARY"; + FileType enumBinary = FileType.valueForString(example); + example = "JSON"; + FileType enumJson = FileType.valueForString(example); - /** - * Verifies that an invalid assignment is null. - */ - public void testInvalidEnum () { - String example = "uSer_ExiT"; - try { - FileType temp = FileType.valueForString(example); + assertNotNull("GRAPHIC_BMP returned null", enumGraphicBmp); + assertNotNull("GRAPHIC_JPEG returned null", enumGraphicJpeg); + assertNotNull("GRAPHIC_PNG returned null", enumGraphicPng); + assertNotNull("AUDIO_WAVE returned null", enumAudioWave); + assertNotNull("AUDIO_AAC returned null", enumAudioAac); + assertNotNull("AUDIO_MP3 returned null", enumAudioMp3); + assertNotNull("BINARY returned null", enumBinary); + assertNotNull("JSON returned null", enumJson); + } + + /** + * Verifies that an invalid assignment is null. + */ + public void testInvalidEnum() { + String example = "uSer_ExiT"; + try { + FileType temp = FileType.valueForString(example); assertNull("Result of valueForString should be null.", temp); - } - catch (IllegalArgumentException exception) { + } catch (IllegalArgumentException exception) { fail("Invalid enum throws IllegalArgumentException."); - } - } + } + } - /** - * Verifies that a null assignment is invalid. - */ - public void testNullEnum () { - String example = null; - try { - FileType temp = FileType.valueForString(example); + /** + * Verifies that a null assignment is invalid. + */ + public void testNullEnum() { + String example = null; + try { + FileType temp = FileType.valueForString(example); assertNull("Result of valueForString should be null.", temp); - } - catch (NullPointerException exception) { + } catch (NullPointerException exception) { fail("Null string throws NullPointerException."); - } - } - - /** - * Verifies the possible enum values of FileType. - */ - public void testListEnum() { - List<FileType> enumValueList = Arrays.asList(FileType.values()); + } + } + + /** + * Verifies the possible enum values of FileType. + */ + public void testListEnum() { + List<FileType> enumValueList = Arrays.asList(FileType.values()); - List<FileType> enumTestList = new ArrayList<FileType>(); - enumTestList.add(FileType.GRAPHIC_BMP); - enumTestList.add(FileType.GRAPHIC_JPEG); - enumTestList.add(FileType.GRAPHIC_PNG); - enumTestList.add(FileType.AUDIO_WAVE); - enumTestList.add(FileType.AUDIO_AAC); - enumTestList.add(FileType.AUDIO_MP3); - enumTestList.add(FileType.BINARY); - enumTestList.add(FileType.JSON); + List<FileType> enumTestList = new ArrayList<FileType>(); + enumTestList.add(FileType.GRAPHIC_BMP); + enumTestList.add(FileType.GRAPHIC_JPEG); + enumTestList.add(FileType.GRAPHIC_PNG); + enumTestList.add(FileType.AUDIO_WAVE); + enumTestList.add(FileType.AUDIO_AAC); + enumTestList.add(FileType.AUDIO_MP3); + enumTestList.add(FileType.BINARY); + enumTestList.add(FileType.JSON); - assertTrue("Enum value list does not match enum class list", - enumValueList.containsAll(enumTestList) && enumTestList.containsAll(enumValueList)); - } + assertTrue("Enum value list does not match enum class list", + enumValueList.containsAll(enumTestList) && enumTestList.containsAll(enumValueList)); + } }
\ No newline at end of file diff --git a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/FuelCutoffStatusTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/FuelCutoffStatusTests.java index aad8c0922..749dbd683 100644 --- a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/FuelCutoffStatusTests.java +++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/FuelCutoffStatusTests.java @@ -9,67 +9,65 @@ import java.util.Arrays; import java.util.List; /** - * This is a unit test class for the SmartDeviceLink library project class : + * This is a unit test class for the SmartDeviceLink library project class : * {@link com.smartdevicelink.proxy.rpc.enums.FuelCutoffStatus} */ public class FuelCutoffStatusTests extends TestCase { - /** - * Verifies that the enum values are not null upon valid assignment. - */ - public void testValidEnums () { - String example = "TERMINATE_FUEL"; - FuelCutoffStatus enumTerminateFuel = FuelCutoffStatus.valueForString(example); - example = "NORMAL_OPERATION"; - FuelCutoffStatus enumNormalOperation = FuelCutoffStatus.valueForString(example); - example = "FAULT"; - FuelCutoffStatus enumFault = FuelCutoffStatus.valueForString(example); - - assertNotNull("TERMINATE_FUEL returned null", enumTerminateFuel); - assertNotNull("NORMAL_OPERATION returned null", enumNormalOperation); - assertNotNull("FAULT returned null", enumFault); - } + /** + * Verifies that the enum values are not null upon valid assignment. + */ + public void testValidEnums() { + String example = "TERMINATE_FUEL"; + FuelCutoffStatus enumTerminateFuel = FuelCutoffStatus.valueForString(example); + example = "NORMAL_OPERATION"; + FuelCutoffStatus enumNormalOperation = FuelCutoffStatus.valueForString(example); + example = "FAULT"; + FuelCutoffStatus enumFault = FuelCutoffStatus.valueForString(example); - /** - * Verifies that an invalid assignment is null. - */ - public void testInvalidEnum () { - String example = "tErmINAte_FueL"; - try { - FuelCutoffStatus temp = FuelCutoffStatus.valueForString(example); + assertNotNull("TERMINATE_FUEL returned null", enumTerminateFuel); + assertNotNull("NORMAL_OPERATION returned null", enumNormalOperation); + assertNotNull("FAULT returned null", enumFault); + } + + /** + * Verifies that an invalid assignment is null. + */ + public void testInvalidEnum() { + String example = "tErmINAte_FueL"; + try { + FuelCutoffStatus temp = FuelCutoffStatus.valueForString(example); assertNull("Result of valueForString should be null.", temp); - } - catch (IllegalArgumentException exception) { + } catch (IllegalArgumentException exception) { fail("Invalid enum throws IllegalArgumentException."); - } - } + } + } - /** - * Verifies that a null assignment is invalid. - */ - public void testNullEnum () { - String example = null; - try { - FuelCutoffStatus temp = FuelCutoffStatus.valueForString(example); + /** + * Verifies that a null assignment is invalid. + */ + public void testNullEnum() { + String example = null; + try { + FuelCutoffStatus temp = FuelCutoffStatus.valueForString(example); assertNull("Result of valueForString should be null.", temp); - } - catch (NullPointerException exception) { + } catch (NullPointerException exception) { fail("Null string throws NullPointerException."); - } - } + } + } - /** - * Verifies the possible enum values of FuelCutoffStatus. - */ - public void testListEnum() { - List<FuelCutoffStatus> enumValueList = Arrays.asList(FuelCutoffStatus.values()); + /** + * Verifies the possible enum values of FuelCutoffStatus. + */ + public void testListEnum() { + List<FuelCutoffStatus> enumValueList = Arrays.asList(FuelCutoffStatus.values()); - List<FuelCutoffStatus> enumTestList = new ArrayList<FuelCutoffStatus>(); - enumTestList.add(FuelCutoffStatus.TERMINATE_FUEL); - enumTestList.add(FuelCutoffStatus.NORMAL_OPERATION); - enumTestList.add(FuelCutoffStatus.FAULT); + List<FuelCutoffStatus> enumTestList = new ArrayList<FuelCutoffStatus>(); + enumTestList.add(FuelCutoffStatus.TERMINATE_FUEL); + enumTestList.add(FuelCutoffStatus.NORMAL_OPERATION); + enumTestList.add(FuelCutoffStatus.FAULT); - assertTrue("Enum value list does not match enum class list", - enumValueList.containsAll(enumTestList) && enumTestList.containsAll(enumValueList)); - } + assertTrue("Enum value list does not match enum class list", + enumValueList.containsAll(enumTestList) && enumTestList.containsAll(enumValueList)); + } }
\ No newline at end of file diff --git a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/FuelTypeTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/FuelTypeTests.java index 25c3e08d9..e6f714e26 100644 --- a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/FuelTypeTests.java +++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/FuelTypeTests.java @@ -9,79 +9,77 @@ import java.util.Arrays; import java.util.List; /** - * This is a unit test class for the SmartDeviceLink library project class : + * This is a unit test class for the SmartDeviceLink library project class : * {@link com.smartdevicelink.proxy.rpc.enums.FuelType} */ public class FuelTypeTests extends TestCase { - /** - * Verifies that the enum values are not null upon valid assignment. - */ - public void testValidEnums () { - String example = "GASOLINE"; - FuelType enumGasoline = FuelType.valueForString(example); - example = "DIESEL"; - FuelType enumDiesel = FuelType.valueForString(example); - example = "CNG"; - FuelType enumCng = FuelType.valueForString(example); - example = "LPG"; - FuelType enumLpg = FuelType.valueForString(example); - example = "HYDROGEN"; - FuelType enumHydrogen = FuelType.valueForString(example); - example = "BATTERY"; - FuelType enumBattery = FuelType.valueForString(example); + /** + * Verifies that the enum values are not null upon valid assignment. + */ + public void testValidEnums() { + String example = "GASOLINE"; + FuelType enumGasoline = FuelType.valueForString(example); + example = "DIESEL"; + FuelType enumDiesel = FuelType.valueForString(example); + example = "CNG"; + FuelType enumCng = FuelType.valueForString(example); + example = "LPG"; + FuelType enumLpg = FuelType.valueForString(example); + example = "HYDROGEN"; + FuelType enumHydrogen = FuelType.valueForString(example); + example = "BATTERY"; + FuelType enumBattery = FuelType.valueForString(example); - assertNotNull("GASOLINE returned null", enumGasoline); - assertNotNull("DIESEL returned null", enumDiesel); - assertNotNull("CNG returned null", enumCng); - assertNotNull("LPG returned null", enumLpg); - assertNotNull("HYDROGEN returned null", enumHydrogen); - assertNotNull("BATTERY returned null", enumBattery); - } + assertNotNull("GASOLINE returned null", enumGasoline); + assertNotNull("DIESEL returned null", enumDiesel); + assertNotNull("CNG returned null", enumCng); + assertNotNull("LPG returned null", enumLpg); + assertNotNull("HYDROGEN returned null", enumHydrogen); + assertNotNull("BATTERY returned null", enumBattery); + } - /** - * Verifies that an invalid assignment is null. - */ - public void testInvalidEnum () { - String example = "gASOLINE"; - try { - FuelType temp = FuelType.valueForString(example); + /** + * Verifies that an invalid assignment is null. + */ + public void testInvalidEnum() { + String example = "gASOLINE"; + try { + FuelType temp = FuelType.valueForString(example); assertNull("Result of valueForString should be null.", temp); - } - catch (IllegalArgumentException exception) { + } catch (IllegalArgumentException exception) { fail("Invalid enum throws IllegalArgumentException."); - } - } + } + } - /** - * Verifies that a null assignment is invalid. - */ - public void testNullEnum () { - String example = null; - try { - FuelType temp = FuelType.valueForString(example); + /** + * Verifies that a null assignment is invalid. + */ + public void testNullEnum() { + String example = null; + try { + FuelType temp = FuelType.valueForString(example); assertNull("Result of valueForString should be null.", temp); - } - catch (NullPointerException exception) { + } catch (NullPointerException exception) { fail("Null string throws NullPointerException."); - } - } + } + } - /** - * Verifies the possible enum values of FuelType. - */ - public void testListEnum() { - List<FuelType> enumValueList = Arrays.asList(FuelType.values()); + /** + * Verifies the possible enum values of FuelType. + */ + public void testListEnum() { + List<FuelType> enumValueList = Arrays.asList(FuelType.values()); - List<FuelType> enumTestList = new ArrayList<FuelType>(); - enumTestList.add(FuelType.GASOLINE); - enumTestList.add(FuelType.DIESEL); - enumTestList.add(FuelType.CNG); - enumTestList.add(FuelType.LPG); - enumTestList.add(FuelType.HYDROGEN); - enumTestList.add(FuelType.BATTERY); + List<FuelType> enumTestList = new ArrayList<FuelType>(); + enumTestList.add(FuelType.GASOLINE); + enumTestList.add(FuelType.DIESEL); + enumTestList.add(FuelType.CNG); + enumTestList.add(FuelType.LPG); + enumTestList.add(FuelType.HYDROGEN); + enumTestList.add(FuelType.BATTERY); - assertTrue("Enum value list does not match enum class list", - enumValueList.containsAll(enumTestList) && enumTestList.containsAll(enumValueList)); - } + assertTrue("Enum value list does not match enum class list", + enumValueList.containsAll(enumTestList) && enumTestList.containsAll(enumValueList)); + } }
\ No newline at end of file diff --git a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/GlobalPropertyTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/GlobalPropertyTests.java index 37a20f61d..e05b364c9 100644 --- a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/GlobalPropertyTests.java +++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/GlobalPropertyTests.java @@ -9,87 +9,85 @@ import java.util.Arrays; import java.util.List; /** - * This is a unit test class for the SmartDeviceLink library project class : + * This is a unit test class for the SmartDeviceLink library project class : * {@link com.smartdevicelink.proxy.rpc.enums.GlobalProperty} */ public class GlobalPropertyTests extends TestCase { - /** - * Verifies that the enum values are not null upon valid assignment. - */ - public void testValidEnums () { - String example = "HELPPROMPT"; - GlobalProperty enumHelpPrompt = GlobalProperty.valueForString(example); - example = "TIMEOUTPROMPT"; - GlobalProperty enumTimeoutPrompt = GlobalProperty.valueForString(example); - example = "VRHELPTITLE"; - GlobalProperty enumVrHelpTitle = GlobalProperty.valueForString(example); - example = "VRHELPITEMS"; - GlobalProperty enumVrHelpItems = GlobalProperty.valueForString(example); - example = "MENUNAME"; - GlobalProperty enumMenuName = GlobalProperty.valueForString(example); - example = "MENUICON"; - GlobalProperty enumMenuIcon = GlobalProperty.valueForString(example); - example = "KEYBOARDPROPERTIES"; - GlobalProperty enumKeyboardProperties = GlobalProperty.valueForString(example); - example = "USERLOCATION"; - GlobalProperty enumUserLocation = GlobalProperty.valueForString(example); - - assertNotNull("HELPPROMPT returned null", enumHelpPrompt); - assertNotNull("TIMEOUTPROMPT returned null", enumTimeoutPrompt); - assertNotNull("VRHELPTITLE returned null", enumVrHelpTitle); - assertNotNull("VRHELPITEMS returned null", enumVrHelpItems); - assertNotNull("MENUNAME returned null", enumMenuName); - assertNotNull("MENUICON returned null", enumMenuIcon); - assertNotNull("KEYBOARDPROPERTIES returned null", enumKeyboardProperties); - assertNotNull("USERLOCATION returned null", enumUserLocation); - } + /** + * Verifies that the enum values are not null upon valid assignment. + */ + public void testValidEnums() { + String example = "HELPPROMPT"; + GlobalProperty enumHelpPrompt = GlobalProperty.valueForString(example); + example = "TIMEOUTPROMPT"; + GlobalProperty enumTimeoutPrompt = GlobalProperty.valueForString(example); + example = "VRHELPTITLE"; + GlobalProperty enumVrHelpTitle = GlobalProperty.valueForString(example); + example = "VRHELPITEMS"; + GlobalProperty enumVrHelpItems = GlobalProperty.valueForString(example); + example = "MENUNAME"; + GlobalProperty enumMenuName = GlobalProperty.valueForString(example); + example = "MENUICON"; + GlobalProperty enumMenuIcon = GlobalProperty.valueForString(example); + example = "KEYBOARDPROPERTIES"; + GlobalProperty enumKeyboardProperties = GlobalProperty.valueForString(example); + example = "USERLOCATION"; + GlobalProperty enumUserLocation = GlobalProperty.valueForString(example); - /** - * Verifies that an invalid assignment is null. - */ - public void testInvalidEnum () { - String example = "heLp_ProMPt"; - try { - GlobalProperty temp = GlobalProperty.valueForString(example); + assertNotNull("HELPPROMPT returned null", enumHelpPrompt); + assertNotNull("TIMEOUTPROMPT returned null", enumTimeoutPrompt); + assertNotNull("VRHELPTITLE returned null", enumVrHelpTitle); + assertNotNull("VRHELPITEMS returned null", enumVrHelpItems); + assertNotNull("MENUNAME returned null", enumMenuName); + assertNotNull("MENUICON returned null", enumMenuIcon); + assertNotNull("KEYBOARDPROPERTIES returned null", enumKeyboardProperties); + assertNotNull("USERLOCATION returned null", enumUserLocation); + } + + /** + * Verifies that an invalid assignment is null. + */ + public void testInvalidEnum() { + String example = "heLp_ProMPt"; + try { + GlobalProperty temp = GlobalProperty.valueForString(example); assertNull("Result of valueForString should be null.", temp); - } - catch (IllegalArgumentException exception) { + } catch (IllegalArgumentException exception) { fail("Invalid enum throws IllegalArgumentException."); - } - } + } + } - /** - * Verifies that a null assignment is invalid. - */ - public void testNullEnum () { - String example = null; - try { - GlobalProperty temp = GlobalProperty.valueForString(example); + /** + * Verifies that a null assignment is invalid. + */ + public void testNullEnum() { + String example = null; + try { + GlobalProperty temp = GlobalProperty.valueForString(example); assertNull("Result of valueForString should be null.", temp); - } - catch (NullPointerException exception) { + } catch (NullPointerException exception) { fail("Null string throws NullPointerException."); - } - } + } + } - /** - * Verifies the possible enum values of GlobalProperty. - */ - public void testListEnum() { - List<GlobalProperty> enumValueList = Arrays.asList(GlobalProperty.values()); + /** + * Verifies the possible enum values of GlobalProperty. + */ + public void testListEnum() { + List<GlobalProperty> enumValueList = Arrays.asList(GlobalProperty.values()); - List<GlobalProperty> enumTestList = new ArrayList<GlobalProperty>(); - enumTestList.add(GlobalProperty.HELPPROMPT); - enumTestList.add(GlobalProperty.TIMEOUTPROMPT); - enumTestList.add(GlobalProperty.VRHELPTITLE); - enumTestList.add(GlobalProperty.VRHELPITEMS); - enumTestList.add(GlobalProperty.MENUNAME); - enumTestList.add(GlobalProperty.MENUICON); - enumTestList.add(GlobalProperty.KEYBOARDPROPERTIES); - enumTestList.add(GlobalProperty.USERLOCATION); + List<GlobalProperty> enumTestList = new ArrayList<GlobalProperty>(); + enumTestList.add(GlobalProperty.HELPPROMPT); + enumTestList.add(GlobalProperty.TIMEOUTPROMPT); + enumTestList.add(GlobalProperty.VRHELPTITLE); + enumTestList.add(GlobalProperty.VRHELPITEMS); + enumTestList.add(GlobalProperty.MENUNAME); + enumTestList.add(GlobalProperty.MENUICON); + enumTestList.add(GlobalProperty.KEYBOARDPROPERTIES); + enumTestList.add(GlobalProperty.USERLOCATION); - assertTrue("Enum value list does not match enum class list", - enumValueList.containsAll(enumTestList) && enumTestList.containsAll(enumValueList)); - } + assertTrue("Enum value list does not match enum class list", + enumValueList.containsAll(enumTestList) && enumTestList.containsAll(enumValueList)); + } }
\ No newline at end of file diff --git a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/HmiLevelTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/HmiLevelTests.java index 9f280bd8c..a33e4c226 100644 --- a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/HmiLevelTests.java +++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/HmiLevelTests.java @@ -9,71 +9,69 @@ import java.util.Arrays; import java.util.List; /** - * This is a unit test class for the SmartDeviceLink library project class : + * This is a unit test class for the SmartDeviceLink library project class : * {@link com.smartdevicelink.proxy.rpc.enums.HMILevel} */ public class HmiLevelTests extends TestCase { - /** - * Verifies that the enum values are not null upon valid assignment. - */ - public void testValidEnums () { - String example = "FULL"; - HMILevel enumFull = HMILevel.valueForString(example); - example = "LIMITED"; - HMILevel enumLimited = HMILevel.valueForString(example); - example = "BACKGROUND"; - HMILevel enumBackground = HMILevel.valueForString(example); - example = "NONE"; - HMILevel enumNone = HMILevel.valueForString(example); - - assertNotNull("FULL returned null", enumFull); - assertNotNull("LIMITED returned null", enumLimited); - assertNotNull("BACKGROUND returned null", enumBackground); - assertNotNull("NONE returned null", enumNone); - } + /** + * Verifies that the enum values are not null upon valid assignment. + */ + public void testValidEnums() { + String example = "FULL"; + HMILevel enumFull = HMILevel.valueForString(example); + example = "LIMITED"; + HMILevel enumLimited = HMILevel.valueForString(example); + example = "BACKGROUND"; + HMILevel enumBackground = HMILevel.valueForString(example); + example = "NONE"; + HMILevel enumNone = HMILevel.valueForString(example); - /** - * Verifies that an invalid assignment is null. - */ - public void testInvalidEnum () { - String example = "fUlL"; - try { - HMILevel temp = HMILevel.valueForString(example); + assertNotNull("FULL returned null", enumFull); + assertNotNull("LIMITED returned null", enumLimited); + assertNotNull("BACKGROUND returned null", enumBackground); + assertNotNull("NONE returned null", enumNone); + } + + /** + * Verifies that an invalid assignment is null. + */ + public void testInvalidEnum() { + String example = "fUlL"; + try { + HMILevel temp = HMILevel.valueForString(example); assertNull("Result of valueForString should be null.", temp); - } - catch (IllegalArgumentException exception) { + } catch (IllegalArgumentException exception) { fail("Invalid enum throws IllegalArgumentException."); - } - } + } + } - /** - * Verifies that a null assignment is invalid. - */ - public void testNullEnum () { - String example = null; - try { - HMILevel temp = HMILevel.valueForString(example); + /** + * Verifies that a null assignment is invalid. + */ + public void testNullEnum() { + String example = null; + try { + HMILevel temp = HMILevel.valueForString(example); assertNull("Result of valueForString should be null.", temp); - } - catch (NullPointerException exception) { + } catch (NullPointerException exception) { fail("Null string throws NullPointerException."); - } - } + } + } + + /** + * Verifies the possible enum values of HMILevel. + */ + public void testListEnum() { + List<HMILevel> enumValueList = Arrays.asList(HMILevel.values()); - /** - * Verifies the possible enum values of HMILevel. - */ - public void testListEnum() { - List<HMILevel> enumValueList = Arrays.asList(HMILevel.values()); + List<HMILevel> enumTestList = new ArrayList<HMILevel>(); + enumTestList.add(HMILevel.HMI_FULL); + enumTestList.add(HMILevel.HMI_LIMITED); + enumTestList.add(HMILevel.HMI_BACKGROUND); + enumTestList.add(HMILevel.HMI_NONE); - List<HMILevel> enumTestList = new ArrayList<HMILevel>(); - enumTestList.add(HMILevel.HMI_FULL); - enumTestList.add(HMILevel.HMI_LIMITED); - enumTestList.add(HMILevel.HMI_BACKGROUND); - enumTestList.add(HMILevel.HMI_NONE); - - assertTrue("Enum value list does not match enum class list", - enumValueList.containsAll(enumTestList) && enumTestList.containsAll(enumValueList)); - } + assertTrue("Enum value list does not match enum class list", + enumValueList.containsAll(enumTestList) && enumTestList.containsAll(enumValueList)); + } }
\ No newline at end of file diff --git a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/HmiZoneCapabilitiesTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/HmiZoneCapabilitiesTests.java index 4ff2b1abd..a9a27d3b4 100644 --- a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/HmiZoneCapabilitiesTests.java +++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/HmiZoneCapabilitiesTests.java @@ -9,63 +9,61 @@ import java.util.Arrays; import java.util.List; /** - * This is a unit test class for the SmartDeviceLink library project class : + * This is a unit test class for the SmartDeviceLink library project class : * {@link com.smartdevicelink.proxy.rpc.enums.HmiZoneCapabilities} */ public class HmiZoneCapabilitiesTests extends TestCase { - /** - * Verifies that the enum values are not null upon valid assignment. - */ - public void testValidEnums () { - String example = "FRONT"; - HmiZoneCapabilities enumFront = HmiZoneCapabilities.valueForString(example); - example = "BACK"; - HmiZoneCapabilities enumBack = HmiZoneCapabilities.valueForString(example); - - assertNotNull("FRONT returned null", enumFront); - assertNotNull("BACK returned null", enumBack); - } + /** + * Verifies that the enum values are not null upon valid assignment. + */ + public void testValidEnums() { + String example = "FRONT"; + HmiZoneCapabilities enumFront = HmiZoneCapabilities.valueForString(example); + example = "BACK"; + HmiZoneCapabilities enumBack = HmiZoneCapabilities.valueForString(example); - /** - * Verifies that an invalid assignment is null. - */ - public void testInvalidEnum () { - String example = "fROnT"; - try { - HmiZoneCapabilities temp = HmiZoneCapabilities.valueForString(example); + assertNotNull("FRONT returned null", enumFront); + assertNotNull("BACK returned null", enumBack); + } + + /** + * Verifies that an invalid assignment is null. + */ + public void testInvalidEnum() { + String example = "fROnT"; + try { + HmiZoneCapabilities temp = HmiZoneCapabilities.valueForString(example); assertNull("Result of valueForString should be null.", temp); - } - catch (IllegalArgumentException exception) { + } catch (IllegalArgumentException exception) { fail("Invalid enum throws IllegalArgumentException."); - } - } + } + } - /** - * Verifies that a null assignment is invalid. - */ - public void testNullEnum () { - String example = null; - try { - HmiZoneCapabilities temp = HmiZoneCapabilities.valueForString(example); + /** + * Verifies that a null assignment is invalid. + */ + public void testNullEnum() { + String example = null; + try { + HmiZoneCapabilities temp = HmiZoneCapabilities.valueForString(example); assertNull("Result of valueForString should be null.", temp); - } - catch (NullPointerException exception) { + } catch (NullPointerException exception) { fail("Null string throws NullPointerException."); - } - } - - /** - * Verifies the possible enum values of HmiZoneCapabilities. - */ - public void testListEnum() { - List<HmiZoneCapabilities> enumValueList = Arrays.asList(HmiZoneCapabilities.values()); + } + } + + /** + * Verifies the possible enum values of HmiZoneCapabilities. + */ + public void testListEnum() { + List<HmiZoneCapabilities> enumValueList = Arrays.asList(HmiZoneCapabilities.values()); - List<HmiZoneCapabilities> enumTestList = new ArrayList<HmiZoneCapabilities>(); - enumTestList.add(HmiZoneCapabilities.FRONT); - enumTestList.add(HmiZoneCapabilities.BACK); + List<HmiZoneCapabilities> enumTestList = new ArrayList<HmiZoneCapabilities>(); + enumTestList.add(HmiZoneCapabilities.FRONT); + enumTestList.add(HmiZoneCapabilities.BACK); - assertTrue("Enum value list does not match enum class list", - enumValueList.containsAll(enumTestList) && enumTestList.containsAll(enumValueList)); - } + assertTrue("Enum value list does not match enum class list", + enumValueList.containsAll(enumTestList) && enumTestList.containsAll(enumValueList)); + } }
\ No newline at end of file diff --git a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/HybridAppPreferenceTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/HybridAppPreferenceTests.java index 5c601fe20..0d53a2ace 100644 --- a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/HybridAppPreferenceTests.java +++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/HybridAppPreferenceTests.java @@ -14,62 +14,60 @@ import java.util.List; */ public class HybridAppPreferenceTests extends TestCase { - /** - * Verifies that the enum values are not null upon valid assignment. - */ - public void testValidEnums () { - String example = "MOBILE"; - HybridAppPreference enumMobile = HybridAppPreference.valueForString(example); - example = "CLOUD"; - HybridAppPreference enumCloud = HybridAppPreference.valueForString(example); - example = "BOTH"; - HybridAppPreference enumBoth = HybridAppPreference.valueForString(example); + /** + * Verifies that the enum values are not null upon valid assignment. + */ + public void testValidEnums() { + String example = "MOBILE"; + HybridAppPreference enumMobile = HybridAppPreference.valueForString(example); + example = "CLOUD"; + HybridAppPreference enumCloud = HybridAppPreference.valueForString(example); + example = "BOTH"; + HybridAppPreference enumBoth = HybridAppPreference.valueForString(example); - assertNotNull("MOBILE returned null", enumMobile); - assertNotNull("CLOUD returned null", enumCloud); - assertNotNull("BOTH returned null", enumBoth); - } + assertNotNull("MOBILE returned null", enumMobile); + assertNotNull("CLOUD returned null", enumCloud); + assertNotNull("BOTH returned null", enumBoth); + } - /** - * Verifies that an invalid assignment is null. - */ - public void testInvalidEnum () { - String example = "deFaUlt"; - try { - HybridAppPreference temp = HybridAppPreference.valueForString(example); - assertNull("Result of valueForString should be null.", temp); - } - catch (IllegalArgumentException exception) { - fail("Invalid enum throws IllegalArgumentException."); - } - } + /** + * Verifies that an invalid assignment is null. + */ + public void testInvalidEnum() { + String example = "deFaUlt"; + try { + HybridAppPreference temp = HybridAppPreference.valueForString(example); + assertNull("Result of valueForString should be null.", temp); + } catch (IllegalArgumentException exception) { + fail("Invalid enum throws IllegalArgumentException."); + } + } - /** - * Verifies that a null assignment is invalid. - */ - public void testNullEnum () { - String example = null; - try { - HybridAppPreference temp = HybridAppPreference.valueForString(example); - assertNull("Result of valueForString should be null.", temp); - } - catch (NullPointerException exception) { - fail("Null string throws NullPointerException."); - } - } + /** + * Verifies that a null assignment is invalid. + */ + public void testNullEnum() { + String example = null; + try { + HybridAppPreference temp = HybridAppPreference.valueForString(example); + assertNull("Result of valueForString should be null.", temp); + } catch (NullPointerException exception) { + fail("Null string throws NullPointerException."); + } + } - /** - * Verifies the possible enum values of HybridAppPreference. - */ - public void testListEnum() { - List<HybridAppPreference> enumValueList = Arrays.asList(HybridAppPreference.values()); + /** + * Verifies the possible enum values of HybridAppPreference. + */ + public void testListEnum() { + List<HybridAppPreference> enumValueList = Arrays.asList(HybridAppPreference.values()); - List<HybridAppPreference> enumTestList = new ArrayList<>(); - enumTestList.add(HybridAppPreference.MOBILE); - enumTestList.add(HybridAppPreference.CLOUD); - enumTestList.add(HybridAppPreference.BOTH); + List<HybridAppPreference> enumTestList = new ArrayList<>(); + enumTestList.add(HybridAppPreference.MOBILE); + enumTestList.add(HybridAppPreference.CLOUD); + enumTestList.add(HybridAppPreference.BOTH); - assertTrue("Enum value list does not match enum class list", - enumValueList.containsAll(enumTestList) && enumTestList.containsAll(enumValueList)); - } + assertTrue("Enum value list does not match enum class list", + enumValueList.containsAll(enumTestList) && enumTestList.containsAll(enumValueList)); + } }
\ No newline at end of file diff --git a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/IgnitionStableStatusTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/IgnitionStableStatusTests.java index fdddae144..43de5fd8c 100644 --- a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/IgnitionStableStatusTests.java +++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/IgnitionStableStatusTests.java @@ -9,67 +9,65 @@ import java.util.Arrays; import java.util.List; /** - * This is a unit test class for the SmartDeviceLink library project class : + * This is a unit test class for the SmartDeviceLink library project class : * {@link com.smartdevicelink.proxy.rpc.enums.IgnitionStableStatus} */ public class IgnitionStableStatusTests extends TestCase { - /** - * Verifies that the enum values are not null upon valid assignment. - */ - public void testValidEnums () { - String example = "IGNITION_SWITCH_NOT_STABLE"; - IgnitionStableStatus enumIgnitionSwitchNotStable = IgnitionStableStatus.valueForString(example); - example = "IGNITION_SWITCH_STABLE"; - IgnitionStableStatus enumIgnitionSwitchStable = IgnitionStableStatus.valueForString(example); - example = "MISSING_FROM_TRANSMITTER"; - IgnitionStableStatus enumMissingFromTransmitter = IgnitionStableStatus.valueForString(example); - - assertNotNull("IGNITION_SWITCH_NOT_STABLE returned null", enumIgnitionSwitchNotStable); - assertNotNull("IGNITION_SWITCH_STABLE returned null", enumIgnitionSwitchStable); - assertNotNull("MISSING_FROM_TRANSMITTER returned null", enumMissingFromTransmitter); - } + /** + * Verifies that the enum values are not null upon valid assignment. + */ + public void testValidEnums() { + String example = "IGNITION_SWITCH_NOT_STABLE"; + IgnitionStableStatus enumIgnitionSwitchNotStable = IgnitionStableStatus.valueForString(example); + example = "IGNITION_SWITCH_STABLE"; + IgnitionStableStatus enumIgnitionSwitchStable = IgnitionStableStatus.valueForString(example); + example = "MISSING_FROM_TRANSMITTER"; + IgnitionStableStatus enumMissingFromTransmitter = IgnitionStableStatus.valueForString(example); - /** - * Verifies that an invalid assignment is null. - */ - public void testInvalidEnum () { - String example = "iGnitIoN_SwiTch_NoT_StablE"; - try { - IgnitionStableStatus temp = IgnitionStableStatus.valueForString(example); + assertNotNull("IGNITION_SWITCH_NOT_STABLE returned null", enumIgnitionSwitchNotStable); + assertNotNull("IGNITION_SWITCH_STABLE returned null", enumIgnitionSwitchStable); + assertNotNull("MISSING_FROM_TRANSMITTER returned null", enumMissingFromTransmitter); + } + + /** + * Verifies that an invalid assignment is null. + */ + public void testInvalidEnum() { + String example = "iGnitIoN_SwiTch_NoT_StablE"; + try { + IgnitionStableStatus temp = IgnitionStableStatus.valueForString(example); assertNull("Result of valueForString should be null.", temp); - } - catch (IllegalArgumentException exception) { + } catch (IllegalArgumentException exception) { fail("Invalid enum throws IllegalArgumentException."); - } - } + } + } - /** - * Verifies that a null assignment is invalid. - */ - public void testNullEnum () { - String example = null; - try { - IgnitionStableStatus temp = IgnitionStableStatus.valueForString(example); + /** + * Verifies that a null assignment is invalid. + */ + public void testNullEnum() { + String example = null; + try { + IgnitionStableStatus temp = IgnitionStableStatus.valueForString(example); assertNull("Result of valueForString should be null.", temp); - } - catch (NullPointerException exception) { + } catch (NullPointerException exception) { fail("Null string throws NullPointerException."); - } - } + } + } - /** - * Verifies the possible enum values of IgnitionStableStatus. - */ - public void testListEnum() { - List<IgnitionStableStatus> enumValueList = Arrays.asList(IgnitionStableStatus.values()); + /** + * Verifies the possible enum values of IgnitionStableStatus. + */ + public void testListEnum() { + List<IgnitionStableStatus> enumValueList = Arrays.asList(IgnitionStableStatus.values()); - List<IgnitionStableStatus> enumTestList = new ArrayList<IgnitionStableStatus>(); - enumTestList.add(IgnitionStableStatus.IGNITION_SWITCH_NOT_STABLE); - enumTestList.add(IgnitionStableStatus.IGNITION_SWITCH_STABLE); - enumTestList.add(IgnitionStableStatus.MISSING_FROM_TRANSMITTER); + List<IgnitionStableStatus> enumTestList = new ArrayList<IgnitionStableStatus>(); + enumTestList.add(IgnitionStableStatus.IGNITION_SWITCH_NOT_STABLE); + enumTestList.add(IgnitionStableStatus.IGNITION_SWITCH_STABLE); + enumTestList.add(IgnitionStableStatus.MISSING_FROM_TRANSMITTER); - assertTrue("Enum value list does not match enum class list", - enumValueList.containsAll(enumTestList) && enumTestList.containsAll(enumValueList)); - } + assertTrue("Enum value list does not match enum class list", + enumValueList.containsAll(enumTestList) && enumTestList.containsAll(enumValueList)); + } }
\ No newline at end of file diff --git a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/IgnitionStatusTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/IgnitionStatusTests.java index e76ac75cc..ba9c56c45 100644 --- a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/IgnitionStatusTests.java +++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/IgnitionStatusTests.java @@ -9,79 +9,77 @@ import java.util.Arrays; import java.util.List; /** - * This is a unit test class for the SmartDeviceLink library project class : + * This is a unit test class for the SmartDeviceLink library project class : * {@link com.smartdevicelink.proxy.rpc.enums.IgnitionStatus} */ public class IgnitionStatusTests extends TestCase { - /** - * Verifies that the enum values are not null upon valid assignment. - */ - public void testValidEnums () { - String example = "UNKNOWN"; - IgnitionStatus enumUnknown = IgnitionStatus.valueForString(example); - example = "OFF"; - IgnitionStatus enumOff = IgnitionStatus.valueForString(example); - example = "ACCESSORY"; - IgnitionStatus enumAccessory = IgnitionStatus.valueForString(example); - example = "RUN"; - IgnitionStatus enumRun = IgnitionStatus.valueForString(example); - example = "START"; - IgnitionStatus enumStart = IgnitionStatus.valueForString(example); - example = "INVALID"; - IgnitionStatus enumInvalid = IgnitionStatus.valueForString(example); - - assertNotNull("UNKNOWN returned null", enumUnknown); - assertNotNull("OFF returned null", enumOff); - assertNotNull("ACCESSORY returned null", enumAccessory); - assertNotNull("RUN returned null", enumRun); - assertNotNull("START returned null", enumStart); - assertNotNull("INVALID returned null", enumInvalid); - } + /** + * Verifies that the enum values are not null upon valid assignment. + */ + public void testValidEnums() { + String example = "UNKNOWN"; + IgnitionStatus enumUnknown = IgnitionStatus.valueForString(example); + example = "OFF"; + IgnitionStatus enumOff = IgnitionStatus.valueForString(example); + example = "ACCESSORY"; + IgnitionStatus enumAccessory = IgnitionStatus.valueForString(example); + example = "RUN"; + IgnitionStatus enumRun = IgnitionStatus.valueForString(example); + example = "START"; + IgnitionStatus enumStart = IgnitionStatus.valueForString(example); + example = "INVALID"; + IgnitionStatus enumInvalid = IgnitionStatus.valueForString(example); - /** - * Verifies that an invalid assignment is null. - */ - public void testInvalidEnum () { - String example = "uNKnowN"; - try { - IgnitionStatus temp = IgnitionStatus.valueForString(example); + assertNotNull("UNKNOWN returned null", enumUnknown); + assertNotNull("OFF returned null", enumOff); + assertNotNull("ACCESSORY returned null", enumAccessory); + assertNotNull("RUN returned null", enumRun); + assertNotNull("START returned null", enumStart); + assertNotNull("INVALID returned null", enumInvalid); + } + + /** + * Verifies that an invalid assignment is null. + */ + public void testInvalidEnum() { + String example = "uNKnowN"; + try { + IgnitionStatus temp = IgnitionStatus.valueForString(example); assertNull("Result of valueForString should be null.", temp); - } - catch (IllegalArgumentException exception) { + } catch (IllegalArgumentException exception) { fail("Invalid enum throws IllegalArgumentException."); - } - } + } + } - /** - * Verifies that a null assignment is invalid. - */ - public void testNullEnum () { - String example = null; - try { - IgnitionStatus temp = IgnitionStatus.valueForString(example); + /** + * Verifies that a null assignment is invalid. + */ + public void testNullEnum() { + String example = null; + try { + IgnitionStatus temp = IgnitionStatus.valueForString(example); assertNull("Result of valueForString should be null.", temp); - } - catch (NullPointerException exception) { + } catch (NullPointerException exception) { fail("Null string throws NullPointerException."); - } - } + } + } + + /** + * Verifies the possible enum values of IgnitionStatus. + */ + public void testListEnum() { + List<IgnitionStatus> enumValueList = Arrays.asList(IgnitionStatus.values()); - /** - * Verifies the possible enum values of IgnitionStatus. - */ - public void testListEnum() { - List<IgnitionStatus> enumValueList = Arrays.asList(IgnitionStatus.values()); + List<IgnitionStatus> enumTestList = new ArrayList<IgnitionStatus>(); + enumTestList.add(IgnitionStatus.UNKNOWN); + enumTestList.add(IgnitionStatus.OFF); + enumTestList.add(IgnitionStatus.ACCESSORY); + enumTestList.add(IgnitionStatus.RUN); + enumTestList.add(IgnitionStatus.START); + enumTestList.add(IgnitionStatus.INVALID); - List<IgnitionStatus> enumTestList = new ArrayList<IgnitionStatus>(); - enumTestList.add(IgnitionStatus.UNKNOWN); - enumTestList.add(IgnitionStatus.OFF); - enumTestList.add(IgnitionStatus.ACCESSORY); - enumTestList.add(IgnitionStatus.RUN); - enumTestList.add(IgnitionStatus.START); - enumTestList.add(IgnitionStatus.INVALID); - - assertTrue("Enum value list does not match enum class list", - enumValueList.containsAll(enumTestList) && enumTestList.containsAll(enumValueList)); - } + assertTrue("Enum value list does not match enum class list", + enumValueList.containsAll(enumTestList) && enumTestList.containsAll(enumValueList)); + } }
\ No newline at end of file diff --git a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/ImageFieldNameTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/ImageFieldNameTests.java index c1b0b6cd7..7e4f28dde 100644 --- a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/ImageFieldNameTests.java +++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/ImageFieldNameTests.java @@ -9,111 +9,109 @@ import java.util.Arrays; import java.util.List; /** - * This is a unit test class for the SmartDeviceLink library project class : + * This is a unit test class for the SmartDeviceLink library project class : * {@link com.smartdevicelink.proxy.rpc.enums.ImageFieldName} */ public class ImageFieldNameTests extends TestCase { - /** - * Verifies that the enum values are not null upon valid assignment. - */ - public void testValidEnums () { - String example = "softButtonImage"; - ImageFieldName enumSoftButtonImage = ImageFieldName.valueForString(example); - example = "choiceImage"; - ImageFieldName enumChoiceImage = ImageFieldName.valueForString(example); - example = "choiceSecondaryImage"; - ImageFieldName enumSecondaryImage = ImageFieldName.valueForString(example); - example = "vrHelpItem"; - ImageFieldName enumVrHelpItem = ImageFieldName.valueForString(example); - example = "turnIcon"; - ImageFieldName enumTurnIcon = ImageFieldName.valueForString(example); - example = "menuIcon"; - ImageFieldName enumMenuIcon = ImageFieldName.valueForString(example); - example = "cmdIcon"; - ImageFieldName enumCmdIcon = ImageFieldName.valueForString(example); - example = "appIcon"; - ImageFieldName enumAppIcon = ImageFieldName.valueForString(example); - example = "graphic"; - ImageFieldName enumGraphicIcon = ImageFieldName.valueForString(example); - example = "showConstantTBTIcon"; - ImageFieldName enumShowConstantTbtIcon = ImageFieldName.valueForString(example); - example = "showConstantTBTNextTurnIcon"; - ImageFieldName enumShowConstantTbtNextTurnIcon = ImageFieldName.valueForString(example); - example = "locationImage"; - ImageFieldName enumLocationImage = ImageFieldName.valueForString(example); - example = "secondaryGraphic"; - ImageFieldName enumSecondaryGraphic = ImageFieldName.valueForString(example); - - assertNotNull("softButtonImage returned null", enumSoftButtonImage); - assertNotNull("choiceImage returned null", enumChoiceImage); - assertNotNull("choiceSecondaryImage returned null", enumSecondaryImage); - assertNotNull("vrHelpItem returned null", enumVrHelpItem); - assertNotNull("turnIcon returned null", enumTurnIcon); - assertNotNull("menuIcon returned null", enumMenuIcon); - assertNotNull("cmdIcon returned null", enumCmdIcon); - assertNotNull("appIcon returned null", enumAppIcon); - assertNotNull("graphic returned null", enumGraphicIcon); - assertNotNull("showConstantTBTIcon returned null", enumShowConstantTbtIcon); - assertNotNull("showConstantTBTNextTurnIcon returned null", enumShowConstantTbtNextTurnIcon); - assertNotNull("location image returned null", enumLocationImage); - assertNotNull("secondary graphic returned null", enumSecondaryGraphic); - } + /** + * Verifies that the enum values are not null upon valid assignment. + */ + public void testValidEnums() { + String example = "softButtonImage"; + ImageFieldName enumSoftButtonImage = ImageFieldName.valueForString(example); + example = "choiceImage"; + ImageFieldName enumChoiceImage = ImageFieldName.valueForString(example); + example = "choiceSecondaryImage"; + ImageFieldName enumSecondaryImage = ImageFieldName.valueForString(example); + example = "vrHelpItem"; + ImageFieldName enumVrHelpItem = ImageFieldName.valueForString(example); + example = "turnIcon"; + ImageFieldName enumTurnIcon = ImageFieldName.valueForString(example); + example = "menuIcon"; + ImageFieldName enumMenuIcon = ImageFieldName.valueForString(example); + example = "cmdIcon"; + ImageFieldName enumCmdIcon = ImageFieldName.valueForString(example); + example = "appIcon"; + ImageFieldName enumAppIcon = ImageFieldName.valueForString(example); + example = "graphic"; + ImageFieldName enumGraphicIcon = ImageFieldName.valueForString(example); + example = "showConstantTBTIcon"; + ImageFieldName enumShowConstantTbtIcon = ImageFieldName.valueForString(example); + example = "showConstantTBTNextTurnIcon"; + ImageFieldName enumShowConstantTbtNextTurnIcon = ImageFieldName.valueForString(example); + example = "locationImage"; + ImageFieldName enumLocationImage = ImageFieldName.valueForString(example); + example = "secondaryGraphic"; + ImageFieldName enumSecondaryGraphic = ImageFieldName.valueForString(example); - /** - * Verifies that an invalid assignment is null. - */ - public void testInvalidEnum () { - String example = "sofTbUtTOnImagE"; - try { - ImageFieldName temp = ImageFieldName.valueForString(example); + assertNotNull("softButtonImage returned null", enumSoftButtonImage); + assertNotNull("choiceImage returned null", enumChoiceImage); + assertNotNull("choiceSecondaryImage returned null", enumSecondaryImage); + assertNotNull("vrHelpItem returned null", enumVrHelpItem); + assertNotNull("turnIcon returned null", enumTurnIcon); + assertNotNull("menuIcon returned null", enumMenuIcon); + assertNotNull("cmdIcon returned null", enumCmdIcon); + assertNotNull("appIcon returned null", enumAppIcon); + assertNotNull("graphic returned null", enumGraphicIcon); + assertNotNull("showConstantTBTIcon returned null", enumShowConstantTbtIcon); + assertNotNull("showConstantTBTNextTurnIcon returned null", enumShowConstantTbtNextTurnIcon); + assertNotNull("location image returned null", enumLocationImage); + assertNotNull("secondary graphic returned null", enumSecondaryGraphic); + } + + /** + * Verifies that an invalid assignment is null. + */ + public void testInvalidEnum() { + String example = "sofTbUtTOnImagE"; + try { + ImageFieldName temp = ImageFieldName.valueForString(example); assertNull("Result of valueForString should be null.", temp); - } - catch (IllegalArgumentException exception) { + } catch (IllegalArgumentException exception) { fail("Invalid enum throws IllegalArgumentException."); - } - } + } + } - /** - * Verifies that a null assignment is invalid. - */ - public void testNullEnum () { - String example = null; - try { - ImageFieldName temp = ImageFieldName.valueForString(example); + /** + * Verifies that a null assignment is invalid. + */ + public void testNullEnum() { + String example = null; + try { + ImageFieldName temp = ImageFieldName.valueForString(example); assertNull("Result of valueForString should be null.", temp); - } - catch (NullPointerException exception) { + } catch (NullPointerException exception) { fail("Null string throws NullPointerException."); - } - } - - /** - * Verifies the possible enum values of ImageFieldName. - */ - public void testListEnum() { - List<ImageFieldName> enumValueList = Arrays.asList(ImageFieldName.values()); + } + } + + /** + * Verifies the possible enum values of ImageFieldName. + */ + public void testListEnum() { + List<ImageFieldName> enumValueList = Arrays.asList(ImageFieldName.values()); - List<ImageFieldName> enumTestList = new ArrayList<ImageFieldName>(); - enumTestList.add(ImageFieldName.softButtonImage); - enumTestList.add(ImageFieldName.choiceImage); - enumTestList.add(ImageFieldName.choiceSecondaryImage); - enumTestList.add(ImageFieldName.vrHelpItem); - enumTestList.add(ImageFieldName.turnIcon); - enumTestList.add(ImageFieldName.menuIcon); - enumTestList.add(ImageFieldName.cmdIcon); - enumTestList.add(ImageFieldName.appIcon); - enumTestList.add(ImageFieldName.graphic); - enumTestList.add(ImageFieldName.showConstantTBTIcon); - enumTestList.add(ImageFieldName.showConstantTBTNextTurnIcon); - enumTestList.add(ImageFieldName.locationImage); - enumTestList.add(ImageFieldName.secondaryGraphic); - enumTestList.add(ImageFieldName.alertIcon); - enumTestList.add(ImageFieldName.subtleAlertIcon); - enumTestList.add(ImageFieldName.subMenuIcon); + List<ImageFieldName> enumTestList = new ArrayList<ImageFieldName>(); + enumTestList.add(ImageFieldName.softButtonImage); + enumTestList.add(ImageFieldName.choiceImage); + enumTestList.add(ImageFieldName.choiceSecondaryImage); + enumTestList.add(ImageFieldName.vrHelpItem); + enumTestList.add(ImageFieldName.turnIcon); + enumTestList.add(ImageFieldName.menuIcon); + enumTestList.add(ImageFieldName.cmdIcon); + enumTestList.add(ImageFieldName.appIcon); + enumTestList.add(ImageFieldName.graphic); + enumTestList.add(ImageFieldName.showConstantTBTIcon); + enumTestList.add(ImageFieldName.showConstantTBTNextTurnIcon); + enumTestList.add(ImageFieldName.locationImage); + enumTestList.add(ImageFieldName.secondaryGraphic); + enumTestList.add(ImageFieldName.alertIcon); + enumTestList.add(ImageFieldName.subtleAlertIcon); + enumTestList.add(ImageFieldName.subMenuIcon); - assertTrue("Enum value list does not match enum class list", - enumValueList.containsAll(enumTestList) && enumTestList.containsAll(enumValueList)); - } + assertTrue("Enum value list does not match enum class list", + enumValueList.containsAll(enumTestList) && enumTestList.containsAll(enumValueList)); + } }
\ No newline at end of file diff --git a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/ImageTypeTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/ImageTypeTests.java index e31375cae..17d96b89a 100644 --- a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/ImageTypeTests.java +++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/ImageTypeTests.java @@ -9,63 +9,61 @@ import java.util.Arrays; import java.util.List; /** - * This is a unit test class for the SmartDeviceLink library project class : + * This is a unit test class for the SmartDeviceLink library project class : * {@link com.smartdevicelink.proxy.rpc.enums.ImageType} */ public class ImageTypeTests extends TestCase { - /** - * Verifies that the enum values are not null upon valid assignment. - */ - public void testValidEnums () { - String example = "STATIC"; - ImageType enumStatic = ImageType.valueForString(example); - example = "DYNAMIC"; - ImageType enumDynamic = ImageType.valueForString(example); - - assertNotNull("STATIC returned null", enumStatic); - assertNotNull("DYNAMIC returned null", enumDynamic); - } + /** + * Verifies that the enum values are not null upon valid assignment. + */ + public void testValidEnums() { + String example = "STATIC"; + ImageType enumStatic = ImageType.valueForString(example); + example = "DYNAMIC"; + ImageType enumDynamic = ImageType.valueForString(example); - /** - * Verifies that an invalid assignment is null. - */ - public void testInvalidEnum () { - String example = "sTatIc"; - try { - ImageType temp = ImageType.valueForString(example); + assertNotNull("STATIC returned null", enumStatic); + assertNotNull("DYNAMIC returned null", enumDynamic); + } + + /** + * Verifies that an invalid assignment is null. + */ + public void testInvalidEnum() { + String example = "sTatIc"; + try { + ImageType temp = ImageType.valueForString(example); assertNull("Result of valueForString should be null.", temp); - } - catch (IllegalArgumentException exception) { + } catch (IllegalArgumentException exception) { fail("Invalid enum throws IllegalArgumentException."); - } - } + } + } - /** - * Verifies that a null assignment is invalid. - */ - public void testNullEnum () { - String example = null; - try { - ImageType temp = ImageType.valueForString(example); + /** + * Verifies that a null assignment is invalid. + */ + public void testNullEnum() { + String example = null; + try { + ImageType temp = ImageType.valueForString(example); assertNull("Result of valueForString should be null.", temp); - } - catch (NullPointerException exception) { + } catch (NullPointerException exception) { fail("Null string throws NullPointerException."); - } - } + } + } - /** - * Verifies the possible enum values of ImageType. - */ - public void testListEnum() { - List<ImageType> enumValueList = Arrays.asList(ImageType.values()); + /** + * Verifies the possible enum values of ImageType. + */ + public void testListEnum() { + List<ImageType> enumValueList = Arrays.asList(ImageType.values()); - List<ImageType> enumTestList = new ArrayList<ImageType>(); - enumTestList.add(ImageType.STATIC); - enumTestList.add(ImageType.DYNAMIC); + List<ImageType> enumTestList = new ArrayList<ImageType>(); + enumTestList.add(ImageType.STATIC); + enumTestList.add(ImageType.DYNAMIC); - assertTrue("Enum value list does not match enum class list", - enumValueList.containsAll(enumTestList) && enumTestList.containsAll(enumValueList)); - } + assertTrue("Enum value list does not match enum class list", + enumValueList.containsAll(enumTestList) && enumTestList.containsAll(enumValueList)); + } }
\ No newline at end of file diff --git a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/InteractionModeTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/InteractionModeTests.java index baae35b38..c6ff9a218 100644 --- a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/InteractionModeTests.java +++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/InteractionModeTests.java @@ -9,67 +9,65 @@ import java.util.Arrays; import java.util.List; /** - * This is a unit test class for the SmartDeviceLink library project class : + * This is a unit test class for the SmartDeviceLink library project class : * {@link com.smartdevicelink.proxy.rpc.enums.InteractionMode} */ public class InteractionModeTests extends TestCase { - /** - * Verifies that the enum values are not null upon valid assignment. - */ - public void testValidEnums () { - String example = "MANUAL_ONLY"; - InteractionMode enumManualOnly = InteractionMode.valueForString(example); - example = "VR_ONLY"; - InteractionMode enumVrOnly = InteractionMode.valueForString(example); - example = "BOTH"; - InteractionMode enumBoth = InteractionMode.valueForString(example); - - assertNotNull("MANUAL_ONLY returned null", enumManualOnly); - assertNotNull("VR_ONLY returned null", enumVrOnly); - assertNotNull("BOTH returned null", enumBoth); - } + /** + * Verifies that the enum values are not null upon valid assignment. + */ + public void testValidEnums() { + String example = "MANUAL_ONLY"; + InteractionMode enumManualOnly = InteractionMode.valueForString(example); + example = "VR_ONLY"; + InteractionMode enumVrOnly = InteractionMode.valueForString(example); + example = "BOTH"; + InteractionMode enumBoth = InteractionMode.valueForString(example); - /** - * Verifies that an invalid assignment is null. - */ - public void testInvalidEnum () { - String example = "maNuAL_OnlY"; - try { - InteractionMode temp = InteractionMode.valueForString(example); + assertNotNull("MANUAL_ONLY returned null", enumManualOnly); + assertNotNull("VR_ONLY returned null", enumVrOnly); + assertNotNull("BOTH returned null", enumBoth); + } + + /** + * Verifies that an invalid assignment is null. + */ + public void testInvalidEnum() { + String example = "maNuAL_OnlY"; + try { + InteractionMode temp = InteractionMode.valueForString(example); assertNull("Result of valueForString should be null.", temp); - } - catch (IllegalArgumentException exception) { + } catch (IllegalArgumentException exception) { fail("Invalid enum throws IllegalArgumentException."); - } - } + } + } - /** - * Verifies that a null assignment is invalid. - */ - public void testNullEnum () { - String example = null; - try { - InteractionMode temp = InteractionMode.valueForString(example); + /** + * Verifies that a null assignment is invalid. + */ + public void testNullEnum() { + String example = null; + try { + InteractionMode temp = InteractionMode.valueForString(example); assertNull("Result of valueForString should be null.", temp); - } - catch (NullPointerException exception) { + } catch (NullPointerException exception) { fail("Null string throws NullPointerException."); - } - } + } + } - /** - * Verifies the possible enum values of InteractionMode. - */ - public void testListEnum() { - List<InteractionMode> enumValueList = Arrays.asList(InteractionMode.values()); + /** + * Verifies the possible enum values of InteractionMode. + */ + public void testListEnum() { + List<InteractionMode> enumValueList = Arrays.asList(InteractionMode.values()); - List<InteractionMode> enumTestList = new ArrayList<InteractionMode>(); - enumTestList.add(InteractionMode.MANUAL_ONLY); - enumTestList.add(InteractionMode.VR_ONLY); - enumTestList.add(InteractionMode.BOTH); + List<InteractionMode> enumTestList = new ArrayList<InteractionMode>(); + enumTestList.add(InteractionMode.MANUAL_ONLY); + enumTestList.add(InteractionMode.VR_ONLY); + enumTestList.add(InteractionMode.BOTH); - assertTrue("Enum value list does not match enum class list", - enumValueList.containsAll(enumTestList) && enumTestList.containsAll(enumValueList)); - } + assertTrue("Enum value list does not match enum class list", + enumValueList.containsAll(enumTestList) && enumTestList.containsAll(enumValueList)); + } }
\ No newline at end of file diff --git a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/JingleTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/JingleTests.java index c215d052b..6712bfc0d 100644 --- a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/JingleTests.java +++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/JingleTests.java @@ -9,75 +9,75 @@ import java.util.Arrays; import java.util.List; /** - * This is a unit test class for the SmartDeviceLink library project class : + * This is a unit test class for the SmartDeviceLink library project class : * {@link com.smartdevicelink.proxy.rpc.enums.Jingle} */ public class JingleTests extends TestCase { - /** - * Verifies that the enum values are not null upon valid assignment. - */ - public void testValidEnums () { - - String example = "POSITIVE_JINGLE"; - Jingle enumPositiveJingle = Jingle.valueForString(example); - example = "NEGATIVE_JINGLE"; - Jingle enumNegativeJingle = Jingle.valueForString(example); - example = "INITIAL_JINGLE"; - Jingle enumInitialJingle = Jingle.valueForString(example); - example = "LISTEN_JINGLE"; - Jingle enumListenJingle = Jingle.valueForString(example); - example = "HELP_JINGLE"; - Jingle enumHelpJingle = Jingle.valueForString(example); - - assertNotNull("POSITIVE_JINGLE returned null", enumPositiveJingle); - assertNotNull("NEGATIVE_JINGLE returned null", enumNegativeJingle); - assertNotNull("INITIAL_JINGLE returned null", enumInitialJingle); - assertNotNull("LISTEN_JINGLE returned null", enumListenJingle); - assertNotNull("HELP_JINGLE returned null", enumHelpJingle); - } + /** + * Verifies that the enum values are not null upon valid assignment. + */ + public void testValidEnums() { - /** - * Verifies that an invalid assignment is null. - */ - public void testInvalidEnum () { - String example = "posITive_JiGLE"; - try { - Jingle temp = Jingle.valueForString(example); - assertNull("Result of valueForString should be null.", temp); - } catch (IllegalArgumentException exception) { - fail("Invalid enum throws IllegalArgumentException."); - } - } + String example = "POSITIVE_JINGLE"; + Jingle enumPositiveJingle = Jingle.valueForString(example); + example = "NEGATIVE_JINGLE"; + Jingle enumNegativeJingle = Jingle.valueForString(example); + example = "INITIAL_JINGLE"; + Jingle enumInitialJingle = Jingle.valueForString(example); + example = "LISTEN_JINGLE"; + Jingle enumListenJingle = Jingle.valueForString(example); + example = "HELP_JINGLE"; + Jingle enumHelpJingle = Jingle.valueForString(example); - /** - * Verifies that a null assignment is invalid. - */ - public void testNullEnum () { - String example = null; - try { - Jingle temp = Jingle.valueForString(example); - assertNull("Result of valueForString should be null.", temp); - } catch (IllegalArgumentException exception) { - fail("Null string throws NullPointerException."); - } - } + assertNotNull("POSITIVE_JINGLE returned null", enumPositiveJingle); + assertNotNull("NEGATIVE_JINGLE returned null", enumNegativeJingle); + assertNotNull("INITIAL_JINGLE returned null", enumInitialJingle); + assertNotNull("LISTEN_JINGLE returned null", enumListenJingle); + assertNotNull("HELP_JINGLE returned null", enumHelpJingle); + } - /** - * Verifies the possible enum values of Jingle. - */ - public void testListEnums () { - List<Jingle> enumValueList = Arrays.asList(Jingle.values()); - List<Jingle> enumTestList = new ArrayList<Jingle>(); - - enumTestList.add(Jingle.HELP); - enumTestList.add(Jingle.INITIAL); - enumTestList.add(Jingle.LISTEN); - enumTestList.add(Jingle.NEGATIVE); - enumTestList.add(Jingle.POSITIVE); - - assertTrue("Enum value list does not match neum class list.", - enumValueList.containsAll(enumTestList) && - enumTestList.containsAll(enumValueList)); - } + /** + * Verifies that an invalid assignment is null. + */ + public void testInvalidEnum() { + String example = "posITive_JiGLE"; + try { + Jingle temp = Jingle.valueForString(example); + assertNull("Result of valueForString should be null.", temp); + } catch (IllegalArgumentException exception) { + fail("Invalid enum throws IllegalArgumentException."); + } + } + + /** + * Verifies that a null assignment is invalid. + */ + public void testNullEnum() { + String example = null; + try { + Jingle temp = Jingle.valueForString(example); + assertNull("Result of valueForString should be null.", temp); + } catch (IllegalArgumentException exception) { + fail("Null string throws NullPointerException."); + } + } + + /** + * Verifies the possible enum values of Jingle. + */ + public void testListEnums() { + List<Jingle> enumValueList = Arrays.asList(Jingle.values()); + List<Jingle> enumTestList = new ArrayList<Jingle>(); + + enumTestList.add(Jingle.HELP); + enumTestList.add(Jingle.INITIAL); + enumTestList.add(Jingle.LISTEN); + enumTestList.add(Jingle.NEGATIVE); + enumTestList.add(Jingle.POSITIVE); + + assertTrue("Enum value list does not match neum class list.", + enumValueList.containsAll(enumTestList) && + enumTestList.containsAll(enumValueList)); + } }
\ No newline at end of file diff --git a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/KeyboardEventTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/KeyboardEventTests.java index 28acd853f..13a28cfda 100644 --- a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/KeyboardEventTests.java +++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/KeyboardEventTests.java @@ -9,75 +9,73 @@ import java.util.Arrays; import java.util.List; /** - * This is a unit test class for the SmartDeviceLink library project class : + * This is a unit test class for the SmartDeviceLink library project class : * {@link com.smartdevicelink.proxy.rpc.enums.KeyboardEvent} */ public class KeyboardEventTests extends TestCase { - /** - * Verifies that the enum values are not null upon valid assignment. - */ - public void testValidEnums () { - String example = "KEYPRESS"; - KeyboardEvent enumKeypress = KeyboardEvent.valueForString(example); - example = "ENTRY_SUBMITTED"; - KeyboardEvent enumEntrySubmitted = KeyboardEvent.valueForString(example); - example = "ENTRY_CANCELLED"; - KeyboardEvent enumEntryCancelled = KeyboardEvent.valueForString(example); - example = "ENTRY_ABORTED"; - KeyboardEvent enumEntryAborted = KeyboardEvent.valueForString(example); - example = "ENTRY_VOICE"; - KeyboardEvent enumEntryVoice = KeyboardEvent.valueForString(example); - - assertNotNull("KEYPRESS returned null", enumKeypress); - assertNotNull("ENTRY_SUBMITTED returned null", enumEntrySubmitted); - assertNotNull("ENTRY_CANCELLED returned null", enumEntryCancelled); - assertNotNull("ENTRY_ABORTED returned null", enumEntryAborted); - assertNotNull("ENTRY_VOICE returned null", enumEntryVoice); - } + /** + * Verifies that the enum values are not null upon valid assignment. + */ + public void testValidEnums() { + String example = "KEYPRESS"; + KeyboardEvent enumKeypress = KeyboardEvent.valueForString(example); + example = "ENTRY_SUBMITTED"; + KeyboardEvent enumEntrySubmitted = KeyboardEvent.valueForString(example); + example = "ENTRY_CANCELLED"; + KeyboardEvent enumEntryCancelled = KeyboardEvent.valueForString(example); + example = "ENTRY_ABORTED"; + KeyboardEvent enumEntryAborted = KeyboardEvent.valueForString(example); + example = "ENTRY_VOICE"; + KeyboardEvent enumEntryVoice = KeyboardEvent.valueForString(example); - /** - * Verifies that an invalid assignment is null. - */ - public void testInvalidEnum () { - String example = "keyPreSS"; - try { - KeyboardEvent temp = KeyboardEvent.valueForString(example); + assertNotNull("KEYPRESS returned null", enumKeypress); + assertNotNull("ENTRY_SUBMITTED returned null", enumEntrySubmitted); + assertNotNull("ENTRY_CANCELLED returned null", enumEntryCancelled); + assertNotNull("ENTRY_ABORTED returned null", enumEntryAborted); + assertNotNull("ENTRY_VOICE returned null", enumEntryVoice); + } + + /** + * Verifies that an invalid assignment is null. + */ + public void testInvalidEnum() { + String example = "keyPreSS"; + try { + KeyboardEvent temp = KeyboardEvent.valueForString(example); assertNull("Result of valueForString should be null.", temp); - } - catch (IllegalArgumentException exception) { + } catch (IllegalArgumentException exception) { fail("Invalid enum throws IllegalArgumentException."); - } - } + } + } - /** - * Verifies that a null assignment is invalid. - */ - public void testNullEnum () { - String example = null; - try { - KeyboardEvent temp = KeyboardEvent.valueForString(example); + /** + * Verifies that a null assignment is invalid. + */ + public void testNullEnum() { + String example = null; + try { + KeyboardEvent temp = KeyboardEvent.valueForString(example); assertNull("Result of valueForString should be null.", temp); - } - catch (NullPointerException exception) { + } catch (NullPointerException exception) { fail("Null string throws NullPointerException."); - } - } + } + } - /** - * Verifies the possible enum values of KeyboardEvent. - */ - public void testListEnum() { - List<KeyboardEvent> enumValueList = Arrays.asList(KeyboardEvent.values()); + /** + * Verifies the possible enum values of KeyboardEvent. + */ + public void testListEnum() { + List<KeyboardEvent> enumValueList = Arrays.asList(KeyboardEvent.values()); - List<KeyboardEvent> enumTestList = new ArrayList<KeyboardEvent>(); - enumTestList.add(KeyboardEvent.KEYPRESS); - enumTestList.add(KeyboardEvent.ENTRY_SUBMITTED); - enumTestList.add(KeyboardEvent.ENTRY_CANCELLED); - enumTestList.add(KeyboardEvent.ENTRY_ABORTED); - enumTestList.add(KeyboardEvent.ENTRY_VOICE); + List<KeyboardEvent> enumTestList = new ArrayList<KeyboardEvent>(); + enumTestList.add(KeyboardEvent.KEYPRESS); + enumTestList.add(KeyboardEvent.ENTRY_SUBMITTED); + enumTestList.add(KeyboardEvent.ENTRY_CANCELLED); + enumTestList.add(KeyboardEvent.ENTRY_ABORTED); + enumTestList.add(KeyboardEvent.ENTRY_VOICE); - assertTrue("Enum value list does not match enum class list", - enumValueList.containsAll(enumTestList) && enumTestList.containsAll(enumValueList)); - } + assertTrue("Enum value list does not match enum class list", + enumValueList.containsAll(enumTestList) && enumTestList.containsAll(enumValueList)); + } }
\ No newline at end of file diff --git a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/KeyboardLayoutTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/KeyboardLayoutTests.java index 5ce30904f..c75b9d7e9 100644 --- a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/KeyboardLayoutTests.java +++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/KeyboardLayoutTests.java @@ -9,67 +9,65 @@ import java.util.Arrays; import java.util.List; /** - * This is a unit test class for the SmartDeviceLink library project class : + * This is a unit test class for the SmartDeviceLink library project class : * {@link com.smartdevicelink.proxy.rpc.enums.KeyboardLayout} */ public class KeyboardLayoutTests extends TestCase { - /** - * Verifies that the enum values are not null upon valid assignment. - */ - public void testValidEnums () { - String example = "QWERTY"; - KeyboardLayout enumQwerty = KeyboardLayout.valueForString(example); - example = "QWERTZ"; - KeyboardLayout enumQwertz = KeyboardLayout.valueForString(example); - example = "AZERTY"; - KeyboardLayout enumAzerty = KeyboardLayout.valueForString(example); - - assertNotNull("QWERTY returned null", enumQwerty); - assertNotNull("QWERTZ returned null", enumQwertz); - assertNotNull("AZERTY returned null", enumAzerty); - } + /** + * Verifies that the enum values are not null upon valid assignment. + */ + public void testValidEnums() { + String example = "QWERTY"; + KeyboardLayout enumQwerty = KeyboardLayout.valueForString(example); + example = "QWERTZ"; + KeyboardLayout enumQwertz = KeyboardLayout.valueForString(example); + example = "AZERTY"; + KeyboardLayout enumAzerty = KeyboardLayout.valueForString(example); - /** - * Verifies that an invalid assignment is null. - */ - public void testInvalidEnum () { - String example = "qWerTY"; - try { - KeyboardLayout temp = KeyboardLayout.valueForString(example); + assertNotNull("QWERTY returned null", enumQwerty); + assertNotNull("QWERTZ returned null", enumQwertz); + assertNotNull("AZERTY returned null", enumAzerty); + } + + /** + * Verifies that an invalid assignment is null. + */ + public void testInvalidEnum() { + String example = "qWerTY"; + try { + KeyboardLayout temp = KeyboardLayout.valueForString(example); assertNull("Result of valueForString should be null.", temp); - } - catch (IllegalArgumentException exception) { + } catch (IllegalArgumentException exception) { fail("Invalid enum throws IllegalArgumentException."); - } - } + } + } - /** - * Verifies that a null assignment is invalid. - */ - public void testNullEnum () { - String example = null; - try { - KeyboardLayout temp = KeyboardLayout.valueForString(example); + /** + * Verifies that a null assignment is invalid. + */ + public void testNullEnum() { + String example = null; + try { + KeyboardLayout temp = KeyboardLayout.valueForString(example); assertNull("Result of valueForString should be null.", temp); - } - catch (NullPointerException exception) { + } catch (NullPointerException exception) { fail("Null string throws NullPointerException."); - } - } + } + } - /** - * Verifies the possible enum values of KeyboardLayout. - */ - public void testListEnum() { - List<KeyboardLayout> enumValueList = Arrays.asList(KeyboardLayout.values()); + /** + * Verifies the possible enum values of KeyboardLayout. + */ + public void testListEnum() { + List<KeyboardLayout> enumValueList = Arrays.asList(KeyboardLayout.values()); - List<KeyboardLayout> enumTestList = new ArrayList<KeyboardLayout>(); - enumTestList.add(KeyboardLayout.QWERTY); - enumTestList.add(KeyboardLayout.QWERTZ); - enumTestList.add(KeyboardLayout.AZERTY); + List<KeyboardLayout> enumTestList = new ArrayList<KeyboardLayout>(); + enumTestList.add(KeyboardLayout.QWERTY); + enumTestList.add(KeyboardLayout.QWERTZ); + enumTestList.add(KeyboardLayout.AZERTY); - assertTrue("Enum value list does not match enum class list", - enumValueList.containsAll(enumTestList) && enumTestList.containsAll(enumValueList)); - } + assertTrue("Enum value list does not match enum class list", + enumValueList.containsAll(enumTestList) && enumTestList.containsAll(enumValueList)); + } }
\ No newline at end of file diff --git a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/KeypressModeTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/KeypressModeTests.java index 6384cc9f3..d432606ee 100644 --- a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/KeypressModeTests.java +++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/KeypressModeTests.java @@ -9,67 +9,65 @@ import java.util.Arrays; import java.util.List; /** - * This is a unit test class for the SmartDeviceLink library project class : + * This is a unit test class for the SmartDeviceLink library project class : * {@link com.smartdevicelink.proxy.rpc.enums.KeypressMode} */ public class KeypressModeTests extends TestCase { - /** - * Verifies that the enum values are not null upon valid assignment. - */ - public void testValidEnums () { - String example = "SINGLE_KEYPRESS"; - KeypressMode enumSingleKeypress = KeypressMode.valueForString(example); - example = "QUEUE_KEYPRESSES"; - KeypressMode enumQueueKeypresses = KeypressMode.valueForString(example); - example = "RESEND_CURRENT_ENTRY"; - KeypressMode enumResendCurrentEntry = KeypressMode.valueForString(example); - - assertNotNull("SINGLE_KEYPRESS returned null", enumSingleKeypress); - assertNotNull("QUEUE_KEYPRESSES returned null", enumQueueKeypresses); - assertNotNull("RESEND_CURRENT_ENTRY returned null", enumResendCurrentEntry); - } + /** + * Verifies that the enum values are not null upon valid assignment. + */ + public void testValidEnums() { + String example = "SINGLE_KEYPRESS"; + KeypressMode enumSingleKeypress = KeypressMode.valueForString(example); + example = "QUEUE_KEYPRESSES"; + KeypressMode enumQueueKeypresses = KeypressMode.valueForString(example); + example = "RESEND_CURRENT_ENTRY"; + KeypressMode enumResendCurrentEntry = KeypressMode.valueForString(example); - /** - * Verifies that an invalid assignment is null. - */ - public void testInvalidEnum () { - String example = "sIngLe_KeyPrESs"; - try { - KeypressMode temp = KeypressMode.valueForString(example); + assertNotNull("SINGLE_KEYPRESS returned null", enumSingleKeypress); + assertNotNull("QUEUE_KEYPRESSES returned null", enumQueueKeypresses); + assertNotNull("RESEND_CURRENT_ENTRY returned null", enumResendCurrentEntry); + } + + /** + * Verifies that an invalid assignment is null. + */ + public void testInvalidEnum() { + String example = "sIngLe_KeyPrESs"; + try { + KeypressMode temp = KeypressMode.valueForString(example); assertNull("Result of valueForString should be null.", temp); - } - catch (IllegalArgumentException exception) { + } catch (IllegalArgumentException exception) { fail("Invalid enum throws IllegalArgumentException."); - } - } + } + } - /** - * Verifies that a null assignment is invalid. - */ - public void testNullEnum () { - String example = null; - try { - KeypressMode temp = KeypressMode.valueForString(example); + /** + * Verifies that a null assignment is invalid. + */ + public void testNullEnum() { + String example = null; + try { + KeypressMode temp = KeypressMode.valueForString(example); assertNull("Result of valueForString should be null.", temp); - } - catch (NullPointerException exception) { + } catch (NullPointerException exception) { fail("Null string throws NullPointerException."); - } - } + } + } - /** - * Verifies the possible enum values of KeypressMode. - */ - public void testListEnum() { - List<KeypressMode> enumValueList = Arrays.asList(KeypressMode.values()); + /** + * Verifies the possible enum values of KeypressMode. + */ + public void testListEnum() { + List<KeypressMode> enumValueList = Arrays.asList(KeypressMode.values()); - List<KeypressMode> enumTestList = new ArrayList<KeypressMode>(); - enumTestList.add(KeypressMode.SINGLE_KEYPRESS); - enumTestList.add(KeypressMode.QUEUE_KEYPRESSES); - enumTestList.add(KeypressMode.RESEND_CURRENT_ENTRY); + List<KeypressMode> enumTestList = new ArrayList<KeypressMode>(); + enumTestList.add(KeypressMode.SINGLE_KEYPRESS); + enumTestList.add(KeypressMode.QUEUE_KEYPRESSES); + enumTestList.add(KeypressMode.RESEND_CURRENT_ENTRY); - assertTrue("Enum value list does not match enum class list", - enumValueList.containsAll(enumTestList) && enumTestList.containsAll(enumValueList)); - } + assertTrue("Enum value list does not match enum class list", + enumValueList.containsAll(enumTestList) && enumTestList.containsAll(enumValueList)); + } }
\ No newline at end of file diff --git a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/LanguageTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/LanguageTests.java index 61de1cfd5..88889b525 100644 --- a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/LanguageTests.java +++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/LanguageTests.java @@ -9,212 +9,210 @@ import java.util.Arrays; import java.util.List; /** - * This is a unit test class for the SmartDeviceLink library project class : + * This is a unit test class for the SmartDeviceLink library project class : * {@link com.smartdevicelink.proxy.rpc.enums.Language} */ public class LanguageTests extends TestCase { - /** - * Verifies that the enum values are not null upon valid assignment. - */ - public void testValidEnums () { - String example = "EN-US"; - Language enumEnUs = Language.valueForString(example); - example = "EN-SA"; - Language enumEnSa = Language.valueForString(example); - example = "HE-IL"; - Language enumHeIl = Language.valueForString(example); - example = "RO-RO"; - Language enumRoRo = Language.valueForString(example); - example = "UK-UA"; - Language enumUkUa = Language.valueForString(example); - example = "ID-ID"; - Language enumIdId = Language.valueForString(example); - example = "VI-VN"; - Language enumViVn = Language.valueForString(example); - example = "MS-MY"; - Language enumMsMy = Language.valueForString(example); - example = "HI-IN"; - Language enumHiIn = Language.valueForString(example); - example = "NL-BE"; - Language enumNlBe = Language.valueForString(example); - example = "EL-GR"; - Language enumElGr = Language.valueForString(example); - example = "HU-HU"; - Language enumHuHu = Language.valueForString(example); - example = "FI-FI"; - Language enumFiFi = Language.valueForString(example); - example = "SK-SK"; - Language enumSkSk = Language.valueForString(example); - example = "ES-MX"; - Language enumEsMx = Language.valueForString(example); - example = "FR-CA"; - Language enumFrCa = Language.valueForString(example); - example = "DE-DE"; - Language enumDeDe = Language.valueForString(example); - example = "ES-ES"; - Language enumEsEs = Language.valueForString(example); - example = "EN-GB"; - Language enumEnGb = Language.valueForString(example); - example = "RU-RU"; - Language enumRuRu = Language.valueForString(example); - example = "TR-TR"; - Language enumTrTr = Language.valueForString(example); - example = "PL-PL"; - Language enumPlPl = Language.valueForString(example); - example = "FR-FR"; - Language enumFrFr = Language.valueForString(example); - example = "IT-IT"; - Language enumItIt = Language.valueForString(example); - example = "SV-SE"; - Language enumSvSe = Language.valueForString(example); - example = "PT-PT"; - Language enumPtPt = Language.valueForString(example); - example = "NL-NL"; - Language enumNlNl = Language.valueForString(example); - example = "EN-AU"; - Language enumEnAu = Language.valueForString(example); - example = "ZH-CN"; - Language enumZhCn = Language.valueForString(example); - example = "ZH-TW"; - Language enumZhTw = Language.valueForString(example); - example = "JA-JP"; - Language enumJaJp = Language.valueForString(example); - example = "AR-SA"; - Language enumArSa = Language.valueForString(example); - example = "KO-KR"; - Language enumKoKr = Language.valueForString(example); - example = "PT-BR"; - Language enumPtBr = Language.valueForString(example); - example = "CS-CZ"; - Language enumCsCz = Language.valueForString(example); - example = "DA-DK"; - Language enumDaDk = Language.valueForString(example); - example = "NO-NO"; - Language enumNoNo = Language.valueForString(example); - example = "EN-IN"; - Language enumEnIn = Language.valueForString(example); - example = "TH-TH"; - Language enumThTh = Language.valueForString(example); - - assertNotNull("EN-US returned null", enumEnUs); - assertNotNull("EN-SA returned null", enumEnSa); - assertNotNull("HE-IL returned null", enumHeIl); - assertNotNull("RO-RO returned null", enumRoRo); - assertNotNull("UK-UA returned null", enumUkUa); - assertNotNull("ID-ID returned null", enumIdId); - assertNotNull("VI-VN returned null", enumViVn); - assertNotNull("MS-MY returned null", enumMsMy); - assertNotNull("HI-IN returned null", enumHiIn); - assertNotNull("NL-BE returned null", enumNlBe); - assertNotNull("EL-GR returned null", enumElGr); - assertNotNull("HU-HU returned null", enumHuHu); - assertNotNull("FI-FI returned null", enumFiFi); - assertNotNull("SK-SK returned null", enumSkSk); - assertNotNull("ES-MX returned null", enumEsMx); - assertNotNull("FR-CA returned null", enumFrCa); - assertNotNull("DE-DE returned null", enumDeDe); - assertNotNull("ES-ES returned null", enumEsEs); - assertNotNull("EN-GB returned null", enumEnGb); - assertNotNull("RU-RU returned null", enumRuRu); - assertNotNull("TR-TR returned null", enumTrTr); - assertNotNull("PL-PL returned null", enumPlPl); - assertNotNull("FR-FR returned null", enumFrFr); - assertNotNull("IT-IT returned null", enumItIt); - assertNotNull("SV-SE returned null", enumSvSe); - assertNotNull("PT-PT returned null", enumPtPt); - assertNotNull("NL-NL returned null", enumNlNl); - assertNotNull("EN-AU returned null", enumEnAu); - assertNotNull("ZH-CN returned null", enumZhCn); - assertNotNull("ZH-TW returned null", enumZhTw); - assertNotNull("JA-JP returned null", enumJaJp); - assertNotNull("AR-SA returned null", enumArSa); - assertNotNull("KO-KR returned null", enumKoKr); - assertNotNull("PT-BR returned null", enumPtBr); - assertNotNull("CS-CZ returned null", enumCsCz); - assertNotNull("DA-DK returned null", enumDaDk); - assertNotNull("NO-NO returned null", enumNoNo); - assertNotNull("EN-IN returned null", enumEnIn); - assertNotNull("TH-TH returned null", enumThTh); - } + /** + * Verifies that the enum values are not null upon valid assignment. + */ + public void testValidEnums() { + String example = "EN-US"; + Language enumEnUs = Language.valueForString(example); + example = "EN-SA"; + Language enumEnSa = Language.valueForString(example); + example = "HE-IL"; + Language enumHeIl = Language.valueForString(example); + example = "RO-RO"; + Language enumRoRo = Language.valueForString(example); + example = "UK-UA"; + Language enumUkUa = Language.valueForString(example); + example = "ID-ID"; + Language enumIdId = Language.valueForString(example); + example = "VI-VN"; + Language enumViVn = Language.valueForString(example); + example = "MS-MY"; + Language enumMsMy = Language.valueForString(example); + example = "HI-IN"; + Language enumHiIn = Language.valueForString(example); + example = "NL-BE"; + Language enumNlBe = Language.valueForString(example); + example = "EL-GR"; + Language enumElGr = Language.valueForString(example); + example = "HU-HU"; + Language enumHuHu = Language.valueForString(example); + example = "FI-FI"; + Language enumFiFi = Language.valueForString(example); + example = "SK-SK"; + Language enumSkSk = Language.valueForString(example); + example = "ES-MX"; + Language enumEsMx = Language.valueForString(example); + example = "FR-CA"; + Language enumFrCa = Language.valueForString(example); + example = "DE-DE"; + Language enumDeDe = Language.valueForString(example); + example = "ES-ES"; + Language enumEsEs = Language.valueForString(example); + example = "EN-GB"; + Language enumEnGb = Language.valueForString(example); + example = "RU-RU"; + Language enumRuRu = Language.valueForString(example); + example = "TR-TR"; + Language enumTrTr = Language.valueForString(example); + example = "PL-PL"; + Language enumPlPl = Language.valueForString(example); + example = "FR-FR"; + Language enumFrFr = Language.valueForString(example); + example = "IT-IT"; + Language enumItIt = Language.valueForString(example); + example = "SV-SE"; + Language enumSvSe = Language.valueForString(example); + example = "PT-PT"; + Language enumPtPt = Language.valueForString(example); + example = "NL-NL"; + Language enumNlNl = Language.valueForString(example); + example = "EN-AU"; + Language enumEnAu = Language.valueForString(example); + example = "ZH-CN"; + Language enumZhCn = Language.valueForString(example); + example = "ZH-TW"; + Language enumZhTw = Language.valueForString(example); + example = "JA-JP"; + Language enumJaJp = Language.valueForString(example); + example = "AR-SA"; + Language enumArSa = Language.valueForString(example); + example = "KO-KR"; + Language enumKoKr = Language.valueForString(example); + example = "PT-BR"; + Language enumPtBr = Language.valueForString(example); + example = "CS-CZ"; + Language enumCsCz = Language.valueForString(example); + example = "DA-DK"; + Language enumDaDk = Language.valueForString(example); + example = "NO-NO"; + Language enumNoNo = Language.valueForString(example); + example = "EN-IN"; + Language enumEnIn = Language.valueForString(example); + example = "TH-TH"; + Language enumThTh = Language.valueForString(example); - /** - * Verifies that an invalid assignment is null. - */ - public void testInvalidEnum () { - String example = "eN-Us"; - try { - Language temp = Language.valueForString(example); + assertNotNull("EN-US returned null", enumEnUs); + assertNotNull("EN-SA returned null", enumEnSa); + assertNotNull("HE-IL returned null", enumHeIl); + assertNotNull("RO-RO returned null", enumRoRo); + assertNotNull("UK-UA returned null", enumUkUa); + assertNotNull("ID-ID returned null", enumIdId); + assertNotNull("VI-VN returned null", enumViVn); + assertNotNull("MS-MY returned null", enumMsMy); + assertNotNull("HI-IN returned null", enumHiIn); + assertNotNull("NL-BE returned null", enumNlBe); + assertNotNull("EL-GR returned null", enumElGr); + assertNotNull("HU-HU returned null", enumHuHu); + assertNotNull("FI-FI returned null", enumFiFi); + assertNotNull("SK-SK returned null", enumSkSk); + assertNotNull("ES-MX returned null", enumEsMx); + assertNotNull("FR-CA returned null", enumFrCa); + assertNotNull("DE-DE returned null", enumDeDe); + assertNotNull("ES-ES returned null", enumEsEs); + assertNotNull("EN-GB returned null", enumEnGb); + assertNotNull("RU-RU returned null", enumRuRu); + assertNotNull("TR-TR returned null", enumTrTr); + assertNotNull("PL-PL returned null", enumPlPl); + assertNotNull("FR-FR returned null", enumFrFr); + assertNotNull("IT-IT returned null", enumItIt); + assertNotNull("SV-SE returned null", enumSvSe); + assertNotNull("PT-PT returned null", enumPtPt); + assertNotNull("NL-NL returned null", enumNlNl); + assertNotNull("EN-AU returned null", enumEnAu); + assertNotNull("ZH-CN returned null", enumZhCn); + assertNotNull("ZH-TW returned null", enumZhTw); + assertNotNull("JA-JP returned null", enumJaJp); + assertNotNull("AR-SA returned null", enumArSa); + assertNotNull("KO-KR returned null", enumKoKr); + assertNotNull("PT-BR returned null", enumPtBr); + assertNotNull("CS-CZ returned null", enumCsCz); + assertNotNull("DA-DK returned null", enumDaDk); + assertNotNull("NO-NO returned null", enumNoNo); + assertNotNull("EN-IN returned null", enumEnIn); + assertNotNull("TH-TH returned null", enumThTh); + } + + /** + * Verifies that an invalid assignment is null. + */ + public void testInvalidEnum() { + String example = "eN-Us"; + try { + Language temp = Language.valueForString(example); assertNull("Result of valueForString should be null.", temp); - } - catch (IllegalArgumentException exception) { + } catch (IllegalArgumentException exception) { fail("Invalid enum throws IllegalArgumentException."); - } - } + } + } - /** - * Verifies that a null assignment is invalid. - */ - public void testNullEnum () { - String example = null; - try { - Language temp = Language.valueForString(example); + /** + * Verifies that a null assignment is invalid. + */ + public void testNullEnum() { + String example = null; + try { + Language temp = Language.valueForString(example); assertNull("Result of valueForString should be null.", temp); - } - catch (NullPointerException exception) { + } catch (NullPointerException exception) { fail("Null string throws NullPointerException."); - } - } + } + } + + /** + * Verifies the possible enum values of Language. + */ + public void testListEnum() { + List<Language> enumValueList = Arrays.asList(Language.values()); + + List<Language> enumTestList = new ArrayList<Language>(); - /** - * Verifies the possible enum values of Language. - */ - public void testListEnum() { - List<Language> enumValueList = Arrays.asList(Language.values()); + enumTestList.add(Language.EN_US); + enumTestList.add(Language.EN_SA); + enumTestList.add(Language.HE_IL); + enumTestList.add(Language.RO_RO); + enumTestList.add(Language.UK_UA); + enumTestList.add(Language.ID_ID); + enumTestList.add(Language.VI_VN); + enumTestList.add(Language.MS_MY); + enumTestList.add(Language.HI_IN); + enumTestList.add(Language.NL_BE); + enumTestList.add(Language.EL_GR); + enumTestList.add(Language.HU_HU); + enumTestList.add(Language.FI_FI); + enumTestList.add(Language.SK_SK); + enumTestList.add(Language.ES_MX); + enumTestList.add(Language.FR_CA); + enumTestList.add(Language.DE_DE); + enumTestList.add(Language.ES_ES); + enumTestList.add(Language.EN_GB); + enumTestList.add(Language.RU_RU); + enumTestList.add(Language.TR_TR); + enumTestList.add(Language.PL_PL); + enumTestList.add(Language.FR_FR); + enumTestList.add(Language.IT_IT); + enumTestList.add(Language.SV_SE); + enumTestList.add(Language.PT_PT); + enumTestList.add(Language.NL_NL); + enumTestList.add(Language.EN_AU); + enumTestList.add(Language.ZH_CN); + enumTestList.add(Language.ZH_TW); + enumTestList.add(Language.JA_JP); + enumTestList.add(Language.AR_SA); + enumTestList.add(Language.KO_KR); + enumTestList.add(Language.PT_BR); + enumTestList.add(Language.CS_CZ); + enumTestList.add(Language.DA_DK); + enumTestList.add(Language.NO_NO); + enumTestList.add(Language.EN_IN); + enumTestList.add(Language.TH_TH); - List<Language> enumTestList = new ArrayList<Language>(); - - enumTestList.add(Language.EN_US); - enumTestList.add(Language.EN_SA); - enumTestList.add(Language.HE_IL); - enumTestList.add(Language.RO_RO); - enumTestList.add(Language.UK_UA); - enumTestList.add(Language.ID_ID); - enumTestList.add(Language.VI_VN); - enumTestList.add(Language.MS_MY); - enumTestList.add(Language.HI_IN); - enumTestList.add(Language.NL_BE); - enumTestList.add(Language.EL_GR); - enumTestList.add(Language.HU_HU); - enumTestList.add(Language.FI_FI); - enumTestList.add(Language.SK_SK); - enumTestList.add(Language.ES_MX); - enumTestList.add(Language.FR_CA); - enumTestList.add(Language.DE_DE); - enumTestList.add(Language.ES_ES); - enumTestList.add(Language.EN_GB); - enumTestList.add(Language.RU_RU); - enumTestList.add(Language.TR_TR); - enumTestList.add(Language.PL_PL); - enumTestList.add(Language.FR_FR); - enumTestList.add(Language.IT_IT); - enumTestList.add(Language.SV_SE); - enumTestList.add(Language.PT_PT); - enumTestList.add(Language.NL_NL); - enumTestList.add(Language.EN_AU); - enumTestList.add(Language.ZH_CN); - enumTestList.add(Language.ZH_TW); - enumTestList.add(Language.JA_JP); - enumTestList.add(Language.AR_SA); - enumTestList.add(Language.KO_KR); - enumTestList.add(Language.PT_BR); - enumTestList.add(Language.CS_CZ); - enumTestList.add(Language.DA_DK); - enumTestList.add(Language.NO_NO); - enumTestList.add(Language.EN_IN); - enumTestList.add(Language.TH_TH); - - assertTrue("Enum value list does not match enum class list", - enumValueList.containsAll(enumTestList) && enumTestList.containsAll(enumValueList)); - } + assertTrue("Enum value list does not match enum class list", + enumValueList.containsAll(enumTestList) && enumTestList.containsAll(enumValueList)); + } }
\ No newline at end of file diff --git a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/LayoutModeTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/LayoutModeTests.java index 8787ae602..2a04539ad 100644 --- a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/LayoutModeTests.java +++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/LayoutModeTests.java @@ -9,76 +9,74 @@ import java.util.Arrays; import java.util.List; /** - * This is a unit test class for the SmartDeviceLink library project class : + * This is a unit test class for the SmartDeviceLink library project class : * {@link com.smartdevicelink.proxy.rpc.enums.LayoutMode} */ public class LayoutModeTests extends TestCase { - /** - * Verifies that the enum values are not null upon valid assignment. - */ - public void testValidEnums () { - String example = "ICON_ONLY"; - LayoutMode enumIconOnly = LayoutMode.valueForString(example); - example = "ICON_WITH_SEARCH"; - LayoutMode enumIconWithSearch = LayoutMode.valueForString(example); - example = "LIST_ONLY"; - LayoutMode enumListOnly = LayoutMode.valueForString(example); - example = "LIST_WITH_SEARCH"; - LayoutMode enumListWithSearch = LayoutMode.valueForString(example); - example = "KEYBOARD"; - LayoutMode enumKeyboard = LayoutMode.valueForString(example); - - assertNotNull("ICON_ONLY returned null", enumIconOnly); - assertNotNull("ICON_WITH_SEARCH returned null", enumIconWithSearch); - assertNotNull("LIST_ONLY returned null", enumListOnly); - assertNotNull("LIST_WITH_SEARCH returned null", enumListWithSearch); - assertNotNull("KEYBOARD returned null", enumKeyboard); - } + /** + * Verifies that the enum values are not null upon valid assignment. + */ + public void testValidEnums() { + String example = "ICON_ONLY"; + LayoutMode enumIconOnly = LayoutMode.valueForString(example); + example = "ICON_WITH_SEARCH"; + LayoutMode enumIconWithSearch = LayoutMode.valueForString(example); + example = "LIST_ONLY"; + LayoutMode enumListOnly = LayoutMode.valueForString(example); + example = "LIST_WITH_SEARCH"; + LayoutMode enumListWithSearch = LayoutMode.valueForString(example); + example = "KEYBOARD"; + LayoutMode enumKeyboard = LayoutMode.valueForString(example); - /** - * Verifies that an invalid assignment is null. - */ - public void testInvalidEnum () { - String example = "icOn_OnlY"; - try { - LayoutMode temp = LayoutMode.valueForString(example); + assertNotNull("ICON_ONLY returned null", enumIconOnly); + assertNotNull("ICON_WITH_SEARCH returned null", enumIconWithSearch); + assertNotNull("LIST_ONLY returned null", enumListOnly); + assertNotNull("LIST_WITH_SEARCH returned null", enumListWithSearch); + assertNotNull("KEYBOARD returned null", enumKeyboard); + } + + /** + * Verifies that an invalid assignment is null. + */ + public void testInvalidEnum() { + String example = "icOn_OnlY"; + try { + LayoutMode temp = LayoutMode.valueForString(example); assertNull("Result of valueForString should be null.", temp); - } - catch (IllegalArgumentException exception) { + } catch (IllegalArgumentException exception) { fail("Invalid enum throws IllegalArgumentException."); - } - } + } + } - /** - * Verifies that a null assignment is invalid. - */ - public void testNullEnum () { - String example = null; - try { - LayoutMode temp = LayoutMode.valueForString(example); + /** + * Verifies that a null assignment is invalid. + */ + public void testNullEnum() { + String example = null; + try { + LayoutMode temp = LayoutMode.valueForString(example); assertNull("Result of valueForString should be null.", temp); - } - catch (NullPointerException exception) { + } catch (NullPointerException exception) { fail("Null string throws NullPointerException."); - } - } - + } + } + - /** - * Verifies the possible enum values of LayoutMode. - */ - public void testListEnum() { - List<LayoutMode> enumValueList = Arrays.asList(LayoutMode.values()); + /** + * Verifies the possible enum values of LayoutMode. + */ + public void testListEnum() { + List<LayoutMode> enumValueList = Arrays.asList(LayoutMode.values()); - List<LayoutMode> enumTestList = new ArrayList<LayoutMode>(); - enumTestList.add(LayoutMode.ICON_ONLY); - enumTestList.add(LayoutMode.ICON_WITH_SEARCH); - enumTestList.add(LayoutMode.LIST_ONLY); - enumTestList.add(LayoutMode.LIST_WITH_SEARCH); - enumTestList.add(LayoutMode.KEYBOARD); + List<LayoutMode> enumTestList = new ArrayList<LayoutMode>(); + enumTestList.add(LayoutMode.ICON_ONLY); + enumTestList.add(LayoutMode.ICON_WITH_SEARCH); + enumTestList.add(LayoutMode.LIST_ONLY); + enumTestList.add(LayoutMode.LIST_WITH_SEARCH); + enumTestList.add(LayoutMode.KEYBOARD); - assertTrue("Enum value list does not match enum class list", - enumValueList.containsAll(enumTestList) && enumTestList.containsAll(enumValueList)); - } + assertTrue("Enum value list does not match enum class list", + enumValueList.containsAll(enumTestList) && enumTestList.containsAll(enumValueList)); + } }
\ No newline at end of file diff --git a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/LightNameTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/LightNameTests.java index 009a63193..c50931bb9 100644 --- a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/LightNameTests.java +++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/LightNameTests.java @@ -15,247 +15,247 @@ import java.util.List; */ public class LightNameTests extends TestCase { - /** - * Verifies that the enum values are not null upon valid assignment. - */ - public void testValidEnums() { - String example = "FRONT_LEFT_HIGH_BEAM"; - LightName enumFrontLeftHighBeam = LightName.valueForString(example); - example = "FRONT_RIGHT_HIGH_BEAM"; - LightName enumFrontRightHighBeam = LightName.valueForString(example); - example = "FRONT_LEFT_LOW_BEAM"; - LightName enumFrontLeftLowBeam = LightName.valueForString(example); - example = "FRONT_RIGHT_LOW_BEAM"; - LightName enumFrontRightLowBeam = LightName.valueForString(example); - example = "FRONT_LEFT_PARKING_LIGHT"; - LightName enumFrontLeftParkingLight = LightName.valueForString(example); - example = "FRONT_RIGHT_PARKING_LIGHT"; - LightName enumFrontRightParkingLight = LightName.valueForString(example); - example = "FRONT_LEFT_FOG_LIGHT"; - LightName enumFrontLeftFogLight = LightName.valueForString(example); - example = "FRONT_RIGHT_FOG_LIGHT"; - LightName enumFrontRightFogLight = LightName.valueForString(example); - example = "FRONT_LEFT_DAYTIME_RUNNING_LIGHT"; - LightName enumFrontLeftDaytimeRunningLight = LightName.valueForString(example); - example = "FRONT_RIGHT_DAYTIME_RUNNING_LIGHT"; - LightName enumFrontRightDaytimeRunningLight = LightName.valueForString(example); - example = "FRONT_LEFT_TURN_LIGHT"; - LightName enumFrontLeftTurnLight = LightName.valueForString(example); - example = "FRONT_RIGHT_TURN_LIGHT"; - LightName enumFrontRightTurnLight = LightName.valueForString(example); - example = "REAR_LEFT_FOG_LIGHT"; - LightName enumRearLeftFogLight = LightName.valueForString(example); - example = "REAR_RIGHT_FOG_LIGHT"; - LightName enumRearRightFogLight = LightName.valueForString(example); - example = "REAR_LEFT_TAIL_LIGHT"; - LightName enumRearLeftTailLight = LightName.valueForString(example); - example = "REAR_RIGHT_TAIL_LIGHT"; - LightName enumRearRightTailLight = LightName.valueForString(example); - example = "REAR_LEFT_BRAKE_LIGHT"; - LightName enumRearLeftBrakeLight = LightName.valueForString(example); - example = "REAR_RIGHT_BRAKE_LIGHT"; - LightName enumRearRightBrakeLight = LightName.valueForString(example); - example = "REAR_LEFT_TURN_LIGHT"; - LightName enumRearLeftTurnLight = LightName.valueForString(example); - example = "REAR_RIGHT_TURN_LIGHT"; - LightName enumRearRightTurnLight = LightName.valueForString(example); - example = "REAR_REGISTRATION_PLATE_LIGHT"; - LightName enumRearRegistrationPlateLight = LightName.valueForString(example); - example = "HIGH_BEAMS"; - LightName enumHighBeams = LightName.valueForString(example); - example = "LOW_BEAMS"; - LightName enumLowBeams = LightName.valueForString(example); - example = "FOG_LIGHTS"; - LightName enumFogLights = LightName.valueForString(example); - example = "RUNNING_LIGHTS"; - LightName enumRunningLights = LightName.valueForString(example); - example = "PARKING_LIGHTS"; - LightName enumParkingLights = LightName.valueForString(example); - example = "BRAKE_LIGHTS"; - LightName enumBrakeLights = LightName.valueForString(example); - example = "REAR_REVERSING_LIGHTS"; - LightName enumRearReversingLights = LightName.valueForString(example); - example = "SIDE_MARKER_LIGHTS"; - LightName enumSideMarkerLights = LightName.valueForString(example); - example = "LEFT_TURN_LIGHTS"; - LightName enumLeftTurnLights = LightName.valueForString(example); - example = "RIGHT_TURN_LIGHTS"; - LightName enumRightTurnLights = LightName.valueForString(example); - example = "HAZARD_LIGHTS"; - LightName enumHazardLights = LightName.valueForString(example); + /** + * Verifies that the enum values are not null upon valid assignment. + */ + public void testValidEnums() { + String example = "FRONT_LEFT_HIGH_BEAM"; + LightName enumFrontLeftHighBeam = LightName.valueForString(example); + example = "FRONT_RIGHT_HIGH_BEAM"; + LightName enumFrontRightHighBeam = LightName.valueForString(example); + example = "FRONT_LEFT_LOW_BEAM"; + LightName enumFrontLeftLowBeam = LightName.valueForString(example); + example = "FRONT_RIGHT_LOW_BEAM"; + LightName enumFrontRightLowBeam = LightName.valueForString(example); + example = "FRONT_LEFT_PARKING_LIGHT"; + LightName enumFrontLeftParkingLight = LightName.valueForString(example); + example = "FRONT_RIGHT_PARKING_LIGHT"; + LightName enumFrontRightParkingLight = LightName.valueForString(example); + example = "FRONT_LEFT_FOG_LIGHT"; + LightName enumFrontLeftFogLight = LightName.valueForString(example); + example = "FRONT_RIGHT_FOG_LIGHT"; + LightName enumFrontRightFogLight = LightName.valueForString(example); + example = "FRONT_LEFT_DAYTIME_RUNNING_LIGHT"; + LightName enumFrontLeftDaytimeRunningLight = LightName.valueForString(example); + example = "FRONT_RIGHT_DAYTIME_RUNNING_LIGHT"; + LightName enumFrontRightDaytimeRunningLight = LightName.valueForString(example); + example = "FRONT_LEFT_TURN_LIGHT"; + LightName enumFrontLeftTurnLight = LightName.valueForString(example); + example = "FRONT_RIGHT_TURN_LIGHT"; + LightName enumFrontRightTurnLight = LightName.valueForString(example); + example = "REAR_LEFT_FOG_LIGHT"; + LightName enumRearLeftFogLight = LightName.valueForString(example); + example = "REAR_RIGHT_FOG_LIGHT"; + LightName enumRearRightFogLight = LightName.valueForString(example); + example = "REAR_LEFT_TAIL_LIGHT"; + LightName enumRearLeftTailLight = LightName.valueForString(example); + example = "REAR_RIGHT_TAIL_LIGHT"; + LightName enumRearRightTailLight = LightName.valueForString(example); + example = "REAR_LEFT_BRAKE_LIGHT"; + LightName enumRearLeftBrakeLight = LightName.valueForString(example); + example = "REAR_RIGHT_BRAKE_LIGHT"; + LightName enumRearRightBrakeLight = LightName.valueForString(example); + example = "REAR_LEFT_TURN_LIGHT"; + LightName enumRearLeftTurnLight = LightName.valueForString(example); + example = "REAR_RIGHT_TURN_LIGHT"; + LightName enumRearRightTurnLight = LightName.valueForString(example); + example = "REAR_REGISTRATION_PLATE_LIGHT"; + LightName enumRearRegistrationPlateLight = LightName.valueForString(example); + example = "HIGH_BEAMS"; + LightName enumHighBeams = LightName.valueForString(example); + example = "LOW_BEAMS"; + LightName enumLowBeams = LightName.valueForString(example); + example = "FOG_LIGHTS"; + LightName enumFogLights = LightName.valueForString(example); + example = "RUNNING_LIGHTS"; + LightName enumRunningLights = LightName.valueForString(example); + example = "PARKING_LIGHTS"; + LightName enumParkingLights = LightName.valueForString(example); + example = "BRAKE_LIGHTS"; + LightName enumBrakeLights = LightName.valueForString(example); + example = "REAR_REVERSING_LIGHTS"; + LightName enumRearReversingLights = LightName.valueForString(example); + example = "SIDE_MARKER_LIGHTS"; + LightName enumSideMarkerLights = LightName.valueForString(example); + example = "LEFT_TURN_LIGHTS"; + LightName enumLeftTurnLights = LightName.valueForString(example); + example = "RIGHT_TURN_LIGHTS"; + LightName enumRightTurnLights = LightName.valueForString(example); + example = "HAZARD_LIGHTS"; + LightName enumHazardLights = LightName.valueForString(example); - example = "REAR_CARGO_LIGHTS"; - LightName enumRearCargoLights = LightName.valueForString(example); - example = "REAR_TRUCK_BED_LIGHTS"; - LightName enumRearTruckBedLights = LightName.valueForString(example); - example = "REAR_TRAILER_LIGHTS"; - LightName enumRearTrailerLights = LightName.valueForString(example); - example = "LEFT_SPOT_LIGHTS"; - LightName enumLeftSpotLights = LightName.valueForString(example); - example = "RIGHT_SPOT_LIGHTS"; - LightName enumRightSpotLights = LightName.valueForString(example); - example = "LEFT_PUDDLE_LIGHTS"; - LightName enumLeftPuddleLights = LightName.valueForString(example); - example = "RIGHT_PUDDLE_LIGHTS"; - LightName enumRightPuddleLights = LightName.valueForString(example); - example = "AMBIENT_LIGHTS"; - LightName enumAmbientLights = LightName.valueForString(example); - example = "OVERHEAD_LIGHTS"; - LightName enumOverheadLights = LightName.valueForString(example); - example = "READING_LIGHTS"; - LightName enumReadingLights = LightName.valueForString(example); - example = "TRUNK_LIGHTS"; - LightName enumTrunkLights = LightName.valueForString(example); - example = "EXTERIOR_FRONT_LIGHTS"; - LightName enumExteriorFrontLights = LightName.valueForString(example); - example = "EXTERIOR_REAR_LIGHTS"; - LightName enumExteriorRearLights = LightName.valueForString(example); - example = "EXTERIOR_LEFT_LIGHTS"; - LightName enumExteriorLeftLights = LightName.valueForString(example); - example = "EXTERIOR_RIGHT_LIGHTS"; - LightName enumExteriorRightLights = LightName.valueForString(example); - example = "EXTERIOR_ALL_LIGHTS"; - LightName enumExteriorAllLights = LightName.valueForString(example); + example = "REAR_CARGO_LIGHTS"; + LightName enumRearCargoLights = LightName.valueForString(example); + example = "REAR_TRUCK_BED_LIGHTS"; + LightName enumRearTruckBedLights = LightName.valueForString(example); + example = "REAR_TRAILER_LIGHTS"; + LightName enumRearTrailerLights = LightName.valueForString(example); + example = "LEFT_SPOT_LIGHTS"; + LightName enumLeftSpotLights = LightName.valueForString(example); + example = "RIGHT_SPOT_LIGHTS"; + LightName enumRightSpotLights = LightName.valueForString(example); + example = "LEFT_PUDDLE_LIGHTS"; + LightName enumLeftPuddleLights = LightName.valueForString(example); + example = "RIGHT_PUDDLE_LIGHTS"; + LightName enumRightPuddleLights = LightName.valueForString(example); + example = "AMBIENT_LIGHTS"; + LightName enumAmbientLights = LightName.valueForString(example); + example = "OVERHEAD_LIGHTS"; + LightName enumOverheadLights = LightName.valueForString(example); + example = "READING_LIGHTS"; + LightName enumReadingLights = LightName.valueForString(example); + example = "TRUNK_LIGHTS"; + LightName enumTrunkLights = LightName.valueForString(example); + example = "EXTERIOR_FRONT_LIGHTS"; + LightName enumExteriorFrontLights = LightName.valueForString(example); + example = "EXTERIOR_REAR_LIGHTS"; + LightName enumExteriorRearLights = LightName.valueForString(example); + example = "EXTERIOR_LEFT_LIGHTS"; + LightName enumExteriorLeftLights = LightName.valueForString(example); + example = "EXTERIOR_RIGHT_LIGHTS"; + LightName enumExteriorRightLights = LightName.valueForString(example); + example = "EXTERIOR_ALL_LIGHTS"; + LightName enumExteriorAllLights = LightName.valueForString(example); - assertNotNull("FRONT_LEFT_HIGH_BEAM returned null", enumFrontLeftHighBeam); - assertNotNull("FRONT_RIGHT_HIGH_BEAM returned null", enumFrontRightHighBeam); - assertNotNull("FRONT_LEFT_LOW_BEAM returned null", enumFrontLeftLowBeam); - assertNotNull("FRONT_RIGHT_LOW_BEAM returned null", enumFrontRightLowBeam); - assertNotNull("FRONT_LEFT_PARKING_LIGHT returned null", enumFrontLeftParkingLight); - assertNotNull("FRONT_RIGHT_PARKING_LIGHT returned null", enumFrontRightParkingLight); - assertNotNull("FRONT_LEFT_FOG_LIGHT returned null", enumFrontLeftFogLight); - assertNotNull("FRONT_RIGHT_FOG_LIGHT returned null", enumFrontRightFogLight); - assertNotNull("FRONT_LEFT_DAYTIME_RUNNING_LIGHT returned null", enumFrontLeftDaytimeRunningLight); - assertNotNull("FRONT_RIGHT_DAYTIME_RUNNING_LIGHT returned null", enumFrontRightDaytimeRunningLight); + assertNotNull("FRONT_LEFT_HIGH_BEAM returned null", enumFrontLeftHighBeam); + assertNotNull("FRONT_RIGHT_HIGH_BEAM returned null", enumFrontRightHighBeam); + assertNotNull("FRONT_LEFT_LOW_BEAM returned null", enumFrontLeftLowBeam); + assertNotNull("FRONT_RIGHT_LOW_BEAM returned null", enumFrontRightLowBeam); + assertNotNull("FRONT_LEFT_PARKING_LIGHT returned null", enumFrontLeftParkingLight); + assertNotNull("FRONT_RIGHT_PARKING_LIGHT returned null", enumFrontRightParkingLight); + assertNotNull("FRONT_LEFT_FOG_LIGHT returned null", enumFrontLeftFogLight); + assertNotNull("FRONT_RIGHT_FOG_LIGHT returned null", enumFrontRightFogLight); + assertNotNull("FRONT_LEFT_DAYTIME_RUNNING_LIGHT returned null", enumFrontLeftDaytimeRunningLight); + assertNotNull("FRONT_RIGHT_DAYTIME_RUNNING_LIGHT returned null", enumFrontRightDaytimeRunningLight); - assertNotNull("FRONT_LEFT_TURN_LIGHT returned null", enumFrontLeftTurnLight); - assertNotNull("FRONT_RIGHT_TURN_LIGHT returned null", enumFrontRightTurnLight); - assertNotNull("REAR_LEFT_FOG_LIGHT returned null", enumRearLeftFogLight); - assertNotNull("REAR_RIGHT_FOG_LIGHT returned null", enumRearRightFogLight); - assertNotNull("REAR_LEFT_TAIL_LIGHT returned null", enumRearLeftTailLight); - assertNotNull("REAR_RIGHT_TAIL_LIGHT returned null", enumRearRightTailLight); - assertNotNull("REAR_LEFT_BRAKE_LIGHT returned null", enumRearLeftBrakeLight); - assertNotNull("REAR_RIGHT_BRAKE_LIGHT returned null", enumRearRightBrakeLight); - assertNotNull("REAR_LEFT_TURN_LIGHT returned null", enumRearLeftTurnLight); - assertNotNull("REAR_RIGHT_TURN_LIGHT returned null", enumRearRightTurnLight); - assertNotNull("REAR_REGISTRATION_PLATE_LIGHT returned null", enumRearRegistrationPlateLight); + assertNotNull("FRONT_LEFT_TURN_LIGHT returned null", enumFrontLeftTurnLight); + assertNotNull("FRONT_RIGHT_TURN_LIGHT returned null", enumFrontRightTurnLight); + assertNotNull("REAR_LEFT_FOG_LIGHT returned null", enumRearLeftFogLight); + assertNotNull("REAR_RIGHT_FOG_LIGHT returned null", enumRearRightFogLight); + assertNotNull("REAR_LEFT_TAIL_LIGHT returned null", enumRearLeftTailLight); + assertNotNull("REAR_RIGHT_TAIL_LIGHT returned null", enumRearRightTailLight); + assertNotNull("REAR_LEFT_BRAKE_LIGHT returned null", enumRearLeftBrakeLight); + assertNotNull("REAR_RIGHT_BRAKE_LIGHT returned null", enumRearRightBrakeLight); + assertNotNull("REAR_LEFT_TURN_LIGHT returned null", enumRearLeftTurnLight); + assertNotNull("REAR_RIGHT_TURN_LIGHT returned null", enumRearRightTurnLight); + assertNotNull("REAR_REGISTRATION_PLATE_LIGHT returned null", enumRearRegistrationPlateLight); - assertNotNull("HIGH_BEAMS returned null", enumHighBeams); - assertNotNull("LOW_BEAMS returned null", enumLowBeams); - assertNotNull("FOG_LIGHTS returned null", enumFogLights); - assertNotNull("RUNNING_LIGHTS returned null", enumRunningLights); - assertNotNull("PARKING_LIGHTS returned null", enumParkingLights); - assertNotNull("BRAKE_LIGHTS returned null", enumBrakeLights); + assertNotNull("HIGH_BEAMS returned null", enumHighBeams); + assertNotNull("LOW_BEAMS returned null", enumLowBeams); + assertNotNull("FOG_LIGHTS returned null", enumFogLights); + assertNotNull("RUNNING_LIGHTS returned null", enumRunningLights); + assertNotNull("PARKING_LIGHTS returned null", enumParkingLights); + assertNotNull("BRAKE_LIGHTS returned null", enumBrakeLights); - assertNotNull("REAR_REVERSING_LIGHTS returned null", enumRearReversingLights); - assertNotNull("SIDE_MARKER_LIGHTS returned null", enumSideMarkerLights); - assertNotNull("LEFT_TURN_LIGHTS returned null", enumLeftTurnLights); - assertNotNull("RIGHT_TURN_LIGHTS returned null", enumRightTurnLights); - assertNotNull("HAZARD_LIGHTS returned null", enumHazardLights); - assertNotNull("REAR_CARGO_LIGHTS returned null", enumRearCargoLights); - assertNotNull("REAR_TRUCK_BED_LIGHTS returned null", enumRearTruckBedLights); - assertNotNull("REAR_TRAILER_LIGHTS returned null", enumRearTrailerLights); - assertNotNull("LEFT_SPOT_LIGHTS returned null", enumLeftSpotLights); - assertNotNull("RIGHT_SPOT_LIGHTS returned null", enumRightSpotLights); - assertNotNull("LEFT_PUDDLE_LIGHTS returned null", enumLeftPuddleLights); - assertNotNull("RIGHT_PUDDLE_LIGHTS returned null", enumRightPuddleLights); + assertNotNull("REAR_REVERSING_LIGHTS returned null", enumRearReversingLights); + assertNotNull("SIDE_MARKER_LIGHTS returned null", enumSideMarkerLights); + assertNotNull("LEFT_TURN_LIGHTS returned null", enumLeftTurnLights); + assertNotNull("RIGHT_TURN_LIGHTS returned null", enumRightTurnLights); + assertNotNull("HAZARD_LIGHTS returned null", enumHazardLights); + assertNotNull("REAR_CARGO_LIGHTS returned null", enumRearCargoLights); + assertNotNull("REAR_TRUCK_BED_LIGHTS returned null", enumRearTruckBedLights); + assertNotNull("REAR_TRAILER_LIGHTS returned null", enumRearTrailerLights); + assertNotNull("LEFT_SPOT_LIGHTS returned null", enumLeftSpotLights); + assertNotNull("RIGHT_SPOT_LIGHTS returned null", enumRightSpotLights); + assertNotNull("LEFT_PUDDLE_LIGHTS returned null", enumLeftPuddleLights); + assertNotNull("RIGHT_PUDDLE_LIGHTS returned null", enumRightPuddleLights); - assertNotNull("AMBIENT_LIGHTS returned null", enumAmbientLights); - assertNotNull("OVERHEAD_LIGHTS returned null", enumOverheadLights); - assertNotNull("READING_LIGHTS returned null", enumReadingLights); - assertNotNull("TRUNK_LIGHTS returned null", enumTrunkLights); + assertNotNull("AMBIENT_LIGHTS returned null", enumAmbientLights); + assertNotNull("OVERHEAD_LIGHTS returned null", enumOverheadLights); + assertNotNull("READING_LIGHTS returned null", enumReadingLights); + assertNotNull("TRUNK_LIGHTS returned null", enumTrunkLights); - assertNotNull("EXTERIOR_FRONT_LIGHTS returned null", enumExteriorFrontLights); - assertNotNull("EXTERIOR_REAR_LIGHTS returned null", enumExteriorRearLights); - assertNotNull("EXTERIOR_LEFT_LIGHTS returned null", enumExteriorLeftLights); - assertNotNull("EXTERIOR_RIGHT_LIGHTS returned null", enumExteriorRightLights); + assertNotNull("EXTERIOR_FRONT_LIGHTS returned null", enumExteriorFrontLights); + assertNotNull("EXTERIOR_REAR_LIGHTS returned null", enumExteriorRearLights); + assertNotNull("EXTERIOR_LEFT_LIGHTS returned null", enumExteriorLeftLights); + assertNotNull("EXTERIOR_RIGHT_LIGHTS returned null", enumExteriorRightLights); - assertNotNull("EXTERIOR_ALL_LIGHTS returned null", enumExteriorAllLights); - } + assertNotNull("EXTERIOR_ALL_LIGHTS returned null", enumExteriorAllLights); + } - /** - * Verifies that an invalid assignment is null. - */ - public void testInvalidEnum() { - String example = "fRONT_LEFT_HIGH_BEAM"; - try { - LightName temp = LightName.valueForString(example); - assertNull("Result of valueForString should be null.", temp); - } catch (IllegalArgumentException exception) { - fail("Invalid enum throws IllegalArgumentException."); - } - } + /** + * Verifies that an invalid assignment is null. + */ + public void testInvalidEnum() { + String example = "fRONT_LEFT_HIGH_BEAM"; + try { + LightName temp = LightName.valueForString(example); + assertNull("Result of valueForString should be null.", temp); + } catch (IllegalArgumentException exception) { + fail("Invalid enum throws IllegalArgumentException."); + } + } - /** - * Verifies that a null assignment is invalid. - */ - public void testNullEnum() { - String example = null; - try { - LightName temp = LightName.valueForString(example); - assertNull("Result of valueForString should be null.", temp); - } catch (NullPointerException exception) { - fail("Null string throws NullPointerException."); - } - } + /** + * Verifies that a null assignment is invalid. + */ + public void testNullEnum() { + String example = null; + try { + LightName temp = LightName.valueForString(example); + assertNull("Result of valueForString should be null.", temp); + } catch (NullPointerException exception) { + fail("Null string throws NullPointerException."); + } + } - /** - * Verifies the possible enum values of LightName. - */ - public void testListEnum() { - List<LightName> enumValueList = Arrays.asList(LightName.values()); + /** + * Verifies the possible enum values of LightName. + */ + public void testListEnum() { + List<LightName> enumValueList = Arrays.asList(LightName.values()); - List<LightName> enumTestList = new ArrayList<LightName>(); - enumTestList.add(LightName.FRONT_LEFT_HIGH_BEAM); - enumTestList.add(LightName.FRONT_RIGHT_HIGH_BEAM); - enumTestList.add(LightName.FRONT_LEFT_LOW_BEAM); - enumTestList.add(LightName.FRONT_RIGHT_LOW_BEAM); - enumTestList.add(LightName.FRONT_LEFT_PARKING_LIGHT); - enumTestList.add(LightName.FRONT_RIGHT_PARKING_LIGHT); - enumTestList.add(LightName.FRONT_LEFT_FOG_LIGHT); - enumTestList.add(LightName.FRONT_RIGHT_FOG_LIGHT); - enumTestList.add(LightName.FRONT_LEFT_DAYTIME_RUNNING_LIGHT); - enumTestList.add(LightName.FRONT_RIGHT_DAYTIME_RUNNING_LIGHT); - enumTestList.add(LightName.FRONT_LEFT_TURN_LIGHT); - enumTestList.add(LightName.FRONT_RIGHT_TURN_LIGHT); - enumTestList.add(LightName.REAR_LEFT_FOG_LIGHT); - enumTestList.add(LightName.REAR_RIGHT_FOG_LIGHT); - enumTestList.add(LightName.REAR_LEFT_TAIL_LIGHT); - enumTestList.add(LightName.REAR_RIGHT_TAIL_LIGHT); - enumTestList.add(LightName.REAR_LEFT_BRAKE_LIGHT); - enumTestList.add(LightName.REAR_RIGHT_BRAKE_LIGHT); - enumTestList.add(LightName.REAR_LEFT_TURN_LIGHT); - enumTestList.add(LightName.REAR_RIGHT_TURN_LIGHT); - enumTestList.add(LightName.REAR_REGISTRATION_PLATE_LIGHT); - enumTestList.add(LightName.HIGH_BEAMS); - enumTestList.add(LightName.LOW_BEAMS); - enumTestList.add(LightName.FOG_LIGHTS); - enumTestList.add(LightName.RUNNING_LIGHTS); - enumTestList.add(LightName.PARKING_LIGHTS); - enumTestList.add(LightName.BRAKE_LIGHTS); - enumTestList.add(LightName.REAR_REVERSING_LIGHTS); - enumTestList.add(LightName.SIDE_MARKER_LIGHTS); - enumTestList.add(LightName.LEFT_TURN_LIGHTS); - enumTestList.add(LightName.RIGHT_TURN_LIGHTS); - enumTestList.add(LightName.HAZARD_LIGHTS); - enumTestList.add(LightName.REAR_CARGO_LIGHTS); - enumTestList.add(LightName.REAR_TRUCK_BED_LIGHTS); - enumTestList.add(LightName.REAR_TRAILER_LIGHTS); - enumTestList.add(LightName.LEFT_SPOT_LIGHTS); - enumTestList.add(LightName.RIGHT_SPOT_LIGHTS); - enumTestList.add(LightName.LEFT_PUDDLE_LIGHTS); - enumTestList.add(LightName.RIGHT_PUDDLE_LIGHTS); - enumTestList.add(LightName.AMBIENT_LIGHTS); - enumTestList.add(LightName.OVERHEAD_LIGHTS); - enumTestList.add(LightName.READING_LIGHTS); - enumTestList.add(LightName.TRUNK_LIGHTS); - enumTestList.add(LightName.EXTERIOR_FRONT_LIGHTS); - enumTestList.add(LightName.EXTERIOR_REAR_LIGHTS); - enumTestList.add(LightName.EXTERIOR_LEFT_LIGHTS); - enumTestList.add(LightName.EXTERIOR_RIGHT_LIGHTS); - enumTestList.add(LightName.EXTERIOR_ALL_LIGHTS); + List<LightName> enumTestList = new ArrayList<LightName>(); + enumTestList.add(LightName.FRONT_LEFT_HIGH_BEAM); + enumTestList.add(LightName.FRONT_RIGHT_HIGH_BEAM); + enumTestList.add(LightName.FRONT_LEFT_LOW_BEAM); + enumTestList.add(LightName.FRONT_RIGHT_LOW_BEAM); + enumTestList.add(LightName.FRONT_LEFT_PARKING_LIGHT); + enumTestList.add(LightName.FRONT_RIGHT_PARKING_LIGHT); + enumTestList.add(LightName.FRONT_LEFT_FOG_LIGHT); + enumTestList.add(LightName.FRONT_RIGHT_FOG_LIGHT); + enumTestList.add(LightName.FRONT_LEFT_DAYTIME_RUNNING_LIGHT); + enumTestList.add(LightName.FRONT_RIGHT_DAYTIME_RUNNING_LIGHT); + enumTestList.add(LightName.FRONT_LEFT_TURN_LIGHT); + enumTestList.add(LightName.FRONT_RIGHT_TURN_LIGHT); + enumTestList.add(LightName.REAR_LEFT_FOG_LIGHT); + enumTestList.add(LightName.REAR_RIGHT_FOG_LIGHT); + enumTestList.add(LightName.REAR_LEFT_TAIL_LIGHT); + enumTestList.add(LightName.REAR_RIGHT_TAIL_LIGHT); + enumTestList.add(LightName.REAR_LEFT_BRAKE_LIGHT); + enumTestList.add(LightName.REAR_RIGHT_BRAKE_LIGHT); + enumTestList.add(LightName.REAR_LEFT_TURN_LIGHT); + enumTestList.add(LightName.REAR_RIGHT_TURN_LIGHT); + enumTestList.add(LightName.REAR_REGISTRATION_PLATE_LIGHT); + enumTestList.add(LightName.HIGH_BEAMS); + enumTestList.add(LightName.LOW_BEAMS); + enumTestList.add(LightName.FOG_LIGHTS); + enumTestList.add(LightName.RUNNING_LIGHTS); + enumTestList.add(LightName.PARKING_LIGHTS); + enumTestList.add(LightName.BRAKE_LIGHTS); + enumTestList.add(LightName.REAR_REVERSING_LIGHTS); + enumTestList.add(LightName.SIDE_MARKER_LIGHTS); + enumTestList.add(LightName.LEFT_TURN_LIGHTS); + enumTestList.add(LightName.RIGHT_TURN_LIGHTS); + enumTestList.add(LightName.HAZARD_LIGHTS); + enumTestList.add(LightName.REAR_CARGO_LIGHTS); + enumTestList.add(LightName.REAR_TRUCK_BED_LIGHTS); + enumTestList.add(LightName.REAR_TRAILER_LIGHTS); + enumTestList.add(LightName.LEFT_SPOT_LIGHTS); + enumTestList.add(LightName.RIGHT_SPOT_LIGHTS); + enumTestList.add(LightName.LEFT_PUDDLE_LIGHTS); + enumTestList.add(LightName.RIGHT_PUDDLE_LIGHTS); + enumTestList.add(LightName.AMBIENT_LIGHTS); + enumTestList.add(LightName.OVERHEAD_LIGHTS); + enumTestList.add(LightName.READING_LIGHTS); + enumTestList.add(LightName.TRUNK_LIGHTS); + enumTestList.add(LightName.EXTERIOR_FRONT_LIGHTS); + enumTestList.add(LightName.EXTERIOR_REAR_LIGHTS); + enumTestList.add(LightName.EXTERIOR_LEFT_LIGHTS); + enumTestList.add(LightName.EXTERIOR_RIGHT_LIGHTS); + enumTestList.add(LightName.EXTERIOR_ALL_LIGHTS); - assertTrue("Enum value list does not match enum class list", - enumValueList.containsAll(enumTestList) && enumTestList.containsAll(enumValueList)); - } + assertTrue("Enum value list does not match enum class list", + enumValueList.containsAll(enumTestList) && enumTestList.containsAll(enumValueList)); + } }
\ No newline at end of file diff --git a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/LightStatusTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/LightStatusTests.java index 607160e26..c95f26d78 100644 --- a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/LightStatusTests.java +++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/LightStatusTests.java @@ -15,72 +15,72 @@ import java.util.List; */ public class LightStatusTests extends TestCase { - /** - * Verifies that the enum values are not null upon valid assignment. - */ - public void testValidEnums() { - String example = "ON"; - LightStatus enumOn = LightStatus.valueForString(example); - example = "OFF"; - LightStatus enumOff = LightStatus.valueForString(example); - example = "RAMP_UP"; - LightStatus enumRampUp = LightStatus.valueForString(example); - example = "RAMP_DOWN"; - LightStatus enumRampDown = LightStatus.valueForString(example); - example = "UNKNOWN"; - LightStatus enumUnknown = LightStatus.valueForString(example); - example = "INVALID"; - LightStatus enumInvalid = LightStatus.valueForString(example); + /** + * Verifies that the enum values are not null upon valid assignment. + */ + public void testValidEnums() { + String example = "ON"; + LightStatus enumOn = LightStatus.valueForString(example); + example = "OFF"; + LightStatus enumOff = LightStatus.valueForString(example); + example = "RAMP_UP"; + LightStatus enumRampUp = LightStatus.valueForString(example); + example = "RAMP_DOWN"; + LightStatus enumRampDown = LightStatus.valueForString(example); + example = "UNKNOWN"; + LightStatus enumUnknown = LightStatus.valueForString(example); + example = "INVALID"; + LightStatus enumInvalid = LightStatus.valueForString(example); - assertNotNull("ON returned null", enumOn); - assertNotNull("OFF returned null", enumOff); - assertNotNull("RAMP_UP returned null", enumRampUp); - assertNotNull("RAMP_DOWN returned null", enumRampDown); - assertNotNull("UNKNOWN returned null", enumUnknown); - assertNotNull("INVALID returned null", enumInvalid); - } + assertNotNull("ON returned null", enumOn); + assertNotNull("OFF returned null", enumOff); + assertNotNull("RAMP_UP returned null", enumRampUp); + assertNotNull("RAMP_DOWN returned null", enumRampDown); + assertNotNull("UNKNOWN returned null", enumUnknown); + assertNotNull("INVALID returned null", enumInvalid); + } - /** - * Verifies that an invalid assignment is null. - */ - public void testInvalidEnum() { - String example = "oN"; - try { - LightStatus temp = LightStatus.valueForString(example); - assertNull("Result of valueForString should be null.", temp); - } catch (IllegalArgumentException exception) { - fail("Invalid enum throws IllegalArgumentException."); - } - } + /** + * Verifies that an invalid assignment is null. + */ + public void testInvalidEnum() { + String example = "oN"; + try { + LightStatus temp = LightStatus.valueForString(example); + assertNull("Result of valueForString should be null.", temp); + } catch (IllegalArgumentException exception) { + fail("Invalid enum throws IllegalArgumentException."); + } + } - /** - * Verifies that a null assignment is invalid. - */ - public void testNullEnum() { - String example = null; - try { - LightStatus temp = LightStatus.valueForString(example); - assertNull("Result of valueForString should be null.", temp); - } catch (NullPointerException exception) { - fail("Null string throws NullPointerException."); - } - } + /** + * Verifies that a null assignment is invalid. + */ + public void testNullEnum() { + String example = null; + try { + LightStatus temp = LightStatus.valueForString(example); + assertNull("Result of valueForString should be null.", temp); + } catch (NullPointerException exception) { + fail("Null string throws NullPointerException."); + } + } - /** - * Verifies the possible enum values of LightStatus. - */ - public void testListEnum() { - List<LightStatus> enumValueList = Arrays.asList(LightStatus.values()); + /** + * Verifies the possible enum values of LightStatus. + */ + public void testListEnum() { + List<LightStatus> enumValueList = Arrays.asList(LightStatus.values()); - List<LightStatus> enumTestList = new ArrayList<LightStatus>(); - enumTestList.add(LightStatus.ON); - enumTestList.add(LightStatus.OFF); - enumTestList.add(LightStatus.RAMP_UP); - enumTestList.add(LightStatus.RAMP_DOWN); - enumTestList.add(LightStatus.UNKNOWN); - enumTestList.add(LightStatus.INVALID); + List<LightStatus> enumTestList = new ArrayList<LightStatus>(); + enumTestList.add(LightStatus.ON); + enumTestList.add(LightStatus.OFF); + enumTestList.add(LightStatus.RAMP_UP); + enumTestList.add(LightStatus.RAMP_DOWN); + enumTestList.add(LightStatus.UNKNOWN); + enumTestList.add(LightStatus.INVALID); - assertTrue("Enum value list does not match enum class list", - enumValueList.containsAll(enumTestList) && enumTestList.containsAll(enumValueList)); - } + assertTrue("Enum value list does not match enum class list", + enumValueList.containsAll(enumTestList) && enumTestList.containsAll(enumValueList)); + } }
\ No newline at end of file diff --git a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/LockScreenStatusTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/LockScreenStatusTests.java index 2c9ced9b8..00e5f823d 100644 --- a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/LockScreenStatusTests.java +++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/LockScreenStatusTests.java @@ -9,67 +9,65 @@ import java.util.Arrays; import java.util.List; /** - * This is a unit test class for the SmartDeviceLink library project class : + * This is a unit test class for the SmartDeviceLink library project class : * {@link com.smartdevicelink.proxy.rpc.enums.LockScreenStatus} */ public class LockScreenStatusTests extends TestCase { - /** - * Verifies that the enum values are not null upon valid assignment. - */ - public void testValidEnums () { - String example = "REQUIRED"; - LockScreenStatus enumRequired = LockScreenStatus.valueForString(example); - example = "OPTIONAL"; - LockScreenStatus enumOptional = LockScreenStatus.valueForString(example); - example = "OFF"; - LockScreenStatus enumOff = LockScreenStatus.valueForString(example); - - assertNotNull("REQUIRED returned null", enumRequired); - assertNotNull("OPTIONAL returned null", enumOptional); - assertNotNull("OFF returned null", enumOff); - } + /** + * Verifies that the enum values are not null upon valid assignment. + */ + public void testValidEnums() { + String example = "REQUIRED"; + LockScreenStatus enumRequired = LockScreenStatus.valueForString(example); + example = "OPTIONAL"; + LockScreenStatus enumOptional = LockScreenStatus.valueForString(example); + example = "OFF"; + LockScreenStatus enumOff = LockScreenStatus.valueForString(example); - /** - * Verifies that an invalid assignment is null. - */ - public void testInvalidEnum () { - String example = "ReqUireD"; - try { - LockScreenStatus temp = LockScreenStatus.valueForString(example); + assertNotNull("REQUIRED returned null", enumRequired); + assertNotNull("OPTIONAL returned null", enumOptional); + assertNotNull("OFF returned null", enumOff); + } + + /** + * Verifies that an invalid assignment is null. + */ + public void testInvalidEnum() { + String example = "ReqUireD"; + try { + LockScreenStatus temp = LockScreenStatus.valueForString(example); assertNull("Result of valueForString should be null.", temp); - } - catch (IllegalArgumentException exception) { + } catch (IllegalArgumentException exception) { fail("Invalid enum throws IllegalArgumentException."); - } - } + } + } - /** - * Verifies that a null assignment is invalid. - */ - public void testNullEnum () { - String example = null; - try { - LockScreenStatus temp = LockScreenStatus.valueForString(example); + /** + * Verifies that a null assignment is invalid. + */ + public void testNullEnum() { + String example = null; + try { + LockScreenStatus temp = LockScreenStatus.valueForString(example); assertNull("Result of valueForString should be null.", temp); - } - catch (NullPointerException exception) { + } catch (NullPointerException exception) { fail("Null string throws NullPointerException."); - } - } + } + } - /** - * Verifies the possible enum values of LockScreenStatus. - */ - public void testListEnum() { - List<LockScreenStatus> enumValueList = Arrays.asList(LockScreenStatus.values()); + /** + * Verifies the possible enum values of LockScreenStatus. + */ + public void testListEnum() { + List<LockScreenStatus> enumValueList = Arrays.asList(LockScreenStatus.values()); - List<LockScreenStatus> enumTestList = new ArrayList<LockScreenStatus>(); - enumTestList.add(LockScreenStatus.REQUIRED); - enumTestList.add(LockScreenStatus.OPTIONAL); - enumTestList.add(LockScreenStatus.OFF); + List<LockScreenStatus> enumTestList = new ArrayList<LockScreenStatus>(); + enumTestList.add(LockScreenStatus.REQUIRED); + enumTestList.add(LockScreenStatus.OPTIONAL); + enumTestList.add(LockScreenStatus.OFF); - assertTrue("Enum value list does not match enum class list", - enumValueList.containsAll(enumTestList) && enumTestList.containsAll(enumValueList)); - } + assertTrue("Enum value list does not match enum class list", + enumValueList.containsAll(enumTestList) && enumTestList.containsAll(enumValueList)); + } }
\ No newline at end of file diff --git a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/MaintenanceModeStatusTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/MaintenanceModeStatusTests.java index 9254cd2b2..510d0c5d3 100644 --- a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/MaintenanceModeStatusTests.java +++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/MaintenanceModeStatusTests.java @@ -46,66 +46,64 @@ import java.util.List; */ public class MaintenanceModeStatusTests extends TestCase { - /** - * Verifies that the enum values are not null upon valid assignment. - */ - public void testValidEnums () { - String example = "NORMAL"; - MaintenanceModeStatus enumNormal = MaintenanceModeStatus.valueForString(example); - example = "NEAR"; - MaintenanceModeStatus enumNear = MaintenanceModeStatus.valueForString(example); - example = "ACTIVE"; - MaintenanceModeStatus enumActive = MaintenanceModeStatus.valueForString(example); - example = "FEATURE_NOT_PRESENT"; - MaintenanceModeStatus enumFeatureNotPResent = MaintenanceModeStatus.valueForString(example); + /** + * Verifies that the enum values are not null upon valid assignment. + */ + public void testValidEnums() { + String example = "NORMAL"; + MaintenanceModeStatus enumNormal = MaintenanceModeStatus.valueForString(example); + example = "NEAR"; + MaintenanceModeStatus enumNear = MaintenanceModeStatus.valueForString(example); + example = "ACTIVE"; + MaintenanceModeStatus enumActive = MaintenanceModeStatus.valueForString(example); + example = "FEATURE_NOT_PRESENT"; + MaintenanceModeStatus enumFeatureNotPResent = MaintenanceModeStatus.valueForString(example); - assertNotNull("NORMAL returned null", enumNormal); - assertNotNull("NEAR returned null", enumNear); - assertNotNull("ACTIVE returned null", enumActive); - assertNotNull("FEATURE_NOT_PRESENT returned null", enumFeatureNotPResent); - } + assertNotNull("NORMAL returned null", enumNormal); + assertNotNull("NEAR returned null", enumNear); + assertNotNull("ACTIVE returned null", enumActive); + assertNotNull("FEATURE_NOT_PRESENT returned null", enumFeatureNotPResent); + } - /** - * Verifies that an invalid assignment is null. - */ - public void testInvalidEnum () { - String example = "normAL"; - try { - MaintenanceModeStatus temp = MaintenanceModeStatus.valueForString(example); - assertNull("Result of valueForString should be null.", temp); - } - catch (IllegalArgumentException exception) { - fail("Invalid enum throws IllegalArgumentException."); - } - } + /** + * Verifies that an invalid assignment is null. + */ + public void testInvalidEnum() { + String example = "normAL"; + try { + MaintenanceModeStatus temp = MaintenanceModeStatus.valueForString(example); + assertNull("Result of valueForString should be null.", temp); + } catch (IllegalArgumentException exception) { + fail("Invalid enum throws IllegalArgumentException."); + } + } - /** - * Verifies that a null assignment is invalid. - */ - public void testNullEnum () { - String example = null; - try { - MaintenanceModeStatus temp = MaintenanceModeStatus.valueForString(example); - assertNull("Result of valueForString should be null.", temp); - } - catch (NullPointerException exception) { - fail("Null string throws NullPointerException."); - } - } + /** + * Verifies that a null assignment is invalid. + */ + public void testNullEnum() { + String example = null; + try { + MaintenanceModeStatus temp = MaintenanceModeStatus.valueForString(example); + assertNull("Result of valueForString should be null.", temp); + } catch (NullPointerException exception) { + fail("Null string throws NullPointerException."); + } + } - /** - * Verifies the possible enum values of MaintenanceModeStatus. - */ - public void testListEnum() { - List<MaintenanceModeStatus> enumValueList = Arrays.asList(MaintenanceModeStatus.values()); + /** + * Verifies the possible enum values of MaintenanceModeStatus. + */ + public void testListEnum() { + List<MaintenanceModeStatus> enumValueList = Arrays.asList(MaintenanceModeStatus.values()); - List<MaintenanceModeStatus> enumTestList = new ArrayList<>(); - enumTestList.add(MaintenanceModeStatus.NORMAL); - enumTestList.add(MaintenanceModeStatus.NEAR); - enumTestList.add(MaintenanceModeStatus.ACTIVE); - enumTestList.add(MaintenanceModeStatus.FEATURE_NOT_PRESENT); + List<MaintenanceModeStatus> enumTestList = new ArrayList<>(); + enumTestList.add(MaintenanceModeStatus.NORMAL); + enumTestList.add(MaintenanceModeStatus.NEAR); + enumTestList.add(MaintenanceModeStatus.ACTIVE); + enumTestList.add(MaintenanceModeStatus.FEATURE_NOT_PRESENT); - assertTrue("Enum value list does not match enum class list", - enumValueList.containsAll(enumTestList) && enumTestList.containsAll(enumValueList)); - } + assertTrue("Enum value list does not match enum class list", + enumValueList.containsAll(enumTestList) && enumTestList.containsAll(enumValueList)); + } }
\ No newline at end of file diff --git a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/MassageCushionTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/MassageCushionTests.java index 8ce99f47a..31c479548 100644 --- a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/MassageCushionTests.java +++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/MassageCushionTests.java @@ -14,68 +14,68 @@ import java.util.List; */ public class MassageCushionTests extends TestCase { - /** - * Verifies that the enum values are not null upon valid assignment. - */ - public void testValidEnums() { - String example = "TOP_LUMBAR"; - MassageCushion enumTopLumbar = MassageCushion.valueForString(example); - example = "MIDDLE_LUMBAR"; - MassageCushion enumMiddleLumbar = MassageCushion.valueForString(example); - example = "BOTTOM_LUMBAR"; - MassageCushion enumBottomLumbar = MassageCushion.valueForString(example); - example = "BACK_BOLSTERS"; - MassageCushion enumBackBolsters = MassageCushion.valueForString(example); - example = "SEAT_BOLSTERS"; - MassageCushion enumSeatBolsters = MassageCushion.valueForString(example); + /** + * Verifies that the enum values are not null upon valid assignment. + */ + public void testValidEnums() { + String example = "TOP_LUMBAR"; + MassageCushion enumTopLumbar = MassageCushion.valueForString(example); + example = "MIDDLE_LUMBAR"; + MassageCushion enumMiddleLumbar = MassageCushion.valueForString(example); + example = "BOTTOM_LUMBAR"; + MassageCushion enumBottomLumbar = MassageCushion.valueForString(example); + example = "BACK_BOLSTERS"; + MassageCushion enumBackBolsters = MassageCushion.valueForString(example); + example = "SEAT_BOLSTERS"; + MassageCushion enumSeatBolsters = MassageCushion.valueForString(example); - assertNotNull("TOP_LUMBAR returned null", enumTopLumbar); - assertNotNull("MIDDLE_LUMBAR returned null", enumMiddleLumbar); - assertNotNull("BOTTOM_LUMBAR returned null", enumBottomLumbar); - assertNotNull("BACK_BOLSTERS returned null", enumBackBolsters); - assertNotNull("SEAT_BOLSTERS returned null", enumSeatBolsters); - } + assertNotNull("TOP_LUMBAR returned null", enumTopLumbar); + assertNotNull("MIDDLE_LUMBAR returned null", enumMiddleLumbar); + assertNotNull("BOTTOM_LUMBAR returned null", enumBottomLumbar); + assertNotNull("BACK_BOLSTERS returned null", enumBackBolsters); + assertNotNull("SEAT_BOLSTERS returned null", enumSeatBolsters); + } - /** - * Verifies that an invalid assignment is null. - */ - public void testInvalidEnum() { - String example = "tOP_LUMBAR"; - try { - MassageCushion temp = MassageCushion.valueForString(example); - assertNull("Result of valueForString should be null.", temp); - } catch (IllegalArgumentException exception) { - fail("Invalid enum throws IllegalArgumentException."); - } - } + /** + * Verifies that an invalid assignment is null. + */ + public void testInvalidEnum() { + String example = "tOP_LUMBAR"; + try { + MassageCushion temp = MassageCushion.valueForString(example); + assertNull("Result of valueForString should be null.", temp); + } catch (IllegalArgumentException exception) { + fail("Invalid enum throws IllegalArgumentException."); + } + } - /** - * Verifies that a null assignment is invalid. - */ - public void testNullEnum() { - String example = null; - try { - MassageCushion temp = MassageCushion.valueForString(example); - assertNull("Result of valueForString should be null.", temp); - } catch (NullPointerException exception) { - fail("Null string throws NullPointerException."); - } - } + /** + * Verifies that a null assignment is invalid. + */ + public void testNullEnum() { + String example = null; + try { + MassageCushion temp = MassageCushion.valueForString(example); + assertNull("Result of valueForString should be null.", temp); + } catch (NullPointerException exception) { + fail("Null string throws NullPointerException."); + } + } - /** - * Verifies the possible enum values of MassageCushion. - */ - public void testListEnum() { - List<MassageCushion> enumValueList = Arrays.asList(MassageCushion.values()); + /** + * Verifies the possible enum values of MassageCushion. + */ + public void testListEnum() { + List<MassageCushion> enumValueList = Arrays.asList(MassageCushion.values()); - List<MassageCushion> enumTestList = new ArrayList<MassageCushion>(); - enumTestList.add(MassageCushion.TOP_LUMBAR); - enumTestList.add(MassageCushion.MIDDLE_LUMBAR); - enumTestList.add(MassageCushion.BOTTOM_LUMBAR); - enumTestList.add(MassageCushion.BACK_BOLSTERS); - enumTestList.add(MassageCushion.SEAT_BOLSTERS); + List<MassageCushion> enumTestList = new ArrayList<MassageCushion>(); + enumTestList.add(MassageCushion.TOP_LUMBAR); + enumTestList.add(MassageCushion.MIDDLE_LUMBAR); + enumTestList.add(MassageCushion.BOTTOM_LUMBAR); + enumTestList.add(MassageCushion.BACK_BOLSTERS); + enumTestList.add(MassageCushion.SEAT_BOLSTERS); - assertTrue("Enum value list does not match enum class list", - enumValueList.containsAll(enumTestList) && enumTestList.containsAll(enumValueList)); - } + assertTrue("Enum value list does not match enum class list", + enumValueList.containsAll(enumTestList) && enumTestList.containsAll(enumValueList)); + } }
\ No newline at end of file diff --git a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/MassageModeTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/MassageModeTests.java index 67b47cf7c..4d455dbbf 100644 --- a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/MassageModeTests.java +++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/MassageModeTests.java @@ -14,60 +14,60 @@ import java.util.List; */ public class MassageModeTests extends TestCase { - /** - * Verifies that the enum values are not null upon valid assignment. - */ - public void testValidEnums() { - String example = "OFF"; - MassageMode enumOff = MassageMode.valueForString(example); - example = "LOW"; - MassageMode enumLow = MassageMode.valueForString(example); - example = "HIGH"; - MassageMode enumHigh = MassageMode.valueForString(example); + /** + * Verifies that the enum values are not null upon valid assignment. + */ + public void testValidEnums() { + String example = "OFF"; + MassageMode enumOff = MassageMode.valueForString(example); + example = "LOW"; + MassageMode enumLow = MassageMode.valueForString(example); + example = "HIGH"; + MassageMode enumHigh = MassageMode.valueForString(example); - assertNotNull("OFF returned null", enumOff); - assertNotNull("LOW returned null", enumLow); - assertNotNull("HIGH returned null", enumHigh); - } + assertNotNull("OFF returned null", enumOff); + assertNotNull("LOW returned null", enumLow); + assertNotNull("HIGH returned null", enumHigh); + } - /** - * Verifies that an invalid assignment is null. - */ - public void testInvalidEnum() { - String example = "oFF"; - try { - MassageMode temp = MassageMode.valueForString(example); - assertNull("Result of valueForString should be null.", temp); - } catch (IllegalArgumentException exception) { - fail("Invalid enum throws IllegalArgumentException."); - } - } + /** + * Verifies that an invalid assignment is null. + */ + public void testInvalidEnum() { + String example = "oFF"; + try { + MassageMode temp = MassageMode.valueForString(example); + assertNull("Result of valueForString should be null.", temp); + } catch (IllegalArgumentException exception) { + fail("Invalid enum throws IllegalArgumentException."); + } + } - /** - * Verifies that a null assignment is invalid. - */ - public void testNullEnum() { - String example = null; - try { - MassageMode temp = MassageMode.valueForString(example); - assertNull("Result of valueForString should be null.", temp); - } catch (NullPointerException exception) { - fail("Null string throws NullPointerException."); - } - } + /** + * Verifies that a null assignment is invalid. + */ + public void testNullEnum() { + String example = null; + try { + MassageMode temp = MassageMode.valueForString(example); + assertNull("Result of valueForString should be null.", temp); + } catch (NullPointerException exception) { + fail("Null string throws NullPointerException."); + } + } - /** - * Verifies the possible enum values of MassageMode. - */ - public void testListEnum() { - List<MassageMode> enumValueList = Arrays.asList(MassageMode.values()); + /** + * Verifies the possible enum values of MassageMode. + */ + public void testListEnum() { + List<MassageMode> enumValueList = Arrays.asList(MassageMode.values()); - List<MassageMode> enumTestList = new ArrayList<MassageMode>(); - enumTestList.add(MassageMode.OFF); - enumTestList.add(MassageMode.LOW); - enumTestList.add(MassageMode.HIGH); + List<MassageMode> enumTestList = new ArrayList<MassageMode>(); + enumTestList.add(MassageMode.OFF); + enumTestList.add(MassageMode.LOW); + enumTestList.add(MassageMode.HIGH); - assertTrue("Enum value list does not match enum class list", - enumValueList.containsAll(enumTestList) && enumTestList.containsAll(enumValueList)); - } + assertTrue("Enum value list does not match enum class list", + enumValueList.containsAll(enumTestList) && enumTestList.containsAll(enumValueList)); + } }
\ No newline at end of file diff --git a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/MassageZoneTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/MassageZoneTests.java index 34adada5e..7e41aec27 100644 --- a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/MassageZoneTests.java +++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/MassageZoneTests.java @@ -14,56 +14,56 @@ import java.util.List; */ public class MassageZoneTests extends TestCase { - /** - * Verifies that the enum values are not null upon valid assignment. - */ - public void testValidEnums() { - String example = "LUMBAR"; - MassageZone enumLumbar = MassageZone.valueForString(example); - example = "SEAT_CUSHION"; - MassageZone enumSeatCushion = MassageZone.valueForString(example); + /** + * Verifies that the enum values are not null upon valid assignment. + */ + public void testValidEnums() { + String example = "LUMBAR"; + MassageZone enumLumbar = MassageZone.valueForString(example); + example = "SEAT_CUSHION"; + MassageZone enumSeatCushion = MassageZone.valueForString(example); - assertNotNull("LUMBAR returned null", enumLumbar); - assertNotNull("SEAT_CUSHION returned null", enumSeatCushion); - } + assertNotNull("LUMBAR returned null", enumLumbar); + assertNotNull("SEAT_CUSHION returned null", enumSeatCushion); + } - /** - * Verifies that an invalid assignment is null. - */ - public void testInvalidEnum() { - String example = "lUMBAR"; - try { - MassageZone temp = MassageZone.valueForString(example); - assertNull("Result of valueForString should be null.", temp); - } catch (IllegalArgumentException exception) { - fail("Invalid enum throws IllegalArgumentException."); - } - } + /** + * Verifies that an invalid assignment is null. + */ + public void testInvalidEnum() { + String example = "lUMBAR"; + try { + MassageZone temp = MassageZone.valueForString(example); + assertNull("Result of valueForString should be null.", temp); + } catch (IllegalArgumentException exception) { + fail("Invalid enum throws IllegalArgumentException."); + } + } - /** - * Verifies that a null assignment is invalid. - */ - public void testNullEnum() { - String example = null; - try { - MassageZone temp = MassageZone.valueForString(example); - assertNull("Result of valueForString should be null.", temp); - } catch (NullPointerException exception) { - fail("Null string throws NullPointerException."); - } - } + /** + * Verifies that a null assignment is invalid. + */ + public void testNullEnum() { + String example = null; + try { + MassageZone temp = MassageZone.valueForString(example); + assertNull("Result of valueForString should be null.", temp); + } catch (NullPointerException exception) { + fail("Null string throws NullPointerException."); + } + } - /** - * Verifies the possible enum values of MassageZone. - */ - public void testListEnum() { - List<MassageZone> enumValueList = Arrays.asList(MassageZone.values()); + /** + * Verifies the possible enum values of MassageZone. + */ + public void testListEnum() { + List<MassageZone> enumValueList = Arrays.asList(MassageZone.values()); - List<MassageZone> enumTestList = new ArrayList<MassageZone>(); - enumTestList.add(MassageZone.LUMBAR); - enumTestList.add(MassageZone.SEAT_CUSHION); + List<MassageZone> enumTestList = new ArrayList<MassageZone>(); + enumTestList.add(MassageZone.LUMBAR); + enumTestList.add(MassageZone.SEAT_CUSHION); - assertTrue("Enum value list does not match enum class list", - enumValueList.containsAll(enumTestList) && enumTestList.containsAll(enumValueList)); - } + assertTrue("Enum value list does not match enum class list", + enumValueList.containsAll(enumTestList) && enumTestList.containsAll(enumValueList)); + } }
\ No newline at end of file diff --git a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/MediaClockFormatTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/MediaClockFormatTests.java index 8c50f8d22..18bb00fb5 100644 --- a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/MediaClockFormatTests.java +++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/MediaClockFormatTests.java @@ -9,83 +9,81 @@ import java.util.Arrays; import java.util.List; /** - * This is a unit test class for the SmartDeviceLink library project class : + * This is a unit test class for the SmartDeviceLink library project class : * {@link com.smartdevicelink.proxy.rpc.enums.MediaClockFormat} */ public class MediaClockFormatTests extends TestCase { - /** - * Verifies that the enum values are not null upon valid assignment. - */ - public void testValidEnums () { - String example = "CLOCK1"; - MediaClockFormat enumClock1 = MediaClockFormat.valueForString(example); - example = "CLOCK2"; - MediaClockFormat enumClock2 = MediaClockFormat.valueForString(example); - example = "CLOCK3"; - MediaClockFormat enumClock3 = MediaClockFormat.valueForString(example); - example = "CLOCKTEXT1"; - MediaClockFormat enumClockText1 = MediaClockFormat.valueForString(example); - example = "CLOCKTEXT2"; - MediaClockFormat enumClockText2 = MediaClockFormat.valueForString(example); - example = "CLOCKTEXT3"; - MediaClockFormat enumClockText3 = MediaClockFormat.valueForString(example); - example = "CLOCKTEXT4"; - MediaClockFormat enumClockText4 = MediaClockFormat.valueForString(example); - - assertNotNull("CLOCK1 returned null", enumClock1); - assertNotNull("CLOCK2 returned null", enumClock2); - assertNotNull("CLOCK3 returned null", enumClock3); - assertNotNull("CLOCKTEXT1 returned null", enumClockText1); - assertNotNull("CLOCKTEXT2 returned null", enumClockText2); - assertNotNull("CLOCKTEXT3 returned null", enumClockText3); - assertNotNull("CLOCKTEXT4 returned null", enumClockText4); - } + /** + * Verifies that the enum values are not null upon valid assignment. + */ + public void testValidEnums() { + String example = "CLOCK1"; + MediaClockFormat enumClock1 = MediaClockFormat.valueForString(example); + example = "CLOCK2"; + MediaClockFormat enumClock2 = MediaClockFormat.valueForString(example); + example = "CLOCK3"; + MediaClockFormat enumClock3 = MediaClockFormat.valueForString(example); + example = "CLOCKTEXT1"; + MediaClockFormat enumClockText1 = MediaClockFormat.valueForString(example); + example = "CLOCKTEXT2"; + MediaClockFormat enumClockText2 = MediaClockFormat.valueForString(example); + example = "CLOCKTEXT3"; + MediaClockFormat enumClockText3 = MediaClockFormat.valueForString(example); + example = "CLOCKTEXT4"; + MediaClockFormat enumClockText4 = MediaClockFormat.valueForString(example); - /** - * Verifies that an invalid assignment is null. - */ - public void testInvalidEnum () { - String example = "cloCK1"; - try { - MediaClockFormat temp = MediaClockFormat.valueForString(example); + assertNotNull("CLOCK1 returned null", enumClock1); + assertNotNull("CLOCK2 returned null", enumClock2); + assertNotNull("CLOCK3 returned null", enumClock3); + assertNotNull("CLOCKTEXT1 returned null", enumClockText1); + assertNotNull("CLOCKTEXT2 returned null", enumClockText2); + assertNotNull("CLOCKTEXT3 returned null", enumClockText3); + assertNotNull("CLOCKTEXT4 returned null", enumClockText4); + } + + /** + * Verifies that an invalid assignment is null. + */ + public void testInvalidEnum() { + String example = "cloCK1"; + try { + MediaClockFormat temp = MediaClockFormat.valueForString(example); assertNull("Result of valueForString should be null.", temp); - } - catch (IllegalArgumentException exception) { + } catch (IllegalArgumentException exception) { fail("Invalid enum throws IllegalArgumentException."); - } - } + } + } - /** - * Verifies that a null assignment is invalid. - */ - public void testNullEnum () { - String example = null; - try { - MediaClockFormat temp = MediaClockFormat.valueForString(example); + /** + * Verifies that a null assignment is invalid. + */ + public void testNullEnum() { + String example = null; + try { + MediaClockFormat temp = MediaClockFormat.valueForString(example); assertNull("Result of valueForString should be null.", temp); - } - catch (NullPointerException exception) { + } catch (NullPointerException exception) { fail("Null string throws NullPointerException."); - } - } + } + } - /** - * Verifies the possible enum values of MediaClockFormat. - */ - public void testListEnum() { - List<MediaClockFormat> enumValueList = Arrays.asList(MediaClockFormat.values()); + /** + * Verifies the possible enum values of MediaClockFormat. + */ + public void testListEnum() { + List<MediaClockFormat> enumValueList = Arrays.asList(MediaClockFormat.values()); - List<MediaClockFormat> enumTestList = new ArrayList<MediaClockFormat>(); - enumTestList.add(MediaClockFormat.CLOCK1); - enumTestList.add(MediaClockFormat.CLOCK2); - enumTestList.add(MediaClockFormat.CLOCK3); - enumTestList.add(MediaClockFormat.CLOCKTEXT1); - enumTestList.add(MediaClockFormat.CLOCKTEXT2); - enumTestList.add(MediaClockFormat.CLOCKTEXT3); - enumTestList.add(MediaClockFormat.CLOCKTEXT4); + List<MediaClockFormat> enumTestList = new ArrayList<MediaClockFormat>(); + enumTestList.add(MediaClockFormat.CLOCK1); + enumTestList.add(MediaClockFormat.CLOCK2); + enumTestList.add(MediaClockFormat.CLOCK3); + enumTestList.add(MediaClockFormat.CLOCKTEXT1); + enumTestList.add(MediaClockFormat.CLOCKTEXT2); + enumTestList.add(MediaClockFormat.CLOCKTEXT3); + enumTestList.add(MediaClockFormat.CLOCKTEXT4); - assertTrue("Enum value list does not match enum class list", - enumValueList.containsAll(enumTestList) && enumTestList.containsAll(enumValueList)); - } + assertTrue("Enum value list does not match enum class list", + enumValueList.containsAll(enumTestList) && enumTestList.containsAll(enumValueList)); + } }
\ No newline at end of file diff --git a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/MediaTypeTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/MediaTypeTests.java index 835045418..42d791b97 100644 --- a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/MediaTypeTests.java +++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/MediaTypeTests.java @@ -14,64 +14,64 @@ import java.util.List; */ public class MediaTypeTests extends TestCase { - /** - * Verifies that the enum values are not null upon valid assignment. - */ - public void testValidEnums() { - String example = "MUSIC"; - MediaType enumMusic = MediaType.valueForString(example); - example = "PODCAST"; - MediaType enumPodcast = MediaType.valueForString(example); - example = "AUDIOBOOK"; - MediaType enumAudioBook = MediaType.valueForString(example); - example = "OTHER"; - MediaType enumOther = MediaType.valueForString(example); + /** + * Verifies that the enum values are not null upon valid assignment. + */ + public void testValidEnums() { + String example = "MUSIC"; + MediaType enumMusic = MediaType.valueForString(example); + example = "PODCAST"; + MediaType enumPodcast = MediaType.valueForString(example); + example = "AUDIOBOOK"; + MediaType enumAudioBook = MediaType.valueForString(example); + example = "OTHER"; + MediaType enumOther = MediaType.valueForString(example); - assertNotNull("MUSIC returned null", enumMusic); - assertNotNull("PODCAST returned null", enumPodcast); - assertNotNull("AUDIOBOOK returned null", enumAudioBook); - assertNotNull("OTHER returned null", enumOther); - } + assertNotNull("MUSIC returned null", enumMusic); + assertNotNull("PODCAST returned null", enumPodcast); + assertNotNull("AUDIOBOOK returned null", enumAudioBook); + assertNotNull("OTHER returned null", enumOther); + } - /** - * Verifies that an invalid assignment is null. - */ - public void testInvalidEnum() { - String example = "PudCAsT"; - try { - MediaType temp = MediaType.valueForString(example); - assertNull("Result of valueForString should be null.", temp); - } catch (IllegalArgumentException exception) { - fail("Invalid enum throws IllegalArgumentException."); - } - } + /** + * Verifies that an invalid assignment is null. + */ + public void testInvalidEnum() { + String example = "PudCAsT"; + try { + MediaType temp = MediaType.valueForString(example); + assertNull("Result of valueForString should be null.", temp); + } catch (IllegalArgumentException exception) { + fail("Invalid enum throws IllegalArgumentException."); + } + } - /** - * Verifies that a null assignment is invalid. - */ - public void testNullEnum() { - String example = null; - try { - MediaType temp = MediaType.valueForString(example); - assertNull("Result of valueForString should be null.", temp); - } catch (NullPointerException exception) { - fail("Null string throws NullPointerException."); - } - } + /** + * Verifies that a null assignment is invalid. + */ + public void testNullEnum() { + String example = null; + try { + MediaType temp = MediaType.valueForString(example); + assertNull("Result of valueForString should be null.", temp); + } catch (NullPointerException exception) { + fail("Null string throws NullPointerException."); + } + } - /** - * Verifies the possible enum values of MediaType. - */ - public void testListEnum() { - List<MediaType> enumValueList = Arrays.asList(MediaType.values()); + /** + * Verifies the possible enum values of MediaType. + */ + public void testListEnum() { + List<MediaType> enumValueList = Arrays.asList(MediaType.values()); - List<MediaType> enumTestList = new ArrayList<MediaType>(); - enumTestList.add(MediaType.MUSIC); - enumTestList.add(MediaType.PODCAST); - enumTestList.add(MediaType.AUDIOBOOK); - enumTestList.add(MediaType.OTHER); + List<MediaType> enumTestList = new ArrayList<MediaType>(); + enumTestList.add(MediaType.MUSIC); + enumTestList.add(MediaType.PODCAST); + enumTestList.add(MediaType.AUDIOBOOK); + enumTestList.add(MediaType.OTHER); - assertTrue("Enum value list does not match enum class list", - enumValueList.containsAll(enumTestList) && enumTestList.containsAll(enumValueList)); - } + assertTrue("Enum value list does not match enum class list", + enumValueList.containsAll(enumTestList) && enumTestList.containsAll(enumValueList)); + } }
\ No newline at end of file diff --git a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/MenuLayoutTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/MenuLayoutTests.java index f92de1f94..a448be361 100644 --- a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/MenuLayoutTests.java +++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/MenuLayoutTests.java @@ -45,56 +45,56 @@ import java.util.List; public class MenuLayoutTests extends TestCase { - /** - * Verifies that the enum values are not null upon valid assignment. - */ - public void testValidEnums() { - String example = "LIST"; - MenuLayout enumList = MenuLayout.valueForString(example); - example = "TILES"; - MenuLayout enumTiles = MenuLayout.valueForString(example); + /** + * Verifies that the enum values are not null upon valid assignment. + */ + public void testValidEnums() { + String example = "LIST"; + MenuLayout enumList = MenuLayout.valueForString(example); + example = "TILES"; + MenuLayout enumTiles = MenuLayout.valueForString(example); - assertNotNull("LIST returned null", enumList); - assertNotNull("TILES returned null", enumTiles); - } + assertNotNull("LIST returned null", enumList); + assertNotNull("TILES returned null", enumTiles); + } - /** - * Verifies that an invalid assignment is null. - */ - public void testInvalidEnum() { - String example = "TooLs"; - try { - MenuLayout temp = MenuLayout.valueForString(example); - assertNull("Result of valueForString should be null.", temp); - } catch (IllegalArgumentException exception) { - fail("Invalid enum throws IllegalArgumentException."); - } - } + /** + * Verifies that an invalid assignment is null. + */ + public void testInvalidEnum() { + String example = "TooLs"; + try { + MenuLayout temp = MenuLayout.valueForString(example); + assertNull("Result of valueForString should be null.", temp); + } catch (IllegalArgumentException exception) { + fail("Invalid enum throws IllegalArgumentException."); + } + } - /** - * Verifies that a null assignment is invalid. - */ - public void testNullEnum() { - String example = null; - try { - MenuLayout temp = MenuLayout.valueForString(example); - assertNull("Result of valueForString should be null.", temp); - } catch (NullPointerException exception) { - fail("Null string throws NullPointerException."); - } - } + /** + * Verifies that a null assignment is invalid. + */ + public void testNullEnum() { + String example = null; + try { + MenuLayout temp = MenuLayout.valueForString(example); + assertNull("Result of valueForString should be null.", temp); + } catch (NullPointerException exception) { + fail("Null string throws NullPointerException."); + } + } - /** - * Verifies the possible enum values of MenuLayout. - */ - public void testListEnum() { - List<MenuLayout> enumValueList = Arrays.asList(MenuLayout.values()); + /** + * Verifies the possible enum values of MenuLayout. + */ + public void testListEnum() { + List<MenuLayout> enumValueList = Arrays.asList(MenuLayout.values()); - List<MenuLayout> enumTestList = new ArrayList<>(); - enumTestList.add(MenuLayout.LIST); - enumTestList.add(MenuLayout.TILES); + List<MenuLayout> enumTestList = new ArrayList<>(); + enumTestList.add(MenuLayout.LIST); + enumTestList.add(MenuLayout.TILES); - assertTrue("Enum value list does not match enum class list", - enumValueList.containsAll(enumTestList) && enumTestList.containsAll(enumValueList)); - } + assertTrue("Enum value list does not match enum class list", + enumValueList.containsAll(enumTestList) && enumTestList.containsAll(enumValueList)); + } }
\ No newline at end of file diff --git a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/MetadataTypeTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/MetadataTypeTests.java index c381dfff3..4647550c5 100644 --- a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/MetadataTypeTests.java +++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/MetadataTypeTests.java @@ -16,97 +16,97 @@ import java.util.List; public class MetadataTypeTests extends TestCase { - /** - * Verifies that the enum values are not null upon valid assignment. - */ - public void testValidEnums() { - String example = "mediaTitle"; - MetadataType enumMediaTitle = MetadataType.valueForString(example); - example = "mediaArtist"; - MetadataType enumMediaArtist = MetadataType.valueForString(example); - example = "mediaAlbum"; - MetadataType enumMediaAlbum = MetadataType.valueForString(example); - example = "mediaYear"; - MetadataType enumMediaYear = MetadataType.valueForString(example); - example = "mediaGenre"; - MetadataType enumMediaGenre = MetadataType.valueForString(example); - example = "mediaStation"; - MetadataType enumMediaStation = MetadataType.valueForString(example); - example = "rating"; - MetadataType enumRating = MetadataType.valueForString(example); - example = "currentTemperature"; - MetadataType enumCurrentTemperature = MetadataType.valueForString(example); - example = "maximumTemperature"; - MetadataType enumMaximumTemperature = MetadataType.valueForString(example); - example = "minimumTemperature"; - MetadataType enumMinimumTemperature = MetadataType.valueForString(example); - example = "weatherTerm"; - MetadataType enumWeatherTerm = MetadataType.valueForString(example); - example = "humidity"; - MetadataType enumHumidity = MetadataType.valueForString(example); + /** + * Verifies that the enum values are not null upon valid assignment. + */ + public void testValidEnums() { + String example = "mediaTitle"; + MetadataType enumMediaTitle = MetadataType.valueForString(example); + example = "mediaArtist"; + MetadataType enumMediaArtist = MetadataType.valueForString(example); + example = "mediaAlbum"; + MetadataType enumMediaAlbum = MetadataType.valueForString(example); + example = "mediaYear"; + MetadataType enumMediaYear = MetadataType.valueForString(example); + example = "mediaGenre"; + MetadataType enumMediaGenre = MetadataType.valueForString(example); + example = "mediaStation"; + MetadataType enumMediaStation = MetadataType.valueForString(example); + example = "rating"; + MetadataType enumRating = MetadataType.valueForString(example); + example = "currentTemperature"; + MetadataType enumCurrentTemperature = MetadataType.valueForString(example); + example = "maximumTemperature"; + MetadataType enumMaximumTemperature = MetadataType.valueForString(example); + example = "minimumTemperature"; + MetadataType enumMinimumTemperature = MetadataType.valueForString(example); + example = "weatherTerm"; + MetadataType enumWeatherTerm = MetadataType.valueForString(example); + example = "humidity"; + MetadataType enumHumidity = MetadataType.valueForString(example); - assertNotNull("mediaTitle returned null", enumMediaTitle); - assertNotNull("mediaArtist returned null", enumMediaArtist); - assertNotNull("mediaAlbum returned null", enumMediaAlbum); - assertNotNull("mediaYear returned null", enumMediaYear); - assertNotNull("mediaGenre returned null", enumMediaGenre); - assertNotNull("mediaStation returned null", enumMediaStation); - assertNotNull("rating returned null", enumRating); - assertNotNull("currentTemperature returned null", enumCurrentTemperature); - assertNotNull("maximumTemperature returned null", enumMaximumTemperature); - assertNotNull("minimumTemperature returned null", enumMinimumTemperature); - assertNotNull("weatherTerm returned null", enumWeatherTerm); - assertNotNull("humidity returned null", enumHumidity); - } + assertNotNull("mediaTitle returned null", enumMediaTitle); + assertNotNull("mediaArtist returned null", enumMediaArtist); + assertNotNull("mediaAlbum returned null", enumMediaAlbum); + assertNotNull("mediaYear returned null", enumMediaYear); + assertNotNull("mediaGenre returned null", enumMediaGenre); + assertNotNull("mediaStation returned null", enumMediaStation); + assertNotNull("rating returned null", enumRating); + assertNotNull("currentTemperature returned null", enumCurrentTemperature); + assertNotNull("maximumTemperature returned null", enumMaximumTemperature); + assertNotNull("minimumTemperature returned null", enumMinimumTemperature); + assertNotNull("weatherTerm returned null", enumWeatherTerm); + assertNotNull("humidity returned null", enumHumidity); + } - /** - * Verifies that an invalid assignment is null. - */ - public void testInvalidEnum() { - String example = "MEDIA_TITLEZ"; - try { - MetadataType temp = MetadataType.valueForString(example); - assertNull("Result of valueForString should be null.", temp); - } catch (IllegalArgumentException exception) { - fail("Invalid enum throws IllegalArgumentException."); - } - } + /** + * Verifies that an invalid assignment is null. + */ + public void testInvalidEnum() { + String example = "MEDIA_TITLEZ"; + try { + MetadataType temp = MetadataType.valueForString(example); + assertNull("Result of valueForString should be null.", temp); + } catch (IllegalArgumentException exception) { + fail("Invalid enum throws IllegalArgumentException."); + } + } - /** - * Verifies that a null assignment is invalid. - */ - public void testNullEnum() { - String example = null; - try { - MetadataType temp = MetadataType.valueForString(example); - assertNull("Result of valueForString should be null.", temp); - } catch (NullPointerException exception) { - fail("Null string throws NullPointerException."); - } - } + /** + * Verifies that a null assignment is invalid. + */ + public void testNullEnum() { + String example = null; + try { + MetadataType temp = MetadataType.valueForString(example); + assertNull("Result of valueForString should be null.", temp); + } catch (NullPointerException exception) { + fail("Null string throws NullPointerException."); + } + } - /** - * Verifies the possible enum values of MetadataType. - */ - public void testListEnum() { - List<MetadataType> enumValueList = Arrays.asList(MetadataType.values()); + /** + * Verifies the possible enum values of MetadataType. + */ + public void testListEnum() { + List<MetadataType> enumValueList = Arrays.asList(MetadataType.values()); - List<MetadataType> enumTestList = new ArrayList<MetadataType>(); - enumTestList.add(MetadataType.MEDIA_TITLE); - enumTestList.add(MetadataType.MEDIA_ARTIST); - enumTestList.add(MetadataType.MEDIA_ALBUM); - enumTestList.add(MetadataType.MEDIA_YEAR); - enumTestList.add(MetadataType.MEDIA_GENRE); - enumTestList.add(MetadataType.MEDIA_STATION); - enumTestList.add(MetadataType.RATING); - enumTestList.add(MetadataType.CURRENT_TEMPERATURE); - enumTestList.add(MetadataType.MAXIMUM_TEMPERATURE); - enumTestList.add(MetadataType.MINIMUM_TEMPERATURE); - enumTestList.add(MetadataType.WEATHER_TERM); - enumTestList.add(MetadataType.HUMIDITY); + List<MetadataType> enumTestList = new ArrayList<MetadataType>(); + enumTestList.add(MetadataType.MEDIA_TITLE); + enumTestList.add(MetadataType.MEDIA_ARTIST); + enumTestList.add(MetadataType.MEDIA_ALBUM); + enumTestList.add(MetadataType.MEDIA_YEAR); + enumTestList.add(MetadataType.MEDIA_GENRE); + enumTestList.add(MetadataType.MEDIA_STATION); + enumTestList.add(MetadataType.RATING); + enumTestList.add(MetadataType.CURRENT_TEMPERATURE); + enumTestList.add(MetadataType.MAXIMUM_TEMPERATURE); + enumTestList.add(MetadataType.MINIMUM_TEMPERATURE); + enumTestList.add(MetadataType.WEATHER_TERM); + enumTestList.add(MetadataType.HUMIDITY); - assertTrue("Enum value list does not match enum class list", - enumValueList.containsAll(enumTestList) && enumTestList.containsAll(enumValueList)); - } + assertTrue("Enum value list does not match enum class list", + enumValueList.containsAll(enumTestList) && enumTestList.containsAll(enumValueList)); + } } diff --git a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/ModuleTypeTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/ModuleTypeTests.java index 719502cbf..8ee0706b7 100644 --- a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/ModuleTypeTests.java +++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/ModuleTypeTests.java @@ -14,72 +14,72 @@ import java.util.List; */ public class ModuleTypeTests extends TestCase { - /** - * Verifies that the enum values are not null upon valid assignment. - */ - public void testValidEnums() { - String example = "CLIMATE"; - ModuleType enumClimate = ModuleType.valueForString(example); - example = "RADIO"; - ModuleType enumRadio = ModuleType.valueForString(example); - example = "SEAT"; - ModuleType enumSeat = ModuleType.valueForString(example); - example = "AUDIO"; - ModuleType enumAudio = ModuleType.valueForString(example); - example = "LIGHT"; - ModuleType enumLight = ModuleType.valueForString(example); - example = "HMI_SETTINGS"; - ModuleType enumHmiSettings = ModuleType.valueForString(example); + /** + * Verifies that the enum values are not null upon valid assignment. + */ + public void testValidEnums() { + String example = "CLIMATE"; + ModuleType enumClimate = ModuleType.valueForString(example); + example = "RADIO"; + ModuleType enumRadio = ModuleType.valueForString(example); + example = "SEAT"; + ModuleType enumSeat = ModuleType.valueForString(example); + example = "AUDIO"; + ModuleType enumAudio = ModuleType.valueForString(example); + example = "LIGHT"; + ModuleType enumLight = ModuleType.valueForString(example); + example = "HMI_SETTINGS"; + ModuleType enumHmiSettings = ModuleType.valueForString(example); - assertNotNull("CLIMATE returned null", enumClimate); - assertNotNull("RADIO returned null", enumRadio); - assertNotNull("SEAT returned null", enumSeat); - assertNotNull("AUDIO returned null", enumAudio); - assertNotNull("LIGHT returned null", enumLight); - assertNotNull("HMI_SETTINGS returned null", enumHmiSettings); - } + assertNotNull("CLIMATE returned null", enumClimate); + assertNotNull("RADIO returned null", enumRadio); + assertNotNull("SEAT returned null", enumSeat); + assertNotNull("AUDIO returned null", enumAudio); + assertNotNull("LIGHT returned null", enumLight); + assertNotNull("HMI_SETTINGS returned null", enumHmiSettings); + } - /** - * Verifies that an invalid assignment is null. - */ - public void testInvalidEnum() { - String example = "cLIMATE"; - try { - ModuleType temp = ModuleType.valueForString(example); - assertNull("Result of valueForString should be null.", temp); - } catch (IllegalArgumentException exception) { - fail("Invalid enum throws IllegalArgumentException."); - } - } + /** + * Verifies that an invalid assignment is null. + */ + public void testInvalidEnum() { + String example = "cLIMATE"; + try { + ModuleType temp = ModuleType.valueForString(example); + assertNull("Result of valueForString should be null.", temp); + } catch (IllegalArgumentException exception) { + fail("Invalid enum throws IllegalArgumentException."); + } + } - /** - * Verifies that a null assignment is invalid. - */ - public void testNullEnum() { - String example = null; - try { - ModuleType temp = ModuleType.valueForString(example); - assertNull("Result of valueForString should be null.", temp); - } catch (NullPointerException exception) { - fail("Null string throws NullPointerException."); - } - } + /** + * Verifies that a null assignment is invalid. + */ + public void testNullEnum() { + String example = null; + try { + ModuleType temp = ModuleType.valueForString(example); + assertNull("Result of valueForString should be null.", temp); + } catch (NullPointerException exception) { + fail("Null string throws NullPointerException."); + } + } - /** - * Verifies the possible enum values of ModuleType. - */ - public void testListEnum() { - List<ModuleType> enumValueList = Arrays.asList(ModuleType.values()); + /** + * Verifies the possible enum values of ModuleType. + */ + public void testListEnum() { + List<ModuleType> enumValueList = Arrays.asList(ModuleType.values()); - List<ModuleType> enumTestList = new ArrayList<ModuleType>(); - enumTestList.add(ModuleType.CLIMATE); - enumTestList.add(ModuleType.RADIO); - enumTestList.add(ModuleType.SEAT); - enumTestList.add(ModuleType.AUDIO); - enumTestList.add(ModuleType.LIGHT); - enumTestList.add(ModuleType.HMI_SETTINGS); + List<ModuleType> enumTestList = new ArrayList<ModuleType>(); + enumTestList.add(ModuleType.CLIMATE); + enumTestList.add(ModuleType.RADIO); + enumTestList.add(ModuleType.SEAT); + enumTestList.add(ModuleType.AUDIO); + enumTestList.add(ModuleType.LIGHT); + enumTestList.add(ModuleType.HMI_SETTINGS); - assertTrue("Enum value list does not match enum class list", - enumValueList.containsAll(enumTestList) && enumTestList.containsAll(enumValueList)); - } + assertTrue("Enum value list does not match enum class list", + enumValueList.containsAll(enumTestList) && enumTestList.containsAll(enumValueList)); + } }
\ No newline at end of file diff --git a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/NavigationActionTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/NavigationActionTests.java index 5051ef337..2d225dff3 100644 --- a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/NavigationActionTests.java +++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/NavigationActionTests.java @@ -14,79 +14,77 @@ import java.util.List; */ public class NavigationActionTests extends TestCase { - /** - * Verifies that the enum values are not null upon valid assignment. - */ - public void testValidEnums () { - String example = "TURN"; - NavigationAction enumTurn = NavigationAction.valueForString(example); - example = "EXIT"; - NavigationAction enumExit = NavigationAction.valueForString(example); - example = "STAY"; - NavigationAction enumStay = NavigationAction.valueForString(example); - example = "MERGE"; - NavigationAction enumMerge = NavigationAction.valueForString(example); - example = "FERRY"; - NavigationAction enumFerry = NavigationAction.valueForString(example); - example = "CAR_SHUTTLE_TRAIN"; - NavigationAction enumCarShuttleTrain = NavigationAction.valueForString(example); - example = "WAYPOINT"; - NavigationAction enumWaypoint = NavigationAction.valueForString(example); + /** + * Verifies that the enum values are not null upon valid assignment. + */ + public void testValidEnums() { + String example = "TURN"; + NavigationAction enumTurn = NavigationAction.valueForString(example); + example = "EXIT"; + NavigationAction enumExit = NavigationAction.valueForString(example); + example = "STAY"; + NavigationAction enumStay = NavigationAction.valueForString(example); + example = "MERGE"; + NavigationAction enumMerge = NavigationAction.valueForString(example); + example = "FERRY"; + NavigationAction enumFerry = NavigationAction.valueForString(example); + example = "CAR_SHUTTLE_TRAIN"; + NavigationAction enumCarShuttleTrain = NavigationAction.valueForString(example); + example = "WAYPOINT"; + NavigationAction enumWaypoint = NavigationAction.valueForString(example); - assertNotNull("TURN returned null", enumTurn); - assertNotNull("EXIT returned null", enumExit); - assertNotNull("STAY returned null", enumStay); - assertNotNull("MERGE returned null", enumMerge); - assertNotNull("FERRY returned null", enumFerry); - assertNotNull("CAR_SHUTTLE_TRAIN returned null", enumCarShuttleTrain); - assertNotNull("WAYPOINT returned null", enumWaypoint); + assertNotNull("TURN returned null", enumTurn); + assertNotNull("EXIT returned null", enumExit); + assertNotNull("STAY returned null", enumStay); + assertNotNull("MERGE returned null", enumMerge); + assertNotNull("FERRY returned null", enumFerry); + assertNotNull("CAR_SHUTTLE_TRAIN returned null", enumCarShuttleTrain); + assertNotNull("WAYPOINT returned null", enumWaypoint); - } + } - /** - * Verifies that an invalid assignment is null. - */ - public void testInvalidEnum () { - String example = "fRONT"; - try { - NavigationAction temp = NavigationAction.valueForString(example); - assertNull("Result of valueForString should be null.", temp); - } - catch (IllegalArgumentException exception) { - fail("Invalid enum throws IllegalArgumentException."); - } - } + /** + * Verifies that an invalid assignment is null. + */ + public void testInvalidEnum() { + String example = "fRONT"; + try { + NavigationAction temp = NavigationAction.valueForString(example); + assertNull("Result of valueForString should be null.", temp); + } catch (IllegalArgumentException exception) { + fail("Invalid enum throws IllegalArgumentException."); + } + } - /** - * Verifies that a null assignment is invalid. - */ - public void testNullEnum () { - String example = null; - try { - NavigationAction temp = NavigationAction.valueForString(example); - assertNull("Result of valueForString should be null.", temp); - } - catch (NullPointerException exception) { - fail("Null string throws NullPointerException."); - } - } + /** + * Verifies that a null assignment is invalid. + */ + public void testNullEnum() { + String example = null; + try { + NavigationAction temp = NavigationAction.valueForString(example); + assertNull("Result of valueForString should be null.", temp); + } catch (NullPointerException exception) { + fail("Null string throws NullPointerException."); + } + } - /** - * Verifies the possible enum values of NavigationAction. - */ - public void testListEnum() { - List<NavigationAction> enumValueList = Arrays.asList(NavigationAction.values()); + /** + * Verifies the possible enum values of NavigationAction. + */ + public void testListEnum() { + List<NavigationAction> enumValueList = Arrays.asList(NavigationAction.values()); - List<NavigationAction> enumTestList = new ArrayList<>(); - enumTestList.add(NavigationAction.TURN); - enumTestList.add(NavigationAction.EXIT); - enumTestList.add(NavigationAction.STAY); - enumTestList.add(NavigationAction.MERGE); - enumTestList.add(NavigationAction.FERRY); - enumTestList.add(NavigationAction.CAR_SHUTTLE_TRAIN); - enumTestList.add(NavigationAction.WAYPOINT); + List<NavigationAction> enumTestList = new ArrayList<>(); + enumTestList.add(NavigationAction.TURN); + enumTestList.add(NavigationAction.EXIT); + enumTestList.add(NavigationAction.STAY); + enumTestList.add(NavigationAction.MERGE); + enumTestList.add(NavigationAction.FERRY); + enumTestList.add(NavigationAction.CAR_SHUTTLE_TRAIN); + enumTestList.add(NavigationAction.WAYPOINT); - assertTrue("Enum value list does not match enum class list", - enumValueList.containsAll(enumTestList) && enumTestList.containsAll(enumValueList)); - } + assertTrue("Enum value list does not match enum class list", + enumValueList.containsAll(enumTestList) && enumTestList.containsAll(enumValueList)); + } } diff --git a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/NavigationJunctionTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/NavigationJunctionTests.java index 691480f78..4cab81dda 100644 --- a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/NavigationJunctionTests.java +++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/NavigationJunctionTests.java @@ -14,82 +14,80 @@ import java.util.List; */ public class NavigationJunctionTests extends TestCase { - /** - * Verifies that the enum values are not null upon valid assignment. - */ - public void testValidEnums () { - String example = "REGULAR"; - NavigationJunction enumRegular = NavigationJunction.valueForString(example); - example = "BIFURCATION"; - NavigationJunction enumBifurcation = NavigationJunction.valueForString(example); - example = "MULTI_CARRIAGEWAY"; - NavigationJunction enumMultiCarriageway = NavigationJunction.valueForString(example); - example = "ROUNDABOUT"; - NavigationJunction enumRoundabout = NavigationJunction.valueForString(example); - example = "TRAVERSABLE_ROUNDABOUT"; - NavigationJunction enumTraversableRoundabout = NavigationJunction.valueForString(example); - example = "JUGHANDLE"; - NavigationJunction enumJughandle = NavigationJunction.valueForString(example); - example = "ALL_WAY_YIELD"; - NavigationJunction enumAllWayYield = NavigationJunction.valueForString(example); - example = "TURN_AROUND"; - NavigationJunction enumTurnAround = NavigationJunction.valueForString(example); + /** + * Verifies that the enum values are not null upon valid assignment. + */ + public void testValidEnums() { + String example = "REGULAR"; + NavigationJunction enumRegular = NavigationJunction.valueForString(example); + example = "BIFURCATION"; + NavigationJunction enumBifurcation = NavigationJunction.valueForString(example); + example = "MULTI_CARRIAGEWAY"; + NavigationJunction enumMultiCarriageway = NavigationJunction.valueForString(example); + example = "ROUNDABOUT"; + NavigationJunction enumRoundabout = NavigationJunction.valueForString(example); + example = "TRAVERSABLE_ROUNDABOUT"; + NavigationJunction enumTraversableRoundabout = NavigationJunction.valueForString(example); + example = "JUGHANDLE"; + NavigationJunction enumJughandle = NavigationJunction.valueForString(example); + example = "ALL_WAY_YIELD"; + NavigationJunction enumAllWayYield = NavigationJunction.valueForString(example); + example = "TURN_AROUND"; + NavigationJunction enumTurnAround = NavigationJunction.valueForString(example); - assertNotNull("REGULAR returned null", enumRegular); - assertNotNull("BIFURCATION returned null", enumBifurcation); - assertNotNull("MULTI_CARRIAGEWAY returned null", enumMultiCarriageway); - assertNotNull("ROUNDABOUT returned null", enumRoundabout); - assertNotNull("TRAVERSABLE_ROUNDABOUT returned null", enumTraversableRoundabout); - assertNotNull("JUGHANDLE returned null", enumJughandle); - assertNotNull("ALL_WAY_YIELD returned null", enumAllWayYield); - assertNotNull("TURN_AROUND returned null", enumTurnAround); - } + assertNotNull("REGULAR returned null", enumRegular); + assertNotNull("BIFURCATION returned null", enumBifurcation); + assertNotNull("MULTI_CARRIAGEWAY returned null", enumMultiCarriageway); + assertNotNull("ROUNDABOUT returned null", enumRoundabout); + assertNotNull("TRAVERSABLE_ROUNDABOUT returned null", enumTraversableRoundabout); + assertNotNull("JUGHANDLE returned null", enumJughandle); + assertNotNull("ALL_WAY_YIELD returned null", enumAllWayYield); + assertNotNull("TURN_AROUND returned null", enumTurnAround); + } - /** - * Verifies that an invalid assignment is null. - */ - public void testInvalidEnum () { - String example = "fRONT"; - try { - NavigationJunction temp = NavigationJunction.valueForString(example); - assertNull("Result of valueForString should be null.", temp); - } - catch (IllegalArgumentException exception) { - fail("Invalid enum throws IllegalArgumentException."); - } - } + /** + * Verifies that an invalid assignment is null. + */ + public void testInvalidEnum() { + String example = "fRONT"; + try { + NavigationJunction temp = NavigationJunction.valueForString(example); + assertNull("Result of valueForString should be null.", temp); + } catch (IllegalArgumentException exception) { + fail("Invalid enum throws IllegalArgumentException."); + } + } - /** - * Verifies that a null assignment is invalid. - */ - public void testNullEnum () { - String example = null; - try { - NavigationJunction temp = NavigationJunction.valueForString(example); - assertNull("Result of valueForString should be null.", temp); - } - catch (NullPointerException exception) { - fail("Null string throws NullPointerException."); - } - } + /** + * Verifies that a null assignment is invalid. + */ + public void testNullEnum() { + String example = null; + try { + NavigationJunction temp = NavigationJunction.valueForString(example); + assertNull("Result of valueForString should be null.", temp); + } catch (NullPointerException exception) { + fail("Null string throws NullPointerException."); + } + } - /** - * Verifies the possible enum values of NavigationJunction. - */ - public void testListEnum() { - List<NavigationJunction> enumValueList = Arrays.asList(NavigationJunction.values()); + /** + * Verifies the possible enum values of NavigationJunction. + */ + public void testListEnum() { + List<NavigationJunction> enumValueList = Arrays.asList(NavigationJunction.values()); - List<NavigationJunction> enumTestList = new ArrayList<>(); - enumTestList.add(NavigationJunction.REGULAR); - enumTestList.add(NavigationJunction.BIFURCATION); - enumTestList.add(NavigationJunction.MULTI_CARRIAGEWAY); - enumTestList.add(NavigationJunction.ROUNDABOUT); - enumTestList.add(NavigationJunction.TRAVERSABLE_ROUNDABOUT); - enumTestList.add(NavigationJunction.JUGHANDLE); - enumTestList.add(NavigationJunction.ALL_WAY_YIELD); - enumTestList.add(NavigationJunction.TURN_AROUND); + List<NavigationJunction> enumTestList = new ArrayList<>(); + enumTestList.add(NavigationJunction.REGULAR); + enumTestList.add(NavigationJunction.BIFURCATION); + enumTestList.add(NavigationJunction.MULTI_CARRIAGEWAY); + enumTestList.add(NavigationJunction.ROUNDABOUT); + enumTestList.add(NavigationJunction.TRAVERSABLE_ROUNDABOUT); + enumTestList.add(NavigationJunction.JUGHANDLE); + enumTestList.add(NavigationJunction.ALL_WAY_YIELD); + enumTestList.add(NavigationJunction.TURN_AROUND); - assertTrue("Enum value list does not match enum class list", - enumValueList.containsAll(enumTestList) && enumTestList.containsAll(enumValueList)); - } + assertTrue("Enum value list does not match enum class list", + enumValueList.containsAll(enumTestList) && enumTestList.containsAll(enumValueList)); + } } diff --git a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/PermissionStatusTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/PermissionStatusTests.java index 2a11db43f..74d3dc704 100644 --- a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/PermissionStatusTests.java +++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/PermissionStatusTests.java @@ -46,66 +46,64 @@ import java.util.List; */ public class PermissionStatusTests extends TestCase { - /** - * Verifies that the enum values are not null upon valid assignment. - */ - public void testValidEnums () { - String example = "ALLOWED"; - PermissionStatus enumAllowed = PermissionStatus.valueForString(example); - example = "DISALLOWED"; - PermissionStatus enumDisallowed = PermissionStatus.valueForString(example); - example = "USER_DISALLOWED"; - PermissionStatus enumUserDisallowed = PermissionStatus.valueForString(example); - example = "USER_CONSENT_PENDING"; - PermissionStatus enumUserConsentPending = PermissionStatus.valueForString(example); + /** + * Verifies that the enum values are not null upon valid assignment. + */ + public void testValidEnums() { + String example = "ALLOWED"; + PermissionStatus enumAllowed = PermissionStatus.valueForString(example); + example = "DISALLOWED"; + PermissionStatus enumDisallowed = PermissionStatus.valueForString(example); + example = "USER_DISALLOWED"; + PermissionStatus enumUserDisallowed = PermissionStatus.valueForString(example); + example = "USER_CONSENT_PENDING"; + PermissionStatus enumUserConsentPending = PermissionStatus.valueForString(example); - assertNotNull("ALLOWED returned null", enumAllowed); - assertNotNull("DISALLOWED returned null", enumDisallowed); - assertNotNull("USER_DISALLOWED returned null", enumUserDisallowed); - assertNotNull("USER_CONSENT_PENDING returned null", enumUserConsentPending); - } + assertNotNull("ALLOWED returned null", enumAllowed); + assertNotNull("DISALLOWED returned null", enumDisallowed); + assertNotNull("USER_DISALLOWED returned null", enumUserDisallowed); + assertNotNull("USER_CONSENT_PENDING returned null", enumUserConsentPending); + } - /** - * Verifies that an invalid assignment is null. - */ - public void testInvalidEnum () { - String example = "DISALLOwed"; - try { - PermissionStatus temp = PermissionStatus.valueForString(example); - assertNull("Result of valueForString should be null.", temp); - } - catch (IllegalArgumentException exception) { - fail("Invalid enum throws IllegalArgumentException."); - } - } + /** + * Verifies that an invalid assignment is null. + */ + public void testInvalidEnum() { + String example = "DISALLOwed"; + try { + PermissionStatus temp = PermissionStatus.valueForString(example); + assertNull("Result of valueForString should be null.", temp); + } catch (IllegalArgumentException exception) { + fail("Invalid enum throws IllegalArgumentException."); + } + } - /** - * Verifies that a null assignment is invalid. - */ - public void testNullEnum () { - String example = null; - try { - PermissionStatus temp = PermissionStatus.valueForString(example); - assertNull("Result of valueForString should be null.", temp); - } - catch (NullPointerException exception) { - fail("Null string throws NullPointerException."); - } - } + /** + * Verifies that a null assignment is invalid. + */ + public void testNullEnum() { + String example = null; + try { + PermissionStatus temp = PermissionStatus.valueForString(example); + assertNull("Result of valueForString should be null.", temp); + } catch (NullPointerException exception) { + fail("Null string throws NullPointerException."); + } + } - /** - * Verifies the possible enum values of PermissionStatus. - */ - public void testListEnum() { - List<PermissionStatus> enumValueList = Arrays.asList(PermissionStatus.values()); + /** + * Verifies the possible enum values of PermissionStatus. + */ + public void testListEnum() { + List<PermissionStatus> enumValueList = Arrays.asList(PermissionStatus.values()); - List<PermissionStatus> enumTestList = new ArrayList<>(); - enumTestList.add(PermissionStatus.ALLOWED); - enumTestList.add(PermissionStatus.DISALLOWED); - enumTestList.add(PermissionStatus.USER_DISALLOWED); - enumTestList.add(PermissionStatus.USER_CONSENT_PENDING); + List<PermissionStatus> enumTestList = new ArrayList<>(); + enumTestList.add(PermissionStatus.ALLOWED); + enumTestList.add(PermissionStatus.DISALLOWED); + enumTestList.add(PermissionStatus.USER_DISALLOWED); + enumTestList.add(PermissionStatus.USER_CONSENT_PENDING); - assertTrue("Enum value list does not match enum class list", - enumValueList.containsAll(enumTestList) && enumTestList.containsAll(enumValueList)); - } + assertTrue("Enum value list does not match enum class list", + enumValueList.containsAll(enumTestList) && enumTestList.containsAll(enumValueList)); + } }
\ No newline at end of file diff --git a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/PowerModeQualificationStatusTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/PowerModeQualificationStatusTests.java index e1b56e1f5..2e7301fc3 100644 --- a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/PowerModeQualificationStatusTests.java +++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/PowerModeQualificationStatusTests.java @@ -9,71 +9,69 @@ import java.util.Arrays; import java.util.List; /** - * This is a unit test class for the SmartDeviceLink library project class : + * This is a unit test class for the SmartDeviceLink library project class : * {@link com.smartdevicelink.proxy.rpc.enums.PowerModeQualificationStatus} */ public class PowerModeQualificationStatusTests extends TestCase { - /** - * Verifies that the enum values are not null upon valid assignment. - */ - public void testValidEnums () { - String example = "POWER_MODE_UNDEFINED"; - PowerModeQualificationStatus enumPowerModeUndefined = PowerModeQualificationStatus.valueForString(example); - example = "POWER_MODE_EVALUATION_IN_PROGRESS"; - PowerModeQualificationStatus enumPowerModeEvaluationInProgress = PowerModeQualificationStatus.valueForString(example); - example = "NOT_DEFINED"; - PowerModeQualificationStatus enumNotDefined = PowerModeQualificationStatus.valueForString(example); - example = "POWER_MODE_OK"; - PowerModeQualificationStatus enumPowerModeOk = PowerModeQualificationStatus.valueForString(example); - - assertNotNull("POWER_MODE_UNDEFINED returned null", enumPowerModeUndefined); - assertNotNull("POWER_MODE_EVALUATION_IN_PROGRESS returned null", enumPowerModeEvaluationInProgress); - assertNotNull("NOT_DEFINED returned null", enumNotDefined); - assertNotNull("POWER_MODE_OK returned null", enumPowerModeOk); - } + /** + * Verifies that the enum values are not null upon valid assignment. + */ + public void testValidEnums() { + String example = "POWER_MODE_UNDEFINED"; + PowerModeQualificationStatus enumPowerModeUndefined = PowerModeQualificationStatus.valueForString(example); + example = "POWER_MODE_EVALUATION_IN_PROGRESS"; + PowerModeQualificationStatus enumPowerModeEvaluationInProgress = PowerModeQualificationStatus.valueForString(example); + example = "NOT_DEFINED"; + PowerModeQualificationStatus enumNotDefined = PowerModeQualificationStatus.valueForString(example); + example = "POWER_MODE_OK"; + PowerModeQualificationStatus enumPowerModeOk = PowerModeQualificationStatus.valueForString(example); - /** - * Verifies that an invalid assignment is null. - */ - public void testInvalidEnum () { - String example = "poweR_moDE_UndEfiNEd"; - try { - PowerModeQualificationStatus temp = PowerModeQualificationStatus.valueForString(example); + assertNotNull("POWER_MODE_UNDEFINED returned null", enumPowerModeUndefined); + assertNotNull("POWER_MODE_EVALUATION_IN_PROGRESS returned null", enumPowerModeEvaluationInProgress); + assertNotNull("NOT_DEFINED returned null", enumNotDefined); + assertNotNull("POWER_MODE_OK returned null", enumPowerModeOk); + } + + /** + * Verifies that an invalid assignment is null. + */ + public void testInvalidEnum() { + String example = "poweR_moDE_UndEfiNEd"; + try { + PowerModeQualificationStatus temp = PowerModeQualificationStatus.valueForString(example); assertNull("Result of valueForString should be null.", temp); - } - catch (IllegalArgumentException exception) { + } catch (IllegalArgumentException exception) { fail("Invalid enum throws IllegalArgumentException."); - } - } + } + } - /** - * Verifies that a null assignment is invalid. - */ - public void testNullEnum () { - String example = null; - try { - PowerModeQualificationStatus temp = PowerModeQualificationStatus.valueForString(example); + /** + * Verifies that a null assignment is invalid. + */ + public void testNullEnum() { + String example = null; + try { + PowerModeQualificationStatus temp = PowerModeQualificationStatus.valueForString(example); assertNull("Result of valueForString should be null.", temp); - } - catch (NullPointerException exception) { + } catch (NullPointerException exception) { fail("Null string throws NullPointerException."); - } - } + } + } - /** - * Verifies the possible enum values of PowerModeQualificationStatus. - */ - public void testListEnum() { - List<PowerModeQualificationStatus> enumValueList = Arrays.asList(PowerModeQualificationStatus.values()); + /** + * Verifies the possible enum values of PowerModeQualificationStatus. + */ + public void testListEnum() { + List<PowerModeQualificationStatus> enumValueList = Arrays.asList(PowerModeQualificationStatus.values()); - List<PowerModeQualificationStatus> enumTestList = new ArrayList<PowerModeQualificationStatus>(); - enumTestList.add(PowerModeQualificationStatus.POWER_MODE_UNDEFINED); - enumTestList.add(PowerModeQualificationStatus.POWER_MODE_EVALUATION_IN_PROGRESS); - enumTestList.add(PowerModeQualificationStatus.NOT_DEFINED); - enumTestList.add(PowerModeQualificationStatus.POWER_MODE_OK); + List<PowerModeQualificationStatus> enumTestList = new ArrayList<PowerModeQualificationStatus>(); + enumTestList.add(PowerModeQualificationStatus.POWER_MODE_UNDEFINED); + enumTestList.add(PowerModeQualificationStatus.POWER_MODE_EVALUATION_IN_PROGRESS); + enumTestList.add(PowerModeQualificationStatus.NOT_DEFINED); + enumTestList.add(PowerModeQualificationStatus.POWER_MODE_OK); - assertTrue("Enum value list does not match enum class list", - enumValueList.containsAll(enumTestList) && enumTestList.containsAll(enumValueList)); - } + assertTrue("Enum value list does not match enum class list", + enumValueList.containsAll(enumTestList) && enumTestList.containsAll(enumValueList)); + } }
\ No newline at end of file diff --git a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/PowerModeStatusTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/PowerModeStatusTests.java index 1063b2f81..a9f029634 100644 --- a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/PowerModeStatusTests.java +++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/PowerModeStatusTests.java @@ -9,91 +9,89 @@ import java.util.Arrays; import java.util.List; /** - * This is a unit test class for the SmartDeviceLink library project class : + * This is a unit test class for the SmartDeviceLink library project class : * {@link com.smartdevicelink.proxy.rpc.enums.PowerModeStatus} */ public class PowerModeStatusTests extends TestCase { - /** - * Verifies that the enum values are not null upon valid assignment. - */ - public void testValidEnums () { - String example = "KEY_OUT"; - PowerModeStatus enumKeyOut = PowerModeStatus.valueForString(example); - example = "KEY_RECENTLY_OUT"; - PowerModeStatus enumKeyRecentlyOut = PowerModeStatus.valueForString(example); - example = "KEY_APPROVED_0"; - PowerModeStatus enumKeyApproved0 = PowerModeStatus.valueForString(example); - example = "POST_ACCESORY_0"; - PowerModeStatus enumPostAccessory0 = PowerModeStatus.valueForString(example); - example = "ACCESORY_1"; - PowerModeStatus enumAccessory1 = PowerModeStatus.valueForString(example); - example = "POST_IGNITION_1"; - PowerModeStatus enumPostIgnition1 = PowerModeStatus.valueForString(example); - example = "IGNITION_ON_2"; - PowerModeStatus enumIgnitionOn2 = PowerModeStatus.valueForString(example); - example = "RUNNING_2"; - PowerModeStatus enumRunning2 = PowerModeStatus.valueForString(example); - example = "CRANK_3"; - PowerModeStatus enumCrank3 = PowerModeStatus.valueForString(example); - - assertNotNull("KEY_OUT returned null", enumKeyOut); - assertNotNull("KEY_RECENTLY_OUT returned null", enumKeyRecentlyOut); - assertNotNull("KEY_APPROVED_0 returned null", enumKeyApproved0); - assertNotNull("POST_ACCESORY_0 returned null", enumPostAccessory0); - assertNotNull("ACCESORY_1 returned null", enumAccessory1); - assertNotNull("POST_IGNITION_1 returned null", enumPostIgnition1); - assertNotNull("IGNITION_ON_2 returned null", enumIgnitionOn2); - assertNotNull("RUNNING_2 returned null", enumRunning2); - assertNotNull("CRANK_3 returned null", enumCrank3); - } + /** + * Verifies that the enum values are not null upon valid assignment. + */ + public void testValidEnums() { + String example = "KEY_OUT"; + PowerModeStatus enumKeyOut = PowerModeStatus.valueForString(example); + example = "KEY_RECENTLY_OUT"; + PowerModeStatus enumKeyRecentlyOut = PowerModeStatus.valueForString(example); + example = "KEY_APPROVED_0"; + PowerModeStatus enumKeyApproved0 = PowerModeStatus.valueForString(example); + example = "POST_ACCESORY_0"; + PowerModeStatus enumPostAccessory0 = PowerModeStatus.valueForString(example); + example = "ACCESORY_1"; + PowerModeStatus enumAccessory1 = PowerModeStatus.valueForString(example); + example = "POST_IGNITION_1"; + PowerModeStatus enumPostIgnition1 = PowerModeStatus.valueForString(example); + example = "IGNITION_ON_2"; + PowerModeStatus enumIgnitionOn2 = PowerModeStatus.valueForString(example); + example = "RUNNING_2"; + PowerModeStatus enumRunning2 = PowerModeStatus.valueForString(example); + example = "CRANK_3"; + PowerModeStatus enumCrank3 = PowerModeStatus.valueForString(example); - /** - * Verifies that an invalid assignment is null. - */ - public void testInvalidEnum () { - String example = "key_Out"; - try { - PowerModeStatus temp = PowerModeStatus.valueForString(example); + assertNotNull("KEY_OUT returned null", enumKeyOut); + assertNotNull("KEY_RECENTLY_OUT returned null", enumKeyRecentlyOut); + assertNotNull("KEY_APPROVED_0 returned null", enumKeyApproved0); + assertNotNull("POST_ACCESORY_0 returned null", enumPostAccessory0); + assertNotNull("ACCESORY_1 returned null", enumAccessory1); + assertNotNull("POST_IGNITION_1 returned null", enumPostIgnition1); + assertNotNull("IGNITION_ON_2 returned null", enumIgnitionOn2); + assertNotNull("RUNNING_2 returned null", enumRunning2); + assertNotNull("CRANK_3 returned null", enumCrank3); + } + + /** + * Verifies that an invalid assignment is null. + */ + public void testInvalidEnum() { + String example = "key_Out"; + try { + PowerModeStatus temp = PowerModeStatus.valueForString(example); assertNull("Result of valueForString should be null.", temp); - } - catch (IllegalArgumentException exception) { + } catch (IllegalArgumentException exception) { fail("Invalid enum throws IllegalArgumentException."); - } - } + } + } - /** - * Verifies that a null assignment is invalid. - */ - public void testNullEnum () { - String example = null; - try { - PowerModeStatus temp = PowerModeStatus.valueForString(example); + /** + * Verifies that a null assignment is invalid. + */ + public void testNullEnum() { + String example = null; + try { + PowerModeStatus temp = PowerModeStatus.valueForString(example); assertNull("Result of valueForString should be null.", temp); - } - catch (NullPointerException exception) { + } catch (NullPointerException exception) { fail("Null string throws NullPointerException."); - } - } + } + } - /** - * Verifies the possible enum values of PowerModeStatus. - */ - public void testListEnum() { - List<PowerModeStatus> enumValueList = Arrays.asList(PowerModeStatus.values()); + /** + * Verifies the possible enum values of PowerModeStatus. + */ + public void testListEnum() { + List<PowerModeStatus> enumValueList = Arrays.asList(PowerModeStatus.values()); - List<PowerModeStatus> enumTestList = new ArrayList<PowerModeStatus>(); - enumTestList.add(PowerModeStatus.KEY_OUT); - enumTestList.add(PowerModeStatus.KEY_RECENTLY_OUT); - enumTestList.add(PowerModeStatus.KEY_APPROVED_0); - enumTestList.add(PowerModeStatus.POST_ACCESORY_0); - enumTestList.add(PowerModeStatus.ACCESORY_1); - enumTestList.add(PowerModeStatus.POST_IGNITION_1); - enumTestList.add(PowerModeStatus.IGNITION_ON_2); - enumTestList.add(PowerModeStatus.RUNNING_2); - enumTestList.add(PowerModeStatus.CRANK_3); + List<PowerModeStatus> enumTestList = new ArrayList<PowerModeStatus>(); + enumTestList.add(PowerModeStatus.KEY_OUT); + enumTestList.add(PowerModeStatus.KEY_RECENTLY_OUT); + enumTestList.add(PowerModeStatus.KEY_APPROVED_0); + enumTestList.add(PowerModeStatus.POST_ACCESORY_0); + enumTestList.add(PowerModeStatus.ACCESORY_1); + enumTestList.add(PowerModeStatus.POST_IGNITION_1); + enumTestList.add(PowerModeStatus.IGNITION_ON_2); + enumTestList.add(PowerModeStatus.RUNNING_2); + enumTestList.add(PowerModeStatus.CRANK_3); - assertTrue("Enum value list does not match enum class list", - enumValueList.containsAll(enumTestList) && enumTestList.containsAll(enumValueList)); - } + assertTrue("Enum value list does not match enum class list", + enumValueList.containsAll(enumTestList) && enumTestList.containsAll(enumValueList)); + } }
\ No newline at end of file diff --git a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/PredefinedLayoutTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/PredefinedLayoutTests.java index 4c5526eec..d1b4c6b52 100644 --- a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/PredefinedLayoutTests.java +++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/PredefinedLayoutTests.java @@ -14,135 +14,133 @@ import java.util.List; */ public class PredefinedLayoutTests extends TestCase { - /** - * Verifies that the enum values are not null upon valid assignment. - */ - public void testValidEnums () { - String example = "DEFAULT"; - PredefinedLayout defaultenum = PredefinedLayout.valueForString(example); - example = "MEDIA"; - PredefinedLayout media = PredefinedLayout.valueForString(example); - example = "NON-MEDIA"; - PredefinedLayout nonmedia = PredefinedLayout.valueForString(example); - example = "ONSCREEN_PRESETS"; - PredefinedLayout onscreen_presets = PredefinedLayout.valueForString(example); - example = "NAV_FULLSCREEN_MAP"; - PredefinedLayout nav_fullscreen_map = PredefinedLayout.valueForString(example); - example = "NAV_LIST"; - PredefinedLayout nav_list = PredefinedLayout.valueForString(example); - example = "NAV_KEYBOARD"; - PredefinedLayout nav_keyboard = PredefinedLayout.valueForString(example); - example = "GRAPHIC_WITH_TEXT"; - PredefinedLayout graphic_with_text = PredefinedLayout.valueForString(example); - example = "TEXT_WITH_GRAPHIC"; - PredefinedLayout text_with_graphic = PredefinedLayout.valueForString(example); - example = "TILES_ONLY"; - PredefinedLayout tiles_only = PredefinedLayout.valueForString(example); - example = "TEXTBUTTONS_ONLY"; - PredefinedLayout textbuttons_only = PredefinedLayout.valueForString(example); - example = "GRAPHIC_WITH_TILES"; - PredefinedLayout graphic_with_tiles = PredefinedLayout.valueForString(example); - example = "TILES_WITH_GRAPHIC"; - PredefinedLayout tiles_with_graphic = PredefinedLayout.valueForString(example); - example = "GRAPHIC_WITH_TEXT_AND_SOFTBUTTONS"; - PredefinedLayout graphic_with_text_and_softbuttons = PredefinedLayout.valueForString(example); - example = "TEXT_AND_SOFTBUTTONS_WITH_GRAPHIC"; - PredefinedLayout text_and_softbuttons_with_graphics = PredefinedLayout.valueForString(example); - example = "GRAPHIC_WITH_TEXTBUTTONS"; - PredefinedLayout graphic_with_textbuttons = PredefinedLayout.valueForString(example); - example = "TEXTBUTTONS_WITH_GRAPHIC"; - PredefinedLayout textbuttons_with_graphic = PredefinedLayout.valueForString(example); - example = "LARGE_GRAPHIC_WITH_SOFTBUTTONS"; - PredefinedLayout large_graphic_with_softbuttons = PredefinedLayout.valueForString(example); - example = "DOUBLE_GRAPHIC_WITH_SOFTBUTTONS"; - PredefinedLayout double_graphic_with_softbuttons = PredefinedLayout.valueForString(example); - example = "LARGE_GRAPHIC_ONLY"; - PredefinedLayout large_graphic_only = PredefinedLayout.valueForString(example); - example = "WEB_VIEW"; - PredefinedLayout web_view = PredefinedLayout.valueForString(example); + /** + * Verifies that the enum values are not null upon valid assignment. + */ + public void testValidEnums() { + String example = "DEFAULT"; + PredefinedLayout defaultenum = PredefinedLayout.valueForString(example); + example = "MEDIA"; + PredefinedLayout media = PredefinedLayout.valueForString(example); + example = "NON-MEDIA"; + PredefinedLayout nonmedia = PredefinedLayout.valueForString(example); + example = "ONSCREEN_PRESETS"; + PredefinedLayout onscreen_presets = PredefinedLayout.valueForString(example); + example = "NAV_FULLSCREEN_MAP"; + PredefinedLayout nav_fullscreen_map = PredefinedLayout.valueForString(example); + example = "NAV_LIST"; + PredefinedLayout nav_list = PredefinedLayout.valueForString(example); + example = "NAV_KEYBOARD"; + PredefinedLayout nav_keyboard = PredefinedLayout.valueForString(example); + example = "GRAPHIC_WITH_TEXT"; + PredefinedLayout graphic_with_text = PredefinedLayout.valueForString(example); + example = "TEXT_WITH_GRAPHIC"; + PredefinedLayout text_with_graphic = PredefinedLayout.valueForString(example); + example = "TILES_ONLY"; + PredefinedLayout tiles_only = PredefinedLayout.valueForString(example); + example = "TEXTBUTTONS_ONLY"; + PredefinedLayout textbuttons_only = PredefinedLayout.valueForString(example); + example = "GRAPHIC_WITH_TILES"; + PredefinedLayout graphic_with_tiles = PredefinedLayout.valueForString(example); + example = "TILES_WITH_GRAPHIC"; + PredefinedLayout tiles_with_graphic = PredefinedLayout.valueForString(example); + example = "GRAPHIC_WITH_TEXT_AND_SOFTBUTTONS"; + PredefinedLayout graphic_with_text_and_softbuttons = PredefinedLayout.valueForString(example); + example = "TEXT_AND_SOFTBUTTONS_WITH_GRAPHIC"; + PredefinedLayout text_and_softbuttons_with_graphics = PredefinedLayout.valueForString(example); + example = "GRAPHIC_WITH_TEXTBUTTONS"; + PredefinedLayout graphic_with_textbuttons = PredefinedLayout.valueForString(example); + example = "TEXTBUTTONS_WITH_GRAPHIC"; + PredefinedLayout textbuttons_with_graphic = PredefinedLayout.valueForString(example); + example = "LARGE_GRAPHIC_WITH_SOFTBUTTONS"; + PredefinedLayout large_graphic_with_softbuttons = PredefinedLayout.valueForString(example); + example = "DOUBLE_GRAPHIC_WITH_SOFTBUTTONS"; + PredefinedLayout double_graphic_with_softbuttons = PredefinedLayout.valueForString(example); + example = "LARGE_GRAPHIC_ONLY"; + PredefinedLayout large_graphic_only = PredefinedLayout.valueForString(example); + example = "WEB_VIEW"; + PredefinedLayout web_view = PredefinedLayout.valueForString(example); - assertNotNull("DEFAULT returned null", defaultenum); - assertNotNull("MEDIA returned null", media); - assertNotNull("NON-MEDIA returned null", nonmedia); - assertNotNull("ONSCREEN_PRESETS returned null", onscreen_presets); - assertNotNull("NAV_FULLSCREEN_MAP returned null", nav_fullscreen_map); - assertNotNull("NAV_LIST returned null", nav_list); - assertNotNull("NAV_KEYBOARD returned null", nav_keyboard); - assertNotNull("GRAPHIC_WITH_TEXT returned null", graphic_with_text); - assertNotNull("TEXT_WITH_GRAPHIC returned null", text_with_graphic); - assertNotNull("TILES_ONLY returned null", tiles_only); - assertNotNull("TEXTBUTTONS_ONLY returned null", textbuttons_only); - assertNotNull("GRAPHIC_WITH_TILES returned null", graphic_with_tiles); - assertNotNull("TILES_WITH_GRAPHIC returned null", tiles_with_graphic); - assertNotNull("GRAPHIC_WITH_TEXT_AND_SOFTBUTTONS returned null", graphic_with_text_and_softbuttons); - assertNotNull("TEXT_AND_SOFTBUTTONS_WITH_GRAPHIC returned null", text_and_softbuttons_with_graphics); - assertNotNull("GRAPHIC_WITH_TEXTBUTTONS returned null", graphic_with_textbuttons); - assertNotNull("TEXTBUTTONS_WITH_GRAPHIC returned null", textbuttons_with_graphic); - assertNotNull("LARGE_GRAPHIC_WITH_SOFTBUTTONS returned null", large_graphic_with_softbuttons); - assertNotNull("DOUBLE_GRAPHIC_WITH_SOFTBUTTONS returned null", double_graphic_with_softbuttons); - assertNotNull("LARGE_GRAPHIC_ONLY returned null", large_graphic_only); - assertNotNull("WEB_VIEW returned null", web_view); - } + assertNotNull("DEFAULT returned null", defaultenum); + assertNotNull("MEDIA returned null", media); + assertNotNull("NON-MEDIA returned null", nonmedia); + assertNotNull("ONSCREEN_PRESETS returned null", onscreen_presets); + assertNotNull("NAV_FULLSCREEN_MAP returned null", nav_fullscreen_map); + assertNotNull("NAV_LIST returned null", nav_list); + assertNotNull("NAV_KEYBOARD returned null", nav_keyboard); + assertNotNull("GRAPHIC_WITH_TEXT returned null", graphic_with_text); + assertNotNull("TEXT_WITH_GRAPHIC returned null", text_with_graphic); + assertNotNull("TILES_ONLY returned null", tiles_only); + assertNotNull("TEXTBUTTONS_ONLY returned null", textbuttons_only); + assertNotNull("GRAPHIC_WITH_TILES returned null", graphic_with_tiles); + assertNotNull("TILES_WITH_GRAPHIC returned null", tiles_with_graphic); + assertNotNull("GRAPHIC_WITH_TEXT_AND_SOFTBUTTONS returned null", graphic_with_text_and_softbuttons); + assertNotNull("TEXT_AND_SOFTBUTTONS_WITH_GRAPHIC returned null", text_and_softbuttons_with_graphics); + assertNotNull("GRAPHIC_WITH_TEXTBUTTONS returned null", graphic_with_textbuttons); + assertNotNull("TEXTBUTTONS_WITH_GRAPHIC returned null", textbuttons_with_graphic); + assertNotNull("LARGE_GRAPHIC_WITH_SOFTBUTTONS returned null", large_graphic_with_softbuttons); + assertNotNull("DOUBLE_GRAPHIC_WITH_SOFTBUTTONS returned null", double_graphic_with_softbuttons); + assertNotNull("LARGE_GRAPHIC_ONLY returned null", large_graphic_only); + assertNotNull("WEB_VIEW returned null", web_view); + } - /** - * Verifies that an invalid assignment is null. - */ - public void testInvalidEnum () { - String example = "LARGE_GRApHIC_ONLY"; - try { - PredefinedLayout temp = PredefinedLayout.valueForString(example); - assertNull("Result of valueForString should be null.", temp); - } - catch (IllegalArgumentException exception) { - fail("Invalid enum throws IllegalArgumentException."); - } - } + /** + * Verifies that an invalid assignment is null. + */ + public void testInvalidEnum() { + String example = "LARGE_GRApHIC_ONLY"; + try { + PredefinedLayout temp = PredefinedLayout.valueForString(example); + assertNull("Result of valueForString should be null.", temp); + } catch (IllegalArgumentException exception) { + fail("Invalid enum throws IllegalArgumentException."); + } + } - /** - * Verifies that a null assignment is invalid. - */ - public void testNullEnum () { - String example = null; - try { - PredefinedLayout temp = PredefinedLayout.valueForString(example); - assertNull("Result of valueForString should be null.", temp); - } - catch (NullPointerException exception) { - fail("Null string throws NullPointerException."); - } - } + /** + * Verifies that a null assignment is invalid. + */ + public void testNullEnum() { + String example = null; + try { + PredefinedLayout temp = PredefinedLayout.valueForString(example); + assertNull("Result of valueForString should be null.", temp); + } catch (NullPointerException exception) { + fail("Null string throws NullPointerException."); + } + } - /** - * Verifies the possible enum values of PredefinedLayout. - */ - public void testListEnum() { - List<PredefinedLayout> enumValueList = Arrays.asList(PredefinedLayout.values()); + /** + * Verifies the possible enum values of PredefinedLayout. + */ + public void testListEnum() { + List<PredefinedLayout> enumValueList = Arrays.asList(PredefinedLayout.values()); - List<PredefinedLayout> enumTestList = new ArrayList<>(); + List<PredefinedLayout> enumTestList = new ArrayList<>(); - enumTestList.add(PredefinedLayout.DEFAULT); - enumTestList.add(PredefinedLayout.MEDIA); - enumTestList.add(PredefinedLayout.NON_MEDIA); - enumTestList.add(PredefinedLayout.ONSCREEN_PRESETS); - enumTestList.add(PredefinedLayout.NAV_FULLSCREEN_MAP); - enumTestList.add(PredefinedLayout.NAV_LIST); - enumTestList.add(PredefinedLayout.NAV_KEYBOARD); - enumTestList.add(PredefinedLayout.GRAPHIC_WITH_TEXT); - enumTestList.add(PredefinedLayout.TEXT_WITH_GRAPHIC); - enumTestList.add(PredefinedLayout.TILES_ONLY); - enumTestList.add(PredefinedLayout.TEXTBUTTONS_ONLY); - enumTestList.add(PredefinedLayout.GRAPHIC_WITH_TILES); - enumTestList.add(PredefinedLayout.TILES_WITH_GRAPHIC); - enumTestList.add(PredefinedLayout.GRAPHIC_WITH_TEXT_AND_SOFTBUTTONS); - enumTestList.add(PredefinedLayout.TEXT_AND_SOFTBUTTONS_WITH_GRAPHIC); - enumTestList.add(PredefinedLayout.GRAPHIC_WITH_TEXTBUTTONS); - enumTestList.add(PredefinedLayout.TEXTBUTTONS_WITH_GRAPHIC); - enumTestList.add(PredefinedLayout.LARGE_GRAPHIC_WITH_SOFTBUTTONS); - enumTestList.add(PredefinedLayout.DOUBLE_GRAPHIC_WITH_SOFTBUTTONS); - enumTestList.add(PredefinedLayout.LARGE_GRAPHIC_ONLY); - enumTestList.add(PredefinedLayout.WEB_VIEW); + enumTestList.add(PredefinedLayout.DEFAULT); + enumTestList.add(PredefinedLayout.MEDIA); + enumTestList.add(PredefinedLayout.NON_MEDIA); + enumTestList.add(PredefinedLayout.ONSCREEN_PRESETS); + enumTestList.add(PredefinedLayout.NAV_FULLSCREEN_MAP); + enumTestList.add(PredefinedLayout.NAV_LIST); + enumTestList.add(PredefinedLayout.NAV_KEYBOARD); + enumTestList.add(PredefinedLayout.GRAPHIC_WITH_TEXT); + enumTestList.add(PredefinedLayout.TEXT_WITH_GRAPHIC); + enumTestList.add(PredefinedLayout.TILES_ONLY); + enumTestList.add(PredefinedLayout.TEXTBUTTONS_ONLY); + enumTestList.add(PredefinedLayout.GRAPHIC_WITH_TILES); + enumTestList.add(PredefinedLayout.TILES_WITH_GRAPHIC); + enumTestList.add(PredefinedLayout.GRAPHIC_WITH_TEXT_AND_SOFTBUTTONS); + enumTestList.add(PredefinedLayout.TEXT_AND_SOFTBUTTONS_WITH_GRAPHIC); + enumTestList.add(PredefinedLayout.GRAPHIC_WITH_TEXTBUTTONS); + enumTestList.add(PredefinedLayout.TEXTBUTTONS_WITH_GRAPHIC); + enumTestList.add(PredefinedLayout.LARGE_GRAPHIC_WITH_SOFTBUTTONS); + enumTestList.add(PredefinedLayout.DOUBLE_GRAPHIC_WITH_SOFTBUTTONS); + enumTestList.add(PredefinedLayout.LARGE_GRAPHIC_ONLY); + enumTestList.add(PredefinedLayout.WEB_VIEW); - assertTrue("Enum value list does not match enum class list", - enumValueList.containsAll(enumTestList) && enumTestList.containsAll(enumValueList)); - } + assertTrue("Enum value list does not match enum class list", + enumValueList.containsAll(enumTestList) && enumTestList.containsAll(enumValueList)); + } }
\ No newline at end of file diff --git a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/PrerecordedSpeechTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/PrerecordedSpeechTests.java index e8b700007..209030f3a 100644 --- a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/PrerecordedSpeechTests.java +++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/PrerecordedSpeechTests.java @@ -9,75 +9,73 @@ import java.util.Arrays; import java.util.List; /** - * This is a unit test class for the SmartDeviceLink library project class : + * This is a unit test class for the SmartDeviceLink library project class : * {@link com.smartdevicelink.proxy.rpc.enums.PrerecordedSpeech} */ public class PrerecordedSpeechTests extends TestCase { - /** - * Verifies that the enum values are not null upon valid assignment. - */ - public void testValidEnums () { - String example = "HELP_JINGLE"; - PrerecordedSpeech enumHelpJingle = PrerecordedSpeech.valueForString(example); - example = "INITIAL_JINGLE"; - PrerecordedSpeech enumInitialJingle = PrerecordedSpeech.valueForString(example); - example = "LISTEN_JINGLE"; - PrerecordedSpeech enumListenJingle = PrerecordedSpeech.valueForString(example); - example = "POSITIVE_JINGLE"; - PrerecordedSpeech enumPositiveJingle = PrerecordedSpeech.valueForString(example); - example = "NEGATIVE_JINGLE"; - PrerecordedSpeech enumNegativeJingle = PrerecordedSpeech.valueForString(example); + /** + * Verifies that the enum values are not null upon valid assignment. + */ + public void testValidEnums() { + String example = "HELP_JINGLE"; + PrerecordedSpeech enumHelpJingle = PrerecordedSpeech.valueForString(example); + example = "INITIAL_JINGLE"; + PrerecordedSpeech enumInitialJingle = PrerecordedSpeech.valueForString(example); + example = "LISTEN_JINGLE"; + PrerecordedSpeech enumListenJingle = PrerecordedSpeech.valueForString(example); + example = "POSITIVE_JINGLE"; + PrerecordedSpeech enumPositiveJingle = PrerecordedSpeech.valueForString(example); + example = "NEGATIVE_JINGLE"; + PrerecordedSpeech enumNegativeJingle = PrerecordedSpeech.valueForString(example); - assertNotNull("HELP_JINGLE returned null", enumHelpJingle); - assertNotNull("INITIAL_JINGLE returned null", enumInitialJingle); - assertNotNull("LISTEN_JINGLE returned null", enumListenJingle); - assertNotNull("POSITIVE_JINGLE returned null", enumPositiveJingle); - assertNotNull("NEGATIVE_JINGLE returned null", enumNegativeJingle); - } + assertNotNull("HELP_JINGLE returned null", enumHelpJingle); + assertNotNull("INITIAL_JINGLE returned null", enumInitialJingle); + assertNotNull("LISTEN_JINGLE returned null", enumListenJingle); + assertNotNull("POSITIVE_JINGLE returned null", enumPositiveJingle); + assertNotNull("NEGATIVE_JINGLE returned null", enumNegativeJingle); + } - /** - * Verifies that an invalid assignment is null. - */ - public void testInvalidEnum () { - String example = "heLP_JingLE"; - try { - PrerecordedSpeech temp = PrerecordedSpeech.valueForString(example); + /** + * Verifies that an invalid assignment is null. + */ + public void testInvalidEnum() { + String example = "heLP_JingLE"; + try { + PrerecordedSpeech temp = PrerecordedSpeech.valueForString(example); assertNull("Result of valueForString should be null.", temp); - } - catch (IllegalArgumentException exception) { + } catch (IllegalArgumentException exception) { fail("Invalid enum throws IllegalArgumentException."); - } - } + } + } - /** - * Verifies that a null assignment is invalid. - */ - public void testNullEnum () { - String example = null; - try { - PrerecordedSpeech temp = PrerecordedSpeech.valueForString(example); + /** + * Verifies that a null assignment is invalid. + */ + public void testNullEnum() { + String example = null; + try { + PrerecordedSpeech temp = PrerecordedSpeech.valueForString(example); assertNull("Result of valueForString should be null.", temp); - } - catch (NullPointerException exception) { + } catch (NullPointerException exception) { fail("Null string throws NullPointerException."); - } - } + } + } - /** - * Verifies the possible enum values of PrerecordedSpeech. - */ - public void testListEnum() { - List<PrerecordedSpeech> enumValueList = Arrays.asList(PrerecordedSpeech.values()); + /** + * Verifies the possible enum values of PrerecordedSpeech. + */ + public void testListEnum() { + List<PrerecordedSpeech> enumValueList = Arrays.asList(PrerecordedSpeech.values()); - List<PrerecordedSpeech> enumTestList = new ArrayList<PrerecordedSpeech>(); - enumTestList.add(PrerecordedSpeech.HELP_JINGLE); - enumTestList.add(PrerecordedSpeech.INITIAL_JINGLE); - enumTestList.add(PrerecordedSpeech.LISTEN_JINGLE); - enumTestList.add(PrerecordedSpeech.POSITIVE_JINGLE); - enumTestList.add(PrerecordedSpeech.NEGATIVE_JINGLE); + List<PrerecordedSpeech> enumTestList = new ArrayList<PrerecordedSpeech>(); + enumTestList.add(PrerecordedSpeech.HELP_JINGLE); + enumTestList.add(PrerecordedSpeech.INITIAL_JINGLE); + enumTestList.add(PrerecordedSpeech.LISTEN_JINGLE); + enumTestList.add(PrerecordedSpeech.POSITIVE_JINGLE); + enumTestList.add(PrerecordedSpeech.NEGATIVE_JINGLE); - assertTrue("Enum value list does not match enum class list", - enumValueList.containsAll(enumTestList) && enumTestList.containsAll(enumValueList)); - } + assertTrue("Enum value list does not match enum class list", + enumValueList.containsAll(enumTestList) && enumTestList.containsAll(enumValueList)); + } }
\ No newline at end of file diff --git a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/PrimaryAudioSourceTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/PrimaryAudioSourceTests.java index a0a6fc6dd..167bedec7 100644 --- a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/PrimaryAudioSourceTests.java +++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/PrimaryAudioSourceTests.java @@ -15,97 +15,97 @@ import java.util.List; */ public class PrimaryAudioSourceTests extends TestCase { - /** - * Verifies that the enum values are not null upon valid assignment. - */ - public void testValidEnums() { - String example = "NO_SOURCE_SELECTED"; - PrimaryAudioSource enumNoSourceSelected = PrimaryAudioSource.valueForString(example); - example = "USB"; - PrimaryAudioSource enumUsb = PrimaryAudioSource.valueForString(example); - example = "USB2"; - PrimaryAudioSource enumUsb2 = PrimaryAudioSource.valueForString(example); - example = "BLUETOOTH_STEREO_BTST"; - PrimaryAudioSource enumBluetoothStereoBtst = PrimaryAudioSource.valueForString(example); - example = "LINE_IN"; - PrimaryAudioSource enumLineIn = PrimaryAudioSource.valueForString(example); - example = "IPOD"; - PrimaryAudioSource enumIpod = PrimaryAudioSource.valueForString(example); - example = "MOBILE_APP"; - PrimaryAudioSource enumMobileApp = PrimaryAudioSource.valueForString(example); - example = "CD"; - PrimaryAudioSource enumCd = PrimaryAudioSource.valueForString(example); - example = "AM"; - PrimaryAudioSource enumAm = PrimaryAudioSource.valueForString(example); - example = "FM"; - PrimaryAudioSource enumFm = PrimaryAudioSource.valueForString(example); - example = "XM"; - PrimaryAudioSource enumXm = PrimaryAudioSource.valueForString(example); - example = "DAB"; - PrimaryAudioSource enumDab = PrimaryAudioSource.valueForString(example); + /** + * Verifies that the enum values are not null upon valid assignment. + */ + public void testValidEnums() { + String example = "NO_SOURCE_SELECTED"; + PrimaryAudioSource enumNoSourceSelected = PrimaryAudioSource.valueForString(example); + example = "USB"; + PrimaryAudioSource enumUsb = PrimaryAudioSource.valueForString(example); + example = "USB2"; + PrimaryAudioSource enumUsb2 = PrimaryAudioSource.valueForString(example); + example = "BLUETOOTH_STEREO_BTST"; + PrimaryAudioSource enumBluetoothStereoBtst = PrimaryAudioSource.valueForString(example); + example = "LINE_IN"; + PrimaryAudioSource enumLineIn = PrimaryAudioSource.valueForString(example); + example = "IPOD"; + PrimaryAudioSource enumIpod = PrimaryAudioSource.valueForString(example); + example = "MOBILE_APP"; + PrimaryAudioSource enumMobileApp = PrimaryAudioSource.valueForString(example); + example = "CD"; + PrimaryAudioSource enumCd = PrimaryAudioSource.valueForString(example); + example = "AM"; + PrimaryAudioSource enumAm = PrimaryAudioSource.valueForString(example); + example = "FM"; + PrimaryAudioSource enumFm = PrimaryAudioSource.valueForString(example); + example = "XM"; + PrimaryAudioSource enumXm = PrimaryAudioSource.valueForString(example); + example = "DAB"; + PrimaryAudioSource enumDab = PrimaryAudioSource.valueForString(example); - assertNotNull("NO_SOURCE_SELECTED returned null", enumNoSourceSelected); - assertNotNull("USB returned null", enumUsb); - assertNotNull("USB2 returned null", enumUsb2); - assertNotNull("BLUETOOTH_STEREO_BTST returned null", enumBluetoothStereoBtst); - assertNotNull("LINE_IN returned null", enumLineIn); - assertNotNull("IPOD returned null", enumIpod); - assertNotNull("MOBILE_APP returned null", enumMobileApp); - assertNotNull("CD returned null", enumCd); - assertNotNull("AM returned null", enumAm); - assertNotNull("FM returned null", enumFm); - assertNotNull("XM returned null", enumXm); - assertNotNull("DAB returned null", enumDab); - } + assertNotNull("NO_SOURCE_SELECTED returned null", enumNoSourceSelected); + assertNotNull("USB returned null", enumUsb); + assertNotNull("USB2 returned null", enumUsb2); + assertNotNull("BLUETOOTH_STEREO_BTST returned null", enumBluetoothStereoBtst); + assertNotNull("LINE_IN returned null", enumLineIn); + assertNotNull("IPOD returned null", enumIpod); + assertNotNull("MOBILE_APP returned null", enumMobileApp); + assertNotNull("CD returned null", enumCd); + assertNotNull("AM returned null", enumAm); + assertNotNull("FM returned null", enumFm); + assertNotNull("XM returned null", enumXm); + assertNotNull("DAB returned null", enumDab); + } - /** - * Verifies that an invalid assignment is null. - */ - public void testInvalidEnum() { - String example = "no_SouRCe_SelEcteD"; - try { - PrimaryAudioSource temp = PrimaryAudioSource.valueForString(example); - assertNull("Result of valueForString should be null.", temp); - } catch (IllegalArgumentException exception) { - fail("Invalid enum throws IllegalArgumentException."); - } - } + /** + * Verifies that an invalid assignment is null. + */ + public void testInvalidEnum() { + String example = "no_SouRCe_SelEcteD"; + try { + PrimaryAudioSource temp = PrimaryAudioSource.valueForString(example); + assertNull("Result of valueForString should be null.", temp); + } catch (IllegalArgumentException exception) { + fail("Invalid enum throws IllegalArgumentException."); + } + } - /** - * Verifies that a null assignment is invalid. - */ - public void testNullEnum() { - String example = null; - try { - PrimaryAudioSource temp = PrimaryAudioSource.valueForString(example); - assertNull("Result of valueForString should be null.", temp); - } catch (NullPointerException exception) { - fail("Null string throws NullPointerException."); - } - } + /** + * Verifies that a null assignment is invalid. + */ + public void testNullEnum() { + String example = null; + try { + PrimaryAudioSource temp = PrimaryAudioSource.valueForString(example); + assertNull("Result of valueForString should be null.", temp); + } catch (NullPointerException exception) { + fail("Null string throws NullPointerException."); + } + } - /** - * Verifies the possible enum values of PrimaryAudioSource. - */ - public void testListEnum() { - List<PrimaryAudioSource> enumValueList = Arrays.asList(PrimaryAudioSource.values()); + /** + * Verifies the possible enum values of PrimaryAudioSource. + */ + public void testListEnum() { + List<PrimaryAudioSource> enumValueList = Arrays.asList(PrimaryAudioSource.values()); - List<PrimaryAudioSource> enumTestList = new ArrayList<PrimaryAudioSource>(); - enumTestList.add(PrimaryAudioSource.NO_SOURCE_SELECTED); - enumTestList.add(PrimaryAudioSource.USB); - enumTestList.add(PrimaryAudioSource.USB2); - enumTestList.add(PrimaryAudioSource.BLUETOOTH_STEREO_BTST); - enumTestList.add(PrimaryAudioSource.LINE_IN); - enumTestList.add(PrimaryAudioSource.IPOD); - enumTestList.add(PrimaryAudioSource.MOBILE_APP); - enumTestList.add(PrimaryAudioSource.CD); - enumTestList.add(PrimaryAudioSource.AM); - enumTestList.add(PrimaryAudioSource.FM); - enumTestList.add(PrimaryAudioSource.XM); - enumTestList.add(PrimaryAudioSource.DAB); + List<PrimaryAudioSource> enumTestList = new ArrayList<PrimaryAudioSource>(); + enumTestList.add(PrimaryAudioSource.NO_SOURCE_SELECTED); + enumTestList.add(PrimaryAudioSource.USB); + enumTestList.add(PrimaryAudioSource.USB2); + enumTestList.add(PrimaryAudioSource.BLUETOOTH_STEREO_BTST); + enumTestList.add(PrimaryAudioSource.LINE_IN); + enumTestList.add(PrimaryAudioSource.IPOD); + enumTestList.add(PrimaryAudioSource.MOBILE_APP); + enumTestList.add(PrimaryAudioSource.CD); + enumTestList.add(PrimaryAudioSource.AM); + enumTestList.add(PrimaryAudioSource.FM); + enumTestList.add(PrimaryAudioSource.XM); + enumTestList.add(PrimaryAudioSource.DAB); - assertTrue("Enum value list does not match enum class list", - enumValueList.containsAll(enumTestList) && enumTestList.containsAll(enumValueList)); - } + assertTrue("Enum value list does not match enum class list", + enumValueList.containsAll(enumTestList) && enumTestList.containsAll(enumValueList)); + } }
\ No newline at end of file diff --git a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/PrndlTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/PrndlTests.java index 215a67704..102922052 100644 --- a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/PrndlTests.java +++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/PrndlTests.java @@ -10,127 +10,125 @@ import java.util.List; /** - * This is a unit test class for the SmartDeviceLink library project class : + * This is a unit test class for the SmartDeviceLink library project class : * {@link com.smartdevicelink.proxy.rpc.enums.PRNDL} */ public class PrndlTests extends TestCase { - /** - * Verifies that the enum values are not null upon valid assignment. - */ - public void testValidEnums () { - String example = "PARK"; - PRNDL enumPark = PRNDL.valueForString(example); - example = "REVERSE"; - PRNDL enumReverse = PRNDL.valueForString(example); - example = "NEUTRAL"; - PRNDL enumNeutral = PRNDL.valueForString(example); - example = "DRIVE"; - PRNDL enumDrive = PRNDL.valueForString(example); - example = "SPORT"; - PRNDL enumSport = PRNDL.valueForString(example); - example = "LOWGEAR"; - PRNDL enumLowGear = PRNDL.valueForString(example); - example = "FIRST"; - PRNDL enumFirst = PRNDL.valueForString(example); - example = "SECOND"; - PRNDL enumSecond = PRNDL.valueForString(example); - example = "THIRD"; - PRNDL enumThird = PRNDL.valueForString(example); - example = "FOURTH"; - PRNDL enumFourth = PRNDL.valueForString(example); - example = "FIFTH"; - PRNDL enumFifth = PRNDL.valueForString(example); - example = "SIXTH"; - PRNDL enumSixth = PRNDL.valueForString(example); - example = "SEVENTH"; - PRNDL enumSeventh = PRNDL.valueForString(example); - example = "EIGHTH"; - PRNDL enumEighth = PRNDL.valueForString(example); - example = "NINTH"; - PRNDL enumNinth = PRNDL.valueForString(example); - example = "TENTH"; - PRNDL enumTenth = PRNDL.valueForString(example); - example = "UNKNOWN"; - PRNDL enumUnknown = PRNDL.valueForString(example); - example = "FAULT"; - PRNDL enumFault = PRNDL.valueForString(example); - - assertNotNull("PARK returned null", enumPark); - assertNotNull("REVERSE returned null", enumReverse); - assertNotNull("NEUTRAL returned null", enumNeutral); - assertNotNull("DRIVE returned null", enumDrive); - assertNotNull("SPORT returned null", enumSport); - assertNotNull("LOWGEAR returned null", enumLowGear); - assertNotNull("FIRST returned null", enumFirst); - assertNotNull("SECOND returned null", enumSecond); - assertNotNull("THIRD returned null", enumThird); - assertNotNull("FOURTH returned null", enumFourth); - assertNotNull("FIFTH returned null", enumFifth); - assertNotNull("SIXTH returned null", enumSixth); - assertNotNull("SEVENTH returned null", enumSeventh); - assertNotNull("EIGHTH returned null", enumEighth); - assertNotNull("NINTH returned null", enumNinth); - assertNotNull("TENTH returned null", enumTenth); - assertNotNull("UNKNOWN returned null", enumUnknown); - assertNotNull("FAULT returned null", enumFault); - } + /** + * Verifies that the enum values are not null upon valid assignment. + */ + public void testValidEnums() { + String example = "PARK"; + PRNDL enumPark = PRNDL.valueForString(example); + example = "REVERSE"; + PRNDL enumReverse = PRNDL.valueForString(example); + example = "NEUTRAL"; + PRNDL enumNeutral = PRNDL.valueForString(example); + example = "DRIVE"; + PRNDL enumDrive = PRNDL.valueForString(example); + example = "SPORT"; + PRNDL enumSport = PRNDL.valueForString(example); + example = "LOWGEAR"; + PRNDL enumLowGear = PRNDL.valueForString(example); + example = "FIRST"; + PRNDL enumFirst = PRNDL.valueForString(example); + example = "SECOND"; + PRNDL enumSecond = PRNDL.valueForString(example); + example = "THIRD"; + PRNDL enumThird = PRNDL.valueForString(example); + example = "FOURTH"; + PRNDL enumFourth = PRNDL.valueForString(example); + example = "FIFTH"; + PRNDL enumFifth = PRNDL.valueForString(example); + example = "SIXTH"; + PRNDL enumSixth = PRNDL.valueForString(example); + example = "SEVENTH"; + PRNDL enumSeventh = PRNDL.valueForString(example); + example = "EIGHTH"; + PRNDL enumEighth = PRNDL.valueForString(example); + example = "NINTH"; + PRNDL enumNinth = PRNDL.valueForString(example); + example = "TENTH"; + PRNDL enumTenth = PRNDL.valueForString(example); + example = "UNKNOWN"; + PRNDL enumUnknown = PRNDL.valueForString(example); + example = "FAULT"; + PRNDL enumFault = PRNDL.valueForString(example); - /** - * Verifies that an invalid assignment is null. - */ - public void testInvalidEnum () { - String example = "pARk"; - try { - PRNDL temp = PRNDL.valueForString(example); + assertNotNull("PARK returned null", enumPark); + assertNotNull("REVERSE returned null", enumReverse); + assertNotNull("NEUTRAL returned null", enumNeutral); + assertNotNull("DRIVE returned null", enumDrive); + assertNotNull("SPORT returned null", enumSport); + assertNotNull("LOWGEAR returned null", enumLowGear); + assertNotNull("FIRST returned null", enumFirst); + assertNotNull("SECOND returned null", enumSecond); + assertNotNull("THIRD returned null", enumThird); + assertNotNull("FOURTH returned null", enumFourth); + assertNotNull("FIFTH returned null", enumFifth); + assertNotNull("SIXTH returned null", enumSixth); + assertNotNull("SEVENTH returned null", enumSeventh); + assertNotNull("EIGHTH returned null", enumEighth); + assertNotNull("NINTH returned null", enumNinth); + assertNotNull("TENTH returned null", enumTenth); + assertNotNull("UNKNOWN returned null", enumUnknown); + assertNotNull("FAULT returned null", enumFault); + } + + /** + * Verifies that an invalid assignment is null. + */ + public void testInvalidEnum() { + String example = "pARk"; + try { + PRNDL temp = PRNDL.valueForString(example); assertNull("Result of valueForString should be null.", temp); - } - catch (IllegalArgumentException exception) { + } catch (IllegalArgumentException exception) { fail("Invalid enum throws IllegalArgumentException."); - } - } + } + } - /** - * Verifies that a null assignment is invalid. - */ - public void testNullEnum () { - String example = null; - try { - PRNDL temp = PRNDL.valueForString(example); + /** + * Verifies that a null assignment is invalid. + */ + public void testNullEnum() { + String example = null; + try { + PRNDL temp = PRNDL.valueForString(example); assertNull("Result of valueForString should be null.", temp); - } - catch (NullPointerException exception) { + } catch (NullPointerException exception) { fail("Null string throws NullPointerException."); - } - } + } + } - /** - * Verifies the possible enum values of PRNDL. - */ - public void testListEnum() { - List<PRNDL> enumValueList = Arrays.asList(PRNDL.values()); + /** + * Verifies the possible enum values of PRNDL. + */ + public void testListEnum() { + List<PRNDL> enumValueList = Arrays.asList(PRNDL.values()); - List<PRNDL> enumTestList = new ArrayList<PRNDL>(); - enumTestList.add(PRNDL.PARK); - enumTestList.add(PRNDL.REVERSE); - enumTestList.add(PRNDL.NEUTRAL); - enumTestList.add(PRNDL.DRIVE); - enumTestList.add(PRNDL.SPORT); - enumTestList.add(PRNDL.LOWGEAR); - enumTestList.add(PRNDL.FIRST); - enumTestList.add(PRNDL.SECOND); - enumTestList.add(PRNDL.THIRD); - enumTestList.add(PRNDL.FOURTH); - enumTestList.add(PRNDL.FIFTH); - enumTestList.add(PRNDL.SIXTH); - enumTestList.add(PRNDL.SEVENTH); - enumTestList.add(PRNDL.EIGHTH); - enumTestList.add(PRNDL.NINTH); - enumTestList.add(PRNDL.TENTH); - enumTestList.add(PRNDL.UNKNOWN); - enumTestList.add(PRNDL.FAULT); + List<PRNDL> enumTestList = new ArrayList<PRNDL>(); + enumTestList.add(PRNDL.PARK); + enumTestList.add(PRNDL.REVERSE); + enumTestList.add(PRNDL.NEUTRAL); + enumTestList.add(PRNDL.DRIVE); + enumTestList.add(PRNDL.SPORT); + enumTestList.add(PRNDL.LOWGEAR); + enumTestList.add(PRNDL.FIRST); + enumTestList.add(PRNDL.SECOND); + enumTestList.add(PRNDL.THIRD); + enumTestList.add(PRNDL.FOURTH); + enumTestList.add(PRNDL.FIFTH); + enumTestList.add(PRNDL.SIXTH); + enumTestList.add(PRNDL.SEVENTH); + enumTestList.add(PRNDL.EIGHTH); + enumTestList.add(PRNDL.NINTH); + enumTestList.add(PRNDL.TENTH); + enumTestList.add(PRNDL.UNKNOWN); + enumTestList.add(PRNDL.FAULT); - assertTrue("Enum value list does not match enum class list", - enumValueList.containsAll(enumTestList) && enumTestList.containsAll(enumValueList)); - } + assertTrue("Enum value list does not match enum class list", + enumValueList.containsAll(enumTestList) && enumTestList.containsAll(enumValueList)); + } }
\ No newline at end of file diff --git a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/RadioBandTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/RadioBandTests.java index 52c15156e..b8001a14f 100644 --- a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/RadioBandTests.java +++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/RadioBandTests.java @@ -9,67 +9,65 @@ import java.util.Arrays; import java.util.List; /** - * This is a unit test class for the SmartDeviceLink library project class : + * This is a unit test class for the SmartDeviceLink library project class : * {@link com.smartdevicelink.proxy.rpc.enums.RadioBand} */ public class RadioBandTests extends TestCase { - /** - * Verifies that the enum values are not null upon valid assignment. - */ - public void testValidEnums () { - String example = "AM"; - RadioBand enumAm = RadioBand.valueForString(example); - example = "FM"; - RadioBand enumFm = RadioBand.valueForString(example); - example = "XM"; - RadioBand enumXm = RadioBand.valueForString(example); + /** + * Verifies that the enum values are not null upon valid assignment. + */ + public void testValidEnums() { + String example = "AM"; + RadioBand enumAm = RadioBand.valueForString(example); + example = "FM"; + RadioBand enumFm = RadioBand.valueForString(example); + example = "XM"; + RadioBand enumXm = RadioBand.valueForString(example); - assertNotNull("AM returned null", enumAm); - assertNotNull("FM returned null", enumFm); - assertNotNull("XM returned null", enumXm); - } + assertNotNull("AM returned null", enumAm); + assertNotNull("FM returned null", enumFm); + assertNotNull("XM returned null", enumXm); + } - /** - * Verifies that an invalid assignment is null. - */ - public void testInvalidEnum () { - String example = "aM"; - try { - RadioBand temp = RadioBand.valueForString(example); + /** + * Verifies that an invalid assignment is null. + */ + public void testInvalidEnum() { + String example = "aM"; + try { + RadioBand temp = RadioBand.valueForString(example); assertNull("Result of valueForString should be null.", temp); - } - catch (IllegalArgumentException exception) { + } catch (IllegalArgumentException exception) { fail("Invalid enum throws IllegalArgumentException."); - } - } + } + } - /** - * Verifies that a null assignment is invalid. - */ - public void testNullEnum () { - String example = null; - try { - RadioBand temp = RadioBand.valueForString(example); + /** + * Verifies that a null assignment is invalid. + */ + public void testNullEnum() { + String example = null; + try { + RadioBand temp = RadioBand.valueForString(example); assertNull("Result of valueForString should be null.", temp); - } - catch (NullPointerException exception) { + } catch (NullPointerException exception) { fail("Null string throws NullPointerException."); - } - } + } + } - /** - * Verifies the possible enum values of RadioBand. - */ - public void testListEnum() { - List<RadioBand> enumValueList = Arrays.asList(RadioBand.values()); + /** + * Verifies the possible enum values of RadioBand. + */ + public void testListEnum() { + List<RadioBand> enumValueList = Arrays.asList(RadioBand.values()); - List<RadioBand> enumTestList = new ArrayList<RadioBand>(); - enumTestList.add(RadioBand.AM); - enumTestList.add(RadioBand.FM); - enumTestList.add(RadioBand.XM); + List<RadioBand> enumTestList = new ArrayList<RadioBand>(); + enumTestList.add(RadioBand.AM); + enumTestList.add(RadioBand.FM); + enumTestList.add(RadioBand.XM); - assertTrue("Enum value list does not match enum class list", - enumValueList.containsAll(enumTestList) && enumTestList.containsAll(enumValueList)); - } + assertTrue("Enum value list does not match enum class list", + enumValueList.containsAll(enumTestList) && enumTestList.containsAll(enumValueList)); + } }
\ No newline at end of file diff --git a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/RadioStateTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/RadioStateTests.java index 5c7286937..fb64b29ad 100644 --- a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/RadioStateTests.java +++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/RadioStateTests.java @@ -9,71 +9,69 @@ import java.util.Arrays; import java.util.List; /** - * This is a unit test class for the SmartDeviceLink library project class : + * This is a unit test class for the SmartDeviceLink library project class : * {@link com.smartdevicelink.proxy.rpc.enums.RadioState} */ public class RadioStateTests extends TestCase { - /** - * Verifies that the enum values are not null upon valid assignment. - */ - public void testValidEnums () { - String example = "ACQUIRING"; - RadioState enumAcquiring = RadioState.valueForString(example); - example = "ACQUIRED"; - RadioState enumAcquired = RadioState.valueForString(example); - example = "MULTICAST"; - RadioState enumMultiCast = RadioState.valueForString(example); - example = "NOT_FOUND"; - RadioState enumNotFound = RadioState.valueForString(example); + /** + * Verifies that the enum values are not null upon valid assignment. + */ + public void testValidEnums() { + String example = "ACQUIRING"; + RadioState enumAcquiring = RadioState.valueForString(example); + example = "ACQUIRED"; + RadioState enumAcquired = RadioState.valueForString(example); + example = "MULTICAST"; + RadioState enumMultiCast = RadioState.valueForString(example); + example = "NOT_FOUND"; + RadioState enumNotFound = RadioState.valueForString(example); - assertNotNull("ACQUIRING returned null", enumAcquiring); - assertNotNull("ACQUIRED returned null", enumAcquired); - assertNotNull("MULTICAST returned null", enumMultiCast); - assertNotNull("NOT_FOUND returned null", enumNotFound); - } + assertNotNull("ACQUIRING returned null", enumAcquiring); + assertNotNull("ACQUIRED returned null", enumAcquired); + assertNotNull("MULTICAST returned null", enumMultiCast); + assertNotNull("NOT_FOUND returned null", enumNotFound); + } - /** - * Verifies that an invalid assignment is null. - */ - public void testInvalidEnum () { - String example = "aCQUIRING"; - try { - RadioState temp = RadioState.valueForString(example); + /** + * Verifies that an invalid assignment is null. + */ + public void testInvalidEnum() { + String example = "aCQUIRING"; + try { + RadioState temp = RadioState.valueForString(example); assertNull("Result of valueForString should be null.", temp); - } - catch (IllegalArgumentException exception) { + } catch (IllegalArgumentException exception) { fail("Invalid enum throws IllegalArgumentException."); - } - } + } + } - /** - * Verifies that a null assignment is invalid. - */ - public void testNullEnum () { - String example = null; - try { - RadioState temp = RadioState.valueForString(example); + /** + * Verifies that a null assignment is invalid. + */ + public void testNullEnum() { + String example = null; + try { + RadioState temp = RadioState.valueForString(example); assertNull("Result of valueForString should be null.", temp); - } - catch (NullPointerException exception) { + } catch (NullPointerException exception) { fail("Null string throws NullPointerException."); - } - } + } + } - /** - * Verifies the possible enum values of RadioState. - */ - public void testListEnum() { - List<RadioState> enumValueList = Arrays.asList(RadioState.values()); + /** + * Verifies the possible enum values of RadioState. + */ + public void testListEnum() { + List<RadioState> enumValueList = Arrays.asList(RadioState.values()); - List<RadioState> enumTestList = new ArrayList<RadioState>(); - enumTestList.add(RadioState.ACQUIRING); - enumTestList.add(RadioState.ACQUIRED); - enumTestList.add(RadioState.MULTICAST); - enumTestList.add(RadioState.NOT_FOUND); + List<RadioState> enumTestList = new ArrayList<RadioState>(); + enumTestList.add(RadioState.ACQUIRING); + enumTestList.add(RadioState.ACQUIRED); + enumTestList.add(RadioState.MULTICAST); + enumTestList.add(RadioState.NOT_FOUND); - assertTrue("Enum value list does not match enum class list", - enumValueList.containsAll(enumTestList) && enumTestList.containsAll(enumValueList)); - } + assertTrue("Enum value list does not match enum class list", + enumValueList.containsAll(enumTestList) && enumTestList.containsAll(enumValueList)); + } }
\ No newline at end of file diff --git a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/RequestTypeTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/RequestTypeTests.java index 54c40d69f..371c120c4 100644 --- a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/RequestTypeTests.java +++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/RequestTypeTests.java @@ -10,144 +10,142 @@ import java.util.Arrays; import java.util.List; /** - * This is a unit test class for the SmartDeviceLink library project class : + * This is a unit test class for the SmartDeviceLink library project class : * {@link com.smartdevicelink.proxy.rpc.enums.RequestType} */ public class RequestTypeTests extends TestCase { - /** - * Verifies that the enum values are not null upon valid assignment. - */ - public void testValidEnums () { - String example = "HTTP"; - RequestType enumHttp = RequestType.valueForString(example); - example = "FILE_RESUME"; - RequestType enumFileResume = RequestType.valueForString(example); - example = "AUTH_REQUEST"; - RequestType enumAuthRequest = RequestType.valueForString(example); - example = "AUTH_CHALLENGE"; - RequestType enumAuthChallenge = RequestType.valueForString(example); - example = "AUTH_ACK"; - RequestType enumAuthAck = RequestType.valueForString(example); - example = "PROPRIETARY"; - RequestType enumProprietary = RequestType.valueForString(example); - - example = "QUERY_APPS"; - RequestType enumQueryApps = RequestType.valueForString(example); - example = "LAUNCH_APP"; - RequestType enumLaunchApp = RequestType.valueForString(example); - example = "LOCK_SCREEN_ICON_URL"; - RequestType enumLockScreen = RequestType.valueForString(example); - example = "TRAFFIC_MESSAGE_CHANNEL"; - RequestType enumTrafficMessage = RequestType.valueForString(example); - example = "DRIVER_PROFILE"; - RequestType enumDriverProfile = RequestType.valueForString(example); - example = "VOICE_SEARCH"; - RequestType enumVoiceSearch = RequestType.valueForString(example); - example = "NAVIGATION"; - RequestType enumNavigation = RequestType.valueForString(example); - example = "PHONE"; - RequestType enumPhone = RequestType.valueForString(example); - example = "CLIMATE"; - RequestType enumClimate = RequestType.valueForString(example); - example = "SETTINGS"; - RequestType enumSettings = RequestType.valueForString(example); - example = "VEHICLE_DIAGNOSTICS"; - RequestType enumDiagnostics = RequestType.valueForString(example); - example = "EMERGENCY"; - RequestType enumEmergency = RequestType.valueForString(example); - example = "MEDIA"; - RequestType enumMedia = RequestType.valueForString(example); - example = "FOTA"; - RequestType enumFota = RequestType.valueForString(example); - example = "ICON_URL"; - RequestType enumIconURL = RequestType.valueForString(example); - - assertNotNull("HTTP returned null", enumHttp); - assertNotNull("FILE_RESUME returned null", enumFileResume); - assertNotNull("AUTH_REQUEST returned null", enumAuthRequest); - assertNotNull("AUTH_CHALLENGE returned null", enumAuthChallenge); - assertNotNull("AUTH_ACK returned null", enumAuthAck); - assertNotNull("PROPRIETARY returned null", enumProprietary); - assertNotNull("ICON_URL returned null", enumIconURL); - - assertNotNull(TestValues.NOT_NULL, enumQueryApps); - assertNotNull(TestValues.NOT_NULL, enumLaunchApp); - assertNotNull(TestValues.NOT_NULL, enumLockScreen); - assertNotNull(TestValues.NOT_NULL, enumTrafficMessage); - assertNotNull(TestValues.NOT_NULL, enumDriverProfile); - assertNotNull(TestValues.NOT_NULL, enumVoiceSearch); - assertNotNull(TestValues.NOT_NULL, enumNavigation); - assertNotNull(TestValues.NOT_NULL, enumPhone); - assertNotNull(TestValues.NOT_NULL, enumClimate); - assertNotNull(TestValues.NOT_NULL, enumSettings); - assertNotNull(TestValues.NOT_NULL, enumDiagnostics); - assertNotNull(TestValues.NOT_NULL, enumEmergency); - assertNotNull(TestValues.NOT_NULL, enumMedia); - assertNotNull(TestValues.NOT_NULL, enumFota); - assertNotNull(TestValues.NOT_NULL, enumIconURL); - } + /** + * Verifies that the enum values are not null upon valid assignment. + */ + public void testValidEnums() { + String example = "HTTP"; + RequestType enumHttp = RequestType.valueForString(example); + example = "FILE_RESUME"; + RequestType enumFileResume = RequestType.valueForString(example); + example = "AUTH_REQUEST"; + RequestType enumAuthRequest = RequestType.valueForString(example); + example = "AUTH_CHALLENGE"; + RequestType enumAuthChallenge = RequestType.valueForString(example); + example = "AUTH_ACK"; + RequestType enumAuthAck = RequestType.valueForString(example); + example = "PROPRIETARY"; + RequestType enumProprietary = RequestType.valueForString(example); - /** - * Verifies that an invalid assignment is null. - */ - public void testInvalidEnum () { - String example = "hTTp"; - try { - RequestType temp = RequestType.valueForString(example); + example = "QUERY_APPS"; + RequestType enumQueryApps = RequestType.valueForString(example); + example = "LAUNCH_APP"; + RequestType enumLaunchApp = RequestType.valueForString(example); + example = "LOCK_SCREEN_ICON_URL"; + RequestType enumLockScreen = RequestType.valueForString(example); + example = "TRAFFIC_MESSAGE_CHANNEL"; + RequestType enumTrafficMessage = RequestType.valueForString(example); + example = "DRIVER_PROFILE"; + RequestType enumDriverProfile = RequestType.valueForString(example); + example = "VOICE_SEARCH"; + RequestType enumVoiceSearch = RequestType.valueForString(example); + example = "NAVIGATION"; + RequestType enumNavigation = RequestType.valueForString(example); + example = "PHONE"; + RequestType enumPhone = RequestType.valueForString(example); + example = "CLIMATE"; + RequestType enumClimate = RequestType.valueForString(example); + example = "SETTINGS"; + RequestType enumSettings = RequestType.valueForString(example); + example = "VEHICLE_DIAGNOSTICS"; + RequestType enumDiagnostics = RequestType.valueForString(example); + example = "EMERGENCY"; + RequestType enumEmergency = RequestType.valueForString(example); + example = "MEDIA"; + RequestType enumMedia = RequestType.valueForString(example); + example = "FOTA"; + RequestType enumFota = RequestType.valueForString(example); + example = "ICON_URL"; + RequestType enumIconURL = RequestType.valueForString(example); + + assertNotNull("HTTP returned null", enumHttp); + assertNotNull("FILE_RESUME returned null", enumFileResume); + assertNotNull("AUTH_REQUEST returned null", enumAuthRequest); + assertNotNull("AUTH_CHALLENGE returned null", enumAuthChallenge); + assertNotNull("AUTH_ACK returned null", enumAuthAck); + assertNotNull("PROPRIETARY returned null", enumProprietary); + assertNotNull("ICON_URL returned null", enumIconURL); + + assertNotNull(TestValues.NOT_NULL, enumQueryApps); + assertNotNull(TestValues.NOT_NULL, enumLaunchApp); + assertNotNull(TestValues.NOT_NULL, enumLockScreen); + assertNotNull(TestValues.NOT_NULL, enumTrafficMessage); + assertNotNull(TestValues.NOT_NULL, enumDriverProfile); + assertNotNull(TestValues.NOT_NULL, enumVoiceSearch); + assertNotNull(TestValues.NOT_NULL, enumNavigation); + assertNotNull(TestValues.NOT_NULL, enumPhone); + assertNotNull(TestValues.NOT_NULL, enumClimate); + assertNotNull(TestValues.NOT_NULL, enumSettings); + assertNotNull(TestValues.NOT_NULL, enumDiagnostics); + assertNotNull(TestValues.NOT_NULL, enumEmergency); + assertNotNull(TestValues.NOT_NULL, enumMedia); + assertNotNull(TestValues.NOT_NULL, enumFota); + assertNotNull(TestValues.NOT_NULL, enumIconURL); + } + + /** + * Verifies that an invalid assignment is null. + */ + public void testInvalidEnum() { + String example = "hTTp"; + try { + RequestType temp = RequestType.valueForString(example); assertNull("Result of valueForString should be null.", temp); - } - catch (IllegalArgumentException exception) { + } catch (IllegalArgumentException exception) { fail("Invalid enum throws IllegalArgumentException."); - } - } + } + } - /** - * Verifies that a null assignment is invalid. - */ - public void testNullEnum () { - String example = null; - try { - RequestType temp = RequestType.valueForString(example); + /** + * Verifies that a null assignment is invalid. + */ + public void testNullEnum() { + String example = null; + try { + RequestType temp = RequestType.valueForString(example); assertNull("Result of valueForString should be null.", temp); - } - catch (NullPointerException exception) { + } catch (NullPointerException exception) { fail("Null string throws NullPointerException."); - } - } + } + } + + /** + * Verifies the possible enum values of RequestType. + */ + public void testListEnum() { + List<RequestType> enumValueList = Arrays.asList(RequestType.values()); - /** - * Verifies the possible enum values of RequestType. - */ - public void testListEnum() { - List<RequestType> enumValueList = Arrays.asList(RequestType.values()); + List<RequestType> enumTestList = new ArrayList<RequestType>(); + enumTestList.add(RequestType.HTTP); + enumTestList.add(RequestType.FILE_RESUME); + enumTestList.add(RequestType.AUTH_REQUEST); + enumTestList.add(RequestType.AUTH_CHALLENGE); + enumTestList.add(RequestType.AUTH_ACK); + enumTestList.add(RequestType.PROPRIETARY); - List<RequestType> enumTestList = new ArrayList<RequestType>(); - enumTestList.add(RequestType.HTTP); - enumTestList.add(RequestType.FILE_RESUME); - enumTestList.add(RequestType.AUTH_REQUEST); - enumTestList.add(RequestType.AUTH_CHALLENGE); - enumTestList.add(RequestType.AUTH_ACK); - enumTestList.add(RequestType.PROPRIETARY); - - enumTestList.add(RequestType.QUERY_APPS); - enumTestList.add(RequestType.LAUNCH_APP); - enumTestList.add(RequestType.LOCK_SCREEN_ICON_URL); - enumTestList.add(RequestType.TRAFFIC_MESSAGE_CHANNEL); - enumTestList.add(RequestType.DRIVER_PROFILE); - enumTestList.add(RequestType.VOICE_SEARCH); - enumTestList.add(RequestType.NAVIGATION); - enumTestList.add(RequestType.PHONE); - enumTestList.add(RequestType.CLIMATE); - enumTestList.add(RequestType.SETTINGS); - enumTestList.add(RequestType.VEHICLE_DIAGNOSTICS); - enumTestList.add(RequestType.EMERGENCY); - enumTestList.add(RequestType.MEDIA); - enumTestList.add(RequestType.FOTA); - enumTestList.add(RequestType.OEM_SPECIFIC); - enumTestList.add(RequestType.ICON_URL); + enumTestList.add(RequestType.QUERY_APPS); + enumTestList.add(RequestType.LAUNCH_APP); + enumTestList.add(RequestType.LOCK_SCREEN_ICON_URL); + enumTestList.add(RequestType.TRAFFIC_MESSAGE_CHANNEL); + enumTestList.add(RequestType.DRIVER_PROFILE); + enumTestList.add(RequestType.VOICE_SEARCH); + enumTestList.add(RequestType.NAVIGATION); + enumTestList.add(RequestType.PHONE); + enumTestList.add(RequestType.CLIMATE); + enumTestList.add(RequestType.SETTINGS); + enumTestList.add(RequestType.VEHICLE_DIAGNOSTICS); + enumTestList.add(RequestType.EMERGENCY); + enumTestList.add(RequestType.MEDIA); + enumTestList.add(RequestType.FOTA); + enumTestList.add(RequestType.OEM_SPECIFIC); + enumTestList.add(RequestType.ICON_URL); - assertTrue("Enum value list does not match enum class list", - enumValueList.containsAll(enumTestList) && enumTestList.containsAll(enumValueList)); - } + assertTrue("Enum value list does not match enum class list", + enumValueList.containsAll(enumTestList) && enumTestList.containsAll(enumValueList)); + } }
\ No newline at end of file diff --git a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/ResultTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/ResultTests.java index 8bfec0490..a00c70cbe 100644 --- a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/ResultTests.java +++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/ResultTests.java @@ -9,203 +9,201 @@ import java.util.Arrays; import java.util.List; /** - * This is a unit test class for the SmartDeviceLink library project class : + * This is a unit test class for the SmartDeviceLink library project class : * {@link com.smartdevicelink.proxy.rpc.enums.Result} */ public class ResultTests extends TestCase { - /** - * Verifies that the enum values are not null upon valid assignment. - */ - public void testValidEnums () { - String example = "SUCCESS"; - Result enumSuccess = Result.valueForString(example); - example = "INVALID_DATA"; - Result enumInvalidData = Result.valueForString(example); - example = "UNSUPPORTED_REQUEST"; - Result enumUnsupportedRequest = Result.valueForString(example); - example = "OUT_OF_MEMORY"; - Result enumOutOfMemory = Result.valueForString(example); - example = "TOO_MANY_PENDING_REQUESTS"; - Result enumTooManyPendingRequests = Result.valueForString(example); - example = "CHAR_LIMIT_EXCEEDED"; - Result enumCharLimitExceeded = Result.valueForString(example); - example = "INVALID_ID"; - Result enumInvalidId = Result.valueForString(example); - example = "DUPLICATE_NAME"; - Result enumDuplicateName = Result.valueForString(example); - example = "TOO_MANY_APPLICATIONS"; - Result enumTooManyApplications = Result.valueForString(example); - example = "APPLICATION_REGISTERED_ALREADY"; - Result enumApplicationRegisteredAlready = Result.valueForString(example); - example = "UNSUPPORTED_VERSION"; - Result enumUnsupportedVersion = Result.valueForString(example); - example = "WRONG_LANGUAGE"; - Result enumWrongLanguage = Result.valueForString(example); - example = "APPLICATION_NOT_REGISTERED"; - Result enumApplicationNotRegistered = Result.valueForString(example); - example = "IN_USE"; - Result enumInUse = Result.valueForString(example); - example = "VEHICLE_DATA_NOT_ALLOWED"; - Result enumVehicleDataNotAllowed = Result.valueForString(example); - example = "VEHICLE_DATA_NOT_AVAILABLE"; - Result enumVehicleDataNotAvailable = Result.valueForString(example); - example = "REJECTED"; - Result enumRejected = Result.valueForString(example); - example = "ABORTED"; - Result enumAborted = Result.valueForString(example); - example = "IGNORED"; - Result enumIgnored = Result.valueForString(example); - example = "UNSUPPORTED_RESOURCE"; - Result enumUnsupportedResource = Result.valueForString(example); - example = "FILE_NOT_FOUND"; - Result enumFileNotFound = Result.valueForString(example); - example = "GENERIC_ERROR"; - Result enumGenericError = Result.valueForString(example); - example = "DISALLOWED"; - Result enumDisallowed = Result.valueForString(example); - example = "USER_DISALLOWED"; - Result enumUserDisallowed = Result.valueForString(example); - example = "TIMED_OUT"; - Result enumTimedOut = Result.valueForString(example); - example = "CANCEL_ROUTE"; - Result enumCancelRoute = Result.valueForString(example); - example = "TRUNCATED_DATA"; - Result enumTruncatedData = Result.valueForString(example); - example = "RETRY"; - Result enumRetry = Result.valueForString(example); - example = "WARNINGS"; - Result enumWarnings = Result.valueForString(example); - example = "SAVED"; - Result enumSaved = Result.valueForString(example); - example = "INVALID_CERT"; - Result enumInvalidCert = Result.valueForString(example); - example = "EXPIRED_CERT"; - Result enumExpiredCert = Result.valueForString(example); - example = "RESUME_FAILED"; - Result enumResumeFailed = Result.valueForString(example); - example = "DATA_NOT_AVAILABLE"; - Result enumDataNotAvailable = Result.valueForString(example); - example = "READ_ONLY"; - Result enumReadOnly = Result.valueForString(example); - example = "CORRUPTED_DATA"; - Result enumCorruptData = Result.valueForString(example); - example = "ENCRYPTION_NEEDED"; - Result enumEncryptionRequired = Result.valueForString(example); - - assertNotNull("SUCCESS returned null", enumSuccess); - assertNotNull("INVALID_DATA returned null", enumInvalidData); - assertNotNull("UNSUPPORTED_REQUEST returned null", enumUnsupportedRequest); - assertNotNull("OUT_OF_MEMORY returned null", enumOutOfMemory); - assertNotNull("TOO_MANY_PENDING_REQUESTS returned null", enumTooManyPendingRequests); - assertNotNull("CHAR_LIMIT_EXCEEDED returned null", enumCharLimitExceeded); - assertNotNull("INVALID_ID returned null", enumInvalidId); - assertNotNull("DUPLICATE_NAME returned null", enumDuplicateName); - assertNotNull("TOO_MANY_APPLICATIONS returned null", enumTooManyApplications); - assertNotNull("APPLICATION_REGISTERED_ALREADY returned null", enumApplicationRegisteredAlready); - assertNotNull("UNSUPPORTED_VERSION returned null", enumUnsupportedVersion); - assertNotNull("WRONG_LANGUAGE returned null", enumWrongLanguage); - assertNotNull("APPLICATION_NOT_REGISTERED returned null", enumApplicationNotRegistered); - assertNotNull("IN_USE returned null", enumInUse); - assertNotNull("VEHICLE_DATA_NOT_ALLOWED returned null", enumVehicleDataNotAllowed); - assertNotNull("VEHICLE_DATA_NOT_AVAILABLE returned null", enumVehicleDataNotAvailable); - assertNotNull("REJECTED returned null", enumRejected); - assertNotNull("ABORTED returned null", enumAborted); - assertNotNull("IGNORED returned null", enumIgnored); - assertNotNull("UNSUPPORTED_RESOURCE returned null", enumUnsupportedResource); - assertNotNull("FILE_NOT_FOUND returned null", enumFileNotFound); - assertNotNull("GENERIC_ERROR returned null", enumGenericError); - assertNotNull("DISALLOWED returned null", enumDisallowed); - assertNotNull("USER_DISALLOWED returned null", enumUserDisallowed); - assertNotNull("TIMED_OUT returned null", enumTimedOut); - assertNotNull("CANCEL_ROUTE returned null", enumCancelRoute); - assertNotNull("TRUNCATED_DATA returned null", enumTruncatedData); - assertNotNull("RETRY returned null", enumRetry); - assertNotNull("WARNINGS returned null", enumWarnings); - assertNotNull("SAVED returned null", enumSaved); - assertNotNull("INVALID_CERT returned null", enumInvalidCert); - assertNotNull("EXPIRED_CERT returned null", enumExpiredCert); - assertNotNull("RESUME_FAILED returned null", enumResumeFailed); - assertNotNull("DATA_NOT_AVAILABLE returned null", enumDataNotAvailable); - assertNotNull("READ_ONLY returned null", enumReadOnly); - assertNotNull("CORRUPTED_DATA", enumCorruptData); - assertNotNull("ENCRYPTION_NEEDED", enumEncryptionRequired); - } + /** + * Verifies that the enum values are not null upon valid assignment. + */ + public void testValidEnums() { + String example = "SUCCESS"; + Result enumSuccess = Result.valueForString(example); + example = "INVALID_DATA"; + Result enumInvalidData = Result.valueForString(example); + example = "UNSUPPORTED_REQUEST"; + Result enumUnsupportedRequest = Result.valueForString(example); + example = "OUT_OF_MEMORY"; + Result enumOutOfMemory = Result.valueForString(example); + example = "TOO_MANY_PENDING_REQUESTS"; + Result enumTooManyPendingRequests = Result.valueForString(example); + example = "CHAR_LIMIT_EXCEEDED"; + Result enumCharLimitExceeded = Result.valueForString(example); + example = "INVALID_ID"; + Result enumInvalidId = Result.valueForString(example); + example = "DUPLICATE_NAME"; + Result enumDuplicateName = Result.valueForString(example); + example = "TOO_MANY_APPLICATIONS"; + Result enumTooManyApplications = Result.valueForString(example); + example = "APPLICATION_REGISTERED_ALREADY"; + Result enumApplicationRegisteredAlready = Result.valueForString(example); + example = "UNSUPPORTED_VERSION"; + Result enumUnsupportedVersion = Result.valueForString(example); + example = "WRONG_LANGUAGE"; + Result enumWrongLanguage = Result.valueForString(example); + example = "APPLICATION_NOT_REGISTERED"; + Result enumApplicationNotRegistered = Result.valueForString(example); + example = "IN_USE"; + Result enumInUse = Result.valueForString(example); + example = "VEHICLE_DATA_NOT_ALLOWED"; + Result enumVehicleDataNotAllowed = Result.valueForString(example); + example = "VEHICLE_DATA_NOT_AVAILABLE"; + Result enumVehicleDataNotAvailable = Result.valueForString(example); + example = "REJECTED"; + Result enumRejected = Result.valueForString(example); + example = "ABORTED"; + Result enumAborted = Result.valueForString(example); + example = "IGNORED"; + Result enumIgnored = Result.valueForString(example); + example = "UNSUPPORTED_RESOURCE"; + Result enumUnsupportedResource = Result.valueForString(example); + example = "FILE_NOT_FOUND"; + Result enumFileNotFound = Result.valueForString(example); + example = "GENERIC_ERROR"; + Result enumGenericError = Result.valueForString(example); + example = "DISALLOWED"; + Result enumDisallowed = Result.valueForString(example); + example = "USER_DISALLOWED"; + Result enumUserDisallowed = Result.valueForString(example); + example = "TIMED_OUT"; + Result enumTimedOut = Result.valueForString(example); + example = "CANCEL_ROUTE"; + Result enumCancelRoute = Result.valueForString(example); + example = "TRUNCATED_DATA"; + Result enumTruncatedData = Result.valueForString(example); + example = "RETRY"; + Result enumRetry = Result.valueForString(example); + example = "WARNINGS"; + Result enumWarnings = Result.valueForString(example); + example = "SAVED"; + Result enumSaved = Result.valueForString(example); + example = "INVALID_CERT"; + Result enumInvalidCert = Result.valueForString(example); + example = "EXPIRED_CERT"; + Result enumExpiredCert = Result.valueForString(example); + example = "RESUME_FAILED"; + Result enumResumeFailed = Result.valueForString(example); + example = "DATA_NOT_AVAILABLE"; + Result enumDataNotAvailable = Result.valueForString(example); + example = "READ_ONLY"; + Result enumReadOnly = Result.valueForString(example); + example = "CORRUPTED_DATA"; + Result enumCorruptData = Result.valueForString(example); + example = "ENCRYPTION_NEEDED"; + Result enumEncryptionRequired = Result.valueForString(example); - /** - * Verifies that an invalid assignment is null. - */ - public void testInvalidEnum () { - String example = "suCcesS"; - try { - Result temp = Result.valueForString(example); + assertNotNull("SUCCESS returned null", enumSuccess); + assertNotNull("INVALID_DATA returned null", enumInvalidData); + assertNotNull("UNSUPPORTED_REQUEST returned null", enumUnsupportedRequest); + assertNotNull("OUT_OF_MEMORY returned null", enumOutOfMemory); + assertNotNull("TOO_MANY_PENDING_REQUESTS returned null", enumTooManyPendingRequests); + assertNotNull("CHAR_LIMIT_EXCEEDED returned null", enumCharLimitExceeded); + assertNotNull("INVALID_ID returned null", enumInvalidId); + assertNotNull("DUPLICATE_NAME returned null", enumDuplicateName); + assertNotNull("TOO_MANY_APPLICATIONS returned null", enumTooManyApplications); + assertNotNull("APPLICATION_REGISTERED_ALREADY returned null", enumApplicationRegisteredAlready); + assertNotNull("UNSUPPORTED_VERSION returned null", enumUnsupportedVersion); + assertNotNull("WRONG_LANGUAGE returned null", enumWrongLanguage); + assertNotNull("APPLICATION_NOT_REGISTERED returned null", enumApplicationNotRegistered); + assertNotNull("IN_USE returned null", enumInUse); + assertNotNull("VEHICLE_DATA_NOT_ALLOWED returned null", enumVehicleDataNotAllowed); + assertNotNull("VEHICLE_DATA_NOT_AVAILABLE returned null", enumVehicleDataNotAvailable); + assertNotNull("REJECTED returned null", enumRejected); + assertNotNull("ABORTED returned null", enumAborted); + assertNotNull("IGNORED returned null", enumIgnored); + assertNotNull("UNSUPPORTED_RESOURCE returned null", enumUnsupportedResource); + assertNotNull("FILE_NOT_FOUND returned null", enumFileNotFound); + assertNotNull("GENERIC_ERROR returned null", enumGenericError); + assertNotNull("DISALLOWED returned null", enumDisallowed); + assertNotNull("USER_DISALLOWED returned null", enumUserDisallowed); + assertNotNull("TIMED_OUT returned null", enumTimedOut); + assertNotNull("CANCEL_ROUTE returned null", enumCancelRoute); + assertNotNull("TRUNCATED_DATA returned null", enumTruncatedData); + assertNotNull("RETRY returned null", enumRetry); + assertNotNull("WARNINGS returned null", enumWarnings); + assertNotNull("SAVED returned null", enumSaved); + assertNotNull("INVALID_CERT returned null", enumInvalidCert); + assertNotNull("EXPIRED_CERT returned null", enumExpiredCert); + assertNotNull("RESUME_FAILED returned null", enumResumeFailed); + assertNotNull("DATA_NOT_AVAILABLE returned null", enumDataNotAvailable); + assertNotNull("READ_ONLY returned null", enumReadOnly); + assertNotNull("CORRUPTED_DATA", enumCorruptData); + assertNotNull("ENCRYPTION_NEEDED", enumEncryptionRequired); + } + + /** + * Verifies that an invalid assignment is null. + */ + public void testInvalidEnum() { + String example = "suCcesS"; + try { + Result temp = Result.valueForString(example); assertNull("Result of valueForString should be null.", temp); - } - catch (IllegalArgumentException exception) { + } catch (IllegalArgumentException exception) { fail("Invalid enum throws IllegalArgumentException."); - } - } + } + } - /** - * Verifies that a null assignment is invalid. - */ - public void testNullEnum () { - String example = null; - try { - Result temp = Result.valueForString(example); + /** + * Verifies that a null assignment is invalid. + */ + public void testNullEnum() { + String example = null; + try { + Result temp = Result.valueForString(example); assertNull("Result of valueForString should be null.", temp); - } - catch (NullPointerException exception) { + } catch (NullPointerException exception) { fail("Null string throws NullPointerException."); - } - } + } + } - /** - * Verifies the possible enum values of Result. - */ - public void testListEnum() { - List<Result> enumValueList = Arrays.asList(Result.values()); + /** + * Verifies the possible enum values of Result. + */ + public void testListEnum() { + List<Result> enumValueList = Arrays.asList(Result.values()); - List<Result> enumTestList = new ArrayList<Result>(); - enumTestList.add(Result.SUCCESS); - enumTestList.add(Result.INVALID_DATA); - enumTestList.add(Result.UNSUPPORTED_REQUEST); - enumTestList.add(Result.OUT_OF_MEMORY); - enumTestList.add(Result.TOO_MANY_PENDING_REQUESTS); - enumTestList.add(Result.CHAR_LIMIT_EXCEEDED); - enumTestList.add(Result.INVALID_ID); - enumTestList.add(Result.DUPLICATE_NAME); - enumTestList.add(Result.TOO_MANY_APPLICATIONS); - enumTestList.add(Result.APPLICATION_REGISTERED_ALREADY); - enumTestList.add(Result.UNSUPPORTED_VERSION); - enumTestList.add(Result.WRONG_LANGUAGE); - enumTestList.add(Result.APPLICATION_NOT_REGISTERED); - enumTestList.add(Result.IN_USE); - enumTestList.add(Result.VEHICLE_DATA_NOT_ALLOWED); - enumTestList.add(Result.VEHICLE_DATA_NOT_AVAILABLE); - enumTestList.add(Result.REJECTED); - enumTestList.add(Result.ABORTED); - enumTestList.add(Result.IGNORED); - enumTestList.add(Result.UNSUPPORTED_RESOURCE); - enumTestList.add(Result.FILE_NOT_FOUND); - enumTestList.add(Result.GENERIC_ERROR); - enumTestList.add(Result.DISALLOWED); - enumTestList.add(Result.USER_DISALLOWED); - enumTestList.add(Result.TIMED_OUT); - enumTestList.add(Result.CANCEL_ROUTE); - enumTestList.add(Result.TRUNCATED_DATA); - enumTestList.add(Result.RETRY); - enumTestList.add(Result.WARNINGS); - enumTestList.add(Result.SAVED); - enumTestList.add(Result.INVALID_CERT); - enumTestList.add(Result.EXPIRED_CERT); - enumTestList.add(Result.RESUME_FAILED); - enumTestList.add(Result.DATA_NOT_AVAILABLE); - enumTestList.add(Result.READ_ONLY); - enumTestList.add(Result.CORRUPTED_DATA); - enumTestList.add(Result.ENCRYPTION_NEEDED); + List<Result> enumTestList = new ArrayList<Result>(); + enumTestList.add(Result.SUCCESS); + enumTestList.add(Result.INVALID_DATA); + enumTestList.add(Result.UNSUPPORTED_REQUEST); + enumTestList.add(Result.OUT_OF_MEMORY); + enumTestList.add(Result.TOO_MANY_PENDING_REQUESTS); + enumTestList.add(Result.CHAR_LIMIT_EXCEEDED); + enumTestList.add(Result.INVALID_ID); + enumTestList.add(Result.DUPLICATE_NAME); + enumTestList.add(Result.TOO_MANY_APPLICATIONS); + enumTestList.add(Result.APPLICATION_REGISTERED_ALREADY); + enumTestList.add(Result.UNSUPPORTED_VERSION); + enumTestList.add(Result.WRONG_LANGUAGE); + enumTestList.add(Result.APPLICATION_NOT_REGISTERED); + enumTestList.add(Result.IN_USE); + enumTestList.add(Result.VEHICLE_DATA_NOT_ALLOWED); + enumTestList.add(Result.VEHICLE_DATA_NOT_AVAILABLE); + enumTestList.add(Result.REJECTED); + enumTestList.add(Result.ABORTED); + enumTestList.add(Result.IGNORED); + enumTestList.add(Result.UNSUPPORTED_RESOURCE); + enumTestList.add(Result.FILE_NOT_FOUND); + enumTestList.add(Result.GENERIC_ERROR); + enumTestList.add(Result.DISALLOWED); + enumTestList.add(Result.USER_DISALLOWED); + enumTestList.add(Result.TIMED_OUT); + enumTestList.add(Result.CANCEL_ROUTE); + enumTestList.add(Result.TRUNCATED_DATA); + enumTestList.add(Result.RETRY); + enumTestList.add(Result.WARNINGS); + enumTestList.add(Result.SAVED); + enumTestList.add(Result.INVALID_CERT); + enumTestList.add(Result.EXPIRED_CERT); + enumTestList.add(Result.RESUME_FAILED); + enumTestList.add(Result.DATA_NOT_AVAILABLE); + enumTestList.add(Result.READ_ONLY); + enumTestList.add(Result.CORRUPTED_DATA); + enumTestList.add(Result.ENCRYPTION_NEEDED); - assertTrue("Enum value list does not match enum class list", - enumValueList.containsAll(enumTestList) && enumTestList.containsAll(enumValueList)); - } + assertTrue("Enum value list does not match enum class list", + enumValueList.containsAll(enumTestList) && enumTestList.containsAll(enumValueList)); + } }
\ No newline at end of file diff --git a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/SamplingRateTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/SamplingRateTests.java index 7a73b47f8..099a8668b 100644 --- a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/SamplingRateTests.java +++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/SamplingRateTests.java @@ -9,71 +9,69 @@ import java.util.Arrays; import java.util.List; /** - * This is a unit test class for the SmartDeviceLink library project class : + * This is a unit test class for the SmartDeviceLink library project class : * {@link com.smartdevicelink.proxy.rpc.enums.SamplingRate} */ public class SamplingRateTests extends TestCase { - /** - * Verifies that the enum values are not null upon valid assignment. - */ - public void testValidEnums () { - String example = "8KHZ"; - SamplingRate enum8Khz = SamplingRate.valueForString(example); - example = "16KHZ"; - SamplingRate enum16Khz = SamplingRate.valueForString(example); - example = "22KHZ"; - SamplingRate enum22Khz = SamplingRate.valueForString(example); - example = "44KHZ"; - SamplingRate enum44Khz = SamplingRate.valueForString(example); - - assertNotNull("8KHZ returned null", enum8Khz); - assertNotNull("16KHZ returned null", enum16Khz); - assertNotNull("22KHZ returned null", enum22Khz); - assertNotNull("44KHZ returned null", enum44Khz); - } + /** + * Verifies that the enum values are not null upon valid assignment. + */ + public void testValidEnums() { + String example = "8KHZ"; + SamplingRate enum8Khz = SamplingRate.valueForString(example); + example = "16KHZ"; + SamplingRate enum16Khz = SamplingRate.valueForString(example); + example = "22KHZ"; + SamplingRate enum22Khz = SamplingRate.valueForString(example); + example = "44KHZ"; + SamplingRate enum44Khz = SamplingRate.valueForString(example); - /** - * Verifies that an invalid assignment is null. - */ - public void testInvalidEnum () { - String example = "8kHz"; - try { - SamplingRate temp = SamplingRate.valueForString(example); + assertNotNull("8KHZ returned null", enum8Khz); + assertNotNull("16KHZ returned null", enum16Khz); + assertNotNull("22KHZ returned null", enum22Khz); + assertNotNull("44KHZ returned null", enum44Khz); + } + + /** + * Verifies that an invalid assignment is null. + */ + public void testInvalidEnum() { + String example = "8kHz"; + try { + SamplingRate temp = SamplingRate.valueForString(example); assertNull("Result of valueForString should be null.", temp); - } - catch (IllegalArgumentException exception) { + } catch (IllegalArgumentException exception) { fail("Invalid enum throws IllegalArgumentException."); - } - } + } + } - /** - * Verifies that a null assignment is invalid. - */ - public void testNullEnum () { - String example = null; - try { - SamplingRate temp = SamplingRate.valueForString(example); + /** + * Verifies that a null assignment is invalid. + */ + public void testNullEnum() { + String example = null; + try { + SamplingRate temp = SamplingRate.valueForString(example); assertNull("Result of valueForString should be null.", temp); - } - catch (NullPointerException exception) { + } catch (NullPointerException exception) { fail("Null string throws NullPointerException."); - } - } + } + } + + /** + * Verifies the possible enum values of SamplingRate. + */ + public void testListEnum() { + List<SamplingRate> enumValueList = Arrays.asList(SamplingRate.values()); - /** - * Verifies the possible enum values of SamplingRate. - */ - public void testListEnum() { - List<SamplingRate> enumValueList = Arrays.asList(SamplingRate.values()); + List<SamplingRate> enumTestList = new ArrayList<SamplingRate>(); + enumTestList.add(SamplingRate._8KHZ); + enumTestList.add(SamplingRate._16KHZ); + enumTestList.add(SamplingRate._22KHZ); + enumTestList.add(SamplingRate._44KHZ); - List<SamplingRate> enumTestList = new ArrayList<SamplingRate>(); - enumTestList.add(SamplingRate._8KHZ); - enumTestList.add(SamplingRate._16KHZ); - enumTestList.add(SamplingRate._22KHZ); - enumTestList.add(SamplingRate._44KHZ); - - assertTrue("Enum value list does not match enum class list", - enumValueList.containsAll(enumTestList) && enumTestList.containsAll(enumValueList)); - } + assertTrue("Enum value list does not match enum class list", + enumValueList.containsAll(enumTestList) && enumTestList.containsAll(enumValueList)); + } }
\ No newline at end of file diff --git a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/SdlDisconnectedReasonTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/SdlDisconnectedReasonTests.java index c55b9fc21..39a5f07c8 100644 --- a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/SdlDisconnectedReasonTests.java +++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/SdlDisconnectedReasonTests.java @@ -11,171 +11,169 @@ import java.util.Arrays; import java.util.List; /** - * This is a unit test class for the SmartDeviceLink library project class : + * This is a unit test class for the SmartDeviceLink library project class : * {@link com.smartdevicelink.proxy.rpc.enums.SdlDisconnectedReason} */ public class SdlDisconnectedReasonTests extends TestCase { - /** - * Verifies that the enum values are not null upon valid assignment. - */ - public void testValidEnums () { - String example = "USER_EXIT"; - SdlDisconnectedReason enumUserExit = SdlDisconnectedReason.valueForString(example); - example = "IGNITION_OFF"; - SdlDisconnectedReason enumIgnitionOff = SdlDisconnectedReason.valueForString(example); - example = "BLUETOOTH_OFF"; - SdlDisconnectedReason enumBluetoothOff = SdlDisconnectedReason.valueForString(example); - example = "USB_DISCONNECTED"; - SdlDisconnectedReason enumUsbDisconnected = SdlDisconnectedReason.valueForString(example); - example = "REQUEST_WHILE_IN_NONE_HMI_LEVEL"; - SdlDisconnectedReason enumRequestWhileInNoneHmiLevel = SdlDisconnectedReason.valueForString(example); - example = "TOO_MANY_REQUESTS"; - SdlDisconnectedReason enumTooManyRequests = SdlDisconnectedReason.valueForString(example); - example = "DRIVER_DISTRACTION_VIOLATION"; - SdlDisconnectedReason enumDriverDistractionViolation = SdlDisconnectedReason.valueForString(example); - example = "LANGUAGE_CHANGE"; - SdlDisconnectedReason enumLanuguageChange = SdlDisconnectedReason.valueForString(example); - example = "MASTER_RESET"; - SdlDisconnectedReason enumMasterReset = SdlDisconnectedReason.valueForString(example); - example = "FACTORY_DEFAULTS"; - SdlDisconnectedReason enumFactoryDefaults = SdlDisconnectedReason.valueForString(example); - example = "TRANSPORT_ERROR"; - SdlDisconnectedReason enumTransportError = SdlDisconnectedReason.valueForString(example); - example = "APPLICATION_REQUESTED_DISCONNECT"; - SdlDisconnectedReason enumApplicationRequestedDisconnect = SdlDisconnectedReason.valueForString(example); - example = "DEFAULT"; - SdlDisconnectedReason enumDefault = SdlDisconnectedReason.valueForString(example); - example = "TRANSPORT_DISCONNECT"; - SdlDisconnectedReason enumTransportDisconnect = SdlDisconnectedReason.valueForString(example); - example = "HB_TIMEOUT"; - SdlDisconnectedReason enumHbTimeout = SdlDisconnectedReason.valueForString(example); - example = "BLUETOOTH_DISABLED"; - SdlDisconnectedReason enumBluetoothDisabled = SdlDisconnectedReason.valueForString(example); - example = "BLUETOOTH_ADAPTER_ERROR"; - SdlDisconnectedReason enumBluetoothAdapterError = SdlDisconnectedReason.valueForString(example); - example = "SDL_REGISTRATION_ERROR"; - SdlDisconnectedReason enumSdlRegistrationError = SdlDisconnectedReason.valueForString(example); - example = "APP_INTERFACE_UNREG"; - SdlDisconnectedReason enumAppInterfaceUnreg = SdlDisconnectedReason.valueForString(example); - example = "GENERIC_ERROR"; - SdlDisconnectedReason enumGenericError = SdlDisconnectedReason.valueForString(example); - example = "LEGACY_BLUETOOTH_MODE_ENABLED"; - SdlDisconnectedReason enumLegacyMode = SdlDisconnectedReason.valueForString(example); - example = "RPC_SESSION_ENDED"; - SdlDisconnectedReason enumRpcSessionEnded = SdlDisconnectedReason.valueForString(example); - example = "RESOURCE_CONSTRAINT"; - SdlDisconnectedReason resourceConstraint = SdlDisconnectedReason.valueForString(example); + /** + * Verifies that the enum values are not null upon valid assignment. + */ + public void testValidEnums() { + String example = "USER_EXIT"; + SdlDisconnectedReason enumUserExit = SdlDisconnectedReason.valueForString(example); + example = "IGNITION_OFF"; + SdlDisconnectedReason enumIgnitionOff = SdlDisconnectedReason.valueForString(example); + example = "BLUETOOTH_OFF"; + SdlDisconnectedReason enumBluetoothOff = SdlDisconnectedReason.valueForString(example); + example = "USB_DISCONNECTED"; + SdlDisconnectedReason enumUsbDisconnected = SdlDisconnectedReason.valueForString(example); + example = "REQUEST_WHILE_IN_NONE_HMI_LEVEL"; + SdlDisconnectedReason enumRequestWhileInNoneHmiLevel = SdlDisconnectedReason.valueForString(example); + example = "TOO_MANY_REQUESTS"; + SdlDisconnectedReason enumTooManyRequests = SdlDisconnectedReason.valueForString(example); + example = "DRIVER_DISTRACTION_VIOLATION"; + SdlDisconnectedReason enumDriverDistractionViolation = SdlDisconnectedReason.valueForString(example); + example = "LANGUAGE_CHANGE"; + SdlDisconnectedReason enumLanuguageChange = SdlDisconnectedReason.valueForString(example); + example = "MASTER_RESET"; + SdlDisconnectedReason enumMasterReset = SdlDisconnectedReason.valueForString(example); + example = "FACTORY_DEFAULTS"; + SdlDisconnectedReason enumFactoryDefaults = SdlDisconnectedReason.valueForString(example); + example = "TRANSPORT_ERROR"; + SdlDisconnectedReason enumTransportError = SdlDisconnectedReason.valueForString(example); + example = "APPLICATION_REQUESTED_DISCONNECT"; + SdlDisconnectedReason enumApplicationRequestedDisconnect = SdlDisconnectedReason.valueForString(example); + example = "DEFAULT"; + SdlDisconnectedReason enumDefault = SdlDisconnectedReason.valueForString(example); + example = "TRANSPORT_DISCONNECT"; + SdlDisconnectedReason enumTransportDisconnect = SdlDisconnectedReason.valueForString(example); + example = "HB_TIMEOUT"; + SdlDisconnectedReason enumHbTimeout = SdlDisconnectedReason.valueForString(example); + example = "BLUETOOTH_DISABLED"; + SdlDisconnectedReason enumBluetoothDisabled = SdlDisconnectedReason.valueForString(example); + example = "BLUETOOTH_ADAPTER_ERROR"; + SdlDisconnectedReason enumBluetoothAdapterError = SdlDisconnectedReason.valueForString(example); + example = "SDL_REGISTRATION_ERROR"; + SdlDisconnectedReason enumSdlRegistrationError = SdlDisconnectedReason.valueForString(example); + example = "APP_INTERFACE_UNREG"; + SdlDisconnectedReason enumAppInterfaceUnreg = SdlDisconnectedReason.valueForString(example); + example = "GENERIC_ERROR"; + SdlDisconnectedReason enumGenericError = SdlDisconnectedReason.valueForString(example); + example = "LEGACY_BLUETOOTH_MODE_ENABLED"; + SdlDisconnectedReason enumLegacyMode = SdlDisconnectedReason.valueForString(example); + example = "RPC_SESSION_ENDED"; + SdlDisconnectedReason enumRpcSessionEnded = SdlDisconnectedReason.valueForString(example); + example = "RESOURCE_CONSTRAINT"; + SdlDisconnectedReason resourceConstraint = SdlDisconnectedReason.valueForString(example); - assertNotNull("USER_EXIT returned null", enumUserExit); - assertNotNull("IGNITION_OFF returned null", enumIgnitionOff); - assertNotNull("BLUETOOTH_OFF returned null", enumBluetoothOff); - assertNotNull("USB_DISCONNECTED returned null", enumUsbDisconnected); - assertNotNull("REQUEST_WHILE_IN_NONE_HMI_LEVEL returned null", enumRequestWhileInNoneHmiLevel); - assertNotNull("TOO_MANY_REQUESTS returned null", enumTooManyRequests); - assertNotNull("DRIVER_DISTRACTION_VIOLATION returned null", enumDriverDistractionViolation); - assertNotNull("LANGUAGE_CHANGE returned null", enumLanuguageChange); - assertNotNull("MASTER_RESET returned null", enumMasterReset); - assertNotNull("FACTORY_DEFAULTS returned null", enumFactoryDefaults); - assertNotNull("TRANSPORT_ERROR returned null", enumTransportError); - assertNotNull("APPLICATION_REQUESTED_DISCONNECT returned null", enumApplicationRequestedDisconnect); - assertNotNull("DEFAULT returned null", enumDefault); - assertNotNull("TRANSPORT_DISCONNECT returned null", enumTransportDisconnect); - assertNotNull("HB_TIMEOUT returned null", enumHbTimeout); - assertNotNull("BLUETOOTH_DISABLED returned null", enumBluetoothDisabled); - assertNotNull("BLUETOOTH_ADAPTER_ERROR returned null", enumBluetoothAdapterError); - assertNotNull("SDL_REGISTRATION_ERROR returned null", enumSdlRegistrationError); - assertNotNull("APP_INTERFACE_UNREG returned null", enumAppInterfaceUnreg); - assertNotNull("GENERIC_ERROR returned null", enumGenericError); - assertNotNull("LEGACY_BLUETOOTH_MODE_ENABLED returned null", enumLegacyMode); - assertNotNull("RPC_SESSION_ENDED returned null", enumRpcSessionEnded); - assertNotNull("RESOURCE_CONSTRAINT returned null", resourceConstraint); - } + assertNotNull("USER_EXIT returned null", enumUserExit); + assertNotNull("IGNITION_OFF returned null", enumIgnitionOff); + assertNotNull("BLUETOOTH_OFF returned null", enumBluetoothOff); + assertNotNull("USB_DISCONNECTED returned null", enumUsbDisconnected); + assertNotNull("REQUEST_WHILE_IN_NONE_HMI_LEVEL returned null", enumRequestWhileInNoneHmiLevel); + assertNotNull("TOO_MANY_REQUESTS returned null", enumTooManyRequests); + assertNotNull("DRIVER_DISTRACTION_VIOLATION returned null", enumDriverDistractionViolation); + assertNotNull("LANGUAGE_CHANGE returned null", enumLanuguageChange); + assertNotNull("MASTER_RESET returned null", enumMasterReset); + assertNotNull("FACTORY_DEFAULTS returned null", enumFactoryDefaults); + assertNotNull("TRANSPORT_ERROR returned null", enumTransportError); + assertNotNull("APPLICATION_REQUESTED_DISCONNECT returned null", enumApplicationRequestedDisconnect); + assertNotNull("DEFAULT returned null", enumDefault); + assertNotNull("TRANSPORT_DISCONNECT returned null", enumTransportDisconnect); + assertNotNull("HB_TIMEOUT returned null", enumHbTimeout); + assertNotNull("BLUETOOTH_DISABLED returned null", enumBluetoothDisabled); + assertNotNull("BLUETOOTH_ADAPTER_ERROR returned null", enumBluetoothAdapterError); + assertNotNull("SDL_REGISTRATION_ERROR returned null", enumSdlRegistrationError); + assertNotNull("APP_INTERFACE_UNREG returned null", enumAppInterfaceUnreg); + assertNotNull("GENERIC_ERROR returned null", enumGenericError); + assertNotNull("LEGACY_BLUETOOTH_MODE_ENABLED returned null", enumLegacyMode); + assertNotNull("RPC_SESSION_ENDED returned null", enumRpcSessionEnded); + assertNotNull("RESOURCE_CONSTRAINT returned null", resourceConstraint); + } - /** - * Verifies that an invalid assignment is null. - */ - public void testInvalidEnum () { - String example = "uSer_ExiT"; - try { - SdlDisconnectedReason temp = SdlDisconnectedReason.valueForString(example); + /** + * Verifies that an invalid assignment is null. + */ + public void testInvalidEnum() { + String example = "uSer_ExiT"; + try { + SdlDisconnectedReason temp = SdlDisconnectedReason.valueForString(example); assertNull("Result of valueForString should be null.", temp); - } - catch (IllegalArgumentException exception) { + } catch (IllegalArgumentException exception) { fail("Invalid enum throws IllegalArgumentException."); - } - } + } + } - /** - * Verifies that a null assignment is invalid. - */ - public void testNullEnum () { - String example = null; - try { - SdlDisconnectedReason temp = SdlDisconnectedReason.valueForString(example); + /** + * Verifies that a null assignment is invalid. + */ + public void testNullEnum() { + String example = null; + try { + SdlDisconnectedReason temp = SdlDisconnectedReason.valueForString(example); assertNull("Result of valueForString should be null.", temp); - } - catch (NullPointerException exception) { + } catch (NullPointerException exception) { fail("Null string throws NullPointerException."); - } - } + } + } - /** - * Verifies the possible enum values of SdlDisconnectedReason. - */ - public void testListEnum() { - List<SdlDisconnectedReason> enumValueList = Arrays.asList(SdlDisconnectedReason.values()); + /** + * Verifies the possible enum values of SdlDisconnectedReason. + */ + public void testListEnum() { + List<SdlDisconnectedReason> enumValueList = Arrays.asList(SdlDisconnectedReason.values()); - List<SdlDisconnectedReason> enumTestList = new ArrayList<SdlDisconnectedReason>(); - enumTestList.add(SdlDisconnectedReason.USER_EXIT); - enumTestList.add(SdlDisconnectedReason.IGNITION_OFF); - enumTestList.add(SdlDisconnectedReason.BLUETOOTH_OFF); - enumTestList.add(SdlDisconnectedReason.USB_DISCONNECTED); - enumTestList.add(SdlDisconnectedReason.REQUEST_WHILE_IN_NONE_HMI_LEVEL); - enumTestList.add(SdlDisconnectedReason.TOO_MANY_REQUESTS); - enumTestList.add(SdlDisconnectedReason.DRIVER_DISTRACTION_VIOLATION); - enumTestList.add(SdlDisconnectedReason.LANGUAGE_CHANGE); - enumTestList.add(SdlDisconnectedReason.MASTER_RESET); - enumTestList.add(SdlDisconnectedReason.FACTORY_DEFAULTS); - enumTestList.add(SdlDisconnectedReason.TRANSPORT_ERROR); - enumTestList.add(SdlDisconnectedReason.APPLICATION_REQUESTED_DISCONNECT); - enumTestList.add(SdlDisconnectedReason.DEFAULT); - enumTestList.add(SdlDisconnectedReason.TRANSPORT_DISCONNECT); - enumTestList.add(SdlDisconnectedReason.HB_TIMEOUT); - enumTestList.add(SdlDisconnectedReason.BLUETOOTH_DISABLED); - enumTestList.add(SdlDisconnectedReason.BLUETOOTH_ADAPTER_ERROR); - enumTestList.add(SdlDisconnectedReason.SDL_REGISTRATION_ERROR); - enumTestList.add(SdlDisconnectedReason.APP_INTERFACE_UNREG); - enumTestList.add(SdlDisconnectedReason.GENERIC_ERROR); - enumTestList.add(SdlDisconnectedReason.LEGACY_BLUETOOTH_MODE_ENABLED); - enumTestList.add(SdlDisconnectedReason.RPC_SESSION_ENDED); - enumTestList.add(SdlDisconnectedReason.PRIMARY_TRANSPORT_CYCLE_REQUEST); - enumTestList.add(SdlDisconnectedReason.MINIMUM_PROTOCOL_VERSION_HIGHER_THAN_SUPPORTED); - enumTestList.add(SdlDisconnectedReason.MINIMUM_RPC_VERSION_HIGHER_THAN_SUPPORTED); - enumTestList.add(SdlDisconnectedReason.RESOURCE_CONSTRAINT); + List<SdlDisconnectedReason> enumTestList = new ArrayList<SdlDisconnectedReason>(); + enumTestList.add(SdlDisconnectedReason.USER_EXIT); + enumTestList.add(SdlDisconnectedReason.IGNITION_OFF); + enumTestList.add(SdlDisconnectedReason.BLUETOOTH_OFF); + enumTestList.add(SdlDisconnectedReason.USB_DISCONNECTED); + enumTestList.add(SdlDisconnectedReason.REQUEST_WHILE_IN_NONE_HMI_LEVEL); + enumTestList.add(SdlDisconnectedReason.TOO_MANY_REQUESTS); + enumTestList.add(SdlDisconnectedReason.DRIVER_DISTRACTION_VIOLATION); + enumTestList.add(SdlDisconnectedReason.LANGUAGE_CHANGE); + enumTestList.add(SdlDisconnectedReason.MASTER_RESET); + enumTestList.add(SdlDisconnectedReason.FACTORY_DEFAULTS); + enumTestList.add(SdlDisconnectedReason.TRANSPORT_ERROR); + enumTestList.add(SdlDisconnectedReason.APPLICATION_REQUESTED_DISCONNECT); + enumTestList.add(SdlDisconnectedReason.DEFAULT); + enumTestList.add(SdlDisconnectedReason.TRANSPORT_DISCONNECT); + enumTestList.add(SdlDisconnectedReason.HB_TIMEOUT); + enumTestList.add(SdlDisconnectedReason.BLUETOOTH_DISABLED); + enumTestList.add(SdlDisconnectedReason.BLUETOOTH_ADAPTER_ERROR); + enumTestList.add(SdlDisconnectedReason.SDL_REGISTRATION_ERROR); + enumTestList.add(SdlDisconnectedReason.APP_INTERFACE_UNREG); + enumTestList.add(SdlDisconnectedReason.GENERIC_ERROR); + enumTestList.add(SdlDisconnectedReason.LEGACY_BLUETOOTH_MODE_ENABLED); + enumTestList.add(SdlDisconnectedReason.RPC_SESSION_ENDED); + enumTestList.add(SdlDisconnectedReason.PRIMARY_TRANSPORT_CYCLE_REQUEST); + enumTestList.add(SdlDisconnectedReason.MINIMUM_PROTOCOL_VERSION_HIGHER_THAN_SUPPORTED); + enumTestList.add(SdlDisconnectedReason.MINIMUM_RPC_VERSION_HIGHER_THAN_SUPPORTED); + enumTestList.add(SdlDisconnectedReason.RESOURCE_CONSTRAINT); + + assertTrue("Enum value list does not match enum class list", + enumValueList.containsAll(enumTestList) && enumTestList.containsAll(enumValueList)); + } + + /** + * Verifies the valid returns of the conversion method, + * {@link com.smartdevicelink.proxy.rpc.enums.SdlDisconnectedReason#convertAppInterfaceUnregisteredReason(AppInterfaceUnregisteredReason)} + */ + public void testConvertMethod() { + assertEquals(TestValues.MATCH, SdlDisconnectedReason.DEFAULT, SdlDisconnectedReason.convertAppInterfaceUnregisteredReason(AppInterfaceUnregisteredReason.APP_UNAUTHORIZED)); + assertEquals(TestValues.MATCH, SdlDisconnectedReason.BLUETOOTH_OFF, SdlDisconnectedReason.convertAppInterfaceUnregisteredReason(AppInterfaceUnregisteredReason.BLUETOOTH_OFF)); + assertEquals(TestValues.MATCH, SdlDisconnectedReason.DRIVER_DISTRACTION_VIOLATION, SdlDisconnectedReason.convertAppInterfaceUnregisteredReason(AppInterfaceUnregisteredReason.DRIVER_DISTRACTION_VIOLATION)); + assertEquals(TestValues.MATCH, SdlDisconnectedReason.FACTORY_DEFAULTS, SdlDisconnectedReason.convertAppInterfaceUnregisteredReason(AppInterfaceUnregisteredReason.FACTORY_DEFAULTS)); + assertEquals(TestValues.MATCH, SdlDisconnectedReason.IGNITION_OFF, SdlDisconnectedReason.convertAppInterfaceUnregisteredReason(AppInterfaceUnregisteredReason.IGNITION_OFF)); + assertEquals(TestValues.MATCH, SdlDisconnectedReason.LANGUAGE_CHANGE, SdlDisconnectedReason.convertAppInterfaceUnregisteredReason(AppInterfaceUnregisteredReason.LANGUAGE_CHANGE)); + assertEquals(TestValues.MATCH, SdlDisconnectedReason.MASTER_RESET, SdlDisconnectedReason.convertAppInterfaceUnregisteredReason(AppInterfaceUnregisteredReason.MASTER_RESET)); + assertEquals(TestValues.MATCH, SdlDisconnectedReason.REQUEST_WHILE_IN_NONE_HMI_LEVEL, SdlDisconnectedReason.convertAppInterfaceUnregisteredReason(AppInterfaceUnregisteredReason.REQUEST_WHILE_IN_NONE_HMI_LEVEL)); + assertEquals(TestValues.MATCH, SdlDisconnectedReason.TOO_MANY_REQUESTS, SdlDisconnectedReason.convertAppInterfaceUnregisteredReason(AppInterfaceUnregisteredReason.TOO_MANY_REQUESTS)); + assertEquals(TestValues.MATCH, SdlDisconnectedReason.USB_DISCONNECTED, SdlDisconnectedReason.convertAppInterfaceUnregisteredReason(AppInterfaceUnregisteredReason.USB_DISCONNECTED)); + assertEquals(TestValues.MATCH, SdlDisconnectedReason.USER_EXIT, SdlDisconnectedReason.convertAppInterfaceUnregisteredReason(AppInterfaceUnregisteredReason.USER_EXIT)); + assertEquals(TestValues.MATCH, SdlDisconnectedReason.RESOURCE_CONSTRAINT, SdlDisconnectedReason.convertAppInterfaceUnregisteredReason(AppInterfaceUnregisteredReason.RESOURCE_CONSTRAINT)); + assertNull(TestValues.MATCH, SdlDisconnectedReason.convertAppInterfaceUnregisteredReason(null)); + } - assertTrue("Enum value list does not match enum class list", - enumValueList.containsAll(enumTestList) && enumTestList.containsAll(enumValueList)); - } - - /** - * Verifies the valid returns of the conversion method, - * {@link com.smartdevicelink.proxy.rpc.enums.SdlDisconnectedReason#convertAppInterfaceUnregisteredReason(AppInterfaceUnregisteredReason)} - */ - public void testConvertMethod () { - assertEquals(TestValues.MATCH, SdlDisconnectedReason.DEFAULT, SdlDisconnectedReason.convertAppInterfaceUnregisteredReason(AppInterfaceUnregisteredReason.APP_UNAUTHORIZED)); - assertEquals(TestValues.MATCH, SdlDisconnectedReason.BLUETOOTH_OFF, SdlDisconnectedReason.convertAppInterfaceUnregisteredReason(AppInterfaceUnregisteredReason.BLUETOOTH_OFF)); - assertEquals(TestValues.MATCH, SdlDisconnectedReason.DRIVER_DISTRACTION_VIOLATION, SdlDisconnectedReason.convertAppInterfaceUnregisteredReason(AppInterfaceUnregisteredReason.DRIVER_DISTRACTION_VIOLATION)); - assertEquals(TestValues.MATCH, SdlDisconnectedReason.FACTORY_DEFAULTS, SdlDisconnectedReason.convertAppInterfaceUnregisteredReason(AppInterfaceUnregisteredReason.FACTORY_DEFAULTS)); - assertEquals(TestValues.MATCH, SdlDisconnectedReason.IGNITION_OFF, SdlDisconnectedReason.convertAppInterfaceUnregisteredReason(AppInterfaceUnregisteredReason.IGNITION_OFF)); - assertEquals(TestValues.MATCH, SdlDisconnectedReason.LANGUAGE_CHANGE, SdlDisconnectedReason.convertAppInterfaceUnregisteredReason(AppInterfaceUnregisteredReason.LANGUAGE_CHANGE)); - assertEquals(TestValues.MATCH, SdlDisconnectedReason.MASTER_RESET, SdlDisconnectedReason.convertAppInterfaceUnregisteredReason(AppInterfaceUnregisteredReason.MASTER_RESET)); - assertEquals(TestValues.MATCH, SdlDisconnectedReason.REQUEST_WHILE_IN_NONE_HMI_LEVEL, SdlDisconnectedReason.convertAppInterfaceUnregisteredReason(AppInterfaceUnregisteredReason.REQUEST_WHILE_IN_NONE_HMI_LEVEL)); - assertEquals(TestValues.MATCH, SdlDisconnectedReason.TOO_MANY_REQUESTS, SdlDisconnectedReason.convertAppInterfaceUnregisteredReason(AppInterfaceUnregisteredReason.TOO_MANY_REQUESTS)); - assertEquals(TestValues.MATCH, SdlDisconnectedReason.USB_DISCONNECTED, SdlDisconnectedReason.convertAppInterfaceUnregisteredReason(AppInterfaceUnregisteredReason.USB_DISCONNECTED)); - assertEquals(TestValues.MATCH, SdlDisconnectedReason.USER_EXIT, SdlDisconnectedReason.convertAppInterfaceUnregisteredReason(AppInterfaceUnregisteredReason.USER_EXIT)); - assertEquals(TestValues.MATCH, SdlDisconnectedReason.RESOURCE_CONSTRAINT, SdlDisconnectedReason.convertAppInterfaceUnregisteredReason(AppInterfaceUnregisteredReason.RESOURCE_CONSTRAINT)); - assertNull(TestValues.MATCH, SdlDisconnectedReason.convertAppInterfaceUnregisteredReason(null)); - } - }
\ No newline at end of file diff --git a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/SeatMemoryActionTypeTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/SeatMemoryActionTypeTests.java index e2cc0294a..5b296a85f 100644 --- a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/SeatMemoryActionTypeTests.java +++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/SeatMemoryActionTypeTests.java @@ -14,60 +14,60 @@ import java.util.List; */ public class SeatMemoryActionTypeTests extends TestCase { - /** - * Verifies that the enum values are not null upon valid assignment. - */ - public void testValidEnums() { - String example = "SAVE"; - SeatMemoryActionType enumSave = SeatMemoryActionType.valueForString(example); - example = "RESTORE"; - SeatMemoryActionType enumRestore = SeatMemoryActionType.valueForString(example); - example = "NONE"; - SeatMemoryActionType enumNone = SeatMemoryActionType.valueForString(example); + /** + * Verifies that the enum values are not null upon valid assignment. + */ + public void testValidEnums() { + String example = "SAVE"; + SeatMemoryActionType enumSave = SeatMemoryActionType.valueForString(example); + example = "RESTORE"; + SeatMemoryActionType enumRestore = SeatMemoryActionType.valueForString(example); + example = "NONE"; + SeatMemoryActionType enumNone = SeatMemoryActionType.valueForString(example); - assertNotNull("SAVE returned null", enumSave); - assertNotNull("RESTORE returned null", enumRestore); - assertNotNull("NONE returned null", enumNone); - } + assertNotNull("SAVE returned null", enumSave); + assertNotNull("RESTORE returned null", enumRestore); + assertNotNull("NONE returned null", enumNone); + } - /** - * Verifies that an invalid assignment is null. - */ - public void testInvalidEnum() { - String example = "sAVE"; - try { - SeatMemoryActionType temp = SeatMemoryActionType.valueForString(example); - assertNull("Result of valueForString should be null.", temp); - } catch (IllegalArgumentException exception) { - fail("Invalid enum throws IllegalArgumentException."); - } - } + /** + * Verifies that an invalid assignment is null. + */ + public void testInvalidEnum() { + String example = "sAVE"; + try { + SeatMemoryActionType temp = SeatMemoryActionType.valueForString(example); + assertNull("Result of valueForString should be null.", temp); + } catch (IllegalArgumentException exception) { + fail("Invalid enum throws IllegalArgumentException."); + } + } - /** - * Verifies that a null assignment is invalid. - */ - public void testNullEnum() { - String example = null; - try { - SeatMemoryActionType temp = SeatMemoryActionType.valueForString(example); - assertNull("Result of valueForString should be null.", temp); - } catch (NullPointerException exception) { - fail("Null string throws NullPointerException."); - } - } + /** + * Verifies that a null assignment is invalid. + */ + public void testNullEnum() { + String example = null; + try { + SeatMemoryActionType temp = SeatMemoryActionType.valueForString(example); + assertNull("Result of valueForString should be null.", temp); + } catch (NullPointerException exception) { + fail("Null string throws NullPointerException."); + } + } - /** - * Verifies the possible enum values of SeatMemoryActionType. - */ - public void testListEnum() { - List<SeatMemoryActionType> enumValueList = Arrays.asList(SeatMemoryActionType.values()); + /** + * Verifies the possible enum values of SeatMemoryActionType. + */ + public void testListEnum() { + List<SeatMemoryActionType> enumValueList = Arrays.asList(SeatMemoryActionType.values()); - List<SeatMemoryActionType> enumTestList = new ArrayList<SeatMemoryActionType>(); - enumTestList.add(SeatMemoryActionType.SAVE); - enumTestList.add(SeatMemoryActionType.RESTORE); - enumTestList.add(SeatMemoryActionType.NONE); + List<SeatMemoryActionType> enumTestList = new ArrayList<SeatMemoryActionType>(); + enumTestList.add(SeatMemoryActionType.SAVE); + enumTestList.add(SeatMemoryActionType.RESTORE); + enumTestList.add(SeatMemoryActionType.NONE); - assertTrue("Enum value list does not match enum class list", - enumValueList.containsAll(enumTestList) && enumTestList.containsAll(enumValueList)); - } + assertTrue("Enum value list does not match enum class list", + enumValueList.containsAll(enumTestList) && enumTestList.containsAll(enumValueList)); + } }
\ No newline at end of file diff --git a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/ServiceUpdateReasonTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/ServiceUpdateReasonTests.java index f2484ff9e..670e24909 100644 --- a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/ServiceUpdateReasonTests.java +++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/ServiceUpdateReasonTests.java @@ -14,71 +14,69 @@ import java.util.List; */ public class ServiceUpdateReasonTests extends TestCase { - /** - * Verifies that the enum values are not null upon valid assignment. - */ - public void testValidEnums () { - String example = "PUBLISHED"; - ServiceUpdateReason enumPublished = ServiceUpdateReason.valueForString(example); - example = "REMOVED"; - ServiceUpdateReason enumRemoved = ServiceUpdateReason.valueForString(example); - example = "ACTIVATED"; - ServiceUpdateReason enumActivated = ServiceUpdateReason.valueForString(example); - example = "DEACTIVATED"; - ServiceUpdateReason enumDeactivated = ServiceUpdateReason.valueForString(example); - example = "MANIFEST_UPDATE"; - ServiceUpdateReason enumManifestUpdate = ServiceUpdateReason.valueForString(example); + /** + * Verifies that the enum values are not null upon valid assignment. + */ + public void testValidEnums() { + String example = "PUBLISHED"; + ServiceUpdateReason enumPublished = ServiceUpdateReason.valueForString(example); + example = "REMOVED"; + ServiceUpdateReason enumRemoved = ServiceUpdateReason.valueForString(example); + example = "ACTIVATED"; + ServiceUpdateReason enumActivated = ServiceUpdateReason.valueForString(example); + example = "DEACTIVATED"; + ServiceUpdateReason enumDeactivated = ServiceUpdateReason.valueForString(example); + example = "MANIFEST_UPDATE"; + ServiceUpdateReason enumManifestUpdate = ServiceUpdateReason.valueForString(example); - assertNotNull("PUBLISHED returned null", enumPublished); - assertNotNull("REMOVED returned null", enumRemoved); - assertNotNull("ACTIVATED returned null", enumActivated); - assertNotNull("DEACTIVATED returned null", enumDeactivated); - assertNotNull("MANIFEST_UPDATE returned null", enumManifestUpdate); - } + assertNotNull("PUBLISHED returned null", enumPublished); + assertNotNull("REMOVED returned null", enumRemoved); + assertNotNull("ACTIVATED returned null", enumActivated); + assertNotNull("DEACTIVATED returned null", enumDeactivated); + assertNotNull("MANIFEST_UPDATE returned null", enumManifestUpdate); + } - /** - * Verifies that an invalid assignment is null. - */ - public void testInvalidEnum () { - String example = "HalFActIvAted"; - try { - ServiceUpdateReason temp = ServiceUpdateReason.valueForString(example); - assertNull("Result of valueForString should be null.", temp); - } - catch (IllegalArgumentException exception) { - fail("Invalid enum throws IllegalArgumentException."); - } - } + /** + * Verifies that an invalid assignment is null. + */ + public void testInvalidEnum() { + String example = "HalFActIvAted"; + try { + ServiceUpdateReason temp = ServiceUpdateReason.valueForString(example); + assertNull("Result of valueForString should be null.", temp); + } catch (IllegalArgumentException exception) { + fail("Invalid enum throws IllegalArgumentException."); + } + } - /** - * Verifies that a null assignment is invalid. - */ - public void testNullEnum () { - String example = null; - try { - ServiceUpdateReason temp = ServiceUpdateReason.valueForString(example); - assertNull("Result of valueForString should be null.", temp); - } - catch (NullPointerException exception) { - fail("Null string throws NullPointerException."); - } - } + /** + * Verifies that a null assignment is invalid. + */ + public void testNullEnum() { + String example = null; + try { + ServiceUpdateReason temp = ServiceUpdateReason.valueForString(example); + assertNull("Result of valueForString should be null.", temp); + } catch (NullPointerException exception) { + fail("Null string throws NullPointerException."); + } + } - /** - * Verifies the possible enum values of ServiceUpdateReason. - */ - public void testListEnum() { - List<ServiceUpdateReason> enumValueList = Arrays.asList(ServiceUpdateReason.values()); + /** + * Verifies the possible enum values of ServiceUpdateReason. + */ + public void testListEnum() { + List<ServiceUpdateReason> enumValueList = Arrays.asList(ServiceUpdateReason.values()); - List<ServiceUpdateReason> enumTestList = new ArrayList<>(); - enumTestList.add(ServiceUpdateReason.MANIFEST_UPDATE); - enumTestList.add(ServiceUpdateReason.ACTIVATED); - enumTestList.add(ServiceUpdateReason.DEACTIVATED); - enumTestList.add(ServiceUpdateReason.PUBLISHED); - enumTestList.add(ServiceUpdateReason.REMOVED); + List<ServiceUpdateReason> enumTestList = new ArrayList<>(); + enumTestList.add(ServiceUpdateReason.MANIFEST_UPDATE); + enumTestList.add(ServiceUpdateReason.ACTIVATED); + enumTestList.add(ServiceUpdateReason.DEACTIVATED); + enumTestList.add(ServiceUpdateReason.PUBLISHED); + enumTestList.add(ServiceUpdateReason.REMOVED); - assertTrue("Enum value list does not match enum class list", - enumValueList.containsAll(enumTestList) && enumTestList.containsAll(enumValueList)); - } + assertTrue("Enum value list does not match enum class list", + enumValueList.containsAll(enumTestList) && enumTestList.containsAll(enumValueList)); + } }
\ No newline at end of file diff --git a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/SoftButtonTypeTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/SoftButtonTypeTests.java index c41e9351a..dffae494a 100644 --- a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/SoftButtonTypeTests.java +++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/SoftButtonTypeTests.java @@ -9,68 +9,66 @@ import java.util.Arrays; import java.util.List; /** - * This is a unit test class for the SmartDeviceLink library project class : + * This is a unit test class for the SmartDeviceLink library project class : * {@link com.smartdevicelink.proxy.rpc.enums.SoftButtonType} */ public class SoftButtonTypeTests extends TestCase { - /** - * Verifies that the enum values are not null upon valid assignment. - */ - public void testValidEnums () { - String example = "TEXT"; - SoftButtonType enumText = SoftButtonType.valueForString(example); - example = "IMAGE"; - SoftButtonType enumImage = SoftButtonType.valueForString(example); - example = "BOTH"; - SoftButtonType enumBoth = SoftButtonType.valueForString(example); - - assertNotNull("TEXT returned null", enumText); - assertNotNull("IMAGE returned null", enumImage); - assertNotNull("BOTH returned null", enumBoth); - } + /** + * Verifies that the enum values are not null upon valid assignment. + */ + public void testValidEnums() { + String example = "TEXT"; + SoftButtonType enumText = SoftButtonType.valueForString(example); + example = "IMAGE"; + SoftButtonType enumImage = SoftButtonType.valueForString(example); + example = "BOTH"; + SoftButtonType enumBoth = SoftButtonType.valueForString(example); + assertNotNull("TEXT returned null", enumText); + assertNotNull("IMAGE returned null", enumImage); + assertNotNull("BOTH returned null", enumBoth); + } - /** - * Verifies that an invalid assignment is null. - */ - public void testInvalidEnum () { - String example = "teXT"; - try { - SoftButtonType temp = SoftButtonType.valueForString(example); + + /** + * Verifies that an invalid assignment is null. + */ + public void testInvalidEnum() { + String example = "teXT"; + try { + SoftButtonType temp = SoftButtonType.valueForString(example); assertNull("Result of valueForString should be null.", temp); - } - catch (IllegalArgumentException exception) { + } catch (IllegalArgumentException exception) { fail("Invalid enum throws IllegalArgumentException."); - } - } + } + } - /** - * Verifies that a null assignment is invalid. - */ - public void testNullEnum () { - String example = null; - try { - SoftButtonType temp = SoftButtonType.valueForString(example); + /** + * Verifies that a null assignment is invalid. + */ + public void testNullEnum() { + String example = null; + try { + SoftButtonType temp = SoftButtonType.valueForString(example); assertNull("Result of valueForString should be null.", temp); - } - catch (NullPointerException exception) { + } catch (NullPointerException exception) { fail("Null string throws NullPointerException."); - } - } + } + } + + /** + * Verifies the possible enum values of SoftButtonType. + */ + public void testListEnum() { + List<SoftButtonType> enumValueList = Arrays.asList(SoftButtonType.values()); - /** - * Verifies the possible enum values of SoftButtonType. - */ - public void testListEnum() { - List<SoftButtonType> enumValueList = Arrays.asList(SoftButtonType.values()); + List<SoftButtonType> enumTestList = new ArrayList<SoftButtonType>(); + enumTestList.add(SoftButtonType.SBT_TEXT); + enumTestList.add(SoftButtonType.SBT_IMAGE); + enumTestList.add(SoftButtonType.SBT_BOTH); - List<SoftButtonType> enumTestList = new ArrayList<SoftButtonType>(); - enumTestList.add(SoftButtonType.SBT_TEXT); - enumTestList.add(SoftButtonType.SBT_IMAGE); - enumTestList.add(SoftButtonType.SBT_BOTH); - - assertTrue("Enum value list does not match enum class list", - enumValueList.containsAll(enumTestList) && enumTestList.containsAll(enumValueList)); - } + assertTrue("Enum value list does not match enum class list", + enumValueList.containsAll(enumTestList) && enumTestList.containsAll(enumValueList)); + } }
\ No newline at end of file diff --git a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/SpeechCapabilitiesTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/SpeechCapabilitiesTests.java index d2da4699b..33170ea2f 100644 --- a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/SpeechCapabilitiesTests.java +++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/SpeechCapabilitiesTests.java @@ -9,76 +9,74 @@ import java.util.Arrays; import java.util.List; /** - * This is a unit test class for the SmartDeviceLink library project class : + * This is a unit test class for the SmartDeviceLink library project class : * {@link com.smartdevicelink.proxy.rpc.enums.SpeechCapabilities} */ public class SpeechCapabilitiesTests extends TestCase { - /** - * Verifies that the enum values are not null upon valid assignment. - */ - public void testValidEnums () { - String example = "TEXT"; - SpeechCapabilities enumText = SpeechCapabilities.valueForString(example); - example = "SAPI_PHONEMES"; - SpeechCapabilities enumSapiPhonemes = SpeechCapabilities.valueForString(example); - example = "LHPLUS_PHONEMES"; - SpeechCapabilities enumLhplusPhonemes = SpeechCapabilities.valueForString(example); - example = "PRE_RECORDED"; - SpeechCapabilities enumPreRecorded = SpeechCapabilities.valueForString(example); - example = "SILENCE"; - SpeechCapabilities enumSilence = SpeechCapabilities.valueForString(example); - - assertNotNull("TEXT returned null", enumText); - assertNotNull("SAPI_PHONEMES returned null", enumSapiPhonemes); - assertNotNull("LHPLUS_PHONEMES returned null", enumLhplusPhonemes); - assertNotNull("PRE_RECORDED returned null", enumPreRecorded); - assertNotNull("SILENCE returned null", enumSilence); - } + /** + * Verifies that the enum values are not null upon valid assignment. + */ + public void testValidEnums() { + String example = "TEXT"; + SpeechCapabilities enumText = SpeechCapabilities.valueForString(example); + example = "SAPI_PHONEMES"; + SpeechCapabilities enumSapiPhonemes = SpeechCapabilities.valueForString(example); + example = "LHPLUS_PHONEMES"; + SpeechCapabilities enumLhplusPhonemes = SpeechCapabilities.valueForString(example); + example = "PRE_RECORDED"; + SpeechCapabilities enumPreRecorded = SpeechCapabilities.valueForString(example); + example = "SILENCE"; + SpeechCapabilities enumSilence = SpeechCapabilities.valueForString(example); - /** - * Verifies that an invalid assignment is null. - */ - public void testInvalidEnum () { - String example = "teXT"; - try { - SpeechCapabilities temp = SpeechCapabilities.valueForString(example); + assertNotNull("TEXT returned null", enumText); + assertNotNull("SAPI_PHONEMES returned null", enumSapiPhonemes); + assertNotNull("LHPLUS_PHONEMES returned null", enumLhplusPhonemes); + assertNotNull("PRE_RECORDED returned null", enumPreRecorded); + assertNotNull("SILENCE returned null", enumSilence); + } + + /** + * Verifies that an invalid assignment is null. + */ + public void testInvalidEnum() { + String example = "teXT"; + try { + SpeechCapabilities temp = SpeechCapabilities.valueForString(example); assertNull("Result of valueForString should be null.", temp); - } - catch (IllegalArgumentException exception) { + } catch (IllegalArgumentException exception) { fail("Invalid enum throws IllegalArgumentException."); - } - } + } + } - /** - * Verifies that a null assignment is invalid. - */ - public void testNullEnum () { - String example = null; - try { - SpeechCapabilities temp = SpeechCapabilities.valueForString(example); + /** + * Verifies that a null assignment is invalid. + */ + public void testNullEnum() { + String example = null; + try { + SpeechCapabilities temp = SpeechCapabilities.valueForString(example); assertNull("Result of valueForString should be null.", temp); - } - catch (NullPointerException exception) { + } catch (NullPointerException exception) { fail("Null string throws NullPointerException."); - } - } + } + } - /** - * Verifies the possible enum values of SpeechCapabilities. - */ - public void testListEnum() { - List<SpeechCapabilities> enumValueList = Arrays.asList(SpeechCapabilities.values()); + /** + * Verifies the possible enum values of SpeechCapabilities. + */ + public void testListEnum() { + List<SpeechCapabilities> enumValueList = Arrays.asList(SpeechCapabilities.values()); - List<SpeechCapabilities> enumTestList = new ArrayList<SpeechCapabilities>(); - enumTestList.add(SpeechCapabilities.TEXT); - enumTestList.add(SpeechCapabilities.SAPI_PHONEMES); - enumTestList.add(SpeechCapabilities.LHPLUS_PHONEMES); - enumTestList.add(SpeechCapabilities.PRE_RECORDED); - enumTestList.add(SpeechCapabilities.SILENCE); - enumTestList.add(SpeechCapabilities.FILE); + List<SpeechCapabilities> enumTestList = new ArrayList<SpeechCapabilities>(); + enumTestList.add(SpeechCapabilities.TEXT); + enumTestList.add(SpeechCapabilities.SAPI_PHONEMES); + enumTestList.add(SpeechCapabilities.LHPLUS_PHONEMES); + enumTestList.add(SpeechCapabilities.PRE_RECORDED); + enumTestList.add(SpeechCapabilities.SILENCE); + enumTestList.add(SpeechCapabilities.FILE); - assertTrue("Enum value list does not match enum class list", - enumValueList.containsAll(enumTestList) && enumTestList.containsAll(enumValueList)); - } + assertTrue("Enum value list does not match enum class list", + enumValueList.containsAll(enumTestList) && enumTestList.containsAll(enumValueList)); + } }
\ No newline at end of file diff --git a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/StaticIconNameTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/StaticIconNameTests.java index b85905039..e4c81deea 100644 --- a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/StaticIconNameTests.java +++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/StaticIconNameTests.java @@ -14,918 +14,916 @@ import java.util.List; */ public class StaticIconNameTests extends TestCase { - public void testValidEnums(){ - String example = "0x29"; - StaticIconName ACCEPT_CALL = StaticIconName.valueForString(example); - assertNotNull("ACCEPT_CALL returned null", ACCEPT_CALL); + public void testValidEnums() { + String example = "0x29"; + StaticIconName ACCEPT_CALL = StaticIconName.valueForString(example); + assertNotNull("ACCEPT_CALL returned null", ACCEPT_CALL); - example = "0x1B"; - StaticIconName ADD_WAYPOINT = StaticIconName.valueForString(example); - assertNotNull("ADD_WAYPOINT returned null", ADD_WAYPOINT); + example = "0x1B"; + StaticIconName ADD_WAYPOINT = StaticIconName.valueForString(example); + assertNotNull("ADD_WAYPOINT returned null", ADD_WAYPOINT); - example = "0x21"; - StaticIconName ALBUM = StaticIconName.valueForString(example); - assertNotNull("ALBUM returned null", ALBUM); + example = "0x21"; + StaticIconName ALBUM = StaticIconName.valueForString(example); + assertNotNull("ALBUM returned null", ALBUM); - example = "0x3d"; - StaticIconName AMBIENT_LIGHTING = StaticIconName.valueForString(example); - assertNotNull("AMBIENT_LIGHTING returned null", AMBIENT_LIGHTING); + example = "0x3d"; + StaticIconName AMBIENT_LIGHTING = StaticIconName.valueForString(example); + assertNotNull("AMBIENT_LIGHTING returned null", AMBIENT_LIGHTING); - example = "0x40"; - StaticIconName ARROW_NORTH = StaticIconName.valueForString(example); - assertNotNull("ARROW_NORTH returned null", ARROW_NORTH); + example = "0x40"; + StaticIconName ARROW_NORTH = StaticIconName.valueForString(example); + assertNotNull("ARROW_NORTH returned null", ARROW_NORTH); - example = "0x12"; - StaticIconName AUDIO_MUTE = StaticIconName.valueForString(example); - assertNotNull("AUDIO_MUTE returned null", AUDIO_MUTE); + example = "0x12"; + StaticIconName AUDIO_MUTE = StaticIconName.valueForString(example); + assertNotNull("AUDIO_MUTE returned null", AUDIO_MUTE); - example = "0x83"; - StaticIconName AUDIOBOOK_EPISODE = StaticIconName.valueForString(example); - assertNotNull("AUDIOBOOK_EPISODE returned null", AUDIOBOOK_EPISODE); + example = "0x83"; + StaticIconName AUDIOBOOK_EPISODE = StaticIconName.valueForString(example); + assertNotNull("AUDIOBOOK_EPISODE returned null", AUDIOBOOK_EPISODE); - example = "0x82"; - StaticIconName AUDIOBOOK_NARRATOR = StaticIconName.valueForString(example); - assertNotNull("AUDIOBOOK_NARRATOR returned null", AUDIOBOOK_NARRATOR); + example = "0x82"; + StaticIconName AUDIOBOOK_NARRATOR = StaticIconName.valueForString(example); + assertNotNull("AUDIOBOOK_NARRATOR returned null", AUDIOBOOK_NARRATOR); - example = "0x45"; - StaticIconName AUXILLARY_AUDIO = StaticIconName.valueForString(example); - assertNotNull("AUXILLARY_AUDIO returned null", AUXILLARY_AUDIO); + example = "0x45"; + StaticIconName AUXILLARY_AUDIO = StaticIconName.valueForString(example); + assertNotNull("AUXILLARY_AUDIO returned null", AUXILLARY_AUDIO); - example = "0x86"; - StaticIconName BACK = StaticIconName.valueForString(example); - assertNotNull("BACK returned null", BACK); + example = "0x86"; + StaticIconName BACK = StaticIconName.valueForString(example); + assertNotNull("BACK returned null", BACK); - example = "0xF7"; - StaticIconName BATTERY_CAPACITY_0_OF_5 = StaticIconName.valueForString(example); - assertNotNull("BATTERY_CAPACITY_0_OF_5 returned null", BATTERY_CAPACITY_0_OF_5); + example = "0xF7"; + StaticIconName BATTERY_CAPACITY_0_OF_5 = StaticIconName.valueForString(example); + assertNotNull("BATTERY_CAPACITY_0_OF_5 returned null", BATTERY_CAPACITY_0_OF_5); - example = "0xF8"; - StaticIconName BATTERY_CAPACITY_1_OF_5 = StaticIconName.valueForString(example); - assertNotNull("BATTERY_CAPACITY_1_OF_5 returned null", BATTERY_CAPACITY_1_OF_5); + example = "0xF8"; + StaticIconName BATTERY_CAPACITY_1_OF_5 = StaticIconName.valueForString(example); + assertNotNull("BATTERY_CAPACITY_1_OF_5 returned null", BATTERY_CAPACITY_1_OF_5); - example = "0xF9"; - StaticIconName BATTERY_CAPACITY_2_OF_5 = StaticIconName.valueForString(example); - assertNotNull("BATTERY_CAPACITY_2_OF_5 returned null", BATTERY_CAPACITY_2_OF_5); + example = "0xF9"; + StaticIconName BATTERY_CAPACITY_2_OF_5 = StaticIconName.valueForString(example); + assertNotNull("BATTERY_CAPACITY_2_OF_5 returned null", BATTERY_CAPACITY_2_OF_5); - example = "0xFA"; - StaticIconName BATTERY_CAPACITY_3_OF_5 = StaticIconName.valueForString(example); - assertNotNull("BATTERY_CAPACITY_3_OF_5 returned null", BATTERY_CAPACITY_3_OF_5); + example = "0xFA"; + StaticIconName BATTERY_CAPACITY_3_OF_5 = StaticIconName.valueForString(example); + assertNotNull("BATTERY_CAPACITY_3_OF_5 returned null", BATTERY_CAPACITY_3_OF_5); - example = "0xf6"; - StaticIconName BATTERY_CAPACITY_4_OF_5 = StaticIconName.valueForString(example); - assertNotNull("BATTERY_CAPACITY_4_OF_5 returned null", BATTERY_CAPACITY_4_OF_5); + example = "0xf6"; + StaticIconName BATTERY_CAPACITY_4_OF_5 = StaticIconName.valueForString(example); + assertNotNull("BATTERY_CAPACITY_4_OF_5 returned null", BATTERY_CAPACITY_4_OF_5); - example = "0xFB"; - StaticIconName BATTERY_CAPACITY_5_OF_5 = StaticIconName.valueForString(example); - assertNotNull("BATTERY_CAPACITY_5_OF_5 returned null", BATTERY_CAPACITY_5_OF_5); + example = "0xFB"; + StaticIconName BATTERY_CAPACITY_5_OF_5 = StaticIconName.valueForString(example); + assertNotNull("BATTERY_CAPACITY_5_OF_5 returned null", BATTERY_CAPACITY_5_OF_5); - example = "0x09"; - StaticIconName BLUETOOTH_AUDIO_SOURCE = StaticIconName.valueForString(example); - assertNotNull("BLUETOOTH_AUDIO_SOURCE returned null", BLUETOOTH_AUDIO_SOURCE); + example = "0x09"; + StaticIconName BLUETOOTH_AUDIO_SOURCE = StaticIconName.valueForString(example); + assertNotNull("BLUETOOTH_AUDIO_SOURCE returned null", BLUETOOTH_AUDIO_SOURCE); - example = "0xcc"; - StaticIconName BLUETOOTH1 = StaticIconName.valueForString(example); - assertNotNull("BLUETOOTH1 returned null", BLUETOOTH1); + example = "0xcc"; + StaticIconName BLUETOOTH1 = StaticIconName.valueForString(example); + assertNotNull("BLUETOOTH1 returned null", BLUETOOTH1); - example = "0xCD"; - StaticIconName BLUETOOTH2 = StaticIconName.valueForString(example); - assertNotNull("BLUETOOTH2 returned null", BLUETOOTH2); + example = "0xCD"; + StaticIconName BLUETOOTH2 = StaticIconName.valueForString(example); + assertNotNull("BLUETOOTH2 returned null", BLUETOOTH2); - example = "0x77"; - StaticIconName BROWSE = StaticIconName.valueForString(example); - assertNotNull("BROWSE returned null", BROWSE); + example = "0x77"; + StaticIconName BROWSE = StaticIconName.valueForString(example); + assertNotNull("BROWSE returned null", BROWSE); - example = "0x66"; - StaticIconName CELL_PHONE_IN_ROAMING_MODE = StaticIconName.valueForString(example); - assertNotNull("CELL_PHONE_IN_ROAMING_MODE returned null", CELL_PHONE_IN_ROAMING_MODE); + example = "0x66"; + StaticIconName CELL_PHONE_IN_ROAMING_MODE = StaticIconName.valueForString(example); + assertNotNull("CELL_PHONE_IN_ROAMING_MODE returned null", CELL_PHONE_IN_ROAMING_MODE); - example = "0x67"; - StaticIconName CELL_SERVICE_SIGNAL_STRENGTH_0_OF_5_BARS = StaticIconName.valueForString(example); - assertNotNull("CELL_SERVICE_SIGNAL_STRENGTH_0_OF_5_BARS returned null", CELL_SERVICE_SIGNAL_STRENGTH_0_OF_5_BARS); + example = "0x67"; + StaticIconName CELL_SERVICE_SIGNAL_STRENGTH_0_OF_5_BARS = StaticIconName.valueForString(example); + assertNotNull("CELL_SERVICE_SIGNAL_STRENGTH_0_OF_5_BARS returned null", CELL_SERVICE_SIGNAL_STRENGTH_0_OF_5_BARS); - example = "0x68"; - StaticIconName CELL_SERVICE_SIGNAL_STRENGTH_1_OF_5_BARS = StaticIconName.valueForString(example); - assertNotNull("CELL_SERVICE_SIGNAL_STRENGTH_1_OF_5_BARS returned null", CELL_SERVICE_SIGNAL_STRENGTH_1_OF_5_BARS); + example = "0x68"; + StaticIconName CELL_SERVICE_SIGNAL_STRENGTH_1_OF_5_BARS = StaticIconName.valueForString(example); + assertNotNull("CELL_SERVICE_SIGNAL_STRENGTH_1_OF_5_BARS returned null", CELL_SERVICE_SIGNAL_STRENGTH_1_OF_5_BARS); - example = "0x69"; - StaticIconName CELL_SERVICE_SIGNAL_STRENGTH_2_OF_5_BARS = StaticIconName.valueForString(example); - assertNotNull("CELL_SERVICE_SIGNAL_STRENGTH_2_OF_5_BARS returned null", CELL_SERVICE_SIGNAL_STRENGTH_2_OF_5_BARS); + example = "0x69"; + StaticIconName CELL_SERVICE_SIGNAL_STRENGTH_2_OF_5_BARS = StaticIconName.valueForString(example); + assertNotNull("CELL_SERVICE_SIGNAL_STRENGTH_2_OF_5_BARS returned null", CELL_SERVICE_SIGNAL_STRENGTH_2_OF_5_BARS); - example = "0x6A"; - StaticIconName CELL_SERVICE_SIGNAL_STRENGTH_3_OF_5_BARS = StaticIconName.valueForString(example); - assertNotNull("CELL_SERVICE_SIGNAL_STRENGTH_3_OF_5_BARS returned null", CELL_SERVICE_SIGNAL_STRENGTH_3_OF_5_BARS); + example = "0x6A"; + StaticIconName CELL_SERVICE_SIGNAL_STRENGTH_3_OF_5_BARS = StaticIconName.valueForString(example); + assertNotNull("CELL_SERVICE_SIGNAL_STRENGTH_3_OF_5_BARS returned null", CELL_SERVICE_SIGNAL_STRENGTH_3_OF_5_BARS); - example = "0x6B"; - StaticIconName CELL_SERVICE_SIGNAL_STRENGTH_4_OF_5_BARS = StaticIconName.valueForString(example); - assertNotNull("CELL_SERVICE_SIGNAL_STRENGTH_4_OF_5_BARS returned null", CELL_SERVICE_SIGNAL_STRENGTH_4_OF_5_BARS); + example = "0x6B"; + StaticIconName CELL_SERVICE_SIGNAL_STRENGTH_4_OF_5_BARS = StaticIconName.valueForString(example); + assertNotNull("CELL_SERVICE_SIGNAL_STRENGTH_4_OF_5_BARS returned null", CELL_SERVICE_SIGNAL_STRENGTH_4_OF_5_BARS); - example = "0xd3"; - StaticIconName CELL_SERVICE_SIGNAL_STRENGTH_5_OF_5_BARS = StaticIconName.valueForString(example); - assertNotNull("CELL_SERVICE_SIGNAL_STRENGTH_5_OF_5_BARS returned null", CELL_SERVICE_SIGNAL_STRENGTH_5_OF_5_BARS); + example = "0xd3"; + StaticIconName CELL_SERVICE_SIGNAL_STRENGTH_5_OF_5_BARS = StaticIconName.valueForString(example); + assertNotNull("CELL_SERVICE_SIGNAL_STRENGTH_5_OF_5_BARS returned null", CELL_SERVICE_SIGNAL_STRENGTH_5_OF_5_BARS); - example = "0xc3"; - StaticIconName CHANGE_LANE_LEFT = StaticIconName.valueForString(example); - assertNotNull("CHANGE_LANE_LEFT returned null", CHANGE_LANE_LEFT); + example = "0xc3"; + StaticIconName CHANGE_LANE_LEFT = StaticIconName.valueForString(example); + assertNotNull("CHANGE_LANE_LEFT returned null", CHANGE_LANE_LEFT); - example = "0xc1"; - StaticIconName CHANGE_LANE_RIGHT = StaticIconName.valueForString(example); - assertNotNull("CHANGE_LANE_RIGHT returned null", CHANGE_LANE_RIGHT); + example = "0xc1"; + StaticIconName CHANGE_LANE_RIGHT = StaticIconName.valueForString(example); + assertNotNull("CHANGE_LANE_RIGHT returned null", CHANGE_LANE_RIGHT); - example = "0x27"; - StaticIconName CHECK_BOX_CHECKED = StaticIconName.valueForString(example); - assertNotNull("CHECK_BOX_CHECKED returned null", CHECK_BOX_CHECKED); + example = "0x27"; + StaticIconName CHECK_BOX_CHECKED = StaticIconName.valueForString(example); + assertNotNull("CHECK_BOX_CHECKED returned null", CHECK_BOX_CHECKED); - example = "0x28"; - StaticIconName CHECK_BOX_UNCHECKED = StaticIconName.valueForString(example); - assertNotNull("CHECK_BOX_UNCHECKED returned null", CHECK_BOX_UNCHECKED); + example = "0x28"; + StaticIconName CHECK_BOX_UNCHECKED = StaticIconName.valueForString(example); + assertNotNull("CHECK_BOX_UNCHECKED returned null", CHECK_BOX_UNCHECKED); - example = "0xd1"; - StaticIconName CLIMATE = StaticIconName.valueForString(example); - assertNotNull("CLIMATE returned null", CLIMATE); + example = "0xd1"; + StaticIconName CLIMATE = StaticIconName.valueForString(example); + assertNotNull("CLIMATE returned null", CLIMATE); - example = "0xfc"; - StaticIconName CLOCK = StaticIconName.valueForString(example); - assertNotNull("CLOCK returned null", CLOCK); + example = "0xfc"; + StaticIconName CLOCK = StaticIconName.valueForString(example); + assertNotNull("CLOCK returned null", CLOCK); - example = "0x1A"; - StaticIconName COMPOSE = StaticIconName.valueForString(example); - assertNotNull("COMPOSE returned null", COMPOSE); + example = "0x1A"; + StaticIconName COMPOSE = StaticIconName.valueForString(example); + assertNotNull("COMPOSE returned null", COMPOSE); - example = "0x5C"; - StaticIconName CONTACT = StaticIconName.valueForString(example); - assertNotNull("CONTACT returned null", CONTACT); + example = "0x5C"; + StaticIconName CONTACT = StaticIconName.valueForString(example); + assertNotNull("CONTACT returned null", CONTACT); - example = "0x42"; - StaticIconName CONTINUE = StaticIconName.valueForString(example); - assertNotNull("CONTINUE returned null", CONTINUE); + example = "0x42"; + StaticIconName CONTINUE = StaticIconName.valueForString(example); + assertNotNull("CONTINUE returned null", CONTINUE); - example = "0x7F"; - StaticIconName DASH = StaticIconName.valueForString(example); - assertNotNull("DASH returned null", DASH); + example = "0x7F"; + StaticIconName DASH = StaticIconName.valueForString(example); + assertNotNull("DASH returned null", DASH); - example = "0x87"; - StaticIconName DATE = StaticIconName.valueForString(example); - assertNotNull("DATE returned null", DATE); + example = "0x87"; + StaticIconName DATE = StaticIconName.valueForString(example); + assertNotNull("DATE returned null", DATE); - example = "0x0F"; - StaticIconName DELETE = StaticIconName.valueForString(example); - assertNotNull("DELETE returned null", DELETE); + example = "0x0F"; + StaticIconName DELETE = StaticIconName.valueForString(example); + assertNotNull("DELETE returned null", DELETE); - example = "0x94"; - StaticIconName DESTINATION = StaticIconName.valueForString(example); - assertNotNull("DESTINATION returned null", DESTINATION); + example = "0x94"; + StaticIconName DESTINATION = StaticIconName.valueForString(example); + assertNotNull("DESTINATION returned null", DESTINATION); - example = "0x4D"; - StaticIconName DESTINATION_FERRY_AHEAD = StaticIconName.valueForString(example); - assertNotNull("DESTINATION_FERRY_AHEAD returned null", DESTINATION_FERRY_AHEAD); + example = "0x4D"; + StaticIconName DESTINATION_FERRY_AHEAD = StaticIconName.valueForString(example); + assertNotNull("DESTINATION_FERRY_AHEAD returned null", DESTINATION_FERRY_AHEAD); - example = "0x2B"; - StaticIconName EBOOKMARK = StaticIconName.valueForString(example); - assertNotNull("EBOOKMARK returned null", EBOOKMARK); + example = "0x2B"; + StaticIconName EBOOKMARK = StaticIconName.valueForString(example); + assertNotNull("EBOOKMARK returned null", EBOOKMARK); - example = "0x2C"; - StaticIconName END_CALL = StaticIconName.valueForString(example); - assertNotNull("END_CALL returned null", END_CALL); + example = "0x2C"; + StaticIconName END_CALL = StaticIconName.valueForString(example); + assertNotNull("END_CALL returned null", END_CALL); - example = "0xD6"; - StaticIconName FAIL = StaticIconName.valueForString(example); - assertNotNull("FAIL returned null", FAIL); + example = "0xD6"; + StaticIconName FAIL = StaticIconName.valueForString(example); + assertNotNull("FAIL returned null", FAIL); - example = "0x08"; - StaticIconName FAST_FORWARD_30_SECS = StaticIconName.valueForString(example); - assertNotNull("FAST_FORWARD_30_SECS returned null", FAST_FORWARD_30_SECS); + example = "0x08"; + StaticIconName FAST_FORWARD_30_SECS = StaticIconName.valueForString(example); + assertNotNull("FAST_FORWARD_30_SECS returned null", FAST_FORWARD_30_SECS); - example = "0x0E"; - StaticIconName FAVORITE_HEART = StaticIconName.valueForString(example); - assertNotNull("FAVORITE_HEART returned null", FAVORITE_HEART); + example = "0x0E"; + StaticIconName FAVORITE_HEART = StaticIconName.valueForString(example); + assertNotNull("FAVORITE_HEART returned null", FAVORITE_HEART); - example = "0x95"; - StaticIconName FAVORITE_STAR = StaticIconName.valueForString(example); - assertNotNull("FAVORITE_STAR returned null", FAVORITE_STAR); + example = "0x95"; + StaticIconName FAVORITE_STAR = StaticIconName.valueForString(example); + assertNotNull("FAVORITE_STAR returned null", FAVORITE_STAR); - example = "0x80"; - StaticIconName FAX_NUMBER = StaticIconName.valueForString(example); - assertNotNull("FAX_NUMBER returned null", FAX_NUMBER); + example = "0x80"; + StaticIconName FAX_NUMBER = StaticIconName.valueForString(example); + assertNotNull("FAX_NUMBER returned null", FAX_NUMBER); - example = "0x50"; - StaticIconName FILENAME = StaticIconName.valueForString(example); - assertNotNull("FILENAME returned null", FILENAME); + example = "0x50"; + StaticIconName FILENAME = StaticIconName.valueForString(example); + assertNotNull("FILENAME returned null", FILENAME); - example = "0x79"; - StaticIconName FILTER = StaticIconName.valueForString(example); - assertNotNull("FILTER returned null", FILTER); + example = "0x79"; + StaticIconName FILTER = StaticIconName.valueForString(example); + assertNotNull("FILTER returned null", FILTER); - example = "0x1C"; - StaticIconName FOLDER = StaticIconName.valueForString(example); - assertNotNull("FOLDER returned null", FOLDER); + example = "0x1C"; + StaticIconName FOLDER = StaticIconName.valueForString(example); + assertNotNull("FOLDER returned null", FOLDER); - example = "0xe9"; - StaticIconName FUEL_PRICES = StaticIconName.valueForString(example); - assertNotNull("FUEL_PRICES returned null", FUEL_PRICES); + example = "0xe9"; + StaticIconName FUEL_PRICES = StaticIconName.valueForString(example); + assertNotNull("FUEL_PRICES returned null", FUEL_PRICES); - example = "0x0c"; - StaticIconName FULL_MAP = StaticIconName.valueForString(example); - assertNotNull("FULL_MAP returned null", FULL_MAP); + example = "0x0c"; + StaticIconName FULL_MAP = StaticIconName.valueForString(example); + assertNotNull("FULL_MAP returned null", FULL_MAP); - example = "0x53"; - StaticIconName GENERIC_PHONE_NUMBER = StaticIconName.valueForString(example); - assertNotNull("GENERIC_PHONE_NUMBER returned null", GENERIC_PHONE_NUMBER); + example = "0x53"; + StaticIconName GENERIC_PHONE_NUMBER = StaticIconName.valueForString(example); + assertNotNull("GENERIC_PHONE_NUMBER returned null", GENERIC_PHONE_NUMBER); - example = "0x4E"; - StaticIconName GENRE = StaticIconName.valueForString(example); - assertNotNull("GENRE returned null", GENRE); + example = "0x4E"; + StaticIconName GENRE = StaticIconName.valueForString(example); + assertNotNull("GENRE returned null", GENRE); - example = "0xea"; - StaticIconName GLOBAL_KEYBOARD = StaticIconName.valueForString(example); - assertNotNull("GLOBAL_KEYBOARD returned null", GLOBAL_KEYBOARD); + example = "0xea"; + StaticIconName GLOBAL_KEYBOARD = StaticIconName.valueForString(example); + assertNotNull("GLOBAL_KEYBOARD returned null", GLOBAL_KEYBOARD); - example = "0xf4"; - StaticIconName HIGHWAY_EXIT_INFORMATION = StaticIconName.valueForString(example); - assertNotNull("HIGHWAY_EXIT_INFORMATION returned null", HIGHWAY_EXIT_INFORMATION); + example = "0xf4"; + StaticIconName HIGHWAY_EXIT_INFORMATION = StaticIconName.valueForString(example); + assertNotNull("HIGHWAY_EXIT_INFORMATION returned null", HIGHWAY_EXIT_INFORMATION); - example = "0x55"; - StaticIconName HOME_PHONE_NUMBER = StaticIconName.valueForString(example); - assertNotNull("HOME_PHONE_NUMBER returned null", HOME_PHONE_NUMBER); + example = "0x55"; + StaticIconName HOME_PHONE_NUMBER = StaticIconName.valueForString(example); + assertNotNull("HOME_PHONE_NUMBER returned null", HOME_PHONE_NUMBER); - example = "0x78"; - StaticIconName HYPERLINK = StaticIconName.valueForString(example); - assertNotNull("HYPERLINK returned null", HYPERLINK); + example = "0x78"; + StaticIconName HYPERLINK = StaticIconName.valueForString(example); + assertNotNull("HYPERLINK returned null", HYPERLINK); - example = "0x51"; - StaticIconName ID3_TAG_UNKNOWN = StaticIconName.valueForString(example); - assertNotNull("ID3_TAG_UNKNOWN returned null", ID3_TAG_UNKNOWN); + example = "0x51"; + StaticIconName ID3_TAG_UNKNOWN = StaticIconName.valueForString(example); + assertNotNull("ID3_TAG_UNKNOWN returned null", ID3_TAG_UNKNOWN); - example = "0x57"; - StaticIconName INCOMING_CALLS = StaticIconName.valueForString(example); - assertNotNull("INCOMING_CALLS returned null", INCOMING_CALLS); + example = "0x57"; + StaticIconName INCOMING_CALLS = StaticIconName.valueForString(example); + assertNotNull("INCOMING_CALLS returned null", INCOMING_CALLS); - example = "0x5d"; - StaticIconName INFORMATION = StaticIconName.valueForString(example); - assertNotNull("INFORMATION returned null", INFORMATION); + example = "0x5d"; + StaticIconName INFORMATION = StaticIconName.valueForString(example); + assertNotNull("INFORMATION returned null", INFORMATION); - example = "0x0D"; - StaticIconName IPOD_MEDIA_SOURCE = StaticIconName.valueForString(example); - assertNotNull("IPOD_MEDIA_SOURCE returned null", IPOD_MEDIA_SOURCE); + example = "0x0D"; + StaticIconName IPOD_MEDIA_SOURCE = StaticIconName.valueForString(example); + assertNotNull("IPOD_MEDIA_SOURCE returned null", IPOD_MEDIA_SOURCE); - example = "0x02"; - StaticIconName JOIN_CALLS = StaticIconName.valueForString(example); - assertNotNull("JOIN_CALLS returned null", JOIN_CALLS); + example = "0x02"; + StaticIconName JOIN_CALLS = StaticIconName.valueForString(example); + assertNotNull("JOIN_CALLS returned null", JOIN_CALLS); - example = "0x46"; - StaticIconName KEEP_LEFT = StaticIconName.valueForString(example); - assertNotNull("KEEP_LEFT returned null", KEEP_LEFT); + example = "0x46"; + StaticIconName KEEP_LEFT = StaticIconName.valueForString(example); + assertNotNull("KEEP_LEFT returned null", KEEP_LEFT); - example = "0x48"; - StaticIconName KEEP_RIGHT = StaticIconName.valueForString(example); - assertNotNull("KEEP_RIGHT returned null", KEEP_RIGHT); + example = "0x48"; + StaticIconName KEEP_RIGHT = StaticIconName.valueForString(example); + assertNotNull("KEEP_RIGHT returned null", KEEP_RIGHT); - example = "0x7D"; - StaticIconName KEY = StaticIconName.valueForString(example); - assertNotNull("KEY returned null", KEY); + example = "0x7D"; + StaticIconName KEY = StaticIconName.valueForString(example); + assertNotNull("KEY returned null", KEY); - example = "0x9f"; - StaticIconName LEFT = StaticIconName.valueForString(example); - assertNotNull("LEFT returned null", LEFT); + example = "0x9f"; + StaticIconName LEFT = StaticIconName.valueForString(example); + assertNotNull("LEFT returned null", LEFT); - example = "0x4B"; - StaticIconName LEFT_ARROW = StaticIconName.valueForString(example); - assertNotNull("LEFT_ARROW returned null", LEFT_ARROW); + example = "0x4B"; + StaticIconName LEFT_ARROW = StaticIconName.valueForString(example); + assertNotNull("LEFT_ARROW returned null", LEFT_ARROW); - example = "0xaf"; - StaticIconName LEFT_EXIT = StaticIconName.valueForString(example); - assertNotNull("LEFT_EXIT returned null", LEFT_EXIT); + example = "0xaf"; + StaticIconName LEFT_EXIT = StaticIconName.valueForString(example); + assertNotNull("LEFT_EXIT returned null", LEFT_EXIT); - example = "0x06"; - StaticIconName LINE_IN_AUDIO_SOURCE = StaticIconName.valueForString(example); - assertNotNull("LINE_IN_AUDIO_SOURCE returned null", LINE_IN_AUDIO_SOURCE); + example = "0x06"; + StaticIconName LINE_IN_AUDIO_SOURCE = StaticIconName.valueForString(example); + assertNotNull("LINE_IN_AUDIO_SOURCE returned null", LINE_IN_AUDIO_SOURCE); - example = "0x22"; - StaticIconName LOCKED = StaticIconName.valueForString(example); - assertNotNull("LOCKED returned null", LOCKED); + example = "0x22"; + StaticIconName LOCKED = StaticIconName.valueForString(example); + assertNotNull("LOCKED returned null", LOCKED); - example = "0x17"; - StaticIconName MEDIA_CONTROL_LEFT_ARROW = StaticIconName.valueForString(example); - assertNotNull("MEDIA_CONTROL_LEFT_ARROW returned null", MEDIA_CONTROL_LEFT_ARROW); + example = "0x17"; + StaticIconName MEDIA_CONTROL_LEFT_ARROW = StaticIconName.valueForString(example); + assertNotNull("MEDIA_CONTROL_LEFT_ARROW returned null", MEDIA_CONTROL_LEFT_ARROW); - example = "0x20"; - StaticIconName MEDIA_CONTROL_RECORDING = StaticIconName.valueForString(example); - assertNotNull("MEDIA_CONTROL_RECORDING returned null", MEDIA_CONTROL_RECORDING); + example = "0x20"; + StaticIconName MEDIA_CONTROL_RECORDING = StaticIconName.valueForString(example); + assertNotNull("MEDIA_CONTROL_RECORDING returned null", MEDIA_CONTROL_RECORDING); - example = "0x15"; - StaticIconName MEDIA_CONTROL_RIGHT_ARROW = StaticIconName.valueForString(example); - assertNotNull("MEDIA_CONTROL_RIGHT_ARROW returned null", MEDIA_CONTROL_RIGHT_ARROW); + example = "0x15"; + StaticIconName MEDIA_CONTROL_RIGHT_ARROW = StaticIconName.valueForString(example); + assertNotNull("MEDIA_CONTROL_RIGHT_ARROW returned null", MEDIA_CONTROL_RIGHT_ARROW); - example = "0x16"; - StaticIconName MEDIA_CONTROL_STOP = StaticIconName.valueForString(example); - assertNotNull("MEDIA_CONTROL_STOP returned null", MEDIA_CONTROL_STOP); + example = "0x16"; + StaticIconName MEDIA_CONTROL_STOP = StaticIconName.valueForString(example); + assertNotNull("MEDIA_CONTROL_STOP returned null", MEDIA_CONTROL_STOP); - example = "0xe8"; - StaticIconName MICROPHONE = StaticIconName.valueForString(example); - assertNotNull("MICROPHONE returned null", MICROPHONE); + example = "0xe8"; + StaticIconName MICROPHONE = StaticIconName.valueForString(example); + assertNotNull("MICROPHONE returned null", MICROPHONE); - example = "0x58"; - StaticIconName MISSED_CALLS = StaticIconName.valueForString(example); - assertNotNull("MISSED_CALLS returned null", MISSED_CALLS); + example = "0x58"; + StaticIconName MISSED_CALLS = StaticIconName.valueForString(example); + assertNotNull("MISSED_CALLS returned null", MISSED_CALLS); - example = "0x54"; - StaticIconName MOBILE_PHONE_NUMBER = StaticIconName.valueForString(example); - assertNotNull("MOBILE_PHONE_NUMBER returned null", MOBILE_PHONE_NUMBER); + example = "0x54"; + StaticIconName MOBILE_PHONE_NUMBER = StaticIconName.valueForString(example); + assertNotNull("MOBILE_PHONE_NUMBER returned null", MOBILE_PHONE_NUMBER); - example = "0xE5"; - StaticIconName MOVE_DOWN = StaticIconName.valueForString(example); - assertNotNull("MOVE_DOWN returned null", MOVE_DOWN); + example = "0xE5"; + StaticIconName MOVE_DOWN = StaticIconName.valueForString(example); + assertNotNull("MOVE_DOWN returned null", MOVE_DOWN); - example = "0xe4"; - StaticIconName MOVE_UP = StaticIconName.valueForString(example); - assertNotNull("MOVE_UP returned null", MOVE_UP); + example = "0xe4"; + StaticIconName MOVE_UP = StaticIconName.valueForString(example); + assertNotNull("MOVE_UP returned null", MOVE_UP); - example = "0x24"; - StaticIconName MP3_TAG_ARTIST = StaticIconName.valueForString(example); - assertNotNull("MP3_TAG_ARTIST returned null", MP3_TAG_ARTIST); + example = "0x24"; + StaticIconName MP3_TAG_ARTIST = StaticIconName.valueForString(example); + assertNotNull("MP3_TAG_ARTIST returned null", MP3_TAG_ARTIST); - example = "0x8e"; - StaticIconName NAVIGATION = StaticIconName.valueForString(example); - assertNotNull("NAVIGATION returned null", NAVIGATION); + example = "0x8e"; + StaticIconName NAVIGATION = StaticIconName.valueForString(example); + assertNotNull("NAVIGATION returned null", NAVIGATION); - example = "0x0a"; - StaticIconName NAVIGATION_CURRENT_DIRECTION = StaticIconName.valueForString(example); - assertNotNull("NAVIGATION_CURRENT_DIRECTION returned null", NAVIGATION_CURRENT_DIRECTION); + example = "0x0a"; + StaticIconName NAVIGATION_CURRENT_DIRECTION = StaticIconName.valueForString(example); + assertNotNull("NAVIGATION_CURRENT_DIRECTION returned null", NAVIGATION_CURRENT_DIRECTION); - example = "0x14"; - StaticIconName NEGATIVE_RATING_THUMBS_DOWN = StaticIconName.valueForString(example); - assertNotNull("NEGATIVE_RATING_THUMBS_DOWN returned null", NEGATIVE_RATING_THUMBS_DOWN); + example = "0x14"; + StaticIconName NEGATIVE_RATING_THUMBS_DOWN = StaticIconName.valueForString(example); + assertNotNull("NEGATIVE_RATING_THUMBS_DOWN returned null", NEGATIVE_RATING_THUMBS_DOWN); - example = "0x5E"; - StaticIconName NEW = StaticIconName.valueForString(example); - assertNotNull("NEW returned null", NEW); + example = "0x5E"; + StaticIconName NEW = StaticIconName.valueForString(example); + assertNotNull("NEW returned null", NEW); - example = "0x56"; - StaticIconName OFFICE_PHONE_NUMBER = StaticIconName.valueForString(example); - assertNotNull("OFFICE_PHONE_NUMBER returned null", OFFICE_PHONE_NUMBER); + example = "0x56"; + StaticIconName OFFICE_PHONE_NUMBER = StaticIconName.valueForString(example); + assertNotNull("OFFICE_PHONE_NUMBER returned null", OFFICE_PHONE_NUMBER); - example = "0x5F"; - StaticIconName OPENED = StaticIconName.valueForString(example); - assertNotNull("OPENED returned null", OPENED); + example = "0x5F"; + StaticIconName OPENED = StaticIconName.valueForString(example); + assertNotNull("OPENED returned null", OPENED); - example = "0x96"; - StaticIconName ORIGIN = StaticIconName.valueForString(example); - assertNotNull("ORIGIN returned null", ORIGIN); + example = "0x96"; + StaticIconName ORIGIN = StaticIconName.valueForString(example); + assertNotNull("ORIGIN returned null", ORIGIN); - example = "0x59"; - StaticIconName OUTGOING_CALLS = StaticIconName.valueForString(example); - assertNotNull("OUTGOING_CALLS returned null", OUTGOING_CALLS); + example = "0x59"; + StaticIconName OUTGOING_CALLS = StaticIconName.valueForString(example); + assertNotNull("OUTGOING_CALLS returned null", OUTGOING_CALLS); - example = "0x1D"; - StaticIconName PHONE_CALL_1 = StaticIconName.valueForString(example); - assertNotNull("PHONE_CALL_1 returned null", PHONE_CALL_1); + example = "0x1D"; + StaticIconName PHONE_CALL_1 = StaticIconName.valueForString(example); + assertNotNull("PHONE_CALL_1 returned null", PHONE_CALL_1); - example = "0x1E"; - StaticIconName PHONE_CALL_2 = StaticIconName.valueForString(example); - assertNotNull("PHONE_CALL_2 returned null", PHONE_CALL_2); + example = "0x1E"; + StaticIconName PHONE_CALL_2 = StaticIconName.valueForString(example); + assertNotNull("PHONE_CALL_2 returned null", PHONE_CALL_2); - example = "0x03"; - StaticIconName PHONE_DEVICE = StaticIconName.valueForString(example); - assertNotNull("PHONE_DEVICE returned null", PHONE_DEVICE); + example = "0x03"; + StaticIconName PHONE_DEVICE = StaticIconName.valueForString(example); + assertNotNull("PHONE_DEVICE returned null", PHONE_DEVICE); - example = "0x81"; - StaticIconName PHONEBOOK = StaticIconName.valueForString(example); - assertNotNull("PHONEBOOK returned null", PHONEBOOK); + example = "0x81"; + StaticIconName PHONEBOOK = StaticIconName.valueForString(example); + assertNotNull("PHONEBOOK returned null", PHONEBOOK); - example = "0x88"; - StaticIconName PHOTO = StaticIconName.valueForString(example); - assertNotNull("PHOTO returned null", PHOTO); + example = "0x88"; + StaticIconName PHOTO = StaticIconName.valueForString(example); + assertNotNull("PHOTO returned null", PHOTO); - example = "0xD0"; - StaticIconName PLAY = StaticIconName.valueForString(example); - assertNotNull("PLAY returned null", PLAY); + example = "0xD0"; + StaticIconName PLAY = StaticIconName.valueForString(example); + assertNotNull("PLAY returned null", PLAY); - example = "0x4F"; - StaticIconName PLAYLIST = StaticIconName.valueForString(example); - assertNotNull("PLAYLIST returned null", PLAYLIST); + example = "0x4F"; + StaticIconName PLAYLIST = StaticIconName.valueForString(example); + assertNotNull("PLAYLIST returned null", PLAYLIST); - example = "0x76"; - StaticIconName POPUP = StaticIconName.valueForString(example); - assertNotNull("POPUP returned null", POPUP); + example = "0x76"; + StaticIconName POPUP = StaticIconName.valueForString(example); + assertNotNull("POPUP returned null", POPUP); - example = "0x13"; - StaticIconName POSITIVE_RATING_THUMBS_UP = StaticIconName.valueForString(example); - assertNotNull("POSITIVE_RATING_THUMBS_UP returned null", POSITIVE_RATING_THUMBS_UP); + example = "0x13"; + StaticIconName POSITIVE_RATING_THUMBS_UP = StaticIconName.valueForString(example); + assertNotNull("POSITIVE_RATING_THUMBS_UP returned null", POSITIVE_RATING_THUMBS_UP); - example = "0x5b"; - StaticIconName POWER = StaticIconName.valueForString(example); - assertNotNull("POWER returned null", POWER); + example = "0x5b"; + StaticIconName POWER = StaticIconName.valueForString(example); + assertNotNull("POWER returned null", POWER); - example = "0x1F"; - StaticIconName PRIMARY_PHONE = StaticIconName.valueForString(example); - assertNotNull("PRIMARY_PHONE returned null", PRIMARY_PHONE); + example = "0x1F"; + StaticIconName PRIMARY_PHONE = StaticIconName.valueForString(example); + assertNotNull("PRIMARY_PHONE returned null", PRIMARY_PHONE); - example = "0x25"; - StaticIconName RADIO_BUTTON_CHECKED = StaticIconName.valueForString(example); - assertNotNull("RADIO_BUTTON_CHECKED returned null", RADIO_BUTTON_CHECKED); + example = "0x25"; + StaticIconName RADIO_BUTTON_CHECKED = StaticIconName.valueForString(example); + assertNotNull("RADIO_BUTTON_CHECKED returned null", RADIO_BUTTON_CHECKED); - example = "0x26"; - StaticIconName RADIO_BUTTON_UNCHECKED = StaticIconName.valueForString(example); - assertNotNull("RADIO_BUTTON_UNCHECKED returned null", RADIO_BUTTON_UNCHECKED); + example = "0x26"; + StaticIconName RADIO_BUTTON_UNCHECKED = StaticIconName.valueForString(example); + assertNotNull("RADIO_BUTTON_UNCHECKED returned null", RADIO_BUTTON_UNCHECKED); - example = "0xe7"; - StaticIconName RECENT_CALLS = StaticIconName.valueForString(example); - assertNotNull("RECENT_CALLS returned null", RECENT_CALLS); + example = "0xe7"; + StaticIconName RECENT_CALLS = StaticIconName.valueForString(example); + assertNotNull("RECENT_CALLS returned null", RECENT_CALLS); - example = "0xf2"; - StaticIconName RECENT_DESTINATIONS = StaticIconName.valueForString(example); - assertNotNull("RECENT_DESTINATIONS returned null", RECENT_DESTINATIONS); + example = "0xf2"; + StaticIconName RECENT_DESTINATIONS = StaticIconName.valueForString(example); + assertNotNull("RECENT_DESTINATIONS returned null", RECENT_DESTINATIONS); - example = "0x19"; - StaticIconName REDO = StaticIconName.valueForString(example); - assertNotNull("REDO returned null", REDO); + example = "0x19"; + StaticIconName REDO = StaticIconName.valueForString(example); + assertNotNull("REDO returned null", REDO); - example = "0x97"; - StaticIconName REFRESH = StaticIconName.valueForString(example); - assertNotNull("REFRESH returned null", REFRESH); + example = "0x97"; + StaticIconName REFRESH = StaticIconName.valueForString(example); + assertNotNull("REFRESH returned null", REFRESH); - example = "0x7E"; - StaticIconName REMOTE_DIAGNOSTICS_CHECK_ENGINE = StaticIconName.valueForString(example); - assertNotNull("REMOTE_DIAGNOSTICS_CHECK_ENGINE returned null", REMOTE_DIAGNOSTICS_CHECK_ENGINE); + example = "0x7E"; + StaticIconName REMOTE_DIAGNOSTICS_CHECK_ENGINE = StaticIconName.valueForString(example); + assertNotNull("REMOTE_DIAGNOSTICS_CHECK_ENGINE returned null", REMOTE_DIAGNOSTICS_CHECK_ENGINE); - example = "0xac"; - StaticIconName RENDERED_911_ASSIST = StaticIconName.valueForString(example); - assertNotNull("RENDERED_911_ASSIST returned null", RENDERED_911_ASSIST); + example = "0xac"; + StaticIconName RENDERED_911_ASSIST = StaticIconName.valueForString(example); + assertNotNull("RENDERED_911_ASSIST returned null", RENDERED_911_ASSIST); - example = "0xe6"; - StaticIconName REPEAT = StaticIconName.valueForString(example); - assertNotNull("REPEAT returned null", REPEAT); + example = "0xe6"; + StaticIconName REPEAT = StaticIconName.valueForString(example); + assertNotNull("REPEAT returned null", REPEAT); - example = "0x73"; - StaticIconName REPEAT_PLAY = StaticIconName.valueForString(example); - assertNotNull("REPEAT_PLAY returned null", REPEAT_PLAY); + example = "0x73"; + StaticIconName REPEAT_PLAY = StaticIconName.valueForString(example); + assertNotNull("REPEAT_PLAY returned null", REPEAT_PLAY); - example = "0x04"; - StaticIconName REPLY = StaticIconName.valueForString(example); - assertNotNull("REPLY returned null", REPLY); + example = "0x04"; + StaticIconName REPLY = StaticIconName.valueForString(example); + assertNotNull("REPLY returned null", REPLY); - example = "0x07"; - StaticIconName REWIND_30_SECS = StaticIconName.valueForString(example); - assertNotNull("REWIND_30_SECS returned null", REWIND_30_SECS); + example = "0x07"; + StaticIconName REWIND_30_SECS = StaticIconName.valueForString(example); + assertNotNull("REWIND_30_SECS returned null", REWIND_30_SECS); - example = "0xa3"; - StaticIconName RIGHT = StaticIconName.valueForString(example); - assertNotNull("RIGHT returned null", RIGHT); + example = "0xa3"; + StaticIconName RIGHT = StaticIconName.valueForString(example); + assertNotNull("RIGHT returned null", RIGHT); - example = "0xb1"; - StaticIconName RIGHT_EXIT = StaticIconName.valueForString(example); - assertNotNull("RIGHT_EXIT returned null", RIGHT_EXIT); + example = "0xb1"; + StaticIconName RIGHT_EXIT = StaticIconName.valueForString(example); + assertNotNull("RIGHT_EXIT returned null", RIGHT_EXIT); - example = "0x5A"; - StaticIconName RINGTONES = StaticIconName.valueForString(example); - assertNotNull("RINGTONES returned null", RINGTONES); + example = "0x5A"; + StaticIconName RINGTONES = StaticIconName.valueForString(example); + assertNotNull("RINGTONES returned null", RINGTONES); - example = "0xee"; - StaticIconName ROUNDABOUT_LEFT_HAND_1 = StaticIconName.valueForString(example); - assertNotNull("ROUNDABOUT_LEFT_HAND_1 returned null", ROUNDABOUT_LEFT_HAND_1); + example = "0xee"; + StaticIconName ROUNDABOUT_LEFT_HAND_1 = StaticIconName.valueForString(example); + assertNotNull("ROUNDABOUT_LEFT_HAND_1 returned null", ROUNDABOUT_LEFT_HAND_1); - example = "0x8c"; - StaticIconName ROUNDABOUT_LEFT_HAND_2 = StaticIconName.valueForString(example); - assertNotNull("ROUNDABOUT_LEFT_HAND_2 returned null", ROUNDABOUT_LEFT_HAND_2); + example = "0x8c"; + StaticIconName ROUNDABOUT_LEFT_HAND_2 = StaticIconName.valueForString(example); + assertNotNull("ROUNDABOUT_LEFT_HAND_2 returned null", ROUNDABOUT_LEFT_HAND_2); - example = "0x84"; - StaticIconName ROUNDABOUT_LEFT_HAND_3 = StaticIconName.valueForString(example); - assertNotNull("ROUNDABOUT_LEFT_HAND_3 returned null", ROUNDABOUT_LEFT_HAND_3); + example = "0x84"; + StaticIconName ROUNDABOUT_LEFT_HAND_3 = StaticIconName.valueForString(example); + assertNotNull("ROUNDABOUT_LEFT_HAND_3 returned null", ROUNDABOUT_LEFT_HAND_3); - example = "0x72"; - StaticIconName ROUNDABOUT_LEFT_HAND_4 = StaticIconName.valueForString(example); - assertNotNull("ROUNDABOUT_LEFT_HAND_4 returned null", ROUNDABOUT_LEFT_HAND_4); + example = "0x72"; + StaticIconName ROUNDABOUT_LEFT_HAND_4 = StaticIconName.valueForString(example); + assertNotNull("ROUNDABOUT_LEFT_HAND_4 returned null", ROUNDABOUT_LEFT_HAND_4); - example = "0x6e"; - StaticIconName ROUNDABOUT_LEFT_HAND_5 = StaticIconName.valueForString(example); - assertNotNull("ROUNDABOUT_LEFT_HAND_5 returned null", ROUNDABOUT_LEFT_HAND_5); + example = "0x6e"; + StaticIconName ROUNDABOUT_LEFT_HAND_5 = StaticIconName.valueForString(example); + assertNotNull("ROUNDABOUT_LEFT_HAND_5 returned null", ROUNDABOUT_LEFT_HAND_5); - example = "0x64"; - StaticIconName ROUNDABOUT_LEFT_HAND_6 = StaticIconName.valueForString(example); - assertNotNull("ROUNDABOUT_LEFT_HAND_6 returned null", ROUNDABOUT_LEFT_HAND_6); + example = "0x64"; + StaticIconName ROUNDABOUT_LEFT_HAND_6 = StaticIconName.valueForString(example); + assertNotNull("ROUNDABOUT_LEFT_HAND_6 returned null", ROUNDABOUT_LEFT_HAND_6); - example = "0x60"; - StaticIconName ROUNDABOUT_LEFT_HAND_7 = StaticIconName.valueForString(example); - assertNotNull("ROUNDABOUT_LEFT_HAND_7 returned null", ROUNDABOUT_LEFT_HAND_7); + example = "0x60"; + StaticIconName ROUNDABOUT_LEFT_HAND_7 = StaticIconName.valueForString(example); + assertNotNull("ROUNDABOUT_LEFT_HAND_7 returned null", ROUNDABOUT_LEFT_HAND_7); - example = "0x62"; - StaticIconName ROUNDABOUT_RIGHT_HAND_1 = StaticIconName.valueForString(example); - assertNotNull("ROUNDABOUT_RIGHT_HAND_1 returned null", ROUNDABOUT_RIGHT_HAND_1); + example = "0x62"; + StaticIconName ROUNDABOUT_RIGHT_HAND_1 = StaticIconName.valueForString(example); + assertNotNull("ROUNDABOUT_RIGHT_HAND_1 returned null", ROUNDABOUT_RIGHT_HAND_1); - example = "0x6c"; - StaticIconName ROUNDABOUT_RIGHT_HAND_2 = StaticIconName.valueForString(example); - assertNotNull("ROUNDABOUT_RIGHT_HAND_2 returned null", ROUNDABOUT_RIGHT_HAND_2); + example = "0x6c"; + StaticIconName ROUNDABOUT_RIGHT_HAND_2 = StaticIconName.valueForString(example); + assertNotNull("ROUNDABOUT_RIGHT_HAND_2 returned null", ROUNDABOUT_RIGHT_HAND_2); - example = "0x70"; - StaticIconName ROUNDABOUT_RIGHT_HAND_3 = StaticIconName.valueForString(example); - assertNotNull("ROUNDABOUT_RIGHT_HAND_3 returned null", ROUNDABOUT_RIGHT_HAND_3); + example = "0x70"; + StaticIconName ROUNDABOUT_RIGHT_HAND_3 = StaticIconName.valueForString(example); + assertNotNull("ROUNDABOUT_RIGHT_HAND_3 returned null", ROUNDABOUT_RIGHT_HAND_3); - example = "0x7a"; - StaticIconName ROUNDABOUT_RIGHT_HAND_4 = StaticIconName.valueForString(example); - assertNotNull("ROUNDABOUT_RIGHT_HAND_4 returned null", ROUNDABOUT_RIGHT_HAND_4); + example = "0x7a"; + StaticIconName ROUNDABOUT_RIGHT_HAND_4 = StaticIconName.valueForString(example); + assertNotNull("ROUNDABOUT_RIGHT_HAND_4 returned null", ROUNDABOUT_RIGHT_HAND_4); - example = "0x8a"; - StaticIconName ROUNDABOUT_RIGHT_HAND_5 = StaticIconName.valueForString(example); - assertNotNull("ROUNDABOUT_RIGHT_HAND_5 returned null", ROUNDABOUT_RIGHT_HAND_5); + example = "0x8a"; + StaticIconName ROUNDABOUT_RIGHT_HAND_5 = StaticIconName.valueForString(example); + assertNotNull("ROUNDABOUT_RIGHT_HAND_5 returned null", ROUNDABOUT_RIGHT_HAND_5); - example = "0xec"; - StaticIconName ROUNDABOUT_RIGHT_HAND_6 = StaticIconName.valueForString(example); - assertNotNull("ROUNDABOUT_RIGHT_HAND_6 returned null", ROUNDABOUT_RIGHT_HAND_6); + example = "0xec"; + StaticIconName ROUNDABOUT_RIGHT_HAND_6 = StaticIconName.valueForString(example); + assertNotNull("ROUNDABOUT_RIGHT_HAND_6 returned null", ROUNDABOUT_RIGHT_HAND_6); - example = "0xf0"; - StaticIconName ROUNDABOUT_RIGHT_HAND_7 = StaticIconName.valueForString(example); - assertNotNull("ROUNDABOUT_RIGHT_HAND_7 returned null", ROUNDABOUT_RIGHT_HAND_7); + example = "0xf0"; + StaticIconName ROUNDABOUT_RIGHT_HAND_7 = StaticIconName.valueForString(example); + assertNotNull("ROUNDABOUT_RIGHT_HAND_7 returned null", ROUNDABOUT_RIGHT_HAND_7); - example = "0x89"; - StaticIconName RSS = StaticIconName.valueForString(example); - assertNotNull("RSS returned null", RSS); + example = "0x89"; + StaticIconName RSS = StaticIconName.valueForString(example); + assertNotNull("RSS returned null", RSS); - example = "0x49"; - StaticIconName SETTINGS = StaticIconName.valueForString(example); - assertNotNull("SETTINGS returned null", SETTINGS); + example = "0x49"; + StaticIconName SETTINGS = StaticIconName.valueForString(example); + assertNotNull("SETTINGS returned null", SETTINGS); - example = "0xa5"; - StaticIconName SHARP_LEFT = StaticIconName.valueForString(example); - assertNotNull("SHARP_LEFT returned null", SHARP_LEFT); + example = "0xa5"; + StaticIconName SHARP_LEFT = StaticIconName.valueForString(example); + assertNotNull("SHARP_LEFT returned null", SHARP_LEFT); - example = "0xe1"; - StaticIconName SHOW = StaticIconName.valueForString(example); - assertNotNull("SHOW returned null", SHOW); + example = "0xe1"; + StaticIconName SHOW = StaticIconName.valueForString(example); + assertNotNull("SHOW returned null", SHOW); - example = "0x74"; - StaticIconName SHUFFLE_PLAY = StaticIconName.valueForString(example); - assertNotNull("SHUFFLE_PLAY returned null", SHUFFLE_PLAY); + example = "0x74"; + StaticIconName SHUFFLE_PLAY = StaticIconName.valueForString(example); + assertNotNull("SHUFFLE_PLAY returned null", SHUFFLE_PLAY); - example = "0xab"; - StaticIconName SKI_PLACES = StaticIconName.valueForString(example); - assertNotNull("SKI_PLACES returned null", SKI_PLACES); + example = "0xab"; + StaticIconName SKI_PLACES = StaticIconName.valueForString(example); + assertNotNull("SKI_PLACES returned null", SKI_PLACES); - example = "0x9d"; - StaticIconName SLIGHT_LEFT = StaticIconName.valueForString(example); - assertNotNull("SLIGHT_LEFT returned null", SLIGHT_LEFT); + example = "0x9d"; + StaticIconName SLIGHT_LEFT = StaticIconName.valueForString(example); + assertNotNull("SLIGHT_LEFT returned null", SLIGHT_LEFT); - example = "0xa1"; - StaticIconName SLIGHT_RIGHT = StaticIconName.valueForString(example); - assertNotNull("SLIGHT_RIGHT returned null", SLIGHT_RIGHT); + example = "0xa1"; + StaticIconName SLIGHT_RIGHT = StaticIconName.valueForString(example); + assertNotNull("SLIGHT_RIGHT returned null", SLIGHT_RIGHT); - example = "0x05"; - StaticIconName SMARTPHONE = StaticIconName.valueForString(example); - assertNotNull("SMARTPHONE returned null", SMARTPHONE); + example = "0x05"; + StaticIconName SMARTPHONE = StaticIconName.valueForString(example); + assertNotNull("SMARTPHONE returned null", SMARTPHONE); - example = "0x7B"; - StaticIconName SORT_LIST = StaticIconName.valueForString(example); - assertNotNull("SORT_LIST returned null", SORT_LIST); + example = "0x7B"; + StaticIconName SORT_LIST = StaticIconName.valueForString(example); + assertNotNull("SORT_LIST returned null", SORT_LIST); - example = "0xE0"; - StaticIconName SPEED_DIAL_NUMBERS_NUMBER_0 = StaticIconName.valueForString(example); - assertNotNull("SPEED_DIAL_NUMBERS_NUMBER_0 returned null", SPEED_DIAL_NUMBERS_NUMBER_0); + example = "0xE0"; + StaticIconName SPEED_DIAL_NUMBERS_NUMBER_0 = StaticIconName.valueForString(example); + assertNotNull("SPEED_DIAL_NUMBERS_NUMBER_0 returned null", SPEED_DIAL_NUMBERS_NUMBER_0); - example = "0xD7"; - StaticIconName SPEED_DIAL_NUMBERS_NUMBER_1 = StaticIconName.valueForString(example); - assertNotNull("SPEED_DIAL_NUMBERS_NUMBER_1 returned null", SPEED_DIAL_NUMBERS_NUMBER_1); + example = "0xD7"; + StaticIconName SPEED_DIAL_NUMBERS_NUMBER_1 = StaticIconName.valueForString(example); + assertNotNull("SPEED_DIAL_NUMBERS_NUMBER_1 returned null", SPEED_DIAL_NUMBERS_NUMBER_1); - example = "0xD8"; - StaticIconName SPEED_DIAL_NUMBERS_NUMBER_2 = StaticIconName.valueForString(example); - assertNotNull("SPEED_DIAL_NUMBERS_NUMBER_2 returned null", SPEED_DIAL_NUMBERS_NUMBER_2); + example = "0xD8"; + StaticIconName SPEED_DIAL_NUMBERS_NUMBER_2 = StaticIconName.valueForString(example); + assertNotNull("SPEED_DIAL_NUMBERS_NUMBER_2 returned null", SPEED_DIAL_NUMBERS_NUMBER_2); - example = "0xD9"; - StaticIconName SPEED_DIAL_NUMBERS_NUMBER_3 = StaticIconName.valueForString(example); - assertNotNull("SPEED_DIAL_NUMBERS_NUMBER_3 returned null", SPEED_DIAL_NUMBERS_NUMBER_3); + example = "0xD9"; + StaticIconName SPEED_DIAL_NUMBERS_NUMBER_3 = StaticIconName.valueForString(example); + assertNotNull("SPEED_DIAL_NUMBERS_NUMBER_3 returned null", SPEED_DIAL_NUMBERS_NUMBER_3); - example = "0xDA"; - StaticIconName SPEED_DIAL_NUMBERS_NUMBER_4 = StaticIconName.valueForString(example); - assertNotNull("SPEED_DIAL_NUMBERS_NUMBER_4 returned null", SPEED_DIAL_NUMBERS_NUMBER_4); + example = "0xDA"; + StaticIconName SPEED_DIAL_NUMBERS_NUMBER_4 = StaticIconName.valueForString(example); + assertNotNull("SPEED_DIAL_NUMBERS_NUMBER_4 returned null", SPEED_DIAL_NUMBERS_NUMBER_4); - example = "0xDB"; - StaticIconName SPEED_DIAL_NUMBERS_NUMBER_5 = StaticIconName.valueForString(example); - assertNotNull("SPEED_DIAL_NUMBERS_NUMBER_5 returned null", SPEED_DIAL_NUMBERS_NUMBER_5); + example = "0xDB"; + StaticIconName SPEED_DIAL_NUMBERS_NUMBER_5 = StaticIconName.valueForString(example); + assertNotNull("SPEED_DIAL_NUMBERS_NUMBER_5 returned null", SPEED_DIAL_NUMBERS_NUMBER_5); - example = "0xDC"; - StaticIconName SPEED_DIAL_NUMBERS_NUMBER_6 = StaticIconName.valueForString(example); - assertNotNull("SPEED_DIAL_NUMBERS_NUMBER_6 returned null", SPEED_DIAL_NUMBERS_NUMBER_6); + example = "0xDC"; + StaticIconName SPEED_DIAL_NUMBERS_NUMBER_6 = StaticIconName.valueForString(example); + assertNotNull("SPEED_DIAL_NUMBERS_NUMBER_6 returned null", SPEED_DIAL_NUMBERS_NUMBER_6); - example = "0xDD"; - StaticIconName SPEED_DIAL_NUMBERS_NUMBER_7 = StaticIconName.valueForString(example); - assertNotNull("SPEED_DIAL_NUMBERS_NUMBER_7 returned null", SPEED_DIAL_NUMBERS_NUMBER_7); + example = "0xDD"; + StaticIconName SPEED_DIAL_NUMBERS_NUMBER_7 = StaticIconName.valueForString(example); + assertNotNull("SPEED_DIAL_NUMBERS_NUMBER_7 returned null", SPEED_DIAL_NUMBERS_NUMBER_7); - example = "0xDE"; - StaticIconName SPEED_DIAL_NUMBERS_NUMBER_8 = StaticIconName.valueForString(example); - assertNotNull("SPEED_DIAL_NUMBERS_NUMBER_8 returned null", SPEED_DIAL_NUMBERS_NUMBER_8); + example = "0xDE"; + StaticIconName SPEED_DIAL_NUMBERS_NUMBER_8 = StaticIconName.valueForString(example); + assertNotNull("SPEED_DIAL_NUMBERS_NUMBER_8 returned null", SPEED_DIAL_NUMBERS_NUMBER_8); - example = "0xDF"; - StaticIconName SPEED_DIAL_NUMBERS_NUMBER_9 = StaticIconName.valueForString(example); - assertNotNull("SPEED_DIAL_NUMBERS_NUMBER_9 returned null", SPEED_DIAL_NUMBERS_NUMBER_9); + example = "0xDF"; + StaticIconName SPEED_DIAL_NUMBERS_NUMBER_9 = StaticIconName.valueForString(example); + assertNotNull("SPEED_DIAL_NUMBERS_NUMBER_9 returned null", SPEED_DIAL_NUMBERS_NUMBER_9); - example = "0xD5"; - StaticIconName SUCCESS = StaticIconName.valueForString(example); - assertNotNull("SUCCESS returned null", SUCCESS); - - example = "0x4C"; - StaticIconName TRACK_TITLE = StaticIconName.valueForString(example); - assertNotNull("TRACK_TITLE returned null", TRACK_TITLE); - - example = "0x2A"; - StaticIconName TRAFFIC_REPORT = StaticIconName.valueForString(example); - assertNotNull("TRAFFIC_REPORT returned null", TRAFFIC_REPORT); - - example = "0x10"; - StaticIconName TURN_LIST = StaticIconName.valueForString(example); - assertNotNull("TURN_LIST returned null", TURN_LIST); - - example = "0xad"; - StaticIconName UTURN_LEFT_TRAFFIC = StaticIconName.valueForString(example); - assertNotNull("UTURN_LEFT_TRAFFIC returned null", UTURN_LEFT_TRAFFIC); - - example = "0xa9"; - StaticIconName UTURN_RIGHT_TRAFFIC = StaticIconName.valueForString(example); - assertNotNull("UTURN_RIGHT_TRAFFIC returned null", UTURN_RIGHT_TRAFFIC); - - example = "0x18"; - StaticIconName UNDO = StaticIconName.valueForString(example); - assertNotNull("UNDO returned null", UNDO); - - example = "0x23"; - StaticIconName UNLOCKED = StaticIconName.valueForString(example); - assertNotNull("UNLOCKED returned null", UNLOCKED); - - example = "0x0B"; - StaticIconName USB_MEDIA_AUDIO_SOURCE = StaticIconName.valueForString(example); - assertNotNull("USB_MEDIA_AUDIO_SOURCE returned null", USB_MEDIA_AUDIO_SOURCE); - - example = "0xC7"; - StaticIconName VOICE_CONTROL_SCROLLBAR_LIST_ITEM_NO_1 = StaticIconName.valueForString(example); - assertNotNull("VOICE_CONTROL_SCROLLBAR_LIST_ITEM_NO_1 returned null", VOICE_CONTROL_SCROLLBAR_LIST_ITEM_NO_1); - - example = "0xC8"; - StaticIconName VOICE_CONTROL_SCROLLBAR_LIST_ITEM_NO_2 = StaticIconName.valueForString(example); - assertNotNull("VOICE_CONTROL_SCROLLBAR_LIST_ITEM_NO_2 returned null", VOICE_CONTROL_SCROLLBAR_LIST_ITEM_NO_2); - - example = "0xC9"; - StaticIconName VOICE_CONTROL_SCROLLBAR_LIST_ITEM_NO_3 = StaticIconName.valueForString(example); - assertNotNull("VOICE_CONTROL_SCROLLBAR_LIST_ITEM_NO_3 returned null", VOICE_CONTROL_SCROLLBAR_LIST_ITEM_NO_3); - - example = "0xCA"; - StaticIconName VOICE_CONTROL_SCROLLBAR_LIST_ITEM_NO_4 = StaticIconName.valueForString(example); - assertNotNull("VOICE_CONTROL_SCROLLBAR_LIST_ITEM_NO_4 returned null", VOICE_CONTROL_SCROLLBAR_LIST_ITEM_NO_4); - - example = "0x90"; - StaticIconName VOICE_RECOGNITION_FAILED = StaticIconName.valueForString(example); - assertNotNull("VOICE_RECOGNITION_FAILED returned null", VOICE_RECOGNITION_FAILED); - - example = "0x92"; - StaticIconName VOICE_RECOGNITION_PAUSE = StaticIconName.valueForString(example); - assertNotNull("VOICE_RECOGNITION_PAUSE returned null", VOICE_RECOGNITION_PAUSE); - - example = "0x8F"; - StaticIconName VOICE_RECOGNITION_SUCCESSFUL = StaticIconName.valueForString(example); - assertNotNull("VOICE_RECOGNITION_SUCCESSFUL returned null", VOICE_RECOGNITION_SUCCESSFUL); - - example = "0x11"; - StaticIconName VOICE_RECOGNITION_SYSTEM_ACTIVE = StaticIconName.valueForString(example); - assertNotNull("VOICE_RECOGNITION_SYSTEM_ACTIVE returned null", VOICE_RECOGNITION_SYSTEM_ACTIVE); - - example = "0x91"; - StaticIconName VOICE_RECOGNITION_SYSTEM_LISTENING = StaticIconName.valueForString(example); - assertNotNull("VOICE_RECOGNITION_SYSTEM_LISTENING returned null", VOICE_RECOGNITION_SYSTEM_LISTENING); - - example = "0x93"; - StaticIconName VOICE_RECOGNITION_TRY_AGAIN = StaticIconName.valueForString(example); - assertNotNull("VOICE_RECOGNITION_TRY_AGAIN returned null", VOICE_RECOGNITION_TRY_AGAIN); - - example = "0xfe"; - StaticIconName WARNING = StaticIconName.valueForString(example); - assertNotNull("WARNING returned null", WARNING); - - example = "0xeb"; - StaticIconName WEATHER = StaticIconName.valueForString(example); - assertNotNull("WEATHER returned null", WEATHER); - - example = "0x43"; - StaticIconName WIFI_FULL = StaticIconName.valueForString(example); - assertNotNull("WIFI_FULL returned null", WIFI_FULL); - - example = "0x98"; - StaticIconName ZOOM_IN = StaticIconName.valueForString(example); - assertNotNull("ZOOM_IN returned null", ZOOM_IN); - - example = "0x9a"; - StaticIconName ZOOM_OUT = StaticIconName.valueForString(example); - assertNotNull("ZOOM_OUT returned null", ZOOM_OUT); - } - - /** - * Verifies that an invalid assignment is null. - */ - public void testInvalidEnum () { - String example = "SoMeThInG"; - try { - StaticIconName SOMETHING = StaticIconName.valueForString(example); - assertNull("Result of valueForString should be null.", SOMETHING); - } - catch (IllegalArgumentException exception) { - fail("Invalid enum throws IllegalArgumentException."); - } - } - - /** - * Verifies that a null assignment is invalid. - */ - public void testNullEnum () { - String example = null; - try { - StaticIconName temp = StaticIconName.valueForString(example); - assertNull("Result of valueForString should be null.", temp); - } - catch (NullPointerException exception) { - fail("Null string throws NullPointerException."); - } - } - - /** - * Verifies the possible enum values of StaticIconNames. - */ - public void testListEnum() { - - List<StaticIconName> enumValueList = Arrays.asList(StaticIconName.values()); - - List<StaticIconName> enumTestList = new ArrayList<>(); - enumTestList.add(StaticIconName.ACCEPT_CALL); - enumTestList.add(StaticIconName.ADD_WAYPOINT); - enumTestList.add(StaticIconName.ALBUM); - enumTestList.add(StaticIconName.AMBIENT_LIGHTING); - enumTestList.add(StaticIconName.ARROW_NORTH); - enumTestList.add(StaticIconName.AUDIO_MUTE); - enumTestList.add(StaticIconName.AUDIOBOOK_EPISODE); - enumTestList.add(StaticIconName.AUDIOBOOK_NARRATOR); - enumTestList.add(StaticIconName.AUXILLARY_AUDIO); - enumTestList.add(StaticIconName.BACK); - enumTestList.add(StaticIconName.BATTERY_CAPACITY_0_OF_5); - enumTestList.add(StaticIconName.BATTERY_CAPACITY_1_OF_5); - enumTestList.add(StaticIconName.BATTERY_CAPACITY_2_OF_5); - enumTestList.add(StaticIconName.BATTERY_CAPACITY_3_OF_5); - enumTestList.add(StaticIconName.BATTERY_CAPACITY_4_OF_5); - enumTestList.add(StaticIconName.BATTERY_CAPACITY_5_OF_5); - enumTestList.add(StaticIconName.BLUETOOTH_AUDIO_SOURCE); - enumTestList.add(StaticIconName.BLUETOOTH1); - enumTestList.add(StaticIconName.BLUETOOTH2); - enumTestList.add(StaticIconName.BROWSE); - enumTestList.add(StaticIconName.CELL_PHONE_IN_ROAMING_MODE); - enumTestList.add(StaticIconName.CELL_SERVICE_SIGNAL_STRENGTH_0_OF_5_BARS); - enumTestList.add(StaticIconName.CELL_SERVICE_SIGNAL_STRENGTH_1_OF_5_BARS); - enumTestList.add(StaticIconName.CELL_SERVICE_SIGNAL_STRENGTH_2_OF_5_BARS); - enumTestList.add(StaticIconName.CELL_SERVICE_SIGNAL_STRENGTH_3_OF_5_BARS); - enumTestList.add(StaticIconName.CELL_SERVICE_SIGNAL_STRENGTH_4_OF_5_BARS); - enumTestList.add(StaticIconName.CELL_SERVICE_SIGNAL_STRENGTH_5_OF_5_BARS); - enumTestList.add(StaticIconName.CHANGE_LANE_LEFT); - enumTestList.add(StaticIconName.CHANGE_LANE_RIGHT); - enumTestList.add(StaticIconName.CHECK_BOX_CHECKED); - enumTestList.add(StaticIconName.CHECK_BOX_UNCHECKED); - enumTestList.add(StaticIconName.CLIMATE); - enumTestList.add(StaticIconName.CLOCK); - enumTestList.add(StaticIconName.COMPOSE); - enumTestList.add(StaticIconName.CONTACT); - enumTestList.add(StaticIconName.CONTINUE); - enumTestList.add(StaticIconName.DASH); - enumTestList.add(StaticIconName.DATE); - enumTestList.add(StaticIconName.DELETE); - enumTestList.add(StaticIconName.DESTINATION); - enumTestList.add(StaticIconName.DESTINATION_FERRY_AHEAD); - enumTestList.add(StaticIconName.EBOOKMARK); - enumTestList.add(StaticIconName.END_CALL); - enumTestList.add(StaticIconName.FAIL); - enumTestList.add(StaticIconName.FAST_FORWARD_30_SECS); - enumTestList.add(StaticIconName.FAVORITE_HEART); - enumTestList.add(StaticIconName.FAVORITE_STAR); - enumTestList.add(StaticIconName.FAX_NUMBER); - enumTestList.add(StaticIconName.FILENAME); - enumTestList.add(StaticIconName.FILTER); - enumTestList.add(StaticIconName.FOLDER); - enumTestList.add(StaticIconName.FUEL_PRICES); - enumTestList.add(StaticIconName.FULL_MAP); - enumTestList.add(StaticIconName.GENERIC_PHONE_NUMBER); - enumTestList.add(StaticIconName.GENRE); - enumTestList.add(StaticIconName.GLOBAL_KEYBOARD); - enumTestList.add(StaticIconName.HIGHWAY_EXIT_INFORMATION); - enumTestList.add(StaticIconName.HOME_PHONE_NUMBER); - enumTestList.add(StaticIconName.HYPERLINK); - enumTestList.add(StaticIconName.ID3_TAG_UNKNOWN); - enumTestList.add(StaticIconName.INCOMING_CALLS); - enumTestList.add(StaticIconName.INFORMATION); - enumTestList.add(StaticIconName.IPOD_MEDIA_SOURCE); - enumTestList.add(StaticIconName.JOIN_CALLS); - enumTestList.add(StaticIconName.KEEP_LEFT); - enumTestList.add(StaticIconName.KEEP_RIGHT); - enumTestList.add(StaticIconName.KEY); - enumTestList.add(StaticIconName.LEFT); - enumTestList.add(StaticIconName.LEFT_ARROW); - enumTestList.add(StaticIconName.LEFT_EXIT); - enumTestList.add(StaticIconName.LINE_IN_AUDIO_SOURCE); - enumTestList.add(StaticIconName.LOCKED); - enumTestList.add(StaticIconName.MEDIA_CONTROL_LEFT_ARROW); - enumTestList.add(StaticIconName.MEDIA_CONTROL_RECORDING); - enumTestList.add(StaticIconName.MEDIA_CONTROL_RIGHT_ARROW); - enumTestList.add(StaticIconName.MEDIA_CONTROL_STOP); - enumTestList.add(StaticIconName.MICROPHONE); - enumTestList.add(StaticIconName.MISSED_CALLS); - enumTestList.add(StaticIconName.MOBILE_PHONE_NUMBER); - enumTestList.add(StaticIconName.MOVE_DOWN); - enumTestList.add(StaticIconName.MOVE_UP); - enumTestList.add(StaticIconName.MP3_TAG_ARTIST); - enumTestList.add(StaticIconName.NAVIGATION); - enumTestList.add(StaticIconName.NAVIGATION_CURRENT_DIRECTION); - enumTestList.add(StaticIconName.NEGATIVE_RATING_THUMBS_DOWN); - enumTestList.add(StaticIconName.NEW); - enumTestList.add(StaticIconName.OFFICE_PHONE_NUMBER); - enumTestList.add(StaticIconName.OPENED); - enumTestList.add(StaticIconName.ORIGIN); - enumTestList.add(StaticIconName.OUTGOING_CALLS); - enumTestList.add(StaticIconName.PHONE_CALL_1); - enumTestList.add(StaticIconName.PHONE_CALL_2); - enumTestList.add(StaticIconName.PHONE_DEVICE); - enumTestList.add(StaticIconName.PHONEBOOK); - enumTestList.add(StaticIconName.PHOTO); - enumTestList.add(StaticIconName.PLAY); - enumTestList.add(StaticIconName.PLAYLIST); - enumTestList.add(StaticIconName.POPUP); - enumTestList.add(StaticIconName.POSITIVE_RATING_THUMBS_UP); - enumTestList.add(StaticIconName.POWER); - enumTestList.add(StaticIconName.PRIMARY_PHONE); - enumTestList.add(StaticIconName.RADIO_BUTTON_CHECKED); - enumTestList.add(StaticIconName.RADIO_BUTTON_UNCHECKED); - enumTestList.add(StaticIconName.RECENT_CALLS); - enumTestList.add(StaticIconName.RECENT_DESTINATIONS); - enumTestList.add(StaticIconName.REDO); - enumTestList.add(StaticIconName.REFRESH); - enumTestList.add(StaticIconName.REMOTE_DIAGNOSTICS_CHECK_ENGINE); - enumTestList.add(StaticIconName.RENDERED_911_ASSIST); - enumTestList.add(StaticIconName.REPEAT); - enumTestList.add(StaticIconName.REPEAT_PLAY); - enumTestList.add(StaticIconName.REPLY); - enumTestList.add(StaticIconName.REWIND_30_SECS); - enumTestList.add(StaticIconName.RIGHT); - enumTestList.add(StaticIconName.RIGHT_EXIT); - enumTestList.add(StaticIconName.RINGTONES); - enumTestList.add(StaticIconName.ROUNDABOUT_LEFT_HAND_1); - enumTestList.add(StaticIconName.ROUNDABOUT_LEFT_HAND_2); - enumTestList.add(StaticIconName.ROUNDABOUT_LEFT_HAND_3); - enumTestList.add(StaticIconName.ROUNDABOUT_LEFT_HAND_4); - enumTestList.add(StaticIconName.ROUNDABOUT_LEFT_HAND_5); - enumTestList.add(StaticIconName.ROUNDABOUT_LEFT_HAND_6); - enumTestList.add(StaticIconName.ROUNDABOUT_LEFT_HAND_7); - enumTestList.add(StaticIconName.ROUNDABOUT_RIGHT_HAND_1); - enumTestList.add(StaticIconName.ROUNDABOUT_RIGHT_HAND_2); - enumTestList.add(StaticIconName.ROUNDABOUT_RIGHT_HAND_3); - enumTestList.add(StaticIconName.ROUNDABOUT_RIGHT_HAND_4); - enumTestList.add(StaticIconName.ROUNDABOUT_RIGHT_HAND_5); - enumTestList.add(StaticIconName.ROUNDABOUT_RIGHT_HAND_6); - enumTestList.add(StaticIconName.ROUNDABOUT_RIGHT_HAND_7); - enumTestList.add(StaticIconName.RSS); - enumTestList.add(StaticIconName.SETTINGS); - enumTestList.add(StaticIconName.SHARP_LEFT); - enumTestList.add(StaticIconName.SHARP_RIGHT); - enumTestList.add(StaticIconName.SHOW); - enumTestList.add(StaticIconName.SHUFFLE_PLAY); - enumTestList.add(StaticIconName.SKI_PLACES); - enumTestList.add(StaticIconName.SLIGHT_LEFT); - enumTestList.add(StaticIconName.SLIGHT_RIGHT); - enumTestList.add(StaticIconName.SMARTPHONE); - enumTestList.add(StaticIconName.SORT_LIST); - enumTestList.add(StaticIconName.SPEED_DIAL_NUMBERS_NUMBER_0); - enumTestList.add(StaticIconName.SPEED_DIAL_NUMBERS_NUMBER_1); - enumTestList.add(StaticIconName.SPEED_DIAL_NUMBERS_NUMBER_2); - enumTestList.add(StaticIconName.SPEED_DIAL_NUMBERS_NUMBER_3); - enumTestList.add(StaticIconName.SPEED_DIAL_NUMBERS_NUMBER_4); - enumTestList.add(StaticIconName.SPEED_DIAL_NUMBERS_NUMBER_5); - enumTestList.add(StaticIconName.SPEED_DIAL_NUMBERS_NUMBER_6); - enumTestList.add(StaticIconName.SPEED_DIAL_NUMBERS_NUMBER_7); - enumTestList.add(StaticIconName.SPEED_DIAL_NUMBERS_NUMBER_8); - enumTestList.add(StaticIconName.SPEED_DIAL_NUMBERS_NUMBER_9); - enumTestList.add(StaticIconName.SUCCESS); - enumTestList.add(StaticIconName.TRACK_TITLE); - enumTestList.add(StaticIconName.TRAFFIC_REPORT); - enumTestList.add(StaticIconName.TURN_LIST); - enumTestList.add(StaticIconName.UTURN_LEFT_TRAFFIC); - enumTestList.add(StaticIconName.UTURN_RIGHT_TRAFFIC); - enumTestList.add(StaticIconName.UNDO); - enumTestList.add(StaticIconName.UNLOCKED); - enumTestList.add(StaticIconName.USB_MEDIA_AUDIO_SOURCE); - enumTestList.add(StaticIconName.VOICE_CONTROL_SCROLLBAR_LIST_ITEM_NO_1); - enumTestList.add(StaticIconName.VOICE_CONTROL_SCROLLBAR_LIST_ITEM_NO_2); - enumTestList.add(StaticIconName.VOICE_CONTROL_SCROLLBAR_LIST_ITEM_NO_3); - enumTestList.add(StaticIconName.VOICE_CONTROL_SCROLLBAR_LIST_ITEM_NO_4); - enumTestList.add(StaticIconName.VOICE_RECOGNITION_FAILED); - enumTestList.add(StaticIconName.VOICE_RECOGNITION_PAUSE); - enumTestList.add(StaticIconName.VOICE_RECOGNITION_SUCCESSFUL); - enumTestList.add(StaticIconName.VOICE_RECOGNITION_SYSTEM_ACTIVE); - enumTestList.add(StaticIconName.VOICE_RECOGNITION_SYSTEM_LISTENING); - enumTestList.add(StaticIconName.VOICE_RECOGNITION_TRY_AGAIN); - enumTestList.add(StaticIconName.WARNING); - enumTestList.add(StaticIconName.WEATHER); - enumTestList.add(StaticIconName.WIFI_FULL); - enumTestList.add(StaticIconName.ZOOM_IN); - enumTestList.add(StaticIconName.ZOOM_OUT); - - assertTrue("Enum value list does not match enum class list", - enumValueList.containsAll(enumTestList) && enumTestList.containsAll(enumValueList)); - } + example = "0xD5"; + StaticIconName SUCCESS = StaticIconName.valueForString(example); + assertNotNull("SUCCESS returned null", SUCCESS); + + example = "0x4C"; + StaticIconName TRACK_TITLE = StaticIconName.valueForString(example); + assertNotNull("TRACK_TITLE returned null", TRACK_TITLE); + + example = "0x2A"; + StaticIconName TRAFFIC_REPORT = StaticIconName.valueForString(example); + assertNotNull("TRAFFIC_REPORT returned null", TRAFFIC_REPORT); + + example = "0x10"; + StaticIconName TURN_LIST = StaticIconName.valueForString(example); + assertNotNull("TURN_LIST returned null", TURN_LIST); + + example = "0xad"; + StaticIconName UTURN_LEFT_TRAFFIC = StaticIconName.valueForString(example); + assertNotNull("UTURN_LEFT_TRAFFIC returned null", UTURN_LEFT_TRAFFIC); + + example = "0xa9"; + StaticIconName UTURN_RIGHT_TRAFFIC = StaticIconName.valueForString(example); + assertNotNull("UTURN_RIGHT_TRAFFIC returned null", UTURN_RIGHT_TRAFFIC); + + example = "0x18"; + StaticIconName UNDO = StaticIconName.valueForString(example); + assertNotNull("UNDO returned null", UNDO); + + example = "0x23"; + StaticIconName UNLOCKED = StaticIconName.valueForString(example); + assertNotNull("UNLOCKED returned null", UNLOCKED); + + example = "0x0B"; + StaticIconName USB_MEDIA_AUDIO_SOURCE = StaticIconName.valueForString(example); + assertNotNull("USB_MEDIA_AUDIO_SOURCE returned null", USB_MEDIA_AUDIO_SOURCE); + + example = "0xC7"; + StaticIconName VOICE_CONTROL_SCROLLBAR_LIST_ITEM_NO_1 = StaticIconName.valueForString(example); + assertNotNull("VOICE_CONTROL_SCROLLBAR_LIST_ITEM_NO_1 returned null", VOICE_CONTROL_SCROLLBAR_LIST_ITEM_NO_1); + + example = "0xC8"; + StaticIconName VOICE_CONTROL_SCROLLBAR_LIST_ITEM_NO_2 = StaticIconName.valueForString(example); + assertNotNull("VOICE_CONTROL_SCROLLBAR_LIST_ITEM_NO_2 returned null", VOICE_CONTROL_SCROLLBAR_LIST_ITEM_NO_2); + + example = "0xC9"; + StaticIconName VOICE_CONTROL_SCROLLBAR_LIST_ITEM_NO_3 = StaticIconName.valueForString(example); + assertNotNull("VOICE_CONTROL_SCROLLBAR_LIST_ITEM_NO_3 returned null", VOICE_CONTROL_SCROLLBAR_LIST_ITEM_NO_3); + + example = "0xCA"; + StaticIconName VOICE_CONTROL_SCROLLBAR_LIST_ITEM_NO_4 = StaticIconName.valueForString(example); + assertNotNull("VOICE_CONTROL_SCROLLBAR_LIST_ITEM_NO_4 returned null", VOICE_CONTROL_SCROLLBAR_LIST_ITEM_NO_4); + + example = "0x90"; + StaticIconName VOICE_RECOGNITION_FAILED = StaticIconName.valueForString(example); + assertNotNull("VOICE_RECOGNITION_FAILED returned null", VOICE_RECOGNITION_FAILED); + + example = "0x92"; + StaticIconName VOICE_RECOGNITION_PAUSE = StaticIconName.valueForString(example); + assertNotNull("VOICE_RECOGNITION_PAUSE returned null", VOICE_RECOGNITION_PAUSE); + + example = "0x8F"; + StaticIconName VOICE_RECOGNITION_SUCCESSFUL = StaticIconName.valueForString(example); + assertNotNull("VOICE_RECOGNITION_SUCCESSFUL returned null", VOICE_RECOGNITION_SUCCESSFUL); + + example = "0x11"; + StaticIconName VOICE_RECOGNITION_SYSTEM_ACTIVE = StaticIconName.valueForString(example); + assertNotNull("VOICE_RECOGNITION_SYSTEM_ACTIVE returned null", VOICE_RECOGNITION_SYSTEM_ACTIVE); + + example = "0x91"; + StaticIconName VOICE_RECOGNITION_SYSTEM_LISTENING = StaticIconName.valueForString(example); + assertNotNull("VOICE_RECOGNITION_SYSTEM_LISTENING returned null", VOICE_RECOGNITION_SYSTEM_LISTENING); + + example = "0x93"; + StaticIconName VOICE_RECOGNITION_TRY_AGAIN = StaticIconName.valueForString(example); + assertNotNull("VOICE_RECOGNITION_TRY_AGAIN returned null", VOICE_RECOGNITION_TRY_AGAIN); + + example = "0xfe"; + StaticIconName WARNING = StaticIconName.valueForString(example); + assertNotNull("WARNING returned null", WARNING); + + example = "0xeb"; + StaticIconName WEATHER = StaticIconName.valueForString(example); + assertNotNull("WEATHER returned null", WEATHER); + + example = "0x43"; + StaticIconName WIFI_FULL = StaticIconName.valueForString(example); + assertNotNull("WIFI_FULL returned null", WIFI_FULL); + + example = "0x98"; + StaticIconName ZOOM_IN = StaticIconName.valueForString(example); + assertNotNull("ZOOM_IN returned null", ZOOM_IN); + + example = "0x9a"; + StaticIconName ZOOM_OUT = StaticIconName.valueForString(example); + assertNotNull("ZOOM_OUT returned null", ZOOM_OUT); + } + + /** + * Verifies that an invalid assignment is null. + */ + public void testInvalidEnum() { + String example = "SoMeThInG"; + try { + StaticIconName SOMETHING = StaticIconName.valueForString(example); + assertNull("Result of valueForString should be null.", SOMETHING); + } catch (IllegalArgumentException exception) { + fail("Invalid enum throws IllegalArgumentException."); + } + } + + /** + * Verifies that a null assignment is invalid. + */ + public void testNullEnum() { + String example = null; + try { + StaticIconName temp = StaticIconName.valueForString(example); + assertNull("Result of valueForString should be null.", temp); + } catch (NullPointerException exception) { + fail("Null string throws NullPointerException."); + } + } + + /** + * Verifies the possible enum values of StaticIconNames. + */ + public void testListEnum() { + + List<StaticIconName> enumValueList = Arrays.asList(StaticIconName.values()); + + List<StaticIconName> enumTestList = new ArrayList<>(); + enumTestList.add(StaticIconName.ACCEPT_CALL); + enumTestList.add(StaticIconName.ADD_WAYPOINT); + enumTestList.add(StaticIconName.ALBUM); + enumTestList.add(StaticIconName.AMBIENT_LIGHTING); + enumTestList.add(StaticIconName.ARROW_NORTH); + enumTestList.add(StaticIconName.AUDIO_MUTE); + enumTestList.add(StaticIconName.AUDIOBOOK_EPISODE); + enumTestList.add(StaticIconName.AUDIOBOOK_NARRATOR); + enumTestList.add(StaticIconName.AUXILLARY_AUDIO); + enumTestList.add(StaticIconName.BACK); + enumTestList.add(StaticIconName.BATTERY_CAPACITY_0_OF_5); + enumTestList.add(StaticIconName.BATTERY_CAPACITY_1_OF_5); + enumTestList.add(StaticIconName.BATTERY_CAPACITY_2_OF_5); + enumTestList.add(StaticIconName.BATTERY_CAPACITY_3_OF_5); + enumTestList.add(StaticIconName.BATTERY_CAPACITY_4_OF_5); + enumTestList.add(StaticIconName.BATTERY_CAPACITY_5_OF_5); + enumTestList.add(StaticIconName.BLUETOOTH_AUDIO_SOURCE); + enumTestList.add(StaticIconName.BLUETOOTH1); + enumTestList.add(StaticIconName.BLUETOOTH2); + enumTestList.add(StaticIconName.BROWSE); + enumTestList.add(StaticIconName.CELL_PHONE_IN_ROAMING_MODE); + enumTestList.add(StaticIconName.CELL_SERVICE_SIGNAL_STRENGTH_0_OF_5_BARS); + enumTestList.add(StaticIconName.CELL_SERVICE_SIGNAL_STRENGTH_1_OF_5_BARS); + enumTestList.add(StaticIconName.CELL_SERVICE_SIGNAL_STRENGTH_2_OF_5_BARS); + enumTestList.add(StaticIconName.CELL_SERVICE_SIGNAL_STRENGTH_3_OF_5_BARS); + enumTestList.add(StaticIconName.CELL_SERVICE_SIGNAL_STRENGTH_4_OF_5_BARS); + enumTestList.add(StaticIconName.CELL_SERVICE_SIGNAL_STRENGTH_5_OF_5_BARS); + enumTestList.add(StaticIconName.CHANGE_LANE_LEFT); + enumTestList.add(StaticIconName.CHANGE_LANE_RIGHT); + enumTestList.add(StaticIconName.CHECK_BOX_CHECKED); + enumTestList.add(StaticIconName.CHECK_BOX_UNCHECKED); + enumTestList.add(StaticIconName.CLIMATE); + enumTestList.add(StaticIconName.CLOCK); + enumTestList.add(StaticIconName.COMPOSE); + enumTestList.add(StaticIconName.CONTACT); + enumTestList.add(StaticIconName.CONTINUE); + enumTestList.add(StaticIconName.DASH); + enumTestList.add(StaticIconName.DATE); + enumTestList.add(StaticIconName.DELETE); + enumTestList.add(StaticIconName.DESTINATION); + enumTestList.add(StaticIconName.DESTINATION_FERRY_AHEAD); + enumTestList.add(StaticIconName.EBOOKMARK); + enumTestList.add(StaticIconName.END_CALL); + enumTestList.add(StaticIconName.FAIL); + enumTestList.add(StaticIconName.FAST_FORWARD_30_SECS); + enumTestList.add(StaticIconName.FAVORITE_HEART); + enumTestList.add(StaticIconName.FAVORITE_STAR); + enumTestList.add(StaticIconName.FAX_NUMBER); + enumTestList.add(StaticIconName.FILENAME); + enumTestList.add(StaticIconName.FILTER); + enumTestList.add(StaticIconName.FOLDER); + enumTestList.add(StaticIconName.FUEL_PRICES); + enumTestList.add(StaticIconName.FULL_MAP); + enumTestList.add(StaticIconName.GENERIC_PHONE_NUMBER); + enumTestList.add(StaticIconName.GENRE); + enumTestList.add(StaticIconName.GLOBAL_KEYBOARD); + enumTestList.add(StaticIconName.HIGHWAY_EXIT_INFORMATION); + enumTestList.add(StaticIconName.HOME_PHONE_NUMBER); + enumTestList.add(StaticIconName.HYPERLINK); + enumTestList.add(StaticIconName.ID3_TAG_UNKNOWN); + enumTestList.add(StaticIconName.INCOMING_CALLS); + enumTestList.add(StaticIconName.INFORMATION); + enumTestList.add(StaticIconName.IPOD_MEDIA_SOURCE); + enumTestList.add(StaticIconName.JOIN_CALLS); + enumTestList.add(StaticIconName.KEEP_LEFT); + enumTestList.add(StaticIconName.KEEP_RIGHT); + enumTestList.add(StaticIconName.KEY); + enumTestList.add(StaticIconName.LEFT); + enumTestList.add(StaticIconName.LEFT_ARROW); + enumTestList.add(StaticIconName.LEFT_EXIT); + enumTestList.add(StaticIconName.LINE_IN_AUDIO_SOURCE); + enumTestList.add(StaticIconName.LOCKED); + enumTestList.add(StaticIconName.MEDIA_CONTROL_LEFT_ARROW); + enumTestList.add(StaticIconName.MEDIA_CONTROL_RECORDING); + enumTestList.add(StaticIconName.MEDIA_CONTROL_RIGHT_ARROW); + enumTestList.add(StaticIconName.MEDIA_CONTROL_STOP); + enumTestList.add(StaticIconName.MICROPHONE); + enumTestList.add(StaticIconName.MISSED_CALLS); + enumTestList.add(StaticIconName.MOBILE_PHONE_NUMBER); + enumTestList.add(StaticIconName.MOVE_DOWN); + enumTestList.add(StaticIconName.MOVE_UP); + enumTestList.add(StaticIconName.MP3_TAG_ARTIST); + enumTestList.add(StaticIconName.NAVIGATION); + enumTestList.add(StaticIconName.NAVIGATION_CURRENT_DIRECTION); + enumTestList.add(StaticIconName.NEGATIVE_RATING_THUMBS_DOWN); + enumTestList.add(StaticIconName.NEW); + enumTestList.add(StaticIconName.OFFICE_PHONE_NUMBER); + enumTestList.add(StaticIconName.OPENED); + enumTestList.add(StaticIconName.ORIGIN); + enumTestList.add(StaticIconName.OUTGOING_CALLS); + enumTestList.add(StaticIconName.PHONE_CALL_1); + enumTestList.add(StaticIconName.PHONE_CALL_2); + enumTestList.add(StaticIconName.PHONE_DEVICE); + enumTestList.add(StaticIconName.PHONEBOOK); + enumTestList.add(StaticIconName.PHOTO); + enumTestList.add(StaticIconName.PLAY); + enumTestList.add(StaticIconName.PLAYLIST); + enumTestList.add(StaticIconName.POPUP); + enumTestList.add(StaticIconName.POSITIVE_RATING_THUMBS_UP); + enumTestList.add(StaticIconName.POWER); + enumTestList.add(StaticIconName.PRIMARY_PHONE); + enumTestList.add(StaticIconName.RADIO_BUTTON_CHECKED); + enumTestList.add(StaticIconName.RADIO_BUTTON_UNCHECKED); + enumTestList.add(StaticIconName.RECENT_CALLS); + enumTestList.add(StaticIconName.RECENT_DESTINATIONS); + enumTestList.add(StaticIconName.REDO); + enumTestList.add(StaticIconName.REFRESH); + enumTestList.add(StaticIconName.REMOTE_DIAGNOSTICS_CHECK_ENGINE); + enumTestList.add(StaticIconName.RENDERED_911_ASSIST); + enumTestList.add(StaticIconName.REPEAT); + enumTestList.add(StaticIconName.REPEAT_PLAY); + enumTestList.add(StaticIconName.REPLY); + enumTestList.add(StaticIconName.REWIND_30_SECS); + enumTestList.add(StaticIconName.RIGHT); + enumTestList.add(StaticIconName.RIGHT_EXIT); + enumTestList.add(StaticIconName.RINGTONES); + enumTestList.add(StaticIconName.ROUNDABOUT_LEFT_HAND_1); + enumTestList.add(StaticIconName.ROUNDABOUT_LEFT_HAND_2); + enumTestList.add(StaticIconName.ROUNDABOUT_LEFT_HAND_3); + enumTestList.add(StaticIconName.ROUNDABOUT_LEFT_HAND_4); + enumTestList.add(StaticIconName.ROUNDABOUT_LEFT_HAND_5); + enumTestList.add(StaticIconName.ROUNDABOUT_LEFT_HAND_6); + enumTestList.add(StaticIconName.ROUNDABOUT_LEFT_HAND_7); + enumTestList.add(StaticIconName.ROUNDABOUT_RIGHT_HAND_1); + enumTestList.add(StaticIconName.ROUNDABOUT_RIGHT_HAND_2); + enumTestList.add(StaticIconName.ROUNDABOUT_RIGHT_HAND_3); + enumTestList.add(StaticIconName.ROUNDABOUT_RIGHT_HAND_4); + enumTestList.add(StaticIconName.ROUNDABOUT_RIGHT_HAND_5); + enumTestList.add(StaticIconName.ROUNDABOUT_RIGHT_HAND_6); + enumTestList.add(StaticIconName.ROUNDABOUT_RIGHT_HAND_7); + enumTestList.add(StaticIconName.RSS); + enumTestList.add(StaticIconName.SETTINGS); + enumTestList.add(StaticIconName.SHARP_LEFT); + enumTestList.add(StaticIconName.SHARP_RIGHT); + enumTestList.add(StaticIconName.SHOW); + enumTestList.add(StaticIconName.SHUFFLE_PLAY); + enumTestList.add(StaticIconName.SKI_PLACES); + enumTestList.add(StaticIconName.SLIGHT_LEFT); + enumTestList.add(StaticIconName.SLIGHT_RIGHT); + enumTestList.add(StaticIconName.SMARTPHONE); + enumTestList.add(StaticIconName.SORT_LIST); + enumTestList.add(StaticIconName.SPEED_DIAL_NUMBERS_NUMBER_0); + enumTestList.add(StaticIconName.SPEED_DIAL_NUMBERS_NUMBER_1); + enumTestList.add(StaticIconName.SPEED_DIAL_NUMBERS_NUMBER_2); + enumTestList.add(StaticIconName.SPEED_DIAL_NUMBERS_NUMBER_3); + enumTestList.add(StaticIconName.SPEED_DIAL_NUMBERS_NUMBER_4); + enumTestList.add(StaticIconName.SPEED_DIAL_NUMBERS_NUMBER_5); + enumTestList.add(StaticIconName.SPEED_DIAL_NUMBERS_NUMBER_6); + enumTestList.add(StaticIconName.SPEED_DIAL_NUMBERS_NUMBER_7); + enumTestList.add(StaticIconName.SPEED_DIAL_NUMBERS_NUMBER_8); + enumTestList.add(StaticIconName.SPEED_DIAL_NUMBERS_NUMBER_9); + enumTestList.add(StaticIconName.SUCCESS); + enumTestList.add(StaticIconName.TRACK_TITLE); + enumTestList.add(StaticIconName.TRAFFIC_REPORT); + enumTestList.add(StaticIconName.TURN_LIST); + enumTestList.add(StaticIconName.UTURN_LEFT_TRAFFIC); + enumTestList.add(StaticIconName.UTURN_RIGHT_TRAFFIC); + enumTestList.add(StaticIconName.UNDO); + enumTestList.add(StaticIconName.UNLOCKED); + enumTestList.add(StaticIconName.USB_MEDIA_AUDIO_SOURCE); + enumTestList.add(StaticIconName.VOICE_CONTROL_SCROLLBAR_LIST_ITEM_NO_1); + enumTestList.add(StaticIconName.VOICE_CONTROL_SCROLLBAR_LIST_ITEM_NO_2); + enumTestList.add(StaticIconName.VOICE_CONTROL_SCROLLBAR_LIST_ITEM_NO_3); + enumTestList.add(StaticIconName.VOICE_CONTROL_SCROLLBAR_LIST_ITEM_NO_4); + enumTestList.add(StaticIconName.VOICE_RECOGNITION_FAILED); + enumTestList.add(StaticIconName.VOICE_RECOGNITION_PAUSE); + enumTestList.add(StaticIconName.VOICE_RECOGNITION_SUCCESSFUL); + enumTestList.add(StaticIconName.VOICE_RECOGNITION_SYSTEM_ACTIVE); + enumTestList.add(StaticIconName.VOICE_RECOGNITION_SYSTEM_LISTENING); + enumTestList.add(StaticIconName.VOICE_RECOGNITION_TRY_AGAIN); + enumTestList.add(StaticIconName.WARNING); + enumTestList.add(StaticIconName.WEATHER); + enumTestList.add(StaticIconName.WIFI_FULL); + enumTestList.add(StaticIconName.ZOOM_IN); + enumTestList.add(StaticIconName.ZOOM_OUT); + + assertTrue("Enum value list does not match enum class list", + enumValueList.containsAll(enumTestList) && enumTestList.containsAll(enumValueList)); + } } diff --git a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/SupportedSeatTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/SupportedSeatTests.java index 7bea14061..44c55cb08 100644 --- a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/SupportedSeatTests.java +++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/SupportedSeatTests.java @@ -14,56 +14,56 @@ import java.util.List; */ public class SupportedSeatTests extends TestCase { - /** - * Verifies that the enum values are not null upon valid assignment. - */ - public void testValidEnums() { - String example = "DRIVER"; - SupportedSeat enumDriver = SupportedSeat.valueForString(example); - example = "FRONT_PASSENGER"; - SupportedSeat enumFrontPassenger = SupportedSeat.valueForString(example); + /** + * Verifies that the enum values are not null upon valid assignment. + */ + public void testValidEnums() { + String example = "DRIVER"; + SupportedSeat enumDriver = SupportedSeat.valueForString(example); + example = "FRONT_PASSENGER"; + SupportedSeat enumFrontPassenger = SupportedSeat.valueForString(example); - assertNotNull("DRIVER returned null", enumDriver); - assertNotNull("FRONT_PASSENGER returned null", enumFrontPassenger); - } + assertNotNull("DRIVER returned null", enumDriver); + assertNotNull("FRONT_PASSENGER returned null", enumFrontPassenger); + } - /** - * Verifies that an invalid assignment is null. - */ - public void testInvalidEnum() { - String example = "dRIVER"; - try { - SupportedSeat temp = SupportedSeat.valueForString(example); - assertNull("Result of valueForString should be null.", temp); - } catch (IllegalArgumentException exception) { - fail("Invalid enum throws IllegalArgumentException."); - } - } + /** + * Verifies that an invalid assignment is null. + */ + public void testInvalidEnum() { + String example = "dRIVER"; + try { + SupportedSeat temp = SupportedSeat.valueForString(example); + assertNull("Result of valueForString should be null.", temp); + } catch (IllegalArgumentException exception) { + fail("Invalid enum throws IllegalArgumentException."); + } + } - /** - * Verifies that a null assignment is invalid. - */ - public void testNullEnum() { - String example = null; - try { - SupportedSeat temp = SupportedSeat.valueForString(example); - assertNull("Result of valueForString should be null.", temp); - } catch (NullPointerException exception) { - fail("Null string throws NullPointerException."); - } - } + /** + * Verifies that a null assignment is invalid. + */ + public void testNullEnum() { + String example = null; + try { + SupportedSeat temp = SupportedSeat.valueForString(example); + assertNull("Result of valueForString should be null.", temp); + } catch (NullPointerException exception) { + fail("Null string throws NullPointerException."); + } + } - /** - * Verifies the possible enum values of SupportedSeat. - */ - public void testListEnum() { - List<SupportedSeat> enumValueList = Arrays.asList(SupportedSeat.values()); + /** + * Verifies the possible enum values of SupportedSeat. + */ + public void testListEnum() { + List<SupportedSeat> enumValueList = Arrays.asList(SupportedSeat.values()); - List<SupportedSeat> enumTestList = new ArrayList<SupportedSeat>(); - enumTestList.add(SupportedSeat.DRIVER); - enumTestList.add(SupportedSeat.FRONT_PASSENGER); + List<SupportedSeat> enumTestList = new ArrayList<SupportedSeat>(); + enumTestList.add(SupportedSeat.DRIVER); + enumTestList.add(SupportedSeat.FRONT_PASSENGER); - assertTrue("Enum value list does not match enum class list", - enumValueList.containsAll(enumTestList) && enumTestList.containsAll(enumValueList)); - } + assertTrue("Enum value list does not match enum class list", + enumValueList.containsAll(enumTestList) && enumTestList.containsAll(enumValueList)); + } }
\ No newline at end of file diff --git a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/SystemActionTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/SystemActionTests.java index 4cb1fca51..8d4fc78f8 100644 --- a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/SystemActionTests.java +++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/SystemActionTests.java @@ -9,67 +9,65 @@ import java.util.Arrays; import java.util.List; /** - * This is a unit test class for the SmartDeviceLink library project class : + * This is a unit test class for the SmartDeviceLink library project class : * {@link com.smartdevicelink.proxy.rpc.enums.SystemAction} */ public class SystemActionTests extends TestCase { - /** - * Verifies that the enum values are not null upon valid assignment. - */ - public void testValidEnums () { - String example = "DEFAULT_ACTION"; - SystemAction enumDefaultAction = SystemAction.valueForString(example); - example = "STEAL_FOCUS"; - SystemAction enumStealFocus = SystemAction.valueForString(example); - example = "KEEP_CONTEXT"; - SystemAction enumKeepContext = SystemAction.valueForString(example); - - assertNotNull("DEFAULT_ACTION returned null", enumDefaultAction); - assertNotNull("STEAL_FOCUS returned null", enumStealFocus); - assertNotNull("KEEP_CONTEXT returned null", enumKeepContext); - } + /** + * Verifies that the enum values are not null upon valid assignment. + */ + public void testValidEnums() { + String example = "DEFAULT_ACTION"; + SystemAction enumDefaultAction = SystemAction.valueForString(example); + example = "STEAL_FOCUS"; + SystemAction enumStealFocus = SystemAction.valueForString(example); + example = "KEEP_CONTEXT"; + SystemAction enumKeepContext = SystemAction.valueForString(example); - /** - * Verifies that an invalid assignment is null. - */ - public void testInvalidEnum () { - String example = "deFaulT_ActiON"; - try { - SystemAction temp = SystemAction.valueForString(example); + assertNotNull("DEFAULT_ACTION returned null", enumDefaultAction); + assertNotNull("STEAL_FOCUS returned null", enumStealFocus); + assertNotNull("KEEP_CONTEXT returned null", enumKeepContext); + } + + /** + * Verifies that an invalid assignment is null. + */ + public void testInvalidEnum() { + String example = "deFaulT_ActiON"; + try { + SystemAction temp = SystemAction.valueForString(example); assertNull("Result of valueForString should be null.", temp); - } - catch (IllegalArgumentException exception) { + } catch (IllegalArgumentException exception) { fail("Invalid enum throws IllegalArgumentException."); - } - } + } + } - /** - * Verifies that a null assignment is invalid. - */ - public void testNullEnum () { - String example = null; - try { - SystemAction temp = SystemAction.valueForString(example); + /** + * Verifies that a null assignment is invalid. + */ + public void testNullEnum() { + String example = null; + try { + SystemAction temp = SystemAction.valueForString(example); assertNull("Result of valueForString should be null.", temp); - } - catch (NullPointerException exception) { + } catch (NullPointerException exception) { fail("Null string throws NullPointerException."); - } - } + } + } - /** - * Verifies the possible enum values of SystemAction. - */ - public void testListEnum() { - List<SystemAction> enumValueList = Arrays.asList(SystemAction.values()); + /** + * Verifies the possible enum values of SystemAction. + */ + public void testListEnum() { + List<SystemAction> enumValueList = Arrays.asList(SystemAction.values()); - List<SystemAction> enumTestList = new ArrayList<SystemAction>(); - enumTestList.add(SystemAction.DEFAULT_ACTION); - enumTestList.add(SystemAction.STEAL_FOCUS); - enumTestList.add(SystemAction.KEEP_CONTEXT); + List<SystemAction> enumTestList = new ArrayList<SystemAction>(); + enumTestList.add(SystemAction.DEFAULT_ACTION); + enumTestList.add(SystemAction.STEAL_FOCUS); + enumTestList.add(SystemAction.KEEP_CONTEXT); - assertTrue("Enum value list does not match enum class list", - enumValueList.containsAll(enumTestList) && enumTestList.containsAll(enumValueList)); - } + assertTrue("Enum value list does not match enum class list", + enumValueList.containsAll(enumTestList) && enumTestList.containsAll(enumValueList)); + } }
\ No newline at end of file diff --git a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/SystemCapabilityTypeTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/SystemCapabilityTypeTests.java index 94617493c..e5dce7185 100644 --- a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/SystemCapabilityTypeTests.java +++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/SystemCapabilityTypeTests.java @@ -9,133 +9,131 @@ import java.util.Arrays; import java.util.List; /** - * This is a unit test class for the SmartDeviceLink library project class : + * This is a unit test class for the SmartDeviceLink library project class : * {@link com.smartdevicelink.proxy.rpc.enums.SystemCapabilityType} */ public class SystemCapabilityTypeTests extends TestCase { - /** - * Verifies that the enum values are not null upon valid assignment. - */ - public void testValidEnums () { - String example = "NAVIGATION"; - SystemCapabilityType enumNavigation = SystemCapabilityType.valueForString(example); - example = "PHONE_CALL"; - SystemCapabilityType enumPhoneCall = SystemCapabilityType.valueForString(example); - example = "VIDEO_STREAMING"; - SystemCapabilityType enumVideoStreaming = SystemCapabilityType.valueForString(example); - example = "REMOTE_CONTROL"; - SystemCapabilityType enumRemoteControl = SystemCapabilityType.valueForString(example); - example = "HMI"; - SystemCapabilityType enumHmi = SystemCapabilityType.valueForString(example); - example = "DISPLAY"; - SystemCapabilityType enumDisplay = SystemCapabilityType.valueForString(example); - example = "AUDIO_PASSTHROUGH"; - SystemCapabilityType enumAudioPassThrough = SystemCapabilityType.valueForString(example); - example = "BUTTON"; - SystemCapabilityType enumButton = SystemCapabilityType.valueForString(example); - example = "HMI_ZONE"; - SystemCapabilityType enumHmiZone = SystemCapabilityType.valueForString(example); - example = "PRESET_BANK"; - SystemCapabilityType enumPresetBank = SystemCapabilityType.valueForString(example); - example = "SOFTBUTTON"; - SystemCapabilityType enumSoftButton = SystemCapabilityType.valueForString(example); - example = "SPEECH"; - SystemCapabilityType enumSpeech = SystemCapabilityType.valueForString(example); - example = "VOICE_RECOGNITION"; - SystemCapabilityType enumVoiceRecognition = SystemCapabilityType.valueForString(example); - example = "PCM_STREAMING"; - SystemCapabilityType enumPCM = SystemCapabilityType.valueForString(example); - example = "APP_SERVICES"; - SystemCapabilityType enumAppServices = SystemCapabilityType.valueForString(example); - example = "SEAT_LOCATION"; - SystemCapabilityType enumSeatLocation = SystemCapabilityType.valueForString(example); - example = "PRERECORDED_SPEECH"; - SystemCapabilityType enumPrerecordedSpeech = SystemCapabilityType.valueForString(example); - example = "DISPLAYS"; - SystemCapabilityType enumDisplays = SystemCapabilityType.valueForString(example); - example = "DRIVER_DISTRACTION"; - SystemCapabilityType enumDriverDistraction = SystemCapabilityType.valueForString(example); + /** + * Verifies that the enum values are not null upon valid assignment. + */ + public void testValidEnums() { + String example = "NAVIGATION"; + SystemCapabilityType enumNavigation = SystemCapabilityType.valueForString(example); + example = "PHONE_CALL"; + SystemCapabilityType enumPhoneCall = SystemCapabilityType.valueForString(example); + example = "VIDEO_STREAMING"; + SystemCapabilityType enumVideoStreaming = SystemCapabilityType.valueForString(example); + example = "REMOTE_CONTROL"; + SystemCapabilityType enumRemoteControl = SystemCapabilityType.valueForString(example); + example = "HMI"; + SystemCapabilityType enumHmi = SystemCapabilityType.valueForString(example); + example = "DISPLAY"; + SystemCapabilityType enumDisplay = SystemCapabilityType.valueForString(example); + example = "AUDIO_PASSTHROUGH"; + SystemCapabilityType enumAudioPassThrough = SystemCapabilityType.valueForString(example); + example = "BUTTON"; + SystemCapabilityType enumButton = SystemCapabilityType.valueForString(example); + example = "HMI_ZONE"; + SystemCapabilityType enumHmiZone = SystemCapabilityType.valueForString(example); + example = "PRESET_BANK"; + SystemCapabilityType enumPresetBank = SystemCapabilityType.valueForString(example); + example = "SOFTBUTTON"; + SystemCapabilityType enumSoftButton = SystemCapabilityType.valueForString(example); + example = "SPEECH"; + SystemCapabilityType enumSpeech = SystemCapabilityType.valueForString(example); + example = "VOICE_RECOGNITION"; + SystemCapabilityType enumVoiceRecognition = SystemCapabilityType.valueForString(example); + example = "PCM_STREAMING"; + SystemCapabilityType enumPCM = SystemCapabilityType.valueForString(example); + example = "APP_SERVICES"; + SystemCapabilityType enumAppServices = SystemCapabilityType.valueForString(example); + example = "SEAT_LOCATION"; + SystemCapabilityType enumSeatLocation = SystemCapabilityType.valueForString(example); + example = "PRERECORDED_SPEECH"; + SystemCapabilityType enumPrerecordedSpeech = SystemCapabilityType.valueForString(example); + example = "DISPLAYS"; + SystemCapabilityType enumDisplays = SystemCapabilityType.valueForString(example); + example = "DRIVER_DISTRACTION"; + SystemCapabilityType enumDriverDistraction = SystemCapabilityType.valueForString(example); - assertNotNull("NAVIGATION returned null", enumNavigation); - assertNotNull("PHONE_CALL returned null", enumPhoneCall); - assertNotNull("VIDEO_STREAMING returned null", enumVideoStreaming); - assertNotNull("REMOTE_CONTROL returned null", enumRemoteControl); - assertNotNull("HMI returned null", enumHmi); - assertNotNull("DISPLAY returned null", enumDisplay); - assertNotNull("AUDIO_PASSTHROUGH returned null", enumAudioPassThrough); - assertNotNull("BUTTON returned null", enumButton); - assertNotNull("HMI_ZONE returned null", enumHmiZone); - assertNotNull("PRESET_BANK returned null", enumPresetBank); - assertNotNull("SOFTBUTTON returned null", enumSoftButton); - assertNotNull("SPEECH returned null", enumSpeech); - assertNotNull("VOICE_RECOGNITION returned null", enumVoiceRecognition); - assertNotNull("PCM_STREAMING", enumPCM); - assertNotNull("APP_SERVICES", enumAppServices); - assertNotNull("SEAT_LOCATION return null", enumSeatLocation); - assertNotNull("PRERECORDED_SPEECH", enumPrerecordedSpeech); - assertNotNull("DISPLAYS", enumDisplays); - assertNotNull("DRIVER_DISTRACTION", enumDriverDistraction); + assertNotNull("NAVIGATION returned null", enumNavigation); + assertNotNull("PHONE_CALL returned null", enumPhoneCall); + assertNotNull("VIDEO_STREAMING returned null", enumVideoStreaming); + assertNotNull("REMOTE_CONTROL returned null", enumRemoteControl); + assertNotNull("HMI returned null", enumHmi); + assertNotNull("DISPLAY returned null", enumDisplay); + assertNotNull("AUDIO_PASSTHROUGH returned null", enumAudioPassThrough); + assertNotNull("BUTTON returned null", enumButton); + assertNotNull("HMI_ZONE returned null", enumHmiZone); + assertNotNull("PRESET_BANK returned null", enumPresetBank); + assertNotNull("SOFTBUTTON returned null", enumSoftButton); + assertNotNull("SPEECH returned null", enumSpeech); + assertNotNull("VOICE_RECOGNITION returned null", enumVoiceRecognition); + assertNotNull("PCM_STREAMING", enumPCM); + assertNotNull("APP_SERVICES", enumAppServices); + assertNotNull("SEAT_LOCATION return null", enumSeatLocation); + assertNotNull("PRERECORDED_SPEECH", enumPrerecordedSpeech); + assertNotNull("DISPLAYS", enumDisplays); + assertNotNull("DRIVER_DISTRACTION", enumDriverDistraction); - } + } - /** - * Verifies that an invalid assignment is null. - */ - public void testInvalidEnum () { - String example = "nAVIGATION"; - try { - SystemCapabilityType temp = SystemCapabilityType.valueForString(example); + /** + * Verifies that an invalid assignment is null. + */ + public void testInvalidEnum() { + String example = "nAVIGATION"; + try { + SystemCapabilityType temp = SystemCapabilityType.valueForString(example); assertNull("Result of valueForString should be null.", temp); - } - catch (IllegalArgumentException exception) { + } catch (IllegalArgumentException exception) { fail("Invalid enum throws IllegalArgumentException."); - } - } + } + } - /** - * Verifies that a null assignment is invalid. - */ - public void testNullEnum () { - String example = null; - try { - SystemCapabilityType temp = SystemCapabilityType.valueForString(example); + /** + * Verifies that a null assignment is invalid. + */ + public void testNullEnum() { + String example = null; + try { + SystemCapabilityType temp = SystemCapabilityType.valueForString(example); assertNull("Result of valueForString should be null.", temp); - } - catch (NullPointerException exception) { + } catch (NullPointerException exception) { fail("Null string throws NullPointerException."); - } - } + } + } - /** - * Verifies the possible enum values of SystemCapabilityType. - */ - public void testListEnum() { - List<SystemCapabilityType> enumValueList = Arrays.asList(SystemCapabilityType.values()); + /** + * Verifies the possible enum values of SystemCapabilityType. + */ + public void testListEnum() { + List<SystemCapabilityType> enumValueList = Arrays.asList(SystemCapabilityType.values()); - List<SystemCapabilityType> enumTestList = new ArrayList<SystemCapabilityType>(); - enumTestList.add(SystemCapabilityType.NAVIGATION); - enumTestList.add(SystemCapabilityType.PHONE_CALL); - enumTestList.add(SystemCapabilityType.VIDEO_STREAMING); - enumTestList.add(SystemCapabilityType.REMOTE_CONTROL); - enumTestList.add(SystemCapabilityType.HMI); - enumTestList.add(SystemCapabilityType.DISPLAY); - enumTestList.add(SystemCapabilityType.AUDIO_PASSTHROUGH); - enumTestList.add(SystemCapabilityType.BUTTON); - enumTestList.add(SystemCapabilityType.HMI_ZONE); - enumTestList.add(SystemCapabilityType.PRESET_BANK); - enumTestList.add(SystemCapabilityType.SOFTBUTTON); - enumTestList.add(SystemCapabilityType.SPEECH); - enumTestList.add(SystemCapabilityType.VOICE_RECOGNITION); - enumTestList.add(SystemCapabilityType.PCM_STREAMING); - enumTestList.add(SystemCapabilityType.APP_SERVICES); - enumTestList.add(SystemCapabilityType.SEAT_LOCATION); - enumTestList.add(SystemCapabilityType.PRERECORDED_SPEECH); - enumTestList.add(SystemCapabilityType.DISPLAYS); - enumTestList.add(SystemCapabilityType.DRIVER_DISTRACTION); + List<SystemCapabilityType> enumTestList = new ArrayList<SystemCapabilityType>(); + enumTestList.add(SystemCapabilityType.NAVIGATION); + enumTestList.add(SystemCapabilityType.PHONE_CALL); + enumTestList.add(SystemCapabilityType.VIDEO_STREAMING); + enumTestList.add(SystemCapabilityType.REMOTE_CONTROL); + enumTestList.add(SystemCapabilityType.HMI); + enumTestList.add(SystemCapabilityType.DISPLAY); + enumTestList.add(SystemCapabilityType.AUDIO_PASSTHROUGH); + enumTestList.add(SystemCapabilityType.BUTTON); + enumTestList.add(SystemCapabilityType.HMI_ZONE); + enumTestList.add(SystemCapabilityType.PRESET_BANK); + enumTestList.add(SystemCapabilityType.SOFTBUTTON); + enumTestList.add(SystemCapabilityType.SPEECH); + enumTestList.add(SystemCapabilityType.VOICE_RECOGNITION); + enumTestList.add(SystemCapabilityType.PCM_STREAMING); + enumTestList.add(SystemCapabilityType.APP_SERVICES); + enumTestList.add(SystemCapabilityType.SEAT_LOCATION); + enumTestList.add(SystemCapabilityType.PRERECORDED_SPEECH); + enumTestList.add(SystemCapabilityType.DISPLAYS); + enumTestList.add(SystemCapabilityType.DRIVER_DISTRACTION); - assertTrue("Enum value list does not match enum class list", - enumValueList.containsAll(enumTestList) && enumTestList.containsAll(enumValueList)); - } + assertTrue("Enum value list does not match enum class list", + enumValueList.containsAll(enumTestList) && enumTestList.containsAll(enumValueList)); + } }
\ No newline at end of file diff --git a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/SystemContextTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/SystemContextTests.java index 00e8477ac..9998227bd 100644 --- a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/SystemContextTests.java +++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/SystemContextTests.java @@ -9,75 +9,73 @@ import java.util.Arrays; import java.util.List; /** - * This is a unit test class for the SmartDeviceLink library project class : + * This is a unit test class for the SmartDeviceLink library project class : * {@link com.smartdevicelink.proxy.rpc.enums.SystemContext} */ public class SystemContextTests extends TestCase { - /** - * Verifies that the enum values are not null upon valid assignment. - */ - public void testValidEnums () { - String example = "MAIN"; - SystemContext enumMain = SystemContext.valueForString(example); - example = "VRSESSION"; - SystemContext enumVrSession = SystemContext.valueForString(example); - example = "MENU"; - SystemContext enumMenu = SystemContext.valueForString(example); - example = "HMI_OBSCURED"; - SystemContext enumHmiObscured = SystemContext.valueForString(example); - example = "ALERT"; - SystemContext enumAlert = SystemContext.valueForString(example); - - assertNotNull("MAIN returned null", enumMain); - assertNotNull("VRSESSION returned null", enumVrSession); - assertNotNull("MENU returned null", enumMenu); - assertNotNull("HMI_OBSCURED returned null", enumHmiObscured); - assertNotNull("ALERT returned null", enumAlert); - } + /** + * Verifies that the enum values are not null upon valid assignment. + */ + public void testValidEnums() { + String example = "MAIN"; + SystemContext enumMain = SystemContext.valueForString(example); + example = "VRSESSION"; + SystemContext enumVrSession = SystemContext.valueForString(example); + example = "MENU"; + SystemContext enumMenu = SystemContext.valueForString(example); + example = "HMI_OBSCURED"; + SystemContext enumHmiObscured = SystemContext.valueForString(example); + example = "ALERT"; + SystemContext enumAlert = SystemContext.valueForString(example); - /** - * Verifies that an invalid assignment is null. - */ - public void testInvalidEnum () { - String example = "mAIn"; - try { - SystemContext temp = SystemContext.valueForString(example); + assertNotNull("MAIN returned null", enumMain); + assertNotNull("VRSESSION returned null", enumVrSession); + assertNotNull("MENU returned null", enumMenu); + assertNotNull("HMI_OBSCURED returned null", enumHmiObscured); + assertNotNull("ALERT returned null", enumAlert); + } + + /** + * Verifies that an invalid assignment is null. + */ + public void testInvalidEnum() { + String example = "mAIn"; + try { + SystemContext temp = SystemContext.valueForString(example); assertNull("Result of valueForString should be null.", temp); - } - catch (IllegalArgumentException exception) { + } catch (IllegalArgumentException exception) { fail("Invalid enum throws IllegalArgumentException."); - } - } + } + } - /** - * Verifies that a null assignment is invalid. - */ - public void testNullEnum () { - String example = null; - try { - SystemContext temp = SystemContext.valueForString(example); + /** + * Verifies that a null assignment is invalid. + */ + public void testNullEnum() { + String example = null; + try { + SystemContext temp = SystemContext.valueForString(example); assertNull("Result of valueForString should be null.", temp); - } - catch (NullPointerException exception) { + } catch (NullPointerException exception) { fail("Null string throws NullPointerException."); - } - } + } + } + + /** + * Verifies the possible enum values of SystemContext. + */ + public void testListEnum() { + List<SystemContext> enumValueList = Arrays.asList(SystemContext.values()); - /** - * Verifies the possible enum values of SystemContext. - */ - public void testListEnum() { - List<SystemContext> enumValueList = Arrays.asList(SystemContext.values()); + List<SystemContext> enumTestList = new ArrayList<SystemContext>(); + enumTestList.add(SystemContext.SYSCTXT_MAIN); + enumTestList.add(SystemContext.SYSCTXT_VRSESSION); + enumTestList.add(SystemContext.SYSCTXT_MENU); + enumTestList.add(SystemContext.SYSCTXT_HMI_OBSCURED); + enumTestList.add(SystemContext.SYSCTXT_ALERT); - List<SystemContext> enumTestList = new ArrayList<SystemContext>(); - enumTestList.add(SystemContext.SYSCTXT_MAIN); - enumTestList.add(SystemContext.SYSCTXT_VRSESSION); - enumTestList.add(SystemContext.SYSCTXT_MENU); - enumTestList.add(SystemContext.SYSCTXT_HMI_OBSCURED); - enumTestList.add(SystemContext.SYSCTXT_ALERT); - - assertTrue("Enum value list does not match enum class list", - enumValueList.containsAll(enumTestList) && enumTestList.containsAll(enumValueList)); - } + assertTrue("Enum value list does not match enum class list", + enumValueList.containsAll(enumTestList) && enumTestList.containsAll(enumValueList)); + } }
\ No newline at end of file diff --git a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/TPMSTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/TPMSTests.java index c573a0d7a..cfdf1e718 100644 --- a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/TPMSTests.java +++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/TPMSTests.java @@ -14,82 +14,80 @@ import java.util.List; */ public class TPMSTests extends TestCase { - /** - * Verifies that the enum values are not null upon valid assignment. - */ - public void testValidEnums () { - String example = "UNKNOWN"; - TPMS unknown = TPMS.valueForString(example); - example = "SYSTEM_FAULT"; - TPMS systemFault = TPMS.valueForString(example); - example = "SENSOR_FAULT"; - TPMS sensorFault = TPMS.valueForString(example); - example = "LOW"; - TPMS low = TPMS.valueForString(example); - example = "SYSTEM_ACTIVE"; - TPMS systemActive = TPMS.valueForString(example); - example = "TRAIN"; - TPMS train = TPMS.valueForString(example); - example = "TRAINING_COMPLETE"; - TPMS trainingComplete = TPMS.valueForString(example); - example = "NOT_TRAINED"; - TPMS notTrained = TPMS.valueForString(example); + /** + * Verifies that the enum values are not null upon valid assignment. + */ + public void testValidEnums() { + String example = "UNKNOWN"; + TPMS unknown = TPMS.valueForString(example); + example = "SYSTEM_FAULT"; + TPMS systemFault = TPMS.valueForString(example); + example = "SENSOR_FAULT"; + TPMS sensorFault = TPMS.valueForString(example); + example = "LOW"; + TPMS low = TPMS.valueForString(example); + example = "SYSTEM_ACTIVE"; + TPMS systemActive = TPMS.valueForString(example); + example = "TRAIN"; + TPMS train = TPMS.valueForString(example); + example = "TRAINING_COMPLETE"; + TPMS trainingComplete = TPMS.valueForString(example); + example = "NOT_TRAINED"; + TPMS notTrained = TPMS.valueForString(example); - assertNotNull("UNKNOWN returned null", unknown); - assertNotNull("SYSTEM_FAULT returned null", systemFault); - assertNotNull("SENSOR_FAULT returned null", sensorFault); - assertNotNull("LOW returned null", low); - assertNotNull("SYSTEM_ACTIVE returned null", systemActive); - assertNotNull("TRAIN returned null", train); - assertNotNull("TRAINING_COMPLETE returned null", trainingComplete); - assertNotNull("NOT_TRAINED returned null", notTrained); - } + assertNotNull("UNKNOWN returned null", unknown); + assertNotNull("SYSTEM_FAULT returned null", systemFault); + assertNotNull("SENSOR_FAULT returned null", sensorFault); + assertNotNull("LOW returned null", low); + assertNotNull("SYSTEM_ACTIVE returned null", systemActive); + assertNotNull("TRAIN returned null", train); + assertNotNull("TRAINING_COMPLETE returned null", trainingComplete); + assertNotNull("NOT_TRAINED returned null", notTrained); + } - /** - * Verifies that an invalid assignment is null. - */ - public void testInvalidEnum () { - String example = "IsHoUldBeNulL"; - try { - TPMS temp = TPMS.valueForString(example); - assertNull("Result of valueForString should be null.", temp); - } - catch (IllegalArgumentException exception) { - fail("Invalid enum throws IllegalArgumentException."); - } - } + /** + * Verifies that an invalid assignment is null. + */ + public void testInvalidEnum() { + String example = "IsHoUldBeNulL"; + try { + TPMS temp = TPMS.valueForString(example); + assertNull("Result of valueForString should be null.", temp); + } catch (IllegalArgumentException exception) { + fail("Invalid enum throws IllegalArgumentException."); + } + } - /** - * Verifies that a null assignment is invalid. - */ - public void testNullEnum () { - String example = null; - try { - TPMS temp = TPMS.valueForString(example); - assertNull("Result of valueForString should be null.", temp); - } - catch (NullPointerException exception) { - fail("Null string throws NullPointerException."); - } - } + /** + * Verifies that a null assignment is invalid. + */ + public void testNullEnum() { + String example = null; + try { + TPMS temp = TPMS.valueForString(example); + assertNull("Result of valueForString should be null.", temp); + } catch (NullPointerException exception) { + fail("Null string throws NullPointerException."); + } + } - /** - * Verifies the possible enum values of TPMS. - */ - public void testListEnum() { - List<TPMS> enumValueList = Arrays.asList(TPMS.values()); + /** + * Verifies the possible enum values of TPMS. + */ + public void testListEnum() { + List<TPMS> enumValueList = Arrays.asList(TPMS.values()); - List<TPMS> enumTestList = new ArrayList<>(); - enumTestList.add(TPMS.UNKNOWN); - enumTestList.add(TPMS.SYSTEM_FAULT); - enumTestList.add(TPMS.SENSOR_FAULT); - enumTestList.add(TPMS.LOW); - enumTestList.add(TPMS.SYSTEM_ACTIVE); - enumTestList.add(TPMS.TRAIN); - enumTestList.add(TPMS.TRAINING_COMPLETE); - enumTestList.add(TPMS.NOT_TRAINED); + List<TPMS> enumTestList = new ArrayList<>(); + enumTestList.add(TPMS.UNKNOWN); + enumTestList.add(TPMS.SYSTEM_FAULT); + enumTestList.add(TPMS.SENSOR_FAULT); + enumTestList.add(TPMS.LOW); + enumTestList.add(TPMS.SYSTEM_ACTIVE); + enumTestList.add(TPMS.TRAIN); + enumTestList.add(TPMS.TRAINING_COMPLETE); + enumTestList.add(TPMS.NOT_TRAINED); - assertTrue("Enum value list does not match enum class list", - enumValueList.containsAll(enumTestList) && enumTestList.containsAll(enumValueList)); - } + assertTrue("Enum value list does not match enum class list", + enumValueList.containsAll(enumTestList) && enumTestList.containsAll(enumValueList)); + } }
\ No newline at end of file diff --git a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/TbtStateTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/TbtStateTests.java index ff6be4608..8d87cda82 100644 --- a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/TbtStateTests.java +++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/TbtStateTests.java @@ -9,95 +9,93 @@ import java.util.Arrays; import java.util.List; /** - * This is a unit test class for the SmartDeviceLink library project class : + * This is a unit test class for the SmartDeviceLink library project class : * {@link com.smartdevicelink.proxy.rpc.enums.TBTState} */ public class TbtStateTests extends TestCase { - /** - * Verifies that the enum values are not null upon valid assignment. - */ - public void testValidEnums () { - String example = "ROUTE_UPDATE_REQUEST"; - TBTState enumRouteUpdateRequest = TBTState.valueForString(example); - example = "ROUTE_ACCEPTED"; - TBTState enumRouteAccepted = TBTState.valueForString(example); - example = "ROUTE_REFUSED"; - TBTState enumRouteRefused = TBTState.valueForString(example); - example = "ROUTE_CANCELLED"; - TBTState enumRouteCancelled = TBTState.valueForString(example); - example = "ETA_REQUEST"; - TBTState enumEtaEquest = TBTState.valueForString(example); - example = "NEXT_TURN_REQUEST"; - TBTState enumNextTurnRequest = TBTState.valueForString(example); - example = "ROUTE_STATUS_REQUEST"; - TBTState enumRouteStatusRequest = TBTState.valueForString(example); - example = "ROUTE_SUMMARY_REQUEST"; - TBTState enumRouteSummaryRequest = TBTState.valueForString(example); - example = "TRIP_STATUS_REQUEST"; - TBTState enumTripStatusRequest = TBTState.valueForString(example); - example = "ROUTE_UPDATE_REQUEST_TIMEOUT"; - TBTState enumRouteUpdateRequestTimeout = TBTState.valueForString(example); - - assertNotNull("ROUTE_UPDATE_REQUEST returned null", enumRouteUpdateRequest); - assertNotNull("ROUTE_ACCEPTED returned null", enumRouteAccepted); - assertNotNull("ROUTE_REFUSED returned null", enumRouteRefused); - assertNotNull("ROUTE_CANCELLED returned null", enumRouteCancelled); - assertNotNull("ETA_REQUEST returned null", enumEtaEquest); - assertNotNull("NEXT_TURN_REQUEST returned null", enumNextTurnRequest); - assertNotNull("ROUTE_STATUS_REQUEST returned null", enumRouteStatusRequest); - assertNotNull("ROUTE_SUMMARY_REQUEST returned null", enumRouteSummaryRequest); - assertNotNull("TRIP_STATUS_REQUEST returned null", enumTripStatusRequest); - assertNotNull("ROUTE_UPDATE_REQUEST_TIMEOUT returned null", enumRouteUpdateRequestTimeout); - } + /** + * Verifies that the enum values are not null upon valid assignment. + */ + public void testValidEnums() { + String example = "ROUTE_UPDATE_REQUEST"; + TBTState enumRouteUpdateRequest = TBTState.valueForString(example); + example = "ROUTE_ACCEPTED"; + TBTState enumRouteAccepted = TBTState.valueForString(example); + example = "ROUTE_REFUSED"; + TBTState enumRouteRefused = TBTState.valueForString(example); + example = "ROUTE_CANCELLED"; + TBTState enumRouteCancelled = TBTState.valueForString(example); + example = "ETA_REQUEST"; + TBTState enumEtaEquest = TBTState.valueForString(example); + example = "NEXT_TURN_REQUEST"; + TBTState enumNextTurnRequest = TBTState.valueForString(example); + example = "ROUTE_STATUS_REQUEST"; + TBTState enumRouteStatusRequest = TBTState.valueForString(example); + example = "ROUTE_SUMMARY_REQUEST"; + TBTState enumRouteSummaryRequest = TBTState.valueForString(example); + example = "TRIP_STATUS_REQUEST"; + TBTState enumTripStatusRequest = TBTState.valueForString(example); + example = "ROUTE_UPDATE_REQUEST_TIMEOUT"; + TBTState enumRouteUpdateRequestTimeout = TBTState.valueForString(example); - /** - * Verifies that an invalid assignment is null. - */ - public void testInvalidEnum () { - String example = "rOUte_UpDAte_reQuesT"; - try { - TBTState temp = TBTState.valueForString(example); + assertNotNull("ROUTE_UPDATE_REQUEST returned null", enumRouteUpdateRequest); + assertNotNull("ROUTE_ACCEPTED returned null", enumRouteAccepted); + assertNotNull("ROUTE_REFUSED returned null", enumRouteRefused); + assertNotNull("ROUTE_CANCELLED returned null", enumRouteCancelled); + assertNotNull("ETA_REQUEST returned null", enumEtaEquest); + assertNotNull("NEXT_TURN_REQUEST returned null", enumNextTurnRequest); + assertNotNull("ROUTE_STATUS_REQUEST returned null", enumRouteStatusRequest); + assertNotNull("ROUTE_SUMMARY_REQUEST returned null", enumRouteSummaryRequest); + assertNotNull("TRIP_STATUS_REQUEST returned null", enumTripStatusRequest); + assertNotNull("ROUTE_UPDATE_REQUEST_TIMEOUT returned null", enumRouteUpdateRequestTimeout); + } + + /** + * Verifies that an invalid assignment is null. + */ + public void testInvalidEnum() { + String example = "rOUte_UpDAte_reQuesT"; + try { + TBTState temp = TBTState.valueForString(example); assertNull("Result of valueForString should be null.", temp); - } - catch (IllegalArgumentException exception) { + } catch (IllegalArgumentException exception) { fail("Invalid enum throws IllegalArgumentException."); - } - } + } + } - /** - * Verifies that a null assignment is invalid. - */ - public void testNullEnum () { - String example = null; - try { - TBTState temp = TBTState.valueForString(example); + /** + * Verifies that a null assignment is invalid. + */ + public void testNullEnum() { + String example = null; + try { + TBTState temp = TBTState.valueForString(example); assertNull("Result of valueForString should be null.", temp); - } - catch (NullPointerException exception) { + } catch (NullPointerException exception) { fail("Null string throws NullPointerException."); - } - } + } + } - /** - * Verifies the possible enum values of TBTState. - */ - public void testListEnum() { - List<TBTState> enumValueList = Arrays.asList(TBTState.values()); + /** + * Verifies the possible enum values of TBTState. + */ + public void testListEnum() { + List<TBTState> enumValueList = Arrays.asList(TBTState.values()); - List<TBTState> enumTestList = new ArrayList<TBTState>(); - enumTestList.add(TBTState.ROUTE_UPDATE_REQUEST); - enumTestList.add(TBTState.ROUTE_ACCEPTED); - enumTestList.add(TBTState.ROUTE_REFUSED); - enumTestList.add(TBTState.ROUTE_CANCELLED); - enumTestList.add(TBTState.ETA_REQUEST); - enumTestList.add(TBTState.NEXT_TURN_REQUEST); - enumTestList.add(TBTState.ROUTE_STATUS_REQUEST); - enumTestList.add(TBTState.ROUTE_SUMMARY_REQUEST); - enumTestList.add(TBTState.TRIP_STATUS_REQUEST); - enumTestList.add(TBTState.ROUTE_UPDATE_REQUEST_TIMEOUT); + List<TBTState> enumTestList = new ArrayList<TBTState>(); + enumTestList.add(TBTState.ROUTE_UPDATE_REQUEST); + enumTestList.add(TBTState.ROUTE_ACCEPTED); + enumTestList.add(TBTState.ROUTE_REFUSED); + enumTestList.add(TBTState.ROUTE_CANCELLED); + enumTestList.add(TBTState.ETA_REQUEST); + enumTestList.add(TBTState.NEXT_TURN_REQUEST); + enumTestList.add(TBTState.ROUTE_STATUS_REQUEST); + enumTestList.add(TBTState.ROUTE_SUMMARY_REQUEST); + enumTestList.add(TBTState.TRIP_STATUS_REQUEST); + enumTestList.add(TBTState.ROUTE_UPDATE_REQUEST_TIMEOUT); - assertTrue("Enum value list does not match enum class list", - enumValueList.containsAll(enumTestList) && enumTestList.containsAll(enumValueList)); - } + assertTrue("Enum value list does not match enum class list", + enumValueList.containsAll(enumTestList) && enumTestList.containsAll(enumValueList)); + } }
\ No newline at end of file diff --git a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/TextAlignmentTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/TextAlignmentTests.java index 57512eb45..7ec1e131d 100644 --- a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/TextAlignmentTests.java +++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/TextAlignmentTests.java @@ -9,67 +9,65 @@ import java.util.Arrays; import java.util.List; /** - * This is a unit test class for the SmartDeviceLink library project class : + * This is a unit test class for the SmartDeviceLink library project class : * {@link com.smartdevicelink.proxy.rpc.enums.TextAlignment} */ public class TextAlignmentTests extends TestCase { - /** - * Verifies that the enum values are not null upon valid assignment. - */ - public void testValidEnums () { - String example = "LEFT_ALIGNED"; - TextAlignment enumLeftAligned = TextAlignment.valueForString(example); - example = "RIGHT_ALIGNED"; - TextAlignment enumRightAligned = TextAlignment.valueForString(example); - example = "CENTERED"; - TextAlignment enumCentered = TextAlignment.valueForString(example); - - assertNotNull("LEFT_ALIGNED returned null", enumLeftAligned); - assertNotNull("RIGHT_ALIGNED returned null", enumRightAligned); - assertNotNull("CENTERED returned null", enumCentered); - } + /** + * Verifies that the enum values are not null upon valid assignment. + */ + public void testValidEnums() { + String example = "LEFT_ALIGNED"; + TextAlignment enumLeftAligned = TextAlignment.valueForString(example); + example = "RIGHT_ALIGNED"; + TextAlignment enumRightAligned = TextAlignment.valueForString(example); + example = "CENTERED"; + TextAlignment enumCentered = TextAlignment.valueForString(example); - /** - * Verifies that an invalid assignment is null. - */ - public void testInvalidEnum () { - String example = "leFT_AliGned"; - try { - TextAlignment temp = TextAlignment.valueForString(example); + assertNotNull("LEFT_ALIGNED returned null", enumLeftAligned); + assertNotNull("RIGHT_ALIGNED returned null", enumRightAligned); + assertNotNull("CENTERED returned null", enumCentered); + } + + /** + * Verifies that an invalid assignment is null. + */ + public void testInvalidEnum() { + String example = "leFT_AliGned"; + try { + TextAlignment temp = TextAlignment.valueForString(example); assertNull("Result of valueForString should be null.", temp); - } - catch (IllegalArgumentException exception) { + } catch (IllegalArgumentException exception) { fail("Invalid enum throws IllegalArgumentException."); - } - } + } + } - /** - * Verifies that a null assignment is invalid. - */ - public void testNullEnum () { - String example = null; - try { - TextAlignment temp = TextAlignment.valueForString(example); + /** + * Verifies that a null assignment is invalid. + */ + public void testNullEnum() { + String example = null; + try { + TextAlignment temp = TextAlignment.valueForString(example); assertNull("Result of valueForString should be null.", temp); - } - catch (NullPointerException exception) { + } catch (NullPointerException exception) { fail("Null string throws NullPointerException."); - } - } + } + } - /** - * Verifies the possible enum values of TextAlignment. - */ - public void testListEnum() { - List<TextAlignment> enumValueList = Arrays.asList(TextAlignment.values()); + /** + * Verifies the possible enum values of TextAlignment. + */ + public void testListEnum() { + List<TextAlignment> enumValueList = Arrays.asList(TextAlignment.values()); - List<TextAlignment> enumTestList = new ArrayList<TextAlignment>(); - enumTestList.add(TextAlignment.LEFT_ALIGNED); - enumTestList.add(TextAlignment.RIGHT_ALIGNED); - enumTestList.add(TextAlignment.CENTERED); + List<TextAlignment> enumTestList = new ArrayList<TextAlignment>(); + enumTestList.add(TextAlignment.LEFT_ALIGNED); + enumTestList.add(TextAlignment.RIGHT_ALIGNED); + enumTestList.add(TextAlignment.CENTERED); - assertTrue("Enum value list does not match enum class list", - enumValueList.containsAll(enumTestList) && enumTestList.containsAll(enumValueList)); - } + assertTrue("Enum value list does not match enum class list", + enumValueList.containsAll(enumTestList) && enumTestList.containsAll(enumValueList)); + } }
\ No newline at end of file diff --git a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/TextFieldNameTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/TextFieldNameTests.java index 8c8122fd8..0eb05f848 100644 --- a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/TextFieldNameTests.java +++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/TextFieldNameTests.java @@ -10,176 +10,174 @@ import java.util.Arrays; import java.util.List; /** - * This is a unit test class for the SmartDeviceLink library project class : + * This is a unit test class for the SmartDeviceLink library project class : * {@link com.smartdevicelink.proxy.rpc.enums.TextFieldName} */ public class TextFieldNameTests extends TestCase { - /** - * Verifies that the enum values are not null upon valid assignment. - */ - public void testValidEnums () { - String example = "mainField1"; - TextFieldName enumMainField1 = TextFieldName.valueForString(example); - example = "mainField2"; - TextFieldName enumMainField2 = TextFieldName.valueForString(example); - example = "mainField3"; - TextFieldName enumMainField3 = TextFieldName.valueForString(example); - example = "mainField4"; - TextFieldName enumMainField4 = TextFieldName.valueForString(example); - example = "statusBar"; - TextFieldName enumStatusBar = TextFieldName.valueForString(example); - example = "mediaClock"; - TextFieldName enumMediaClock = TextFieldName.valueForString(example); - example = "mediaTrack"; - TextFieldName enumMediaTrack = TextFieldName.valueForString(example); - example = "alertText1"; - TextFieldName enumAlertText1 = TextFieldName.valueForString(example); - example = "alertText2"; - TextFieldName enumAlertText2 = TextFieldName.valueForString(example); - example = "alertText3"; - TextFieldName enumAlertText3 = TextFieldName.valueForString(example); - example = "scrollableMessageBody"; - TextFieldName enumScrollableMessageBody = TextFieldName.valueForString(example); - example = "initialInteractionText"; - TextFieldName enumInitialInteractionText = TextFieldName.valueForString(example); - example = "navigationText1"; - TextFieldName enumNavigationText1 = TextFieldName.valueForString(example); - example = "navigationText2"; - TextFieldName enumNavigationText2 = TextFieldName.valueForString(example); - example = "ETA"; - TextFieldName enumEta = TextFieldName.valueForString(example); - example = "totalDistance"; - TextFieldName enumTotalDistance = TextFieldName.valueForString(example); - example = "audioPassThruDisplayText1"; - TextFieldName enumAudioPassThruDisplayText1 = TextFieldName.valueForString(example); - example = "audioPassThruDisplayText2"; - TextFieldName enumAudioPassThruDisplayText2 = TextFieldName.valueForString(example); - example = "sliderHeader"; - TextFieldName enumSliderHeader = TextFieldName.valueForString(example); - example = "sliderFooter"; - TextFieldName enumSliderFooter = TextFieldName.valueForString(example); - example = "menuName"; - TextFieldName enumMenuName = TextFieldName.valueForString(example); - example = "secondaryText"; - TextFieldName enumSecondaryText = TextFieldName.valueForString(example); - example = "tertiaryText"; - TextFieldName enumTertiaryText = TextFieldName.valueForString(example); - example = "menuTitle"; - TextFieldName enumMenuTitle = TextFieldName.valueForString(example); - example = "locationName"; - TextFieldName enumLocName = TextFieldName.valueForString(example); - example = "locationDescription"; - TextFieldName enumLocDesc = TextFieldName.valueForString(example); - example = "addressLines"; - TextFieldName enumAddLines = TextFieldName.valueForString(example); - example = "phoneNumber"; - TextFieldName enumPhone = TextFieldName.valueForString(example); - example = "templateTitle"; - TextFieldName templateTitle = TextFieldName.valueForString(example); - - assertNotNull("mainField1 returned null", enumMainField1); - assertNotNull("mainField2 returned null", enumMainField2); - assertNotNull("mainField3 returned null", enumMainField3); - assertNotNull("mainField4 returned null", enumMainField4); - assertNotNull("statusBar returned null", enumStatusBar); - assertNotNull("mediaClock returned null", enumMediaClock); - assertNotNull("mediaTrack returned null", enumMediaTrack); - assertNotNull("alertText1 returned null", enumAlertText1); - assertNotNull("alertText2 returned null", enumAlertText2); - assertNotNull("alertText3 returned null", enumAlertText3); - assertNotNull("scrollableMessageBody returned null", enumScrollableMessageBody); - assertNotNull("initialInteractionText returned null", enumInitialInteractionText); - assertNotNull("navigationText1 returned null", enumNavigationText1); - assertNotNull("navigationText2 returned null", enumNavigationText2); - assertNotNull("ETA returned null", enumEta); - assertNotNull("totalDistance returned null", enumTotalDistance); - assertNotNull("audioPassThruDisplayText1 returned null", enumAudioPassThruDisplayText1); - assertNotNull("audioPassThruDisplayText2 returned null", enumAudioPassThruDisplayText2); - assertNotNull("sliderHeader returned null", enumSliderHeader); - assertNotNull("sliderFooter returned null", enumSliderFooter); - assertNotNull("menuName returned null", enumMenuName); - assertNotNull("secondaryText returned null", enumSecondaryText); - assertNotNull("tertiaryText returned null", enumTertiaryText); - assertNotNull("menuTitle returned null", enumMenuTitle); - assertNotNull("templateTitle returned null", templateTitle); + /** + * Verifies that the enum values are not null upon valid assignment. + */ + public void testValidEnums() { + String example = "mainField1"; + TextFieldName enumMainField1 = TextFieldName.valueForString(example); + example = "mainField2"; + TextFieldName enumMainField2 = TextFieldName.valueForString(example); + example = "mainField3"; + TextFieldName enumMainField3 = TextFieldName.valueForString(example); + example = "mainField4"; + TextFieldName enumMainField4 = TextFieldName.valueForString(example); + example = "statusBar"; + TextFieldName enumStatusBar = TextFieldName.valueForString(example); + example = "mediaClock"; + TextFieldName enumMediaClock = TextFieldName.valueForString(example); + example = "mediaTrack"; + TextFieldName enumMediaTrack = TextFieldName.valueForString(example); + example = "alertText1"; + TextFieldName enumAlertText1 = TextFieldName.valueForString(example); + example = "alertText2"; + TextFieldName enumAlertText2 = TextFieldName.valueForString(example); + example = "alertText3"; + TextFieldName enumAlertText3 = TextFieldName.valueForString(example); + example = "scrollableMessageBody"; + TextFieldName enumScrollableMessageBody = TextFieldName.valueForString(example); + example = "initialInteractionText"; + TextFieldName enumInitialInteractionText = TextFieldName.valueForString(example); + example = "navigationText1"; + TextFieldName enumNavigationText1 = TextFieldName.valueForString(example); + example = "navigationText2"; + TextFieldName enumNavigationText2 = TextFieldName.valueForString(example); + example = "ETA"; + TextFieldName enumEta = TextFieldName.valueForString(example); + example = "totalDistance"; + TextFieldName enumTotalDistance = TextFieldName.valueForString(example); + example = "audioPassThruDisplayText1"; + TextFieldName enumAudioPassThruDisplayText1 = TextFieldName.valueForString(example); + example = "audioPassThruDisplayText2"; + TextFieldName enumAudioPassThruDisplayText2 = TextFieldName.valueForString(example); + example = "sliderHeader"; + TextFieldName enumSliderHeader = TextFieldName.valueForString(example); + example = "sliderFooter"; + TextFieldName enumSliderFooter = TextFieldName.valueForString(example); + example = "menuName"; + TextFieldName enumMenuName = TextFieldName.valueForString(example); + example = "secondaryText"; + TextFieldName enumSecondaryText = TextFieldName.valueForString(example); + example = "tertiaryText"; + TextFieldName enumTertiaryText = TextFieldName.valueForString(example); + example = "menuTitle"; + TextFieldName enumMenuTitle = TextFieldName.valueForString(example); + example = "locationName"; + TextFieldName enumLocName = TextFieldName.valueForString(example); + example = "locationDescription"; + TextFieldName enumLocDesc = TextFieldName.valueForString(example); + example = "addressLines"; + TextFieldName enumAddLines = TextFieldName.valueForString(example); + example = "phoneNumber"; + TextFieldName enumPhone = TextFieldName.valueForString(example); + example = "templateTitle"; + TextFieldName templateTitle = TextFieldName.valueForString(example); + assertNotNull("mainField1 returned null", enumMainField1); + assertNotNull("mainField2 returned null", enumMainField2); + assertNotNull("mainField3 returned null", enumMainField3); + assertNotNull("mainField4 returned null", enumMainField4); + assertNotNull("statusBar returned null", enumStatusBar); + assertNotNull("mediaClock returned null", enumMediaClock); + assertNotNull("mediaTrack returned null", enumMediaTrack); + assertNotNull("alertText1 returned null", enumAlertText1); + assertNotNull("alertText2 returned null", enumAlertText2); + assertNotNull("alertText3 returned null", enumAlertText3); + assertNotNull("scrollableMessageBody returned null", enumScrollableMessageBody); + assertNotNull("initialInteractionText returned null", enumInitialInteractionText); + assertNotNull("navigationText1 returned null", enumNavigationText1); + assertNotNull("navigationText2 returned null", enumNavigationText2); + assertNotNull("ETA returned null", enumEta); + assertNotNull("totalDistance returned null", enumTotalDistance); + assertNotNull("audioPassThruDisplayText1 returned null", enumAudioPassThruDisplayText1); + assertNotNull("audioPassThruDisplayText2 returned null", enumAudioPassThruDisplayText2); + assertNotNull("sliderHeader returned null", enumSliderHeader); + assertNotNull("sliderFooter returned null", enumSliderFooter); + assertNotNull("menuName returned null", enumMenuName); + assertNotNull("secondaryText returned null", enumSecondaryText); + assertNotNull("tertiaryText returned null", enumTertiaryText); + assertNotNull("menuTitle returned null", enumMenuTitle); + assertNotNull("templateTitle returned null", templateTitle); - assertNotNull(TestValues.NOT_NULL, enumLocName); - assertNotNull(TestValues.NOT_NULL, enumLocDesc); - assertNotNull(TestValues.NOT_NULL, enumAddLines); - assertNotNull(TestValues.NOT_NULL, enumPhone); - } - /** - * Verifies that an invalid assignment is null. - */ - public void testInvalidEnum () { - String example = "mAinField1"; - try { - TextFieldName temp = TextFieldName.valueForString(example); + assertNotNull(TestValues.NOT_NULL, enumLocName); + assertNotNull(TestValues.NOT_NULL, enumLocDesc); + assertNotNull(TestValues.NOT_NULL, enumAddLines); + assertNotNull(TestValues.NOT_NULL, enumPhone); + } + + /** + * Verifies that an invalid assignment is null. + */ + public void testInvalidEnum() { + String example = "mAinField1"; + try { + TextFieldName temp = TextFieldName.valueForString(example); assertNull("Result of valueForString should be null.", temp); - } - catch (IllegalArgumentException exception) { + } catch (IllegalArgumentException exception) { fail("Invalid enum throws IllegalArgumentException."); - } - } + } + } - /** - * Verifies that a null assignment is invalid. - */ - public void testNullEnum () { - String example = null; - try { - TextFieldName temp = TextFieldName.valueForString(example); + /** + * Verifies that a null assignment is invalid. + */ + public void testNullEnum() { + String example = null; + try { + TextFieldName temp = TextFieldName.valueForString(example); assertNull("Result of valueForString should be null.", temp); - } - catch (NullPointerException exception) { + } catch (NullPointerException exception) { fail("Null string throws NullPointerException."); - } - } + } + } - /** - * Verifies the possible enum values of TextFieldName. - */ - public void testListEnum() { - List<TextFieldName> enumValueList = Arrays.asList(TextFieldName.values()); + /** + * Verifies the possible enum values of TextFieldName. + */ + public void testListEnum() { + List<TextFieldName> enumValueList = Arrays.asList(TextFieldName.values()); - List<TextFieldName> enumTestList = new ArrayList<TextFieldName>(); - enumTestList.add(TextFieldName.mainField1); - enumTestList.add(TextFieldName.mainField2); - enumTestList.add(TextFieldName.mainField3); - enumTestList.add(TextFieldName.mainField4); - enumTestList.add(TextFieldName.statusBar); - enumTestList.add(TextFieldName.mediaClock); - enumTestList.add(TextFieldName.mediaTrack); - enumTestList.add(TextFieldName.alertText1); - enumTestList.add(TextFieldName.alertText2); - enumTestList.add(TextFieldName.alertText3); - enumTestList.add(TextFieldName.scrollableMessageBody); - enumTestList.add(TextFieldName.initialInteractionText); - enumTestList.add(TextFieldName.navigationText1); - enumTestList.add(TextFieldName.navigationText2); - enumTestList.add(TextFieldName.ETA); - enumTestList.add(TextFieldName.totalDistance); - enumTestList.add(TextFieldName.audioPassThruDisplayText1); - enumTestList.add(TextFieldName.audioPassThruDisplayText2); - enumTestList.add(TextFieldName.sliderHeader); - enumTestList.add(TextFieldName.sliderFooter); - enumTestList.add(TextFieldName.menuName); - enumTestList.add(TextFieldName.secondaryText); - enumTestList.add(TextFieldName.tertiaryText); - enumTestList.add(TextFieldName.menuTitle); - enumTestList.add(TextFieldName.locationName); - enumTestList.add(TextFieldName.locationDescription); - enumTestList.add(TextFieldName.addressLines); - enumTestList.add(TextFieldName.phoneNumber); - enumTestList.add(TextFieldName.templateTitle); - enumTestList.add(TextFieldName.subtleAlertText1); - enumTestList.add(TextFieldName.subtleAlertText2); - enumTestList.add(TextFieldName.subtleAlertSoftButtonText); + List<TextFieldName> enumTestList = new ArrayList<TextFieldName>(); + enumTestList.add(TextFieldName.mainField1); + enumTestList.add(TextFieldName.mainField2); + enumTestList.add(TextFieldName.mainField3); + enumTestList.add(TextFieldName.mainField4); + enumTestList.add(TextFieldName.statusBar); + enumTestList.add(TextFieldName.mediaClock); + enumTestList.add(TextFieldName.mediaTrack); + enumTestList.add(TextFieldName.alertText1); + enumTestList.add(TextFieldName.alertText2); + enumTestList.add(TextFieldName.alertText3); + enumTestList.add(TextFieldName.scrollableMessageBody); + enumTestList.add(TextFieldName.initialInteractionText); + enumTestList.add(TextFieldName.navigationText1); + enumTestList.add(TextFieldName.navigationText2); + enumTestList.add(TextFieldName.ETA); + enumTestList.add(TextFieldName.totalDistance); + enumTestList.add(TextFieldName.audioPassThruDisplayText1); + enumTestList.add(TextFieldName.audioPassThruDisplayText2); + enumTestList.add(TextFieldName.sliderHeader); + enumTestList.add(TextFieldName.sliderFooter); + enumTestList.add(TextFieldName.menuName); + enumTestList.add(TextFieldName.secondaryText); + enumTestList.add(TextFieldName.tertiaryText); + enumTestList.add(TextFieldName.menuTitle); + enumTestList.add(TextFieldName.locationName); + enumTestList.add(TextFieldName.locationDescription); + enumTestList.add(TextFieldName.addressLines); + enumTestList.add(TextFieldName.phoneNumber); + enumTestList.add(TextFieldName.templateTitle); + enumTestList.add(TextFieldName.subtleAlertText1); + enumTestList.add(TextFieldName.subtleAlertText2); + enumTestList.add(TextFieldName.subtleAlertSoftButtonText); - assertTrue("Enum value list does not match enum class list", - enumValueList.containsAll(enumTestList) && enumTestList.containsAll(enumValueList)); - } + assertTrue("Enum value list does not match enum class list", + enumValueList.containsAll(enumTestList) && enumTestList.containsAll(enumValueList)); + } }
\ No newline at end of file diff --git a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/TimerModeTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/TimerModeTests.java index 892159a0d..03f26d543 100644 --- a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/TimerModeTests.java +++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/TimerModeTests.java @@ -46,62 +46,60 @@ import java.util.List; */ public class TimerModeTests extends TestCase { - /** - * Verifies that the enum values are not null upon valid assignment. - */ - public void testValidEnums () { - String example = "UP"; - TimerMode enumUp = TimerMode.valueForString(example); - example = "DOWN"; - TimerMode enumDown = TimerMode.valueForString(example); - example = "NONE"; - TimerMode enumNone = TimerMode.valueForString(example); + /** + * Verifies that the enum values are not null upon valid assignment. + */ + public void testValidEnums() { + String example = "UP"; + TimerMode enumUp = TimerMode.valueForString(example); + example = "DOWN"; + TimerMode enumDown = TimerMode.valueForString(example); + example = "NONE"; + TimerMode enumNone = TimerMode.valueForString(example); - assertNotNull("UP returned null", enumUp); - assertNotNull("DOWN returned null", enumDown); - assertNotNull("NONE returned null", enumNone); - } + assertNotNull("UP returned null", enumUp); + assertNotNull("DOWN returned null", enumDown); + assertNotNull("NONE returned null", enumNone); + } - /** - * Verifies that an invalid assignment is null. - */ - public void testInvalidEnum () { - String example = "NonE"; - try { - TimerMode temp = TimerMode.valueForString(example); - assertNull("Result of valueForString should be null.", temp); - } - catch (IllegalArgumentException exception) { - fail("Invalid enum throws IllegalArgumentException."); - } - } + /** + * Verifies that an invalid assignment is null. + */ + public void testInvalidEnum() { + String example = "NonE"; + try { + TimerMode temp = TimerMode.valueForString(example); + assertNull("Result of valueForString should be null.", temp); + } catch (IllegalArgumentException exception) { + fail("Invalid enum throws IllegalArgumentException."); + } + } - /** - * Verifies that a null assignment is invalid. - */ - public void testNullEnum () { - String example = null; - try { - TimerMode temp = TimerMode.valueForString(example); - assertNull("Result of valueForString should be null.", temp); - } - catch (NullPointerException exception) { - fail("Null string throws NullPointerException."); - } - } + /** + * Verifies that a null assignment is invalid. + */ + public void testNullEnum() { + String example = null; + try { + TimerMode temp = TimerMode.valueForString(example); + assertNull("Result of valueForString should be null.", temp); + } catch (NullPointerException exception) { + fail("Null string throws NullPointerException."); + } + } - /** - * Verifies the possible enum values of TimerMode. - */ - public void testListEnum() { - List<TimerMode> enumValueList = Arrays.asList(TimerMode.values()); + /** + * Verifies the possible enum values of TimerMode. + */ + public void testListEnum() { + List<TimerMode> enumValueList = Arrays.asList(TimerMode.values()); - List<TimerMode> enumTestList = new ArrayList<>(); - enumTestList.add(TimerMode.UP); - enumTestList.add(TimerMode.DOWN); - enumTestList.add(TimerMode.NONE); + List<TimerMode> enumTestList = new ArrayList<>(); + enumTestList.add(TimerMode.UP); + enumTestList.add(TimerMode.DOWN); + enumTestList.add(TimerMode.NONE); - assertTrue("Enum value list does not match enum class list", - enumValueList.containsAll(enumTestList) && enumTestList.containsAll(enumValueList)); - } + assertTrue("Enum value list does not match enum class list", + enumValueList.containsAll(enumTestList) && enumTestList.containsAll(enumValueList)); + } }
\ No newline at end of file diff --git a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/TouchTypeTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/TouchTypeTests.java index db9c417ef..a9dc4aa2b 100644 --- a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/TouchTypeTests.java +++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/TouchTypeTests.java @@ -9,73 +9,71 @@ import java.util.Arrays; import java.util.List; /** - * This is a unit test class for the SmartDeviceLink library project class : + * This is a unit test class for the SmartDeviceLink library project class : * {@link com.smartdevicelink.proxy.rpc.enums.TouchType} */ public class TouchTypeTests extends TestCase { - /** - * Verifies that the enum values are not null upon valid assignment. - */ - public void testValidEnums () { - String example = "BEGIN"; - TouchType enumBegin = TouchType.valueForString(example); - example = "MOVE"; - TouchType enumMove = TouchType.valueForString(example); - example = "END"; - TouchType enumEnd = TouchType.valueForString(example); - example = "CANCEL"; - TouchType enumCancel = TouchType.valueForString(example); + /** + * Verifies that the enum values are not null upon valid assignment. + */ + public void testValidEnums() { + String example = "BEGIN"; + TouchType enumBegin = TouchType.valueForString(example); + example = "MOVE"; + TouchType enumMove = TouchType.valueForString(example); + example = "END"; + TouchType enumEnd = TouchType.valueForString(example); + example = "CANCEL"; + TouchType enumCancel = TouchType.valueForString(example); - assertNotNull("BEGIN returned null", enumBegin); - assertNotNull("MOVE returned null", enumMove); - assertNotNull("END returned null", enumEnd); - assertNotNull("CANCEL returned null", enumCancel); - } + assertNotNull("BEGIN returned null", enumBegin); + assertNotNull("MOVE returned null", enumMove); + assertNotNull("END returned null", enumEnd); + assertNotNull("CANCEL returned null", enumCancel); + } - /** - * Verifies that an invalid assignment is null. - */ - public void testInvalidEnum () { - String example = "bEgIn"; - try { - TouchType temp = TouchType.valueForString(example); + /** + * Verifies that an invalid assignment is null. + */ + public void testInvalidEnum() { + String example = "bEgIn"; + try { + TouchType temp = TouchType.valueForString(example); assertNull("Result of valueForString should be null.", temp); - } - catch (IllegalArgumentException exception) { + } catch (IllegalArgumentException exception) { fail("Invalid enum throws IllegalArgumentException."); - } - } + } + } - /** - * Verifies that a null assignment is invalid. - */ - public void testNullEnum () { - String example = null; - try { - TouchType temp = TouchType.valueForString(example); + /** + * Verifies that a null assignment is invalid. + */ + public void testNullEnum() { + String example = null; + try { + TouchType temp = TouchType.valueForString(example); assertNull("Result of valueForString should be null.", temp); - } - catch (NullPointerException exception) { + } catch (NullPointerException exception) { fail("Null string throws NullPointerException."); - } - } - + } + } - /** - * Verifies the possible enum values of TouchType. - */ - public void testListEnum() { - List<TouchType> enumValueList = Arrays.asList(TouchType.values()); - List<TouchType> enumTestList = new ArrayList<TouchType>(); - enumTestList.add(TouchType.BEGIN); - enumTestList.add(TouchType.MOVE); - enumTestList.add(TouchType.END); - enumTestList.add(TouchType.CANCEL); + /** + * Verifies the possible enum values of TouchType. + */ + public void testListEnum() { + List<TouchType> enumValueList = Arrays.asList(TouchType.values()); - assertTrue("Enum value list does not match enum class list", - enumValueList.containsAll(enumTestList) && enumTestList.containsAll(enumValueList)); - } + List<TouchType> enumTestList = new ArrayList<TouchType>(); + enumTestList.add(TouchType.BEGIN); + enumTestList.add(TouchType.MOVE); + enumTestList.add(TouchType.END); + enumTestList.add(TouchType.CANCEL); + + assertTrue("Enum value list does not match enum class list", + enumValueList.containsAll(enumTestList) && enumTestList.containsAll(enumValueList)); + } }
\ No newline at end of file diff --git a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/TransmissionTypeTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/TransmissionTypeTests.java index 6a21c7cc2..005d57721 100644 --- a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/TransmissionTypeTests.java +++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/TransmissionTypeTests.java @@ -12,7 +12,7 @@ public class TransmissionTypeTests extends TestCase { /** * Verifies that the enum values are not null upon valid assignment. */ - public void testValidEnums () { + public void testValidEnums() { String example = "MANUAL"; TransmissionType manual = TransmissionType.valueForString(example); example = "AUTOMATIC"; @@ -45,13 +45,12 @@ public class TransmissionTypeTests extends TestCase { /** * Verifies that an invalid assignment is null. */ - public void testInvalidEnum () { + public void testInvalidEnum() { String example = "pARk"; try { TransmissionType temp = TransmissionType.valueForString(example); assertNull("Result of valueForString should be null.", temp); - } - catch (IllegalArgumentException exception) { + } catch (IllegalArgumentException exception) { fail("Invalid enum throws IllegalArgumentException."); } } @@ -59,13 +58,12 @@ public class TransmissionTypeTests extends TestCase { /** * Verifies that a null assignment is invalid. */ - public void testNullEnum () { + public void testNullEnum() { String example = null; try { TransmissionType temp = TransmissionType.valueForString(example); assertNull("Result of valueForString should be null.", temp); - } - catch (NullPointerException exception) { + } catch (NullPointerException exception) { fail("Null string throws NullPointerException."); } } diff --git a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/TriggerSourceTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/TriggerSourceTests.java index b4e1c2e16..a24f3ef96 100644 --- a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/TriggerSourceTests.java +++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/TriggerSourceTests.java @@ -9,68 +9,66 @@ import java.util.Arrays; import java.util.List; /** - * This is a unit test class for the SmartDeviceLink library project class : + * This is a unit test class for the SmartDeviceLink library project class : * {@link com.smartdevicelink.proxy.rpc.enums.TriggerSource} */ public class TriggerSourceTests extends TestCase { - /** - * Verifies that the enum values are not null upon valid assignment. - */ - public void testValidEnums () { - String example = "MENU"; - TriggerSource enumMenu = TriggerSource.valueForString(example); - example = "VR"; - TriggerSource enumVr = TriggerSource.valueForString(example); - example = "KEYBOARD"; - TriggerSource enumKeyboard = TriggerSource.valueForString(example); - - assertNotNull("MENU returned null", enumMenu); - assertNotNull("VR returned null", enumVr); - assertNotNull("KEYBOARD returned null", enumKeyboard); - } + /** + * Verifies that the enum values are not null upon valid assignment. + */ + public void testValidEnums() { + String example = "MENU"; + TriggerSource enumMenu = TriggerSource.valueForString(example); + example = "VR"; + TriggerSource enumVr = TriggerSource.valueForString(example); + example = "KEYBOARD"; + TriggerSource enumKeyboard = TriggerSource.valueForString(example); - /** - * Verifies that an invalid assignment is null. - */ - public void testInvalidEnum () { - String example = "meNU"; - try { - TriggerSource temp = TriggerSource.valueForString(example); + assertNotNull("MENU returned null", enumMenu); + assertNotNull("VR returned null", enumVr); + assertNotNull("KEYBOARD returned null", enumKeyboard); + } + + /** + * Verifies that an invalid assignment is null. + */ + public void testInvalidEnum() { + String example = "meNU"; + try { + TriggerSource temp = TriggerSource.valueForString(example); assertNull("Result of valueForString should be null.", temp); - } - catch (IllegalArgumentException exception) { + } catch (IllegalArgumentException exception) { fail("Invalid enum throws IllegalArgumentException."); - } - } + } + } - /** - * Verifies that a null assignment is invalid. - */ - public void testNullEnum () { - String example = null; - try { - TriggerSource temp = TriggerSource.valueForString(example); + /** + * Verifies that a null assignment is invalid. + */ + public void testNullEnum() { + String example = null; + try { + TriggerSource temp = TriggerSource.valueForString(example); assertNull("Result of valueForString should be null.", temp); - } - catch (NullPointerException exception) { + } catch (NullPointerException exception) { fail("Null string throws NullPointerException."); - } - } - + } + } + + + /** + * Verifies the possible enum values of TriggerSource. + */ + public void testListEnum() { + List<TriggerSource> enumValueList = Arrays.asList(TriggerSource.values()); - /** - * Verifies the possible enum values of TriggerSource. - */ - public void testListEnum() { - List<TriggerSource> enumValueList = Arrays.asList(TriggerSource.values()); + List<TriggerSource> enumTestList = new ArrayList<TriggerSource>(); + enumTestList.add(TriggerSource.TS_MENU); + enumTestList.add(TriggerSource.TS_VR); + enumTestList.add(TriggerSource.TS_KEYBOARD); - List<TriggerSource> enumTestList = new ArrayList<TriggerSource>(); - enumTestList.add(TriggerSource.TS_MENU); - enumTestList.add(TriggerSource.TS_VR); - enumTestList.add(TriggerSource.TS_KEYBOARD); - - assertTrue("Enum value list does not match enum class list", - enumValueList.containsAll(enumTestList) && enumTestList.containsAll(enumValueList)); - } + assertTrue("Enum value list does not match enum class list", + enumValueList.containsAll(enumTestList) && enumTestList.containsAll(enumValueList)); + } }
\ No newline at end of file diff --git a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/TurnSignalTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/TurnSignalTests.java index a758d683e..56127dd16 100644 --- a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/TurnSignalTests.java +++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/TurnSignalTests.java @@ -14,66 +14,64 @@ import java.util.List; */ public class TurnSignalTests extends TestCase { - /** - * Verifies that the enum values are not null upon valid assignment. - */ - public void testValidEnums () { - String example = "OFF"; - TurnSignal off = TurnSignal.valueForString(example); - example = "LEFT"; - TurnSignal left = TurnSignal.valueForString(example); - example = "RIGHT"; - TurnSignal right = TurnSignal.valueForString(example); - example = "BOTH"; - TurnSignal both = TurnSignal.valueForString(example); + /** + * Verifies that the enum values are not null upon valid assignment. + */ + public void testValidEnums() { + String example = "OFF"; + TurnSignal off = TurnSignal.valueForString(example); + example = "LEFT"; + TurnSignal left = TurnSignal.valueForString(example); + example = "RIGHT"; + TurnSignal right = TurnSignal.valueForString(example); + example = "BOTH"; + TurnSignal both = TurnSignal.valueForString(example); - assertNotNull("OFF returned null", off); - assertNotNull("LEFT returned null", left); - assertNotNull("RIGHT returned null", right); - assertNotNull("BOTH returned null", both); - } + assertNotNull("OFF returned null", off); + assertNotNull("LEFT returned null", left); + assertNotNull("RIGHT returned null", right); + assertNotNull("BOTH returned null", both); + } - /** - * Verifies that an invalid assignment is null. - */ - public void testInvalidEnum () { - String example = "IsHoUldBeNulL"; - try { - TurnSignal temp = TurnSignal.valueForString(example); - assertNull("Result of valueForString should be null.", temp); - } - catch (IllegalArgumentException exception) { - fail("Invalid enum throws IllegalArgumentException."); - } - } + /** + * Verifies that an invalid assignment is null. + */ + public void testInvalidEnum() { + String example = "IsHoUldBeNulL"; + try { + TurnSignal temp = TurnSignal.valueForString(example); + assertNull("Result of valueForString should be null.", temp); + } catch (IllegalArgumentException exception) { + fail("Invalid enum throws IllegalArgumentException."); + } + } - /** - * Verifies that a null assignment is invalid. - */ - public void testNullEnum () { - String example = null; - try { - TurnSignal temp = TurnSignal.valueForString(example); - assertNull("Result of valueForString should be null.", temp); - } - catch (NullPointerException exception) { - fail("Null string throws NullPointerException."); - } - } + /** + * Verifies that a null assignment is invalid. + */ + public void testNullEnum() { + String example = null; + try { + TurnSignal temp = TurnSignal.valueForString(example); + assertNull("Result of valueForString should be null.", temp); + } catch (NullPointerException exception) { + fail("Null string throws NullPointerException."); + } + } - /** - * Verifies the possible enum values of TurnSignal. - */ - public void testListEnum() { - List<TurnSignal> enumValueList = Arrays.asList(TurnSignal.values()); + /** + * Verifies the possible enum values of TurnSignal. + */ + public void testListEnum() { + List<TurnSignal> enumValueList = Arrays.asList(TurnSignal.values()); - List<TurnSignal> enumTestList = new ArrayList<>(); - enumTestList.add(TurnSignal.OFF); - enumTestList.add(TurnSignal.LEFT); - enumTestList.add(TurnSignal.RIGHT); - enumTestList.add(TurnSignal.BOTH); + List<TurnSignal> enumTestList = new ArrayList<>(); + enumTestList.add(TurnSignal.OFF); + enumTestList.add(TurnSignal.LEFT); + enumTestList.add(TurnSignal.RIGHT); + enumTestList.add(TurnSignal.BOTH); - assertTrue("Enum value list does not match enum class list", - enumValueList.containsAll(enumTestList) && enumTestList.containsAll(enumValueList)); - } + assertTrue("Enum value list does not match enum class list", + enumValueList.containsAll(enumTestList) && enumTestList.containsAll(enumValueList)); + } }
\ No newline at end of file diff --git a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/UpdateModeTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/UpdateModeTests.java index 508282f97..5f7c0548c 100644 --- a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/UpdateModeTests.java +++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/UpdateModeTests.java @@ -9,75 +9,73 @@ import java.util.Arrays; import java.util.List; /** - * This is a unit test class for the SmartDeviceLink library project class : + * This is a unit test class for the SmartDeviceLink library project class : * {@link com.smartdevicelink.proxy.rpc.enums.UpdateMode} */ public class UpdateModeTests extends TestCase { - /** - * Verifies that the enum values are not null upon valid assignment. - */ - public void testValidEnums () { - String example = "COUNTUP"; - UpdateMode enumCountUp = UpdateMode.valueForString(example); - example = "COUNTDOWN"; - UpdateMode enumCountDown = UpdateMode.valueForString(example); - example = "PAUSE"; - UpdateMode enumPause = UpdateMode.valueForString(example); - example = "RESUME"; - UpdateMode enumResume = UpdateMode.valueForString(example); - example = "CLEAR"; - UpdateMode enumClear = UpdateMode.valueForString(example); - - assertNotNull("COUNTUP returned null", enumCountUp); - assertNotNull("COUNTDOWN returned null", enumCountDown); - assertNotNull("PAUSE returned null", enumPause); - assertNotNull("RESUME returned null", enumResume); - assertNotNull("CLEAR returned null", enumClear); - } - - /** - * Verifies that an invalid assignment is null. - */ - public void testInvalidEnum () { - String example = "coUnTUp"; - try { - UpdateMode temp = UpdateMode.valueForString(example); + /** + * Verifies that the enum values are not null upon valid assignment. + */ + public void testValidEnums() { + String example = "COUNTUP"; + UpdateMode enumCountUp = UpdateMode.valueForString(example); + example = "COUNTDOWN"; + UpdateMode enumCountDown = UpdateMode.valueForString(example); + example = "PAUSE"; + UpdateMode enumPause = UpdateMode.valueForString(example); + example = "RESUME"; + UpdateMode enumResume = UpdateMode.valueForString(example); + example = "CLEAR"; + UpdateMode enumClear = UpdateMode.valueForString(example); + + assertNotNull("COUNTUP returned null", enumCountUp); + assertNotNull("COUNTDOWN returned null", enumCountDown); + assertNotNull("PAUSE returned null", enumPause); + assertNotNull("RESUME returned null", enumResume); + assertNotNull("CLEAR returned null", enumClear); + } + + /** + * Verifies that an invalid assignment is null. + */ + public void testInvalidEnum() { + String example = "coUnTUp"; + try { + UpdateMode temp = UpdateMode.valueForString(example); assertNull("Result of valueForString should be null.", temp); - } - catch (IllegalArgumentException exception) { + } catch (IllegalArgumentException exception) { fail("Invalid enum throws IllegalArgumentException."); - } - } - - /** - * Verifies that a null assignment is invalid. - */ - public void testNullEnum () { - String example = null; - try { - UpdateMode temp = UpdateMode.valueForString(example); + } + } + + /** + * Verifies that a null assignment is invalid. + */ + public void testNullEnum() { + String example = null; + try { + UpdateMode temp = UpdateMode.valueForString(example); assertNull("Result of valueForString should be null.", temp); - } - catch (NullPointerException exception) { + } catch (NullPointerException exception) { fail("Null string throws NullPointerException."); - } - } - - /** - * Verifies the possible enum values of UpdateMode. - */ - public void testListEnum() { - List<UpdateMode> enumValueList = Arrays.asList(UpdateMode.values()); + } + } + + /** + * Verifies the possible enum values of UpdateMode. + */ + public void testListEnum() { + List<UpdateMode> enumValueList = Arrays.asList(UpdateMode.values()); - List<UpdateMode> enumTestList = new ArrayList<UpdateMode>(); - enumTestList.add(UpdateMode.COUNTUP); - enumTestList.add(UpdateMode.COUNTDOWN); - enumTestList.add(UpdateMode.PAUSE); - enumTestList.add(UpdateMode.RESUME); - enumTestList.add(UpdateMode.CLEAR); + List<UpdateMode> enumTestList = new ArrayList<UpdateMode>(); + enumTestList.add(UpdateMode.COUNTUP); + enumTestList.add(UpdateMode.COUNTDOWN); + enumTestList.add(UpdateMode.PAUSE); + enumTestList.add(UpdateMode.RESUME); + enumTestList.add(UpdateMode.CLEAR); - assertTrue("Enum value list does not match enum class list", - enumValueList.containsAll(enumTestList) && enumTestList.containsAll(enumValueList)); - } + assertTrue("Enum value list does not match enum class list", + enumValueList.containsAll(enumTestList) && enumTestList.containsAll(enumValueList)); + } }
\ No newline at end of file diff --git a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/VehicleDataActiveStatusTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/VehicleDataActiveStatusTests.java index b6ba15a7a..4f3c89191 100644 --- a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/VehicleDataActiveStatusTests.java +++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/VehicleDataActiveStatusTests.java @@ -46,70 +46,68 @@ import java.util.List; */ public class VehicleDataActiveStatusTests extends TestCase { - /** - * Verifies that the enum values are not null upon valid assignment. - */ - public void testValidEnums () { - String example = "INACTIVE_NOT_CONFIRMED"; - VehicleDataActiveStatus enumInactiveNotConfirmed = VehicleDataActiveStatus.valueForString(example); - example = "INACTIVE_CONFIRMED"; - VehicleDataActiveStatus enumInactiveConfirmed = VehicleDataActiveStatus.valueForString(example); - example = "ACTIVE_NOT_CONFIRMED"; - VehicleDataActiveStatus enumActiveNotConfirmed = VehicleDataActiveStatus.valueForString(example); - example = "ACTIVE_CONFIRMED"; - VehicleDataActiveStatus enumActiveConfirmed = VehicleDataActiveStatus.valueForString(example); - example = "FAULT"; - VehicleDataActiveStatus enumFault = VehicleDataActiveStatus.valueForString(example); + /** + * Verifies that the enum values are not null upon valid assignment. + */ + public void testValidEnums() { + String example = "INACTIVE_NOT_CONFIRMED"; + VehicleDataActiveStatus enumInactiveNotConfirmed = VehicleDataActiveStatus.valueForString(example); + example = "INACTIVE_CONFIRMED"; + VehicleDataActiveStatus enumInactiveConfirmed = VehicleDataActiveStatus.valueForString(example); + example = "ACTIVE_NOT_CONFIRMED"; + VehicleDataActiveStatus enumActiveNotConfirmed = VehicleDataActiveStatus.valueForString(example); + example = "ACTIVE_CONFIRMED"; + VehicleDataActiveStatus enumActiveConfirmed = VehicleDataActiveStatus.valueForString(example); + example = "FAULT"; + VehicleDataActiveStatus enumFault = VehicleDataActiveStatus.valueForString(example); - assertNotNull("INACTIVE_NOT_CONFIRMED returned null", enumInactiveNotConfirmed); - assertNotNull("INACTIVE_CONFIRMED returned null", enumInactiveConfirmed); - assertNotNull("ACTIVE_NOT_CONFIRMED returned null", enumActiveNotConfirmed); - assertNotNull("ACTIVE_CONFIRMED returned null", enumActiveConfirmed); - assertNotNull("FAULT returned null", enumFault); - } + assertNotNull("INACTIVE_NOT_CONFIRMED returned null", enumInactiveNotConfirmed); + assertNotNull("INACTIVE_CONFIRMED returned null", enumInactiveConfirmed); + assertNotNull("ACTIVE_NOT_CONFIRMED returned null", enumActiveNotConfirmed); + assertNotNull("ACTIVE_CONFIRMED returned null", enumActiveConfirmed); + assertNotNull("FAULT returned null", enumFault); + } - /** - * Verifies that an invalid assignment is null. - */ - public void testInvalidEnum () { - String example = "FauLt"; - try { - VehicleDataActiveStatus temp = VehicleDataActiveStatus.valueForString(example); - assertNull("Result of valueForString should be null.", temp); - } - catch (IllegalArgumentException exception) { - fail("Invalid enum throws IllegalArgumentException."); - } - } + /** + * Verifies that an invalid assignment is null. + */ + public void testInvalidEnum() { + String example = "FauLt"; + try { + VehicleDataActiveStatus temp = VehicleDataActiveStatus.valueForString(example); + assertNull("Result of valueForString should be null.", temp); + } catch (IllegalArgumentException exception) { + fail("Invalid enum throws IllegalArgumentException."); + } + } - /** - * Verifies that a null assignment is invalid. - */ - public void testNullEnum () { - String example = null; - try { - VehicleDataActiveStatus temp = VehicleDataActiveStatus.valueForString(example); - assertNull("Result of valueForString should be null.", temp); - } - catch (NullPointerException exception) { - fail("Null string throws NullPointerException."); - } - } + /** + * Verifies that a null assignment is invalid. + */ + public void testNullEnum() { + String example = null; + try { + VehicleDataActiveStatus temp = VehicleDataActiveStatus.valueForString(example); + assertNull("Result of valueForString should be null.", temp); + } catch (NullPointerException exception) { + fail("Null string throws NullPointerException."); + } + } - /** - * Verifies the possible enum values of VehicleDataActiveStatus. - */ - public void testListEnum() { - List<VehicleDataActiveStatus> enumValueList = Arrays.asList(VehicleDataActiveStatus.values()); + /** + * Verifies the possible enum values of VehicleDataActiveStatus. + */ + public void testListEnum() { + List<VehicleDataActiveStatus> enumValueList = Arrays.asList(VehicleDataActiveStatus.values()); - List<VehicleDataActiveStatus> enumTestList = new ArrayList<>(); - enumTestList.add(VehicleDataActiveStatus.INACTIVE_NOT_CONFIRMED); - enumTestList.add(VehicleDataActiveStatus.INACTIVE_CONFIRMED); - enumTestList.add(VehicleDataActiveStatus.ACTIVE_NOT_CONFIRMED); - enumTestList.add(VehicleDataActiveStatus.ACTIVE_CONFIRMED); - enumTestList.add(VehicleDataActiveStatus.FAULT); + List<VehicleDataActiveStatus> enumTestList = new ArrayList<>(); + enumTestList.add(VehicleDataActiveStatus.INACTIVE_NOT_CONFIRMED); + enumTestList.add(VehicleDataActiveStatus.INACTIVE_CONFIRMED); + enumTestList.add(VehicleDataActiveStatus.ACTIVE_NOT_CONFIRMED); + enumTestList.add(VehicleDataActiveStatus.ACTIVE_CONFIRMED); + enumTestList.add(VehicleDataActiveStatus.FAULT); - assertTrue("Enum value list does not match enum class list", - enumValueList.containsAll(enumTestList) && enumTestList.containsAll(enumValueList)); - } + assertTrue("Enum value list does not match enum class list", + enumValueList.containsAll(enumTestList) && enumTestList.containsAll(enumValueList)); + } }
\ No newline at end of file diff --git a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/VehicleDataEventStatusTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/VehicleDataEventStatusTests.java index d70d20446..4cee560c0 100644 --- a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/VehicleDataEventStatusTests.java +++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/VehicleDataEventStatusTests.java @@ -9,75 +9,73 @@ import java.util.Arrays; import java.util.List; /** - * This is a unit test class for the SmartDeviceLink library project class : + * This is a unit test class for the SmartDeviceLink library project class : * {@link com.smartdevicelink.proxy.rpc.enums.VehicleDataEventStatus} */ public class VehicleDataEventStatusTests extends TestCase { - /** - * Verifies that the enum values are not null upon valid assignment. - */ - public void testValidEnums () { - String example = "NO_EVENT"; - VehicleDataEventStatus enumNoEvent = VehicleDataEventStatus.valueForString(example); - example = "NO"; - VehicleDataEventStatus enumNo = VehicleDataEventStatus.valueForString(example); - example = "YES"; - VehicleDataEventStatus enumYes = VehicleDataEventStatus.valueForString(example); - example = "NOT_SUPPORTED"; - VehicleDataEventStatus enumNotSupported = VehicleDataEventStatus.valueForString(example); - example = "FAULT"; - VehicleDataEventStatus enumFault = VehicleDataEventStatus.valueForString(example); - - assertNotNull("NO_EVENT returned null", enumNoEvent); - assertNotNull("NO returned null", enumNo); - assertNotNull("YES returned null", enumYes); - assertNotNull("NOT_SUPPORTED returned null", enumNotSupported); - assertNotNull("FAULT returned null", enumFault); - } - - /** - * Verifies that an invalid assignment is null. - */ - public void testInvalidEnum () { - String example = "no_EveNT"; - try { - VehicleDataEventStatus temp = VehicleDataEventStatus.valueForString(example); + /** + * Verifies that the enum values are not null upon valid assignment. + */ + public void testValidEnums() { + String example = "NO_EVENT"; + VehicleDataEventStatus enumNoEvent = VehicleDataEventStatus.valueForString(example); + example = "NO"; + VehicleDataEventStatus enumNo = VehicleDataEventStatus.valueForString(example); + example = "YES"; + VehicleDataEventStatus enumYes = VehicleDataEventStatus.valueForString(example); + example = "NOT_SUPPORTED"; + VehicleDataEventStatus enumNotSupported = VehicleDataEventStatus.valueForString(example); + example = "FAULT"; + VehicleDataEventStatus enumFault = VehicleDataEventStatus.valueForString(example); + + assertNotNull("NO_EVENT returned null", enumNoEvent); + assertNotNull("NO returned null", enumNo); + assertNotNull("YES returned null", enumYes); + assertNotNull("NOT_SUPPORTED returned null", enumNotSupported); + assertNotNull("FAULT returned null", enumFault); + } + + /** + * Verifies that an invalid assignment is null. + */ + public void testInvalidEnum() { + String example = "no_EveNT"; + try { + VehicleDataEventStatus temp = VehicleDataEventStatus.valueForString(example); assertNull("Result of valueForString should be null.", temp); - } - catch (IllegalArgumentException exception) { + } catch (IllegalArgumentException exception) { fail("Invalid enum throws IllegalArgumentException."); - } - } - - /** - * Verifies that a null assignment is invalid. - */ - public void testNullEnum () { - String example = null; - try { - VehicleDataEventStatus temp = VehicleDataEventStatus.valueForString(example); + } + } + + /** + * Verifies that a null assignment is invalid. + */ + public void testNullEnum() { + String example = null; + try { + VehicleDataEventStatus temp = VehicleDataEventStatus.valueForString(example); assertNull("Result of valueForString should be null.", temp); - } - catch (NullPointerException exception) { + } catch (NullPointerException exception) { fail("Null string throws NullPointerException."); - } - } - - /** - * Verifies the possible enum values of AmbientLightStatus. - */ - public void testListEnum() { - List<VehicleDataEventStatus> enumValueList = Arrays.asList(VehicleDataEventStatus.values()); + } + } + + /** + * Verifies the possible enum values of AmbientLightStatus. + */ + public void testListEnum() { + List<VehicleDataEventStatus> enumValueList = Arrays.asList(VehicleDataEventStatus.values()); - List<VehicleDataEventStatus> enumTestList = new ArrayList<VehicleDataEventStatus>(); - enumTestList.add(VehicleDataEventStatus.NO_EVENT); - enumTestList.add(VehicleDataEventStatus.NO); - enumTestList.add(VehicleDataEventStatus.YES); - enumTestList.add(VehicleDataEventStatus.NOT_SUPPORTED); - enumTestList.add(VehicleDataEventStatus.FAULT); + List<VehicleDataEventStatus> enumTestList = new ArrayList<VehicleDataEventStatus>(); + enumTestList.add(VehicleDataEventStatus.NO_EVENT); + enumTestList.add(VehicleDataEventStatus.NO); + enumTestList.add(VehicleDataEventStatus.YES); + enumTestList.add(VehicleDataEventStatus.NOT_SUPPORTED); + enumTestList.add(VehicleDataEventStatus.FAULT); - assertTrue("Enum value list does not match enum class list", - enumValueList.containsAll(enumTestList) && enumTestList.containsAll(enumValueList)); - } + assertTrue("Enum value list does not match enum class list", + enumValueList.containsAll(enumTestList) && enumTestList.containsAll(enumValueList)); + } }
\ No newline at end of file diff --git a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/VehicleDataNotificationStatusTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/VehicleDataNotificationStatusTests.java index 622938fbf..4641d92dd 100644 --- a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/VehicleDataNotificationStatusTests.java +++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/VehicleDataNotificationStatusTests.java @@ -9,71 +9,69 @@ import java.util.Arrays; import java.util.List; /** - * This is a unit test class for the SmartDeviceLink library project class : + * This is a unit test class for the SmartDeviceLink library project class : * {@link com.smartdevicelink.proxy.rpc.enums.VehicleDataNotificationStatus} */ public class VehicleDataNotificationStatusTests extends TestCase { - /** - * Verifies that the enum values are not null upon valid assignment. - */ - public void testValidEnums () { - String example = "NOT_SUPPORTED"; - VehicleDataNotificationStatus enumNotSupported = VehicleDataNotificationStatus.valueForString(example); - example = "NORMAL"; - VehicleDataNotificationStatus enumNormal = VehicleDataNotificationStatus.valueForString(example); - example = "ACTIVE"; - VehicleDataNotificationStatus enumActive = VehicleDataNotificationStatus.valueForString(example); - example = "NOT_USED"; - VehicleDataNotificationStatus enumNotUsed = VehicleDataNotificationStatus.valueForString(example); - - assertNotNull("NOT_SUPPORTED returned null", enumNotSupported); - assertNotNull("NORMAL returned null", enumNormal); - assertNotNull("ACTIVE returned null", enumActive); - assertNotNull("NOT_USED returned null", enumNotUsed); - } - - /** - * Verifies that an invalid assignment is null. - */ - public void testInvalidEnum () { - String example = "nOT_SuppOrTEd"; - try { - VehicleDataNotificationStatus temp = VehicleDataNotificationStatus.valueForString(example); + /** + * Verifies that the enum values are not null upon valid assignment. + */ + public void testValidEnums() { + String example = "NOT_SUPPORTED"; + VehicleDataNotificationStatus enumNotSupported = VehicleDataNotificationStatus.valueForString(example); + example = "NORMAL"; + VehicleDataNotificationStatus enumNormal = VehicleDataNotificationStatus.valueForString(example); + example = "ACTIVE"; + VehicleDataNotificationStatus enumActive = VehicleDataNotificationStatus.valueForString(example); + example = "NOT_USED"; + VehicleDataNotificationStatus enumNotUsed = VehicleDataNotificationStatus.valueForString(example); + + assertNotNull("NOT_SUPPORTED returned null", enumNotSupported); + assertNotNull("NORMAL returned null", enumNormal); + assertNotNull("ACTIVE returned null", enumActive); + assertNotNull("NOT_USED returned null", enumNotUsed); + } + + /** + * Verifies that an invalid assignment is null. + */ + public void testInvalidEnum() { + String example = "nOT_SuppOrTEd"; + try { + VehicleDataNotificationStatus temp = VehicleDataNotificationStatus.valueForString(example); assertNull("Result of valueForString should be null.", temp); - } - catch (IllegalArgumentException exception) { + } catch (IllegalArgumentException exception) { fail("Invalid enum throws IllegalArgumentException."); - } - } - - /** - * Verifies that a null assignment is invalid. - */ - public void testNullEnum () { - String example = null; - try { - VehicleDataNotificationStatus temp = VehicleDataNotificationStatus.valueForString(example); + } + } + + /** + * Verifies that a null assignment is invalid. + */ + public void testNullEnum() { + String example = null; + try { + VehicleDataNotificationStatus temp = VehicleDataNotificationStatus.valueForString(example); assertNull("Result of valueForString should be null.", temp); - } - catch (NullPointerException exception) { + } catch (NullPointerException exception) { fail("Null string throws NullPointerException."); - } - } - - /** - * Verifies the possible enum values of VehicleDataNotification. - */ - public void testListEnum() { - List<VehicleDataNotificationStatus> enumValueList = Arrays.asList(VehicleDataNotificationStatus.values()); + } + } + + /** + * Verifies the possible enum values of VehicleDataNotification. + */ + public void testListEnum() { + List<VehicleDataNotificationStatus> enumValueList = Arrays.asList(VehicleDataNotificationStatus.values()); - List<VehicleDataNotificationStatus> enumTestList = new ArrayList<VehicleDataNotificationStatus>(); - enumTestList.add(VehicleDataNotificationStatus.NOT_SUPPORTED); - enumTestList.add(VehicleDataNotificationStatus.NORMAL); - enumTestList.add(VehicleDataNotificationStatus.ACTIVE); - enumTestList.add(VehicleDataNotificationStatus.NOT_USED); + List<VehicleDataNotificationStatus> enumTestList = new ArrayList<VehicleDataNotificationStatus>(); + enumTestList.add(VehicleDataNotificationStatus.NOT_SUPPORTED); + enumTestList.add(VehicleDataNotificationStatus.NORMAL); + enumTestList.add(VehicleDataNotificationStatus.ACTIVE); + enumTestList.add(VehicleDataNotificationStatus.NOT_USED); - assertTrue("Enum value list does not match enum class list", - enumValueList.containsAll(enumTestList) && enumTestList.containsAll(enumValueList)); - } + assertTrue("Enum value list does not match enum class list", + enumValueList.containsAll(enumTestList) && enumTestList.containsAll(enumValueList)); + } }
\ No newline at end of file diff --git a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/VehicleDataResultCodeTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/VehicleDataResultCodeTests.java index df926b1aa..61705d8aa 100644 --- a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/VehicleDataResultCodeTests.java +++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/VehicleDataResultCodeTests.java @@ -9,91 +9,89 @@ import java.util.Arrays; import java.util.List; /** - * This is a unit test class for the SmartDeviceLink library project class : + * This is a unit test class for the SmartDeviceLink library project class : * {@link com.smartdevicelink.proxy.rpc.enums.VehicleDataResultCode} */ public class VehicleDataResultCodeTests extends TestCase { - /** - * Verifies that the enum values are not null upon valid assignment. - */ - public void testValidEnums () { - String example = "SUCCESS"; - VehicleDataResultCode enumSuccess = VehicleDataResultCode.valueForString(example); - example = "TRUNCATED_DATA"; - VehicleDataResultCode enumTruncData = VehicleDataResultCode.valueForString(example); - example = "DISALLOWED"; - VehicleDataResultCode enumDisallowed = VehicleDataResultCode.valueForString(example); - example = "USER_DISALLOWED"; - VehicleDataResultCode enumUserDisallowed = VehicleDataResultCode.valueForString(example); - example = "INVALID_ID"; - VehicleDataResultCode enumInvalidId = VehicleDataResultCode.valueForString(example); - example = "VEHICLE_DATA_NOT_AVAILABLE"; - VehicleDataResultCode enumVehicleDataNotAvailable = VehicleDataResultCode.valueForString(example); - example = "DATA_ALREADY_SUBSCRIBED"; - VehicleDataResultCode enumDataAlreadySubscribed = VehicleDataResultCode.valueForString(example); - example = "DATA_NOT_SUBSCRIBED"; - VehicleDataResultCode enumDataNotSubscribed = VehicleDataResultCode.valueForString(example); - example = "IGNORED"; - VehicleDataResultCode enumIgnored = VehicleDataResultCode.valueForString(example); - - assertNotNull("SUCCESS returned null", enumSuccess); - assertNotNull("TRUNCATED_DATA returned null", enumTruncData); - assertNotNull("DISALLOWED returned null", enumDisallowed); - assertNotNull("USER_DISALLOWED returned null", enumUserDisallowed); - assertNotNull("INVALID_ID returned null", enumInvalidId); - assertNotNull("VEHICLE_DATA_NOT_AVAILABLE returned null", enumVehicleDataNotAvailable); - assertNotNull("DATA_ALREADY_SUBSCRIBED returned null", enumDataAlreadySubscribed); - assertNotNull("DATA_NOT_SUBSCRIBED returned null", enumDataNotSubscribed); - assertNotNull("IGNORED returned null", enumIgnored); - } - - /** - * Verifies that an invalid assignment is null. - */ - public void testInvalidEnum () { - String example = "suCcesS"; - try { - VehicleDataResultCode temp = VehicleDataResultCode.valueForString(example); + /** + * Verifies that the enum values are not null upon valid assignment. + */ + public void testValidEnums() { + String example = "SUCCESS"; + VehicleDataResultCode enumSuccess = VehicleDataResultCode.valueForString(example); + example = "TRUNCATED_DATA"; + VehicleDataResultCode enumTruncData = VehicleDataResultCode.valueForString(example); + example = "DISALLOWED"; + VehicleDataResultCode enumDisallowed = VehicleDataResultCode.valueForString(example); + example = "USER_DISALLOWED"; + VehicleDataResultCode enumUserDisallowed = VehicleDataResultCode.valueForString(example); + example = "INVALID_ID"; + VehicleDataResultCode enumInvalidId = VehicleDataResultCode.valueForString(example); + example = "VEHICLE_DATA_NOT_AVAILABLE"; + VehicleDataResultCode enumVehicleDataNotAvailable = VehicleDataResultCode.valueForString(example); + example = "DATA_ALREADY_SUBSCRIBED"; + VehicleDataResultCode enumDataAlreadySubscribed = VehicleDataResultCode.valueForString(example); + example = "DATA_NOT_SUBSCRIBED"; + VehicleDataResultCode enumDataNotSubscribed = VehicleDataResultCode.valueForString(example); + example = "IGNORED"; + VehicleDataResultCode enumIgnored = VehicleDataResultCode.valueForString(example); + + assertNotNull("SUCCESS returned null", enumSuccess); + assertNotNull("TRUNCATED_DATA returned null", enumTruncData); + assertNotNull("DISALLOWED returned null", enumDisallowed); + assertNotNull("USER_DISALLOWED returned null", enumUserDisallowed); + assertNotNull("INVALID_ID returned null", enumInvalidId); + assertNotNull("VEHICLE_DATA_NOT_AVAILABLE returned null", enumVehicleDataNotAvailable); + assertNotNull("DATA_ALREADY_SUBSCRIBED returned null", enumDataAlreadySubscribed); + assertNotNull("DATA_NOT_SUBSCRIBED returned null", enumDataNotSubscribed); + assertNotNull("IGNORED returned null", enumIgnored); + } + + /** + * Verifies that an invalid assignment is null. + */ + public void testInvalidEnum() { + String example = "suCcesS"; + try { + VehicleDataResultCode temp = VehicleDataResultCode.valueForString(example); assertNull("Result of valueForString should be null.", temp); - } - catch (IllegalArgumentException exception) { + } catch (IllegalArgumentException exception) { fail("Invalid enum throws IllegalArgumentException."); - } - } - - /** - * Verifies that a null assignment is invalid. - */ - public void testNullEnum () { - String example = null; - try { - VehicleDataResultCode temp = VehicleDataResultCode.valueForString(example); + } + } + + /** + * Verifies that a null assignment is invalid. + */ + public void testNullEnum() { + String example = null; + try { + VehicleDataResultCode temp = VehicleDataResultCode.valueForString(example); assertNull("Result of valueForString should be null.", temp); - } - catch (NullPointerException exception) { + } catch (NullPointerException exception) { fail("Null string throws NullPointerException."); - } - } - - /** - * Verifies the possible enum values of VehicleDataResultCode. - */ - public void testListEnum() { - List<VehicleDataResultCode> enumValueList = Arrays.asList(VehicleDataResultCode.values()); + } + } + + /** + * Verifies the possible enum values of VehicleDataResultCode. + */ + public void testListEnum() { + List<VehicleDataResultCode> enumValueList = Arrays.asList(VehicleDataResultCode.values()); - List<VehicleDataResultCode> enumTestList = new ArrayList<VehicleDataResultCode>(); - enumTestList.add(VehicleDataResultCode.SUCCESS); - enumTestList.add(VehicleDataResultCode.TRUNCATED_DATA); - enumTestList.add(VehicleDataResultCode.DISALLOWED); - enumTestList.add(VehicleDataResultCode.USER_DISALLOWED); - enumTestList.add(VehicleDataResultCode.INVALID_ID); - enumTestList.add(VehicleDataResultCode.VEHICLE_DATA_NOT_AVAILABLE); - enumTestList.add(VehicleDataResultCode.DATA_ALREADY_SUBSCRIBED); - enumTestList.add(VehicleDataResultCode.DATA_NOT_SUBSCRIBED); - enumTestList.add(VehicleDataResultCode.IGNORED); + List<VehicleDataResultCode> enumTestList = new ArrayList<VehicleDataResultCode>(); + enumTestList.add(VehicleDataResultCode.SUCCESS); + enumTestList.add(VehicleDataResultCode.TRUNCATED_DATA); + enumTestList.add(VehicleDataResultCode.DISALLOWED); + enumTestList.add(VehicleDataResultCode.USER_DISALLOWED); + enumTestList.add(VehicleDataResultCode.INVALID_ID); + enumTestList.add(VehicleDataResultCode.VEHICLE_DATA_NOT_AVAILABLE); + enumTestList.add(VehicleDataResultCode.DATA_ALREADY_SUBSCRIBED); + enumTestList.add(VehicleDataResultCode.DATA_NOT_SUBSCRIBED); + enumTestList.add(VehicleDataResultCode.IGNORED); - assertTrue("Enum value list does not match enum class list", - enumValueList.containsAll(enumTestList) && enumTestList.containsAll(enumValueList)); - } + assertTrue("Enum value list does not match enum class list", + enumValueList.containsAll(enumTestList) && enumTestList.containsAll(enumValueList)); + } }
\ No newline at end of file diff --git a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/VehicleDataStatusTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/VehicleDataStatusTests.java index 48f972baf..6808df33a 100644 --- a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/VehicleDataStatusTests.java +++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/VehicleDataStatusTests.java @@ -9,67 +9,65 @@ import java.util.Arrays; import java.util.List; /** - * This is a unit test class for the SmartDeviceLink library project class : + * This is a unit test class for the SmartDeviceLink library project class : * {@link com.smartdevicelink.proxy.rpc.enums.VehicleDataStatus} */ public class VehicleDataStatusTests extends TestCase { - /** - * Verifies that the enum values are not null upon valid assignment. - */ - public void testValidEnums () { - String example = "NO_DATA_EXISTS"; - VehicleDataStatus enumNoDataExists = VehicleDataStatus.valueForString(example); - example = "OFF"; - VehicleDataStatus enumOff = VehicleDataStatus.valueForString(example); - example = "ON"; - VehicleDataStatus enumOn = VehicleDataStatus.valueForString(example); - - assertNotNull("NO_DATA_EXISTS returned null", enumNoDataExists); - assertNotNull("OFF returned null", enumOff); - assertNotNull("ON returned null", enumOn); - } - - /** - * Verifies that an invalid assignment is null. - */ - public void testInvalidEnum () { - String example = "No_DatA_ExiSTs"; - try { - VehicleDataStatus temp = VehicleDataStatus.valueForString(example); + /** + * Verifies that the enum values are not null upon valid assignment. + */ + public void testValidEnums() { + String example = "NO_DATA_EXISTS"; + VehicleDataStatus enumNoDataExists = VehicleDataStatus.valueForString(example); + example = "OFF"; + VehicleDataStatus enumOff = VehicleDataStatus.valueForString(example); + example = "ON"; + VehicleDataStatus enumOn = VehicleDataStatus.valueForString(example); + + assertNotNull("NO_DATA_EXISTS returned null", enumNoDataExists); + assertNotNull("OFF returned null", enumOff); + assertNotNull("ON returned null", enumOn); + } + + /** + * Verifies that an invalid assignment is null. + */ + public void testInvalidEnum() { + String example = "No_DatA_ExiSTs"; + try { + VehicleDataStatus temp = VehicleDataStatus.valueForString(example); assertNull("Result of valueForString should be null.", temp); - } - catch (IllegalArgumentException exception) { + } catch (IllegalArgumentException exception) { fail("Invalid enum throws IllegalArgumentException."); - } - } - - /** - * Verifies that a null assignment is invalid. - */ - public void testNullEnum () { - String example = null; - try { - VehicleDataStatus temp = VehicleDataStatus.valueForString(example); + } + } + + /** + * Verifies that a null assignment is invalid. + */ + public void testNullEnum() { + String example = null; + try { + VehicleDataStatus temp = VehicleDataStatus.valueForString(example); assertNull("Result of valueForString should be null.", temp); - } - catch (NullPointerException exception) { + } catch (NullPointerException exception) { fail("Null string throws NullPointerException."); - } - } - - /** - * Verifies the possible enum values of VehicleDataStatus. - */ - public void testListEnum() { - List<VehicleDataStatus> enumValueList = Arrays.asList(VehicleDataStatus.values()); + } + } + + /** + * Verifies the possible enum values of VehicleDataStatus. + */ + public void testListEnum() { + List<VehicleDataStatus> enumValueList = Arrays.asList(VehicleDataStatus.values()); - List<VehicleDataStatus> enumTestList = new ArrayList<VehicleDataStatus>(); - enumTestList.add(VehicleDataStatus.NO_DATA_EXISTS); - enumTestList.add(VehicleDataStatus.OFF); - enumTestList.add(VehicleDataStatus.ON); + List<VehicleDataStatus> enumTestList = new ArrayList<VehicleDataStatus>(); + enumTestList.add(VehicleDataStatus.NO_DATA_EXISTS); + enumTestList.add(VehicleDataStatus.OFF); + enumTestList.add(VehicleDataStatus.ON); - assertTrue("Enum value list does not match enum class list", - enumValueList.containsAll(enumTestList) && enumTestList.containsAll(enumValueList)); - } + assertTrue("Enum value list does not match enum class list", + enumValueList.containsAll(enumTestList) && enumTestList.containsAll(enumValueList)); + } }
\ No newline at end of file diff --git a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/VehicleDataTypeTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/VehicleDataTypeTests.java index a337058f9..1b270a9dd 100644 --- a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/VehicleDataTypeTests.java +++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/VehicleDataTypeTests.java @@ -9,199 +9,197 @@ import java.util.Arrays; import java.util.List; /** - * This is a unit test class for the SmartDeviceLink library project class : + * This is a unit test class for the SmartDeviceLink library project class : * {@link com.smartdevicelink.proxy.rpc.enums.VehicleDataType} */ public class VehicleDataTypeTests extends TestCase { - /** - * Verifies that the enum values are not null upon valid assignment. - */ - public void testValidEnums () { - String example = "VEHICLEDATA_GPS"; - VehicleDataType enumVehicleDataGps = VehicleDataType.valueForString(example); - example = "VEHICLEDATA_SPEED"; - VehicleDataType enumVehicleDataSpeed = VehicleDataType.valueForString(example); - example = "VEHICLEDATA_RPM"; - VehicleDataType enumVehicleDataRpm = VehicleDataType.valueForString(example); - example = "VEHICLEDATA_FUELLEVEL"; - VehicleDataType enumVehicleDataFuelLevel = VehicleDataType.valueForString(example); - example = "VEHICLEDATA_FUELLEVEL_STATE"; - VehicleDataType enumVehicleDataFuelLevelState = VehicleDataType.valueForString(example); - example = "VEHICLEDATA_FUELCONSUMPTION"; - VehicleDataType enumVehicleDataFuelConsumption = VehicleDataType.valueForString(example); - example = "VEHICLEDATA_EXTERNTEMP"; - VehicleDataType enumVehicleDataExternTemp = VehicleDataType.valueForString(example); - example = "VEHICLEDATA_VIN"; - VehicleDataType enumVehicleDataVin = VehicleDataType.valueForString(example); - example = "VEHICLEDATA_PRNDL"; - VehicleDataType enumVehicleDataPrndl = VehicleDataType.valueForString(example); - example = "VEHICLEDATA_TIREPRESSURE"; - VehicleDataType enumVehicleDataTirePressure = VehicleDataType.valueForString(example); - example = "VEHICLEDATA_ODOMETER"; - VehicleDataType enumVehicleDataOdometer = VehicleDataType.valueForString(example); - example = "VEHICLEDATA_BELTSTATUS"; - VehicleDataType enumVehicleDataBeltStatus = VehicleDataType.valueForString(example); - example = "VEHICLEDATA_BODYINFO"; - VehicleDataType enumVehicleDataBodyInfo = VehicleDataType.valueForString(example); - example = "VEHICLEDATA_DEVICESTATUS"; - VehicleDataType enumVehicleDataDeviceStatus = VehicleDataType.valueForString(example); - example = "VEHICLEDATA_BRAKING"; - VehicleDataType enumVehicleDataBraking = VehicleDataType.valueForString(example); - example = "VEHICLEDATA_WIPERSTATUS"; - VehicleDataType enumVehicleDataWiperStatus = VehicleDataType.valueForString(example); - example = "VEHICLEDATA_HEADLAMPSTATUS"; - VehicleDataType enumVehicleDataHeadlampStatus = VehicleDataType.valueForString(example); - example = "VEHICLEDATA_BATTVOLTAGE"; - VehicleDataType enumVehicleDataBattVoltage = VehicleDataType.valueForString(example); - example = "VEHICLEDATA_ENGINETORQUE"; - VehicleDataType enumVehicleDataEngineTorque = VehicleDataType.valueForString(example); - example = "VEHICLEDATA_ENGINEOILLIFE"; - VehicleDataType enumVehicleDataEngineOilLife = VehicleDataType.valueForString(example); - example = "VEHICLEDATA_ACCPEDAL"; - VehicleDataType enumVehicleDataAccPedal = VehicleDataType.valueForString(example); - example = "VEHICLEDATA_STEERINGWHEEL"; - VehicleDataType enumVehicleDataSteeringWheel = VehicleDataType.valueForString(example); - example = "VEHICLEDATA_ECALLINFO"; - VehicleDataType enumVehicleDataECallInfo = VehicleDataType.valueForString(example); - example = "VEHICLEDATA_AIRBAGSTATUS"; - VehicleDataType enumVehicleDataAirbagStatus = VehicleDataType.valueForString(example); - example = "VEHICLEDATA_EMERGENCYEVENT"; - VehicleDataType enumVehicleDataEmergencyEvent = VehicleDataType.valueForString(example); - example = "VEHICLEDATA_CLUSTERMODESTATUS"; - VehicleDataType enumVehicleDataClusterModeStatus = VehicleDataType.valueForString(example); - example = "VEHICLEDATA_MYKEY"; - VehicleDataType enumVehicleDataMyKey = VehicleDataType.valueForString(example); - example = "VEHICLEDATA_FUELRANGE"; - VehicleDataType enumVehicleDataFuelRange = VehicleDataType.valueForString(example); - example = "VEHICLEDATA_TURNSIGNAL"; - VehicleDataType enumVehicleDataTurnSignal = VehicleDataType.valueForString(example); - example = "VEHICLEDATA_ELECTRONICPARKBRAKESTATUS"; - VehicleDataType enumVehicleDataElectronicParkBrakeStatus = VehicleDataType.valueForString(example); - example = "VEHICLEDATA_CLOUDAPPVEHICLEID"; - VehicleDataType enumVehicleCloudAppVehicleId = VehicleDataType.valueForString(example); - example = "VEHICLEDATA_OEM_CUSTOM_DATA"; - VehicleDataType enumVehicleDataOemVehicleDataType= VehicleDataType.valueForString(example); - example = "VEHICLEDATA_HANDSOFFSTEERING"; - VehicleDataType enumVehicleDataHandsOffSteeringType= VehicleDataType.valueForString(example); - example = "VEHICLEDATA_GEARSTATUS"; - VehicleDataType enumVehicleDataGearStatus= VehicleDataType.valueForString(example); - example = "VEHICLEDATA_WINDOWSTATUS"; - VehicleDataType enumVehicleDataTypeWindowStatus= VehicleDataType.valueForString(example); - example = "VEHICLEDATA_STABILITYCONTROLSSTATUS"; - VehicleDataType enumVehicleDataStabilityControlsStatus = VehicleDataType.valueForString(example); + /** + * Verifies that the enum values are not null upon valid assignment. + */ + public void testValidEnums() { + String example = "VEHICLEDATA_GPS"; + VehicleDataType enumVehicleDataGps = VehicleDataType.valueForString(example); + example = "VEHICLEDATA_SPEED"; + VehicleDataType enumVehicleDataSpeed = VehicleDataType.valueForString(example); + example = "VEHICLEDATA_RPM"; + VehicleDataType enumVehicleDataRpm = VehicleDataType.valueForString(example); + example = "VEHICLEDATA_FUELLEVEL"; + VehicleDataType enumVehicleDataFuelLevel = VehicleDataType.valueForString(example); + example = "VEHICLEDATA_FUELLEVEL_STATE"; + VehicleDataType enumVehicleDataFuelLevelState = VehicleDataType.valueForString(example); + example = "VEHICLEDATA_FUELCONSUMPTION"; + VehicleDataType enumVehicleDataFuelConsumption = VehicleDataType.valueForString(example); + example = "VEHICLEDATA_EXTERNTEMP"; + VehicleDataType enumVehicleDataExternTemp = VehicleDataType.valueForString(example); + example = "VEHICLEDATA_VIN"; + VehicleDataType enumVehicleDataVin = VehicleDataType.valueForString(example); + example = "VEHICLEDATA_PRNDL"; + VehicleDataType enumVehicleDataPrndl = VehicleDataType.valueForString(example); + example = "VEHICLEDATA_TIREPRESSURE"; + VehicleDataType enumVehicleDataTirePressure = VehicleDataType.valueForString(example); + example = "VEHICLEDATA_ODOMETER"; + VehicleDataType enumVehicleDataOdometer = VehicleDataType.valueForString(example); + example = "VEHICLEDATA_BELTSTATUS"; + VehicleDataType enumVehicleDataBeltStatus = VehicleDataType.valueForString(example); + example = "VEHICLEDATA_BODYINFO"; + VehicleDataType enumVehicleDataBodyInfo = VehicleDataType.valueForString(example); + example = "VEHICLEDATA_DEVICESTATUS"; + VehicleDataType enumVehicleDataDeviceStatus = VehicleDataType.valueForString(example); + example = "VEHICLEDATA_BRAKING"; + VehicleDataType enumVehicleDataBraking = VehicleDataType.valueForString(example); + example = "VEHICLEDATA_WIPERSTATUS"; + VehicleDataType enumVehicleDataWiperStatus = VehicleDataType.valueForString(example); + example = "VEHICLEDATA_HEADLAMPSTATUS"; + VehicleDataType enumVehicleDataHeadlampStatus = VehicleDataType.valueForString(example); + example = "VEHICLEDATA_BATTVOLTAGE"; + VehicleDataType enumVehicleDataBattVoltage = VehicleDataType.valueForString(example); + example = "VEHICLEDATA_ENGINETORQUE"; + VehicleDataType enumVehicleDataEngineTorque = VehicleDataType.valueForString(example); + example = "VEHICLEDATA_ENGINEOILLIFE"; + VehicleDataType enumVehicleDataEngineOilLife = VehicleDataType.valueForString(example); + example = "VEHICLEDATA_ACCPEDAL"; + VehicleDataType enumVehicleDataAccPedal = VehicleDataType.valueForString(example); + example = "VEHICLEDATA_STEERINGWHEEL"; + VehicleDataType enumVehicleDataSteeringWheel = VehicleDataType.valueForString(example); + example = "VEHICLEDATA_ECALLINFO"; + VehicleDataType enumVehicleDataECallInfo = VehicleDataType.valueForString(example); + example = "VEHICLEDATA_AIRBAGSTATUS"; + VehicleDataType enumVehicleDataAirbagStatus = VehicleDataType.valueForString(example); + example = "VEHICLEDATA_EMERGENCYEVENT"; + VehicleDataType enumVehicleDataEmergencyEvent = VehicleDataType.valueForString(example); + example = "VEHICLEDATA_CLUSTERMODESTATUS"; + VehicleDataType enumVehicleDataClusterModeStatus = VehicleDataType.valueForString(example); + example = "VEHICLEDATA_MYKEY"; + VehicleDataType enumVehicleDataMyKey = VehicleDataType.valueForString(example); + example = "VEHICLEDATA_FUELRANGE"; + VehicleDataType enumVehicleDataFuelRange = VehicleDataType.valueForString(example); + example = "VEHICLEDATA_TURNSIGNAL"; + VehicleDataType enumVehicleDataTurnSignal = VehicleDataType.valueForString(example); + example = "VEHICLEDATA_ELECTRONICPARKBRAKESTATUS"; + VehicleDataType enumVehicleDataElectronicParkBrakeStatus = VehicleDataType.valueForString(example); + example = "VEHICLEDATA_CLOUDAPPVEHICLEID"; + VehicleDataType enumVehicleCloudAppVehicleId = VehicleDataType.valueForString(example); + example = "VEHICLEDATA_OEM_CUSTOM_DATA"; + VehicleDataType enumVehicleDataOemVehicleDataType = VehicleDataType.valueForString(example); + example = "VEHICLEDATA_HANDSOFFSTEERING"; + VehicleDataType enumVehicleDataHandsOffSteeringType = VehicleDataType.valueForString(example); + example = "VEHICLEDATA_GEARSTATUS"; + VehicleDataType enumVehicleDataGearStatus = VehicleDataType.valueForString(example); + example = "VEHICLEDATA_WINDOWSTATUS"; + VehicleDataType enumVehicleDataTypeWindowStatus = VehicleDataType.valueForString(example); + example = "VEHICLEDATA_STABILITYCONTROLSSTATUS"; + VehicleDataType enumVehicleDataStabilityControlsStatus = VehicleDataType.valueForString(example); - assertNotNull("VEHICLEDATA_GPS returned null", enumVehicleDataGps); - assertNotNull("VEHICLEDATA_SPEED returned null", enumVehicleDataSpeed); - assertNotNull("VEHICLEDATA_RPM returned null", enumVehicleDataRpm); - assertNotNull("VEHICLEDATA_FUELLEVEL returned null", enumVehicleDataFuelLevel); - assertNotNull("VEHICLEDATA_FUELLEVEL_STATE returned null", enumVehicleDataFuelLevelState); - assertNotNull("VEHICLEDATA_FUELCONSUMPTION returned null", enumVehicleDataFuelConsumption); - assertNotNull("VEHICLEDATA_EXTERNTEMP returned null", enumVehicleDataExternTemp); - assertNotNull("VEHICLEDATA_VIN returned null", enumVehicleDataVin); - assertNotNull("VEHICLEDATA_PRNDL returned null", enumVehicleDataPrndl); - assertNotNull("VEHICLEDATA_TIREPRESSURE returned null", enumVehicleDataTirePressure); - assertNotNull("VEHICLEDATA_ODOMETER returned null", enumVehicleDataOdometer); - assertNotNull("VEHICLEDATA_BELTSTATUS returned null", enumVehicleDataBeltStatus); - assertNotNull("VEHICLEDATA_BODYINFO returned null", enumVehicleDataBodyInfo); - assertNotNull("VEHICLEDATA_DEVICESTATUS returned null", enumVehicleDataDeviceStatus); - assertNotNull("VEHICLEDATA_BRAKING returned null", enumVehicleDataBraking); - assertNotNull("VEHICLEDATA_WIPERSTATUS returned null", enumVehicleDataWiperStatus); - assertNotNull("VEHICLEDATA_HEADLAMPSTATUS returned null", enumVehicleDataHeadlampStatus); - assertNotNull("VEHICLEDATA_BATTVOLTAGE returned null", enumVehicleDataBattVoltage); - assertNotNull("VEHICLEDATA_ENGINETORQUE returned null", enumVehicleDataEngineTorque); - assertNotNull("VEHICLEDATA_ENGINEOILLIFE returned null", enumVehicleDataEngineOilLife); - assertNotNull("VEHICLEDATA_ACCPEDAL returned null", enumVehicleDataAccPedal); - assertNotNull("VEHICLEDATA_STEERINGWHEEL returned null", enumVehicleDataSteeringWheel); - assertNotNull("VEHICLEDATA_ECALLINFO returned null", enumVehicleDataECallInfo); - assertNotNull("VEHICLEDATA_AIRBAGSTATUS returned null", enumVehicleDataAirbagStatus); - assertNotNull("VEHICLEDATA_EMERGENCYEVENT returned null", enumVehicleDataEmergencyEvent); - assertNotNull("VEHICLEDATA_CLUSTERMODESTATUS returned null", enumVehicleDataClusterModeStatus); - assertNotNull("VEHICLEDATA_MYKEY returned null", enumVehicleDataMyKey); - assertNotNull("VEHICLEDATA_FUELRANGE returned null", enumVehicleDataFuelRange); - assertNotNull("VEHICLEDATA_TURNSIGNAL returned null", enumVehicleDataTurnSignal); - assertNotNull("VEHICLEDATA_ELECTRONICPARKBRAKESTATUS returned null", enumVehicleDataElectronicParkBrakeStatus); - assertNotNull("VEHICLEDATA_CLOUDAPPVEHICLEID returned null", enumVehicleCloudAppVehicleId); - assertNotNull("VEHICLEDATA_OEM_CUSTOM_DATA returned null", enumVehicleDataOemVehicleDataType); - assertNotNull("VEHICLEDATA_HANDSOFFSTEERING returned null", enumVehicleDataHandsOffSteeringType); - assertNotNull("VEHICLEDATA_WINDOWSTATUS returned null", enumVehicleDataTypeWindowStatus); - assertNotNull("VEHICLEDATA_GEARSTATUS returned null", enumVehicleDataGearStatus); - assertNotNull("VEHICLEDATA_STABILITYCONTROLSSTATUS returned null", enumVehicleDataStabilityControlsStatus); - } - - /** - * Verifies that an invalid assignment is null. - */ - public void testInvalidEnum () { - String example = "VeHIcLEDatA_GPs"; - try { - VehicleDataType temp = VehicleDataType.valueForString(example); + assertNotNull("VEHICLEDATA_GPS returned null", enumVehicleDataGps); + assertNotNull("VEHICLEDATA_SPEED returned null", enumVehicleDataSpeed); + assertNotNull("VEHICLEDATA_RPM returned null", enumVehicleDataRpm); + assertNotNull("VEHICLEDATA_FUELLEVEL returned null", enumVehicleDataFuelLevel); + assertNotNull("VEHICLEDATA_FUELLEVEL_STATE returned null", enumVehicleDataFuelLevelState); + assertNotNull("VEHICLEDATA_FUELCONSUMPTION returned null", enumVehicleDataFuelConsumption); + assertNotNull("VEHICLEDATA_EXTERNTEMP returned null", enumVehicleDataExternTemp); + assertNotNull("VEHICLEDATA_VIN returned null", enumVehicleDataVin); + assertNotNull("VEHICLEDATA_PRNDL returned null", enumVehicleDataPrndl); + assertNotNull("VEHICLEDATA_TIREPRESSURE returned null", enumVehicleDataTirePressure); + assertNotNull("VEHICLEDATA_ODOMETER returned null", enumVehicleDataOdometer); + assertNotNull("VEHICLEDATA_BELTSTATUS returned null", enumVehicleDataBeltStatus); + assertNotNull("VEHICLEDATA_BODYINFO returned null", enumVehicleDataBodyInfo); + assertNotNull("VEHICLEDATA_DEVICESTATUS returned null", enumVehicleDataDeviceStatus); + assertNotNull("VEHICLEDATA_BRAKING returned null", enumVehicleDataBraking); + assertNotNull("VEHICLEDATA_WIPERSTATUS returned null", enumVehicleDataWiperStatus); + assertNotNull("VEHICLEDATA_HEADLAMPSTATUS returned null", enumVehicleDataHeadlampStatus); + assertNotNull("VEHICLEDATA_BATTVOLTAGE returned null", enumVehicleDataBattVoltage); + assertNotNull("VEHICLEDATA_ENGINETORQUE returned null", enumVehicleDataEngineTorque); + assertNotNull("VEHICLEDATA_ENGINEOILLIFE returned null", enumVehicleDataEngineOilLife); + assertNotNull("VEHICLEDATA_ACCPEDAL returned null", enumVehicleDataAccPedal); + assertNotNull("VEHICLEDATA_STEERINGWHEEL returned null", enumVehicleDataSteeringWheel); + assertNotNull("VEHICLEDATA_ECALLINFO returned null", enumVehicleDataECallInfo); + assertNotNull("VEHICLEDATA_AIRBAGSTATUS returned null", enumVehicleDataAirbagStatus); + assertNotNull("VEHICLEDATA_EMERGENCYEVENT returned null", enumVehicleDataEmergencyEvent); + assertNotNull("VEHICLEDATA_CLUSTERMODESTATUS returned null", enumVehicleDataClusterModeStatus); + assertNotNull("VEHICLEDATA_MYKEY returned null", enumVehicleDataMyKey); + assertNotNull("VEHICLEDATA_FUELRANGE returned null", enumVehicleDataFuelRange); + assertNotNull("VEHICLEDATA_TURNSIGNAL returned null", enumVehicleDataTurnSignal); + assertNotNull("VEHICLEDATA_ELECTRONICPARKBRAKESTATUS returned null", enumVehicleDataElectronicParkBrakeStatus); + assertNotNull("VEHICLEDATA_CLOUDAPPVEHICLEID returned null", enumVehicleCloudAppVehicleId); + assertNotNull("VEHICLEDATA_OEM_CUSTOM_DATA returned null", enumVehicleDataOemVehicleDataType); + assertNotNull("VEHICLEDATA_HANDSOFFSTEERING returned null", enumVehicleDataHandsOffSteeringType); + assertNotNull("VEHICLEDATA_WINDOWSTATUS returned null", enumVehicleDataTypeWindowStatus); + assertNotNull("VEHICLEDATA_GEARSTATUS returned null", enumVehicleDataGearStatus); + assertNotNull("VEHICLEDATA_STABILITYCONTROLSSTATUS returned null", enumVehicleDataStabilityControlsStatus); + } + + /** + * Verifies that an invalid assignment is null. + */ + public void testInvalidEnum() { + String example = "VeHIcLEDatA_GPs"; + try { + VehicleDataType temp = VehicleDataType.valueForString(example); assertNull("Result of valueForString should be null.", temp); - } - catch (IllegalArgumentException exception) { + } catch (IllegalArgumentException exception) { fail("Invalid enum throws IllegalArgumentException."); - } - } - - /** - * Verifies that a null assignment is invalid. - */ - public void testNullEnum () { - String example = null; - try { - VehicleDataType temp = VehicleDataType.valueForString(example); + } + } + + /** + * Verifies that a null assignment is invalid. + */ + public void testNullEnum() { + String example = null; + try { + VehicleDataType temp = VehicleDataType.valueForString(example); assertNull("Result of valueForString should be null.", temp); - } - catch (NullPointerException exception) { + } catch (NullPointerException exception) { fail("Null string throws NullPointerException."); - } - } - - /** - * Verifies the possible enum values of VehicleDataType. - */ - public void testListEnum() { - List<VehicleDataType> enumValueList = Arrays.asList(VehicleDataType.values()); + } + } + + /** + * Verifies the possible enum values of VehicleDataType. + */ + public void testListEnum() { + List<VehicleDataType> enumValueList = Arrays.asList(VehicleDataType.values()); - List<VehicleDataType> enumTestList = new ArrayList<VehicleDataType>(); - enumTestList.add(VehicleDataType.VEHICLEDATA_GPS); - enumTestList.add(VehicleDataType.VEHICLEDATA_SPEED); - enumTestList.add(VehicleDataType.VEHICLEDATA_RPM); - enumTestList.add(VehicleDataType.VEHICLEDATA_FUELLEVEL); - enumTestList.add(VehicleDataType.VEHICLEDATA_FUELLEVEL_STATE); - enumTestList.add(VehicleDataType.VEHICLEDATA_FUELCONSUMPTION); - enumTestList.add(VehicleDataType.VEHICLEDATA_EXTERNTEMP); - enumTestList.add(VehicleDataType.VEHICLEDATA_VIN); - enumTestList.add(VehicleDataType.VEHICLEDATA_PRNDL); - enumTestList.add(VehicleDataType.VEHICLEDATA_TIREPRESSURE); - enumTestList.add(VehicleDataType.VEHICLEDATA_ODOMETER); - enumTestList.add(VehicleDataType.VEHICLEDATA_BELTSTATUS); - enumTestList.add(VehicleDataType.VEHICLEDATA_BODYINFO); - enumTestList.add(VehicleDataType.VEHICLEDATA_DEVICESTATUS); - enumTestList.add(VehicleDataType.VEHICLEDATA_BRAKING); - enumTestList.add(VehicleDataType.VEHICLEDATA_WIPERSTATUS); - enumTestList.add(VehicleDataType.VEHICLEDATA_HEADLAMPSTATUS); - enumTestList.add(VehicleDataType.VEHICLEDATA_BATTVOLTAGE); - enumTestList.add(VehicleDataType.VEHICLEDATA_ENGINETORQUE); - enumTestList.add(VehicleDataType.VEHICLEDATA_ENGINEOILLIFE); - enumTestList.add(VehicleDataType.VEHICLEDATA_ACCPEDAL); - enumTestList.add(VehicleDataType.VEHICLEDATA_STEERINGWHEEL); - enumTestList.add(VehicleDataType.VEHICLEDATA_ECALLINFO); - enumTestList.add(VehicleDataType.VEHICLEDATA_AIRBAGSTATUS); - enumTestList.add(VehicleDataType.VEHICLEDATA_EMERGENCYEVENT); - enumTestList.add(VehicleDataType.VEHICLEDATA_CLUSTERMODESTATUS); - enumTestList.add(VehicleDataType.VEHICLEDATA_MYKEY); - enumTestList.add(VehicleDataType.VEHICLEDATA_FUELRANGE); - enumTestList.add(VehicleDataType.VEHICLEDATA_TURNSIGNAL); - enumTestList.add(VehicleDataType.VEHICLEDATA_ELECTRONICPARKBRAKESTATUS); - enumTestList.add(VehicleDataType.VEHICLEDATA_CLOUDAPPVEHICLEID); - enumTestList.add(VehicleDataType.VEHICLEDATA_OEM_CUSTOM_DATA); - enumTestList.add(VehicleDataType.VEHICLEDATA_HANDSOFFSTEERING); - enumTestList.add(VehicleDataType.VEHICLEDATA_WINDOWSTATUS); - enumTestList.add(VehicleDataType.VEHICLEDATA_GEARSTATUS); - enumTestList.add(VehicleDataType.VEHICLEDATA_STABILITYCONTROLSSTATUS); + List<VehicleDataType> enumTestList = new ArrayList<VehicleDataType>(); + enumTestList.add(VehicleDataType.VEHICLEDATA_GPS); + enumTestList.add(VehicleDataType.VEHICLEDATA_SPEED); + enumTestList.add(VehicleDataType.VEHICLEDATA_RPM); + enumTestList.add(VehicleDataType.VEHICLEDATA_FUELLEVEL); + enumTestList.add(VehicleDataType.VEHICLEDATA_FUELLEVEL_STATE); + enumTestList.add(VehicleDataType.VEHICLEDATA_FUELCONSUMPTION); + enumTestList.add(VehicleDataType.VEHICLEDATA_EXTERNTEMP); + enumTestList.add(VehicleDataType.VEHICLEDATA_VIN); + enumTestList.add(VehicleDataType.VEHICLEDATA_PRNDL); + enumTestList.add(VehicleDataType.VEHICLEDATA_TIREPRESSURE); + enumTestList.add(VehicleDataType.VEHICLEDATA_ODOMETER); + enumTestList.add(VehicleDataType.VEHICLEDATA_BELTSTATUS); + enumTestList.add(VehicleDataType.VEHICLEDATA_BODYINFO); + enumTestList.add(VehicleDataType.VEHICLEDATA_DEVICESTATUS); + enumTestList.add(VehicleDataType.VEHICLEDATA_BRAKING); + enumTestList.add(VehicleDataType.VEHICLEDATA_WIPERSTATUS); + enumTestList.add(VehicleDataType.VEHICLEDATA_HEADLAMPSTATUS); + enumTestList.add(VehicleDataType.VEHICLEDATA_BATTVOLTAGE); + enumTestList.add(VehicleDataType.VEHICLEDATA_ENGINETORQUE); + enumTestList.add(VehicleDataType.VEHICLEDATA_ENGINEOILLIFE); + enumTestList.add(VehicleDataType.VEHICLEDATA_ACCPEDAL); + enumTestList.add(VehicleDataType.VEHICLEDATA_STEERINGWHEEL); + enumTestList.add(VehicleDataType.VEHICLEDATA_ECALLINFO); + enumTestList.add(VehicleDataType.VEHICLEDATA_AIRBAGSTATUS); + enumTestList.add(VehicleDataType.VEHICLEDATA_EMERGENCYEVENT); + enumTestList.add(VehicleDataType.VEHICLEDATA_CLUSTERMODESTATUS); + enumTestList.add(VehicleDataType.VEHICLEDATA_MYKEY); + enumTestList.add(VehicleDataType.VEHICLEDATA_FUELRANGE); + enumTestList.add(VehicleDataType.VEHICLEDATA_TURNSIGNAL); + enumTestList.add(VehicleDataType.VEHICLEDATA_ELECTRONICPARKBRAKESTATUS); + enumTestList.add(VehicleDataType.VEHICLEDATA_CLOUDAPPVEHICLEID); + enumTestList.add(VehicleDataType.VEHICLEDATA_OEM_CUSTOM_DATA); + enumTestList.add(VehicleDataType.VEHICLEDATA_HANDSOFFSTEERING); + enumTestList.add(VehicleDataType.VEHICLEDATA_WINDOWSTATUS); + enumTestList.add(VehicleDataType.VEHICLEDATA_GEARSTATUS); + enumTestList.add(VehicleDataType.VEHICLEDATA_STABILITYCONTROLSSTATUS); - assertTrue("Enum value list does not match enum class list", - enumValueList.containsAll(enumTestList) && enumTestList.containsAll(enumValueList)); - } + assertTrue("Enum value list does not match enum class list", + enumValueList.containsAll(enumTestList) && enumTestList.containsAll(enumValueList)); + } } diff --git a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/VentilationModeTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/VentilationModeTests.java index 3cd7b4038..359b6fd2c 100644 --- a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/VentilationModeTests.java +++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/VentilationModeTests.java @@ -9,71 +9,69 @@ import java.util.Arrays; import java.util.List; /** - * This is a unit test class for the SmartDeviceLink library project class : + * This is a unit test class for the SmartDeviceLink library project class : * {@link com.smartdevicelink.proxy.rpc.enums.VentilationMode} */ public class VentilationModeTests extends TestCase { - /** - * Verifies that the enum values are not null upon valid assignment. - */ - public void testValidEnums () { - String example = "UPPER"; - VentilationMode enumUpper = VentilationMode.valueForString(example); - example = "LOWER"; - VentilationMode enumLower = VentilationMode.valueForString(example); - example = "BOTH"; - VentilationMode enumBoth = VentilationMode.valueForString(example); - example = "NONE"; - VentilationMode enumNone = VentilationMode.valueForString(example); + /** + * Verifies that the enum values are not null upon valid assignment. + */ + public void testValidEnums() { + String example = "UPPER"; + VentilationMode enumUpper = VentilationMode.valueForString(example); + example = "LOWER"; + VentilationMode enumLower = VentilationMode.valueForString(example); + example = "BOTH"; + VentilationMode enumBoth = VentilationMode.valueForString(example); + example = "NONE"; + VentilationMode enumNone = VentilationMode.valueForString(example); - assertNotNull("UPPER returned null", enumUpper); - assertNotNull("LOWER returned null", enumLower); - assertNotNull("BOTH returned null", enumBoth); - assertNotNull("NONE returned null", enumNone); - } + assertNotNull("UPPER returned null", enumUpper); + assertNotNull("LOWER returned null", enumLower); + assertNotNull("BOTH returned null", enumBoth); + assertNotNull("NONE returned null", enumNone); + } - /** - * Verifies that an invalid assignment is null. - */ - public void testInvalidEnum () { - String example = "uPPER"; - try { - VentilationMode temp = VentilationMode.valueForString(example); + /** + * Verifies that an invalid assignment is null. + */ + public void testInvalidEnum() { + String example = "uPPER"; + try { + VentilationMode temp = VentilationMode.valueForString(example); assertNull("Result of valueForString should be null.", temp); - } - catch (IllegalArgumentException exception) { + } catch (IllegalArgumentException exception) { fail("Invalid enum throws IllegalArgumentException."); - } - } + } + } - /** - * Verifies that a null assignment is invalid. - */ - public void testNullEnum () { - String example = null; - try { - VentilationMode temp = VentilationMode.valueForString(example); + /** + * Verifies that a null assignment is invalid. + */ + public void testNullEnum() { + String example = null; + try { + VentilationMode temp = VentilationMode.valueForString(example); assertNull("Result of valueForString should be null.", temp); - } - catch (NullPointerException exception) { + } catch (NullPointerException exception) { fail("Null string throws NullPointerException."); - } - } + } + } - /** - * Verifies the possible enum values of VentilationMode. - */ - public void testListEnum() { - List<VentilationMode> enumValueList = Arrays.asList(VentilationMode.values()); + /** + * Verifies the possible enum values of VentilationMode. + */ + public void testListEnum() { + List<VentilationMode> enumValueList = Arrays.asList(VentilationMode.values()); - List<VentilationMode> enumTestList = new ArrayList<VentilationMode>(); - enumTestList.add(VentilationMode.UPPER); - enumTestList.add(VentilationMode.LOWER); - enumTestList.add(VentilationMode.BOTH); - enumTestList.add(VentilationMode.NONE); + List<VentilationMode> enumTestList = new ArrayList<VentilationMode>(); + enumTestList.add(VentilationMode.UPPER); + enumTestList.add(VentilationMode.LOWER); + enumTestList.add(VentilationMode.BOTH); + enumTestList.add(VentilationMode.NONE); - assertTrue("Enum value list does not match enum class list", - enumValueList.containsAll(enumTestList) && enumTestList.containsAll(enumValueList)); - } + assertTrue("Enum value list does not match enum class list", + enumValueList.containsAll(enumTestList) && enumTestList.containsAll(enumValueList)); + } }
\ No newline at end of file diff --git a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/VideoStreamingCodecTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/VideoStreamingCodecTests.java index b4aa8fd97..641fc5dd9 100644 --- a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/VideoStreamingCodecTests.java +++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/VideoStreamingCodecTests.java @@ -1,4 +1,5 @@ package com.smartdevicelink.test.rpc.enums; + import com.smartdevicelink.proxy.rpc.enums.VideoStreamingCodec; import junit.framework.TestCase; @@ -9,71 +10,69 @@ import java.util.List; public class VideoStreamingCodecTests extends TestCase { - /** - * Verifies that the enum values are not null upon valid assignment. - */ - public void testValidEnums () { - String example = "H264"; - VideoStreamingCodec enumH264 = VideoStreamingCodec.valueForString(example); - example = "H265"; - VideoStreamingCodec enumH265 = VideoStreamingCodec.valueForString(example); - example = "Theora"; - VideoStreamingCodec enumTheora = VideoStreamingCodec.valueForString(example); - example = "VP8"; - VideoStreamingCodec enumVP8 = VideoStreamingCodec.valueForString(example); - example = "VP9"; - VideoStreamingCodec enumVP9 = VideoStreamingCodec.valueForString(example); + /** + * Verifies that the enum values are not null upon valid assignment. + */ + public void testValidEnums() { + String example = "H264"; + VideoStreamingCodec enumH264 = VideoStreamingCodec.valueForString(example); + example = "H265"; + VideoStreamingCodec enumH265 = VideoStreamingCodec.valueForString(example); + example = "Theora"; + VideoStreamingCodec enumTheora = VideoStreamingCodec.valueForString(example); + example = "VP8"; + VideoStreamingCodec enumVP8 = VideoStreamingCodec.valueForString(example); + example = "VP9"; + VideoStreamingCodec enumVP9 = VideoStreamingCodec.valueForString(example); - assertNotNull("H264 returned null", enumH264); - assertNotNull("H265 returned null", enumH265); - assertNotNull("Theora returned null", enumTheora); - assertNotNull("VP8 returned null", enumVP8); - assertNotNull("VP9 returned null", enumVP9); - } + assertNotNull("H264 returned null", enumH264); + assertNotNull("H265 returned null", enumH265); + assertNotNull("Theora returned null", enumTheora); + assertNotNull("VP8 returned null", enumVP8); + assertNotNull("VP9 returned null", enumVP9); + } - /** - * Verifies that an invalid assignment is null. - */ - public void testInvalidEnum () { - String example = "H234"; - try { - VideoStreamingCodec temp = VideoStreamingCodec.valueForString(example); - assertNull("Result of valueForString should be null.", temp); - } - catch (IllegalArgumentException exception) { - fail("Invalid enum throws IllegalArgumentException."); - } - } + /** + * Verifies that an invalid assignment is null. + */ + public void testInvalidEnum() { + String example = "H234"; + try { + VideoStreamingCodec temp = VideoStreamingCodec.valueForString(example); + assertNull("Result of valueForString should be null.", temp); + } catch (IllegalArgumentException exception) { + fail("Invalid enum throws IllegalArgumentException."); + } + } - /** - * Verifies that a null assignment is invalid. - */ - public void testNullEnum () { - String example = null; - try { - VideoStreamingCodec temp = VideoStreamingCodec.valueForString(example); - assertNull("Result of valueForString should be null.", temp); - } - catch (NullPointerException exception) { - fail("Null string throws NullPointerException."); - } - } + /** + * Verifies that a null assignment is invalid. + */ + public void testNullEnum() { + String example = null; + try { + VideoStreamingCodec temp = VideoStreamingCodec.valueForString(example); + assertNull("Result of valueForString should be null.", temp); + } catch (NullPointerException exception) { + fail("Null string throws NullPointerException."); + } + } - /** - * Verifies the possible enum values of TouchType. - */ - public void testListEnum() { - List<VideoStreamingCodec> enumValueList = Arrays.asList(VideoStreamingCodec.values()); + /** + * Verifies the possible enum values of TouchType. + */ + public void testListEnum() { + List<VideoStreamingCodec> enumValueList = Arrays.asList(VideoStreamingCodec.values()); - List<VideoStreamingCodec> enumTestList = new ArrayList<VideoStreamingCodec>(); - enumTestList.add(VideoStreamingCodec.H264); - enumTestList.add(VideoStreamingCodec.H265); - enumTestList.add(VideoStreamingCodec.Theora); - enumTestList.add(VideoStreamingCodec.VP8); - enumTestList.add(VideoStreamingCodec.VP9); + List<VideoStreamingCodec> enumTestList = new ArrayList<VideoStreamingCodec>(); + enumTestList.add(VideoStreamingCodec.H264); + enumTestList.add(VideoStreamingCodec.H265); + enumTestList.add(VideoStreamingCodec.Theora); + enumTestList.add(VideoStreamingCodec.VP8); + enumTestList.add(VideoStreamingCodec.VP9); - assertTrue("Enum value list does not match enum class list", - enumValueList.containsAll(enumTestList) && enumTestList.containsAll(enumValueList)); - } + assertTrue("Enum value list does not match enum class list", + enumValueList.containsAll(enumTestList) && enumTestList.containsAll(enumValueList)); + } } diff --git a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/VideoStreamingProtocolTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/VideoStreamingProtocolTests.java index 36dba5b6f..090017aca 100644 --- a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/VideoStreamingProtocolTests.java +++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/VideoStreamingProtocolTests.java @@ -10,72 +10,70 @@ import java.util.List; public class VideoStreamingProtocolTests extends TestCase { - /** - * Verifies that the enum values are not null upon valid assignment. - */ - public void testValidEnums () { - String example = "RAW"; - VideoStreamingProtocol enumRAW = VideoStreamingProtocol.valueForString(example); - example = "RTP"; - VideoStreamingProtocol enumRTP = VideoStreamingProtocol.valueForString(example); - example = "RTSP"; - VideoStreamingProtocol enumRTSP = VideoStreamingProtocol.valueForString(example); - example = "RTMP"; - VideoStreamingProtocol enumRTMP = VideoStreamingProtocol.valueForString(example); - example = "WEBM"; - VideoStreamingProtocol enumWEBM = VideoStreamingProtocol.valueForString(example); + /** + * Verifies that the enum values are not null upon valid assignment. + */ + public void testValidEnums() { + String example = "RAW"; + VideoStreamingProtocol enumRAW = VideoStreamingProtocol.valueForString(example); + example = "RTP"; + VideoStreamingProtocol enumRTP = VideoStreamingProtocol.valueForString(example); + example = "RTSP"; + VideoStreamingProtocol enumRTSP = VideoStreamingProtocol.valueForString(example); + example = "RTMP"; + VideoStreamingProtocol enumRTMP = VideoStreamingProtocol.valueForString(example); + example = "WEBM"; + VideoStreamingProtocol enumWEBM = VideoStreamingProtocol.valueForString(example); - assertNotNull("RAW returned null", enumRAW); - assertNotNull("RTP returned null", enumRTP); - assertNotNull("RTSP returned null", enumRTSP); - assertNotNull("RTMP returned null", enumRTMP); - assertNotNull("WEBM returned null", enumWEBM); - } + assertNotNull("RAW returned null", enumRAW); + assertNotNull("RTP returned null", enumRTP); + assertNotNull("RTSP returned null", enumRTSP); + assertNotNull("RTMP returned null", enumRTMP); + assertNotNull("WEBM returned null", enumWEBM); + } - /** - * Verifies that an invalid assignment is null. - */ - public void testInvalidEnum () { - String example = "RAAW"; - try { - VideoStreamingProtocol temp = VideoStreamingProtocol.valueForString(example); - assertNull("Result of valueForString should be null.", temp); - } - catch (IllegalArgumentException exception) { - fail("Invalid enum throws IllegalArgumentException."); - } - } + /** + * Verifies that an invalid assignment is null. + */ + public void testInvalidEnum() { + String example = "RAAW"; + try { + VideoStreamingProtocol temp = VideoStreamingProtocol.valueForString(example); + assertNull("Result of valueForString should be null.", temp); + } catch (IllegalArgumentException exception) { + fail("Invalid enum throws IllegalArgumentException."); + } + } - /** - * Verifies that a null assignment is invalid. - */ - public void testNullEnum () { - String example = null; - try { - VideoStreamingProtocol temp = VideoStreamingProtocol.valueForString(example); - assertNull("Result of valueForString should be null.", temp); - } - catch (NullPointerException exception) { - fail("Null string throws NullPointerException."); - } - } + /** + * Verifies that a null assignment is invalid. + */ + public void testNullEnum() { + String example = null; + try { + VideoStreamingProtocol temp = VideoStreamingProtocol.valueForString(example); + assertNull("Result of valueForString should be null.", temp); + } catch (NullPointerException exception) { + fail("Null string throws NullPointerException."); + } + } - /** - * Verifies the possible enum values of TouchType. - */ - public void testListEnum() { - List<VideoStreamingProtocol> enumValueList = Arrays.asList(VideoStreamingProtocol.values()); + /** + * Verifies the possible enum values of TouchType. + */ + public void testListEnum() { + List<VideoStreamingProtocol> enumValueList = Arrays.asList(VideoStreamingProtocol.values()); - List<VideoStreamingProtocol> enumTestList = new ArrayList<VideoStreamingProtocol>(); - enumTestList.add(VideoStreamingProtocol.RAW); - enumTestList.add(VideoStreamingProtocol.RTP); - enumTestList.add(VideoStreamingProtocol.RTSP); - enumTestList.add(VideoStreamingProtocol.RTMP); - enumTestList.add(VideoStreamingProtocol.WEBM); + List<VideoStreamingProtocol> enumTestList = new ArrayList<VideoStreamingProtocol>(); + enumTestList.add(VideoStreamingProtocol.RAW); + enumTestList.add(VideoStreamingProtocol.RTP); + enumTestList.add(VideoStreamingProtocol.RTSP); + enumTestList.add(VideoStreamingProtocol.RTMP); + enumTestList.add(VideoStreamingProtocol.WEBM); - assertTrue("Enum value list does not match enum class list", - enumValueList.containsAll(enumTestList) && enumTestList.containsAll(enumValueList)); - } + assertTrue("Enum value list does not match enum class list", + enumValueList.containsAll(enumTestList) && enumTestList.containsAll(enumValueList)); + } } diff --git a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/VideoStreamingStateTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/VideoStreamingStateTests.java index 2074efe47..bf0858464 100644 --- a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/VideoStreamingStateTests.java +++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/VideoStreamingStateTests.java @@ -9,63 +9,61 @@ import java.util.Arrays; import java.util.List; /** - * This is a unit test class for the SmartDeviceLink library project class : + * This is a unit test class for the SmartDeviceLink library project class : * {@link com.smartdevicelink.proxy.rpc.enums.VideoStreamingState} */ public class VideoStreamingStateTests extends TestCase { - /** - * Verifies that the enum values are not null upon valid assignment. - */ - public void testValidEnums () { - String example = "STREAMABLE"; - VideoStreamingState enumStreamable = VideoStreamingState.valueForString(example); - example = "NOT_STREAMABLE"; - VideoStreamingState enumNotStreamable = VideoStreamingState.valueForString(example); + /** + * Verifies that the enum values are not null upon valid assignment. + */ + public void testValidEnums() { + String example = "STREAMABLE"; + VideoStreamingState enumStreamable = VideoStreamingState.valueForString(example); + example = "NOT_STREAMABLE"; + VideoStreamingState enumNotStreamable = VideoStreamingState.valueForString(example); - assertNotNull("STREAMABLE returned null", enumStreamable); - assertNotNull("NOT_STREAMABLE returned null", enumNotStreamable); - } + assertNotNull("STREAMABLE returned null", enumStreamable); + assertNotNull("NOT_STREAMABLE returned null", enumNotStreamable); + } - /** - * Verifies that an invalid assignment is null. - */ - public void testInvalidEnum () { - String example = "StrEAmaBlE"; - try { - VideoStreamingState temp = VideoStreamingState.valueForString(example); + /** + * Verifies that an invalid assignment is null. + */ + public void testInvalidEnum() { + String example = "StrEAmaBlE"; + try { + VideoStreamingState temp = VideoStreamingState.valueForString(example); assertNull("Result of valueForString should be null.", temp); - } - catch (IllegalArgumentException exception) { + } catch (IllegalArgumentException exception) { fail("Invalid enum throws IllegalArgumentException."); - } - } + } + } - /** - * Verifies that a null assignment is invalid. - */ - public void testNullEnum () { - String example = null; - try { - VideoStreamingState temp = VideoStreamingState.valueForString(example); + /** + * Verifies that a null assignment is invalid. + */ + public void testNullEnum() { + String example = null; + try { + VideoStreamingState temp = VideoStreamingState.valueForString(example); assertNull("Result of valueForString should be null.", temp); - } - catch (NullPointerException exception) { + } catch (NullPointerException exception) { fail("Null string throws NullPointerException."); - } - } + } + } - /** - * Verifies the possible enum values of VideoStreamingState. - */ - public void testListEnum() { - List<VideoStreamingState> enumValueList = Arrays.asList(VideoStreamingState.values()); + /** + * Verifies the possible enum values of VideoStreamingState. + */ + public void testListEnum() { + List<VideoStreamingState> enumValueList = Arrays.asList(VideoStreamingState.values()); - List<VideoStreamingState> enumTestList = new ArrayList<VideoStreamingState>(); - enumTestList.add(VideoStreamingState.STREAMABLE); - enumTestList.add(VideoStreamingState.NOT_STREAMABLE); + List<VideoStreamingState> enumTestList = new ArrayList<VideoStreamingState>(); + enumTestList.add(VideoStreamingState.STREAMABLE); + enumTestList.add(VideoStreamingState.NOT_STREAMABLE); - assertTrue("Enum value list does not match enum class list", - enumValueList.containsAll(enumTestList) && enumTestList.containsAll(enumValueList)); - } + assertTrue("Enum value list does not match enum class list", + enumValueList.containsAll(enumTestList) && enumTestList.containsAll(enumValueList)); + } }
\ No newline at end of file diff --git a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/VrCapabilitiesTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/VrCapabilitiesTests.java index 611798683..de8bd5ac3 100644 --- a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/VrCapabilitiesTests.java +++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/VrCapabilitiesTests.java @@ -9,60 +9,58 @@ import java.util.Arrays; import java.util.List; /** - * This is a unit test class for the SmartDeviceLink library project class : + * This is a unit test class for the SmartDeviceLink library project class : * {@link com.smartdevicelink.proxy.rpc.enums.VrCapabilities} */ public class VrCapabilitiesTests extends TestCase { - /** - * Verifies that the enum values are not null upon valid assignment. - */ - public void testValidEnums () { - String example = "Text"; - VrCapabilities enumText = VrCapabilities.valueForString(example); - - assertNotNull("Text returned null", enumText); - } - - /** - * Verifies that an invalid assignment is null. - */ - public void testInvalidEnum () { - String example = "tExTx"; - try { - VrCapabilities temp = VrCapabilities.valueForString(example); + /** + * Verifies that the enum values are not null upon valid assignment. + */ + public void testValidEnums() { + String example = "Text"; + VrCapabilities enumText = VrCapabilities.valueForString(example); + + assertNotNull("Text returned null", enumText); + } + + /** + * Verifies that an invalid assignment is null. + */ + public void testInvalidEnum() { + String example = "tExTx"; + try { + VrCapabilities temp = VrCapabilities.valueForString(example); assertNull("Result of valueForString should be null.", temp); - } - catch (IllegalArgumentException exception) { + } catch (IllegalArgumentException exception) { fail("Invalid enum throws IllegalArgumentException."); - } - } - - /** - * Verifies that a null assignment is invalid. - */ - public void testNullEnum () { - String example = null; - try { - VrCapabilities temp = VrCapabilities.valueForString(example); + } + } + + /** + * Verifies that a null assignment is invalid. + */ + public void testNullEnum() { + String example = null; + try { + VrCapabilities temp = VrCapabilities.valueForString(example); assertNull("Result of valueForString should be null.", temp); - } - catch (NullPointerException exception) { + } catch (NullPointerException exception) { fail("Null string throws NullPointerException."); - } - } - - /** - * Verifies the possible enum values of VrCapabilities. - */ - @SuppressWarnings("deprecation") - public void testListEnum() { - List<VrCapabilities> enumValueList = Arrays.asList(VrCapabilities.values()); + } + } + + /** + * Verifies the possible enum values of VrCapabilities. + */ + @SuppressWarnings("deprecation") + public void testListEnum() { + List<VrCapabilities> enumValueList = Arrays.asList(VrCapabilities.values()); - List<VrCapabilities> enumTestList = new ArrayList<VrCapabilities>(); - enumTestList.add(VrCapabilities.TEXT); + List<VrCapabilities> enumTestList = new ArrayList<VrCapabilities>(); + enumTestList.add(VrCapabilities.TEXT); - assertTrue("Enum value list does not match enum class list", - enumValueList.containsAll(enumTestList) && enumTestList.containsAll(enumValueList)); - } + assertTrue("Enum value list does not match enum class list", + enumValueList.containsAll(enumTestList) && enumTestList.containsAll(enumValueList)); + } }
\ No newline at end of file diff --git a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/WarningLightStatusTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/WarningLightStatusTests.java index bf3433f61..278c263df 100644 --- a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/WarningLightStatusTests.java +++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/WarningLightStatusTests.java @@ -9,71 +9,69 @@ import java.util.Arrays; import java.util.List; /** - * This is a unit test class for the SmartDeviceLink library project class : + * This is a unit test class for the SmartDeviceLink library project class : * {@link com.smartdevicelink.proxy.rpc.enums.WarningLightStatus} */ public class WarningLightStatusTests extends TestCase { - /** - * Verifies that the enum values are not null upon valid assignment. - */ - public void testValidEnums () { - String example = "OFF"; - WarningLightStatus enumOff = WarningLightStatus.valueForString(example); - example = "ON"; - WarningLightStatus enumOn = WarningLightStatus.valueForString(example); - example = "FLASH"; - WarningLightStatus enumFlash = WarningLightStatus.valueForString(example); - example = "NOT_USED"; - WarningLightStatus enumNotUsed = WarningLightStatus.valueForString(example); - - assertNotNull("OFF returned null", enumOff); - assertNotNull("ON returned null", enumOn); - assertNotNull("FLASH returned null", enumFlash); - assertNotNull("NOT_USED returned null", enumNotUsed); - } - - /** - * Verifies that an invalid assignment is null. - */ - public void testInvalidEnum () { - String example = "OfF"; - try { - WarningLightStatus temp = WarningLightStatus.valueForString(example); + /** + * Verifies that the enum values are not null upon valid assignment. + */ + public void testValidEnums() { + String example = "OFF"; + WarningLightStatus enumOff = WarningLightStatus.valueForString(example); + example = "ON"; + WarningLightStatus enumOn = WarningLightStatus.valueForString(example); + example = "FLASH"; + WarningLightStatus enumFlash = WarningLightStatus.valueForString(example); + example = "NOT_USED"; + WarningLightStatus enumNotUsed = WarningLightStatus.valueForString(example); + + assertNotNull("OFF returned null", enumOff); + assertNotNull("ON returned null", enumOn); + assertNotNull("FLASH returned null", enumFlash); + assertNotNull("NOT_USED returned null", enumNotUsed); + } + + /** + * Verifies that an invalid assignment is null. + */ + public void testInvalidEnum() { + String example = "OfF"; + try { + WarningLightStatus temp = WarningLightStatus.valueForString(example); assertNull("Result of valueForString should be null.", temp); - } - catch (IllegalArgumentException exception) { + } catch (IllegalArgumentException exception) { fail("Invalid enum throws IllegalArgumentException."); - } - } - - /** - * Verifies that a null assignment is invalid. - */ - public void testNullEnum () { - String example = null; - try { - WarningLightStatus temp = WarningLightStatus.valueForString(example); + } + } + + /** + * Verifies that a null assignment is invalid. + */ + public void testNullEnum() { + String example = null; + try { + WarningLightStatus temp = WarningLightStatus.valueForString(example); assertNull("Result of valueForString should be null.", temp); - } - catch (NullPointerException exception) { + } catch (NullPointerException exception) { fail("Null string throws NullPointerException."); - } - } - - /** - * Verifies the possible enum values of WarningLightStatus. - */ - public void testListEnum() { - List<WarningLightStatus> enumValueList = Arrays.asList(WarningLightStatus.values()); + } + } + + /** + * Verifies the possible enum values of WarningLightStatus. + */ + public void testListEnum() { + List<WarningLightStatus> enumValueList = Arrays.asList(WarningLightStatus.values()); - List<WarningLightStatus> enumTestList = new ArrayList<WarningLightStatus>(); - enumTestList.add(WarningLightStatus.OFF); - enumTestList.add(WarningLightStatus.ON); - enumTestList.add(WarningLightStatus.FLASH); - enumTestList.add(WarningLightStatus.NOT_USED); + List<WarningLightStatus> enumTestList = new ArrayList<WarningLightStatus>(); + enumTestList.add(WarningLightStatus.OFF); + enumTestList.add(WarningLightStatus.ON); + enumTestList.add(WarningLightStatus.FLASH); + enumTestList.add(WarningLightStatus.NOT_USED); - assertTrue("Enum value list does not match enum class list", - enumValueList.containsAll(enumTestList) && enumTestList.containsAll(enumValueList)); - } + assertTrue("Enum value list does not match enum class list", + enumValueList.containsAll(enumTestList) && enumTestList.containsAll(enumValueList)); + } }
\ No newline at end of file diff --git a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/WiperStatusTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/WiperStatusTests.java index 918bfa207..b38030ef4 100644 --- a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/WiperStatusTests.java +++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/WiperStatusTests.java @@ -9,115 +9,113 @@ import java.util.Arrays; import java.util.List; /** - * This is a unit test class for the SmartDeviceLink library project class : + * This is a unit test class for the SmartDeviceLink library project class : * {@link com.smartdevicelink.proxy.rpc.enums.WiperStatus} */ public class WiperStatusTests extends TestCase { - /** - * Verifies that the enum values are not null upon valid assignment. - */ - public void testValidEnums () { - String example = "OFF"; - WiperStatus enumOff = WiperStatus.valueForString(example); - example = "AUTO_OFF"; - WiperStatus enumAutoOff = WiperStatus.valueForString(example); - example = "OFF_MOVING"; - WiperStatus enumOffMoving = WiperStatus.valueForString(example); - example = "MAN_INT_OFF"; - WiperStatus enumManIntOff = WiperStatus.valueForString(example); - example = "MAN_INT_ON"; - WiperStatus enumManIntOn = WiperStatus.valueForString(example); - example = "MAN_LOW"; - WiperStatus enumManLow = WiperStatus.valueForString(example); - example = "MAN_HIGH"; - WiperStatus enumManHigh = WiperStatus.valueForString(example); - example = "MAN_FLICK"; - WiperStatus enumManFlick = WiperStatus.valueForString(example); - example = "WASH"; - WiperStatus enumWash = WiperStatus.valueForString(example); - example = "AUTO_LOW"; - WiperStatus enumAutoLow = WiperStatus.valueForString(example); - example = "AUTO_HIGH"; - WiperStatus enumAutoHigh = WiperStatus.valueForString(example); - example = "COURTESYWIPE"; - WiperStatus enumCourtesyWipe = WiperStatus.valueForString(example); - example = "AUTO_ADJUST"; - WiperStatus enumAutoAdjust = WiperStatus.valueForString(example); - example = "STALLED"; - WiperStatus enumStalled = WiperStatus.valueForString(example); - example = "NO_DATA_EXISTS"; - WiperStatus enumNoDataExists = WiperStatus.valueForString(example); - - assertNotNull("OFF returned null", enumOff); - assertNotNull("AUTO_OFF returned null", enumAutoOff); - assertNotNull("OFF_MOVING returned null", enumOffMoving); - assertNotNull("MAN_INT_OFF returned null", enumManIntOff); - assertNotNull("MAN_INT_ON returned null", enumManIntOn); - assertNotNull("MAN_LOW returned null", enumManLow); - assertNotNull("MAN_HIGH returned null", enumManHigh); - assertNotNull("MAN_FLICK returned null", enumManFlick); - assertNotNull("WASH returned null", enumWash); - assertNotNull("AUTO_LOW returned null", enumAutoLow); - assertNotNull("AUTO_HIGH returned null", enumAutoHigh); - assertNotNull("COURTESYWIPE returned null", enumCourtesyWipe); - assertNotNull("AUTO_ADJUST returned null", enumAutoAdjust); - assertNotNull("STALLED returned null", enumStalled); - assertNotNull("NO_DATA_EXISTS returned null", enumNoDataExists); - } - - /** - * Verifies that an invalid assignment is null. - */ - public void testInvalidEnum () { - String example = "OFf"; - try { - WiperStatus temp = WiperStatus.valueForString(example); + /** + * Verifies that the enum values are not null upon valid assignment. + */ + public void testValidEnums() { + String example = "OFF"; + WiperStatus enumOff = WiperStatus.valueForString(example); + example = "AUTO_OFF"; + WiperStatus enumAutoOff = WiperStatus.valueForString(example); + example = "OFF_MOVING"; + WiperStatus enumOffMoving = WiperStatus.valueForString(example); + example = "MAN_INT_OFF"; + WiperStatus enumManIntOff = WiperStatus.valueForString(example); + example = "MAN_INT_ON"; + WiperStatus enumManIntOn = WiperStatus.valueForString(example); + example = "MAN_LOW"; + WiperStatus enumManLow = WiperStatus.valueForString(example); + example = "MAN_HIGH"; + WiperStatus enumManHigh = WiperStatus.valueForString(example); + example = "MAN_FLICK"; + WiperStatus enumManFlick = WiperStatus.valueForString(example); + example = "WASH"; + WiperStatus enumWash = WiperStatus.valueForString(example); + example = "AUTO_LOW"; + WiperStatus enumAutoLow = WiperStatus.valueForString(example); + example = "AUTO_HIGH"; + WiperStatus enumAutoHigh = WiperStatus.valueForString(example); + example = "COURTESYWIPE"; + WiperStatus enumCourtesyWipe = WiperStatus.valueForString(example); + example = "AUTO_ADJUST"; + WiperStatus enumAutoAdjust = WiperStatus.valueForString(example); + example = "STALLED"; + WiperStatus enumStalled = WiperStatus.valueForString(example); + example = "NO_DATA_EXISTS"; + WiperStatus enumNoDataExists = WiperStatus.valueForString(example); + + assertNotNull("OFF returned null", enumOff); + assertNotNull("AUTO_OFF returned null", enumAutoOff); + assertNotNull("OFF_MOVING returned null", enumOffMoving); + assertNotNull("MAN_INT_OFF returned null", enumManIntOff); + assertNotNull("MAN_INT_ON returned null", enumManIntOn); + assertNotNull("MAN_LOW returned null", enumManLow); + assertNotNull("MAN_HIGH returned null", enumManHigh); + assertNotNull("MAN_FLICK returned null", enumManFlick); + assertNotNull("WASH returned null", enumWash); + assertNotNull("AUTO_LOW returned null", enumAutoLow); + assertNotNull("AUTO_HIGH returned null", enumAutoHigh); + assertNotNull("COURTESYWIPE returned null", enumCourtesyWipe); + assertNotNull("AUTO_ADJUST returned null", enumAutoAdjust); + assertNotNull("STALLED returned null", enumStalled); + assertNotNull("NO_DATA_EXISTS returned null", enumNoDataExists); + } + + /** + * Verifies that an invalid assignment is null. + */ + public void testInvalidEnum() { + String example = "OFf"; + try { + WiperStatus temp = WiperStatus.valueForString(example); assertNull("Result of valueForString should be null.", temp); - } - catch (IllegalArgumentException exception) { + } catch (IllegalArgumentException exception) { fail("Invalid enum throws IllegalArgumentException."); - } - } - - /** - * Verifies that a null assignment is invalid. - */ - public void testNullEnum () { - String example = null; - try { - WiperStatus temp = WiperStatus.valueForString(example); + } + } + + /** + * Verifies that a null assignment is invalid. + */ + public void testNullEnum() { + String example = null; + try { + WiperStatus temp = WiperStatus.valueForString(example); assertNull("Result of valueForString should be null.", temp); - } - catch (NullPointerException exception) { + } catch (NullPointerException exception) { fail("Null string throws NullPointerException."); - } - } - - /** - * Verifies the possible enum values of WiperStatus. - */ - public void testListEnum() { - List<WiperStatus> enumValueList = Arrays.asList(WiperStatus.values()); + } + } + + /** + * Verifies the possible enum values of WiperStatus. + */ + public void testListEnum() { + List<WiperStatus> enumValueList = Arrays.asList(WiperStatus.values()); - List<WiperStatus> enumTestList = new ArrayList<WiperStatus>(); - enumTestList.add(WiperStatus.OFF); - enumTestList.add(WiperStatus.AUTO_OFF); - enumTestList.add(WiperStatus.OFF_MOVING); - enumTestList.add(WiperStatus.MAN_INT_OFF); - enumTestList.add(WiperStatus.MAN_INT_ON); - enumTestList.add(WiperStatus.MAN_LOW); - enumTestList.add(WiperStatus.MAN_HIGH); - enumTestList.add(WiperStatus.MAN_FLICK); - enumTestList.add(WiperStatus.WASH); - enumTestList.add(WiperStatus.AUTO_LOW); - enumTestList.add(WiperStatus.AUTO_HIGH); - enumTestList.add(WiperStatus.COURTESYWIPE); - enumTestList.add(WiperStatus.AUTO_ADJUST); - enumTestList.add(WiperStatus.STALLED); - enumTestList.add(WiperStatus.NO_DATA_EXISTS); + List<WiperStatus> enumTestList = new ArrayList<WiperStatus>(); + enumTestList.add(WiperStatus.OFF); + enumTestList.add(WiperStatus.AUTO_OFF); + enumTestList.add(WiperStatus.OFF_MOVING); + enumTestList.add(WiperStatus.MAN_INT_OFF); + enumTestList.add(WiperStatus.MAN_INT_ON); + enumTestList.add(WiperStatus.MAN_LOW); + enumTestList.add(WiperStatus.MAN_HIGH); + enumTestList.add(WiperStatus.MAN_FLICK); + enumTestList.add(WiperStatus.WASH); + enumTestList.add(WiperStatus.AUTO_LOW); + enumTestList.add(WiperStatus.AUTO_HIGH); + enumTestList.add(WiperStatus.COURTESYWIPE); + enumTestList.add(WiperStatus.AUTO_ADJUST); + enumTestList.add(WiperStatus.STALLED); + enumTestList.add(WiperStatus.NO_DATA_EXISTS); - assertTrue("Enum value list does not match enum class list", - enumValueList.containsAll(enumTestList) && enumTestList.containsAll(enumValueList)); - } + assertTrue("Enum value list does not match enum class list", + enumValueList.containsAll(enumTestList) && enumTestList.containsAll(enumValueList)); + } }
\ No newline at end of file diff --git a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/notifications/OnAppInterfaceUnregisteredTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/notifications/OnAppInterfaceUnregisteredTests.java index 464d67017..84ef75450 100644 --- a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/notifications/OnAppInterfaceUnregisteredTests.java +++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/notifications/OnAppInterfaceUnregisteredTests.java @@ -17,13 +17,13 @@ import static junit.framework.TestCase.assertNull; import static junit.framework.TestCase.fail; /** - * This is a unit test class for the SmartDeviceLink library project class : + * This is a unit test class for the SmartDeviceLink library project class : * {@link com.smartdevicelink.proxy.rpc.OnAppInterfaceUnregistered} */ -public class OnAppInterfaceUnregisteredTests extends BaseRpcTests{ +public class OnAppInterfaceUnregisteredTests extends BaseRpcTests { @Override - protected RPCMessage createMessage(){ + protected RPCMessage createMessage() { OnAppInterfaceUnregistered msg = new OnAppInterfaceUnregistered(); msg.setReason(TestValues.GENERAL_APPINTERFACEUNREGISTEREDREASON); @@ -32,39 +32,39 @@ public class OnAppInterfaceUnregisteredTests extends BaseRpcTests{ } @Override - protected String getMessageType(){ + protected String getMessageType() { return RPCMessage.KEY_NOTIFICATION; } @Override - protected String getCommandType(){ + protected String getCommandType() { return FunctionID.ON_APP_INTERFACE_UNREGISTERED.toString(); } @Override - protected JSONObject getExpectedParameters(int sdlVersion){ + protected JSONObject getExpectedParameters(int sdlVersion) { JSONObject result = new JSONObject(); - try{ + try { result.put(OnAppInterfaceUnregistered.KEY_REASON, TestValues.GENERAL_APPINTERFACEUNREGISTEREDREASON); - } catch(JSONException e){ - fail(TestValues.JSON_FAIL); + } catch (JSONException e) { + fail(TestValues.JSON_FAIL); } return result; } /** - * Tests the expected values of the RPC message. - */ + * Tests the expected values of the RPC message. + */ @Test - public void testRpcValues () { - // Test Values - AppInterfaceUnregisteredReason reason = ( (OnAppInterfaceUnregistered) msg ).getReason(); - + public void testRpcValues() { + // Test Values + AppInterfaceUnregisteredReason reason = ((OnAppInterfaceUnregistered) msg).getReason(); + // Valid Tests assertEquals(TestValues.MATCH, TestValues.GENERAL_APPINTERFACEUNREGISTEREDREASON, reason); - + // Invalid/Null tests OnAppInterfaceUnregistered msg = new OnAppInterfaceUnregistered(); assertNotNull(TestValues.NOT_NULL, msg); diff --git a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/notifications/OnAppServiceDataTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/notifications/OnAppServiceDataTests.java index 10affe5f0..9ea416632 100644 --- a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/notifications/OnAppServiceDataTests.java +++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/notifications/OnAppServiceDataTests.java @@ -23,59 +23,59 @@ import static junit.framework.TestCase.fail; */ public class OnAppServiceDataTests extends BaseRpcTests { - @Override - protected RPCMessage createMessage(){ - OnAppServiceData msg = new OnAppServiceData(); - - msg.setServiceData(TestValues.GENERAL_APPSERVICEDATA); - - return msg; - } - - @Override - protected String getMessageType(){ - return RPCMessage.KEY_NOTIFICATION; - } - - @Override - protected String getCommandType(){ - return FunctionID.ON_APP_SERVICE_DATA.toString(); - } - - @Override - protected JSONObject getExpectedParameters(int sdlVersion){ - JSONObject result = new JSONObject(); - - try{ - result.put(OnAppServiceData.KEY_SERVICE_DATA, TestValues.GENERAL_APPSERVICEDATA.serializeJSON()); - }catch(JSONException e){ - fail(TestValues.JSON_FAIL); - } - - return result; - } - - /** - * Tests the expected values of the RPC message. - */ - @Test - public void testRpcValues () { - // Test Values - AppServiceData cmdId = ( (OnAppServiceData) msg ).getServiceData(); - - // Valid Tests - assertEquals(TestValues.MATCH, TestValues.GENERAL_APPSERVICEDATA, cmdId); - - // Invalid/Null Tests - OnAppServiceData msg = new OnAppServiceData(); - assertNotNull(TestValues.NOT_NULL, msg); - testNullBase(msg); - - assertNull(TestValues.NULL, msg.getServiceData()); - - // test constructor with param - msg = new OnAppServiceData(TestValues.GENERAL_APPSERVICEDATA); - AppServiceData serviceData = msg.getServiceData(); - assertEquals(serviceData, TestValues.GENERAL_APPSERVICEDATA); - } + @Override + protected RPCMessage createMessage() { + OnAppServiceData msg = new OnAppServiceData(); + + msg.setServiceData(TestValues.GENERAL_APPSERVICEDATA); + + return msg; + } + + @Override + protected String getMessageType() { + return RPCMessage.KEY_NOTIFICATION; + } + + @Override + protected String getCommandType() { + return FunctionID.ON_APP_SERVICE_DATA.toString(); + } + + @Override + protected JSONObject getExpectedParameters(int sdlVersion) { + JSONObject result = new JSONObject(); + + try { + result.put(OnAppServiceData.KEY_SERVICE_DATA, TestValues.GENERAL_APPSERVICEDATA.serializeJSON()); + } catch (JSONException e) { + fail(TestValues.JSON_FAIL); + } + + return result; + } + + /** + * Tests the expected values of the RPC message. + */ + @Test + public void testRpcValues() { + // Test Values + AppServiceData cmdId = ((OnAppServiceData) msg).getServiceData(); + + // Valid Tests + assertEquals(TestValues.MATCH, TestValues.GENERAL_APPSERVICEDATA, cmdId); + + // Invalid/Null Tests + OnAppServiceData msg = new OnAppServiceData(); + assertNotNull(TestValues.NOT_NULL, msg); + testNullBase(msg); + + assertNull(TestValues.NULL, msg.getServiceData()); + + // test constructor with param + msg = new OnAppServiceData(TestValues.GENERAL_APPSERVICEDATA); + AppServiceData serviceData = msg.getServiceData(); + assertEquals(serviceData, TestValues.GENERAL_APPSERVICEDATA); + } } diff --git a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/notifications/OnAudioPassThruTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/notifications/OnAudioPassThruTests.java index 28b7aaeae..ce5392a48 100644 --- a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/notifications/OnAudioPassThruTests.java +++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/notifications/OnAudioPassThruTests.java @@ -12,37 +12,37 @@ import org.junit.Test; import static junit.framework.TestCase.assertNotNull; /** - * This is a unit test class for the SmartDeviceLink library project class : + * This is a unit test class for the SmartDeviceLink library project class : * {@link com.smartdevicelink.proxy.rpc.OnAudioPassThru} */ -public class OnAudioPassThruTests extends BaseRpcTests{ +public class OnAudioPassThruTests extends BaseRpcTests { @Override - protected RPCMessage createMessage(){ + protected RPCMessage createMessage() { return new OnAudioPassThru(); } @Override - protected String getMessageType(){ + protected String getMessageType() { return RPCMessage.KEY_NOTIFICATION; } @Override - protected String getCommandType(){ + protected String getCommandType() { return FunctionID.ON_AUDIO_PASS_THRU.toString(); } @Override - protected JSONObject getExpectedParameters(int sdlVersion){ + protected JSONObject getExpectedParameters(int sdlVersion) { return new JSONObject(); } /** - * Tests the expected values of the RPC message. - */ + * Tests the expected values of the RPC message. + */ @Test - public void testRpcValues () { - // Invalid/Null Tests + public void testRpcValues() { + // Invalid/Null Tests OnAudioPassThru msg = new OnAudioPassThru(); assertNotNull(TestValues.NOT_NULL, msg); testNullBase(msg); diff --git a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/notifications/OnButtonEventTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/notifications/OnButtonEventTests.java index 3570c33e5..dbad77232 100644 --- a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/notifications/OnButtonEventTests.java +++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/notifications/OnButtonEventTests.java @@ -18,13 +18,13 @@ import static junit.framework.TestCase.assertNull; import static junit.framework.TestCase.fail; /** - * This is a unit test class for the SmartDeviceLink library project class : + * This is a unit test class for the SmartDeviceLink library project class : * {@link com.smartdevicelink.proxy.rpc.OnButtonEvent} */ -public class OnButtonEventTests extends BaseRpcTests{ +public class OnButtonEventTests extends BaseRpcTests { @Override - protected RPCMessage createMessage(){ + protected RPCMessage createMessage() { OnButtonEvent msg = new OnButtonEvent(); msg.setButtonEventMode(TestValues.GENERAL_BUTTONEVENTMODE); @@ -35,45 +35,45 @@ public class OnButtonEventTests extends BaseRpcTests{ } @Override - protected String getMessageType(){ + protected String getMessageType() { return RPCMessage.KEY_NOTIFICATION; } @Override - protected String getCommandType(){ + protected String getCommandType() { return FunctionID.ON_BUTTON_EVENT.toString(); } @Override - protected JSONObject getExpectedParameters(int sdlVersion){ + protected JSONObject getExpectedParameters(int sdlVersion) { JSONObject result = new JSONObject(); - try{ + try { result.put(OnButtonEvent.KEY_BUTTON_EVENT_MODE, TestValues.GENERAL_BUTTONEVENTMODE); result.put(OnButtonEvent.KEY_BUTTON_NAME, TestValues.GENERAL_BUTTONNAME); result.put(OnButtonEvent.KEY_CUSTOM_BUTTON_ID, TestValues.GENERAL_INT); - }catch(JSONException e){ - fail(TestValues.JSON_FAIL); + } catch (JSONException e) { + fail(TestValues.JSON_FAIL); } return result; } /** - * Tests the expected values of the RPC message. - */ + * Tests the expected values of the RPC message. + */ @Test - public void testRpcValues () { - // Test Values - int cmdId = ( (OnButtonEvent) msg ).getCustomButtonID(); - ButtonEventMode mode = ( (OnButtonEvent) msg ).getButtonEventMode(); - ButtonName name = ( (OnButtonEvent) msg ).getButtonName(); - + public void testRpcValues() { + // Test Values + int cmdId = ((OnButtonEvent) msg).getCustomButtonID(); + ButtonEventMode mode = ((OnButtonEvent) msg).getButtonEventMode(); + ButtonName name = ((OnButtonEvent) msg).getButtonName(); + // Valid Tests assertEquals(TestValues.MATCH, TestValues.GENERAL_INT, cmdId); assertEquals(TestValues.MATCH, TestValues.GENERAL_BUTTONEVENTMODE, mode); assertEquals(TestValues.MATCH, TestValues.GENERAL_BUTTONNAME, name); - + // Invalid/Null Tests OnButtonEvent msg = new OnButtonEvent(); assertNotNull(TestValues.NOT_NULL, msg); diff --git a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/notifications/OnButtonPressTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/notifications/OnButtonPressTests.java index d5ee08486..db7ebdccf 100644 --- a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/notifications/OnButtonPressTests.java +++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/notifications/OnButtonPressTests.java @@ -18,13 +18,13 @@ import static junit.framework.TestCase.assertNull; import static junit.framework.TestCase.fail; /** - * This is a unit test class for the SmartDeviceLink library project class : + * This is a unit test class for the SmartDeviceLink library project class : * {@link com.smartdevicelink.proxy.rpc.OnButtonPress} */ -public class OnButtonPressTests extends BaseRpcTests{ +public class OnButtonPressTests extends BaseRpcTests { @Override - protected RPCMessage createMessage(){ + protected RPCMessage createMessage() { OnButtonPress msg = new OnButtonPress(); msg.setButtonName(TestValues.GENERAL_BUTTONNAME); @@ -35,45 +35,45 @@ public class OnButtonPressTests extends BaseRpcTests{ } @Override - protected String getMessageType(){ + protected String getMessageType() { return RPCMessage.KEY_NOTIFICATION; } @Override - protected String getCommandType(){ + protected String getCommandType() { return FunctionID.ON_BUTTON_PRESS.toString(); } @Override - protected JSONObject getExpectedParameters(int sdlVersion){ + protected JSONObject getExpectedParameters(int sdlVersion) { JSONObject result = new JSONObject(); - try{ + try { result.put(OnButtonPress.KEY_CUSTOM_BUTTON_ID, TestValues.GENERAL_INT); result.put(OnButtonPress.KEY_BUTTON_NAME, TestValues.GENERAL_BUTTONNAME); result.put(OnButtonPress.KEY_BUTTON_PRESS_MODE, TestValues.GENERAL_BUTTONPRESSMODE); - }catch(JSONException e){ - fail(TestValues.JSON_FAIL); + } catch (JSONException e) { + fail(TestValues.JSON_FAIL); } return result; } /** - * Tests the expected values of the RPC message. - */ + * Tests the expected values of the RPC message. + */ @Test - public void testRpcValues () { - // Test Values - int customName = ( (OnButtonPress) msg ).getCustomButtonID(); - ButtonName buttonName = ( (OnButtonPress) msg ).getButtonName(); - ButtonPressMode buttonPressMode = ( (OnButtonPress) msg ).getButtonPressMode(); - + public void testRpcValues() { + // Test Values + int customName = ((OnButtonPress) msg).getCustomButtonID(); + ButtonName buttonName = ((OnButtonPress) msg).getButtonName(); + ButtonPressMode buttonPressMode = ((OnButtonPress) msg).getButtonPressMode(); + // Valid Tests assertEquals(TestValues.MATCH, TestValues.GENERAL_INT, customName); - assertEquals(TestValues.MATCH, TestValues.GENERAL_BUTTONNAME, buttonName); - assertEquals(TestValues.MATCH, TestValues.GENERAL_BUTTONPRESSMODE, buttonPressMode); - + assertEquals(TestValues.MATCH, TestValues.GENERAL_BUTTONNAME, buttonName); + assertEquals(TestValues.MATCH, TestValues.GENERAL_BUTTONPRESSMODE, buttonPressMode); + // Invalid/Null Tests OnButtonPress msg = new OnButtonPress(); assertNotNull(TestValues.NOT_NULL, msg); diff --git a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/notifications/OnCommandTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/notifications/OnCommandTests.java index dcc4d8029..e492442d0 100644 --- a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/notifications/OnCommandTests.java +++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/notifications/OnCommandTests.java @@ -17,13 +17,13 @@ import static junit.framework.TestCase.assertNull; import static junit.framework.TestCase.fail; /** - * This is a unit test class for the SmartDeviceLink library project class : + * This is a unit test class for the SmartDeviceLink library project class : * {@link com.smartdevicelink.proxy.rpc.OnCommand} */ -public class OnCommandTests extends BaseRpcTests{ +public class OnCommandTests extends BaseRpcTests { @Override - protected RPCMessage createMessage(){ + protected RPCMessage createMessage() { OnCommand msg = new OnCommand(); msg.setCmdID(TestValues.GENERAL_INT); @@ -33,42 +33,42 @@ public class OnCommandTests extends BaseRpcTests{ } @Override - protected String getMessageType(){ + protected String getMessageType() { return RPCMessage.KEY_NOTIFICATION; } @Override - protected String getCommandType(){ + protected String getCommandType() { return FunctionID.ON_COMMAND.toString(); } @Override - protected JSONObject getExpectedParameters(int sdlVersion){ + protected JSONObject getExpectedParameters(int sdlVersion) { JSONObject result = new JSONObject(); - try{ + try { result.put(OnCommand.KEY_CMD_ID, TestValues.GENERAL_INT); result.put(OnCommand.KEY_TRIGGER_SOURCE, TestValues.GENERAL_TRIGGERSOURCE); - }catch(JSONException e){ - fail(TestValues.JSON_FAIL); + } catch (JSONException e) { + fail(TestValues.JSON_FAIL); } return result; } /** - * Tests the expected values of the RPC message. - */ + * Tests the expected values of the RPC message. + */ @Test - public void testRpcValues () { - // Test Values - int cmdId = ( (OnCommand) msg ).getCmdID(); - TriggerSource triggerSource = ( (OnCommand) msg ).getTriggerSource(); - + public void testRpcValues() { + // Test Values + int cmdId = ((OnCommand) msg).getCmdID(); + TriggerSource triggerSource = ((OnCommand) msg).getTriggerSource(); + // Valid Tests assertEquals(TestValues.MATCH, TestValues.GENERAL_INT, cmdId); assertEquals(TestValues.MATCH, TestValues.GENERAL_TRIGGERSOURCE, triggerSource); - + // Invalid/Null Tests OnCommand msg = new OnCommand(); assertNotNull(TestValues.NOT_NULL, msg); diff --git a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/notifications/OnDriverDistractionTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/notifications/OnDriverDistractionTests.java index 88432d2ba..8f640e3cc 100644 --- a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/notifications/OnDriverDistractionTests.java +++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/notifications/OnDriverDistractionTests.java @@ -17,15 +17,15 @@ import static junit.framework.TestCase.assertNull; import static junit.framework.TestCase.fail; /** - * This is a unit test class for the SmartDeviceLink library project class : + * This is a unit test class for the SmartDeviceLink library project class : * {@link com.smartdevicelink.proxy.rpc.OnDriverDistraction} */ -public class OnDriverDistractionTests extends BaseRpcTests{ +public class OnDriverDistractionTests extends BaseRpcTests { private static final DriverDistractionState STATUS = DriverDistractionState.DD_ON; @Override - protected RPCMessage createMessage(){ + protected RPCMessage createMessage() { OnDriverDistraction msg = new OnDriverDistraction(); msg.setState(STATUS); @@ -34,44 +34,44 @@ public class OnDriverDistractionTests extends BaseRpcTests{ } @Override - protected String getMessageType(){ + protected String getMessageType() { return RPCMessage.KEY_NOTIFICATION; } @Override - protected String getCommandType(){ + protected String getCommandType() { return FunctionID.ON_DRIVER_DISTRACTION.toString(); } @Override - protected JSONObject getExpectedParameters(int sdlVersion){ + protected JSONObject getExpectedParameters(int sdlVersion) { JSONObject result = new JSONObject(); - try{ + try { result.put(OnDriverDistraction.KEY_STATE, STATUS); - }catch(JSONException e){ - fail(TestValues.JSON_FAIL); + } catch (JSONException e) { + fail(TestValues.JSON_FAIL); } return result; } /** - * Tests the expected values of the RPC message. - */ + * Tests the expected values of the RPC message. + */ @Test - public void testRpcValues () { - // Test Values - DriverDistractionState cmdId = ( (OnDriverDistraction) msg ).getState(); - + public void testRpcValues() { + // Test Values + DriverDistractionState cmdId = ((OnDriverDistraction) msg).getState(); + // Valid Tests assertEquals(TestValues.MATCH, STATUS, cmdId); - + // Invalid/Null Tests OnDriverDistraction msg = new OnDriverDistraction(); assertNotNull(TestValues.NOT_NULL, msg); testNullBase(msg); - assertNull(TestValues.NULL, msg.getState()); + assertNull(TestValues.NULL, msg.getState()); } }
\ No newline at end of file diff --git a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/notifications/OnHMIStatusTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/notifications/OnHMIStatusTests.java index c0206c960..ea1c8f7dd 100644 --- a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/notifications/OnHMIStatusTests.java +++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/notifications/OnHMIStatusTests.java @@ -21,13 +21,13 @@ import static junit.framework.TestCase.assertNull; import static junit.framework.TestCase.fail; /** - * This is a unit test class for the SmartDeviceLink library project class : + * This is a unit test class for the SmartDeviceLink library project class : * {@link com.smartdevicelink.proxy.rpc.OnHMIStatus} */ -public class OnHMIStatusTests extends BaseRpcTests{ +public class OnHMIStatusTests extends BaseRpcTests { - @Override - protected RPCMessage createMessage(){ + @Override + protected RPCMessage createMessage() { OnHMIStatus msg = new OnHMIStatus(); msg.setAudioStreamingState(TestValues.GENERAL_AUDIOSTREAMINGSTATE); @@ -41,51 +41,51 @@ public class OnHMIStatusTests extends BaseRpcTests{ } @Override - protected String getMessageType(){ + protected String getMessageType() { return RPCMessage.KEY_NOTIFICATION; } @Override - protected String getCommandType(){ + protected String getCommandType() { return FunctionID.ON_HMI_STATUS.toString(); } @Override - protected JSONObject getExpectedParameters(int sdlVersion){ + protected JSONObject getExpectedParameters(int sdlVersion) { JSONObject result = new JSONObject(); - try{ + try { result.put(OnHMIStatus.KEY_AUDIO_STREAMING_STATE, TestValues.GENERAL_AUDIOSTREAMINGSTATE); result.put(OnHMIStatus.KEY_VIDEO_STREAMING_STATE, TestValues.GENERAL_VIDEOSTREAMINGSTATE); result.put(OnHMIStatus.KEY_HMI_LEVEL, TestValues.GENERAL_HMILEVEL); result.put(OnHMIStatus.KEY_SYSTEM_CONTEXT, TestValues.GENERAL_SYSTEMCONTEXT); result.put(OnHMIStatus.KEY_WINDOW_ID, TestValues.GENERAL_INT); - }catch(JSONException e){ - fail(TestValues.JSON_FAIL); + } catch (JSONException e) { + fail(TestValues.JSON_FAIL); } return result; } /** - * Tests the expected values of the RPC message. - */ + * Tests the expected values of the RPC message. + */ @Test - public void testRpcValues () { - // Test Values - AudioStreamingState audioStreamingState = ( (OnHMIStatus) msg ).getAudioStreamingState(); - VideoStreamingState videoStreamingState = ( (OnHMIStatus) msg ).getVideoStreamingState(); - HMILevel hmiLevel = ( (OnHMIStatus) msg ).getHmiLevel(); - SystemContext context = ( (OnHMIStatus) msg ).getSystemContext(); - int testWindowID = ( (OnHMIStatus) msg ).getWindowID(); - + public void testRpcValues() { + // Test Values + AudioStreamingState audioStreamingState = ((OnHMIStatus) msg).getAudioStreamingState(); + VideoStreamingState videoStreamingState = ((OnHMIStatus) msg).getVideoStreamingState(); + HMILevel hmiLevel = ((OnHMIStatus) msg).getHmiLevel(); + SystemContext context = ((OnHMIStatus) msg).getSystemContext(); + int testWindowID = ((OnHMIStatus) msg).getWindowID(); + // Valid Tests assertEquals(TestValues.MATCH, TestValues.GENERAL_AUDIOSTREAMINGSTATE, audioStreamingState); assertEquals(TestValues.MATCH, TestValues.GENERAL_VIDEOSTREAMINGSTATE, videoStreamingState); assertEquals(TestValues.MATCH, TestValues.GENERAL_HMILEVEL, hmiLevel); assertEquals(TestValues.MATCH, TestValues.GENERAL_SYSTEMCONTEXT, context); assertEquals(TestValues.MATCH, TestValues.GENERAL_INT, testWindowID); - + // Invalid/Null Tests OnHMIStatus msg = new OnHMIStatus(); assertNotNull(TestValues.NOT_NULL, msg); @@ -94,7 +94,7 @@ public class OnHMIStatusTests extends BaseRpcTests{ assertNull(TestValues.NULL, msg.getAudioStreamingState()); assertNull(TestValues.NULL, msg.getVideoStreamingState()); - msg.format(new Version(4,5,0),true); + msg.format(new Version(4, 5, 0), true); assertEquals(TestValues.MATCH, VideoStreamingState.STREAMABLE, msg.getVideoStreamingState()); assertNull(TestValues.NULL, msg.getHmiLevel()); assertNull(TestValues.NULL, msg.getSystemContext()); diff --git a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/notifications/OnHashChangeTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/notifications/OnHashChangeTests.java index 45db05e25..52406f2e1 100644 --- a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/notifications/OnHashChangeTests.java +++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/notifications/OnHashChangeTests.java @@ -16,15 +16,15 @@ import static junit.framework.TestCase.assertNull; import static junit.framework.TestCase.fail; /** - * This is a unit test class for the SmartDeviceLink library project class : + * This is a unit test class for the SmartDeviceLink library project class : * {@link com.smartdevicelink.proxy.rpc.OnHashChange} */ -public class OnHashChangeTests extends BaseRpcTests{ +public class OnHashChangeTests extends BaseRpcTests { private static final String HASH_ID = "agh4lg2hb1g9gq3"; @Override - protected RPCMessage createMessage(){ + protected RPCMessage createMessage() { OnHashChange msg = new OnHashChange(); msg.setHashID(HASH_ID); @@ -33,39 +33,39 @@ public class OnHashChangeTests extends BaseRpcTests{ } @Override - protected String getMessageType(){ + protected String getMessageType() { return RPCMessage.KEY_NOTIFICATION; } @Override - protected String getCommandType(){ + protected String getCommandType() { return FunctionID.ON_HASH_CHANGE.toString(); } @Override - protected JSONObject getExpectedParameters(int sdlVersion){ + protected JSONObject getExpectedParameters(int sdlVersion) { JSONObject result = new JSONObject(); - try{ + try { result.put(OnHashChange.KEY_HASH_ID, HASH_ID); - }catch(JSONException e){ - fail(TestValues.JSON_FAIL); + } catch (JSONException e) { + fail(TestValues.JSON_FAIL); } return result; } /** - * Tests the expected values of the RPC message. - */ + * Tests the expected values of the RPC message. + */ @Test - public void testRpcValues () { - // Test Values - String hashId = ( (OnHashChange) msg ).getHashID(); - + public void testRpcValues() { + // Test Values + String hashId = ((OnHashChange) msg).getHashID(); + // Valid Tests assertEquals(TestValues.MATCH, HASH_ID, hashId); - + // Invalid/Null Tests OnHashChange msg = new OnHashChange(); assertNotNull(TestValues.NOT_NULL, msg); diff --git a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/notifications/OnInteriorVehicleDataTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/notifications/OnInteriorVehicleDataTests.java index c111e740b..31faf7679 100644 --- a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/notifications/OnInteriorVehicleDataTests.java +++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/notifications/OnInteriorVehicleDataTests.java @@ -19,13 +19,13 @@ import static junit.framework.TestCase.assertTrue; import static junit.framework.TestCase.fail; /** - * This is a unit test class for the SmartDeviceLink library project class : + * This is a unit test class for the SmartDeviceLink library project class : * {@link com.smartdevicelink.proxy.rpc.OnInteriorVehicleData} */ -public class OnInteriorVehicleDataTests extends BaseRpcTests{ +public class OnInteriorVehicleDataTests extends BaseRpcTests { @Override - protected RPCMessage createMessage(){ + protected RPCMessage createMessage() { OnInteriorVehicleData msg = new OnInteriorVehicleData(); msg.setModuleData(TestValues.GENERAL_MODULEDATA); @@ -33,35 +33,35 @@ public class OnInteriorVehicleDataTests extends BaseRpcTests{ } @Override - protected String getMessageType(){ + protected String getMessageType() { return RPCMessage.KEY_NOTIFICATION; } @Override - protected String getCommandType(){ + protected String getCommandType() { return FunctionID.ON_INTERIOR_VEHICLE_DATA.toString(); } @Override - protected JSONObject getExpectedParameters(int sdlVersion){ + protected JSONObject getExpectedParameters(int sdlVersion) { JSONObject result = new JSONObject(); - try{ + try { result.put(OnInteriorVehicleData.KEY_MODULE_DATA, JsonRPCMarshaller.serializeHashtable(TestValues.GENERAL_MODULEDATA.getStore())); - }catch(JSONException e){ - fail(TestValues.JSON_FAIL); + } catch (JSONException e) { + fail(TestValues.JSON_FAIL); } return result; } /** - * Tests the expected values of the RPC message. - */ + * Tests the expected values of the RPC message. + */ @Test - public void testRpcValues () { - // Test Values - ModuleData moduleData = ( (OnInteriorVehicleData) msg ).getModuleData(); + public void testRpcValues() { + // Test Values + ModuleData moduleData = ((OnInteriorVehicleData) msg).getModuleData(); // Valid Tests assertTrue(TestValues.TRUE, Validator.validateModuleData(TestValues.GENERAL_MODULEDATA, moduleData)); diff --git a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/notifications/OnKeyboardInputTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/notifications/OnKeyboardInputTests.java index 0d99c07d9..ee3bb686c 100644 --- a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/notifications/OnKeyboardInputTests.java +++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/notifications/OnKeyboardInputTests.java @@ -17,13 +17,13 @@ import static junit.framework.TestCase.assertNull; import static junit.framework.TestCase.fail; /** - * This is a unit test class for the SmartDeviceLink library project class : + * This is a unit test class for the SmartDeviceLink library project class : * {@link com.smartdevicelink.proxy.rpc.OnKeyboardInput} */ -public class OnKeyboardInputTests extends BaseRpcTests{ +public class OnKeyboardInputTests extends BaseRpcTests { @Override - protected RPCMessage createMessage(){ + protected RPCMessage createMessage() { OnKeyboardInput msg = new OnKeyboardInput(); msg.setData(TestValues.GENERAL_STRING); @@ -33,42 +33,42 @@ public class OnKeyboardInputTests extends BaseRpcTests{ } @Override - protected String getMessageType(){ + protected String getMessageType() { return RPCMessage.KEY_NOTIFICATION; } @Override - protected String getCommandType(){ + protected String getCommandType() { return FunctionID.ON_KEYBOARD_INPUT.toString(); } @Override - protected JSONObject getExpectedParameters(int sdlVersion){ + protected JSONObject getExpectedParameters(int sdlVersion) { JSONObject result = new JSONObject(); - try{ + try { result.put(OnKeyboardInput.KEY_DATA, TestValues.GENERAL_STRING); result.put(OnKeyboardInput.KEY_EVENT, TestValues.GENERAL_KEYBOARDEVENT); - }catch(JSONException e){ - fail(TestValues.JSON_FAIL); + } catch (JSONException e) { + fail(TestValues.JSON_FAIL); } return result; } /** - * Tests the expected values of the RPC message. - */ + * Tests the expected values of the RPC message. + */ @Test - public void testRpcValues () { - // Test Values - KeyboardEvent event = ( (OnKeyboardInput) msg ).getEvent(); - String data = ( (OnKeyboardInput) msg ).getData(); - + public void testRpcValues() { + // Test Values + KeyboardEvent event = ((OnKeyboardInput) msg).getEvent(); + String data = ((OnKeyboardInput) msg).getData(); + // Valid Tests assertEquals(TestValues.MATCH, TestValues.GENERAL_KEYBOARDEVENT, event); assertEquals(TestValues.MATCH, TestValues.GENERAL_STRING, data); - + // Invalid/Null Tests OnKeyboardInput msg = new OnKeyboardInput(); assertNotNull(TestValues.NOT_NULL, msg); diff --git a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/notifications/OnLanguageChangeTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/notifications/OnLanguageChangeTests.java index ddcdd7201..042d4c4a6 100644 --- a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/notifications/OnLanguageChangeTests.java +++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/notifications/OnLanguageChangeTests.java @@ -17,13 +17,13 @@ import static junit.framework.TestCase.assertNull; import static junit.framework.TestCase.fail; /** - * This is a unit test class for the SmartDeviceLink library project class : + * This is a unit test class for the SmartDeviceLink library project class : * {@link com.smartdevicelink.proxy.rpc.OnLanguageChange} */ -public class OnLanguageChangeTests extends BaseRpcTests{ +public class OnLanguageChangeTests extends BaseRpcTests { @Override - protected RPCMessage createMessage(){ + protected RPCMessage createMessage() { OnLanguageChange msg = new OnLanguageChange(); msg.setLanguage(TestValues.GENERAL_LANGUAGE); @@ -33,42 +33,42 @@ public class OnLanguageChangeTests extends BaseRpcTests{ } @Override - protected String getMessageType(){ + protected String getMessageType() { return RPCMessage.KEY_NOTIFICATION; } @Override - protected String getCommandType(){ + protected String getCommandType() { return FunctionID.ON_LANGUAGE_CHANGE.toString(); } @Override - protected JSONObject getExpectedParameters(int sdlVersion){ + protected JSONObject getExpectedParameters(int sdlVersion) { JSONObject result = new JSONObject(); - try{ + try { result.put(OnLanguageChange.KEY_LANGUAGE, TestValues.GENERAL_LANGUAGE); result.put(OnLanguageChange.KEY_HMI_DISPLAY_LANGUAGE, TestValues.GENERAL_LANGUAGE); - }catch(JSONException e){ - fail(TestValues.JSON_FAIL); + } catch (JSONException e) { + fail(TestValues.JSON_FAIL); } return result; } /** - * Tests the expected values of the RPC message. - */ + * Tests the expected values of the RPC message. + */ @Test - public void testRpcValues () { - // Test Values - Language lang = ( (OnLanguageChange) msg ).getLanguage(); - Language hmiLang = ( (OnLanguageChange) msg ).getHmiDisplayLanguage(); - + public void testRpcValues() { + // Test Values + Language lang = ((OnLanguageChange) msg).getLanguage(); + Language hmiLang = ((OnLanguageChange) msg).getHmiDisplayLanguage(); + // Valid Tests assertEquals(TestValues.MATCH, TestValues.GENERAL_LANGUAGE, lang); assertEquals(TestValues.MATCH, TestValues.GENERAL_LANGUAGE, hmiLang); - + // Invalid/Null Tests OnLanguageChange msg = new OnLanguageChange(); assertNotNull(TestValues.NOT_NULL, msg); diff --git a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/notifications/OnPermissionsChangeTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/notifications/OnPermissionsChangeTests.java index 97a9e14ec..02b3b2a82 100644 --- a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/notifications/OnPermissionsChangeTests.java +++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/notifications/OnPermissionsChangeTests.java @@ -21,60 +21,60 @@ import static junit.framework.TestCase.assertTrue; import static junit.framework.TestCase.fail; /** - * This is a unit test class for the SmartDeviceLink library project class : + * This is a unit test class for the SmartDeviceLink library project class : * {@link com.smartdevicelink.proxy.rpc.OnPermissionsChange} */ -public class OnPermissionsChangeTests extends BaseRpcTests{ +public class OnPermissionsChangeTests extends BaseRpcTests { @Override - protected RPCMessage createMessage(){ + protected RPCMessage createMessage() { OnPermissionsChange msg = new OnPermissionsChange(); msg.setPermissionItem(TestValues.GENERAL_PERMISSIONITEM_LIST); msg.setRequireEncryption(TestValues.GENERAL_BOOLEAN); - + return msg; } @Override - protected String getMessageType(){ + protected String getMessageType() { return RPCMessage.KEY_NOTIFICATION; } @Override - protected String getCommandType(){ + protected String getCommandType() { return FunctionID.ON_PERMISSIONS_CHANGE.toString(); } @Override - protected JSONObject getExpectedParameters(int sdlVersion){ + protected JSONObject getExpectedParameters(int sdlVersion) { JSONObject result = new JSONObject(); - try{ + try { result.put(OnPermissionsChange.KEY_PERMISSION_ITEM, TestValues.JSON_PERMISSIONITEMS); result.put(OnPermissionsChange.KEY_REQUIRE_ENCRYPTION, TestValues.GENERAL_BOOLEAN); - }catch(JSONException e){ - fail(TestValues.JSON_FAIL); + } catch (JSONException e) { + fail(TestValues.JSON_FAIL); } return result; } /** - * Tests the expected values of the RPC message. - */ + * Tests the expected values of the RPC message. + */ @Test - public void testRpcValues () { - // Test Values - List<PermissionItem> data = ( (OnPermissionsChange) msg ).getPermissionItem(); - boolean isRequired = ((OnPermissionsChange)msg).getRequireEncryption(); + public void testRpcValues() { + // Test Values + List<PermissionItem> data = ((OnPermissionsChange) msg).getPermissionItem(); + boolean isRequired = ((OnPermissionsChange) msg).getRequireEncryption(); // Valid Tests assertEquals(TestValues.MATCH, TestValues.GENERAL_PERMISSIONITEM_LIST.size(), data.size()); - for(int i=0; i<data.size(); i++){ + for (int i = 0; i < data.size(); i++) { assertTrue(TestValues.TRUE, Validator.validatePermissionItem(TestValues.GENERAL_PERMISSIONITEM_LIST.get(i), data.get(i))); } assertEquals(TestValues.MATCH, TestValues.GENERAL_BOOLEAN, isRequired); - + // Invalid/Null Tests OnPermissionsChange msg = new OnPermissionsChange(); assertNotNull(TestValues.NOT_NULL, msg); diff --git a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/notifications/OnRCStatusTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/notifications/OnRCStatusTests.java index c292756e6..2bd2ebc50 100644 --- a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/notifications/OnRCStatusTests.java +++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/notifications/OnRCStatusTests.java @@ -21,78 +21,78 @@ import static junit.framework.TestCase.assertNotNull; import static junit.framework.TestCase.assertNull; public class OnRCStatusTests extends BaseRpcTests { - @Override - protected RPCMessage createMessage() { - OnRCStatus msg = new OnRCStatus(); - - List<ModuleData> listAllocatedModules = TestValues.GENERAL_MODULEDATA_LIST; - - msg.setAllocatedModules(listAllocatedModules); - - List<ModuleData> listFreeModules = new ArrayList<>(); - listFreeModules.add(TestValues.GENERAL_MODULEDATA); - msg.setFreeModules(listFreeModules); - - msg.setAllowed(TestValues.GENERAL_BOOLEAN); - return msg; - } - - @Override - protected String getMessageType() { - return RPCMessage.KEY_NOTIFICATION; - } - - @Override - protected String getCommandType() { - return FunctionID.ON_RC_STATUS.toString(); - } - - @Override - protected JSONObject getExpectedParameters(int sdlVersion) { - JSONObject result = new JSONObject(); - - JSONArray jsonArrayAllocatedModules = new JSONArray(); - JSONArray jsonArrayFreeModules = new JSONArray(); - try { - jsonArrayAllocatedModules.put(JsonRPCMarshaller.serializeHashtable(TestValues.GENERAL_MODULEDATA.getStore())); - jsonArrayFreeModules.put(JsonRPCMarshaller.serializeHashtable(TestValues.GENERAL_MODULEDATA.getStore())); - } catch (JSONException e) { - e.printStackTrace(); - } - - try { - result.put(OnRCStatus.KEY_ALLOCATED_MODULES, jsonArrayAllocatedModules); - result.put(OnRCStatus.KEY_FREE_MODULES, jsonArrayFreeModules); - result.put(OnRCStatus.KEY_ALLOWED, TestValues.GENERAL_BOOLEAN); - } catch (JSONException e) { - e.printStackTrace(); - } - - return result; - } - - /** - * Tests the expected values of the RPC message. - */ - @Test - public void testRpcValues() { - // Test Values - List<ModuleData> listAllocatedModules = ((OnRCStatus) msg).getAllocatedModules(); - List<ModuleData> listFreeModules = ((OnRCStatus) msg).getFreeModules(); - Boolean allowed = ((OnRCStatus) msg).getAllowed(); - - // Valid Tests - assertEquals(TestValues.MATCH, TestValues.GENERAL_MODULEDATA, listAllocatedModules.get(0)); - assertEquals(TestValues.MATCH, TestValues.GENERAL_MODULEDATA, listFreeModules.get(0)); - assertEquals(TestValues.MATCH, (Boolean) TestValues.GENERAL_BOOLEAN, allowed); - - // Invalid/Null Tests - OnRCStatus msg = new OnRCStatus(); - assertNotNull(TestValues.NOT_NULL, msg); - testNullBase(msg); - - assertNull(TestValues.NULL, msg.getAllocatedModules()); - assertNull(TestValues.NULL, msg.getFreeModules()); - assertNull(TestValues.NULL, msg.getAllowed()); - } + @Override + protected RPCMessage createMessage() { + OnRCStatus msg = new OnRCStatus(); + + List<ModuleData> listAllocatedModules = TestValues.GENERAL_MODULEDATA_LIST; + + msg.setAllocatedModules(listAllocatedModules); + + List<ModuleData> listFreeModules = new ArrayList<>(); + listFreeModules.add(TestValues.GENERAL_MODULEDATA); + msg.setFreeModules(listFreeModules); + + msg.setAllowed(TestValues.GENERAL_BOOLEAN); + return msg; + } + + @Override + protected String getMessageType() { + return RPCMessage.KEY_NOTIFICATION; + } + + @Override + protected String getCommandType() { + return FunctionID.ON_RC_STATUS.toString(); + } + + @Override + protected JSONObject getExpectedParameters(int sdlVersion) { + JSONObject result = new JSONObject(); + + JSONArray jsonArrayAllocatedModules = new JSONArray(); + JSONArray jsonArrayFreeModules = new JSONArray(); + try { + jsonArrayAllocatedModules.put(JsonRPCMarshaller.serializeHashtable(TestValues.GENERAL_MODULEDATA.getStore())); + jsonArrayFreeModules.put(JsonRPCMarshaller.serializeHashtable(TestValues.GENERAL_MODULEDATA.getStore())); + } catch (JSONException e) { + e.printStackTrace(); + } + + try { + result.put(OnRCStatus.KEY_ALLOCATED_MODULES, jsonArrayAllocatedModules); + result.put(OnRCStatus.KEY_FREE_MODULES, jsonArrayFreeModules); + result.put(OnRCStatus.KEY_ALLOWED, TestValues.GENERAL_BOOLEAN); + } catch (JSONException e) { + e.printStackTrace(); + } + + return result; + } + + /** + * Tests the expected values of the RPC message. + */ + @Test + public void testRpcValues() { + // Test Values + List<ModuleData> listAllocatedModules = ((OnRCStatus) msg).getAllocatedModules(); + List<ModuleData> listFreeModules = ((OnRCStatus) msg).getFreeModules(); + Boolean allowed = ((OnRCStatus) msg).getAllowed(); + + // Valid Tests + assertEquals(TestValues.MATCH, TestValues.GENERAL_MODULEDATA, listAllocatedModules.get(0)); + assertEquals(TestValues.MATCH, TestValues.GENERAL_MODULEDATA, listFreeModules.get(0)); + assertEquals(TestValues.MATCH, (Boolean) TestValues.GENERAL_BOOLEAN, allowed); + + // Invalid/Null Tests + OnRCStatus msg = new OnRCStatus(); + assertNotNull(TestValues.NOT_NULL, msg); + testNullBase(msg); + + assertNull(TestValues.NULL, msg.getAllocatedModules()); + assertNull(TestValues.NULL, msg.getFreeModules()); + assertNull(TestValues.NULL, msg.getAllowed()); + } } diff --git a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/notifications/OnSystemCapabilityUpdatedTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/notifications/OnSystemCapabilityUpdatedTests.java index 37fa2e570..a2f4f3c71 100644 --- a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/notifications/OnSystemCapabilityUpdatedTests.java +++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/notifications/OnSystemCapabilityUpdatedTests.java @@ -22,59 +22,59 @@ import static junit.framework.TestCase.fail; */ public class OnSystemCapabilityUpdatedTests extends BaseRpcTests { - @Override - protected RPCMessage createMessage(){ - OnSystemCapabilityUpdated msg = new OnSystemCapabilityUpdated(); - - msg.setSystemCapability(TestValues.GENERAL_SYSTEMCAPABILITY); - - return msg; - } - - @Override - protected String getMessageType(){ - return RPCMessage.KEY_NOTIFICATION; - } - - @Override - protected String getCommandType(){ - return FunctionID.ON_SYSTEM_CAPABILITY_UPDATED.toString(); - } - - @Override - protected JSONObject getExpectedParameters(int sdlVersion){ - JSONObject result = new JSONObject(); - - try{ - result.put(OnSystemCapabilityUpdated.KEY_SYSTEM_CAPABILITY, TestValues.GENERAL_SYSTEMCAPABILITY.serializeJSON()); - }catch(JSONException e){ - fail(TestValues.JSON_FAIL); - } - - return result; - } - - /** - * Tests the expected values of the RPC message. - */ - @Test - public void testRpcValues () { - // Test Values - SystemCapability cmdId = ( (OnSystemCapabilityUpdated) msg ).getSystemCapability(); - - // Valid Tests - assertEquals(TestValues.MATCH, TestValues.GENERAL_SYSTEMCAPABILITY, cmdId); - - // Invalid/Null Tests - OnSystemCapabilityUpdated msg = new OnSystemCapabilityUpdated(); - assertNotNull(TestValues.NOT_NULL, msg); - testNullBase(msg); - - assertNull(TestValues.NULL, msg.getSystemCapability()); - - // test constructor with param - msg = new OnSystemCapabilityUpdated(TestValues.GENERAL_SYSTEMCAPABILITY); - SystemCapability systemCapability = msg.getSystemCapability(); - assertEquals(systemCapability, TestValues.GENERAL_SYSTEMCAPABILITY); - } + @Override + protected RPCMessage createMessage() { + OnSystemCapabilityUpdated msg = new OnSystemCapabilityUpdated(); + + msg.setSystemCapability(TestValues.GENERAL_SYSTEMCAPABILITY); + + return msg; + } + + @Override + protected String getMessageType() { + return RPCMessage.KEY_NOTIFICATION; + } + + @Override + protected String getCommandType() { + return FunctionID.ON_SYSTEM_CAPABILITY_UPDATED.toString(); + } + + @Override + protected JSONObject getExpectedParameters(int sdlVersion) { + JSONObject result = new JSONObject(); + + try { + result.put(OnSystemCapabilityUpdated.KEY_SYSTEM_CAPABILITY, TestValues.GENERAL_SYSTEMCAPABILITY.serializeJSON()); + } catch (JSONException e) { + fail(TestValues.JSON_FAIL); + } + + return result; + } + + /** + * Tests the expected values of the RPC message. + */ + @Test + public void testRpcValues() { + // Test Values + SystemCapability cmdId = ((OnSystemCapabilityUpdated) msg).getSystemCapability(); + + // Valid Tests + assertEquals(TestValues.MATCH, TestValues.GENERAL_SYSTEMCAPABILITY, cmdId); + + // Invalid/Null Tests + OnSystemCapabilityUpdated msg = new OnSystemCapabilityUpdated(); + assertNotNull(TestValues.NOT_NULL, msg); + testNullBase(msg); + + assertNull(TestValues.NULL, msg.getSystemCapability()); + + // test constructor with param + msg = new OnSystemCapabilityUpdated(TestValues.GENERAL_SYSTEMCAPABILITY); + SystemCapability systemCapability = msg.getSystemCapability(); + assertEquals(systemCapability, TestValues.GENERAL_SYSTEMCAPABILITY); + } } diff --git a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/notifications/OnSystemRequestTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/notifications/OnSystemRequestTests.java index 580cbd9a7..b481615c8 100644 --- a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/notifications/OnSystemRequestTests.java +++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/notifications/OnSystemRequestTests.java @@ -21,13 +21,13 @@ import static junit.framework.TestCase.assertTrue; import static junit.framework.TestCase.fail; /** - * This is a unit test class for the SmartDeviceLink library project class : + * This is a unit test class for the SmartDeviceLink library project class : * {@link com.smartdevicelink.proxy.rpc.OnSystemRequest} */ -public class OnSystemRequestTests extends BaseRpcTests{ - +public class OnSystemRequestTests extends BaseRpcTests { + @Override - protected RPCMessage createMessage(){ + protected RPCMessage createMessage() { OnSystemRequest msg = new OnSystemRequest(); msg.setFileType(TestValues.GENERAL_FILETYPE); @@ -42,20 +42,20 @@ public class OnSystemRequestTests extends BaseRpcTests{ } @Override - protected String getMessageType(){ + protected String getMessageType() { return RPCMessage.KEY_NOTIFICATION; } @Override - protected String getCommandType(){ + protected String getCommandType() { return FunctionID.ON_SYSTEM_REQUEST.toString(); } @Override - protected JSONObject getExpectedParameters(int sdlVersion){ + protected JSONObject getExpectedParameters(int sdlVersion) { JSONObject result = new JSONObject(); - try{ + try { result.put(OnSystemRequest.KEY_FILE_TYPE, TestValues.GENERAL_FILETYPE); result.put(OnSystemRequest.KEY_LENGTH, TestValues.GENERAL_LONG); result.put(OnSystemRequest.KEY_TIMEOUT, TestValues.GENERAL_INT); @@ -63,28 +63,28 @@ public class OnSystemRequestTests extends BaseRpcTests{ result.put(OnSystemRequest.KEY_URL, TestValues.GENERAL_STRING); result.put(OnSystemRequest.KEY_REQUEST_TYPE, TestValues.GENERAL_REQUESTTYPE); result.put(OnSystemRequest.KEY_REQUEST_SUB_TYPE, TestValues.GENERAL_STRING); - } catch(JSONException e) { - fail(TestValues.JSON_FAIL); + } catch (JSONException e) { + fail(TestValues.JSON_FAIL); } return result; } /** - * Tests the expected values of the RPC message. - */ + * Tests the expected values of the RPC message. + */ @Test - public void testRpcValues () { - // Test Values - FileType fileType = ( (OnSystemRequest) msg ).getFileType(); - Long length = ( (OnSystemRequest) msg ).getLength(); - int timeout = ( (OnSystemRequest) msg ).getTimeout(); - Long offset = ( (OnSystemRequest) msg ).getOffset(); - String url = ( (OnSystemRequest) msg ).getUrl(); - RequestType requestType = ( (OnSystemRequest) msg ).getRequestType(); - String requestSubType = ( (OnSystemRequest) msg ).getRequestSubType(); - - + public void testRpcValues() { + // Test Values + FileType fileType = ((OnSystemRequest) msg).getFileType(); + Long length = ((OnSystemRequest) msg).getLength(); + int timeout = ((OnSystemRequest) msg).getTimeout(); + Long offset = ((OnSystemRequest) msg).getOffset(); + String url = ((OnSystemRequest) msg).getUrl(); + RequestType requestType = ((OnSystemRequest) msg).getRequestType(); + String requestSubType = ((OnSystemRequest) msg).getRequestSubType(); + + // Valid Tests assertEquals(TestValues.MATCH, TestValues.GENERAL_FILETYPE, fileType); assertEquals(TestValues.MATCH, TestValues.GENERAL_LONG, length); @@ -93,22 +93,22 @@ public class OnSystemRequestTests extends BaseRpcTests{ assertEquals(TestValues.MATCH, TestValues.GENERAL_STRING, url); assertEquals(TestValues.MATCH, TestValues.GENERAL_REQUESTTYPE, requestType); assertEquals(TestValues.MATCH, TestValues.GENERAL_STRING, requestSubType); - + // Test Body OnSystemRequest osr = (OnSystemRequest) msg; String body = osr.getBody(); assertNull(TestValues.NULL, body); - - String testBody = "123ABC"; + + String testBody = "123ABC"; osr.setBody(testBody); - + String readBody = osr.getBody(); assertEquals(TestValues.MATCH, testBody, readBody); - + // Test Headers Headers headers = osr.getHeader(); assertNull(TestValues.NULL, headers); - + Headers testHeaders = new Headers(); testHeaders.setCharset("ASCII"); testHeaders.setConnectTimeout(1000); @@ -119,12 +119,12 @@ public class OnSystemRequestTests extends BaseRpcTests{ testHeaders.setInstanceFollowRedirects(true); testHeaders.setReadTimeout(800); testHeaders.setRequestMethod("POST"); - testHeaders.setUseCaches(false); + testHeaders.setUseCaches(false); osr.setHeaders(testHeaders); - + Headers readHeaders = osr.getHeader(); assertTrue(TestValues.TRUE, Validator.validateHeaders(testHeaders, readHeaders)); - + // Invalid/Null Tests OnSystemRequest msg = new OnSystemRequest(); assertNotNull(TestValues.NOT_NULL, msg); @@ -140,7 +140,7 @@ public class OnSystemRequestTests extends BaseRpcTests{ } @Test - public void testUrlParam(){ + public void testUrlParam() { OnSystemRequest msg = new OnSystemRequest(); diff --git a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/notifications/OnTBTClientStateTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/notifications/OnTBTClientStateTests.java index 0de7a5745..f21f7f1f3 100644 --- a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/notifications/OnTBTClientStateTests.java +++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/notifications/OnTBTClientStateTests.java @@ -17,13 +17,13 @@ import static junit.framework.TestCase.assertNull; import static junit.framework.TestCase.fail; /** - * This is a unit test class for the SmartDeviceLink library project class : + * This is a unit test class for the SmartDeviceLink library project class : * {@link com.smartdevicelink.proxy.rpc.OnTBTClientState} */ -public class OnTBTClientStateTests extends BaseRpcTests{ +public class OnTBTClientStateTests extends BaseRpcTests { @Override - protected RPCMessage createMessage(){ + protected RPCMessage createMessage() { OnTBTClientState msg = new OnTBTClientState(); msg.setState(TestValues.GENERAL_TBTSTATE); @@ -32,39 +32,39 @@ public class OnTBTClientStateTests extends BaseRpcTests{ } @Override - protected String getMessageType(){ + protected String getMessageType() { return RPCMessage.KEY_NOTIFICATION; } @Override - protected String getCommandType(){ + protected String getCommandType() { return FunctionID.ON_TBT_CLIENT_STATE.toString(); } @Override - protected JSONObject getExpectedParameters(int sdlVersion){ + protected JSONObject getExpectedParameters(int sdlVersion) { JSONObject result = new JSONObject(); - try{ + try { result.put(OnTBTClientState.KEY_STATE, TestValues.GENERAL_TBTSTATE); - } catch(JSONException e){ - fail(TestValues.JSON_FAIL); + } catch (JSONException e) { + fail(TestValues.JSON_FAIL); } return result; } /** - * Tests the expected values of the RPC message. - */ + * Tests the expected values of the RPC message. + */ @Test - public void testRpcValues () { - // Test Values - TBTState data = ( (OnTBTClientState) msg ).getState(); - + public void testRpcValues() { + // Test Values + TBTState data = ((OnTBTClientState) msg).getState(); + // Valid Tests assertEquals(TestValues.MATCH, TestValues.GENERAL_TBTSTATE, data); - + // Invalid/Null Tests OnTBTClientState msg = new OnTBTClientState(); assertNotNull(TestValues.NOT_NULL, msg); diff --git a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/notifications/OnTouchEventTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/notifications/OnTouchEventTests.java index 2c2379550..5ff64b285 100644 --- a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/notifications/OnTouchEventTests.java +++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/notifications/OnTouchEventTests.java @@ -22,62 +22,62 @@ import static junit.framework.TestCase.assertTrue; import static junit.framework.TestCase.fail; /** - * This is a unit test class for the SmartDeviceLink library project class : + * This is a unit test class for the SmartDeviceLink library project class : * {@link com.smartdevicelink.proxy.rpc.OnTouchEvent} */ -public class OnTouchEventTests extends BaseRpcTests{ +public class OnTouchEventTests extends BaseRpcTests { - @Override - protected RPCMessage createMessage(){ + @Override + protected RPCMessage createMessage() { OnTouchEvent msg = new OnTouchEvent(); msg.setType(TestValues.GENERAL_TOUCHTYPE); msg.setEvent(TestValues.GENERAL_TOUCHEVENT_LIST); return msg; - } + } @Override - protected String getMessageType(){ + protected String getMessageType() { return RPCMessage.KEY_NOTIFICATION; } @Override - protected String getCommandType(){ + protected String getCommandType() { return FunctionID.ON_TOUCH_EVENT.toString(); } @Override - protected JSONObject getExpectedParameters(int sdlVersion){ + protected JSONObject getExpectedParameters(int sdlVersion) { JSONObject result = new JSONObject(); - try{ + try { result.put(OnTouchEvent.KEY_TYPE, TestValues.GENERAL_TOUCHTYPE); - result.put(OnTouchEvent.KEY_EVENT, TestValues.JSON_TOUCHEVENTS); - }catch(JSONException e){ - fail(TestValues.JSON_FAIL); + result.put(OnTouchEvent.KEY_EVENT, TestValues.JSON_TOUCHEVENTS); + } catch (JSONException e) { + fail(TestValues.JSON_FAIL); } return result; } /** - * Tests the expected values of the RPC message. - */ + * Tests the expected values of the RPC message. + */ @Test - public void testRpcValues () { - // Test Values - TouchType type = ( (OnTouchEvent) msg ).getType(); - List<TouchEvent> event = ( (OnTouchEvent) msg ).getEvent(); - + public void testRpcValues() { + // Test Values + TouchType type = ((OnTouchEvent) msg).getType(); + List<TouchEvent> event = ((OnTouchEvent) msg).getEvent(); + // Valid Tests assertEquals(TestValues.MATCH, TestValues.GENERAL_TOUCHTYPE, type); assertEquals(TestValues.MATCH, TestValues.GENERAL_TOUCHEVENT_LIST.size(), event.size()); - for(int i = 0; i< TestValues.GENERAL_TOUCHEVENT_LIST.size(); i++){ + for (int i = 0; i < TestValues.GENERAL_TOUCHEVENT_LIST.size(); i++) { TouchEvent referenceEvent = TestValues.GENERAL_TOUCHEVENT_LIST.get(i); TouchEvent dataEvent = event.get(i); assertTrue(TestValues.TRUE, Validator.validateTouchEvent(referenceEvent, dataEvent)); } - + // Invalid/Null Tests OnTouchEvent msg = new OnTouchEvent(); assertNotNull(TestValues.NOT_NULL, msg); diff --git a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/notifications/OnUpdateFileTest.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/notifications/OnUpdateFileTest.java index 03dc524a1..4a955a3c3 100644 --- a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/notifications/OnUpdateFileTest.java +++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/notifications/OnUpdateFileTest.java @@ -43,9 +43,9 @@ public class OnUpdateFileTest extends BaseRpcTests { protected JSONObject getExpectedParameters(int sdlVersion) { JSONObject result = new JSONObject(); - try{ + try { result.put(OnUpdateFile.KEY_FILE_NAME, TestValues.GENERAL_STRING); - }catch(JSONException e){ + } catch (JSONException e) { fail(TestValues.JSON_FAIL); } @@ -56,9 +56,9 @@ public class OnUpdateFileTest extends BaseRpcTests { * Tests the expected values of the RPC message. */ @Test - public void testRpcValues () { + public void testRpcValues() { // Test Values - String fileName = ( (OnUpdateFile) msg).getFileName(); + String fileName = ((OnUpdateFile) msg).getFileName(); // Valid Tests assertEquals(TestValues.MATCH, TestValues.GENERAL_STRING, fileName); diff --git a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/notifications/OnUpdateSubMenuTest.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/notifications/OnUpdateSubMenuTest.java index afcaf1310..9099d085f 100644 --- a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/notifications/OnUpdateSubMenuTest.java +++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/notifications/OnUpdateSubMenuTest.java @@ -44,10 +44,10 @@ public class OnUpdateSubMenuTest extends BaseRpcTests { protected JSONObject getExpectedParameters(int sdlVersion) { JSONObject result = new JSONObject(); - try{ + try { result.put(OnUpdateSubMenu.KEY_MENU_ID, TestValues.GENERAL_INT); result.put(OnUpdateSubMenu.KEY_UPDATE_SUB_CELLS, TestValues.GENERAL_BOOLEAN); - }catch(JSONException e){ + } catch (JSONException e) { fail(TestValues.JSON_FAIL); } @@ -58,10 +58,10 @@ public class OnUpdateSubMenuTest extends BaseRpcTests { * Tests the expected values of the RPC message. */ @Test - public void testRpcValues () { + public void testRpcValues() { // Test Values - int menuId = ( (OnUpdateSubMenu) msg ).getMenuID(); - boolean updateSubCells = ( (OnUpdateSubMenu) msg ).getUpdateSubCells(); + int menuId = ((OnUpdateSubMenu) msg).getMenuID(); + boolean updateSubCells = ((OnUpdateSubMenu) msg).getUpdateSubCells(); // Valid Tests assertEquals(TestValues.MATCH, TestValues.GENERAL_INT, menuId); diff --git a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/notifications/OnVehicleDataTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/notifications/OnVehicleDataTests.java index 409ad1dd1..cb60f7572 100644 --- a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/notifications/OnVehicleDataTests.java +++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/notifications/OnVehicleDataTests.java @@ -49,31 +49,31 @@ import static junit.framework.TestCase.assertTrue; import static junit.framework.TestCase.fail; /** - * This is a unit test class for the SmartDeviceLink library project class : + * This is a unit test class for the SmartDeviceLink library project class : * {@link com.smartdevicelink.proxy.rpc.OnVehicleData} */ -public class OnVehicleDataTests extends BaseRpcTests{ - +public class OnVehicleDataTests extends BaseRpcTests { + @Override - protected RPCMessage createMessage(){ - return VehicleDataHelper.VEHICLE_DATA; + protected RPCMessage createMessage() { + return VehicleDataHelper.VEHICLE_DATA; } @Override - protected String getMessageType(){ - return RPCMessage.KEY_NOTIFICATION; + protected String getMessageType() { + return RPCMessage.KEY_NOTIFICATION; } @Override - protected String getCommandType(){ - return FunctionID.ON_VEHICLE_DATA.toString(); + protected String getCommandType() { + return FunctionID.ON_VEHICLE_DATA.toString(); } @Override - protected JSONObject getExpectedParameters(int sdlVersion){ + protected JSONObject getExpectedParameters(int sdlVersion) { JSONObject result = new JSONObject(); - try{ + try { result.put(OnVehicleData.KEY_SPEED, VehicleDataHelper.SPEED); result.put(OnVehicleData.KEY_RPM, VehicleDataHelper.RPM); result.put(OnVehicleData.KEY_EXTERNAL_TEMPERATURE, VehicleDataHelper.EXTERNAL_TEMPERATURE); @@ -101,96 +101,96 @@ public class OnVehicleDataTests extends BaseRpcTests{ result.put(OnVehicleData.KEY_CLUSTER_MODE_STATUS, VehicleDataHelper.CLUSTER_MODE_STATUS.serializeJSON()); result.put(OnVehicleData.KEY_MY_KEY, VehicleDataHelper.MY_KEY.serializeJSON()); result.put(OnVehicleData.KEY_FUEL_RANGE, VehicleDataHelper.JSON_FUEL_RANGE); - result.put(OnVehicleData.KEY_TURN_SIGNAL, VehicleDataHelper.TURN_SIGNAL); - result.put(OnVehicleData.KEY_ELECTRONIC_PARK_BRAKE_STATUS, VehicleDataHelper.ELECTRONIC_PARK_BRAKE_STATUS); - result.put(OnVehicleData.KEY_HANDS_OFF_STEERING, VehicleDataHelper.HANDS_OFF_STEERING); - result.put(OnVehicleData.KEY_GEAR_STATUS, VehicleDataHelper.GEAR_STATUS); - result.put(OnVehicleData.KEY_WINDOW_STATUS, VehicleDataHelper.WINDOW_STATUS_LIST); - result.put(OnVehicleData.KEY_STABILITY_CONTROLS_STATUS, VehicleDataHelper.STABILITY_CONTROLS_STATUS); - result.put(TestValues.GENERAL_OEM_CUSTOM_VEHICLE_DATA_NAME, VehicleDataHelper.OEM_CUSTOM_VEHICLE_DATA_STATE); - } catch(JSONException e) { - fail(TestValues.JSON_FAIL); + result.put(OnVehicleData.KEY_TURN_SIGNAL, VehicleDataHelper.TURN_SIGNAL); + result.put(OnVehicleData.KEY_ELECTRONIC_PARK_BRAKE_STATUS, VehicleDataHelper.ELECTRONIC_PARK_BRAKE_STATUS); + result.put(OnVehicleData.KEY_HANDS_OFF_STEERING, VehicleDataHelper.HANDS_OFF_STEERING); + result.put(OnVehicleData.KEY_GEAR_STATUS, VehicleDataHelper.GEAR_STATUS); + result.put(OnVehicleData.KEY_WINDOW_STATUS, VehicleDataHelper.WINDOW_STATUS_LIST); + result.put(OnVehicleData.KEY_STABILITY_CONTROLS_STATUS, VehicleDataHelper.STABILITY_CONTROLS_STATUS); + result.put(TestValues.GENERAL_OEM_CUSTOM_VEHICLE_DATA_NAME, VehicleDataHelper.OEM_CUSTOM_VEHICLE_DATA_STATE); + } catch (JSONException e) { + fail(TestValues.JSON_FAIL); } return result; } - + /** - * Tests the expected values of the RPC message. - */ + * Tests the expected values of the RPC message. + */ @Test - public void testRpcValues () { - // Test Values - Double speed = ( (OnVehicleData) msg).getSpeed(); - int rpm = ( (OnVehicleData) msg).getRpm(); - Double external = ( (OnVehicleData) msg).getExternalTemperature(); - Double fuelLevel = ( (OnVehicleData) msg).getFuelLevel(); - String vin = ( (OnVehicleData) msg).getVin(); - PRNDL prndl = ( (OnVehicleData) msg).getPrndl(); - TireStatus pressure = ( (OnVehicleData) msg).getTirePressure(); - Double torque = ( (OnVehicleData) msg).getEngineTorque(); - Float engineOilLife = ( (OnVehicleData) msg).getEngineOilLife(); - int odometer = ( (OnVehicleData) msg).getOdometer(); - GPSData gps = ( (OnVehicleData) msg).getGps(); - ComponentVolumeStatus state = ( (OnVehicleData) msg).getFuelLevelState(); - Double consumption = ( (OnVehicleData) msg).getInstantFuelConsumption(); - BeltStatus belt = ( (OnVehicleData) msg).getBeltStatus(); - BodyInformation body = ( (OnVehicleData) msg).getBodyInformation(); - DeviceStatus device = ( (OnVehicleData) msg).getDeviceStatus(); - VehicleDataEventStatus brake = ( (OnVehicleData) msg).getDriverBraking(); - WiperStatus wiper = ( (OnVehicleData) msg).getWiperStatus(); - HeadLampStatus lamp = ( (OnVehicleData) msg).getHeadLampStatus(); - Double pedal = ( (OnVehicleData) msg).getAccPedalPosition(); - Double wheel = ( (OnVehicleData) msg).getSteeringWheelAngle(); - ECallInfo ecall = ( (OnVehicleData) msg).getECallInfo(); - AirbagStatus airbag = ( (OnVehicleData) msg).getAirbagStatus(); - EmergencyEvent event = ( (OnVehicleData) msg).getEmergencyEvent(); - ClusterModeStatus cluster = ( (OnVehicleData) msg).getClusterModeStatus(); - MyKey key = ( (OnVehicleData) msg).getMyKey(); - List<FuelRange> fuelRangeList = ( (OnVehicleData) msg).getFuelRange(); - List<WindowStatus> windowStatusList = ( (OnVehicleData) msg).getWindowStatus(); - TurnSignal turnSignal = ( (OnVehicleData) msg).getTurnSignal(); - ElectronicParkBrakeStatus electronicParkBrakeStatus = ( (OnVehicleData) msg).getElectronicParkBrakeStatus(); - GearStatus gearStatus = ( (OnVehicleData) msg).getGearStatus(); - StabilityControlsStatus stabilityControlsStatus = ( (OnVehicleData) msg).getStabilityControlsStatus(); - Object oemCustomVehicleData = ( (OnVehicleData) msg).getOEMCustomVehicleData(TestValues.GENERAL_OEM_CUSTOM_VEHICLE_DATA_NAME); - Boolean handsOffSteering = ( (OnVehicleData) msg).getHandsOffSteering(); - // Valid Tests - assertEquals(TestValues.MATCH, VehicleDataHelper.SPEED, speed); - assertEquals(TestValues.MATCH, VehicleDataHelper.RPM, rpm); - assertEquals(TestValues.MATCH, VehicleDataHelper.EXTERNAL_TEMPERATURE, external); - assertEquals(TestValues.MATCH, VehicleDataHelper.FUEL_LEVEL, fuelLevel); - assertEquals(TestValues.MATCH, VehicleDataHelper.VIN, vin); - assertEquals(TestValues.MATCH, VehicleDataHelper.PRNDL_FINAL, prndl); - assertTrue(TestValues.MATCH, Validator.validateTireStatus(VehicleDataHelper.TIRE_PRESSURE, pressure)); - assertEquals(TestValues.MATCH, VehicleDataHelper.ENGINE_TORQUE, torque); - assertEquals(TestValues.MATCH, VehicleDataHelper.ENGINE_OIL_LIFE, engineOilLife); - assertEquals(TestValues.MATCH, VehicleDataHelper.ODOMETER, odometer); - assertTrue(TestValues.MATCH, Validator.validateGpsData(VehicleDataHelper.GPS, gps)); - assertEquals(TestValues.MATCH, VehicleDataHelper.FUEL_LEVEL_STATE, state); - assertEquals(TestValues.MATCH, VehicleDataHelper.INSTANT_FUEL_CONSUMPTION, consumption); - assertTrue(TestValues.TRUE, Validator.validateBeltStatus(VehicleDataHelper.BELT_STATUS, belt)); - assertTrue(TestValues.TRUE, Validator.validateBodyInformation(VehicleDataHelper.BODY_INFORMATION, body)); - assertTrue(TestValues.TRUE, Validator.validateDeviceStatus(VehicleDataHelper.DEVICE_STATUS, device)); - assertEquals(TestValues.MATCH, VehicleDataHelper.DRIVER_BRAKING, brake); - assertEquals(TestValues.MATCH, VehicleDataHelper.WIPER_STATUS, wiper); - assertTrue(TestValues.TRUE, Validator.validateHeadLampStatus(VehicleDataHelper.HEAD_LAMP_STATUS, lamp)); - assertEquals(TestValues.MATCH, VehicleDataHelper.ACC_PEDAL_POSITION, pedal); - assertEquals(TestValues.MATCH, VehicleDataHelper.STEERING_WHEEL_ANGLE, wheel); - assertTrue(TestValues.TRUE, Validator.validateECallInfo(VehicleDataHelper.E_CALL_INFO, ecall)); - assertTrue(TestValues.TRUE, Validator.validateAirbagStatus(VehicleDataHelper.AIRBAG_STATUS, airbag)); - assertTrue(TestValues.TRUE, Validator.validateEmergencyEvent(VehicleDataHelper.EMERGENCY_EVENT, event)); - assertTrue(TestValues.TRUE, Validator.validateClusterModeStatus(VehicleDataHelper.CLUSTER_MODE_STATUS, cluster)); - assertTrue(TestValues.TRUE, Validator.validateMyKey(VehicleDataHelper.MY_KEY, key)); - assertTrue(TestValues.TRUE, Validator.validateFuelRange(VehicleDataHelper.FUEL_RANGE_LIST, fuelRangeList)); - assertTrue(TestValues.TRUE, Validator.validateWindowStatuses(VehicleDataHelper.WINDOW_STATUS_LIST, windowStatusList)); - assertEquals(TestValues.MATCH, VehicleDataHelper.TURN_SIGNAL, turnSignal); - assertEquals(TestValues.MATCH, VehicleDataHelper.ELECTRONIC_PARK_BRAKE_STATUS, electronicParkBrakeStatus); - assertEquals(TestValues.MATCH, VehicleDataHelper.GEAR_STATUS, gearStatus); - assertEquals(TestValues.MATCH, VehicleDataHelper.STABILITY_CONTROLS_STATUS, stabilityControlsStatus); - assertEquals(TestValues.MATCH, VehicleDataHelper.OEM_CUSTOM_VEHICLE_DATA_STATE, oemCustomVehicleData); - assertEquals(TestValues.MATCH, VehicleDataHelper.HANDS_OFF_STEERING, handsOffSteering); - // Invalid/Null Tests + public void testRpcValues() { + // Test Values + Double speed = ((OnVehicleData) msg).getSpeed(); + int rpm = ((OnVehicleData) msg).getRpm(); + Double external = ((OnVehicleData) msg).getExternalTemperature(); + Double fuelLevel = ((OnVehicleData) msg).getFuelLevel(); + String vin = ((OnVehicleData) msg).getVin(); + PRNDL prndl = ((OnVehicleData) msg).getPrndl(); + TireStatus pressure = ((OnVehicleData) msg).getTirePressure(); + Double torque = ((OnVehicleData) msg).getEngineTorque(); + Float engineOilLife = ((OnVehicleData) msg).getEngineOilLife(); + int odometer = ((OnVehicleData) msg).getOdometer(); + GPSData gps = ((OnVehicleData) msg).getGps(); + ComponentVolumeStatus state = ((OnVehicleData) msg).getFuelLevelState(); + Double consumption = ((OnVehicleData) msg).getInstantFuelConsumption(); + BeltStatus belt = ((OnVehicleData) msg).getBeltStatus(); + BodyInformation body = ((OnVehicleData) msg).getBodyInformation(); + DeviceStatus device = ((OnVehicleData) msg).getDeviceStatus(); + VehicleDataEventStatus brake = ((OnVehicleData) msg).getDriverBraking(); + WiperStatus wiper = ((OnVehicleData) msg).getWiperStatus(); + HeadLampStatus lamp = ((OnVehicleData) msg).getHeadLampStatus(); + Double pedal = ((OnVehicleData) msg).getAccPedalPosition(); + Double wheel = ((OnVehicleData) msg).getSteeringWheelAngle(); + ECallInfo ecall = ((OnVehicleData) msg).getECallInfo(); + AirbagStatus airbag = ((OnVehicleData) msg).getAirbagStatus(); + EmergencyEvent event = ((OnVehicleData) msg).getEmergencyEvent(); + ClusterModeStatus cluster = ((OnVehicleData) msg).getClusterModeStatus(); + MyKey key = ((OnVehicleData) msg).getMyKey(); + List<FuelRange> fuelRangeList = ((OnVehicleData) msg).getFuelRange(); + List<WindowStatus> windowStatusList = ((OnVehicleData) msg).getWindowStatus(); + TurnSignal turnSignal = ((OnVehicleData) msg).getTurnSignal(); + ElectronicParkBrakeStatus electronicParkBrakeStatus = ((OnVehicleData) msg).getElectronicParkBrakeStatus(); + GearStatus gearStatus = ((OnVehicleData) msg).getGearStatus(); + StabilityControlsStatus stabilityControlsStatus = ((OnVehicleData) msg).getStabilityControlsStatus(); + Object oemCustomVehicleData = ((OnVehicleData) msg).getOEMCustomVehicleData(TestValues.GENERAL_OEM_CUSTOM_VEHICLE_DATA_NAME); + Boolean handsOffSteering = ((OnVehicleData) msg).getHandsOffSteering(); + // Valid Tests + assertEquals(TestValues.MATCH, VehicleDataHelper.SPEED, speed); + assertEquals(TestValues.MATCH, VehicleDataHelper.RPM, rpm); + assertEquals(TestValues.MATCH, VehicleDataHelper.EXTERNAL_TEMPERATURE, external); + assertEquals(TestValues.MATCH, VehicleDataHelper.FUEL_LEVEL, fuelLevel); + assertEquals(TestValues.MATCH, VehicleDataHelper.VIN, vin); + assertEquals(TestValues.MATCH, VehicleDataHelper.PRNDL_FINAL, prndl); + assertTrue(TestValues.MATCH, Validator.validateTireStatus(VehicleDataHelper.TIRE_PRESSURE, pressure)); + assertEquals(TestValues.MATCH, VehicleDataHelper.ENGINE_TORQUE, torque); + assertEquals(TestValues.MATCH, VehicleDataHelper.ENGINE_OIL_LIFE, engineOilLife); + assertEquals(TestValues.MATCH, VehicleDataHelper.ODOMETER, odometer); + assertTrue(TestValues.MATCH, Validator.validateGpsData(VehicleDataHelper.GPS, gps)); + assertEquals(TestValues.MATCH, VehicleDataHelper.FUEL_LEVEL_STATE, state); + assertEquals(TestValues.MATCH, VehicleDataHelper.INSTANT_FUEL_CONSUMPTION, consumption); + assertTrue(TestValues.TRUE, Validator.validateBeltStatus(VehicleDataHelper.BELT_STATUS, belt)); + assertTrue(TestValues.TRUE, Validator.validateBodyInformation(VehicleDataHelper.BODY_INFORMATION, body)); + assertTrue(TestValues.TRUE, Validator.validateDeviceStatus(VehicleDataHelper.DEVICE_STATUS, device)); + assertEquals(TestValues.MATCH, VehicleDataHelper.DRIVER_BRAKING, brake); + assertEquals(TestValues.MATCH, VehicleDataHelper.WIPER_STATUS, wiper); + assertTrue(TestValues.TRUE, Validator.validateHeadLampStatus(VehicleDataHelper.HEAD_LAMP_STATUS, lamp)); + assertEquals(TestValues.MATCH, VehicleDataHelper.ACC_PEDAL_POSITION, pedal); + assertEquals(TestValues.MATCH, VehicleDataHelper.STEERING_WHEEL_ANGLE, wheel); + assertTrue(TestValues.TRUE, Validator.validateECallInfo(VehicleDataHelper.E_CALL_INFO, ecall)); + assertTrue(TestValues.TRUE, Validator.validateAirbagStatus(VehicleDataHelper.AIRBAG_STATUS, airbag)); + assertTrue(TestValues.TRUE, Validator.validateEmergencyEvent(VehicleDataHelper.EMERGENCY_EVENT, event)); + assertTrue(TestValues.TRUE, Validator.validateClusterModeStatus(VehicleDataHelper.CLUSTER_MODE_STATUS, cluster)); + assertTrue(TestValues.TRUE, Validator.validateMyKey(VehicleDataHelper.MY_KEY, key)); + assertTrue(TestValues.TRUE, Validator.validateFuelRange(VehicleDataHelper.FUEL_RANGE_LIST, fuelRangeList)); + assertTrue(TestValues.TRUE, Validator.validateWindowStatuses(VehicleDataHelper.WINDOW_STATUS_LIST, windowStatusList)); + assertEquals(TestValues.MATCH, VehicleDataHelper.TURN_SIGNAL, turnSignal); + assertEquals(TestValues.MATCH, VehicleDataHelper.ELECTRONIC_PARK_BRAKE_STATUS, electronicParkBrakeStatus); + assertEquals(TestValues.MATCH, VehicleDataHelper.GEAR_STATUS, gearStatus); + assertEquals(TestValues.MATCH, VehicleDataHelper.STABILITY_CONTROLS_STATUS, stabilityControlsStatus); + assertEquals(TestValues.MATCH, VehicleDataHelper.OEM_CUSTOM_VEHICLE_DATA_STATE, oemCustomVehicleData); + assertEquals(TestValues.MATCH, VehicleDataHelper.HANDS_OFF_STEERING, handsOffSteering); + // Invalid/Null Tests OnVehicleData msg = new OnVehicleData(); assertNotNull(TestValues.NOT_NULL, msg); testNullBase(msg); @@ -229,374 +229,365 @@ public class OnVehicleDataTests extends BaseRpcTests{ assertNull(TestValues.NULL, msg.getGearStatus()); assertNull(TestValues.NULL, msg.getStabilityControlsStatus()); assertNull(TestValues.NULL, msg.getOEMCustomVehicleData(TestValues.GENERAL_OEM_CUSTOM_VEHICLE_DATA_NAME)); - } + } - @Test + @Test public void testJson() { - JSONObject reference = new JSONObject(); - - //Objects needed on the first level. - JSONObject tireStatusObj = new JSONObject(); - JSONObject GPSDataObj = new JSONObject(); - JSONObject beltStatusObj = new JSONObject(); - JSONObject bodyInformationObj = new JSONObject(); - JSONObject deviceStatusObj = new JSONObject(); - JSONObject headLampStatusObj = new JSONObject(); - JSONObject ECallInfoObj = new JSONObject(); - JSONObject airbagStatusObj = new JSONObject(); - JSONObject emergencyEventObj = new JSONObject(); - JSONObject clusterModeStatusObj = new JSONObject(); - JSONObject myKeyObj = new JSONObject(); - JSONObject fuelRangeObj = new JSONObject(); - JSONObject windowStatusObj = new JSONObject(); - JSONObject gearStatusObj = new JSONObject(); - JSONObject stabilityControlStatusObj = new JSONObject(); - JSONArray fuelRangeArrayObj = new JSONArray(); - JSONArray windowStatusArrayObj = new JSONArray(); - - try { - //Set up the JSONObject to represent OnVehicleData: - - //TIRE_PRESSURE - tireStatusObj.put(TireStatus.KEY_PRESSURE_TELL_TALE, VehicleDataHelper.TIRE_PRESSURE_TELL_TALE); - JSONObject tireLeftFront = new JSONObject(); - tireLeftFront.put(SingleTireStatus.KEY_STATUS, VehicleDataHelper.TIRE_PRESSURE_LEFT_FRONT); - tireStatusObj.put(TireStatus.KEY_LEFT_FRONT, tireLeftFront); - JSONObject tireRightFront = new JSONObject(); - tireRightFront.put(SingleTireStatus.KEY_STATUS, VehicleDataHelper.TIRE_PRESSURE_RIGHT_FRONT); - tireStatusObj.put(TireStatus.KEY_RIGHT_FRONT, tireRightFront); - JSONObject tireLeftRear = new JSONObject(); - tireLeftRear.put(SingleTireStatus.KEY_STATUS, VehicleDataHelper.TIRE_PRESSURE_LEFT_REAR); - tireStatusObj.put(TireStatus.KEY_LEFT_REAR, tireLeftRear); - JSONObject tireRightRear = new JSONObject(); - tireRightRear.put(SingleTireStatus.KEY_STATUS, VehicleDataHelper.TIRE_PRESSURE_RIGHT_REAR); - tireStatusObj.put(TireStatus.KEY_RIGHT_REAR, tireRightRear); - JSONObject tireInnerLeftRear = new JSONObject(); - tireInnerLeftRear.put(SingleTireStatus.KEY_STATUS, VehicleDataHelper.TIRE_PRESSURE_INNER_LEFT_REAR); - tireStatusObj.put(TireStatus.KEY_INNER_LEFT_REAR, tireInnerLeftRear); - JSONObject tireInnerRightRear = new JSONObject(); - tireInnerRightRear.put(SingleTireStatus.KEY_STATUS, VehicleDataHelper.TIRE_PRESSURE_INNER_RIGHT_REAR); - tireStatusObj.put(TireStatus.KEY_INNER_RIGHT_REAR, tireInnerRightRear); - - //GPS - GPSDataObj.put(GPSData.KEY_LONGITUDE_DEGREES, VehicleDataHelper.GPS_LONGITUDE); - GPSDataObj.put(GPSData.KEY_LATITUDE_DEGREES, VehicleDataHelper.GPS_LATITUDE); - GPSDataObj.put(GPSData.KEY_UTC_YEAR, VehicleDataHelper.GPS_YEAR); - GPSDataObj.put(GPSData.KEY_UTC_MONTH, VehicleDataHelper.GPS_MONTH); - GPSDataObj.put(GPSData.KEY_UTC_DAY, VehicleDataHelper.GPS_DAY); - GPSDataObj.put(GPSData.KEY_UTC_HOURS, VehicleDataHelper.GPS_HOURS); - GPSDataObj.put(GPSData.KEY_UTC_MINUTES, VehicleDataHelper.GPS_MINUTES); - GPSDataObj.put(GPSData.KEY_UTC_SECONDS, VehicleDataHelper.GPS_SECONDS); - GPSDataObj.put(GPSData.KEY_COMPASS_DIRECTION, VehicleDataHelper.GPS_DIRECTION); - GPSDataObj.put(GPSData.KEY_PDOP, VehicleDataHelper.GPS_PDOP); - GPSDataObj.put(GPSData.KEY_VDOP, VehicleDataHelper.GPS_VDOP); - GPSDataObj.put(GPSData.KEY_HDOP, VehicleDataHelper.GPS_HDOP); - GPSDataObj.put(GPSData.KEY_ACTUAL, VehicleDataHelper.GPS_ACTUAL); - GPSDataObj.put(GPSData.KEY_SATELLITES, VehicleDataHelper.GPS_SATELLITES); - GPSDataObj.put(GPSData.KEY_DIMENSION, VehicleDataHelper.GPS_DIMENSION); - GPSDataObj.put(GPSData.KEY_ALTITUDE, VehicleDataHelper.GPS_ALTITUDE); - GPSDataObj.put(GPSData.KEY_HEADING, VehicleDataHelper.GPS_HEADING); - GPSDataObj.put(GPSData.KEY_SPEED, VehicleDataHelper.GPS_SPEED); - GPSDataObj.put(GPSData.KEY_SHIFTED, VehicleDataHelper.GPS_SHIFTED); - - //BELT_STATUS - beltStatusObj.put(BeltStatus.KEY_DRIVER_BELT_DEPLOYED, VehicleDataHelper.BELT_STATUS_DRIVER_DEPLOYED); - beltStatusObj.put(BeltStatus.KEY_PASSENGER_BELT_DEPLOYED, VehicleDataHelper.BELT_STATUS_PASSENGER_DEPLOYED); - beltStatusObj.put(BeltStatus.KEY_PASSENGER_BUCKLE_BELTED, VehicleDataHelper.BELT_STATUS_PASSENGER_BELTED); - beltStatusObj.put(BeltStatus.KEY_DRIVER_BUCKLE_BELTED, VehicleDataHelper.BELT_STATUS_DRIVER_BELTED); - beltStatusObj.put(BeltStatus.KEY_LEFT_ROW_2_BUCKLE_BELTED, VehicleDataHelper.BELT_STATUS_LEFT_ROW_2_BELTED); - beltStatusObj.put(BeltStatus.KEY_PASSENGER_CHILD_DETECTED, VehicleDataHelper.BELT_STATUS_PASSENGER_CHILD); - beltStatusObj.put(BeltStatus.KEY_RIGHT_ROW_2_BUCKLE_BELTED, VehicleDataHelper.BELT_STATUS_RIGHT_ROW_2_BELTED); - beltStatusObj.put(BeltStatus.KEY_MIDDLE_ROW_2_BUCKLE_BELTED, VehicleDataHelper.BELT_STATUS_MIDDLE_ROW_2_BELTED); - beltStatusObj.put(BeltStatus.KEY_MIDDLE_ROW_3_BUCKLE_BELTED, VehicleDataHelper.BELT_STATUS_MIDDLE_ROW_3_BELTED); - beltStatusObj.put(BeltStatus.KEY_LEFT_ROW_3_BUCKLE_BELTED, VehicleDataHelper.BELT_STATUS_LEFT_ROW_3_BELTED); - beltStatusObj.put(BeltStatus.KEY_RIGHT_ROW_3_BUCKLE_BELTED, VehicleDataHelper.BELT_STATUS_RIGHT_ROW_3_BELTED); - beltStatusObj.put(BeltStatus.KEY_LEFT_REAR_INFLATABLE_BELTED, VehicleDataHelper.BELT_STATUS_LEFT_REAR_INFLATABLE_BELTED); - beltStatusObj.put(BeltStatus.KEY_RIGHT_REAR_INFLATABLE_BELTED, VehicleDataHelper.BELT_STATUS_RIGHT_REAR_INFLATABLE_BELTED); - beltStatusObj.put(BeltStatus.KEY_MIDDLE_ROW_1_BELT_DEPLOYED, VehicleDataHelper.BELT_STATUS_MIDDLE_ROW_1_DEPLOYED); - beltStatusObj.put(BeltStatus.KEY_MIDDLE_ROW_1_BUCKLE_BELTED, VehicleDataHelper.BELT_STATUS_MIDDLE_ROW_1_BELTED); - - //BODY_INFORMATION - bodyInformationObj.put(BodyInformation.KEY_PARK_BRAKE_ACTIVE, VehicleDataHelper.BODY_INFORMATION_PARK_BRAKE); - bodyInformationObj.put(BodyInformation.KEY_IGNITION_STABLE_STATUS, VehicleDataHelper.BODY_INFORMATION_IGNITION_STATUS); - bodyInformationObj.put(BodyInformation.KEY_IGNITION_STATUS, VehicleDataHelper.BODY_INFORMATION_IGNITION_STABLE_STATUS); - bodyInformationObj.put(BodyInformation.KEY_DRIVER_DOOR_AJAR, VehicleDataHelper.BODY_INFORMATION_DRIVER_AJAR); - bodyInformationObj.put(BodyInformation.KEY_PASSENGER_DOOR_AJAR, VehicleDataHelper.BODY_INFORMATION_PASSENGER_AJAR); - bodyInformationObj.put(BodyInformation.KEY_REAR_LEFT_DOOR_AJAR, VehicleDataHelper.BODY_INFORMATION_REAR_LEFT_AJAR); - bodyInformationObj.put(BodyInformation.KEY_REAR_RIGHT_DOOR_AJAR, VehicleDataHelper.BODY_INFORMATION_REAR_RIGHT_AJAR); - - //DEVICE_STATUS - deviceStatusObj.put(DeviceStatus.KEY_VOICE_REC_ON, VehicleDataHelper.DEVICE_STATUS_VOICE_REC); - deviceStatusObj.put(DeviceStatus.KEY_BT_ICON_ON, VehicleDataHelper.DEVICE_STATUS_BT_ICON); - deviceStatusObj.put(DeviceStatus.KEY_CALL_ACTIVE, VehicleDataHelper.DEVICE_STATUS_CALL_ACTIVE); - deviceStatusObj.put(DeviceStatus.KEY_PHONE_ROAMING, VehicleDataHelper.DEVICE_STATUS_PHONE_ROAMING); - deviceStatusObj.put(DeviceStatus.KEY_TEXT_MSG_AVAILABLE, VehicleDataHelper.DEVICE_STATUS_TEXT_MSG_AVAILABLE); - deviceStatusObj.put(DeviceStatus.KEY_BATT_LEVEL_STATUS, VehicleDataHelper.DEVICE_STATUS_BATT_LEVEL_STATUS); - deviceStatusObj.put(DeviceStatus.KEY_STEREO_AUDIO_OUTPUT_MUTED, VehicleDataHelper.DEVICE_STATUS_STEREO_MUTED); - deviceStatusObj.put(DeviceStatus.KEY_MONO_AUDIO_OUTPUT_MUTED, VehicleDataHelper.DEVICE_STATUS_MONO_MUTED); - deviceStatusObj.put(DeviceStatus.KEY_SIGNAL_LEVEL_STATUS, VehicleDataHelper.DEVICE_STATUS_SIGNAL_LEVEL_STATUS); - deviceStatusObj.put(DeviceStatus.KEY_PRIMARY_AUDIO_SOURCE, VehicleDataHelper.DEVICE_STATUS_PRIMARY_AUDIO); - deviceStatusObj.put(DeviceStatus.KEY_E_CALL_EVENT_ACTIVE, VehicleDataHelper.DEVICE_STATUS_E_CALL_ACTIVE); - - //HEAD_LAMP_STATUS - headLampStatusObj.put(HeadLampStatus.KEY_AMBIENT_LIGHT_SENSOR_STATUS, VehicleDataHelper.HEAD_LAMP_STATUS_AMBIENT_STATUS); - headLampStatusObj.put(HeadLampStatus.KEY_HIGH_BEAMS_ON, VehicleDataHelper.HEAD_LAMP_HIGH_BEAMS); - headLampStatusObj.put(HeadLampStatus.KEY_LOW_BEAMS_ON, VehicleDataHelper.HEAD_LAMP_LOW_BEAMS); - - //E_CALL_INFO - ECallInfoObj.put(ECallInfo.KEY_E_CALL_NOTIFICATION_STATUS, VehicleDataHelper.E_CALL_INFO_E_CALL_NOTIFICATION_STATUS); - ECallInfoObj.put(ECallInfo.KEY_AUX_E_CALL_NOTIFICATION_STATUS, VehicleDataHelper.E_CALL_INFO_AUX_E_CALL_NOTIFICATION_STATUS); - ECallInfoObj.put(ECallInfo.KEY_E_CALL_CONFIRMATION_STATUS, VehicleDataHelper.E_CALL_INFO_CONFIRMATION_STATUS); - - //AIRBAG_STATUS - airbagStatusObj.put(AirbagStatus.KEY_DRIVER_AIRBAG_DEPLOYED, VehicleDataHelper.AIRBAG_STATUS_DRIVER_DEPLOYED); - airbagStatusObj.put(AirbagStatus.KEY_DRIVER_SIDE_AIRBAG_DEPLOYED, VehicleDataHelper.AIRBAG_STATUS_DRIVER_SIDE_DEPLOYED); - airbagStatusObj.put(AirbagStatus.KEY_DRIVER_CURTAIN_AIRBAG_DEPLOYED, VehicleDataHelper.AIRBAG_STATUS_DRIVER_CURTAIN_DEPLOYED); - airbagStatusObj.put(AirbagStatus.KEY_DRIVER_KNEE_AIRBAG_DEPLOYED, VehicleDataHelper.AIRBAG_STATUS_DRIVER_KNEE_DEPLOYED); - airbagStatusObj.put(AirbagStatus.KEY_PASSENGER_AIRBAG_DEPLOYED, VehicleDataHelper.AIRBAG_STATUS_PASSENGER_DEPLOYED); - airbagStatusObj.put(AirbagStatus.KEY_PASSENGER_SIDE_AIRBAG_DEPLOYED, VehicleDataHelper.AIRBAG_STATUS_PASSENGER_SIDE_DEPLOYED); - airbagStatusObj.put(AirbagStatus.KEY_PASSENGER_CURTAIN_AIRBAG_DEPLOYED, VehicleDataHelper.AIRBAG_STATUS_PASSENGER_CURTAIN_DEPLOYED); - airbagStatusObj.put(AirbagStatus.KEY_PASSENGER_KNEE_AIRBAG_DEPLOYED, VehicleDataHelper.AIRBAG_STATUS_PASSENGER_KNEE_DEPLOYED); - - //EMERGENCY_EVENT - emergencyEventObj.put(EmergencyEvent.KEY_EMERGENCY_EVENT_TYPE, VehicleDataHelper.EMERGENCY_EVENT_TYPE); - emergencyEventObj.put(EmergencyEvent.KEY_FUEL_CUTOFF_STATUS, VehicleDataHelper.EMERGENCY_EVENT_FUEL_CUTOFF_STATUS); - emergencyEventObj.put(EmergencyEvent.KEY_ROLLOVER_EVENT, VehicleDataHelper.EMERGENCY_EVENT_ROLLOVER_EVENT); - emergencyEventObj.put(EmergencyEvent.KEY_MAXIMUM_CHANGE_VELOCITY, VehicleDataHelper.EMERGENCY_EVENT_MAX_CHANGE_VELOCITY); - emergencyEventObj.put(EmergencyEvent.KEY_MULTIPLE_EVENTS, VehicleDataHelper.EMERGENCY_EVENT_MULTIPLE_EVENTS); - - //CLUSTER_MODE_STATUS - clusterModeStatusObj.put(ClusterModeStatus.KEY_POWER_MODE_ACTIVE, VehicleDataHelper.CLUSTER_MODE_STATUS_POWER_MODE_ACTIVE); - clusterModeStatusObj.put(ClusterModeStatus.KEY_POWER_MODE_QUALIFICATION_STATUS, VehicleDataHelper.CLUSTER_MODE_STATUS_POWER_MODE_QUALIFICATION_STATUS); - clusterModeStatusObj.put(ClusterModeStatus.KEY_CAR_MODE_STATUS, VehicleDataHelper.CLUSTER_MODE_STATUS_CAR_MODE_STATUS); - clusterModeStatusObj.put(ClusterModeStatus.KEY_POWER_MODE_STATUS, VehicleDataHelper.CLUSTER_MODE_STATUS_POWER_MODE_STATUS); - - //MY_KEY - myKeyObj.put(MyKey.KEY_E_911_OVERRIDE, VehicleDataHelper.MY_KEY_E_911_OVERRIDE); - - // FUEL_RANGE - fuelRangeObj.put(FuelRange.KEY_TYPE, VehicleDataHelper.FUEL_RANGE_TYPE); - fuelRangeObj.put(FuelRange.KEY_RANGE, VehicleDataHelper.FUEL_RANGE_RANGE); - fuelRangeObj.put(FuelRange.KEY_CAPACITY, VehicleDataHelper.FUEL_RANGE_CAPACITY); - fuelRangeObj.put(FuelRange.KEY_CAPACITY_UNIT, VehicleDataHelper.FUEL_RANGE_CAPACITY_UNIT); - fuelRangeObj.put(FuelRange.KEY_LEVEL, VehicleDataHelper.FUEL_RANGE_LEVEL); - fuelRangeObj.put(FuelRange.KEY_LEVEL_STATE, VehicleDataHelper.FUEL_RANGE_LEVEL_STATE); - fuelRangeArrayObj.put(fuelRangeObj); - - // STABILITY_CONTROLS_STATU - stabilityControlStatusObj.put(StabilityControlsStatus.KEY_ESC_SYSTEM, VehicleDataHelper.ESC_SYSTEM); - stabilityControlStatusObj.put(StabilityControlsStatus.KEY_TRAILER_SWAY_CONTROL, VehicleDataHelper.S_WAY_TRAILER); - - // WINDOW_STATUS - windowStatusObj.put(WindowStatus.KEY_LOCATION, VehicleDataHelper.LOCATION_GRID); - windowStatusObj.put(WindowStatus.KEY_STATE, VehicleDataHelper.WINDOW_STATE); - windowStatusArrayObj.put(windowStatusObj); - - // GEAR STATUS - gearStatusObj.put(GearStatus.KEY_USER_SELECTED_GEAR, VehicleDataHelper.USER_SELECTED_GEAR); - gearStatusObj.put(GearStatus.KEY_TRANSMISSION_TYPE, VehicleDataHelper.TRANSMISSION_TYPE); - gearStatusObj.put(GearStatus.KEY_ACTUAL_GEAR, VehicleDataHelper.ACTUAL_GEAR); - - reference.put(OnVehicleData.KEY_SPEED, VehicleDataHelper.SPEED); - reference.put(OnVehicleData.KEY_RPM, VehicleDataHelper.RPM); - reference.put(OnVehicleData.KEY_EXTERNAL_TEMPERATURE, VehicleDataHelper.EXTERNAL_TEMPERATURE); - reference.put(OnVehicleData.KEY_FUEL_LEVEL, VehicleDataHelper.FUEL_LEVEL); - reference.put(OnVehicleData.KEY_VIN, VehicleDataHelper.VIN); - reference.put(OnVehicleData.KEY_PRNDL, VehicleDataHelper.PRNDL_FINAL); - reference.put(OnVehicleData.KEY_TIRE_PRESSURE, tireStatusObj); - reference.put(OnVehicleData.KEY_ENGINE_TORQUE, VehicleDataHelper.ENGINE_TORQUE); - reference.put(OnVehicleData.KEY_ENGINE_OIL_LIFE, VehicleDataHelper.ENGINE_OIL_LIFE); - reference.put(OnVehicleData.KEY_ODOMETER, VehicleDataHelper.ODOMETER); - reference.put(OnVehicleData.KEY_GPS, GPSDataObj); - reference.put(OnVehicleData.KEY_FUEL_LEVEL_STATE, VehicleDataHelper.FUEL_LEVEL_STATE); - reference.put(OnVehicleData.KEY_INSTANT_FUEL_CONSUMPTION, VehicleDataHelper.INSTANT_FUEL_CONSUMPTION); - reference.put(OnVehicleData.KEY_BELT_STATUS, beltStatusObj); - reference.put(OnVehicleData.KEY_BODY_INFORMATION, bodyInformationObj); - reference.put(OnVehicleData.KEY_DEVICE_STATUS, deviceStatusObj); - reference.put(OnVehicleData.KEY_DRIVER_BRAKING, VehicleDataHelper.DRIVER_BRAKING); - reference.put(OnVehicleData.KEY_WIPER_STATUS, VehicleDataHelper.WIPER_STATUS); - reference.put(OnVehicleData.KEY_HEAD_LAMP_STATUS, headLampStatusObj); - reference.put(OnVehicleData.KEY_ACC_PEDAL_POSITION, VehicleDataHelper.ACC_PEDAL_POSITION); - reference.put(OnVehicleData.KEY_STEERING_WHEEL_ANGLE, VehicleDataHelper.STEERING_WHEEL_ANGLE); - reference.put(OnVehicleData.KEY_E_CALL_INFO, ECallInfoObj); - reference.put(OnVehicleData.KEY_AIRBAG_STATUS, airbagStatusObj); - reference.put(OnVehicleData.KEY_EMERGENCY_EVENT, emergencyEventObj); - reference.put(OnVehicleData.KEY_CLUSTER_MODE_STATUS, clusterModeStatusObj); - reference.put(OnVehicleData.KEY_MY_KEY, myKeyObj); - reference.put(OnVehicleData.KEY_FUEL_RANGE, fuelRangeArrayObj); - reference.put(OnVehicleData.KEY_TURN_SIGNAL, VehicleDataHelper.TURN_SIGNAL); - reference.put(OnVehicleData.KEY_ELECTRONIC_PARK_BRAKE_STATUS, VehicleDataHelper.ELECTRONIC_PARK_BRAKE_STATUS); - reference.put(OnVehicleData.KEY_HANDS_OFF_STEERING, VehicleDataHelper.HANDS_OFF_STEERING); - reference.put(OnVehicleData.KEY_WINDOW_STATUS, windowStatusArrayObj); - reference.put(OnVehicleData.KEY_GEAR_STATUS, gearStatusObj); - reference.put(OnVehicleData.KEY_STABILITY_CONTROLS_STATUS, stabilityControlStatusObj); - reference.put(TestValues.GENERAL_OEM_CUSTOM_VEHICLE_DATA_NAME, VehicleDataHelper.OEM_CUSTOM_VEHICLE_DATA_STATE); - - JSONObject underTest = msg.serializeJSON(); - //go inside underTest and only return the JSONObject inside the parameters key inside the notification key - underTest = underTest.getJSONObject("notification").getJSONObject("parameters"); - - assertEquals(TestValues.MATCH, reference.length(), underTest.length()); - - Iterator<?> iterator = reference.keys(); - - while (iterator.hasNext()) { - String key = (String) iterator.next(); - - if (key.equals(OnVehicleData.KEY_TIRE_PRESSURE)) { - JSONObject tirePressureReference = JsonUtils.readJsonObjectFromJsonObject(reference, key); - JSONObject tirePressureTest = JsonUtils.readJsonObjectFromJsonObject(underTest, key); - - assertTrue(TestValues.TRUE, Validator.validateTireStatus( - new TireStatus(JsonRPCMarshaller.deserializeJSONObject(tirePressureReference)), - new TireStatus(JsonRPCMarshaller.deserializeJSONObject(tirePressureTest)))); - - } else if (key.equals(OnVehicleData.KEY_GPS)) { - JSONObject GPSObjReference = JsonUtils.readJsonObjectFromJsonObject(reference, key); - JSONObject GPSObjTest = JsonUtils.readJsonObjectFromJsonObject(underTest, key); - - assertTrue(TestValues.TRUE, Validator.validateGpsData( - new GPSData(JsonRPCMarshaller.deserializeJSONObject(GPSObjReference)), - new GPSData(JsonRPCMarshaller.deserializeJSONObject(GPSObjTest)))); - } else if (key.equals(OnVehicleData.KEY_BELT_STATUS)) { - JSONObject beltObjReference = JsonUtils.readJsonObjectFromJsonObject(reference, key); - JSONObject beltObjTest = JsonUtils.readJsonObjectFromJsonObject(underTest, key); - - assertTrue(TestValues.TRUE, Validator.validateBeltStatus( - new BeltStatus(JsonRPCMarshaller.deserializeJSONObject(beltObjReference)), - new BeltStatus(JsonRPCMarshaller.deserializeJSONObject(beltObjTest)))); - } else if (key.equals(OnVehicleData.KEY_BODY_INFORMATION)) { - JSONObject bodyInfoObjReference = JsonUtils.readJsonObjectFromJsonObject(reference, key); - JSONObject bodyInfoObjTest = JsonUtils.readJsonObjectFromJsonObject(underTest, key); - - assertTrue(TestValues.TRUE, Validator.validateBodyInformation( - new BodyInformation(JsonRPCMarshaller.deserializeJSONObject(bodyInfoObjReference)), - new BodyInformation(JsonRPCMarshaller.deserializeJSONObject(bodyInfoObjTest)))); - } else if (key.equals(OnVehicleData.KEY_DEVICE_STATUS)) { - JSONObject deviceObjReference = JsonUtils.readJsonObjectFromJsonObject(reference, key); - JSONObject deviceObjTest = JsonUtils.readJsonObjectFromJsonObject(underTest, key); - - assertTrue(TestValues.TRUE, Validator.validateDeviceStatus( - new DeviceStatus(JsonRPCMarshaller.deserializeJSONObject(deviceObjReference)), - new DeviceStatus(JsonRPCMarshaller.deserializeJSONObject(deviceObjTest)))); - } else if (key.equals(OnVehicleData.KEY_HEAD_LAMP_STATUS)) { - JSONObject headLampObjReference = JsonUtils.readJsonObjectFromJsonObject(reference, key); - JSONObject headLampObjTest = JsonUtils.readJsonObjectFromJsonObject(underTest, key); - - assertTrue(TestValues.TRUE, Validator.validateHeadLampStatus( - new HeadLampStatus(JsonRPCMarshaller.deserializeJSONObject(headLampObjReference)), - new HeadLampStatus(JsonRPCMarshaller.deserializeJSONObject(headLampObjTest)))); - } else if (key.equals(OnVehicleData.KEY_E_CALL_INFO)) { - JSONObject callInfoObjReference = JsonUtils.readJsonObjectFromJsonObject(reference, key); - JSONObject callInfoObjTest = JsonUtils.readJsonObjectFromJsonObject(underTest, key); - - assertTrue(TestValues.TRUE, Validator.validateECallInfo( - new ECallInfo(JsonRPCMarshaller.deserializeJSONObject(callInfoObjReference)), - new ECallInfo(JsonRPCMarshaller.deserializeJSONObject(callInfoObjTest)))); - } else if (key.equals(OnVehicleData.KEY_AIRBAG_STATUS)) { - JSONObject airbagObjReference = JsonUtils.readJsonObjectFromJsonObject(reference, key); - JSONObject airbagObjTest = JsonUtils.readJsonObjectFromJsonObject(underTest, key); - - assertTrue(TestValues.TRUE, Validator.validateAirbagStatus( - new AirbagStatus(JsonRPCMarshaller.deserializeJSONObject(airbagObjReference)), - new AirbagStatus(JsonRPCMarshaller.deserializeJSONObject(airbagObjTest)))); - } - else if (key.equals(OnVehicleData.KEY_EMERGENCY_EVENT)) { - JSONObject emergencyObjReference = JsonUtils.readJsonObjectFromJsonObject(reference, key); - JSONObject emergencyObjTest = JsonUtils.readJsonObjectFromJsonObject(underTest, key); - - assertTrue(TestValues.TRUE, Validator.validateEmergencyEvent( - new EmergencyEvent(JsonRPCMarshaller.deserializeJSONObject(emergencyObjReference)), - new EmergencyEvent(JsonRPCMarshaller.deserializeJSONObject(emergencyObjTest)))); - } - else if (key.equals(OnVehicleData.KEY_CLUSTER_MODE_STATUS)) { - JSONObject clusterModeObjReference = JsonUtils.readJsonObjectFromJsonObject(reference, key); - JSONObject clusterModeObjTest = JsonUtils.readJsonObjectFromJsonObject(underTest, key); - - assertTrue(TestValues.TRUE, Validator.validateClusterModeStatus( - new ClusterModeStatus(JsonRPCMarshaller.deserializeJSONObject(clusterModeObjReference)), - new ClusterModeStatus(JsonRPCMarshaller.deserializeJSONObject(clusterModeObjTest)))); - } - else if (key.equals(OnVehicleData.KEY_MY_KEY)) { - JSONObject myKeyObjReference = JsonUtils.readJsonObjectFromJsonObject(reference, key); - JSONObject myKeyObjTest = JsonUtils.readJsonObjectFromJsonObject(underTest, key); - - assertTrue(TestValues.TRUE, Validator.validateMyKey( - new MyKey(JsonRPCMarshaller.deserializeJSONObject(myKeyObjReference)), - new MyKey(JsonRPCMarshaller.deserializeJSONObject(myKeyObjTest)))); - } - else if (key.equals(OnVehicleData.KEY_GEAR_STATUS)) { - JSONObject myKeyObjReference = JsonUtils.readJsonObjectFromJsonObject(reference, key); - JSONObject myKeyObjTest = JsonUtils.readJsonObjectFromJsonObject(underTest, key); - - assertTrue(TestValues.TRUE, Validator.validateGearStatuses( - new GearStatus(JsonRPCMarshaller.deserializeJSONObject(myKeyObjReference)), - new GearStatus(JsonRPCMarshaller.deserializeJSONObject(myKeyObjTest)))); - } - else if (key.equals(OnVehicleData.KEY_ENGINE_OIL_LIFE)) { - assertEquals(JsonUtils.readDoubleFromJsonObject(reference, key), JsonUtils.readDoubleFromJsonObject(underTest, key)); - } - else if (key.equals(OnVehicleData.KEY_HANDS_OFF_STEERING)) { - assertEquals(JsonUtils.readBooleanFromJsonObject(reference, key), JsonUtils.readBooleanFromJsonObject(underTest, key)); - } - else if (key.equals(OnVehicleData.KEY_FUEL_RANGE)) { - JSONArray fuelRangeArrayObjReference = JsonUtils.readJsonArrayFromJsonObject(reference, key); - List<FuelRange> fuelRangeRefereceList = new ArrayList<FuelRange>(); - for (int index = 0; index < fuelRangeArrayObjReference.length(); index++) { - FuelRange fuelRange = new FuelRange(JsonRPCMarshaller.deserializeJSONObject( (JSONObject)fuelRangeArrayObjReference.get(index) )); - fuelRangeRefereceList.add(fuelRange); - } - - JSONArray fuelRangeArrayObjTest = JsonUtils.readJsonArrayFromJsonObject(underTest, key); - List<FuelRange> fuelRangeUnderTestList = new ArrayList<FuelRange>(); - for (int index = 0; index < fuelRangeArrayObjTest.length(); index++) { - FuelRange fuelRange = new FuelRange(JsonRPCMarshaller.deserializeJSONObject( (JSONObject)fuelRangeArrayObjTest.get(index) )); - fuelRangeUnderTestList.add(fuelRange); - } - - assertTrue(TestValues.TRUE, Validator.validateFuelRange( - fuelRangeRefereceList, - fuelRangeUnderTestList)); - } else if (key.equals(OnVehicleData.KEY_WINDOW_STATUS)) { - JSONArray windowStatusArrayObjReference = JsonUtils.readJsonArrayFromJsonObject(reference, key); - List<WindowStatus> windowStatusReferenceList = new ArrayList<>(); - for (int index = 0; index < windowStatusArrayObjReference.length(); index++) { - WindowStatus windowStatus = new WindowStatus(JsonRPCMarshaller.deserializeJSONObject( (JSONObject)windowStatusArrayObjReference.get(index) )); - windowStatusReferenceList.add(windowStatus); - } - - JSONArray windowStatusArrayObjTest = JsonUtils.readJsonArrayFromJsonObject(underTest, key); - List<WindowStatus> windowStatusUnderTestList = new ArrayList<>(); - for (int index = 0; index < windowStatusArrayObjTest.length(); index++) { - WindowStatus windowStatus = new WindowStatus(JsonRPCMarshaller.deserializeJSONObject( (JSONObject)windowStatusArrayObjTest.get(index) )); - windowStatusUnderTestList.add(windowStatus); - } - - assertTrue("JSON value didn't match expected value for key \"" + key + "\".", - Validator.validateWindowStatuses( - windowStatusReferenceList, - windowStatusUnderTestList)); - } - else if (key.equals(GetVehicleDataResponse.KEY_STABILITY_CONTROLS_STATUS)) { - JSONObject myKeyObjReference = JsonUtils.readJsonObjectFromJsonObject(reference, key); - JSONObject myKeyObjTest = JsonUtils.readJsonObjectFromJsonObject(underTest, key); - - StabilityControlsStatus status1 = new StabilityControlsStatus(JsonRPCMarshaller.deserializeJSONObject(myKeyObjReference)); - StabilityControlsStatus status2 = new StabilityControlsStatus(JsonRPCMarshaller.deserializeJSONObject(myKeyObjTest)); - - assertTrue("JSON value didn't match expected value for key \"" + key + "\".", - Validator.validateStabilityControlStatus( - status1, - status2 - ) - ); - } - else { - assertEquals(TestValues.TRUE, JsonUtils.readObjectFromJsonObject(reference, key), JsonUtils.readObjectFromJsonObject(underTest, key)); - } - } - } catch (JSONException e) { - fail(TestValues.JSON_FAIL); - } + JSONObject reference = new JSONObject(); + + //Objects needed on the first level. + JSONObject tireStatusObj = new JSONObject(); + JSONObject GPSDataObj = new JSONObject(); + JSONObject beltStatusObj = new JSONObject(); + JSONObject bodyInformationObj = new JSONObject(); + JSONObject deviceStatusObj = new JSONObject(); + JSONObject headLampStatusObj = new JSONObject(); + JSONObject ECallInfoObj = new JSONObject(); + JSONObject airbagStatusObj = new JSONObject(); + JSONObject emergencyEventObj = new JSONObject(); + JSONObject clusterModeStatusObj = new JSONObject(); + JSONObject myKeyObj = new JSONObject(); + JSONObject fuelRangeObj = new JSONObject(); + JSONObject windowStatusObj = new JSONObject(); + JSONObject gearStatusObj = new JSONObject(); + JSONObject stabilityControlStatusObj = new JSONObject(); + JSONArray fuelRangeArrayObj = new JSONArray(); + JSONArray windowStatusArrayObj = new JSONArray(); + + try { + //Set up the JSONObject to represent OnVehicleData: + + //TIRE_PRESSURE + tireStatusObj.put(TireStatus.KEY_PRESSURE_TELL_TALE, VehicleDataHelper.TIRE_PRESSURE_TELL_TALE); + JSONObject tireLeftFront = new JSONObject(); + tireLeftFront.put(SingleTireStatus.KEY_STATUS, VehicleDataHelper.TIRE_PRESSURE_LEFT_FRONT); + tireStatusObj.put(TireStatus.KEY_LEFT_FRONT, tireLeftFront); + JSONObject tireRightFront = new JSONObject(); + tireRightFront.put(SingleTireStatus.KEY_STATUS, VehicleDataHelper.TIRE_PRESSURE_RIGHT_FRONT); + tireStatusObj.put(TireStatus.KEY_RIGHT_FRONT, tireRightFront); + JSONObject tireLeftRear = new JSONObject(); + tireLeftRear.put(SingleTireStatus.KEY_STATUS, VehicleDataHelper.TIRE_PRESSURE_LEFT_REAR); + tireStatusObj.put(TireStatus.KEY_LEFT_REAR, tireLeftRear); + JSONObject tireRightRear = new JSONObject(); + tireRightRear.put(SingleTireStatus.KEY_STATUS, VehicleDataHelper.TIRE_PRESSURE_RIGHT_REAR); + tireStatusObj.put(TireStatus.KEY_RIGHT_REAR, tireRightRear); + JSONObject tireInnerLeftRear = new JSONObject(); + tireInnerLeftRear.put(SingleTireStatus.KEY_STATUS, VehicleDataHelper.TIRE_PRESSURE_INNER_LEFT_REAR); + tireStatusObj.put(TireStatus.KEY_INNER_LEFT_REAR, tireInnerLeftRear); + JSONObject tireInnerRightRear = new JSONObject(); + tireInnerRightRear.put(SingleTireStatus.KEY_STATUS, VehicleDataHelper.TIRE_PRESSURE_INNER_RIGHT_REAR); + tireStatusObj.put(TireStatus.KEY_INNER_RIGHT_REAR, tireInnerRightRear); + + //GPS + GPSDataObj.put(GPSData.KEY_LONGITUDE_DEGREES, VehicleDataHelper.GPS_LONGITUDE); + GPSDataObj.put(GPSData.KEY_LATITUDE_DEGREES, VehicleDataHelper.GPS_LATITUDE); + GPSDataObj.put(GPSData.KEY_UTC_YEAR, VehicleDataHelper.GPS_YEAR); + GPSDataObj.put(GPSData.KEY_UTC_MONTH, VehicleDataHelper.GPS_MONTH); + GPSDataObj.put(GPSData.KEY_UTC_DAY, VehicleDataHelper.GPS_DAY); + GPSDataObj.put(GPSData.KEY_UTC_HOURS, VehicleDataHelper.GPS_HOURS); + GPSDataObj.put(GPSData.KEY_UTC_MINUTES, VehicleDataHelper.GPS_MINUTES); + GPSDataObj.put(GPSData.KEY_UTC_SECONDS, VehicleDataHelper.GPS_SECONDS); + GPSDataObj.put(GPSData.KEY_COMPASS_DIRECTION, VehicleDataHelper.GPS_DIRECTION); + GPSDataObj.put(GPSData.KEY_PDOP, VehicleDataHelper.GPS_PDOP); + GPSDataObj.put(GPSData.KEY_VDOP, VehicleDataHelper.GPS_VDOP); + GPSDataObj.put(GPSData.KEY_HDOP, VehicleDataHelper.GPS_HDOP); + GPSDataObj.put(GPSData.KEY_ACTUAL, VehicleDataHelper.GPS_ACTUAL); + GPSDataObj.put(GPSData.KEY_SATELLITES, VehicleDataHelper.GPS_SATELLITES); + GPSDataObj.put(GPSData.KEY_DIMENSION, VehicleDataHelper.GPS_DIMENSION); + GPSDataObj.put(GPSData.KEY_ALTITUDE, VehicleDataHelper.GPS_ALTITUDE); + GPSDataObj.put(GPSData.KEY_HEADING, VehicleDataHelper.GPS_HEADING); + GPSDataObj.put(GPSData.KEY_SPEED, VehicleDataHelper.GPS_SPEED); + GPSDataObj.put(GPSData.KEY_SHIFTED, VehicleDataHelper.GPS_SHIFTED); + + //BELT_STATUS + beltStatusObj.put(BeltStatus.KEY_DRIVER_BELT_DEPLOYED, VehicleDataHelper.BELT_STATUS_DRIVER_DEPLOYED); + beltStatusObj.put(BeltStatus.KEY_PASSENGER_BELT_DEPLOYED, VehicleDataHelper.BELT_STATUS_PASSENGER_DEPLOYED); + beltStatusObj.put(BeltStatus.KEY_PASSENGER_BUCKLE_BELTED, VehicleDataHelper.BELT_STATUS_PASSENGER_BELTED); + beltStatusObj.put(BeltStatus.KEY_DRIVER_BUCKLE_BELTED, VehicleDataHelper.BELT_STATUS_DRIVER_BELTED); + beltStatusObj.put(BeltStatus.KEY_LEFT_ROW_2_BUCKLE_BELTED, VehicleDataHelper.BELT_STATUS_LEFT_ROW_2_BELTED); + beltStatusObj.put(BeltStatus.KEY_PASSENGER_CHILD_DETECTED, VehicleDataHelper.BELT_STATUS_PASSENGER_CHILD); + beltStatusObj.put(BeltStatus.KEY_RIGHT_ROW_2_BUCKLE_BELTED, VehicleDataHelper.BELT_STATUS_RIGHT_ROW_2_BELTED); + beltStatusObj.put(BeltStatus.KEY_MIDDLE_ROW_2_BUCKLE_BELTED, VehicleDataHelper.BELT_STATUS_MIDDLE_ROW_2_BELTED); + beltStatusObj.put(BeltStatus.KEY_MIDDLE_ROW_3_BUCKLE_BELTED, VehicleDataHelper.BELT_STATUS_MIDDLE_ROW_3_BELTED); + beltStatusObj.put(BeltStatus.KEY_LEFT_ROW_3_BUCKLE_BELTED, VehicleDataHelper.BELT_STATUS_LEFT_ROW_3_BELTED); + beltStatusObj.put(BeltStatus.KEY_RIGHT_ROW_3_BUCKLE_BELTED, VehicleDataHelper.BELT_STATUS_RIGHT_ROW_3_BELTED); + beltStatusObj.put(BeltStatus.KEY_LEFT_REAR_INFLATABLE_BELTED, VehicleDataHelper.BELT_STATUS_LEFT_REAR_INFLATABLE_BELTED); + beltStatusObj.put(BeltStatus.KEY_RIGHT_REAR_INFLATABLE_BELTED, VehicleDataHelper.BELT_STATUS_RIGHT_REAR_INFLATABLE_BELTED); + beltStatusObj.put(BeltStatus.KEY_MIDDLE_ROW_1_BELT_DEPLOYED, VehicleDataHelper.BELT_STATUS_MIDDLE_ROW_1_DEPLOYED); + beltStatusObj.put(BeltStatus.KEY_MIDDLE_ROW_1_BUCKLE_BELTED, VehicleDataHelper.BELT_STATUS_MIDDLE_ROW_1_BELTED); + + //BODY_INFORMATION + bodyInformationObj.put(BodyInformation.KEY_PARK_BRAKE_ACTIVE, VehicleDataHelper.BODY_INFORMATION_PARK_BRAKE); + bodyInformationObj.put(BodyInformation.KEY_IGNITION_STABLE_STATUS, VehicleDataHelper.BODY_INFORMATION_IGNITION_STATUS); + bodyInformationObj.put(BodyInformation.KEY_IGNITION_STATUS, VehicleDataHelper.BODY_INFORMATION_IGNITION_STABLE_STATUS); + bodyInformationObj.put(BodyInformation.KEY_DRIVER_DOOR_AJAR, VehicleDataHelper.BODY_INFORMATION_DRIVER_AJAR); + bodyInformationObj.put(BodyInformation.KEY_PASSENGER_DOOR_AJAR, VehicleDataHelper.BODY_INFORMATION_PASSENGER_AJAR); + bodyInformationObj.put(BodyInformation.KEY_REAR_LEFT_DOOR_AJAR, VehicleDataHelper.BODY_INFORMATION_REAR_LEFT_AJAR); + bodyInformationObj.put(BodyInformation.KEY_REAR_RIGHT_DOOR_AJAR, VehicleDataHelper.BODY_INFORMATION_REAR_RIGHT_AJAR); + + //DEVICE_STATUS + deviceStatusObj.put(DeviceStatus.KEY_VOICE_REC_ON, VehicleDataHelper.DEVICE_STATUS_VOICE_REC); + deviceStatusObj.put(DeviceStatus.KEY_BT_ICON_ON, VehicleDataHelper.DEVICE_STATUS_BT_ICON); + deviceStatusObj.put(DeviceStatus.KEY_CALL_ACTIVE, VehicleDataHelper.DEVICE_STATUS_CALL_ACTIVE); + deviceStatusObj.put(DeviceStatus.KEY_PHONE_ROAMING, VehicleDataHelper.DEVICE_STATUS_PHONE_ROAMING); + deviceStatusObj.put(DeviceStatus.KEY_TEXT_MSG_AVAILABLE, VehicleDataHelper.DEVICE_STATUS_TEXT_MSG_AVAILABLE); + deviceStatusObj.put(DeviceStatus.KEY_BATT_LEVEL_STATUS, VehicleDataHelper.DEVICE_STATUS_BATT_LEVEL_STATUS); + deviceStatusObj.put(DeviceStatus.KEY_STEREO_AUDIO_OUTPUT_MUTED, VehicleDataHelper.DEVICE_STATUS_STEREO_MUTED); + deviceStatusObj.put(DeviceStatus.KEY_MONO_AUDIO_OUTPUT_MUTED, VehicleDataHelper.DEVICE_STATUS_MONO_MUTED); + deviceStatusObj.put(DeviceStatus.KEY_SIGNAL_LEVEL_STATUS, VehicleDataHelper.DEVICE_STATUS_SIGNAL_LEVEL_STATUS); + deviceStatusObj.put(DeviceStatus.KEY_PRIMARY_AUDIO_SOURCE, VehicleDataHelper.DEVICE_STATUS_PRIMARY_AUDIO); + deviceStatusObj.put(DeviceStatus.KEY_E_CALL_EVENT_ACTIVE, VehicleDataHelper.DEVICE_STATUS_E_CALL_ACTIVE); + + //HEAD_LAMP_STATUS + headLampStatusObj.put(HeadLampStatus.KEY_AMBIENT_LIGHT_SENSOR_STATUS, VehicleDataHelper.HEAD_LAMP_STATUS_AMBIENT_STATUS); + headLampStatusObj.put(HeadLampStatus.KEY_HIGH_BEAMS_ON, VehicleDataHelper.HEAD_LAMP_HIGH_BEAMS); + headLampStatusObj.put(HeadLampStatus.KEY_LOW_BEAMS_ON, VehicleDataHelper.HEAD_LAMP_LOW_BEAMS); + + //E_CALL_INFO + ECallInfoObj.put(ECallInfo.KEY_E_CALL_NOTIFICATION_STATUS, VehicleDataHelper.E_CALL_INFO_E_CALL_NOTIFICATION_STATUS); + ECallInfoObj.put(ECallInfo.KEY_AUX_E_CALL_NOTIFICATION_STATUS, VehicleDataHelper.E_CALL_INFO_AUX_E_CALL_NOTIFICATION_STATUS); + ECallInfoObj.put(ECallInfo.KEY_E_CALL_CONFIRMATION_STATUS, VehicleDataHelper.E_CALL_INFO_CONFIRMATION_STATUS); + + //AIRBAG_STATUS + airbagStatusObj.put(AirbagStatus.KEY_DRIVER_AIRBAG_DEPLOYED, VehicleDataHelper.AIRBAG_STATUS_DRIVER_DEPLOYED); + airbagStatusObj.put(AirbagStatus.KEY_DRIVER_SIDE_AIRBAG_DEPLOYED, VehicleDataHelper.AIRBAG_STATUS_DRIVER_SIDE_DEPLOYED); + airbagStatusObj.put(AirbagStatus.KEY_DRIVER_CURTAIN_AIRBAG_DEPLOYED, VehicleDataHelper.AIRBAG_STATUS_DRIVER_CURTAIN_DEPLOYED); + airbagStatusObj.put(AirbagStatus.KEY_DRIVER_KNEE_AIRBAG_DEPLOYED, VehicleDataHelper.AIRBAG_STATUS_DRIVER_KNEE_DEPLOYED); + airbagStatusObj.put(AirbagStatus.KEY_PASSENGER_AIRBAG_DEPLOYED, VehicleDataHelper.AIRBAG_STATUS_PASSENGER_DEPLOYED); + airbagStatusObj.put(AirbagStatus.KEY_PASSENGER_SIDE_AIRBAG_DEPLOYED, VehicleDataHelper.AIRBAG_STATUS_PASSENGER_SIDE_DEPLOYED); + airbagStatusObj.put(AirbagStatus.KEY_PASSENGER_CURTAIN_AIRBAG_DEPLOYED, VehicleDataHelper.AIRBAG_STATUS_PASSENGER_CURTAIN_DEPLOYED); + airbagStatusObj.put(AirbagStatus.KEY_PASSENGER_KNEE_AIRBAG_DEPLOYED, VehicleDataHelper.AIRBAG_STATUS_PASSENGER_KNEE_DEPLOYED); + + //EMERGENCY_EVENT + emergencyEventObj.put(EmergencyEvent.KEY_EMERGENCY_EVENT_TYPE, VehicleDataHelper.EMERGENCY_EVENT_TYPE); + emergencyEventObj.put(EmergencyEvent.KEY_FUEL_CUTOFF_STATUS, VehicleDataHelper.EMERGENCY_EVENT_FUEL_CUTOFF_STATUS); + emergencyEventObj.put(EmergencyEvent.KEY_ROLLOVER_EVENT, VehicleDataHelper.EMERGENCY_EVENT_ROLLOVER_EVENT); + emergencyEventObj.put(EmergencyEvent.KEY_MAXIMUM_CHANGE_VELOCITY, VehicleDataHelper.EMERGENCY_EVENT_MAX_CHANGE_VELOCITY); + emergencyEventObj.put(EmergencyEvent.KEY_MULTIPLE_EVENTS, VehicleDataHelper.EMERGENCY_EVENT_MULTIPLE_EVENTS); + + //CLUSTER_MODE_STATUS + clusterModeStatusObj.put(ClusterModeStatus.KEY_POWER_MODE_ACTIVE, VehicleDataHelper.CLUSTER_MODE_STATUS_POWER_MODE_ACTIVE); + clusterModeStatusObj.put(ClusterModeStatus.KEY_POWER_MODE_QUALIFICATION_STATUS, VehicleDataHelper.CLUSTER_MODE_STATUS_POWER_MODE_QUALIFICATION_STATUS); + clusterModeStatusObj.put(ClusterModeStatus.KEY_CAR_MODE_STATUS, VehicleDataHelper.CLUSTER_MODE_STATUS_CAR_MODE_STATUS); + clusterModeStatusObj.put(ClusterModeStatus.KEY_POWER_MODE_STATUS, VehicleDataHelper.CLUSTER_MODE_STATUS_POWER_MODE_STATUS); + + //MY_KEY + myKeyObj.put(MyKey.KEY_E_911_OVERRIDE, VehicleDataHelper.MY_KEY_E_911_OVERRIDE); + + // FUEL_RANGE + fuelRangeObj.put(FuelRange.KEY_TYPE, VehicleDataHelper.FUEL_RANGE_TYPE); + fuelRangeObj.put(FuelRange.KEY_RANGE, VehicleDataHelper.FUEL_RANGE_RANGE); + fuelRangeObj.put(FuelRange.KEY_CAPACITY, VehicleDataHelper.FUEL_RANGE_CAPACITY); + fuelRangeObj.put(FuelRange.KEY_CAPACITY_UNIT, VehicleDataHelper.FUEL_RANGE_CAPACITY_UNIT); + fuelRangeObj.put(FuelRange.KEY_LEVEL, VehicleDataHelper.FUEL_RANGE_LEVEL); + fuelRangeObj.put(FuelRange.KEY_LEVEL_STATE, VehicleDataHelper.FUEL_RANGE_LEVEL_STATE); + fuelRangeArrayObj.put(fuelRangeObj); + + // STABILITY_CONTROLS_STATU + stabilityControlStatusObj.put(StabilityControlsStatus.KEY_ESC_SYSTEM, VehicleDataHelper.ESC_SYSTEM); + stabilityControlStatusObj.put(StabilityControlsStatus.KEY_TRAILER_SWAY_CONTROL, VehicleDataHelper.S_WAY_TRAILER); + + // WINDOW_STATUS + windowStatusObj.put(WindowStatus.KEY_LOCATION, VehicleDataHelper.LOCATION_GRID); + windowStatusObj.put(WindowStatus.KEY_STATE, VehicleDataHelper.WINDOW_STATE); + windowStatusArrayObj.put(windowStatusObj); + + // GEAR STATUS + gearStatusObj.put(GearStatus.KEY_USER_SELECTED_GEAR, VehicleDataHelper.USER_SELECTED_GEAR); + gearStatusObj.put(GearStatus.KEY_TRANSMISSION_TYPE, VehicleDataHelper.TRANSMISSION_TYPE); + gearStatusObj.put(GearStatus.KEY_ACTUAL_GEAR, VehicleDataHelper.ACTUAL_GEAR); + + reference.put(OnVehicleData.KEY_SPEED, VehicleDataHelper.SPEED); + reference.put(OnVehicleData.KEY_RPM, VehicleDataHelper.RPM); + reference.put(OnVehicleData.KEY_EXTERNAL_TEMPERATURE, VehicleDataHelper.EXTERNAL_TEMPERATURE); + reference.put(OnVehicleData.KEY_FUEL_LEVEL, VehicleDataHelper.FUEL_LEVEL); + reference.put(OnVehicleData.KEY_VIN, VehicleDataHelper.VIN); + reference.put(OnVehicleData.KEY_PRNDL, VehicleDataHelper.PRNDL_FINAL); + reference.put(OnVehicleData.KEY_TIRE_PRESSURE, tireStatusObj); + reference.put(OnVehicleData.KEY_ENGINE_TORQUE, VehicleDataHelper.ENGINE_TORQUE); + reference.put(OnVehicleData.KEY_ENGINE_OIL_LIFE, VehicleDataHelper.ENGINE_OIL_LIFE); + reference.put(OnVehicleData.KEY_ODOMETER, VehicleDataHelper.ODOMETER); + reference.put(OnVehicleData.KEY_GPS, GPSDataObj); + reference.put(OnVehicleData.KEY_FUEL_LEVEL_STATE, VehicleDataHelper.FUEL_LEVEL_STATE); + reference.put(OnVehicleData.KEY_INSTANT_FUEL_CONSUMPTION, VehicleDataHelper.INSTANT_FUEL_CONSUMPTION); + reference.put(OnVehicleData.KEY_BELT_STATUS, beltStatusObj); + reference.put(OnVehicleData.KEY_BODY_INFORMATION, bodyInformationObj); + reference.put(OnVehicleData.KEY_DEVICE_STATUS, deviceStatusObj); + reference.put(OnVehicleData.KEY_DRIVER_BRAKING, VehicleDataHelper.DRIVER_BRAKING); + reference.put(OnVehicleData.KEY_WIPER_STATUS, VehicleDataHelper.WIPER_STATUS); + reference.put(OnVehicleData.KEY_HEAD_LAMP_STATUS, headLampStatusObj); + reference.put(OnVehicleData.KEY_ACC_PEDAL_POSITION, VehicleDataHelper.ACC_PEDAL_POSITION); + reference.put(OnVehicleData.KEY_STEERING_WHEEL_ANGLE, VehicleDataHelper.STEERING_WHEEL_ANGLE); + reference.put(OnVehicleData.KEY_E_CALL_INFO, ECallInfoObj); + reference.put(OnVehicleData.KEY_AIRBAG_STATUS, airbagStatusObj); + reference.put(OnVehicleData.KEY_EMERGENCY_EVENT, emergencyEventObj); + reference.put(OnVehicleData.KEY_CLUSTER_MODE_STATUS, clusterModeStatusObj); + reference.put(OnVehicleData.KEY_MY_KEY, myKeyObj); + reference.put(OnVehicleData.KEY_FUEL_RANGE, fuelRangeArrayObj); + reference.put(OnVehicleData.KEY_TURN_SIGNAL, VehicleDataHelper.TURN_SIGNAL); + reference.put(OnVehicleData.KEY_ELECTRONIC_PARK_BRAKE_STATUS, VehicleDataHelper.ELECTRONIC_PARK_BRAKE_STATUS); + reference.put(OnVehicleData.KEY_HANDS_OFF_STEERING, VehicleDataHelper.HANDS_OFF_STEERING); + reference.put(OnVehicleData.KEY_WINDOW_STATUS, windowStatusArrayObj); + reference.put(OnVehicleData.KEY_GEAR_STATUS, gearStatusObj); + reference.put(OnVehicleData.KEY_STABILITY_CONTROLS_STATUS, stabilityControlStatusObj); + reference.put(TestValues.GENERAL_OEM_CUSTOM_VEHICLE_DATA_NAME, VehicleDataHelper.OEM_CUSTOM_VEHICLE_DATA_STATE); + + JSONObject underTest = msg.serializeJSON(); + //go inside underTest and only return the JSONObject inside the parameters key inside the notification key + underTest = underTest.getJSONObject("notification").getJSONObject("parameters"); + + assertEquals(TestValues.MATCH, reference.length(), underTest.length()); + + Iterator<?> iterator = reference.keys(); + + while (iterator.hasNext()) { + String key = (String) iterator.next(); + + if (key.equals(OnVehicleData.KEY_TIRE_PRESSURE)) { + JSONObject tirePressureReference = JsonUtils.readJsonObjectFromJsonObject(reference, key); + JSONObject tirePressureTest = JsonUtils.readJsonObjectFromJsonObject(underTest, key); + + assertTrue(TestValues.TRUE, Validator.validateTireStatus( + new TireStatus(JsonRPCMarshaller.deserializeJSONObject(tirePressureReference)), + new TireStatus(JsonRPCMarshaller.deserializeJSONObject(tirePressureTest)))); + + } else if (key.equals(OnVehicleData.KEY_GPS)) { + JSONObject GPSObjReference = JsonUtils.readJsonObjectFromJsonObject(reference, key); + JSONObject GPSObjTest = JsonUtils.readJsonObjectFromJsonObject(underTest, key); + + assertTrue(TestValues.TRUE, Validator.validateGpsData( + new GPSData(JsonRPCMarshaller.deserializeJSONObject(GPSObjReference)), + new GPSData(JsonRPCMarshaller.deserializeJSONObject(GPSObjTest)))); + } else if (key.equals(OnVehicleData.KEY_BELT_STATUS)) { + JSONObject beltObjReference = JsonUtils.readJsonObjectFromJsonObject(reference, key); + JSONObject beltObjTest = JsonUtils.readJsonObjectFromJsonObject(underTest, key); + + assertTrue(TestValues.TRUE, Validator.validateBeltStatus( + new BeltStatus(JsonRPCMarshaller.deserializeJSONObject(beltObjReference)), + new BeltStatus(JsonRPCMarshaller.deserializeJSONObject(beltObjTest)))); + } else if (key.equals(OnVehicleData.KEY_BODY_INFORMATION)) { + JSONObject bodyInfoObjReference = JsonUtils.readJsonObjectFromJsonObject(reference, key); + JSONObject bodyInfoObjTest = JsonUtils.readJsonObjectFromJsonObject(underTest, key); + + assertTrue(TestValues.TRUE, Validator.validateBodyInformation( + new BodyInformation(JsonRPCMarshaller.deserializeJSONObject(bodyInfoObjReference)), + new BodyInformation(JsonRPCMarshaller.deserializeJSONObject(bodyInfoObjTest)))); + } else if (key.equals(OnVehicleData.KEY_DEVICE_STATUS)) { + JSONObject deviceObjReference = JsonUtils.readJsonObjectFromJsonObject(reference, key); + JSONObject deviceObjTest = JsonUtils.readJsonObjectFromJsonObject(underTest, key); + + assertTrue(TestValues.TRUE, Validator.validateDeviceStatus( + new DeviceStatus(JsonRPCMarshaller.deserializeJSONObject(deviceObjReference)), + new DeviceStatus(JsonRPCMarshaller.deserializeJSONObject(deviceObjTest)))); + } else if (key.equals(OnVehicleData.KEY_HEAD_LAMP_STATUS)) { + JSONObject headLampObjReference = JsonUtils.readJsonObjectFromJsonObject(reference, key); + JSONObject headLampObjTest = JsonUtils.readJsonObjectFromJsonObject(underTest, key); + + assertTrue(TestValues.TRUE, Validator.validateHeadLampStatus( + new HeadLampStatus(JsonRPCMarshaller.deserializeJSONObject(headLampObjReference)), + new HeadLampStatus(JsonRPCMarshaller.deserializeJSONObject(headLampObjTest)))); + } else if (key.equals(OnVehicleData.KEY_E_CALL_INFO)) { + JSONObject callInfoObjReference = JsonUtils.readJsonObjectFromJsonObject(reference, key); + JSONObject callInfoObjTest = JsonUtils.readJsonObjectFromJsonObject(underTest, key); + + assertTrue(TestValues.TRUE, Validator.validateECallInfo( + new ECallInfo(JsonRPCMarshaller.deserializeJSONObject(callInfoObjReference)), + new ECallInfo(JsonRPCMarshaller.deserializeJSONObject(callInfoObjTest)))); + } else if (key.equals(OnVehicleData.KEY_AIRBAG_STATUS)) { + JSONObject airbagObjReference = JsonUtils.readJsonObjectFromJsonObject(reference, key); + JSONObject airbagObjTest = JsonUtils.readJsonObjectFromJsonObject(underTest, key); + + assertTrue(TestValues.TRUE, Validator.validateAirbagStatus( + new AirbagStatus(JsonRPCMarshaller.deserializeJSONObject(airbagObjReference)), + new AirbagStatus(JsonRPCMarshaller.deserializeJSONObject(airbagObjTest)))); + } else if (key.equals(OnVehicleData.KEY_EMERGENCY_EVENT)) { + JSONObject emergencyObjReference = JsonUtils.readJsonObjectFromJsonObject(reference, key); + JSONObject emergencyObjTest = JsonUtils.readJsonObjectFromJsonObject(underTest, key); + + assertTrue(TestValues.TRUE, Validator.validateEmergencyEvent( + new EmergencyEvent(JsonRPCMarshaller.deserializeJSONObject(emergencyObjReference)), + new EmergencyEvent(JsonRPCMarshaller.deserializeJSONObject(emergencyObjTest)))); + } else if (key.equals(OnVehicleData.KEY_CLUSTER_MODE_STATUS)) { + JSONObject clusterModeObjReference = JsonUtils.readJsonObjectFromJsonObject(reference, key); + JSONObject clusterModeObjTest = JsonUtils.readJsonObjectFromJsonObject(underTest, key); + + assertTrue(TestValues.TRUE, Validator.validateClusterModeStatus( + new ClusterModeStatus(JsonRPCMarshaller.deserializeJSONObject(clusterModeObjReference)), + new ClusterModeStatus(JsonRPCMarshaller.deserializeJSONObject(clusterModeObjTest)))); + } else if (key.equals(OnVehicleData.KEY_MY_KEY)) { + JSONObject myKeyObjReference = JsonUtils.readJsonObjectFromJsonObject(reference, key); + JSONObject myKeyObjTest = JsonUtils.readJsonObjectFromJsonObject(underTest, key); + + assertTrue(TestValues.TRUE, Validator.validateMyKey( + new MyKey(JsonRPCMarshaller.deserializeJSONObject(myKeyObjReference)), + new MyKey(JsonRPCMarshaller.deserializeJSONObject(myKeyObjTest)))); + } else if (key.equals(OnVehicleData.KEY_GEAR_STATUS)) { + JSONObject myKeyObjReference = JsonUtils.readJsonObjectFromJsonObject(reference, key); + JSONObject myKeyObjTest = JsonUtils.readJsonObjectFromJsonObject(underTest, key); + + assertTrue(TestValues.TRUE, Validator.validateGearStatuses( + new GearStatus(JsonRPCMarshaller.deserializeJSONObject(myKeyObjReference)), + new GearStatus(JsonRPCMarshaller.deserializeJSONObject(myKeyObjTest)))); + } else if (key.equals(OnVehicleData.KEY_ENGINE_OIL_LIFE)) { + assertEquals(JsonUtils.readDoubleFromJsonObject(reference, key), JsonUtils.readDoubleFromJsonObject(underTest, key)); + } else if (key.equals(OnVehicleData.KEY_HANDS_OFF_STEERING)) { + assertEquals(JsonUtils.readBooleanFromJsonObject(reference, key), JsonUtils.readBooleanFromJsonObject(underTest, key)); + } else if (key.equals(OnVehicleData.KEY_FUEL_RANGE)) { + JSONArray fuelRangeArrayObjReference = JsonUtils.readJsonArrayFromJsonObject(reference, key); + List<FuelRange> fuelRangeRefereceList = new ArrayList<FuelRange>(); + for (int index = 0; index < fuelRangeArrayObjReference.length(); index++) { + FuelRange fuelRange = new FuelRange(JsonRPCMarshaller.deserializeJSONObject((JSONObject) fuelRangeArrayObjReference.get(index))); + fuelRangeRefereceList.add(fuelRange); + } + + JSONArray fuelRangeArrayObjTest = JsonUtils.readJsonArrayFromJsonObject(underTest, key); + List<FuelRange> fuelRangeUnderTestList = new ArrayList<FuelRange>(); + for (int index = 0; index < fuelRangeArrayObjTest.length(); index++) { + FuelRange fuelRange = new FuelRange(JsonRPCMarshaller.deserializeJSONObject((JSONObject) fuelRangeArrayObjTest.get(index))); + fuelRangeUnderTestList.add(fuelRange); + } + + assertTrue(TestValues.TRUE, Validator.validateFuelRange( + fuelRangeRefereceList, + fuelRangeUnderTestList)); + } else if (key.equals(OnVehicleData.KEY_WINDOW_STATUS)) { + JSONArray windowStatusArrayObjReference = JsonUtils.readJsonArrayFromJsonObject(reference, key); + List<WindowStatus> windowStatusReferenceList = new ArrayList<>(); + for (int index = 0; index < windowStatusArrayObjReference.length(); index++) { + WindowStatus windowStatus = new WindowStatus(JsonRPCMarshaller.deserializeJSONObject((JSONObject) windowStatusArrayObjReference.get(index))); + windowStatusReferenceList.add(windowStatus); + } + + JSONArray windowStatusArrayObjTest = JsonUtils.readJsonArrayFromJsonObject(underTest, key); + List<WindowStatus> windowStatusUnderTestList = new ArrayList<>(); + for (int index = 0; index < windowStatusArrayObjTest.length(); index++) { + WindowStatus windowStatus = new WindowStatus(JsonRPCMarshaller.deserializeJSONObject((JSONObject) windowStatusArrayObjTest.get(index))); + windowStatusUnderTestList.add(windowStatus); + } + + assertTrue("JSON value didn't match expected value for key \"" + key + "\".", + Validator.validateWindowStatuses( + windowStatusReferenceList, + windowStatusUnderTestList)); + } else if (key.equals(GetVehicleDataResponse.KEY_STABILITY_CONTROLS_STATUS)) { + JSONObject myKeyObjReference = JsonUtils.readJsonObjectFromJsonObject(reference, key); + JSONObject myKeyObjTest = JsonUtils.readJsonObjectFromJsonObject(underTest, key); + + StabilityControlsStatus status1 = new StabilityControlsStatus(JsonRPCMarshaller.deserializeJSONObject(myKeyObjReference)); + StabilityControlsStatus status2 = new StabilityControlsStatus(JsonRPCMarshaller.deserializeJSONObject(myKeyObjTest)); + + assertTrue("JSON value didn't match expected value for key \"" + key + "\".", + Validator.validateStabilityControlStatus( + status1, + status2 + ) + ); + } else { + assertEquals(TestValues.TRUE, JsonUtils.readObjectFromJsonObject(reference, key), JsonUtils.readObjectFromJsonObject(underTest, key)); + } + } + } catch (JSONException e) { + fail(TestValues.JSON_FAIL); + } } } diff --git a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/notifications/OnWayPointChangeTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/notifications/OnWayPointChangeTests.java index efdd3eba0..0a263ac56 100644 --- a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/notifications/OnWayPointChangeTests.java +++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/notifications/OnWayPointChangeTests.java @@ -27,7 +27,7 @@ import static junit.framework.TestCase.assertNull; public class OnWayPointChangeTests extends BaseRpcTests { @Override - protected RPCMessage createMessage(){ + protected RPCMessage createMessage() { OnWayPointChange msg = new OnWayPointChange(); List<LocationDetails> list = new ArrayList<>(); @@ -40,17 +40,17 @@ public class OnWayPointChangeTests extends BaseRpcTests { } @Override - protected String getMessageType(){ + protected String getMessageType() { return RPCMessage.KEY_NOTIFICATION; } @Override - protected String getCommandType(){ + protected String getCommandType() { return FunctionID.ON_WAY_POINT_CHANGE.toString(); } @Override - protected JSONObject getExpectedParameters(int sdlVersion){ + protected JSONObject getExpectedParameters(int sdlVersion) { JSONObject result = new JSONObject(); JSONArray jsonArray = new JSONArray(); @@ -74,7 +74,7 @@ public class OnWayPointChangeTests extends BaseRpcTests { * Tests the expected values of the RPC message. */ @Test - public void testRpcValues () { + public void testRpcValues() { // Test Values List<LocationDetails> list = ((OnWayPointChange) msg).getWayPoints(); diff --git a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/AddCommandTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/AddCommandTests.java index a1c1de3fc..ebcb09943 100644 --- a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/AddCommandTests.java +++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/AddCommandTests.java @@ -27,13 +27,13 @@ import static junit.framework.TestCase.fail; import static org.junit.Assert.assertNull; /** - * This is a unit test class for the SmartDeviceLink library project class : + * This is a unit test class for the SmartDeviceLink library project class : * {@link com.smartdevicelink.proxy.rpc.AddCommand} */ -public class AddCommandTests extends BaseRpcTests{ +public class AddCommandTests extends BaseRpcTests { @Override - protected RPCMessage createMessage(){ + protected RPCMessage createMessage() { AddCommand msg = new AddCommand(); msg.setCmdIcon(TestValues.GENERAL_IMAGE); @@ -45,103 +45,103 @@ public class AddCommandTests extends BaseRpcTests{ } @Override - protected String getMessageType(){ + protected String getMessageType() { return RPCMessage.KEY_REQUEST; } @Override - protected String getCommandType(){ + protected String getCommandType() { return FunctionID.ADD_COMMAND.toString(); } @Override - protected JSONObject getExpectedParameters(int sdlVersion){ + protected JSONObject getExpectedParameters(int sdlVersion) { JSONObject result = new JSONObject(); - try{ + try { result.put(AddCommand.KEY_CMD_ICON, TestValues.JSON_IMAGE); result.put(AddCommand.KEY_MENU_PARAMS, TestValues.JSON_MENUPARAMS); result.put(AddCommand.KEY_VR_COMMANDS, JsonUtils.createJsonArray(TestValues.GENERAL_STRING_LIST)); result.put(AddCommand.KEY_CMD_ID, TestValues.GENERAL_INT); - }catch(JSONException e){ - fail(TestValues.JSON_FAIL); + } catch (JSONException e) { + fail(TestValues.JSON_FAIL); } return result; } - + /** - * Tests the expected values of the RPC message. - */ + * Tests the expected values of the RPC message. + */ @Test - public void testRpcValues () { - // Test Values - int testCmdId = ( (AddCommand) msg ).getCmdID(); - Image testImage = ( (AddCommand) msg ).getCmdIcon(); - MenuParams testMenuParams = ( (AddCommand) msg ).getMenuParams(); - List<String> testVrCommands = ( (AddCommand) msg ).getVrCommands(); - - // Valid Tests - assertNotNull(TestValues.NOT_NULL, testMenuParams); - assertNotNull(TestValues.NOT_NULL, testImage); - assertNotNull(TestValues.NOT_NULL, testVrCommands); - - assertEquals(TestValues.MATCH, TestValues.GENERAL_INT, testCmdId); - assertEquals(TestValues.MATCH, TestValues.GENERAL_STRING_LIST.size(), testVrCommands.size()); - - assertTrue(TestValues.TRUE, Validator.validateMenuParams(TestValues.GENERAL_MENUPARAMS, testMenuParams)); - assertTrue(TestValues.TRUE, Validator.validateImage(TestValues.GENERAL_IMAGE, testImage)); - assertTrue(TestValues.TRUE, Validator.validateStringList(TestValues.GENERAL_STRING_LIST, testVrCommands)); - - // Invalid/Null Tests - AddCommand msg = new AddCommand(); - assertNotNull(TestValues.NULL, msg); - testNullBase(msg); - - assertNull(TestValues.NULL, msg.getCmdIcon()); + public void testRpcValues() { + // Test Values + int testCmdId = ((AddCommand) msg).getCmdID(); + Image testImage = ((AddCommand) msg).getCmdIcon(); + MenuParams testMenuParams = ((AddCommand) msg).getMenuParams(); + List<String> testVrCommands = ((AddCommand) msg).getVrCommands(); + + // Valid Tests + assertNotNull(TestValues.NOT_NULL, testMenuParams); + assertNotNull(TestValues.NOT_NULL, testImage); + assertNotNull(TestValues.NOT_NULL, testVrCommands); + + assertEquals(TestValues.MATCH, TestValues.GENERAL_INT, testCmdId); + assertEquals(TestValues.MATCH, TestValues.GENERAL_STRING_LIST.size(), testVrCommands.size()); + + assertTrue(TestValues.TRUE, Validator.validateMenuParams(TestValues.GENERAL_MENUPARAMS, testMenuParams)); + assertTrue(TestValues.TRUE, Validator.validateImage(TestValues.GENERAL_IMAGE, testImage)); + assertTrue(TestValues.TRUE, Validator.validateStringList(TestValues.GENERAL_STRING_LIST, testVrCommands)); + + // Invalid/Null Tests + AddCommand msg = new AddCommand(); + assertNotNull(TestValues.NULL, msg); + testNullBase(msg); + + assertNull(TestValues.NULL, msg.getCmdIcon()); assertNull(TestValues.NULL, msg.getCmdID()); assertNull(TestValues.NULL, msg.getMenuParams()); assertNull(TestValues.NULL, msg.getVrCommands()); } - + /** * Tests a valid JSON construction of this RPC message. */ @Test - public void testJsonConstructor () { - JSONObject commandJson = JsonFileReader.readId(getInstrumentation().getTargetContext(), getCommandType(), getMessageType()); - assertNotNull(TestValues.NOT_NULL, commandJson); - - try { - Hashtable<String, Object> hash = JsonRPCMarshaller.deserializeJSONObject(commandJson); - AddCommand cmd = new AddCommand(hash); - - JSONObject body = JsonUtils.readJsonObjectFromJsonObject(commandJson, getMessageType()); - assertNotNull(TestValues.NOT_NULL, body); - - // Test everything in the json body. - assertEquals(TestValues.MATCH, JsonUtils.readStringFromJsonObject(body, RPCMessage.KEY_FUNCTION_NAME), cmd.getFunctionName()); - assertEquals(TestValues.MATCH, JsonUtils.readIntegerFromJsonObject(body, RPCMessage.KEY_CORRELATION_ID), cmd.getCorrelationID()); - - JSONObject parameters = JsonUtils.readJsonObjectFromJsonObject(body, RPCMessage.KEY_PARAMETERS); - - List<String> vrCommandsList = JsonUtils.readStringListFromJsonObject(parameters, AddCommand.KEY_VR_COMMANDS); - List<String> testCommandsList = cmd.getVrCommands(); - assertEquals(TestValues.MATCH, vrCommandsList.size(), testCommandsList.size()); - assertTrue(TestValues.TRUE, Validator.validateStringList(vrCommandsList, testCommandsList)); - - assertEquals(TestValues.MATCH, JsonUtils.readIntegerFromJsonObject(parameters, AddCommand.KEY_CMD_ID), cmd.getCmdID()); - - JSONObject menuParams = JsonUtils.readJsonObjectFromJsonObject(parameters, AddCommand.KEY_MENU_PARAMS); - MenuParams referenceMenuParams = new MenuParams(JsonRPCMarshaller.deserializeJSONObject(menuParams)); - assertTrue(TestValues.TRUE, Validator.validateMenuParams(referenceMenuParams, cmd.getMenuParams())); - - JSONObject cmdIcon = JsonUtils.readJsonObjectFromJsonObject(parameters, AddCommand.KEY_CMD_ICON); - Image referenceCmdIcon = new Image(JsonRPCMarshaller.deserializeJSONObject(cmdIcon)); - assertTrue(TestValues.TRUE, Validator.validateImage(referenceCmdIcon, cmd.getCmdIcon())); - - } catch (JSONException e) { - e.printStackTrace(); - } + public void testJsonConstructor() { + JSONObject commandJson = JsonFileReader.readId(getInstrumentation().getTargetContext(), getCommandType(), getMessageType()); + assertNotNull(TestValues.NOT_NULL, commandJson); + + try { + Hashtable<String, Object> hash = JsonRPCMarshaller.deserializeJSONObject(commandJson); + AddCommand cmd = new AddCommand(hash); + + JSONObject body = JsonUtils.readJsonObjectFromJsonObject(commandJson, getMessageType()); + assertNotNull(TestValues.NOT_NULL, body); + + // Test everything in the json body. + assertEquals(TestValues.MATCH, JsonUtils.readStringFromJsonObject(body, RPCMessage.KEY_FUNCTION_NAME), cmd.getFunctionName()); + assertEquals(TestValues.MATCH, JsonUtils.readIntegerFromJsonObject(body, RPCMessage.KEY_CORRELATION_ID), cmd.getCorrelationID()); + + JSONObject parameters = JsonUtils.readJsonObjectFromJsonObject(body, RPCMessage.KEY_PARAMETERS); + + List<String> vrCommandsList = JsonUtils.readStringListFromJsonObject(parameters, AddCommand.KEY_VR_COMMANDS); + List<String> testCommandsList = cmd.getVrCommands(); + assertEquals(TestValues.MATCH, vrCommandsList.size(), testCommandsList.size()); + assertTrue(TestValues.TRUE, Validator.validateStringList(vrCommandsList, testCommandsList)); + + assertEquals(TestValues.MATCH, JsonUtils.readIntegerFromJsonObject(parameters, AddCommand.KEY_CMD_ID), cmd.getCmdID()); + + JSONObject menuParams = JsonUtils.readJsonObjectFromJsonObject(parameters, AddCommand.KEY_MENU_PARAMS); + MenuParams referenceMenuParams = new MenuParams(JsonRPCMarshaller.deserializeJSONObject(menuParams)); + assertTrue(TestValues.TRUE, Validator.validateMenuParams(referenceMenuParams, cmd.getMenuParams())); + + JSONObject cmdIcon = JsonUtils.readJsonObjectFromJsonObject(parameters, AddCommand.KEY_CMD_ICON); + Image referenceCmdIcon = new Image(JsonRPCMarshaller.deserializeJSONObject(cmdIcon)); + assertTrue(TestValues.TRUE, Validator.validateImage(referenceCmdIcon, cmd.getCmdIcon())); + + } catch (JSONException e) { + e.printStackTrace(); + } } }
\ No newline at end of file diff --git a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/AddSubmenuTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/AddSubmenuTests.java index 01ebf5f8c..e135d3217 100644 --- a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/AddSubmenuTests.java +++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/AddSubmenuTests.java @@ -26,13 +26,13 @@ import static junit.framework.TestCase.assertTrue; import static junit.framework.TestCase.fail; /** - * This is a unit test class for the SmartDeviceLink library project class : + * This is a unit test class for the SmartDeviceLink library project class : * {@link com.smartdevicelink.proxy.rpc.AddSubMenu} */ -public class AddSubmenuTests extends BaseRpcTests{ +public class AddSubmenuTests extends BaseRpcTests { @Override - protected RPCMessage createMessage(){ + protected RPCMessage createMessage() { AddSubMenu msg = new AddSubMenu(); msg.setMenuID(TestValues.GENERAL_INT); @@ -46,46 +46,46 @@ public class AddSubmenuTests extends BaseRpcTests{ } @Override - protected String getMessageType(){ + protected String getMessageType() { return RPCMessage.KEY_REQUEST; } @Override - protected String getCommandType(){ + protected String getCommandType() { return FunctionID.ADD_SUB_MENU.toString(); } @Override - protected JSONObject getExpectedParameters(int sdlVersion){ + protected JSONObject getExpectedParameters(int sdlVersion) { JSONObject result = new JSONObject(); - try{ + try { result.put(AddSubMenu.KEY_MENU_ID, TestValues.GENERAL_INT); result.put(AddSubMenu.KEY_MENU_NAME, TestValues.GENERAL_STRING); result.put(AddSubMenu.KEY_POSITION, TestValues.GENERAL_INT); result.put(AddSubMenu.KEY_MENU_ICON, TestValues.JSON_IMAGE); result.put(AddSubMenu.KEY_MENU_LAYOUT, TestValues.GENERAL_MENU_LAYOUT); result.put(AddSubMenu.KEY_PARENT_ID, TestValues.GENERAL_MENU_MAX_ID); - }catch(JSONException e){ - fail(TestValues.JSON_FAIL); + } catch (JSONException e) { + fail(TestValues.JSON_FAIL); } return result; } /** - * Tests the expected values of the RPC message. - */ + * Tests the expected values of the RPC message. + */ @Test - public void testRpcValues () { - // Test Values + public void testRpcValues() { + // Test Values int testMenuId = ((AddSubMenu) msg).getMenuID(); int testPosition = ((AddSubMenu) msg).getPosition(); String testMenuName = ((AddSubMenu) msg).getMenuName(); Image testMenuIcon = ((AddSubMenu) msg).getMenuIcon(); MenuLayout testMenuLayout = ((AddSubMenu) msg).getMenuLayout(); int testParentID = ((AddSubMenu) msg).getParentID(); - + // Valid Tests assertEquals("Menu ID didn't match input menu ID.", TestValues.GENERAL_INT, testMenuId); assertEquals("Menu name didn't match input menu name.", TestValues.GENERAL_STRING, testMenuName); @@ -107,39 +107,39 @@ public class AddSubmenuTests extends BaseRpcTests{ assertNull(TestValues.NULL, msg.getMenuLayout()); assertNull(TestValues.NULL, msg.getParentID()); } - + /** * Tests a valid JSON construction of this RPC message. */ @Test - public void testJsonConstructor () { - JSONObject commandJson = JsonFileReader.readId(getInstrumentation().getTargetContext(), getCommandType(), getMessageType()); - assertNotNull(TestValues.NOT_NULL, commandJson); - - try { - Hashtable<String, Object> hash = JsonRPCMarshaller.deserializeJSONObject(commandJson); - AddSubMenu cmd = new AddSubMenu(hash); - - JSONObject body = JsonUtils.readJsonObjectFromJsonObject(commandJson, getMessageType()); - assertNotNull(TestValues.NOT_NULL, body); - - // Test everything in the json body. - assertEquals(TestValues.MATCH, JsonUtils.readStringFromJsonObject(body, RPCMessage.KEY_FUNCTION_NAME), cmd.getFunctionName()); - assertEquals(TestValues.MATCH, JsonUtils.readIntegerFromJsonObject(body, RPCMessage.KEY_CORRELATION_ID), cmd.getCorrelationID()); - - JSONObject parameters = JsonUtils.readJsonObjectFromJsonObject(body, RPCMessage.KEY_PARAMETERS); - - assertEquals(TestValues.MATCH, JsonUtils.readIntegerFromJsonObject(parameters, AddSubMenu.KEY_MENU_ID), cmd.getMenuID()); - assertEquals(TestValues.MATCH, JsonUtils.readIntegerFromJsonObject(parameters, AddSubMenu.KEY_POSITION), cmd.getPosition()); - assertEquals(TestValues.MATCH, JsonUtils.readStringFromJsonObject(parameters, AddSubMenu.KEY_MENU_NAME), cmd.getMenuName()); - assertEquals(TestValues.MATCH, JsonUtils.readObjectFromJsonObject(parameters, AddSubMenu.KEY_MENU_LAYOUT), cmd.getMenuLayout()); - assertEquals(TestValues.MATCH, JsonUtils.readIntegerFromJsonObject(parameters, AddSubMenu.KEY_PARENT_ID), cmd.getParentID()); - - JSONObject menuIcon = JsonUtils.readJsonObjectFromJsonObject(parameters, AddSubMenu.KEY_MENU_ICON); - Image referenceMenuIcon = new Image(JsonRPCMarshaller.deserializeJSONObject(menuIcon)); - assertTrue(TestValues.TRUE, Validator.validateImage(referenceMenuIcon, cmd.getMenuIcon())); - } catch (JSONException e) { - fail(TestValues.JSON_FAIL); - } + public void testJsonConstructor() { + JSONObject commandJson = JsonFileReader.readId(getInstrumentation().getTargetContext(), getCommandType(), getMessageType()); + assertNotNull(TestValues.NOT_NULL, commandJson); + + try { + Hashtable<String, Object> hash = JsonRPCMarshaller.deserializeJSONObject(commandJson); + AddSubMenu cmd = new AddSubMenu(hash); + + JSONObject body = JsonUtils.readJsonObjectFromJsonObject(commandJson, getMessageType()); + assertNotNull(TestValues.NOT_NULL, body); + + // Test everything in the json body. + assertEquals(TestValues.MATCH, JsonUtils.readStringFromJsonObject(body, RPCMessage.KEY_FUNCTION_NAME), cmd.getFunctionName()); + assertEquals(TestValues.MATCH, JsonUtils.readIntegerFromJsonObject(body, RPCMessage.KEY_CORRELATION_ID), cmd.getCorrelationID()); + + JSONObject parameters = JsonUtils.readJsonObjectFromJsonObject(body, RPCMessage.KEY_PARAMETERS); + + assertEquals(TestValues.MATCH, JsonUtils.readIntegerFromJsonObject(parameters, AddSubMenu.KEY_MENU_ID), cmd.getMenuID()); + assertEquals(TestValues.MATCH, JsonUtils.readIntegerFromJsonObject(parameters, AddSubMenu.KEY_POSITION), cmd.getPosition()); + assertEquals(TestValues.MATCH, JsonUtils.readStringFromJsonObject(parameters, AddSubMenu.KEY_MENU_NAME), cmd.getMenuName()); + assertEquals(TestValues.MATCH, JsonUtils.readObjectFromJsonObject(parameters, AddSubMenu.KEY_MENU_LAYOUT), cmd.getMenuLayout()); + assertEquals(TestValues.MATCH, JsonUtils.readIntegerFromJsonObject(parameters, AddSubMenu.KEY_PARENT_ID), cmd.getParentID()); + + JSONObject menuIcon = JsonUtils.readJsonObjectFromJsonObject(parameters, AddSubMenu.KEY_MENU_ICON); + Image referenceMenuIcon = new Image(JsonRPCMarshaller.deserializeJSONObject(menuIcon)); + assertTrue(TestValues.TRUE, Validator.validateImage(referenceMenuIcon, cmd.getMenuIcon())); + } catch (JSONException e) { + fail(TestValues.JSON_FAIL); + } } }
\ No newline at end of file diff --git a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/AlertManeuverTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/AlertManeuverTests.java index 0a50a3562..c33e4d4eb 100644 --- a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/AlertManeuverTests.java +++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/AlertManeuverTests.java @@ -29,59 +29,59 @@ import static junit.framework.TestCase.assertTrue; import static junit.framework.TestCase.fail; /** - * This is a unit test class for the SmartDeviceLink library project class : + * This is a unit test class for the SmartDeviceLink library project class : * {@link com.smartdevicelink.proxy.rpc.AlertManeuver} */ public class AlertManeuverTests extends BaseRpcTests { - @Override - protected RPCMessage createMessage() { - AlertManeuver msg = new AlertManeuver(); - - msg.setTtsChunks(TestValues.GENERAL_TTSCHUNK_LIST); + @Override + protected RPCMessage createMessage() { + AlertManeuver msg = new AlertManeuver(); + + msg.setTtsChunks(TestValues.GENERAL_TTSCHUNK_LIST); msg.setSoftButtons(TestValues.GENERAL_SOFTBUTTON_LIST); - - return msg; - } - - @Override - protected String getMessageType() { - return RPCMessage.KEY_REQUEST; - } - - @Override - protected String getCommandType() { - return FunctionID.ALERT_MANEUVER.toString(); - } - - @Override - protected JSONObject getExpectedParameters(int sdlVersion) { - JSONObject result = new JSONObject(); - + + return msg; + } + + @Override + protected String getMessageType() { + return RPCMessage.KEY_REQUEST; + } + + @Override + protected String getCommandType() { + return FunctionID.ALERT_MANEUVER.toString(); + } + + @Override + protected JSONObject getExpectedParameters(int sdlVersion) { + JSONObject result = new JSONObject(); + try { - result.put(AlertManeuver.KEY_TTS_CHUNKS, TestValues.JSON_TTSCHUNKS); + result.put(AlertManeuver.KEY_TTS_CHUNKS, TestValues.JSON_TTSCHUNKS); result.put(AlertManeuver.KEY_SOFT_BUTTONS, TestValues.JSON_SOFTBUTTONS); - } catch(JSONException e){ - fail(TestValues.JSON_FAIL); + } catch (JSONException e) { + fail(TestValues.JSON_FAIL); } - + return result; - } - - /** - * Tests the expected values of the RPC message. - */ - @Test - public void testRpcValues () { - // Test Values - List<TTSChunk> testTtsChunks = ( (AlertManeuver) msg ).getTtsChunks(); - List<SoftButton> testSoftButtons = ( (AlertManeuver) msg ).getSoftButtons(); - - // Valid Tests - assertTrue(TestValues.TRUE, Validator.validateSoftButtons(TestValues.GENERAL_SOFTBUTTON_LIST, testSoftButtons)); - assertTrue(TestValues.TRUE, Validator.validateTtsChunks(TestValues.GENERAL_TTSCHUNK_LIST, testTtsChunks)); - - // Invalid/Null Tests + } + + /** + * Tests the expected values of the RPC message. + */ + @Test + public void testRpcValues() { + // Test Values + List<TTSChunk> testTtsChunks = ((AlertManeuver) msg).getTtsChunks(); + List<SoftButton> testSoftButtons = ((AlertManeuver) msg).getSoftButtons(); + + // Valid Tests + assertTrue(TestValues.TRUE, Validator.validateSoftButtons(TestValues.GENERAL_SOFTBUTTON_LIST, testSoftButtons)); + assertTrue(TestValues.TRUE, Validator.validateTtsChunks(TestValues.GENERAL_TTSCHUNK_LIST, testTtsChunks)); + + // Invalid/Null Tests AlertManeuver msg = new AlertManeuver(); assertNotNull(TestValues.NOT_NULL, msg); testNullBase(msg); @@ -89,45 +89,45 @@ public class AlertManeuverTests extends BaseRpcTests { assertNull(TestValues.NULL, msg.getTtsChunks()); assertNull(TestValues.NULL, msg.getSoftButtons()); } - - /** + + /** * Tests a valid JSON construction of this RPC message. */ - @Test - public void testJsonConstructor () { - JSONObject commandJson = JsonFileReader.readId(getInstrumentation().getTargetContext(), getCommandType(), getMessageType()); - assertNotNull(TestValues.NOT_NULL, commandJson); - - try { - Hashtable<String, Object> hash = JsonRPCMarshaller.deserializeJSONObject(commandJson); - AlertManeuver cmd = new AlertManeuver(hash); - - JSONObject body = JsonUtils.readJsonObjectFromJsonObject(commandJson, getMessageType()); - assertNotNull(TestValues.NOT_NULL, body); - - // Test everything in the json body. - assertEquals(TestValues.MATCH, JsonUtils.readStringFromJsonObject(body, RPCMessage.KEY_FUNCTION_NAME), cmd.getFunctionName()); - assertEquals(TestValues.MATCH, JsonUtils.readIntegerFromJsonObject(body, RPCMessage.KEY_CORRELATION_ID), cmd.getCorrelationID()); - - JSONObject parameters = JsonUtils.readJsonObjectFromJsonObject(body, RPCMessage.KEY_PARAMETERS); - JSONArray ttsChunkArray = JsonUtils.readJsonArrayFromJsonObject(parameters, AlertManeuver.KEY_TTS_CHUNKS); - - List<TTSChunk> ttsChunkList = new ArrayList<TTSChunk>(); - for (int index = 0; index < ttsChunkArray.length(); index++) { - TTSChunk chunk = new TTSChunk(JsonRPCMarshaller.deserializeJSONObject( (JSONObject)ttsChunkArray.get(index))); - ttsChunkList.add(chunk); - } - assertTrue(TestValues.TRUE, Validator.validateTtsChunks(ttsChunkList, cmd.getTtsChunks())); - - JSONArray softButtonArray = JsonUtils.readJsonArrayFromJsonObject(parameters, AlertManeuver.KEY_SOFT_BUTTONS); - List<SoftButton> softButtonList = new ArrayList<SoftButton>(); - for (int index = 0; index < softButtonArray.length(); index++) { - SoftButton chunk = new SoftButton(JsonRPCMarshaller.deserializeJSONObject((JSONObject)softButtonArray.get(index))); - softButtonList.add(chunk); - } - assertTrue(TestValues.TRUE, Validator.validateSoftButtons(softButtonList, cmd.getSoftButtons())); - } catch (JSONException e) { - fail(TestValues.JSON_FAIL); - } - } + @Test + public void testJsonConstructor() { + JSONObject commandJson = JsonFileReader.readId(getInstrumentation().getTargetContext(), getCommandType(), getMessageType()); + assertNotNull(TestValues.NOT_NULL, commandJson); + + try { + Hashtable<String, Object> hash = JsonRPCMarshaller.deserializeJSONObject(commandJson); + AlertManeuver cmd = new AlertManeuver(hash); + + JSONObject body = JsonUtils.readJsonObjectFromJsonObject(commandJson, getMessageType()); + assertNotNull(TestValues.NOT_NULL, body); + + // Test everything in the json body. + assertEquals(TestValues.MATCH, JsonUtils.readStringFromJsonObject(body, RPCMessage.KEY_FUNCTION_NAME), cmd.getFunctionName()); + assertEquals(TestValues.MATCH, JsonUtils.readIntegerFromJsonObject(body, RPCMessage.KEY_CORRELATION_ID), cmd.getCorrelationID()); + + JSONObject parameters = JsonUtils.readJsonObjectFromJsonObject(body, RPCMessage.KEY_PARAMETERS); + JSONArray ttsChunkArray = JsonUtils.readJsonArrayFromJsonObject(parameters, AlertManeuver.KEY_TTS_CHUNKS); + + List<TTSChunk> ttsChunkList = new ArrayList<TTSChunk>(); + for (int index = 0; index < ttsChunkArray.length(); index++) { + TTSChunk chunk = new TTSChunk(JsonRPCMarshaller.deserializeJSONObject((JSONObject) ttsChunkArray.get(index))); + ttsChunkList.add(chunk); + } + assertTrue(TestValues.TRUE, Validator.validateTtsChunks(ttsChunkList, cmd.getTtsChunks())); + + JSONArray softButtonArray = JsonUtils.readJsonArrayFromJsonObject(parameters, AlertManeuver.KEY_SOFT_BUTTONS); + List<SoftButton> softButtonList = new ArrayList<SoftButton>(); + for (int index = 0; index < softButtonArray.length(); index++) { + SoftButton chunk = new SoftButton(JsonRPCMarshaller.deserializeJSONObject((JSONObject) softButtonArray.get(index))); + softButtonList.add(chunk); + } + assertTrue(TestValues.TRUE, Validator.validateSoftButtons(softButtonList, cmd.getSoftButtons())); + } catch (JSONException e) { + fail(TestValues.JSON_FAIL); + } + } }
\ No newline at end of file diff --git a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/AlertTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/AlertTests.java index 525fae442..bde00db0c 100644 --- a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/AlertTests.java +++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/AlertTests.java @@ -30,13 +30,13 @@ import static junit.framework.TestCase.assertTrue; import static junit.framework.TestCase.fail; /** - * This is a unit test class for the SmartDeviceLink library project class : + * This is a unit test class for the SmartDeviceLink library project class : * {@link com.smartdevicelink.proxy.rpc.Alert} */ -public class AlertTests extends BaseRpcTests{ +public class AlertTests extends BaseRpcTests { @Override - protected RPCMessage createMessage(){ + protected RPCMessage createMessage() { Alert msg = new Alert(); msg.setDuration(TestValues.GENERAL_INT); @@ -49,25 +49,25 @@ public class AlertTests extends BaseRpcTests{ msg.setSoftButtons(TestValues.GENERAL_SOFTBUTTON_LIST); msg.setCancelID(TestValues.GENERAL_INTEGER); msg.setAlertIcon(TestValues.GENERAL_IMAGE); - + return msg; } @Override - protected String getMessageType(){ + protected String getMessageType() { return RPCMessage.KEY_REQUEST; } @Override - protected String getCommandType(){ + protected String getCommandType() { return FunctionID.ALERT.toString(); } @Override - protected JSONObject getExpectedParameters(int sdlVersion){ + protected JSONObject getExpectedParameters(int sdlVersion) { JSONObject result = new JSONObject(); - - try{ + + try { result.put(Alert.KEY_DURATION, TestValues.GENERAL_INT); result.put(Alert.KEY_ALERT_TEXT_1, TestValues.GENERAL_STRING); result.put(Alert.KEY_ALERT_TEXT_2, TestValues.GENERAL_STRING); @@ -78,43 +78,43 @@ public class AlertTests extends BaseRpcTests{ result.put(Alert.KEY_SOFT_BUTTONS, TestValues.JSON_SOFTBUTTONS); result.put(Alert.KEY_CANCEL_ID, TestValues.GENERAL_INTEGER); result.put(Alert.KEY_ALERT_ICON, TestValues.JSON_IMAGE); - }catch(JSONException e){ - fail(TestValues.JSON_FAIL); + } catch (JSONException e) { + fail(TestValues.JSON_FAIL); } return result; } /** - * Tests the expected values of the RPC message. - */ + * Tests the expected values of the RPC message. + */ @Test - public void testRpcValues () { - // Test Values - int testDuration = ( (Alert) msg ).getDuration(); - String testAlertText1 = ( (Alert) msg ).getAlertText1(); - String testAlertText2 = ( (Alert) msg ).getAlertText2(); - String testAlertText3 = ( (Alert) msg ).getAlertText3(); - boolean testPlayTone = ( (Alert) msg ).getPlayTone(); - boolean testProgressIndicator = ( (Alert) msg ).getProgressIndicator(); - List<TTSChunk> testTtsChunks = ( (Alert) msg ).getTtsChunks(); - List<SoftButton> testSoftButtons = ( (Alert) msg ).getSoftButtons(); - Integer testCancelID = ( (Alert) msg ).getCancelID(); - Image alertIcon = ( (Alert) msg ).getAlertIcon(); - - // Valid Tests - assertEquals(TestValues.MATCH, TestValues.GENERAL_INT, testDuration); - assertEquals(TestValues.MATCH, TestValues.GENERAL_STRING, testAlertText1); - assertEquals(TestValues.MATCH, TestValues.GENERAL_STRING, testAlertText2); - assertEquals(TestValues.MATCH, TestValues.GENERAL_STRING, testAlertText3); - assertEquals(TestValues.MATCH, TestValues.GENERAL_BOOLEAN, testPlayTone); - assertEquals(TestValues.MATCH, TestValues.GENERAL_BOOLEAN, testProgressIndicator); - assertTrue(TestValues.TRUE, Validator.validateSoftButtons(TestValues.GENERAL_SOFTBUTTON_LIST, testSoftButtons)); - assertTrue(TestValues.TRUE, Validator.validateTtsChunks(TestValues.GENERAL_TTSCHUNK_LIST, testTtsChunks)); - assertEquals(TestValues.MATCH, TestValues.GENERAL_INTEGER, testCancelID); - assertTrue(TestValues.TRUE, Validator.validateImage(TestValues.GENERAL_IMAGE, alertIcon)); - - // Invalid/Null Tests + public void testRpcValues() { + // Test Values + int testDuration = ((Alert) msg).getDuration(); + String testAlertText1 = ((Alert) msg).getAlertText1(); + String testAlertText2 = ((Alert) msg).getAlertText2(); + String testAlertText3 = ((Alert) msg).getAlertText3(); + boolean testPlayTone = ((Alert) msg).getPlayTone(); + boolean testProgressIndicator = ((Alert) msg).getProgressIndicator(); + List<TTSChunk> testTtsChunks = ((Alert) msg).getTtsChunks(); + List<SoftButton> testSoftButtons = ((Alert) msg).getSoftButtons(); + Integer testCancelID = ((Alert) msg).getCancelID(); + Image alertIcon = ((Alert) msg).getAlertIcon(); + + // Valid Tests + assertEquals(TestValues.MATCH, TestValues.GENERAL_INT, testDuration); + assertEquals(TestValues.MATCH, TestValues.GENERAL_STRING, testAlertText1); + assertEquals(TestValues.MATCH, TestValues.GENERAL_STRING, testAlertText2); + assertEquals(TestValues.MATCH, TestValues.GENERAL_STRING, testAlertText3); + assertEquals(TestValues.MATCH, TestValues.GENERAL_BOOLEAN, testPlayTone); + assertEquals(TestValues.MATCH, TestValues.GENERAL_BOOLEAN, testProgressIndicator); + assertTrue(TestValues.TRUE, Validator.validateSoftButtons(TestValues.GENERAL_SOFTBUTTON_LIST, testSoftButtons)); + assertTrue(TestValues.TRUE, Validator.validateTtsChunks(TestValues.GENERAL_TTSCHUNK_LIST, testTtsChunks)); + assertEquals(TestValues.MATCH, TestValues.GENERAL_INTEGER, testCancelID); + assertTrue(TestValues.TRUE, Validator.validateImage(TestValues.GENERAL_IMAGE, alertIcon)); + + // Invalid/Null Tests Alert msg = new Alert(); assertNotNull(TestValues.NOT_NULL, msg); testNullBase(msg); @@ -130,55 +130,55 @@ public class AlertTests extends BaseRpcTests{ assertNull(TestValues.NULL, msg.getCancelID()); assertNull(TestValues.NULL, msg.getAlertIcon()); } - + /** * Tests a valid JSON construction of this RPC message. */ @Test - public void testJsonConstructor () { - JSONObject commandJson = JsonFileReader.readId(getInstrumentation().getTargetContext(), getCommandType(), getMessageType()); - assertNotNull(TestValues.NOT_NULL, commandJson); - - try { - Hashtable<String, Object> hash = JsonRPCMarshaller.deserializeJSONObject(commandJson); - Alert cmd = new Alert(hash); - JSONObject body = JsonUtils.readJsonObjectFromJsonObject(commandJson, getMessageType()); - assertNotNull(TestValues.NOT_NULL, body); - - // Test everything in the json body. - assertEquals(TestValues.MATCH, JsonUtils.readStringFromJsonObject(body, RPCMessage.KEY_FUNCTION_NAME), cmd.getFunctionName()); - assertEquals(TestValues.MATCH, JsonUtils.readIntegerFromJsonObject(body, RPCMessage.KEY_CORRELATION_ID), cmd.getCorrelationID()); - - JSONObject parameters = JsonUtils.readJsonObjectFromJsonObject(body, RPCMessage.KEY_PARAMETERS); - assertEquals(TestValues.MATCH, JsonUtils.readBooleanFromJsonObject(parameters, Alert.KEY_PLAY_TONE), cmd.getPlayTone()); - assertEquals(TestValues.MATCH, JsonUtils.readIntegerFromJsonObject(parameters, Alert.KEY_DURATION), cmd.getDuration()); - assertEquals(TestValues.MATCH, JsonUtils.readStringFromJsonObject(parameters, Alert.KEY_ALERT_TEXT_1), cmd.getAlertText1()); - assertEquals(TestValues.MATCH, JsonUtils.readStringFromJsonObject(parameters, Alert.KEY_ALERT_TEXT_2), cmd.getAlertText2()); - assertEquals(TestValues.MATCH, JsonUtils.readStringFromJsonObject(parameters, Alert.KEY_ALERT_TEXT_3), cmd.getAlertText3()); - assertEquals(TestValues.MATCH, JsonUtils.readBooleanFromJsonObject(parameters, Alert.KEY_PROGRESS_INDICATOR), cmd.getProgressIndicator()); - assertEquals(TestValues.MATCH, JsonUtils.readIntegerFromJsonObject(parameters, Alert.KEY_CANCEL_ID), cmd.getCancelID()); - - JSONArray ttsChunkArray = JsonUtils.readJsonArrayFromJsonObject(parameters, Alert.KEY_TTS_CHUNKS); - List<TTSChunk> ttsChunkList = new ArrayList<TTSChunk>(); - for (int index = 0; index < ttsChunkArray.length(); index++) { - TTSChunk chunk = new TTSChunk(JsonRPCMarshaller.deserializeJSONObject( (JSONObject)ttsChunkArray.get(index)) ); - ttsChunkList.add(chunk); - } - assertTrue(TestValues.TRUE, Validator.validateTtsChunks(ttsChunkList, cmd.getTtsChunks())); - - JSONArray softButtonArray = JsonUtils.readJsonArrayFromJsonObject(parameters, Alert.KEY_SOFT_BUTTONS); - List<SoftButton> softButtonList = new ArrayList<SoftButton>(); - for (int index = 0; index < softButtonArray.length(); index++) { - SoftButton chunk = new SoftButton(JsonRPCMarshaller.deserializeJSONObject( (JSONObject)softButtonArray.get(index)) ); - softButtonList.add(chunk); - } - assertTrue(TestValues.TRUE, Validator.validateSoftButtons(softButtonList, cmd.getSoftButtons())); - - JSONObject alertIcon = JsonUtils.readJsonObjectFromJsonObject(parameters, Alert.KEY_ALERT_ICON); - Image referenceAlertIcon = new Image(JsonRPCMarshaller.deserializeJSONObject(alertIcon)); - assertTrue(TestValues.TRUE, Validator.validateImage(referenceAlertIcon, cmd.getAlertIcon())); + public void testJsonConstructor() { + JSONObject commandJson = JsonFileReader.readId(getInstrumentation().getTargetContext(), getCommandType(), getMessageType()); + assertNotNull(TestValues.NOT_NULL, commandJson); + + try { + Hashtable<String, Object> hash = JsonRPCMarshaller.deserializeJSONObject(commandJson); + Alert cmd = new Alert(hash); + JSONObject body = JsonUtils.readJsonObjectFromJsonObject(commandJson, getMessageType()); + assertNotNull(TestValues.NOT_NULL, body); + + // Test everything in the json body. + assertEquals(TestValues.MATCH, JsonUtils.readStringFromJsonObject(body, RPCMessage.KEY_FUNCTION_NAME), cmd.getFunctionName()); + assertEquals(TestValues.MATCH, JsonUtils.readIntegerFromJsonObject(body, RPCMessage.KEY_CORRELATION_ID), cmd.getCorrelationID()); + + JSONObject parameters = JsonUtils.readJsonObjectFromJsonObject(body, RPCMessage.KEY_PARAMETERS); + assertEquals(TestValues.MATCH, JsonUtils.readBooleanFromJsonObject(parameters, Alert.KEY_PLAY_TONE), cmd.getPlayTone()); + assertEquals(TestValues.MATCH, JsonUtils.readIntegerFromJsonObject(parameters, Alert.KEY_DURATION), cmd.getDuration()); + assertEquals(TestValues.MATCH, JsonUtils.readStringFromJsonObject(parameters, Alert.KEY_ALERT_TEXT_1), cmd.getAlertText1()); + assertEquals(TestValues.MATCH, JsonUtils.readStringFromJsonObject(parameters, Alert.KEY_ALERT_TEXT_2), cmd.getAlertText2()); + assertEquals(TestValues.MATCH, JsonUtils.readStringFromJsonObject(parameters, Alert.KEY_ALERT_TEXT_3), cmd.getAlertText3()); + assertEquals(TestValues.MATCH, JsonUtils.readBooleanFromJsonObject(parameters, Alert.KEY_PROGRESS_INDICATOR), cmd.getProgressIndicator()); + assertEquals(TestValues.MATCH, JsonUtils.readIntegerFromJsonObject(parameters, Alert.KEY_CANCEL_ID), cmd.getCancelID()); + + JSONArray ttsChunkArray = JsonUtils.readJsonArrayFromJsonObject(parameters, Alert.KEY_TTS_CHUNKS); + List<TTSChunk> ttsChunkList = new ArrayList<TTSChunk>(); + for (int index = 0; index < ttsChunkArray.length(); index++) { + TTSChunk chunk = new TTSChunk(JsonRPCMarshaller.deserializeJSONObject((JSONObject) ttsChunkArray.get(index))); + ttsChunkList.add(chunk); + } + assertTrue(TestValues.TRUE, Validator.validateTtsChunks(ttsChunkList, cmd.getTtsChunks())); + + JSONArray softButtonArray = JsonUtils.readJsonArrayFromJsonObject(parameters, Alert.KEY_SOFT_BUTTONS); + List<SoftButton> softButtonList = new ArrayList<SoftButton>(); + for (int index = 0; index < softButtonArray.length(); index++) { + SoftButton chunk = new SoftButton(JsonRPCMarshaller.deserializeJSONObject((JSONObject) softButtonArray.get(index))); + softButtonList.add(chunk); + } + assertTrue(TestValues.TRUE, Validator.validateSoftButtons(softButtonList, cmd.getSoftButtons())); + + JSONObject alertIcon = JsonUtils.readJsonObjectFromJsonObject(parameters, Alert.KEY_ALERT_ICON); + Image referenceAlertIcon = new Image(JsonRPCMarshaller.deserializeJSONObject(alertIcon)); + assertTrue(TestValues.TRUE, Validator.validateImage(referenceAlertIcon, cmd.getAlertIcon())); } catch (JSONException e) { - fail(TestValues.JSON_FAIL); - } + fail(TestValues.JSON_FAIL); + } } }
\ No newline at end of file diff --git a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/ButtonPressTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/ButtonPressTests.java index 6ac0a3663..f235e32e2 100644 --- a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/ButtonPressTests.java +++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/ButtonPressTests.java @@ -31,7 +31,7 @@ import static junit.framework.TestCase.fail; public class ButtonPressTests extends BaseRpcTests { @Override - protected RPCMessage createMessage(){ + protected RPCMessage createMessage() { ButtonPress msg = new ButtonPress(); msg.setModuleType(TestValues.GENERAL_MODULETYPE); @@ -43,25 +43,25 @@ public class ButtonPressTests extends BaseRpcTests { } @Override - protected String getMessageType(){ + protected String getMessageType() { return RPCMessage.KEY_REQUEST; } @Override - protected String getCommandType(){ + protected String getCommandType() { return FunctionID.BUTTON_PRESS.toString(); } @Override - protected JSONObject getExpectedParameters(int sdlVersion){ + protected JSONObject getExpectedParameters(int sdlVersion) { JSONObject result = new JSONObject(); - try{ + try { result.put(ButtonPress.KEY_MODULE_TYPE, TestValues.GENERAL_MODULETYPE); result.put(ButtonPress.KEY_BUTTON_NAME, TestValues.GENERAL_BUTTONNAME); result.put(ButtonPress.KEY_BUTTON_PRESS_MODE, TestValues.GENERAL_BUTTONPRESSMODE); result.put(ButtonPress.KEY_MODULE_ID, TestValues.GENERAL_STRING); - }catch(JSONException e){ + } catch (JSONException e) { fail(TestValues.JSON_FAIL); } @@ -72,11 +72,11 @@ public class ButtonPressTests extends BaseRpcTests { * Tests the expected values of the RPC message. */ @Test - public void testRpcValues () { + public void testRpcValues() { // Test Values - ModuleType testModuleType = ( (ButtonPress) msg ).getModuleType(); - ButtonName testButtonName = ( (ButtonPress) msg ).getButtonName(); - ButtonPressMode testButtonPressMode = ( (ButtonPress) msg ).getButtonPressMode(); + ModuleType testModuleType = ((ButtonPress) msg).getModuleType(); + ButtonName testButtonName = ((ButtonPress) msg).getButtonName(); + ButtonPressMode testButtonPressMode = ((ButtonPress) msg).getButtonPressMode(); String testButtonId = ((ButtonPress) msg).getModuleId(); // Valid Tests @@ -100,7 +100,7 @@ public class ButtonPressTests extends BaseRpcTests { * Tests a valid JSON construction of this RPC message. */ @Test - public void testJsonConstructor () { + public void testJsonConstructor() { JSONObject commandJson = JsonFileReader.readId(getInstrumentation().getTargetContext(), getCommandType(), getMessageType()); assertNotNull(TestValues.NOT_NULL, commandJson); @@ -121,7 +121,7 @@ public class ButtonPressTests extends BaseRpcTests { assertEquals(TestValues.MATCH, JsonUtils.readObjectFromJsonObject(parameters, ButtonPress.KEY_BUTTON_NAME).toString(), cmd.getButtonName().toString()); assertEquals(TestValues.MATCH, JsonUtils.readObjectFromJsonObject(parameters, ButtonPress.KEY_BUTTON_PRESS_MODE).toString(), cmd.getButtonPressMode().toString()); assertEquals(TestValues.MATCH, JsonUtils.readObjectFromJsonObject(parameters, ButtonPress.KEY_MODULE_ID), cmd.getModuleId()); - }catch (JSONException e) { + } catch (JSONException e) { fail(TestValues.JSON_FAIL); } } diff --git a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/CancelInteractionTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/CancelInteractionTests.java index 26ddbf7b5..cf5d3bda6 100644 --- a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/CancelInteractionTests.java +++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/CancelInteractionTests.java @@ -70,12 +70,12 @@ public class CancelInteractionTests extends BaseRpcTests { } @Override - protected String getMessageType(){ + protected String getMessageType() { return RPCMessage.KEY_REQUEST; } @Override - protected String getCommandType(){ + protected String getCommandType() { return FunctionID.CANCEL_INTERACTION.toString(); } @@ -97,10 +97,10 @@ public class CancelInteractionTests extends BaseRpcTests { * Tests the expected values of the RPC message. */ @Test - public void testRpcValues () { + public void testRpcValues() { // Test Values - Integer testFunctionID = ((CancelInteraction) msg).getInteractionFunctionID(); - Integer testCancelID = ((CancelInteraction) msg).getCancelID(); + Integer testFunctionID = ((CancelInteraction) msg).getInteractionFunctionID(); + Integer testCancelID = ((CancelInteraction) msg).getCancelID(); // Valid Tests assertEquals(TestValues.MATCH, TestValues.GENERAL_INTEGER, testFunctionID); @@ -119,7 +119,7 @@ public class CancelInteractionTests extends BaseRpcTests { * Tests a valid JSON construction of this RPC message. */ @Test - public void testJsonConstructor () { + public void testJsonConstructor() { JSONObject commandJson = JsonFileReader.readId(getInstrumentation().getTargetContext(), getCommandType(), getMessageType()); assertNotNull(TestValues.NOT_NULL, commandJson); @@ -136,8 +136,7 @@ public class CancelInteractionTests extends BaseRpcTests { assertEquals(TestValues.MATCH, JsonUtils.readIntegerFromJsonObject(parameters, CancelInteraction.KEY_FUNCTION_ID), cmd.getInteractionFunctionID()); assertEquals(TestValues.MATCH, JsonUtils.readIntegerFromJsonObject(parameters, CancelInteraction.KEY_CANCEL_ID), cmd.getCancelID()); - } - catch (JSONException e) { + } catch (JSONException e) { fail(TestValues.JSON_FAIL); } } diff --git a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/ChangeRegistrationTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/ChangeRegistrationTests.java index 34375ee39..d3a711f07 100644 --- a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/ChangeRegistrationTests.java +++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/ChangeRegistrationTests.java @@ -23,13 +23,13 @@ import static junit.framework.TestCase.assertNull; import static junit.framework.TestCase.fail; /** - * This is a unit test class for the SmartDeviceLink library project class : + * This is a unit test class for the SmartDeviceLink library project class : * {@link com.smartdevicelink.proxy.rpc.ChangeRegistration} */ -public class ChangeRegistrationTests extends BaseRpcTests{ - +public class ChangeRegistrationTests extends BaseRpcTests { + @Override - protected RPCMessage createMessage(){ + protected RPCMessage createMessage() { ChangeRegistration msg = new ChangeRegistration(); msg.setLanguage(TestValues.GENERAL_LANGUAGE); @@ -39,43 +39,43 @@ public class ChangeRegistrationTests extends BaseRpcTests{ } @Override - protected String getMessageType(){ + protected String getMessageType() { return RPCMessage.KEY_REQUEST; } @Override - protected String getCommandType(){ + protected String getCommandType() { return FunctionID.CHANGE_REGISTRATION.toString(); } @Override - protected JSONObject getExpectedParameters(int sdlVersion){ + protected JSONObject getExpectedParameters(int sdlVersion) { JSONObject result = new JSONObject(); - try{ + try { result.put(ChangeRegistration.KEY_LANGUAGE, TestValues.GENERAL_LANGUAGE); result.put(ChangeRegistration.KEY_HMI_DISPLAY_LANGUAGE, TestValues.GENERAL_LANGUAGE); - }catch(JSONException e){ - fail(TestValues.JSON_FAIL); + } catch (JSONException e) { + fail(TestValues.JSON_FAIL); } return result; } /** - * Tests the expected values of the RPC message. - */ + * Tests the expected values of the RPC message. + */ @Test - public void testRpcValues () { - // Test Values - Language testLanguage = ( (ChangeRegistration) msg ).getLanguage(); - Language testHmiLanguage = ( (ChangeRegistration) msg ).getHmiDisplayLanguage(); - + public void testRpcValues() { + // Test Values + Language testLanguage = ((ChangeRegistration) msg).getLanguage(); + Language testHmiLanguage = ((ChangeRegistration) msg).getHmiDisplayLanguage(); + // Valid Tests assertEquals(TestValues.MATCH, TestValues.GENERAL_LANGUAGE, testLanguage); assertEquals(TestValues.MATCH, TestValues.GENERAL_LANGUAGE, testHmiLanguage); - - // Invalid/Null Tests + + // Invalid/Null Tests ChangeRegistration msg = new ChangeRegistration(); assertNotNull(TestValues.NOT_NULL, msg); testNullBase(msg); @@ -83,31 +83,31 @@ public class ChangeRegistrationTests extends BaseRpcTests{ assertNull(TestValues.NULL, msg.getLanguage()); assertNull(TestValues.NULL, msg.getHmiDisplayLanguage()); } - + /** * Tests a valid JSON construction of this RPC message. */ @Test - public void testJsonConstructor () { - JSONObject commandJson = JsonFileReader.readId(getInstrumentation().getTargetContext(), getCommandType(), getMessageType()); - assertNotNull(TestValues.NOT_NULL, commandJson); - - try { - Hashtable<String, Object> hash = JsonRPCMarshaller.deserializeJSONObject(commandJson); - ChangeRegistration cmd = new ChangeRegistration(hash); - - JSONObject body = JsonUtils.readJsonObjectFromJsonObject(commandJson, getMessageType()); - assertNotNull(TestValues.NOT_NULL, body); - - // Test everything in the json body. - assertEquals(TestValues.MATCH, JsonUtils.readStringFromJsonObject(body, RPCMessage.KEY_FUNCTION_NAME), cmd.getFunctionName()); - assertEquals(TestValues.MATCH, JsonUtils.readIntegerFromJsonObject(body, RPCMessage.KEY_CORRELATION_ID), cmd.getCorrelationID()); - - JSONObject parameters = JsonUtils.readJsonObjectFromJsonObject(body, RPCMessage.KEY_PARAMETERS); - assertEquals(TestValues.MATCH, JsonUtils.readStringFromJsonObject(parameters, ChangeRegistration.KEY_LANGUAGE), cmd.getLanguage().toString()); - assertEquals(TestValues.MATCH, JsonUtils.readStringFromJsonObject(parameters, ChangeRegistration.KEY_HMI_DISPLAY_LANGUAGE), cmd.getHmiDisplayLanguage().toString()); - } catch (JSONException e) { - fail(TestValues.JSON_FAIL); - } + public void testJsonConstructor() { + JSONObject commandJson = JsonFileReader.readId(getInstrumentation().getTargetContext(), getCommandType(), getMessageType()); + assertNotNull(TestValues.NOT_NULL, commandJson); + + try { + Hashtable<String, Object> hash = JsonRPCMarshaller.deserializeJSONObject(commandJson); + ChangeRegistration cmd = new ChangeRegistration(hash); + + JSONObject body = JsonUtils.readJsonObjectFromJsonObject(commandJson, getMessageType()); + assertNotNull(TestValues.NOT_NULL, body); + + // Test everything in the json body. + assertEquals(TestValues.MATCH, JsonUtils.readStringFromJsonObject(body, RPCMessage.KEY_FUNCTION_NAME), cmd.getFunctionName()); + assertEquals(TestValues.MATCH, JsonUtils.readIntegerFromJsonObject(body, RPCMessage.KEY_CORRELATION_ID), cmd.getCorrelationID()); + + JSONObject parameters = JsonUtils.readJsonObjectFromJsonObject(body, RPCMessage.KEY_PARAMETERS); + assertEquals(TestValues.MATCH, JsonUtils.readStringFromJsonObject(parameters, ChangeRegistration.KEY_LANGUAGE), cmd.getLanguage().toString()); + assertEquals(TestValues.MATCH, JsonUtils.readStringFromJsonObject(parameters, ChangeRegistration.KEY_HMI_DISPLAY_LANGUAGE), cmd.getHmiDisplayLanguage().toString()); + } catch (JSONException e) { + fail(TestValues.JSON_FAIL); + } } }
\ No newline at end of file diff --git a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/CloseApplicationTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/CloseApplicationTests.java index 02cc2d718..35c1d363e 100644 --- a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/CloseApplicationTests.java +++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/CloseApplicationTests.java @@ -61,22 +61,22 @@ import static junit.framework.TestCase.fail; public class CloseApplicationTests extends BaseRpcTests { @Override - protected RPCMessage createMessage(){ + protected RPCMessage createMessage() { return new CloseApplication(); } @Override - protected String getMessageType(){ + protected String getMessageType() { return RPCMessage.KEY_REQUEST; } @Override - protected String getCommandType(){ + protected String getCommandType() { return FunctionID.CLOSE_APPLICATION.toString(); } @Override - protected JSONObject getExpectedParameters(int sdlVersion){ + protected JSONObject getExpectedParameters(int sdlVersion) { return new JSONObject(); } @@ -84,7 +84,7 @@ public class CloseApplicationTests extends BaseRpcTests { * Tests the expected values of the RPC message. */ @Test - public void testRpcValues () { + public void testRpcValues() { // Invalid/Null Tests CloseApplication msg = new CloseApplication(); assertNotNull(TestValues.NOT_NULL, msg); @@ -95,7 +95,7 @@ public class CloseApplicationTests extends BaseRpcTests { * Tests a valid JSON construction of this RPC message. */ @Test - public void testJsonConstructor () { + public void testJsonConstructor() { JSONObject commandJson = JsonFileReader.readId(getInstrumentation().getTargetContext(), getCommandType(), getMessageType()); assertNotNull(TestValues.NOT_NULL, commandJson); @@ -109,8 +109,7 @@ public class CloseApplicationTests extends BaseRpcTests { // Test everything in the json body. assertEquals(TestValues.MATCH, JsonUtils.readStringFromJsonObject(body, RPCMessage.KEY_FUNCTION_NAME), cmd.getFunctionName()); assertEquals(TestValues.MATCH, JsonUtils.readIntegerFromJsonObject(body, RPCMessage.KEY_CORRELATION_ID), cmd.getCorrelationID()); - } - catch (JSONException e) { + } catch (JSONException e) { fail(TestValues.JSON_FAIL); } } diff --git a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/CreateInteractionChoiceSetTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/CreateInteractionChoiceSetTests.java index f5ae2fbd3..d0b470e71 100644 --- a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/CreateInteractionChoiceSetTests.java +++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/CreateInteractionChoiceSetTests.java @@ -27,13 +27,13 @@ import static junit.framework.TestCase.assertTrue; import static junit.framework.TestCase.fail; /** - * This is a unit test class for the SmartDeviceLink library project class : + * This is a unit test class for the SmartDeviceLink library project class : * {@link com.smartdevicelink.proxy.rpc.CreateInteractionChoiceSet} */ -public class CreateInteractionChoiceSetTests extends BaseRpcTests{ - +public class CreateInteractionChoiceSetTests extends BaseRpcTests { + @Override - protected RPCMessage createMessage(){ + protected RPCMessage createMessage() { CreateInteractionChoiceSet msg = new CreateInteractionChoiceSet(); msg.setInteractionChoiceSetID(TestValues.GENERAL_INT); @@ -43,45 +43,45 @@ public class CreateInteractionChoiceSetTests extends BaseRpcTests{ } @Override - protected String getMessageType(){ + protected String getMessageType() { return RPCMessage.KEY_REQUEST; } @Override - protected String getCommandType(){ + protected String getCommandType() { return FunctionID.CREATE_INTERACTION_CHOICE_SET.toString(); } @Override - protected JSONObject getExpectedParameters(int sdlVersion){ + protected JSONObject getExpectedParameters(int sdlVersion) { JSONObject result = new JSONObject(); - try{ + try { result.put(CreateInteractionChoiceSet.KEY_INTERACTION_CHOICE_SET_ID, TestValues.GENERAL_INT); result.put(CreateInteractionChoiceSet.KEY_CHOICE_SET, TestValues.JSON_CHOICES); - }catch(JSONException e){ - fail(TestValues.JSON_FAIL); + } catch (JSONException e) { + fail(TestValues.JSON_FAIL); } return result; } /** - * Tests the expected values of the RPC message. - */ + * Tests the expected values of the RPC message. + */ @Test - public void testRpcValues () { - // Test Values - int testCmdId = ( (CreateInteractionChoiceSet) msg ).getInteractionChoiceSetID(); - List<Choice> testChoices = ( (CreateInteractionChoiceSet) msg ).getChoiceSet(); - + public void testRpcValues() { + // Test Values + int testCmdId = ((CreateInteractionChoiceSet) msg).getInteractionChoiceSetID(); + List<Choice> testChoices = ((CreateInteractionChoiceSet) msg).getChoiceSet(); + // Valid Tests assertEquals(TestValues.MATCH, TestValues.GENERAL_INT, testCmdId); assertEquals(TestValues.MATCH, TestValues.GENERAL_CHOICE_LIST.size(), testChoices.size()); - for(int i = 0; i < testChoices.size(); i++){ + for (int i = 0; i < testChoices.size(); i++) { assertTrue(TestValues.TRUE, Validator.validateChoice(TestValues.GENERAL_CHOICE_LIST.get(i), testChoices.get(i))); } - + // Invalid/Null Tests CreateInteractionChoiceSet msg = new CreateInteractionChoiceSet(); assertNotNull(TestValues.NOT_NULL, msg); @@ -95,31 +95,31 @@ public class CreateInteractionChoiceSetTests extends BaseRpcTests{ * Tests a valid JSON construction of this RPC message. */ @Test - public void testJsonConstructor () { - JSONObject commandJson = JsonFileReader.readId(getInstrumentation().getTargetContext(), getCommandType(), getMessageType()); - assertNotNull(TestValues.NOT_NULL, commandJson); - - try { - Hashtable<String, Object> hash = JsonRPCMarshaller.deserializeJSONObject(commandJson); - CreateInteractionChoiceSet cmd = new CreateInteractionChoiceSet(hash); - - JSONObject body = JsonUtils.readJsonObjectFromJsonObject(commandJson, getMessageType()); - assertNotNull(TestValues.NOT_NULL, body); - - // Test everything in the json body. - assertEquals(TestValues.MATCH, JsonUtils.readStringFromJsonObject(body, RPCMessage.KEY_FUNCTION_NAME), cmd.getFunctionName()); - assertEquals(TestValues.MATCH, JsonUtils.readIntegerFromJsonObject(body, RPCMessage.KEY_CORRELATION_ID), cmd.getCorrelationID()); - - JSONObject parameters = JsonUtils.readJsonObjectFromJsonObject(body, RPCMessage.KEY_PARAMETERS); - assertEquals(TestValues.MATCH, JsonUtils.readIntegerFromJsonObject(parameters, CreateInteractionChoiceSet.KEY_INTERACTION_CHOICE_SET_ID), cmd.getInteractionChoiceSetID()); - - JSONArray choiceSetArray = JsonUtils.readJsonArrayFromJsonObject(parameters, CreateInteractionChoiceSet.KEY_CHOICE_SET); - for (int index = 0; index < choiceSetArray.length(); index++) { - Choice chunk = new Choice(JsonRPCMarshaller.deserializeJSONObject( (JSONObject)choiceSetArray.get(index)) ); - assertTrue(TestValues.TRUE, Validator.validateChoice(chunk, cmd.getChoiceSet().get(index)) ); - } - } catch (JSONException e) { - fail(TestValues.JSON_FAIL); - } + public void testJsonConstructor() { + JSONObject commandJson = JsonFileReader.readId(getInstrumentation().getTargetContext(), getCommandType(), getMessageType()); + assertNotNull(TestValues.NOT_NULL, commandJson); + + try { + Hashtable<String, Object> hash = JsonRPCMarshaller.deserializeJSONObject(commandJson); + CreateInteractionChoiceSet cmd = new CreateInteractionChoiceSet(hash); + + JSONObject body = JsonUtils.readJsonObjectFromJsonObject(commandJson, getMessageType()); + assertNotNull(TestValues.NOT_NULL, body); + + // Test everything in the json body. + assertEquals(TestValues.MATCH, JsonUtils.readStringFromJsonObject(body, RPCMessage.KEY_FUNCTION_NAME), cmd.getFunctionName()); + assertEquals(TestValues.MATCH, JsonUtils.readIntegerFromJsonObject(body, RPCMessage.KEY_CORRELATION_ID), cmd.getCorrelationID()); + + JSONObject parameters = JsonUtils.readJsonObjectFromJsonObject(body, RPCMessage.KEY_PARAMETERS); + assertEquals(TestValues.MATCH, JsonUtils.readIntegerFromJsonObject(parameters, CreateInteractionChoiceSet.KEY_INTERACTION_CHOICE_SET_ID), cmd.getInteractionChoiceSetID()); + + JSONArray choiceSetArray = JsonUtils.readJsonArrayFromJsonObject(parameters, CreateInteractionChoiceSet.KEY_CHOICE_SET); + for (int index = 0; index < choiceSetArray.length(); index++) { + Choice chunk = new Choice(JsonRPCMarshaller.deserializeJSONObject((JSONObject) choiceSetArray.get(index))); + assertTrue(TestValues.TRUE, Validator.validateChoice(chunk, cmd.getChoiceSet().get(index))); + } + } catch (JSONException e) { + fail(TestValues.JSON_FAIL); + } } }
\ No newline at end of file diff --git a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/DeleteCommandTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/DeleteCommandTests.java index 72401b9b1..74cfa67ae 100644 --- a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/DeleteCommandTests.java +++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/DeleteCommandTests.java @@ -22,13 +22,13 @@ import static junit.framework.TestCase.assertNull; import static junit.framework.TestCase.fail; /** - * This is a unit test class for the SmartDeviceLink library project class : + * This is a unit test class for the SmartDeviceLink library project class : * {@link com.smartdevicelink.proxy.rpc.DeleteCommand} */ -public class DeleteCommandTests extends BaseRpcTests{ +public class DeleteCommandTests extends BaseRpcTests { @Override - protected RPCMessage createMessage(){ + protected RPCMessage createMessage() { DeleteCommand msg = new DeleteCommand(); msg.setCmdID(TestValues.GENERAL_INT); @@ -37,39 +37,39 @@ public class DeleteCommandTests extends BaseRpcTests{ } @Override - protected String getMessageType(){ + protected String getMessageType() { return RPCMessage.KEY_REQUEST; } @Override - protected String getCommandType(){ + protected String getCommandType() { return FunctionID.DELETE_COMMAND.toString(); } @Override - protected JSONObject getExpectedParameters(int sdlVersion){ + protected JSONObject getExpectedParameters(int sdlVersion) { JSONObject result = new JSONObject(); - try{ + try { result.put(DeleteCommand.KEY_CMD_ID, TestValues.GENERAL_INT); - }catch(JSONException e){ - fail(TestValues.JSON_FAIL); + } catch (JSONException e) { + fail(TestValues.JSON_FAIL); } return result; } /** - * Tests the expected values of the RPC message. - */ + * Tests the expected values of the RPC message. + */ @Test - public void testRpcValues () { - // Test Values - int cmdId = ( (DeleteCommand) msg ).getCmdID(); - - // Valid Tests + public void testRpcValues() { + // Test Values + int cmdId = ((DeleteCommand) msg).getCmdID(); + + // Valid Tests assertEquals("Command ID didn't match input command ID.", TestValues.GENERAL_INT, cmdId); - + // Invalid/Null Tests DeleteCommand msg = new DeleteCommand(); assertNotNull(TestValues.NOT_NULL, msg); @@ -77,31 +77,30 @@ public class DeleteCommandTests extends BaseRpcTests{ assertNull(TestValues.MATCH, msg.getCmdID()); } - + /** * Tests a valid JSON construction of this RPC message. */ @Test - public void testJsonConstructor () { - JSONObject commandJson = JsonFileReader.readId(getInstrumentation().getTargetContext(), getCommandType(), getMessageType()); - assertNotNull(TestValues.NOT_NULL, commandJson); - - try { - Hashtable<String, Object> hash = JsonRPCMarshaller.deserializeJSONObject(commandJson); - DeleteCommand cmd = new DeleteCommand(hash); - - JSONObject body = JsonUtils.readJsonObjectFromJsonObject(commandJson, getMessageType()); - assertNotNull(TestValues.NOT_NULL, body); - - // Test everything in the json body. - assertEquals(TestValues.MATCH, JsonUtils.readStringFromJsonObject(body, RPCMessage.KEY_FUNCTION_NAME), cmd.getFunctionName()); - assertEquals(TestValues.MATCH, JsonUtils.readIntegerFromJsonObject(body, RPCMessage.KEY_CORRELATION_ID), cmd.getCorrelationID()); - - JSONObject parameters = JsonUtils.readJsonObjectFromJsonObject(body, RPCMessage.KEY_PARAMETERS); - assertEquals(TestValues.MATCH, JsonUtils.readIntegerFromJsonObject(parameters, DeleteCommand.KEY_CMD_ID), cmd.getCmdID()); - } - catch (JSONException e) { - fail(TestValues.JSON_FAIL); - } + public void testJsonConstructor() { + JSONObject commandJson = JsonFileReader.readId(getInstrumentation().getTargetContext(), getCommandType(), getMessageType()); + assertNotNull(TestValues.NOT_NULL, commandJson); + + try { + Hashtable<String, Object> hash = JsonRPCMarshaller.deserializeJSONObject(commandJson); + DeleteCommand cmd = new DeleteCommand(hash); + + JSONObject body = JsonUtils.readJsonObjectFromJsonObject(commandJson, getMessageType()); + assertNotNull(TestValues.NOT_NULL, body); + + // Test everything in the json body. + assertEquals(TestValues.MATCH, JsonUtils.readStringFromJsonObject(body, RPCMessage.KEY_FUNCTION_NAME), cmd.getFunctionName()); + assertEquals(TestValues.MATCH, JsonUtils.readIntegerFromJsonObject(body, RPCMessage.KEY_CORRELATION_ID), cmd.getCorrelationID()); + + JSONObject parameters = JsonUtils.readJsonObjectFromJsonObject(body, RPCMessage.KEY_PARAMETERS); + assertEquals(TestValues.MATCH, JsonUtils.readIntegerFromJsonObject(parameters, DeleteCommand.KEY_CMD_ID), cmd.getCmdID()); + } catch (JSONException e) { + fail(TestValues.JSON_FAIL); + } } }
\ No newline at end of file diff --git a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/DeleteFileTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/DeleteFileTests.java index d4af2d0da..54d806e08 100644 --- a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/DeleteFileTests.java +++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/DeleteFileTests.java @@ -22,85 +22,85 @@ import static junit.framework.TestCase.assertNull; import static junit.framework.TestCase.fail; /** - * This is a unit test class for the SmartDeviceLink library project class : + * This is a unit test class for the SmartDeviceLink library project class : * {@link com.smartdevicelink.proxy.rpc.DeleteFile} */ -public class DeleteFileTests extends BaseRpcTests{ - +public class DeleteFileTests extends BaseRpcTests { + @Override - protected RPCMessage createMessage(){ + protected RPCMessage createMessage() { DeleteFile msg = new DeleteFile(); - msg.setSdlFileName(TestValues.GENERAL_STRING); + msg.setSdlFileName(TestValues.GENERAL_STRING); return msg; } @Override - protected String getMessageType(){ + protected String getMessageType() { return RPCMessage.KEY_REQUEST; } @Override - protected String getCommandType(){ + protected String getCommandType() { return FunctionID.DELETE_FILE.toString(); } @Override - protected JSONObject getExpectedParameters(int sdlVersion){ + protected JSONObject getExpectedParameters(int sdlVersion) { JSONObject result = new JSONObject(); - try{ - result.put(DeleteFile.KEY_SDL_FILE_NAME, TestValues.GENERAL_STRING); - }catch(JSONException e){ - fail(TestValues.JSON_FAIL); + try { + result.put(DeleteFile.KEY_SDL_FILE_NAME, TestValues.GENERAL_STRING); + } catch (JSONException e) { + fail(TestValues.JSON_FAIL); } return result; } /** - * Tests the expected values of the RPC message. - */ + * Tests the expected values of the RPC message. + */ @Test - public void testRpcValues () { - // Test Values - String testFilename = ( (DeleteFile) msg ).getSdlFileName(); - - // Valid Tests - assertEquals(TestValues.MATCH, TestValues.GENERAL_STRING, testFilename); - - // Invalid/Null Tests - DeleteFile msg = new DeleteFile(); - assertNotNull(TestValues.NOT_NULL, msg); - testNullBase(msg); - - assertNull(TestValues.NULL, msg.getSdlFileName()); + public void testRpcValues() { + // Test Values + String testFilename = ((DeleteFile) msg).getSdlFileName(); + + // Valid Tests + assertEquals(TestValues.MATCH, TestValues.GENERAL_STRING, testFilename); + + // Invalid/Null Tests + DeleteFile msg = new DeleteFile(); + assertNotNull(TestValues.NOT_NULL, msg); + testNullBase(msg); + + assertNull(TestValues.NULL, msg.getSdlFileName()); } /** * Tests a valid JSON construction of this RPC message. */ @Test - public void testJsonConstructor () { - JSONObject commandJson = JsonFileReader.readId(getInstrumentation().getTargetContext(), getCommandType(), getMessageType()); - assertNotNull(TestValues.NOT_NULL, commandJson); - - try { - Hashtable<String, Object> hash = JsonRPCMarshaller.deserializeJSONObject(commandJson); - DeleteFile cmd = new DeleteFile(hash); - - JSONObject body = JsonUtils.readJsonObjectFromJsonObject(commandJson, getMessageType()); - assertNotNull(TestValues.NOT_NULL, body); - - // Test everything in the json body. - assertEquals(TestValues.MATCH, JsonUtils.readStringFromJsonObject(body, RPCMessage.KEY_FUNCTION_NAME), cmd.getFunctionName()); - assertEquals(TestValues.MATCH, JsonUtils.readIntegerFromJsonObject(body, RPCMessage.KEY_CORRELATION_ID), cmd.getCorrelationID()); - - JSONObject parameters = JsonUtils.readJsonObjectFromJsonObject(body, RPCMessage.KEY_PARAMETERS); - assertEquals(TestValues.MATCH, JsonUtils.readStringFromJsonObject(parameters, DeleteFile.KEY_SDL_FILE_NAME), cmd.getSdlFileName()); - } catch (JSONException e) { - fail(TestValues.JSON_FAIL); - } + public void testJsonConstructor() { + JSONObject commandJson = JsonFileReader.readId(getInstrumentation().getTargetContext(), getCommandType(), getMessageType()); + assertNotNull(TestValues.NOT_NULL, commandJson); + + try { + Hashtable<String, Object> hash = JsonRPCMarshaller.deserializeJSONObject(commandJson); + DeleteFile cmd = new DeleteFile(hash); + + JSONObject body = JsonUtils.readJsonObjectFromJsonObject(commandJson, getMessageType()); + assertNotNull(TestValues.NOT_NULL, body); + + // Test everything in the json body. + assertEquals(TestValues.MATCH, JsonUtils.readStringFromJsonObject(body, RPCMessage.KEY_FUNCTION_NAME), cmd.getFunctionName()); + assertEquals(TestValues.MATCH, JsonUtils.readIntegerFromJsonObject(body, RPCMessage.KEY_CORRELATION_ID), cmd.getCorrelationID()); + + JSONObject parameters = JsonUtils.readJsonObjectFromJsonObject(body, RPCMessage.KEY_PARAMETERS); + assertEquals(TestValues.MATCH, JsonUtils.readStringFromJsonObject(parameters, DeleteFile.KEY_SDL_FILE_NAME), cmd.getSdlFileName()); + } catch (JSONException e) { + fail(TestValues.JSON_FAIL); + } } }
\ No newline at end of file diff --git a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/DeleteInteractionChoiceSetTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/DeleteInteractionChoiceSetTests.java index 7aea9c784..7f6aebbfc 100644 --- a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/DeleteInteractionChoiceSetTests.java +++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/DeleteInteractionChoiceSetTests.java @@ -22,13 +22,13 @@ import static junit.framework.TestCase.assertNull; import static junit.framework.TestCase.fail; /** - * This is a unit test class for the SmartDeviceLink library project class : + * This is a unit test class for the SmartDeviceLink library project class : * {@link com.smartdevicelink.proxy.rpc.DeleteInteractionChoiceSet} */ -public class DeleteInteractionChoiceSetTests extends BaseRpcTests{ +public class DeleteInteractionChoiceSetTests extends BaseRpcTests { @Override - protected RPCMessage createMessage(){ + protected RPCMessage createMessage() { DeleteInteractionChoiceSet msg = new DeleteInteractionChoiceSet(); msg.setInteractionChoiceSetID(TestValues.GENERAL_INT); @@ -37,40 +37,40 @@ public class DeleteInteractionChoiceSetTests extends BaseRpcTests{ } @Override - protected String getMessageType(){ + protected String getMessageType() { return RPCMessage.KEY_REQUEST; } @Override - protected String getCommandType(){ + protected String getCommandType() { return FunctionID.DELETE_INTERACTION_CHOICE_SET.toString(); } @Override - protected JSONObject getExpectedParameters(int sdlVersion){ + protected JSONObject getExpectedParameters(int sdlVersion) { JSONObject result = new JSONObject(); - try{ + try { result.put(DeleteInteractionChoiceSet.KEY_INTERACTION_CHOICE_SET_ID, TestValues.GENERAL_INT); - }catch(JSONException e){ - fail(TestValues.JSON_FAIL); + } catch (JSONException e) { + fail(TestValues.JSON_FAIL); } return result; } /** - * Tests the expected values of the RPC message. - */ + * Tests the expected values of the RPC message. + */ @Test - public void testRpcValues () { - // Test Values - int testChoiceSetId = ( (DeleteInteractionChoiceSet) msg ).getInteractionChoiceSetID(); - + public void testRpcValues() { + // Test Values + int testChoiceSetId = ((DeleteInteractionChoiceSet) msg).getInteractionChoiceSetID(); + // Valid Tests assertEquals(TestValues.MATCH, TestValues.GENERAL_INT, testChoiceSetId); - - // Invalid/Null Tests + + // Invalid/Null Tests DeleteInteractionChoiceSet msg = new DeleteInteractionChoiceSet(); assertNotNull(TestValues.NOT_NULL, msg); testNullBase(msg); @@ -82,25 +82,25 @@ public class DeleteInteractionChoiceSetTests extends BaseRpcTests{ * Tests a valid JSON construction of this RPC message. */ @Test - public void testJsonConstructor () { - JSONObject commandJson = JsonFileReader.readId(getInstrumentation().getTargetContext(), getCommandType(), getMessageType()); - assertNotNull(TestValues.NOT_NULL, commandJson); - - try { - Hashtable<String, Object> hash = JsonRPCMarshaller.deserializeJSONObject(commandJson); - DeleteInteractionChoiceSet cmd = new DeleteInteractionChoiceSet(hash); - - JSONObject body = JsonUtils.readJsonObjectFromJsonObject(commandJson, getMessageType()); - assertNotNull(TestValues.NOT_NULL, body); - - // Test everything in the json body. - assertEquals(TestValues.MATCH, JsonUtils.readStringFromJsonObject(body, RPCMessage.KEY_FUNCTION_NAME), cmd.getFunctionName()); - assertEquals(TestValues.MATCH, JsonUtils.readIntegerFromJsonObject(body, RPCMessage.KEY_CORRELATION_ID), cmd.getCorrelationID()); - - JSONObject parameters = JsonUtils.readJsonObjectFromJsonObject(body, RPCMessage.KEY_PARAMETERS); - assertEquals(TestValues.MATCH, JsonUtils.readIntegerFromJsonObject(parameters, DeleteInteractionChoiceSet.KEY_INTERACTION_CHOICE_SET_ID), cmd.getInteractionChoiceSetID()); - } catch (JSONException e) { - fail(TestValues.JSON_FAIL); - } - } + public void testJsonConstructor() { + JSONObject commandJson = JsonFileReader.readId(getInstrumentation().getTargetContext(), getCommandType(), getMessageType()); + assertNotNull(TestValues.NOT_NULL, commandJson); + + try { + Hashtable<String, Object> hash = JsonRPCMarshaller.deserializeJSONObject(commandJson); + DeleteInteractionChoiceSet cmd = new DeleteInteractionChoiceSet(hash); + + JSONObject body = JsonUtils.readJsonObjectFromJsonObject(commandJson, getMessageType()); + assertNotNull(TestValues.NOT_NULL, body); + + // Test everything in the json body. + assertEquals(TestValues.MATCH, JsonUtils.readStringFromJsonObject(body, RPCMessage.KEY_FUNCTION_NAME), cmd.getFunctionName()); + assertEquals(TestValues.MATCH, JsonUtils.readIntegerFromJsonObject(body, RPCMessage.KEY_CORRELATION_ID), cmd.getCorrelationID()); + + JSONObject parameters = JsonUtils.readJsonObjectFromJsonObject(body, RPCMessage.KEY_PARAMETERS); + assertEquals(TestValues.MATCH, JsonUtils.readIntegerFromJsonObject(parameters, DeleteInteractionChoiceSet.KEY_INTERACTION_CHOICE_SET_ID), cmd.getInteractionChoiceSetID()); + } catch (JSONException e) { + fail(TestValues.JSON_FAIL); + } + } }
\ No newline at end of file diff --git a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/DeleteSubMenuTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/DeleteSubMenuTests.java index 326bb2175..a2d5391f3 100644 --- a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/DeleteSubMenuTests.java +++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/DeleteSubMenuTests.java @@ -22,13 +22,13 @@ import static junit.framework.TestCase.assertNull; import static junit.framework.TestCase.fail; /** - * This is a unit test class for the SmartDeviceLink library project class : + * This is a unit test class for the SmartDeviceLink library project class : * {@link com.smartdevicelink.proxy.rpc.DeleteSubMenu} */ -public class DeleteSubMenuTests extends BaseRpcTests{ +public class DeleteSubMenuTests extends BaseRpcTests { @Override - protected RPCMessage createMessage(){ + protected RPCMessage createMessage() { DeleteSubMenu msg = new DeleteSubMenu(); msg.setMenuID(TestValues.GENERAL_INT); @@ -37,39 +37,39 @@ public class DeleteSubMenuTests extends BaseRpcTests{ } @Override - protected String getMessageType(){ + protected String getMessageType() { return RPCMessage.KEY_REQUEST; } @Override - protected String getCommandType(){ + protected String getCommandType() { return FunctionID.DELETE_SUB_MENU.toString(); } @Override - protected JSONObject getExpectedParameters(int sdlVersion){ + protected JSONObject getExpectedParameters(int sdlVersion) { JSONObject result = new JSONObject(); - try{ + try { result.put(DeleteSubMenu.KEY_MENU_ID, TestValues.GENERAL_INT); - }catch(JSONException e){ - fail(TestValues.JSON_FAIL); + } catch (JSONException e) { + fail(TestValues.JSON_FAIL); } return result; } /** - * Tests the expected values of the RPC message. - */ + * Tests the expected values of the RPC message. + */ @Test - public void testRpcValues () { - // Test Values - int testMenuId = ( (DeleteSubMenu) msg ).getMenuID(); - + public void testRpcValues() { + // Test Values + int testMenuId = ((DeleteSubMenu) msg).getMenuID(); + // Valid Tests assertEquals(TestValues.MATCH, TestValues.GENERAL_INT, testMenuId); - + // Invalid/Null Tests DeleteSubMenu msg = new DeleteSubMenu(); assertNotNull(TestValues.NOT_NULL, msg); @@ -82,25 +82,25 @@ public class DeleteSubMenuTests extends BaseRpcTests{ * Tests a valid JSON construction of this RPC message. */ @Test - public void testJsonConstructor () { - JSONObject commandJson = JsonFileReader.readId(getInstrumentation().getTargetContext(), getCommandType(), getMessageType()); - assertNotNull(TestValues.NOT_NULL, commandJson); - - try { - Hashtable<String, Object> hash = JsonRPCMarshaller.deserializeJSONObject(commandJson); - DeleteSubMenu cmd = new DeleteSubMenu(hash); - - JSONObject body = JsonUtils.readJsonObjectFromJsonObject(commandJson, getMessageType()); - assertNotNull(TestValues.NOT_NULL, body); - - // Test everything in the json body. - assertEquals(TestValues.MATCH, JsonUtils.readStringFromJsonObject(body, RPCMessage.KEY_FUNCTION_NAME), cmd.getFunctionName()); - assertEquals(TestValues.MATCH, JsonUtils.readIntegerFromJsonObject(body, RPCMessage.KEY_CORRELATION_ID), cmd.getCorrelationID()); - - JSONObject parameters = JsonUtils.readJsonObjectFromJsonObject(body, RPCMessage.KEY_PARAMETERS); - assertEquals(TestValues.MATCH, JsonUtils.readIntegerFromJsonObject(parameters, DeleteSubMenu.KEY_MENU_ID), cmd.getMenuID()); - } catch (JSONException e) { - fail(TestValues.JSON_FAIL); - } - } + public void testJsonConstructor() { + JSONObject commandJson = JsonFileReader.readId(getInstrumentation().getTargetContext(), getCommandType(), getMessageType()); + assertNotNull(TestValues.NOT_NULL, commandJson); + + try { + Hashtable<String, Object> hash = JsonRPCMarshaller.deserializeJSONObject(commandJson); + DeleteSubMenu cmd = new DeleteSubMenu(hash); + + JSONObject body = JsonUtils.readJsonObjectFromJsonObject(commandJson, getMessageType()); + assertNotNull(TestValues.NOT_NULL, body); + + // Test everything in the json body. + assertEquals(TestValues.MATCH, JsonUtils.readStringFromJsonObject(body, RPCMessage.KEY_FUNCTION_NAME), cmd.getFunctionName()); + assertEquals(TestValues.MATCH, JsonUtils.readIntegerFromJsonObject(body, RPCMessage.KEY_CORRELATION_ID), cmd.getCorrelationID()); + + JSONObject parameters = JsonUtils.readJsonObjectFromJsonObject(body, RPCMessage.KEY_PARAMETERS); + assertEquals(TestValues.MATCH, JsonUtils.readIntegerFromJsonObject(parameters, DeleteSubMenu.KEY_MENU_ID), cmd.getMenuID()); + } catch (JSONException e) { + fail(TestValues.JSON_FAIL); + } + } }
\ No newline at end of file diff --git a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/DiagnosticMessageTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/DiagnosticMessageTests.java index 755a3dfb0..a075b887d 100644 --- a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/DiagnosticMessageTests.java +++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/DiagnosticMessageTests.java @@ -25,13 +25,13 @@ import static junit.framework.TestCase.assertTrue; import static junit.framework.TestCase.fail; /** - * This is a unit test class for the SmartDeviceLink library project class : + * This is a unit test class for the SmartDeviceLink library project class : * {@link com.smartdevicelink.proxy.rpc.DiagnosticMessage} */ -public class DiagnosticMessageTests extends BaseRpcTests{ +public class DiagnosticMessageTests extends BaseRpcTests { @Override - protected RPCMessage createMessage(){ + protected RPCMessage createMessage() { DiagnosticMessage msg = new DiagnosticMessage(); msg.setMessageLength(TestValues.GENERAL_INT); @@ -42,49 +42,49 @@ public class DiagnosticMessageTests extends BaseRpcTests{ } @Override - protected String getMessageType(){ + protected String getMessageType() { return RPCMessage.KEY_REQUEST; } @Override - protected String getCommandType(){ + protected String getCommandType() { return FunctionID.DIAGNOSTIC_MESSAGE.toString(); } @Override - protected JSONObject getExpectedParameters(int sdlVersion){ + protected JSONObject getExpectedParameters(int sdlVersion) { JSONObject result = new JSONObject(); - try{ + try { result.put(DiagnosticMessage.KEY_TARGET_ID, TestValues.GENERAL_INT); result.put(DiagnosticMessage.KEY_MESSAGE_LENGTH, TestValues.GENERAL_INT); result.put(DiagnosticMessage.KEY_MESSAGE_DATA, JsonUtils.createJsonArray(TestValues.GENERAL_INTEGER_LIST)); - }catch(JSONException e){ - fail(TestValues.JSON_FAIL); + } catch (JSONException e) { + fail(TestValues.JSON_FAIL); } return result; } /** - * Tests the expected values of the RPC message. - */ + * Tests the expected values of the RPC message. + */ @Test - public void testRpcValues () { - // Test Values - int testTargetId = ( (DiagnosticMessage) msg ).getTargetID(); - int testMessageLength = ( (DiagnosticMessage) msg ).getMessageLength(); - List<Integer> testMessageData = ( (DiagnosticMessage) msg ).getMessageData(); + public void testRpcValues() { + // Test Values + int testTargetId = ((DiagnosticMessage) msg).getTargetID(); + int testMessageLength = ((DiagnosticMessage) msg).getMessageLength(); + List<Integer> testMessageData = ((DiagnosticMessage) msg).getMessageData(); // Valid Tests assertEquals(TestValues.MATCH, TestValues.GENERAL_INT, testTargetId); assertEquals(TestValues.MATCH, TestValues.GENERAL_INT, testMessageLength); assertEquals(TestValues.MATCH, TestValues.GENERAL_INTEGER_LIST.size(), testMessageData.size()); - for(int i = 0; i < testMessageData.size(); i++){ + for (int i = 0; i < testMessageData.size(); i++) { assertEquals(TestValues.MATCH, TestValues.GENERAL_INTEGER_LIST.get(i), testMessageData.get(i)); } - + // Invalid/Null Tests DiagnosticMessage msg = new DiagnosticMessage(); assertNotNull(TestValues.NOT_NULL, msg); @@ -99,31 +99,31 @@ public class DiagnosticMessageTests extends BaseRpcTests{ * Tests a valid JSON construction of this RPC message. */ @Test - public void testJsonConstructor () { - JSONObject commandJson = JsonFileReader.readId(getInstrumentation().getTargetContext(), getCommandType(), getMessageType()); - assertNotNull(TestValues.NOT_NULL, commandJson); - - try { - Hashtable<String, Object> hash = JsonRPCMarshaller.deserializeJSONObject(commandJson); - DiagnosticMessage cmd = new DiagnosticMessage(hash); - - JSONObject body = JsonUtils.readJsonObjectFromJsonObject(commandJson, getMessageType()); - assertNotNull(TestValues.NOT_NULL, body); - - // Test everything in the json body. - assertEquals(TestValues.MATCH, JsonUtils.readStringFromJsonObject(body, RPCMessage.KEY_FUNCTION_NAME), cmd.getFunctionName()); - assertEquals(TestValues.MATCH, JsonUtils.readIntegerFromJsonObject(body, RPCMessage.KEY_CORRELATION_ID), cmd.getCorrelationID()); - - JSONObject parameters = JsonUtils.readJsonObjectFromJsonObject(body, RPCMessage.KEY_PARAMETERS); - assertEquals(TestValues.MATCH, JsonUtils.readIntegerFromJsonObject(parameters, DiagnosticMessage.KEY_TARGET_ID), cmd.getTargetID()); - assertEquals(TestValues.MATCH, JsonUtils.readIntegerFromJsonObject(parameters, DiagnosticMessage.KEY_MESSAGE_LENGTH), cmd.getMessageLength()); - - List<Integer> messageDataList = JsonUtils.readIntegerListFromJsonObject(parameters, DiagnosticMessage.KEY_MESSAGE_DATA); - List<Integer> testDataList = cmd.getMessageData(); - assertEquals(TestValues.MATCH, messageDataList.size(), testDataList.size()); - assertTrue(TestValues.TRUE, Validator.validateIntegerList(messageDataList, testDataList)); - } catch (JSONException e) { - fail(TestValues.JSON_FAIL); - } + public void testJsonConstructor() { + JSONObject commandJson = JsonFileReader.readId(getInstrumentation().getTargetContext(), getCommandType(), getMessageType()); + assertNotNull(TestValues.NOT_NULL, commandJson); + + try { + Hashtable<String, Object> hash = JsonRPCMarshaller.deserializeJSONObject(commandJson); + DiagnosticMessage cmd = new DiagnosticMessage(hash); + + JSONObject body = JsonUtils.readJsonObjectFromJsonObject(commandJson, getMessageType()); + assertNotNull(TestValues.NOT_NULL, body); + + // Test everything in the json body. + assertEquals(TestValues.MATCH, JsonUtils.readStringFromJsonObject(body, RPCMessage.KEY_FUNCTION_NAME), cmd.getFunctionName()); + assertEquals(TestValues.MATCH, JsonUtils.readIntegerFromJsonObject(body, RPCMessage.KEY_CORRELATION_ID), cmd.getCorrelationID()); + + JSONObject parameters = JsonUtils.readJsonObjectFromJsonObject(body, RPCMessage.KEY_PARAMETERS); + assertEquals(TestValues.MATCH, JsonUtils.readIntegerFromJsonObject(parameters, DiagnosticMessage.KEY_TARGET_ID), cmd.getTargetID()); + assertEquals(TestValues.MATCH, JsonUtils.readIntegerFromJsonObject(parameters, DiagnosticMessage.KEY_MESSAGE_LENGTH), cmd.getMessageLength()); + + List<Integer> messageDataList = JsonUtils.readIntegerListFromJsonObject(parameters, DiagnosticMessage.KEY_MESSAGE_DATA); + List<Integer> testDataList = cmd.getMessageData(); + assertEquals(TestValues.MATCH, messageDataList.size(), testDataList.size()); + assertTrue(TestValues.TRUE, Validator.validateIntegerList(messageDataList, testDataList)); + } catch (JSONException e) { + fail(TestValues.JSON_FAIL); + } } }
\ No newline at end of file diff --git a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/DialNumberTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/DialNumberTests.java index 7e6cd3991..b22dd002d 100644 --- a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/DialNumberTests.java +++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/DialNumberTests.java @@ -30,7 +30,7 @@ public class DialNumberTests extends BaseRpcTests { private final String TEST_NUMBER = "5558675309"; @Override - protected RPCMessage createMessage(){ + protected RPCMessage createMessage() { DialNumber msg = new DialNumber(); msg.setNumber(TEST_NUMBER); @@ -39,22 +39,22 @@ public class DialNumberTests extends BaseRpcTests { } @Override - protected String getMessageType(){ + protected String getMessageType() { return RPCMessage.KEY_REQUEST; } @Override - protected String getCommandType(){ + protected String getCommandType() { return FunctionID.DIAL_NUMBER.toString(); } @Override - protected JSONObject getExpectedParameters(int sdlVersion){ + protected JSONObject getExpectedParameters(int sdlVersion) { JSONObject result = new JSONObject(); - try{ + try { result.put(DialNumber.KEY_NUMBER, TEST_NUMBER); - }catch(JSONException e){ + } catch (JSONException e) { fail(TestValues.JSON_FAIL); } @@ -65,7 +65,7 @@ public class DialNumberTests extends BaseRpcTests { * Tests the expected values of the RPC message. */ @Test - public void testRpcValues () { + public void testRpcValues() { // Test Values String testNumber = ((DialNumber) msg).getNumber(); @@ -83,7 +83,7 @@ public class DialNumberTests extends BaseRpcTests { * Tests a valid JSON construction of this RPC message. */ @Test - public void testJsonConstructor () { + public void testJsonConstructor() { JSONObject commandJson = JsonFileReader.readId(getInstrumentation().getTargetContext(), getCommandType(), getMessageType()); assertNotNull(TestValues.NOT_NULL, commandJson); diff --git a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/EndAudioPassThruTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/EndAudioPassThruTests.java index f226c0630..398a23b0e 100644 --- a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/EndAudioPassThruTests.java +++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/EndAudioPassThruTests.java @@ -21,37 +21,37 @@ import static junit.framework.TestCase.assertNotNull; import static junit.framework.TestCase.fail; /** - * This is a unit test class for the SmartDeviceLink library project class : + * This is a unit test class for the SmartDeviceLink library project class : * {@link com.smartdevicelink.proxy.rpc.EndAudioPassThru} */ -public class EndAudioPassThruTests extends BaseRpcTests{ +public class EndAudioPassThruTests extends BaseRpcTests { @Override - protected RPCMessage createMessage(){ + protected RPCMessage createMessage() { return new EndAudioPassThru(); } @Override - protected String getMessageType(){ + protected String getMessageType() { return RPCMessage.KEY_REQUEST; } @Override - protected String getCommandType(){ + protected String getCommandType() { return FunctionID.END_AUDIO_PASS_THRU.toString(); } @Override - protected JSONObject getExpectedParameters(int sdlVersion){ + protected JSONObject getExpectedParameters(int sdlVersion) { return new JSONObject(); } /** - * Tests the expected values of the RPC message. - */ + * Tests the expected values of the RPC message. + */ @Test - public void testRpcValues () { - // Invalid/Null Tests + public void testRpcValues() { + // Invalid/Null Tests EndAudioPassThru msg = new EndAudioPassThru(); assertNotNull(TestValues.NOT_NULL, msg); testNullBase(msg); @@ -61,22 +61,22 @@ public class EndAudioPassThruTests extends BaseRpcTests{ * Tests a valid JSON construction of this RPC message. */ @Test - public void testJsonConstructor () { - JSONObject commandJson = JsonFileReader.readId(getInstrumentation().getTargetContext(), getCommandType(), getMessageType()); - assertNotNull(TestValues.NOT_NULL, commandJson); - - try { - Hashtable<String, Object> hash = JsonRPCMarshaller.deserializeJSONObject(commandJson); - EndAudioPassThru cmd = new EndAudioPassThru(hash); - - JSONObject body = JsonUtils.readJsonObjectFromJsonObject(commandJson, getMessageType()); - assertNotNull(TestValues.NOT_NULL, body); - - // Test everything in the json body. - assertEquals(TestValues.MATCH, JsonUtils.readStringFromJsonObject(body, RPCMessage.KEY_FUNCTION_NAME), cmd.getFunctionName()); - assertEquals(TestValues.MATCH, JsonUtils.readIntegerFromJsonObject(body, RPCMessage.KEY_CORRELATION_ID), cmd.getCorrelationID()); - } catch (JSONException e) { - fail(TestValues.JSON_FAIL); - } - } + public void testJsonConstructor() { + JSONObject commandJson = JsonFileReader.readId(getInstrumentation().getTargetContext(), getCommandType(), getMessageType()); + assertNotNull(TestValues.NOT_NULL, commandJson); + + try { + Hashtable<String, Object> hash = JsonRPCMarshaller.deserializeJSONObject(commandJson); + EndAudioPassThru cmd = new EndAudioPassThru(hash); + + JSONObject body = JsonUtils.readJsonObjectFromJsonObject(commandJson, getMessageType()); + assertNotNull(TestValues.NOT_NULL, body); + + // Test everything in the json body. + assertEquals(TestValues.MATCH, JsonUtils.readStringFromJsonObject(body, RPCMessage.KEY_FUNCTION_NAME), cmd.getFunctionName()); + assertEquals(TestValues.MATCH, JsonUtils.readIntegerFromJsonObject(body, RPCMessage.KEY_CORRELATION_ID), cmd.getCorrelationID()); + } catch (JSONException e) { + fail(TestValues.JSON_FAIL); + } + } }
\ No newline at end of file diff --git a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/GetAppServiceDataTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/GetAppServiceDataTests.java index 02e7fb5ff..53acb1c28 100644 --- a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/GetAppServiceDataTests.java +++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/GetAppServiceDataTests.java @@ -23,95 +23,95 @@ import static junit.framework.TestCase.fail; public class GetAppServiceDataTests extends BaseRpcTests { - @Override - protected RPCMessage createMessage() { - GetAppServiceData msg = new GetAppServiceData(); - msg.setServiceType(TestValues.GENERAL_STRING); - msg.setSubscribe(TestValues.GENERAL_BOOLEAN); - return msg; - } - - @Override - protected String getMessageType() { - return RPCMessage.KEY_REQUEST; - } - - @Override - protected String getCommandType() { - return FunctionID.GET_APP_SERVICE_DATA.toString(); - } - - @Override - protected JSONObject getExpectedParameters(int sdlVersion) { - JSONObject result = new JSONObject(); - - try { - result.put(GetAppServiceData.KEY_SERVICE_TYPE, TestValues.GENERAL_STRING); - result.put(GetAppServiceData.KEY_SUBSCRIBE, TestValues.GENERAL_BOOLEAN); - } catch (JSONException e) { - fail(TestValues.JSON_FAIL); - } - return result; - } - - /** - * Tests the expected values of the RPC message. - */ - @Test - public void testRpcValues () { - // Test Values - String serviceType = ( (GetAppServiceData) msg ).getServiceType(); - boolean subscribe = ( (GetAppServiceData) msg ).getSubscribe(); - - // Valid Tests - assertEquals(TestValues.MATCH, TestValues.GENERAL_STRING, serviceType); - assertEquals(TestValues.MATCH, TestValues.GENERAL_BOOLEAN, subscribe); - - // Invalid/Null Tests - GetAppServiceData msg = new GetAppServiceData(); - assertNotNull(TestValues.NOT_NULL, msg); - testNullBase(msg); - - assertNull(msg.getServiceType()); - assertNull(msg.getSubscribe()); - } - - /** - * Tests constructor with required params - */ - @Test - public void testRequiredParamsConstructor () { - - GetAppServiceData msg = new GetAppServiceData(TestValues.GENERAL_STRING); - assertNotNull(TestValues.NOT_NULL, msg); - // Valid Tests - assertEquals(TestValues.MATCH, TestValues.GENERAL_STRING, msg.getServiceType()); - } - - /** - * Tests a valid JSON construction of this RPC message. - */ - @Test - public void testJsonConstructor () { - JSONObject commandJson = JsonFileReader.readId(getInstrumentation().getTargetContext(), getCommandType(), getMessageType()); - assertNotNull(TestValues.NOT_NULL, commandJson); - - try { - Hashtable<String, Object> hash = JsonRPCMarshaller.deserializeJSONObject(commandJson); - GetAppServiceData cmd = new GetAppServiceData(hash); - - JSONObject body = JsonUtils.readJsonObjectFromJsonObject(commandJson, getMessageType()); - assertNotNull(TestValues.NOT_NULL, body); - - // Test everything in the json body. - assertEquals(TestValues.MATCH, JsonUtils.readStringFromJsonObject(body, RPCMessage.KEY_FUNCTION_NAME), cmd.getFunctionName()); - assertEquals(TestValues.MATCH, JsonUtils.readIntegerFromJsonObject(body, RPCMessage.KEY_CORRELATION_ID), cmd.getCorrelationID()); - - JSONObject parameters = JsonUtils.readJsonObjectFromJsonObject(body, RPCMessage.KEY_PARAMETERS); - assertEquals(TestValues.MATCH, JsonUtils.readBooleanFromJsonObject(parameters, GetAppServiceData.KEY_SUBSCRIBE), cmd.getSubscribe()); - assertEquals(TestValues.MATCH, JsonUtils.readObjectFromJsonObject(parameters, GetAppServiceData.KEY_SERVICE_TYPE).toString(), cmd.getServiceType().toString()); - } catch (JSONException e) { - e.printStackTrace(); - } - } + @Override + protected RPCMessage createMessage() { + GetAppServiceData msg = new GetAppServiceData(); + msg.setServiceType(TestValues.GENERAL_STRING); + msg.setSubscribe(TestValues.GENERAL_BOOLEAN); + return msg; + } + + @Override + protected String getMessageType() { + return RPCMessage.KEY_REQUEST; + } + + @Override + protected String getCommandType() { + return FunctionID.GET_APP_SERVICE_DATA.toString(); + } + + @Override + protected JSONObject getExpectedParameters(int sdlVersion) { + JSONObject result = new JSONObject(); + + try { + result.put(GetAppServiceData.KEY_SERVICE_TYPE, TestValues.GENERAL_STRING); + result.put(GetAppServiceData.KEY_SUBSCRIBE, TestValues.GENERAL_BOOLEAN); + } catch (JSONException e) { + fail(TestValues.JSON_FAIL); + } + return result; + } + + /** + * Tests the expected values of the RPC message. + */ + @Test + public void testRpcValues() { + // Test Values + String serviceType = ((GetAppServiceData) msg).getServiceType(); + boolean subscribe = ((GetAppServiceData) msg).getSubscribe(); + + // Valid Tests + assertEquals(TestValues.MATCH, TestValues.GENERAL_STRING, serviceType); + assertEquals(TestValues.MATCH, TestValues.GENERAL_BOOLEAN, subscribe); + + // Invalid/Null Tests + GetAppServiceData msg = new GetAppServiceData(); + assertNotNull(TestValues.NOT_NULL, msg); + testNullBase(msg); + + assertNull(msg.getServiceType()); + assertNull(msg.getSubscribe()); + } + + /** + * Tests constructor with required params + */ + @Test + public void testRequiredParamsConstructor() { + + GetAppServiceData msg = new GetAppServiceData(TestValues.GENERAL_STRING); + assertNotNull(TestValues.NOT_NULL, msg); + // Valid Tests + assertEquals(TestValues.MATCH, TestValues.GENERAL_STRING, msg.getServiceType()); + } + + /** + * Tests a valid JSON construction of this RPC message. + */ + @Test + public void testJsonConstructor() { + JSONObject commandJson = JsonFileReader.readId(getInstrumentation().getTargetContext(), getCommandType(), getMessageType()); + assertNotNull(TestValues.NOT_NULL, commandJson); + + try { + Hashtable<String, Object> hash = JsonRPCMarshaller.deserializeJSONObject(commandJson); + GetAppServiceData cmd = new GetAppServiceData(hash); + + JSONObject body = JsonUtils.readJsonObjectFromJsonObject(commandJson, getMessageType()); + assertNotNull(TestValues.NOT_NULL, body); + + // Test everything in the json body. + assertEquals(TestValues.MATCH, JsonUtils.readStringFromJsonObject(body, RPCMessage.KEY_FUNCTION_NAME), cmd.getFunctionName()); + assertEquals(TestValues.MATCH, JsonUtils.readIntegerFromJsonObject(body, RPCMessage.KEY_CORRELATION_ID), cmd.getCorrelationID()); + + JSONObject parameters = JsonUtils.readJsonObjectFromJsonObject(body, RPCMessage.KEY_PARAMETERS); + assertEquals(TestValues.MATCH, JsonUtils.readBooleanFromJsonObject(parameters, GetAppServiceData.KEY_SUBSCRIBE), cmd.getSubscribe()); + assertEquals(TestValues.MATCH, JsonUtils.readObjectFromJsonObject(parameters, GetAppServiceData.KEY_SERVICE_TYPE).toString(), cmd.getServiceType().toString()); + } catch (JSONException e) { + e.printStackTrace(); + } + } }
\ No newline at end of file diff --git a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/GetCloudAppPropertiesTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/GetCloudAppPropertiesTests.java index ad8238056..0def46997 100644 --- a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/GetCloudAppPropertiesTests.java +++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/GetCloudAppPropertiesTests.java @@ -13,36 +13,36 @@ import static junit.framework.TestCase.fail; public class GetCloudAppPropertiesTests extends BaseRpcTests { - @Override - protected RPCMessage createMessage(){ - GetCloudAppProperties msg = new GetCloudAppProperties(); + @Override + protected RPCMessage createMessage() { + GetCloudAppProperties msg = new GetCloudAppProperties(); - msg.setAppID(TestValues.GENERAL_STRING); + msg.setAppID(TestValues.GENERAL_STRING); - return msg; - } + return msg; + } - @Override - protected String getMessageType(){ - return RPCMessage.KEY_REQUEST; - } + @Override + protected String getMessageType() { + return RPCMessage.KEY_REQUEST; + } - @Override - protected String getCommandType(){ - return FunctionID.GET_CLOUD_APP_PROPERTIES.toString(); - } + @Override + protected String getCommandType() { + return FunctionID.GET_CLOUD_APP_PROPERTIES.toString(); + } - @Override - protected JSONObject getExpectedParameters(int sdlVersion){ - JSONObject result = new JSONObject(); + @Override + protected JSONObject getExpectedParameters(int sdlVersion) { + JSONObject result = new JSONObject(); - try{ - result.put(GetCloudAppProperties.KEY_APP_ID, TestValues.GENERAL_STRING); - }catch(JSONException e){ - fail(TestValues.JSON_FAIL); - } + try { + result.put(GetCloudAppProperties.KEY_APP_ID, TestValues.GENERAL_STRING); + } catch (JSONException e) { + fail(TestValues.JSON_FAIL); + } - return result; - } + return result; + } } diff --git a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/GetDTCsTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/GetDTCsTests.java index 05b8c1994..cf9cf6527 100644 --- a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/GetDTCsTests.java +++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/GetDTCsTests.java @@ -22,13 +22,13 @@ import static junit.framework.TestCase.assertNull; import static junit.framework.TestCase.fail; /** - * This is a unit test class for the SmartDeviceLink library project class : + * This is a unit test class for the SmartDeviceLink library project class : * {@link com.smartdevicelink.proxy.rpc.GetDTCs} */ -public class GetDTCsTests extends BaseRpcTests{ +public class GetDTCsTests extends BaseRpcTests { @Override - protected RPCMessage createMessage(){ + protected RPCMessage createMessage() { GetDTCs msg = new GetDTCs(); msg.setEcuName(TestValues.GENERAL_INT); @@ -38,43 +38,43 @@ public class GetDTCsTests extends BaseRpcTests{ } @Override - protected String getMessageType(){ + protected String getMessageType() { return RPCMessage.KEY_REQUEST; } @Override - protected String getCommandType(){ + protected String getCommandType() { return FunctionID.GET_DTCS.toString(); } @Override - protected JSONObject getExpectedParameters(int sdlVersion){ + protected JSONObject getExpectedParameters(int sdlVersion) { JSONObject result = new JSONObject(); - try{ + try { result.put(GetDTCs.KEY_ECU_NAME, TestValues.GENERAL_INT); result.put(GetDTCs.KEY_DTC_MASK, TestValues.GENERAL_INT); - }catch(JSONException e){ - fail(TestValues.JSON_FAIL); + } catch (JSONException e) { + fail(TestValues.JSON_FAIL); } return result; } /** - * Tests the expected values of the RPC message. - */ + * Tests the expected values of the RPC message. + */ @Test - public void testRpcValues () { - // Test Values - int testDtcMask = ( (GetDTCs) msg ).getDtcMask(); - int testEcuName = ( (GetDTCs) msg ).getEcuName(); - - // Valid Tests - assertEquals(TestValues.MATCH, TestValues.GENERAL_INT, testDtcMask); - assertEquals(TestValues.MATCH, TestValues.GENERAL_INT, testEcuName); - - // Invalid/Null Tests + public void testRpcValues() { + // Test Values + int testDtcMask = ((GetDTCs) msg).getDtcMask(); + int testEcuName = ((GetDTCs) msg).getEcuName(); + + // Valid Tests + assertEquals(TestValues.MATCH, TestValues.GENERAL_INT, testDtcMask); + assertEquals(TestValues.MATCH, TestValues.GENERAL_INT, testEcuName); + + // Invalid/Null Tests GetDTCs msg = new GetDTCs(); assertNotNull(TestValues.NOT_NULL, msg); testNullBase(msg); @@ -82,33 +82,32 @@ public class GetDTCsTests extends BaseRpcTests{ assertNull(TestValues.NULL, msg.getEcuName()); assertNull(TestValues.NULL, msg.getDtcMask()); } - + /** * Tests a valid JSON construction of this RPC message. */ @Test - public void testJsonConstructor () { - JSONObject commandJson = JsonFileReader.readId(getInstrumentation().getTargetContext(), getCommandType(), getMessageType()); - assertNotNull(TestValues.NOT_NULL, commandJson); - - try { - Hashtable<String, Object> hash = JsonRPCMarshaller.deserializeJSONObject(commandJson); - GetDTCs cmd = new GetDTCs(hash); - - JSONObject body = JsonUtils.readJsonObjectFromJsonObject(commandJson, getMessageType()); - assertNotNull(TestValues.NOT_NULL, body); - - // Test everything in the json body. - assertEquals(TestValues.MATCH, JsonUtils.readStringFromJsonObject(body, RPCMessage.KEY_FUNCTION_NAME), cmd.getFunctionName()); - assertEquals(TestValues.MATCH, JsonUtils.readIntegerFromJsonObject(body, RPCMessage.KEY_CORRELATION_ID), cmd.getCorrelationID()); - - JSONObject parameters = JsonUtils.readJsonObjectFromJsonObject(body, RPCMessage.KEY_PARAMETERS); - - assertEquals(TestValues.MATCH, JsonUtils.readIntegerFromJsonObject(parameters, GetDTCs.KEY_DTC_MASK), cmd.getDtcMask()); - assertEquals(TestValues.MATCH, JsonUtils.readIntegerFromJsonObject(parameters, GetDTCs.KEY_ECU_NAME), cmd.getEcuName()); - } - catch (JSONException e) { - fail(TestValues.JSON_FAIL); - } - } + public void testJsonConstructor() { + JSONObject commandJson = JsonFileReader.readId(getInstrumentation().getTargetContext(), getCommandType(), getMessageType()); + assertNotNull(TestValues.NOT_NULL, commandJson); + + try { + Hashtable<String, Object> hash = JsonRPCMarshaller.deserializeJSONObject(commandJson); + GetDTCs cmd = new GetDTCs(hash); + + JSONObject body = JsonUtils.readJsonObjectFromJsonObject(commandJson, getMessageType()); + assertNotNull(TestValues.NOT_NULL, body); + + // Test everything in the json body. + assertEquals(TestValues.MATCH, JsonUtils.readStringFromJsonObject(body, RPCMessage.KEY_FUNCTION_NAME), cmd.getFunctionName()); + assertEquals(TestValues.MATCH, JsonUtils.readIntegerFromJsonObject(body, RPCMessage.KEY_CORRELATION_ID), cmd.getCorrelationID()); + + JSONObject parameters = JsonUtils.readJsonObjectFromJsonObject(body, RPCMessage.KEY_PARAMETERS); + + assertEquals(TestValues.MATCH, JsonUtils.readIntegerFromJsonObject(parameters, GetDTCs.KEY_DTC_MASK), cmd.getDtcMask()); + assertEquals(TestValues.MATCH, JsonUtils.readIntegerFromJsonObject(parameters, GetDTCs.KEY_ECU_NAME), cmd.getEcuName()); + } catch (JSONException e) { + fail(TestValues.JSON_FAIL); + } + } }
\ No newline at end of file diff --git a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/GetFileTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/GetFileTests.java index 9d358cc8a..55e620950 100644 --- a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/GetFileTests.java +++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/GetFileTests.java @@ -25,118 +25,118 @@ import static junit.framework.TestCase.fail; public class GetFileTests extends BaseRpcTests { - @Override - protected RPCMessage createMessage() { - GetFile msg = new GetFile(); - - msg.setFileName(TestValues.GENERAL_STRING); - msg.setAppServiceId(TestValues.GENERAL_STRING); - msg.setFileType(TestValues.GENERAL_FILETYPE); - msg.setOffset(TestValues.GENERAL_INT); - msg.setLength(TestValues.GENERAL_INT); - - return msg; - } - - @Override - protected String getMessageType() { - return RPCMessage.KEY_REQUEST; - } - - @Override - protected String getCommandType() { - return FunctionID.GET_FILE.toString(); - } - - @Override - protected JSONObject getExpectedParameters(int sdlVersion) { - JSONObject result = new JSONObject(); - - try { - result.put(GetFile.KEY_FILE_NAME, TestValues.GENERAL_STRING); - result.put(GetFile.KEY_APP_SERVICE_ID, TestValues.GENERAL_STRING); - result.put(GetFile.KEY_FILE_TYPE, TestValues.GENERAL_FILETYPE); - result.put(GetFile.KEY_OFFSET, TestValues.GENERAL_INTEGER); - result.put(GetFile.KEY_LENGTH, TestValues.GENERAL_INTEGER); - } catch (JSONException e) { - fail(TestValues.JSON_FAIL); - } - - return result; - } - - /** - * Tests the expected values of the RPC message. - */ - @Test - public void testRpcValues () { - // Test Values - String fileName = ( (GetFile) msg ).getFileName(); - String appServiceId = ( (GetFile) msg ).getAppServiceId(); - FileType fileType = ( (GetFile) msg ).getFileType(); - Integer offset = ( (GetFile) msg ).getOffset(); - Integer length = ( (GetFile) msg ).getLength(); - - // Valid Tests - assertEquals(TestValues.MATCH, TestValues.GENERAL_STRING, fileName); - assertEquals(TestValues.MATCH, TestValues.GENERAL_STRING, appServiceId); - assertEquals(TestValues.MATCH, TestValues.GENERAL_FILETYPE, fileType); - assertEquals(TestValues.MATCH, TestValues.GENERAL_INTEGER, offset); - assertEquals(TestValues.MATCH, TestValues.GENERAL_INTEGER, length); - - // Invalid/Null Tests - GetFile msg = new GetFile(); - assertNotNull(TestValues.NOT_NULL, msg); - testNullBase(msg); - - assertNull(TestValues.NULL, msg.getFileName()); - assertNull(TestValues.NULL, msg.getAppServiceId()); - assertNull(TestValues.NULL, msg.getFileType()); - assertNull(TestValues.NULL, msg.getOffset()); - assertNull(TestValues.NULL, msg.getLength()); - } - - /** - * Tests constructor with required params - */ - @Test - public void testRequiredParamsConstructor () { - - GetFile msg = new GetFile(TestValues.GENERAL_STRING); - assertNotNull(TestValues.NOT_NULL, msg); - // Valid Tests - assertEquals(TestValues.MATCH, TestValues.GENERAL_STRING, msg.getFileName()); - } - - /** - * Tests a valid JSON construction of this RPC message. - */ - @Test - public void testJsonConstructor () { - JSONObject commandJson = JsonFileReader.readId(getInstrumentation().getTargetContext(), getCommandType(), getMessageType()); - assertNotNull(TestValues.NOT_NULL, commandJson); - - try { - Hashtable<String, Object> hash = JsonRPCMarshaller.deserializeJSONObject(commandJson); - GetFile cmd = new GetFile(hash); - - JSONObject body = JsonUtils.readJsonObjectFromJsonObject(commandJson, getMessageType()); - assertNotNull(TestValues.NOT_NULL, body); - - // Test everything in the json body. - assertEquals(TestValues.MATCH, JsonUtils.readStringFromJsonObject(body, RPCMessage.KEY_FUNCTION_NAME), cmd.getFunctionName()); - assertEquals(TestValues.MATCH, JsonUtils.readIntegerFromJsonObject(body, RPCMessage.KEY_CORRELATION_ID), cmd.getCorrelationID()); - - JSONObject parameters = JsonUtils.readJsonObjectFromJsonObject(body, RPCMessage.KEY_PARAMETERS); - - assertEquals(TestValues.MATCH, JsonUtils.readStringFromJsonObject(parameters, GetFile.KEY_APP_SERVICE_ID), cmd.getAppServiceId()); - assertEquals(TestValues.MATCH, JsonUtils.readStringFromJsonObject(parameters, GetFile.KEY_FILE_NAME), cmd.getFileName()); - assertEquals(TestValues.MATCH, JsonUtils.readObjectFromJsonObject(parameters, GetFile.KEY_FILE_TYPE).toString(), cmd.getFileType().toString()); - assertEquals(TestValues.MATCH, JsonUtils.readIntegerFromJsonObject(parameters, GetFile.KEY_LENGTH), cmd.getLength()); - assertEquals(TestValues.MATCH, JsonUtils.readIntegerFromJsonObject(parameters, GetFile.KEY_OFFSET), cmd.getOffset()); - } catch (JSONException e) { - e.printStackTrace(); - } - } + @Override + protected RPCMessage createMessage() { + GetFile msg = new GetFile(); + + msg.setFileName(TestValues.GENERAL_STRING); + msg.setAppServiceId(TestValues.GENERAL_STRING); + msg.setFileType(TestValues.GENERAL_FILETYPE); + msg.setOffset(TestValues.GENERAL_INT); + msg.setLength(TestValues.GENERAL_INT); + + return msg; + } + + @Override + protected String getMessageType() { + return RPCMessage.KEY_REQUEST; + } + + @Override + protected String getCommandType() { + return FunctionID.GET_FILE.toString(); + } + + @Override + protected JSONObject getExpectedParameters(int sdlVersion) { + JSONObject result = new JSONObject(); + + try { + result.put(GetFile.KEY_FILE_NAME, TestValues.GENERAL_STRING); + result.put(GetFile.KEY_APP_SERVICE_ID, TestValues.GENERAL_STRING); + result.put(GetFile.KEY_FILE_TYPE, TestValues.GENERAL_FILETYPE); + result.put(GetFile.KEY_OFFSET, TestValues.GENERAL_INTEGER); + result.put(GetFile.KEY_LENGTH, TestValues.GENERAL_INTEGER); + } catch (JSONException e) { + fail(TestValues.JSON_FAIL); + } + + return result; + } + + /** + * Tests the expected values of the RPC message. + */ + @Test + public void testRpcValues() { + // Test Values + String fileName = ((GetFile) msg).getFileName(); + String appServiceId = ((GetFile) msg).getAppServiceId(); + FileType fileType = ((GetFile) msg).getFileType(); + Integer offset = ((GetFile) msg).getOffset(); + Integer length = ((GetFile) msg).getLength(); + + // Valid Tests + assertEquals(TestValues.MATCH, TestValues.GENERAL_STRING, fileName); + assertEquals(TestValues.MATCH, TestValues.GENERAL_STRING, appServiceId); + assertEquals(TestValues.MATCH, TestValues.GENERAL_FILETYPE, fileType); + assertEquals(TestValues.MATCH, TestValues.GENERAL_INTEGER, offset); + assertEquals(TestValues.MATCH, TestValues.GENERAL_INTEGER, length); + + // Invalid/Null Tests + GetFile msg = new GetFile(); + assertNotNull(TestValues.NOT_NULL, msg); + testNullBase(msg); + + assertNull(TestValues.NULL, msg.getFileName()); + assertNull(TestValues.NULL, msg.getAppServiceId()); + assertNull(TestValues.NULL, msg.getFileType()); + assertNull(TestValues.NULL, msg.getOffset()); + assertNull(TestValues.NULL, msg.getLength()); + } + + /** + * Tests constructor with required params + */ + @Test + public void testRequiredParamsConstructor() { + + GetFile msg = new GetFile(TestValues.GENERAL_STRING); + assertNotNull(TestValues.NOT_NULL, msg); + // Valid Tests + assertEquals(TestValues.MATCH, TestValues.GENERAL_STRING, msg.getFileName()); + } + + /** + * Tests a valid JSON construction of this RPC message. + */ + @Test + public void testJsonConstructor() { + JSONObject commandJson = JsonFileReader.readId(getInstrumentation().getTargetContext(), getCommandType(), getMessageType()); + assertNotNull(TestValues.NOT_NULL, commandJson); + + try { + Hashtable<String, Object> hash = JsonRPCMarshaller.deserializeJSONObject(commandJson); + GetFile cmd = new GetFile(hash); + + JSONObject body = JsonUtils.readJsonObjectFromJsonObject(commandJson, getMessageType()); + assertNotNull(TestValues.NOT_NULL, body); + + // Test everything in the json body. + assertEquals(TestValues.MATCH, JsonUtils.readStringFromJsonObject(body, RPCMessage.KEY_FUNCTION_NAME), cmd.getFunctionName()); + assertEquals(TestValues.MATCH, JsonUtils.readIntegerFromJsonObject(body, RPCMessage.KEY_CORRELATION_ID), cmd.getCorrelationID()); + + JSONObject parameters = JsonUtils.readJsonObjectFromJsonObject(body, RPCMessage.KEY_PARAMETERS); + + assertEquals(TestValues.MATCH, JsonUtils.readStringFromJsonObject(parameters, GetFile.KEY_APP_SERVICE_ID), cmd.getAppServiceId()); + assertEquals(TestValues.MATCH, JsonUtils.readStringFromJsonObject(parameters, GetFile.KEY_FILE_NAME), cmd.getFileName()); + assertEquals(TestValues.MATCH, JsonUtils.readObjectFromJsonObject(parameters, GetFile.KEY_FILE_TYPE).toString(), cmd.getFileType().toString()); + assertEquals(TestValues.MATCH, JsonUtils.readIntegerFromJsonObject(parameters, GetFile.KEY_LENGTH), cmd.getLength()); + assertEquals(TestValues.MATCH, JsonUtils.readIntegerFromJsonObject(parameters, GetFile.KEY_OFFSET), cmd.getOffset()); + } catch (JSONException e) { + e.printStackTrace(); + } + } } 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 6d9bc2283..f1f96a701 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 @@ -25,79 +25,79 @@ import static junit.framework.TestCase.fail; public class GetInteriorVehicleDataConsentTests extends BaseRpcTests { - @Override - protected RPCMessage createMessage() { - GetInteriorVehicleDataConsent msg = new GetInteriorVehicleDataConsent(); - msg.setModuleType(TestValues.GENERAL_MODULETYPE); - msg.setModuleIds(TestValues.GENERAL_STRING_LIST); - return msg; - } - - @Override - protected JSONObject getExpectedParameters(int sdlVersion) { - JSONObject result = new JSONObject(); - try { - result.put(GetInteriorVehicleDataConsent.KEY_MODULE_TYPE, TestValues.GENERAL_MODULETYPE); - result.put(GetInteriorVehicleDataConsent.KEY_MODULE_ID, JsonUtils.createJsonArray(TestValues.GENERAL_STRING_LIST)); - } catch (JSONException e) { - fail(TestValues.JSON_FAIL); - } - return result; - } - - @Override - protected String getCommandType() { - return FunctionID.GET_INTERIOR_VEHICLE_DATA_CONSENT.toString(); - } - - @Override - protected String getMessageType(){ - return RPCMessage.KEY_REQUEST; - } - - @Test - public void testRpcValues() { - ModuleType type = ((GetInteriorVehicleDataConsent) msg).getModuleType(); - List<String> ids = ((GetInteriorVehicleDataConsent) msg).getModuleIds(); - - //valid tests - assertEquals(TestValues.MATCH, TestValues.GENERAL_MODULETYPE, type); - assertEquals(TestValues.MATCH, TestValues.GENERAL_STRING_LIST, ids); - - //null tests - GetInteriorVehicleDataConsent msg = new GetInteriorVehicleDataConsent(); - assertNull(TestValues.NULL, msg.getModuleType()); - assertNull(TestValues.NULL, msg.getModuleIds()); - - //test require param constructor - GetInteriorVehicleDataConsent msg2 = new GetInteriorVehicleDataConsent(TestValues.GENERAL_MODULETYPE, TestValues.GENERAL_STRING_LIST); - assertEquals(TestValues.MATCH, TestValues.GENERAL_MODULETYPE, msg2.getModuleType()); - assertEquals(TestValues.MATCH, TestValues.GENERAL_STRING_LIST, msg2.getModuleIds()); - - } - - @Test - public void testJsonConstructor() { - JSONObject commandJson = JsonFileReader.readId(getInstrumentation().getTargetContext(), getCommandType(), getMessageType()); - assertNotNull(TestValues.NOT_NULL, commandJson); - - try { - Hashtable<String, Object> hash = JsonRPCMarshaller.deserializeJSONObject(commandJson); - GetInteriorVehicleDataConsent cmd = new GetInteriorVehicleDataConsent(hash); - - JSONObject body = JsonUtils.readJsonObjectFromJsonObject(commandJson, getMessageType()); - assertNotNull(TestValues.NOT_NULL, body); - - assertEquals(TestValues.MATCH, JsonUtils.readStringFromJsonObject(body, RPCMessage.KEY_FUNCTION_NAME), cmd.getFunctionName()); - assertEquals(TestValues.MATCH, JsonUtils.readIntegerFromJsonObject(body, RPCMessage.KEY_CORRELATION_ID), cmd.getCorrelationID()); - - JSONObject parameters = JsonUtils.readJsonObjectFromJsonObject(body, RPCMessage.KEY_PARAMETERS); - assertEquals(TestValues.MATCH, JsonUtils.readObjectFromJsonObject(parameters, GetInteriorVehicleDataConsent.KEY_MODULE_TYPE).toString(), cmd.getModuleType().toString()); - assertEquals(TestValues.MATCH, JsonUtils.readStringListFromJsonObject(parameters, GetInteriorVehicleDataConsent.KEY_MODULE_ID), cmd.getModuleIds()); - } catch (JSONException e) { - fail(TestValues.JSON_FAIL); - } - } + @Override + protected RPCMessage createMessage() { + GetInteriorVehicleDataConsent msg = new GetInteriorVehicleDataConsent(); + msg.setModuleType(TestValues.GENERAL_MODULETYPE); + msg.setModuleIds(TestValues.GENERAL_STRING_LIST); + return msg; + } + + @Override + protected JSONObject getExpectedParameters(int sdlVersion) { + JSONObject result = new JSONObject(); + try { + result.put(GetInteriorVehicleDataConsent.KEY_MODULE_TYPE, TestValues.GENERAL_MODULETYPE); + result.put(GetInteriorVehicleDataConsent.KEY_MODULE_ID, JsonUtils.createJsonArray(TestValues.GENERAL_STRING_LIST)); + } catch (JSONException e) { + fail(TestValues.JSON_FAIL); + } + return result; + } + + @Override + protected String getCommandType() { + return FunctionID.GET_INTERIOR_VEHICLE_DATA_CONSENT.toString(); + } + + @Override + protected String getMessageType() { + return RPCMessage.KEY_REQUEST; + } + + @Test + public void testRpcValues() { + ModuleType type = ((GetInteriorVehicleDataConsent) msg).getModuleType(); + List<String> ids = ((GetInteriorVehicleDataConsent) msg).getModuleIds(); + + //valid tests + assertEquals(TestValues.MATCH, TestValues.GENERAL_MODULETYPE, type); + assertEquals(TestValues.MATCH, TestValues.GENERAL_STRING_LIST, ids); + + //null tests + GetInteriorVehicleDataConsent msg = new GetInteriorVehicleDataConsent(); + assertNull(TestValues.NULL, msg.getModuleType()); + assertNull(TestValues.NULL, msg.getModuleIds()); + + //test require param constructor + GetInteriorVehicleDataConsent msg2 = new GetInteriorVehicleDataConsent(TestValues.GENERAL_MODULETYPE, TestValues.GENERAL_STRING_LIST); + assertEquals(TestValues.MATCH, TestValues.GENERAL_MODULETYPE, msg2.getModuleType()); + assertEquals(TestValues.MATCH, TestValues.GENERAL_STRING_LIST, msg2.getModuleIds()); + + } + + @Test + public void testJsonConstructor() { + JSONObject commandJson = JsonFileReader.readId(getInstrumentation().getTargetContext(), getCommandType(), getMessageType()); + assertNotNull(TestValues.NOT_NULL, commandJson); + + try { + Hashtable<String, Object> hash = JsonRPCMarshaller.deserializeJSONObject(commandJson); + GetInteriorVehicleDataConsent cmd = new GetInteriorVehicleDataConsent(hash); + + JSONObject body = JsonUtils.readJsonObjectFromJsonObject(commandJson, getMessageType()); + assertNotNull(TestValues.NOT_NULL, body); + + assertEquals(TestValues.MATCH, JsonUtils.readStringFromJsonObject(body, RPCMessage.KEY_FUNCTION_NAME), cmd.getFunctionName()); + assertEquals(TestValues.MATCH, JsonUtils.readIntegerFromJsonObject(body, RPCMessage.KEY_CORRELATION_ID), cmd.getCorrelationID()); + + JSONObject parameters = JsonUtils.readJsonObjectFromJsonObject(body, RPCMessage.KEY_PARAMETERS); + assertEquals(TestValues.MATCH, JsonUtils.readObjectFromJsonObject(parameters, GetInteriorVehicleDataConsent.KEY_MODULE_TYPE).toString(), cmd.getModuleType().toString()); + assertEquals(TestValues.MATCH, JsonUtils.readStringListFromJsonObject(parameters, GetInteriorVehicleDataConsent.KEY_MODULE_ID), cmd.getModuleIds()); + } catch (JSONException e) { + fail(TestValues.JSON_FAIL); + } + } } diff --git a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/GetInteriorVehicleDataTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/GetInteriorVehicleDataTests.java index 615851917..9ae36b479 100644 --- a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/GetInteriorVehicleDataTests.java +++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/GetInteriorVehicleDataTests.java @@ -29,7 +29,7 @@ import static junit.framework.TestCase.fail; public class GetInteriorVehicleDataTests extends BaseRpcTests { @Override - protected RPCMessage createMessage(){ + protected RPCMessage createMessage() { GetInteriorVehicleData msg = new GetInteriorVehicleData(); msg.setModuleType(TestValues.GENERAL_MODULETYPE); @@ -40,24 +40,24 @@ public class GetInteriorVehicleDataTests extends BaseRpcTests { } @Override - protected String getMessageType(){ + protected String getMessageType() { return RPCMessage.KEY_REQUEST; } @Override - protected String getCommandType(){ + protected String getCommandType() { return FunctionID.GET_INTERIOR_VEHICLE_DATA.toString(); } @Override - protected JSONObject getExpectedParameters(int sdlVersion){ + protected JSONObject getExpectedParameters(int sdlVersion) { JSONObject result = new JSONObject(); - try{ + try { result.put(GetInteriorVehicleData.KEY_MODULE_TYPE, TestValues.GENERAL_MODULETYPE); result.put(GetInteriorVehicleData.KEY_SUBSCRIBE, TestValues.GENERAL_BOOLEAN); result.put(GetInteriorVehicleData.KEY_MODULE_ID, TestValues.GENERAL_STRING); - }catch(JSONException e){ + } catch (JSONException e) { fail(TestValues.JSON_FAIL); } @@ -68,10 +68,10 @@ public class GetInteriorVehicleDataTests extends BaseRpcTests { * Tests the expected values of the RPC message. */ @Test - public void testRpcValues () { + public void testRpcValues() { // Test Values - ModuleType testModuleType = ( (GetInteriorVehicleData) msg ).getModuleType(); - boolean testSubscribed = ( (GetInteriorVehicleData) msg ).getSubscribe(); + ModuleType testModuleType = ((GetInteriorVehicleData) msg).getModuleType(); + boolean testSubscribed = ((GetInteriorVehicleData) msg).getSubscribe(); String testModuleId = ((GetInteriorVehicleData) msg).getModuleId(); // Valid Tests @@ -93,7 +93,7 @@ public class GetInteriorVehicleDataTests extends BaseRpcTests { * Tests a valid JSON construction of this RPC message. */ @Test - public void testJsonConstructor () { + public void testJsonConstructor() { JSONObject commandJson = JsonFileReader.readId(getInstrumentation().getTargetContext(), getCommandType(), getMessageType()); assertNotNull(TestValues.NOT_NULL, commandJson); @@ -113,7 +113,7 @@ public class GetInteriorVehicleDataTests extends BaseRpcTests { assertEquals(TestValues.MATCH, JsonUtils.readObjectFromJsonObject(parameters, GetInteriorVehicleData.KEY_MODULE_TYPE).toString(), cmd.getModuleType().toString()); assertEquals(TestValues.MATCH, JsonUtils.readObjectFromJsonObject(parameters, GetInteriorVehicleData.KEY_SUBSCRIBE), cmd.getSubscribe()); assertEquals(TestValues.MATCH, JsonUtils.readObjectFromJsonObject(parameters, GetInteriorVehicleData.KEY_MODULE_ID), cmd.getModuleId()); - }catch (JSONException e) { + } catch (JSONException e) { fail(TestValues.JSON_FAIL); } } diff --git a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/GetSystemCapabilityTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/GetSystemCapabilityTests.java index 6eb55d90f..0fc757ccb 100644 --- a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/GetSystemCapabilityTests.java +++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/GetSystemCapabilityTests.java @@ -25,7 +25,7 @@ import static junit.framework.TestCase.fail; public class GetSystemCapabilityTests extends BaseRpcTests { @Override - protected RPCMessage createMessage(){ + protected RPCMessage createMessage() { GetSystemCapability msg = new GetSystemCapability(); msg.setSystemCapabilityType(TestValues.GENERAL_SYSTEMCAPABILITYTYPE); @@ -35,23 +35,23 @@ public class GetSystemCapabilityTests extends BaseRpcTests { } @Override - protected String getMessageType(){ + protected String getMessageType() { return RPCMessage.KEY_REQUEST; } @Override - protected String getCommandType(){ + protected String getCommandType() { return FunctionID.GET_SYSTEM_CAPABILITY.toString(); } @Override - protected JSONObject getExpectedParameters(int sdlVersion){ + protected JSONObject getExpectedParameters(int sdlVersion) { JSONObject result = new JSONObject(); - try{ + try { result.put(GetSystemCapability.KEY_SYSTEM_CAPABILITY_TYPE, TestValues.GENERAL_SYSTEMCAPABILITYTYPE); result.put(GetSystemCapability.KEY_SUBSCRIBE, TestValues.GENERAL_BOOLEAN); - }catch(JSONException e){ + } catch (JSONException e) { fail(TestValues.JSON_FAIL); } @@ -62,10 +62,10 @@ public class GetSystemCapabilityTests extends BaseRpcTests { * Tests the expected values of the RPC message. */ @Test - public void testRpcValues () { + public void testRpcValues() { // Test Values - SystemCapabilityType testType = ( (GetSystemCapability) msg ).getSystemCapabilityType(); - boolean testSubscribe = ( (GetSystemCapability) msg ).getSubscribe(); + SystemCapabilityType testType = ((GetSystemCapability) msg).getSystemCapabilityType(); + boolean testSubscribe = ((GetSystemCapability) msg).getSubscribe(); // Valid Tests assertEquals(TestValues.MATCH, TestValues.GENERAL_SYSTEMCAPABILITYTYPE, testType); @@ -84,7 +84,7 @@ public class GetSystemCapabilityTests extends BaseRpcTests { * Tests a valid JSON construction of this RPC message. */ @Test - public void testJsonConstructor () { + public void testJsonConstructor() { JSONObject commandJson = JsonFileReader.readId(getInstrumentation().getTargetContext(), getCommandType(), getMessageType()); assertNotNull(TestValues.NOT_NULL, commandJson); @@ -103,7 +103,7 @@ public class GetSystemCapabilityTests extends BaseRpcTests { assertEquals(TestValues.MATCH, JsonUtils.readObjectFromJsonObject(parameters, GetSystemCapability.KEY_SYSTEM_CAPABILITY_TYPE).toString(), cmd.getSystemCapabilityType().toString()); assertEquals(TestValues.MATCH, JsonUtils.readObjectFromJsonObject(parameters, GetSystemCapability.KEY_SUBSCRIBE), cmd.getSubscribe()); - }catch (JSONException e) { + } catch (JSONException e) { fail(TestValues.JSON_FAIL); } } diff --git a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/GetVehicleDataTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/GetVehicleDataTests.java index 637445ac7..fe726018f 100644 --- a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/GetVehicleDataTests.java +++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/GetVehicleDataTests.java @@ -23,68 +23,68 @@ import static junit.framework.TestCase.assertTrue; import static junit.framework.TestCase.fail; /** - * This is a unit test class for the SmartDeviceLink library project class : + * This is a unit test class for the SmartDeviceLink library project class : * {@link com.smartdevicelink.proxy.rpc.GetVehicleData} */ public class GetVehicleDataTests extends BaseRpcTests { - - @Override - protected RPCMessage createMessage(){ + + @Override + protected RPCMessage createMessage() { GetVehicleData msg = new GetVehicleData(); - msg.setSpeed(TestValues.GENERAL_BOOLEAN); - msg.setRpm(TestValues.GENERAL_BOOLEAN); - msg.setExternalTemperature(TestValues.GENERAL_BOOLEAN); - msg.setFuelLevel(TestValues.GENERAL_BOOLEAN); - msg.setPrndl(TestValues.GENERAL_BOOLEAN); - msg.setTirePressure(TestValues.GENERAL_BOOLEAN); - msg.setEngineTorque(TestValues.GENERAL_BOOLEAN); - msg.setEngineOilLife(TestValues.GENERAL_BOOLEAN); - msg.setOdometer(TestValues.GENERAL_BOOLEAN); - msg.setGps(TestValues.GENERAL_BOOLEAN); - msg.setFuelLevelState(TestValues.GENERAL_BOOLEAN); - msg.setInstantFuelConsumption(TestValues.GENERAL_BOOLEAN); - msg.setVin(TestValues.GENERAL_BOOLEAN); - msg.setBeltStatus(TestValues.GENERAL_BOOLEAN); - msg.setBodyInformation(TestValues.GENERAL_BOOLEAN); - msg.setDeviceStatus(TestValues.GENERAL_BOOLEAN); - msg.setDriverBraking(TestValues.GENERAL_BOOLEAN); - msg.setWiperStatus(TestValues.GENERAL_BOOLEAN); - msg.setHeadLampStatus(TestValues.GENERAL_BOOLEAN); - msg.setAccPedalPosition(TestValues.GENERAL_BOOLEAN); - msg.setSteeringWheelAngle(TestValues.GENERAL_BOOLEAN); - msg.setECallInfo(TestValues.GENERAL_BOOLEAN); - msg.setAirbagStatus(TestValues.GENERAL_BOOLEAN); - msg.setEmergencyEvent(TestValues.GENERAL_BOOLEAN); - msg.setClusterModeStatus(TestValues.GENERAL_BOOLEAN); - msg.setMyKey(TestValues.GENERAL_BOOLEAN); - msg.setFuelRange(TestValues.GENERAL_BOOLEAN); - msg.setTurnSignal(TestValues.GENERAL_BOOLEAN); - msg.setElectronicParkBrakeStatus(TestValues.GENERAL_BOOLEAN); - msg.setHandsOffSteering(TestValues.GENERAL_BOOLEAN); - msg.setWindowStatus(TestValues.GENERAL_BOOLEAN); - msg.setGearStatus(TestValues.GENERAL_BOOLEAN); - msg.setStabilityControlsStatus(TestValues.GENERAL_BOOLEAN); - msg.setOEMCustomVehicleData(TestValues.GENERAL_OEM_CUSTOM_VEHICLE_DATA_NAME, TestValues.GENERAL_BOOLEAN); + msg.setSpeed(TestValues.GENERAL_BOOLEAN); + msg.setRpm(TestValues.GENERAL_BOOLEAN); + msg.setExternalTemperature(TestValues.GENERAL_BOOLEAN); + msg.setFuelLevel(TestValues.GENERAL_BOOLEAN); + msg.setPrndl(TestValues.GENERAL_BOOLEAN); + msg.setTirePressure(TestValues.GENERAL_BOOLEAN); + msg.setEngineTorque(TestValues.GENERAL_BOOLEAN); + msg.setEngineOilLife(TestValues.GENERAL_BOOLEAN); + msg.setOdometer(TestValues.GENERAL_BOOLEAN); + msg.setGps(TestValues.GENERAL_BOOLEAN); + msg.setFuelLevelState(TestValues.GENERAL_BOOLEAN); + msg.setInstantFuelConsumption(TestValues.GENERAL_BOOLEAN); + msg.setVin(TestValues.GENERAL_BOOLEAN); + msg.setBeltStatus(TestValues.GENERAL_BOOLEAN); + msg.setBodyInformation(TestValues.GENERAL_BOOLEAN); + msg.setDeviceStatus(TestValues.GENERAL_BOOLEAN); + msg.setDriverBraking(TestValues.GENERAL_BOOLEAN); + msg.setWiperStatus(TestValues.GENERAL_BOOLEAN); + msg.setHeadLampStatus(TestValues.GENERAL_BOOLEAN); + msg.setAccPedalPosition(TestValues.GENERAL_BOOLEAN); + msg.setSteeringWheelAngle(TestValues.GENERAL_BOOLEAN); + msg.setECallInfo(TestValues.GENERAL_BOOLEAN); + msg.setAirbagStatus(TestValues.GENERAL_BOOLEAN); + msg.setEmergencyEvent(TestValues.GENERAL_BOOLEAN); + msg.setClusterModeStatus(TestValues.GENERAL_BOOLEAN); + msg.setMyKey(TestValues.GENERAL_BOOLEAN); + msg.setFuelRange(TestValues.GENERAL_BOOLEAN); + msg.setTurnSignal(TestValues.GENERAL_BOOLEAN); + msg.setElectronicParkBrakeStatus(TestValues.GENERAL_BOOLEAN); + msg.setHandsOffSteering(TestValues.GENERAL_BOOLEAN); + msg.setWindowStatus(TestValues.GENERAL_BOOLEAN); + msg.setGearStatus(TestValues.GENERAL_BOOLEAN); + msg.setStabilityControlsStatus(TestValues.GENERAL_BOOLEAN); + msg.setOEMCustomVehicleData(TestValues.GENERAL_OEM_CUSTOM_VEHICLE_DATA_NAME, TestValues.GENERAL_BOOLEAN); return msg; } @Override - protected String getMessageType(){ + protected String getMessageType() { return RPCMessage.KEY_REQUEST; } @Override - protected String getCommandType(){ + protected String getCommandType() { return FunctionID.GET_VEHICLE_DATA.toString(); } @Override - protected JSONObject getExpectedParameters(int sdlVersion){ + protected JSONObject getExpectedParameters(int sdlVersion) { JSONObject result = new JSONObject(); - try{ + try { result.put(GetVehicleData.KEY_SPEED, TestValues.GENERAL_BOOLEAN); result.put(GetVehicleData.KEY_RPM, TestValues.GENERAL_BOOLEAN); result.put(GetVehicleData.KEY_EXTERNAL_TEMPERATURE, TestValues.GENERAL_BOOLEAN); @@ -119,56 +119,56 @@ public class GetVehicleDataTests extends BaseRpcTests { result.put(GetVehicleData.KEY_WINDOW_STATUS, TestValues.GENERAL_BOOLEAN); result.put(GetVehicleData.KEY_STABILITY_CONTROLS_STATUS, TestValues.GENERAL_BOOLEAN); result.put(TestValues.GENERAL_OEM_CUSTOM_VEHICLE_DATA_NAME, TestValues.GENERAL_BOOLEAN); - }catch(JSONException e){ - fail(TestValues.JSON_FAIL); + } catch (JSONException e) { + fail(TestValues.JSON_FAIL); } return result; } - + /** - * Tests the expected values of the RPC message. - */ + * Tests the expected values of the RPC message. + */ @Test - public void testRpcValues () { - // Valid Tests - assertTrue(TestValues.TRUE, ( (GetVehicleData) msg ).getSpeed()); - assertTrue(TestValues.TRUE, ( (GetVehicleData) msg ).getRpm()); - assertTrue(TestValues.TRUE, ( (GetVehicleData) msg ).getExternalTemperature()); - assertTrue(TestValues.TRUE, ( (GetVehicleData) msg ).getFuelLevel()); - assertTrue(TestValues.TRUE, ( (GetVehicleData) msg ).getPrndl()); - assertTrue(TestValues.TRUE, ( (GetVehicleData) msg ).getTirePressure()); - assertTrue(TestValues.TRUE, ( (GetVehicleData) msg ).getEngineTorque()); - assertTrue(TestValues.TRUE, ( (GetVehicleData) msg ).getEngineOilLife()); - assertTrue(TestValues.TRUE, ( (GetVehicleData) msg ).getOdometer()); - assertTrue(TestValues.TRUE, ( (GetVehicleData) msg ).getGps()); - assertTrue(TestValues.TRUE, ( (GetVehicleData) msg ).getFuelLevelState()); - assertTrue(TestValues.TRUE, ( (GetVehicleData) msg ).getInstantFuelConsumption()); - assertTrue(TestValues.TRUE, ( (GetVehicleData) msg ).getVin()); - assertTrue(TestValues.TRUE, ( (GetVehicleData) msg ).getBeltStatus()); - assertTrue(TestValues.TRUE, ( (GetVehicleData) msg ).getBodyInformation()); - assertTrue(TestValues.TRUE, ( (GetVehicleData) msg ).getVin()); - assertTrue(TestValues.TRUE, ( (GetVehicleData) msg ).getDeviceStatus()); - assertTrue(TestValues.TRUE, ( (GetVehicleData) msg ).getDriverBraking()); - assertTrue(TestValues.TRUE, ( (GetVehicleData) msg ).getWiperStatus()); - assertTrue(TestValues.TRUE, ( (GetVehicleData) msg ).getHeadLampStatus()); - assertTrue(TestValues.TRUE, ( (GetVehicleData) msg ).getAccPedalPosition()); - assertTrue(TestValues.TRUE, ( (GetVehicleData) msg ).getSteeringWheelAngle()); - assertTrue(TestValues.TRUE, ( (GetVehicleData) msg ).getECallInfo()); - assertTrue(TestValues.TRUE, ( (GetVehicleData) msg ).getAirbagStatus()); - assertTrue(TestValues.TRUE, ( (GetVehicleData) msg ).getEmergencyEvent()); - assertTrue(TestValues.TRUE, ( (GetVehicleData) msg ).getClusterModeStatus()); - assertTrue(TestValues.TRUE, ( (GetVehicleData) msg ).getMyKey()); - assertTrue(TestValues.TRUE, ( (GetVehicleData) msg ).getFuelRange()); - assertTrue(TestValues.TRUE, ( (GetVehicleData) msg ).getTurnSignal()); - assertTrue(TestValues.TRUE, ( (GetVehicleData) msg ).getElectronicParkBrakeStatus()); - assertTrue(TestValues.TRUE, ( (GetVehicleData) msg ).getHandsOffSteering()); - assertTrue(TestValues.TRUE, ( (GetVehicleData) msg ).getWindowStatus()); - assertTrue(TestValues.TRUE, ( (GetVehicleData) msg ).getGearStatus()); - assertTrue(TestValues.TRUE, ( (GetVehicleData) msg ).getStabilityControlsStatus()); - assertTrue(TestValues.TRUE, ( (GetVehicleData) msg ).getOEMCustomVehicleData(TestValues.GENERAL_OEM_CUSTOM_VEHICLE_DATA_NAME)); - - // Invalid/Null Tests + public void testRpcValues() { + // Valid Tests + assertTrue(TestValues.TRUE, ((GetVehicleData) msg).getSpeed()); + assertTrue(TestValues.TRUE, ((GetVehicleData) msg).getRpm()); + assertTrue(TestValues.TRUE, ((GetVehicleData) msg).getExternalTemperature()); + assertTrue(TestValues.TRUE, ((GetVehicleData) msg).getFuelLevel()); + assertTrue(TestValues.TRUE, ((GetVehicleData) msg).getPrndl()); + assertTrue(TestValues.TRUE, ((GetVehicleData) msg).getTirePressure()); + assertTrue(TestValues.TRUE, ((GetVehicleData) msg).getEngineTorque()); + assertTrue(TestValues.TRUE, ((GetVehicleData) msg).getEngineOilLife()); + assertTrue(TestValues.TRUE, ((GetVehicleData) msg).getOdometer()); + assertTrue(TestValues.TRUE, ((GetVehicleData) msg).getGps()); + assertTrue(TestValues.TRUE, ((GetVehicleData) msg).getFuelLevelState()); + assertTrue(TestValues.TRUE, ((GetVehicleData) msg).getInstantFuelConsumption()); + assertTrue(TestValues.TRUE, ((GetVehicleData) msg).getVin()); + assertTrue(TestValues.TRUE, ((GetVehicleData) msg).getBeltStatus()); + assertTrue(TestValues.TRUE, ((GetVehicleData) msg).getBodyInformation()); + assertTrue(TestValues.TRUE, ((GetVehicleData) msg).getVin()); + assertTrue(TestValues.TRUE, ((GetVehicleData) msg).getDeviceStatus()); + assertTrue(TestValues.TRUE, ((GetVehicleData) msg).getDriverBraking()); + assertTrue(TestValues.TRUE, ((GetVehicleData) msg).getWiperStatus()); + assertTrue(TestValues.TRUE, ((GetVehicleData) msg).getHeadLampStatus()); + assertTrue(TestValues.TRUE, ((GetVehicleData) msg).getAccPedalPosition()); + assertTrue(TestValues.TRUE, ((GetVehicleData) msg).getSteeringWheelAngle()); + assertTrue(TestValues.TRUE, ((GetVehicleData) msg).getECallInfo()); + assertTrue(TestValues.TRUE, ((GetVehicleData) msg).getAirbagStatus()); + assertTrue(TestValues.TRUE, ((GetVehicleData) msg).getEmergencyEvent()); + assertTrue(TestValues.TRUE, ((GetVehicleData) msg).getClusterModeStatus()); + assertTrue(TestValues.TRUE, ((GetVehicleData) msg).getMyKey()); + assertTrue(TestValues.TRUE, ((GetVehicleData) msg).getFuelRange()); + assertTrue(TestValues.TRUE, ((GetVehicleData) msg).getTurnSignal()); + assertTrue(TestValues.TRUE, ((GetVehicleData) msg).getElectronicParkBrakeStatus()); + assertTrue(TestValues.TRUE, ((GetVehicleData) msg).getHandsOffSteering()); + assertTrue(TestValues.TRUE, ((GetVehicleData) msg).getWindowStatus()); + assertTrue(TestValues.TRUE, ((GetVehicleData) msg).getGearStatus()); + assertTrue(TestValues.TRUE, ((GetVehicleData) msg).getStabilityControlsStatus()); + assertTrue(TestValues.TRUE, ((GetVehicleData) msg).getOEMCustomVehicleData(TestValues.GENERAL_OEM_CUSTOM_VEHICLE_DATA_NAME)); + + // Invalid/Null Tests GetVehicleData msg = new GetVehicleData(); assertNotNull(TestValues.NOT_NULL, msg); testNullBase(msg); @@ -208,63 +208,63 @@ public class GetVehicleDataTests extends BaseRpcTests { assertNull(TestValues.NULL, msg.getStabilityControlsStatus()); assertNull(TestValues.NULL, msg.getOEMCustomVehicleData(TestValues.GENERAL_OEM_CUSTOM_VEHICLE_DATA_NAME)); } - + /** * Tests a valid JSON construction of this RPC message. */ @Test - public void testJsonConstructor () { - JSONObject commandJson = JsonFileReader.readId(getInstrumentation().getTargetContext(), getCommandType(), getMessageType()); - assertNotNull(TestValues.NOT_NULL, commandJson); - - try { - Hashtable<String, Object> hash = JsonRPCMarshaller.deserializeJSONObject(commandJson); - GetVehicleData cmd = new GetVehicleData(hash); - - JSONObject body = JsonUtils.readJsonObjectFromJsonObject(commandJson, getMessageType()); - assertNotNull(TestValues.NOT_NULL, body); - - // Test everything in the json body. - assertEquals("Command name doesn't match input name", JsonUtils.readStringFromJsonObject(body, RPCMessage.KEY_FUNCTION_NAME), cmd.getFunctionName()); - assertEquals("Correlation ID doesn't match input ID", JsonUtils.readIntegerFromJsonObject(body, RPCMessage.KEY_CORRELATION_ID), cmd.getCorrelationID()); + public void testJsonConstructor() { + JSONObject commandJson = JsonFileReader.readId(getInstrumentation().getTargetContext(), getCommandType(), getMessageType()); + assertNotNull(TestValues.NOT_NULL, commandJson); + + try { + Hashtable<String, Object> hash = JsonRPCMarshaller.deserializeJSONObject(commandJson); + GetVehicleData cmd = new GetVehicleData(hash); + + JSONObject body = JsonUtils.readJsonObjectFromJsonObject(commandJson, getMessageType()); + assertNotNull(TestValues.NOT_NULL, body); - JSONObject parameters = JsonUtils.readJsonObjectFromJsonObject(body, RPCMessage.KEY_PARAMETERS); - assertEquals(TestValues.MATCH, JsonUtils.readBooleanFromJsonObject(parameters, GetVehicleData.KEY_SPEED), cmd.getSpeed()); - assertEquals(TestValues.MATCH, JsonUtils.readBooleanFromJsonObject(parameters, GetVehicleData.KEY_RPM), cmd.getRpm()); - assertEquals(TestValues.MATCH, JsonUtils.readBooleanFromJsonObject(parameters, GetVehicleData.KEY_EXTERNAL_TEMPERATURE), cmd.getExternalTemperature()); - assertEquals(TestValues.MATCH, JsonUtils.readBooleanFromJsonObject(parameters, GetVehicleData.KEY_FUEL_LEVEL), cmd.getFuelLevel()); - assertEquals(TestValues.MATCH, JsonUtils.readBooleanFromJsonObject(parameters, GetVehicleData.KEY_VIN), cmd.getVin()); - assertEquals(TestValues.MATCH, JsonUtils.readBooleanFromJsonObject(parameters, GetVehicleData.KEY_PRNDL), cmd.getPrndl()); - assertEquals(TestValues.MATCH, JsonUtils.readBooleanFromJsonObject(parameters, GetVehicleData.KEY_TIRE_PRESSURE), cmd.getTirePressure()); - assertEquals(TestValues.MATCH, JsonUtils.readBooleanFromJsonObject(parameters, GetVehicleData.KEY_ENGINE_TORQUE), cmd.getEngineTorque()); - assertEquals(TestValues.MATCH, JsonUtils.readBooleanFromJsonObject(parameters, GetVehicleData.KEY_ENGINE_OIL_LIFE), cmd.getEngineOilLife()); - assertEquals(TestValues.MATCH, JsonUtils.readBooleanFromJsonObject(parameters, GetVehicleData.KEY_ODOMETER), cmd.getOdometer()); - assertEquals(TestValues.MATCH, JsonUtils.readBooleanFromJsonObject(parameters, GetVehicleData.KEY_GPS), cmd.getGps()); - assertEquals(TestValues.MATCH, JsonUtils.readBooleanFromJsonObject(parameters, GetVehicleData.KEY_FUEL_LEVEL_STATE), cmd.getFuelLevelState()); - assertEquals(TestValues.MATCH, JsonUtils.readBooleanFromJsonObject(parameters, GetVehicleData.KEY_INSTANT_FUEL_CONSUMPTION), cmd.getInstantFuelConsumption()); - assertEquals(TestValues.MATCH, JsonUtils.readBooleanFromJsonObject(parameters, GetVehicleData.KEY_BELT_STATUS), cmd.getBeltStatus()); - assertEquals(TestValues.MATCH, JsonUtils.readBooleanFromJsonObject(parameters, GetVehicleData.KEY_BODY_INFORMATION), cmd.getBodyInformation()); - assertEquals(TestValues.MATCH, JsonUtils.readBooleanFromJsonObject(parameters, GetVehicleData.KEY_DEVICE_STATUS), cmd.getDeviceStatus()); - assertEquals(TestValues.MATCH, JsonUtils.readBooleanFromJsonObject(parameters, GetVehicleData.KEY_DRIVER_BRAKING), cmd.getDriverBraking()); - assertEquals(TestValues.MATCH, JsonUtils.readBooleanFromJsonObject(parameters, GetVehicleData.KEY_WIPER_STATUS), cmd.getWiperStatus()); - assertEquals(TestValues.MATCH, JsonUtils.readBooleanFromJsonObject(parameters, GetVehicleData.KEY_HEAD_LAMP_STATUS), cmd.getHeadLampStatus()); - assertEquals(TestValues.MATCH, JsonUtils.readBooleanFromJsonObject(parameters, GetVehicleData.KEY_ACC_PEDAL_POSITION), cmd.getAccPedalPosition()); - assertEquals(TestValues.MATCH, JsonUtils.readBooleanFromJsonObject(parameters, GetVehicleData.KEY_STEERING_WHEEL_ANGLE), cmd.getSteeringWheelAngle()); - assertEquals(TestValues.MATCH, JsonUtils.readBooleanFromJsonObject(parameters, GetVehicleData.KEY_E_CALL_INFO), cmd.getECallInfo()); - assertEquals(TestValues.MATCH, JsonUtils.readBooleanFromJsonObject(parameters, GetVehicleData.KEY_AIRBAG_STATUS), cmd.getAirbagStatus()); - assertEquals(TestValues.MATCH, JsonUtils.readBooleanFromJsonObject(parameters, GetVehicleData.KEY_EMERGENCY_EVENT), cmd.getEmergencyEvent()); - assertEquals(TestValues.MATCH, JsonUtils.readBooleanFromJsonObject(parameters, GetVehicleData.KEY_CLUSTER_MODE_STATUS), cmd.getClusterModeStatus()); - assertEquals(TestValues.MATCH, JsonUtils.readBooleanFromJsonObject(parameters, GetVehicleData.KEY_MY_KEY), cmd.getMyKey()); - assertEquals(TestValues.MATCH, JsonUtils.readBooleanFromJsonObject(parameters, GetVehicleData.KEY_FUEL_RANGE), cmd.getFuelRange()); - assertEquals(TestValues.MATCH, JsonUtils.readBooleanFromJsonObject(parameters, GetVehicleData.KEY_TURN_SIGNAL), cmd.getTurnSignal()); - assertEquals(TestValues.MATCH, JsonUtils.readBooleanFromJsonObject(parameters, GetVehicleData.KEY_ELECTRONIC_PARK_BRAKE_STATUS), cmd.getElectronicParkBrakeStatus()); - assertEquals(TestValues.MATCH, JsonUtils.readBooleanFromJsonObject(parameters, GetVehicleData.KEY_HANDS_OFF_STEERING), cmd.getHandsOffSteering()); - assertEquals(TestValues.MATCH, JsonUtils.readBooleanFromJsonObject(parameters, GetVehicleData.KEY_WINDOW_STATUS), cmd.getWindowStatus()); - assertEquals(TestValues.MATCH, JsonUtils.readBooleanFromJsonObject(parameters, GetVehicleData.KEY_GEAR_STATUS), cmd.getGearStatus()); - assertEquals(TestValues.MATCH, JsonUtils.readBooleanFromJsonObject(parameters, GetVehicleData.KEY_STABILITY_CONTROLS_STATUS), cmd.getStabilityControlsStatus()); - assertEquals(TestValues.MATCH, JsonUtils.readBooleanFromJsonObject(parameters, TestValues.GENERAL_OEM_CUSTOM_VEHICLE_DATA_NAME), cmd.getOEMCustomVehicleData(TestValues.GENERAL_OEM_CUSTOM_VEHICLE_DATA_NAME)); - } catch (JSONException e) { - fail(TestValues.JSON_FAIL); - } + // Test everything in the json body. + assertEquals("Command name doesn't match input name", JsonUtils.readStringFromJsonObject(body, RPCMessage.KEY_FUNCTION_NAME), cmd.getFunctionName()); + assertEquals("Correlation ID doesn't match input ID", JsonUtils.readIntegerFromJsonObject(body, RPCMessage.KEY_CORRELATION_ID), cmd.getCorrelationID()); + + JSONObject parameters = JsonUtils.readJsonObjectFromJsonObject(body, RPCMessage.KEY_PARAMETERS); + assertEquals(TestValues.MATCH, JsonUtils.readBooleanFromJsonObject(parameters, GetVehicleData.KEY_SPEED), cmd.getSpeed()); + assertEquals(TestValues.MATCH, JsonUtils.readBooleanFromJsonObject(parameters, GetVehicleData.KEY_RPM), cmd.getRpm()); + assertEquals(TestValues.MATCH, JsonUtils.readBooleanFromJsonObject(parameters, GetVehicleData.KEY_EXTERNAL_TEMPERATURE), cmd.getExternalTemperature()); + assertEquals(TestValues.MATCH, JsonUtils.readBooleanFromJsonObject(parameters, GetVehicleData.KEY_FUEL_LEVEL), cmd.getFuelLevel()); + assertEquals(TestValues.MATCH, JsonUtils.readBooleanFromJsonObject(parameters, GetVehicleData.KEY_VIN), cmd.getVin()); + assertEquals(TestValues.MATCH, JsonUtils.readBooleanFromJsonObject(parameters, GetVehicleData.KEY_PRNDL), cmd.getPrndl()); + assertEquals(TestValues.MATCH, JsonUtils.readBooleanFromJsonObject(parameters, GetVehicleData.KEY_TIRE_PRESSURE), cmd.getTirePressure()); + assertEquals(TestValues.MATCH, JsonUtils.readBooleanFromJsonObject(parameters, GetVehicleData.KEY_ENGINE_TORQUE), cmd.getEngineTorque()); + assertEquals(TestValues.MATCH, JsonUtils.readBooleanFromJsonObject(parameters, GetVehicleData.KEY_ENGINE_OIL_LIFE), cmd.getEngineOilLife()); + assertEquals(TestValues.MATCH, JsonUtils.readBooleanFromJsonObject(parameters, GetVehicleData.KEY_ODOMETER), cmd.getOdometer()); + assertEquals(TestValues.MATCH, JsonUtils.readBooleanFromJsonObject(parameters, GetVehicleData.KEY_GPS), cmd.getGps()); + assertEquals(TestValues.MATCH, JsonUtils.readBooleanFromJsonObject(parameters, GetVehicleData.KEY_FUEL_LEVEL_STATE), cmd.getFuelLevelState()); + assertEquals(TestValues.MATCH, JsonUtils.readBooleanFromJsonObject(parameters, GetVehicleData.KEY_INSTANT_FUEL_CONSUMPTION), cmd.getInstantFuelConsumption()); + assertEquals(TestValues.MATCH, JsonUtils.readBooleanFromJsonObject(parameters, GetVehicleData.KEY_BELT_STATUS), cmd.getBeltStatus()); + assertEquals(TestValues.MATCH, JsonUtils.readBooleanFromJsonObject(parameters, GetVehicleData.KEY_BODY_INFORMATION), cmd.getBodyInformation()); + assertEquals(TestValues.MATCH, JsonUtils.readBooleanFromJsonObject(parameters, GetVehicleData.KEY_DEVICE_STATUS), cmd.getDeviceStatus()); + assertEquals(TestValues.MATCH, JsonUtils.readBooleanFromJsonObject(parameters, GetVehicleData.KEY_DRIVER_BRAKING), cmd.getDriverBraking()); + assertEquals(TestValues.MATCH, JsonUtils.readBooleanFromJsonObject(parameters, GetVehicleData.KEY_WIPER_STATUS), cmd.getWiperStatus()); + assertEquals(TestValues.MATCH, JsonUtils.readBooleanFromJsonObject(parameters, GetVehicleData.KEY_HEAD_LAMP_STATUS), cmd.getHeadLampStatus()); + assertEquals(TestValues.MATCH, JsonUtils.readBooleanFromJsonObject(parameters, GetVehicleData.KEY_ACC_PEDAL_POSITION), cmd.getAccPedalPosition()); + assertEquals(TestValues.MATCH, JsonUtils.readBooleanFromJsonObject(parameters, GetVehicleData.KEY_STEERING_WHEEL_ANGLE), cmd.getSteeringWheelAngle()); + assertEquals(TestValues.MATCH, JsonUtils.readBooleanFromJsonObject(parameters, GetVehicleData.KEY_E_CALL_INFO), cmd.getECallInfo()); + assertEquals(TestValues.MATCH, JsonUtils.readBooleanFromJsonObject(parameters, GetVehicleData.KEY_AIRBAG_STATUS), cmd.getAirbagStatus()); + assertEquals(TestValues.MATCH, JsonUtils.readBooleanFromJsonObject(parameters, GetVehicleData.KEY_EMERGENCY_EVENT), cmd.getEmergencyEvent()); + assertEquals(TestValues.MATCH, JsonUtils.readBooleanFromJsonObject(parameters, GetVehicleData.KEY_CLUSTER_MODE_STATUS), cmd.getClusterModeStatus()); + assertEquals(TestValues.MATCH, JsonUtils.readBooleanFromJsonObject(parameters, GetVehicleData.KEY_MY_KEY), cmd.getMyKey()); + assertEquals(TestValues.MATCH, JsonUtils.readBooleanFromJsonObject(parameters, GetVehicleData.KEY_FUEL_RANGE), cmd.getFuelRange()); + assertEquals(TestValues.MATCH, JsonUtils.readBooleanFromJsonObject(parameters, GetVehicleData.KEY_TURN_SIGNAL), cmd.getTurnSignal()); + assertEquals(TestValues.MATCH, JsonUtils.readBooleanFromJsonObject(parameters, GetVehicleData.KEY_ELECTRONIC_PARK_BRAKE_STATUS), cmd.getElectronicParkBrakeStatus()); + assertEquals(TestValues.MATCH, JsonUtils.readBooleanFromJsonObject(parameters, GetVehicleData.KEY_HANDS_OFF_STEERING), cmd.getHandsOffSteering()); + assertEquals(TestValues.MATCH, JsonUtils.readBooleanFromJsonObject(parameters, GetVehicleData.KEY_WINDOW_STATUS), cmd.getWindowStatus()); + assertEquals(TestValues.MATCH, JsonUtils.readBooleanFromJsonObject(parameters, GetVehicleData.KEY_GEAR_STATUS), cmd.getGearStatus()); + assertEquals(TestValues.MATCH, JsonUtils.readBooleanFromJsonObject(parameters, GetVehicleData.KEY_STABILITY_CONTROLS_STATUS), cmd.getStabilityControlsStatus()); + assertEquals(TestValues.MATCH, JsonUtils.readBooleanFromJsonObject(parameters, TestValues.GENERAL_OEM_CUSTOM_VEHICLE_DATA_NAME), cmd.getOEMCustomVehicleData(TestValues.GENERAL_OEM_CUSTOM_VEHICLE_DATA_NAME)); + } catch (JSONException e) { + fail(TestValues.JSON_FAIL); + } } }
\ No newline at end of file diff --git a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/GetWayPointsTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/GetWayPointsTests.java index 8a9586a93..1e27cbdec 100644 --- a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/GetWayPointsTests.java +++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/GetWayPointsTests.java @@ -28,7 +28,7 @@ import static junit.framework.TestCase.fail; public class GetWayPointsTests extends BaseRpcTests { @Override - protected RPCMessage createMessage(){ + protected RPCMessage createMessage() { GetWayPoints msg = new GetWayPoints(); msg.setWayPointType(WayPointType.DESTINATION); @@ -37,22 +37,22 @@ public class GetWayPointsTests extends BaseRpcTests { } @Override - protected String getMessageType(){ + protected String getMessageType() { return RPCMessage.KEY_REQUEST; } @Override - protected String getCommandType(){ + protected String getCommandType() { return FunctionID.GET_WAY_POINTS.toString(); } @Override - protected JSONObject getExpectedParameters(int sdlVersion){ + protected JSONObject getExpectedParameters(int sdlVersion) { JSONObject result = new JSONObject(); - try{ + try { result.put(GetWayPoints.KEY_WAY_POINT_TYPE, WayPointType.DESTINATION); - }catch(JSONException e){ + } catch (JSONException e) { fail(TestValues.JSON_FAIL); } @@ -63,9 +63,9 @@ public class GetWayPointsTests extends BaseRpcTests { * Tests the expected values of the RPC message. */ @Test - public void testRpcValues () { + public void testRpcValues() { // Test Values - WayPointType testType = ( (GetWayPoints) msg ).getWayPointType(); + WayPointType testType = ((GetWayPoints) msg).getWayPointType(); // Valid Tests assertEquals(TestValues.MATCH, WayPointType.DESTINATION, testType); @@ -82,7 +82,7 @@ public class GetWayPointsTests extends BaseRpcTests { * Tests a valid JSON construction of this RPC message. */ @Test - public void testJsonConstructor () { + public void testJsonConstructor() { JSONObject commandJson = JsonFileReader.readId(getInstrumentation().getTargetContext(), getCommandType(), getMessageType()); assertNotNull(TestValues.NOT_NULL, commandJson); diff --git a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/ListFilesTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/ListFilesTests.java index 60d2394b8..c7dd46b65 100644 --- a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/ListFilesTests.java +++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/ListFilesTests.java @@ -21,37 +21,37 @@ import static junit.framework.TestCase.assertNotNull; import static junit.framework.TestCase.fail; /** - * This is a unit test class for the SmartDeviceLink library project class : + * This is a unit test class for the SmartDeviceLink library project class : * {@link com.smartdevicelink.proxy.rpc.ListFiles} */ -public class ListFilesTests extends BaseRpcTests{ +public class ListFilesTests extends BaseRpcTests { @Override - protected RPCMessage createMessage(){ + protected RPCMessage createMessage() { return new ListFiles(); } @Override - protected String getMessageType(){ + protected String getMessageType() { return RPCMessage.KEY_REQUEST; } @Override - protected String getCommandType(){ + protected String getCommandType() { return FunctionID.LIST_FILES.toString(); } @Override - protected JSONObject getExpectedParameters(int sdlVersion){ + protected JSONObject getExpectedParameters(int sdlVersion) { return new JSONObject(); } /** - * Tests the expected values of the RPC message. - */ + * Tests the expected values of the RPC message. + */ @Test - public void testRpcValues () { - // Invalid/Null Tests + public void testRpcValues() { + // Invalid/Null Tests ListFiles msg = new ListFiles(); assertNotNull(TestValues.NOT_NULL, msg); testNullBase(msg); @@ -61,22 +61,22 @@ public class ListFilesTests extends BaseRpcTests{ * Tests a valid JSON construction of this RPC message. */ @Test - public void testJsonConstructor () { - JSONObject commandJson = JsonFileReader.readId(getInstrumentation().getTargetContext(), getCommandType(), getMessageType()); - assertNotNull(TestValues.NOT_NULL, commandJson); - - try { - Hashtable<String, Object> hash = JsonRPCMarshaller.deserializeJSONObject(commandJson); - ListFiles cmd = new ListFiles(hash); - - JSONObject body = JsonUtils.readJsonObjectFromJsonObject(commandJson, getMessageType()); - assertNotNull(TestValues.NOT_NULL, body); - - // Test everything in the json body. - assertEquals(TestValues.MATCH, JsonUtils.readStringFromJsonObject(body, RPCMessage.KEY_FUNCTION_NAME), cmd.getFunctionName()); - assertEquals(TestValues.MATCH, JsonUtils.readIntegerFromJsonObject(body, RPCMessage.KEY_CORRELATION_ID), cmd.getCorrelationID()); - } catch (JSONException e) { - fail(TestValues.JSON_FAIL); - } - } + public void testJsonConstructor() { + JSONObject commandJson = JsonFileReader.readId(getInstrumentation().getTargetContext(), getCommandType(), getMessageType()); + assertNotNull(TestValues.NOT_NULL, commandJson); + + try { + Hashtable<String, Object> hash = JsonRPCMarshaller.deserializeJSONObject(commandJson); + ListFiles cmd = new ListFiles(hash); + + JSONObject body = JsonUtils.readJsonObjectFromJsonObject(commandJson, getMessageType()); + assertNotNull(TestValues.NOT_NULL, body); + + // Test everything in the json body. + assertEquals(TestValues.MATCH, JsonUtils.readStringFromJsonObject(body, RPCMessage.KEY_FUNCTION_NAME), cmd.getFunctionName()); + assertEquals(TestValues.MATCH, JsonUtils.readIntegerFromJsonObject(body, RPCMessage.KEY_CORRELATION_ID), cmd.getCorrelationID()); + } catch (JSONException e) { + fail(TestValues.JSON_FAIL); + } + } }
\ No newline at end of file diff --git a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/PerformAppServiceInteractionTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/PerformAppServiceInteractionTests.java index bdc8bb9ac..e49999176 100644 --- a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/PerformAppServiceInteractionTests.java +++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/PerformAppServiceInteractionTests.java @@ -24,115 +24,115 @@ import static junit.framework.TestCase.fail; public class PerformAppServiceInteractionTests extends BaseRpcTests { - @Override - protected RPCMessage createMessage() { - PerformAppServiceInteraction msg = new PerformAppServiceInteraction(); - - msg.setServiceUri(TestValues.GENERAL_STRING); - msg.setServiceID(TestValues.GENERAL_STRING); - msg.setOriginApp(TestValues.GENERAL_STRING); - msg.setRequestServiceActive(TestValues.GENERAL_BOOLEAN); - - return msg; - } - - @Override - protected String getMessageType() { - return RPCMessage.KEY_REQUEST; - } - - @Override - protected String getCommandType() { - return FunctionID.PERFORM_APP_SERVICES_INTERACTION.toString(); - } - - @Override - protected JSONObject getExpectedParameters(int sdlVersion) { - JSONObject result = new JSONObject(); - - try { - result.put(PerformAppServiceInteraction.KEY_SERVICE_URI, TestValues.GENERAL_STRING); - result.put(PerformAppServiceInteraction.KEY_SERVICE_ID, TestValues.GENERAL_STRING); - result.put(PerformAppServiceInteraction.KEY_ORIGIN_APP, TestValues.GENERAL_STRING); - result.put(PerformAppServiceInteraction.KEY_REQUEST_SERVICE_ACTIVE, TestValues.GENERAL_BOOLEAN); - } catch (JSONException e) { - fail(TestValues.JSON_FAIL); - } - - return result; - } - - /** - * Tests the expected values of the RPC message. - */ - @Test - public void testRpcValues () { - // Test Values - String serviceUri = ( (PerformAppServiceInteraction) msg ).getServiceUri(); - String appServiceId = ( (PerformAppServiceInteraction) msg ).getServiceID(); - String originApp = ( (PerformAppServiceInteraction) msg ).getOriginApp(); - boolean requestServiceActive = ( (PerformAppServiceInteraction) msg ).getRequestServiceActive(); - - // Valid Tests - assertEquals(TestValues.MATCH, TestValues.GENERAL_STRING, serviceUri); - assertEquals(TestValues.MATCH, TestValues.GENERAL_STRING, appServiceId); - assertEquals(TestValues.MATCH, TestValues.GENERAL_STRING, originApp); - assertEquals(TestValues.MATCH, TestValues.GENERAL_BOOLEAN, requestServiceActive); - - // Invalid/Null Tests - PerformAppServiceInteraction msg = new PerformAppServiceInteraction(); - assertNotNull(TestValues.NOT_NULL, msg); - testNullBase(msg); - - assertNull(TestValues.NULL, msg.getServiceUri()); - assertNull(TestValues.NULL, msg.getServiceID()); - assertNull(TestValues.NULL, msg.getOriginApp()); - assertNull(TestValues.NULL, msg.getRequestServiceActive()); - } - - /** - * Tests constructor with required params - */ - @Test - public void testRequiredParamsConstructor () { - // test with param in constructor - PerformAppServiceInteraction msg = new PerformAppServiceInteraction(TestValues.GENERAL_STRING, TestValues.GENERAL_STRING, TestValues.GENERAL_STRING); - String serviceUri = msg.getServiceUri(); - String appServiceId = msg.getServiceID(); - String originApp = msg.getOriginApp(); - assertEquals(TestValues.MATCH, TestValues.GENERAL_STRING, serviceUri); - assertEquals(TestValues.MATCH, TestValues.GENERAL_STRING, appServiceId); - assertEquals(TestValues.MATCH, TestValues.GENERAL_STRING, originApp); - } - - /** - * Tests a valid JSON construction of this RPC message. - */ - @Test - public void testJsonConstructor () { - JSONObject commandJson = JsonFileReader.readId(getInstrumentation().getTargetContext(), getCommandType(), getMessageType()); - assertNotNull(TestValues.NOT_NULL, commandJson); - - try { - Hashtable<String, Object> hash = JsonRPCMarshaller.deserializeJSONObject(commandJson); - PerformAppServiceInteraction cmd = new PerformAppServiceInteraction(hash); - - JSONObject body = JsonUtils.readJsonObjectFromJsonObject(commandJson, getMessageType()); - assertNotNull(TestValues.NOT_NULL, body); - - // Test everything in the json body. - assertEquals(TestValues.MATCH, JsonUtils.readStringFromJsonObject(body, RPCMessage.KEY_FUNCTION_NAME), cmd.getFunctionName()); - assertEquals(TestValues.MATCH, JsonUtils.readIntegerFromJsonObject(body, RPCMessage.KEY_CORRELATION_ID), cmd.getCorrelationID()); - - JSONObject parameters = JsonUtils.readJsonObjectFromJsonObject(body, RPCMessage.KEY_PARAMETERS); - - assertEquals(TestValues.MATCH, JsonUtils.readStringFromJsonObject(parameters, PerformAppServiceInteraction.KEY_SERVICE_ID), cmd.getServiceID()); - assertEquals(TestValues.MATCH, JsonUtils.readStringFromJsonObject(parameters, PerformAppServiceInteraction.KEY_SERVICE_URI), cmd.getServiceUri()); - assertEquals(TestValues.MATCH, JsonUtils.readStringFromJsonObject(parameters, PerformAppServiceInteraction.KEY_ORIGIN_APP), cmd.getOriginApp()); - assertEquals(TestValues.MATCH, JsonUtils.readBooleanFromJsonObject(parameters, PerformAppServiceInteraction.KEY_REQUEST_SERVICE_ACTIVE), cmd.getRequestServiceActive()); - } catch (JSONException e) { - e.printStackTrace(); - } - } + @Override + protected RPCMessage createMessage() { + PerformAppServiceInteraction msg = new PerformAppServiceInteraction(); + + msg.setServiceUri(TestValues.GENERAL_STRING); + msg.setServiceID(TestValues.GENERAL_STRING); + msg.setOriginApp(TestValues.GENERAL_STRING); + msg.setRequestServiceActive(TestValues.GENERAL_BOOLEAN); + + return msg; + } + + @Override + protected String getMessageType() { + return RPCMessage.KEY_REQUEST; + } + + @Override + protected String getCommandType() { + return FunctionID.PERFORM_APP_SERVICES_INTERACTION.toString(); + } + + @Override + protected JSONObject getExpectedParameters(int sdlVersion) { + JSONObject result = new JSONObject(); + + try { + result.put(PerformAppServiceInteraction.KEY_SERVICE_URI, TestValues.GENERAL_STRING); + result.put(PerformAppServiceInteraction.KEY_SERVICE_ID, TestValues.GENERAL_STRING); + result.put(PerformAppServiceInteraction.KEY_ORIGIN_APP, TestValues.GENERAL_STRING); + result.put(PerformAppServiceInteraction.KEY_REQUEST_SERVICE_ACTIVE, TestValues.GENERAL_BOOLEAN); + } catch (JSONException e) { + fail(TestValues.JSON_FAIL); + } + + return result; + } + + /** + * Tests the expected values of the RPC message. + */ + @Test + public void testRpcValues() { + // Test Values + String serviceUri = ((PerformAppServiceInteraction) msg).getServiceUri(); + String appServiceId = ((PerformAppServiceInteraction) msg).getServiceID(); + String originApp = ((PerformAppServiceInteraction) msg).getOriginApp(); + boolean requestServiceActive = ((PerformAppServiceInteraction) msg).getRequestServiceActive(); + + // Valid Tests + assertEquals(TestValues.MATCH, TestValues.GENERAL_STRING, serviceUri); + assertEquals(TestValues.MATCH, TestValues.GENERAL_STRING, appServiceId); + assertEquals(TestValues.MATCH, TestValues.GENERAL_STRING, originApp); + assertEquals(TestValues.MATCH, TestValues.GENERAL_BOOLEAN, requestServiceActive); + + // Invalid/Null Tests + PerformAppServiceInteraction msg = new PerformAppServiceInteraction(); + assertNotNull(TestValues.NOT_NULL, msg); + testNullBase(msg); + + assertNull(TestValues.NULL, msg.getServiceUri()); + assertNull(TestValues.NULL, msg.getServiceID()); + assertNull(TestValues.NULL, msg.getOriginApp()); + assertNull(TestValues.NULL, msg.getRequestServiceActive()); + } + + /** + * Tests constructor with required params + */ + @Test + public void testRequiredParamsConstructor() { + // test with param in constructor + PerformAppServiceInteraction msg = new PerformAppServiceInteraction(TestValues.GENERAL_STRING, TestValues.GENERAL_STRING, TestValues.GENERAL_STRING); + String serviceUri = msg.getServiceUri(); + String appServiceId = msg.getServiceID(); + String originApp = msg.getOriginApp(); + assertEquals(TestValues.MATCH, TestValues.GENERAL_STRING, serviceUri); + assertEquals(TestValues.MATCH, TestValues.GENERAL_STRING, appServiceId); + assertEquals(TestValues.MATCH, TestValues.GENERAL_STRING, originApp); + } + + /** + * Tests a valid JSON construction of this RPC message. + */ + @Test + public void testJsonConstructor() { + JSONObject commandJson = JsonFileReader.readId(getInstrumentation().getTargetContext(), getCommandType(), getMessageType()); + assertNotNull(TestValues.NOT_NULL, commandJson); + + try { + Hashtable<String, Object> hash = JsonRPCMarshaller.deserializeJSONObject(commandJson); + PerformAppServiceInteraction cmd = new PerformAppServiceInteraction(hash); + + JSONObject body = JsonUtils.readJsonObjectFromJsonObject(commandJson, getMessageType()); + assertNotNull(TestValues.NOT_NULL, body); + + // Test everything in the json body. + assertEquals(TestValues.MATCH, JsonUtils.readStringFromJsonObject(body, RPCMessage.KEY_FUNCTION_NAME), cmd.getFunctionName()); + assertEquals(TestValues.MATCH, JsonUtils.readIntegerFromJsonObject(body, RPCMessage.KEY_CORRELATION_ID), cmd.getCorrelationID()); + + JSONObject parameters = JsonUtils.readJsonObjectFromJsonObject(body, RPCMessage.KEY_PARAMETERS); + + assertEquals(TestValues.MATCH, JsonUtils.readStringFromJsonObject(parameters, PerformAppServiceInteraction.KEY_SERVICE_ID), cmd.getServiceID()); + assertEquals(TestValues.MATCH, JsonUtils.readStringFromJsonObject(parameters, PerformAppServiceInteraction.KEY_SERVICE_URI), cmd.getServiceUri()); + assertEquals(TestValues.MATCH, JsonUtils.readStringFromJsonObject(parameters, PerformAppServiceInteraction.KEY_ORIGIN_APP), cmd.getOriginApp()); + assertEquals(TestValues.MATCH, JsonUtils.readBooleanFromJsonObject(parameters, PerformAppServiceInteraction.KEY_REQUEST_SERVICE_ACTIVE), cmd.getRequestServiceActive()); + } catch (JSONException e) { + e.printStackTrace(); + } + } } diff --git a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/PerformAudioPassThruTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/PerformAudioPassThruTests.java index d1bc966c5..bee27cb47 100644 --- a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/PerformAudioPassThruTests.java +++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/PerformAudioPassThruTests.java @@ -31,137 +31,137 @@ import static junit.framework.TestCase.assertTrue; import static junit.framework.TestCase.fail; /** - * This is a unit test class for the SmartDeviceLink library project class : + * This is a unit test class for the SmartDeviceLink library project class : * {@link com.smartdevicelink.proxy.rpc.PerformAudioPassThru} */ public class PerformAudioPassThruTests extends BaseRpcTests { - @Override - protected RPCMessage createMessage() { - PerformAudioPassThru msg = new PerformAudioPassThru(); - - msg.setInitialPrompt(TestValues.GENERAL_TTSCHUNK_LIST); - msg.setAudioPassThruDisplayText1(TestValues.GENERAL_STRING); - msg.setAudioPassThruDisplayText2(TestValues.GENERAL_STRING); - msg.setSamplingRate(TestValues.GENERAL_SAMPLINGRATE); - msg.setAudioType(TestValues.GENERAL_AUDIOTYPE); - msg.setBitsPerSample(TestValues.GENERAL_BITSPERSAMPLE); - msg.setMaxDuration(TestValues.GENERAL_INT); - msg.setMuteAudio(TestValues.GENERAL_BOOLEAN); - return msg; - } - - @Override - protected String getMessageType() { - return RPCMessage.KEY_REQUEST; - } - - @Override - protected String getCommandType() { - return FunctionID.PERFORM_AUDIO_PASS_THRU.toString(); - } - - @Override - protected JSONObject getExpectedParameters(int sdlVersion) { - JSONObject result = new JSONObject(); - - try { - result.put(PerformAudioPassThru.KEY_AUDIO_PASS_THRU_DISPLAY_TEXT_1, TestValues.GENERAL_STRING); - result.put(PerformAudioPassThru.KEY_AUDIO_PASS_THRU_DISPLAY_TEXT_2, TestValues.GENERAL_STRING); - result.put(PerformAudioPassThru.KEY_MUTE_AUDIO, TestValues.GENERAL_BOOLEAN); - result.put(PerformAudioPassThru.KEY_MAX_DURATION, TestValues.GENERAL_INT); - result.put(PerformAudioPassThru.KEY_AUDIO_TYPE, TestValues.GENERAL_AUDIOTYPE); - result.put(PerformAudioPassThru.KEY_SAMPLING_RATE, TestValues.GENERAL_SAMPLINGRATE); - result.put(PerformAudioPassThru.KEY_BITS_PER_SAMPLE, TestValues.GENERAL_BITSPERSAMPLE); - result.put(PerformAudioPassThru.KEY_INITIAL_PROMPT, TestValues.JSON_TTSCHUNKS); - } catch (JSONException e) { - fail(TestValues.JSON_FAIL); - } - - return result; - } - - /** - * Tests the expected values of the RPC message. - */ - @Test - public void testRpcValues () { - // Test Values - boolean testMuteAudio = ( (PerformAudioPassThru) msg ).getMuteAudio(); - int testMaxDuration = ( (PerformAudioPassThru) msg ).getMaxDuration(); - String testText2 = ( (PerformAudioPassThru) msg ).getAudioPassThruDisplayText2(); - String testText1 = ( (PerformAudioPassThru) msg ).getAudioPassThruDisplayText1(); - SamplingRate testSamplingRate = ( (PerformAudioPassThru) msg ).getSamplingRate(); - AudioType testAudioType = ( (PerformAudioPassThru) msg ).getAudioType(); - BitsPerSample testBitsPerSample = ( (PerformAudioPassThru) msg ).getBitsPerSample(); - List<TTSChunk> testInitialPrompt = ( (PerformAudioPassThru) msg ).getInitialPrompt(); - - // Valid Tests - assertEquals(TestValues.MATCH, TestValues.GENERAL_TTSCHUNK_LIST.size(), testInitialPrompt.size()); - assertEquals(TestValues.MATCH, TestValues.GENERAL_STRING, testText1); - assertEquals(TestValues.MATCH, TestValues.GENERAL_STRING, testText2); - assertEquals(TestValues.MATCH, TestValues.GENERAL_SAMPLINGRATE, testSamplingRate); - assertEquals(TestValues.MATCH, TestValues.GENERAL_BITSPERSAMPLE, testBitsPerSample); - assertEquals(TestValues.MATCH, TestValues.GENERAL_AUDIOTYPE, testAudioType); - assertEquals(TestValues.MATCH, TestValues.GENERAL_INT, testMaxDuration); - assertEquals(TestValues.MATCH, TestValues.GENERAL_BOOLEAN, testMuteAudio); - for (int i = 0; i < TestValues.GENERAL_TTSCHUNK_LIST.size(); i++) { - assertEquals(TestValues.MATCH, TestValues.GENERAL_TTSCHUNK_LIST.get(i), testInitialPrompt.get(i)); - } - - // Invalid/Null Tests - PerformAudioPassThru msg = new PerformAudioPassThru(); - assertNotNull(TestValues.NOT_NULL, msg); - testNullBase(msg); - - assertNull(TestValues.NULL, msg.getInitialPrompt()); - assertNull(TestValues.NULL, msg.getAudioPassThruDisplayText1()); - assertNull(TestValues.NULL, msg.getAudioPassThruDisplayText2()); - assertNull(TestValues.NULL, msg.getSamplingRate()); - assertNull(TestValues.NULL, msg.getBitsPerSample()); - assertNull(TestValues.NULL, msg.getAudioType()); - assertNull(TestValues.NULL, msg.getMaxDuration()); - assertNull(TestValues.NULL, msg.getMuteAudio()); - } + @Override + protected RPCMessage createMessage() { + PerformAudioPassThru msg = new PerformAudioPassThru(); + + msg.setInitialPrompt(TestValues.GENERAL_TTSCHUNK_LIST); + msg.setAudioPassThruDisplayText1(TestValues.GENERAL_STRING); + msg.setAudioPassThruDisplayText2(TestValues.GENERAL_STRING); + msg.setSamplingRate(TestValues.GENERAL_SAMPLINGRATE); + msg.setAudioType(TestValues.GENERAL_AUDIOTYPE); + msg.setBitsPerSample(TestValues.GENERAL_BITSPERSAMPLE); + msg.setMaxDuration(TestValues.GENERAL_INT); + msg.setMuteAudio(TestValues.GENERAL_BOOLEAN); + return msg; + } + + @Override + protected String getMessageType() { + return RPCMessage.KEY_REQUEST; + } + + @Override + protected String getCommandType() { + return FunctionID.PERFORM_AUDIO_PASS_THRU.toString(); + } + + @Override + protected JSONObject getExpectedParameters(int sdlVersion) { + JSONObject result = new JSONObject(); + + try { + result.put(PerformAudioPassThru.KEY_AUDIO_PASS_THRU_DISPLAY_TEXT_1, TestValues.GENERAL_STRING); + result.put(PerformAudioPassThru.KEY_AUDIO_PASS_THRU_DISPLAY_TEXT_2, TestValues.GENERAL_STRING); + result.put(PerformAudioPassThru.KEY_MUTE_AUDIO, TestValues.GENERAL_BOOLEAN); + result.put(PerformAudioPassThru.KEY_MAX_DURATION, TestValues.GENERAL_INT); + result.put(PerformAudioPassThru.KEY_AUDIO_TYPE, TestValues.GENERAL_AUDIOTYPE); + result.put(PerformAudioPassThru.KEY_SAMPLING_RATE, TestValues.GENERAL_SAMPLINGRATE); + result.put(PerformAudioPassThru.KEY_BITS_PER_SAMPLE, TestValues.GENERAL_BITSPERSAMPLE); + result.put(PerformAudioPassThru.KEY_INITIAL_PROMPT, TestValues.JSON_TTSCHUNKS); + } catch (JSONException e) { + fail(TestValues.JSON_FAIL); + } + + return result; + } + + /** + * Tests the expected values of the RPC message. + */ + @Test + public void testRpcValues() { + // Test Values + boolean testMuteAudio = ((PerformAudioPassThru) msg).getMuteAudio(); + int testMaxDuration = ((PerformAudioPassThru) msg).getMaxDuration(); + String testText2 = ((PerformAudioPassThru) msg).getAudioPassThruDisplayText2(); + String testText1 = ((PerformAudioPassThru) msg).getAudioPassThruDisplayText1(); + SamplingRate testSamplingRate = ((PerformAudioPassThru) msg).getSamplingRate(); + AudioType testAudioType = ((PerformAudioPassThru) msg).getAudioType(); + BitsPerSample testBitsPerSample = ((PerformAudioPassThru) msg).getBitsPerSample(); + List<TTSChunk> testInitialPrompt = ((PerformAudioPassThru) msg).getInitialPrompt(); + + // Valid Tests + assertEquals(TestValues.MATCH, TestValues.GENERAL_TTSCHUNK_LIST.size(), testInitialPrompt.size()); + assertEquals(TestValues.MATCH, TestValues.GENERAL_STRING, testText1); + assertEquals(TestValues.MATCH, TestValues.GENERAL_STRING, testText2); + assertEquals(TestValues.MATCH, TestValues.GENERAL_SAMPLINGRATE, testSamplingRate); + assertEquals(TestValues.MATCH, TestValues.GENERAL_BITSPERSAMPLE, testBitsPerSample); + assertEquals(TestValues.MATCH, TestValues.GENERAL_AUDIOTYPE, testAudioType); + assertEquals(TestValues.MATCH, TestValues.GENERAL_INT, testMaxDuration); + assertEquals(TestValues.MATCH, TestValues.GENERAL_BOOLEAN, testMuteAudio); + for (int i = 0; i < TestValues.GENERAL_TTSCHUNK_LIST.size(); i++) { + assertEquals(TestValues.MATCH, TestValues.GENERAL_TTSCHUNK_LIST.get(i), testInitialPrompt.get(i)); + } + + // Invalid/Null Tests + PerformAudioPassThru msg = new PerformAudioPassThru(); + assertNotNull(TestValues.NOT_NULL, msg); + testNullBase(msg); + + assertNull(TestValues.NULL, msg.getInitialPrompt()); + assertNull(TestValues.NULL, msg.getAudioPassThruDisplayText1()); + assertNull(TestValues.NULL, msg.getAudioPassThruDisplayText2()); + assertNull(TestValues.NULL, msg.getSamplingRate()); + assertNull(TestValues.NULL, msg.getBitsPerSample()); + assertNull(TestValues.NULL, msg.getAudioType()); + assertNull(TestValues.NULL, msg.getMaxDuration()); + assertNull(TestValues.NULL, msg.getMuteAudio()); + } /** * Tests a valid JSON construction of this RPC message. */ @Test - public void testJsonConstructor () { - JSONObject commandJson = JsonFileReader.readId(getInstrumentation().getTargetContext(), getCommandType(), getMessageType()); - assertNotNull(TestValues.NOT_NULL, commandJson); - - try { - Hashtable<String, Object> hash = JsonRPCMarshaller.deserializeJSONObject(commandJson); - PerformAudioPassThru cmd = new PerformAudioPassThru(hash); - - JSONObject body = JsonUtils.readJsonObjectFromJsonObject(commandJson, getMessageType()); - assertNotNull(TestValues.NOT_NULL, body); - - // Test everything in the json body. - assertEquals(TestValues.MATCH, JsonUtils.readStringFromJsonObject(body, RPCMessage.KEY_FUNCTION_NAME), cmd.getFunctionName()); - assertEquals(TestValues.MATCH, JsonUtils.readIntegerFromJsonObject(body, RPCMessage.KEY_CORRELATION_ID), cmd.getCorrelationID()); - - JSONObject parameters = JsonUtils.readJsonObjectFromJsonObject(body, RPCMessage.KEY_PARAMETERS); - assertEquals(TestValues.MATCH, JsonUtils.readIntegerFromJsonObject(parameters, PerformAudioPassThru.KEY_MAX_DURATION), (Integer)cmd.getMaxDuration()); - assertEquals(TestValues.MATCH, JsonUtils.readStringFromJsonObject(parameters, PerformAudioPassThru.KEY_AUDIO_PASS_THRU_DISPLAY_TEXT_1), cmd.getAudioPassThruDisplayText1()); - assertEquals(TestValues.MATCH, JsonUtils.readStringFromJsonObject(parameters, PerformAudioPassThru.KEY_AUDIO_PASS_THRU_DISPLAY_TEXT_2), cmd.getAudioPassThruDisplayText2()); - assertEquals(TestValues.MATCH, JsonUtils.readBooleanFromJsonObject(parameters, PerformAudioPassThru.KEY_MUTE_AUDIO), cmd.getMuteAudio()); - assertEquals(TestValues.MATCH, JsonUtils.readStringFromJsonObject(parameters, PerformAudioPassThru.KEY_SAMPLING_RATE), cmd.getSamplingRate().toString()); - assertEquals(TestValues.MATCH, JsonUtils.readStringFromJsonObject(parameters, PerformAudioPassThru.KEY_AUDIO_TYPE), cmd.getAudioType().toString()); - - JSONArray ttsChunkArray = JsonUtils.readJsonArrayFromJsonObject(parameters, PerformAudioPassThru.KEY_INITIAL_PROMPT); - List<TTSChunk> ttsChunkList = new ArrayList<TTSChunk>(); - for (int index = 0; index < ttsChunkArray.length(); index++) { - TTSChunk chunk = new TTSChunk(JsonRPCMarshaller.deserializeJSONObject( (JSONObject)ttsChunkArray.get(index)) ); - ttsChunkList.add(chunk); - } - assertTrue(TestValues.TRUE, Validator.validateTtsChunks(ttsChunkList, cmd.getInitialPrompt())); - - assertEquals(TestValues.MATCH, JsonUtils.readStringFromJsonObject(parameters, PerformAudioPassThru.KEY_BITS_PER_SAMPLE), cmd.getBitsPerSample().toString()); - } catch (JSONException e) { - fail(TestValues.JSON_FAIL); - } + public void testJsonConstructor() { + JSONObject commandJson = JsonFileReader.readId(getInstrumentation().getTargetContext(), getCommandType(), getMessageType()); + assertNotNull(TestValues.NOT_NULL, commandJson); + + try { + Hashtable<String, Object> hash = JsonRPCMarshaller.deserializeJSONObject(commandJson); + PerformAudioPassThru cmd = new PerformAudioPassThru(hash); + + JSONObject body = JsonUtils.readJsonObjectFromJsonObject(commandJson, getMessageType()); + assertNotNull(TestValues.NOT_NULL, body); + + // Test everything in the json body. + assertEquals(TestValues.MATCH, JsonUtils.readStringFromJsonObject(body, RPCMessage.KEY_FUNCTION_NAME), cmd.getFunctionName()); + assertEquals(TestValues.MATCH, JsonUtils.readIntegerFromJsonObject(body, RPCMessage.KEY_CORRELATION_ID), cmd.getCorrelationID()); + + JSONObject parameters = JsonUtils.readJsonObjectFromJsonObject(body, RPCMessage.KEY_PARAMETERS); + assertEquals(TestValues.MATCH, JsonUtils.readIntegerFromJsonObject(parameters, PerformAudioPassThru.KEY_MAX_DURATION), (Integer) cmd.getMaxDuration()); + assertEquals(TestValues.MATCH, JsonUtils.readStringFromJsonObject(parameters, PerformAudioPassThru.KEY_AUDIO_PASS_THRU_DISPLAY_TEXT_1), cmd.getAudioPassThruDisplayText1()); + assertEquals(TestValues.MATCH, JsonUtils.readStringFromJsonObject(parameters, PerformAudioPassThru.KEY_AUDIO_PASS_THRU_DISPLAY_TEXT_2), cmd.getAudioPassThruDisplayText2()); + assertEquals(TestValues.MATCH, JsonUtils.readBooleanFromJsonObject(parameters, PerformAudioPassThru.KEY_MUTE_AUDIO), cmd.getMuteAudio()); + assertEquals(TestValues.MATCH, JsonUtils.readStringFromJsonObject(parameters, PerformAudioPassThru.KEY_SAMPLING_RATE), cmd.getSamplingRate().toString()); + assertEquals(TestValues.MATCH, JsonUtils.readStringFromJsonObject(parameters, PerformAudioPassThru.KEY_AUDIO_TYPE), cmd.getAudioType().toString()); + + JSONArray ttsChunkArray = JsonUtils.readJsonArrayFromJsonObject(parameters, PerformAudioPassThru.KEY_INITIAL_PROMPT); + List<TTSChunk> ttsChunkList = new ArrayList<TTSChunk>(); + for (int index = 0; index < ttsChunkArray.length(); index++) { + TTSChunk chunk = new TTSChunk(JsonRPCMarshaller.deserializeJSONObject((JSONObject) ttsChunkArray.get(index))); + ttsChunkList.add(chunk); + } + assertTrue(TestValues.TRUE, Validator.validateTtsChunks(ttsChunkList, cmd.getInitialPrompt())); + + assertEquals(TestValues.MATCH, JsonUtils.readStringFromJsonObject(parameters, PerformAudioPassThru.KEY_BITS_PER_SAMPLE), cmd.getBitsPerSample().toString()); + } catch (JSONException e) { + fail(TestValues.JSON_FAIL); + } } }
\ No newline at end of file diff --git a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/PerformInteractionTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/PerformInteractionTests.java index 89afaa843..6ed75c104 100644 --- a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/PerformInteractionTests.java +++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/PerformInteractionTests.java @@ -31,173 +31,173 @@ import static junit.framework.TestCase.assertTrue; import static junit.framework.TestCase.fail; /** - * This is a unit test class for the SmartDeviceLink library project class : + * This is a unit test class for the SmartDeviceLink library project class : * {@link com.smartdevicelink.proxy.rpc.PerformInteraction} */ public class PerformInteractionTests extends BaseRpcTests { - - @Override - protected RPCMessage createMessage() { - PerformInteraction msg = new PerformInteraction(); - - msg.setInitialPrompt(TestValues.GENERAL_TTSCHUNK_LIST); - msg.setHelpPrompt(TestValues.GENERAL_TTSCHUNK_LIST); - msg.setTimeoutPrompt(TestValues.GENERAL_TTSCHUNK_LIST); - msg.setVrHelp(TestValues.GENERAL_VRHELPITEM_LIST); - msg.setInteractionChoiceSetIDList(TestValues.GENERAL_INTEGER_LIST); - msg.setInteractionLayout(TestValues.GENERAL_LAYOUTMODE); - msg.setInitialText(TestValues.GENERAL_STRING); - msg.setInteractionMode(TestValues.GENERAL_INTERACTIONMODE); - msg.setTimeout(TestValues.GENERAL_INT); - msg.setCancelID(TestValues.GENERAL_INTEGER); - - return msg; - } - - @Override - protected String getMessageType() { - return RPCMessage.KEY_REQUEST; - } - - @Override - protected String getCommandType() { - return FunctionID.PERFORM_INTERACTION.toString(); - } - - @Override - protected JSONObject getExpectedParameters(int sdlVersion) { - JSONObject result = new JSONObject(); - - try { - result.put(PerformInteraction.KEY_INITIAL_PROMPT, TestValues.JSON_TTSCHUNKS); - result.put(PerformInteraction.KEY_HELP_PROMPT, TestValues.JSON_TTSCHUNKS); - result.put(PerformInteraction.KEY_TIMEOUT_PROMPT, TestValues.JSON_TTSCHUNKS); - result.put(PerformInteraction.KEY_VR_HELP, TestValues.JSON_VRHELPITEMS); - result.put(PerformInteraction.KEY_INTERACTION_CHOICE_SET_ID_LIST, JsonUtils.createJsonArray(TestValues.GENERAL_INTEGER_LIST)); - result.put(PerformInteraction.KEY_INTERACTION_LAYOUT, TestValues.GENERAL_LAYOUTMODE); - result.put(PerformInteraction.KEY_INITIAL_TEXT, TestValues.GENERAL_STRING); - result.put(PerformInteraction.KEY_INTERACTION_MODE, TestValues.GENERAL_INTERACTIONMODE); - result.put(PerformInteraction.KEY_TIMEOUT, TestValues.GENERAL_INT); - result.put(PerformInteraction.KEY_CANCEL_ID, TestValues.GENERAL_INTEGER); - } catch (JSONException e) { - fail(TestValues.JSON_FAIL); - } - - return result; - } + + @Override + protected RPCMessage createMessage() { + PerformInteraction msg = new PerformInteraction(); + + msg.setInitialPrompt(TestValues.GENERAL_TTSCHUNK_LIST); + msg.setHelpPrompt(TestValues.GENERAL_TTSCHUNK_LIST); + msg.setTimeoutPrompt(TestValues.GENERAL_TTSCHUNK_LIST); + msg.setVrHelp(TestValues.GENERAL_VRHELPITEM_LIST); + msg.setInteractionChoiceSetIDList(TestValues.GENERAL_INTEGER_LIST); + msg.setInteractionLayout(TestValues.GENERAL_LAYOUTMODE); + msg.setInitialText(TestValues.GENERAL_STRING); + msg.setInteractionMode(TestValues.GENERAL_INTERACTIONMODE); + msg.setTimeout(TestValues.GENERAL_INT); + msg.setCancelID(TestValues.GENERAL_INTEGER); + + return msg; + } + + @Override + protected String getMessageType() { + return RPCMessage.KEY_REQUEST; + } + + @Override + protected String getCommandType() { + return FunctionID.PERFORM_INTERACTION.toString(); + } + + @Override + protected JSONObject getExpectedParameters(int sdlVersion) { + JSONObject result = new JSONObject(); + + try { + result.put(PerformInteraction.KEY_INITIAL_PROMPT, TestValues.JSON_TTSCHUNKS); + result.put(PerformInteraction.KEY_HELP_PROMPT, TestValues.JSON_TTSCHUNKS); + result.put(PerformInteraction.KEY_TIMEOUT_PROMPT, TestValues.JSON_TTSCHUNKS); + result.put(PerformInteraction.KEY_VR_HELP, TestValues.JSON_VRHELPITEMS); + result.put(PerformInteraction.KEY_INTERACTION_CHOICE_SET_ID_LIST, JsonUtils.createJsonArray(TestValues.GENERAL_INTEGER_LIST)); + result.put(PerformInteraction.KEY_INTERACTION_LAYOUT, TestValues.GENERAL_LAYOUTMODE); + result.put(PerformInteraction.KEY_INITIAL_TEXT, TestValues.GENERAL_STRING); + result.put(PerformInteraction.KEY_INTERACTION_MODE, TestValues.GENERAL_INTERACTIONMODE); + result.put(PerformInteraction.KEY_TIMEOUT, TestValues.GENERAL_INT); + result.put(PerformInteraction.KEY_CANCEL_ID, TestValues.GENERAL_INTEGER); + } catch (JSONException e) { + fail(TestValues.JSON_FAIL); + } + + return result; + } /** - * Tests the expected values of the RPC message. - */ + * Tests the expected values of the RPC message. + */ @Test - public void testRpcValues () { - // Test Values - List<TTSChunk> testInitialPrompt = ( (PerformInteraction) msg).getInitialPrompt(); - List<TTSChunk> testHelpPrompt = ( (PerformInteraction) msg).getHelpPrompt(); - List<TTSChunk> testTimeoutPrompt = ( (PerformInteraction) msg).getTimeoutPrompt(); - List<VrHelpItem> testVrHelpItems = ( (PerformInteraction) msg).getVrHelp(); - List<Integer> testChoiceSetIds = ( (PerformInteraction) msg).getInteractionChoiceSetIDList(); - LayoutMode testLayout = ( (PerformInteraction) msg).getInteractionLayout(); - String testInitialText = ( (PerformInteraction) msg).getInitialText(); - InteractionMode testMode = ( (PerformInteraction) msg).getInteractionMode(); - Integer testTimeout = ( (PerformInteraction) msg).getTimeout(); - Integer testCancelID = ( (PerformInteraction) msg ).getCancelID(); - - // Valid Tests - assertTrue(TestValues.TRUE, Validator.validateTtsChunks(TestValues.GENERAL_TTSCHUNK_LIST, testInitialPrompt)); - assertTrue(TestValues.TRUE, Validator.validateTtsChunks(TestValues.GENERAL_TTSCHUNK_LIST, testHelpPrompt)); - assertTrue(TestValues.TRUE, Validator.validateTtsChunks(TestValues.GENERAL_TTSCHUNK_LIST, testTimeoutPrompt)); - assertTrue(TestValues.TRUE, Validator.validateVrHelpItems(TestValues.GENERAL_VRHELPITEM_LIST, testVrHelpItems)); - assertEquals(TestValues.MATCH, TestValues.GENERAL_INTEGER_LIST, testChoiceSetIds); - assertEquals(TestValues.MATCH, TestValues.GENERAL_LAYOUTMODE, testLayout); - assertEquals(TestValues.MATCH, TestValues.GENERAL_STRING, testInitialText); - assertEquals(TestValues.MATCH, TestValues.GENERAL_INTERACTIONMODE, testMode); - assertEquals(TestValues.MATCH, (Integer) TestValues.GENERAL_INT, testTimeout); - assertEquals(TestValues.MATCH, TestValues.GENERAL_INTEGER, testCancelID); - - // Invald/Null Tests - PerformInteraction msg = new PerformInteraction(); - assertNotNull(TestValues.NOT_NULL, msg); - - testNullBase(msg); - - assertNull(TestValues.NULL, msg.getInitialPrompt()); - assertNull(TestValues.NULL, msg.getHelpPrompt()); - assertNull(TestValues.NULL, msg.getTimeoutPrompt()); - assertNull(TestValues.NULL, msg.getVrHelp()); - assertNull(TestValues.NULL, msg.getInteractionChoiceSetIDList()); - assertNull(TestValues.NULL, msg.getInteractionLayout()); - assertNull(TestValues.NULL, msg.getInitialText()); - assertNull(TestValues.NULL, msg.getInteractionMode()); - assertNull(TestValues.NULL, msg.getTimeout()); - assertNull(TestValues.NULL, msg.getCancelID()); - } + public void testRpcValues() { + // Test Values + List<TTSChunk> testInitialPrompt = ((PerformInteraction) msg).getInitialPrompt(); + List<TTSChunk> testHelpPrompt = ((PerformInteraction) msg).getHelpPrompt(); + List<TTSChunk> testTimeoutPrompt = ((PerformInteraction) msg).getTimeoutPrompt(); + List<VrHelpItem> testVrHelpItems = ((PerformInteraction) msg).getVrHelp(); + List<Integer> testChoiceSetIds = ((PerformInteraction) msg).getInteractionChoiceSetIDList(); + LayoutMode testLayout = ((PerformInteraction) msg).getInteractionLayout(); + String testInitialText = ((PerformInteraction) msg).getInitialText(); + InteractionMode testMode = ((PerformInteraction) msg).getInteractionMode(); + Integer testTimeout = ((PerformInteraction) msg).getTimeout(); + Integer testCancelID = ((PerformInteraction) msg).getCancelID(); + + // Valid Tests + assertTrue(TestValues.TRUE, Validator.validateTtsChunks(TestValues.GENERAL_TTSCHUNK_LIST, testInitialPrompt)); + assertTrue(TestValues.TRUE, Validator.validateTtsChunks(TestValues.GENERAL_TTSCHUNK_LIST, testHelpPrompt)); + assertTrue(TestValues.TRUE, Validator.validateTtsChunks(TestValues.GENERAL_TTSCHUNK_LIST, testTimeoutPrompt)); + assertTrue(TestValues.TRUE, Validator.validateVrHelpItems(TestValues.GENERAL_VRHELPITEM_LIST, testVrHelpItems)); + assertEquals(TestValues.MATCH, TestValues.GENERAL_INTEGER_LIST, testChoiceSetIds); + assertEquals(TestValues.MATCH, TestValues.GENERAL_LAYOUTMODE, testLayout); + assertEquals(TestValues.MATCH, TestValues.GENERAL_STRING, testInitialText); + assertEquals(TestValues.MATCH, TestValues.GENERAL_INTERACTIONMODE, testMode); + assertEquals(TestValues.MATCH, (Integer) TestValues.GENERAL_INT, testTimeout); + assertEquals(TestValues.MATCH, TestValues.GENERAL_INTEGER, testCancelID); + + // Invald/Null Tests + PerformInteraction msg = new PerformInteraction(); + assertNotNull(TestValues.NOT_NULL, msg); + + testNullBase(msg); + + assertNull(TestValues.NULL, msg.getInitialPrompt()); + assertNull(TestValues.NULL, msg.getHelpPrompt()); + assertNull(TestValues.NULL, msg.getTimeoutPrompt()); + assertNull(TestValues.NULL, msg.getVrHelp()); + assertNull(TestValues.NULL, msg.getInteractionChoiceSetIDList()); + assertNull(TestValues.NULL, msg.getInteractionLayout()); + assertNull(TestValues.NULL, msg.getInitialText()); + assertNull(TestValues.NULL, msg.getInteractionMode()); + assertNull(TestValues.NULL, msg.getTimeout()); + assertNull(TestValues.NULL, msg.getCancelID()); + } /** * Tests a valid JSON construction of this RPC message. */ @Test - public void testJsonConstructor () { - JSONObject commandJson = JsonFileReader.readId(getInstrumentation().getTargetContext(), getCommandType(), getMessageType()); - assertNotNull(TestValues.NOT_NULL, commandJson); - - try { - Hashtable<String, Object> hash = JsonRPCMarshaller.deserializeJSONObject(commandJson); - PerformInteraction cmd = new PerformInteraction(hash); - - JSONObject body = JsonUtils.readJsonObjectFromJsonObject(commandJson, getMessageType()); - assertNotNull(TestValues.NOT_NULL, body); - - // Test everything in the json body. - assertEquals(TestValues.MATCH, JsonUtils.readStringFromJsonObject(body, RPCMessage.KEY_FUNCTION_NAME), cmd.getFunctionName()); - assertEquals(TestValues.MATCH, JsonUtils.readIntegerFromJsonObject(body, RPCMessage.KEY_CORRELATION_ID), cmd.getCorrelationID()); - - JSONObject parameters = JsonUtils.readJsonObjectFromJsonObject(body, RPCMessage.KEY_PARAMETERS); - assertEquals(TestValues.MATCH, JsonUtils.readStringFromJsonObject(parameters, PerformInteraction.KEY_INITIAL_TEXT), cmd.getInitialText()); - assertEquals(TestValues.MATCH, JsonUtils.readStringFromJsonObject(parameters, PerformInteraction.KEY_INTERACTION_MODE), cmd.getInteractionMode().toString()); - assertEquals(TestValues.MATCH, JsonUtils.readIntegerFromJsonObject(parameters, PerformInteraction.KEY_CANCEL_ID), cmd.getCancelID()); - - List<Integer> interactionIDList = JsonUtils.readIntegerListFromJsonObject(parameters, PerformInteraction.KEY_INTERACTION_CHOICE_SET_ID_LIST); - List<Integer> testIDList = cmd.getInteractionChoiceSetIDList(); - assertEquals(TestValues.MATCH, interactionIDList.size(), testIDList.size()); - assertTrue(TestValues.TRUE, Validator.validateIntegerList(interactionIDList, testIDList)); - - assertEquals(TestValues.MATCH, JsonUtils.readStringFromJsonObject(parameters, PerformInteraction.KEY_INTERACTION_LAYOUT), cmd.getInteractionLayout().toString()); - - JSONArray initalPromptArray = JsonUtils.readJsonArrayFromJsonObject(parameters, PerformInteraction.KEY_INITIAL_PROMPT); - List<TTSChunk> initalPromptList = new ArrayList<TTSChunk>(); - for (int index = 0; index < initalPromptArray.length(); index++) { - TTSChunk chunk = new TTSChunk(JsonRPCMarshaller.deserializeJSONObject( (JSONObject)initalPromptArray.get(index)) ); - initalPromptList.add(chunk); - } - assertTrue(TestValues.TRUE, Validator.validateTtsChunks(initalPromptList, cmd.getInitialPrompt())); - - JSONArray helpPromptArray = JsonUtils.readJsonArrayFromJsonObject(parameters, PerformInteraction.KEY_HELP_PROMPT); - List<TTSChunk> helpPromptList = new ArrayList<TTSChunk>(); - for (int index = 0; index < helpPromptArray.length(); index++) { - TTSChunk chunk = new TTSChunk(JsonRPCMarshaller.deserializeJSONObject( (JSONObject)helpPromptArray.get(index)) ); - helpPromptList.add(chunk); - } - assertTrue(TestValues.TRUE, Validator.validateTtsChunks(helpPromptList, cmd.getHelpPrompt())); - - JSONArray timeoutPromptArray = JsonUtils.readJsonArrayFromJsonObject(parameters, PerformInteraction.KEY_TIMEOUT_PROMPT); - List<TTSChunk> timeoutPromptList = new ArrayList<TTSChunk>(); - for (int index = 0; index < timeoutPromptArray.length(); index++) { - TTSChunk chunk = new TTSChunk(JsonRPCMarshaller.deserializeJSONObject( (JSONObject)timeoutPromptArray.get(index)) ); - timeoutPromptList.add(chunk); - } - assertTrue(TestValues.TRUE, Validator.validateTtsChunks(timeoutPromptList, cmd.getTimeoutPrompt())); - assertEquals(TestValues.MATCH, JsonUtils.readIntegerFromJsonObject(parameters, PerformInteraction.KEY_TIMEOUT), cmd.getTimeout()); - - JSONArray vrHelpArray = JsonUtils.readJsonArrayFromJsonObject(parameters, PerformInteraction.KEY_VR_HELP); - List<VrHelpItem> vrHelpList= new ArrayList<VrHelpItem>(); - for (int index = 0; index < vrHelpArray.length(); index++) { - VrHelpItem vrHelpItem = new VrHelpItem(JsonRPCMarshaller.deserializeJSONObject( (JSONObject)vrHelpArray.get(index)) ); - vrHelpList.add(vrHelpItem); - } - assertTrue(TestValues.TRUE, Validator.validateVrHelpItems(vrHelpList, cmd.getVrHelp()) ); - } catch (JSONException e) { - fail(TestValues.JSON_FAIL); - } - } + public void testJsonConstructor() { + JSONObject commandJson = JsonFileReader.readId(getInstrumentation().getTargetContext(), getCommandType(), getMessageType()); + assertNotNull(TestValues.NOT_NULL, commandJson); + + try { + Hashtable<String, Object> hash = JsonRPCMarshaller.deserializeJSONObject(commandJson); + PerformInteraction cmd = new PerformInteraction(hash); + + JSONObject body = JsonUtils.readJsonObjectFromJsonObject(commandJson, getMessageType()); + assertNotNull(TestValues.NOT_NULL, body); + + // Test everything in the json body. + assertEquals(TestValues.MATCH, JsonUtils.readStringFromJsonObject(body, RPCMessage.KEY_FUNCTION_NAME), cmd.getFunctionName()); + assertEquals(TestValues.MATCH, JsonUtils.readIntegerFromJsonObject(body, RPCMessage.KEY_CORRELATION_ID), cmd.getCorrelationID()); + + JSONObject parameters = JsonUtils.readJsonObjectFromJsonObject(body, RPCMessage.KEY_PARAMETERS); + assertEquals(TestValues.MATCH, JsonUtils.readStringFromJsonObject(parameters, PerformInteraction.KEY_INITIAL_TEXT), cmd.getInitialText()); + assertEquals(TestValues.MATCH, JsonUtils.readStringFromJsonObject(parameters, PerformInteraction.KEY_INTERACTION_MODE), cmd.getInteractionMode().toString()); + assertEquals(TestValues.MATCH, JsonUtils.readIntegerFromJsonObject(parameters, PerformInteraction.KEY_CANCEL_ID), cmd.getCancelID()); + + List<Integer> interactionIDList = JsonUtils.readIntegerListFromJsonObject(parameters, PerformInteraction.KEY_INTERACTION_CHOICE_SET_ID_LIST); + List<Integer> testIDList = cmd.getInteractionChoiceSetIDList(); + assertEquals(TestValues.MATCH, interactionIDList.size(), testIDList.size()); + assertTrue(TestValues.TRUE, Validator.validateIntegerList(interactionIDList, testIDList)); + + assertEquals(TestValues.MATCH, JsonUtils.readStringFromJsonObject(parameters, PerformInteraction.KEY_INTERACTION_LAYOUT), cmd.getInteractionLayout().toString()); + + JSONArray initalPromptArray = JsonUtils.readJsonArrayFromJsonObject(parameters, PerformInteraction.KEY_INITIAL_PROMPT); + List<TTSChunk> initalPromptList = new ArrayList<TTSChunk>(); + for (int index = 0; index < initalPromptArray.length(); index++) { + TTSChunk chunk = new TTSChunk(JsonRPCMarshaller.deserializeJSONObject((JSONObject) initalPromptArray.get(index))); + initalPromptList.add(chunk); + } + assertTrue(TestValues.TRUE, Validator.validateTtsChunks(initalPromptList, cmd.getInitialPrompt())); + + JSONArray helpPromptArray = JsonUtils.readJsonArrayFromJsonObject(parameters, PerformInteraction.KEY_HELP_PROMPT); + List<TTSChunk> helpPromptList = new ArrayList<TTSChunk>(); + for (int index = 0; index < helpPromptArray.length(); index++) { + TTSChunk chunk = new TTSChunk(JsonRPCMarshaller.deserializeJSONObject((JSONObject) helpPromptArray.get(index))); + helpPromptList.add(chunk); + } + assertTrue(TestValues.TRUE, Validator.validateTtsChunks(helpPromptList, cmd.getHelpPrompt())); + + JSONArray timeoutPromptArray = JsonUtils.readJsonArrayFromJsonObject(parameters, PerformInteraction.KEY_TIMEOUT_PROMPT); + List<TTSChunk> timeoutPromptList = new ArrayList<TTSChunk>(); + for (int index = 0; index < timeoutPromptArray.length(); index++) { + TTSChunk chunk = new TTSChunk(JsonRPCMarshaller.deserializeJSONObject((JSONObject) timeoutPromptArray.get(index))); + timeoutPromptList.add(chunk); + } + assertTrue(TestValues.TRUE, Validator.validateTtsChunks(timeoutPromptList, cmd.getTimeoutPrompt())); + assertEquals(TestValues.MATCH, JsonUtils.readIntegerFromJsonObject(parameters, PerformInteraction.KEY_TIMEOUT), cmd.getTimeout()); + + JSONArray vrHelpArray = JsonUtils.readJsonArrayFromJsonObject(parameters, PerformInteraction.KEY_VR_HELP); + List<VrHelpItem> vrHelpList = new ArrayList<VrHelpItem>(); + for (int index = 0; index < vrHelpArray.length(); index++) { + VrHelpItem vrHelpItem = new VrHelpItem(JsonRPCMarshaller.deserializeJSONObject((JSONObject) vrHelpArray.get(index))); + vrHelpList.add(vrHelpItem); + } + assertTrue(TestValues.TRUE, Validator.validateVrHelpItems(vrHelpList, cmd.getVrHelp())); + } catch (JSONException e) { + fail(TestValues.JSON_FAIL); + } + } }
\ No newline at end of file diff --git a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/PublishAppServiceTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/PublishAppServiceTests.java index e999cb6d1..2bdd7d613 100644 --- a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/PublishAppServiceTests.java +++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/PublishAppServiceTests.java @@ -26,93 +26,93 @@ import static junit.framework.TestCase.fail; public class PublishAppServiceTests extends BaseRpcTests { - @Override - protected RPCMessage createMessage() { - PublishAppService msg = new PublishAppService(); - msg.setAppServiceManifest(TestValues.GENERAL_APPSERVICEMANIFEST); - return msg; - } - - @Override - protected String getMessageType() { - return RPCMessage.KEY_REQUEST; - } - - @Override - protected String getCommandType() { - return FunctionID.PUBLISH_APP_SERVICE.toString(); - } - - @Override - protected JSONObject getExpectedParameters(int sdlVersion) { - JSONObject result = new JSONObject(); - - try { - result.put(PublishAppService.KEY_APP_SERVICE_MANIFEST, JsonRPCMarshaller.serializeHashtable(TestValues.GENERAL_APPSERVICEMANIFEST.getStore())); - } catch (JSONException e) { - fail(TestValues.JSON_FAIL); - } - - return result; - } - - /** - * Tests the expected values of the RPC message. - */ - @Test - public void testRpcValues () { - // Test Values - AppServiceManifest copy = ( (PublishAppService) msg ).getAppServiceManifest(); - - // Valid Tests - assertTrue(Validator.validateAppServiceManifest(TestValues.GENERAL_APPSERVICEMANIFEST, copy)); - - // Invalid/Null Tests - PublishAppService msg = new PublishAppService(); - assertNotNull(TestValues.NOT_NULL, msg); - testNullBase(msg); - - assertNull(TestValues.MATCH, msg.getAppServiceManifest()); - } - - /** - * Tests constructor with required params - */ - @Test - public void testRequiredParamsConstructor () { - - PublishAppService msg = new PublishAppService(TestValues.GENERAL_APPSERVICEMANIFEST); - assertNotNull(TestValues.NOT_NULL, msg); - // Valid Tests - assertTrue(Validator.validateAppServiceManifest(TestValues.GENERAL_APPSERVICEMANIFEST, msg.getAppServiceManifest())); - } - - /** - * Tests a valid JSON construction of this RPC message. - */ - @Test - public void testJsonConstructor () { - JSONObject commandJson = JsonFileReader.readId(getInstrumentation().getTargetContext(), getCommandType(), getMessageType()); - assertNotNull(TestValues.NOT_NULL, commandJson); - - try { - Hashtable<String, Object> hash = JsonRPCMarshaller.deserializeJSONObject(commandJson); - PublishAppService cmd = new PublishAppService(hash); - - JSONObject body = JsonUtils.readJsonObjectFromJsonObject(commandJson, getMessageType()); - assertNotNull(TestValues.NOT_NULL, body); - - // Test everything in the json body. - assertEquals(TestValues.MATCH, JsonUtils.readStringFromJsonObject(body, RPCMessage.KEY_FUNCTION_NAME), cmd.getFunctionName()); - assertEquals(TestValues.MATCH, JsonUtils.readIntegerFromJsonObject(body, RPCMessage.KEY_CORRELATION_ID), cmd.getCorrelationID()); - - JSONObject parameters = JsonUtils.readJsonObjectFromJsonObject(body, RPCMessage.KEY_PARAMETERS); - - JSONObject appServiceManifestObject = JsonUtils.readJsonObjectFromJsonObject(parameters, PublishAppService.KEY_APP_SERVICE_MANIFEST); - AppServiceManifest manifestTest = new AppServiceManifest(JsonRPCMarshaller.deserializeJSONObject(appServiceManifestObject)); - assertTrue(TestValues.TRUE, Validator.validateAppServiceManifest(manifestTest, cmd.getAppServiceManifest())); - } catch (JSONException e) { - e.printStackTrace(); - } - } + @Override + protected RPCMessage createMessage() { + PublishAppService msg = new PublishAppService(); + msg.setAppServiceManifest(TestValues.GENERAL_APPSERVICEMANIFEST); + return msg; + } + + @Override + protected String getMessageType() { + return RPCMessage.KEY_REQUEST; + } + + @Override + protected String getCommandType() { + return FunctionID.PUBLISH_APP_SERVICE.toString(); + } + + @Override + protected JSONObject getExpectedParameters(int sdlVersion) { + JSONObject result = new JSONObject(); + + try { + result.put(PublishAppService.KEY_APP_SERVICE_MANIFEST, JsonRPCMarshaller.serializeHashtable(TestValues.GENERAL_APPSERVICEMANIFEST.getStore())); + } catch (JSONException e) { + fail(TestValues.JSON_FAIL); + } + + return result; + } + + /** + * Tests the expected values of the RPC message. + */ + @Test + public void testRpcValues() { + // Test Values + AppServiceManifest copy = ((PublishAppService) msg).getAppServiceManifest(); + + // Valid Tests + assertTrue(Validator.validateAppServiceManifest(TestValues.GENERAL_APPSERVICEMANIFEST, copy)); + + // Invalid/Null Tests + PublishAppService msg = new PublishAppService(); + assertNotNull(TestValues.NOT_NULL, msg); + testNullBase(msg); + + assertNull(TestValues.MATCH, msg.getAppServiceManifest()); + } + + /** + * Tests constructor with required params + */ + @Test + public void testRequiredParamsConstructor() { + + PublishAppService msg = new PublishAppService(TestValues.GENERAL_APPSERVICEMANIFEST); + assertNotNull(TestValues.NOT_NULL, msg); + // Valid Tests + assertTrue(Validator.validateAppServiceManifest(TestValues.GENERAL_APPSERVICEMANIFEST, msg.getAppServiceManifest())); + } + + /** + * Tests a valid JSON construction of this RPC message. + */ + @Test + public void testJsonConstructor() { + JSONObject commandJson = JsonFileReader.readId(getInstrumentation().getTargetContext(), getCommandType(), getMessageType()); + assertNotNull(TestValues.NOT_NULL, commandJson); + + try { + Hashtable<String, Object> hash = JsonRPCMarshaller.deserializeJSONObject(commandJson); + PublishAppService cmd = new PublishAppService(hash); + + JSONObject body = JsonUtils.readJsonObjectFromJsonObject(commandJson, getMessageType()); + assertNotNull(TestValues.NOT_NULL, body); + + // Test everything in the json body. + assertEquals(TestValues.MATCH, JsonUtils.readStringFromJsonObject(body, RPCMessage.KEY_FUNCTION_NAME), cmd.getFunctionName()); + assertEquals(TestValues.MATCH, JsonUtils.readIntegerFromJsonObject(body, RPCMessage.KEY_CORRELATION_ID), cmd.getCorrelationID()); + + JSONObject parameters = JsonUtils.readJsonObjectFromJsonObject(body, RPCMessage.KEY_PARAMETERS); + + JSONObject appServiceManifestObject = JsonUtils.readJsonObjectFromJsonObject(parameters, PublishAppService.KEY_APP_SERVICE_MANIFEST); + AppServiceManifest manifestTest = new AppServiceManifest(JsonRPCMarshaller.deserializeJSONObject(appServiceManifestObject)); + assertTrue(TestValues.TRUE, Validator.validateAppServiceManifest(manifestTest, cmd.getAppServiceManifest())); + } catch (JSONException e) { + e.printStackTrace(); + } + } }
\ No newline at end of file diff --git a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/PutFileTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/PutFileTests.java index 0e3b39aab..9ca62481e 100644 --- a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/PutFileTests.java +++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/PutFileTests.java @@ -24,136 +24,135 @@ import static junit.framework.TestCase.assertNull; import static junit.framework.TestCase.fail; /** - * This is a unit test class for the SmartDeviceLink library project class : + * This is a unit test class for the SmartDeviceLink library project class : * {@link com.smartdevicelink.proxy.rpc.PutFile} */ public class PutFileTests extends BaseRpcTests { - - @Override - protected RPCMessage createMessage() { - PutFile msg = new PutFile(); - - msg.setFileType(TestValues.GENERAL_FILETYPE); - msg.setPersistentFile(TestValues.GENERAL_BOOLEAN); - msg.setSystemFile(TestValues.GENERAL_BOOLEAN); - msg.setOffset(TestValues.GENERAL_LONG); - msg.setLength(TestValues.GENERAL_LONG); - msg.setCRC(TestValues.GENERAL_BYTE_ARRAY); - msg.setCRC(TestValues.GENERAL_LONG); - - return msg; - } - - @Override - protected String getMessageType() { - return RPCMessage.KEY_REQUEST; - } - - @Override - protected String getCommandType() { - return FunctionID.PUT_FILE.toString(); - } - - @Override - protected JSONObject getExpectedParameters(int sdlVersion) { - JSONObject result = new JSONObject(); - - try { - result.put(PutFile.KEY_FILE_TYPE, TestValues.GENERAL_FILETYPE); - result.put(PutFile.KEY_PERSISTENT_FILE, TestValues.GENERAL_BOOLEAN); - result.put(PutFile.KEY_SYSTEM_FILE, TestValues.GENERAL_BOOLEAN); - result.put(PutFile.KEY_OFFSET, TestValues.GENERAL_LONG); - result.put(PutFile.KEY_LENGTH, TestValues.GENERAL_LONG); - result.put(PutFile.KEY_CRC, TestValues.GENERAL_LONG); - } catch (JSONException e) { - fail(TestValues.JSON_FAIL); - } - - return result; - } - - /** - * Tests the expected values of the RPC message. - */ - @Test - public void testRpcValues () { - // Test Values - FileType testFileType = ( (PutFile) msg ).getFileType(); - boolean testPersistentFile = ( (PutFile) msg ).getPersistentFile(); - boolean testSystemFile = ( (PutFile) msg ).getSystemFile(); - Long testOffset = ( (PutFile) msg ).getOffset(); - Long testLength = ( (PutFile) msg ).getLength(); - Long testCRC = ( (PutFile) msg ).getCRC(); - - // Valid Tests - assertEquals(TestValues.MATCH, TestValues.GENERAL_FILETYPE, testFileType); - assertEquals(TestValues.MATCH, TestValues.GENERAL_BOOLEAN, testPersistentFile); - assertEquals(TestValues.MATCH, TestValues.GENERAL_BOOLEAN, testSystemFile); - assertEquals(TestValues.MATCH, TestValues.GENERAL_LONG, testOffset); - assertEquals(TestValues.MATCH, TestValues.GENERAL_LONG, testLength); - assertEquals(TestValues.MATCH, TestValues.GENERAL_LONG, testCRC); - - // Invalid/Null Tests - PutFile msg = new PutFile(); - assertNotNull("Null object creation failed.", msg); - testNullBase(msg); - - assertNull(TestValues.NULL, msg.getFileType()); - assertNull(TestValues.NULL, msg.getPersistentFile()); - assertNull(TestValues.NULL, msg.getSystemFile()); - assertNull(TestValues.NULL, msg.getOffset()); - assertNull(TestValues.NULL, msg.getLength()); - assertNull(TestValues.NULL, msg.getCRC()); - } - - /** - * Tests the expected values of the CRC checksum. - */ - @Test - public void testByteArrayCheckSum () { - // Test Values - PutFile msgCRC = new PutFile(); - msgCRC.setCRC(TestValues.GENERAL_BYTE_ARRAY); - Long testCRCByteArray = msgCRC.getCRC(); - - CRC32 crc = new CRC32(); - crc.update(TestValues.GENERAL_BYTE_ARRAY); - Long crcValue = crc.getValue(); - - assertEquals(TestValues.MATCH, crcValue, testCRCByteArray); - } + @Override + protected RPCMessage createMessage() { + PutFile msg = new PutFile(); + + msg.setFileType(TestValues.GENERAL_FILETYPE); + msg.setPersistentFile(TestValues.GENERAL_BOOLEAN); + msg.setSystemFile(TestValues.GENERAL_BOOLEAN); + msg.setOffset(TestValues.GENERAL_LONG); + msg.setLength(TestValues.GENERAL_LONG); + msg.setCRC(TestValues.GENERAL_BYTE_ARRAY); + msg.setCRC(TestValues.GENERAL_LONG); + + return msg; + } + + @Override + protected String getMessageType() { + return RPCMessage.KEY_REQUEST; + } + + @Override + protected String getCommandType() { + return FunctionID.PUT_FILE.toString(); + } + + @Override + protected JSONObject getExpectedParameters(int sdlVersion) { + JSONObject result = new JSONObject(); + + try { + result.put(PutFile.KEY_FILE_TYPE, TestValues.GENERAL_FILETYPE); + result.put(PutFile.KEY_PERSISTENT_FILE, TestValues.GENERAL_BOOLEAN); + result.put(PutFile.KEY_SYSTEM_FILE, TestValues.GENERAL_BOOLEAN); + result.put(PutFile.KEY_OFFSET, TestValues.GENERAL_LONG); + result.put(PutFile.KEY_LENGTH, TestValues.GENERAL_LONG); + result.put(PutFile.KEY_CRC, TestValues.GENERAL_LONG); + } catch (JSONException e) { + fail(TestValues.JSON_FAIL); + } + + return result; + } + + /** + * Tests the expected values of the RPC message. + */ + @Test + public void testRpcValues() { + // Test Values + FileType testFileType = ((PutFile) msg).getFileType(); + boolean testPersistentFile = ((PutFile) msg).getPersistentFile(); + boolean testSystemFile = ((PutFile) msg).getSystemFile(); + Long testOffset = ((PutFile) msg).getOffset(); + Long testLength = ((PutFile) msg).getLength(); + Long testCRC = ((PutFile) msg).getCRC(); + + // Valid Tests + assertEquals(TestValues.MATCH, TestValues.GENERAL_FILETYPE, testFileType); + assertEquals(TestValues.MATCH, TestValues.GENERAL_BOOLEAN, testPersistentFile); + assertEquals(TestValues.MATCH, TestValues.GENERAL_BOOLEAN, testSystemFile); + assertEquals(TestValues.MATCH, TestValues.GENERAL_LONG, testOffset); + assertEquals(TestValues.MATCH, TestValues.GENERAL_LONG, testLength); + assertEquals(TestValues.MATCH, TestValues.GENERAL_LONG, testCRC); + + // Invalid/Null Tests + PutFile msg = new PutFile(); + assertNotNull("Null object creation failed.", msg); + testNullBase(msg); + + assertNull(TestValues.NULL, msg.getFileType()); + assertNull(TestValues.NULL, msg.getPersistentFile()); + assertNull(TestValues.NULL, msg.getSystemFile()); + assertNull(TestValues.NULL, msg.getOffset()); + assertNull(TestValues.NULL, msg.getLength()); + assertNull(TestValues.NULL, msg.getCRC()); + } + + /** + * Tests the expected values of the CRC checksum. + */ + @Test + public void testByteArrayCheckSum() { + // Test Values + PutFile msgCRC = new PutFile(); + msgCRC.setCRC(TestValues.GENERAL_BYTE_ARRAY); + Long testCRCByteArray = msgCRC.getCRC(); + + CRC32 crc = new CRC32(); + crc.update(TestValues.GENERAL_BYTE_ARRAY); + Long crcValue = crc.getValue(); + + assertEquals(TestValues.MATCH, crcValue, testCRCByteArray); + } /** * Tests a valid JSON construction of this RPC message. */ @Test - public void testJsonConstructor () { - JSONObject commandJson = JsonFileReader.readId(getInstrumentation().getTargetContext(), getCommandType(), getMessageType()); - assertNotNull(TestValues.NOT_NULL, commandJson); - - try { - Hashtable<String, Object> hash = JsonRPCMarshaller.deserializeJSONObject(commandJson); - PutFile cmd = new PutFile(hash); - - JSONObject body = JsonUtils.readJsonObjectFromJsonObject(commandJson, getMessageType()); - assertNotNull(TestValues.NOT_NULL, body); - - // Test everything in the json body. - assertEquals(TestValues.MATCH, JsonUtils.readStringFromJsonObject(body, RPCMessage.KEY_FUNCTION_NAME), cmd.getFunctionName()); - assertEquals(TestValues.MATCH, JsonUtils.readIntegerFromJsonObject(body, RPCMessage.KEY_CORRELATION_ID), cmd.getCorrelationID()); - - JSONObject parameters = JsonUtils.readJsonObjectFromJsonObject(body, RPCMessage.KEY_PARAMETERS); - assertEquals(TestValues.MATCH, JsonUtils.readBooleanFromJsonObject(parameters, PutFile.KEY_PERSISTENT_FILE), cmd.getPersistentFile()); - assertEquals(TestValues.MATCH, JsonUtils.readBooleanFromJsonObject(parameters, PutFile.KEY_SYSTEM_FILE), cmd.getSystemFile()); - assertEquals(TestValues.MATCH, JsonUtils.readStringFromJsonObject(parameters, PutFile.KEY_FILE_TYPE), cmd.getFileType().toString()); - assertEquals(TestValues.MATCH, JsonUtils.readStringFromJsonObject(parameters, PutFile.KEY_SDL_FILE_NAME), cmd.getSdlFileName()); - assertEquals(TestValues.MATCH, (Long) JsonUtils.readIntegerFromJsonObject(parameters, PutFile.KEY_OFFSET).longValue(), cmd.getOffset()); - assertEquals(TestValues.MATCH, (Long) JsonUtils.readIntegerFromJsonObject(parameters, PutFile.KEY_LENGTH).longValue(), cmd.getLength()); - assertEquals(TestValues.MATCH, (Long) JsonUtils.readIntegerFromJsonObject(parameters, PutFile.KEY_CRC).longValue(), cmd.getCRC()); - } catch (JSONException e) { - fail(TestValues.JSON_FAIL); - } + public void testJsonConstructor() { + JSONObject commandJson = JsonFileReader.readId(getInstrumentation().getTargetContext(), getCommandType(), getMessageType()); + assertNotNull(TestValues.NOT_NULL, commandJson); + + try { + Hashtable<String, Object> hash = JsonRPCMarshaller.deserializeJSONObject(commandJson); + PutFile cmd = new PutFile(hash); + + JSONObject body = JsonUtils.readJsonObjectFromJsonObject(commandJson, getMessageType()); + assertNotNull(TestValues.NOT_NULL, body); + + // Test everything in the json body. + assertEquals(TestValues.MATCH, JsonUtils.readStringFromJsonObject(body, RPCMessage.KEY_FUNCTION_NAME), cmd.getFunctionName()); + assertEquals(TestValues.MATCH, JsonUtils.readIntegerFromJsonObject(body, RPCMessage.KEY_CORRELATION_ID), cmd.getCorrelationID()); + + JSONObject parameters = JsonUtils.readJsonObjectFromJsonObject(body, RPCMessage.KEY_PARAMETERS); + assertEquals(TestValues.MATCH, JsonUtils.readBooleanFromJsonObject(parameters, PutFile.KEY_PERSISTENT_FILE), cmd.getPersistentFile()); + assertEquals(TestValues.MATCH, JsonUtils.readBooleanFromJsonObject(parameters, PutFile.KEY_SYSTEM_FILE), cmd.getSystemFile()); + assertEquals(TestValues.MATCH, JsonUtils.readStringFromJsonObject(parameters, PutFile.KEY_FILE_TYPE), cmd.getFileType().toString()); + assertEquals(TestValues.MATCH, JsonUtils.readStringFromJsonObject(parameters, PutFile.KEY_SDL_FILE_NAME), cmd.getSdlFileName()); + assertEquals(TestValues.MATCH, (Long) JsonUtils.readIntegerFromJsonObject(parameters, PutFile.KEY_OFFSET).longValue(), cmd.getOffset()); + assertEquals(TestValues.MATCH, (Long) JsonUtils.readIntegerFromJsonObject(parameters, PutFile.KEY_LENGTH).longValue(), cmd.getLength()); + assertEquals(TestValues.MATCH, (Long) JsonUtils.readIntegerFromJsonObject(parameters, PutFile.KEY_CRC).longValue(), cmd.getCRC()); + } catch (JSONException e) { + fail(TestValues.JSON_FAIL); + } } }
\ No newline at end of file diff --git a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/ReadDidTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/ReadDidTests.java index 7045f7434..761cfc304 100644 --- a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/ReadDidTests.java +++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/ReadDidTests.java @@ -25,95 +25,95 @@ import static junit.framework.TestCase.assertTrue; import static junit.framework.TestCase.fail; /** - * This is a unit test class for the SmartDeviceLink library project class : + * This is a unit test class for the SmartDeviceLink library project class : * {@link com.smartdevicelink.proxy.rpc.ReadDID} */ public class ReadDidTests extends BaseRpcTests { - - @Override - protected RPCMessage createMessage() { - ReadDID msg = new ReadDID(); - - msg.setEcuName(TestValues.GENERAL_INT); - msg.setDidLocation(TestValues.GENERAL_INTEGER_LIST); - - return msg; - } - - @Override - protected String getMessageType() { - return RPCMessage.KEY_REQUEST; - } - - @Override - protected String getCommandType() { - return FunctionID.READ_DID.toString(); - } - - @Override - protected JSONObject getExpectedParameters(int sdlVersion) { - JSONObject result = new JSONObject(); - - try { - result.put(ReadDID.KEY_ECU_NAME, TestValues.GENERAL_INT); - result.put(ReadDID.KEY_DID_LOCATION, JsonUtils.createJsonArray(TestValues.GENERAL_INTEGER_LIST)); - } catch (JSONException e) { - fail(TestValues.JSON_FAIL); - } - - return result; - } - - /** - * Tests the expected values of the RPC message. - */ - @Test - public void testRpcValues () { - // Test Values - Integer testEcuName = ( (ReadDID) msg ).getEcuName(); - List<Integer> testDidLocation = ( (ReadDID) msg ).getDidLocation(); - - // Valid Tests - assertEquals(TestValues.MATCH, (Integer) TestValues.GENERAL_INT, testEcuName); - assertEquals(TestValues.MATCH, TestValues.GENERAL_INTEGER_LIST, testDidLocation); - - // Invalid/Null Tests - ReadDID msg = new ReadDID(); - assertNotNull(TestValues.NOT_NULL, msg); - testNullBase(msg); - - assertNull(TestValues.NULL, msg.getEcuName()); - assertNull(TestValues.NULL, msg.getDidLocation()); - } - - /** + + @Override + protected RPCMessage createMessage() { + ReadDID msg = new ReadDID(); + + msg.setEcuName(TestValues.GENERAL_INT); + msg.setDidLocation(TestValues.GENERAL_INTEGER_LIST); + + return msg; + } + + @Override + protected String getMessageType() { + return RPCMessage.KEY_REQUEST; + } + + @Override + protected String getCommandType() { + return FunctionID.READ_DID.toString(); + } + + @Override + protected JSONObject getExpectedParameters(int sdlVersion) { + JSONObject result = new JSONObject(); + + try { + result.put(ReadDID.KEY_ECU_NAME, TestValues.GENERAL_INT); + result.put(ReadDID.KEY_DID_LOCATION, JsonUtils.createJsonArray(TestValues.GENERAL_INTEGER_LIST)); + } catch (JSONException e) { + fail(TestValues.JSON_FAIL); + } + + return result; + } + + /** + * Tests the expected values of the RPC message. + */ + @Test + public void testRpcValues() { + // Test Values + Integer testEcuName = ((ReadDID) msg).getEcuName(); + List<Integer> testDidLocation = ((ReadDID) msg).getDidLocation(); + + // Valid Tests + assertEquals(TestValues.MATCH, (Integer) TestValues.GENERAL_INT, testEcuName); + assertEquals(TestValues.MATCH, TestValues.GENERAL_INTEGER_LIST, testDidLocation); + + // Invalid/Null Tests + ReadDID msg = new ReadDID(); + assertNotNull(TestValues.NOT_NULL, msg); + testNullBase(msg); + + assertNull(TestValues.NULL, msg.getEcuName()); + assertNull(TestValues.NULL, msg.getDidLocation()); + } + + /** * Tests a valid JSON construction of this RPC message. */ - @Test - public void testJsonConstructor () { - JSONObject commandJson = JsonFileReader.readId(getInstrumentation().getTargetContext(), getCommandType(), getMessageType()); - assertNotNull(TestValues.NOT_NULL, commandJson); - - try { - Hashtable<String, Object> hash = JsonRPCMarshaller.deserializeJSONObject(commandJson); - ReadDID cmd = new ReadDID(hash); - - JSONObject body = JsonUtils.readJsonObjectFromJsonObject(commandJson, getMessageType()); - assertNotNull(TestValues.NOT_NULL, body); - - // Test everything in the json body. - assertEquals(TestValues.MATCH, JsonUtils.readStringFromJsonObject(body, RPCMessage.KEY_FUNCTION_NAME), cmd.getFunctionName()); - assertEquals(TestValues.MATCH, JsonUtils.readIntegerFromJsonObject(body, RPCMessage.KEY_CORRELATION_ID), cmd.getCorrelationID()); - - JSONObject parameters = JsonUtils.readJsonObjectFromJsonObject(body, RPCMessage.KEY_PARAMETERS); - assertEquals(TestValues.MATCH, JsonUtils.readIntegerFromJsonObject(parameters, ReadDID.KEY_ECU_NAME), cmd.getEcuName()); - - List<Integer> didLocationList = JsonUtils.readIntegerListFromJsonObject(parameters, ReadDID.KEY_DID_LOCATION); - List<Integer> testLocationList = cmd.getDidLocation(); - assertEquals(TestValues.MATCH, didLocationList.size(), testLocationList.size()); - assertTrue(TestValues.TRUE, Validator.validateIntegerList(didLocationList, testLocationList)); - } catch (JSONException e) { - fail(TestValues.JSON_FAIL); - } - } + @Test + public void testJsonConstructor() { + JSONObject commandJson = JsonFileReader.readId(getInstrumentation().getTargetContext(), getCommandType(), getMessageType()); + assertNotNull(TestValues.NOT_NULL, commandJson); + + try { + Hashtable<String, Object> hash = JsonRPCMarshaller.deserializeJSONObject(commandJson); + ReadDID cmd = new ReadDID(hash); + + JSONObject body = JsonUtils.readJsonObjectFromJsonObject(commandJson, getMessageType()); + assertNotNull(TestValues.NOT_NULL, body); + + // Test everything in the json body. + assertEquals(TestValues.MATCH, JsonUtils.readStringFromJsonObject(body, RPCMessage.KEY_FUNCTION_NAME), cmd.getFunctionName()); + assertEquals(TestValues.MATCH, JsonUtils.readIntegerFromJsonObject(body, RPCMessage.KEY_CORRELATION_ID), cmd.getCorrelationID()); + + JSONObject parameters = JsonUtils.readJsonObjectFromJsonObject(body, RPCMessage.KEY_PARAMETERS); + assertEquals(TestValues.MATCH, JsonUtils.readIntegerFromJsonObject(parameters, ReadDID.KEY_ECU_NAME), cmd.getEcuName()); + + List<Integer> didLocationList = JsonUtils.readIntegerListFromJsonObject(parameters, ReadDID.KEY_DID_LOCATION); + List<Integer> testLocationList = cmd.getDidLocation(); + assertEquals(TestValues.MATCH, didLocationList.size(), testLocationList.size()); + assertTrue(TestValues.TRUE, Validator.validateIntegerList(didLocationList, testLocationList)); + } catch (JSONException e) { + fail(TestValues.JSON_FAIL); + } + } }
\ No newline at end of file diff --git a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/RegisterAppInterfaceTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/RegisterAppInterfaceTests.java index b61687bd7..a4957183b 100644 --- a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/RegisterAppInterfaceTests.java +++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/RegisterAppInterfaceTests.java @@ -34,205 +34,205 @@ import static junit.framework.TestCase.assertTrue; import static junit.framework.TestCase.fail; /** - * This is a unit test class for the SmartDeviceLink library project class : + * This is a unit test class for the SmartDeviceLink library project class : * {@link com.smartdevicelink.proxy.rpc.RegisterAppInterface} */ public class RegisterAppInterfaceTests extends BaseRpcTests { - @Override - protected RPCMessage createMessage() { - RegisterAppInterface msg = new RegisterAppInterface(); - - msg.setSdlMsgVersion(TestValues.GENERAL_SDLMSGVERSION); - msg.setAppName(TestValues.GENERAL_STRING); - msg.setNgnMediaScreenAppName(TestValues.GENERAL_STRING); - msg.setFullAppID(TestValues.GENERAL_FULL_APP_ID); - msg.setLanguageDesired(TestValues.GENERAL_LANGUAGE); - msg.setHmiDisplayLanguageDesired(TestValues.GENERAL_LANGUAGE); - msg.setHashID(TestValues.GENERAL_STRING); - msg.setTtsName(TestValues.GENERAL_TTSCHUNK_LIST); - msg.setVrSynonyms(TestValues.GENERAL_STRING_LIST); - msg.setAppHMIType(TestValues.GENERAL_APPHMITYPE_LIST); - msg.setIsMediaApplication(TestValues.GENERAL_BOOLEAN); - msg.setDeviceInfo(TestValues.GENERAL_DEVICEINFO); - msg.setAppInfo(TestValues.GENERAL_APPINFO); - msg.setDayColorScheme(TestValues.GENERAL_DAYCOLORSCHEME); - msg.setNightColorScheme(TestValues.GENERAL_NIGHTCOLORSCHEME); - - return msg; - } - - @Override - protected String getMessageType() { - return RPCMessage.KEY_REQUEST; - } - - @Override - protected String getCommandType() { - return FunctionID.REGISTER_APP_INTERFACE.toString(); - } - - @Override - protected JSONObject getExpectedParameters(int sdlVersion) { - JSONObject result = new JSONObject(); - - try { - result.put(RegisterAppInterface.KEY_SDL_MSG_VERSION, TestValues.JSON_SDLMSGVERSION); - result.put(RegisterAppInterface.KEY_APP_NAME, TestValues.GENERAL_STRING); - result.put(RegisterAppInterface.KEY_NGN_MEDIA_SCREEN_APP_NAME, TestValues.GENERAL_STRING); - result.put(RegisterAppInterface.KEY_APP_ID, TestValues.GENERAL_APP_ID); - result.put(RegisterAppInterface.KEY_FULL_APP_ID, TestValues.GENERAL_FULL_APP_ID); - result.put(RegisterAppInterface.KEY_LANGUAGE_DESIRED, TestValues.GENERAL_LANGUAGE); - result.put(RegisterAppInterface.KEY_HMI_DISPLAY_LANGUAGE_DESIRED, TestValues.GENERAL_LANGUAGE); - result.put(RegisterAppInterface.KEY_HASH_ID, TestValues.GENERAL_STRING); - result.put(RegisterAppInterface.KEY_TTS_NAME, TestValues.JSON_TTSCHUNKS); - result.put(RegisterAppInterface.KEY_VR_SYNONYMS, JsonUtils.createJsonArray(TestValues.GENERAL_STRING_LIST)); - result.put(RegisterAppInterface.KEY_APP_HMI_TYPE, JsonUtils.createJsonArrayOfJsonNames(TestValues.GENERAL_APPHMITYPE_LIST, SDL_VERSION_UNDER_TEST)); - result.put(RegisterAppInterface.KEY_IS_MEDIA_APPLICATION, TestValues.GENERAL_BOOLEAN); - result.put(RegisterAppInterface.KEY_DEVICE_INFO, TestValues.JSON_DEVICEINFO); - result.put(RegisterAppInterface.KEY_APP_INFO, TestValues.JSON_APPINFO); - result.put(RegisterAppInterface.KEY_DAY_COLOR_SCHEME, TestValues.JSON_DAYCOLORSCHEME); - result.put(RegisterAppInterface.KEY_NIGHT_COLOR_SCHEME, TestValues.JSON_NIGHTCOLORSCHEME); - } catch (JSONException e) { - fail(TestValues.JSON_FAIL); - } - - return result; - } - - /** - * Tests the expected values of the RPC message. - */ - @Test - public void testRpcValues () { - // Test Values - SdlMsgVersion testVersion = ( (RegisterAppInterface) msg).getSdlMsgVersion(); - String testName = ( (RegisterAppInterface) msg).getAppName(); - String testNgnName = ( (RegisterAppInterface) msg).getNgnMediaScreenAppName(); - String testAppId = ( (RegisterAppInterface) msg).getAppID(); - String testFullAppId = ( (RegisterAppInterface) msg).getFullAppID(); - Language testLang = ( (RegisterAppInterface) msg).getLanguageDesired(); - Language testHmiLang = ( (RegisterAppInterface) msg).getHmiDisplayLanguageDesired(); - String testHashId = ( (RegisterAppInterface) msg).getHashID(); - List<TTSChunk> testTts = ( (RegisterAppInterface) msg).getTtsName(); - List<String> testSynonyms = ( (RegisterAppInterface) msg).getVrSynonyms(); - List<AppHMIType> testApps = ( (RegisterAppInterface) msg).getAppHMIType(); - Boolean testMedia = ( (RegisterAppInterface) msg).getIsMediaApplication(); - DeviceInfo testDeviceInfo = ( (RegisterAppInterface) msg).getDeviceInfo(); - AppInfo testAppInfo = ( (RegisterAppInterface) msg).getAppInfo(); - TemplateColorScheme testDayColorScheme = ( (RegisterAppInterface) msg).getDayColorScheme(); - TemplateColorScheme testNightColorScheme = ( (RegisterAppInterface) msg).getNightColorScheme(); - - // Valid Tests - assertTrue(TestValues.TRUE, Validator.validateSdlMsgVersion(TestValues.GENERAL_SDLMSGVERSION, testVersion)); - assertEquals(TestValues.MATCH, TestValues.GENERAL_STRING, testName); - assertEquals(TestValues.MATCH, TestValues.GENERAL_STRING, testNgnName); - assertEquals(TestValues.MATCH, TestValues.GENERAL_APP_ID, testAppId); - assertEquals(TestValues.MATCH, TestValues.GENERAL_FULL_APP_ID, testFullAppId); - assertEquals(TestValues.MATCH, TestValues.GENERAL_LANGUAGE, testLang); - assertEquals(TestValues.MATCH, TestValues.GENERAL_LANGUAGE, testHmiLang); - assertEquals(TestValues.MATCH, TestValues.GENERAL_STRING, testHashId); - assertTrue(TestValues.TRUE, Validator.validateTtsChunks(TestValues.GENERAL_TTSCHUNK_LIST, testTts)); - assertEquals(TestValues.MATCH, TestValues.GENERAL_STRING_LIST, testSynonyms); - assertEquals(TestValues.MATCH, TestValues.GENERAL_APPHMITYPE_LIST, testApps); - assertEquals(TestValues.MATCH, (Boolean) TestValues.GENERAL_BOOLEAN, testMedia); - assertTrue(TestValues.TRUE, Validator.validateDeviceInfo(TestValues.GENERAL_DEVICEINFO, testDeviceInfo)); - assertTrue(TestValues.TRUE, Validator.validateAppInfo(TestValues.GENERAL_APPINFO, testAppInfo)); - assertTrue(TestValues.TRUE, Validator.validateTemplateColorScheme(TestValues.GENERAL_DAYCOLORSCHEME, testDayColorScheme)); - assertTrue(TestValues.TRUE, Validator.validateTemplateColorScheme(TestValues.GENERAL_NIGHTCOLORSCHEME, testNightColorScheme)); - - // Invalid/Null Tests - RegisterAppInterface msg = new RegisterAppInterface(); - assertNotNull(TestValues.NOT_NULL, msg); - testNullBase(msg); - - assertNull(TestValues.NULL, msg.getSdlMsgVersion()); - assertNull(TestValues.NULL, msg.getAppName()); - assertNull(TestValues.NULL, msg.getNgnMediaScreenAppName()); - assertNull(TestValues.NULL, msg.getAppID()); - assertNull(TestValues.NULL, msg.getFullAppID()); - assertNull(TestValues.NULL, msg.getLanguageDesired()); - assertNull(TestValues.NULL, msg.getHmiDisplayLanguageDesired()); - assertNull(TestValues.NULL, msg.getHashID()); - assertNull(TestValues.NULL, msg.getTtsName()); - assertNull(TestValues.NULL, msg.getVrSynonyms()); - assertNull(TestValues.NULL, msg.getAppHMIType()); - assertNull(TestValues.NULL, msg.getIsMediaApplication()); - assertNull(TestValues.NULL, msg.getDeviceInfo()); - assertNull(TestValues.NULL, msg.getAppInfo()); - assertNull(TestValues.NULL, msg.getDayColorScheme()); - assertNull(TestValues.NULL, msg.getNightColorScheme()); - } + @Override + protected RPCMessage createMessage() { + RegisterAppInterface msg = new RegisterAppInterface(); + + msg.setSdlMsgVersion(TestValues.GENERAL_SDLMSGVERSION); + msg.setAppName(TestValues.GENERAL_STRING); + msg.setNgnMediaScreenAppName(TestValues.GENERAL_STRING); + msg.setFullAppID(TestValues.GENERAL_FULL_APP_ID); + msg.setLanguageDesired(TestValues.GENERAL_LANGUAGE); + msg.setHmiDisplayLanguageDesired(TestValues.GENERAL_LANGUAGE); + msg.setHashID(TestValues.GENERAL_STRING); + msg.setTtsName(TestValues.GENERAL_TTSCHUNK_LIST); + msg.setVrSynonyms(TestValues.GENERAL_STRING_LIST); + msg.setAppHMIType(TestValues.GENERAL_APPHMITYPE_LIST); + msg.setIsMediaApplication(TestValues.GENERAL_BOOLEAN); + msg.setDeviceInfo(TestValues.GENERAL_DEVICEINFO); + msg.setAppInfo(TestValues.GENERAL_APPINFO); + msg.setDayColorScheme(TestValues.GENERAL_DAYCOLORSCHEME); + msg.setNightColorScheme(TestValues.GENERAL_NIGHTCOLORSCHEME); + + return msg; + } + + @Override + protected String getMessageType() { + return RPCMessage.KEY_REQUEST; + } + + @Override + protected String getCommandType() { + return FunctionID.REGISTER_APP_INTERFACE.toString(); + } + + @Override + protected JSONObject getExpectedParameters(int sdlVersion) { + JSONObject result = new JSONObject(); + + try { + result.put(RegisterAppInterface.KEY_SDL_MSG_VERSION, TestValues.JSON_SDLMSGVERSION); + result.put(RegisterAppInterface.KEY_APP_NAME, TestValues.GENERAL_STRING); + result.put(RegisterAppInterface.KEY_NGN_MEDIA_SCREEN_APP_NAME, TestValues.GENERAL_STRING); + result.put(RegisterAppInterface.KEY_APP_ID, TestValues.GENERAL_APP_ID); + result.put(RegisterAppInterface.KEY_FULL_APP_ID, TestValues.GENERAL_FULL_APP_ID); + result.put(RegisterAppInterface.KEY_LANGUAGE_DESIRED, TestValues.GENERAL_LANGUAGE); + result.put(RegisterAppInterface.KEY_HMI_DISPLAY_LANGUAGE_DESIRED, TestValues.GENERAL_LANGUAGE); + result.put(RegisterAppInterface.KEY_HASH_ID, TestValues.GENERAL_STRING); + result.put(RegisterAppInterface.KEY_TTS_NAME, TestValues.JSON_TTSCHUNKS); + result.put(RegisterAppInterface.KEY_VR_SYNONYMS, JsonUtils.createJsonArray(TestValues.GENERAL_STRING_LIST)); + result.put(RegisterAppInterface.KEY_APP_HMI_TYPE, JsonUtils.createJsonArrayOfJsonNames(TestValues.GENERAL_APPHMITYPE_LIST, SDL_VERSION_UNDER_TEST)); + result.put(RegisterAppInterface.KEY_IS_MEDIA_APPLICATION, TestValues.GENERAL_BOOLEAN); + result.put(RegisterAppInterface.KEY_DEVICE_INFO, TestValues.JSON_DEVICEINFO); + result.put(RegisterAppInterface.KEY_APP_INFO, TestValues.JSON_APPINFO); + result.put(RegisterAppInterface.KEY_DAY_COLOR_SCHEME, TestValues.JSON_DAYCOLORSCHEME); + result.put(RegisterAppInterface.KEY_NIGHT_COLOR_SCHEME, TestValues.JSON_NIGHTCOLORSCHEME); + } catch (JSONException e) { + fail(TestValues.JSON_FAIL); + } + + return result; + } + + /** + * Tests the expected values of the RPC message. + */ + @Test + public void testRpcValues() { + // Test Values + SdlMsgVersion testVersion = ((RegisterAppInterface) msg).getSdlMsgVersion(); + String testName = ((RegisterAppInterface) msg).getAppName(); + String testNgnName = ((RegisterAppInterface) msg).getNgnMediaScreenAppName(); + String testAppId = ((RegisterAppInterface) msg).getAppID(); + String testFullAppId = ((RegisterAppInterface) msg).getFullAppID(); + Language testLang = ((RegisterAppInterface) msg).getLanguageDesired(); + Language testHmiLang = ((RegisterAppInterface) msg).getHmiDisplayLanguageDesired(); + String testHashId = ((RegisterAppInterface) msg).getHashID(); + List<TTSChunk> testTts = ((RegisterAppInterface) msg).getTtsName(); + List<String> testSynonyms = ((RegisterAppInterface) msg).getVrSynonyms(); + List<AppHMIType> testApps = ((RegisterAppInterface) msg).getAppHMIType(); + Boolean testMedia = ((RegisterAppInterface) msg).getIsMediaApplication(); + DeviceInfo testDeviceInfo = ((RegisterAppInterface) msg).getDeviceInfo(); + AppInfo testAppInfo = ((RegisterAppInterface) msg).getAppInfo(); + TemplateColorScheme testDayColorScheme = ((RegisterAppInterface) msg).getDayColorScheme(); + TemplateColorScheme testNightColorScheme = ((RegisterAppInterface) msg).getNightColorScheme(); + + // Valid Tests + assertTrue(TestValues.TRUE, Validator.validateSdlMsgVersion(TestValues.GENERAL_SDLMSGVERSION, testVersion)); + assertEquals(TestValues.MATCH, TestValues.GENERAL_STRING, testName); + assertEquals(TestValues.MATCH, TestValues.GENERAL_STRING, testNgnName); + assertEquals(TestValues.MATCH, TestValues.GENERAL_APP_ID, testAppId); + assertEquals(TestValues.MATCH, TestValues.GENERAL_FULL_APP_ID, testFullAppId); + assertEquals(TestValues.MATCH, TestValues.GENERAL_LANGUAGE, testLang); + assertEquals(TestValues.MATCH, TestValues.GENERAL_LANGUAGE, testHmiLang); + assertEquals(TestValues.MATCH, TestValues.GENERAL_STRING, testHashId); + assertTrue(TestValues.TRUE, Validator.validateTtsChunks(TestValues.GENERAL_TTSCHUNK_LIST, testTts)); + assertEquals(TestValues.MATCH, TestValues.GENERAL_STRING_LIST, testSynonyms); + assertEquals(TestValues.MATCH, TestValues.GENERAL_APPHMITYPE_LIST, testApps); + assertEquals(TestValues.MATCH, (Boolean) TestValues.GENERAL_BOOLEAN, testMedia); + assertTrue(TestValues.TRUE, Validator.validateDeviceInfo(TestValues.GENERAL_DEVICEINFO, testDeviceInfo)); + assertTrue(TestValues.TRUE, Validator.validateAppInfo(TestValues.GENERAL_APPINFO, testAppInfo)); + assertTrue(TestValues.TRUE, Validator.validateTemplateColorScheme(TestValues.GENERAL_DAYCOLORSCHEME, testDayColorScheme)); + assertTrue(TestValues.TRUE, Validator.validateTemplateColorScheme(TestValues.GENERAL_NIGHTCOLORSCHEME, testNightColorScheme)); + + // Invalid/Null Tests + RegisterAppInterface msg = new RegisterAppInterface(); + assertNotNull(TestValues.NOT_NULL, msg); + testNullBase(msg); + + assertNull(TestValues.NULL, msg.getSdlMsgVersion()); + assertNull(TestValues.NULL, msg.getAppName()); + assertNull(TestValues.NULL, msg.getNgnMediaScreenAppName()); + assertNull(TestValues.NULL, msg.getAppID()); + assertNull(TestValues.NULL, msg.getFullAppID()); + assertNull(TestValues.NULL, msg.getLanguageDesired()); + assertNull(TestValues.NULL, msg.getHmiDisplayLanguageDesired()); + assertNull(TestValues.NULL, msg.getHashID()); + assertNull(TestValues.NULL, msg.getTtsName()); + assertNull(TestValues.NULL, msg.getVrSynonyms()); + assertNull(TestValues.NULL, msg.getAppHMIType()); + assertNull(TestValues.NULL, msg.getIsMediaApplication()); + assertNull(TestValues.NULL, msg.getDeviceInfo()); + assertNull(TestValues.NULL, msg.getAppInfo()); + assertNull(TestValues.NULL, msg.getDayColorScheme()); + assertNull(TestValues.NULL, msg.getNightColorScheme()); + } /** * Tests a valid JSON construction of this RPC message. */ @Test - public void testJsonConstructor () { - JSONObject commandJson = JsonFileReader.readId(getInstrumentation().getTargetContext(), getCommandType(), getMessageType()); - assertNotNull(TestValues.NOT_NULL, commandJson); - - try { - Hashtable<String, Object> hash = JsonRPCMarshaller.deserializeJSONObject(commandJson); - RegisterAppInterface cmd = new RegisterAppInterface(hash); - - JSONObject body = JsonUtils.readJsonObjectFromJsonObject(commandJson, getMessageType()); - assertNotNull(TestValues.NOT_NULL, body); - - // Test everything in the json body. - assertEquals(TestValues.MATCH, JsonUtils.readStringFromJsonObject(body, RPCMessage.KEY_FUNCTION_NAME), cmd.getFunctionName()); - assertEquals(TestValues.MATCH, JsonUtils.readIntegerFromJsonObject(body, RPCMessage.KEY_CORRELATION_ID), cmd.getCorrelationID()); - - JSONObject parameters = JsonUtils.readJsonObjectFromJsonObject(body, RPCMessage.KEY_PARAMETERS); - JSONArray ttsNameArray = JsonUtils.readJsonArrayFromJsonObject(parameters, RegisterAppInterface.KEY_TTS_NAME); - List<TTSChunk> ttsNameList = new ArrayList<TTSChunk>(); - for (int index = 0; index < ttsNameArray.length(); index++) { - TTSChunk chunk = new TTSChunk(JsonRPCMarshaller.deserializeJSONObject( (JSONObject)ttsNameArray.get(index)) ); - ttsNameList.add(chunk); - } - assertTrue(TestValues.TRUE, Validator.validateTtsChunks(ttsNameList, cmd.getTtsName())); - assertEquals(TestValues.MATCH, JsonUtils.readStringFromJsonObject(parameters, RegisterAppInterface.KEY_HMI_DISPLAY_LANGUAGE_DESIRED), cmd.getHmiDisplayLanguageDesired().toString()); - - JSONArray appHmiTypeArray = JsonUtils.readJsonArrayFromJsonObject(parameters, RegisterAppInterface.KEY_APP_HMI_TYPE); - for (int index = 0; index < appHmiTypeArray.length(); index++) { - AppHMIType appHmiTypeItem = AppHMIType.valueForString( appHmiTypeArray.get(index).toString() ); - assertEquals(TestValues.MATCH, appHmiTypeItem, cmd.getAppHMIType().get(index) ); - } - assertEquals(TestValues.MATCH, JsonUtils.readStringFromJsonObject(parameters, RegisterAppInterface.KEY_APP_ID), cmd.getAppID()); - assertEquals(TestValues.MATCH, JsonUtils.readStringFromJsonObject(parameters, RegisterAppInterface.KEY_FULL_APP_ID), cmd.getFullAppID()); - assertEquals(TestValues.MATCH, JsonUtils.readStringFromJsonObject(parameters, RegisterAppInterface.KEY_LANGUAGE_DESIRED), cmd.getLanguageDesired().toString()); - - JSONObject deviceInfoObj = JsonUtils.readJsonObjectFromJsonObject(parameters, RegisterAppInterface.KEY_DEVICE_INFO); - DeviceInfo deviceInfo = new DeviceInfo(JsonRPCMarshaller.deserializeJSONObject(deviceInfoObj)); - assertTrue(TestValues.TRUE, Validator.validateDeviceInfo(deviceInfo, cmd.getDeviceInfo()) ); - assertEquals(TestValues.MATCH, JsonUtils.readStringFromJsonObject(parameters, RegisterAppInterface.KEY_APP_NAME), cmd.getAppName()); - assertEquals(TestValues.MATCH, JsonUtils.readStringFromJsonObject(parameters, RegisterAppInterface.KEY_NGN_MEDIA_SCREEN_APP_NAME), cmd.getNgnMediaScreenAppName()); - assertEquals(TestValues.MATCH, JsonUtils.readBooleanFromJsonObject(parameters, RegisterAppInterface.KEY_IS_MEDIA_APPLICATION), cmd.getIsMediaApplication()); - - JSONObject appInfoObj = JsonUtils.readJsonObjectFromJsonObject(parameters, RegisterAppInterface.KEY_APP_INFO); - AppInfo appInfo = new AppInfo(JsonRPCMarshaller.deserializeJSONObject(appInfoObj)); - assertTrue(TestValues.TRUE, Validator.validateAppInfo(appInfo, cmd.getAppInfo())); - - List<String> vrSynonymsList = JsonUtils.readStringListFromJsonObject(parameters, RegisterAppInterface.KEY_VR_SYNONYMS); - List<String> testSynonymsList = cmd.getVrSynonyms(); - assertEquals(TestValues.MATCH, vrSynonymsList.size(), testSynonymsList.size()); - assertTrue(TestValues.TRUE, Validator.validateStringList(vrSynonymsList, testSynonymsList)); - - JSONObject sdlMsgVersionObj = JsonUtils.readJsonObjectFromJsonObject(parameters, RegisterAppInterface.KEY_SDL_MSG_VERSION); - SdlMsgVersion sdlMsgVersion = new SdlMsgVersion(JsonRPCMarshaller.deserializeJSONObject(sdlMsgVersionObj)); - assertTrue(TestValues.TRUE, Validator.validateSdlMsgVersion(sdlMsgVersion, cmd.getSdlMsgVersion()) ); - assertEquals(TestValues.MATCH, JsonUtils.readStringFromJsonObject(parameters, RegisterAppInterface.KEY_HASH_ID), cmd.getHashID()); - - JSONObject dayColorSchemeObj = JsonUtils.readJsonObjectFromJsonObject(parameters, RegisterAppInterface.KEY_DAY_COLOR_SCHEME); - TemplateColorScheme dayColorScheme = new TemplateColorScheme(JsonRPCMarshaller.deserializeJSONObject(dayColorSchemeObj)); - assertTrue(TestValues.TRUE, Validator.validateTemplateColorScheme(dayColorScheme, cmd.getDayColorScheme()) ); - - JSONObject nightColorSchemeObj = JsonUtils.readJsonObjectFromJsonObject(parameters, RegisterAppInterface.KEY_DAY_COLOR_SCHEME); - TemplateColorScheme nightColorScheme = new TemplateColorScheme(JsonRPCMarshaller.deserializeJSONObject(nightColorSchemeObj)); - assertTrue(TestValues.TRUE, Validator.validateTemplateColorScheme(nightColorScheme, cmd.getDayColorScheme()) ); - - } catch (JSONException e) { - fail(TestValues.JSON_FAIL); - } + public void testJsonConstructor() { + JSONObject commandJson = JsonFileReader.readId(getInstrumentation().getTargetContext(), getCommandType(), getMessageType()); + assertNotNull(TestValues.NOT_NULL, commandJson); + + try { + Hashtable<String, Object> hash = JsonRPCMarshaller.deserializeJSONObject(commandJson); + RegisterAppInterface cmd = new RegisterAppInterface(hash); + + JSONObject body = JsonUtils.readJsonObjectFromJsonObject(commandJson, getMessageType()); + assertNotNull(TestValues.NOT_NULL, body); + + // Test everything in the json body. + assertEquals(TestValues.MATCH, JsonUtils.readStringFromJsonObject(body, RPCMessage.KEY_FUNCTION_NAME), cmd.getFunctionName()); + assertEquals(TestValues.MATCH, JsonUtils.readIntegerFromJsonObject(body, RPCMessage.KEY_CORRELATION_ID), cmd.getCorrelationID()); + + JSONObject parameters = JsonUtils.readJsonObjectFromJsonObject(body, RPCMessage.KEY_PARAMETERS); + JSONArray ttsNameArray = JsonUtils.readJsonArrayFromJsonObject(parameters, RegisterAppInterface.KEY_TTS_NAME); + List<TTSChunk> ttsNameList = new ArrayList<TTSChunk>(); + for (int index = 0; index < ttsNameArray.length(); index++) { + TTSChunk chunk = new TTSChunk(JsonRPCMarshaller.deserializeJSONObject((JSONObject) ttsNameArray.get(index))); + ttsNameList.add(chunk); + } + assertTrue(TestValues.TRUE, Validator.validateTtsChunks(ttsNameList, cmd.getTtsName())); + assertEquals(TestValues.MATCH, JsonUtils.readStringFromJsonObject(parameters, RegisterAppInterface.KEY_HMI_DISPLAY_LANGUAGE_DESIRED), cmd.getHmiDisplayLanguageDesired().toString()); + + JSONArray appHmiTypeArray = JsonUtils.readJsonArrayFromJsonObject(parameters, RegisterAppInterface.KEY_APP_HMI_TYPE); + for (int index = 0; index < appHmiTypeArray.length(); index++) { + AppHMIType appHmiTypeItem = AppHMIType.valueForString(appHmiTypeArray.get(index).toString()); + assertEquals(TestValues.MATCH, appHmiTypeItem, cmd.getAppHMIType().get(index)); + } + assertEquals(TestValues.MATCH, JsonUtils.readStringFromJsonObject(parameters, RegisterAppInterface.KEY_APP_ID), cmd.getAppID()); + assertEquals(TestValues.MATCH, JsonUtils.readStringFromJsonObject(parameters, RegisterAppInterface.KEY_FULL_APP_ID), cmd.getFullAppID()); + assertEquals(TestValues.MATCH, JsonUtils.readStringFromJsonObject(parameters, RegisterAppInterface.KEY_LANGUAGE_DESIRED), cmd.getLanguageDesired().toString()); + + JSONObject deviceInfoObj = JsonUtils.readJsonObjectFromJsonObject(parameters, RegisterAppInterface.KEY_DEVICE_INFO); + DeviceInfo deviceInfo = new DeviceInfo(JsonRPCMarshaller.deserializeJSONObject(deviceInfoObj)); + assertTrue(TestValues.TRUE, Validator.validateDeviceInfo(deviceInfo, cmd.getDeviceInfo())); + assertEquals(TestValues.MATCH, JsonUtils.readStringFromJsonObject(parameters, RegisterAppInterface.KEY_APP_NAME), cmd.getAppName()); + assertEquals(TestValues.MATCH, JsonUtils.readStringFromJsonObject(parameters, RegisterAppInterface.KEY_NGN_MEDIA_SCREEN_APP_NAME), cmd.getNgnMediaScreenAppName()); + assertEquals(TestValues.MATCH, JsonUtils.readBooleanFromJsonObject(parameters, RegisterAppInterface.KEY_IS_MEDIA_APPLICATION), cmd.getIsMediaApplication()); + + JSONObject appInfoObj = JsonUtils.readJsonObjectFromJsonObject(parameters, RegisterAppInterface.KEY_APP_INFO); + AppInfo appInfo = new AppInfo(JsonRPCMarshaller.deserializeJSONObject(appInfoObj)); + assertTrue(TestValues.TRUE, Validator.validateAppInfo(appInfo, cmd.getAppInfo())); + + List<String> vrSynonymsList = JsonUtils.readStringListFromJsonObject(parameters, RegisterAppInterface.KEY_VR_SYNONYMS); + List<String> testSynonymsList = cmd.getVrSynonyms(); + assertEquals(TestValues.MATCH, vrSynonymsList.size(), testSynonymsList.size()); + assertTrue(TestValues.TRUE, Validator.validateStringList(vrSynonymsList, testSynonymsList)); + + JSONObject sdlMsgVersionObj = JsonUtils.readJsonObjectFromJsonObject(parameters, RegisterAppInterface.KEY_SDL_MSG_VERSION); + SdlMsgVersion sdlMsgVersion = new SdlMsgVersion(JsonRPCMarshaller.deserializeJSONObject(sdlMsgVersionObj)); + assertTrue(TestValues.TRUE, Validator.validateSdlMsgVersion(sdlMsgVersion, cmd.getSdlMsgVersion())); + assertEquals(TestValues.MATCH, JsonUtils.readStringFromJsonObject(parameters, RegisterAppInterface.KEY_HASH_ID), cmd.getHashID()); + + JSONObject dayColorSchemeObj = JsonUtils.readJsonObjectFromJsonObject(parameters, RegisterAppInterface.KEY_DAY_COLOR_SCHEME); + TemplateColorScheme dayColorScheme = new TemplateColorScheme(JsonRPCMarshaller.deserializeJSONObject(dayColorSchemeObj)); + assertTrue(TestValues.TRUE, Validator.validateTemplateColorScheme(dayColorScheme, cmd.getDayColorScheme())); + + JSONObject nightColorSchemeObj = JsonUtils.readJsonObjectFromJsonObject(parameters, RegisterAppInterface.KEY_DAY_COLOR_SCHEME); + TemplateColorScheme nightColorScheme = new TemplateColorScheme(JsonRPCMarshaller.deserializeJSONObject(nightColorSchemeObj)); + assertTrue(TestValues.TRUE, Validator.validateTemplateColorScheme(nightColorScheme, cmd.getDayColorScheme())); + + } catch (JSONException e) { + fail(TestValues.JSON_FAIL); + } } }
\ No newline at end of file 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 840eb246d..0514fa8cf 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 @@ -24,75 +24,75 @@ import static junit.framework.TestCase.fail; public class ReleaseInteriorVehicleDataModuleTests extends BaseRpcTests { - @Override - protected RPCMessage createMessage() { - ReleaseInteriorVehicleDataModule msg = new ReleaseInteriorVehicleDataModule(); - msg.setModuleType(TestValues.GENERAL_MODULETYPE); - msg.setModuleId(TestValues.GENERAL_STRING); - return msg; - } - - @Override - protected JSONObject getExpectedParameters(int sdlVersion) { - JSONObject result = new JSONObject(); - try { - result.put(ReleaseInteriorVehicleDataModule.KEY_MODULE_TYPE, TestValues.GENERAL_MODULETYPE); - result.put(ReleaseInteriorVehicleDataModule.KEY_MODULE_ID, TestValues.GENERAL_STRING); - } catch (JSONException e) { - fail(TestValues.JSON_FAIL); - } - return result; - } - - @Override - protected String getCommandType() { - return FunctionID.RELEASE_INTERIOR_VEHICLE_MODULE.toString(); - } - - @Override - protected String getMessageType() { - return RPCMessage.KEY_REQUEST; - } - - @Test - public void testRpcValues() { - ModuleType type = ((ReleaseInteriorVehicleDataModule) msg).getModuleType(); - String id = ((ReleaseInteriorVehicleDataModule) msg).getModuleId(); - - //valid tests - assertEquals(TestValues.MATCH, TestValues.GENERAL_MODULETYPE, type); - assertEquals(TestValues.MATCH, TestValues.GENERAL_STRING, id); - - //null tests - ReleaseInteriorVehicleDataModule msg = new ReleaseInteriorVehicleDataModule(); - assertNull(TestValues.NULL, msg.getModuleType()); - assertNull(TestValues.NULL, msg.getModuleId()); - - // required param tests - ReleaseInteriorVehicleDataModule msg2 = new ReleaseInteriorVehicleDataModule(TestValues.GENERAL_MODULETYPE); - assertEquals(TestValues.MATCH, TestValues.GENERAL_MODULETYPE, msg2.getModuleType()); - } - - @Test - public void testJsonConstructor() { - JSONObject commandJson = JsonFileReader.readId(getInstrumentation().getTargetContext(), getCommandType(), getMessageType()); - assertNotNull(TestValues.NOT_NULL, commandJson); - - try { - Hashtable<String, Object> hash = JsonRPCMarshaller.deserializeJSONObject(commandJson); - ReleaseInteriorVehicleDataModule cmd = new ReleaseInteriorVehicleDataModule(hash); - - JSONObject body = JsonUtils.readJsonObjectFromJsonObject(commandJson, getMessageType()); - assertNotNull(TestValues.NOT_NULL, body); - - assertEquals(TestValues.MATCH, JsonUtils.readStringFromJsonObject(body, RPCMessage.KEY_FUNCTION_NAME), cmd.getFunctionName()); - assertEquals(TestValues.MATCH, JsonUtils.readIntegerFromJsonObject(body, RPCMessage.KEY_CORRELATION_ID), cmd.getCorrelationID()); - - JSONObject parameters = JsonUtils.readJsonObjectFromJsonObject(body, RPCMessage.KEY_PARAMETERS); - assertEquals(TestValues.MATCH, JsonUtils.readObjectFromJsonObject(parameters, ReleaseInteriorVehicleDataModule.KEY_MODULE_TYPE).toString(), cmd.getModuleType().toString()); - assertEquals(TestValues.MATCH, JsonUtils.readStringListFromJsonObject(parameters, ReleaseInteriorVehicleDataModule.KEY_MODULE_ID), cmd.getModuleId()); - } catch (JSONException e) { - fail(TestValues.JSON_FAIL); - } - } + @Override + protected RPCMessage createMessage() { + ReleaseInteriorVehicleDataModule msg = new ReleaseInteriorVehicleDataModule(); + msg.setModuleType(TestValues.GENERAL_MODULETYPE); + msg.setModuleId(TestValues.GENERAL_STRING); + return msg; + } + + @Override + protected JSONObject getExpectedParameters(int sdlVersion) { + JSONObject result = new JSONObject(); + try { + result.put(ReleaseInteriorVehicleDataModule.KEY_MODULE_TYPE, TestValues.GENERAL_MODULETYPE); + result.put(ReleaseInteriorVehicleDataModule.KEY_MODULE_ID, TestValues.GENERAL_STRING); + } catch (JSONException e) { + fail(TestValues.JSON_FAIL); + } + return result; + } + + @Override + protected String getCommandType() { + return FunctionID.RELEASE_INTERIOR_VEHICLE_MODULE.toString(); + } + + @Override + protected String getMessageType() { + return RPCMessage.KEY_REQUEST; + } + + @Test + public void testRpcValues() { + ModuleType type = ((ReleaseInteriorVehicleDataModule) msg).getModuleType(); + String id = ((ReleaseInteriorVehicleDataModule) msg).getModuleId(); + + //valid tests + assertEquals(TestValues.MATCH, TestValues.GENERAL_MODULETYPE, type); + assertEquals(TestValues.MATCH, TestValues.GENERAL_STRING, id); + + //null tests + ReleaseInteriorVehicleDataModule msg = new ReleaseInteriorVehicleDataModule(); + assertNull(TestValues.NULL, msg.getModuleType()); + assertNull(TestValues.NULL, msg.getModuleId()); + + // required param tests + ReleaseInteriorVehicleDataModule msg2 = new ReleaseInteriorVehicleDataModule(TestValues.GENERAL_MODULETYPE); + assertEquals(TestValues.MATCH, TestValues.GENERAL_MODULETYPE, msg2.getModuleType()); + } + + @Test + public void testJsonConstructor() { + JSONObject commandJson = JsonFileReader.readId(getInstrumentation().getTargetContext(), getCommandType(), getMessageType()); + assertNotNull(TestValues.NOT_NULL, commandJson); + + try { + Hashtable<String, Object> hash = JsonRPCMarshaller.deserializeJSONObject(commandJson); + ReleaseInteriorVehicleDataModule cmd = new ReleaseInteriorVehicleDataModule(hash); + + JSONObject body = JsonUtils.readJsonObjectFromJsonObject(commandJson, getMessageType()); + assertNotNull(TestValues.NOT_NULL, body); + + assertEquals(TestValues.MATCH, JsonUtils.readStringFromJsonObject(body, RPCMessage.KEY_FUNCTION_NAME), cmd.getFunctionName()); + assertEquals(TestValues.MATCH, JsonUtils.readIntegerFromJsonObject(body, RPCMessage.KEY_CORRELATION_ID), cmd.getCorrelationID()); + + JSONObject parameters = JsonUtils.readJsonObjectFromJsonObject(body, RPCMessage.KEY_PARAMETERS); + assertEquals(TestValues.MATCH, JsonUtils.readObjectFromJsonObject(parameters, ReleaseInteriorVehicleDataModule.KEY_MODULE_TYPE).toString(), cmd.getModuleType().toString()); + assertEquals(TestValues.MATCH, JsonUtils.readStringListFromJsonObject(parameters, ReleaseInteriorVehicleDataModule.KEY_MODULE_ID), cmd.getModuleId()); + } catch (JSONException e) { + fail(TestValues.JSON_FAIL); + } + } } diff --git a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/ResetGlobalPropertiesTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/ResetGlobalPropertiesTests.java index 3a2f6eeb4..71351c611 100644 --- a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/ResetGlobalPropertiesTests.java +++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/ResetGlobalPropertiesTests.java @@ -25,93 +25,93 @@ import static junit.framework.TestCase.assertNull; import static junit.framework.TestCase.fail; /** - * This is a unit test class for the SmartDeviceLink library project class : + * This is a unit test class for the SmartDeviceLink library project class : * {@link com.smartdevicelink.proxy.rpc.ResetGlobalProperties} */ public class ResetGlobalPropertiesTests extends BaseRpcTests { - @Override - protected RPCMessage createMessage() { - ResetGlobalProperties msg = new ResetGlobalProperties(); - - msg.setProperties(TestValues.GENERAL_GLOBALPROPERTY_LIST); - - return msg; - } - - @Override - protected String getMessageType() { - return RPCMessage.KEY_REQUEST; - } - - @Override - protected String getCommandType() { - return FunctionID.RESET_GLOBAL_PROPERTIES.toString(); - } - - @Override - protected JSONObject getExpectedParameters(int sdlVersion) { - JSONObject result = new JSONObject(); - - try { - result.put(ResetGlobalProperties.KEY_PROPERTIES, JsonUtils.createJsonArray(TestValues.GENERAL_GLOBALPROPERTY_LIST)); - } catch (JSONException e) { - fail(TestValues.JSON_FAIL); - } - - return result; - } - - /** - * Tests the expected values of the RPC message. - */ - @Test - public void testRpcValues () { - // Test Values - List<GlobalProperty> copy = ( (ResetGlobalProperties) msg ).getProperties(); - - // Valid Tests + @Override + protected RPCMessage createMessage() { + ResetGlobalProperties msg = new ResetGlobalProperties(); + + msg.setProperties(TestValues.GENERAL_GLOBALPROPERTY_LIST); + + return msg; + } + + @Override + protected String getMessageType() { + return RPCMessage.KEY_REQUEST; + } + + @Override + protected String getCommandType() { + return FunctionID.RESET_GLOBAL_PROPERTIES.toString(); + } + + @Override + protected JSONObject getExpectedParameters(int sdlVersion) { + JSONObject result = new JSONObject(); + + try { + result.put(ResetGlobalProperties.KEY_PROPERTIES, JsonUtils.createJsonArray(TestValues.GENERAL_GLOBALPROPERTY_LIST)); + } catch (JSONException e) { + fail(TestValues.JSON_FAIL); + } + + return result; + } + + /** + * Tests the expected values of the RPC message. + */ + @Test + public void testRpcValues() { + // Test Values + List<GlobalProperty> copy = ((ResetGlobalProperties) msg).getProperties(); + + // Valid Tests assertEquals(TestValues.MATCH, TestValues.GENERAL_GLOBALPROPERTY_LIST.size(), copy.size()); - for(int i = 0; i < TestValues.GENERAL_GLOBALPROPERTY_LIST.size(); i++){ + for (int i = 0; i < TestValues.GENERAL_GLOBALPROPERTY_LIST.size(); i++) { assertEquals(TestValues.MATCH, TestValues.GENERAL_GLOBALPROPERTY_LIST.get(i), copy.get(i)); } - + // Invalid/Null Tests - ResetGlobalProperties msg = new ResetGlobalProperties(); - assertNotNull(TestValues.NOT_NULL, msg); - testNullBase(msg); + ResetGlobalProperties msg = new ResetGlobalProperties(); + assertNotNull(TestValues.NOT_NULL, msg); + testNullBase(msg); - assertNull(TestValues.NULL, msg.getProperties()); - } + assertNull(TestValues.NULL, msg.getProperties()); + } /** * Tests a valid JSON construction of this RPC message. */ @Test - public void testJsonConstructor () { - JSONObject commandJson = JsonFileReader.readId(getInstrumentation().getTargetContext(), getCommandType(), getMessageType()); - assertNotNull(TestValues.NOT_NULL, commandJson); - - try { - Hashtable<String, Object> hash = JsonRPCMarshaller.deserializeJSONObject(commandJson); - ResetGlobalProperties cmd = new ResetGlobalProperties(hash); - - JSONObject body = JsonUtils.readJsonObjectFromJsonObject(commandJson, getMessageType()); - assertNotNull(TestValues.NOT_NULL, body); - - // Test everything in the json body. - assertEquals(TestValues.MATCH, JsonUtils.readStringFromJsonObject(body, RPCMessage.KEY_FUNCTION_NAME), cmd.getFunctionName()); - assertEquals(TestValues.MATCH, JsonUtils.readIntegerFromJsonObject(body, RPCMessage.KEY_CORRELATION_ID), cmd.getCorrelationID()); - - JSONObject parameters = JsonUtils.readJsonObjectFromJsonObject(body, RPCMessage.KEY_PARAMETERS); - - JSONArray propertiesArray = JsonUtils.readJsonArrayFromJsonObject(parameters, ResetGlobalProperties.KEY_PROPERTIES); - for (int index = 0; index < propertiesArray.length(); index++) { - GlobalProperty property = GlobalProperty.valueOf(propertiesArray.get(index).toString()); - assertEquals(TestValues.MATCH, property, cmd.getProperties().get(index)); - } - } catch (JSONException e) { - fail(TestValues.JSON_FAIL); - } + public void testJsonConstructor() { + JSONObject commandJson = JsonFileReader.readId(getInstrumentation().getTargetContext(), getCommandType(), getMessageType()); + assertNotNull(TestValues.NOT_NULL, commandJson); + + try { + Hashtable<String, Object> hash = JsonRPCMarshaller.deserializeJSONObject(commandJson); + ResetGlobalProperties cmd = new ResetGlobalProperties(hash); + + JSONObject body = JsonUtils.readJsonObjectFromJsonObject(commandJson, getMessageType()); + assertNotNull(TestValues.NOT_NULL, body); + + // Test everything in the json body. + assertEquals(TestValues.MATCH, JsonUtils.readStringFromJsonObject(body, RPCMessage.KEY_FUNCTION_NAME), cmd.getFunctionName()); + assertEquals(TestValues.MATCH, JsonUtils.readIntegerFromJsonObject(body, RPCMessage.KEY_CORRELATION_ID), cmd.getCorrelationID()); + + JSONObject parameters = JsonUtils.readJsonObjectFromJsonObject(body, RPCMessage.KEY_PARAMETERS); + + JSONArray propertiesArray = JsonUtils.readJsonArrayFromJsonObject(parameters, ResetGlobalProperties.KEY_PROPERTIES); + for (int index = 0; index < propertiesArray.length(); index++) { + GlobalProperty property = GlobalProperty.valueOf(propertiesArray.get(index).toString()); + assertEquals(TestValues.MATCH, property, cmd.getProperties().get(index)); + } + } catch (JSONException e) { + fail(TestValues.JSON_FAIL); + } } }
\ No newline at end of file diff --git a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/ScrollableMessageTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/ScrollableMessageTests.java index 40d4eb33e..e18fb5896 100644 --- a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/ScrollableMessageTests.java +++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/ScrollableMessageTests.java @@ -28,114 +28,114 @@ import static junit.framework.TestCase.assertTrue; import static junit.framework.TestCase.fail; /** - * This is a unit test class for the SmartDeviceLink library project class : + * This is a unit test class for the SmartDeviceLink library project class : * {@link com.smartdevicelink.proxy.rpc.ScrollableMessage} */ public class ScrollableMessageTests extends BaseRpcTests { - - @Override - protected RPCMessage createMessage() { - ScrollableMessage msg = new ScrollableMessage(); - - msg.setTimeout(TestValues.GENERAL_INT); - msg.setSoftButtons(TestValues.GENERAL_SOFTBUTTON_LIST); - msg.setScrollableMessageBody(TestValues.GENERAL_STRING); - msg.setCancelID(TestValues.GENERAL_INTEGER); - - return msg; - } - - @Override - protected String getMessageType() { - return RPCMessage.KEY_REQUEST; - } - - @Override - protected String getCommandType() { - return FunctionID.SCROLLABLE_MESSAGE.toString(); - } - - @Override - protected JSONObject getExpectedParameters(int sdlVersion) { - JSONObject result = new JSONObject(); - - try { - result.put(ScrollableMessage.KEY_SCROLLABLE_MESSAGE_BODY, TestValues.GENERAL_STRING); - result.put(ScrollableMessage.KEY_TIMEOUT, TestValues.GENERAL_INT); - result.put(ScrollableMessage.KEY_SOFT_BUTTONS, TestValues.JSON_SOFTBUTTONS); - result.put(ScrollableMessage.KEY_CANCEL_ID, TestValues.GENERAL_INTEGER); - } catch (JSONException e) { - fail(TestValues.JSON_FAIL); - } - - return result; - } - - /** - * Tests the expected values of the RPC message. - */ - @Test - public void testRpcValues () { - // Test Values - String testBody = ( (ScrollableMessage) msg ).getScrollableMessageBody(); - Integer testTimeout = ( (ScrollableMessage) msg ).getTimeout(); - List<SoftButton> testSoftButtons = ( (ScrollableMessage) msg ).getSoftButtons(); - Integer testCancelID = ( (ScrollableMessage) msg ).getCancelID(); - - // Valid Tests - assertEquals(TestValues.MATCH, TestValues.GENERAL_STRING, testBody); - assertEquals(TestValues.MATCH, (Integer) TestValues.GENERAL_INT, testTimeout); - assertEquals(TestValues.MATCH, TestValues.GENERAL_SOFTBUTTON_LIST.size(), testSoftButtons.size()); - for (int i = 0; i < TestValues.GENERAL_SOFTBUTTON_LIST.size(); i++) { - assertEquals(TestValues.MATCH, TestValues.GENERAL_SOFTBUTTON_LIST.get(i), testSoftButtons.get(i)); - } - assertEquals(TestValues.MATCH, TestValues.GENERAL_INTEGER, testCancelID); - - // Invalid/Null Tests - ScrollableMessage msg = new ScrollableMessage(); - assertNotNull(TestValues.NOT_NULL, msg); - - testNullBase(msg); - - assertNull(TestValues.NULL, msg.getScrollableMessageBody()); - assertNull(TestValues.NULL, msg.getTimeout()); - assertNull(TestValues.NULL, msg.getSoftButtons()); - assertNull(TestValues.NULL, msg.getCancelID()); - } + + @Override + protected RPCMessage createMessage() { + ScrollableMessage msg = new ScrollableMessage(); + + msg.setTimeout(TestValues.GENERAL_INT); + msg.setSoftButtons(TestValues.GENERAL_SOFTBUTTON_LIST); + msg.setScrollableMessageBody(TestValues.GENERAL_STRING); + msg.setCancelID(TestValues.GENERAL_INTEGER); + + return msg; + } + + @Override + protected String getMessageType() { + return RPCMessage.KEY_REQUEST; + } + + @Override + protected String getCommandType() { + return FunctionID.SCROLLABLE_MESSAGE.toString(); + } + + @Override + protected JSONObject getExpectedParameters(int sdlVersion) { + JSONObject result = new JSONObject(); + + try { + result.put(ScrollableMessage.KEY_SCROLLABLE_MESSAGE_BODY, TestValues.GENERAL_STRING); + result.put(ScrollableMessage.KEY_TIMEOUT, TestValues.GENERAL_INT); + result.put(ScrollableMessage.KEY_SOFT_BUTTONS, TestValues.JSON_SOFTBUTTONS); + result.put(ScrollableMessage.KEY_CANCEL_ID, TestValues.GENERAL_INTEGER); + } catch (JSONException e) { + fail(TestValues.JSON_FAIL); + } + + return result; + } + + /** + * Tests the expected values of the RPC message. + */ + @Test + public void testRpcValues() { + // Test Values + String testBody = ((ScrollableMessage) msg).getScrollableMessageBody(); + Integer testTimeout = ((ScrollableMessage) msg).getTimeout(); + List<SoftButton> testSoftButtons = ((ScrollableMessage) msg).getSoftButtons(); + Integer testCancelID = ((ScrollableMessage) msg).getCancelID(); + + // Valid Tests + assertEquals(TestValues.MATCH, TestValues.GENERAL_STRING, testBody); + assertEquals(TestValues.MATCH, (Integer) TestValues.GENERAL_INT, testTimeout); + assertEquals(TestValues.MATCH, TestValues.GENERAL_SOFTBUTTON_LIST.size(), testSoftButtons.size()); + for (int i = 0; i < TestValues.GENERAL_SOFTBUTTON_LIST.size(); i++) { + assertEquals(TestValues.MATCH, TestValues.GENERAL_SOFTBUTTON_LIST.get(i), testSoftButtons.get(i)); + } + assertEquals(TestValues.MATCH, TestValues.GENERAL_INTEGER, testCancelID); + + // Invalid/Null Tests + ScrollableMessage msg = new ScrollableMessage(); + assertNotNull(TestValues.NOT_NULL, msg); + + testNullBase(msg); + + assertNull(TestValues.NULL, msg.getScrollableMessageBody()); + assertNull(TestValues.NULL, msg.getTimeout()); + assertNull(TestValues.NULL, msg.getSoftButtons()); + assertNull(TestValues.NULL, msg.getCancelID()); + } /** * Tests a valid JSON construction of this RPC message. */ @Test - public void testJsonConstructor () { - JSONObject commandJson = JsonFileReader.readId(getInstrumentation().getTargetContext(), getCommandType(), getMessageType()); - assertNotNull(TestValues.NOT_NULL, commandJson); - - try { - Hashtable<String, Object> hash = JsonRPCMarshaller.deserializeJSONObject(commandJson); - ScrollableMessage cmd = new ScrollableMessage(hash); - - JSONObject body = JsonUtils.readJsonObjectFromJsonObject(commandJson, getMessageType()); - assertNotNull(TestValues.NOT_NULL, body); - - // Test everything in the json body. - assertEquals(TestValues.MATCH, JsonUtils.readStringFromJsonObject(body, RPCMessage.KEY_FUNCTION_NAME), cmd.getFunctionName()); - assertEquals(TestValues.MATCH, JsonUtils.readIntegerFromJsonObject(body, RPCMessage.KEY_CORRELATION_ID), cmd.getCorrelationID()); - - JSONObject parameters = JsonUtils.readJsonObjectFromJsonObject(body, RPCMessage.KEY_PARAMETERS); - assertEquals(TestValues.MATCH, JsonUtils.readStringFromJsonObject(parameters, ScrollableMessage.KEY_SCROLLABLE_MESSAGE_BODY), cmd.getScrollableMessageBody()); - assertEquals(TestValues.MATCH, JsonUtils.readIntegerFromJsonObject(parameters, ScrollableMessage.KEY_TIMEOUT), cmd.getTimeout()); - assertEquals(TestValues.MATCH, JsonUtils.readIntegerFromJsonObject(parameters, ScrollableMessage.KEY_CANCEL_ID), cmd.getCancelID()); - - JSONArray softButtonArray = JsonUtils.readJsonArrayFromJsonObject(parameters, ScrollableMessage.KEY_SOFT_BUTTONS); - List<SoftButton> softButtonList = new ArrayList<SoftButton>(); - for (int index = 0; index < softButtonArray.length(); index++) { - SoftButton chunk = new SoftButton(JsonRPCMarshaller.deserializeJSONObject( (JSONObject)softButtonArray.get(index)) ); - softButtonList.add(chunk); - } - assertTrue(TestValues.TRUE, Validator.validateSoftButtons(softButtonList, cmd.getSoftButtons())); - } catch (JSONException e) { - fail(TestValues.JSON_FAIL); - } - } + public void testJsonConstructor() { + JSONObject commandJson = JsonFileReader.readId(getInstrumentation().getTargetContext(), getCommandType(), getMessageType()); + assertNotNull(TestValues.NOT_NULL, commandJson); + + try { + Hashtable<String, Object> hash = JsonRPCMarshaller.deserializeJSONObject(commandJson); + ScrollableMessage cmd = new ScrollableMessage(hash); + + JSONObject body = JsonUtils.readJsonObjectFromJsonObject(commandJson, getMessageType()); + assertNotNull(TestValues.NOT_NULL, body); + + // Test everything in the json body. + assertEquals(TestValues.MATCH, JsonUtils.readStringFromJsonObject(body, RPCMessage.KEY_FUNCTION_NAME), cmd.getFunctionName()); + assertEquals(TestValues.MATCH, JsonUtils.readIntegerFromJsonObject(body, RPCMessage.KEY_CORRELATION_ID), cmd.getCorrelationID()); + + JSONObject parameters = JsonUtils.readJsonObjectFromJsonObject(body, RPCMessage.KEY_PARAMETERS); + assertEquals(TestValues.MATCH, JsonUtils.readStringFromJsonObject(parameters, ScrollableMessage.KEY_SCROLLABLE_MESSAGE_BODY), cmd.getScrollableMessageBody()); + assertEquals(TestValues.MATCH, JsonUtils.readIntegerFromJsonObject(parameters, ScrollableMessage.KEY_TIMEOUT), cmd.getTimeout()); + assertEquals(TestValues.MATCH, JsonUtils.readIntegerFromJsonObject(parameters, ScrollableMessage.KEY_CANCEL_ID), cmd.getCancelID()); + + JSONArray softButtonArray = JsonUtils.readJsonArrayFromJsonObject(parameters, ScrollableMessage.KEY_SOFT_BUTTONS); + List<SoftButton> softButtonList = new ArrayList<SoftButton>(); + for (int index = 0; index < softButtonArray.length(); index++) { + SoftButton chunk = new SoftButton(JsonRPCMarshaller.deserializeJSONObject((JSONObject) softButtonArray.get(index))); + softButtonList.add(chunk); + } + assertTrue(TestValues.TRUE, Validator.validateSoftButtons(softButtonList, cmd.getSoftButtons())); + } catch (JSONException e) { + fail(TestValues.JSON_FAIL); + } + } }
\ No newline at end of file diff --git a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/SendHapticDataTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/SendHapticDataTests.java index 090818308..e31ab22bf 100644 --- a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/SendHapticDataTests.java +++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/SendHapticDataTests.java @@ -26,67 +26,67 @@ import static junit.framework.TestCase.assertNull; public class SendHapticDataTests extends BaseRpcTests { - private SendHapticData msg; - - @Override - protected RPCMessage createMessage(){ - msg = new SendHapticData(); - - List<HapticRect> list = new ArrayList<>(); - list.add(TestValues.GENERAL_HAPTIC_RECT); - - msg.setHapticRectData(list); - - return msg; - } - - @Override - protected String getMessageType(){ - return RPCMessage.KEY_REQUEST; - } - - @Override - protected String getCommandType(){ - return FunctionID.SEND_HAPTIC_DATA.toString(); - } - - @Override - protected JSONObject getExpectedParameters(int sdlVersion){ - JSONObject result = new JSONObject(); - - JSONArray jsonArray = new JSONArray(); - try { - jsonArray.put(JsonRPCMarshaller.serializeHashtable(TestValues.GENERAL_HAPTIC_RECT.getStore())); - } catch (JSONException e) { - e.printStackTrace(); - } - - try { - result.put(SendHapticData.KEY_HAPTIC_RECT_DATA, jsonArray); - } catch (JSONException e) { - e.printStackTrace(); - } - - return result; - } - - /** - * Tests the expected values of the RPC message. - */ - @Test - public void testRpcValues () { - // Test Values - List<HapticRect> list = msg.getHapticRectData(); - - // Valid Tests - assertEquals(TestValues.MATCH, TestValues.GENERAL_HAPTIC_RECT, list.get(0)); - - // Invalid/Null Tests - SendHapticData msg = new SendHapticData(); - assertNotNull(TestValues.NOT_NULL, msg); - testNullBase(msg); - - assertNull(TestValues.NULL, msg.getHapticRectData()); - } + private SendHapticData msg; + + @Override + protected RPCMessage createMessage() { + msg = new SendHapticData(); + + List<HapticRect> list = new ArrayList<>(); + list.add(TestValues.GENERAL_HAPTIC_RECT); + + msg.setHapticRectData(list); + + return msg; + } + + @Override + protected String getMessageType() { + return RPCMessage.KEY_REQUEST; + } + + @Override + protected String getCommandType() { + return FunctionID.SEND_HAPTIC_DATA.toString(); + } + + @Override + protected JSONObject getExpectedParameters(int sdlVersion) { + JSONObject result = new JSONObject(); + + JSONArray jsonArray = new JSONArray(); + try { + jsonArray.put(JsonRPCMarshaller.serializeHashtable(TestValues.GENERAL_HAPTIC_RECT.getStore())); + } catch (JSONException e) { + e.printStackTrace(); + } + + try { + result.put(SendHapticData.KEY_HAPTIC_RECT_DATA, jsonArray); + } catch (JSONException e) { + e.printStackTrace(); + } + + return result; + } + + /** + * Tests the expected values of the RPC message. + */ + @Test + public void testRpcValues() { + // Test Values + List<HapticRect> list = msg.getHapticRectData(); + + // Valid Tests + assertEquals(TestValues.MATCH, TestValues.GENERAL_HAPTIC_RECT, list.get(0)); + + // Invalid/Null Tests + SendHapticData msg = new SendHapticData(); + assertNotNull(TestValues.NOT_NULL, msg); + testNullBase(msg); + + assertNull(TestValues.NULL, msg.getHapticRectData()); + } } diff --git a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/SendLocationTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/SendLocationTests.java index 14867c7f6..0120d8279 100644 --- a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/SendLocationTests.java +++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/SendLocationTests.java @@ -26,81 +26,81 @@ import static junit.framework.TestCase.assertTrue; import static junit.framework.TestCase.fail; /** - * This is a unit test class for the SmartDeviceLink library project class : + * This is a unit test class for the SmartDeviceLink library project class : * {@link com.smartdevicelink.proxy.rpc.SendLocation} */ public class SendLocationTests extends BaseRpcTests { - + @Override - protected RPCMessage createMessage(){ - SendLocation msg = new SendLocation(); - - msg.setLatitudeDegrees(TestValues.GENERAL_DOUBLE); - msg.setLongitudeDegrees(TestValues.GENERAL_DOUBLE); - msg.setLocationName(TestValues.GENERAL_STRING); - msg.setLocationDescription(TestValues.GENERAL_STRING); - msg.setPhoneNumber(TestValues.GENERAL_STRING); - msg.setAddressLines(TestValues.GENERAL_STRING_LIST); - msg.setLocationImage(TestValues.GENERAL_IMAGE); - - return msg; + protected RPCMessage createMessage() { + SendLocation msg = new SendLocation(); + + msg.setLatitudeDegrees(TestValues.GENERAL_DOUBLE); + msg.setLongitudeDegrees(TestValues.GENERAL_DOUBLE); + msg.setLocationName(TestValues.GENERAL_STRING); + msg.setLocationDescription(TestValues.GENERAL_STRING); + msg.setPhoneNumber(TestValues.GENERAL_STRING); + msg.setAddressLines(TestValues.GENERAL_STRING_LIST); + msg.setLocationImage(TestValues.GENERAL_IMAGE); + + return msg; } - + @Override - protected String getMessageType(){ + protected String getMessageType() { return RPCMessage.KEY_REQUEST; } - + @Override - protected String getCommandType(){ + protected String getCommandType() { return FunctionID.SEND_LOCATION.toString(); } - + @Override - protected JSONObject getExpectedParameters (int sdlVersion){ - JSONObject result = new JSONObject(); - - try { - result.put(SendLocation.KEY_LAT_DEGREES, TestValues.GENERAL_DOUBLE); - result.put(SendLocation.KEY_LON_DEGREES, TestValues.GENERAL_DOUBLE); - result.put(SendLocation.KEY_LOCATION_NAME, TestValues.GENERAL_STRING); - result.put(SendLocation.KEY_LOCATION_DESCRIPTION, TestValues.GENERAL_STRING); - result.put(SendLocation.KEY_PHONE_NUMBER, TestValues.GENERAL_STRING); - result.put(SendLocation.KEY_LOCATION_IMAGE, TestValues.GENERAL_IMAGE.serializeJSON()); - result.put(SendLocation.KEY_ADDRESS_LINES, JsonUtils.createJsonArray(TestValues.GENERAL_STRING_LIST)); - } catch(JSONException e){ - fail(TestValues.JSON_FAIL); + protected JSONObject getExpectedParameters(int sdlVersion) { + JSONObject result = new JSONObject(); + + try { + result.put(SendLocation.KEY_LAT_DEGREES, TestValues.GENERAL_DOUBLE); + result.put(SendLocation.KEY_LON_DEGREES, TestValues.GENERAL_DOUBLE); + result.put(SendLocation.KEY_LOCATION_NAME, TestValues.GENERAL_STRING); + result.put(SendLocation.KEY_LOCATION_DESCRIPTION, TestValues.GENERAL_STRING); + result.put(SendLocation.KEY_PHONE_NUMBER, TestValues.GENERAL_STRING); + result.put(SendLocation.KEY_LOCATION_IMAGE, TestValues.GENERAL_IMAGE.serializeJSON()); + result.put(SendLocation.KEY_ADDRESS_LINES, JsonUtils.createJsonArray(TestValues.GENERAL_STRING_LIST)); + } catch (JSONException e) { + fail(TestValues.JSON_FAIL); } - - return result; + + return result; } - + /** - * Tests the expected values of the RPC message. - */ + * Tests the expected values of the RPC message. + */ @Test - public void testRpcValues () { - // Test Values - Double latitude = ((SendLocation) msg).getLatitudeDegrees(); + public void testRpcValues() { + // Test Values + Double latitude = ((SendLocation) msg).getLatitudeDegrees(); Double longitude = ((SendLocation) msg).getLongitudeDegrees(); String locationName = ((SendLocation) msg).getLocationName(); - String locationDesc = ((SendLocation) msg).getLocationDescription(); - String phoneNumber = ((SendLocation) msg).getPhoneNumber(); - List<String> addressLines = ((SendLocation) msg).getAddressLines(); - Image locationImage = ((SendLocation) msg).getLocationImage(); - - // Valid Tests + String locationDesc = ((SendLocation) msg).getLocationDescription(); + String phoneNumber = ((SendLocation) msg).getPhoneNumber(); + List<String> addressLines = ((SendLocation) msg).getAddressLines(); + Image locationImage = ((SendLocation) msg).getLocationImage(); + + // Valid Tests assertEquals(TestValues.MATCH, TestValues.GENERAL_DOUBLE, longitude); assertEquals(TestValues.MATCH, TestValues.GENERAL_DOUBLE, latitude); - assertEquals(TestValues.MATCH, TestValues.GENERAL_STRING, locationDesc); - assertEquals(TestValues.MATCH, TestValues.GENERAL_STRING, locationName); - assertEquals(TestValues.MATCH, TestValues.GENERAL_STRING, phoneNumber); - assertTrue(TestValues.TRUE, Validator.validateStringList(TestValues.GENERAL_STRING_LIST, addressLines)); - assertTrue(TestValues.TRUE, Validator.validateImage(TestValues.GENERAL_IMAGE, locationImage)); - - // Invalid/Null Tests - SendLocation msg = new SendLocation(); - assertNotNull(TestValues.NOT_NULL, msg); + assertEquals(TestValues.MATCH, TestValues.GENERAL_STRING, locationDesc); + assertEquals(TestValues.MATCH, TestValues.GENERAL_STRING, locationName); + assertEquals(TestValues.MATCH, TestValues.GENERAL_STRING, phoneNumber); + assertTrue(TestValues.TRUE, Validator.validateStringList(TestValues.GENERAL_STRING_LIST, addressLines)); + assertTrue(TestValues.TRUE, Validator.validateImage(TestValues.GENERAL_IMAGE, locationImage)); + + // Invalid/Null Tests + SendLocation msg = new SendLocation(); + assertNotNull(TestValues.NOT_NULL, msg); testNullBase(msg); assertNull(TestValues.NULL, msg.getLatitudeDegrees()); @@ -116,40 +116,40 @@ public class SendLocationTests extends BaseRpcTests { * Tests a valid JSON construction of this RPC message. */ @Test - public void testJsonConstructor () { - JSONObject commandJson = JsonFileReader.readId(getInstrumentation().getTargetContext(), getCommandType(), getMessageType()); - assertNotNull("Command object is null", commandJson); - - try { - Hashtable<String, Object> hash = JsonRPCMarshaller.deserializeJSONObject(commandJson); - SendLocation cmd = new SendLocation(hash); - assertNotNull(TestValues.NOT_NULL, cmd); - - JSONObject body = JsonUtils.readJsonObjectFromJsonObject(commandJson, getMessageType()); - assertNotNull(TestValues.NOT_NULL, body); - - // Test everything in the json body. - assertEquals(TestValues.MATCH, JsonUtils.readStringFromJsonObject(body, RPCMessage.KEY_FUNCTION_NAME), cmd.getFunctionName()); - assertEquals(TestValues.MATCH, JsonUtils.readIntegerFromJsonObject(body, RPCMessage.KEY_CORRELATION_ID), cmd.getCorrelationID()); - - JSONObject parameters = JsonUtils.readJsonObjectFromJsonObject(body, RPCMessage.KEY_PARAMETERS); - assertEquals(TestValues.MATCH, JsonUtils.readDoubleFromJsonObject(parameters, SendLocation.KEY_LAT_DEGREES), cmd.getLatitudeDegrees()); - assertEquals(TestValues.MATCH, JsonUtils.readDoubleFromJsonObject(parameters, SendLocation.KEY_LON_DEGREES), cmd.getLongitudeDegrees()); - assertEquals(TestValues.MATCH, JsonUtils.readStringFromJsonObject(parameters, SendLocation.KEY_LOCATION_NAME), cmd.getLocationName()); - assertEquals(TestValues.MATCH, JsonUtils.readStringFromJsonObject(parameters, SendLocation.KEY_LOCATION_DESCRIPTION), cmd.getLocationDescription()); - assertEquals(TestValues.MATCH, JsonUtils.readStringFromJsonObject(parameters, SendLocation.KEY_PHONE_NUMBER), cmd.getPhoneNumber()); - - List<String> addressList = JsonUtils.readStringListFromJsonObject(parameters, SendLocation.KEY_ADDRESS_LINES); - List<String> testList = cmd.getAddressLines(); - assertEquals(TestValues.MATCH, addressList.size(), testList.size()); - assertTrue(TestValues.TRUE, Validator.validateStringList(addressList, testList)); - - JSONObject cmdIcon = JsonUtils.readJsonObjectFromJsonObject(parameters, SendLocation.KEY_LOCATION_IMAGE); - Image reference = new Image(JsonRPCMarshaller.deserializeJSONObject(cmdIcon)); - assertTrue(TestValues.TRUE, Validator.validateImage(reference, cmd.getLocationImage())); - - } catch (JSONException e) { - fail(TestValues.JSON_FAIL); - } + public void testJsonConstructor() { + JSONObject commandJson = JsonFileReader.readId(getInstrumentation().getTargetContext(), getCommandType(), getMessageType()); + assertNotNull("Command object is null", commandJson); + + try { + Hashtable<String, Object> hash = JsonRPCMarshaller.deserializeJSONObject(commandJson); + SendLocation cmd = new SendLocation(hash); + assertNotNull(TestValues.NOT_NULL, cmd); + + JSONObject body = JsonUtils.readJsonObjectFromJsonObject(commandJson, getMessageType()); + assertNotNull(TestValues.NOT_NULL, body); + + // Test everything in the json body. + assertEquals(TestValues.MATCH, JsonUtils.readStringFromJsonObject(body, RPCMessage.KEY_FUNCTION_NAME), cmd.getFunctionName()); + assertEquals(TestValues.MATCH, JsonUtils.readIntegerFromJsonObject(body, RPCMessage.KEY_CORRELATION_ID), cmd.getCorrelationID()); + + JSONObject parameters = JsonUtils.readJsonObjectFromJsonObject(body, RPCMessage.KEY_PARAMETERS); + assertEquals(TestValues.MATCH, JsonUtils.readDoubleFromJsonObject(parameters, SendLocation.KEY_LAT_DEGREES), cmd.getLatitudeDegrees()); + assertEquals(TestValues.MATCH, JsonUtils.readDoubleFromJsonObject(parameters, SendLocation.KEY_LON_DEGREES), cmd.getLongitudeDegrees()); + assertEquals(TestValues.MATCH, JsonUtils.readStringFromJsonObject(parameters, SendLocation.KEY_LOCATION_NAME), cmd.getLocationName()); + assertEquals(TestValues.MATCH, JsonUtils.readStringFromJsonObject(parameters, SendLocation.KEY_LOCATION_DESCRIPTION), cmd.getLocationDescription()); + assertEquals(TestValues.MATCH, JsonUtils.readStringFromJsonObject(parameters, SendLocation.KEY_PHONE_NUMBER), cmd.getPhoneNumber()); + + List<String> addressList = JsonUtils.readStringListFromJsonObject(parameters, SendLocation.KEY_ADDRESS_LINES); + List<String> testList = cmd.getAddressLines(); + assertEquals(TestValues.MATCH, addressList.size(), testList.size()); + assertTrue(TestValues.TRUE, Validator.validateStringList(addressList, testList)); + + JSONObject cmdIcon = JsonUtils.readJsonObjectFromJsonObject(parameters, SendLocation.KEY_LOCATION_IMAGE); + Image reference = new Image(JsonRPCMarshaller.deserializeJSONObject(cmdIcon)); + assertTrue(TestValues.TRUE, Validator.validateImage(reference, cmd.getLocationImage())); + + } catch (JSONException e) { + fail(TestValues.JSON_FAIL); + } } }
\ No newline at end of file diff --git a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/SetAppIconTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/SetAppIconTests.java index 2b47f7837..7430f4174 100644 --- a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/SetAppIconTests.java +++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/SetAppIconTests.java @@ -22,86 +22,86 @@ import static junit.framework.TestCase.assertNull; import static junit.framework.TestCase.fail; /** - * This is a unit test class for the SmartDeviceLink library project class : + * This is a unit test class for the SmartDeviceLink library project class : * {@link com.smartdevicelink.proxy.rpc.SetAppIcon} */ public class SetAppIconTests extends BaseRpcTests { - @Override - protected RPCMessage createMessage() { - SetAppIcon msg = new SetAppIcon(); - - msg.setSdlFileName(TestValues.GENERAL_STRING); - - return msg; - } - - @Override - protected String getMessageType() { - return RPCMessage.KEY_REQUEST; - } - - @Override - protected String getCommandType() { - return FunctionID.SET_APP_ICON.toString(); - } - - @Override - protected JSONObject getExpectedParameters(int sdlVersion) { - JSONObject result = new JSONObject(); - - try { - result.put(SetAppIcon.KEY_SDL_FILE_NAME, TestValues.GENERAL_STRING); - } catch (JSONException e) { - fail(TestValues.JSON_FAIL); - } - - return result; - } - - /** - * Tests the expected values of the RPC message. - */ - @Test - public void testRpcValues () { - // Test Values - String copy = ( (SetAppIcon) msg ).getSdlFileName(); - - // Valid Tests - assertEquals(TestValues.MATCH, TestValues.GENERAL_STRING, copy); - - // Invalid/Null Tests - SetAppIcon msg = new SetAppIcon(); - assertNotNull(TestValues.NOT_NULL, msg); - testNullBase(msg); - - assertNull(TestValues.NULL, msg.getSdlFileName()); - } + @Override + protected RPCMessage createMessage() { + SetAppIcon msg = new SetAppIcon(); + + msg.setSdlFileName(TestValues.GENERAL_STRING); + + return msg; + } + + @Override + protected String getMessageType() { + return RPCMessage.KEY_REQUEST; + } + + @Override + protected String getCommandType() { + return FunctionID.SET_APP_ICON.toString(); + } + + @Override + protected JSONObject getExpectedParameters(int sdlVersion) { + JSONObject result = new JSONObject(); + + try { + result.put(SetAppIcon.KEY_SDL_FILE_NAME, TestValues.GENERAL_STRING); + } catch (JSONException e) { + fail(TestValues.JSON_FAIL); + } + + return result; + } + + /** + * Tests the expected values of the RPC message. + */ + @Test + public void testRpcValues() { + // Test Values + String copy = ((SetAppIcon) msg).getSdlFileName(); + + // Valid Tests + assertEquals(TestValues.MATCH, TestValues.GENERAL_STRING, copy); + + // Invalid/Null Tests + SetAppIcon msg = new SetAppIcon(); + assertNotNull(TestValues.NOT_NULL, msg); + testNullBase(msg); + + assertNull(TestValues.NULL, msg.getSdlFileName()); + } /** * Tests a valid JSON construction of this RPC message. */ @Test - public void testJsonConstructor () { - JSONObject commandJson = JsonFileReader.readId(getInstrumentation().getTargetContext(), getCommandType(), getMessageType()); - assertNotNull(TestValues.NOT_NULL, commandJson); - - try { - Hashtable<String, Object> hash = JsonRPCMarshaller.deserializeJSONObject(commandJson); - SetAppIcon cmd = new SetAppIcon(hash); - - JSONObject body = JsonUtils.readJsonObjectFromJsonObject(commandJson, getMessageType()); - assertNotNull(TestValues.NOT_NULL, body); - - // Test everything in the json body. - assertEquals(TestValues.MATCH, JsonUtils.readStringFromJsonObject(body, RPCMessage.KEY_FUNCTION_NAME), cmd.getFunctionName()); - assertEquals(TestValues.MATCH, JsonUtils.readIntegerFromJsonObject(body, RPCMessage.KEY_CORRELATION_ID), cmd.getCorrelationID()); - - JSONObject parameters = JsonUtils.readJsonObjectFromJsonObject(body, RPCMessage.KEY_PARAMETERS); - assertEquals(TestValues.MATCH, JsonUtils.readStringFromJsonObject(parameters, SetAppIcon.KEY_SDL_FILE_NAME), cmd.getSdlFileName()); - - } catch (JSONException e) { - fail(TestValues.JSON_FAIL); - } + public void testJsonConstructor() { + JSONObject commandJson = JsonFileReader.readId(getInstrumentation().getTargetContext(), getCommandType(), getMessageType()); + assertNotNull(TestValues.NOT_NULL, commandJson); + + try { + Hashtable<String, Object> hash = JsonRPCMarshaller.deserializeJSONObject(commandJson); + SetAppIcon cmd = new SetAppIcon(hash); + + JSONObject body = JsonUtils.readJsonObjectFromJsonObject(commandJson, getMessageType()); + assertNotNull(TestValues.NOT_NULL, body); + + // Test everything in the json body. + assertEquals(TestValues.MATCH, JsonUtils.readStringFromJsonObject(body, RPCMessage.KEY_FUNCTION_NAME), cmd.getFunctionName()); + assertEquals(TestValues.MATCH, JsonUtils.readIntegerFromJsonObject(body, RPCMessage.KEY_CORRELATION_ID), cmd.getCorrelationID()); + + JSONObject parameters = JsonUtils.readJsonObjectFromJsonObject(body, RPCMessage.KEY_PARAMETERS); + assertEquals(TestValues.MATCH, JsonUtils.readStringFromJsonObject(parameters, SetAppIcon.KEY_SDL_FILE_NAME), cmd.getSdlFileName()); + + } catch (JSONException e) { + fail(TestValues.JSON_FAIL); + } } }
\ No newline at end of file diff --git a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/SetCloudAppPropertiesTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/SetCloudAppPropertiesTests.java index 2db06fa01..fb71fda20 100644 --- a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/SetCloudAppPropertiesTests.java +++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/SetCloudAppPropertiesTests.java @@ -14,7 +14,7 @@ import static junit.framework.TestCase.fail; public class SetCloudAppPropertiesTests extends BaseRpcTests { @Override - protected RPCMessage createMessage(){ + protected RPCMessage createMessage() { SetCloudAppProperties msg = new SetCloudAppProperties(); msg.setProperties(TestValues.GENERAL_CLOUDAPPPROPERTIES); @@ -23,22 +23,22 @@ public class SetCloudAppPropertiesTests extends BaseRpcTests { } @Override - protected String getMessageType(){ + protected String getMessageType() { return RPCMessage.KEY_REQUEST; } @Override - protected String getCommandType(){ + protected String getCommandType() { return FunctionID.SET_CLOUD_APP_PROPERTIES.toString(); } @Override - protected JSONObject getExpectedParameters(int sdlVersion){ + protected JSONObject getExpectedParameters(int sdlVersion) { JSONObject result = new JSONObject(); - try{ + try { result.put(SetCloudAppProperties.KEY_PROPERTIES, TestValues.GENERAL_CLOUDAPPPROPERTIES.serializeJSON()); - }catch(JSONException e){ + } catch (JSONException e) { fail(TestValues.JSON_FAIL); } diff --git a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/SetDisplayLayoutTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/SetDisplayLayoutTests.java index f5a080295..97607f56c 100644 --- a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/SetDisplayLayoutTests.java +++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/SetDisplayLayoutTests.java @@ -26,106 +26,106 @@ import static junit.framework.TestCase.fail; /** - * This is a unit test class for the SmartDeviceLink library project class : + * This is a unit test class for the SmartDeviceLink library project class : * {@link com.smartdevicelink.proxy.rpc.SetDisplayLayout} */ public class SetDisplayLayoutTests extends BaseRpcTests { - - @Override - protected RPCMessage createMessage() { - SetDisplayLayout msg = new SetDisplayLayout(); - - msg.setDisplayLayout(TestValues.GENERAL_STRING); - msg.setDayColorScheme(TestValues.GENERAL_DAYCOLORSCHEME); - msg.setNightColorScheme(TestValues.GENERAL_NIGHTCOLORSCHEME); - - return msg; - } - - @Override - protected String getMessageType() { - return RPCMessage.KEY_REQUEST; - } - - @Override - protected String getCommandType() { - return FunctionID.SET_DISPLAY_LAYOUT.toString(); - } - - @Override - protected JSONObject getExpectedParameters(int sdlVersion) { - JSONObject result = new JSONObject(); - - try { - result.put(SetDisplayLayout.KEY_DISPLAY_LAYOUT, TestValues.GENERAL_STRING); - result.put(SetDisplayLayout.KEY_DAY_COLOR_SCHEME, TestValues.JSON_DAYCOLORSCHEME); - result.put(SetDisplayLayout.KEY_NIGHT_COLOR_SCHEME, TestValues.JSON_NIGHTCOLORSCHEME); - } catch (JSONException e) { - fail(TestValues.JSON_FAIL); - } - - return result; - } - - /** - * Tests the expected values of the RPC message. - */ - @Test - public void testRpcValues () { - // Test Values - String testDisplayLayout = ( (SetDisplayLayout) msg ).getDisplayLayout(); - TemplateColorScheme testDayColorScheme = ( (SetDisplayLayout) msg).getDayColorScheme(); - TemplateColorScheme testNightColorScheme = ( (SetDisplayLayout) msg).getNightColorScheme(); - - // Valid Tests - assertEquals(TestValues.MATCH, TestValues.GENERAL_STRING, testDisplayLayout); - assertTrue(TestValues.TRUE, Validator.validateTemplateColorScheme(TestValues.GENERAL_DAYCOLORSCHEME, testDayColorScheme)); - assertTrue(TestValues.TRUE, Validator.validateTemplateColorScheme(TestValues.GENERAL_NIGHTCOLORSCHEME, testNightColorScheme)); - - // Invalid/Null Tests - SetDisplayLayout msg = new SetDisplayLayout(); - assertNotNull(TestValues.NOT_NULL, msg); - testNullBase(msg); - - assertNull(TestValues.NULL, msg.getDisplayLayout()); - assertNull(TestValues.NULL, msg.getDayColorScheme()); - assertNull(TestValues.NULL, msg.getNightColorScheme()); - } - - /** + + @Override + protected RPCMessage createMessage() { + SetDisplayLayout msg = new SetDisplayLayout(); + + msg.setDisplayLayout(TestValues.GENERAL_STRING); + msg.setDayColorScheme(TestValues.GENERAL_DAYCOLORSCHEME); + msg.setNightColorScheme(TestValues.GENERAL_NIGHTCOLORSCHEME); + + return msg; + } + + @Override + protected String getMessageType() { + return RPCMessage.KEY_REQUEST; + } + + @Override + protected String getCommandType() { + return FunctionID.SET_DISPLAY_LAYOUT.toString(); + } + + @Override + protected JSONObject getExpectedParameters(int sdlVersion) { + JSONObject result = new JSONObject(); + + try { + result.put(SetDisplayLayout.KEY_DISPLAY_LAYOUT, TestValues.GENERAL_STRING); + result.put(SetDisplayLayout.KEY_DAY_COLOR_SCHEME, TestValues.JSON_DAYCOLORSCHEME); + result.put(SetDisplayLayout.KEY_NIGHT_COLOR_SCHEME, TestValues.JSON_NIGHTCOLORSCHEME); + } catch (JSONException e) { + fail(TestValues.JSON_FAIL); + } + + return result; + } + + /** + * Tests the expected values of the RPC message. + */ + @Test + public void testRpcValues() { + // Test Values + String testDisplayLayout = ((SetDisplayLayout) msg).getDisplayLayout(); + TemplateColorScheme testDayColorScheme = ((SetDisplayLayout) msg).getDayColorScheme(); + TemplateColorScheme testNightColorScheme = ((SetDisplayLayout) msg).getNightColorScheme(); + + // Valid Tests + assertEquals(TestValues.MATCH, TestValues.GENERAL_STRING, testDisplayLayout); + assertTrue(TestValues.TRUE, Validator.validateTemplateColorScheme(TestValues.GENERAL_DAYCOLORSCHEME, testDayColorScheme)); + assertTrue(TestValues.TRUE, Validator.validateTemplateColorScheme(TestValues.GENERAL_NIGHTCOLORSCHEME, testNightColorScheme)); + + // Invalid/Null Tests + SetDisplayLayout msg = new SetDisplayLayout(); + assertNotNull(TestValues.NOT_NULL, msg); + testNullBase(msg); + + assertNull(TestValues.NULL, msg.getDisplayLayout()); + assertNull(TestValues.NULL, msg.getDayColorScheme()); + assertNull(TestValues.NULL, msg.getNightColorScheme()); + } + + /** * Tests a valid JSON construction of this RPC message. */ - @Test - public void testJsonConstructor () { - JSONObject commandJson = JsonFileReader.readId(getInstrumentation().getTargetContext(), getCommandType(), getMessageType()); - assertNotNull(TestValues.NOT_NULL, commandJson); - - try { - Hashtable<String, Object> hash = JsonRPCMarshaller.deserializeJSONObject(commandJson); - SetDisplayLayout cmd = new SetDisplayLayout(hash); - - JSONObject body = JsonUtils.readJsonObjectFromJsonObject(commandJson, getMessageType()); - assertNotNull(TestValues.MATCH, body); - - // Test everything in the json body. - assertEquals(TestValues.MATCH, JsonUtils.readStringFromJsonObject(body, RPCMessage.KEY_FUNCTION_NAME), cmd.getFunctionName()); - assertEquals(TestValues.MATCH, JsonUtils.readIntegerFromJsonObject(body, RPCMessage.KEY_CORRELATION_ID), cmd.getCorrelationID()); - - JSONObject parameters = JsonUtils.readJsonObjectFromJsonObject(body, RPCMessage.KEY_PARAMETERS); - assertEquals(TestValues.MATCH, JsonUtils.readStringFromJsonObject(parameters, SetDisplayLayout.KEY_DISPLAY_LAYOUT), cmd.getDisplayLayout()); - - - JSONObject dayColorSchemeObj = JsonUtils.readJsonObjectFromJsonObject(parameters, SetDisplayLayout.KEY_DAY_COLOR_SCHEME); - TemplateColorScheme dayColorScheme = new TemplateColorScheme(JsonRPCMarshaller.deserializeJSONObject(dayColorSchemeObj)); - assertTrue(TestValues.TRUE, Validator.validateTemplateColorScheme(dayColorScheme, cmd.getDayColorScheme()) ); - - JSONObject nightColorSchemeObj = JsonUtils.readJsonObjectFromJsonObject(parameters, SetDisplayLayout.KEY_DAY_COLOR_SCHEME); - TemplateColorScheme nightColorScheme = new TemplateColorScheme(JsonRPCMarshaller.deserializeJSONObject(nightColorSchemeObj)); - assertTrue(TestValues.TRUE, Validator.validateTemplateColorScheme(nightColorScheme, cmd.getDayColorScheme()) ); - - - } catch (JSONException e) { - fail(TestValues.JSON_FAIL); - } + @Test + public void testJsonConstructor() { + JSONObject commandJson = JsonFileReader.readId(getInstrumentation().getTargetContext(), getCommandType(), getMessageType()); + assertNotNull(TestValues.NOT_NULL, commandJson); + + try { + Hashtable<String, Object> hash = JsonRPCMarshaller.deserializeJSONObject(commandJson); + SetDisplayLayout cmd = new SetDisplayLayout(hash); + + JSONObject body = JsonUtils.readJsonObjectFromJsonObject(commandJson, getMessageType()); + assertNotNull(TestValues.MATCH, body); + + // Test everything in the json body. + assertEquals(TestValues.MATCH, JsonUtils.readStringFromJsonObject(body, RPCMessage.KEY_FUNCTION_NAME), cmd.getFunctionName()); + assertEquals(TestValues.MATCH, JsonUtils.readIntegerFromJsonObject(body, RPCMessage.KEY_CORRELATION_ID), cmd.getCorrelationID()); + + JSONObject parameters = JsonUtils.readJsonObjectFromJsonObject(body, RPCMessage.KEY_PARAMETERS); + assertEquals(TestValues.MATCH, JsonUtils.readStringFromJsonObject(parameters, SetDisplayLayout.KEY_DISPLAY_LAYOUT), cmd.getDisplayLayout()); + + + JSONObject dayColorSchemeObj = JsonUtils.readJsonObjectFromJsonObject(parameters, SetDisplayLayout.KEY_DAY_COLOR_SCHEME); + TemplateColorScheme dayColorScheme = new TemplateColorScheme(JsonRPCMarshaller.deserializeJSONObject(dayColorSchemeObj)); + assertTrue(TestValues.TRUE, Validator.validateTemplateColorScheme(dayColorScheme, cmd.getDayColorScheme())); + + JSONObject nightColorSchemeObj = JsonUtils.readJsonObjectFromJsonObject(parameters, SetDisplayLayout.KEY_DAY_COLOR_SCHEME); + TemplateColorScheme nightColorScheme = new TemplateColorScheme(JsonRPCMarshaller.deserializeJSONObject(nightColorSchemeObj)); + assertTrue(TestValues.TRUE, Validator.validateTemplateColorScheme(nightColorScheme, cmd.getDayColorScheme())); + + + } catch (JSONException e) { + fail(TestValues.JSON_FAIL); + } } }
\ No newline at end of file diff --git a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/SetGlobalPropertiesTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/SetGlobalPropertiesTests.java index abf889104..849ed07dc 100644 --- a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/SetGlobalPropertiesTests.java +++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/SetGlobalPropertiesTests.java @@ -32,155 +32,155 @@ import static junit.framework.TestCase.assertTrue; import static junit.framework.TestCase.fail; /** - * This is a unit test class for the SmartDeviceLink library project class : + * This is a unit test class for the SmartDeviceLink library project class : * {@link com.smartdevicelink.proxy.rpc.SetGlobalProperties} */ public class SetGlobalPropertiesTests extends BaseRpcTests { - - @Override - protected RPCMessage createMessage() { - SetGlobalProperties msg = new SetGlobalProperties(); - - msg.setVrHelpTitle(TestValues.GENERAL_STRING); - msg.setMenuTitle(TestValues.GENERAL_STRING); - msg.setMenuIcon(TestValues.GENERAL_IMAGE); - msg.setVrHelp(TestValues.GENERAL_VRHELPITEM_LIST); - msg.setHelpPrompt(TestValues.GENERAL_TTSCHUNK_LIST); - msg.setTimeoutPrompt(TestValues.GENERAL_TTSCHUNK_LIST); - msg.setKeyboardProperties(TestValues.GENERAL_KEYBOARDPROPERTIES); - msg.setMenuLayout(TestValues.GENERAL_MENU_LAYOUT); - - return msg; - } - - @Override - protected String getMessageType() { - return RPCMessage.KEY_REQUEST; - } - - @Override - protected String getCommandType() { - return FunctionID.SET_GLOBAL_PROPERTIES.toString(); - } - - @Override - protected JSONObject getExpectedParameters(int sdlVersion) { - JSONObject result = new JSONObject(); - - try { - result.put(SetGlobalProperties.KEY_MENU_ICON, TestValues.JSON_IMAGE); - result.put(SetGlobalProperties.KEY_VR_HELP, TestValues.JSON_VRHELPITEMS); - result.put(SetGlobalProperties.KEY_HELP_PROMPT, TestValues.JSON_TTSCHUNKS); - result.put(SetGlobalProperties.KEY_TIMEOUT_PROMPT, TestValues.JSON_TTSCHUNKS); - result.put(SetGlobalProperties.KEY_MENU_TITLE, TestValues.GENERAL_STRING); - result.put(SetGlobalProperties.KEY_VR_HELP_TITLE, TestValues.GENERAL_STRING); - result.put(SetGlobalProperties.KEY_KEYBOARD_PROPERTIES, TestValues.JSON_KEYBOARDPROPERTIES); - result.put(SetGlobalProperties.KEY_MENU_LAYOUT, TestValues.GENERAL_MENU_LAYOUT); - } catch (JSONException e) { - fail(TestValues.JSON_FAIL); - } - - return result; - } - - /** - * Tests the expected values of the RPC message. - */ - @Test - public void testRpcValues () { - // Test Values - Image testImage = ( (SetGlobalProperties) msg ).getMenuIcon(); - String testVrHelpTitle = ( (SetGlobalProperties) msg ).getVrHelpTitle(); - String testMenuTitle = ( (SetGlobalProperties) msg ).getMenuTitle(); - List<TTSChunk> testHelpPrompt = ( (SetGlobalProperties) msg ).getHelpPrompt(); - List<TTSChunk> testTimeout = ( (SetGlobalProperties) msg ).getTimeoutPrompt(); - List<VrHelpItem> testVrHelpItems = ( (SetGlobalProperties) msg ).getVrHelp(); - KeyboardProperties testKeyboardProperties = ( (SetGlobalProperties) msg ).getKeyboardProperties(); - MenuLayout testMenuLayout = ( (SetGlobalProperties) msg ).getMenuLayout(); - - // Valid Tests - assertEquals(TestValues.MATCH, TestValues.GENERAL_STRING, testMenuTitle); - assertEquals(TestValues.MATCH, TestValues.GENERAL_STRING, testVrHelpTitle); - assertTrue(TestValues.TRUE, Validator.validateImage(TestValues.GENERAL_IMAGE, testImage)); - assertTrue(TestValues.TRUE, Validator.validateVrHelpItems(TestValues.GENERAL_VRHELPITEM_LIST, testVrHelpItems)); - assertTrue(TestValues.TRUE, Validator.validateTtsChunks(TestValues.GENERAL_TTSCHUNK_LIST, testHelpPrompt)); - assertTrue(TestValues.TRUE, Validator.validateTtsChunks(TestValues.GENERAL_TTSCHUNK_LIST, testTimeout)); - assertTrue(TestValues.TRUE, Validator.validateKeyboardProperties(TestValues.GENERAL_KEYBOARDPROPERTIES, testKeyboardProperties)); - assertEquals(TestValues.MATCH, TestValues.GENERAL_MENU_LAYOUT, testMenuLayout); - - // Invalid/Null Tests - SetGlobalProperties msg = new SetGlobalProperties(); - assertNotNull(TestValues.NOT_NULL, msg); - testNullBase(msg); - - assertNull(TestValues.NULL, msg.getMenuIcon()); - assertNull(TestValues.NULL, msg.getMenuTitle()); - assertNull(TestValues.NULL, msg.getVrHelp()); - assertNull(TestValues.NULL, msg.getHelpPrompt()); - assertNull(TestValues.NULL, msg.getTimeoutPrompt()); - assertNull(TestValues.NULL, msg.getKeyboardProperties()); - assertNull(TestValues.NULL, msg.getVrHelpTitle()); - assertNull(TestValues.NULL, msg.getMenuLayout()); - } - - /** + + @Override + protected RPCMessage createMessage() { + SetGlobalProperties msg = new SetGlobalProperties(); + + msg.setVrHelpTitle(TestValues.GENERAL_STRING); + msg.setMenuTitle(TestValues.GENERAL_STRING); + msg.setMenuIcon(TestValues.GENERAL_IMAGE); + msg.setVrHelp(TestValues.GENERAL_VRHELPITEM_LIST); + msg.setHelpPrompt(TestValues.GENERAL_TTSCHUNK_LIST); + msg.setTimeoutPrompt(TestValues.GENERAL_TTSCHUNK_LIST); + msg.setKeyboardProperties(TestValues.GENERAL_KEYBOARDPROPERTIES); + msg.setMenuLayout(TestValues.GENERAL_MENU_LAYOUT); + + return msg; + } + + @Override + protected String getMessageType() { + return RPCMessage.KEY_REQUEST; + } + + @Override + protected String getCommandType() { + return FunctionID.SET_GLOBAL_PROPERTIES.toString(); + } + + @Override + protected JSONObject getExpectedParameters(int sdlVersion) { + JSONObject result = new JSONObject(); + + try { + result.put(SetGlobalProperties.KEY_MENU_ICON, TestValues.JSON_IMAGE); + result.put(SetGlobalProperties.KEY_VR_HELP, TestValues.JSON_VRHELPITEMS); + result.put(SetGlobalProperties.KEY_HELP_PROMPT, TestValues.JSON_TTSCHUNKS); + result.put(SetGlobalProperties.KEY_TIMEOUT_PROMPT, TestValues.JSON_TTSCHUNKS); + result.put(SetGlobalProperties.KEY_MENU_TITLE, TestValues.GENERAL_STRING); + result.put(SetGlobalProperties.KEY_VR_HELP_TITLE, TestValues.GENERAL_STRING); + result.put(SetGlobalProperties.KEY_KEYBOARD_PROPERTIES, TestValues.JSON_KEYBOARDPROPERTIES); + result.put(SetGlobalProperties.KEY_MENU_LAYOUT, TestValues.GENERAL_MENU_LAYOUT); + } catch (JSONException e) { + fail(TestValues.JSON_FAIL); + } + + return result; + } + + /** + * Tests the expected values of the RPC message. + */ + @Test + public void testRpcValues() { + // Test Values + Image testImage = ((SetGlobalProperties) msg).getMenuIcon(); + String testVrHelpTitle = ((SetGlobalProperties) msg).getVrHelpTitle(); + String testMenuTitle = ((SetGlobalProperties) msg).getMenuTitle(); + List<TTSChunk> testHelpPrompt = ((SetGlobalProperties) msg).getHelpPrompt(); + List<TTSChunk> testTimeout = ((SetGlobalProperties) msg).getTimeoutPrompt(); + List<VrHelpItem> testVrHelpItems = ((SetGlobalProperties) msg).getVrHelp(); + KeyboardProperties testKeyboardProperties = ((SetGlobalProperties) msg).getKeyboardProperties(); + MenuLayout testMenuLayout = ((SetGlobalProperties) msg).getMenuLayout(); + + // Valid Tests + assertEquals(TestValues.MATCH, TestValues.GENERAL_STRING, testMenuTitle); + assertEquals(TestValues.MATCH, TestValues.GENERAL_STRING, testVrHelpTitle); + assertTrue(TestValues.TRUE, Validator.validateImage(TestValues.GENERAL_IMAGE, testImage)); + assertTrue(TestValues.TRUE, Validator.validateVrHelpItems(TestValues.GENERAL_VRHELPITEM_LIST, testVrHelpItems)); + assertTrue(TestValues.TRUE, Validator.validateTtsChunks(TestValues.GENERAL_TTSCHUNK_LIST, testHelpPrompt)); + assertTrue(TestValues.TRUE, Validator.validateTtsChunks(TestValues.GENERAL_TTSCHUNK_LIST, testTimeout)); + assertTrue(TestValues.TRUE, Validator.validateKeyboardProperties(TestValues.GENERAL_KEYBOARDPROPERTIES, testKeyboardProperties)); + assertEquals(TestValues.MATCH, TestValues.GENERAL_MENU_LAYOUT, testMenuLayout); + + // Invalid/Null Tests + SetGlobalProperties msg = new SetGlobalProperties(); + assertNotNull(TestValues.NOT_NULL, msg); + testNullBase(msg); + + assertNull(TestValues.NULL, msg.getMenuIcon()); + assertNull(TestValues.NULL, msg.getMenuTitle()); + assertNull(TestValues.NULL, msg.getVrHelp()); + assertNull(TestValues.NULL, msg.getHelpPrompt()); + assertNull(TestValues.NULL, msg.getTimeoutPrompt()); + assertNull(TestValues.NULL, msg.getKeyboardProperties()); + assertNull(TestValues.NULL, msg.getVrHelpTitle()); + assertNull(TestValues.NULL, msg.getMenuLayout()); + } + + /** * Tests a valid JSON construction of this RPC message. */ - @Test - public void testJsonConstructor () { - JSONObject commandJson = JsonFileReader.readId(getInstrumentation().getTargetContext(), getCommandType(), getMessageType()); - assertNotNull(TestValues.NOT_NULL, commandJson); - - try { - Hashtable<String, Object> hash = JsonRPCMarshaller.deserializeJSONObject(commandJson); - SetGlobalProperties cmd = new SetGlobalProperties(hash); - - JSONObject body = JsonUtils.readJsonObjectFromJsonObject(commandJson, getMessageType()); - assertNotNull(TestValues.NOT_NULL, body); - - // Test everything in the json body. - assertEquals(TestValues.MATCH, JsonUtils.readStringFromJsonObject(body, RPCMessage.KEY_FUNCTION_NAME), cmd.getFunctionName()); - assertEquals(TestValues.MATCH, JsonUtils.readIntegerFromJsonObject(body, RPCMessage.KEY_CORRELATION_ID), cmd.getCorrelationID()); - - JSONObject parameters = JsonUtils.readJsonObjectFromJsonObject(body, RPCMessage.KEY_PARAMETERS); - assertEquals(TestValues.MATCH, JsonUtils.readStringFromJsonObject(parameters, SetGlobalProperties.KEY_VR_HELP_TITLE), cmd.getVrHelpTitle()); - assertEquals(TestValues.MATCH, JsonUtils.readStringFromJsonObject(parameters, SetGlobalProperties.KEY_MENU_TITLE), cmd.getMenuTitle()); - - assertEquals(TestValues.MATCH, JsonUtils.readObjectFromJsonObject(parameters, SetGlobalProperties.KEY_MENU_LAYOUT), cmd.getMenuLayout()); - - JSONObject menuIcon = JsonUtils.readJsonObjectFromJsonObject(parameters, SetGlobalProperties.KEY_MENU_ICON); - Image referenceMenuIcon = new Image(JsonRPCMarshaller.deserializeJSONObject(menuIcon)); - assertTrue(TestValues.TRUE, Validator.validateImage(referenceMenuIcon, cmd.getMenuIcon())); - - JSONObject keyboardProperties = JsonUtils.readJsonObjectFromJsonObject(parameters, SetGlobalProperties.KEY_KEYBOARD_PROPERTIES); - KeyboardProperties referenceKeyboardProperties = new KeyboardProperties(JsonRPCMarshaller.deserializeJSONObject(keyboardProperties)); - assertTrue(TestValues.TRUE, Validator.validateKeyboardProperties(referenceKeyboardProperties, cmd.getKeyboardProperties())); - - JSONArray helpPromptArray = JsonUtils.readJsonArrayFromJsonObject(parameters, SetGlobalProperties.KEY_HELP_PROMPT); - List<TTSChunk> helpPromptList = new ArrayList<TTSChunk>(); - for (int index = 0; index < helpPromptArray.length(); index++) { - TTSChunk chunk = new TTSChunk(JsonRPCMarshaller.deserializeJSONObject( (JSONObject)helpPromptArray.get(index)) ); - helpPromptList.add(chunk); - } - assertTrue(TestValues.TRUE, Validator.validateTtsChunks(helpPromptList, cmd.getHelpPrompt())); - - JSONArray timeoutPromptArray = JsonUtils.readJsonArrayFromJsonObject(parameters, SetGlobalProperties.KEY_TIMEOUT_PROMPT); - List<TTSChunk> timeoutPromptList = new ArrayList<TTSChunk>(); - for (int index = 0; index < timeoutPromptArray.length(); index++) { - TTSChunk chunk = new TTSChunk(JsonRPCMarshaller.deserializeJSONObject( (JSONObject)timeoutPromptArray.get(index)) ); - timeoutPromptList.add(chunk); - } - assertTrue(TestValues.TRUE, Validator.validateTtsChunks(timeoutPromptList, cmd.getTimeoutPrompt())); - - JSONArray vrHelpArray = JsonUtils.readJsonArrayFromJsonObject(parameters, SetGlobalProperties.KEY_VR_HELP); - List<VrHelpItem> vrHelpList = new ArrayList<VrHelpItem>(); - for (int index = 0; index < vrHelpArray.length(); index++) { - VrHelpItem chunk = new VrHelpItem(JsonRPCMarshaller.deserializeJSONObject( (JSONObject)vrHelpArray.get(index)) ); - vrHelpList.add(chunk); - } - assertTrue(TestValues.TRUE, Validator.validateVrHelpItems(vrHelpList, cmd.getVrHelp())); - } catch (JSONException e) { - fail(TestValues.JSON_FAIL); - } + @Test + public void testJsonConstructor() { + JSONObject commandJson = JsonFileReader.readId(getInstrumentation().getTargetContext(), getCommandType(), getMessageType()); + assertNotNull(TestValues.NOT_NULL, commandJson); + + try { + Hashtable<String, Object> hash = JsonRPCMarshaller.deserializeJSONObject(commandJson); + SetGlobalProperties cmd = new SetGlobalProperties(hash); + + JSONObject body = JsonUtils.readJsonObjectFromJsonObject(commandJson, getMessageType()); + assertNotNull(TestValues.NOT_NULL, body); + + // Test everything in the json body. + assertEquals(TestValues.MATCH, JsonUtils.readStringFromJsonObject(body, RPCMessage.KEY_FUNCTION_NAME), cmd.getFunctionName()); + assertEquals(TestValues.MATCH, JsonUtils.readIntegerFromJsonObject(body, RPCMessage.KEY_CORRELATION_ID), cmd.getCorrelationID()); + + JSONObject parameters = JsonUtils.readJsonObjectFromJsonObject(body, RPCMessage.KEY_PARAMETERS); + assertEquals(TestValues.MATCH, JsonUtils.readStringFromJsonObject(parameters, SetGlobalProperties.KEY_VR_HELP_TITLE), cmd.getVrHelpTitle()); + assertEquals(TestValues.MATCH, JsonUtils.readStringFromJsonObject(parameters, SetGlobalProperties.KEY_MENU_TITLE), cmd.getMenuTitle()); + + assertEquals(TestValues.MATCH, JsonUtils.readObjectFromJsonObject(parameters, SetGlobalProperties.KEY_MENU_LAYOUT), cmd.getMenuLayout()); + + JSONObject menuIcon = JsonUtils.readJsonObjectFromJsonObject(parameters, SetGlobalProperties.KEY_MENU_ICON); + Image referenceMenuIcon = new Image(JsonRPCMarshaller.deserializeJSONObject(menuIcon)); + assertTrue(TestValues.TRUE, Validator.validateImage(referenceMenuIcon, cmd.getMenuIcon())); + + JSONObject keyboardProperties = JsonUtils.readJsonObjectFromJsonObject(parameters, SetGlobalProperties.KEY_KEYBOARD_PROPERTIES); + KeyboardProperties referenceKeyboardProperties = new KeyboardProperties(JsonRPCMarshaller.deserializeJSONObject(keyboardProperties)); + assertTrue(TestValues.TRUE, Validator.validateKeyboardProperties(referenceKeyboardProperties, cmd.getKeyboardProperties())); + + JSONArray helpPromptArray = JsonUtils.readJsonArrayFromJsonObject(parameters, SetGlobalProperties.KEY_HELP_PROMPT); + List<TTSChunk> helpPromptList = new ArrayList<TTSChunk>(); + for (int index = 0; index < helpPromptArray.length(); index++) { + TTSChunk chunk = new TTSChunk(JsonRPCMarshaller.deserializeJSONObject((JSONObject) helpPromptArray.get(index))); + helpPromptList.add(chunk); + } + assertTrue(TestValues.TRUE, Validator.validateTtsChunks(helpPromptList, cmd.getHelpPrompt())); + + JSONArray timeoutPromptArray = JsonUtils.readJsonArrayFromJsonObject(parameters, SetGlobalProperties.KEY_TIMEOUT_PROMPT); + List<TTSChunk> timeoutPromptList = new ArrayList<TTSChunk>(); + for (int index = 0; index < timeoutPromptArray.length(); index++) { + TTSChunk chunk = new TTSChunk(JsonRPCMarshaller.deserializeJSONObject((JSONObject) timeoutPromptArray.get(index))); + timeoutPromptList.add(chunk); + } + assertTrue(TestValues.TRUE, Validator.validateTtsChunks(timeoutPromptList, cmd.getTimeoutPrompt())); + + JSONArray vrHelpArray = JsonUtils.readJsonArrayFromJsonObject(parameters, SetGlobalProperties.KEY_VR_HELP); + List<VrHelpItem> vrHelpList = new ArrayList<VrHelpItem>(); + for (int index = 0; index < vrHelpArray.length(); index++) { + VrHelpItem chunk = new VrHelpItem(JsonRPCMarshaller.deserializeJSONObject((JSONObject) vrHelpArray.get(index))); + vrHelpList.add(chunk); + } + assertTrue(TestValues.TRUE, Validator.validateVrHelpItems(vrHelpList, cmd.getVrHelp())); + } catch (JSONException e) { + fail(TestValues.JSON_FAIL); + } } }
\ No newline at end of file diff --git a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/SetInteriorVehicleDataTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/SetInteriorVehicleDataTests.java index 727b9e209..73a3f82e9 100644 --- a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/SetInteriorVehicleDataTests.java +++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/SetInteriorVehicleDataTests.java @@ -31,7 +31,7 @@ import static junit.framework.TestCase.fail; public class SetInteriorVehicleDataTests extends BaseRpcTests { @Override - protected RPCMessage createMessage(){ + protected RPCMessage createMessage() { SetInteriorVehicleData msg = new SetInteriorVehicleData(); msg.setModuleData(TestValues.GENERAL_MODULEDATA); @@ -40,22 +40,22 @@ public class SetInteriorVehicleDataTests extends BaseRpcTests { } @Override - protected String getMessageType(){ + protected String getMessageType() { return RPCMessage.KEY_REQUEST; } @Override - protected String getCommandType(){ + protected String getCommandType() { return FunctionID.SET_INTERIOR_VEHICLE_DATA.toString(); } @Override - protected JSONObject getExpectedParameters(int sdlVersion){ + protected JSONObject getExpectedParameters(int sdlVersion) { JSONObject result = new JSONObject(); - try{ + try { result.put(SetInteriorVehicleData.KEY_MODULE_DATA, JsonRPCMarshaller.serializeHashtable(TestValues.GENERAL_MODULEDATA.getStore())); - }catch(JSONException e){ + } catch (JSONException e) { fail(TestValues.JSON_FAIL); } @@ -66,9 +66,9 @@ public class SetInteriorVehicleDataTests extends BaseRpcTests { * Tests the expected values of the RPC message. */ @Test - public void testRpcValues () { + public void testRpcValues() { // Test Values - ModuleData testModuleData = ( (SetInteriorVehicleData) msg ).getModuleData(); + ModuleData testModuleData = ((SetInteriorVehicleData) msg).getModuleData(); // Valid Tests assertTrue(TestValues.TRUE, Validator.validateModuleData(TestValues.GENERAL_MODULEDATA, testModuleData)); @@ -85,7 +85,7 @@ public class SetInteriorVehicleDataTests extends BaseRpcTests { * Tests a valid JSON construction of this RPC message. */ @Test - public void testJsonConstructor () { + public void testJsonConstructor() { JSONObject commandJson = JsonFileReader.readId(getInstrumentation().getTargetContext(), getCommandType(), getMessageType()); assertNotNull(TestValues.NOT_NULL, commandJson); @@ -105,7 +105,7 @@ public class SetInteriorVehicleDataTests extends BaseRpcTests { ModuleData referenceModuleData = new ModuleData(JsonRPCMarshaller.deserializeJSONObject((JSONObject) JsonUtils.readObjectFromJsonObject(parameters, SetInteriorVehicleData.KEY_MODULE_DATA))); assertTrue(TestValues.TRUE, Validator.validateModuleData(referenceModuleData, cmd.getModuleData())); - }catch (JSONException e) { + } catch (JSONException e) { fail(TestValues.JSON_FAIL); } } diff --git a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/SetMediaClockTimerTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/SetMediaClockTimerTests.java index c4937aa95..7f22c0701 100644 --- a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/SetMediaClockTimerTests.java +++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/SetMediaClockTimerTests.java @@ -27,174 +27,174 @@ import static junit.framework.TestCase.assertTrue; import static junit.framework.TestCase.fail; /** - * This is a unit test class for the SmartDeviceLink library project class : + * This is a unit test class for the SmartDeviceLink library project class : * {@link com.smartdevicelink.proxy.rpc.SetMediaClockTimer} */ public class SetMediaClockTimerTests extends BaseRpcTests { - @Override - protected RPCMessage createMessage() { - SetMediaClockTimer msg = new SetMediaClockTimer(); - - msg.setStartTime(TestValues.GENERAL_STARTTIME); - msg.setEndTime(TestValues.GENERAL_STARTTIME); - msg.setUpdateMode(TestValues.GENERAL_UPDATEMODE); - msg.setAudioStreamingIndicator(TestValues.GENERAL_AUDIO_STREAMING_INDICATOR); - - return msg; - } - - @Override - protected String getMessageType() { - return RPCMessage.KEY_REQUEST; - } - - @Override - protected String getCommandType() { - return FunctionID.SET_MEDIA_CLOCK_TIMER.toString(); - } - - @Override - protected JSONObject getExpectedParameters(int sdlVersion) { - JSONObject result = new JSONObject(); - - try { - result.put(SetMediaClockTimer.KEY_START_TIME, TestValues.JSON_STARTTIME); - result.put(SetMediaClockTimer.KEY_END_TIME, TestValues.JSON_STARTTIME); - result.put(SetMediaClockTimer.KEY_UPDATE_MODE, TestValues.GENERAL_UPDATEMODE); - result.put(SetMediaClockTimer.KEY_AUDIO_STREAMING_INDICATOR, TestValues.GENERAL_AUDIO_STREAMING_INDICATOR); - } catch (JSONException e) { - fail(TestValues.JSON_FAIL); - } - - return result; - } - - /** - * Tests the expected values of the RPC message. - */ - @Test - public void testRpcValues () { - // Test Values - StartTime testStartTime = ( (SetMediaClockTimer) msg ).getStartTime(); - StartTime testEndTime = ( (SetMediaClockTimer) msg ).getEndTime(); - UpdateMode testUpdateMode = ( (SetMediaClockTimer) msg ).getUpdateMode(); - AudioStreamingIndicator testAudioStreamingIndicator = ( (SetMediaClockTimer) msg ).getAudioStreamingIndicator(); - - // Valid Tests - assertEquals(TestValues.MATCH, TestValues.GENERAL_UPDATEMODE, testUpdateMode); - assertEquals(TestValues.MATCH, TestValues.GENERAL_AUDIO_STREAMING_INDICATOR, testAudioStreamingIndicator); - assertTrue(TestValues.TRUE, Validator.validateStartTime(TestValues.GENERAL_STARTTIME, testStartTime)); - assertTrue(TestValues.TRUE, Validator.validateStartTime(TestValues.GENERAL_STARTTIME, testEndTime)); - - // Invalid/Null Tests - SetMediaClockTimer msg = new SetMediaClockTimer(); - assertNotNull(TestValues.NOT_NULL, msg); - testNullBase(msg); - - assertNull(TestValues.NULL, msg.getStartTime()); - assertNull(TestValues.NULL, msg.getEndTime()); - assertNull(TestValues.NULL, msg.getUpdateMode()); - assertNull(TestValues.NULL, msg.getAudioStreamingIndicator()); - } - - /** - * Test static initializers - */ - @Test - public void testInitializers(){ - Integer timeInterval1 = 5000; - StartTime startTime1 = new StartTime(timeInterval1); - Integer timeInterval2 = 7000; - StartTime startTime2 = new StartTime(timeInterval2); - SetMediaClockTimer msg; - - msg = SetMediaClockTimer.countUpFromStartTimeInterval(timeInterval1, timeInterval2, TestValues.GENERAL_AUDIO_STREAMING_INDICATOR); - assertEquals(TestValues.MATCH, msg.getUpdateMode(), UpdateMode.COUNTUP); - assertTrue(TestValues.TRUE, Validator.validateStartTime(startTime1, msg.getStartTime())); - assertTrue(TestValues.TRUE, Validator.validateStartTime(startTime2, msg.getEndTime())); - assertEquals(TestValues.MATCH, TestValues.GENERAL_AUDIO_STREAMING_INDICATOR, msg.getAudioStreamingIndicator()); - - msg = SetMediaClockTimer.countUpFromStartTime(startTime1, startTime2, TestValues.GENERAL_AUDIO_STREAMING_INDICATOR); - assertEquals(TestValues.MATCH, msg.getUpdateMode(), UpdateMode.COUNTUP); - assertTrue(TestValues.TRUE, Validator.validateStartTime(startTime1, msg.getStartTime())); - assertTrue(TestValues.TRUE, Validator.validateStartTime(startTime2, msg.getEndTime())); - assertEquals(TestValues.MATCH, TestValues.GENERAL_AUDIO_STREAMING_INDICATOR, msg.getAudioStreamingIndicator()); - - msg = SetMediaClockTimer.countDownFromStartTimeInterval(timeInterval1, timeInterval2, TestValues.GENERAL_AUDIO_STREAMING_INDICATOR); - assertEquals(TestValues.MATCH, msg.getUpdateMode(), UpdateMode.COUNTDOWN); - assertTrue(TestValues.TRUE, Validator.validateStartTime(startTime1, msg.getStartTime())); - assertTrue(TestValues.TRUE, Validator.validateStartTime(startTime2, msg.getEndTime())); - assertEquals(TestValues.MATCH, TestValues.GENERAL_AUDIO_STREAMING_INDICATOR, msg.getAudioStreamingIndicator()); - - msg = SetMediaClockTimer.countDownFromStartTime(startTime1, startTime2, TestValues.GENERAL_AUDIO_STREAMING_INDICATOR); - assertEquals(TestValues.MATCH, msg.getUpdateMode(), UpdateMode.COUNTDOWN); - assertTrue(TestValues.TRUE, Validator.validateStartTime(startTime1, msg.getStartTime())); - assertTrue(TestValues.TRUE, Validator.validateStartTime(startTime2, msg.getEndTime())); - assertEquals(TestValues.MATCH, TestValues.GENERAL_AUDIO_STREAMING_INDICATOR, msg.getAudioStreamingIndicator()); - - msg = SetMediaClockTimer.pauseWithPlayPauseIndicator(TestValues.GENERAL_AUDIO_STREAMING_INDICATOR); - assertEquals(TestValues.MATCH, msg.getUpdateMode(), UpdateMode.PAUSE); - assertNull(TestValues.NULL, msg.getStartTime()); - assertNull(TestValues.NULL, msg.getEndTime()); - assertEquals(TestValues.MATCH, TestValues.GENERAL_AUDIO_STREAMING_INDICATOR, msg.getAudioStreamingIndicator()); - - msg = SetMediaClockTimer.updatePauseWithNewStartTimeInterval(timeInterval1, timeInterval2, TestValues.GENERAL_AUDIO_STREAMING_INDICATOR); - assertEquals(TestValues.MATCH, msg.getUpdateMode(), UpdateMode.PAUSE); - assertTrue(TestValues.TRUE, Validator.validateStartTime(startTime1, msg.getStartTime())); - assertTrue(TestValues.TRUE, Validator.validateStartTime(startTime2, msg.getEndTime())); - assertEquals(TestValues.MATCH, TestValues.GENERAL_AUDIO_STREAMING_INDICATOR, msg.getAudioStreamingIndicator()); - - msg = SetMediaClockTimer.updatePauseWithNewStartTime(startTime1, startTime2, TestValues.GENERAL_AUDIO_STREAMING_INDICATOR); - assertEquals(TestValues.MATCH, msg.getUpdateMode(), UpdateMode.PAUSE); - assertTrue(TestValues.TRUE, Validator.validateStartTime(startTime1, msg.getStartTime())); - assertTrue(TestValues.TRUE, Validator.validateStartTime(startTime2, msg.getEndTime())); - assertEquals(TestValues.MATCH, TestValues.GENERAL_AUDIO_STREAMING_INDICATOR, msg.getAudioStreamingIndicator()); - - msg = SetMediaClockTimer.resumeWithPlayPauseIndicator(TestValues.GENERAL_AUDIO_STREAMING_INDICATOR); - assertEquals(TestValues.MATCH, msg.getUpdateMode(), UpdateMode.RESUME); - assertNull(TestValues.NULL, msg.getStartTime()); - assertNull(TestValues.NULL, msg.getEndTime()); - assertEquals(TestValues.MATCH, TestValues.GENERAL_AUDIO_STREAMING_INDICATOR, msg.getAudioStreamingIndicator()); - - msg = SetMediaClockTimer.clearWithPlayPauseIndicator(TestValues.GENERAL_AUDIO_STREAMING_INDICATOR); - assertEquals(TestValues.MATCH, msg.getUpdateMode(), UpdateMode.CLEAR); - assertNull(TestValues.NULL, msg.getStartTime()); - assertNull(TestValues.NULL, msg.getEndTime()); - assertEquals(TestValues.MATCH, TestValues.GENERAL_AUDIO_STREAMING_INDICATOR, msg.getAudioStreamingIndicator()); - } - - /** + @Override + protected RPCMessage createMessage() { + SetMediaClockTimer msg = new SetMediaClockTimer(); + + msg.setStartTime(TestValues.GENERAL_STARTTIME); + msg.setEndTime(TestValues.GENERAL_STARTTIME); + msg.setUpdateMode(TestValues.GENERAL_UPDATEMODE); + msg.setAudioStreamingIndicator(TestValues.GENERAL_AUDIO_STREAMING_INDICATOR); + + return msg; + } + + @Override + protected String getMessageType() { + return RPCMessage.KEY_REQUEST; + } + + @Override + protected String getCommandType() { + return FunctionID.SET_MEDIA_CLOCK_TIMER.toString(); + } + + @Override + protected JSONObject getExpectedParameters(int sdlVersion) { + JSONObject result = new JSONObject(); + + try { + result.put(SetMediaClockTimer.KEY_START_TIME, TestValues.JSON_STARTTIME); + result.put(SetMediaClockTimer.KEY_END_TIME, TestValues.JSON_STARTTIME); + result.put(SetMediaClockTimer.KEY_UPDATE_MODE, TestValues.GENERAL_UPDATEMODE); + result.put(SetMediaClockTimer.KEY_AUDIO_STREAMING_INDICATOR, TestValues.GENERAL_AUDIO_STREAMING_INDICATOR); + } catch (JSONException e) { + fail(TestValues.JSON_FAIL); + } + + return result; + } + + /** + * Tests the expected values of the RPC message. + */ + @Test + public void testRpcValues() { + // Test Values + StartTime testStartTime = ((SetMediaClockTimer) msg).getStartTime(); + StartTime testEndTime = ((SetMediaClockTimer) msg).getEndTime(); + UpdateMode testUpdateMode = ((SetMediaClockTimer) msg).getUpdateMode(); + AudioStreamingIndicator testAudioStreamingIndicator = ((SetMediaClockTimer) msg).getAudioStreamingIndicator(); + + // Valid Tests + assertEquals(TestValues.MATCH, TestValues.GENERAL_UPDATEMODE, testUpdateMode); + assertEquals(TestValues.MATCH, TestValues.GENERAL_AUDIO_STREAMING_INDICATOR, testAudioStreamingIndicator); + assertTrue(TestValues.TRUE, Validator.validateStartTime(TestValues.GENERAL_STARTTIME, testStartTime)); + assertTrue(TestValues.TRUE, Validator.validateStartTime(TestValues.GENERAL_STARTTIME, testEndTime)); + + // Invalid/Null Tests + SetMediaClockTimer msg = new SetMediaClockTimer(); + assertNotNull(TestValues.NOT_NULL, msg); + testNullBase(msg); + + assertNull(TestValues.NULL, msg.getStartTime()); + assertNull(TestValues.NULL, msg.getEndTime()); + assertNull(TestValues.NULL, msg.getUpdateMode()); + assertNull(TestValues.NULL, msg.getAudioStreamingIndicator()); + } + + /** + * Test static initializers + */ + @Test + public void testInitializers() { + Integer timeInterval1 = 5000; + StartTime startTime1 = new StartTime(timeInterval1); + Integer timeInterval2 = 7000; + StartTime startTime2 = new StartTime(timeInterval2); + SetMediaClockTimer msg; + + msg = SetMediaClockTimer.countUpFromStartTimeInterval(timeInterval1, timeInterval2, TestValues.GENERAL_AUDIO_STREAMING_INDICATOR); + assertEquals(TestValues.MATCH, msg.getUpdateMode(), UpdateMode.COUNTUP); + assertTrue(TestValues.TRUE, Validator.validateStartTime(startTime1, msg.getStartTime())); + assertTrue(TestValues.TRUE, Validator.validateStartTime(startTime2, msg.getEndTime())); + assertEquals(TestValues.MATCH, TestValues.GENERAL_AUDIO_STREAMING_INDICATOR, msg.getAudioStreamingIndicator()); + + msg = SetMediaClockTimer.countUpFromStartTime(startTime1, startTime2, TestValues.GENERAL_AUDIO_STREAMING_INDICATOR); + assertEquals(TestValues.MATCH, msg.getUpdateMode(), UpdateMode.COUNTUP); + assertTrue(TestValues.TRUE, Validator.validateStartTime(startTime1, msg.getStartTime())); + assertTrue(TestValues.TRUE, Validator.validateStartTime(startTime2, msg.getEndTime())); + assertEquals(TestValues.MATCH, TestValues.GENERAL_AUDIO_STREAMING_INDICATOR, msg.getAudioStreamingIndicator()); + + msg = SetMediaClockTimer.countDownFromStartTimeInterval(timeInterval1, timeInterval2, TestValues.GENERAL_AUDIO_STREAMING_INDICATOR); + assertEquals(TestValues.MATCH, msg.getUpdateMode(), UpdateMode.COUNTDOWN); + assertTrue(TestValues.TRUE, Validator.validateStartTime(startTime1, msg.getStartTime())); + assertTrue(TestValues.TRUE, Validator.validateStartTime(startTime2, msg.getEndTime())); + assertEquals(TestValues.MATCH, TestValues.GENERAL_AUDIO_STREAMING_INDICATOR, msg.getAudioStreamingIndicator()); + + msg = SetMediaClockTimer.countDownFromStartTime(startTime1, startTime2, TestValues.GENERAL_AUDIO_STREAMING_INDICATOR); + assertEquals(TestValues.MATCH, msg.getUpdateMode(), UpdateMode.COUNTDOWN); + assertTrue(TestValues.TRUE, Validator.validateStartTime(startTime1, msg.getStartTime())); + assertTrue(TestValues.TRUE, Validator.validateStartTime(startTime2, msg.getEndTime())); + assertEquals(TestValues.MATCH, TestValues.GENERAL_AUDIO_STREAMING_INDICATOR, msg.getAudioStreamingIndicator()); + + msg = SetMediaClockTimer.pauseWithPlayPauseIndicator(TestValues.GENERAL_AUDIO_STREAMING_INDICATOR); + assertEquals(TestValues.MATCH, msg.getUpdateMode(), UpdateMode.PAUSE); + assertNull(TestValues.NULL, msg.getStartTime()); + assertNull(TestValues.NULL, msg.getEndTime()); + assertEquals(TestValues.MATCH, TestValues.GENERAL_AUDIO_STREAMING_INDICATOR, msg.getAudioStreamingIndicator()); + + msg = SetMediaClockTimer.updatePauseWithNewStartTimeInterval(timeInterval1, timeInterval2, TestValues.GENERAL_AUDIO_STREAMING_INDICATOR); + assertEquals(TestValues.MATCH, msg.getUpdateMode(), UpdateMode.PAUSE); + assertTrue(TestValues.TRUE, Validator.validateStartTime(startTime1, msg.getStartTime())); + assertTrue(TestValues.TRUE, Validator.validateStartTime(startTime2, msg.getEndTime())); + assertEquals(TestValues.MATCH, TestValues.GENERAL_AUDIO_STREAMING_INDICATOR, msg.getAudioStreamingIndicator()); + + msg = SetMediaClockTimer.updatePauseWithNewStartTime(startTime1, startTime2, TestValues.GENERAL_AUDIO_STREAMING_INDICATOR); + assertEquals(TestValues.MATCH, msg.getUpdateMode(), UpdateMode.PAUSE); + assertTrue(TestValues.TRUE, Validator.validateStartTime(startTime1, msg.getStartTime())); + assertTrue(TestValues.TRUE, Validator.validateStartTime(startTime2, msg.getEndTime())); + assertEquals(TestValues.MATCH, TestValues.GENERAL_AUDIO_STREAMING_INDICATOR, msg.getAudioStreamingIndicator()); + + msg = SetMediaClockTimer.resumeWithPlayPauseIndicator(TestValues.GENERAL_AUDIO_STREAMING_INDICATOR); + assertEquals(TestValues.MATCH, msg.getUpdateMode(), UpdateMode.RESUME); + assertNull(TestValues.NULL, msg.getStartTime()); + assertNull(TestValues.NULL, msg.getEndTime()); + assertEquals(TestValues.MATCH, TestValues.GENERAL_AUDIO_STREAMING_INDICATOR, msg.getAudioStreamingIndicator()); + + msg = SetMediaClockTimer.clearWithPlayPauseIndicator(TestValues.GENERAL_AUDIO_STREAMING_INDICATOR); + assertEquals(TestValues.MATCH, msg.getUpdateMode(), UpdateMode.CLEAR); + assertNull(TestValues.NULL, msg.getStartTime()); + assertNull(TestValues.NULL, msg.getEndTime()); + assertEquals(TestValues.MATCH, TestValues.GENERAL_AUDIO_STREAMING_INDICATOR, msg.getAudioStreamingIndicator()); + } + + /** * Tests a valid JSON construction of this RPC message. */ - @Test - public void testJsonConstructor () { - JSONObject commandJson = JsonFileReader.readId(getInstrumentation().getTargetContext(), getCommandType(), getMessageType()); - assertNotNull(TestValues.NOT_NULL, commandJson); - - try { - Hashtable<String, Object> hash = JsonRPCMarshaller.deserializeJSONObject(commandJson); - SetMediaClockTimer cmd = new SetMediaClockTimer(hash); - - JSONObject body = JsonUtils.readJsonObjectFromJsonObject(commandJson, getMessageType()); - assertNotNull(TestValues.NOT_NULL, body); - - // Test everything in the json body. - assertEquals(TestValues.MATCH, JsonUtils.readStringFromJsonObject(body, RPCMessage.KEY_FUNCTION_NAME), cmd.getFunctionName()); - assertEquals(TestValues.MATCH, JsonUtils.readIntegerFromJsonObject(body, RPCMessage.KEY_CORRELATION_ID), cmd.getCorrelationID()); - - JSONObject parameters = JsonUtils.readJsonObjectFromJsonObject(body, RPCMessage.KEY_PARAMETERS); - JSONObject startTime = JsonUtils.readJsonObjectFromJsonObject(parameters, SetMediaClockTimer.KEY_START_TIME); - StartTime referenceStartTime = new StartTime(JsonRPCMarshaller.deserializeJSONObject(startTime)); - assertTrue(TestValues.TRUE, Validator.validateStartTime(referenceStartTime, cmd.getStartTime())); - - JSONObject endTime = JsonUtils.readJsonObjectFromJsonObject(parameters, SetMediaClockTimer.KEY_END_TIME); - StartTime referenceEndTime = new StartTime(JsonRPCMarshaller.deserializeJSONObject(endTime)); - assertTrue(TestValues.TRUE, Validator.validateStartTime(referenceEndTime, cmd.getEndTime())); - assertEquals(TestValues.MATCH, JsonUtils.readStringFromJsonObject(parameters, SetMediaClockTimer.KEY_UPDATE_MODE), cmd.getUpdateMode().toString()); - assertEquals(TestValues.MATCH, JsonUtils.readStringFromJsonObject(parameters, SetMediaClockTimer.KEY_AUDIO_STREAMING_INDICATOR), cmd.getAudioStreamingIndicator().toString()); - } catch (JSONException e) { - fail(TestValues.JSON_FAIL); - } + @Test + public void testJsonConstructor() { + JSONObject commandJson = JsonFileReader.readId(getInstrumentation().getTargetContext(), getCommandType(), getMessageType()); + assertNotNull(TestValues.NOT_NULL, commandJson); + + try { + Hashtable<String, Object> hash = JsonRPCMarshaller.deserializeJSONObject(commandJson); + SetMediaClockTimer cmd = new SetMediaClockTimer(hash); + + JSONObject body = JsonUtils.readJsonObjectFromJsonObject(commandJson, getMessageType()); + assertNotNull(TestValues.NOT_NULL, body); + + // Test everything in the json body. + assertEquals(TestValues.MATCH, JsonUtils.readStringFromJsonObject(body, RPCMessage.KEY_FUNCTION_NAME), cmd.getFunctionName()); + assertEquals(TestValues.MATCH, JsonUtils.readIntegerFromJsonObject(body, RPCMessage.KEY_CORRELATION_ID), cmd.getCorrelationID()); + + JSONObject parameters = JsonUtils.readJsonObjectFromJsonObject(body, RPCMessage.KEY_PARAMETERS); + JSONObject startTime = JsonUtils.readJsonObjectFromJsonObject(parameters, SetMediaClockTimer.KEY_START_TIME); + StartTime referenceStartTime = new StartTime(JsonRPCMarshaller.deserializeJSONObject(startTime)); + assertTrue(TestValues.TRUE, Validator.validateStartTime(referenceStartTime, cmd.getStartTime())); + + JSONObject endTime = JsonUtils.readJsonObjectFromJsonObject(parameters, SetMediaClockTimer.KEY_END_TIME); + StartTime referenceEndTime = new StartTime(JsonRPCMarshaller.deserializeJSONObject(endTime)); + assertTrue(TestValues.TRUE, Validator.validateStartTime(referenceEndTime, cmd.getEndTime())); + assertEquals(TestValues.MATCH, JsonUtils.readStringFromJsonObject(parameters, SetMediaClockTimer.KEY_UPDATE_MODE), cmd.getUpdateMode().toString()); + assertEquals(TestValues.MATCH, JsonUtils.readStringFromJsonObject(parameters, SetMediaClockTimer.KEY_AUDIO_STREAMING_INDICATOR), cmd.getAudioStreamingIndicator().toString()); + } catch (JSONException e) { + fail(TestValues.JSON_FAIL); + } } }
\ No newline at end of file diff --git a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/ShowAppMenuTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/ShowAppMenuTests.java index 27d876f14..db0c88440 100644 --- a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/ShowAppMenuTests.java +++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/ShowAppMenuTests.java @@ -62,81 +62,81 @@ import static junit.framework.TestCase.fail; */ public class ShowAppMenuTests extends BaseRpcTests { - @Override - protected RPCMessage createMessage() { - ShowAppMenu msg = new ShowAppMenu(); - msg.setMenuID(TestValues.GENERAL_INTEGER); - return msg; - } - - @Override - protected String getMessageType() { - return RPCMessage.KEY_REQUEST; - } - - @Override - protected String getCommandType() { - return FunctionID.SHOW_APP_MENU.toString(); - } - - @Override - protected JSONObject getExpectedParameters(int sdlVersion) { - JSONObject result = new JSONObject(); - - try { - result.put(ShowAppMenu.KEY_MENU_ID, TestValues.GENERAL_INTEGER); - } catch (JSONException e) { - fail(TestValues.JSON_FAIL); - } - - return result; - } - - /** - * Tests the expected values of the RPC message. - */ - @Test - public void testRpcValues () { - // Test Values - Integer copy = ( (ShowAppMenu) msg ).getMenuID(); - - // Valid Tests - assertEquals(TestValues.MATCH, TestValues.GENERAL_INTEGER, copy); - - // Invalid/Null Tests - ShowAppMenu msg = new ShowAppMenu(); - assertNotNull(TestValues.NOT_NULL, msg); - testNullBase(msg); - - assertNull(TestValues.MATCH, msg.getMenuID()); - } - - /** - * Tests a valid JSON construction of this RPC message. - */ - @Test - public void testJsonConstructor () { - JSONObject commandJson = JsonFileReader.readId(getInstrumentation().getTargetContext(), getCommandType(), getMessageType()); - assertNotNull(TestValues.NOT_NULL, commandJson); - - try { - Hashtable<String, Object> hash = JsonRPCMarshaller.deserializeJSONObject(commandJson); - ShowAppMenu cmd = new ShowAppMenu(hash); - - JSONObject body = JsonUtils.readJsonObjectFromJsonObject(commandJson, getMessageType()); - assertNotNull(TestValues.NOT_NULL, body); - - // Test everything in the json body. - assertEquals(TestValues.MATCH, JsonUtils.readStringFromJsonObject(body, RPCMessage.KEY_FUNCTION_NAME), cmd.getFunctionName()); - assertEquals(TestValues.MATCH, JsonUtils.readIntegerFromJsonObject(body, RPCMessage.KEY_CORRELATION_ID), cmd.getCorrelationID()); - - JSONObject parameters = JsonUtils.readJsonObjectFromJsonObject(body, RPCMessage.KEY_PARAMETERS); - - Integer serviceID = JsonUtils.readIntegerFromJsonObject(parameters, ShowAppMenu.KEY_MENU_ID); - assertEquals(TestValues.MATCH, TestValues.GENERAL_INTEGER, serviceID); - } catch (JSONException e) { - e.printStackTrace(); - } - } + @Override + protected RPCMessage createMessage() { + ShowAppMenu msg = new ShowAppMenu(); + msg.setMenuID(TestValues.GENERAL_INTEGER); + return msg; + } + + @Override + protected String getMessageType() { + return RPCMessage.KEY_REQUEST; + } + + @Override + protected String getCommandType() { + return FunctionID.SHOW_APP_MENU.toString(); + } + + @Override + protected JSONObject getExpectedParameters(int sdlVersion) { + JSONObject result = new JSONObject(); + + try { + result.put(ShowAppMenu.KEY_MENU_ID, TestValues.GENERAL_INTEGER); + } catch (JSONException e) { + fail(TestValues.JSON_FAIL); + } + + return result; + } + + /** + * Tests the expected values of the RPC message. + */ + @Test + public void testRpcValues() { + // Test Values + Integer copy = ((ShowAppMenu) msg).getMenuID(); + + // Valid Tests + assertEquals(TestValues.MATCH, TestValues.GENERAL_INTEGER, copy); + + // Invalid/Null Tests + ShowAppMenu msg = new ShowAppMenu(); + assertNotNull(TestValues.NOT_NULL, msg); + testNullBase(msg); + + assertNull(TestValues.MATCH, msg.getMenuID()); + } + + /** + * Tests a valid JSON construction of this RPC message. + */ + @Test + public void testJsonConstructor() { + JSONObject commandJson = JsonFileReader.readId(getInstrumentation().getTargetContext(), getCommandType(), getMessageType()); + assertNotNull(TestValues.NOT_NULL, commandJson); + + try { + Hashtable<String, Object> hash = JsonRPCMarshaller.deserializeJSONObject(commandJson); + ShowAppMenu cmd = new ShowAppMenu(hash); + + JSONObject body = JsonUtils.readJsonObjectFromJsonObject(commandJson, getMessageType()); + assertNotNull(TestValues.NOT_NULL, body); + + // Test everything in the json body. + assertEquals(TestValues.MATCH, JsonUtils.readStringFromJsonObject(body, RPCMessage.KEY_FUNCTION_NAME), cmd.getFunctionName()); + assertEquals(TestValues.MATCH, JsonUtils.readIntegerFromJsonObject(body, RPCMessage.KEY_CORRELATION_ID), cmd.getCorrelationID()); + + JSONObject parameters = JsonUtils.readJsonObjectFromJsonObject(body, RPCMessage.KEY_PARAMETERS); + + Integer serviceID = JsonUtils.readIntegerFromJsonObject(parameters, ShowAppMenu.KEY_MENU_ID); + assertEquals(TestValues.MATCH, TestValues.GENERAL_INTEGER, serviceID); + } catch (JSONException e) { + e.printStackTrace(); + } + } }
\ No newline at end of file diff --git a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/ShowConstantTbtTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/ShowConstantTbtTests.java index 848d40a1f..e454fcf7a 100644 --- a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/ShowConstantTbtTests.java +++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/ShowConstantTbtTests.java @@ -29,99 +29,99 @@ import static junit.framework.TestCase.assertTrue; import static junit.framework.TestCase.fail; /** - * This is a unit test class for the SmartDeviceLink library project class : + * This is a unit test class for the SmartDeviceLink library project class : * {@link com.smartdevicelink.proxy.rpc.ShowConstantTbt} */ public class ShowConstantTbtTests extends BaseRpcTests { - @Override - protected RPCMessage createMessage() { - ShowConstantTbt msg = new ShowConstantTbt(); - - msg.setDistanceToManeuver(TestValues.GENERAL_DOUBLE); - msg.setDistanceToManeuverScale(TestValues.GENERAL_DOUBLE); - msg.setEta(TestValues.GENERAL_STRING); - msg.setManeuverComplete(true); - msg.setNavigationText1(TestValues.GENERAL_STRING); - msg.setNavigationText2(TestValues.GENERAL_STRING); - msg.setNextTurnIcon(TestValues.GENERAL_IMAGE); - msg.setSoftButtons(TestValues.GENERAL_SOFTBUTTON_LIST); - msg.setTimeToDestination(TestValues.GENERAL_STRING); - msg.setTotalDistance(TestValues.GENERAL_STRING); - msg.setTurnIcon(TestValues.GENERAL_IMAGE); - - return msg; - } - - @Override - protected String getMessageType() { - return RPCMessage.KEY_REQUEST; - } - - @Override - protected String getCommandType() { - return FunctionID.SHOW_CONSTANT_TBT.toString(); - } - - @Override - protected JSONObject getExpectedParameters(int sdlVersion) { - JSONObject result = new JSONObject(); - - try { - result.put(ShowConstantTbt.KEY_SOFT_BUTTONS, TestValues.JSON_SOFTBUTTONS); - result.put(ShowConstantTbt.KEY_ETA, TestValues.GENERAL_STRING); - result.put(ShowConstantTbt.KEY_MANEUVER_COMPLETE, true); - result.put(ShowConstantTbt.KEY_MANEUVER_DISTANCE, TestValues.GENERAL_DOUBLE); - result.put(ShowConstantTbt.KEY_MANEUVER_DISTANCE_SCALE, TestValues.GENERAL_DOUBLE); - result.put(ShowConstantTbt.KEY_TEXT1, TestValues.GENERAL_STRING); - result.put(ShowConstantTbt.KEY_TEXT2, TestValues.GENERAL_STRING); - result.put(ShowConstantTbt.KEY_TIME_TO_DESTINATION, TestValues.GENERAL_STRING); - result.put(ShowConstantTbt.KEY_TOTAL_DISTANCE, TestValues.GENERAL_STRING); - result.put(ShowConstantTbt.KEY_MANEUVER_IMAGE, TestValues.GENERAL_IMAGE.serializeJSON()); - result.put(ShowConstantTbt.KEY_NEXT_MANEUVER_IMAGE, TestValues.GENERAL_IMAGE.serializeJSON()); - } catch(JSONException e){ - fail(TestValues.JSON_FAIL); + @Override + protected RPCMessage createMessage() { + ShowConstantTbt msg = new ShowConstantTbt(); + + msg.setDistanceToManeuver(TestValues.GENERAL_DOUBLE); + msg.setDistanceToManeuverScale(TestValues.GENERAL_DOUBLE); + msg.setEta(TestValues.GENERAL_STRING); + msg.setManeuverComplete(true); + msg.setNavigationText1(TestValues.GENERAL_STRING); + msg.setNavigationText2(TestValues.GENERAL_STRING); + msg.setNextTurnIcon(TestValues.GENERAL_IMAGE); + msg.setSoftButtons(TestValues.GENERAL_SOFTBUTTON_LIST); + msg.setTimeToDestination(TestValues.GENERAL_STRING); + msg.setTotalDistance(TestValues.GENERAL_STRING); + msg.setTurnIcon(TestValues.GENERAL_IMAGE); + + return msg; + } + + @Override + protected String getMessageType() { + return RPCMessage.KEY_REQUEST; + } + + @Override + protected String getCommandType() { + return FunctionID.SHOW_CONSTANT_TBT.toString(); + } + + @Override + protected JSONObject getExpectedParameters(int sdlVersion) { + JSONObject result = new JSONObject(); + + try { + result.put(ShowConstantTbt.KEY_SOFT_BUTTONS, TestValues.JSON_SOFTBUTTONS); + result.put(ShowConstantTbt.KEY_ETA, TestValues.GENERAL_STRING); + result.put(ShowConstantTbt.KEY_MANEUVER_COMPLETE, true); + result.put(ShowConstantTbt.KEY_MANEUVER_DISTANCE, TestValues.GENERAL_DOUBLE); + result.put(ShowConstantTbt.KEY_MANEUVER_DISTANCE_SCALE, TestValues.GENERAL_DOUBLE); + result.put(ShowConstantTbt.KEY_TEXT1, TestValues.GENERAL_STRING); + result.put(ShowConstantTbt.KEY_TEXT2, TestValues.GENERAL_STRING); + result.put(ShowConstantTbt.KEY_TIME_TO_DESTINATION, TestValues.GENERAL_STRING); + result.put(ShowConstantTbt.KEY_TOTAL_DISTANCE, TestValues.GENERAL_STRING); + result.put(ShowConstantTbt.KEY_MANEUVER_IMAGE, TestValues.GENERAL_IMAGE.serializeJSON()); + result.put(ShowConstantTbt.KEY_NEXT_MANEUVER_IMAGE, TestValues.GENERAL_IMAGE.serializeJSON()); + } catch (JSONException e) { + fail(TestValues.JSON_FAIL); } - - return result; - } - - /** - * Tests the expected values of the RPC message. - */ - @Test - public void testRpcValues () { - // Test Values - Double testScale = ((ShowConstantTbt) msg).getDistanceToManeuverScale(); - Double testDistance = ((ShowConstantTbt) msg).getDistanceToManeuver(); - String testEta = ((ShowConstantTbt) msg).getEta(); - String testTimeToDestination = ((ShowConstantTbt) msg).getTimeToDestination(); - String testTotalDistance = ((ShowConstantTbt) msg).getTotalDistance(); - String testNavText2 = ((ShowConstantTbt) msg).getNavigationText2(); - String testNavText1 = ((ShowConstantTbt) msg).getNavigationText1(); - Boolean testManeuverComplete = ((ShowConstantTbt) msg).getManeuverComplete(); - Image testTurnIcon = ((ShowConstantTbt) msg).getTurnIcon(); - Image testNextTurnIcon = ((ShowConstantTbt) msg).getNextTurnIcon(); - List<SoftButton> testSoftButtons = ((ShowConstantTbt) msg).getSoftButtons(); - - // Valid Test - assertEquals(TestValues.MATCH, TestValues.GENERAL_STRING, testTimeToDestination); - assertEquals(TestValues.MATCH, TestValues.GENERAL_DOUBLE, testScale); - assertEquals(TestValues.MATCH, TestValues.GENERAL_STRING, testNavText1); - assertEquals(TestValues.MATCH, TestValues.GENERAL_STRING, testNavText2); - assertEquals(TestValues.MATCH, TestValues.GENERAL_STRING, testEta); - assertEquals(TestValues.MATCH, TestValues.GENERAL_STRING, testTotalDistance); - assertEquals(TestValues.MATCH, TestValues.GENERAL_DOUBLE, testDistance); - assertTrue(TestValues.TRUE, testManeuverComplete); - assertTrue(TestValues.TRUE, Validator.validateSoftButtons(TestValues.GENERAL_SOFTBUTTON_LIST, testSoftButtons)); - assertTrue(TestValues.TRUE, Validator.validateImage(TestValues.GENERAL_IMAGE, testTurnIcon)); - assertTrue(TestValues.TRUE, Validator.validateImage(TestValues.GENERAL_IMAGE, testNextTurnIcon)); - - // Invalid/Null Tests - ShowConstantTbt msg = new ShowConstantTbt(); - assertNotNull(TestValues.NOT_NULL, msg); + + return result; + } + + /** + * Tests the expected values of the RPC message. + */ + @Test + public void testRpcValues() { + // Test Values + Double testScale = ((ShowConstantTbt) msg).getDistanceToManeuverScale(); + Double testDistance = ((ShowConstantTbt) msg).getDistanceToManeuver(); + String testEta = ((ShowConstantTbt) msg).getEta(); + String testTimeToDestination = ((ShowConstantTbt) msg).getTimeToDestination(); + String testTotalDistance = ((ShowConstantTbt) msg).getTotalDistance(); + String testNavText2 = ((ShowConstantTbt) msg).getNavigationText2(); + String testNavText1 = ((ShowConstantTbt) msg).getNavigationText1(); + Boolean testManeuverComplete = ((ShowConstantTbt) msg).getManeuverComplete(); + Image testTurnIcon = ((ShowConstantTbt) msg).getTurnIcon(); + Image testNextTurnIcon = ((ShowConstantTbt) msg).getNextTurnIcon(); + List<SoftButton> testSoftButtons = ((ShowConstantTbt) msg).getSoftButtons(); + + // Valid Test + assertEquals(TestValues.MATCH, TestValues.GENERAL_STRING, testTimeToDestination); + assertEquals(TestValues.MATCH, TestValues.GENERAL_DOUBLE, testScale); + assertEquals(TestValues.MATCH, TestValues.GENERAL_STRING, testNavText1); + assertEquals(TestValues.MATCH, TestValues.GENERAL_STRING, testNavText2); + assertEquals(TestValues.MATCH, TestValues.GENERAL_STRING, testEta); + assertEquals(TestValues.MATCH, TestValues.GENERAL_STRING, testTotalDistance); + assertEquals(TestValues.MATCH, TestValues.GENERAL_DOUBLE, testDistance); + assertTrue(TestValues.TRUE, testManeuverComplete); + assertTrue(TestValues.TRUE, Validator.validateSoftButtons(TestValues.GENERAL_SOFTBUTTON_LIST, testSoftButtons)); + assertTrue(TestValues.TRUE, Validator.validateImage(TestValues.GENERAL_IMAGE, testTurnIcon)); + assertTrue(TestValues.TRUE, Validator.validateImage(TestValues.GENERAL_IMAGE, testNextTurnIcon)); + + // Invalid/Null Tests + ShowConstantTbt msg = new ShowConstantTbt(); + assertNotNull(TestValues.NOT_NULL, msg); testNullBase(msg); - + assertNull(TestValues.NULL, msg.getSoftButtons()); assertNull(TestValues.NULL, msg.getNavigationText1()); assertNull(TestValues.NULL, msg.getNavigationText2()); @@ -133,53 +133,53 @@ public class ShowConstantTbtTests extends BaseRpcTests { assertNull(TestValues.NULL, msg.getTimeToDestination()); assertNull(TestValues.NULL, msg.getTotalDistance()); assertNull(TestValues.NULL, msg.getTurnIcon()); - } - - /** + } + + /** * Tests a valid JSON construction of this RPC message. */ - @Test - public void testJsonConstructor () { - JSONObject commandJson = JsonFileReader.readId(getInstrumentation().getTargetContext(), getCommandType(), getMessageType()); - assertNotNull(TestValues.NOT_NULL, commandJson); - - try { - Hashtable<String, Object> hash = JsonRPCMarshaller.deserializeJSONObject(commandJson); - ShowConstantTbt cmd = new ShowConstantTbt(hash); - JSONObject body = JsonUtils.readJsonObjectFromJsonObject(commandJson, getMessageType()); - assertNotNull(TestValues.NOT_NULL, body); - - // Test everything in the json body. - assertEquals(TestValues.MATCH, JsonUtils.readStringFromJsonObject(body, RPCMessage.KEY_FUNCTION_NAME), cmd.getFunctionName()); - assertEquals(TestValues.MATCH, JsonUtils.readIntegerFromJsonObject(body, RPCMessage.KEY_CORRELATION_ID), cmd.getCorrelationID()); - - JSONObject parameters = JsonUtils.readJsonObjectFromJsonObject(body, RPCMessage.KEY_PARAMETERS); - assertEquals(TestValues.MATCH, JsonUtils.readStringFromJsonObject(parameters, ShowConstantTbt.KEY_ETA), cmd.getEta()); - assertEquals(TestValues.MATCH, JsonUtils.readBooleanFromJsonObject(parameters, ShowConstantTbt.KEY_MANEUVER_COMPLETE), cmd.getManeuverComplete()); - assertEquals(TestValues.MATCH, JsonUtils.readDoubleFromJsonObject(parameters, ShowConstantTbt.KEY_MANEUVER_DISTANCE), cmd.getDistanceToManeuver()); - assertEquals(TestValues.MATCH, JsonUtils.readDoubleFromJsonObject(parameters, ShowConstantTbt.KEY_MANEUVER_DISTANCE_SCALE), cmd.getDistanceToManeuverScale()); - assertEquals(TestValues.MATCH, JsonUtils.readStringFromJsonObject(parameters, ShowConstantTbt.KEY_TEXT1), cmd.getNavigationText1()); - assertEquals(TestValues.MATCH, JsonUtils.readStringFromJsonObject(parameters, ShowConstantTbt.KEY_TEXT2), cmd.getNavigationText2()); - assertEquals(TestValues.MATCH, JsonUtils.readStringFromJsonObject(parameters, ShowConstantTbt.KEY_TIME_TO_DESTINATION), cmd.getTimeToDestination()); - assertEquals(TestValues.MATCH, JsonUtils.readStringFromJsonObject(parameters, ShowConstantTbt.KEY_TOTAL_DISTANCE), cmd.getTotalDistance()); - - JSONObject icon1 = JsonUtils.readJsonObjectFromJsonObject(parameters, ShowConstantTbt.KEY_MANEUVER_IMAGE); - Image refIcon1 = new Image(JsonRPCMarshaller.deserializeJSONObject(icon1)); - assertTrue(TestValues.TRUE, Validator.validateImage(refIcon1, cmd.getTurnIcon())); - - JSONObject icon2 = JsonUtils.readJsonObjectFromJsonObject(parameters, ShowConstantTbt.KEY_NEXT_MANEUVER_IMAGE); - Image refIcon2 = new Image(JsonRPCMarshaller.deserializeJSONObject(icon2)); - assertTrue(TestValues.TRUE, Validator.validateImage(refIcon2, cmd.getNextTurnIcon())); - - JSONArray softButtonArray = JsonUtils.readJsonArrayFromJsonObject(parameters, ShowConstantTbt.KEY_SOFT_BUTTONS); - List<SoftButton> softButtonList = new ArrayList<SoftButton>(); - for (int index = 0; index < softButtonArray.length(); index++) { - SoftButton chunk = new SoftButton(JsonRPCMarshaller.deserializeJSONObject( (JSONObject)softButtonArray.get(index)) ); - softButtonList.add(chunk); - } - assertTrue(TestValues.TRUE, Validator.validateSoftButtons(softButtonList, cmd.getSoftButtons())); - } catch (JSONException e) { - fail(TestValues.JSON_FAIL); - } - } + @Test + public void testJsonConstructor() { + JSONObject commandJson = JsonFileReader.readId(getInstrumentation().getTargetContext(), getCommandType(), getMessageType()); + assertNotNull(TestValues.NOT_NULL, commandJson); + + try { + Hashtable<String, Object> hash = JsonRPCMarshaller.deserializeJSONObject(commandJson); + ShowConstantTbt cmd = new ShowConstantTbt(hash); + JSONObject body = JsonUtils.readJsonObjectFromJsonObject(commandJson, getMessageType()); + assertNotNull(TestValues.NOT_NULL, body); + + // Test everything in the json body. + assertEquals(TestValues.MATCH, JsonUtils.readStringFromJsonObject(body, RPCMessage.KEY_FUNCTION_NAME), cmd.getFunctionName()); + assertEquals(TestValues.MATCH, JsonUtils.readIntegerFromJsonObject(body, RPCMessage.KEY_CORRELATION_ID), cmd.getCorrelationID()); + + JSONObject parameters = JsonUtils.readJsonObjectFromJsonObject(body, RPCMessage.KEY_PARAMETERS); + assertEquals(TestValues.MATCH, JsonUtils.readStringFromJsonObject(parameters, ShowConstantTbt.KEY_ETA), cmd.getEta()); + assertEquals(TestValues.MATCH, JsonUtils.readBooleanFromJsonObject(parameters, ShowConstantTbt.KEY_MANEUVER_COMPLETE), cmd.getManeuverComplete()); + assertEquals(TestValues.MATCH, JsonUtils.readDoubleFromJsonObject(parameters, ShowConstantTbt.KEY_MANEUVER_DISTANCE), cmd.getDistanceToManeuver()); + assertEquals(TestValues.MATCH, JsonUtils.readDoubleFromJsonObject(parameters, ShowConstantTbt.KEY_MANEUVER_DISTANCE_SCALE), cmd.getDistanceToManeuverScale()); + assertEquals(TestValues.MATCH, JsonUtils.readStringFromJsonObject(parameters, ShowConstantTbt.KEY_TEXT1), cmd.getNavigationText1()); + assertEquals(TestValues.MATCH, JsonUtils.readStringFromJsonObject(parameters, ShowConstantTbt.KEY_TEXT2), cmd.getNavigationText2()); + assertEquals(TestValues.MATCH, JsonUtils.readStringFromJsonObject(parameters, ShowConstantTbt.KEY_TIME_TO_DESTINATION), cmd.getTimeToDestination()); + assertEquals(TestValues.MATCH, JsonUtils.readStringFromJsonObject(parameters, ShowConstantTbt.KEY_TOTAL_DISTANCE), cmd.getTotalDistance()); + + JSONObject icon1 = JsonUtils.readJsonObjectFromJsonObject(parameters, ShowConstantTbt.KEY_MANEUVER_IMAGE); + Image refIcon1 = new Image(JsonRPCMarshaller.deserializeJSONObject(icon1)); + assertTrue(TestValues.TRUE, Validator.validateImage(refIcon1, cmd.getTurnIcon())); + + JSONObject icon2 = JsonUtils.readJsonObjectFromJsonObject(parameters, ShowConstantTbt.KEY_NEXT_MANEUVER_IMAGE); + Image refIcon2 = new Image(JsonRPCMarshaller.deserializeJSONObject(icon2)); + assertTrue(TestValues.TRUE, Validator.validateImage(refIcon2, cmd.getNextTurnIcon())); + + JSONArray softButtonArray = JsonUtils.readJsonArrayFromJsonObject(parameters, ShowConstantTbt.KEY_SOFT_BUTTONS); + List<SoftButton> softButtonList = new ArrayList<SoftButton>(); + for (int index = 0; index < softButtonArray.length(); index++) { + SoftButton chunk = new SoftButton(JsonRPCMarshaller.deserializeJSONObject((JSONObject) softButtonArray.get(index))); + softButtonList.add(chunk); + } + assertTrue(TestValues.TRUE, Validator.validateSoftButtons(softButtonList, cmd.getSoftButtons())); + } catch (JSONException e) { + fail(TestValues.JSON_FAIL); + } + } }
\ No newline at end of file diff --git a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/ShowTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/ShowTests.java index 14585c439..03396cd3f 100644 --- a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/ShowTests.java +++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/ShowTests.java @@ -32,184 +32,184 @@ import static junit.framework.TestCase.assertTrue; import static junit.framework.TestCase.fail; /** - * This is a unit test class for the SmartDeviceLink library project class : + * This is a unit test class for the SmartDeviceLink library project class : * {@link com.smartdevicelink.proxy.rpc.Show} */ public class ShowTests extends BaseRpcTests { @Override - protected RPCMessage createMessage() { - Show msg = new Show(); - - msg.setMainField1(TestValues.GENERAL_STRING); - msg.setMainField2(TestValues.GENERAL_STRING); - msg.setMainField3(TestValues.GENERAL_STRING); - msg.setMainField4(TestValues.GENERAL_STRING); - msg.setStatusBar(TestValues.GENERAL_STRING); - msg.setMediaTrack(TestValues.GENERAL_STRING); - msg.setTemplateTitle(TestValues.GENERAL_STRING); - msg.setAlignment(TestValues.GENERAL_TEXTALIGNMENT); - msg.setGraphic(TestValues.GENERAL_IMAGE); - msg.setSecondaryGraphic(TestValues.GENERAL_IMAGE); - msg.setCustomPresets(TestValues.GENERAL_STRING_LIST); - msg.setSoftButtons(TestValues.GENERAL_SOFTBUTTON_LIST); - msg.setMetadataTags(TestValues.GENERAL_METADATASTRUCT); - msg.setWindowID(TestValues.GENERAL_INT); - msg.setTemplateConfiguration(TestValues.GENERAL_TEMPLATE_CONFIGURATION); - - return msg; - } - - @Override - protected String getMessageType() { - return RPCMessage.KEY_REQUEST; - } - - @Override - protected String getCommandType() { - return FunctionID.SHOW.toString(); - } - - @Override - protected JSONObject getExpectedParameters(int sdlVersion) { - JSONObject result = new JSONObject(); - - try { - result.put(Show.KEY_MAIN_FIELD_1, TestValues.GENERAL_STRING); - result.put(Show.KEY_MAIN_FIELD_2, TestValues.GENERAL_STRING); - result.put(Show.KEY_MAIN_FIELD_3, TestValues.GENERAL_STRING); - result.put(Show.KEY_MAIN_FIELD_4, TestValues.GENERAL_STRING); - result.put(Show.KEY_STATUS_BAR, TestValues.GENERAL_STRING); - result.put(Show.KEY_MEDIA_TRACK, TestValues.GENERAL_STRING); - result.put(Show.KEY_TEMPLATE_TITLE, TestValues.GENERAL_STRING); - result.put(Show.KEY_GRAPHIC, TestValues.JSON_IMAGE); - result.put(Show.KEY_SECONDARY_GRAPHIC, TestValues.JSON_IMAGE); - result.put(Show.KEY_ALIGNMENT, TestValues.GENERAL_TEXTALIGNMENT); - result.put(Show.KEY_CUSTOM_PRESETS, JsonUtils.createJsonArray(TestValues.GENERAL_STRING_LIST)); - result.put(Show.KEY_SOFT_BUTTONS, TestValues.JSON_SOFTBUTTONS); - result.put(Show.KEY_METADATA_TAGS, TestValues.GENERAL_METADATASTRUCT.serializeJSON()); - result.put(Show.KEY_WINDOW_ID, TestValues.GENERAL_INT); - result.put(Show.KEY_TEMPLATE_CONFIGURATION, TestValues.GENERAL_TEMPLATE_CONFIGURATION.serializeJSON()); - } catch (JSONException e) { - fail(TestValues.JSON_FAIL); - } - - return result; - } - - @Test - public void testSoftButtons () { - // TestValues - String testTrack = ( (Show) msg ).getMediaTrack(); - String templateTitle = ( (Show) msg ).getTemplateTitle(); - Image testGraphic2 = ( (Show) msg ).getSecondaryGraphic(); - Image testGraphic1 = ( (Show) msg ).getGraphic(); - String testStatusBar = ( (Show) msg ).getStatusBar(); - String testText1 = ( (Show) msg ).getMainField1(); - String testText2 = ( (Show) msg ).getMainField2(); - String testText3 = ( (Show) msg ).getMainField3(); - String testText4 = ( (Show) msg ).getMainField4(); - TextAlignment testAlignment = ( (Show) msg ).getAlignment(); - List<SoftButton> testSoftButtons = ( (Show) msg ).getSoftButtons(); - List<String> testCustomPresets = ( (Show) msg ).getCustomPresets(); - MetadataTags testMetadata = ( (Show) msg ).getMetadataTags(); - - // Valid Tests - assertEquals(TestValues.MATCH, TestValues.GENERAL_STRING, testTrack); - assertEquals(TestValues.MATCH, TestValues.GENERAL_STRING, templateTitle); - assertEquals(TestValues.MATCH, TestValues.GENERAL_TEXTALIGNMENT, testAlignment); - assertEquals(TestValues.MATCH, TestValues.GENERAL_STRING, testStatusBar); - assertEquals(TestValues.MATCH, TestValues.GENERAL_STRING, testText1); - assertEquals(TestValues.MATCH, TestValues.GENERAL_STRING, testText2); - assertEquals(TestValues.MATCH, TestValues.GENERAL_STRING, testText3); - assertEquals(TestValues.MATCH, TestValues.GENERAL_STRING, testText4); - assertEquals(TestValues.MATCH, TestValues.GENERAL_STRING_LIST.size(), testCustomPresets.size()); - assertEquals(TestValues.MATCH, TestValues.GENERAL_METADATASTRUCT, testMetadata); - assertTrue(TestValues.TRUE, Validator.validateSoftButtons(TestValues.GENERAL_SOFTBUTTON_LIST, testSoftButtons)); - assertTrue(TestValues.TRUE, Validator.validateImage(TestValues.GENERAL_IMAGE, testGraphic2)); - assertTrue(TestValues.TRUE, Validator.validateImage(TestValues.GENERAL_IMAGE, testGraphic1)); - - // Invalid/Null Tests - Show msg = new Show(); - assertNotNull(TestValues.NOT_NULL, msg); - testNullBase(msg); - - assertNull(TestValues.NULL, msg.getMainField1()); - assertNull(TestValues.NULL, msg.getMainField2()); - assertNull(TestValues.NULL, msg.getMainField3()); - assertNull(TestValues.NULL, msg.getMainField4()); - assertNull(TestValues.NULL, msg.getStatusBar()); - assertNull(TestValues.NULL, msg.getAlignment()); - assertNull(TestValues.NULL, msg.getGraphic()); - assertNull(TestValues.NULL, msg.getSecondaryGraphic()); - assertNull(TestValues.NULL, msg.getCustomPresets()); - assertNull(TestValues.NULL, msg.getMediaTrack()); - assertNull(TestValues.NULL, msg.getTemplateTitle()); - assertNull(TestValues.NULL, msg.getSoftButtons()); - assertNull(TestValues.NULL, msg.getMetadataTags()); - assertNull(TestValues.NULL, msg.getWindowID()); - assertNull(TestValues.NULL, msg.getTemplateConfiguration()); - } - - /** + protected RPCMessage createMessage() { + Show msg = new Show(); + + msg.setMainField1(TestValues.GENERAL_STRING); + msg.setMainField2(TestValues.GENERAL_STRING); + msg.setMainField3(TestValues.GENERAL_STRING); + msg.setMainField4(TestValues.GENERAL_STRING); + msg.setStatusBar(TestValues.GENERAL_STRING); + msg.setMediaTrack(TestValues.GENERAL_STRING); + msg.setTemplateTitle(TestValues.GENERAL_STRING); + msg.setAlignment(TestValues.GENERAL_TEXTALIGNMENT); + msg.setGraphic(TestValues.GENERAL_IMAGE); + msg.setSecondaryGraphic(TestValues.GENERAL_IMAGE); + msg.setCustomPresets(TestValues.GENERAL_STRING_LIST); + msg.setSoftButtons(TestValues.GENERAL_SOFTBUTTON_LIST); + msg.setMetadataTags(TestValues.GENERAL_METADATASTRUCT); + msg.setWindowID(TestValues.GENERAL_INT); + msg.setTemplateConfiguration(TestValues.GENERAL_TEMPLATE_CONFIGURATION); + + return msg; + } + + @Override + protected String getMessageType() { + return RPCMessage.KEY_REQUEST; + } + + @Override + protected String getCommandType() { + return FunctionID.SHOW.toString(); + } + + @Override + protected JSONObject getExpectedParameters(int sdlVersion) { + JSONObject result = new JSONObject(); + + try { + result.put(Show.KEY_MAIN_FIELD_1, TestValues.GENERAL_STRING); + result.put(Show.KEY_MAIN_FIELD_2, TestValues.GENERAL_STRING); + result.put(Show.KEY_MAIN_FIELD_3, TestValues.GENERAL_STRING); + result.put(Show.KEY_MAIN_FIELD_4, TestValues.GENERAL_STRING); + result.put(Show.KEY_STATUS_BAR, TestValues.GENERAL_STRING); + result.put(Show.KEY_MEDIA_TRACK, TestValues.GENERAL_STRING); + result.put(Show.KEY_TEMPLATE_TITLE, TestValues.GENERAL_STRING); + result.put(Show.KEY_GRAPHIC, TestValues.JSON_IMAGE); + result.put(Show.KEY_SECONDARY_GRAPHIC, TestValues.JSON_IMAGE); + result.put(Show.KEY_ALIGNMENT, TestValues.GENERAL_TEXTALIGNMENT); + result.put(Show.KEY_CUSTOM_PRESETS, JsonUtils.createJsonArray(TestValues.GENERAL_STRING_LIST)); + result.put(Show.KEY_SOFT_BUTTONS, TestValues.JSON_SOFTBUTTONS); + result.put(Show.KEY_METADATA_TAGS, TestValues.GENERAL_METADATASTRUCT.serializeJSON()); + result.put(Show.KEY_WINDOW_ID, TestValues.GENERAL_INT); + result.put(Show.KEY_TEMPLATE_CONFIGURATION, TestValues.GENERAL_TEMPLATE_CONFIGURATION.serializeJSON()); + } catch (JSONException e) { + fail(TestValues.JSON_FAIL); + } + + return result; + } + + @Test + public void testSoftButtons() { + // TestValues + String testTrack = ((Show) msg).getMediaTrack(); + String templateTitle = ((Show) msg).getTemplateTitle(); + Image testGraphic2 = ((Show) msg).getSecondaryGraphic(); + Image testGraphic1 = ((Show) msg).getGraphic(); + String testStatusBar = ((Show) msg).getStatusBar(); + String testText1 = ((Show) msg).getMainField1(); + String testText2 = ((Show) msg).getMainField2(); + String testText3 = ((Show) msg).getMainField3(); + String testText4 = ((Show) msg).getMainField4(); + TextAlignment testAlignment = ((Show) msg).getAlignment(); + List<SoftButton> testSoftButtons = ((Show) msg).getSoftButtons(); + List<String> testCustomPresets = ((Show) msg).getCustomPresets(); + MetadataTags testMetadata = ((Show) msg).getMetadataTags(); + + // Valid Tests + assertEquals(TestValues.MATCH, TestValues.GENERAL_STRING, testTrack); + assertEquals(TestValues.MATCH, TestValues.GENERAL_STRING, templateTitle); + assertEquals(TestValues.MATCH, TestValues.GENERAL_TEXTALIGNMENT, testAlignment); + assertEquals(TestValues.MATCH, TestValues.GENERAL_STRING, testStatusBar); + assertEquals(TestValues.MATCH, TestValues.GENERAL_STRING, testText1); + assertEquals(TestValues.MATCH, TestValues.GENERAL_STRING, testText2); + assertEquals(TestValues.MATCH, TestValues.GENERAL_STRING, testText3); + assertEquals(TestValues.MATCH, TestValues.GENERAL_STRING, testText4); + assertEquals(TestValues.MATCH, TestValues.GENERAL_STRING_LIST.size(), testCustomPresets.size()); + assertEquals(TestValues.MATCH, TestValues.GENERAL_METADATASTRUCT, testMetadata); + assertTrue(TestValues.TRUE, Validator.validateSoftButtons(TestValues.GENERAL_SOFTBUTTON_LIST, testSoftButtons)); + assertTrue(TestValues.TRUE, Validator.validateImage(TestValues.GENERAL_IMAGE, testGraphic2)); + assertTrue(TestValues.TRUE, Validator.validateImage(TestValues.GENERAL_IMAGE, testGraphic1)); + + // Invalid/Null Tests + Show msg = new Show(); + assertNotNull(TestValues.NOT_NULL, msg); + testNullBase(msg); + + assertNull(TestValues.NULL, msg.getMainField1()); + assertNull(TestValues.NULL, msg.getMainField2()); + assertNull(TestValues.NULL, msg.getMainField3()); + assertNull(TestValues.NULL, msg.getMainField4()); + assertNull(TestValues.NULL, msg.getStatusBar()); + assertNull(TestValues.NULL, msg.getAlignment()); + assertNull(TestValues.NULL, msg.getGraphic()); + assertNull(TestValues.NULL, msg.getSecondaryGraphic()); + assertNull(TestValues.NULL, msg.getCustomPresets()); + assertNull(TestValues.NULL, msg.getMediaTrack()); + assertNull(TestValues.NULL, msg.getTemplateTitle()); + assertNull(TestValues.NULL, msg.getSoftButtons()); + assertNull(TestValues.NULL, msg.getMetadataTags()); + assertNull(TestValues.NULL, msg.getWindowID()); + assertNull(TestValues.NULL, msg.getTemplateConfiguration()); + } + + /** * Tests a valid JSON construction of this RPC message. */ - @Test - public void testJsonConstructor () { - JSONObject commandJson = JsonFileReader.readId(getInstrumentation().getTargetContext(),getCommandType(), getMessageType()); - assertNotNull(TestValues.NOT_NULL, commandJson); - - try { - Hashtable<String, Object> hash = JsonRPCMarshaller.deserializeJSONObject(commandJson); - Show cmd = new Show(hash); - - JSONObject body = JsonUtils.readJsonObjectFromJsonObject(commandJson, getMessageType()); - assertNotNull(TestValues.NOT_NULL, body); - - // Test everything in the json body. - assertEquals(TestValues.MATCH, JsonUtils.readStringFromJsonObject(body, RPCMessage.KEY_FUNCTION_NAME), cmd.getFunctionName()); - assertEquals(TestValues.MATCH, JsonUtils.readIntegerFromJsonObject(body, RPCMessage.KEY_CORRELATION_ID), cmd.getCorrelationID()); - - JSONObject parameters = JsonUtils.readJsonObjectFromJsonObject(body, RPCMessage.KEY_PARAMETERS); - - JSONObject graphic = JsonUtils.readJsonObjectFromJsonObject(parameters, Show.KEY_GRAPHIC); - Image referenceGraphic = new Image(JsonRPCMarshaller.deserializeJSONObject(graphic)); - assertTrue(TestValues.TRUE, Validator.validateImage(referenceGraphic, cmd.getGraphic())); - - List<String> customPresetsList = JsonUtils.readStringListFromJsonObject(parameters, Show.KEY_CUSTOM_PRESETS); - List<String> testPresetsList = cmd.getCustomPresets(); - assertEquals(TestValues.MATCH, customPresetsList.size(), testPresetsList.size()); - assertTrue(TestValues.TRUE, Validator.validateStringList(customPresetsList, testPresetsList)); - - assertEquals(TestValues.MATCH, JsonUtils.readStringFromJsonObject(parameters, Show.KEY_MAIN_FIELD_1), cmd.getMainField1()); - assertEquals(TestValues.MATCH, JsonUtils.readStringFromJsonObject(parameters, Show.KEY_MAIN_FIELD_2), cmd.getMainField2()); - assertEquals(TestValues.MATCH, JsonUtils.readStringFromJsonObject(parameters, Show.KEY_MAIN_FIELD_3), cmd.getMainField3()); - assertEquals(TestValues.MATCH, JsonUtils.readStringFromJsonObject(parameters, Show.KEY_MAIN_FIELD_4), cmd.getMainField4()); - assertEquals(TestValues.MATCH, JsonUtils.readStringFromJsonObject(parameters, Show.KEY_STATUS_BAR), cmd.getStatusBar()); - assertEquals(TestValues.MATCH, JsonUtils.readStringFromJsonObject(parameters, Show.KEY_ALIGNMENT), cmd.getAlignment().toString()); - assertEquals(TestValues.MATCH, JsonUtils.readStringFromJsonObject(parameters, Show.KEY_MEDIA_TRACK), cmd.getMediaTrack()); - assertEquals(TestValues.MATCH, JsonUtils.readStringFromJsonObject(parameters, Show.KEY_TEMPLATE_TITLE), cmd.getTemplateTitle()); - assertEquals(TestValues.MATCH, JsonUtils.readStringFromJsonObject(parameters, Show.KEY_METADATA_TAGS), cmd.getMetadataTags()); - assertEquals(TestValues.MATCH, JsonUtils.readIntegerFromJsonObject(parameters, Show.KEY_WINDOW_ID), cmd.getWindowID()); - - JSONObject templateConfiguration = JsonUtils.readJsonObjectFromJsonObject(parameters, Show.KEY_TEMPLATE_CONFIGURATION); - TemplateConfiguration refTemplateConfiguration = new TemplateConfiguration(JsonRPCMarshaller.deserializeJSONObject(templateConfiguration)); - assertTrue(TestValues.TRUE, Validator.validateTemplateConfiguration(refTemplateConfiguration, cmd.getTemplateConfiguration())); - - JSONObject secondaryGraphic = JsonUtils.readJsonObjectFromJsonObject(parameters, Show.KEY_SECONDARY_GRAPHIC); - Image referenceSecondaryGraphic = new Image(JsonRPCMarshaller.deserializeJSONObject(secondaryGraphic)); - assertTrue(TestValues.TRUE, Validator.validateImage(referenceSecondaryGraphic, cmd.getSecondaryGraphic())); - - JSONArray softButtonArray = JsonUtils.readJsonArrayFromJsonObject(parameters, Show.KEY_SOFT_BUTTONS); - List<SoftButton> softButtonList = new ArrayList<SoftButton>(); - for (int index = 0; index < softButtonArray.length(); index++) { - SoftButton chunk = new SoftButton(JsonRPCMarshaller.deserializeJSONObject( (JSONObject)softButtonArray.get(index)) ); - softButtonList.add(chunk); - } - assertTrue(TestValues.TRUE, Validator.validateSoftButtons(softButtonList, cmd.getSoftButtons())); - - } catch (JSONException e) { - fail(TestValues.JSON_FAIL); - } + @Test + public void testJsonConstructor() { + JSONObject commandJson = JsonFileReader.readId(getInstrumentation().getTargetContext(), getCommandType(), getMessageType()); + assertNotNull(TestValues.NOT_NULL, commandJson); + + try { + Hashtable<String, Object> hash = JsonRPCMarshaller.deserializeJSONObject(commandJson); + Show cmd = new Show(hash); + + JSONObject body = JsonUtils.readJsonObjectFromJsonObject(commandJson, getMessageType()); + assertNotNull(TestValues.NOT_NULL, body); + + // Test everything in the json body. + assertEquals(TestValues.MATCH, JsonUtils.readStringFromJsonObject(body, RPCMessage.KEY_FUNCTION_NAME), cmd.getFunctionName()); + assertEquals(TestValues.MATCH, JsonUtils.readIntegerFromJsonObject(body, RPCMessage.KEY_CORRELATION_ID), cmd.getCorrelationID()); + + JSONObject parameters = JsonUtils.readJsonObjectFromJsonObject(body, RPCMessage.KEY_PARAMETERS); + + JSONObject graphic = JsonUtils.readJsonObjectFromJsonObject(parameters, Show.KEY_GRAPHIC); + Image referenceGraphic = new Image(JsonRPCMarshaller.deserializeJSONObject(graphic)); + assertTrue(TestValues.TRUE, Validator.validateImage(referenceGraphic, cmd.getGraphic())); + + List<String> customPresetsList = JsonUtils.readStringListFromJsonObject(parameters, Show.KEY_CUSTOM_PRESETS); + List<String> testPresetsList = cmd.getCustomPresets(); + assertEquals(TestValues.MATCH, customPresetsList.size(), testPresetsList.size()); + assertTrue(TestValues.TRUE, Validator.validateStringList(customPresetsList, testPresetsList)); + + assertEquals(TestValues.MATCH, JsonUtils.readStringFromJsonObject(parameters, Show.KEY_MAIN_FIELD_1), cmd.getMainField1()); + assertEquals(TestValues.MATCH, JsonUtils.readStringFromJsonObject(parameters, Show.KEY_MAIN_FIELD_2), cmd.getMainField2()); + assertEquals(TestValues.MATCH, JsonUtils.readStringFromJsonObject(parameters, Show.KEY_MAIN_FIELD_3), cmd.getMainField3()); + assertEquals(TestValues.MATCH, JsonUtils.readStringFromJsonObject(parameters, Show.KEY_MAIN_FIELD_4), cmd.getMainField4()); + assertEquals(TestValues.MATCH, JsonUtils.readStringFromJsonObject(parameters, Show.KEY_STATUS_BAR), cmd.getStatusBar()); + assertEquals(TestValues.MATCH, JsonUtils.readStringFromJsonObject(parameters, Show.KEY_ALIGNMENT), cmd.getAlignment().toString()); + assertEquals(TestValues.MATCH, JsonUtils.readStringFromJsonObject(parameters, Show.KEY_MEDIA_TRACK), cmd.getMediaTrack()); + assertEquals(TestValues.MATCH, JsonUtils.readStringFromJsonObject(parameters, Show.KEY_TEMPLATE_TITLE), cmd.getTemplateTitle()); + assertEquals(TestValues.MATCH, JsonUtils.readStringFromJsonObject(parameters, Show.KEY_METADATA_TAGS), cmd.getMetadataTags()); + assertEquals(TestValues.MATCH, JsonUtils.readIntegerFromJsonObject(parameters, Show.KEY_WINDOW_ID), cmd.getWindowID()); + + JSONObject templateConfiguration = JsonUtils.readJsonObjectFromJsonObject(parameters, Show.KEY_TEMPLATE_CONFIGURATION); + TemplateConfiguration refTemplateConfiguration = new TemplateConfiguration(JsonRPCMarshaller.deserializeJSONObject(templateConfiguration)); + assertTrue(TestValues.TRUE, Validator.validateTemplateConfiguration(refTemplateConfiguration, cmd.getTemplateConfiguration())); + + JSONObject secondaryGraphic = JsonUtils.readJsonObjectFromJsonObject(parameters, Show.KEY_SECONDARY_GRAPHIC); + Image referenceSecondaryGraphic = new Image(JsonRPCMarshaller.deserializeJSONObject(secondaryGraphic)); + assertTrue(TestValues.TRUE, Validator.validateImage(referenceSecondaryGraphic, cmd.getSecondaryGraphic())); + + JSONArray softButtonArray = JsonUtils.readJsonArrayFromJsonObject(parameters, Show.KEY_SOFT_BUTTONS); + List<SoftButton> softButtonList = new ArrayList<SoftButton>(); + for (int index = 0; index < softButtonArray.length(); index++) { + SoftButton chunk = new SoftButton(JsonRPCMarshaller.deserializeJSONObject((JSONObject) softButtonArray.get(index))); + softButtonList.add(chunk); + } + assertTrue(TestValues.TRUE, Validator.validateSoftButtons(softButtonList, cmd.getSoftButtons())); + + } catch (JSONException e) { + fail(TestValues.JSON_FAIL); + } } }
\ No newline at end of file diff --git a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/SliderTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/SliderTests.java index def35eae2..c4abeb086 100644 --- a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/SliderTests.java +++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/SliderTests.java @@ -25,121 +25,120 @@ import static junit.framework.TestCase.assertTrue; import static junit.framework.TestCase.fail; /** - * This is a unit test class for the SmartDeviceLink library project class : + * This is a unit test class for the SmartDeviceLink library project class : * {@link com.smartdevicelink.proxy.rpc.Slider} */ public class SliderTests extends BaseRpcTests { - @Override - protected RPCMessage createMessage() { - Slider msg = new Slider(); - - msg.setNumTicks(TestValues.GENERAL_INT); - msg.setPosition(TestValues.GENERAL_INT); - msg.setTimeout(TestValues.GENERAL_INT); - msg.setSliderHeader(TestValues.GENERAL_STRING); - msg.setSliderFooter(TestValues.GENERAL_STRING_LIST); - msg.setCancelID(TestValues.GENERAL_INTEGER); - - return msg; - } - - @Override - protected String getMessageType() { - return RPCMessage.KEY_REQUEST; - } - - @Override - protected String getCommandType() { - return FunctionID.SLIDER.toString(); - } - - @Override - protected JSONObject getExpectedParameters(int sdlVersion) { - JSONObject result = new JSONObject(); - - try { - result.put(Slider.KEY_SLIDER_HEADER, TestValues.GENERAL_STRING); - result.put(Slider.KEY_SLIDER_FOOTER, JsonUtils.createJsonArray(TestValues.GENERAL_STRING_LIST)); - result.put(Slider.KEY_POSITION, TestValues.GENERAL_INT); - result.put(Slider.KEY_TIMEOUT, TestValues.GENERAL_INT); - result.put(Slider.KEY_NUM_TICKS, TestValues.GENERAL_INT); - result.put(Slider.KEY_CANCEL_ID, TestValues.GENERAL_INTEGER); - } catch (JSONException e) { - fail(TestValues.JSON_FAIL); - } - - return result; - } - - /** - * Tests the expected values of the RPC message. - */ - @Test - public void testRpcValues () { - // Test Values - Integer testNumTicks = ( (Slider) msg ).getNumTicks(); - Integer testTimeout = ( (Slider) msg ).getTimeout(); - Integer testPosition = ( (Slider) msg ).getPosition(); - String testSlider = ( (Slider) msg ).getSliderHeader(); - List<String> testFooter = ( (Slider) msg ).getSliderFooter(); - Integer testCancelID = ( (Slider) msg ).getCancelID(); - - // Valid Tests - assertEquals(TestValues.MATCH, (Integer) TestValues.GENERAL_INT, testNumTicks); - assertEquals(TestValues.MATCH, (Integer) TestValues.GENERAL_INT, testTimeout); - assertEquals(TestValues.MATCH, (Integer) TestValues.GENERAL_INT, testPosition); - assertEquals(TestValues.MATCH, TestValues.GENERAL_STRING, testSlider); - assertTrue(TestValues.TRUE, Validator.validateStringList(TestValues.GENERAL_STRING_LIST, testFooter)); - assertEquals(TestValues.MATCH, TestValues.GENERAL_INTEGER, testCancelID); - - // Invalid/Null Tests - Slider msg = new Slider(); - assertNotNull(TestValues.NOT_NULL, msg); - testNullBase(msg); - - assertNull(TestValues.NULL, msg.getSliderHeader()); - assertNull(TestValues.NULL, msg.getSliderFooter()); - assertNull(TestValues.NULL, msg.getPosition()); - assertNull(TestValues.NULL, msg.getTimeout()); - assertNull(TestValues.NULL, msg.getNumTicks()); - assertNull(TestValues.NULL, msg.getCancelID()); - } - - /** + @Override + protected RPCMessage createMessage() { + Slider msg = new Slider(); + + msg.setNumTicks(TestValues.GENERAL_INT); + msg.setPosition(TestValues.GENERAL_INT); + msg.setTimeout(TestValues.GENERAL_INT); + msg.setSliderHeader(TestValues.GENERAL_STRING); + msg.setSliderFooter(TestValues.GENERAL_STRING_LIST); + msg.setCancelID(TestValues.GENERAL_INTEGER); + + return msg; + } + + @Override + protected String getMessageType() { + return RPCMessage.KEY_REQUEST; + } + + @Override + protected String getCommandType() { + return FunctionID.SLIDER.toString(); + } + + @Override + protected JSONObject getExpectedParameters(int sdlVersion) { + JSONObject result = new JSONObject(); + + try { + result.put(Slider.KEY_SLIDER_HEADER, TestValues.GENERAL_STRING); + result.put(Slider.KEY_SLIDER_FOOTER, JsonUtils.createJsonArray(TestValues.GENERAL_STRING_LIST)); + result.put(Slider.KEY_POSITION, TestValues.GENERAL_INT); + result.put(Slider.KEY_TIMEOUT, TestValues.GENERAL_INT); + result.put(Slider.KEY_NUM_TICKS, TestValues.GENERAL_INT); + result.put(Slider.KEY_CANCEL_ID, TestValues.GENERAL_INTEGER); + } catch (JSONException e) { + fail(TestValues.JSON_FAIL); + } + + return result; + } + + /** + * Tests the expected values of the RPC message. + */ + @Test + public void testRpcValues() { + // Test Values + Integer testNumTicks = ((Slider) msg).getNumTicks(); + Integer testTimeout = ((Slider) msg).getTimeout(); + Integer testPosition = ((Slider) msg).getPosition(); + String testSlider = ((Slider) msg).getSliderHeader(); + List<String> testFooter = ((Slider) msg).getSliderFooter(); + Integer testCancelID = ((Slider) msg).getCancelID(); + + // Valid Tests + assertEquals(TestValues.MATCH, (Integer) TestValues.GENERAL_INT, testNumTicks); + assertEquals(TestValues.MATCH, (Integer) TestValues.GENERAL_INT, testTimeout); + assertEquals(TestValues.MATCH, (Integer) TestValues.GENERAL_INT, testPosition); + assertEquals(TestValues.MATCH, TestValues.GENERAL_STRING, testSlider); + assertTrue(TestValues.TRUE, Validator.validateStringList(TestValues.GENERAL_STRING_LIST, testFooter)); + assertEquals(TestValues.MATCH, TestValues.GENERAL_INTEGER, testCancelID); + + // Invalid/Null Tests + Slider msg = new Slider(); + assertNotNull(TestValues.NOT_NULL, msg); + testNullBase(msg); + + assertNull(TestValues.NULL, msg.getSliderHeader()); + assertNull(TestValues.NULL, msg.getSliderFooter()); + assertNull(TestValues.NULL, msg.getPosition()); + assertNull(TestValues.NULL, msg.getTimeout()); + assertNull(TestValues.NULL, msg.getNumTicks()); + assertNull(TestValues.NULL, msg.getCancelID()); + } + + /** * Tests a valid JSON construction of this RPC message. */ - @Test - public void testJsonConstructor () { - JSONObject commandJson = JsonFileReader.readId(getInstrumentation().getTargetContext(), getCommandType(), getMessageType()); - assertNotNull(TestValues.NOT_NULL, commandJson); - - try { - Hashtable<String, Object> hash = JsonRPCMarshaller.deserializeJSONObject(commandJson); - Slider cmd = new Slider(hash); - - JSONObject body = JsonUtils.readJsonObjectFromJsonObject(commandJson, getMessageType()); - assertNotNull(TestValues.NOT_NULL, body); - - // Test everything in the json body. - assertEquals(TestValues.MATCH, JsonUtils.readStringFromJsonObject(body, RPCMessage.KEY_FUNCTION_NAME), cmd.getFunctionName()); - assertEquals(TestValues.MATCH, JsonUtils.readIntegerFromJsonObject(body, RPCMessage.KEY_CORRELATION_ID), cmd.getCorrelationID()); - - JSONObject parameters = JsonUtils.readJsonObjectFromJsonObject(body, RPCMessage.KEY_PARAMETERS); - assertEquals(TestValues.MATCH, JsonUtils.readIntegerFromJsonObject(parameters, Slider.KEY_NUM_TICKS), cmd.getNumTicks()); - assertEquals(TestValues.MATCH, JsonUtils.readStringFromJsonObject(parameters, Slider.KEY_SLIDER_HEADER), cmd.getSliderHeader()); - - List<String> sliderFooterList = JsonUtils.readStringListFromJsonObject(parameters, Slider.KEY_SLIDER_FOOTER); - List<String> testFooterList = cmd.getSliderFooter(); - assertEquals(TestValues.MATCH, sliderFooterList.size(), testFooterList.size()); - assertTrue(TestValues.TRUE, Validator.validateStringList(sliderFooterList, testFooterList)); - - assertEquals(TestValues.MATCH, JsonUtils.readIntegerFromJsonObject(parameters, Slider.KEY_POSITION), cmd.getPosition()); - assertEquals(TestValues.MATCH, JsonUtils.readIntegerFromJsonObject(parameters, Slider.KEY_TIMEOUT), cmd.getTimeout()); - assertEquals(TestValues.MATCH, JsonUtils.readIntegerFromJsonObject(parameters, Slider.KEY_CANCEL_ID), cmd.getCancelID()); - } - catch (JSONException e) { - fail(TestValues.JSON_FAIL); - } - } + @Test + public void testJsonConstructor() { + JSONObject commandJson = JsonFileReader.readId(getInstrumentation().getTargetContext(), getCommandType(), getMessageType()); + assertNotNull(TestValues.NOT_NULL, commandJson); + + try { + Hashtable<String, Object> hash = JsonRPCMarshaller.deserializeJSONObject(commandJson); + Slider cmd = new Slider(hash); + + JSONObject body = JsonUtils.readJsonObjectFromJsonObject(commandJson, getMessageType()); + assertNotNull(TestValues.NOT_NULL, body); + + // Test everything in the json body. + assertEquals(TestValues.MATCH, JsonUtils.readStringFromJsonObject(body, RPCMessage.KEY_FUNCTION_NAME), cmd.getFunctionName()); + assertEquals(TestValues.MATCH, JsonUtils.readIntegerFromJsonObject(body, RPCMessage.KEY_CORRELATION_ID), cmd.getCorrelationID()); + + JSONObject parameters = JsonUtils.readJsonObjectFromJsonObject(body, RPCMessage.KEY_PARAMETERS); + assertEquals(TestValues.MATCH, JsonUtils.readIntegerFromJsonObject(parameters, Slider.KEY_NUM_TICKS), cmd.getNumTicks()); + assertEquals(TestValues.MATCH, JsonUtils.readStringFromJsonObject(parameters, Slider.KEY_SLIDER_HEADER), cmd.getSliderHeader()); + + List<String> sliderFooterList = JsonUtils.readStringListFromJsonObject(parameters, Slider.KEY_SLIDER_FOOTER); + List<String> testFooterList = cmd.getSliderFooter(); + assertEquals(TestValues.MATCH, sliderFooterList.size(), testFooterList.size()); + assertTrue(TestValues.TRUE, Validator.validateStringList(sliderFooterList, testFooterList)); + + assertEquals(TestValues.MATCH, JsonUtils.readIntegerFromJsonObject(parameters, Slider.KEY_POSITION), cmd.getPosition()); + assertEquals(TestValues.MATCH, JsonUtils.readIntegerFromJsonObject(parameters, Slider.KEY_TIMEOUT), cmd.getTimeout()); + assertEquals(TestValues.MATCH, JsonUtils.readIntegerFromJsonObject(parameters, Slider.KEY_CANCEL_ID), cmd.getCancelID()); + } catch (JSONException e) { + fail(TestValues.JSON_FAIL); + } + } }
\ No newline at end of file diff --git a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/SpeakTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/SpeakTests.java index b9c89493f..f66e91312 100644 --- a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/SpeakTests.java +++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/SpeakTests.java @@ -28,88 +28,88 @@ import static junit.framework.TestCase.assertTrue; import static junit.framework.TestCase.fail; public class SpeakTests extends BaseRpcTests { - - @Override - protected RPCMessage createMessage() { - Speak msg = new Speak(); - - msg.setTtsChunks(TestValues.GENERAL_TTSCHUNK_LIST); - - return msg; - } - - @Override - protected String getMessageType() { - return RPCMessage.KEY_REQUEST; - } - - @Override - protected String getCommandType() { - return FunctionID.SPEAK.toString(); - } - - @Override - protected JSONObject getExpectedParameters(int sdlVersion) { - JSONObject result = new JSONObject(); - - try { - result.put(Speak.KEY_TTS_CHUNKS, TestValues.JSON_TTSCHUNKS); - } catch (JSONException e) { - fail(TestValues.JSON_FAIL); - } - - return result; - } - - /** - * Tests the expected values of the RPC message. - */ - @Test - public void testRpcValues () { - // Test Values - List<TTSChunk> copy = ( (Speak) msg ).getTtsChunks(); - - // Valid Tests - assertTrue(TestValues.TRUE, Validator.validateTtsChunks(TestValues.GENERAL_TTSCHUNK_LIST, copy)); - - // Invalid/Null Tests - Speak msg = new Speak(); - assertNotNull(TestValues.NOT_NULL, msg); - testNullBase(msg); - - assertNull(TestValues.MATCH, msg.getTtsChunks()); - } + + @Override + protected RPCMessage createMessage() { + Speak msg = new Speak(); + + msg.setTtsChunks(TestValues.GENERAL_TTSCHUNK_LIST); + + return msg; + } + + @Override + protected String getMessageType() { + return RPCMessage.KEY_REQUEST; + } + + @Override + protected String getCommandType() { + return FunctionID.SPEAK.toString(); + } + + @Override + protected JSONObject getExpectedParameters(int sdlVersion) { + JSONObject result = new JSONObject(); + + try { + result.put(Speak.KEY_TTS_CHUNKS, TestValues.JSON_TTSCHUNKS); + } catch (JSONException e) { + fail(TestValues.JSON_FAIL); + } + + return result; + } + + /** + * Tests the expected values of the RPC message. + */ + @Test + public void testRpcValues() { + // Test Values + List<TTSChunk> copy = ((Speak) msg).getTtsChunks(); + + // Valid Tests + assertTrue(TestValues.TRUE, Validator.validateTtsChunks(TestValues.GENERAL_TTSCHUNK_LIST, copy)); + + // Invalid/Null Tests + Speak msg = new Speak(); + assertNotNull(TestValues.NOT_NULL, msg); + testNullBase(msg); + + assertNull(TestValues.MATCH, msg.getTtsChunks()); + } /** * Tests a valid JSON construction of this RPC message. */ @Test - public void testJsonConstructor () { - JSONObject commandJson = JsonFileReader.readId(getInstrumentation().getTargetContext(), getCommandType(), getMessageType()); - assertNotNull(TestValues.NOT_NULL, commandJson); - - try { - Hashtable<String, Object> hash = JsonRPCMarshaller.deserializeJSONObject(commandJson); - Speak cmd = new Speak(hash); - - JSONObject body = JsonUtils.readJsonObjectFromJsonObject(commandJson, getMessageType()); - assertNotNull(TestValues.NOT_NULL, body); - - // Test everything in the json body. - assertEquals(TestValues.MATCH, JsonUtils.readStringFromJsonObject(body, RPCMessage.KEY_FUNCTION_NAME), cmd.getFunctionName()); - assertEquals(TestValues.MATCH, JsonUtils.readIntegerFromJsonObject(body, RPCMessage.KEY_CORRELATION_ID), cmd.getCorrelationID()); - - JSONObject parameters = JsonUtils.readJsonObjectFromJsonObject(body, RPCMessage.KEY_PARAMETERS); - - JSONArray ttsChunkArray = JsonUtils.readJsonArrayFromJsonObject(parameters, Speak.KEY_TTS_CHUNKS); - List<TTSChunk> ttsChunkList = new ArrayList<TTSChunk>(); - for (int index = 0; index < ttsChunkArray.length(); index++) { - TTSChunk chunk = new TTSChunk(JsonRPCMarshaller.deserializeJSONObject( (JSONObject)ttsChunkArray.get(index)) ); - ttsChunkList.add(chunk); - } - assertTrue(TestValues.TRUE, Validator.validateTtsChunks(ttsChunkList, cmd.getTtsChunks())); - } catch (JSONException e) { - e.printStackTrace(); - } + public void testJsonConstructor() { + JSONObject commandJson = JsonFileReader.readId(getInstrumentation().getTargetContext(), getCommandType(), getMessageType()); + assertNotNull(TestValues.NOT_NULL, commandJson); + + try { + Hashtable<String, Object> hash = JsonRPCMarshaller.deserializeJSONObject(commandJson); + Speak cmd = new Speak(hash); + + JSONObject body = JsonUtils.readJsonObjectFromJsonObject(commandJson, getMessageType()); + assertNotNull(TestValues.NOT_NULL, body); + + // Test everything in the json body. + assertEquals(TestValues.MATCH, JsonUtils.readStringFromJsonObject(body, RPCMessage.KEY_FUNCTION_NAME), cmd.getFunctionName()); + assertEquals(TestValues.MATCH, JsonUtils.readIntegerFromJsonObject(body, RPCMessage.KEY_CORRELATION_ID), cmd.getCorrelationID()); + + JSONObject parameters = JsonUtils.readJsonObjectFromJsonObject(body, RPCMessage.KEY_PARAMETERS); + + JSONArray ttsChunkArray = JsonUtils.readJsonArrayFromJsonObject(parameters, Speak.KEY_TTS_CHUNKS); + List<TTSChunk> ttsChunkList = new ArrayList<TTSChunk>(); + for (int index = 0; index < ttsChunkArray.length(); index++) { + TTSChunk chunk = new TTSChunk(JsonRPCMarshaller.deserializeJSONObject((JSONObject) ttsChunkArray.get(index))); + ttsChunkList.add(chunk); + } + assertTrue(TestValues.TRUE, Validator.validateTtsChunks(ttsChunkList, cmd.getTtsChunks())); + } catch (JSONException e) { + e.printStackTrace(); + } } }
\ No newline at end of file diff --git a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/SubscribeButtonTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/SubscribeButtonTests.java index cb838dc5f..ebd1fbc8c 100644 --- a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/SubscribeButtonTests.java +++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/SubscribeButtonTests.java @@ -23,85 +23,85 @@ import static junit.framework.TestCase.assertNull; import static junit.framework.TestCase.fail; /** - * This is a unit test class for the SmartDeviceLink library project class : + * This is a unit test class for the SmartDeviceLink library project class : * {@link com.smartdevicelink.proxy.rpc.SubscribeButton} */ public class SubscribeButtonTests extends BaseRpcTests { - - @Override - protected RPCMessage createMessage() { - SubscribeButton msg = new SubscribeButton(); - - msg.setButtonName(TestValues.GENERAL_BUTTONNAME); - - return msg; - } - - @Override - protected String getMessageType() { - return RPCMessage.KEY_REQUEST; - } - - @Override - protected String getCommandType() { - return FunctionID.SUBSCRIBE_BUTTON.toString(); - } - - @Override - protected JSONObject getExpectedParameters(int sdlVersion) { - JSONObject result = new JSONObject(); - - try { - result.put(SubscribeButton.KEY_BUTTON_NAME, TestValues.GENERAL_BUTTONNAME); - } catch (JSONException e) { - fail(TestValues.JSON_FAIL); - } - - return result; - } - - /** - * Tests the expected values of the RPC message. - */ - @Test - public void testRpcValues () { - // Test Values - ButtonName testButtonName = ( (SubscribeButton) msg ).getButtonName(); - - // Valid Tests - assertEquals("Data didn't match input data.", TestValues.GENERAL_BUTTONNAME, testButtonName); - - // Invalid/Null Tests - SubscribeButton msg = new SubscribeButton(); - assertNotNull(TestValues.NOT_NULL, msg); - testNullBase(msg); - - assertNull(TestValues.NULL, msg.getButtonName()); - } - - /** + + @Override + protected RPCMessage createMessage() { + SubscribeButton msg = new SubscribeButton(); + + msg.setButtonName(TestValues.GENERAL_BUTTONNAME); + + return msg; + } + + @Override + protected String getMessageType() { + return RPCMessage.KEY_REQUEST; + } + + @Override + protected String getCommandType() { + return FunctionID.SUBSCRIBE_BUTTON.toString(); + } + + @Override + protected JSONObject getExpectedParameters(int sdlVersion) { + JSONObject result = new JSONObject(); + + try { + result.put(SubscribeButton.KEY_BUTTON_NAME, TestValues.GENERAL_BUTTONNAME); + } catch (JSONException e) { + fail(TestValues.JSON_FAIL); + } + + return result; + } + + /** + * Tests the expected values of the RPC message. + */ + @Test + public void testRpcValues() { + // Test Values + ButtonName testButtonName = ((SubscribeButton) msg).getButtonName(); + + // Valid Tests + assertEquals("Data didn't match input data.", TestValues.GENERAL_BUTTONNAME, testButtonName); + + // Invalid/Null Tests + SubscribeButton msg = new SubscribeButton(); + assertNotNull(TestValues.NOT_NULL, msg); + testNullBase(msg); + + assertNull(TestValues.NULL, msg.getButtonName()); + } + + /** * Tests a valid JSON construction of this RPC message. */ - @Test - public void testJsonConstructor () { - JSONObject commandJson = JsonFileReader.readId(getInstrumentation().getTargetContext(), getCommandType(), getMessageType()); - assertNotNull(TestValues.NOT_NULL, commandJson); - - try { - Hashtable<String, Object> hash = JsonRPCMarshaller.deserializeJSONObject(commandJson); - SubscribeButton cmd = new SubscribeButton(hash); - - JSONObject body = JsonUtils.readJsonObjectFromJsonObject(commandJson, getMessageType()); - assertNotNull(TestValues.NOT_NULL, body); - - // Test everything in the json body. - assertEquals(TestValues.MATCH, JsonUtils.readStringFromJsonObject(body, RPCMessage.KEY_FUNCTION_NAME), cmd.getFunctionName()); - assertEquals(TestValues.MATCH, JsonUtils.readIntegerFromJsonObject(body, RPCMessage.KEY_CORRELATION_ID), cmd.getCorrelationID()); - - JSONObject parameters = JsonUtils.readJsonObjectFromJsonObject(body, RPCMessage.KEY_PARAMETERS); - assertEquals(TestValues.MATCH, JsonUtils.readStringFromJsonObject(parameters, SubscribeButton.KEY_BUTTON_NAME), cmd.getButtonName().toString()); - } catch (JSONException e) { - fail(TestValues.JSON_FAIL); - } + @Test + public void testJsonConstructor() { + JSONObject commandJson = JsonFileReader.readId(getInstrumentation().getTargetContext(), getCommandType(), getMessageType()); + assertNotNull(TestValues.NOT_NULL, commandJson); + + try { + Hashtable<String, Object> hash = JsonRPCMarshaller.deserializeJSONObject(commandJson); + SubscribeButton cmd = new SubscribeButton(hash); + + JSONObject body = JsonUtils.readJsonObjectFromJsonObject(commandJson, getMessageType()); + assertNotNull(TestValues.NOT_NULL, body); + + // Test everything in the json body. + assertEquals(TestValues.MATCH, JsonUtils.readStringFromJsonObject(body, RPCMessage.KEY_FUNCTION_NAME), cmd.getFunctionName()); + assertEquals(TestValues.MATCH, JsonUtils.readIntegerFromJsonObject(body, RPCMessage.KEY_CORRELATION_ID), cmd.getCorrelationID()); + + JSONObject parameters = JsonUtils.readJsonObjectFromJsonObject(body, RPCMessage.KEY_PARAMETERS); + assertEquals(TestValues.MATCH, JsonUtils.readStringFromJsonObject(parameters, SubscribeButton.KEY_BUTTON_NAME), cmd.getButtonName().toString()); + } catch (JSONException e) { + fail(TestValues.JSON_FAIL); + } } }
\ No newline at end of file diff --git a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/SubscribeVehicleDataTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/SubscribeVehicleDataTests.java index 341eb73d4..528eeb128 100644 --- a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/SubscribeVehicleDataTests.java +++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/SubscribeVehicleDataTests.java @@ -23,67 +23,67 @@ import static junit.framework.TestCase.assertTrue; import static junit.framework.TestCase.fail; /** - * This is a unit test class for the SmartDeviceLink library project class : + * This is a unit test class for the SmartDeviceLink library project class : * {@link com.smartdevicelink.proxy.rpc.SubscribeVehicleData} */ public class SubscribeVehicleDataTests extends BaseRpcTests { - - @Override - protected RPCMessage createMessage() { - SubscribeVehicleData msg = new SubscribeVehicleData(); - msg.setSpeed(TestValues.GENERAL_BOOLEAN); - msg.setRpm(TestValues.GENERAL_BOOLEAN); - msg.setExternalTemperature(TestValues.GENERAL_BOOLEAN); - msg.setFuelLevel(TestValues.GENERAL_BOOLEAN); - msg.setPrndl(TestValues.GENERAL_BOOLEAN); - msg.setTirePressure(TestValues.GENERAL_BOOLEAN); - msg.setEngineTorque(TestValues.GENERAL_BOOLEAN); - msg.setEngineOilLife(TestValues.GENERAL_BOOLEAN); - msg.setOdometer(TestValues.GENERAL_BOOLEAN); - msg.setGps(TestValues.GENERAL_BOOLEAN); - msg.setFuelLevelState(TestValues.GENERAL_BOOLEAN); - msg.setInstantFuelConsumption(TestValues.GENERAL_BOOLEAN); - msg.setBeltStatus(TestValues.GENERAL_BOOLEAN); - msg.setBodyInformation(TestValues.GENERAL_BOOLEAN); - msg.setDeviceStatus(TestValues.GENERAL_BOOLEAN); - msg.setDriverBraking(TestValues.GENERAL_BOOLEAN); - msg.setWiperStatus(TestValues.GENERAL_BOOLEAN); - msg.setHeadLampStatus(TestValues.GENERAL_BOOLEAN); - msg.setAccPedalPosition(TestValues.GENERAL_BOOLEAN); - msg.setSteeringWheelAngle(TestValues.GENERAL_BOOLEAN); - msg.setECallInfo(TestValues.GENERAL_BOOLEAN); - msg.setAirbagStatus(TestValues.GENERAL_BOOLEAN); - msg.setEmergencyEvent(TestValues.GENERAL_BOOLEAN); - msg.setClusterModeStatus(TestValues.GENERAL_BOOLEAN); - msg.setMyKey(TestValues.GENERAL_BOOLEAN); - msg.setFuelRange(TestValues.GENERAL_BOOLEAN); - msg.setTurnSignal(TestValues.GENERAL_BOOLEAN); - msg.setElectronicParkBrakeStatus(TestValues.GENERAL_BOOLEAN); - msg.setHandsOffSteering(TestValues.GENERAL_BOOLEAN); - msg.setWindowStatus(TestValues.GENERAL_BOOLEAN); - msg.setGearStatus(TestValues.GENERAL_BOOLEAN); - msg.setStabilityControlsStatus(TestValues.GENERAL_BOOLEAN); - msg.setOEMCustomVehicleData(TestValues.GENERAL_OEM_CUSTOM_VEHICLE_DATA_NAME, TestValues.GENERAL_BOOLEAN); - - return msg; - } + @Override + protected RPCMessage createMessage() { + SubscribeVehicleData msg = new SubscribeVehicleData(); - @Override - protected String getMessageType() { - return RPCMessage.KEY_REQUEST; - } + msg.setSpeed(TestValues.GENERAL_BOOLEAN); + msg.setRpm(TestValues.GENERAL_BOOLEAN); + msg.setExternalTemperature(TestValues.GENERAL_BOOLEAN); + msg.setFuelLevel(TestValues.GENERAL_BOOLEAN); + msg.setPrndl(TestValues.GENERAL_BOOLEAN); + msg.setTirePressure(TestValues.GENERAL_BOOLEAN); + msg.setEngineTorque(TestValues.GENERAL_BOOLEAN); + msg.setEngineOilLife(TestValues.GENERAL_BOOLEAN); + msg.setOdometer(TestValues.GENERAL_BOOLEAN); + msg.setGps(TestValues.GENERAL_BOOLEAN); + msg.setFuelLevelState(TestValues.GENERAL_BOOLEAN); + msg.setInstantFuelConsumption(TestValues.GENERAL_BOOLEAN); + msg.setBeltStatus(TestValues.GENERAL_BOOLEAN); + msg.setBodyInformation(TestValues.GENERAL_BOOLEAN); + msg.setDeviceStatus(TestValues.GENERAL_BOOLEAN); + msg.setDriverBraking(TestValues.GENERAL_BOOLEAN); + msg.setWiperStatus(TestValues.GENERAL_BOOLEAN); + msg.setHeadLampStatus(TestValues.GENERAL_BOOLEAN); + msg.setAccPedalPosition(TestValues.GENERAL_BOOLEAN); + msg.setSteeringWheelAngle(TestValues.GENERAL_BOOLEAN); + msg.setECallInfo(TestValues.GENERAL_BOOLEAN); + msg.setAirbagStatus(TestValues.GENERAL_BOOLEAN); + msg.setEmergencyEvent(TestValues.GENERAL_BOOLEAN); + msg.setClusterModeStatus(TestValues.GENERAL_BOOLEAN); + msg.setMyKey(TestValues.GENERAL_BOOLEAN); + msg.setFuelRange(TestValues.GENERAL_BOOLEAN); + msg.setTurnSignal(TestValues.GENERAL_BOOLEAN); + msg.setElectronicParkBrakeStatus(TestValues.GENERAL_BOOLEAN); + msg.setHandsOffSteering(TestValues.GENERAL_BOOLEAN); + msg.setWindowStatus(TestValues.GENERAL_BOOLEAN); + msg.setGearStatus(TestValues.GENERAL_BOOLEAN); + msg.setStabilityControlsStatus(TestValues.GENERAL_BOOLEAN); + msg.setOEMCustomVehicleData(TestValues.GENERAL_OEM_CUSTOM_VEHICLE_DATA_NAME, TestValues.GENERAL_BOOLEAN); - @Override - protected String getCommandType() { - return FunctionID.SUBSCRIBE_VEHICLE_DATA.toString(); - } + return msg; + } + + @Override + protected String getMessageType() { + return RPCMessage.KEY_REQUEST; + } + + @Override + protected String getCommandType() { + return FunctionID.SUBSCRIBE_VEHICLE_DATA.toString(); + } - @Override - protected JSONObject getExpectedParameters(int sdlVersion) { - JSONObject result = new JSONObject(); + @Override + protected JSONObject getExpectedParameters(int sdlVersion) { + JSONObject result = new JSONObject(); - try { + try { result.put(SubscribeVehicleData.KEY_SPEED, TestValues.GENERAL_BOOLEAN); result.put(SubscribeVehicleData.KEY_RPM, TestValues.GENERAL_BOOLEAN); result.put(SubscribeVehicleData.KEY_EXTERNAL_TEMPERATURE, TestValues.GENERAL_BOOLEAN); @@ -117,58 +117,58 @@ public class SubscribeVehicleDataTests extends BaseRpcTests { result.put(SubscribeVehicleData.KEY_GEAR_STATUS, TestValues.GENERAL_BOOLEAN); result.put(SubscribeVehicleData.KEY_STABILITY_CONTROLS_STATUS, TestValues.GENERAL_BOOLEAN); result.put(TestValues.GENERAL_OEM_CUSTOM_VEHICLE_DATA_NAME, TestValues.GENERAL_BOOLEAN); - } catch (JSONException e) { - fail(TestValues.JSON_FAIL); - } + } catch (JSONException e) { + fail(TestValues.JSON_FAIL); + } + + return result; + } + + /** + * Tests the expected values of the RPC message. + */ + @Test + public void testRpcValues() { - return result; - } + // Valid Tests + assertTrue(TestValues.MATCH, ((SubscribeVehicleData) msg).getSpeed()); + assertTrue(TestValues.MATCH, ((SubscribeVehicleData) msg).getRpm()); + assertTrue(TestValues.MATCH, ((SubscribeVehicleData) msg).getExternalTemperature()); + assertTrue(TestValues.MATCH, ((SubscribeVehicleData) msg).getFuelLevel()); + assertTrue(TestValues.MATCH, ((SubscribeVehicleData) msg).getPrndl()); + assertTrue(TestValues.MATCH, ((SubscribeVehicleData) msg).getTirePressure()); + assertTrue(TestValues.MATCH, ((SubscribeVehicleData) msg).getEngineTorque()); + assertTrue(TestValues.MATCH, ((SubscribeVehicleData) msg).getEngineOilLife()); + assertTrue(TestValues.MATCH, ((SubscribeVehicleData) msg).getOdometer()); + assertTrue(TestValues.MATCH, ((SubscribeVehicleData) msg).getGps()); + assertTrue(TestValues.MATCH, ((SubscribeVehicleData) msg).getFuelLevelState()); + assertTrue(TestValues.MATCH, ((SubscribeVehicleData) msg).getInstantFuelConsumption()); + assertTrue(TestValues.MATCH, ((SubscribeVehicleData) msg).getBeltStatus()); + assertTrue(TestValues.MATCH, ((SubscribeVehicleData) msg).getBodyInformation()); + assertTrue(TestValues.MATCH, ((SubscribeVehicleData) msg).getDeviceStatus()); + assertTrue(TestValues.MATCH, ((SubscribeVehicleData) msg).getDriverBraking()); + assertTrue(TestValues.MATCH, ((SubscribeVehicleData) msg).getWiperStatus()); + assertTrue(TestValues.MATCH, ((SubscribeVehicleData) msg).getHeadLampStatus()); + assertTrue(TestValues.MATCH, ((SubscribeVehicleData) msg).getAccPedalPosition()); + assertTrue(TestValues.MATCH, ((SubscribeVehicleData) msg).getSteeringWheelAngle()); + assertTrue(TestValues.MATCH, ((SubscribeVehicleData) msg).getECallInfo()); + assertTrue(TestValues.MATCH, ((SubscribeVehicleData) msg).getAirbagStatus()); + assertTrue(TestValues.MATCH, ((SubscribeVehicleData) msg).getEmergencyEvent()); + assertTrue(TestValues.MATCH, ((SubscribeVehicleData) msg).getClusterModeStatus()); + assertTrue(TestValues.MATCH, ((SubscribeVehicleData) msg).getMyKey()); + assertTrue(TestValues.MATCH, ((SubscribeVehicleData) msg).getFuelRange()); + assertTrue(TestValues.MATCH, ((SubscribeVehicleData) msg).getTurnSignal()); + assertTrue(TestValues.MATCH, ((SubscribeVehicleData) msg).getElectronicParkBrakeStatus()); + assertTrue(TestValues.MATCH, ((SubscribeVehicleData) msg).getHandsOffSteering()); + assertTrue(TestValues.MATCH, ((SubscribeVehicleData) msg).getWindowStatus()); + assertTrue(TestValues.MATCH, ((SubscribeVehicleData) msg).getGearStatus()); + assertTrue(TestValues.MATCH, ((SubscribeVehicleData) msg).getStabilityControlsStatus()); + assertTrue(TestValues.MATCH, ((SubscribeVehicleData) msg).getOEMCustomVehicleData(TestValues.GENERAL_OEM_CUSTOM_VEHICLE_DATA_NAME)); - /** - * Tests the expected values of the RPC message. - */ - @Test - public void testRpcValues () { - - // Valid Tests - assertTrue(TestValues.MATCH,( (SubscribeVehicleData) msg ).getSpeed()); - assertTrue(TestValues.MATCH,( (SubscribeVehicleData) msg ).getRpm()); - assertTrue(TestValues.MATCH,( (SubscribeVehicleData) msg ).getExternalTemperature()); - assertTrue(TestValues.MATCH,( (SubscribeVehicleData) msg ).getFuelLevel()); - assertTrue(TestValues.MATCH,( (SubscribeVehicleData) msg ).getPrndl()); - assertTrue(TestValues.MATCH,( (SubscribeVehicleData) msg ).getTirePressure()); - assertTrue(TestValues.MATCH,( (SubscribeVehicleData) msg ).getEngineTorque()); - assertTrue(TestValues.MATCH,( (SubscribeVehicleData) msg ).getEngineOilLife()); - assertTrue(TestValues.MATCH,( (SubscribeVehicleData) msg ).getOdometer()); - assertTrue(TestValues.MATCH,( (SubscribeVehicleData) msg ).getGps()); - assertTrue(TestValues.MATCH,( (SubscribeVehicleData) msg ).getFuelLevelState()); - assertTrue(TestValues.MATCH,( (SubscribeVehicleData) msg ).getInstantFuelConsumption()); - assertTrue(TestValues.MATCH,( (SubscribeVehicleData) msg ).getBeltStatus()); - assertTrue(TestValues.MATCH,( (SubscribeVehicleData) msg ).getBodyInformation()); - assertTrue(TestValues.MATCH,( (SubscribeVehicleData) msg ).getDeviceStatus()); - assertTrue(TestValues.MATCH,( (SubscribeVehicleData) msg ).getDriverBraking()); - assertTrue(TestValues.MATCH,( (SubscribeVehicleData) msg ).getWiperStatus()); - assertTrue(TestValues.MATCH,( (SubscribeVehicleData) msg ).getHeadLampStatus()); - assertTrue(TestValues.MATCH,( (SubscribeVehicleData) msg ).getAccPedalPosition()); - assertTrue(TestValues.MATCH,( (SubscribeVehicleData) msg ).getSteeringWheelAngle()); - assertTrue(TestValues.MATCH,( (SubscribeVehicleData) msg ).getECallInfo()); - assertTrue(TestValues.MATCH,( (SubscribeVehicleData) msg ).getAirbagStatus()); - assertTrue(TestValues.MATCH,( (SubscribeVehicleData) msg ).getEmergencyEvent()); - assertTrue(TestValues.MATCH,( (SubscribeVehicleData) msg ).getClusterModeStatus()); - assertTrue(TestValues.MATCH,( (SubscribeVehicleData) msg ).getMyKey()); - assertTrue(TestValues.MATCH,( (SubscribeVehicleData) msg ).getFuelRange()); - assertTrue(TestValues.MATCH,( (SubscribeVehicleData) msg ).getTurnSignal()); - assertTrue(TestValues.MATCH,( (SubscribeVehicleData) msg ).getElectronicParkBrakeStatus()); - assertTrue(TestValues.MATCH,( (SubscribeVehicleData) msg ).getHandsOffSteering()); - assertTrue(TestValues.MATCH,( (SubscribeVehicleData) msg ).getWindowStatus()); - assertTrue(TestValues.MATCH,( (SubscribeVehicleData) msg ).getGearStatus()); - assertTrue(TestValues.MATCH,( (SubscribeVehicleData) msg ).getStabilityControlsStatus()); - assertTrue(TestValues.MATCH,( (SubscribeVehicleData) msg ).getOEMCustomVehicleData(TestValues.GENERAL_OEM_CUSTOM_VEHICLE_DATA_NAME)); - - // Invalid/Null Tests - SubscribeVehicleData msg = new SubscribeVehicleData(); - assertNotNull(TestValues.NOT_NULL, msg); - testNullBase(msg); + // Invalid/Null Tests + SubscribeVehicleData msg = new SubscribeVehicleData(); + assertNotNull(TestValues.NOT_NULL, msg); + testNullBase(msg); assertNull(TestValues.NULL, msg.getAccPedalPosition()); assertNull(TestValues.NULL, msg.getAirbagStatus()); @@ -203,62 +203,62 @@ public class SubscribeVehicleDataTests extends BaseRpcTests { assertNull(TestValues.NULL, msg.getGearStatus()); assertNull(TestValues.NULL, msg.getStabilityControlsStatus()); assertNull(TestValues.NULL, msg.getOEMCustomVehicleData(TestValues.GENERAL_OEM_CUSTOM_VEHICLE_DATA_NAME)); - } - + } + /** * Tests a valid JSON construction of this RPC message. */ @Test - public void testJsonConstructor () { - JSONObject commandJson = JsonFileReader.readId(getInstrumentation().getTargetContext(), getCommandType(), getMessageType()); - assertNotNull(TestValues.NOT_NULL, commandJson); - - try { - Hashtable<String, Object> hash = JsonRPCMarshaller.deserializeJSONObject(commandJson); - SubscribeVehicleData cmd = new SubscribeVehicleData(hash); - - JSONObject body = JsonUtils.readJsonObjectFromJsonObject(commandJson, getMessageType()); - assertNotNull(TestValues.NOT_NULL, body); - - // Test everything in the json body. - assertEquals(TestValues.MATCH, JsonUtils.readStringFromJsonObject(body, RPCMessage.KEY_FUNCTION_NAME), cmd.getFunctionName()); - assertEquals(TestValues.MATCH, JsonUtils.readIntegerFromJsonObject(body, RPCMessage.KEY_CORRELATION_ID), cmd.getCorrelationID()); + public void testJsonConstructor() { + JSONObject commandJson = JsonFileReader.readId(getInstrumentation().getTargetContext(), getCommandType(), getMessageType()); + assertNotNull(TestValues.NOT_NULL, commandJson); + + try { + Hashtable<String, Object> hash = JsonRPCMarshaller.deserializeJSONObject(commandJson); + SubscribeVehicleData cmd = new SubscribeVehicleData(hash); + + JSONObject body = JsonUtils.readJsonObjectFromJsonObject(commandJson, getMessageType()); + assertNotNull(TestValues.NOT_NULL, body); + + // Test everything in the json body. + assertEquals(TestValues.MATCH, JsonUtils.readStringFromJsonObject(body, RPCMessage.KEY_FUNCTION_NAME), cmd.getFunctionName()); + assertEquals(TestValues.MATCH, JsonUtils.readIntegerFromJsonObject(body, RPCMessage.KEY_CORRELATION_ID), cmd.getCorrelationID()); - JSONObject parameters = JsonUtils.readJsonObjectFromJsonObject(body, RPCMessage.KEY_PARAMETERS); - assertEquals(TestValues.MATCH, JsonUtils.readBooleanFromJsonObject(parameters, SubscribeVehicleData.KEY_SPEED), cmd.getSpeed()); - assertEquals(TestValues.MATCH, JsonUtils.readBooleanFromJsonObject(parameters, SubscribeVehicleData.KEY_RPM), cmd.getRpm()); - assertEquals(TestValues.MATCH, JsonUtils.readBooleanFromJsonObject(parameters, SubscribeVehicleData.KEY_EXTERNAL_TEMPERATURE), cmd.getExternalTemperature()); - assertEquals(TestValues.MATCH, JsonUtils.readBooleanFromJsonObject(parameters, SubscribeVehicleData.KEY_FUEL_LEVEL), cmd.getFuelLevel()); - assertEquals(TestValues.MATCH, JsonUtils.readBooleanFromJsonObject(parameters, SubscribeVehicleData.KEY_PRNDL), cmd.getPrndl()); - assertEquals(TestValues.MATCH, JsonUtils.readBooleanFromJsonObject(parameters, SubscribeVehicleData.KEY_TIRE_PRESSURE), cmd.getTirePressure()); - assertEquals(TestValues.MATCH, JsonUtils.readBooleanFromJsonObject(parameters, SubscribeVehicleData.KEY_ENGINE_TORQUE), cmd.getEngineTorque()); - assertEquals(TestValues.MATCH, JsonUtils.readBooleanFromJsonObject(parameters, SubscribeVehicleData.KEY_ENGINE_OIL_LIFE), cmd.getEngineOilLife()); - assertEquals(TestValues.MATCH, JsonUtils.readBooleanFromJsonObject(parameters, SubscribeVehicleData.KEY_ODOMETER), cmd.getOdometer()); - assertEquals(TestValues.MATCH, JsonUtils.readBooleanFromJsonObject(parameters, SubscribeVehicleData.KEY_GPS), cmd.getGps()); - assertEquals(TestValues.MATCH, JsonUtils.readBooleanFromJsonObject(parameters, SubscribeVehicleData.KEY_FUEL_LEVEL_STATE), cmd.getFuelLevelState()); - assertEquals(TestValues.MATCH, JsonUtils.readBooleanFromJsonObject(parameters, SubscribeVehicleData.KEY_INSTANT_FUEL_CONSUMPTION), cmd.getInstantFuelConsumption()); - assertEquals(TestValues.MATCH, JsonUtils.readBooleanFromJsonObject(parameters, SubscribeVehicleData.KEY_BELT_STATUS), cmd.getBeltStatus()); - assertEquals(TestValues.MATCH, JsonUtils.readBooleanFromJsonObject(parameters, SubscribeVehicleData.KEY_BODY_INFORMATION), cmd.getBodyInformation()); - assertEquals(TestValues.MATCH, JsonUtils.readBooleanFromJsonObject(parameters, SubscribeVehicleData.KEY_DEVICE_STATUS), cmd.getDeviceStatus()); - assertEquals(TestValues.MATCH, JsonUtils.readBooleanFromJsonObject(parameters, SubscribeVehicleData.KEY_DRIVER_BRAKING), cmd.getDriverBraking()); - assertEquals(TestValues.MATCH, JsonUtils.readBooleanFromJsonObject(parameters, SubscribeVehicleData.KEY_WIPER_STATUS), cmd.getWiperStatus()); - assertEquals(TestValues.MATCH, JsonUtils.readBooleanFromJsonObject(parameters, SubscribeVehicleData.KEY_HEAD_LAMP_STATUS), cmd.getHeadLampStatus()); - assertEquals(TestValues.MATCH, JsonUtils.readBooleanFromJsonObject(parameters, SubscribeVehicleData.KEY_ACC_PEDAL_POSITION), cmd.getAccPedalPosition()); - assertEquals(TestValues.MATCH, JsonUtils.readBooleanFromJsonObject(parameters, SubscribeVehicleData.KEY_STEERING_WHEEL_ANGLE), cmd.getSteeringWheelAngle()); - assertEquals(TestValues.MATCH, JsonUtils.readBooleanFromJsonObject(parameters, SubscribeVehicleData.KEY_E_CALL_INFO), cmd.getECallInfo()); - assertEquals(TestValues.MATCH, JsonUtils.readBooleanFromJsonObject(parameters, SubscribeVehicleData.KEY_AIRBAG_STATUS), cmd.getAirbagStatus()); - assertEquals(TestValues.MATCH, JsonUtils.readBooleanFromJsonObject(parameters, SubscribeVehicleData.KEY_EMERGENCY_EVENT), cmd.getEmergencyEvent()); - assertEquals(TestValues.MATCH, JsonUtils.readBooleanFromJsonObject(parameters, SubscribeVehicleData.KEY_CLUSTER_MODE_STATUS), cmd.getClusterModeStatus()); - assertEquals(TestValues.MATCH, JsonUtils.readBooleanFromJsonObject(parameters, SubscribeVehicleData.KEY_MY_KEY), cmd.getMyKey()); - assertEquals(TestValues.MATCH, JsonUtils.readBooleanFromJsonObject(parameters, SubscribeVehicleData.KEY_FUEL_RANGE), cmd.getFuelRange()); - assertEquals(TestValues.MATCH, JsonUtils.readBooleanFromJsonObject(parameters, SubscribeVehicleData.KEY_TURN_SIGNAL), cmd.getTurnSignal()); - assertEquals(TestValues.MATCH, JsonUtils.readBooleanFromJsonObject(parameters, SubscribeVehicleData.KEY_ELECTRONIC_PARK_BRAKE_STATUS), cmd.getElectronicParkBrakeStatus()); - assertEquals(TestValues.MATCH, JsonUtils.readBooleanFromJsonObject(parameters, SubscribeVehicleData.KEY_HANDS_OFF_STEERING), cmd.getHandsOffSteering()); - assertEquals(TestValues.MATCH, JsonUtils.readBooleanFromJsonObject(parameters, SubscribeVehicleData.KEY_WINDOW_STATUS), cmd.getWindowStatus()); - assertEquals(TestValues.MATCH, JsonUtils.readBooleanFromJsonObject(parameters, SubscribeVehicleData.KEY_STABILITY_CONTROLS_STATUS), cmd.getStabilityControlsStatus()); - assertEquals(TestValues.MATCH, JsonUtils.readBooleanFromJsonObject(parameters, TestValues.GENERAL_OEM_CUSTOM_VEHICLE_DATA_NAME), cmd.getOEMCustomVehicleData(TestValues.GENERAL_OEM_CUSTOM_VEHICLE_DATA_NAME)); - } catch (JSONException e) { - fail(TestValues.JSON_FAIL); - } + JSONObject parameters = JsonUtils.readJsonObjectFromJsonObject(body, RPCMessage.KEY_PARAMETERS); + assertEquals(TestValues.MATCH, JsonUtils.readBooleanFromJsonObject(parameters, SubscribeVehicleData.KEY_SPEED), cmd.getSpeed()); + assertEquals(TestValues.MATCH, JsonUtils.readBooleanFromJsonObject(parameters, SubscribeVehicleData.KEY_RPM), cmd.getRpm()); + assertEquals(TestValues.MATCH, JsonUtils.readBooleanFromJsonObject(parameters, SubscribeVehicleData.KEY_EXTERNAL_TEMPERATURE), cmd.getExternalTemperature()); + assertEquals(TestValues.MATCH, JsonUtils.readBooleanFromJsonObject(parameters, SubscribeVehicleData.KEY_FUEL_LEVEL), cmd.getFuelLevel()); + assertEquals(TestValues.MATCH, JsonUtils.readBooleanFromJsonObject(parameters, SubscribeVehicleData.KEY_PRNDL), cmd.getPrndl()); + assertEquals(TestValues.MATCH, JsonUtils.readBooleanFromJsonObject(parameters, SubscribeVehicleData.KEY_TIRE_PRESSURE), cmd.getTirePressure()); + assertEquals(TestValues.MATCH, JsonUtils.readBooleanFromJsonObject(parameters, SubscribeVehicleData.KEY_ENGINE_TORQUE), cmd.getEngineTorque()); + assertEquals(TestValues.MATCH, JsonUtils.readBooleanFromJsonObject(parameters, SubscribeVehicleData.KEY_ENGINE_OIL_LIFE), cmd.getEngineOilLife()); + assertEquals(TestValues.MATCH, JsonUtils.readBooleanFromJsonObject(parameters, SubscribeVehicleData.KEY_ODOMETER), cmd.getOdometer()); + assertEquals(TestValues.MATCH, JsonUtils.readBooleanFromJsonObject(parameters, SubscribeVehicleData.KEY_GPS), cmd.getGps()); + assertEquals(TestValues.MATCH, JsonUtils.readBooleanFromJsonObject(parameters, SubscribeVehicleData.KEY_FUEL_LEVEL_STATE), cmd.getFuelLevelState()); + assertEquals(TestValues.MATCH, JsonUtils.readBooleanFromJsonObject(parameters, SubscribeVehicleData.KEY_INSTANT_FUEL_CONSUMPTION), cmd.getInstantFuelConsumption()); + assertEquals(TestValues.MATCH, JsonUtils.readBooleanFromJsonObject(parameters, SubscribeVehicleData.KEY_BELT_STATUS), cmd.getBeltStatus()); + assertEquals(TestValues.MATCH, JsonUtils.readBooleanFromJsonObject(parameters, SubscribeVehicleData.KEY_BODY_INFORMATION), cmd.getBodyInformation()); + assertEquals(TestValues.MATCH, JsonUtils.readBooleanFromJsonObject(parameters, SubscribeVehicleData.KEY_DEVICE_STATUS), cmd.getDeviceStatus()); + assertEquals(TestValues.MATCH, JsonUtils.readBooleanFromJsonObject(parameters, SubscribeVehicleData.KEY_DRIVER_BRAKING), cmd.getDriverBraking()); + assertEquals(TestValues.MATCH, JsonUtils.readBooleanFromJsonObject(parameters, SubscribeVehicleData.KEY_WIPER_STATUS), cmd.getWiperStatus()); + assertEquals(TestValues.MATCH, JsonUtils.readBooleanFromJsonObject(parameters, SubscribeVehicleData.KEY_HEAD_LAMP_STATUS), cmd.getHeadLampStatus()); + assertEquals(TestValues.MATCH, JsonUtils.readBooleanFromJsonObject(parameters, SubscribeVehicleData.KEY_ACC_PEDAL_POSITION), cmd.getAccPedalPosition()); + assertEquals(TestValues.MATCH, JsonUtils.readBooleanFromJsonObject(parameters, SubscribeVehicleData.KEY_STEERING_WHEEL_ANGLE), cmd.getSteeringWheelAngle()); + assertEquals(TestValues.MATCH, JsonUtils.readBooleanFromJsonObject(parameters, SubscribeVehicleData.KEY_E_CALL_INFO), cmd.getECallInfo()); + assertEquals(TestValues.MATCH, JsonUtils.readBooleanFromJsonObject(parameters, SubscribeVehicleData.KEY_AIRBAG_STATUS), cmd.getAirbagStatus()); + assertEquals(TestValues.MATCH, JsonUtils.readBooleanFromJsonObject(parameters, SubscribeVehicleData.KEY_EMERGENCY_EVENT), cmd.getEmergencyEvent()); + assertEquals(TestValues.MATCH, JsonUtils.readBooleanFromJsonObject(parameters, SubscribeVehicleData.KEY_CLUSTER_MODE_STATUS), cmd.getClusterModeStatus()); + assertEquals(TestValues.MATCH, JsonUtils.readBooleanFromJsonObject(parameters, SubscribeVehicleData.KEY_MY_KEY), cmd.getMyKey()); + assertEquals(TestValues.MATCH, JsonUtils.readBooleanFromJsonObject(parameters, SubscribeVehicleData.KEY_FUEL_RANGE), cmd.getFuelRange()); + assertEquals(TestValues.MATCH, JsonUtils.readBooleanFromJsonObject(parameters, SubscribeVehicleData.KEY_TURN_SIGNAL), cmd.getTurnSignal()); + assertEquals(TestValues.MATCH, JsonUtils.readBooleanFromJsonObject(parameters, SubscribeVehicleData.KEY_ELECTRONIC_PARK_BRAKE_STATUS), cmd.getElectronicParkBrakeStatus()); + assertEquals(TestValues.MATCH, JsonUtils.readBooleanFromJsonObject(parameters, SubscribeVehicleData.KEY_HANDS_OFF_STEERING), cmd.getHandsOffSteering()); + assertEquals(TestValues.MATCH, JsonUtils.readBooleanFromJsonObject(parameters, SubscribeVehicleData.KEY_WINDOW_STATUS), cmd.getWindowStatus()); + assertEquals(TestValues.MATCH, JsonUtils.readBooleanFromJsonObject(parameters, SubscribeVehicleData.KEY_STABILITY_CONTROLS_STATUS), cmd.getStabilityControlsStatus()); + assertEquals(TestValues.MATCH, JsonUtils.readBooleanFromJsonObject(parameters, TestValues.GENERAL_OEM_CUSTOM_VEHICLE_DATA_NAME), cmd.getOEMCustomVehicleData(TestValues.GENERAL_OEM_CUSTOM_VEHICLE_DATA_NAME)); + } catch (JSONException e) { + fail(TestValues.JSON_FAIL); + } } }
\ No newline at end of file diff --git a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/SubscribeWayPointsTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/SubscribeWayPointsTests.java index a28d31bbf..d79b3905b 100644 --- a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/SubscribeWayPointsTests.java +++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/SubscribeWayPointsTests.java @@ -49,7 +49,7 @@ public class SubscribeWayPointsTests extends BaseRpcTests { * Tests the expected values of the RPC message. */ @Test - public void testRpcValues () { + public void testRpcValues() { // Invalid/Null Tests SubscribeWayPoints msg = new SubscribeWayPoints(); assertNotNull(TestValues.NOT_NULL, msg); @@ -60,7 +60,7 @@ public class SubscribeWayPointsTests extends BaseRpcTests { * Tests a valid JSON construction of this RPC message. */ @Test - public void testJsonConstructor () { + public void testJsonConstructor() { JSONObject commandJson = JsonFileReader.readId(getInstrumentation().getTargetContext(), getCommandType(), getMessageType()); assertNotNull(TestValues.NOT_NULL, commandJson); diff --git a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/SubtleAlertTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/SubtleAlertTests.java index 7c5a49534..d817c817d 100644 --- a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/SubtleAlertTests.java +++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/SubtleAlertTests.java @@ -83,12 +83,12 @@ public class SubtleAlertTests extends BaseRpcTests { } @Override - protected String getMessageType(){ + protected String getMessageType() { return RPCMessage.KEY_REQUEST; } @Override - protected String getCommandType(){ + protected String getCommandType() { return FunctionID.SUBTLE_ALERT.toString(); } @@ -115,7 +115,7 @@ public class SubtleAlertTests extends BaseRpcTests { * Tests the expected values of the RPC message. */ @Test - public void testRpcValues () { + public void testRpcValues() { // Test Values String testAlertText1 = ((SubtleAlert) msg).getAlertText1(); String testAlertText2 = ((SubtleAlert) msg).getAlertText2(); @@ -152,7 +152,7 @@ public class SubtleAlertTests extends BaseRpcTests { * Tests a valid JSON construction of this RPC message. */ @Test - public void testJsonConstructor () { + public void testJsonConstructor() { JSONObject commandJson = JsonFileReader.readId(getInstrumentation().getTargetContext(), getCommandType(), getMessageType()); assertNotNull(TestValues.NOT_NULL, commandJson); @@ -177,25 +177,24 @@ public class SubtleAlertTests extends BaseRpcTests { JSONArray ttsChunkArray = JsonUtils.readJsonArrayFromJsonObject(parameters, SubtleAlert.KEY_TTS_CHUNKS); List<TTSChunk> ttsChunkList = new ArrayList<TTSChunk>(); for (int index = 0; index < ttsChunkArray.length(); index++) { - TTSChunk chunk = new TTSChunk(JsonRPCMarshaller.deserializeJSONObject( (JSONObject)ttsChunkArray.get(index)) ); + TTSChunk chunk = new TTSChunk(JsonRPCMarshaller.deserializeJSONObject((JSONObject) ttsChunkArray.get(index))); ttsChunkList.add(chunk); } - assertTrue(TestValues.TRUE, Validator.validateTtsChunks(ttsChunkList, cmd.getTtsChunks())); + assertTrue(TestValues.TRUE, Validator.validateTtsChunks(ttsChunkList, cmd.getTtsChunks())); assertEquals(TestValues.MATCH, JsonUtils.readIntegerFromJsonObject(parameters, SubtleAlert.KEY_DURATION), cmd.getDuration()); JSONArray softButtonArray = JsonUtils.readJsonArrayFromJsonObject(parameters, SubtleAlert.KEY_SOFT_BUTTONS); List<SoftButton> softButtonList = new ArrayList<SoftButton>(); for (int index = 0; index < softButtonArray.length(); index++) { - SoftButton chunk = new SoftButton(JsonRPCMarshaller.deserializeJSONObject( (JSONObject)softButtonArray.get(index)) ); + SoftButton chunk = new SoftButton(JsonRPCMarshaller.deserializeJSONObject((JSONObject) softButtonArray.get(index))); softButtonList.add(chunk); } - assertTrue(TestValues.TRUE, Validator.validateSoftButtons(softButtonList, cmd.getSoftButtons())); + assertTrue(TestValues.TRUE, Validator.validateSoftButtons(softButtonList, cmd.getSoftButtons())); assertEquals(TestValues.MATCH, JsonUtils.readIntegerFromJsonObject(parameters, SubtleAlert.KEY_CANCEL_ID), cmd.getCancelID()); - } - catch (JSONException e) { + } catch (JSONException e) { fail(TestValues.JSON_FAIL); } } diff --git a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/SystemRequestTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/SystemRequestTests.java index 973d63713..3f2a1a997 100644 --- a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/SystemRequestTests.java +++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/SystemRequestTests.java @@ -27,108 +27,108 @@ import static junit.framework.TestCase.fail; /** - * This is a unit test class for the SmartDeviceLink library project class : + * This is a unit test class for the SmartDeviceLink library project class : * {@link com.smartdevicelink.proxy.rpc.SystemRequest} */ public class SystemRequestTests extends BaseRpcTests { - - @Override - protected RPCMessage createMessage() { - SystemRequest msg = new SystemRequest(); - - msg.setLegacyData(TestValues.GENERAL_STRING_LIST); - msg.setFileName(TestValues.GENERAL_STRING); - msg.setRequestType(TestValues.GENERAL_REQUESTTYPE); - msg.setRequestSubType(TestValues.GENERAL_STRING); - - return msg; - } - - @Override - protected String getMessageType() { - return RPCMessage.KEY_REQUEST; - } - - @Override - protected String getCommandType() { - return FunctionID.SYSTEM_REQUEST.toString(); - } - - @Override - protected JSONObject getExpectedParameters(int sdlVersion) { - JSONObject result = new JSONObject(); - - try { - result.put(SystemRequest.KEY_DATA, JsonUtils.createJsonArray(TestValues.GENERAL_STRING_LIST)); - result.put(SystemRequest.KEY_FILE_NAME, TestValues.GENERAL_STRING); - result.put(SystemRequest.KEY_REQUEST_TYPE, TestValues.GENERAL_REQUESTTYPE); - result.put(SystemRequest.KEY_REQUEST_SUB_TYPE, TestValues.GENERAL_STRING); - } catch (JSONException e) { - fail(TestValues.JSON_FAIL); - } - - return result; - } - - /** - * Tests the expected values of the RPC message. - */ - @Test - public void testRpcValues () { - // Test Values - RequestType testRequestType = ( (SystemRequest) msg ).getRequestType(); - String testRequestSubType = ( (SystemRequest) msg ).getRequestSubType(); - String testFileName = ( (SystemRequest) msg ).getFileName(); - List<String> testLegacyData = ( (SystemRequest) msg ).getLegacyData(); - - // Valid Tests - assertEquals(TestValues.MATCH, TestValues.GENERAL_REQUESTTYPE, testRequestType); - assertEquals(TestValues.MATCH, TestValues.GENERAL_STRING, testRequestSubType); - assertEquals(TestValues.MATCH, TestValues.GENERAL_STRING, testFileName); - assertTrue(TestValues.TRUE, Validator.validateStringList(TestValues.GENERAL_STRING_LIST, testLegacyData)); - - // Invalid/Null Tests - SystemRequest msg = new SystemRequest(); - assertNotNull(TestValues.NOT_NULL, msg); - testNullBase(msg); - - assertNull(TestValues.NULL, msg.getLegacyData()); - assertNull(TestValues.NULL, msg.getFileName()); - assertNull(TestValues.NULL, msg.getRequestType()); - assertNull(TestValues.NULL, msg.getRequestSubType()); - assertNull(TestValues.NULL, msg.getBulkData()); - } - - /** + + @Override + protected RPCMessage createMessage() { + SystemRequest msg = new SystemRequest(); + + msg.setLegacyData(TestValues.GENERAL_STRING_LIST); + msg.setFileName(TestValues.GENERAL_STRING); + msg.setRequestType(TestValues.GENERAL_REQUESTTYPE); + msg.setRequestSubType(TestValues.GENERAL_STRING); + + return msg; + } + + @Override + protected String getMessageType() { + return RPCMessage.KEY_REQUEST; + } + + @Override + protected String getCommandType() { + return FunctionID.SYSTEM_REQUEST.toString(); + } + + @Override + protected JSONObject getExpectedParameters(int sdlVersion) { + JSONObject result = new JSONObject(); + + try { + result.put(SystemRequest.KEY_DATA, JsonUtils.createJsonArray(TestValues.GENERAL_STRING_LIST)); + result.put(SystemRequest.KEY_FILE_NAME, TestValues.GENERAL_STRING); + result.put(SystemRequest.KEY_REQUEST_TYPE, TestValues.GENERAL_REQUESTTYPE); + result.put(SystemRequest.KEY_REQUEST_SUB_TYPE, TestValues.GENERAL_STRING); + } catch (JSONException e) { + fail(TestValues.JSON_FAIL); + } + + return result; + } + + /** + * Tests the expected values of the RPC message. + */ + @Test + public void testRpcValues() { + // Test Values + RequestType testRequestType = ((SystemRequest) msg).getRequestType(); + String testRequestSubType = ((SystemRequest) msg).getRequestSubType(); + String testFileName = ((SystemRequest) msg).getFileName(); + List<String> testLegacyData = ((SystemRequest) msg).getLegacyData(); + + // Valid Tests + assertEquals(TestValues.MATCH, TestValues.GENERAL_REQUESTTYPE, testRequestType); + assertEquals(TestValues.MATCH, TestValues.GENERAL_STRING, testRequestSubType); + assertEquals(TestValues.MATCH, TestValues.GENERAL_STRING, testFileName); + assertTrue(TestValues.TRUE, Validator.validateStringList(TestValues.GENERAL_STRING_LIST, testLegacyData)); + + // Invalid/Null Tests + SystemRequest msg = new SystemRequest(); + assertNotNull(TestValues.NOT_NULL, msg); + testNullBase(msg); + + assertNull(TestValues.NULL, msg.getLegacyData()); + assertNull(TestValues.NULL, msg.getFileName()); + assertNull(TestValues.NULL, msg.getRequestType()); + assertNull(TestValues.NULL, msg.getRequestSubType()); + assertNull(TestValues.NULL, msg.getBulkData()); + } + + /** * Tests a valid JSON construction of this RPC message. */ - @Test - public void testJsonConstructor () { - JSONObject commandJson = JsonFileReader.readId(getInstrumentation().getTargetContext(), getCommandType(), getMessageType()); - assertNotNull(TestValues.NOT_NULL, commandJson); - - try { - Hashtable<String, Object> hash = JsonRPCMarshaller.deserializeJSONObject(commandJson); - SystemRequest cmd = new SystemRequest(hash); - - JSONObject body = JsonUtils.readJsonObjectFromJsonObject(commandJson, getMessageType()); - assertNotNull(TestValues.NOT_NULL, body); - - // Test everything in the json body. - assertEquals(TestValues.MATCH, JsonUtils.readStringFromJsonObject(body, RPCMessage.KEY_FUNCTION_NAME), cmd.getFunctionName()); - assertEquals(TestValues.MATCH, JsonUtils.readIntegerFromJsonObject(body, RPCMessage.KEY_CORRELATION_ID), cmd.getCorrelationID()); - - JSONObject parameters = JsonUtils.readJsonObjectFromJsonObject(body, RPCMessage.KEY_PARAMETERS); - assertEquals(TestValues.MATCH, JsonUtils.readStringFromJsonObject(parameters, SystemRequest.KEY_FILE_NAME), cmd.getFileName()); - assertEquals(TestValues.MATCH, JsonUtils.readStringFromJsonObject(parameters, SystemRequest.KEY_REQUEST_TYPE), cmd.getRequestType().toString()); - assertEquals(TestValues.MATCH, JsonUtils.readStringFromJsonObject(parameters, SystemRequest.KEY_REQUEST_SUB_TYPE), cmd.getRequestSubType()); - - List<String> dataList = JsonUtils.readStringListFromJsonObject(parameters, SystemRequest.KEY_DATA); - List<String> testDataList = cmd.getLegacyData(); - assertEquals(TestValues.MATCH, dataList.size(), testDataList.size()); - assertTrue(TestValues.TRUE, Validator.validateStringList(dataList, testDataList)); - } catch (JSONException e) { - fail(TestValues.JSON_FAIL); - } - } + @Test + public void testJsonConstructor() { + JSONObject commandJson = JsonFileReader.readId(getInstrumentation().getTargetContext(), getCommandType(), getMessageType()); + assertNotNull(TestValues.NOT_NULL, commandJson); + + try { + Hashtable<String, Object> hash = JsonRPCMarshaller.deserializeJSONObject(commandJson); + SystemRequest cmd = new SystemRequest(hash); + + JSONObject body = JsonUtils.readJsonObjectFromJsonObject(commandJson, getMessageType()); + assertNotNull(TestValues.NOT_NULL, body); + + // Test everything in the json body. + assertEquals(TestValues.MATCH, JsonUtils.readStringFromJsonObject(body, RPCMessage.KEY_FUNCTION_NAME), cmd.getFunctionName()); + assertEquals(TestValues.MATCH, JsonUtils.readIntegerFromJsonObject(body, RPCMessage.KEY_CORRELATION_ID), cmd.getCorrelationID()); + + JSONObject parameters = JsonUtils.readJsonObjectFromJsonObject(body, RPCMessage.KEY_PARAMETERS); + assertEquals(TestValues.MATCH, JsonUtils.readStringFromJsonObject(parameters, SystemRequest.KEY_FILE_NAME), cmd.getFileName()); + assertEquals(TestValues.MATCH, JsonUtils.readStringFromJsonObject(parameters, SystemRequest.KEY_REQUEST_TYPE), cmd.getRequestType().toString()); + assertEquals(TestValues.MATCH, JsonUtils.readStringFromJsonObject(parameters, SystemRequest.KEY_REQUEST_SUB_TYPE), cmd.getRequestSubType()); + + List<String> dataList = JsonUtils.readStringListFromJsonObject(parameters, SystemRequest.KEY_DATA); + List<String> testDataList = cmd.getLegacyData(); + assertEquals(TestValues.MATCH, dataList.size(), testDataList.size()); + assertTrue(TestValues.TRUE, Validator.validateStringList(dataList, testDataList)); + } catch (JSONException e) { + fail(TestValues.JSON_FAIL); + } + } }
\ No newline at end of file diff --git a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/UnpublishAppServiceTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/UnpublishAppServiceTests.java index 7b57be8ac..aef04ae7e 100644 --- a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/UnpublishAppServiceTests.java +++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/UnpublishAppServiceTests.java @@ -62,93 +62,93 @@ import static junit.framework.TestCase.fail; */ public class UnpublishAppServiceTests extends BaseRpcTests { - @Override - protected RPCMessage createMessage() { - UnpublishAppService msg = new UnpublishAppService(); - msg.setServiceID(TestValues.GENERAL_STRING); - return msg; - } - - @Override - protected String getMessageType() { - return RPCMessage.KEY_REQUEST; - } - - @Override - protected String getCommandType() { - return FunctionID.UNPUBLISH_APP_SERVICE.toString(); - } - - @Override - protected JSONObject getExpectedParameters(int sdlVersion) { - JSONObject result = new JSONObject(); - - try { - result.put(UnpublishAppService.KEY_SERVICE_ID, TestValues.GENERAL_STRING); - } catch (JSONException e) { - fail(TestValues.JSON_FAIL); - } - - return result; - } - - /** - * Tests the expected values of the RPC message. - */ - @Test - public void testRpcValues () { - // Test Values - String copy = ( (UnpublishAppService) msg ).getServiceID(); - - // Valid Tests - assertEquals(TestValues.MATCH, TestValues.GENERAL_STRING, copy); - - // Invalid/Null Tests - UnpublishAppService msg = new UnpublishAppService(); - assertNotNull(TestValues.NOT_NULL, msg); - testNullBase(msg); - - assertNull(TestValues.MATCH, msg.getServiceID()); - } - - /** - * Tests constructor with required params - */ - @Test - public void testRequiredParamsConstructor () { - - UnpublishAppService msg = new UnpublishAppService(TestValues.GENERAL_STRING); - assertNotNull(TestValues.NOT_NULL, msg); - // Valid Tests - assertEquals(TestValues.MATCH, TestValues.GENERAL_STRING, msg.getServiceID()); - } - - /** - * Tests a valid JSON construction of this RPC message. - */ - @Test - public void testJsonConstructor () { - JSONObject commandJson = JsonFileReader.readId(getInstrumentation().getTargetContext(), getCommandType(), getMessageType()); - assertNotNull(TestValues.NOT_NULL, commandJson); - - try { - Hashtable<String, Object> hash = JsonRPCMarshaller.deserializeJSONObject(commandJson); - UnpublishAppService cmd = new UnpublishAppService(hash); - - JSONObject body = JsonUtils.readJsonObjectFromJsonObject(commandJson, getMessageType()); - assertNotNull(TestValues.NOT_NULL, body); - - // Test everything in the json body. - assertEquals(TestValues.MATCH, JsonUtils.readStringFromJsonObject(body, RPCMessage.KEY_FUNCTION_NAME), cmd.getFunctionName()); - assertEquals(TestValues.MATCH, JsonUtils.readIntegerFromJsonObject(body, RPCMessage.KEY_CORRELATION_ID), cmd.getCorrelationID()); - - JSONObject parameters = JsonUtils.readJsonObjectFromJsonObject(body, RPCMessage.KEY_PARAMETERS); - - String serviceID = JsonUtils.readStringFromJsonObject(parameters, UnpublishAppService.KEY_SERVICE_ID); - assertEquals(TestValues.MATCH, TestValues.GENERAL_STRING, serviceID); - } catch (JSONException e) { - e.printStackTrace(); - } - } + @Override + protected RPCMessage createMessage() { + UnpublishAppService msg = new UnpublishAppService(); + msg.setServiceID(TestValues.GENERAL_STRING); + return msg; + } + + @Override + protected String getMessageType() { + return RPCMessage.KEY_REQUEST; + } + + @Override + protected String getCommandType() { + return FunctionID.UNPUBLISH_APP_SERVICE.toString(); + } + + @Override + protected JSONObject getExpectedParameters(int sdlVersion) { + JSONObject result = new JSONObject(); + + try { + result.put(UnpublishAppService.KEY_SERVICE_ID, TestValues.GENERAL_STRING); + } catch (JSONException e) { + fail(TestValues.JSON_FAIL); + } + + return result; + } + + /** + * Tests the expected values of the RPC message. + */ + @Test + public void testRpcValues() { + // Test Values + String copy = ((UnpublishAppService) msg).getServiceID(); + + // Valid Tests + assertEquals(TestValues.MATCH, TestValues.GENERAL_STRING, copy); + + // Invalid/Null Tests + UnpublishAppService msg = new UnpublishAppService(); + assertNotNull(TestValues.NOT_NULL, msg); + testNullBase(msg); + + assertNull(TestValues.MATCH, msg.getServiceID()); + } + + /** + * Tests constructor with required params + */ + @Test + public void testRequiredParamsConstructor() { + + UnpublishAppService msg = new UnpublishAppService(TestValues.GENERAL_STRING); + assertNotNull(TestValues.NOT_NULL, msg); + // Valid Tests + assertEquals(TestValues.MATCH, TestValues.GENERAL_STRING, msg.getServiceID()); + } + + /** + * Tests a valid JSON construction of this RPC message. + */ + @Test + public void testJsonConstructor() { + JSONObject commandJson = JsonFileReader.readId(getInstrumentation().getTargetContext(), getCommandType(), getMessageType()); + assertNotNull(TestValues.NOT_NULL, commandJson); + + try { + Hashtable<String, Object> hash = JsonRPCMarshaller.deserializeJSONObject(commandJson); + UnpublishAppService cmd = new UnpublishAppService(hash); + + JSONObject body = JsonUtils.readJsonObjectFromJsonObject(commandJson, getMessageType()); + assertNotNull(TestValues.NOT_NULL, body); + + // Test everything in the json body. + assertEquals(TestValues.MATCH, JsonUtils.readStringFromJsonObject(body, RPCMessage.KEY_FUNCTION_NAME), cmd.getFunctionName()); + assertEquals(TestValues.MATCH, JsonUtils.readIntegerFromJsonObject(body, RPCMessage.KEY_CORRELATION_ID), cmd.getCorrelationID()); + + JSONObject parameters = JsonUtils.readJsonObjectFromJsonObject(body, RPCMessage.KEY_PARAMETERS); + + String serviceID = JsonUtils.readStringFromJsonObject(parameters, UnpublishAppService.KEY_SERVICE_ID); + assertEquals(TestValues.MATCH, TestValues.GENERAL_STRING, serviceID); + } catch (JSONException e) { + e.printStackTrace(); + } + } }
\ No newline at end of file diff --git a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/UnregisterAppInterfaceTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/UnregisterAppInterfaceTests.java index 768a7c27b..08cd129e6 100644 --- a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/UnregisterAppInterfaceTests.java +++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/UnregisterAppInterfaceTests.java @@ -21,63 +21,62 @@ import static junit.framework.TestCase.assertNotNull; import static junit.framework.TestCase.fail; /** - * This is a unit test class for the SmartDeviceLink library project class : + * This is a unit test class for the SmartDeviceLink library project class : * {@link com.smartdevicelink.proxy.rpc.UnregisterAppInterface} */ public class UnregisterAppInterfaceTests extends BaseRpcTests { - @Override - protected RPCMessage createMessage(){ + @Override + protected RPCMessage createMessage() { return new UnregisterAppInterface(); } @Override - protected String getMessageType(){ + protected String getMessageType() { return RPCMessage.KEY_REQUEST; } @Override - protected String getCommandType(){ + protected String getCommandType() { return FunctionID.UNREGISTER_APP_INTERFACE.toString(); } @Override - protected JSONObject getExpectedParameters(int sdlVersion){ + protected JSONObject getExpectedParameters(int sdlVersion) { return new JSONObject(); } /** - * Tests the expected values of the RPC message. - */ + * Tests the expected values of the RPC message. + */ @Test - public void testRpcValues () { - // Invalid/Null Tests - UnregisterAppInterface msg = new UnregisterAppInterface(); + public void testRpcValues() { + // Invalid/Null Tests + UnregisterAppInterface msg = new UnregisterAppInterface(); assertNotNull(TestValues.NOT_NULL, msg); testNullBase(msg); } - + /** * Tests a valid JSON construction of this RPC message. */ @Test - public void testJsonConstructor () { - JSONObject commandJson = JsonFileReader.readId(getInstrumentation().getTargetContext(), getCommandType(), getMessageType()); - assertNotNull(TestValues.NOT_NULL, commandJson); - - try { - Hashtable<String, Object> hash = JsonRPCMarshaller.deserializeJSONObject(commandJson); - UnregisterAppInterface cmd = new UnregisterAppInterface(hash); - - JSONObject body = JsonUtils.readJsonObjectFromJsonObject(commandJson, getMessageType()); - assertNotNull(TestValues.NOT_NULL, body); - - // Test everything in the json body. - assertEquals(TestValues.MATCH, JsonUtils.readStringFromJsonObject(body, RPCMessage.KEY_FUNCTION_NAME), cmd.getFunctionName()); - assertEquals(TestValues.MATCH, JsonUtils.readIntegerFromJsonObject(body, RPCMessage.KEY_CORRELATION_ID), cmd.getCorrelationID()); - } - catch (JSONException e) { - fail(TestValues.JSON_FAIL); - } - } + public void testJsonConstructor() { + JSONObject commandJson = JsonFileReader.readId(getInstrumentation().getTargetContext(), getCommandType(), getMessageType()); + assertNotNull(TestValues.NOT_NULL, commandJson); + + try { + Hashtable<String, Object> hash = JsonRPCMarshaller.deserializeJSONObject(commandJson); + UnregisterAppInterface cmd = new UnregisterAppInterface(hash); + + JSONObject body = JsonUtils.readJsonObjectFromJsonObject(commandJson, getMessageType()); + assertNotNull(TestValues.NOT_NULL, body); + + // Test everything in the json body. + assertEquals(TestValues.MATCH, JsonUtils.readStringFromJsonObject(body, RPCMessage.KEY_FUNCTION_NAME), cmd.getFunctionName()); + assertEquals(TestValues.MATCH, JsonUtils.readIntegerFromJsonObject(body, RPCMessage.KEY_CORRELATION_ID), cmd.getCorrelationID()); + } catch (JSONException e) { + fail(TestValues.JSON_FAIL); + } + } }
\ No newline at end of file diff --git a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/UnsubscribeButtonTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/UnsubscribeButtonTests.java index 5716f8b84..667d02a77 100644 --- a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/UnsubscribeButtonTests.java +++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/UnsubscribeButtonTests.java @@ -23,87 +23,86 @@ import static junit.framework.TestCase.assertNull; import static junit.framework.TestCase.fail; /** - * This is a unit test class for the SmartDeviceLink library project class : + * This is a unit test class for the SmartDeviceLink library project class : * {@link com.smartdevicelink.proxy.rpc.UnsubscribeButton} */ public class UnsubscribeButtonTests extends BaseRpcTests { - - @Override - protected RPCMessage createMessage() { - UnsubscribeButton msg = new UnsubscribeButton(); - - msg.setButtonName(TestValues.GENERAL_BUTTONNAME); - - return msg; - } - - @Override - protected String getMessageType() { - return RPCMessage.KEY_REQUEST; - } - - @Override - protected String getCommandType() { - return FunctionID.UNSUBSCRIBE_BUTTON.toString(); - } - - @Override - protected JSONObject getExpectedParameters(int sdlVersion) { - JSONObject result = new JSONObject(); - - try { - result.put(UnsubscribeButton.KEY_BUTTON_NAME, TestValues.GENERAL_BUTTONNAME); - - } catch (JSONException e) { - fail(TestValues.JSON_FAIL); - } - - return result; - } - - /** - * Tests the expected values of the RPC message. - */ - @Test - public void testRpcValues () { - // Test Values - ButtonName testButtonName = ( (UnsubscribeButton) msg ).getButtonName(); - - // Valid Tests - assertEquals(TestValues.MATCH, TestValues.GENERAL_BUTTONNAME, testButtonName); - - // Invalid/Null Tests - UnsubscribeButton msg = new UnsubscribeButton(); - assertNotNull(TestValues.NOT_NULL, msg); - testNullBase(msg); - - assertNull(TestValues.NULL, msg.getButtonName()); + + @Override + protected RPCMessage createMessage() { + UnsubscribeButton msg = new UnsubscribeButton(); + + msg.setButtonName(TestValues.GENERAL_BUTTONNAME); + + return msg; + } + + @Override + protected String getMessageType() { + return RPCMessage.KEY_REQUEST; + } + + @Override + protected String getCommandType() { + return FunctionID.UNSUBSCRIBE_BUTTON.toString(); + } + + @Override + protected JSONObject getExpectedParameters(int sdlVersion) { + JSONObject result = new JSONObject(); + + try { + result.put(UnsubscribeButton.KEY_BUTTON_NAME, TestValues.GENERAL_BUTTONNAME); + + } catch (JSONException e) { + fail(TestValues.JSON_FAIL); + } + + return result; } - - /** + + /** + * Tests the expected values of the RPC message. + */ + @Test + public void testRpcValues() { + // Test Values + ButtonName testButtonName = ((UnsubscribeButton) msg).getButtonName(); + + // Valid Tests + assertEquals(TestValues.MATCH, TestValues.GENERAL_BUTTONNAME, testButtonName); + + // Invalid/Null Tests + UnsubscribeButton msg = new UnsubscribeButton(); + assertNotNull(TestValues.NOT_NULL, msg); + testNullBase(msg); + + assertNull(TestValues.NULL, msg.getButtonName()); + } + + /** * Tests a valid JSON construction of this RPC message. */ - @Test - public void testJsonConstructor () { - JSONObject commandJson = JsonFileReader.readId(getInstrumentation().getTargetContext(), getCommandType(), getMessageType()); - assertNotNull(TestValues.NOT_NULL, commandJson); - - try { - Hashtable<String, Object> hash = JsonRPCMarshaller.deserializeJSONObject(commandJson); - UnsubscribeButton cmd = new UnsubscribeButton(hash); - - JSONObject body = JsonUtils.readJsonObjectFromJsonObject(commandJson, getMessageType()); - assertNotNull(TestValues.NOT_NULL, body); - - // Test everything in the json body. - assertEquals(TestValues.MATCH, JsonUtils.readStringFromJsonObject(body, RPCMessage.KEY_FUNCTION_NAME), cmd.getFunctionName()); - assertEquals(TestValues.MATCH, JsonUtils.readIntegerFromJsonObject(body, RPCMessage.KEY_CORRELATION_ID), cmd.getCorrelationID()); - - JSONObject parameters = JsonUtils.readJsonObjectFromJsonObject(body, RPCMessage.KEY_PARAMETERS); - assertEquals(TestValues.MATCH, JsonUtils.readStringFromJsonObject(parameters, UnsubscribeButton.KEY_BUTTON_NAME), cmd.getButtonName().toString()); - } - catch (JSONException e) { - e.printStackTrace(); - } - } + @Test + public void testJsonConstructor() { + JSONObject commandJson = JsonFileReader.readId(getInstrumentation().getTargetContext(), getCommandType(), getMessageType()); + assertNotNull(TestValues.NOT_NULL, commandJson); + + try { + Hashtable<String, Object> hash = JsonRPCMarshaller.deserializeJSONObject(commandJson); + UnsubscribeButton cmd = new UnsubscribeButton(hash); + + JSONObject body = JsonUtils.readJsonObjectFromJsonObject(commandJson, getMessageType()); + assertNotNull(TestValues.NOT_NULL, body); + + // Test everything in the json body. + assertEquals(TestValues.MATCH, JsonUtils.readStringFromJsonObject(body, RPCMessage.KEY_FUNCTION_NAME), cmd.getFunctionName()); + assertEquals(TestValues.MATCH, JsonUtils.readIntegerFromJsonObject(body, RPCMessage.KEY_CORRELATION_ID), cmd.getCorrelationID()); + + JSONObject parameters = JsonUtils.readJsonObjectFromJsonObject(body, RPCMessage.KEY_PARAMETERS); + assertEquals(TestValues.MATCH, JsonUtils.readStringFromJsonObject(parameters, UnsubscribeButton.KEY_BUTTON_NAME), cmd.getButtonName().toString()); + } catch (JSONException e) { + e.printStackTrace(); + } + } }
\ No newline at end of file diff --git a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/UnsubscribeVehicleDataTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/UnsubscribeVehicleDataTests.java index 2ea0dae9b..cfe2548f3 100644 --- a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/UnsubscribeVehicleDataTests.java +++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/UnsubscribeVehicleDataTests.java @@ -25,68 +25,68 @@ import static junit.framework.TestCase.fail; /** - * This is a unit test class for the SmartDeviceLink library project class : + * This is a unit test class for the SmartDeviceLink library project class : * {@link com.smartdevicelink.proxy.rpc.UnsubscribeVehicleData} */ public class UnsubscribeVehicleDataTests extends BaseRpcTests { - @Override - protected RPCMessage createMessage() { - UnsubscribeVehicleData msg = new UnsubscribeVehicleData(); + @Override + protected RPCMessage createMessage() { + UnsubscribeVehicleData msg = new UnsubscribeVehicleData(); - msg.setSpeed(TestValues.GENERAL_BOOLEAN); - msg.setRpm(TestValues.GENERAL_BOOLEAN); - msg.setExternalTemperature(TestValues.GENERAL_BOOLEAN); - msg.setFuelLevel(TestValues.GENERAL_BOOLEAN); - msg.setPrndl(TestValues.GENERAL_BOOLEAN); - msg.setTirePressure(TestValues.GENERAL_BOOLEAN); - msg.setEngineTorque(TestValues.GENERAL_BOOLEAN); - msg.setEngineOilLife(TestValues.GENERAL_BOOLEAN); - msg.setOdometer(TestValues.GENERAL_BOOLEAN); - msg.setGps(TestValues.GENERAL_BOOLEAN); - msg.setFuelLevelState(TestValues.GENERAL_BOOLEAN); - msg.setInstantFuelConsumption(TestValues.GENERAL_BOOLEAN); - msg.setBeltStatus(TestValues.GENERAL_BOOLEAN); - msg.setBodyInformation(TestValues.GENERAL_BOOLEAN); - msg.setDeviceStatus(TestValues.GENERAL_BOOLEAN); - msg.setDriverBraking(TestValues.GENERAL_BOOLEAN); - msg.setWiperStatus(TestValues.GENERAL_BOOLEAN); - msg.setHeadLampStatus(TestValues.GENERAL_BOOLEAN); - msg.setAccPedalPosition(TestValues.GENERAL_BOOLEAN); - msg.setSteeringWheelAngle(TestValues.GENERAL_BOOLEAN); - msg.setECallInfo(TestValues.GENERAL_BOOLEAN); - msg.setAirbagStatus(TestValues.GENERAL_BOOLEAN); - msg.setEmergencyEvent(TestValues.GENERAL_BOOLEAN); - msg.setClusterModeStatus(TestValues.GENERAL_BOOLEAN); - msg.setMyKey(TestValues.GENERAL_BOOLEAN); - msg.setFuelRange(TestValues.GENERAL_BOOLEAN); - msg.setTurnSignal(TestValues.GENERAL_BOOLEAN); - msg.setElectronicParkBrakeStatus(TestValues.GENERAL_BOOLEAN); - msg.setCloudAppVehicleID(TestValues.GENERAL_BOOLEAN); - msg.setGearStatus(TestValues.GENERAL_BOOLEAN); - msg.setHandsOffSteering(TestValues.GENERAL_BOOLEAN); - msg.setWindowStatus(TestValues.GENERAL_BOOLEAN); - msg.setStabilityControlsStatus(TestValues.GENERAL_BOOLEAN); - msg.setOEMCustomVehicleData(TestValues.GENERAL_OEM_CUSTOM_VEHICLE_DATA_NAME, TestValues.GENERAL_BOOLEAN); + msg.setSpeed(TestValues.GENERAL_BOOLEAN); + msg.setRpm(TestValues.GENERAL_BOOLEAN); + msg.setExternalTemperature(TestValues.GENERAL_BOOLEAN); + msg.setFuelLevel(TestValues.GENERAL_BOOLEAN); + msg.setPrndl(TestValues.GENERAL_BOOLEAN); + msg.setTirePressure(TestValues.GENERAL_BOOLEAN); + msg.setEngineTorque(TestValues.GENERAL_BOOLEAN); + msg.setEngineOilLife(TestValues.GENERAL_BOOLEAN); + msg.setOdometer(TestValues.GENERAL_BOOLEAN); + msg.setGps(TestValues.GENERAL_BOOLEAN); + msg.setFuelLevelState(TestValues.GENERAL_BOOLEAN); + msg.setInstantFuelConsumption(TestValues.GENERAL_BOOLEAN); + msg.setBeltStatus(TestValues.GENERAL_BOOLEAN); + msg.setBodyInformation(TestValues.GENERAL_BOOLEAN); + msg.setDeviceStatus(TestValues.GENERAL_BOOLEAN); + msg.setDriverBraking(TestValues.GENERAL_BOOLEAN); + msg.setWiperStatus(TestValues.GENERAL_BOOLEAN); + msg.setHeadLampStatus(TestValues.GENERAL_BOOLEAN); + msg.setAccPedalPosition(TestValues.GENERAL_BOOLEAN); + msg.setSteeringWheelAngle(TestValues.GENERAL_BOOLEAN); + msg.setECallInfo(TestValues.GENERAL_BOOLEAN); + msg.setAirbagStatus(TestValues.GENERAL_BOOLEAN); + msg.setEmergencyEvent(TestValues.GENERAL_BOOLEAN); + msg.setClusterModeStatus(TestValues.GENERAL_BOOLEAN); + msg.setMyKey(TestValues.GENERAL_BOOLEAN); + msg.setFuelRange(TestValues.GENERAL_BOOLEAN); + msg.setTurnSignal(TestValues.GENERAL_BOOLEAN); + msg.setElectronicParkBrakeStatus(TestValues.GENERAL_BOOLEAN); + msg.setCloudAppVehicleID(TestValues.GENERAL_BOOLEAN); + msg.setGearStatus(TestValues.GENERAL_BOOLEAN); + msg.setHandsOffSteering(TestValues.GENERAL_BOOLEAN); + msg.setWindowStatus(TestValues.GENERAL_BOOLEAN); + msg.setStabilityControlsStatus(TestValues.GENERAL_BOOLEAN); + msg.setOEMCustomVehicleData(TestValues.GENERAL_OEM_CUSTOM_VEHICLE_DATA_NAME, TestValues.GENERAL_BOOLEAN); - return msg; - } + return msg; + } - @Override - protected String getMessageType() { - return RPCMessage.KEY_REQUEST; - } + @Override + protected String getMessageType() { + return RPCMessage.KEY_REQUEST; + } - @Override - protected String getCommandType() { - return FunctionID.UNSUBSCRIBE_VEHICLE_DATA.toString(); - } + @Override + protected String getCommandType() { + return FunctionID.UNSUBSCRIBE_VEHICLE_DATA.toString(); + } - @Override - protected JSONObject getExpectedParameters(int sdlVersion) { - JSONObject result = new JSONObject(); + @Override + protected JSONObject getExpectedParameters(int sdlVersion) { + JSONObject result = new JSONObject(); - try { + try { result.put(UnsubscribeVehicleData.KEY_SPEED, TestValues.GENERAL_BOOLEAN); result.put(UnsubscribeVehicleData.KEY_RPM, TestValues.GENERAL_BOOLEAN); result.put(UnsubscribeVehicleData.KEY_EXTERNAL_TEMPERATURE, TestValues.GENERAL_BOOLEAN); @@ -114,66 +114,66 @@ public class UnsubscribeVehicleDataTests extends BaseRpcTests { result.put(UnsubscribeVehicleData.KEY_MY_KEY, TestValues.GENERAL_BOOLEAN); result.put(UnsubscribeVehicleData.KEY_FUEL_RANGE, TestValues.GENERAL_BOOLEAN); result.put(UnsubscribeVehicleData.KEY_TURN_SIGNAL, TestValues.GENERAL_BOOLEAN); - result.put(UnsubscribeVehicleData.KEY_ELECTRONIC_PARK_BRAKE_STATUS, TestValues.GENERAL_BOOLEAN); - result.put(UnsubscribeVehicleData.KEY_CLOUD_APP_VEHICLE_ID, TestValues.GENERAL_BOOLEAN); - result.put(UnsubscribeVehicleData.KEY_HANDS_OFF_STEERING, TestValues.GENERAL_BOOLEAN); - result.put(UnsubscribeVehicleData.KEY_WINDOW_STATUS, TestValues.GENERAL_BOOLEAN); - result.put(UnsubscribeVehicleData.KEY_GEAR_STATUS, TestValues.GENERAL_BOOLEAN); - result.put(UnsubscribeVehicleData.KEY_STABILITY_CONTROLS_STATUS, TestValues.GENERAL_BOOLEAN); - result.put(TestValues.GENERAL_OEM_CUSTOM_VEHICLE_DATA_NAME, TestValues.GENERAL_BOOLEAN); - } catch (JSONException e) { - fail(TestValues.JSON_FAIL); - } + result.put(UnsubscribeVehicleData.KEY_ELECTRONIC_PARK_BRAKE_STATUS, TestValues.GENERAL_BOOLEAN); + result.put(UnsubscribeVehicleData.KEY_CLOUD_APP_VEHICLE_ID, TestValues.GENERAL_BOOLEAN); + result.put(UnsubscribeVehicleData.KEY_HANDS_OFF_STEERING, TestValues.GENERAL_BOOLEAN); + result.put(UnsubscribeVehicleData.KEY_WINDOW_STATUS, TestValues.GENERAL_BOOLEAN); + result.put(UnsubscribeVehicleData.KEY_GEAR_STATUS, TestValues.GENERAL_BOOLEAN); + result.put(UnsubscribeVehicleData.KEY_STABILITY_CONTROLS_STATUS, TestValues.GENERAL_BOOLEAN); + result.put(TestValues.GENERAL_OEM_CUSTOM_VEHICLE_DATA_NAME, TestValues.GENERAL_BOOLEAN); + } catch (JSONException e) { + fail(TestValues.JSON_FAIL); + } - return result; - } + return result; + } - /** - * Tests the expected values of the RPC message. - */ - @Test - public void testRpcValues(){ - // Valid Tests - assertTrue(TestValues.TRUE,( (UnsubscribeVehicleData) msg ).getSpeed()); - assertTrue(TestValues.TRUE,( (UnsubscribeVehicleData) msg ).getRpm()); - assertTrue(TestValues.TRUE,( (UnsubscribeVehicleData) msg ).getExternalTemperature()); - assertTrue(TestValues.TRUE,( (UnsubscribeVehicleData) msg ).getFuelLevel()); - assertTrue(TestValues.TRUE,( (UnsubscribeVehicleData) msg ).getPrndl()); - assertTrue(TestValues.TRUE,( (UnsubscribeVehicleData) msg ).getTirePressure()); - assertTrue(TestValues.TRUE,( (UnsubscribeVehicleData) msg ).getEngineTorque()); - assertTrue(TestValues.TRUE,( (UnsubscribeVehicleData) msg ).getEngineOilLife()); - assertTrue(TestValues.TRUE,( (UnsubscribeVehicleData) msg ).getOdometer()); - assertTrue(TestValues.TRUE,( (UnsubscribeVehicleData) msg ).getGps()); - assertTrue(TestValues.TRUE,( (UnsubscribeVehicleData) msg ).getFuelLevelState()); - assertTrue(TestValues.TRUE,( (UnsubscribeVehicleData) msg ).getInstantFuelConsumption()); - assertTrue(TestValues.TRUE,( (UnsubscribeVehicleData) msg ).getBeltStatus()); - assertTrue(TestValues.TRUE,( (UnsubscribeVehicleData) msg ).getBodyInformation()); - assertTrue(TestValues.TRUE,( (UnsubscribeVehicleData) msg ).getDeviceStatus()); - assertTrue(TestValues.TRUE,( (UnsubscribeVehicleData) msg ).getDriverBraking()); - assertTrue(TestValues.TRUE,( (UnsubscribeVehicleData) msg ).getWiperStatus()); - assertTrue(TestValues.TRUE,( (UnsubscribeVehicleData) msg ).getHeadLampStatus()); - assertTrue(TestValues.TRUE,( (UnsubscribeVehicleData) msg ).getAccPedalPosition()); - assertTrue(TestValues.TRUE,( (UnsubscribeVehicleData) msg ).getSteeringWheelAngle()); - assertTrue(TestValues.TRUE,( (UnsubscribeVehicleData) msg ).getECallInfo()); - assertTrue(TestValues.TRUE,( (UnsubscribeVehicleData) msg ).getAirbagStatus()); - assertTrue(TestValues.TRUE,( (UnsubscribeVehicleData) msg ).getEmergencyEvent()); - assertTrue(TestValues.TRUE,( (UnsubscribeVehicleData) msg ).getClusterModeStatus()); - assertTrue(TestValues.TRUE,( (UnsubscribeVehicleData) msg ).getMyKey()); - assertTrue(TestValues.TRUE,( (UnsubscribeVehicleData) msg ).getFuelRange()); - assertTrue(TestValues.TRUE,( (UnsubscribeVehicleData) msg ).getTurnSignal()); - assertTrue(TestValues.TRUE,( (UnsubscribeVehicleData) msg ).getElectronicParkBrakeStatus()); - assertTrue(TestValues.TRUE,( (UnsubscribeVehicleData) msg ).getCloudAppVehicleID()); - assertTrue(TestValues.TRUE,( (UnsubscribeVehicleData) msg ).getHandsOffSteering()); - assertTrue(TestValues.TRUE,( (UnsubscribeVehicleData) msg ).getWindowStatus()); - assertTrue(TestValues.TRUE,( (UnsubscribeVehicleData) msg ).getGearStatus()); - assertTrue(TestValues.TRUE,( (UnsubscribeVehicleData) msg ).getStabilityControlsStatus()); - assertTrue(TestValues.TRUE,( (UnsubscribeVehicleData) msg ).getOEMCustomVehicleData(TestValues.GENERAL_OEM_CUSTOM_VEHICLE_DATA_NAME)); - // Invalid/Null Tests - UnsubscribeVehicleData msg = new UnsubscribeVehicleData(); - assertNotNull(TestValues.NOT_NULL, msg); - testNullBase(msg); - - assertNull(TestValues.NULL, msg.getAccPedalPosition()); + /** + * Tests the expected values of the RPC message. + */ + @Test + public void testRpcValues() { + // Valid Tests + assertTrue(TestValues.TRUE, ((UnsubscribeVehicleData) msg).getSpeed()); + assertTrue(TestValues.TRUE, ((UnsubscribeVehicleData) msg).getRpm()); + assertTrue(TestValues.TRUE, ((UnsubscribeVehicleData) msg).getExternalTemperature()); + assertTrue(TestValues.TRUE, ((UnsubscribeVehicleData) msg).getFuelLevel()); + assertTrue(TestValues.TRUE, ((UnsubscribeVehicleData) msg).getPrndl()); + assertTrue(TestValues.TRUE, ((UnsubscribeVehicleData) msg).getTirePressure()); + assertTrue(TestValues.TRUE, ((UnsubscribeVehicleData) msg).getEngineTorque()); + assertTrue(TestValues.TRUE, ((UnsubscribeVehicleData) msg).getEngineOilLife()); + assertTrue(TestValues.TRUE, ((UnsubscribeVehicleData) msg).getOdometer()); + assertTrue(TestValues.TRUE, ((UnsubscribeVehicleData) msg).getGps()); + assertTrue(TestValues.TRUE, ((UnsubscribeVehicleData) msg).getFuelLevelState()); + assertTrue(TestValues.TRUE, ((UnsubscribeVehicleData) msg).getInstantFuelConsumption()); + assertTrue(TestValues.TRUE, ((UnsubscribeVehicleData) msg).getBeltStatus()); + assertTrue(TestValues.TRUE, ((UnsubscribeVehicleData) msg).getBodyInformation()); + assertTrue(TestValues.TRUE, ((UnsubscribeVehicleData) msg).getDeviceStatus()); + assertTrue(TestValues.TRUE, ((UnsubscribeVehicleData) msg).getDriverBraking()); + assertTrue(TestValues.TRUE, ((UnsubscribeVehicleData) msg).getWiperStatus()); + assertTrue(TestValues.TRUE, ((UnsubscribeVehicleData) msg).getHeadLampStatus()); + assertTrue(TestValues.TRUE, ((UnsubscribeVehicleData) msg).getAccPedalPosition()); + assertTrue(TestValues.TRUE, ((UnsubscribeVehicleData) msg).getSteeringWheelAngle()); + assertTrue(TestValues.TRUE, ((UnsubscribeVehicleData) msg).getECallInfo()); + assertTrue(TestValues.TRUE, ((UnsubscribeVehicleData) msg).getAirbagStatus()); + assertTrue(TestValues.TRUE, ((UnsubscribeVehicleData) msg).getEmergencyEvent()); + assertTrue(TestValues.TRUE, ((UnsubscribeVehicleData) msg).getClusterModeStatus()); + assertTrue(TestValues.TRUE, ((UnsubscribeVehicleData) msg).getMyKey()); + assertTrue(TestValues.TRUE, ((UnsubscribeVehicleData) msg).getFuelRange()); + assertTrue(TestValues.TRUE, ((UnsubscribeVehicleData) msg).getTurnSignal()); + assertTrue(TestValues.TRUE, ((UnsubscribeVehicleData) msg).getElectronicParkBrakeStatus()); + assertTrue(TestValues.TRUE, ((UnsubscribeVehicleData) msg).getCloudAppVehicleID()); + assertTrue(TestValues.TRUE, ((UnsubscribeVehicleData) msg).getHandsOffSteering()); + assertTrue(TestValues.TRUE, ((UnsubscribeVehicleData) msg).getWindowStatus()); + assertTrue(TestValues.TRUE, ((UnsubscribeVehicleData) msg).getGearStatus()); + assertTrue(TestValues.TRUE, ((UnsubscribeVehicleData) msg).getStabilityControlsStatus()); + assertTrue(TestValues.TRUE, ((UnsubscribeVehicleData) msg).getOEMCustomVehicleData(TestValues.GENERAL_OEM_CUSTOM_VEHICLE_DATA_NAME)); + // Invalid/Null Tests + UnsubscribeVehicleData msg = new UnsubscribeVehicleData(); + assertNotNull(TestValues.NOT_NULL, msg); + testNullBase(msg); + + assertNull(TestValues.NULL, msg.getAccPedalPosition()); assertNull(TestValues.NULL, msg.getAirbagStatus()); assertNull(TestValues.NULL, msg.getBeltStatus()); assertNull(TestValues.NULL, msg.getDriverBraking()); @@ -200,73 +200,72 @@ public class UnsubscribeVehicleDataTests extends BaseRpcTests { assertNull(TestValues.NULL, msg.getMyKey()); assertNull(TestValues.NULL, msg.getFuelRange()); assertNull(TestValues.NULL, msg.getTurnSignal()); - assertNull(TestValues.NULL, msg.getElectronicParkBrakeStatus()); - assertNull(TestValues.NULL, msg.getCloudAppVehicleID()); - assertNull(TestValues.NULL, msg.getHandsOffSteering()); - assertNull(TestValues.NULL, msg.getWindowStatus()); - assertNull(TestValues.NULL, msg.getGearStatus()); - assertNull(TestValues.NULL, msg.getStabilityControlsStatus()); - assertNull(TestValues.NULL, msg.getOEMCustomVehicleData(TestValues.GENERAL_OEM_CUSTOM_VEHICLE_DATA_NAME)); - } + assertNull(TestValues.NULL, msg.getElectronicParkBrakeStatus()); + assertNull(TestValues.NULL, msg.getCloudAppVehicleID()); + assertNull(TestValues.NULL, msg.getHandsOffSteering()); + assertNull(TestValues.NULL, msg.getWindowStatus()); + assertNull(TestValues.NULL, msg.getGearStatus()); + assertNull(TestValues.NULL, msg.getStabilityControlsStatus()); + assertNull(TestValues.NULL, msg.getOEMCustomVehicleData(TestValues.GENERAL_OEM_CUSTOM_VEHICLE_DATA_NAME)); + } - /** + /** * Tests a valid JSON construction of this RPC message. */ - @Test - public void testJsonConstructor () { - JSONObject commandJson = JsonFileReader.readId(getInstrumentation().getTargetContext(), getCommandType(), getMessageType()); - assertNotNull(TestValues.NOT_NULL, commandJson); - - try { - Hashtable<String, Object> hash = JsonRPCMarshaller.deserializeJSONObject(commandJson); - UnsubscribeVehicleData cmd = new UnsubscribeVehicleData(hash); - - JSONObject body = JsonUtils.readJsonObjectFromJsonObject(commandJson, getMessageType()); - assertNotNull(TestValues.NOT_NULL, body); - - // Test everything in the json body. - assertEquals(TestValues.MATCH, JsonUtils.readStringFromJsonObject(body, RPCMessage.KEY_FUNCTION_NAME), cmd.getFunctionName()); - assertEquals(TestValues.MATCH, JsonUtils.readIntegerFromJsonObject(body, RPCMessage.KEY_CORRELATION_ID), cmd.getCorrelationID()); + @Test + public void testJsonConstructor() { + JSONObject commandJson = JsonFileReader.readId(getInstrumentation().getTargetContext(), getCommandType(), getMessageType()); + assertNotNull(TestValues.NOT_NULL, commandJson); + + try { + Hashtable<String, Object> hash = JsonRPCMarshaller.deserializeJSONObject(commandJson); + UnsubscribeVehicleData cmd = new UnsubscribeVehicleData(hash); + + JSONObject body = JsonUtils.readJsonObjectFromJsonObject(commandJson, getMessageType()); + assertNotNull(TestValues.NOT_NULL, body); + + // Test everything in the json body. + assertEquals(TestValues.MATCH, JsonUtils.readStringFromJsonObject(body, RPCMessage.KEY_FUNCTION_NAME), cmd.getFunctionName()); + assertEquals(TestValues.MATCH, JsonUtils.readIntegerFromJsonObject(body, RPCMessage.KEY_CORRELATION_ID), cmd.getCorrelationID()); - JSONObject parameters = JsonUtils.readJsonObjectFromJsonObject(body, RPCMessage.KEY_PARAMETERS); - assertEquals(TestValues.MATCH, JsonUtils.readBooleanFromJsonObject(parameters, UnsubscribeVehicleData.KEY_SPEED), cmd.getSpeed()); - assertEquals(TestValues.MATCH, JsonUtils.readBooleanFromJsonObject(parameters, UnsubscribeVehicleData.KEY_RPM), cmd.getRpm()); - assertEquals(TestValues.MATCH, JsonUtils.readBooleanFromJsonObject(parameters, UnsubscribeVehicleData.KEY_EXTERNAL_TEMPERATURE), cmd.getExternalTemperature()); - assertEquals(TestValues.MATCH, JsonUtils.readBooleanFromJsonObject(parameters, UnsubscribeVehicleData.KEY_FUEL_LEVEL), cmd.getFuelLevel()); - assertEquals(TestValues.MATCH, JsonUtils.readBooleanFromJsonObject(parameters, UnsubscribeVehicleData.KEY_PRNDL), cmd.getPrndl()); - assertEquals(TestValues.MATCH, JsonUtils.readBooleanFromJsonObject(parameters, UnsubscribeVehicleData.KEY_TIRE_PRESSURE), cmd.getTirePressure()); - assertEquals(TestValues.MATCH, JsonUtils.readBooleanFromJsonObject(parameters, UnsubscribeVehicleData.KEY_ENGINE_TORQUE), cmd.getEngineTorque()); - assertEquals(TestValues.MATCH, JsonUtils.readBooleanFromJsonObject(parameters, UnsubscribeVehicleData.KEY_ENGINE_OIL_LIFE), cmd.getEngineOilLife()); - assertEquals(TestValues.MATCH, JsonUtils.readBooleanFromJsonObject(parameters, UnsubscribeVehicleData.KEY_ODOMETER), cmd.getOdometer()); - assertEquals(TestValues.MATCH, JsonUtils.readBooleanFromJsonObject(parameters, UnsubscribeVehicleData.KEY_GPS), cmd.getGps()); - assertEquals(TestValues.MATCH, JsonUtils.readBooleanFromJsonObject(parameters, UnsubscribeVehicleData.KEY_FUEL_LEVEL_STATE), cmd.getFuelLevelState()); - assertEquals(TestValues.MATCH, JsonUtils.readBooleanFromJsonObject(parameters, UnsubscribeVehicleData.KEY_INSTANT_FUEL_CONSUMPTION), cmd.getInstantFuelConsumption()); - assertEquals(TestValues.MATCH, JsonUtils.readBooleanFromJsonObject(parameters, UnsubscribeVehicleData.KEY_BELT_STATUS), cmd.getBeltStatus()); - assertEquals(TestValues.MATCH, JsonUtils.readBooleanFromJsonObject(parameters, UnsubscribeVehicleData.KEY_BODY_INFORMATION), cmd.getBodyInformation()); - assertEquals(TestValues.MATCH, JsonUtils.readBooleanFromJsonObject(parameters, UnsubscribeVehicleData.KEY_DEVICE_STATUS), cmd.getDeviceStatus()); - assertEquals(TestValues.MATCH, JsonUtils.readBooleanFromJsonObject(parameters, UnsubscribeVehicleData.KEY_DRIVER_BRAKING), cmd.getDriverBraking()); - assertEquals(TestValues.MATCH, JsonUtils.readBooleanFromJsonObject(parameters, UnsubscribeVehicleData.KEY_WIPER_STATUS), cmd.getWiperStatus()); - assertEquals(TestValues.MATCH, JsonUtils.readBooleanFromJsonObject(parameters, UnsubscribeVehicleData.KEY_HEAD_LAMP_STATUS), cmd.getHeadLampStatus()); - assertEquals(TestValues.MATCH, JsonUtils.readBooleanFromJsonObject(parameters, UnsubscribeVehicleData.KEY_ACC_PEDAL_POSITION), cmd.getAccPedalPosition()); - assertEquals(TestValues.MATCH, JsonUtils.readBooleanFromJsonObject(parameters, UnsubscribeVehicleData.KEY_STEERING_WHEEL_ANGLE), cmd.getSteeringWheelAngle()); - assertEquals(TestValues.MATCH, JsonUtils.readBooleanFromJsonObject(parameters, UnsubscribeVehicleData.KEY_E_CALL_INFO), cmd.getECallInfo()); - assertEquals(TestValues.MATCH, JsonUtils.readBooleanFromJsonObject(parameters, UnsubscribeVehicleData.KEY_AIRBAG_STATUS), cmd.getAirbagStatus()); - assertEquals(TestValues.MATCH, JsonUtils.readBooleanFromJsonObject(parameters, UnsubscribeVehicleData.KEY_EMERGENCY_EVENT), cmd.getEmergencyEvent()); - assertEquals(TestValues.MATCH, JsonUtils.readBooleanFromJsonObject(parameters, UnsubscribeVehicleData.KEY_CLUSTER_MODE_STATUS), cmd.getClusterModeStatus()); - assertEquals(TestValues.MATCH, JsonUtils.readBooleanFromJsonObject(parameters, UnsubscribeVehicleData.KEY_MY_KEY), cmd.getMyKey()); - assertEquals(TestValues.MATCH, JsonUtils.readBooleanFromJsonObject(parameters, UnsubscribeVehicleData.KEY_FUEL_RANGE), cmd.getFuelRange()); - assertEquals(TestValues.MATCH, JsonUtils.readBooleanFromJsonObject(parameters, UnsubscribeVehicleData.KEY_TURN_SIGNAL), cmd.getTurnSignal()); - assertEquals(TestValues.MATCH, JsonUtils.readBooleanFromJsonObject(parameters, UnsubscribeVehicleData.KEY_ELECTRONIC_PARK_BRAKE_STATUS), cmd.getElectronicParkBrakeStatus()); - assertEquals(TestValues.MATCH, JsonUtils.readBooleanFromJsonObject(parameters, UnsubscribeVehicleData.KEY_CLOUD_APP_VEHICLE_ID), cmd.getCloudAppVehicleID()); - assertEquals(TestValues.MATCH, JsonUtils.readBooleanFromJsonObject(parameters, UnsubscribeVehicleData.KEY_HANDS_OFF_STEERING), cmd.getHandsOffSteering()); - assertEquals(TestValues.MATCH, JsonUtils.readBooleanFromJsonObject(parameters, UnsubscribeVehicleData.KEY_WINDOW_STATUS), cmd.getWindowStatus()); - assertEquals(TestValues.MATCH, JsonUtils.readBooleanFromJsonObject(parameters, UnsubscribeVehicleData.KEY_GEAR_STATUS), cmd.getGearStatus()); - assertEquals(TestValues.MATCH, JsonUtils.readBooleanFromJsonObject(parameters, UnsubscribeVehicleData.KEY_STABILITY_CONTROLS_STATUS), cmd.getStabilityControlsStatus()); - assertEquals(TestValues.MATCH, JsonUtils.readBooleanFromJsonObject(parameters, TestValues.GENERAL_OEM_CUSTOM_VEHICLE_DATA_NAME), cmd.getOEMCustomVehicleData(TestValues.GENERAL_OEM_CUSTOM_VEHICLE_DATA_NAME)); + JSONObject parameters = JsonUtils.readJsonObjectFromJsonObject(body, RPCMessage.KEY_PARAMETERS); + assertEquals(TestValues.MATCH, JsonUtils.readBooleanFromJsonObject(parameters, UnsubscribeVehicleData.KEY_SPEED), cmd.getSpeed()); + assertEquals(TestValues.MATCH, JsonUtils.readBooleanFromJsonObject(parameters, UnsubscribeVehicleData.KEY_RPM), cmd.getRpm()); + assertEquals(TestValues.MATCH, JsonUtils.readBooleanFromJsonObject(parameters, UnsubscribeVehicleData.KEY_EXTERNAL_TEMPERATURE), cmd.getExternalTemperature()); + assertEquals(TestValues.MATCH, JsonUtils.readBooleanFromJsonObject(parameters, UnsubscribeVehicleData.KEY_FUEL_LEVEL), cmd.getFuelLevel()); + assertEquals(TestValues.MATCH, JsonUtils.readBooleanFromJsonObject(parameters, UnsubscribeVehicleData.KEY_PRNDL), cmd.getPrndl()); + assertEquals(TestValues.MATCH, JsonUtils.readBooleanFromJsonObject(parameters, UnsubscribeVehicleData.KEY_TIRE_PRESSURE), cmd.getTirePressure()); + assertEquals(TestValues.MATCH, JsonUtils.readBooleanFromJsonObject(parameters, UnsubscribeVehicleData.KEY_ENGINE_TORQUE), cmd.getEngineTorque()); + assertEquals(TestValues.MATCH, JsonUtils.readBooleanFromJsonObject(parameters, UnsubscribeVehicleData.KEY_ENGINE_OIL_LIFE), cmd.getEngineOilLife()); + assertEquals(TestValues.MATCH, JsonUtils.readBooleanFromJsonObject(parameters, UnsubscribeVehicleData.KEY_ODOMETER), cmd.getOdometer()); + assertEquals(TestValues.MATCH, JsonUtils.readBooleanFromJsonObject(parameters, UnsubscribeVehicleData.KEY_GPS), cmd.getGps()); + assertEquals(TestValues.MATCH, JsonUtils.readBooleanFromJsonObject(parameters, UnsubscribeVehicleData.KEY_FUEL_LEVEL_STATE), cmd.getFuelLevelState()); + assertEquals(TestValues.MATCH, JsonUtils.readBooleanFromJsonObject(parameters, UnsubscribeVehicleData.KEY_INSTANT_FUEL_CONSUMPTION), cmd.getInstantFuelConsumption()); + assertEquals(TestValues.MATCH, JsonUtils.readBooleanFromJsonObject(parameters, UnsubscribeVehicleData.KEY_BELT_STATUS), cmd.getBeltStatus()); + assertEquals(TestValues.MATCH, JsonUtils.readBooleanFromJsonObject(parameters, UnsubscribeVehicleData.KEY_BODY_INFORMATION), cmd.getBodyInformation()); + assertEquals(TestValues.MATCH, JsonUtils.readBooleanFromJsonObject(parameters, UnsubscribeVehicleData.KEY_DEVICE_STATUS), cmd.getDeviceStatus()); + assertEquals(TestValues.MATCH, JsonUtils.readBooleanFromJsonObject(parameters, UnsubscribeVehicleData.KEY_DRIVER_BRAKING), cmd.getDriverBraking()); + assertEquals(TestValues.MATCH, JsonUtils.readBooleanFromJsonObject(parameters, UnsubscribeVehicleData.KEY_WIPER_STATUS), cmd.getWiperStatus()); + assertEquals(TestValues.MATCH, JsonUtils.readBooleanFromJsonObject(parameters, UnsubscribeVehicleData.KEY_HEAD_LAMP_STATUS), cmd.getHeadLampStatus()); + assertEquals(TestValues.MATCH, JsonUtils.readBooleanFromJsonObject(parameters, UnsubscribeVehicleData.KEY_ACC_PEDAL_POSITION), cmd.getAccPedalPosition()); + assertEquals(TestValues.MATCH, JsonUtils.readBooleanFromJsonObject(parameters, UnsubscribeVehicleData.KEY_STEERING_WHEEL_ANGLE), cmd.getSteeringWheelAngle()); + assertEquals(TestValues.MATCH, JsonUtils.readBooleanFromJsonObject(parameters, UnsubscribeVehicleData.KEY_E_CALL_INFO), cmd.getECallInfo()); + assertEquals(TestValues.MATCH, JsonUtils.readBooleanFromJsonObject(parameters, UnsubscribeVehicleData.KEY_AIRBAG_STATUS), cmd.getAirbagStatus()); + assertEquals(TestValues.MATCH, JsonUtils.readBooleanFromJsonObject(parameters, UnsubscribeVehicleData.KEY_EMERGENCY_EVENT), cmd.getEmergencyEvent()); + assertEquals(TestValues.MATCH, JsonUtils.readBooleanFromJsonObject(parameters, UnsubscribeVehicleData.KEY_CLUSTER_MODE_STATUS), cmd.getClusterModeStatus()); + assertEquals(TestValues.MATCH, JsonUtils.readBooleanFromJsonObject(parameters, UnsubscribeVehicleData.KEY_MY_KEY), cmd.getMyKey()); + assertEquals(TestValues.MATCH, JsonUtils.readBooleanFromJsonObject(parameters, UnsubscribeVehicleData.KEY_FUEL_RANGE), cmd.getFuelRange()); + assertEquals(TestValues.MATCH, JsonUtils.readBooleanFromJsonObject(parameters, UnsubscribeVehicleData.KEY_TURN_SIGNAL), cmd.getTurnSignal()); + assertEquals(TestValues.MATCH, JsonUtils.readBooleanFromJsonObject(parameters, UnsubscribeVehicleData.KEY_ELECTRONIC_PARK_BRAKE_STATUS), cmd.getElectronicParkBrakeStatus()); + assertEquals(TestValues.MATCH, JsonUtils.readBooleanFromJsonObject(parameters, UnsubscribeVehicleData.KEY_CLOUD_APP_VEHICLE_ID), cmd.getCloudAppVehicleID()); + assertEquals(TestValues.MATCH, JsonUtils.readBooleanFromJsonObject(parameters, UnsubscribeVehicleData.KEY_HANDS_OFF_STEERING), cmd.getHandsOffSteering()); + assertEquals(TestValues.MATCH, JsonUtils.readBooleanFromJsonObject(parameters, UnsubscribeVehicleData.KEY_WINDOW_STATUS), cmd.getWindowStatus()); + assertEquals(TestValues.MATCH, JsonUtils.readBooleanFromJsonObject(parameters, UnsubscribeVehicleData.KEY_GEAR_STATUS), cmd.getGearStatus()); + assertEquals(TestValues.MATCH, JsonUtils.readBooleanFromJsonObject(parameters, UnsubscribeVehicleData.KEY_STABILITY_CONTROLS_STATUS), cmd.getStabilityControlsStatus()); + assertEquals(TestValues.MATCH, JsonUtils.readBooleanFromJsonObject(parameters, TestValues.GENERAL_OEM_CUSTOM_VEHICLE_DATA_NAME), cmd.getOEMCustomVehicleData(TestValues.GENERAL_OEM_CUSTOM_VEHICLE_DATA_NAME)); - } - catch (JSONException e) { - fail(TestValues.JSON_FAIL); - } - } + } catch (JSONException e) { + fail(TestValues.JSON_FAIL); + } + } }
\ No newline at end of file diff --git a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/UnsubscribeWayPointsTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/UnsubscribeWayPointsTests.java index fe3aa9ffc..a0320aa08 100644 --- a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/UnsubscribeWayPointsTests.java +++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/UnsubscribeWayPointsTests.java @@ -49,7 +49,7 @@ public class UnsubscribeWayPointsTests extends BaseRpcTests { * Tests the expected values of the RPC message. */ @Test - public void testRpcValues () { + public void testRpcValues() { // Invalid/Null Tests UnsubscribeWayPoints msg = new UnsubscribeWayPoints(); assertNotNull(TestValues.NOT_NULL, msg); @@ -60,7 +60,7 @@ public class UnsubscribeWayPointsTests extends BaseRpcTests { * Tests a valid JSON construction of this RPC message. */ @Test - public void testJsonConstructor () { + public void testJsonConstructor() { JSONObject commandJson = JsonFileReader.readId(getInstrumentation().getTargetContext(), getCommandType(), getMessageType()); assertNotNull(TestValues.NOT_NULL, commandJson); diff --git a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/UpdateTurnListTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/UpdateTurnListTests.java index 195530934..4f5cd4285 100644 --- a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/UpdateTurnListTests.java +++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/UpdateTurnListTests.java @@ -29,107 +29,107 @@ import static junit.framework.TestCase.assertTrue; import static junit.framework.TestCase.fail; /** - * This is a unit test class for the SmartDeviceLink library project class : + * This is a unit test class for the SmartDeviceLink library project class : * {@link com.smartdevicelink.proxy.rpc.UpdateTurnList} */ public class UpdateTurnListTests extends BaseRpcTests { @Override protected RPCMessage createMessage() { - UpdateTurnList msg = new UpdateTurnList(); - - msg.setTurnList(TestValues.GENERAL_TURN_LIST); - msg.setSoftButtons(TestValues.GENERAL_SOFTBUTTON_LIST); - - return msg; + UpdateTurnList msg = new UpdateTurnList(); + + msg.setTurnList(TestValues.GENERAL_TURN_LIST); + msg.setSoftButtons(TestValues.GENERAL_SOFTBUTTON_LIST); + + return msg; } - + @Override - protected String getMessageType(){ + protected String getMessageType() { return RPCMessage.KEY_REQUEST; } @Override - protected String getCommandType(){ + protected String getCommandType() { return FunctionID.UPDATE_TURN_LIST.toString(); } - + @Override - protected JSONObject getExpectedParameters(int sdlVersion){ + protected JSONObject getExpectedParameters(int sdlVersion) { JSONObject result = new JSONObject(); - - try{ - result.put(UpdateTurnList.KEY_SOFT_BUTTONS, TestValues.JSON_SOFTBUTTONS); - result.put(UpdateTurnList.KEY_TURN_LIST, TestValues.JSON_TURNS); - } catch(JSONException e){ - fail(TestValues.JSON_FAIL); + + try { + result.put(UpdateTurnList.KEY_SOFT_BUTTONS, TestValues.JSON_SOFTBUTTONS); + result.put(UpdateTurnList.KEY_TURN_LIST, TestValues.JSON_TURNS); + } catch (JSONException e) { + fail(TestValues.JSON_FAIL); } return result; } /** - * Tests the expected values of the RPC message. - */ + * Tests the expected values of the RPC message. + */ @Test - public void testRpcValues () { - // Test Values - List<SoftButton> testSoftButtonList = ( (UpdateTurnList) msg ).getSoftButtons(); - List<Turn> testTurnList = ( (UpdateTurnList) msg ).getTurnList(); - - // Valid Tests - assertNotNull(TestValues.NOT_NULL, testSoftButtonList); - assertNotNull(TestValues.NOT_NULL, testTurnList); - - assertTrue(TestValues.TRUE, Validator.validateSoftButtons(TestValues.GENERAL_SOFTBUTTON_LIST, testSoftButtonList)); - assertTrue(TestValues.TRUE, Validator.validateTurnList(TestValues.GENERAL_TURN_LIST, testTurnList)); - - // Invalid/Null Tests - UpdateTurnList msg = new UpdateTurnList(); + public void testRpcValues() { + // Test Values + List<SoftButton> testSoftButtonList = ((UpdateTurnList) msg).getSoftButtons(); + List<Turn> testTurnList = ((UpdateTurnList) msg).getTurnList(); + + // Valid Tests + assertNotNull(TestValues.NOT_NULL, testSoftButtonList); + assertNotNull(TestValues.NOT_NULL, testTurnList); + + assertTrue(TestValues.TRUE, Validator.validateSoftButtons(TestValues.GENERAL_SOFTBUTTON_LIST, testSoftButtonList)); + assertTrue(TestValues.TRUE, Validator.validateTurnList(TestValues.GENERAL_TURN_LIST, testTurnList)); + + // Invalid/Null Tests + UpdateTurnList msg = new UpdateTurnList(); assertNotNull(TestValues.NOT_NULL, msg); testNullBase(msg); assertNull(TestValues.NULL, msg.getTurnList()); assertNull(TestValues.NULL, msg.getSoftButtons()); } - + /** * Tests a valid JSON construction of this RPC message. */ @Test - public void testJsonConstructor () { - JSONObject commandJson = JsonFileReader.readId(getInstrumentation().getTargetContext(), getCommandType(), getMessageType()); - assertNotNull(TestValues.NOT_NULL, commandJson); - - try { - Hashtable<String, Object> hash = JsonRPCMarshaller.deserializeJSONObject(commandJson); - UpdateTurnList cmd = new UpdateTurnList(hash); - JSONObject body = JsonUtils.readJsonObjectFromJsonObject(commandJson, getMessageType()); - assertNotNull(TestValues.NOT_NULL, body); - - // Test everything in the json body. - assertEquals(TestValues.MATCH, JsonUtils.readStringFromJsonObject(body, RPCMessage.KEY_FUNCTION_NAME), cmd.getFunctionName()); - assertEquals(TestValues.MATCH, JsonUtils.readIntegerFromJsonObject(body, RPCMessage.KEY_CORRELATION_ID), cmd.getCorrelationID()); - - JSONObject parameters = JsonUtils.readJsonObjectFromJsonObject(body, RPCMessage.KEY_PARAMETERS); - JSONArray softButtonArray = JsonUtils.readJsonArrayFromJsonObject(parameters, UpdateTurnList.KEY_SOFT_BUTTONS); - List<SoftButton> softButtonList = new ArrayList<SoftButton>(); - for (int index = 0; index < softButtonArray.length(); index++) { - SoftButton chunk = new SoftButton(JsonRPCMarshaller.deserializeJSONObject( (JSONObject)softButtonArray.get(index)) ); - softButtonList.add(chunk); - } - assertTrue(TestValues.TRUE, Validator.validateSoftButtons(softButtonList, cmd.getSoftButtons())); - - JSONArray turnArray = JsonUtils.readJsonArrayFromJsonObject(parameters, UpdateTurnList.KEY_TURN_LIST); - List<Turn> turnList = new ArrayList<Turn>(); - for (int index = 0; index < turnArray.length(); index++) { - Turn chunk = new Turn(JsonRPCMarshaller.deserializeJSONObject((JSONObject) turnArray.get(index))); - if (chunk != null) - turnList.add(chunk); - } - assertTrue(TestValues.TRUE, Validator.validateTurnList(turnList, cmd.getTurnList())); - } catch (JSONException e) { - fail(TestValues.JSON_FAIL); - } + public void testJsonConstructor() { + JSONObject commandJson = JsonFileReader.readId(getInstrumentation().getTargetContext(), getCommandType(), getMessageType()); + assertNotNull(TestValues.NOT_NULL, commandJson); + + try { + Hashtable<String, Object> hash = JsonRPCMarshaller.deserializeJSONObject(commandJson); + UpdateTurnList cmd = new UpdateTurnList(hash); + JSONObject body = JsonUtils.readJsonObjectFromJsonObject(commandJson, getMessageType()); + assertNotNull(TestValues.NOT_NULL, body); + + // Test everything in the json body. + assertEquals(TestValues.MATCH, JsonUtils.readStringFromJsonObject(body, RPCMessage.KEY_FUNCTION_NAME), cmd.getFunctionName()); + assertEquals(TestValues.MATCH, JsonUtils.readIntegerFromJsonObject(body, RPCMessage.KEY_CORRELATION_ID), cmd.getCorrelationID()); + + JSONObject parameters = JsonUtils.readJsonObjectFromJsonObject(body, RPCMessage.KEY_PARAMETERS); + JSONArray softButtonArray = JsonUtils.readJsonArrayFromJsonObject(parameters, UpdateTurnList.KEY_SOFT_BUTTONS); + List<SoftButton> softButtonList = new ArrayList<SoftButton>(); + for (int index = 0; index < softButtonArray.length(); index++) { + SoftButton chunk = new SoftButton(JsonRPCMarshaller.deserializeJSONObject((JSONObject) softButtonArray.get(index))); + softButtonList.add(chunk); + } + assertTrue(TestValues.TRUE, Validator.validateSoftButtons(softButtonList, cmd.getSoftButtons())); + + JSONArray turnArray = JsonUtils.readJsonArrayFromJsonObject(parameters, UpdateTurnList.KEY_TURN_LIST); + List<Turn> turnList = new ArrayList<Turn>(); + for (int index = 0; index < turnArray.length(); index++) { + Turn chunk = new Turn(JsonRPCMarshaller.deserializeJSONObject((JSONObject) turnArray.get(index))); + if (chunk != null) + turnList.add(chunk); + } + assertTrue(TestValues.TRUE, Validator.validateTurnList(turnList, cmd.getTurnList())); + } catch (JSONException e) { + fail(TestValues.JSON_FAIL); + } } }
\ No newline at end of file diff --git a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/AddCommandResponseTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/AddCommandResponseTests.java index 459fce382..52e113be4 100644 --- a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/AddCommandResponseTests.java +++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/AddCommandResponseTests.java @@ -21,62 +21,62 @@ import static junit.framework.TestCase.assertEquals; import static junit.framework.TestCase.assertNotNull; /** - * This is a unit test class for the SmartDeviceLink library project class : + * This is a unit test class for the SmartDeviceLink library project class : * {@link com.smartdevicelink.proxy.rpc.AddCommandResponse} */ -public class AddCommandResponseTests extends BaseRpcTests{ +public class AddCommandResponseTests extends BaseRpcTests { @Override - protected RPCMessage createMessage(){ + protected RPCMessage createMessage() { return new AddCommandResponse(); } @Override - protected String getMessageType(){ + protected String getMessageType() { return RPCMessage.KEY_RESPONSE; } @Override - protected String getCommandType(){ + protected String getCommandType() { return FunctionID.ADD_COMMAND.toString(); } @Override - protected JSONObject getExpectedParameters(int sdlVersion){ + protected JSONObject getExpectedParameters(int sdlVersion) { return new JSONObject(); } /** - * Tests the expected values of the RPC message. - */ + * Tests the expected values of the RPC message. + */ @Test - public void testRpcValues () { - // Invalid/Null Tests + public void testRpcValues() { + // Invalid/Null Tests AddCommandResponse msg = new AddCommandResponse(); assertNotNull(TestValues.NOT_NULL, msg); testNullBase(msg); } - + /** * Tests a valid JSON construction of this RPC message. */ @Test - public void testJsonConstructor () { - JSONObject commandJson = JsonFileReader.readId(getInstrumentation().getTargetContext(), getCommandType(), getMessageType()); - assertNotNull(TestValues.NOT_NULL, commandJson); - - try { - Hashtable<String, Object> hash = JsonRPCMarshaller.deserializeJSONObject(commandJson); - AddCommand cmd = new AddCommand(hash); - - JSONObject body = JsonUtils.readJsonObjectFromJsonObject(commandJson, getMessageType()); - assertNotNull(TestValues.NOT_NULL, body); - - // Test everything in the json body. - assertEquals(TestValues.MATCH, JsonUtils.readStringFromJsonObject(body, RPCMessage.KEY_FUNCTION_NAME), cmd.getFunctionName()); - assertEquals(TestValues.MATCH, JsonUtils.readIntegerFromJsonObject(body, RPCMessage.KEY_CORRELATION_ID), cmd.getCorrelationID()); - } catch (JSONException e) { - e.printStackTrace(); - } + public void testJsonConstructor() { + JSONObject commandJson = JsonFileReader.readId(getInstrumentation().getTargetContext(), getCommandType(), getMessageType()); + assertNotNull(TestValues.NOT_NULL, commandJson); + + try { + Hashtable<String, Object> hash = JsonRPCMarshaller.deserializeJSONObject(commandJson); + AddCommand cmd = new AddCommand(hash); + + JSONObject body = JsonUtils.readJsonObjectFromJsonObject(commandJson, getMessageType()); + assertNotNull(TestValues.NOT_NULL, body); + + // Test everything in the json body. + assertEquals(TestValues.MATCH, JsonUtils.readStringFromJsonObject(body, RPCMessage.KEY_FUNCTION_NAME), cmd.getFunctionName()); + assertEquals(TestValues.MATCH, JsonUtils.readIntegerFromJsonObject(body, RPCMessage.KEY_CORRELATION_ID), cmd.getCorrelationID()); + } catch (JSONException e) { + e.printStackTrace(); + } } }
\ No newline at end of file diff --git a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/AddSubmenuResponseTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/AddSubmenuResponseTests.java index c4cf43309..826d8f481 100644 --- a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/AddSubmenuResponseTests.java +++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/AddSubmenuResponseTests.java @@ -20,37 +20,37 @@ import static junit.framework.TestCase.assertEquals; import static junit.framework.TestCase.assertNotNull; /** - * This is a unit test class for the SmartDeviceLink library project class : + * This is a unit test class for the SmartDeviceLink library project class : * {@link com.smartdevicelink.proxy.rpc.AddSubMenuResponse} */ -public class AddSubmenuResponseTests extends BaseRpcTests{ +public class AddSubmenuResponseTests extends BaseRpcTests { @Override - protected RPCMessage createMessage(){ + protected RPCMessage createMessage() { return new AddSubMenuResponse(); } @Override - protected String getMessageType(){ + protected String getMessageType() { return RPCMessage.KEY_RESPONSE; } @Override - protected String getCommandType(){ + protected String getCommandType() { return FunctionID.ADD_SUB_MENU.toString(); } @Override - protected JSONObject getExpectedParameters(int sdlVersion){ + protected JSONObject getExpectedParameters(int sdlVersion) { return new JSONObject(); } /** - * Tests the expected values of the RPC message. - */ + * Tests the expected values of the RPC message. + */ @Test - public void testRpcValues () { - // Invalid/Null Tests + public void testRpcValues() { + // Invalid/Null Tests AddSubMenuResponse msg = new AddSubMenuResponse(); assertNotNull(TestValues.NOT_NULL, msg); testNullBase(msg); @@ -60,22 +60,22 @@ public class AddSubmenuResponseTests extends BaseRpcTests{ * Tests a valid JSON construction of this RPC message. */ @Test - public void testJsonConstructor () { - JSONObject commandJson = JsonFileReader.readId(getInstrumentation().getTargetContext(), getCommandType(), getMessageType()); - assertNotNull(TestValues.NOT_NULL, commandJson); - - try { - Hashtable<String, Object> hash = JsonRPCMarshaller.deserializeJSONObject(commandJson); - AddSubMenuResponse cmd = new AddSubMenuResponse(hash); - - JSONObject body = JsonUtils.readJsonObjectFromJsonObject(commandJson, getMessageType()); - assertNotNull(TestValues.NOT_NULL, body); - - // Test everything in the json body. - assertEquals(TestValues.MATCH, JsonUtils.readStringFromJsonObject(body, RPCMessage.KEY_FUNCTION_NAME), cmd.getFunctionName()); - assertEquals(TestValues.MATCH, JsonUtils.readIntegerFromJsonObject(body, RPCMessage.KEY_CORRELATION_ID), cmd.getCorrelationID()); - } catch (JSONException e) { - e.printStackTrace(); - } - } + public void testJsonConstructor() { + JSONObject commandJson = JsonFileReader.readId(getInstrumentation().getTargetContext(), getCommandType(), getMessageType()); + assertNotNull(TestValues.NOT_NULL, commandJson); + + try { + Hashtable<String, Object> hash = JsonRPCMarshaller.deserializeJSONObject(commandJson); + AddSubMenuResponse cmd = new AddSubMenuResponse(hash); + + JSONObject body = JsonUtils.readJsonObjectFromJsonObject(commandJson, getMessageType()); + assertNotNull(TestValues.NOT_NULL, body); + + // Test everything in the json body. + assertEquals(TestValues.MATCH, JsonUtils.readStringFromJsonObject(body, RPCMessage.KEY_FUNCTION_NAME), cmd.getFunctionName()); + assertEquals(TestValues.MATCH, JsonUtils.readIntegerFromJsonObject(body, RPCMessage.KEY_CORRELATION_ID), cmd.getCorrelationID()); + } catch (JSONException e) { + e.printStackTrace(); + } + } }
\ No newline at end of file diff --git a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/AlertManeuverResponseTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/AlertManeuverResponseTests.java index 44149d663..b7caed595 100644 --- a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/AlertManeuverResponseTests.java +++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/AlertManeuverResponseTests.java @@ -20,37 +20,37 @@ import static junit.framework.TestCase.assertEquals; import static junit.framework.TestCase.assertNotNull; /** - * This is a unit test class for the SmartDeviceLink library project class : + * This is a unit test class for the SmartDeviceLink library project class : * {@link com.smartdevicelink.proxy.rpc.AlertManeuverResponse} */ public class AlertManeuverResponseTests extends BaseRpcTests { - @Override - protected RPCMessage createMessage() { - return new AlertManeuverResponse(); - } + @Override + protected RPCMessage createMessage() { + return new AlertManeuverResponse(); + } + + @Override + protected String getMessageType() { + return RPCMessage.KEY_RESPONSE; + } - @Override - protected String getMessageType() { - return RPCMessage.KEY_RESPONSE; - } + @Override + protected String getCommandType() { + return FunctionID.ALERT_MANEUVER.toString(); + } - @Override - protected String getCommandType() { - return FunctionID.ALERT_MANEUVER.toString(); - } + @Override + protected JSONObject getExpectedParameters(int sdlVersion) { + return new JSONObject(); + } - @Override - protected JSONObject getExpectedParameters(int sdlVersion) { - return new JSONObject(); - } - - /** - * Tests the expected values of the RPC message. - */ - @Test - public void testRpcValues () { - // Invalid/Null Tests + /** + * Tests the expected values of the RPC message. + */ + @Test + public void testRpcValues() { + // Invalid/Null Tests AlertManeuverResponse msg = new AlertManeuverResponse(); assertNotNull(TestValues.NOT_NULL, msg); testNullBase(msg); @@ -60,22 +60,22 @@ public class AlertManeuverResponseTests extends BaseRpcTests { * Tests a valid JSON construction of this RPC message. */ @Test - public void testJsonConstructor () { - JSONObject commandJson = JsonFileReader.readId(getInstrumentation().getTargetContext(), getCommandType(), getMessageType()); - assertNotNull(TestValues.NOT_NULL, commandJson); - - try { - Hashtable<String, Object> hash = JsonRPCMarshaller.deserializeJSONObject(commandJson); - AlertManeuverResponse cmd = new AlertManeuverResponse(hash); - - JSONObject body = JsonUtils.readJsonObjectFromJsonObject(commandJson, getMessageType()); - assertNotNull(TestValues.NOT_NULL, body); - - // Test everything in the json body. - assertEquals(TestValues.MATCH, JsonUtils.readStringFromJsonObject(body, RPCMessage.KEY_FUNCTION_NAME), cmd.getFunctionName()); - assertEquals(TestValues.MATCH, JsonUtils.readIntegerFromJsonObject(body, RPCMessage.KEY_CORRELATION_ID), cmd.getCorrelationID()); - } catch (JSONException e) { - e.printStackTrace(); - } + public void testJsonConstructor() { + JSONObject commandJson = JsonFileReader.readId(getInstrumentation().getTargetContext(), getCommandType(), getMessageType()); + assertNotNull(TestValues.NOT_NULL, commandJson); + + try { + Hashtable<String, Object> hash = JsonRPCMarshaller.deserializeJSONObject(commandJson); + AlertManeuverResponse cmd = new AlertManeuverResponse(hash); + + JSONObject body = JsonUtils.readJsonObjectFromJsonObject(commandJson, getMessageType()); + assertNotNull(TestValues.NOT_NULL, body); + + // Test everything in the json body. + assertEquals(TestValues.MATCH, JsonUtils.readStringFromJsonObject(body, RPCMessage.KEY_FUNCTION_NAME), cmd.getFunctionName()); + assertEquals(TestValues.MATCH, JsonUtils.readIntegerFromJsonObject(body, RPCMessage.KEY_CORRELATION_ID), cmd.getCorrelationID()); + } catch (JSONException e) { + e.printStackTrace(); + } } }
\ No newline at end of file diff --git a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/AlertResponseTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/AlertResponseTests.java index 7d439aacc..517e7fd3c 100644 --- a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/AlertResponseTests.java +++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/AlertResponseTests.java @@ -22,54 +22,54 @@ import static junit.framework.TestCase.assertNull; import static junit.framework.TestCase.fail; /** - * This is a unit test class for the SmartDeviceLink library project class : + * This is a unit test class for the SmartDeviceLink library project class : * {@link com.smartdevicelink.proxy.rpc.AlertResponse} */ -public class AlertResponseTests extends BaseRpcTests{ +public class AlertResponseTests extends BaseRpcTests { private static final int TRY_AGAIN_TIME = 400; @Override - protected RPCMessage createMessage(){ - AlertResponse alert = new AlertResponse(); - alert.setTryAgainTime(TRY_AGAIN_TIME); + protected RPCMessage createMessage() { + AlertResponse alert = new AlertResponse(); + alert.setTryAgainTime(TRY_AGAIN_TIME); return alert; } @Override - protected String getMessageType(){ + protected String getMessageType() { return RPCMessage.KEY_RESPONSE; } @Override - protected String getCommandType(){ + protected String getCommandType() { return FunctionID.ALERT.toString(); } @Override - protected JSONObject getExpectedParameters(int sdlVersion){ + protected JSONObject getExpectedParameters(int sdlVersion) { JSONObject result = new JSONObject(); - try{ + try { result.put(AlertResponse.KEY_TRY_AGAIN_TIME, TRY_AGAIN_TIME); - }catch(JSONException e){ - fail(TestValues.JSON_FAIL); + } catch (JSONException e) { + fail(TestValues.JSON_FAIL); } return result; } /** - * Tests the expected values of the RPC message. - */ + * Tests the expected values of the RPC message. + */ @Test - public void testRpcValues () { - // Test Values - int tryAgainTime = ( (AlertResponse) msg ).getTryAgainTime(); - + public void testRpcValues() { + // Test Values + int tryAgainTime = ((AlertResponse) msg).getTryAgainTime(); + // Valid Tests assertEquals(TestValues.MATCH, TRY_AGAIN_TIME, tryAgainTime); - + // Invalid/Null Tests AlertResponse msg = new AlertResponse(); assertNotNull(TestValues.NOT_NULL, msg); @@ -82,25 +82,25 @@ public class AlertResponseTests extends BaseRpcTests{ * Tests a valid JSON construction of this RPC message. */ @Test - public void testJsonConstructor () { - JSONObject commandJson = JsonFileReader.readId(getInstrumentation().getTargetContext(), getCommandType(), getMessageType()); - assertNotNull(TestValues.NOT_NULL, commandJson); - - try { - Hashtable<String, Object> hash = JsonRPCMarshaller.deserializeJSONObject(commandJson); - AlertResponse cmd = new AlertResponse(hash); - JSONObject body = JsonUtils.readJsonObjectFromJsonObject(commandJson, getMessageType()); - assertNotNull(TestValues.NOT_NULL, body); - - // Test everything in the json body. - assertEquals(TestValues.MATCH, JsonUtils.readStringFromJsonObject(body, RPCMessage.KEY_FUNCTION_NAME), cmd.getFunctionName()); - assertEquals(TestValues.MATCH, JsonUtils.readIntegerFromJsonObject(body, RPCMessage.KEY_CORRELATION_ID), cmd.getCorrelationID()); - - JSONObject parameters = JsonUtils.readJsonObjectFromJsonObject(body, RPCMessage.KEY_PARAMETERS); - assertEquals(TestValues.MATCH, JsonUtils.readIntegerFromJsonObject(parameters, AlertResponse.KEY_TRY_AGAIN_TIME), cmd.getTryAgainTime()); - - } catch (JSONException e) { - e.printStackTrace(); - } + public void testJsonConstructor() { + JSONObject commandJson = JsonFileReader.readId(getInstrumentation().getTargetContext(), getCommandType(), getMessageType()); + assertNotNull(TestValues.NOT_NULL, commandJson); + + try { + Hashtable<String, Object> hash = JsonRPCMarshaller.deserializeJSONObject(commandJson); + AlertResponse cmd = new AlertResponse(hash); + JSONObject body = JsonUtils.readJsonObjectFromJsonObject(commandJson, getMessageType()); + assertNotNull(TestValues.NOT_NULL, body); + + // Test everything in the json body. + assertEquals(TestValues.MATCH, JsonUtils.readStringFromJsonObject(body, RPCMessage.KEY_FUNCTION_NAME), cmd.getFunctionName()); + assertEquals(TestValues.MATCH, JsonUtils.readIntegerFromJsonObject(body, RPCMessage.KEY_CORRELATION_ID), cmd.getCorrelationID()); + + JSONObject parameters = JsonUtils.readJsonObjectFromJsonObject(body, RPCMessage.KEY_PARAMETERS); + assertEquals(TestValues.MATCH, JsonUtils.readIntegerFromJsonObject(parameters, AlertResponse.KEY_TRY_AGAIN_TIME), cmd.getTryAgainTime()); + + } catch (JSONException e) { + e.printStackTrace(); + } } }
\ No newline at end of file diff --git a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/ButtonPressResponseTest.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/ButtonPressResponseTest.java index 6350b6e80..e614bc636 100644 --- a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/ButtonPressResponseTest.java +++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/ButtonPressResponseTest.java @@ -20,37 +20,37 @@ import static junit.framework.TestCase.assertEquals; import static junit.framework.TestCase.assertNotNull; /** - * This is a unit test class for the SmartDeviceLink library project class : + * This is a unit test class for the SmartDeviceLink library project class : * {@link com.smartdevicelink.proxy.rpc.ButtonPressResponse} */ public class ButtonPressResponseTest extends BaseRpcTests { - - @Override - protected RPCMessage createMessage(){ + + @Override + protected RPCMessage createMessage() { return new ButtonPressResponse(); } @Override - protected String getMessageType(){ + protected String getMessageType() { return RPCMessage.KEY_RESPONSE; } @Override - protected String getCommandType(){ + protected String getCommandType() { return FunctionID.BUTTON_PRESS.toString(); } @Override - protected JSONObject getExpectedParameters(int sdlVersion){ + protected JSONObject getExpectedParameters(int sdlVersion) { return new JSONObject(); } /** - * Tests the expected values of the RPC message. - */ + * Tests the expected values of the RPC message. + */ @Test - public void testRpcValues () { - // Invalid/Null Tests + public void testRpcValues() { + // Invalid/Null Tests ButtonPressResponse msg = new ButtonPressResponse(); assertNotNull(TestValues.NOT_NULL, msg); testNullBase(msg); @@ -60,22 +60,22 @@ public class ButtonPressResponseTest extends BaseRpcTests { * Tests a valid JSON construction of this RPC message. */ @Test - public void testJsonConstructor () { - JSONObject commandJson = JsonFileReader.readId(getInstrumentation().getContext(), getCommandType(), getMessageType()); - assertNotNull(TestValues.NOT_NULL, commandJson); - - try { - Hashtable<String, Object> hash = JsonRPCMarshaller.deserializeJSONObject(commandJson); + public void testJsonConstructor() { + JSONObject commandJson = JsonFileReader.readId(getInstrumentation().getContext(), getCommandType(), getMessageType()); + assertNotNull(TestValues.NOT_NULL, commandJson); + + try { + Hashtable<String, Object> hash = JsonRPCMarshaller.deserializeJSONObject(commandJson); ButtonPressResponse cmd = new ButtonPressResponse(hash); - - JSONObject body = JsonUtils.readJsonObjectFromJsonObject(commandJson, getMessageType()); - assertNotNull(TestValues.NOT_NULL, body); - - // Test everything in the json body. - assertEquals(TestValues.MATCH, JsonUtils.readStringFromJsonObject(body, RPCMessage.KEY_FUNCTION_NAME), cmd.getFunctionName()); - assertEquals(TestValues.MATCH, JsonUtils.readIntegerFromJsonObject(body, RPCMessage.KEY_CORRELATION_ID), cmd.getCorrelationID()); - } catch (JSONException e) { - e.printStackTrace(); - } + + JSONObject body = JsonUtils.readJsonObjectFromJsonObject(commandJson, getMessageType()); + assertNotNull(TestValues.NOT_NULL, body); + + // Test everything in the json body. + assertEquals(TestValues.MATCH, JsonUtils.readStringFromJsonObject(body, RPCMessage.KEY_FUNCTION_NAME), cmd.getFunctionName()); + assertEquals(TestValues.MATCH, JsonUtils.readIntegerFromJsonObject(body, RPCMessage.KEY_CORRELATION_ID), cmd.getCorrelationID()); + } catch (JSONException e) { + e.printStackTrace(); + } } }
\ No newline at end of file diff --git a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/CancelInteractionResponseTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/CancelInteractionResponseTests.java index fb9374247..66f143449 100644 --- a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/CancelInteractionResponseTests.java +++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/CancelInteractionResponseTests.java @@ -60,22 +60,22 @@ import static junit.framework.TestCase.assertNotNull; public class CancelInteractionResponseTests extends BaseRpcTests { @Override - protected RPCMessage createMessage(){ + protected RPCMessage createMessage() { return new CancelInteractionResponse(); } @Override - protected String getMessageType(){ + protected String getMessageType() { return RPCMessage.KEY_RESPONSE; } @Override - protected String getCommandType(){ + protected String getCommandType() { return FunctionID.CANCEL_INTERACTION.toString(); } @Override - protected JSONObject getExpectedParameters(int sdlVersion){ + protected JSONObject getExpectedParameters(int sdlVersion) { return new JSONObject(); } @@ -83,7 +83,7 @@ public class CancelInteractionResponseTests extends BaseRpcTests { * Tests the expected values of the RPC message. */ @Test - public void testRpcValues () { + public void testRpcValues() { // Invalid/Null Tests CancelInteractionResponse msg = new CancelInteractionResponse(); assertNotNull(TestValues.NOT_NULL, msg); @@ -94,7 +94,7 @@ public class CancelInteractionResponseTests extends BaseRpcTests { * Tests a valid JSON construction of this RPC message. */ @Test - public void testJsonConstructor () { + public void testJsonConstructor() { JSONObject commandJson = JsonFileReader.readId(getInstrumentation().getTargetContext(), getCommandType(), getMessageType()); assertNotNull(TestValues.NOT_NULL, commandJson); diff --git a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/ChangeRegistrationResponseTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/ChangeRegistrationResponseTests.java index e3000a9ed..b81a73a45 100644 --- a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/ChangeRegistrationResponseTests.java +++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/ChangeRegistrationResponseTests.java @@ -20,37 +20,37 @@ import static junit.framework.TestCase.assertEquals; import static junit.framework.TestCase.assertNotNull; /** - * This is a unit test class for the SmartDeviceLink library project class : + * This is a unit test class for the SmartDeviceLink library project class : * {@link com.smartdevicelink.proxy.rpc.ChangeRegistrationResponse} */ -public class ChangeRegistrationResponseTests extends BaseRpcTests{ +public class ChangeRegistrationResponseTests extends BaseRpcTests { @Override - protected RPCMessage createMessage(){ + protected RPCMessage createMessage() { return new ChangeRegistrationResponse(); } @Override - protected String getMessageType(){ + protected String getMessageType() { return RPCMessage.KEY_RESPONSE; } @Override - protected String getCommandType(){ + protected String getCommandType() { return FunctionID.CHANGE_REGISTRATION.toString(); } @Override - protected JSONObject getExpectedParameters(int sdlVersion){ + protected JSONObject getExpectedParameters(int sdlVersion) { return new JSONObject(); } /** - * Tests the expected values of the RPC message. - */ + * Tests the expected values of the RPC message. + */ @Test - public void testRpcValues () { - // Invalid/Null Tests + public void testRpcValues() { + // Invalid/Null Tests ChangeRegistrationResponse msg = new ChangeRegistrationResponse(); assertNotNull(TestValues.NOT_NULL, msg); testNullBase(msg); @@ -60,23 +60,23 @@ public class ChangeRegistrationResponseTests extends BaseRpcTests{ * Tests a valid JSON construction of this RPC message. */ @Test - public void testJsonConstructor () { - JSONObject commandJson = JsonFileReader.readId(getInstrumentation().getTargetContext(), getCommandType(), getMessageType()); - assertNotNull(TestValues.NOT_NULL, commandJson); - - try { - Hashtable<String, Object> hash = JsonRPCMarshaller.deserializeJSONObject(commandJson); - ChangeRegistrationResponse cmd = new ChangeRegistrationResponse(hash); - - JSONObject body = JsonUtils.readJsonObjectFromJsonObject(commandJson, getMessageType()); - assertNotNull(TestValues.NOT_NULL, body); - - // Test everything in the json body. - assertEquals(TestValues.MATCH, JsonUtils.readStringFromJsonObject(body, RPCMessage.KEY_FUNCTION_NAME), cmd.getFunctionName()); - assertEquals(TestValues.MATCH, JsonUtils.readIntegerFromJsonObject(body, RPCMessage.KEY_CORRELATION_ID), cmd.getCorrelationID()); + public void testJsonConstructor() { + JSONObject commandJson = JsonFileReader.readId(getInstrumentation().getTargetContext(), getCommandType(), getMessageType()); + assertNotNull(TestValues.NOT_NULL, commandJson); + + try { + Hashtable<String, Object> hash = JsonRPCMarshaller.deserializeJSONObject(commandJson); + ChangeRegistrationResponse cmd = new ChangeRegistrationResponse(hash); + + JSONObject body = JsonUtils.readJsonObjectFromJsonObject(commandJson, getMessageType()); + assertNotNull(TestValues.NOT_NULL, body); + + // Test everything in the json body. + assertEquals(TestValues.MATCH, JsonUtils.readStringFromJsonObject(body, RPCMessage.KEY_FUNCTION_NAME), cmd.getFunctionName()); + assertEquals(TestValues.MATCH, JsonUtils.readIntegerFromJsonObject(body, RPCMessage.KEY_CORRELATION_ID), cmd.getCorrelationID()); - } catch (JSONException e) { - e.printStackTrace(); - } + } catch (JSONException e) { + e.printStackTrace(); + } } }
\ No newline at end of file diff --git a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/CloseApplicationResponseTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/CloseApplicationResponseTests.java index 135155e6e..21a41fad9 100644 --- a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/CloseApplicationResponseTests.java +++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/CloseApplicationResponseTests.java @@ -60,22 +60,22 @@ import static junit.framework.TestCase.assertNotNull; public class CloseApplicationResponseTests extends BaseRpcTests { @Override - protected RPCMessage createMessage(){ + protected RPCMessage createMessage() { return new CloseApplicationResponse(); } @Override - protected String getMessageType(){ + protected String getMessageType() { return RPCMessage.KEY_RESPONSE; } @Override - protected String getCommandType(){ + protected String getCommandType() { return FunctionID.CLOSE_APPLICATION.toString(); } @Override - protected JSONObject getExpectedParameters(int sdlVersion){ + protected JSONObject getExpectedParameters(int sdlVersion) { return new JSONObject(); } @@ -83,7 +83,7 @@ public class CloseApplicationResponseTests extends BaseRpcTests { * Tests the expected values of the RPC message. */ @Test - public void testRpcValues () { + public void testRpcValues() { // Invalid/Null Tests CloseApplicationResponse msg = new CloseApplicationResponse(); assertNotNull(TestValues.NOT_NULL, msg); @@ -94,7 +94,7 @@ public class CloseApplicationResponseTests extends BaseRpcTests { * Tests a valid JSON construction of this RPC message. */ @Test - public void testJsonConstructor () { + public void testJsonConstructor() { JSONObject commandJson = JsonFileReader.readId(getInstrumentation().getContext(), getCommandType(), getMessageType()); assertNotNull(TestValues.NOT_NULL, commandJson); diff --git a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/CreateInteractionChoiceSetResponseTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/CreateInteractionChoiceSetResponseTests.java index 3c0b783b3..34f290114 100644 --- a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/CreateInteractionChoiceSetResponseTests.java +++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/CreateInteractionChoiceSetResponseTests.java @@ -12,37 +12,37 @@ import org.junit.Test; import static junit.framework.TestCase.assertNotNull; /** - * This is a unit test class for the SmartDeviceLink library project class : + * This is a unit test class for the SmartDeviceLink library project class : * {@link com.smartdevicelink.proxy.rpc.CreateInteractionChoiceSetResponse} */ -public class CreateInteractionChoiceSetResponseTests extends BaseRpcTests{ +public class CreateInteractionChoiceSetResponseTests extends BaseRpcTests { @Override - protected RPCMessage createMessage(){ + protected RPCMessage createMessage() { return new CreateInteractionChoiceSetResponse(); } @Override - protected String getMessageType(){ + protected String getMessageType() { return RPCMessage.KEY_RESPONSE; } @Override - protected String getCommandType(){ + protected String getCommandType() { return FunctionID.CREATE_INTERACTION_CHOICE_SET.toString(); } @Override - protected JSONObject getExpectedParameters(int sdlVersion){ + protected JSONObject getExpectedParameters(int sdlVersion) { return new JSONObject(); } /** - * Tests the expected values of the RPC message. - */ + * Tests the expected values of the RPC message. + */ @Test - public void testRpcValues () { - // Invalid/Null Tests + public void testRpcValues() { + // Invalid/Null Tests CreateInteractionChoiceSetResponse msg = new CreateInteractionChoiceSetResponse(); assertNotNull(TestValues.NOT_NULL, msg); diff --git a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/DeleteCommandResponseTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/DeleteCommandResponseTests.java index 92a179855..cda4f25ba 100644 --- a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/DeleteCommandResponseTests.java +++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/DeleteCommandResponseTests.java @@ -20,37 +20,37 @@ import static junit.framework.TestCase.assertEquals; import static junit.framework.TestCase.assertNotNull; /** - * This is a unit test class for the SmartDeviceLink library project class : + * This is a unit test class for the SmartDeviceLink library project class : * {@link com.smartdevicelink.proxy.rpc.DeleteCommandResponse} */ -public class DeleteCommandResponseTests extends BaseRpcTests{ +public class DeleteCommandResponseTests extends BaseRpcTests { @Override - protected RPCMessage createMessage(){ + protected RPCMessage createMessage() { return new DeleteCommandResponse(); } @Override - protected String getMessageType(){ + protected String getMessageType() { return RPCMessage.KEY_RESPONSE; } @Override - protected String getCommandType(){ + protected String getCommandType() { return FunctionID.DELETE_COMMAND.toString(); } @Override - protected JSONObject getExpectedParameters(int sdlVersion){ + protected JSONObject getExpectedParameters(int sdlVersion) { return new JSONObject(); } /** - * Tests the expected values of the RPC message. - */ + * Tests the expected values of the RPC message. + */ @Test - public void testRpcValues () { - // Invalid/Null Tests + public void testRpcValues() { + // Invalid/Null Tests DeleteCommandResponse msg = new DeleteCommandResponse(); assertNotNull(TestValues.NOT_NULL, msg); testNullBase(msg); @@ -60,22 +60,22 @@ public class DeleteCommandResponseTests extends BaseRpcTests{ * Tests a valid JSON construction of this RPC message. */ @Test - public void testJsonConstructor () { - JSONObject commandJson = JsonFileReader.readId(getInstrumentation().getTargetContext(), getCommandType(), getMessageType()); - assertNotNull(TestValues.NOT_NULL, commandJson); - - try { - Hashtable<String, Object> hash = JsonRPCMarshaller.deserializeJSONObject(commandJson); - DeleteCommandResponse cmd = new DeleteCommandResponse(hash); - - JSONObject body = JsonUtils.readJsonObjectFromJsonObject(commandJson, getMessageType()); - assertNotNull(TestValues.NOT_NULL, body); - - // Test everything in the json body. - assertEquals(TestValues.MATCH, JsonUtils.readStringFromJsonObject(body, RPCMessage.KEY_FUNCTION_NAME), cmd.getFunctionName()); - assertEquals(TestValues.MATCH, JsonUtils.readIntegerFromJsonObject(body, RPCMessage.KEY_CORRELATION_ID), cmd.getCorrelationID()); - } catch (JSONException e) { - e.printStackTrace(); - } + public void testJsonConstructor() { + JSONObject commandJson = JsonFileReader.readId(getInstrumentation().getTargetContext(), getCommandType(), getMessageType()); + assertNotNull(TestValues.NOT_NULL, commandJson); + + try { + Hashtable<String, Object> hash = JsonRPCMarshaller.deserializeJSONObject(commandJson); + DeleteCommandResponse cmd = new DeleteCommandResponse(hash); + + JSONObject body = JsonUtils.readJsonObjectFromJsonObject(commandJson, getMessageType()); + assertNotNull(TestValues.NOT_NULL, body); + + // Test everything in the json body. + assertEquals(TestValues.MATCH, JsonUtils.readStringFromJsonObject(body, RPCMessage.KEY_FUNCTION_NAME), cmd.getFunctionName()); + assertEquals(TestValues.MATCH, JsonUtils.readIntegerFromJsonObject(body, RPCMessage.KEY_CORRELATION_ID), cmd.getCorrelationID()); + } catch (JSONException e) { + e.printStackTrace(); + } } }
\ No newline at end of file diff --git a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/DeleteFileResponseTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/DeleteFileResponseTests.java index 42b26d1bd..68dcf1bd6 100644 --- a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/DeleteFileResponseTests.java +++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/DeleteFileResponseTests.java @@ -22,13 +22,13 @@ import static junit.framework.TestCase.assertNull; import static junit.framework.TestCase.fail; /** - * This is a unit test class for the SmartDeviceLink library project class : + * This is a unit test class for the SmartDeviceLink library project class : * {@link com.smartdevicelink.proxy.rpc.DeleteFileResponse} */ -public class DeleteFileResponseTests extends BaseRpcTests{ +public class DeleteFileResponseTests extends BaseRpcTests { @Override - protected RPCMessage createMessage(){ + protected RPCMessage createMessage() { DeleteFileResponse msg = new DeleteFileResponse(); msg.setSpaceAvailable(TestValues.GENERAL_INT); @@ -37,39 +37,39 @@ public class DeleteFileResponseTests extends BaseRpcTests{ } @Override - protected String getMessageType(){ + protected String getMessageType() { return RPCMessage.KEY_RESPONSE; } @Override - protected String getCommandType(){ + protected String getCommandType() { return FunctionID.DELETE_FILE.toString(); } @Override - protected JSONObject getExpectedParameters(int sdlVersion){ + protected JSONObject getExpectedParameters(int sdlVersion) { JSONObject result = new JSONObject(); - try{ + try { result.put(DeleteFileResponse.KEY_SPACE_AVAILABLE, TestValues.GENERAL_INT); - }catch(JSONException e){ - fail(TestValues.JSON_FAIL); + } catch (JSONException e) { + fail(TestValues.JSON_FAIL); } return result; } /** - * Tests the expected values of the RPC message. - */ + * Tests the expected values of the RPC message. + */ @Test - public void testRpcValues () { - // Test Values - int spaceAvailable = ( (DeleteFileResponse) msg ).getSpaceAvailable(); - + public void testRpcValues() { + // Test Values + int spaceAvailable = ((DeleteFileResponse) msg).getSpaceAvailable(); + // Valid Tests assertEquals(TestValues.MATCH, TestValues.GENERAL_INT, spaceAvailable); - + // Invalid/Null Tests DeleteFileResponse msg = new DeleteFileResponse(); assertNotNull(TestValues.NOT_NULL, msg); @@ -82,25 +82,25 @@ public class DeleteFileResponseTests extends BaseRpcTests{ * Tests a valid JSON construction of this RPC message. */ @Test - public void testJsonConstructor () { - JSONObject commandJson = JsonFileReader.readId(getInstrumentation().getTargetContext(), getCommandType(), getMessageType()); - assertNotNull(TestValues.NOT_NULL, commandJson); - - try { - Hashtable<String, Object> hash = JsonRPCMarshaller.deserializeJSONObject(commandJson); - DeleteFileResponse cmd = new DeleteFileResponse(hash); - - JSONObject body = JsonUtils.readJsonObjectFromJsonObject(commandJson, getMessageType()); - assertNotNull(TestValues.NOT_NULL, body); - - // Test everything in the json body. - assertEquals(TestValues.MATCH, JsonUtils.readStringFromJsonObject(body, RPCMessage.KEY_FUNCTION_NAME), cmd.getFunctionName()); - assertEquals(TestValues.MATCH, JsonUtils.readIntegerFromJsonObject(body, RPCMessage.KEY_CORRELATION_ID), cmd.getCorrelationID()); - - JSONObject parameters = JsonUtils.readJsonObjectFromJsonObject(body, RPCMessage.KEY_PARAMETERS); - assertEquals(TestValues.MATCH, JsonUtils.readIntegerFromJsonObject(parameters, DeleteFileResponse.KEY_SPACE_AVAILABLE), cmd.getSpaceAvailable()); - } catch (JSONException e) { - e.printStackTrace(); - } - } + public void testJsonConstructor() { + JSONObject commandJson = JsonFileReader.readId(getInstrumentation().getTargetContext(), getCommandType(), getMessageType()); + assertNotNull(TestValues.NOT_NULL, commandJson); + + try { + Hashtable<String, Object> hash = JsonRPCMarshaller.deserializeJSONObject(commandJson); + DeleteFileResponse cmd = new DeleteFileResponse(hash); + + JSONObject body = JsonUtils.readJsonObjectFromJsonObject(commandJson, getMessageType()); + assertNotNull(TestValues.NOT_NULL, body); + + // Test everything in the json body. + assertEquals(TestValues.MATCH, JsonUtils.readStringFromJsonObject(body, RPCMessage.KEY_FUNCTION_NAME), cmd.getFunctionName()); + assertEquals(TestValues.MATCH, JsonUtils.readIntegerFromJsonObject(body, RPCMessage.KEY_CORRELATION_ID), cmd.getCorrelationID()); + + JSONObject parameters = JsonUtils.readJsonObjectFromJsonObject(body, RPCMessage.KEY_PARAMETERS); + assertEquals(TestValues.MATCH, JsonUtils.readIntegerFromJsonObject(parameters, DeleteFileResponse.KEY_SPACE_AVAILABLE), cmd.getSpaceAvailable()); + } catch (JSONException e) { + e.printStackTrace(); + } + } }
\ No newline at end of file diff --git a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/DeleteInteractionChoiceSetResponseTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/DeleteInteractionChoiceSetResponseTests.java index 53d5f58e9..647b2817c 100644 --- a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/DeleteInteractionChoiceSetResponseTests.java +++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/DeleteInteractionChoiceSetResponseTests.java @@ -20,37 +20,37 @@ import static junit.framework.TestCase.assertEquals; import static junit.framework.TestCase.assertNotNull; /** - * This is a unit test class for the SmartDeviceLink library project class : + * This is a unit test class for the SmartDeviceLink library project class : * {@link com.smartdevicelink.proxy.rpc.DeleteInteractionChoiceSetResponse} */ -public class DeleteInteractionChoiceSetResponseTests extends BaseRpcTests{ +public class DeleteInteractionChoiceSetResponseTests extends BaseRpcTests { @Override - protected RPCMessage createMessage(){ + protected RPCMessage createMessage() { return new DeleteInteractionChoiceSetResponse(); } @Override - protected String getMessageType(){ + protected String getMessageType() { return RPCMessage.KEY_RESPONSE; } @Override - protected String getCommandType(){ + protected String getCommandType() { return FunctionID.DELETE_INTERACTION_CHOICE_SET.toString(); } @Override - protected JSONObject getExpectedParameters(int sdlVersion){ + protected JSONObject getExpectedParameters(int sdlVersion) { return new JSONObject(); } /** - * Tests the expected values of the RPC message. - */ + * Tests the expected values of the RPC message. + */ @Test - public void testRpcValues () { - // Invalid/Null Tests + public void testRpcValues() { + // Invalid/Null Tests DeleteInteractionChoiceSetResponse msg = new DeleteInteractionChoiceSetResponse(); assertNotNull(TestValues.NOT_NULL, msg); testNullBase(msg); @@ -60,22 +60,22 @@ public class DeleteInteractionChoiceSetResponseTests extends BaseRpcTests{ * Tests a valid JSON construction of this RPC message. */ @Test - public void testJsonConstructor () { - JSONObject commandJson = JsonFileReader.readId(getInstrumentation().getTargetContext(), getCommandType(), getMessageType()); - assertNotNull(TestValues.NOT_NULL, commandJson); - - try { - Hashtable<String, Object> hash = JsonRPCMarshaller.deserializeJSONObject(commandJson); - DeleteInteractionChoiceSetResponse cmd = new DeleteInteractionChoiceSetResponse(hash); - - JSONObject body = JsonUtils.readJsonObjectFromJsonObject(commandJson, getMessageType()); - assertNotNull(TestValues.NOT_NULL, body); - - // Test everything in the json body. - assertEquals(TestValues.MATCH, JsonUtils.readStringFromJsonObject(body, RPCMessage.KEY_FUNCTION_NAME), cmd.getFunctionName()); - assertEquals(TestValues.MATCH, JsonUtils.readIntegerFromJsonObject(body, RPCMessage.KEY_CORRELATION_ID), cmd.getCorrelationID()); - } catch (JSONException e) { - e.printStackTrace(); - } + public void testJsonConstructor() { + JSONObject commandJson = JsonFileReader.readId(getInstrumentation().getTargetContext(), getCommandType(), getMessageType()); + assertNotNull(TestValues.NOT_NULL, commandJson); + + try { + Hashtable<String, Object> hash = JsonRPCMarshaller.deserializeJSONObject(commandJson); + DeleteInteractionChoiceSetResponse cmd = new DeleteInteractionChoiceSetResponse(hash); + + JSONObject body = JsonUtils.readJsonObjectFromJsonObject(commandJson, getMessageType()); + assertNotNull(TestValues.NOT_NULL, body); + + // Test everything in the json body. + assertEquals(TestValues.MATCH, JsonUtils.readStringFromJsonObject(body, RPCMessage.KEY_FUNCTION_NAME), cmd.getFunctionName()); + assertEquals(TestValues.MATCH, JsonUtils.readIntegerFromJsonObject(body, RPCMessage.KEY_CORRELATION_ID), cmd.getCorrelationID()); + } catch (JSONException e) { + e.printStackTrace(); + } } }
\ No newline at end of file diff --git a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/DeleteSubMenuResponseTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/DeleteSubMenuResponseTests.java index 8809b51c3..f9357510e 100644 --- a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/DeleteSubMenuResponseTests.java +++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/DeleteSubMenuResponseTests.java @@ -20,37 +20,37 @@ import static junit.framework.TestCase.assertEquals; import static junit.framework.TestCase.assertNotNull; /** - * This is a unit test class for the SmartDeviceLink library project class : + * This is a unit test class for the SmartDeviceLink library project class : * {@link com.smartdevicelink.proxy.rpc.DeleteSubMenuResponse} */ -public class DeleteSubMenuResponseTests extends BaseRpcTests{ +public class DeleteSubMenuResponseTests extends BaseRpcTests { @Override - protected RPCMessage createMessage(){ + protected RPCMessage createMessage() { return new DeleteSubMenuResponse(); } @Override - protected String getMessageType(){ + protected String getMessageType() { return RPCMessage.KEY_RESPONSE; } @Override - protected String getCommandType(){ + protected String getCommandType() { return FunctionID.DELETE_SUB_MENU.toString(); } @Override - protected JSONObject getExpectedParameters(int sdlVersion){ + protected JSONObject getExpectedParameters(int sdlVersion) { return new JSONObject(); } /** - * Tests the expected values of the RPC message. - */ + * Tests the expected values of the RPC message. + */ @Test - public void testRpcValues () { - // Invalid/Null Tests + public void testRpcValues() { + // Invalid/Null Tests DeleteSubMenuResponse msg = new DeleteSubMenuResponse(); assertNotNull(TestValues.NOT_NULL, msg); testNullBase(msg); @@ -60,22 +60,22 @@ public class DeleteSubMenuResponseTests extends BaseRpcTests{ * Tests a valid JSON construction of this RPC message. */ @Test - public void testJsonConstructor () { - JSONObject commandJson = JsonFileReader.readId(getInstrumentation().getTargetContext(), getCommandType(), getMessageType()); - assertNotNull(TestValues.NOT_NULL, commandJson); - - try { - Hashtable<String, Object> hash = JsonRPCMarshaller.deserializeJSONObject(commandJson); - DeleteSubMenuResponse cmd = new DeleteSubMenuResponse(hash); - - JSONObject body = JsonUtils.readJsonObjectFromJsonObject(commandJson, getMessageType()); - assertNotNull(TestValues.NOT_NULL, body); - - // Test everything in the json body. - assertEquals(TestValues.MATCH, JsonUtils.readStringFromJsonObject(body, RPCMessage.KEY_FUNCTION_NAME), cmd.getFunctionName()); - assertEquals(TestValues.MATCH, JsonUtils.readIntegerFromJsonObject(body, RPCMessage.KEY_CORRELATION_ID), cmd.getCorrelationID()); - } catch (JSONException e) { - e.printStackTrace(); - } + public void testJsonConstructor() { + JSONObject commandJson = JsonFileReader.readId(getInstrumentation().getTargetContext(), getCommandType(), getMessageType()); + assertNotNull(TestValues.NOT_NULL, commandJson); + + try { + Hashtable<String, Object> hash = JsonRPCMarshaller.deserializeJSONObject(commandJson); + DeleteSubMenuResponse cmd = new DeleteSubMenuResponse(hash); + + JSONObject body = JsonUtils.readJsonObjectFromJsonObject(commandJson, getMessageType()); + assertNotNull(TestValues.NOT_NULL, body); + + // Test everything in the json body. + assertEquals(TestValues.MATCH, JsonUtils.readStringFromJsonObject(body, RPCMessage.KEY_FUNCTION_NAME), cmd.getFunctionName()); + assertEquals(TestValues.MATCH, JsonUtils.readIntegerFromJsonObject(body, RPCMessage.KEY_CORRELATION_ID), cmd.getCorrelationID()); + } catch (JSONException e) { + e.printStackTrace(); + } } }
\ No newline at end of file diff --git a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/DiagnosticMessageResponseTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/DiagnosticMessageResponseTests.java index 289269ffd..5b22b5e83 100644 --- a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/DiagnosticMessageResponseTests.java +++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/DiagnosticMessageResponseTests.java @@ -25,13 +25,13 @@ import static junit.framework.TestCase.assertTrue; import static junit.framework.TestCase.fail; /** - * This is a unit test class for the SmartDeviceLink library project class : + * This is a unit test class for the SmartDeviceLink library project class : * {@link com.smartdevicelink.proxy.rpc.DiagnosticMessageResponse} */ -public class DiagnosticMessageResponseTests extends BaseRpcTests{ +public class DiagnosticMessageResponseTests extends BaseRpcTests { @Override - protected RPCMessage createMessage(){ + protected RPCMessage createMessage() { DiagnosticMessageResponse msg = new DiagnosticMessageResponse(); msg.setMessageDataResult(TestValues.GENERAL_INTEGER_LIST); @@ -40,24 +40,24 @@ public class DiagnosticMessageResponseTests extends BaseRpcTests{ } @Override - protected String getMessageType(){ + protected String getMessageType() { return RPCMessage.KEY_RESPONSE; } @Override - protected String getCommandType(){ + protected String getCommandType() { return FunctionID.DIAGNOSTIC_MESSAGE.toString(); } @Override - protected JSONObject getExpectedParameters(int sdlVersion){ + protected JSONObject getExpectedParameters(int sdlVersion) { JSONObject result = new JSONObject(); - try{ + try { result.put(DiagnosticMessageResponse.KEY_MESSAGE_DATA_RESULT, JsonUtils.createJsonArray(TestValues.GENERAL_INTEGER_LIST)); - }catch(JSONException e){ - fail(TestValues.JSON_FAIL); + } catch (JSONException e) { + fail(TestValues.JSON_FAIL); } return result; @@ -65,20 +65,20 @@ public class DiagnosticMessageResponseTests extends BaseRpcTests{ /** - * Tests the expected values of the RPC message. - */ + * Tests the expected values of the RPC message. + */ @Test - public void testRpcValues () { - // Test Values - List<Integer> cmdId = ( (DiagnosticMessageResponse) msg ).getMessageDataResult(); + public void testRpcValues() { + // Test Values + List<Integer> cmdId = ((DiagnosticMessageResponse) msg).getMessageDataResult(); // Valid Tests assertEquals(TestValues.MATCH, TestValues.GENERAL_INTEGER_LIST.size(), cmdId.size()); - for(int i = 0; i < TestValues.GENERAL_INTEGER_LIST.size(); i++){ + for (int i = 0; i < TestValues.GENERAL_INTEGER_LIST.size(); i++) { assertEquals(TestValues.MATCH, TestValues.GENERAL_INTEGER_LIST.get(i), cmdId.get(i)); } - + // Invalid/Null Tests DiagnosticMessageResponse msg = new DiagnosticMessageResponse(); assertNotNull(TestValues.NOT_NULL, msg); @@ -91,30 +91,30 @@ public class DiagnosticMessageResponseTests extends BaseRpcTests{ * Tests a valid JSON construction of this RPC message. */ @Test - public void testJsonConstructor () { - JSONObject commandJson = JsonFileReader.readId(getInstrumentation().getTargetContext(), getCommandType(), getMessageType()); - assertNotNull(TestValues.NOT_NULL, commandJson); - - try { - Hashtable<String, Object> hash = JsonRPCMarshaller.deserializeJSONObject(commandJson); - DiagnosticMessageResponse cmd = new DiagnosticMessageResponse(hash); - - JSONObject body = JsonUtils.readJsonObjectFromJsonObject(commandJson, getMessageType()); - assertNotNull(TestValues.NOT_NULL, body); - - // Test everything in the json body. - assertEquals(TestValues.MATCH, JsonUtils.readStringFromJsonObject(body, RPCMessage.KEY_FUNCTION_NAME), cmd.getFunctionName()); - assertEquals(TestValues.MATCH, JsonUtils.readIntegerFromJsonObject(body, RPCMessage.KEY_CORRELATION_ID), cmd.getCorrelationID()); - - JSONObject parameters = JsonUtils.readJsonObjectFromJsonObject(body, RPCMessage.KEY_PARAMETERS); - - List<Integer> dataResultList = JsonUtils.readIntegerListFromJsonObject(parameters, DiagnosticMessageResponse.KEY_MESSAGE_DATA_RESULT); - List<Integer> testResultList = cmd.getMessageDataResult(); - - assertEquals(TestValues.MATCH, dataResultList.size(), testResultList.size()); - assertTrue(TestValues.TRUE, Validator.validateIntegerList(dataResultList, testResultList)); - } catch (JSONException e) { - e.printStackTrace(); - } + public void testJsonConstructor() { + JSONObject commandJson = JsonFileReader.readId(getInstrumentation().getTargetContext(), getCommandType(), getMessageType()); + assertNotNull(TestValues.NOT_NULL, commandJson); + + try { + Hashtable<String, Object> hash = JsonRPCMarshaller.deserializeJSONObject(commandJson); + DiagnosticMessageResponse cmd = new DiagnosticMessageResponse(hash); + + JSONObject body = JsonUtils.readJsonObjectFromJsonObject(commandJson, getMessageType()); + assertNotNull(TestValues.NOT_NULL, body); + + // Test everything in the json body. + assertEquals(TestValues.MATCH, JsonUtils.readStringFromJsonObject(body, RPCMessage.KEY_FUNCTION_NAME), cmd.getFunctionName()); + assertEquals(TestValues.MATCH, JsonUtils.readIntegerFromJsonObject(body, RPCMessage.KEY_CORRELATION_ID), cmd.getCorrelationID()); + + JSONObject parameters = JsonUtils.readJsonObjectFromJsonObject(body, RPCMessage.KEY_PARAMETERS); + + List<Integer> dataResultList = JsonUtils.readIntegerListFromJsonObject(parameters, DiagnosticMessageResponse.KEY_MESSAGE_DATA_RESULT); + List<Integer> testResultList = cmd.getMessageDataResult(); + + assertEquals(TestValues.MATCH, dataResultList.size(), testResultList.size()); + assertTrue(TestValues.TRUE, Validator.validateIntegerList(dataResultList, testResultList)); + } catch (JSONException e) { + e.printStackTrace(); + } } }
\ No newline at end of file diff --git a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/DialNumberResponseTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/DialNumberResponseTests.java index 006e6d050..ec3e6c32e 100644 --- a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/DialNumberResponseTests.java +++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/DialNumberResponseTests.java @@ -49,7 +49,7 @@ public class DialNumberResponseTests extends BaseRpcTests { * Tests the expected values of the RPC message. */ @Test - public void testRpcValues () { + public void testRpcValues() { // Invalid/Null Tests DialNumberResponse msg = new DialNumberResponse(); assertNotNull(TestValues.NOT_NULL, msg); @@ -60,7 +60,7 @@ public class DialNumberResponseTests extends BaseRpcTests { * Tests a valid JSON construction of this RPC message. */ @Test - public void testJsonConstructor () { + public void testJsonConstructor() { JSONObject commandJson = JsonFileReader.readId(getInstrumentation().getTargetContext(), getCommandType(), getMessageType()); assertNotNull(TestValues.NOT_NULL, commandJson); diff --git a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/EndAudioPassThruResponseTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/EndAudioPassThruResponseTests.java index a3a79b6bd..35ea755b4 100644 --- a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/EndAudioPassThruResponseTests.java +++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/EndAudioPassThruResponseTests.java @@ -20,37 +20,37 @@ import static junit.framework.TestCase.assertEquals; import static junit.framework.TestCase.assertNotNull; /** - * This is a unit test class for the SmartDeviceLink library project class : + * This is a unit test class for the SmartDeviceLink library project class : * {@link com.smartdevicelink.proxy.rpc.EndAudioPassThruResponse} */ -public class EndAudioPassThruResponseTests extends BaseRpcTests{ +public class EndAudioPassThruResponseTests extends BaseRpcTests { @Override - protected RPCMessage createMessage(){ + protected RPCMessage createMessage() { return new EndAudioPassThruResponse(); } @Override - protected String getMessageType(){ + protected String getMessageType() { return RPCMessage.KEY_RESPONSE; } @Override - protected String getCommandType(){ + protected String getCommandType() { return FunctionID.END_AUDIO_PASS_THRU.toString(); } @Override - protected JSONObject getExpectedParameters(int sdlVersion){ + protected JSONObject getExpectedParameters(int sdlVersion) { return new JSONObject(); } /** - * Tests the expected values of the RPC message. - */ + * Tests the expected values of the RPC message. + */ @Test - public void testRpcValues () { - // Invalid/Null Tests + public void testRpcValues() { + // Invalid/Null Tests EndAudioPassThruResponse msg = new EndAudioPassThruResponse(); assertNotNull(TestValues.NOT_NULL, msg); testNullBase(msg); @@ -60,22 +60,22 @@ public class EndAudioPassThruResponseTests extends BaseRpcTests{ * Tests a valid JSON construction of this RPC message. */ @Test - public void testJsonConstructor () { - JSONObject commandJson = JsonFileReader.readId(getInstrumentation().getTargetContext(), getCommandType(), getMessageType()); - assertNotNull(TestValues.NOT_NULL, commandJson); - - try { - Hashtable<String, Object> hash = JsonRPCMarshaller.deserializeJSONObject(commandJson); - EndAudioPassThruResponse cmd = new EndAudioPassThruResponse(hash); - - JSONObject body = JsonUtils.readJsonObjectFromJsonObject(commandJson, getMessageType()); - assertNotNull(TestValues.NOT_NULL, body); - - // Test everything in the json body. - assertEquals(TestValues.MATCH, JsonUtils.readStringFromJsonObject(body, RPCMessage.KEY_FUNCTION_NAME), cmd.getFunctionName()); - assertEquals(TestValues.MATCH, JsonUtils.readIntegerFromJsonObject(body, RPCMessage.KEY_CORRELATION_ID), cmd.getCorrelationID()); - } catch (JSONException e) { - e.printStackTrace(); - } + public void testJsonConstructor() { + JSONObject commandJson = JsonFileReader.readId(getInstrumentation().getTargetContext(), getCommandType(), getMessageType()); + assertNotNull(TestValues.NOT_NULL, commandJson); + + try { + Hashtable<String, Object> hash = JsonRPCMarshaller.deserializeJSONObject(commandJson); + EndAudioPassThruResponse cmd = new EndAudioPassThruResponse(hash); + + JSONObject body = JsonUtils.readJsonObjectFromJsonObject(commandJson, getMessageType()); + assertNotNull(TestValues.NOT_NULL, body); + + // Test everything in the json body. + assertEquals(TestValues.MATCH, JsonUtils.readStringFromJsonObject(body, RPCMessage.KEY_FUNCTION_NAME), cmd.getFunctionName()); + assertEquals(TestValues.MATCH, JsonUtils.readIntegerFromJsonObject(body, RPCMessage.KEY_CORRELATION_ID), cmd.getCorrelationID()); + } catch (JSONException e) { + e.printStackTrace(); + } } }
\ No newline at end of file diff --git a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/GenericResponseTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/GenericResponseTests.java index ecb6fad7c..f22e9ecca 100644 --- a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/GenericResponseTests.java +++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/GenericResponseTests.java @@ -12,37 +12,37 @@ import org.junit.Test; import static junit.framework.TestCase.assertNotNull; /** - * This is a unit test class for the SmartDeviceLink library project class : + * This is a unit test class for the SmartDeviceLink library project class : * {@link com.smartdevicelink.proxy.rpc.GenericResponse} */ -public class GenericResponseTests extends BaseRpcTests{ +public class GenericResponseTests extends BaseRpcTests { @Override - protected RPCMessage createMessage(){ + protected RPCMessage createMessage() { return new GenericResponse(); } @Override - protected String getMessageType(){ + protected String getMessageType() { return RPCMessage.KEY_RESPONSE; } @Override - protected String getCommandType(){ + protected String getCommandType() { return FunctionID.GENERIC_RESPONSE.toString(); } @Override - protected JSONObject getExpectedParameters(int sdlVersion){ + protected JSONObject getExpectedParameters(int sdlVersion) { return new JSONObject(); } /** - * Tests the expected values of the RPC message. - */ + * Tests the expected values of the RPC message. + */ @Test - public void testRpcValues () { - // Invalid/Null Tests + public void testRpcValues() { + // Invalid/Null Tests GenericResponse msg = new GenericResponse(); assertNotNull(TestValues.NOT_NULL, msg); testNullBase(msg); diff --git a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/GetAppServiceDataResponseTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/GetAppServiceDataResponseTests.java index 49de496e4..8bc12e5d7 100644 --- a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/GetAppServiceDataResponseTests.java +++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/GetAppServiceDataResponseTests.java @@ -26,61 +26,61 @@ import static junit.framework.TestCase.assertNotNull; */ public class GetAppServiceDataResponseTests extends BaseRpcTests { - @Override - protected RPCMessage createMessage(){ - return new GetAppServiceDataResponse(); - } + @Override + protected RPCMessage createMessage() { + return new GetAppServiceDataResponse(); + } - @Override - protected String getMessageType(){ - return RPCMessage.KEY_RESPONSE; - } + @Override + protected String getMessageType() { + return RPCMessage.KEY_RESPONSE; + } - @Override - protected String getCommandType(){ - return FunctionID.GET_APP_SERVICE_DATA.toString(); - } + @Override + protected String getCommandType() { + return FunctionID.GET_APP_SERVICE_DATA.toString(); + } - @Override - protected JSONObject getExpectedParameters(int sdlVersion){ - return new JSONObject(); - } + @Override + protected JSONObject getExpectedParameters(int sdlVersion) { + return new JSONObject(); + } - /** - * Tests the expected values of the RPC message. - */ - @Test - public void testRpcValues () { - // Invalid/Null Tests - GetAppServiceDataResponse msg = new GetAppServiceDataResponse(); - msg.setServiceData(TestValues.GENERAL_APPSERVICEDATA); - assertNotNull(TestValues.NOT_NULL, msg); - testNullBase(msg); + /** + * Tests the expected values of the RPC message. + */ + @Test + public void testRpcValues() { + // Invalid/Null Tests + GetAppServiceDataResponse msg = new GetAppServiceDataResponse(); + msg.setServiceData(TestValues.GENERAL_APPSERVICEDATA); + assertNotNull(TestValues.NOT_NULL, msg); + testNullBase(msg); - // test getter - AppServiceData serviceData = msg.getServiceData(); - assertEquals(TestValues.GENERAL_APPSERVICEDATA, serviceData); - } + // test getter + AppServiceData serviceData = msg.getServiceData(); + assertEquals(TestValues.GENERAL_APPSERVICEDATA, serviceData); + } - /** - * Tests a valid JSON construction of this RPC message. - */ - @Test - public void testJsonConstructor () { - JSONObject commandJson = JsonFileReader.readId(getInstrumentation().getTargetContext(), getCommandType(), getMessageType()); - assertNotNull(TestValues.NOT_NULL, commandJson); + /** + * Tests a valid JSON construction of this RPC message. + */ + @Test + public void testJsonConstructor() { + JSONObject commandJson = JsonFileReader.readId(getInstrumentation().getTargetContext(), getCommandType(), getMessageType()); + assertNotNull(TestValues.NOT_NULL, commandJson); - try { - Hashtable<String, Object> hash = JsonRPCMarshaller.deserializeJSONObject(commandJson); - GetAppServiceDataResponse cmd = new GetAppServiceDataResponse(hash); + try { + Hashtable<String, Object> hash = JsonRPCMarshaller.deserializeJSONObject(commandJson); + GetAppServiceDataResponse cmd = new GetAppServiceDataResponse(hash); - JSONObject body = JsonUtils.readJsonObjectFromJsonObject(commandJson, getMessageType()); - assertNotNull(TestValues.NOT_NULL, body); + JSONObject body = JsonUtils.readJsonObjectFromJsonObject(commandJson, getMessageType()); + assertNotNull(TestValues.NOT_NULL, body); - // Test everything in the json body. - assertEquals(TestValues.MATCH, JsonUtils.readStringFromJsonObject(body, RPCMessage.KEY_FUNCTION_NAME), cmd.getFunctionName()); - } catch (JSONException e) { - e.printStackTrace(); - } - } + // Test everything in the json body. + assertEquals(TestValues.MATCH, JsonUtils.readStringFromJsonObject(body, RPCMessage.KEY_FUNCTION_NAME), cmd.getFunctionName()); + } catch (JSONException e) { + e.printStackTrace(); + } + } }
\ No newline at end of file diff --git a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/GetCloudAppPropertiesResponseTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/GetCloudAppPropertiesResponseTests.java index b9d40f907..bc3873421 100644 --- a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/GetCloudAppPropertiesResponseTests.java +++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/GetCloudAppPropertiesResponseTests.java @@ -12,35 +12,35 @@ import org.junit.Test; import static junit.framework.TestCase.assertNotNull; public class GetCloudAppPropertiesResponseTests extends BaseRpcTests { - @Override - protected RPCMessage createMessage(){ - return new GetCloudAppPropertiesResponse(); - } - - @Override - protected String getMessageType(){ - return RPCMessage.KEY_RESPONSE; - } - - @Override - protected String getCommandType(){ - return FunctionID.GET_CLOUD_APP_PROPERTIES.toString(); - } - - @Override - protected JSONObject getExpectedParameters(int sdlVersion){ - return new JSONObject(); - } - - /** - * Tests the expected values of the RPC message. - */ - @Test - public void testRpcValues () { - // Invalid/Null Tests - GetCloudAppPropertiesResponse msg = new GetCloudAppPropertiesResponse(); - assertNotNull(TestValues.NOT_NULL, msg); - testNullBase(msg); - } + @Override + protected RPCMessage createMessage() { + return new GetCloudAppPropertiesResponse(); + } + + @Override + protected String getMessageType() { + return RPCMessage.KEY_RESPONSE; + } + + @Override + protected String getCommandType() { + return FunctionID.GET_CLOUD_APP_PROPERTIES.toString(); + } + + @Override + protected JSONObject getExpectedParameters(int sdlVersion) { + return new JSONObject(); + } + + /** + * Tests the expected values of the RPC message. + */ + @Test + public void testRpcValues() { + // Invalid/Null Tests + GetCloudAppPropertiesResponse msg = new GetCloudAppPropertiesResponse(); + assertNotNull(TestValues.NOT_NULL, msg); + testNullBase(msg); + } } diff --git a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/GetDTCsResponseTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/GetDTCsResponseTests.java index bbbd2559a..e54b1b71b 100644 --- a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/GetDTCsResponseTests.java +++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/GetDTCsResponseTests.java @@ -25,13 +25,13 @@ import static junit.framework.TestCase.assertTrue; import static junit.framework.TestCase.fail; /** - * This is a unit test class for the SmartDeviceLink library project class : + * This is a unit test class for the SmartDeviceLink library project class : * {@link com.smartdevicelink.proxy.rpc.GetDTCsResponse} */ -public class GetDTCsResponseTests extends BaseRpcTests{ - +public class GetDTCsResponseTests extends BaseRpcTests { + @Override - protected RPCMessage createMessage(){ + protected RPCMessage createMessage() { GetDTCsResponse msg = new GetDTCsResponse(); msg.setDtc(TestValues.GENERAL_STRING_LIST); @@ -40,43 +40,43 @@ public class GetDTCsResponseTests extends BaseRpcTests{ } @Override - protected String getMessageType(){ + protected String getMessageType() { return RPCMessage.KEY_RESPONSE; } @Override - protected String getCommandType(){ + protected String getCommandType() { return FunctionID.GET_DTCS.toString(); } @Override - protected JSONObject getExpectedParameters(int sdlVersion){ + protected JSONObject getExpectedParameters(int sdlVersion) { JSONObject result = new JSONObject(); - try{ + try { result.put(GetDTCsResponse.KEY_DTC, JsonUtils.createJsonArray(TestValues.GENERAL_STRING_LIST)); - }catch(JSONException e){ - fail(TestValues.JSON_FAIL); + } catch (JSONException e) { + fail(TestValues.JSON_FAIL); } return result; } /** - * Tests the expected values of the RPC message. - */ + * Tests the expected values of the RPC message. + */ @Test - public void testRpcValues () { - // Test Values - List<String> cmdId = ( (GetDTCsResponse) msg ).getDtc(); + public void testRpcValues() { + // Test Values + List<String> cmdId = ((GetDTCsResponse) msg).getDtc(); // Valid Tests assertEquals(TestValues.MATCH, TestValues.GENERAL_STRING_LIST.size(), cmdId.size()); - for(int i = 0; i < TestValues.GENERAL_STRING_LIST.size(); i++){ + for (int i = 0; i < TestValues.GENERAL_STRING_LIST.size(); i++) { assertEquals(TestValues.MATCH, TestValues.GENERAL_STRING_LIST.get(i), cmdId.get(i)); } - + // Invalid/Null Tests GetDTCsResponse msg = new GetDTCsResponse(); assertNotNull(TestValues.NOT_NULL, msg); @@ -89,30 +89,30 @@ public class GetDTCsResponseTests extends BaseRpcTests{ * Tests a valid JSON construction of this RPC message. */ @Test - public void testJsonConstructor () { - JSONObject commandJson = JsonFileReader.readId(getInstrumentation().getTargetContext(), getCommandType(), getMessageType()); - assertNotNull(TestValues.NOT_NULL, commandJson); - - try { - Hashtable<String, Object> hash = JsonRPCMarshaller.deserializeJSONObject(commandJson); - GetDTCsResponse cmd = new GetDTCsResponse(hash); - - JSONObject body = JsonUtils.readJsonObjectFromJsonObject(commandJson, getMessageType()); - assertNotNull(TestValues.NOT_NULL, body); - - // Test everything in the json body. - assertEquals(TestValues.MATCH, JsonUtils.readStringFromJsonObject(body, RPCMessage.KEY_FUNCTION_NAME), cmd.getFunctionName()); - assertEquals(TestValues.MATCH, JsonUtils.readIntegerFromJsonObject(body, RPCMessage.KEY_CORRELATION_ID), cmd.getCorrelationID()); - - JSONObject parameters = JsonUtils.readJsonObjectFromJsonObject(body, RPCMessage.KEY_PARAMETERS); - - List<String> dtcList = JsonUtils.readStringListFromJsonObject(parameters, GetDTCsResponse.KEY_DTC); - List<String> testDtcList = cmd.getDtc(); - assertEquals(TestValues.MATCH, dtcList.size(), testDtcList.size()); - assertTrue(TestValues.TRUE, Validator.validateStringList(dtcList, testDtcList)); - - } catch (JSONException e) { - e.printStackTrace(); - } - } + public void testJsonConstructor() { + JSONObject commandJson = JsonFileReader.readId(getInstrumentation().getTargetContext(), getCommandType(), getMessageType()); + assertNotNull(TestValues.NOT_NULL, commandJson); + + try { + Hashtable<String, Object> hash = JsonRPCMarshaller.deserializeJSONObject(commandJson); + GetDTCsResponse cmd = new GetDTCsResponse(hash); + + JSONObject body = JsonUtils.readJsonObjectFromJsonObject(commandJson, getMessageType()); + assertNotNull(TestValues.NOT_NULL, body); + + // Test everything in the json body. + assertEquals(TestValues.MATCH, JsonUtils.readStringFromJsonObject(body, RPCMessage.KEY_FUNCTION_NAME), cmd.getFunctionName()); + assertEquals(TestValues.MATCH, JsonUtils.readIntegerFromJsonObject(body, RPCMessage.KEY_CORRELATION_ID), cmd.getCorrelationID()); + + JSONObject parameters = JsonUtils.readJsonObjectFromJsonObject(body, RPCMessage.KEY_PARAMETERS); + + List<String> dtcList = JsonUtils.readStringListFromJsonObject(parameters, GetDTCsResponse.KEY_DTC); + List<String> testDtcList = cmd.getDtc(); + assertEquals(TestValues.MATCH, dtcList.size(), testDtcList.size()); + assertTrue(TestValues.TRUE, Validator.validateStringList(dtcList, testDtcList)); + + } catch (JSONException e) { + e.printStackTrace(); + } + } }
\ No newline at end of file diff --git a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/GetFileResponseTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/GetFileResponseTests.java index 867e91cb2..87f7ebd8b 100644 --- a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/GetFileResponseTests.java +++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/GetFileResponseTests.java @@ -29,100 +29,100 @@ import static junit.framework.TestCase.fail; */ public class GetFileResponseTests extends BaseRpcTests { - @Override - protected RPCMessage createMessage(){ - - GetFileResponse msg = new GetFileResponse(); - - msg.setCRC(TestValues.GENERAL_INT); - msg.setFileType(TestValues.GENERAL_FILETYPE); - msg.setOffset(TestValues.GENERAL_INT); - msg.setLength(TestValues.GENERAL_INT); - - return msg; - } - - @Override - protected String getMessageType(){ - return RPCMessage.KEY_RESPONSE; - } - - @Override - protected String getCommandType(){ - return FunctionID.GET_FILE.toString(); - } - - @Override - protected JSONObject getExpectedParameters(int sdlVersion){ - JSONObject result = new JSONObject(); - - try{ - result.put(GetFileResponse.KEY_CRC, TestValues.GENERAL_INTEGER); - result.put(GetFileResponse.KEY_FILE_TYPE, TestValues.GENERAL_FILETYPE); - result.put(GetFileResponse.KEY_OFFSET, TestValues.GENERAL_INTEGER); - result.put(GetFileResponse.KEY_LENGTH, TestValues.GENERAL_INTEGER); - }catch(JSONException e){ - fail(TestValues.JSON_FAIL); - } - - return result; - } - - /** - * Tests the expected values of the RPC message. - */ - @Test - public void testRpcValues () { - // Test Values - Integer crc = ( (GetFileResponse) msg ).getCRC(); - FileType fileType = ( (GetFileResponse) msg ).getFileType(); - Integer offset = ( (GetFileResponse) msg ).getOffset(); - Integer length = ( (GetFileResponse) msg ).getLength(); - - // Valid Tests - assertEquals(TestValues.MATCH, TestValues.GENERAL_INTEGER, crc); - assertEquals(TestValues.MATCH, TestValues.GENERAL_FILETYPE, fileType); - assertEquals(TestValues.MATCH, TestValues.GENERAL_INTEGER, offset); - assertEquals(TestValues.MATCH, TestValues.GENERAL_INTEGER, length); - - // Invalid/Null Tests - GetFileResponse msg = new GetFileResponse(); - assertNotNull(TestValues.NOT_NULL, msg); - testNullBase(msg); - - assertNull(TestValues.NULL, msg.getCRC()); - assertNull(TestValues.NULL, msg.getFileType()); - assertNull(TestValues.NULL, msg.getOffset()); - assertNull(TestValues.NULL, msg.getLength()); - } - - /** - * Tests a valid JSON construction of this RPC message. - */ - @Test - public void testJsonConstructor () { - JSONObject commandJson = JsonFileReader.readId(getInstrumentation().getTargetContext(), getCommandType(), getMessageType()); - assertNotNull(TestValues.NOT_NULL, commandJson); - - try { - Hashtable<String, Object> hash = JsonRPCMarshaller.deserializeJSONObject(commandJson); - GetFileResponse cmd = new GetFileResponse (hash); - - JSONObject body = JsonUtils.readJsonObjectFromJsonObject(commandJson, getMessageType()); - assertNotNull(TestValues.NOT_NULL, body); - - // Test everything in the json body. - assertEquals(TestValues.MATCH, JsonUtils.readStringFromJsonObject(body, RPCMessage.KEY_FUNCTION_NAME), cmd.getFunctionName()); - assertEquals(TestValues.MATCH, JsonUtils.readIntegerFromJsonObject(body, RPCMessage.KEY_CORRELATION_ID), cmd.getCorrelationID()); - - JSONObject parameters = JsonUtils.readJsonObjectFromJsonObject(body, RPCMessage.KEY_PARAMETERS); - - assertEquals(TestValues.MATCH, JsonUtils.readIntegerFromJsonObject(parameters, GetFileResponse.KEY_CRC), cmd.getCRC()); - assertEquals(TestValues.MATCH, JsonUtils.readObjectFromJsonObject(parameters, GetFileResponse.KEY_FILE_TYPE).toString(), cmd.getFileType().toString()); - assertEquals(TestValues.MATCH, JsonUtils.readIntegerFromJsonObject(parameters, GetFileResponse.KEY_LENGTH), cmd.getLength()); - assertEquals(TestValues.MATCH, JsonUtils.readIntegerFromJsonObject(parameters, GetFileResponse.KEY_OFFSET), cmd.getOffset()); - } catch (JSONException e) { - e.printStackTrace(); - } - } + @Override + protected RPCMessage createMessage() { + + GetFileResponse msg = new GetFileResponse(); + + msg.setCRC(TestValues.GENERAL_INT); + msg.setFileType(TestValues.GENERAL_FILETYPE); + msg.setOffset(TestValues.GENERAL_INT); + msg.setLength(TestValues.GENERAL_INT); + + return msg; + } + + @Override + protected String getMessageType() { + return RPCMessage.KEY_RESPONSE; + } + + @Override + protected String getCommandType() { + return FunctionID.GET_FILE.toString(); + } + + @Override + protected JSONObject getExpectedParameters(int sdlVersion) { + JSONObject result = new JSONObject(); + + try { + result.put(GetFileResponse.KEY_CRC, TestValues.GENERAL_INTEGER); + result.put(GetFileResponse.KEY_FILE_TYPE, TestValues.GENERAL_FILETYPE); + result.put(GetFileResponse.KEY_OFFSET, TestValues.GENERAL_INTEGER); + result.put(GetFileResponse.KEY_LENGTH, TestValues.GENERAL_INTEGER); + } catch (JSONException e) { + fail(TestValues.JSON_FAIL); + } + + return result; + } + + /** + * Tests the expected values of the RPC message. + */ + @Test + public void testRpcValues() { + // Test Values + Integer crc = ((GetFileResponse) msg).getCRC(); + FileType fileType = ((GetFileResponse) msg).getFileType(); + Integer offset = ((GetFileResponse) msg).getOffset(); + Integer length = ((GetFileResponse) msg).getLength(); + + // Valid Tests + assertEquals(TestValues.MATCH, TestValues.GENERAL_INTEGER, crc); + assertEquals(TestValues.MATCH, TestValues.GENERAL_FILETYPE, fileType); + assertEquals(TestValues.MATCH, TestValues.GENERAL_INTEGER, offset); + assertEquals(TestValues.MATCH, TestValues.GENERAL_INTEGER, length); + + // Invalid/Null Tests + GetFileResponse msg = new GetFileResponse(); + assertNotNull(TestValues.NOT_NULL, msg); + testNullBase(msg); + + assertNull(TestValues.NULL, msg.getCRC()); + assertNull(TestValues.NULL, msg.getFileType()); + assertNull(TestValues.NULL, msg.getOffset()); + assertNull(TestValues.NULL, msg.getLength()); + } + + /** + * Tests a valid JSON construction of this RPC message. + */ + @Test + public void testJsonConstructor() { + JSONObject commandJson = JsonFileReader.readId(getInstrumentation().getTargetContext(), getCommandType(), getMessageType()); + assertNotNull(TestValues.NOT_NULL, commandJson); + + try { + Hashtable<String, Object> hash = JsonRPCMarshaller.deserializeJSONObject(commandJson); + GetFileResponse cmd = new GetFileResponse(hash); + + JSONObject body = JsonUtils.readJsonObjectFromJsonObject(commandJson, getMessageType()); + assertNotNull(TestValues.NOT_NULL, body); + + // Test everything in the json body. + assertEquals(TestValues.MATCH, JsonUtils.readStringFromJsonObject(body, RPCMessage.KEY_FUNCTION_NAME), cmd.getFunctionName()); + assertEquals(TestValues.MATCH, JsonUtils.readIntegerFromJsonObject(body, RPCMessage.KEY_CORRELATION_ID), cmd.getCorrelationID()); + + JSONObject parameters = JsonUtils.readJsonObjectFromJsonObject(body, RPCMessage.KEY_PARAMETERS); + + assertEquals(TestValues.MATCH, JsonUtils.readIntegerFromJsonObject(parameters, GetFileResponse.KEY_CRC), cmd.getCRC()); + assertEquals(TestValues.MATCH, JsonUtils.readObjectFromJsonObject(parameters, GetFileResponse.KEY_FILE_TYPE).toString(), cmd.getFileType().toString()); + assertEquals(TestValues.MATCH, JsonUtils.readIntegerFromJsonObject(parameters, GetFileResponse.KEY_LENGTH), cmd.getLength()); + assertEquals(TestValues.MATCH, JsonUtils.readIntegerFromJsonObject(parameters, GetFileResponse.KEY_OFFSET), cmd.getOffset()); + } catch (JSONException e) { + e.printStackTrace(); + } + } } 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 512d324e3..715e49f6c 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 @@ -25,68 +25,68 @@ import static junit.framework.TestCase.fail; public class GetInteriorVehicleDataConsentResponseTests extends BaseRpcTests { - @Override - protected RPCMessage createMessage() { - GetInteriorVehicleDataConsentResponse msg = new GetInteriorVehicleDataConsentResponse(); - msg.setAllowances(TestValues.GENERAL_BOOLEAN_LIST); - return msg; - } - - @Override - protected String getMessageType() { - return RPCMessage.KEY_RESPONSE; - } - - @Override - protected String getCommandType() { - return FunctionID.GET_INTERIOR_VEHICLE_DATA_CONSENT.toString(); - } - - @Override - protected JSONObject getExpectedParameters(int sdlVersion) { - JSONObject result = new JSONObject(); - - try{ - result.put(GetInteriorVehicleDataConsentResponse.KEY_ALLOWED, JsonUtils.createJsonArray(TestValues.GENERAL_BOOLEAN_LIST)); - } catch (JSONException e) { - fail(TestValues.JSON_FAIL); - } - return result; - } - - @Test - public void testRpcValues() { - List<Boolean> list = ((GetInteriorVehicleDataConsentResponse) msg).getAllowances(); - assertEquals(TestValues.MATCH, list, TestValues.GENERAL_BOOLEAN_LIST); - } - - @Test - public void testRequiredParams(){ - GetInteriorVehicleDataConsentResponse msg = new GetInteriorVehicleDataConsentResponse(true, Result.SUCCESS); - assertTrue(msg.getSuccess()); - assertEquals(TestValues.MATCH, msg.getResultCode(), Result.SUCCESS); - } - - @Test - public void testJsonConstructor() { - JSONObject commandJson = JsonFileReader.readId(getInstrumentation().getContext(), getCommandType(), getMessageType()); - assertNotNull(TestValues.NOT_NULL, commandJson); - - try { - Hashtable<String, Object> hash = JsonRPCMarshaller.deserializeJSONObject(commandJson); - GetInteriorVehicleDataConsentResponse cmd = new GetInteriorVehicleDataConsentResponse(hash); - - JSONObject body = JsonUtils.readJsonObjectFromJsonObject(commandJson, getMessageType()); - assertNotNull(TestValues.NOT_NULL, body); - - assertEquals(TestValues.MATCH, JsonUtils.readStringFromJsonObject(body, RPCMessage.KEY_FUNCTION_NAME), cmd.getFunctionName()); - assertEquals(TestValues.MATCH, JsonUtils.readIntegerFromJsonObject(body, RPCMessage.KEY_CORRELATION_ID), cmd.getCorrelationID()); - - JSONObject parameters = JsonUtils.readJsonObjectFromJsonObject(body, RPCMessage.KEY_PARAMETERS); - assertEquals(TestValues.MATCH, JsonUtils.readBooleanListFromJsonObject(parameters, - GetInteriorVehicleDataConsentResponse.KEY_ALLOWED), cmd.getAllowances()); - } catch (JSONException e) { - fail(TestValues.JSON_FAIL); - } - } + @Override + protected RPCMessage createMessage() { + GetInteriorVehicleDataConsentResponse msg = new GetInteriorVehicleDataConsentResponse(); + msg.setAllowances(TestValues.GENERAL_BOOLEAN_LIST); + return msg; + } + + @Override + protected String getMessageType() { + return RPCMessage.KEY_RESPONSE; + } + + @Override + protected String getCommandType() { + return FunctionID.GET_INTERIOR_VEHICLE_DATA_CONSENT.toString(); + } + + @Override + protected JSONObject getExpectedParameters(int sdlVersion) { + JSONObject result = new JSONObject(); + + try { + result.put(GetInteriorVehicleDataConsentResponse.KEY_ALLOWED, JsonUtils.createJsonArray(TestValues.GENERAL_BOOLEAN_LIST)); + } catch (JSONException e) { + fail(TestValues.JSON_FAIL); + } + return result; + } + + @Test + public void testRpcValues() { + List<Boolean> list = ((GetInteriorVehicleDataConsentResponse) msg).getAllowances(); + assertEquals(TestValues.MATCH, list, TestValues.GENERAL_BOOLEAN_LIST); + } + + @Test + public void testRequiredParams() { + GetInteriorVehicleDataConsentResponse msg = new GetInteriorVehicleDataConsentResponse(true, Result.SUCCESS); + assertTrue(msg.getSuccess()); + assertEquals(TestValues.MATCH, msg.getResultCode(), Result.SUCCESS); + } + + @Test + public void testJsonConstructor() { + JSONObject commandJson = JsonFileReader.readId(getInstrumentation().getContext(), getCommandType(), getMessageType()); + assertNotNull(TestValues.NOT_NULL, commandJson); + + try { + Hashtable<String, Object> hash = JsonRPCMarshaller.deserializeJSONObject(commandJson); + GetInteriorVehicleDataConsentResponse cmd = new GetInteriorVehicleDataConsentResponse(hash); + + JSONObject body = JsonUtils.readJsonObjectFromJsonObject(commandJson, getMessageType()); + assertNotNull(TestValues.NOT_NULL, body); + + assertEquals(TestValues.MATCH, JsonUtils.readStringFromJsonObject(body, RPCMessage.KEY_FUNCTION_NAME), cmd.getFunctionName()); + assertEquals(TestValues.MATCH, JsonUtils.readIntegerFromJsonObject(body, RPCMessage.KEY_CORRELATION_ID), cmd.getCorrelationID()); + + JSONObject parameters = JsonUtils.readJsonObjectFromJsonObject(body, RPCMessage.KEY_PARAMETERS); + assertEquals(TestValues.MATCH, JsonUtils.readBooleanListFromJsonObject(parameters, + GetInteriorVehicleDataConsentResponse.KEY_ALLOWED), cmd.getAllowances()); + } catch (JSONException e) { + fail(TestValues.JSON_FAIL); + } + } } diff --git a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/GetInteriorVehicleDataResponseTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/GetInteriorVehicleDataResponseTests.java index e4006d4a4..bef276ffb 100644 --- a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/GetInteriorVehicleDataResponseTests.java +++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/GetInteriorVehicleDataResponseTests.java @@ -31,7 +31,7 @@ import static junit.framework.TestCase.fail; public class GetInteriorVehicleDataResponseTests extends BaseRpcTests { @Override - protected RPCMessage createMessage(){ + protected RPCMessage createMessage() { GetInteriorVehicleDataResponse msg = new GetInteriorVehicleDataResponse(); @@ -42,23 +42,23 @@ public class GetInteriorVehicleDataResponseTests extends BaseRpcTests { } @Override - protected String getMessageType(){ + protected String getMessageType() { return RPCMessage.KEY_RESPONSE; } @Override - protected String getCommandType(){ + protected String getCommandType() { return FunctionID.GET_INTERIOR_VEHICLE_DATA.toString(); } @Override - protected JSONObject getExpectedParameters(int sdlVersion){ + protected JSONObject getExpectedParameters(int sdlVersion) { JSONObject result = new JSONObject(); - try{ + try { result.put(GetInteriorVehicleDataResponse.KEY_IS_SUBSCRIBED, TestValues.GENERAL_BOOLEAN); result.put(GetInteriorVehicleDataResponse.KEY_MODULE_DATA, JsonRPCMarshaller.serializeHashtable(TestValues.GENERAL_MODULEDATA.getStore())); - }catch(JSONException e){ + } catch (JSONException e) { fail(TestValues.JSON_FAIL); } @@ -69,10 +69,10 @@ public class GetInteriorVehicleDataResponseTests extends BaseRpcTests { * Tests the expected values of the RPC message. */ @Test - public void testRpcValues () { + public void testRpcValues() { // Test Values - boolean testIsSubscribed = ( (GetInteriorVehicleDataResponse) msg ).getIsSubscribed(); - ModuleData testModuleData = ( (GetInteriorVehicleDataResponse) msg ).getModuleData(); + boolean testIsSubscribed = ((GetInteriorVehicleDataResponse) msg).getIsSubscribed(); + ModuleData testModuleData = ((GetInteriorVehicleDataResponse) msg).getModuleData(); // Valid Tests assertEquals(TestValues.MATCH, TestValues.GENERAL_BOOLEAN, testIsSubscribed); @@ -91,13 +91,13 @@ public class GetInteriorVehicleDataResponseTests extends BaseRpcTests { * Tests a valid JSON construction of this RPC message. */ @Test - public void testJsonConstructor () { + public void testJsonConstructor() { JSONObject commandJson = JsonFileReader.readId(getInstrumentation().getTargetContext(), getCommandType(), getMessageType()); assertNotNull(TestValues.NOT_NULL, commandJson); try { Hashtable<String, Object> hash = JsonRPCMarshaller.deserializeJSONObject(commandJson); - GetInteriorVehicleDataResponse cmd = new GetInteriorVehicleDataResponse (hash); + GetInteriorVehicleDataResponse cmd = new GetInteriorVehicleDataResponse(hash); JSONObject body = JsonUtils.readJsonObjectFromJsonObject(commandJson, getMessageType()); assertNotNull(TestValues.NOT_NULL, body); @@ -111,7 +111,7 @@ public class GetInteriorVehicleDataResponseTests extends BaseRpcTests { ModuleData testModuleData = new ModuleData(JsonRPCMarshaller.deserializeJSONObject((JSONObject) JsonUtils.readObjectFromJsonObject(parameters, GetInteriorVehicleDataResponse.KEY_MODULE_DATA))); ModuleData cmdModuleData = cmd.getModuleData(); - assertTrue(TestValues.TRUE, Validator.validateModuleData(testModuleData, cmdModuleData) ); + assertTrue(TestValues.TRUE, Validator.validateModuleData(testModuleData, cmdModuleData)); assertEquals(TestValues.MATCH, JsonUtils.readObjectFromJsonObject(parameters, GetInteriorVehicleDataResponse.KEY_IS_SUBSCRIBED), cmd.getIsSubscribed()); } catch (JSONException e) { e.printStackTrace(); diff --git a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/GetSystemCapabilityResponseTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/GetSystemCapabilityResponseTests.java index 827b340e7..802201d2c 100644 --- a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/GetSystemCapabilityResponseTests.java +++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/GetSystemCapabilityResponseTests.java @@ -25,7 +25,7 @@ import static junit.framework.TestCase.fail; public class GetSystemCapabilityResponseTests extends BaseRpcTests { @Override - protected RPCMessage createMessage(){ + protected RPCMessage createMessage() { GetSystemCapabilityResponse msg = new GetSystemCapabilityResponse(); msg.setSystemCapability(TestValues.GENERAL_SYSTEMCAPABILITY); @@ -34,22 +34,22 @@ public class GetSystemCapabilityResponseTests extends BaseRpcTests { } @Override - protected String getMessageType(){ + protected String getMessageType() { return RPCMessage.KEY_RESPONSE; } @Override - protected String getCommandType(){ + protected String getCommandType() { return FunctionID.GET_SYSTEM_CAPABILITY.toString(); } @Override - protected JSONObject getExpectedParameters(int sdlVersion){ + protected JSONObject getExpectedParameters(int sdlVersion) { JSONObject result = new JSONObject(); - try{ + try { result.put(GetSystemCapabilityResponse.KEY_SYSTEM_CAPABILITY, JsonRPCMarshaller.serializeHashtable(TestValues.GENERAL_SYSTEMCAPABILITY.getStore())); - }catch(JSONException e){ + } catch (JSONException e) { fail(TestValues.JSON_FAIL); } @@ -60,9 +60,9 @@ public class GetSystemCapabilityResponseTests extends BaseRpcTests { * Tests the expected values of the RPC message. */ @Test - public void testRpcValues () { + public void testRpcValues() { // Test Values - SystemCapability testCapability = ( (GetSystemCapabilityResponse) msg ).getSystemCapability(); + SystemCapability testCapability = ((GetSystemCapabilityResponse) msg).getSystemCapability(); // Valid Tests assertEquals(TestValues.MATCH, TestValues.GENERAL_SYSTEMCAPABILITY.getSystemCapabilityType(), testCapability.getSystemCapabilityType()); @@ -79,7 +79,7 @@ public class GetSystemCapabilityResponseTests extends BaseRpcTests { * Tests a valid JSON construction of this RPC message. */ @Test - public void testJsonConstructor () { + public void testJsonConstructor() { JSONObject commandJson = JsonFileReader.readId(getInstrumentation().getTargetContext(), getCommandType(), getMessageType()); assertNotNull(TestValues.NOT_NULL, commandJson); diff --git a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/GetVehicleDataResponseTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/GetVehicleDataResponseTests.java index 91e13586a..606283cc7 100644 --- a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/GetVehicleDataResponseTests.java +++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/GetVehicleDataResponseTests.java @@ -47,31 +47,31 @@ import static junit.framework.TestCase.fail; /** - * This is a unit test class for the SmartDeviceLink library project class : + * This is a unit test class for the SmartDeviceLink library project class : * {@link com.smartdevicelink.proxy.rpc.GetVehicleDataResponse} */ -public class GetVehicleDataResponseTests extends BaseRpcTests{ +public class GetVehicleDataResponseTests extends BaseRpcTests { @Override - protected RPCMessage createMessage(){ - return VehicleDataHelper.VEHICLE_DATA_RESPONSE; + protected RPCMessage createMessage() { + return VehicleDataHelper.VEHICLE_DATA_RESPONSE; } - + @Override - protected String getMessageType(){ + protected String getMessageType() { return RPCMessage.KEY_RESPONSE; } @Override - protected String getCommandType(){ + protected String getCommandType() { return FunctionID.GET_VEHICLE_DATA.toString(); } @Override - protected JSONObject getExpectedParameters(int sdlVersion){ + protected JSONObject getExpectedParameters(int sdlVersion) { JSONObject result = new JSONObject(); - try{ + try { result.put(GetVehicleDataResponse.KEY_SPEED, VehicleDataHelper.SPEED); result.put(GetVehicleDataResponse.KEY_RPM, VehicleDataHelper.RPM); result.put(GetVehicleDataResponse.KEY_EXTERNAL_TEMPERATURE, VehicleDataHelper.EXTERNAL_TEMPERATURE); @@ -101,13 +101,13 @@ public class GetVehicleDataResponseTests extends BaseRpcTests{ result.put(GetVehicleDataResponse.KEY_FUEL_RANGE, VehicleDataHelper.JSON_FUEL_RANGE); result.put(GetVehicleDataResponse.KEY_TURN_SIGNAL, VehicleDataHelper.TURN_SIGNAL); result.put(GetVehicleDataResponse.KEY_ELECTRONIC_PARK_BRAKE_STATUS, VehicleDataHelper.ELECTRONIC_PARK_BRAKE_STATUS); - result.put(GetVehicleDataResponse.KEY_WINDOW_STATUS, VehicleDataHelper.WINDOW_STATUS_LIST); + result.put(GetVehicleDataResponse.KEY_WINDOW_STATUS, VehicleDataHelper.WINDOW_STATUS_LIST); result.put(GetVehicleDataResponse.KEY_HANDS_OFF_STEERING, VehicleDataHelper.HANDS_OFF_STEERING); result.put(GetVehicleDataResponse.KEY_GEAR_STATUS, VehicleDataHelper.GEAR_STATUS); - result.put(GetVehicleDataResponse.KEY_STABILITY_CONTROLS_STATUS, VehicleDataHelper.STABILITY_CONTROLS_STATUS); - result.put(TestValues.GENERAL_OEM_CUSTOM_VEHICLE_DATA_NAME, VehicleDataHelper.OEM_CUSTOM_VEHICLE_DATA_STATE); - } catch(JSONException e){ - fail(TestValues.JSON_FAIL); + result.put(GetVehicleDataResponse.KEY_STABILITY_CONTROLS_STATUS, VehicleDataHelper.STABILITY_CONTROLS_STATUS); + result.put(TestValues.GENERAL_OEM_CUSTOM_VEHICLE_DATA_NAME, VehicleDataHelper.OEM_CUSTOM_VEHICLE_DATA_STATE); + } catch (JSONException e) { + fail(TestValues.JSON_FAIL); } return result; @@ -115,440 +115,424 @@ public class GetVehicleDataResponseTests extends BaseRpcTests{ @Test public void testJson() { - JSONObject reference = new JSONObject(); - - //objects needed on the first level - JSONObject tireStatusObj = new JSONObject(); - JSONObject GPSDataObj = new JSONObject(); - JSONObject beltStatusObj = new JSONObject(); - JSONObject bodyInformationObj = new JSONObject(); - JSONObject deviceStatusObj = new JSONObject(); - JSONObject headLampStatusObj = new JSONObject(); - JSONObject ECallInfoObj = new JSONObject(); - JSONObject airbagStatusObj = new JSONObject(); - JSONObject emergencyEventObj = new JSONObject(); - JSONObject clusterModeStatusObj = new JSONObject(); - JSONObject myKeyObj = new JSONObject(); - JSONObject stabilityControlsStatusObj = new JSONObject(); - JSONObject fuelRangeObj = new JSONObject(); - JSONObject windowStatusObj = new JSONObject(); - JSONObject gearStatusObj = new JSONObject(); - JSONArray fuelRangeArrayObj = new JSONArray(); - JSONArray windowStatusArrayObj = new JSONArray(); - - try { - //set up the JSONObject to represent GetVehicleDataResponse - //TIRE_PRESSURE - tireStatusObj.put(TireStatus.KEY_PRESSURE_TELL_TALE, VehicleDataHelper.TIRE_PRESSURE_TELL_TALE); - JSONObject tireLeftFront = new JSONObject(); - tireLeftFront.put(SingleTireStatus.KEY_STATUS, VehicleDataHelper.TIRE_PRESSURE_LEFT_FRONT); - tireStatusObj.put(TireStatus.KEY_LEFT_FRONT, tireLeftFront); - JSONObject tireRightFront = new JSONObject(); - tireRightFront.put(SingleTireStatus.KEY_STATUS, VehicleDataHelper.TIRE_PRESSURE_RIGHT_FRONT); - tireStatusObj.put(TireStatus.KEY_RIGHT_FRONT, tireRightFront); - JSONObject tireLeftRear = new JSONObject(); - tireLeftRear.put(SingleTireStatus.KEY_STATUS, VehicleDataHelper.TIRE_PRESSURE_LEFT_REAR); - tireStatusObj.put(TireStatus.KEY_LEFT_REAR, tireLeftRear); - JSONObject tireRightRear = new JSONObject(); - tireRightRear.put(SingleTireStatus.KEY_STATUS, VehicleDataHelper.TIRE_PRESSURE_RIGHT_REAR); - tireStatusObj.put(TireStatus.KEY_RIGHT_REAR, tireRightRear); - JSONObject tireInnerLeftRear = new JSONObject(); - tireInnerLeftRear.put(SingleTireStatus.KEY_STATUS, VehicleDataHelper.TIRE_PRESSURE_INNER_LEFT_REAR); - tireStatusObj.put(TireStatus.KEY_INNER_LEFT_REAR, tireInnerLeftRear); - JSONObject tireInnerRightRear = new JSONObject(); - tireInnerRightRear.put(SingleTireStatus.KEY_STATUS, VehicleDataHelper.TIRE_PRESSURE_INNER_RIGHT_REAR); - tireStatusObj.put(TireStatus.KEY_INNER_RIGHT_REAR, tireInnerRightRear); - - //GPS - GPSDataObj.put(GPSData.KEY_LONGITUDE_DEGREES, VehicleDataHelper.GPS_LONGITUDE); - GPSDataObj.put(GPSData.KEY_LATITUDE_DEGREES, VehicleDataHelper.GPS_LATITUDE); - GPSDataObj.put(GPSData.KEY_UTC_YEAR, VehicleDataHelper.GPS_YEAR); - GPSDataObj.put(GPSData.KEY_UTC_MONTH, VehicleDataHelper.GPS_MONTH); - GPSDataObj.put(GPSData.KEY_UTC_DAY, VehicleDataHelper.GPS_DAY); - GPSDataObj.put(GPSData.KEY_UTC_HOURS, VehicleDataHelper.GPS_HOURS); - GPSDataObj.put(GPSData.KEY_UTC_MINUTES, VehicleDataHelper.GPS_MINUTES); - GPSDataObj.put(GPSData.KEY_UTC_SECONDS, VehicleDataHelper.GPS_SECONDS); - GPSDataObj.put(GPSData.KEY_COMPASS_DIRECTION, VehicleDataHelper.GPS_DIRECTION); - GPSDataObj.put(GPSData.KEY_PDOP, VehicleDataHelper.GPS_PDOP); - GPSDataObj.put(GPSData.KEY_VDOP, VehicleDataHelper.GPS_VDOP); - GPSDataObj.put(GPSData.KEY_HDOP, VehicleDataHelper.GPS_HDOP); - GPSDataObj.put(GPSData.KEY_ACTUAL, VehicleDataHelper.GPS_ACTUAL); - GPSDataObj.put(GPSData.KEY_SATELLITES, VehicleDataHelper.GPS_SATELLITES); - GPSDataObj.put(GPSData.KEY_DIMENSION, VehicleDataHelper.GPS_DIMENSION); - GPSDataObj.put(GPSData.KEY_ALTITUDE, VehicleDataHelper.GPS_ALTITUDE); - GPSDataObj.put(GPSData.KEY_HEADING, VehicleDataHelper.GPS_HEADING); - GPSDataObj.put(GPSData.KEY_SPEED, VehicleDataHelper.GPS_SPEED); - GPSDataObj.put(GPSData.KEY_SHIFTED, VehicleDataHelper.GPS_SHIFTED); - - //BELT_STATUS - beltStatusObj.put(BeltStatus.KEY_DRIVER_BELT_DEPLOYED, VehicleDataHelper.BELT_STATUS_DRIVER_DEPLOYED); - beltStatusObj.put(BeltStatus.KEY_PASSENGER_BELT_DEPLOYED, VehicleDataHelper.BELT_STATUS_PASSENGER_DEPLOYED); - beltStatusObj.put(BeltStatus.KEY_PASSENGER_BUCKLE_BELTED, VehicleDataHelper.BELT_STATUS_PASSENGER_BELTED); - beltStatusObj.put(BeltStatus.KEY_DRIVER_BUCKLE_BELTED, VehicleDataHelper.BELT_STATUS_DRIVER_BELTED); - beltStatusObj.put(BeltStatus.KEY_LEFT_ROW_2_BUCKLE_BELTED, VehicleDataHelper.BELT_STATUS_LEFT_ROW_2_BELTED); - beltStatusObj.put(BeltStatus.KEY_PASSENGER_CHILD_DETECTED, VehicleDataHelper.BELT_STATUS_PASSENGER_CHILD); - beltStatusObj.put(BeltStatus.KEY_RIGHT_ROW_2_BUCKLE_BELTED, VehicleDataHelper.BELT_STATUS_RIGHT_ROW_2_BELTED); - beltStatusObj.put(BeltStatus.KEY_MIDDLE_ROW_2_BUCKLE_BELTED, VehicleDataHelper.BELT_STATUS_MIDDLE_ROW_2_BELTED); - beltStatusObj.put(BeltStatus.KEY_MIDDLE_ROW_3_BUCKLE_BELTED, VehicleDataHelper.BELT_STATUS_MIDDLE_ROW_3_BELTED); - beltStatusObj.put(BeltStatus.KEY_LEFT_ROW_3_BUCKLE_BELTED, VehicleDataHelper.BELT_STATUS_LEFT_ROW_3_BELTED); - beltStatusObj.put(BeltStatus.KEY_RIGHT_ROW_3_BUCKLE_BELTED, VehicleDataHelper.BELT_STATUS_RIGHT_ROW_3_BELTED); - beltStatusObj.put(BeltStatus.KEY_LEFT_REAR_INFLATABLE_BELTED, VehicleDataHelper.BELT_STATUS_LEFT_REAR_INFLATABLE_BELTED); - beltStatusObj.put(BeltStatus.KEY_RIGHT_REAR_INFLATABLE_BELTED, VehicleDataHelper.BELT_STATUS_RIGHT_REAR_INFLATABLE_BELTED); - beltStatusObj.put(BeltStatus.KEY_MIDDLE_ROW_1_BELT_DEPLOYED, VehicleDataHelper.BELT_STATUS_MIDDLE_ROW_1_DEPLOYED); - beltStatusObj.put(BeltStatus.KEY_MIDDLE_ROW_1_BUCKLE_BELTED, VehicleDataHelper.BELT_STATUS_MIDDLE_ROW_1_BELTED); - - //BODY_INFORMATION - bodyInformationObj.put(BodyInformation.KEY_PARK_BRAKE_ACTIVE, VehicleDataHelper.BODY_INFORMATION_PARK_BRAKE); - bodyInformationObj.put(BodyInformation.KEY_IGNITION_STABLE_STATUS, VehicleDataHelper.BODY_INFORMATION_IGNITION_STATUS); - bodyInformationObj.put(BodyInformation.KEY_IGNITION_STATUS, VehicleDataHelper.BODY_INFORMATION_IGNITION_STABLE_STATUS); - bodyInformationObj.put(BodyInformation.KEY_DRIVER_DOOR_AJAR, VehicleDataHelper.BODY_INFORMATION_DRIVER_AJAR); - bodyInformationObj.put(BodyInformation.KEY_PASSENGER_DOOR_AJAR, VehicleDataHelper.BODY_INFORMATION_PASSENGER_AJAR); - bodyInformationObj.put(BodyInformation.KEY_REAR_LEFT_DOOR_AJAR, VehicleDataHelper.BODY_INFORMATION_REAR_LEFT_AJAR); - bodyInformationObj.put(BodyInformation.KEY_REAR_RIGHT_DOOR_AJAR, VehicleDataHelper.BODY_INFORMATION_REAR_RIGHT_AJAR); - - //DEVICE_STATUS - deviceStatusObj.put(DeviceStatus.KEY_VOICE_REC_ON, VehicleDataHelper.DEVICE_STATUS_VOICE_REC); - deviceStatusObj.put(DeviceStatus.KEY_BT_ICON_ON, VehicleDataHelper.DEVICE_STATUS_BT_ICON); - deviceStatusObj.put(DeviceStatus.KEY_CALL_ACTIVE, VehicleDataHelper.DEVICE_STATUS_CALL_ACTIVE); - deviceStatusObj.put(DeviceStatus.KEY_PHONE_ROAMING, VehicleDataHelper.DEVICE_STATUS_PHONE_ROAMING); - deviceStatusObj.put(DeviceStatus.KEY_TEXT_MSG_AVAILABLE, VehicleDataHelper.DEVICE_STATUS_TEXT_MSG_AVAILABLE); - deviceStatusObj.put(DeviceStatus.KEY_BATT_LEVEL_STATUS, VehicleDataHelper.DEVICE_STATUS_BATT_LEVEL_STATUS); - deviceStatusObj.put(DeviceStatus.KEY_STEREO_AUDIO_OUTPUT_MUTED, VehicleDataHelper.DEVICE_STATUS_STEREO_MUTED); - deviceStatusObj.put(DeviceStatus.KEY_MONO_AUDIO_OUTPUT_MUTED, VehicleDataHelper.DEVICE_STATUS_MONO_MUTED); - deviceStatusObj.put(DeviceStatus.KEY_SIGNAL_LEVEL_STATUS, VehicleDataHelper.DEVICE_STATUS_SIGNAL_LEVEL_STATUS); - deviceStatusObj.put(DeviceStatus.KEY_PRIMARY_AUDIO_SOURCE, VehicleDataHelper.DEVICE_STATUS_PRIMARY_AUDIO); - deviceStatusObj.put(DeviceStatus.KEY_E_CALL_EVENT_ACTIVE, VehicleDataHelper.DEVICE_STATUS_E_CALL_ACTIVE); - - //HEAD_LAMP_STATUS - headLampStatusObj.put(HeadLampStatus.KEY_AMBIENT_LIGHT_SENSOR_STATUS, VehicleDataHelper.HEAD_LAMP_STATUS_AMBIENT_STATUS); - headLampStatusObj.put(HeadLampStatus.KEY_HIGH_BEAMS_ON, VehicleDataHelper.HEAD_LAMP_HIGH_BEAMS); - headLampStatusObj.put(HeadLampStatus.KEY_LOW_BEAMS_ON, VehicleDataHelper.HEAD_LAMP_LOW_BEAMS); - - //E_CALL_INFO - ECallInfoObj.put(ECallInfo.KEY_E_CALL_NOTIFICATION_STATUS, VehicleDataHelper.E_CALL_INFO_E_CALL_NOTIFICATION_STATUS); - ECallInfoObj.put(ECallInfo.KEY_AUX_E_CALL_NOTIFICATION_STATUS, VehicleDataHelper.E_CALL_INFO_AUX_E_CALL_NOTIFICATION_STATUS); - ECallInfoObj.put(ECallInfo.KEY_E_CALL_CONFIRMATION_STATUS, VehicleDataHelper.E_CALL_INFO_CONFIRMATION_STATUS); - - //AIRBAG_STATUS - airbagStatusObj.put(AirbagStatus.KEY_DRIVER_AIRBAG_DEPLOYED, VehicleDataHelper.AIRBAG_STATUS_DRIVER_DEPLOYED); - airbagStatusObj.put(AirbagStatus.KEY_DRIVER_SIDE_AIRBAG_DEPLOYED, VehicleDataHelper.AIRBAG_STATUS_DRIVER_SIDE_DEPLOYED); - airbagStatusObj.put(AirbagStatus.KEY_DRIVER_CURTAIN_AIRBAG_DEPLOYED, VehicleDataHelper.AIRBAG_STATUS_DRIVER_CURTAIN_DEPLOYED); - airbagStatusObj.put(AirbagStatus.KEY_DRIVER_KNEE_AIRBAG_DEPLOYED, VehicleDataHelper.AIRBAG_STATUS_DRIVER_KNEE_DEPLOYED); - airbagStatusObj.put(AirbagStatus.KEY_PASSENGER_AIRBAG_DEPLOYED, VehicleDataHelper.AIRBAG_STATUS_PASSENGER_DEPLOYED); - airbagStatusObj.put(AirbagStatus.KEY_PASSENGER_SIDE_AIRBAG_DEPLOYED, VehicleDataHelper.AIRBAG_STATUS_PASSENGER_SIDE_DEPLOYED); - airbagStatusObj.put(AirbagStatus.KEY_PASSENGER_CURTAIN_AIRBAG_DEPLOYED, VehicleDataHelper.AIRBAG_STATUS_PASSENGER_CURTAIN_DEPLOYED); - airbagStatusObj.put(AirbagStatus.KEY_PASSENGER_KNEE_AIRBAG_DEPLOYED, VehicleDataHelper.AIRBAG_STATUS_PASSENGER_KNEE_DEPLOYED); - - //EMERGENCY_EVENT - emergencyEventObj.put(EmergencyEvent.KEY_EMERGENCY_EVENT_TYPE, VehicleDataHelper.EMERGENCY_EVENT_TYPE); - emergencyEventObj.put(EmergencyEvent.KEY_FUEL_CUTOFF_STATUS, VehicleDataHelper.EMERGENCY_EVENT_FUEL_CUTOFF_STATUS); - emergencyEventObj.put(EmergencyEvent.KEY_ROLLOVER_EVENT, VehicleDataHelper.EMERGENCY_EVENT_ROLLOVER_EVENT); - emergencyEventObj.put(EmergencyEvent.KEY_MAXIMUM_CHANGE_VELOCITY, VehicleDataHelper.EMERGENCY_EVENT_MAX_CHANGE_VELOCITY); - emergencyEventObj.put(EmergencyEvent.KEY_MULTIPLE_EVENTS, VehicleDataHelper.EMERGENCY_EVENT_MULTIPLE_EVENTS); - - //CLUSTER_MODE_STATUS - clusterModeStatusObj.put(ClusterModeStatus.KEY_POWER_MODE_ACTIVE, VehicleDataHelper.CLUSTER_MODE_STATUS_POWER_MODE_ACTIVE); - clusterModeStatusObj.put(ClusterModeStatus.KEY_POWER_MODE_QUALIFICATION_STATUS, VehicleDataHelper.CLUSTER_MODE_STATUS_POWER_MODE_QUALIFICATION_STATUS); - clusterModeStatusObj.put(ClusterModeStatus.KEY_CAR_MODE_STATUS, VehicleDataHelper.CLUSTER_MODE_STATUS_CAR_MODE_STATUS); - clusterModeStatusObj.put(ClusterModeStatus.KEY_POWER_MODE_STATUS, VehicleDataHelper.CLUSTER_MODE_STATUS_POWER_MODE_STATUS); - - // STABILITY_CONTROL_STATUS - stabilityControlsStatusObj.put(StabilityControlsStatus.KEY_ESC_SYSTEM, VehicleDataHelper.ESC_SYSTEM); - stabilityControlsStatusObj.put(StabilityControlsStatus.KEY_TRAILER_SWAY_CONTROL, VehicleDataHelper.S_WAY_TRAILER); - - //MY_KEY - myKeyObj.put(MyKey.KEY_E_911_OVERRIDE, VehicleDataHelper.MY_KEY_E_911_OVERRIDE); - - // FUEL_RANGE - fuelRangeObj.put(FuelRange.KEY_TYPE, VehicleDataHelper.FUEL_RANGE_TYPE); - fuelRangeObj.put(FuelRange.KEY_RANGE, VehicleDataHelper.FUEL_RANGE_RANGE); - fuelRangeObj.put(FuelRange.KEY_CAPACITY, VehicleDataHelper.FUEL_RANGE_CAPACITY); - fuelRangeObj.put(FuelRange.KEY_CAPACITY_UNIT, VehicleDataHelper.FUEL_RANGE_CAPACITY_UNIT); - fuelRangeObj.put(FuelRange.KEY_LEVEL, VehicleDataHelper.FUEL_RANGE_LEVEL); - fuelRangeObj.put(FuelRange.KEY_LEVEL_STATE, VehicleDataHelper.FUEL_RANGE_LEVEL_STATE); - fuelRangeArrayObj.put(fuelRangeObj); - - //GEAR_STATUS - gearStatusObj.put(GearStatus.KEY_USER_SELECTED_GEAR, VehicleDataHelper.USER_SELECTED_GEAR); - gearStatusObj.put(GearStatus.KEY_TRANSMISSION_TYPE, VehicleDataHelper.TRANSMISSION_TYPE); - gearStatusObj.put(GearStatus.KEY_ACTUAL_GEAR, VehicleDataHelper.ACTUAL_GEAR); - - // WINDOW_STATUS - windowStatusObj.put(WindowStatus.KEY_LOCATION, VehicleDataHelper.LOCATION_GRID); - windowStatusObj.put(WindowStatus.KEY_STATE, VehicleDataHelper.WINDOW_STATE); - windowStatusArrayObj.put(windowStatusObj); - - reference.put(GetVehicleDataResponse.KEY_SPEED, VehicleDataHelper.SPEED); - reference.put(GetVehicleDataResponse.KEY_RPM, VehicleDataHelper.RPM); - reference.put(GetVehicleDataResponse.KEY_EXTERNAL_TEMPERATURE, VehicleDataHelper.EXTERNAL_TEMPERATURE); - reference.put(GetVehicleDataResponse.KEY_FUEL_LEVEL, VehicleDataHelper.FUEL_LEVEL); - reference.put(GetVehicleDataResponse.KEY_VIN, VehicleDataHelper.VIN); - reference.put(GetVehicleDataResponse.KEY_PRNDL, VehicleDataHelper.PRNDL_FINAL); - reference.put(GetVehicleDataResponse.KEY_TIRE_PRESSURE, tireStatusObj); - reference.put(GetVehicleDataResponse.KEY_ENGINE_TORQUE, VehicleDataHelper.ENGINE_TORQUE); - reference.put(GetVehicleDataResponse.KEY_ENGINE_OIL_LIFE, VehicleDataHelper.ENGINE_OIL_LIFE); - reference.put(GetVehicleDataResponse.KEY_ODOMETER, VehicleDataHelper.ODOMETER); - reference.put(GetVehicleDataResponse.KEY_GPS, GPSDataObj); - reference.put(GetVehicleDataResponse.KEY_FUEL_LEVEL_STATE, VehicleDataHelper.FUEL_LEVEL_STATE); - reference.put(GetVehicleDataResponse.KEY_INSTANT_FUEL_CONSUMPTION, VehicleDataHelper.INSTANT_FUEL_CONSUMPTION); - reference.put(GetVehicleDataResponse.KEY_BELT_STATUS, beltStatusObj); - reference.put(GetVehicleDataResponse.KEY_BODY_INFORMATION, bodyInformationObj); - reference.put(GetVehicleDataResponse.KEY_DEVICE_STATUS, deviceStatusObj); - reference.put(GetVehicleDataResponse.KEY_DRIVER_BRAKING, VehicleDataHelper.DRIVER_BRAKING); - reference.put(GetVehicleDataResponse.KEY_WIPER_STATUS, VehicleDataHelper.WIPER_STATUS); - reference.put(GetVehicleDataResponse.KEY_HEAD_LAMP_STATUS, headLampStatusObj); - reference.put(GetVehicleDataResponse.KEY_ACC_PEDAL_POSITION, VehicleDataHelper.ACC_PEDAL_POSITION); - reference.put(GetVehicleDataResponse.KEY_STEERING_WHEEL_ANGLE, VehicleDataHelper.STEERING_WHEEL_ANGLE); - reference.put(GetVehicleDataResponse.KEY_E_CALL_INFO, ECallInfoObj); - reference.put(GetVehicleDataResponse.KEY_AIRBAG_STATUS, airbagStatusObj); - reference.put(GetVehicleDataResponse.KEY_EMERGENCY_EVENT, emergencyEventObj); - reference.put(GetVehicleDataResponse.KEY_CLUSTER_MODE_STATUS, clusterModeStatusObj); - reference.put(GetVehicleDataResponse.KEY_MY_KEY, myKeyObj); - reference.put(GetVehicleDataResponse.KEY_FUEL_RANGE, fuelRangeArrayObj); - reference.put(GetVehicleDataResponse.KEY_TURN_SIGNAL, TurnSignal.OFF); - reference.put(GetVehicleDataResponse.KEY_GEAR_STATUS, gearStatusObj); - reference.put(GetVehicleDataResponse.KEY_ELECTRONIC_PARK_BRAKE_STATUS, VehicleDataHelper.ELECTRONIC_PARK_BRAKE_STATUS); - reference.put(GetVehicleDataResponse.KEY_WINDOW_STATUS, windowStatusArrayObj); - reference.put(GetVehicleDataResponse.KEY_HANDS_OFF_STEERING, VehicleDataHelper.HANDS_OFF_STEERING); - reference.put(GetVehicleDataResponse.KEY_STABILITY_CONTROLS_STATUS, stabilityControlsStatusObj); - reference.put(TestValues.GENERAL_OEM_CUSTOM_VEHICLE_DATA_NAME, VehicleDataHelper.OEM_CUSTOM_VEHICLE_DATA_STATE); - - JSONObject underTest = msg.serializeJSON(); - - //go inside underTest and only return the JSONObject inside the parameters key inside the response key - underTest = underTest.getJSONObject("response").getJSONObject("parameters"); - - assertEquals("JSON size didn't match expected size.", reference.length(), underTest.length()); - - Iterator<?> iterator = reference.keys(); - - while (iterator.hasNext()) { - String key = (String) iterator.next(); - - if (key.equals(GetVehicleDataResponse.KEY_TIRE_PRESSURE)) { - JSONObject tirePressureReference = JsonUtils.readJsonObjectFromJsonObject(reference, key); - JSONObject tirePressureTest = JsonUtils.readJsonObjectFromJsonObject(underTest, key); - - assertTrue("JSON value didn't match expected value for key \"" + key + "\".", - Validator.validateTireStatus( - new TireStatus(JsonRPCMarshaller.deserializeJSONObject(tirePressureReference)), - new TireStatus(JsonRPCMarshaller.deserializeJSONObject(tirePressureTest)))); - - } - else if (key.equals(GetVehicleDataResponse.KEY_GPS)) { - JSONObject GPSObjReference = JsonUtils.readJsonObjectFromJsonObject(reference, key); - JSONObject GPSObjTest = JsonUtils.readJsonObjectFromJsonObject(underTest, key); - - assertTrue("JSON value didn't match expected value for key \"" + key + "\".", - Validator.validateGpsData( - new GPSData(JsonRPCMarshaller.deserializeJSONObject(GPSObjReference)), - new GPSData(JsonRPCMarshaller.deserializeJSONObject(GPSObjTest)))); - } - else if (key.equals(GetVehicleDataResponse.KEY_BELT_STATUS)) { - JSONObject beltObjReference = JsonUtils.readJsonObjectFromJsonObject(reference, key); - JSONObject beltObjTest = JsonUtils.readJsonObjectFromJsonObject(underTest, key); - - assertTrue("JSON value didn't match expected value for key \"" + key + "\".", - Validator.validateBeltStatus( - new BeltStatus(JsonRPCMarshaller.deserializeJSONObject(beltObjReference)), - new BeltStatus(JsonRPCMarshaller.deserializeJSONObject(beltObjTest)))); - } - else if (key.equals(GetVehicleDataResponse.KEY_BODY_INFORMATION)) { - JSONObject bodyInfoObjReference = JsonUtils.readJsonObjectFromJsonObject(reference, key); - JSONObject bodyInfoObjTest = JsonUtils.readJsonObjectFromJsonObject(underTest, key); - - assertTrue("JSON value didn't match expected value for key \"" + key + "\".", - Validator.validateBodyInformation( - new BodyInformation(JsonRPCMarshaller.deserializeJSONObject(bodyInfoObjReference)), - new BodyInformation(JsonRPCMarshaller.deserializeJSONObject(bodyInfoObjTest)))); - } - else if (key.equals(GetVehicleDataResponse.KEY_DEVICE_STATUS)) { - JSONObject deviceObjReference = JsonUtils.readJsonObjectFromJsonObject(reference, key); - JSONObject deviceObjTest = JsonUtils.readJsonObjectFromJsonObject(underTest, key); - - assertTrue("JSON value didn't match expected value for key \"" + key + "\".", - Validator.validateDeviceStatus( - new DeviceStatus(JsonRPCMarshaller.deserializeJSONObject(deviceObjReference)), - new DeviceStatus(JsonRPCMarshaller.deserializeJSONObject(deviceObjTest)))); - } - else if (key.equals(GetVehicleDataResponse.KEY_HEAD_LAMP_STATUS)) { - JSONObject headLampObjReference = JsonUtils.readJsonObjectFromJsonObject(reference, key); - JSONObject headLampObjTest = JsonUtils.readJsonObjectFromJsonObject(underTest, key); - - assertTrue("JSON value didn't match expected value for key \"" + key + "\".", - Validator.validateHeadLampStatus( - new HeadLampStatus(JsonRPCMarshaller.deserializeJSONObject(headLampObjReference)), - new HeadLampStatus(JsonRPCMarshaller.deserializeJSONObject(headLampObjTest)))); - } - else if (key.equals(GetVehicleDataResponse.KEY_E_CALL_INFO)) { - JSONObject callInfoObjReference = JsonUtils.readJsonObjectFromJsonObject(reference, key); - JSONObject callInfoObjTest = JsonUtils.readJsonObjectFromJsonObject(underTest, key); - - assertTrue("JSON value didn't match expected value for key \"" + key + "\".", - Validator.validateECallInfo( - new ECallInfo(JsonRPCMarshaller.deserializeJSONObject(callInfoObjReference)), - new ECallInfo(JsonRPCMarshaller.deserializeJSONObject(callInfoObjTest)))); - } - else if (key.equals(GetVehicleDataResponse.KEY_AIRBAG_STATUS)) { - JSONObject airbagObjReference = JsonUtils.readJsonObjectFromJsonObject(reference, key); - JSONObject airbagObjTest = JsonUtils.readJsonObjectFromJsonObject(underTest, key); - - assertTrue("JSON value didn't match expected value for key \"" + key + "\".", - Validator.validateAirbagStatus( - new AirbagStatus(JsonRPCMarshaller.deserializeJSONObject(airbagObjReference)), - new AirbagStatus(JsonRPCMarshaller.deserializeJSONObject(airbagObjTest)))); - } - else if (key.equals(GetVehicleDataResponse.KEY_EMERGENCY_EVENT)) { - JSONObject emergencyObjReference = JsonUtils.readJsonObjectFromJsonObject(reference, key); - JSONObject emergencyObjTest = JsonUtils.readJsonObjectFromJsonObject(underTest, key); - - assertTrue("JSON value didn't match expected value for key \"" + key + "\".", - Validator.validateEmergencyEvent( - new EmergencyEvent(JsonRPCMarshaller.deserializeJSONObject(emergencyObjReference)), - new EmergencyEvent(JsonRPCMarshaller.deserializeJSONObject(emergencyObjTest)))); - } - else if (key.equals(GetVehicleDataResponse.KEY_CLUSTER_MODE_STATUS)) { - JSONObject clusterModeObjReference = JsonUtils.readJsonObjectFromJsonObject(reference, key); - JSONObject clusterModeObjTest = JsonUtils.readJsonObjectFromJsonObject(underTest, key); - - assertTrue("JSON value didn't match expected value for key \"" + key + "\".", - Validator.validateClusterModeStatus( - new ClusterModeStatus(JsonRPCMarshaller.deserializeJSONObject(clusterModeObjReference)), - new ClusterModeStatus(JsonRPCMarshaller.deserializeJSONObject(clusterModeObjTest)))); - } - else if (key.equals(GetVehicleDataResponse.KEY_MY_KEY)) { - JSONObject myKeyObjReference = JsonUtils.readJsonObjectFromJsonObject(reference, key); - JSONObject myKeyObjTest = JsonUtils.readJsonObjectFromJsonObject(underTest, key); - - assertTrue("JSON value didn't match expected value for key \"" + key + "\".", - Validator.validateMyKey( - new MyKey(JsonRPCMarshaller.deserializeJSONObject(myKeyObjReference)), - new MyKey(JsonRPCMarshaller.deserializeJSONObject(myKeyObjTest)))); - } - else if (key.equals(GetVehicleDataResponse.KEY_ENGINE_OIL_LIFE)) { - assertEquals("JSON value didn't match expected value for key \"" + key + "\".", - JsonUtils.readDoubleFromJsonObject(reference, key), JsonUtils.readDoubleFromJsonObject(underTest, key)); - } - else if (key.equals(GetVehicleDataResponse.KEY_GEAR_STATUS)) { - JSONObject myKeyObjReference = JsonUtils.readJsonObjectFromJsonObject(reference, key); - JSONObject myKeyObjTest = JsonUtils.readJsonObjectFromJsonObject(underTest, key); - - assertTrue(TestValues.TRUE, Validator.validateGearStatuses( - new GearStatus(JsonRPCMarshaller.deserializeJSONObject(myKeyObjReference)), - new GearStatus(JsonRPCMarshaller.deserializeJSONObject(myKeyObjTest)))); - } - else if (key.equals(GetVehicleDataResponse.KEY_STABILITY_CONTROLS_STATUS)) { - JSONObject myKeyObjReference = JsonUtils.readJsonObjectFromJsonObject(reference, key); - JSONObject myKeyObjTest = JsonUtils.readJsonObjectFromJsonObject(underTest, key); - - StabilityControlsStatus status1 = new StabilityControlsStatus(JsonRPCMarshaller.deserializeJSONObject(myKeyObjReference)); - StabilityControlsStatus status2 = new StabilityControlsStatus(JsonRPCMarshaller.deserializeJSONObject(myKeyObjTest)); - - assertTrue("JSON value didn't match expected value for key \"" + key + "\".", - Validator.validateStabilityControlStatus( - status1, - status2 - ) - ); - } - else if (key.equals(GetVehicleDataResponse.KEY_FUEL_RANGE)) { - JSONArray fuelRangeArrayObjReference = JsonUtils.readJsonArrayFromJsonObject(reference, key); - List<FuelRange> fuelRangeRefereceList = new ArrayList<FuelRange>(); - for (int index = 0; index < fuelRangeArrayObjReference.length(); index++) { - FuelRange fuelRange = new FuelRange(JsonRPCMarshaller.deserializeJSONObject( (JSONObject)fuelRangeArrayObjReference.get(index) )); - fuelRangeRefereceList.add(fuelRange); - } - - JSONArray fuelRangeArrayObjTest = JsonUtils.readJsonArrayFromJsonObject(underTest, key); - List<FuelRange> fuelRangeUnderTestList = new ArrayList<FuelRange>(); - for (int index = 0; index < fuelRangeArrayObjTest.length(); index++) { - FuelRange fuelRange = new FuelRange(JsonRPCMarshaller.deserializeJSONObject( (JSONObject)fuelRangeArrayObjTest.get(index) )); - fuelRangeUnderTestList.add(fuelRange); - } - - assertTrue("JSON value didn't match expected value for key \"" + key + "\".", - Validator.validateFuelRange( - fuelRangeRefereceList, - fuelRangeUnderTestList)); - } - else if (key.equals(GetVehicleDataResponse.KEY_WINDOW_STATUS)) { - JSONArray windowStatusArrayObjReference = JsonUtils.readJsonArrayFromJsonObject(reference, key); - List<WindowStatus> windowStatusReferenceList = new ArrayList<>(); - for (int index = 0; index < windowStatusArrayObjReference.length(); index++) { - WindowStatus windowStatus = new WindowStatus(JsonRPCMarshaller.deserializeJSONObject( (JSONObject)windowStatusArrayObjReference.get(index) )); - windowStatusReferenceList.add(windowStatus); - } - - JSONArray windowStatusArrayObjTest = JsonUtils.readJsonArrayFromJsonObject(underTest, key); - List<WindowStatus> windowStatusUnderTestList = new ArrayList<>(); - for (int index = 0; index < windowStatusArrayObjTest.length(); index++) { - WindowStatus windowStatus = new WindowStatus(JsonRPCMarshaller.deserializeJSONObject( (JSONObject)windowStatusArrayObjTest.get(index) )); - windowStatusUnderTestList.add(windowStatus); - } - - assertTrue("JSON value didn't match expected value for key \"" + key + "\".", - Validator.validateWindowStatuses( - windowStatusReferenceList, - windowStatusUnderTestList)); - } - else { - assertEquals("JSON value didn't match expected value for key \"" + key + "\".", - JsonUtils.readObjectFromJsonObject(reference, key), - JsonUtils.readObjectFromJsonObject(underTest, key)); - } - - } - - } catch (JSONException e) { - fail(TestValues.JSON_FAIL); - } + JSONObject reference = new JSONObject(); + + //objects needed on the first level + JSONObject tireStatusObj = new JSONObject(); + JSONObject GPSDataObj = new JSONObject(); + JSONObject beltStatusObj = new JSONObject(); + JSONObject bodyInformationObj = new JSONObject(); + JSONObject deviceStatusObj = new JSONObject(); + JSONObject headLampStatusObj = new JSONObject(); + JSONObject ECallInfoObj = new JSONObject(); + JSONObject airbagStatusObj = new JSONObject(); + JSONObject emergencyEventObj = new JSONObject(); + JSONObject clusterModeStatusObj = new JSONObject(); + JSONObject myKeyObj = new JSONObject(); + JSONObject stabilityControlsStatusObj = new JSONObject(); + JSONObject fuelRangeObj = new JSONObject(); + JSONObject windowStatusObj = new JSONObject(); + JSONObject gearStatusObj = new JSONObject(); + JSONArray fuelRangeArrayObj = new JSONArray(); + JSONArray windowStatusArrayObj = new JSONArray(); + + try { + //set up the JSONObject to represent GetVehicleDataResponse + //TIRE_PRESSURE + tireStatusObj.put(TireStatus.KEY_PRESSURE_TELL_TALE, VehicleDataHelper.TIRE_PRESSURE_TELL_TALE); + JSONObject tireLeftFront = new JSONObject(); + tireLeftFront.put(SingleTireStatus.KEY_STATUS, VehicleDataHelper.TIRE_PRESSURE_LEFT_FRONT); + tireStatusObj.put(TireStatus.KEY_LEFT_FRONT, tireLeftFront); + JSONObject tireRightFront = new JSONObject(); + tireRightFront.put(SingleTireStatus.KEY_STATUS, VehicleDataHelper.TIRE_PRESSURE_RIGHT_FRONT); + tireStatusObj.put(TireStatus.KEY_RIGHT_FRONT, tireRightFront); + JSONObject tireLeftRear = new JSONObject(); + tireLeftRear.put(SingleTireStatus.KEY_STATUS, VehicleDataHelper.TIRE_PRESSURE_LEFT_REAR); + tireStatusObj.put(TireStatus.KEY_LEFT_REAR, tireLeftRear); + JSONObject tireRightRear = new JSONObject(); + tireRightRear.put(SingleTireStatus.KEY_STATUS, VehicleDataHelper.TIRE_PRESSURE_RIGHT_REAR); + tireStatusObj.put(TireStatus.KEY_RIGHT_REAR, tireRightRear); + JSONObject tireInnerLeftRear = new JSONObject(); + tireInnerLeftRear.put(SingleTireStatus.KEY_STATUS, VehicleDataHelper.TIRE_PRESSURE_INNER_LEFT_REAR); + tireStatusObj.put(TireStatus.KEY_INNER_LEFT_REAR, tireInnerLeftRear); + JSONObject tireInnerRightRear = new JSONObject(); + tireInnerRightRear.put(SingleTireStatus.KEY_STATUS, VehicleDataHelper.TIRE_PRESSURE_INNER_RIGHT_REAR); + tireStatusObj.put(TireStatus.KEY_INNER_RIGHT_REAR, tireInnerRightRear); + + //GPS + GPSDataObj.put(GPSData.KEY_LONGITUDE_DEGREES, VehicleDataHelper.GPS_LONGITUDE); + GPSDataObj.put(GPSData.KEY_LATITUDE_DEGREES, VehicleDataHelper.GPS_LATITUDE); + GPSDataObj.put(GPSData.KEY_UTC_YEAR, VehicleDataHelper.GPS_YEAR); + GPSDataObj.put(GPSData.KEY_UTC_MONTH, VehicleDataHelper.GPS_MONTH); + GPSDataObj.put(GPSData.KEY_UTC_DAY, VehicleDataHelper.GPS_DAY); + GPSDataObj.put(GPSData.KEY_UTC_HOURS, VehicleDataHelper.GPS_HOURS); + GPSDataObj.put(GPSData.KEY_UTC_MINUTES, VehicleDataHelper.GPS_MINUTES); + GPSDataObj.put(GPSData.KEY_UTC_SECONDS, VehicleDataHelper.GPS_SECONDS); + GPSDataObj.put(GPSData.KEY_COMPASS_DIRECTION, VehicleDataHelper.GPS_DIRECTION); + GPSDataObj.put(GPSData.KEY_PDOP, VehicleDataHelper.GPS_PDOP); + GPSDataObj.put(GPSData.KEY_VDOP, VehicleDataHelper.GPS_VDOP); + GPSDataObj.put(GPSData.KEY_HDOP, VehicleDataHelper.GPS_HDOP); + GPSDataObj.put(GPSData.KEY_ACTUAL, VehicleDataHelper.GPS_ACTUAL); + GPSDataObj.put(GPSData.KEY_SATELLITES, VehicleDataHelper.GPS_SATELLITES); + GPSDataObj.put(GPSData.KEY_DIMENSION, VehicleDataHelper.GPS_DIMENSION); + GPSDataObj.put(GPSData.KEY_ALTITUDE, VehicleDataHelper.GPS_ALTITUDE); + GPSDataObj.put(GPSData.KEY_HEADING, VehicleDataHelper.GPS_HEADING); + GPSDataObj.put(GPSData.KEY_SPEED, VehicleDataHelper.GPS_SPEED); + GPSDataObj.put(GPSData.KEY_SHIFTED, VehicleDataHelper.GPS_SHIFTED); + + //BELT_STATUS + beltStatusObj.put(BeltStatus.KEY_DRIVER_BELT_DEPLOYED, VehicleDataHelper.BELT_STATUS_DRIVER_DEPLOYED); + beltStatusObj.put(BeltStatus.KEY_PASSENGER_BELT_DEPLOYED, VehicleDataHelper.BELT_STATUS_PASSENGER_DEPLOYED); + beltStatusObj.put(BeltStatus.KEY_PASSENGER_BUCKLE_BELTED, VehicleDataHelper.BELT_STATUS_PASSENGER_BELTED); + beltStatusObj.put(BeltStatus.KEY_DRIVER_BUCKLE_BELTED, VehicleDataHelper.BELT_STATUS_DRIVER_BELTED); + beltStatusObj.put(BeltStatus.KEY_LEFT_ROW_2_BUCKLE_BELTED, VehicleDataHelper.BELT_STATUS_LEFT_ROW_2_BELTED); + beltStatusObj.put(BeltStatus.KEY_PASSENGER_CHILD_DETECTED, VehicleDataHelper.BELT_STATUS_PASSENGER_CHILD); + beltStatusObj.put(BeltStatus.KEY_RIGHT_ROW_2_BUCKLE_BELTED, VehicleDataHelper.BELT_STATUS_RIGHT_ROW_2_BELTED); + beltStatusObj.put(BeltStatus.KEY_MIDDLE_ROW_2_BUCKLE_BELTED, VehicleDataHelper.BELT_STATUS_MIDDLE_ROW_2_BELTED); + beltStatusObj.put(BeltStatus.KEY_MIDDLE_ROW_3_BUCKLE_BELTED, VehicleDataHelper.BELT_STATUS_MIDDLE_ROW_3_BELTED); + beltStatusObj.put(BeltStatus.KEY_LEFT_ROW_3_BUCKLE_BELTED, VehicleDataHelper.BELT_STATUS_LEFT_ROW_3_BELTED); + beltStatusObj.put(BeltStatus.KEY_RIGHT_ROW_3_BUCKLE_BELTED, VehicleDataHelper.BELT_STATUS_RIGHT_ROW_3_BELTED); + beltStatusObj.put(BeltStatus.KEY_LEFT_REAR_INFLATABLE_BELTED, VehicleDataHelper.BELT_STATUS_LEFT_REAR_INFLATABLE_BELTED); + beltStatusObj.put(BeltStatus.KEY_RIGHT_REAR_INFLATABLE_BELTED, VehicleDataHelper.BELT_STATUS_RIGHT_REAR_INFLATABLE_BELTED); + beltStatusObj.put(BeltStatus.KEY_MIDDLE_ROW_1_BELT_DEPLOYED, VehicleDataHelper.BELT_STATUS_MIDDLE_ROW_1_DEPLOYED); + beltStatusObj.put(BeltStatus.KEY_MIDDLE_ROW_1_BUCKLE_BELTED, VehicleDataHelper.BELT_STATUS_MIDDLE_ROW_1_BELTED); + + //BODY_INFORMATION + bodyInformationObj.put(BodyInformation.KEY_PARK_BRAKE_ACTIVE, VehicleDataHelper.BODY_INFORMATION_PARK_BRAKE); + bodyInformationObj.put(BodyInformation.KEY_IGNITION_STABLE_STATUS, VehicleDataHelper.BODY_INFORMATION_IGNITION_STATUS); + bodyInformationObj.put(BodyInformation.KEY_IGNITION_STATUS, VehicleDataHelper.BODY_INFORMATION_IGNITION_STABLE_STATUS); + bodyInformationObj.put(BodyInformation.KEY_DRIVER_DOOR_AJAR, VehicleDataHelper.BODY_INFORMATION_DRIVER_AJAR); + bodyInformationObj.put(BodyInformation.KEY_PASSENGER_DOOR_AJAR, VehicleDataHelper.BODY_INFORMATION_PASSENGER_AJAR); + bodyInformationObj.put(BodyInformation.KEY_REAR_LEFT_DOOR_AJAR, VehicleDataHelper.BODY_INFORMATION_REAR_LEFT_AJAR); + bodyInformationObj.put(BodyInformation.KEY_REAR_RIGHT_DOOR_AJAR, VehicleDataHelper.BODY_INFORMATION_REAR_RIGHT_AJAR); + + //DEVICE_STATUS + deviceStatusObj.put(DeviceStatus.KEY_VOICE_REC_ON, VehicleDataHelper.DEVICE_STATUS_VOICE_REC); + deviceStatusObj.put(DeviceStatus.KEY_BT_ICON_ON, VehicleDataHelper.DEVICE_STATUS_BT_ICON); + deviceStatusObj.put(DeviceStatus.KEY_CALL_ACTIVE, VehicleDataHelper.DEVICE_STATUS_CALL_ACTIVE); + deviceStatusObj.put(DeviceStatus.KEY_PHONE_ROAMING, VehicleDataHelper.DEVICE_STATUS_PHONE_ROAMING); + deviceStatusObj.put(DeviceStatus.KEY_TEXT_MSG_AVAILABLE, VehicleDataHelper.DEVICE_STATUS_TEXT_MSG_AVAILABLE); + deviceStatusObj.put(DeviceStatus.KEY_BATT_LEVEL_STATUS, VehicleDataHelper.DEVICE_STATUS_BATT_LEVEL_STATUS); + deviceStatusObj.put(DeviceStatus.KEY_STEREO_AUDIO_OUTPUT_MUTED, VehicleDataHelper.DEVICE_STATUS_STEREO_MUTED); + deviceStatusObj.put(DeviceStatus.KEY_MONO_AUDIO_OUTPUT_MUTED, VehicleDataHelper.DEVICE_STATUS_MONO_MUTED); + deviceStatusObj.put(DeviceStatus.KEY_SIGNAL_LEVEL_STATUS, VehicleDataHelper.DEVICE_STATUS_SIGNAL_LEVEL_STATUS); + deviceStatusObj.put(DeviceStatus.KEY_PRIMARY_AUDIO_SOURCE, VehicleDataHelper.DEVICE_STATUS_PRIMARY_AUDIO); + deviceStatusObj.put(DeviceStatus.KEY_E_CALL_EVENT_ACTIVE, VehicleDataHelper.DEVICE_STATUS_E_CALL_ACTIVE); + + //HEAD_LAMP_STATUS + headLampStatusObj.put(HeadLampStatus.KEY_AMBIENT_LIGHT_SENSOR_STATUS, VehicleDataHelper.HEAD_LAMP_STATUS_AMBIENT_STATUS); + headLampStatusObj.put(HeadLampStatus.KEY_HIGH_BEAMS_ON, VehicleDataHelper.HEAD_LAMP_HIGH_BEAMS); + headLampStatusObj.put(HeadLampStatus.KEY_LOW_BEAMS_ON, VehicleDataHelper.HEAD_LAMP_LOW_BEAMS); + + //E_CALL_INFO + ECallInfoObj.put(ECallInfo.KEY_E_CALL_NOTIFICATION_STATUS, VehicleDataHelper.E_CALL_INFO_E_CALL_NOTIFICATION_STATUS); + ECallInfoObj.put(ECallInfo.KEY_AUX_E_CALL_NOTIFICATION_STATUS, VehicleDataHelper.E_CALL_INFO_AUX_E_CALL_NOTIFICATION_STATUS); + ECallInfoObj.put(ECallInfo.KEY_E_CALL_CONFIRMATION_STATUS, VehicleDataHelper.E_CALL_INFO_CONFIRMATION_STATUS); + + //AIRBAG_STATUS + airbagStatusObj.put(AirbagStatus.KEY_DRIVER_AIRBAG_DEPLOYED, VehicleDataHelper.AIRBAG_STATUS_DRIVER_DEPLOYED); + airbagStatusObj.put(AirbagStatus.KEY_DRIVER_SIDE_AIRBAG_DEPLOYED, VehicleDataHelper.AIRBAG_STATUS_DRIVER_SIDE_DEPLOYED); + airbagStatusObj.put(AirbagStatus.KEY_DRIVER_CURTAIN_AIRBAG_DEPLOYED, VehicleDataHelper.AIRBAG_STATUS_DRIVER_CURTAIN_DEPLOYED); + airbagStatusObj.put(AirbagStatus.KEY_DRIVER_KNEE_AIRBAG_DEPLOYED, VehicleDataHelper.AIRBAG_STATUS_DRIVER_KNEE_DEPLOYED); + airbagStatusObj.put(AirbagStatus.KEY_PASSENGER_AIRBAG_DEPLOYED, VehicleDataHelper.AIRBAG_STATUS_PASSENGER_DEPLOYED); + airbagStatusObj.put(AirbagStatus.KEY_PASSENGER_SIDE_AIRBAG_DEPLOYED, VehicleDataHelper.AIRBAG_STATUS_PASSENGER_SIDE_DEPLOYED); + airbagStatusObj.put(AirbagStatus.KEY_PASSENGER_CURTAIN_AIRBAG_DEPLOYED, VehicleDataHelper.AIRBAG_STATUS_PASSENGER_CURTAIN_DEPLOYED); + airbagStatusObj.put(AirbagStatus.KEY_PASSENGER_KNEE_AIRBAG_DEPLOYED, VehicleDataHelper.AIRBAG_STATUS_PASSENGER_KNEE_DEPLOYED); + + //EMERGENCY_EVENT + emergencyEventObj.put(EmergencyEvent.KEY_EMERGENCY_EVENT_TYPE, VehicleDataHelper.EMERGENCY_EVENT_TYPE); + emergencyEventObj.put(EmergencyEvent.KEY_FUEL_CUTOFF_STATUS, VehicleDataHelper.EMERGENCY_EVENT_FUEL_CUTOFF_STATUS); + emergencyEventObj.put(EmergencyEvent.KEY_ROLLOVER_EVENT, VehicleDataHelper.EMERGENCY_EVENT_ROLLOVER_EVENT); + emergencyEventObj.put(EmergencyEvent.KEY_MAXIMUM_CHANGE_VELOCITY, VehicleDataHelper.EMERGENCY_EVENT_MAX_CHANGE_VELOCITY); + emergencyEventObj.put(EmergencyEvent.KEY_MULTIPLE_EVENTS, VehicleDataHelper.EMERGENCY_EVENT_MULTIPLE_EVENTS); + + //CLUSTER_MODE_STATUS + clusterModeStatusObj.put(ClusterModeStatus.KEY_POWER_MODE_ACTIVE, VehicleDataHelper.CLUSTER_MODE_STATUS_POWER_MODE_ACTIVE); + clusterModeStatusObj.put(ClusterModeStatus.KEY_POWER_MODE_QUALIFICATION_STATUS, VehicleDataHelper.CLUSTER_MODE_STATUS_POWER_MODE_QUALIFICATION_STATUS); + clusterModeStatusObj.put(ClusterModeStatus.KEY_CAR_MODE_STATUS, VehicleDataHelper.CLUSTER_MODE_STATUS_CAR_MODE_STATUS); + clusterModeStatusObj.put(ClusterModeStatus.KEY_POWER_MODE_STATUS, VehicleDataHelper.CLUSTER_MODE_STATUS_POWER_MODE_STATUS); + + // STABILITY_CONTROL_STATUS + stabilityControlsStatusObj.put(StabilityControlsStatus.KEY_ESC_SYSTEM, VehicleDataHelper.ESC_SYSTEM); + stabilityControlsStatusObj.put(StabilityControlsStatus.KEY_TRAILER_SWAY_CONTROL, VehicleDataHelper.S_WAY_TRAILER); + + //MY_KEY + myKeyObj.put(MyKey.KEY_E_911_OVERRIDE, VehicleDataHelper.MY_KEY_E_911_OVERRIDE); + + // FUEL_RANGE + fuelRangeObj.put(FuelRange.KEY_TYPE, VehicleDataHelper.FUEL_RANGE_TYPE); + fuelRangeObj.put(FuelRange.KEY_RANGE, VehicleDataHelper.FUEL_RANGE_RANGE); + fuelRangeObj.put(FuelRange.KEY_CAPACITY, VehicleDataHelper.FUEL_RANGE_CAPACITY); + fuelRangeObj.put(FuelRange.KEY_CAPACITY_UNIT, VehicleDataHelper.FUEL_RANGE_CAPACITY_UNIT); + fuelRangeObj.put(FuelRange.KEY_LEVEL, VehicleDataHelper.FUEL_RANGE_LEVEL); + fuelRangeObj.put(FuelRange.KEY_LEVEL_STATE, VehicleDataHelper.FUEL_RANGE_LEVEL_STATE); + fuelRangeArrayObj.put(fuelRangeObj); + + //GEAR_STATUS + gearStatusObj.put(GearStatus.KEY_USER_SELECTED_GEAR, VehicleDataHelper.USER_SELECTED_GEAR); + gearStatusObj.put(GearStatus.KEY_TRANSMISSION_TYPE, VehicleDataHelper.TRANSMISSION_TYPE); + gearStatusObj.put(GearStatus.KEY_ACTUAL_GEAR, VehicleDataHelper.ACTUAL_GEAR); + + // WINDOW_STATUS + windowStatusObj.put(WindowStatus.KEY_LOCATION, VehicleDataHelper.LOCATION_GRID); + windowStatusObj.put(WindowStatus.KEY_STATE, VehicleDataHelper.WINDOW_STATE); + windowStatusArrayObj.put(windowStatusObj); + + reference.put(GetVehicleDataResponse.KEY_SPEED, VehicleDataHelper.SPEED); + reference.put(GetVehicleDataResponse.KEY_RPM, VehicleDataHelper.RPM); + reference.put(GetVehicleDataResponse.KEY_EXTERNAL_TEMPERATURE, VehicleDataHelper.EXTERNAL_TEMPERATURE); + reference.put(GetVehicleDataResponse.KEY_FUEL_LEVEL, VehicleDataHelper.FUEL_LEVEL); + reference.put(GetVehicleDataResponse.KEY_VIN, VehicleDataHelper.VIN); + reference.put(GetVehicleDataResponse.KEY_PRNDL, VehicleDataHelper.PRNDL_FINAL); + reference.put(GetVehicleDataResponse.KEY_TIRE_PRESSURE, tireStatusObj); + reference.put(GetVehicleDataResponse.KEY_ENGINE_TORQUE, VehicleDataHelper.ENGINE_TORQUE); + reference.put(GetVehicleDataResponse.KEY_ENGINE_OIL_LIFE, VehicleDataHelper.ENGINE_OIL_LIFE); + reference.put(GetVehicleDataResponse.KEY_ODOMETER, VehicleDataHelper.ODOMETER); + reference.put(GetVehicleDataResponse.KEY_GPS, GPSDataObj); + reference.put(GetVehicleDataResponse.KEY_FUEL_LEVEL_STATE, VehicleDataHelper.FUEL_LEVEL_STATE); + reference.put(GetVehicleDataResponse.KEY_INSTANT_FUEL_CONSUMPTION, VehicleDataHelper.INSTANT_FUEL_CONSUMPTION); + reference.put(GetVehicleDataResponse.KEY_BELT_STATUS, beltStatusObj); + reference.put(GetVehicleDataResponse.KEY_BODY_INFORMATION, bodyInformationObj); + reference.put(GetVehicleDataResponse.KEY_DEVICE_STATUS, deviceStatusObj); + reference.put(GetVehicleDataResponse.KEY_DRIVER_BRAKING, VehicleDataHelper.DRIVER_BRAKING); + reference.put(GetVehicleDataResponse.KEY_WIPER_STATUS, VehicleDataHelper.WIPER_STATUS); + reference.put(GetVehicleDataResponse.KEY_HEAD_LAMP_STATUS, headLampStatusObj); + reference.put(GetVehicleDataResponse.KEY_ACC_PEDAL_POSITION, VehicleDataHelper.ACC_PEDAL_POSITION); + reference.put(GetVehicleDataResponse.KEY_STEERING_WHEEL_ANGLE, VehicleDataHelper.STEERING_WHEEL_ANGLE); + reference.put(GetVehicleDataResponse.KEY_E_CALL_INFO, ECallInfoObj); + reference.put(GetVehicleDataResponse.KEY_AIRBAG_STATUS, airbagStatusObj); + reference.put(GetVehicleDataResponse.KEY_EMERGENCY_EVENT, emergencyEventObj); + reference.put(GetVehicleDataResponse.KEY_CLUSTER_MODE_STATUS, clusterModeStatusObj); + reference.put(GetVehicleDataResponse.KEY_MY_KEY, myKeyObj); + reference.put(GetVehicleDataResponse.KEY_FUEL_RANGE, fuelRangeArrayObj); + reference.put(GetVehicleDataResponse.KEY_TURN_SIGNAL, TurnSignal.OFF); + reference.put(GetVehicleDataResponse.KEY_GEAR_STATUS, gearStatusObj); + reference.put(GetVehicleDataResponse.KEY_ELECTRONIC_PARK_BRAKE_STATUS, VehicleDataHelper.ELECTRONIC_PARK_BRAKE_STATUS); + reference.put(GetVehicleDataResponse.KEY_WINDOW_STATUS, windowStatusArrayObj); + reference.put(GetVehicleDataResponse.KEY_HANDS_OFF_STEERING, VehicleDataHelper.HANDS_OFF_STEERING); + reference.put(GetVehicleDataResponse.KEY_STABILITY_CONTROLS_STATUS, stabilityControlsStatusObj); + reference.put(TestValues.GENERAL_OEM_CUSTOM_VEHICLE_DATA_NAME, VehicleDataHelper.OEM_CUSTOM_VEHICLE_DATA_STATE); + + JSONObject underTest = msg.serializeJSON(); + + //go inside underTest and only return the JSONObject inside the parameters key inside the response key + underTest = underTest.getJSONObject("response").getJSONObject("parameters"); + + assertEquals("JSON size didn't match expected size.", reference.length(), underTest.length()); + + Iterator<?> iterator = reference.keys(); + + while (iterator.hasNext()) { + String key = (String) iterator.next(); + + if (key.equals(GetVehicleDataResponse.KEY_TIRE_PRESSURE)) { + JSONObject tirePressureReference = JsonUtils.readJsonObjectFromJsonObject(reference, key); + JSONObject tirePressureTest = JsonUtils.readJsonObjectFromJsonObject(underTest, key); + + assertTrue("JSON value didn't match expected value for key \"" + key + "\".", + Validator.validateTireStatus( + new TireStatus(JsonRPCMarshaller.deserializeJSONObject(tirePressureReference)), + new TireStatus(JsonRPCMarshaller.deserializeJSONObject(tirePressureTest)))); + + } else if (key.equals(GetVehicleDataResponse.KEY_GPS)) { + JSONObject GPSObjReference = JsonUtils.readJsonObjectFromJsonObject(reference, key); + JSONObject GPSObjTest = JsonUtils.readJsonObjectFromJsonObject(underTest, key); + + assertTrue("JSON value didn't match expected value for key \"" + key + "\".", + Validator.validateGpsData( + new GPSData(JsonRPCMarshaller.deserializeJSONObject(GPSObjReference)), + new GPSData(JsonRPCMarshaller.deserializeJSONObject(GPSObjTest)))); + } else if (key.equals(GetVehicleDataResponse.KEY_BELT_STATUS)) { + JSONObject beltObjReference = JsonUtils.readJsonObjectFromJsonObject(reference, key); + JSONObject beltObjTest = JsonUtils.readJsonObjectFromJsonObject(underTest, key); + + assertTrue("JSON value didn't match expected value for key \"" + key + "\".", + Validator.validateBeltStatus( + new BeltStatus(JsonRPCMarshaller.deserializeJSONObject(beltObjReference)), + new BeltStatus(JsonRPCMarshaller.deserializeJSONObject(beltObjTest)))); + } else if (key.equals(GetVehicleDataResponse.KEY_BODY_INFORMATION)) { + JSONObject bodyInfoObjReference = JsonUtils.readJsonObjectFromJsonObject(reference, key); + JSONObject bodyInfoObjTest = JsonUtils.readJsonObjectFromJsonObject(underTest, key); + + assertTrue("JSON value didn't match expected value for key \"" + key + "\".", + Validator.validateBodyInformation( + new BodyInformation(JsonRPCMarshaller.deserializeJSONObject(bodyInfoObjReference)), + new BodyInformation(JsonRPCMarshaller.deserializeJSONObject(bodyInfoObjTest)))); + } else if (key.equals(GetVehicleDataResponse.KEY_DEVICE_STATUS)) { + JSONObject deviceObjReference = JsonUtils.readJsonObjectFromJsonObject(reference, key); + JSONObject deviceObjTest = JsonUtils.readJsonObjectFromJsonObject(underTest, key); + + assertTrue("JSON value didn't match expected value for key \"" + key + "\".", + Validator.validateDeviceStatus( + new DeviceStatus(JsonRPCMarshaller.deserializeJSONObject(deviceObjReference)), + new DeviceStatus(JsonRPCMarshaller.deserializeJSONObject(deviceObjTest)))); + } else if (key.equals(GetVehicleDataResponse.KEY_HEAD_LAMP_STATUS)) { + JSONObject headLampObjReference = JsonUtils.readJsonObjectFromJsonObject(reference, key); + JSONObject headLampObjTest = JsonUtils.readJsonObjectFromJsonObject(underTest, key); + + assertTrue("JSON value didn't match expected value for key \"" + key + "\".", + Validator.validateHeadLampStatus( + new HeadLampStatus(JsonRPCMarshaller.deserializeJSONObject(headLampObjReference)), + new HeadLampStatus(JsonRPCMarshaller.deserializeJSONObject(headLampObjTest)))); + } else if (key.equals(GetVehicleDataResponse.KEY_E_CALL_INFO)) { + JSONObject callInfoObjReference = JsonUtils.readJsonObjectFromJsonObject(reference, key); + JSONObject callInfoObjTest = JsonUtils.readJsonObjectFromJsonObject(underTest, key); + + assertTrue("JSON value didn't match expected value for key \"" + key + "\".", + Validator.validateECallInfo( + new ECallInfo(JsonRPCMarshaller.deserializeJSONObject(callInfoObjReference)), + new ECallInfo(JsonRPCMarshaller.deserializeJSONObject(callInfoObjTest)))); + } else if (key.equals(GetVehicleDataResponse.KEY_AIRBAG_STATUS)) { + JSONObject airbagObjReference = JsonUtils.readJsonObjectFromJsonObject(reference, key); + JSONObject airbagObjTest = JsonUtils.readJsonObjectFromJsonObject(underTest, key); + + assertTrue("JSON value didn't match expected value for key \"" + key + "\".", + Validator.validateAirbagStatus( + new AirbagStatus(JsonRPCMarshaller.deserializeJSONObject(airbagObjReference)), + new AirbagStatus(JsonRPCMarshaller.deserializeJSONObject(airbagObjTest)))); + } else if (key.equals(GetVehicleDataResponse.KEY_EMERGENCY_EVENT)) { + JSONObject emergencyObjReference = JsonUtils.readJsonObjectFromJsonObject(reference, key); + JSONObject emergencyObjTest = JsonUtils.readJsonObjectFromJsonObject(underTest, key); + + assertTrue("JSON value didn't match expected value for key \"" + key + "\".", + Validator.validateEmergencyEvent( + new EmergencyEvent(JsonRPCMarshaller.deserializeJSONObject(emergencyObjReference)), + new EmergencyEvent(JsonRPCMarshaller.deserializeJSONObject(emergencyObjTest)))); + } else if (key.equals(GetVehicleDataResponse.KEY_CLUSTER_MODE_STATUS)) { + JSONObject clusterModeObjReference = JsonUtils.readJsonObjectFromJsonObject(reference, key); + JSONObject clusterModeObjTest = JsonUtils.readJsonObjectFromJsonObject(underTest, key); + + assertTrue("JSON value didn't match expected value for key \"" + key + "\".", + Validator.validateClusterModeStatus( + new ClusterModeStatus(JsonRPCMarshaller.deserializeJSONObject(clusterModeObjReference)), + new ClusterModeStatus(JsonRPCMarshaller.deserializeJSONObject(clusterModeObjTest)))); + } else if (key.equals(GetVehicleDataResponse.KEY_MY_KEY)) { + JSONObject myKeyObjReference = JsonUtils.readJsonObjectFromJsonObject(reference, key); + JSONObject myKeyObjTest = JsonUtils.readJsonObjectFromJsonObject(underTest, key); + + assertTrue("JSON value didn't match expected value for key \"" + key + "\".", + Validator.validateMyKey( + new MyKey(JsonRPCMarshaller.deserializeJSONObject(myKeyObjReference)), + new MyKey(JsonRPCMarshaller.deserializeJSONObject(myKeyObjTest)))); + } else if (key.equals(GetVehicleDataResponse.KEY_ENGINE_OIL_LIFE)) { + assertEquals("JSON value didn't match expected value for key \"" + key + "\".", + JsonUtils.readDoubleFromJsonObject(reference, key), JsonUtils.readDoubleFromJsonObject(underTest, key)); + } else if (key.equals(GetVehicleDataResponse.KEY_GEAR_STATUS)) { + JSONObject myKeyObjReference = JsonUtils.readJsonObjectFromJsonObject(reference, key); + JSONObject myKeyObjTest = JsonUtils.readJsonObjectFromJsonObject(underTest, key); + + assertTrue(TestValues.TRUE, Validator.validateGearStatuses( + new GearStatus(JsonRPCMarshaller.deserializeJSONObject(myKeyObjReference)), + new GearStatus(JsonRPCMarshaller.deserializeJSONObject(myKeyObjTest)))); + } else if (key.equals(GetVehicleDataResponse.KEY_STABILITY_CONTROLS_STATUS)) { + JSONObject myKeyObjReference = JsonUtils.readJsonObjectFromJsonObject(reference, key); + JSONObject myKeyObjTest = JsonUtils.readJsonObjectFromJsonObject(underTest, key); + + StabilityControlsStatus status1 = new StabilityControlsStatus(JsonRPCMarshaller.deserializeJSONObject(myKeyObjReference)); + StabilityControlsStatus status2 = new StabilityControlsStatus(JsonRPCMarshaller.deserializeJSONObject(myKeyObjTest)); + + assertTrue("JSON value didn't match expected value for key \"" + key + "\".", + Validator.validateStabilityControlStatus( + status1, + status2 + ) + ); + } else if (key.equals(GetVehicleDataResponse.KEY_FUEL_RANGE)) { + JSONArray fuelRangeArrayObjReference = JsonUtils.readJsonArrayFromJsonObject(reference, key); + List<FuelRange> fuelRangeRefereceList = new ArrayList<FuelRange>(); + for (int index = 0; index < fuelRangeArrayObjReference.length(); index++) { + FuelRange fuelRange = new FuelRange(JsonRPCMarshaller.deserializeJSONObject((JSONObject) fuelRangeArrayObjReference.get(index))); + fuelRangeRefereceList.add(fuelRange); + } + + JSONArray fuelRangeArrayObjTest = JsonUtils.readJsonArrayFromJsonObject(underTest, key); + List<FuelRange> fuelRangeUnderTestList = new ArrayList<FuelRange>(); + for (int index = 0; index < fuelRangeArrayObjTest.length(); index++) { + FuelRange fuelRange = new FuelRange(JsonRPCMarshaller.deserializeJSONObject((JSONObject) fuelRangeArrayObjTest.get(index))); + fuelRangeUnderTestList.add(fuelRange); + } + + assertTrue("JSON value didn't match expected value for key \"" + key + "\".", + Validator.validateFuelRange( + fuelRangeRefereceList, + fuelRangeUnderTestList)); + } else if (key.equals(GetVehicleDataResponse.KEY_WINDOW_STATUS)) { + JSONArray windowStatusArrayObjReference = JsonUtils.readJsonArrayFromJsonObject(reference, key); + List<WindowStatus> windowStatusReferenceList = new ArrayList<>(); + for (int index = 0; index < windowStatusArrayObjReference.length(); index++) { + WindowStatus windowStatus = new WindowStatus(JsonRPCMarshaller.deserializeJSONObject((JSONObject) windowStatusArrayObjReference.get(index))); + windowStatusReferenceList.add(windowStatus); + } + + JSONArray windowStatusArrayObjTest = JsonUtils.readJsonArrayFromJsonObject(underTest, key); + List<WindowStatus> windowStatusUnderTestList = new ArrayList<>(); + for (int index = 0; index < windowStatusArrayObjTest.length(); index++) { + WindowStatus windowStatus = new WindowStatus(JsonRPCMarshaller.deserializeJSONObject((JSONObject) windowStatusArrayObjTest.get(index))); + windowStatusUnderTestList.add(windowStatus); + } + + assertTrue("JSON value didn't match expected value for key \"" + key + "\".", + Validator.validateWindowStatuses( + windowStatusReferenceList, + windowStatusUnderTestList)); + } else { + assertEquals("JSON value didn't match expected value for key \"" + key + "\".", + JsonUtils.readObjectFromJsonObject(reference, key), + JsonUtils.readObjectFromJsonObject(underTest, key)); + } + + } + + } catch (JSONException e) { + fail(TestValues.JSON_FAIL); + } } /** - * Tests the expected values of the RPC message. - */ + * Tests the expected values of the RPC message. + */ @Test - public void testRpcValues(){ - // Valid Tests - assertEquals(TestValues.MATCH, VehicleDataHelper.SPEED, ( (GetVehicleDataResponse) msg ).getSpeed()); - assertEquals(TestValues.MATCH, (Integer) VehicleDataHelper.RPM, ( (GetVehicleDataResponse) msg ).getRpm()); - assertEquals(TestValues.MATCH, VehicleDataHelper.EXTERNAL_TEMPERATURE, ( (GetVehicleDataResponse) msg ).getExternalTemperature()); - assertEquals(TestValues.MATCH, VehicleDataHelper.FUEL_LEVEL, ( (GetVehicleDataResponse) msg ).getFuelLevel()); - assertEquals(TestValues.MATCH, VehicleDataHelper.PRNDL_FINAL, ( (GetVehicleDataResponse) msg ).getPrndl()); - assertEquals(TestValues.MATCH, VehicleDataHelper.TIRE_PRESSURE, ( (GetVehicleDataResponse) msg ).getTirePressure()); - assertEquals(TestValues.MATCH, VehicleDataHelper.ENGINE_TORQUE, ( (GetVehicleDataResponse) msg ).getEngineTorque()); - assertEquals(TestValues.MATCH, VehicleDataHelper.ENGINE_OIL_LIFE, ( (GetVehicleDataResponse) msg ).getEngineOilLife()); - assertEquals(TestValues.MATCH, (Integer) VehicleDataHelper.ODOMETER, ( (GetVehicleDataResponse) msg ).getOdometer()); - assertEquals(TestValues.MATCH, VehicleDataHelper.GPS, ( (GetVehicleDataResponse) msg ).getGps()); - assertEquals(TestValues.MATCH, VehicleDataHelper.FUEL_LEVEL_STATE, ( (GetVehicleDataResponse) msg ).getFuelLevelState()); - assertEquals(TestValues.MATCH, VehicleDataHelper.INSTANT_FUEL_CONSUMPTION, ( (GetVehicleDataResponse) msg ).getInstantFuelConsumption()); - assertEquals(TestValues.MATCH, VehicleDataHelper.BELT_STATUS, ( (GetVehicleDataResponse) msg ).getBeltStatus()); - assertEquals(TestValues.MATCH, VehicleDataHelper.BODY_INFORMATION, ( (GetVehicleDataResponse) msg ).getBodyInformation()); - assertEquals(TestValues.MATCH, VehicleDataHelper.DEVICE_STATUS, ( (GetVehicleDataResponse) msg ).getDeviceStatus()); - assertEquals(TestValues.MATCH, VehicleDataHelper.DRIVER_BRAKING, ( (GetVehicleDataResponse) msg ).getDriverBraking()); - assertEquals(TestValues.MATCH, VehicleDataHelper.WIPER_STATUS, ( (GetVehicleDataResponse) msg ).getWiperStatus()); - assertEquals(TestValues.MATCH, VehicleDataHelper.HEAD_LAMP_STATUS, ( (GetVehicleDataResponse) msg ).getHeadLampStatus()); - assertEquals(TestValues.MATCH, VehicleDataHelper.ACC_PEDAL_POSITION, ( (GetVehicleDataResponse) msg ).getAccPedalPosition()); - assertEquals(TestValues.MATCH, VehicleDataHelper.STEERING_WHEEL_ANGLE, ( (GetVehicleDataResponse) msg ).getSteeringWheelAngle()); - assertEquals(TestValues.MATCH, VehicleDataHelper.E_CALL_INFO, ( (GetVehicleDataResponse) msg ).getECallInfo()); - assertEquals(TestValues.MATCH, VehicleDataHelper.AIRBAG_STATUS, ( (GetVehicleDataResponse) msg ).getAirbagStatus()); - assertEquals(TestValues.MATCH, VehicleDataHelper.EMERGENCY_EVENT, ( (GetVehicleDataResponse) msg ).getEmergencyEvent()); - assertEquals(TestValues.MATCH, VehicleDataHelper.CLUSTER_MODE_STATUS, ( (GetVehicleDataResponse) msg ).getClusterModeStatus()); - assertEquals(TestValues.MATCH, VehicleDataHelper.MY_KEY, ( (GetVehicleDataResponse) msg ).getMyKey()); - assertEquals(TestValues.MATCH, VehicleDataHelper.TURN_SIGNAL, ( (GetVehicleDataResponse) msg ).getTurnSignal()); - assertEquals(TestValues.MATCH, VehicleDataHelper.ELECTRONIC_PARK_BRAKE_STATUS, ( (GetVehicleDataResponse) msg ).getElectronicParkBrakeStatus()); - assertEquals(TestValues.MATCH, VehicleDataHelper.WINDOW_STATUS_LIST, ( (GetVehicleDataResponse) msg ).getWindowStatus()); - assertEquals(TestValues.MATCH, VehicleDataHelper.GEAR_STATUS, ( (GetVehicleDataResponse) msg ).getGearStatus()); - assertEquals(TestValues.MATCH, VehicleDataHelper.HANDS_OFF_STEERING, ( (GetVehicleDataResponse) msg ).getHandsOffSteering()); - assertEquals(TestValues.MATCH, VehicleDataHelper.STABILITY_CONTROLS_STATUS, ( (GetVehicleDataResponse) msg ).getStabilityControlsStatus()); - assertEquals(TestValues.MATCH, VehicleDataHelper.OEM_CUSTOM_VEHICLE_DATA_STATE, ( (GetVehicleDataResponse) msg ).getOEMCustomVehicleData(TestValues.GENERAL_OEM_CUSTOM_VEHICLE_DATA_NAME)); - - // Invalid/Null Tests - GetVehicleDataResponse msg = new GetVehicleDataResponse(); - assertNotNull(TestValues.NOT_NULL, msg); - testNullBase(msg); - - assertNull(TestValues.NULL, msg.getAccPedalPosition()); + public void testRpcValues() { + // Valid Tests + assertEquals(TestValues.MATCH, VehicleDataHelper.SPEED, ((GetVehicleDataResponse) msg).getSpeed()); + assertEquals(TestValues.MATCH, (Integer) VehicleDataHelper.RPM, ((GetVehicleDataResponse) msg).getRpm()); + assertEquals(TestValues.MATCH, VehicleDataHelper.EXTERNAL_TEMPERATURE, ((GetVehicleDataResponse) msg).getExternalTemperature()); + assertEquals(TestValues.MATCH, VehicleDataHelper.FUEL_LEVEL, ((GetVehicleDataResponse) msg).getFuelLevel()); + assertEquals(TestValues.MATCH, VehicleDataHelper.PRNDL_FINAL, ((GetVehicleDataResponse) msg).getPrndl()); + assertEquals(TestValues.MATCH, VehicleDataHelper.TIRE_PRESSURE, ((GetVehicleDataResponse) msg).getTirePressure()); + assertEquals(TestValues.MATCH, VehicleDataHelper.ENGINE_TORQUE, ((GetVehicleDataResponse) msg).getEngineTorque()); + assertEquals(TestValues.MATCH, VehicleDataHelper.ENGINE_OIL_LIFE, ((GetVehicleDataResponse) msg).getEngineOilLife()); + assertEquals(TestValues.MATCH, (Integer) VehicleDataHelper.ODOMETER, ((GetVehicleDataResponse) msg).getOdometer()); + assertEquals(TestValues.MATCH, VehicleDataHelper.GPS, ((GetVehicleDataResponse) msg).getGps()); + assertEquals(TestValues.MATCH, VehicleDataHelper.FUEL_LEVEL_STATE, ((GetVehicleDataResponse) msg).getFuelLevelState()); + assertEquals(TestValues.MATCH, VehicleDataHelper.INSTANT_FUEL_CONSUMPTION, ((GetVehicleDataResponse) msg).getInstantFuelConsumption()); + assertEquals(TestValues.MATCH, VehicleDataHelper.BELT_STATUS, ((GetVehicleDataResponse) msg).getBeltStatus()); + assertEquals(TestValues.MATCH, VehicleDataHelper.BODY_INFORMATION, ((GetVehicleDataResponse) msg).getBodyInformation()); + assertEquals(TestValues.MATCH, VehicleDataHelper.DEVICE_STATUS, ((GetVehicleDataResponse) msg).getDeviceStatus()); + assertEquals(TestValues.MATCH, VehicleDataHelper.DRIVER_BRAKING, ((GetVehicleDataResponse) msg).getDriverBraking()); + assertEquals(TestValues.MATCH, VehicleDataHelper.WIPER_STATUS, ((GetVehicleDataResponse) msg).getWiperStatus()); + assertEquals(TestValues.MATCH, VehicleDataHelper.HEAD_LAMP_STATUS, ((GetVehicleDataResponse) msg).getHeadLampStatus()); + assertEquals(TestValues.MATCH, VehicleDataHelper.ACC_PEDAL_POSITION, ((GetVehicleDataResponse) msg).getAccPedalPosition()); + assertEquals(TestValues.MATCH, VehicleDataHelper.STEERING_WHEEL_ANGLE, ((GetVehicleDataResponse) msg).getSteeringWheelAngle()); + assertEquals(TestValues.MATCH, VehicleDataHelper.E_CALL_INFO, ((GetVehicleDataResponse) msg).getECallInfo()); + assertEquals(TestValues.MATCH, VehicleDataHelper.AIRBAG_STATUS, ((GetVehicleDataResponse) msg).getAirbagStatus()); + assertEquals(TestValues.MATCH, VehicleDataHelper.EMERGENCY_EVENT, ((GetVehicleDataResponse) msg).getEmergencyEvent()); + assertEquals(TestValues.MATCH, VehicleDataHelper.CLUSTER_MODE_STATUS, ((GetVehicleDataResponse) msg).getClusterModeStatus()); + assertEquals(TestValues.MATCH, VehicleDataHelper.MY_KEY, ((GetVehicleDataResponse) msg).getMyKey()); + assertEquals(TestValues.MATCH, VehicleDataHelper.TURN_SIGNAL, ((GetVehicleDataResponse) msg).getTurnSignal()); + assertEquals(TestValues.MATCH, VehicleDataHelper.ELECTRONIC_PARK_BRAKE_STATUS, ((GetVehicleDataResponse) msg).getElectronicParkBrakeStatus()); + assertEquals(TestValues.MATCH, VehicleDataHelper.WINDOW_STATUS_LIST, ((GetVehicleDataResponse) msg).getWindowStatus()); + assertEquals(TestValues.MATCH, VehicleDataHelper.GEAR_STATUS, ((GetVehicleDataResponse) msg).getGearStatus()); + assertEquals(TestValues.MATCH, VehicleDataHelper.HANDS_OFF_STEERING, ((GetVehicleDataResponse) msg).getHandsOffSteering()); + assertEquals(TestValues.MATCH, VehicleDataHelper.STABILITY_CONTROLS_STATUS, ((GetVehicleDataResponse) msg).getStabilityControlsStatus()); + assertEquals(TestValues.MATCH, VehicleDataHelper.OEM_CUSTOM_VEHICLE_DATA_STATE, ((GetVehicleDataResponse) msg).getOEMCustomVehicleData(TestValues.GENERAL_OEM_CUSTOM_VEHICLE_DATA_NAME)); + + // Invalid/Null Tests + GetVehicleDataResponse msg = new GetVehicleDataResponse(); + assertNotNull(TestValues.NOT_NULL, msg); + testNullBase(msg); + + assertNull(TestValues.NULL, msg.getAccPedalPosition()); assertNull(TestValues.NULL, msg.getAirbagStatus()); assertNull(TestValues.NULL, msg.getBeltStatus()); assertNull(TestValues.NULL, msg.getDriverBraking()); @@ -576,120 +560,120 @@ public class GetVehicleDataResponseTests extends BaseRpcTests{ assertNull(TestValues.NULL, msg.getTurnSignal()); assertNull(TestValues.NULL, msg.getElectronicParkBrakeStatus()); assertNull(TestValues.NULL, msg.getGearStatus()); - assertNull(TestValues.NULL, msg.getHandsOffSteering()); + assertNull(TestValues.NULL, msg.getHandsOffSteering()); assertNull(TestValues.NULL, msg.getStabilityControlsStatus()); assertNull(TestValues.NULL, msg.getWindowStatus()); assertNull(TestValues.NULL, msg.getOEMCustomVehicleData(TestValues.GENERAL_OEM_CUSTOM_VEHICLE_DATA_NAME)); } - - /** + + /** * Tests a valid JSON construction of this RPC message. */ - @Test - public void testJsonConstructor () { - JSONObject commandJson = JsonFileReader.readId(getInstrumentation().getTargetContext(), getCommandType(), getMessageType()); - assertNotNull(TestValues.NOT_NULL, commandJson); - - try { - Hashtable<String, Object> hash = JsonRPCMarshaller.deserializeJSONObject(commandJson); - GetVehicleDataResponse cmd = new GetVehicleDataResponse(hash); - - JSONObject body = JsonUtils.readJsonObjectFromJsonObject(commandJson, getMessageType()); - assertNotNull(TestValues.NOT_NULL, body); - - // Test everything in the json body. - assertEquals(TestValues.MATCH, JsonUtils.readStringFromJsonObject(body, RPCMessage.KEY_FUNCTION_NAME), cmd.getFunctionName()); - assertEquals(TestValues.MATCH, JsonUtils.readIntegerFromJsonObject(body, RPCMessage.KEY_CORRELATION_ID), cmd.getCorrelationID()); - - JSONObject parameters = JsonUtils.readJsonObjectFromJsonObject(body, RPCMessage.KEY_PARAMETERS); - assertEquals(TestValues.MATCH, JsonUtils.readDoubleFromJsonObject(parameters, GetVehicleDataResponse.KEY_SPEED), cmd.getSpeed()); - assertEquals(TestValues.MATCH, JsonUtils.readIntegerFromJsonObject(parameters, GetVehicleDataResponse.KEY_RPM), cmd.getRpm()); - assertEquals(TestValues.MATCH, JsonUtils.readDoubleFromJsonObject(parameters, GetVehicleDataResponse.KEY_EXTERNAL_TEMPERATURE), cmd.getExternalTemperature()); - assertEquals(TestValues.MATCH, JsonUtils.readDoubleFromJsonObject(parameters, GetVehicleDataResponse.KEY_FUEL_LEVEL), cmd.getFuelLevel()); - assertEquals(TestValues.MATCH, JsonUtils.readStringFromJsonObject(parameters, GetVehicleDataResponse.KEY_VIN), cmd.getVin()); - assertEquals(TestValues.MATCH, JsonUtils.readStringFromJsonObject(parameters, GetVehicleDataResponse.KEY_PRNDL), cmd.getPrndl().toString()); - assertEquals(TestValues.MATCH, JsonUtils.readBooleanFromJsonObject(parameters, GetVehicleDataResponse.KEY_HANDS_OFF_STEERING), cmd.getHandsOffSteering()); - JSONObject tireStatusObj = JsonUtils.readJsonObjectFromJsonObject(parameters, GetVehicleDataResponse.KEY_TIRE_PRESSURE); - TireStatus tireStatus = new TireStatus(JsonRPCMarshaller.deserializeJSONObject(tireStatusObj)); - assertTrue(TestValues.TRUE, Validator.validateTireStatus(tireStatus, cmd.getTirePressure()) ); - - assertEquals(TestValues.MATCH, JsonUtils.readDoubleFromJsonObject(parameters, GetVehicleDataResponse.KEY_ENGINE_TORQUE), cmd.getEngineTorque()); - assertEquals(TestValues.MATCH, JsonUtils.readDoubleFromJsonObject(parameters, GetVehicleDataResponse.KEY_ENGINE_OIL_LIFE), cmd.getEngineOilLife(), 0.0002); - assertEquals(TestValues.MATCH, JsonUtils.readIntegerFromJsonObject(parameters, GetVehicleDataResponse.KEY_ODOMETER), cmd.getOdometer()); - - JSONObject gpsDataObj = JsonUtils.readJsonObjectFromJsonObject(parameters, GetVehicleDataResponse.KEY_GPS); - GPSData gpsData = new GPSData(JsonRPCMarshaller.deserializeJSONObject(gpsDataObj)); - assertTrue(TestValues.TRUE, Validator.validateGpsData(gpsData, cmd.getGps()) ); - - assertEquals(TestValues.MATCH, JsonUtils.readStringFromJsonObject(parameters, GetVehicleDataResponse.KEY_FUEL_LEVEL_STATE), cmd.getFuelLevelState().toString()); - assertEquals(TestValues.MATCH, JsonUtils.readDoubleFromJsonObject(parameters, GetVehicleDataResponse.KEY_INSTANT_FUEL_CONSUMPTION), cmd.getInstantFuelConsumption()); - - JSONObject beltStatusObj = JsonUtils.readJsonObjectFromJsonObject(parameters, GetVehicleDataResponse.KEY_BELT_STATUS); - BeltStatus beltStatus = new BeltStatus(JsonRPCMarshaller.deserializeJSONObject(beltStatusObj)); - assertTrue(TestValues.TRUE, Validator.validateBeltStatus(beltStatus, cmd.getBeltStatus()) ); - - JSONObject bodyInformationObj = JsonUtils.readJsonObjectFromJsonObject(parameters, GetVehicleDataResponse.KEY_BODY_INFORMATION); - BodyInformation bodyInformation = new BodyInformation(JsonRPCMarshaller.deserializeJSONObject(bodyInformationObj)); - assertTrue(TestValues.TRUE, Validator.validateBodyInformation(bodyInformation, cmd.getBodyInformation()) ); - - JSONObject deviceStatusObj = JsonUtils.readJsonObjectFromJsonObject(parameters, GetVehicleDataResponse.KEY_DEVICE_STATUS); - DeviceStatus deviceStatus = new DeviceStatus(JsonRPCMarshaller.deserializeJSONObject(deviceStatusObj)); - assertTrue(TestValues.TRUE, Validator.validateDeviceStatus(deviceStatus, cmd.getDeviceStatus()) ); - - assertEquals(TestValues.MATCH, JsonUtils.readStringFromJsonObject(parameters, GetVehicleDataResponse.KEY_DRIVER_BRAKING), cmd.getDriverBraking().toString()); - assertEquals(TestValues.MATCH, JsonUtils.readStringFromJsonObject(parameters, GetVehicleDataResponse.KEY_WIPER_STATUS), cmd.getWiperStatus().toString()); - - JSONObject headLampStatusObj = JsonUtils.readJsonObjectFromJsonObject(parameters, GetVehicleDataResponse.KEY_HEAD_LAMP_STATUS); - HeadLampStatus headLampStatus = new HeadLampStatus(JsonRPCMarshaller.deserializeJSONObject(headLampStatusObj)); - assertTrue(TestValues.TRUE, Validator.validateHeadLampStatus(headLampStatus, cmd.getHeadLampStatus()) ); - - assertEquals(TestValues.MATCH, JsonUtils.readDoubleFromJsonObject(parameters, GetVehicleDataResponse.KEY_ACC_PEDAL_POSITION), cmd.getAccPedalPosition()); - assertEquals(TestValues.MATCH, JsonUtils.readDoubleFromJsonObject(parameters, GetVehicleDataResponse.KEY_STEERING_WHEEL_ANGLE), cmd.getSteeringWheelAngle()); - - JSONObject eCallInfoObj = JsonUtils.readJsonObjectFromJsonObject(parameters, GetVehicleDataResponse.KEY_E_CALL_INFO); - ECallInfo eCallInfo = new ECallInfo(JsonRPCMarshaller.deserializeJSONObject(eCallInfoObj)); - assertTrue(TestValues.TRUE, Validator.validateECallInfo(eCallInfo, cmd.getECallInfo()) ); - - JSONObject airbagStatusObj = JsonUtils.readJsonObjectFromJsonObject(parameters, GetVehicleDataResponse.KEY_AIRBAG_STATUS); - AirbagStatus airbagStatus = new AirbagStatus(JsonRPCMarshaller.deserializeJSONObject(airbagStatusObj)); - assertTrue(TestValues.TRUE, Validator.validateAirbagStatus(airbagStatus, cmd.getAirbagStatus()) ); - - JSONObject emergencyEventObj = JsonUtils.readJsonObjectFromJsonObject(parameters, GetVehicleDataResponse.KEY_EMERGENCY_EVENT); - EmergencyEvent emergencyEvent = new EmergencyEvent(JsonRPCMarshaller.deserializeJSONObject(emergencyEventObj)); - assertTrue(TestValues.TRUE, Validator.validateEmergencyEvent(emergencyEvent, cmd.getEmergencyEvent()) ); - - JSONObject clusterModeStatusObj = JsonUtils.readJsonObjectFromJsonObject(parameters, GetVehicleDataResponse.KEY_CLUSTER_MODE_STATUS); - ClusterModeStatus clusterModeStatus = new ClusterModeStatus(JsonRPCMarshaller.deserializeJSONObject(clusterModeStatusObj)); - assertTrue(TestValues.TRUE, Validator.validateClusterModeStatus(clusterModeStatus, cmd.getClusterModeStatus()) ); - - JSONObject gearStatusObj = JsonUtils.readJsonObjectFromJsonObject(parameters, GetVehicleDataResponse.KEY_GEAR_STATUS); - GearStatus gearStatus = new GearStatus(JsonRPCMarshaller.deserializeJSONObject(gearStatusObj)); - GearStatus cmdStatus = cmd.getGearStatus(); - assertTrue(TestValues.TRUE, Validator.validateGearStatuses(gearStatus, cmdStatus)); - - JSONObject myKeyObj = JsonUtils.readJsonObjectFromJsonObject(parameters, GetVehicleDataResponse.KEY_MY_KEY); - MyKey myKey = new MyKey(JsonRPCMarshaller.deserializeJSONObject(myKeyObj)); - assertTrue(TestValues.TRUE, Validator.validateMyKey(myKey, cmd.getMyKey()) ); - - JSONArray windowStatusArray = JsonUtils.readJsonArrayFromJsonObject(parameters, GetVehicleDataResponse.KEY_WINDOW_STATUS); - - List<WindowStatus> windowStatus = new ArrayList<>(); - for (int index = 0; index < windowStatusArray.length(); index++) { - WindowStatus status = new WindowStatus(JsonRPCMarshaller.deserializeJSONObject( (JSONObject)windowStatusArray.get(index)) ); - windowStatus.add(status); - } - assertTrue(TestValues.TRUE, Validator.validateWindowStatuses(windowStatus, cmd.getWindowStatus()) ); - - assertEquals(TestValues.MATCH, JsonUtils.readStringFromJsonObject(parameters, GetVehicleDataResponse.KEY_TURN_SIGNAL), cmd.getTurnSignal().toString()); - assertEquals(TestValues.MATCH, JsonUtils.readStringFromJsonObject(parameters, GetVehicleDataResponse.KEY_ELECTRONIC_PARK_BRAKE_STATUS), cmd.getElectronicParkBrakeStatus().toString()); - assertEquals(TestValues.MATCH, JsonUtils.readStringFromJsonObject(parameters, TestValues.GENERAL_OEM_CUSTOM_VEHICLE_DATA_NAME), cmd.getOEMCustomVehicleData(TestValues.GENERAL_OEM_CUSTOM_VEHICLE_DATA_NAME)); - - JSONObject stabilityControlStatusObj = JsonUtils.readJsonObjectFromJsonObject(parameters, GetVehicleDataResponse.KEY_STABILITY_CONTROLS_STATUS); - StabilityControlsStatus stabilityControlsStatus = new StabilityControlsStatus(JsonRPCMarshaller.deserializeJSONObject(stabilityControlStatusObj)); - assertTrue(TestValues.TRUE, Validator.validateStabilityControlStatus(stabilityControlsStatus, cmd.getStabilityControlsStatus())); - } catch (JSONException e) { - e.printStackTrace(); - } - } + @Test + public void testJsonConstructor() { + JSONObject commandJson = JsonFileReader.readId(getInstrumentation().getTargetContext(), getCommandType(), getMessageType()); + assertNotNull(TestValues.NOT_NULL, commandJson); + + try { + Hashtable<String, Object> hash = JsonRPCMarshaller.deserializeJSONObject(commandJson); + GetVehicleDataResponse cmd = new GetVehicleDataResponse(hash); + + JSONObject body = JsonUtils.readJsonObjectFromJsonObject(commandJson, getMessageType()); + assertNotNull(TestValues.NOT_NULL, body); + + // Test everything in the json body. + assertEquals(TestValues.MATCH, JsonUtils.readStringFromJsonObject(body, RPCMessage.KEY_FUNCTION_NAME), cmd.getFunctionName()); + assertEquals(TestValues.MATCH, JsonUtils.readIntegerFromJsonObject(body, RPCMessage.KEY_CORRELATION_ID), cmd.getCorrelationID()); + + JSONObject parameters = JsonUtils.readJsonObjectFromJsonObject(body, RPCMessage.KEY_PARAMETERS); + assertEquals(TestValues.MATCH, JsonUtils.readDoubleFromJsonObject(parameters, GetVehicleDataResponse.KEY_SPEED), cmd.getSpeed()); + assertEquals(TestValues.MATCH, JsonUtils.readIntegerFromJsonObject(parameters, GetVehicleDataResponse.KEY_RPM), cmd.getRpm()); + assertEquals(TestValues.MATCH, JsonUtils.readDoubleFromJsonObject(parameters, GetVehicleDataResponse.KEY_EXTERNAL_TEMPERATURE), cmd.getExternalTemperature()); + assertEquals(TestValues.MATCH, JsonUtils.readDoubleFromJsonObject(parameters, GetVehicleDataResponse.KEY_FUEL_LEVEL), cmd.getFuelLevel()); + assertEquals(TestValues.MATCH, JsonUtils.readStringFromJsonObject(parameters, GetVehicleDataResponse.KEY_VIN), cmd.getVin()); + assertEquals(TestValues.MATCH, JsonUtils.readStringFromJsonObject(parameters, GetVehicleDataResponse.KEY_PRNDL), cmd.getPrndl().toString()); + assertEquals(TestValues.MATCH, JsonUtils.readBooleanFromJsonObject(parameters, GetVehicleDataResponse.KEY_HANDS_OFF_STEERING), cmd.getHandsOffSteering()); + JSONObject tireStatusObj = JsonUtils.readJsonObjectFromJsonObject(parameters, GetVehicleDataResponse.KEY_TIRE_PRESSURE); + TireStatus tireStatus = new TireStatus(JsonRPCMarshaller.deserializeJSONObject(tireStatusObj)); + assertTrue(TestValues.TRUE, Validator.validateTireStatus(tireStatus, cmd.getTirePressure())); + + assertEquals(TestValues.MATCH, JsonUtils.readDoubleFromJsonObject(parameters, GetVehicleDataResponse.KEY_ENGINE_TORQUE), cmd.getEngineTorque()); + assertEquals(TestValues.MATCH, JsonUtils.readDoubleFromJsonObject(parameters, GetVehicleDataResponse.KEY_ENGINE_OIL_LIFE), cmd.getEngineOilLife(), 0.0002); + assertEquals(TestValues.MATCH, JsonUtils.readIntegerFromJsonObject(parameters, GetVehicleDataResponse.KEY_ODOMETER), cmd.getOdometer()); + + JSONObject gpsDataObj = JsonUtils.readJsonObjectFromJsonObject(parameters, GetVehicleDataResponse.KEY_GPS); + GPSData gpsData = new GPSData(JsonRPCMarshaller.deserializeJSONObject(gpsDataObj)); + assertTrue(TestValues.TRUE, Validator.validateGpsData(gpsData, cmd.getGps())); + + assertEquals(TestValues.MATCH, JsonUtils.readStringFromJsonObject(parameters, GetVehicleDataResponse.KEY_FUEL_LEVEL_STATE), cmd.getFuelLevelState().toString()); + assertEquals(TestValues.MATCH, JsonUtils.readDoubleFromJsonObject(parameters, GetVehicleDataResponse.KEY_INSTANT_FUEL_CONSUMPTION), cmd.getInstantFuelConsumption()); + + JSONObject beltStatusObj = JsonUtils.readJsonObjectFromJsonObject(parameters, GetVehicleDataResponse.KEY_BELT_STATUS); + BeltStatus beltStatus = new BeltStatus(JsonRPCMarshaller.deserializeJSONObject(beltStatusObj)); + assertTrue(TestValues.TRUE, Validator.validateBeltStatus(beltStatus, cmd.getBeltStatus())); + + JSONObject bodyInformationObj = JsonUtils.readJsonObjectFromJsonObject(parameters, GetVehicleDataResponse.KEY_BODY_INFORMATION); + BodyInformation bodyInformation = new BodyInformation(JsonRPCMarshaller.deserializeJSONObject(bodyInformationObj)); + assertTrue(TestValues.TRUE, Validator.validateBodyInformation(bodyInformation, cmd.getBodyInformation())); + + JSONObject deviceStatusObj = JsonUtils.readJsonObjectFromJsonObject(parameters, GetVehicleDataResponse.KEY_DEVICE_STATUS); + DeviceStatus deviceStatus = new DeviceStatus(JsonRPCMarshaller.deserializeJSONObject(deviceStatusObj)); + assertTrue(TestValues.TRUE, Validator.validateDeviceStatus(deviceStatus, cmd.getDeviceStatus())); + + assertEquals(TestValues.MATCH, JsonUtils.readStringFromJsonObject(parameters, GetVehicleDataResponse.KEY_DRIVER_BRAKING), cmd.getDriverBraking().toString()); + assertEquals(TestValues.MATCH, JsonUtils.readStringFromJsonObject(parameters, GetVehicleDataResponse.KEY_WIPER_STATUS), cmd.getWiperStatus().toString()); + + JSONObject headLampStatusObj = JsonUtils.readJsonObjectFromJsonObject(parameters, GetVehicleDataResponse.KEY_HEAD_LAMP_STATUS); + HeadLampStatus headLampStatus = new HeadLampStatus(JsonRPCMarshaller.deserializeJSONObject(headLampStatusObj)); + assertTrue(TestValues.TRUE, Validator.validateHeadLampStatus(headLampStatus, cmd.getHeadLampStatus())); + + assertEquals(TestValues.MATCH, JsonUtils.readDoubleFromJsonObject(parameters, GetVehicleDataResponse.KEY_ACC_PEDAL_POSITION), cmd.getAccPedalPosition()); + assertEquals(TestValues.MATCH, JsonUtils.readDoubleFromJsonObject(parameters, GetVehicleDataResponse.KEY_STEERING_WHEEL_ANGLE), cmd.getSteeringWheelAngle()); + + JSONObject eCallInfoObj = JsonUtils.readJsonObjectFromJsonObject(parameters, GetVehicleDataResponse.KEY_E_CALL_INFO); + ECallInfo eCallInfo = new ECallInfo(JsonRPCMarshaller.deserializeJSONObject(eCallInfoObj)); + assertTrue(TestValues.TRUE, Validator.validateECallInfo(eCallInfo, cmd.getECallInfo())); + + JSONObject airbagStatusObj = JsonUtils.readJsonObjectFromJsonObject(parameters, GetVehicleDataResponse.KEY_AIRBAG_STATUS); + AirbagStatus airbagStatus = new AirbagStatus(JsonRPCMarshaller.deserializeJSONObject(airbagStatusObj)); + assertTrue(TestValues.TRUE, Validator.validateAirbagStatus(airbagStatus, cmd.getAirbagStatus())); + + JSONObject emergencyEventObj = JsonUtils.readJsonObjectFromJsonObject(parameters, GetVehicleDataResponse.KEY_EMERGENCY_EVENT); + EmergencyEvent emergencyEvent = new EmergencyEvent(JsonRPCMarshaller.deserializeJSONObject(emergencyEventObj)); + assertTrue(TestValues.TRUE, Validator.validateEmergencyEvent(emergencyEvent, cmd.getEmergencyEvent())); + + JSONObject clusterModeStatusObj = JsonUtils.readJsonObjectFromJsonObject(parameters, GetVehicleDataResponse.KEY_CLUSTER_MODE_STATUS); + ClusterModeStatus clusterModeStatus = new ClusterModeStatus(JsonRPCMarshaller.deserializeJSONObject(clusterModeStatusObj)); + assertTrue(TestValues.TRUE, Validator.validateClusterModeStatus(clusterModeStatus, cmd.getClusterModeStatus())); + + JSONObject gearStatusObj = JsonUtils.readJsonObjectFromJsonObject(parameters, GetVehicleDataResponse.KEY_GEAR_STATUS); + GearStatus gearStatus = new GearStatus(JsonRPCMarshaller.deserializeJSONObject(gearStatusObj)); + GearStatus cmdStatus = cmd.getGearStatus(); + assertTrue(TestValues.TRUE, Validator.validateGearStatuses(gearStatus, cmdStatus)); + + JSONObject myKeyObj = JsonUtils.readJsonObjectFromJsonObject(parameters, GetVehicleDataResponse.KEY_MY_KEY); + MyKey myKey = new MyKey(JsonRPCMarshaller.deserializeJSONObject(myKeyObj)); + assertTrue(TestValues.TRUE, Validator.validateMyKey(myKey, cmd.getMyKey())); + + JSONArray windowStatusArray = JsonUtils.readJsonArrayFromJsonObject(parameters, GetVehicleDataResponse.KEY_WINDOW_STATUS); + + List<WindowStatus> windowStatus = new ArrayList<>(); + for (int index = 0; index < windowStatusArray.length(); index++) { + WindowStatus status = new WindowStatus(JsonRPCMarshaller.deserializeJSONObject((JSONObject) windowStatusArray.get(index))); + windowStatus.add(status); + } + assertTrue(TestValues.TRUE, Validator.validateWindowStatuses(windowStatus, cmd.getWindowStatus())); + + assertEquals(TestValues.MATCH, JsonUtils.readStringFromJsonObject(parameters, GetVehicleDataResponse.KEY_TURN_SIGNAL), cmd.getTurnSignal().toString()); + assertEquals(TestValues.MATCH, JsonUtils.readStringFromJsonObject(parameters, GetVehicleDataResponse.KEY_ELECTRONIC_PARK_BRAKE_STATUS), cmd.getElectronicParkBrakeStatus().toString()); + assertEquals(TestValues.MATCH, JsonUtils.readStringFromJsonObject(parameters, TestValues.GENERAL_OEM_CUSTOM_VEHICLE_DATA_NAME), cmd.getOEMCustomVehicleData(TestValues.GENERAL_OEM_CUSTOM_VEHICLE_DATA_NAME)); + + JSONObject stabilityControlStatusObj = JsonUtils.readJsonObjectFromJsonObject(parameters, GetVehicleDataResponse.KEY_STABILITY_CONTROLS_STATUS); + StabilityControlsStatus stabilityControlsStatus = new StabilityControlsStatus(JsonRPCMarshaller.deserializeJSONObject(stabilityControlStatusObj)); + assertTrue(TestValues.TRUE, Validator.validateStabilityControlStatus(stabilityControlsStatus, cmd.getStabilityControlsStatus())); + } catch (JSONException e) { + e.printStackTrace(); + } + } } diff --git a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/GetWayPointsResponseTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/GetWayPointsResponseTests.java index 131aba5fa..8586f650f 100644 --- a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/GetWayPointsResponseTests.java +++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/GetWayPointsResponseTests.java @@ -78,10 +78,10 @@ public class GetWayPointsResponseTests extends BaseRpcTests { * Tests the expected values of the RPC message. */ @Test - public void testRpcValues () { + public void testRpcValues() { // Test Values - List<LocationDetails> testWPs = ( (GetWayPointsResponse) msg ).getWayPoints(); + List<LocationDetails> testWPs = ((GetWayPointsResponse) msg).getWayPoints(); // Valid Tests assertEquals(TestValues.MATCH, waypoints, testWPs); @@ -98,7 +98,7 @@ public class GetWayPointsResponseTests extends BaseRpcTests { * Tests a valid JSON construction of this RPC message. */ @Test - public void testJsonConstructor () { + public void testJsonConstructor() { JSONObject commandJson = JsonFileReader.readId(getInstrumentation().getTargetContext(), getCommandType(), getMessageType()); assertNotNull(TestValues.NOT_NULL, commandJson); @@ -118,11 +118,11 @@ public class GetWayPointsResponseTests extends BaseRpcTests { JSONArray locArray = JsonUtils.readJsonArrayFromJsonObject(parameters, GetWayPointsResponse.KEY_WAY_POINTS); List<LocationDetails> locationList = new ArrayList<LocationDetails>(); for (int index = 0; index < locArray.length(); index++) { - LocationDetails det = new LocationDetails(JsonRPCMarshaller.deserializeJSONObject( (JSONObject) locArray.get(index))); + LocationDetails det = new LocationDetails(JsonRPCMarshaller.deserializeJSONObject((JSONObject) locArray.get(index))); locationList.add(det); } List<LocationDetails> dets = cmd.getWayPoints(); - assertEquals(TestValues.MATCH, locationList.size(), dets.size()); + assertEquals(TestValues.MATCH, locationList.size(), dets.size()); } catch (JSONException e) { e.printStackTrace(); diff --git a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/ListFilesResponseTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/ListFilesResponseTests.java index 67b23ef2b..c90384567 100644 --- a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/ListFilesResponseTests.java +++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/ListFilesResponseTests.java @@ -26,13 +26,13 @@ import static junit.framework.TestCase.fail; /** - * This is a unit test class for the SmartDeviceLink library project class : + * This is a unit test class for the SmartDeviceLink library project class : * {@link com.smartdevicelink.proxy.rpc.ListFilesResponse} */ -public class ListFilesResponseTests extends BaseRpcTests{ +public class ListFilesResponseTests extends BaseRpcTests { @Override - protected RPCMessage createMessage(){ + protected RPCMessage createMessage() { ListFilesResponse msg = new ListFilesResponse(); msg.setFilenames(TestValues.GENERAL_STRING_LIST); @@ -42,43 +42,43 @@ public class ListFilesResponseTests extends BaseRpcTests{ } @Override - protected String getMessageType(){ + protected String getMessageType() { return RPCMessage.KEY_RESPONSE; } @Override - protected String getCommandType(){ + protected String getCommandType() { return FunctionID.LIST_FILES.toString(); } @Override - protected JSONObject getExpectedParameters(int sdlVersion){ + protected JSONObject getExpectedParameters(int sdlVersion) { JSONObject result = new JSONObject(); - try{ + try { result.put(ListFilesResponse.KEY_FILENAMES, JsonUtils.createJsonArray(TestValues.GENERAL_STRING_LIST)); result.put(ListFilesResponse.KEY_SPACE_AVAILABLE, TestValues.GENERAL_INT); - }catch(JSONException e){ - fail(TestValues.JSON_FAIL); + } catch (JSONException e) { + fail(TestValues.JSON_FAIL); } return result; } /** - * Tests the expected values of the RPC message. - */ + * Tests the expected values of the RPC message. + */ @Test - public void testRpcValues () { - // Test Values - List<String> filenames = ( (ListFilesResponse) msg ).getFilenames(); - int spaceAvailable = ( (ListFilesResponse) msg ).getSpaceAvailable(); - + public void testRpcValues() { + // Test Values + List<String> filenames = ((ListFilesResponse) msg).getFilenames(); + int spaceAvailable = ((ListFilesResponse) msg).getSpaceAvailable(); + // Valid Tests assertEquals(TestValues.MATCH, TestValues.GENERAL_STRING_LIST.size(), filenames.size()); assertTrue(TestValues.TRUE, Validator.validateStringList(TestValues.GENERAL_STRING_LIST, filenames)); assertEquals(TestValues.MATCH, TestValues.GENERAL_INT, spaceAvailable); - + // Invalid/Null Tests ListFilesResponse msg = new ListFilesResponse(); assertNotNull(TestValues.NOT_NULL, msg); @@ -92,30 +92,30 @@ public class ListFilesResponseTests extends BaseRpcTests{ * Tests a valid JSON construction of this RPC message. */ @Test - public void testJsonConstructor () { - JSONObject commandJson = JsonFileReader.readId(getInstrumentation().getTargetContext(), getCommandType(), getMessageType()); - assertNotNull(TestValues.NOT_NULL, commandJson); - - try { - Hashtable<String, Object> hash = JsonRPCMarshaller.deserializeJSONObject(commandJson); - ListFilesResponse cmd = new ListFilesResponse(hash); - - JSONObject body = JsonUtils.readJsonObjectFromJsonObject(commandJson, getMessageType()); - assertNotNull(TestValues.NOT_NULL, body); - - // Test everything in the json body. - assertEquals(TestValues.MATCH, JsonUtils.readStringFromJsonObject(body, RPCMessage.KEY_FUNCTION_NAME), cmd.getFunctionName()); - assertEquals(TestValues.MATCH, JsonUtils.readIntegerFromJsonObject(body, RPCMessage.KEY_CORRELATION_ID), cmd.getCorrelationID()); - - JSONObject parameters = JsonUtils.readJsonObjectFromJsonObject(body, RPCMessage.KEY_PARAMETERS); - - List<String> fileNamesList = JsonUtils.readStringListFromJsonObject(parameters, ListFilesResponse.KEY_FILENAMES); - List<String> testNamesList = cmd.getFilenames(); - assertEquals(TestValues.MATCH, fileNamesList.size(), testNamesList.size()); - assertTrue(TestValues.TRUE, Validator.validateStringList(fileNamesList, testNamesList)); - assertEquals(TestValues.MATCH, JsonUtils.readIntegerFromJsonObject(parameters, ListFilesResponse.KEY_SPACE_AVAILABLE), cmd.getSpaceAvailable()); - } catch (JSONException e) { - e.printStackTrace(); - } + public void testJsonConstructor() { + JSONObject commandJson = JsonFileReader.readId(getInstrumentation().getTargetContext(), getCommandType(), getMessageType()); + assertNotNull(TestValues.NOT_NULL, commandJson); + + try { + Hashtable<String, Object> hash = JsonRPCMarshaller.deserializeJSONObject(commandJson); + ListFilesResponse cmd = new ListFilesResponse(hash); + + JSONObject body = JsonUtils.readJsonObjectFromJsonObject(commandJson, getMessageType()); + assertNotNull(TestValues.NOT_NULL, body); + + // Test everything in the json body. + assertEquals(TestValues.MATCH, JsonUtils.readStringFromJsonObject(body, RPCMessage.KEY_FUNCTION_NAME), cmd.getFunctionName()); + assertEquals(TestValues.MATCH, JsonUtils.readIntegerFromJsonObject(body, RPCMessage.KEY_CORRELATION_ID), cmd.getCorrelationID()); + + JSONObject parameters = JsonUtils.readJsonObjectFromJsonObject(body, RPCMessage.KEY_PARAMETERS); + + List<String> fileNamesList = JsonUtils.readStringListFromJsonObject(parameters, ListFilesResponse.KEY_FILENAMES); + List<String> testNamesList = cmd.getFilenames(); + assertEquals(TestValues.MATCH, fileNamesList.size(), testNamesList.size()); + assertTrue(TestValues.TRUE, Validator.validateStringList(fileNamesList, testNamesList)); + assertEquals(TestValues.MATCH, JsonUtils.readIntegerFromJsonObject(parameters, ListFilesResponse.KEY_SPACE_AVAILABLE), cmd.getSpaceAvailable()); + } catch (JSONException e) { + e.printStackTrace(); + } } }
\ No newline at end of file diff --git a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/PerformAppServiceInteractionResponseTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/PerformAppServiceInteractionResponseTests.java index 2278a61a1..d464efbea 100644 --- a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/PerformAppServiceInteractionResponseTests.java +++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/PerformAppServiceInteractionResponseTests.java @@ -28,82 +28,82 @@ import static junit.framework.TestCase.fail; */ public class PerformAppServiceInteractionResponseTests extends BaseRpcTests { - @Override - protected RPCMessage createMessage(){ - - PerformAppServiceInteractionResponse msg = new PerformAppServiceInteractionResponse(); - - msg.setServiceSpecificResult(TestValues.GENERAL_STRING); - - return msg; - } - - @Override - protected String getMessageType(){ - return RPCMessage.KEY_RESPONSE; - } - - @Override - protected String getCommandType(){ - return FunctionID.PERFORM_APP_SERVICES_INTERACTION.toString(); - } - - @Override - protected JSONObject getExpectedParameters(int sdlVersion){ - JSONObject result = new JSONObject(); - - try{ - result.put(PerformAppServiceInteractionResponse.KEY_SERVICE_SPECIFIC_RESULT, TestValues.GENERAL_STRING); - }catch(JSONException e){ - fail(TestValues.JSON_FAIL); - } - - return result; - } - - /** - * Tests the expected values of the RPC message. - */ - @Test - public void testRpcValues () { - // Test Values - String serviceSpecificResult = ( (PerformAppServiceInteractionResponse) msg ).getServiceSpecificResult(); - - // Valid Tests - assertEquals(TestValues.MATCH, TestValues.GENERAL_STRING, serviceSpecificResult); - - // Invalid/Null Tests - PerformAppServiceInteractionResponse msg = new PerformAppServiceInteractionResponse(); - assertNotNull(TestValues.NOT_NULL, msg); - testNullBase(msg); - - assertNull(TestValues.NULL, msg.getServiceSpecificResult()); - } - - /** - * Tests a valid JSON construction of this RPC message. - */ - @Test - public void testJsonConstructor () { - JSONObject commandJson = JsonFileReader.readId(getInstrumentation().getTargetContext(), getCommandType(), getMessageType()); - assertNotNull(TestValues.NOT_NULL, commandJson); - - try { - Hashtable<String, Object> hash = JsonRPCMarshaller.deserializeJSONObject(commandJson); - PerformAppServiceInteractionResponse cmd = new PerformAppServiceInteractionResponse (hash); - - JSONObject body = JsonUtils.readJsonObjectFromJsonObject(commandJson, getMessageType()); - assertNotNull(TestValues.NOT_NULL, body); - - // Test everything in the json body. - assertEquals(TestValues.MATCH, JsonUtils.readStringFromJsonObject(body, RPCMessage.KEY_FUNCTION_NAME), cmd.getFunctionName()); - assertEquals(TestValues.MATCH, JsonUtils.readIntegerFromJsonObject(body, RPCMessage.KEY_CORRELATION_ID), cmd.getCorrelationID()); - - JSONObject parameters = JsonUtils.readJsonObjectFromJsonObject(body, RPCMessage.KEY_PARAMETERS); - - assertEquals(TestValues.MATCH, JsonUtils.readStringFromJsonObject(parameters, PerformAppServiceInteractionResponse.KEY_SERVICE_SPECIFIC_RESULT), cmd.getServiceSpecificResult()); - } catch (JSONException e) { - e.printStackTrace(); - } - } + @Override + protected RPCMessage createMessage() { + + PerformAppServiceInteractionResponse msg = new PerformAppServiceInteractionResponse(); + + msg.setServiceSpecificResult(TestValues.GENERAL_STRING); + + return msg; + } + + @Override + protected String getMessageType() { + return RPCMessage.KEY_RESPONSE; + } + + @Override + protected String getCommandType() { + return FunctionID.PERFORM_APP_SERVICES_INTERACTION.toString(); + } + + @Override + protected JSONObject getExpectedParameters(int sdlVersion) { + JSONObject result = new JSONObject(); + + try { + result.put(PerformAppServiceInteractionResponse.KEY_SERVICE_SPECIFIC_RESULT, TestValues.GENERAL_STRING); + } catch (JSONException e) { + fail(TestValues.JSON_FAIL); + } + + return result; + } + + /** + * Tests the expected values of the RPC message. + */ + @Test + public void testRpcValues() { + // Test Values + String serviceSpecificResult = ((PerformAppServiceInteractionResponse) msg).getServiceSpecificResult(); + + // Valid Tests + assertEquals(TestValues.MATCH, TestValues.GENERAL_STRING, serviceSpecificResult); + + // Invalid/Null Tests + PerformAppServiceInteractionResponse msg = new PerformAppServiceInteractionResponse(); + assertNotNull(TestValues.NOT_NULL, msg); + testNullBase(msg); + + assertNull(TestValues.NULL, msg.getServiceSpecificResult()); + } + + /** + * Tests a valid JSON construction of this RPC message. + */ + @Test + public void testJsonConstructor() { + JSONObject commandJson = JsonFileReader.readId(getInstrumentation().getTargetContext(), getCommandType(), getMessageType()); + assertNotNull(TestValues.NOT_NULL, commandJson); + + try { + Hashtable<String, Object> hash = JsonRPCMarshaller.deserializeJSONObject(commandJson); + PerformAppServiceInteractionResponse cmd = new PerformAppServiceInteractionResponse(hash); + + JSONObject body = JsonUtils.readJsonObjectFromJsonObject(commandJson, getMessageType()); + assertNotNull(TestValues.NOT_NULL, body); + + // Test everything in the json body. + assertEquals(TestValues.MATCH, JsonUtils.readStringFromJsonObject(body, RPCMessage.KEY_FUNCTION_NAME), cmd.getFunctionName()); + assertEquals(TestValues.MATCH, JsonUtils.readIntegerFromJsonObject(body, RPCMessage.KEY_CORRELATION_ID), cmd.getCorrelationID()); + + JSONObject parameters = JsonUtils.readJsonObjectFromJsonObject(body, RPCMessage.KEY_PARAMETERS); + + assertEquals(TestValues.MATCH, JsonUtils.readStringFromJsonObject(parameters, PerformAppServiceInteractionResponse.KEY_SERVICE_SPECIFIC_RESULT), cmd.getServiceSpecificResult()); + } catch (JSONException e) { + e.printStackTrace(); + } + } } diff --git a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/PerformAudioPassThruResponseTest.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/PerformAudioPassThruResponseTest.java index f3a0bd310..f37ed358b 100644 --- a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/PerformAudioPassThruResponseTest.java +++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/PerformAudioPassThruResponseTest.java @@ -20,38 +20,38 @@ import static junit.framework.TestCase.assertEquals; import static junit.framework.TestCase.assertNotNull; /** - * This is a unit test class for the SmartDeviceLink library project class : + * This is a unit test class for the SmartDeviceLink library project class : * {@link com.smartdevicelink.proxy.rpc.PerformAudioPassThruResponse} */ public class PerformAudioPassThruResponseTest extends BaseRpcTests { - @Override - protected RPCMessage createMessage(){ + @Override + protected RPCMessage createMessage() { return new PerformAudioPassThruResponse(); } @Override - protected String getMessageType(){ + protected String getMessageType() { return RPCMessage.KEY_RESPONSE; } @Override - protected String getCommandType(){ + protected String getCommandType() { return FunctionID.PERFORM_AUDIO_PASS_THRU.toString(); } @Override - protected JSONObject getExpectedParameters(int sdlVersion){ + protected JSONObject getExpectedParameters(int sdlVersion) { return new JSONObject(); } - + /** - * Tests the expected values of the RPC message. - */ + * Tests the expected values of the RPC message. + */ @Test - public void testRpcValues () { - // Invalid/Null Tests - PerformAudioPassThruResponse msg = new PerformAudioPassThruResponse(); + public void testRpcValues() { + // Invalid/Null Tests + PerformAudioPassThruResponse msg = new PerformAudioPassThruResponse(); assertNotNull(TestValues.NOT_NULL, msg); testNullBase(msg); } @@ -60,22 +60,22 @@ public class PerformAudioPassThruResponseTest extends BaseRpcTests { * Tests a valid JSON construction of this RPC message. */ @Test - public void testJsonConstructor () { - JSONObject commandJson = JsonFileReader.readId(getInstrumentation().getContext(), getCommandType(), getMessageType()); - assertNotNull(TestValues.NOT_NULL, commandJson); - - try { - Hashtable<String, Object> hash = JsonRPCMarshaller.deserializeJSONObject(commandJson); - PerformAudioPassThruResponse cmd = new PerformAudioPassThruResponse(hash); - - JSONObject body = JsonUtils.readJsonObjectFromJsonObject(commandJson, getMessageType()); - assertNotNull(TestValues.NOT_NULL, body); - - // Test everything in the json body. - assertEquals(TestValues.MATCH, JsonUtils.readStringFromJsonObject(body, RPCMessage.KEY_FUNCTION_NAME), cmd.getFunctionName()); - assertEquals(TestValues.MATCH, JsonUtils.readIntegerFromJsonObject(body, RPCMessage.KEY_CORRELATION_ID), cmd.getCorrelationID()); - } catch (JSONException e) { - e.printStackTrace(); - } + public void testJsonConstructor() { + JSONObject commandJson = JsonFileReader.readId(getInstrumentation().getContext(), getCommandType(), getMessageType()); + assertNotNull(TestValues.NOT_NULL, commandJson); + + try { + Hashtable<String, Object> hash = JsonRPCMarshaller.deserializeJSONObject(commandJson); + PerformAudioPassThruResponse cmd = new PerformAudioPassThruResponse(hash); + + JSONObject body = JsonUtils.readJsonObjectFromJsonObject(commandJson, getMessageType()); + assertNotNull(TestValues.NOT_NULL, body); + + // Test everything in the json body. + assertEquals(TestValues.MATCH, JsonUtils.readStringFromJsonObject(body, RPCMessage.KEY_FUNCTION_NAME), cmd.getFunctionName()); + assertEquals(TestValues.MATCH, JsonUtils.readIntegerFromJsonObject(body, RPCMessage.KEY_CORRELATION_ID), cmd.getCorrelationID()); + } catch (JSONException e) { + e.printStackTrace(); + } } }
\ No newline at end of file diff --git a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/PerformInteractionResponseTest.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/PerformInteractionResponseTest.java index cc78069e3..3565dd901 100644 --- a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/PerformInteractionResponseTest.java +++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/PerformInteractionResponseTest.java @@ -23,97 +23,97 @@ import static junit.framework.TestCase.assertNull; import static junit.framework.TestCase.fail; /** - * This is a unit test class for the SmartDeviceLink library project class : + * This is a unit test class for the SmartDeviceLink library project class : * {@link com.smartdevicelink.proxy.rpc.PerformInteractionResponse} */ public class PerformInteractionResponseTest extends BaseRpcTests { - - @Override - protected RPCMessage createMessage() { - PerformInteractionResponse msg = new PerformInteractionResponse(); - - msg.setChoiceID(TestValues.GENERAL_INT); - msg.setTriggerSource(TestValues.GENERAL_TRIGGERSOURCE); - msg.setManualTextEntry(TestValues.GENERAL_STRING); - - return msg; - } - - @Override - protected String getMessageType() { - return RPCMessage.KEY_RESPONSE; - } - - @Override - protected String getCommandType() { - return FunctionID.PERFORM_INTERACTION.toString(); - } - - @Override - protected JSONObject getExpectedParameters(int sdlVersion) { - JSONObject result = new JSONObject(); - - try { - result.put(PerformInteractionResponse.KEY_CHOICE_ID, TestValues.GENERAL_INT); - result.put(PerformInteractionResponse.KEY_TRIGGER_SOURCE, TestValues.GENERAL_TRIGGERSOURCE); - result.put(PerformInteractionResponse.KEY_MANUAL_TEXT_ENTRY, TestValues.GENERAL_STRING); - } catch (JSONException e) { - fail(TestValues.JSON_FAIL); - } - - return result; - } - - /** - * Tests the expected values of the RPC message. - */ - @Test - public void testRpcValues () { - // Test Values - Integer testId = ( (PerformInteractionResponse) msg).getChoiceID(); - TriggerSource testSource = ( (PerformInteractionResponse) msg).getTriggerSource(); - String testText = ( (PerformInteractionResponse) msg).getManualTextEntry(); - - // Valid Tests - assertEquals(TestValues.MATCH, (Integer) TestValues.GENERAL_INT, testId); - assertEquals(TestValues.MATCH, TestValues.GENERAL_TRIGGERSOURCE, testSource); - assertEquals(TestValues.MATCH, TestValues.GENERAL_STRING, testText); - - // Invalid/Null Tests - PerformInteractionResponse msg = new PerformInteractionResponse(); - assertNotNull(TestValues.NOT_NULL, msg); - testNullBase(msg); - - assertNull(TestValues.NULL, msg.getChoiceID()); - assertNull(TestValues.NULL, msg.getTriggerSource()); - assertNull(TestValues.NULL, msg.getManualTextEntry()); - } + + @Override + protected RPCMessage createMessage() { + PerformInteractionResponse msg = new PerformInteractionResponse(); + + msg.setChoiceID(TestValues.GENERAL_INT); + msg.setTriggerSource(TestValues.GENERAL_TRIGGERSOURCE); + msg.setManualTextEntry(TestValues.GENERAL_STRING); + + return msg; + } + + @Override + protected String getMessageType() { + return RPCMessage.KEY_RESPONSE; + } + + @Override + protected String getCommandType() { + return FunctionID.PERFORM_INTERACTION.toString(); + } + + @Override + protected JSONObject getExpectedParameters(int sdlVersion) { + JSONObject result = new JSONObject(); + + try { + result.put(PerformInteractionResponse.KEY_CHOICE_ID, TestValues.GENERAL_INT); + result.put(PerformInteractionResponse.KEY_TRIGGER_SOURCE, TestValues.GENERAL_TRIGGERSOURCE); + result.put(PerformInteractionResponse.KEY_MANUAL_TEXT_ENTRY, TestValues.GENERAL_STRING); + } catch (JSONException e) { + fail(TestValues.JSON_FAIL); + } + + return result; + } + + /** + * Tests the expected values of the RPC message. + */ + @Test + public void testRpcValues() { + // Test Values + Integer testId = ((PerformInteractionResponse) msg).getChoiceID(); + TriggerSource testSource = ((PerformInteractionResponse) msg).getTriggerSource(); + String testText = ((PerformInteractionResponse) msg).getManualTextEntry(); + + // Valid Tests + assertEquals(TestValues.MATCH, (Integer) TestValues.GENERAL_INT, testId); + assertEquals(TestValues.MATCH, TestValues.GENERAL_TRIGGERSOURCE, testSource); + assertEquals(TestValues.MATCH, TestValues.GENERAL_STRING, testText); + + // Invalid/Null Tests + PerformInteractionResponse msg = new PerformInteractionResponse(); + assertNotNull(TestValues.NOT_NULL, msg); + testNullBase(msg); + + assertNull(TestValues.NULL, msg.getChoiceID()); + assertNull(TestValues.NULL, msg.getTriggerSource()); + assertNull(TestValues.NULL, msg.getManualTextEntry()); + } /** * Tests a valid JSON construction of this RPC message. */ @Test - public void testJsonConstructor () { - JSONObject commandJson = JsonFileReader.readId(getInstrumentation().getContext(), getCommandType(), getMessageType()); - assertNotNull(TestValues.NOT_NULL, commandJson); - - try { - Hashtable<String, Object> hash = JsonRPCMarshaller.deserializeJSONObject(commandJson); - PerformInteractionResponse cmd = new PerformInteractionResponse(hash); - - JSONObject body = JsonUtils.readJsonObjectFromJsonObject(commandJson, getMessageType()); - assertNotNull(TestValues.NOT_NULL, body); - - // Test everything in the json body. - assertEquals(TestValues.MATCH, JsonUtils.readStringFromJsonObject(body, RPCMessage.KEY_FUNCTION_NAME), cmd.getFunctionName()); - assertEquals(TestValues.MATCH, JsonUtils.readIntegerFromJsonObject(body, RPCMessage.KEY_CORRELATION_ID), cmd.getCorrelationID()); - - JSONObject parameters = JsonUtils.readJsonObjectFromJsonObject(body, RPCMessage.KEY_PARAMETERS); - assertEquals(TestValues.MATCH, JsonUtils.readStringFromJsonObject(parameters, PerformInteractionResponse.KEY_MANUAL_TEXT_ENTRY), cmd.getManualTextEntry()); - assertEquals(TestValues.MATCH, JsonUtils.readStringFromJsonObject(parameters, PerformInteractionResponse.KEY_TRIGGER_SOURCE), cmd.getTriggerSource().toString()); - assertEquals(TestValues.MATCH, JsonUtils.readIntegerFromJsonObject(parameters, PerformInteractionResponse.KEY_CHOICE_ID), cmd.getChoiceID()); - } catch (JSONException e) { - e.printStackTrace(); - } + public void testJsonConstructor() { + JSONObject commandJson = JsonFileReader.readId(getInstrumentation().getContext(), getCommandType(), getMessageType()); + assertNotNull(TestValues.NOT_NULL, commandJson); + + try { + Hashtable<String, Object> hash = JsonRPCMarshaller.deserializeJSONObject(commandJson); + PerformInteractionResponse cmd = new PerformInteractionResponse(hash); + + JSONObject body = JsonUtils.readJsonObjectFromJsonObject(commandJson, getMessageType()); + assertNotNull(TestValues.NOT_NULL, body); + + // Test everything in the json body. + assertEquals(TestValues.MATCH, JsonUtils.readStringFromJsonObject(body, RPCMessage.KEY_FUNCTION_NAME), cmd.getFunctionName()); + assertEquals(TestValues.MATCH, JsonUtils.readIntegerFromJsonObject(body, RPCMessage.KEY_CORRELATION_ID), cmd.getCorrelationID()); + + JSONObject parameters = JsonUtils.readJsonObjectFromJsonObject(body, RPCMessage.KEY_PARAMETERS); + assertEquals(TestValues.MATCH, JsonUtils.readStringFromJsonObject(parameters, PerformInteractionResponse.KEY_MANUAL_TEXT_ENTRY), cmd.getManualTextEntry()); + assertEquals(TestValues.MATCH, JsonUtils.readStringFromJsonObject(parameters, PerformInteractionResponse.KEY_TRIGGER_SOURCE), cmd.getTriggerSource().toString()); + assertEquals(TestValues.MATCH, JsonUtils.readIntegerFromJsonObject(parameters, PerformInteractionResponse.KEY_CHOICE_ID), cmd.getChoiceID()); + } catch (JSONException e) { + e.printStackTrace(); + } } }
\ No newline at end of file diff --git a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/PublishAppServiceResponseTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/PublishAppServiceResponseTests.java index 197aa13d4..aff5932f3 100644 --- a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/PublishAppServiceResponseTests.java +++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/PublishAppServiceResponseTests.java @@ -30,84 +30,84 @@ import static junit.framework.TestCase.fail; */ public class PublishAppServiceResponseTests extends BaseRpcTests { - @Override - protected RPCMessage createMessage(){ - - PublishAppServiceResponse msg = new PublishAppServiceResponse(); - - msg.setServiceRecord(TestValues.GENERAL_APPSERVICERECORD); - - return msg; - } - - @Override - protected String getMessageType(){ - return RPCMessage.KEY_RESPONSE; - } - - @Override - protected String getCommandType(){ - return FunctionID.PUBLISH_APP_SERVICE.toString(); - } - - @Override - protected JSONObject getExpectedParameters(int sdlVersion){ - JSONObject result = new JSONObject(); - - try{ - result.put(PublishAppServiceResponse.KEY_APP_SERVICE_RECORD, JsonRPCMarshaller.serializeHashtable(TestValues.GENERAL_APPSERVICERECORD.getStore())); - }catch(JSONException e){ - fail(TestValues.JSON_FAIL); - } - - return result; - } - - /** - * Tests the expected values of the RPC message. - */ - @Test - public void testRpcValues () { - // Test Values - AppServiceRecord testRecord = ( (PublishAppServiceResponse) msg ).getServiceRecord(); - - // Valid Tests - assertTrue(TestValues.TRUE, Validator.validateAppServiceRecord(TestValues.GENERAL_APPSERVICERECORD, testRecord)); - - // Invalid/Null Tests - PublishAppServiceResponse msg = new PublishAppServiceResponse(); - assertNotNull(TestValues.NOT_NULL, msg); - testNullBase(msg); - - assertNull(TestValues.NULL, msg.getServiceRecord()); - } - - /** - * Tests a valid JSON construction of this RPC message. - */ - @Test - public void testJsonConstructor () { - JSONObject commandJson = JsonFileReader.readId(getInstrumentation().getTargetContext(), getCommandType(), getMessageType()); - assertNotNull(TestValues.NOT_NULL, commandJson); - - try { - Hashtable<String, Object> hash = JsonRPCMarshaller.deserializeJSONObject(commandJson); - PublishAppServiceResponse cmd = new PublishAppServiceResponse (hash); - - JSONObject body = JsonUtils.readJsonObjectFromJsonObject(commandJson, getMessageType()); - assertNotNull(TestValues.NOT_NULL, body); - - // Test everything in the json body. - assertEquals(TestValues.MATCH, JsonUtils.readStringFromJsonObject(body, RPCMessage.KEY_FUNCTION_NAME), cmd.getFunctionName()); - assertEquals(TestValues.MATCH, JsonUtils.readIntegerFromJsonObject(body, RPCMessage.KEY_CORRELATION_ID), cmd.getCorrelationID()); - - JSONObject parameters = JsonUtils.readJsonObjectFromJsonObject(body, RPCMessage.KEY_PARAMETERS); - - JSONObject appServiceRecordObject = JsonUtils.readJsonObjectFromJsonObject(parameters, PublishAppServiceResponse.KEY_APP_SERVICE_RECORD); - AppServiceRecord recordTest = new AppServiceRecord(JsonRPCMarshaller.deserializeJSONObject(appServiceRecordObject)); - assertTrue(TestValues.TRUE, Validator.validateAppServiceRecord(recordTest, cmd.getServiceRecord())); - } catch (JSONException e) { - e.printStackTrace(); - } - } + @Override + protected RPCMessage createMessage() { + + PublishAppServiceResponse msg = new PublishAppServiceResponse(); + + msg.setServiceRecord(TestValues.GENERAL_APPSERVICERECORD); + + return msg; + } + + @Override + protected String getMessageType() { + return RPCMessage.KEY_RESPONSE; + } + + @Override + protected String getCommandType() { + return FunctionID.PUBLISH_APP_SERVICE.toString(); + } + + @Override + protected JSONObject getExpectedParameters(int sdlVersion) { + JSONObject result = new JSONObject(); + + try { + result.put(PublishAppServiceResponse.KEY_APP_SERVICE_RECORD, JsonRPCMarshaller.serializeHashtable(TestValues.GENERAL_APPSERVICERECORD.getStore())); + } catch (JSONException e) { + fail(TestValues.JSON_FAIL); + } + + return result; + } + + /** + * Tests the expected values of the RPC message. + */ + @Test + public void testRpcValues() { + // Test Values + AppServiceRecord testRecord = ((PublishAppServiceResponse) msg).getServiceRecord(); + + // Valid Tests + assertTrue(TestValues.TRUE, Validator.validateAppServiceRecord(TestValues.GENERAL_APPSERVICERECORD, testRecord)); + + // Invalid/Null Tests + PublishAppServiceResponse msg = new PublishAppServiceResponse(); + assertNotNull(TestValues.NOT_NULL, msg); + testNullBase(msg); + + assertNull(TestValues.NULL, msg.getServiceRecord()); + } + + /** + * Tests a valid JSON construction of this RPC message. + */ + @Test + public void testJsonConstructor() { + JSONObject commandJson = JsonFileReader.readId(getInstrumentation().getTargetContext(), getCommandType(), getMessageType()); + assertNotNull(TestValues.NOT_NULL, commandJson); + + try { + Hashtable<String, Object> hash = JsonRPCMarshaller.deserializeJSONObject(commandJson); + PublishAppServiceResponse cmd = new PublishAppServiceResponse(hash); + + JSONObject body = JsonUtils.readJsonObjectFromJsonObject(commandJson, getMessageType()); + assertNotNull(TestValues.NOT_NULL, body); + + // Test everything in the json body. + assertEquals(TestValues.MATCH, JsonUtils.readStringFromJsonObject(body, RPCMessage.KEY_FUNCTION_NAME), cmd.getFunctionName()); + assertEquals(TestValues.MATCH, JsonUtils.readIntegerFromJsonObject(body, RPCMessage.KEY_CORRELATION_ID), cmd.getCorrelationID()); + + JSONObject parameters = JsonUtils.readJsonObjectFromJsonObject(body, RPCMessage.KEY_PARAMETERS); + + JSONObject appServiceRecordObject = JsonUtils.readJsonObjectFromJsonObject(parameters, PublishAppServiceResponse.KEY_APP_SERVICE_RECORD); + AppServiceRecord recordTest = new AppServiceRecord(JsonRPCMarshaller.deserializeJSONObject(appServiceRecordObject)); + assertTrue(TestValues.TRUE, Validator.validateAppServiceRecord(recordTest, cmd.getServiceRecord())); + } catch (JSONException e) { + e.printStackTrace(); + } + } } diff --git a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/PutFileResponseTest.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/PutFileResponseTest.java index 6c34c9df4..8fd6c2046 100644 --- a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/PutFileResponseTest.java +++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/PutFileResponseTest.java @@ -22,85 +22,85 @@ import static junit.framework.TestCase.assertNull; import static junit.framework.TestCase.fail; /** - * This is a unit test class for the SmartDeviceLink library project class : + * This is a unit test class for the SmartDeviceLink library project class : * {@link com.smartdevicelink.proxy.rpc.PutFileResponse} */ public class PutFileResponseTest extends BaseRpcTests { - - @Override - protected RPCMessage createMessage() { - PutFileResponse msg = new PutFileResponse(); - - msg.setSpaceAvailable(TestValues.GENERAL_INT); - - return msg; - } - - @Override - protected String getMessageType() { - return RPCMessage.KEY_RESPONSE; - } - - @Override - protected String getCommandType() { - return FunctionID.PUT_FILE.toString(); - } - - @Override - protected JSONObject getExpectedParameters(int sdlVersion) { - JSONObject result = new JSONObject(); - - try { - result.put(PutFileResponse.KEY_SPACE_AVAILABLE, TestValues.GENERAL_INT); - } catch (JSONException e) { - fail(TestValues.JSON_FAIL); - } - - return result; - } - - /** - * Tests the expected values of the RPC message. - */ - @Test - public void testRpcValues () { - // Test Values - Integer testSpace = ( (PutFileResponse) msg ).getSpaceAvailable(); - - // Valid Tests - assertEquals(TestValues.MATCH, (Integer) TestValues.GENERAL_INT, testSpace); - - // Invalid/Null Tests - PutFileResponse msg = new PutFileResponse(); - assertNotNull(TestValues.NOT_NULL, msg); - testNullBase(msg); - - assertNull(TestValues.NULL, msg.getSpaceAvailable()); - } + + @Override + protected RPCMessage createMessage() { + PutFileResponse msg = new PutFileResponse(); + + msg.setSpaceAvailable(TestValues.GENERAL_INT); + + return msg; + } + + @Override + protected String getMessageType() { + return RPCMessage.KEY_RESPONSE; + } + + @Override + protected String getCommandType() { + return FunctionID.PUT_FILE.toString(); + } + + @Override + protected JSONObject getExpectedParameters(int sdlVersion) { + JSONObject result = new JSONObject(); + + try { + result.put(PutFileResponse.KEY_SPACE_AVAILABLE, TestValues.GENERAL_INT); + } catch (JSONException e) { + fail(TestValues.JSON_FAIL); + } + + return result; + } + + /** + * Tests the expected values of the RPC message. + */ + @Test + public void testRpcValues() { + // Test Values + Integer testSpace = ((PutFileResponse) msg).getSpaceAvailable(); + + // Valid Tests + assertEquals(TestValues.MATCH, (Integer) TestValues.GENERAL_INT, testSpace); + + // Invalid/Null Tests + PutFileResponse msg = new PutFileResponse(); + assertNotNull(TestValues.NOT_NULL, msg); + testNullBase(msg); + + assertNull(TestValues.NULL, msg.getSpaceAvailable()); + } /** * Tests a valid JSON construction of this RPC message. */ @Test - public void testJsonConstructor () { - JSONObject commandJson = JsonFileReader.readId(getInstrumentation().getContext(), getCommandType(), getMessageType()); - assertNotNull(TestValues.NOT_NULL, commandJson); - - try { - Hashtable<String, Object> hash = JsonRPCMarshaller.deserializeJSONObject(commandJson); - PutFileResponse cmd = new PutFileResponse(hash); - - JSONObject body = JsonUtils.readJsonObjectFromJsonObject(commandJson, getMessageType()); - assertNotNull(TestValues.NOT_NULL, body); - - // Test everything in the json body. - assertEquals(TestValues.MATCH, JsonUtils.readStringFromJsonObject(body, RPCMessage.KEY_FUNCTION_NAME), cmd.getFunctionName()); - assertEquals(TestValues.MATCH, JsonUtils.readIntegerFromJsonObject(body, RPCMessage.KEY_CORRELATION_ID), cmd.getCorrelationID()); - - JSONObject parameters = JsonUtils.readJsonObjectFromJsonObject(body, RPCMessage.KEY_PARAMETERS); - assertEquals(TestValues.MATCH, JsonUtils.readIntegerFromJsonObject(parameters, PutFileResponse.KEY_SPACE_AVAILABLE), cmd.getSpaceAvailable()); - } catch (JSONException e) { - e.printStackTrace(); - } + public void testJsonConstructor() { + JSONObject commandJson = JsonFileReader.readId(getInstrumentation().getContext(), getCommandType(), getMessageType()); + assertNotNull(TestValues.NOT_NULL, commandJson); + + try { + Hashtable<String, Object> hash = JsonRPCMarshaller.deserializeJSONObject(commandJson); + PutFileResponse cmd = new PutFileResponse(hash); + + JSONObject body = JsonUtils.readJsonObjectFromJsonObject(commandJson, getMessageType()); + assertNotNull(TestValues.NOT_NULL, body); + + // Test everything in the json body. + assertEquals(TestValues.MATCH, JsonUtils.readStringFromJsonObject(body, RPCMessage.KEY_FUNCTION_NAME), cmd.getFunctionName()); + assertEquals(TestValues.MATCH, JsonUtils.readIntegerFromJsonObject(body, RPCMessage.KEY_CORRELATION_ID), cmd.getCorrelationID()); + + JSONObject parameters = JsonUtils.readJsonObjectFromJsonObject(body, RPCMessage.KEY_PARAMETERS); + assertEquals(TestValues.MATCH, JsonUtils.readIntegerFromJsonObject(parameters, PutFileResponse.KEY_SPACE_AVAILABLE), cmd.getSpaceAvailable()); + } catch (JSONException e) { + e.printStackTrace(); + } } }
\ No newline at end of file diff --git a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/ReadDIDResponseTest.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/ReadDIDResponseTest.java index 3a62e344d..6e2ec0ffc 100644 --- a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/ReadDIDResponseTest.java +++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/ReadDIDResponseTest.java @@ -29,92 +29,92 @@ import static junit.framework.TestCase.fail; /** - * This is a unit test class for the SmartDeviceLink library project class : + * This is a unit test class for the SmartDeviceLink library project class : * {@link com.smartdevicelink.proxy.rpc.ReadDIDResponse} */ public class ReadDIDResponseTest extends BaseRpcTests { - - @Override - protected RPCMessage createMessage() { - ReadDIDResponse msg = new ReadDIDResponse(); - - msg.setDidResult(TestValues.GENERAL_DIDRESULT_LIST); - - return msg; - } - - @Override - protected String getMessageType() { - return RPCMessage.KEY_RESPONSE; - } - - @Override - protected String getCommandType() { - return FunctionID.READ_DID.toString(); - } - - @Override - protected JSONObject getExpectedParameters(int sdlVersion) { - JSONObject result = new JSONObject(); - - try { - result.put(ReadDIDResponse.KEY_DID_RESULT, TestValues.JSON_DIDRESULTS); - } catch (JSONException e) { - fail(TestValues.JSON_FAIL); - } - - return result; - } + + @Override + protected RPCMessage createMessage() { + ReadDIDResponse msg = new ReadDIDResponse(); + + msg.setDidResult(TestValues.GENERAL_DIDRESULT_LIST); + + return msg; + } + + @Override + protected String getMessageType() { + return RPCMessage.KEY_RESPONSE; + } + + @Override + protected String getCommandType() { + return FunctionID.READ_DID.toString(); + } + + @Override + protected JSONObject getExpectedParameters(int sdlVersion) { + JSONObject result = new JSONObject(); + + try { + result.put(ReadDIDResponse.KEY_DID_RESULT, TestValues.JSON_DIDRESULTS); + } catch (JSONException e) { + fail(TestValues.JSON_FAIL); + } + + return result; + } /** - * Tests the expected values of the RPC message. - */ + * Tests the expected values of the RPC message. + */ @Test - public void testRpcValues () { - // Test Values - List<DIDResult> testResults = ( (ReadDIDResponse) msg ).getDidResult(); - - // Valid Tests - assertTrue("Did results didn't match input data.", Validator.validateDIDResults(TestValues.GENERAL_DIDRESULT_LIST, testResults)); - - // Invalid/Null Tests - ReadDIDResponse msg = new ReadDIDResponse(); - assertNotNull(TestValues.NOT_NULL, msg); - testNullBase(msg); - - assertNull(TestValues.NULL, msg.getDidResult()); - } + public void testRpcValues() { + // Test Values + List<DIDResult> testResults = ((ReadDIDResponse) msg).getDidResult(); + + // Valid Tests + assertTrue("Did results didn't match input data.", Validator.validateDIDResults(TestValues.GENERAL_DIDRESULT_LIST, testResults)); + + // Invalid/Null Tests + ReadDIDResponse msg = new ReadDIDResponse(); + assertNotNull(TestValues.NOT_NULL, msg); + testNullBase(msg); + + assertNull(TestValues.NULL, msg.getDidResult()); + } /** * Tests a valid JSON construction of this RPC message. */ @Test - public void testJsonConstructor () { - JSONObject commandJson = JsonFileReader.readId(getInstrumentation().getContext(), getCommandType(), getMessageType()); - assertNotNull(TestValues.NOT_NULL, commandJson); - - try { - Hashtable<String, Object> hash = JsonRPCMarshaller.deserializeJSONObject(commandJson); - ReadDIDResponse cmd = new ReadDIDResponse(hash); - - JSONObject body = JsonUtils.readJsonObjectFromJsonObject(commandJson, getMessageType()); - assertNotNull(TestValues.NOT_NULL, body); - - // Test everything in the json body. - assertEquals(TestValues.MATCH, JsonUtils.readStringFromJsonObject(body, RPCMessage.KEY_FUNCTION_NAME), cmd.getFunctionName()); - assertEquals(TestValues.MATCH, JsonUtils.readIntegerFromJsonObject(body, RPCMessage.KEY_CORRELATION_ID), cmd.getCorrelationID()); - - JSONObject parameters = JsonUtils.readJsonObjectFromJsonObject(body, RPCMessage.KEY_PARAMETERS); - - JSONArray didResultArray = JsonUtils.readJsonArrayFromJsonObject(parameters, ReadDIDResponse.KEY_DID_RESULT); - List<DIDResult> didResultList = new ArrayList<DIDResult>(); - for (int index = 0; index < didResultArray.length(); index++) { - DIDResult chunk = new DIDResult(JsonRPCMarshaller.deserializeJSONObject( (JSONObject)didResultArray.get(index)) ); - didResultList.add(chunk); - } - assertTrue(TestValues.MATCH, Validator.validateDIDResults(didResultList, cmd.getDidResult())); - } catch (JSONException e) { - e.printStackTrace(); - } + public void testJsonConstructor() { + JSONObject commandJson = JsonFileReader.readId(getInstrumentation().getContext(), getCommandType(), getMessageType()); + assertNotNull(TestValues.NOT_NULL, commandJson); + + try { + Hashtable<String, Object> hash = JsonRPCMarshaller.deserializeJSONObject(commandJson); + ReadDIDResponse cmd = new ReadDIDResponse(hash); + + JSONObject body = JsonUtils.readJsonObjectFromJsonObject(commandJson, getMessageType()); + assertNotNull(TestValues.NOT_NULL, body); + + // Test everything in the json body. + assertEquals(TestValues.MATCH, JsonUtils.readStringFromJsonObject(body, RPCMessage.KEY_FUNCTION_NAME), cmd.getFunctionName()); + assertEquals(TestValues.MATCH, JsonUtils.readIntegerFromJsonObject(body, RPCMessage.KEY_CORRELATION_ID), cmd.getCorrelationID()); + + JSONObject parameters = JsonUtils.readJsonObjectFromJsonObject(body, RPCMessage.KEY_PARAMETERS); + + JSONArray didResultArray = JsonUtils.readJsonArrayFromJsonObject(parameters, ReadDIDResponse.KEY_DID_RESULT); + List<DIDResult> didResultList = new ArrayList<DIDResult>(); + for (int index = 0; index < didResultArray.length(); index++) { + DIDResult chunk = new DIDResult(JsonRPCMarshaller.deserializeJSONObject((JSONObject) didResultArray.get(index))); + didResultList.add(chunk); + } + assertTrue(TestValues.MATCH, Validator.validateDIDResults(didResultList, cmd.getDidResult())); + } catch (JSONException e) { + e.printStackTrace(); + } } }
\ No newline at end of file diff --git a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/RegisterAppInterfaceResponseTest.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/RegisterAppInterfaceResponseTest.java index 4e790a758..d95eb0594 100644 --- a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/RegisterAppInterfaceResponseTest.java +++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/RegisterAppInterfaceResponseTest.java @@ -39,240 +39,240 @@ import static junit.framework.TestCase.assertTrue; import static junit.framework.TestCase.fail; /** - * This is a unit test class for the SmartDeviceLink library project class : + * This is a unit test class for the SmartDeviceLink library project class : * {@link com.smartdevicelink.proxy.rpc.RegisterAppInterfaceResponse} */ public class RegisterAppInterfaceResponseTest extends BaseRpcTests { - @Override - protected RPCMessage createMessage() { - RegisterAppInterfaceResponse msg = new RegisterAppInterfaceResponse(); - - msg.setSdlMsgVersion(TestValues.GENERAL_SDLMSGVERSION); - msg.setLanguage(TestValues.GENERAL_LANGUAGE); - msg.setHmiDisplayLanguage(TestValues.GENERAL_LANGUAGE); - msg.setDisplayCapabilities(TestValues.GENERAL_DISPLAYCAPABILITIES); - msg.setPresetBankCapabilities(TestValues.GENERAL_PRESETBANKCAPABILITIES); - msg.setVehicleType(TestValues.GENERAL_VEHICLETYPE); - msg.setButtonCapabilities(TestValues.GENERAL_BUTTONCAPABILITIES_LIST); - msg.setSoftButtonCapabilities(TestValues.GENERAL_SOFTBUTTONCAPABILITIES_LIST); - msg.setAudioPassThruCapabilities(TestValues.GENERAL_AUDIOPASSTHRUCAPABILITIES_LIST); - msg.setPcmStreamingCapabilities(TestValues.GENERAL_AUDIOPASSTHRUCAPABILITIES); - msg.setHmiZoneCapabilities(TestValues.GENERAL_HMIZONECAPABILITIES_LIST); - msg.setSpeechCapabilities(TestValues.GENERAL_SPEECHCAPABILITIES_LIST); - msg.setVrCapabilities(TestValues.GENERAL_VRCAPABILITIES_LIST); - msg.setPrerecordedSpeech(TestValues.GENERAL_PRERECORDEDSPEECH_LIST); - msg.setSupportedDiagModes(TestValues.GENERAL_INTEGER_LIST); - msg.setIconResumed(TestValues.GENERAL_BOOLEAN); - - return msg; - } - - @Override - protected String getMessageType() { - return RPCMessage.KEY_RESPONSE; - } - - @Override - protected String getCommandType() { - return FunctionID.REGISTER_APP_INTERFACE.toString(); - } - - - @Override - protected JSONObject getExpectedParameters(int sdlVersion) { - JSONObject result = new JSONObject(); - - try { - result.put(RegisterAppInterfaceResponse.KEY_LANGUAGE, TestValues.GENERAL_LANGUAGE); - result.put(RegisterAppInterfaceResponse.KEY_HMI_DISPLAY_LANGUAGE, TestValues.GENERAL_LANGUAGE); - result.put(RegisterAppInterfaceResponse.KEY_SUPPORTED_DIAG_MODES, JsonUtils.createJsonArray(TestValues.GENERAL_INTEGER_LIST)); - result.put(RegisterAppInterfaceResponse.KEY_SDL_MSG_VERSION, TestValues.JSON_SDLMSGVERSION); - result.put(RegisterAppInterfaceResponse.KEY_VEHICLE_TYPE, TestValues.GENERAL_VEHICLETYPE.serializeJSON()); - result.put(RegisterAppInterfaceResponse.KEY_PRESET_BANK_CAPABILITIES, TestValues.JSON_PRESETBANKCAPABILITIES); - result.put(RegisterAppInterfaceResponse.KEY_DISPLAY_CAPABILITIES, TestValues.JSON_DISPLAYCAPABILITIES); - result.put(RegisterAppInterfaceResponse.KEY_BUTTON_CAPABILITIES, TestValues.JSON_BUTTONCAPABILITIES); - result.put(RegisterAppInterfaceResponse.KEY_SOFT_BUTTON_CAPABILITIES, TestValues.JSON_SOFTBUTTONCAPABILITIES); - result.put(RegisterAppInterfaceResponse.KEY_AUDIO_PASS_THRU_CAPABILITIES, TestValues.JSON_AUDIOPASSTHRUCAPABILITIES); - result.put(RegisterAppInterfaceResponse.KEY_PCM_STREAM_CAPABILITIES, TestValues.JSON_PCMSTREAMCAPABILITIES); - result.put(RegisterAppInterfaceResponse.KEY_SPEECH_CAPABILITIES, JsonUtils.createJsonArray(TestValues.GENERAL_SPEECHCAPABILITIES_LIST)); - result.put(RegisterAppInterfaceResponse.KEY_VR_CAPABILITIES, JsonUtils.createJsonArray(TestValues.GENERAL_VRCAPABILITIES_LIST)); - result.put(RegisterAppInterfaceResponse.KEY_HMI_ZONE_CAPABILITIES, JsonUtils.createJsonArray(TestValues.GENERAL_HMIZONECAPABILITIES_LIST)); - result.put(RegisterAppInterfaceResponse.KEY_PRERECORDED_SPEECH, JsonUtils.createJsonArray(TestValues.GENERAL_PRERECORDEDSPEECH_LIST)); - result.put(RegisterAppInterfaceResponse.KEY_ICON_RESUMED, TestValues.GENERAL_BOOLEAN); - } catch (JSONException e) { - fail(TestValues.JSON_FAIL); - } - - return result; - } - - /** - * Tests the expected values of the RPC message. - */ - @Test - public void testRpcValues () { - // Test Values - List<Integer> testSupportedDiagModes = ( (RegisterAppInterfaceResponse) msg ).getSupportedDiagModes(); - List<PrerecordedSpeech> testPrerecordedSpeech = ( (RegisterAppInterfaceResponse) msg ).getPrerecordedSpeech(); - List<VrCapabilities> testVrCapabilities = ( (RegisterAppInterfaceResponse) msg ).getVrCapabilities(); - List<SpeechCapabilities> testSpeechCapabilities = ( (RegisterAppInterfaceResponse) msg ).getSpeechCapabilities(); - List<HmiZoneCapabilities> testHmiZoneCapabilities = ( (RegisterAppInterfaceResponse) msg ).getHmiZoneCapabilities(); - List<SoftButtonCapabilities> testSoftButtonCapabilities = ( (RegisterAppInterfaceResponse) msg ).getSoftButtonCapabilities(); - List<ButtonCapabilities> testButtonCapabilities = ( (RegisterAppInterfaceResponse) msg ).getButtonCapabilities(); - VehicleType testVehicleType = ( (RegisterAppInterfaceResponse) msg ).getVehicleType(); - PresetBankCapabilities testPbc = ( (RegisterAppInterfaceResponse) msg ).getPresetBankCapabilities(); - DisplayCapabilities testDc = ( (RegisterAppInterfaceResponse) msg ).getDisplayCapabilities(); - Language testHmiLang = ( (RegisterAppInterfaceResponse) msg ).getHmiDisplayLanguage(); - Language testLang = ( (RegisterAppInterfaceResponse) msg ).getLanguage(); - SdlMsgVersion testMsgVersion = ( (RegisterAppInterfaceResponse) msg ).getSdlMsgVersion(); - List<AudioPassThruCapabilities> testAptc = ( (RegisterAppInterfaceResponse) msg ).getAudioPassThruCapabilities(); - AudioPassThruCapabilities testPcmStream = ( (RegisterAppInterfaceResponse) msg ).getPcmStreamingCapabilities(); - Boolean testIconResumed = ( (RegisterAppInterfaceResponse) msg ).getIconResumed(); - - // Valid Tests - assertEquals(TestValues.MATCH, TestValues.GENERAL_INTEGER_LIST, testSupportedDiagModes); - assertEquals(TestValues.MATCH, TestValues.GENERAL_PRERECORDEDSPEECH_LIST, testPrerecordedSpeech); - assertEquals(TestValues.MATCH, TestValues.GENERAL_VRCAPABILITIES_LIST, testVrCapabilities); - assertEquals(TestValues.MATCH, TestValues.GENERAL_SPEECHCAPABILITIES_LIST, testSpeechCapabilities); - assertEquals(TestValues.MATCH, TestValues.GENERAL_HMIZONECAPABILITIES_LIST, testHmiZoneCapabilities); - assertTrue(TestValues.TRUE, Validator.validateSoftButtonCapabilities(TestValues.GENERAL_SOFTBUTTONCAPABILITIES_LIST, testSoftButtonCapabilities)); - assertTrue(TestValues.TRUE, Validator.validateButtonCapabilities(TestValues.GENERAL_BUTTONCAPABILITIES_LIST, testButtonCapabilities)); - assertTrue(TestValues.TRUE, Validator.validateVehicleType(TestValues.GENERAL_VEHICLETYPE, testVehicleType)); - assertTrue(TestValues.TRUE, Validator.validatePresetBankCapabilities(TestValues.GENERAL_PRESETBANKCAPABILITIES, testPbc)); - assertTrue(TestValues.TRUE, Validator.validateDisplayCapabilities(TestValues.GENERAL_DISPLAYCAPABILITIES, testDc)); - assertEquals(TestValues.MATCH, TestValues.GENERAL_LANGUAGE, testHmiLang); - assertEquals(TestValues.MATCH, TestValues.GENERAL_LANGUAGE, testLang); - assertTrue(TestValues.TRUE, Validator.validateSdlMsgVersion(TestValues.GENERAL_SDLMSGVERSION, testMsgVersion)); - assertTrue(TestValues.TRUE, Validator.validateAudioPassThruCapabilities(TestValues.GENERAL_AUDIOPASSTHRUCAPABILITIES_LIST, testAptc)); - assertTrue(TestValues.TRUE, Validator.validatePcmStreamCapabilities(TestValues.GENERAL_AUDIOPASSTHRUCAPABILITIES, testPcmStream)); - assertEquals(TestValues.MATCH, (Boolean) TestValues.GENERAL_BOOLEAN, testIconResumed); - - // Invalid/Null Tests - RegisterAppInterfaceResponse msg = new RegisterAppInterfaceResponse(); - assertNotNull(TestValues.NOT_NULL, msg); - testNullBase(msg); - - assertNull(TestValues.NULL, msg.getSdlMsgVersion()); - assertNull(TestValues.NULL, msg.getLanguage()); - assertNull(TestValues.NULL, msg.getHmiDisplayLanguage()); - assertNull(TestValues.NULL, msg.getDisplayCapabilities()); - assertNull(TestValues.NULL, msg.getPresetBankCapabilities()); - assertNull(TestValues.NULL, msg.getVehicleType()); - assertNull(TestValues.NULL, msg.getButtonCapabilities()); - assertNull(TestValues.NULL, msg.getSoftButtonCapabilities()); - assertNull(TestValues.NULL, msg.getAudioPassThruCapabilities()); - assertNull(TestValues.NULL, msg.getPcmStreamingCapabilities()); - assertNull(TestValues.NULL, msg.getHmiZoneCapabilities()); - assertNull(TestValues.NULL, msg.getSpeechCapabilities()); - assertNull(TestValues.NULL, msg.getVrCapabilities()); - assertNull(TestValues.NULL, msg.getPrerecordedSpeech()); - assertNull(TestValues.NULL, msg.getSupportedDiagModes()); - assertNull(TestValues.NULL, msg.getIconResumed()); - } - + @Override + protected RPCMessage createMessage() { + RegisterAppInterfaceResponse msg = new RegisterAppInterfaceResponse(); + + msg.setSdlMsgVersion(TestValues.GENERAL_SDLMSGVERSION); + msg.setLanguage(TestValues.GENERAL_LANGUAGE); + msg.setHmiDisplayLanguage(TestValues.GENERAL_LANGUAGE); + msg.setDisplayCapabilities(TestValues.GENERAL_DISPLAYCAPABILITIES); + msg.setPresetBankCapabilities(TestValues.GENERAL_PRESETBANKCAPABILITIES); + msg.setVehicleType(TestValues.GENERAL_VEHICLETYPE); + msg.setButtonCapabilities(TestValues.GENERAL_BUTTONCAPABILITIES_LIST); + msg.setSoftButtonCapabilities(TestValues.GENERAL_SOFTBUTTONCAPABILITIES_LIST); + msg.setAudioPassThruCapabilities(TestValues.GENERAL_AUDIOPASSTHRUCAPABILITIES_LIST); + msg.setPcmStreamingCapabilities(TestValues.GENERAL_AUDIOPASSTHRUCAPABILITIES); + msg.setHmiZoneCapabilities(TestValues.GENERAL_HMIZONECAPABILITIES_LIST); + msg.setSpeechCapabilities(TestValues.GENERAL_SPEECHCAPABILITIES_LIST); + msg.setVrCapabilities(TestValues.GENERAL_VRCAPABILITIES_LIST); + msg.setPrerecordedSpeech(TestValues.GENERAL_PRERECORDEDSPEECH_LIST); + msg.setSupportedDiagModes(TestValues.GENERAL_INTEGER_LIST); + msg.setIconResumed(TestValues.GENERAL_BOOLEAN); + + return msg; + } + + @Override + protected String getMessageType() { + return RPCMessage.KEY_RESPONSE; + } + + @Override + protected String getCommandType() { + return FunctionID.REGISTER_APP_INTERFACE.toString(); + } + + + @Override + protected JSONObject getExpectedParameters(int sdlVersion) { + JSONObject result = new JSONObject(); + + try { + result.put(RegisterAppInterfaceResponse.KEY_LANGUAGE, TestValues.GENERAL_LANGUAGE); + result.put(RegisterAppInterfaceResponse.KEY_HMI_DISPLAY_LANGUAGE, TestValues.GENERAL_LANGUAGE); + result.put(RegisterAppInterfaceResponse.KEY_SUPPORTED_DIAG_MODES, JsonUtils.createJsonArray(TestValues.GENERAL_INTEGER_LIST)); + result.put(RegisterAppInterfaceResponse.KEY_SDL_MSG_VERSION, TestValues.JSON_SDLMSGVERSION); + result.put(RegisterAppInterfaceResponse.KEY_VEHICLE_TYPE, TestValues.GENERAL_VEHICLETYPE.serializeJSON()); + result.put(RegisterAppInterfaceResponse.KEY_PRESET_BANK_CAPABILITIES, TestValues.JSON_PRESETBANKCAPABILITIES); + result.put(RegisterAppInterfaceResponse.KEY_DISPLAY_CAPABILITIES, TestValues.JSON_DISPLAYCAPABILITIES); + result.put(RegisterAppInterfaceResponse.KEY_BUTTON_CAPABILITIES, TestValues.JSON_BUTTONCAPABILITIES); + result.put(RegisterAppInterfaceResponse.KEY_SOFT_BUTTON_CAPABILITIES, TestValues.JSON_SOFTBUTTONCAPABILITIES); + result.put(RegisterAppInterfaceResponse.KEY_AUDIO_PASS_THRU_CAPABILITIES, TestValues.JSON_AUDIOPASSTHRUCAPABILITIES); + result.put(RegisterAppInterfaceResponse.KEY_PCM_STREAM_CAPABILITIES, TestValues.JSON_PCMSTREAMCAPABILITIES); + result.put(RegisterAppInterfaceResponse.KEY_SPEECH_CAPABILITIES, JsonUtils.createJsonArray(TestValues.GENERAL_SPEECHCAPABILITIES_LIST)); + result.put(RegisterAppInterfaceResponse.KEY_VR_CAPABILITIES, JsonUtils.createJsonArray(TestValues.GENERAL_VRCAPABILITIES_LIST)); + result.put(RegisterAppInterfaceResponse.KEY_HMI_ZONE_CAPABILITIES, JsonUtils.createJsonArray(TestValues.GENERAL_HMIZONECAPABILITIES_LIST)); + result.put(RegisterAppInterfaceResponse.KEY_PRERECORDED_SPEECH, JsonUtils.createJsonArray(TestValues.GENERAL_PRERECORDEDSPEECH_LIST)); + result.put(RegisterAppInterfaceResponse.KEY_ICON_RESUMED, TestValues.GENERAL_BOOLEAN); + } catch (JSONException e) { + fail(TestValues.JSON_FAIL); + } + + return result; + } + + /** + * Tests the expected values of the RPC message. + */ + @Test + public void testRpcValues() { + // Test Values + List<Integer> testSupportedDiagModes = ((RegisterAppInterfaceResponse) msg).getSupportedDiagModes(); + List<PrerecordedSpeech> testPrerecordedSpeech = ((RegisterAppInterfaceResponse) msg).getPrerecordedSpeech(); + List<VrCapabilities> testVrCapabilities = ((RegisterAppInterfaceResponse) msg).getVrCapabilities(); + List<SpeechCapabilities> testSpeechCapabilities = ((RegisterAppInterfaceResponse) msg).getSpeechCapabilities(); + List<HmiZoneCapabilities> testHmiZoneCapabilities = ((RegisterAppInterfaceResponse) msg).getHmiZoneCapabilities(); + List<SoftButtonCapabilities> testSoftButtonCapabilities = ((RegisterAppInterfaceResponse) msg).getSoftButtonCapabilities(); + List<ButtonCapabilities> testButtonCapabilities = ((RegisterAppInterfaceResponse) msg).getButtonCapabilities(); + VehicleType testVehicleType = ((RegisterAppInterfaceResponse) msg).getVehicleType(); + PresetBankCapabilities testPbc = ((RegisterAppInterfaceResponse) msg).getPresetBankCapabilities(); + DisplayCapabilities testDc = ((RegisterAppInterfaceResponse) msg).getDisplayCapabilities(); + Language testHmiLang = ((RegisterAppInterfaceResponse) msg).getHmiDisplayLanguage(); + Language testLang = ((RegisterAppInterfaceResponse) msg).getLanguage(); + SdlMsgVersion testMsgVersion = ((RegisterAppInterfaceResponse) msg).getSdlMsgVersion(); + List<AudioPassThruCapabilities> testAptc = ((RegisterAppInterfaceResponse) msg).getAudioPassThruCapabilities(); + AudioPassThruCapabilities testPcmStream = ((RegisterAppInterfaceResponse) msg).getPcmStreamingCapabilities(); + Boolean testIconResumed = ((RegisterAppInterfaceResponse) msg).getIconResumed(); + + // Valid Tests + assertEquals(TestValues.MATCH, TestValues.GENERAL_INTEGER_LIST, testSupportedDiagModes); + assertEquals(TestValues.MATCH, TestValues.GENERAL_PRERECORDEDSPEECH_LIST, testPrerecordedSpeech); + assertEquals(TestValues.MATCH, TestValues.GENERAL_VRCAPABILITIES_LIST, testVrCapabilities); + assertEquals(TestValues.MATCH, TestValues.GENERAL_SPEECHCAPABILITIES_LIST, testSpeechCapabilities); + assertEquals(TestValues.MATCH, TestValues.GENERAL_HMIZONECAPABILITIES_LIST, testHmiZoneCapabilities); + assertTrue(TestValues.TRUE, Validator.validateSoftButtonCapabilities(TestValues.GENERAL_SOFTBUTTONCAPABILITIES_LIST, testSoftButtonCapabilities)); + assertTrue(TestValues.TRUE, Validator.validateButtonCapabilities(TestValues.GENERAL_BUTTONCAPABILITIES_LIST, testButtonCapabilities)); + assertTrue(TestValues.TRUE, Validator.validateVehicleType(TestValues.GENERAL_VEHICLETYPE, testVehicleType)); + assertTrue(TestValues.TRUE, Validator.validatePresetBankCapabilities(TestValues.GENERAL_PRESETBANKCAPABILITIES, testPbc)); + assertTrue(TestValues.TRUE, Validator.validateDisplayCapabilities(TestValues.GENERAL_DISPLAYCAPABILITIES, testDc)); + assertEquals(TestValues.MATCH, TestValues.GENERAL_LANGUAGE, testHmiLang); + assertEquals(TestValues.MATCH, TestValues.GENERAL_LANGUAGE, testLang); + assertTrue(TestValues.TRUE, Validator.validateSdlMsgVersion(TestValues.GENERAL_SDLMSGVERSION, testMsgVersion)); + assertTrue(TestValues.TRUE, Validator.validateAudioPassThruCapabilities(TestValues.GENERAL_AUDIOPASSTHRUCAPABILITIES_LIST, testAptc)); + assertTrue(TestValues.TRUE, Validator.validatePcmStreamCapabilities(TestValues.GENERAL_AUDIOPASSTHRUCAPABILITIES, testPcmStream)); + assertEquals(TestValues.MATCH, (Boolean) TestValues.GENERAL_BOOLEAN, testIconResumed); + + // Invalid/Null Tests + RegisterAppInterfaceResponse msg = new RegisterAppInterfaceResponse(); + assertNotNull(TestValues.NOT_NULL, msg); + testNullBase(msg); + + assertNull(TestValues.NULL, msg.getSdlMsgVersion()); + assertNull(TestValues.NULL, msg.getLanguage()); + assertNull(TestValues.NULL, msg.getHmiDisplayLanguage()); + assertNull(TestValues.NULL, msg.getDisplayCapabilities()); + assertNull(TestValues.NULL, msg.getPresetBankCapabilities()); + assertNull(TestValues.NULL, msg.getVehicleType()); + assertNull(TestValues.NULL, msg.getButtonCapabilities()); + assertNull(TestValues.NULL, msg.getSoftButtonCapabilities()); + assertNull(TestValues.NULL, msg.getAudioPassThruCapabilities()); + assertNull(TestValues.NULL, msg.getPcmStreamingCapabilities()); + assertNull(TestValues.NULL, msg.getHmiZoneCapabilities()); + assertNull(TestValues.NULL, msg.getSpeechCapabilities()); + assertNull(TestValues.NULL, msg.getVrCapabilities()); + assertNull(TestValues.NULL, msg.getPrerecordedSpeech()); + assertNull(TestValues.NULL, msg.getSupportedDiagModes()); + assertNull(TestValues.NULL, msg.getIconResumed()); + } + /** * Tests a valid JSON construction of this RPC message. */ @Test - public void testJsonConstructor () { - JSONObject commandJson = JsonFileReader.readId(getInstrumentation().getContext(), getCommandType(), getMessageType()); - assertNotNull(TestValues.NOT_NULL, commandJson); - - try { - Hashtable<String, Object> hash = JsonRPCMarshaller.deserializeJSONObject(commandJson); - RegisterAppInterfaceResponse cmd = new RegisterAppInterfaceResponse(hash); - - JSONObject body = JsonUtils.readJsonObjectFromJsonObject(commandJson, getMessageType()); - assertNotNull(TestValues.NOT_NULL, body); - - // Test everything in the json body. - assertEquals(TestValues.MATCH, JsonUtils.readStringFromJsonObject(body, RPCMessage.KEY_FUNCTION_NAME), cmd.getFunctionName()); - assertEquals(TestValues.MATCH, JsonUtils.readIntegerFromJsonObject(body, RPCMessage.KEY_CORRELATION_ID), cmd.getCorrelationID()); - - JSONObject parameters = JsonUtils.readJsonObjectFromJsonObject(body, RPCMessage.KEY_PARAMETERS); - - JSONObject vehicleTypeObj = JsonUtils.readJsonObjectFromJsonObject(parameters, RegisterAppInterfaceResponse.KEY_VEHICLE_TYPE); - VehicleType vehicleType = new VehicleType(JsonRPCMarshaller.deserializeJSONObject(vehicleTypeObj)); - assertTrue(TestValues.TRUE, Validator.validateVehicleType(vehicleType, cmd.getVehicleType())); - - JSONObject pcmStreamObj = JsonUtils.readJsonObjectFromJsonObject(parameters, RegisterAppInterfaceResponse.KEY_PCM_STREAM_CAPABILITIES); - AudioPassThruCapabilities pcmStreamCap = new AudioPassThruCapabilities(JsonRPCMarshaller.deserializeJSONObject(pcmStreamObj)); - assertTrue(TestValues.TRUE, Validator.validatePcmStreamCapabilities(pcmStreamCap, cmd.getPcmStreamingCapabilities())); - - JSONArray speechCapabilitiesArray = JsonUtils.readJsonArrayFromJsonObject(parameters, RegisterAppInterfaceResponse.KEY_SPEECH_CAPABILITIES); - for (int index = 0; index < speechCapabilitiesArray.length(); index++) { - SpeechCapabilities speechCapability = SpeechCapabilities.valueForString( speechCapabilitiesArray.get(index).toString() ); - assertEquals(TestValues.MATCH, speechCapability, cmd.getSpeechCapabilities().get(index)); - } - - JSONArray vrCapabilitiesArray = JsonUtils.readJsonArrayFromJsonObject(parameters, RegisterAppInterfaceResponse.KEY_VR_CAPABILITIES); - for (int index = 0; index < vrCapabilitiesArray.length(); index++) { - VrCapabilities vrCapability = VrCapabilities.valueForString( vrCapabilitiesArray.get(index).toString() ); - assertEquals(TestValues.MATCH, vrCapability, cmd.getVrCapabilities().get(index)); - } - - JSONArray audioPassThruCapabilitiesArray = JsonUtils.readJsonArrayFromJsonObject(parameters, RegisterAppInterfaceResponse.KEY_AUDIO_PASS_THRU_CAPABILITIES); - List<AudioPassThruCapabilities> audioPassThruCapabilitiesList = new ArrayList<AudioPassThruCapabilities>(); - for (int index = 0; index < audioPassThruCapabilitiesArray.length(); index++) { - AudioPassThruCapabilities audioPassThruCapability = - new AudioPassThruCapabilities(JsonRPCMarshaller.deserializeJSONObject( (JSONObject)audioPassThruCapabilitiesArray.get(index) )); - audioPassThruCapabilitiesList.add(audioPassThruCapability); - } - assertTrue(TestValues.TRUE, Validator.validateAudioPassThruCapabilities(audioPassThruCapabilitiesList, cmd.getAudioPassThruCapabilities() )); - - JSONArray hmiZoneCapabilitiesArray = JsonUtils.readJsonArrayFromJsonObject(parameters, RegisterAppInterfaceResponse.KEY_HMI_ZONE_CAPABILITIES); - for (int index = 0; index < hmiZoneCapabilitiesArray.length(); index++) { - HmiZoneCapabilities hmiZoneCapability = HmiZoneCapabilities.valueForString( hmiZoneCapabilitiesArray.get(index).toString() ); - assertEquals(TestValues.MATCH, hmiZoneCapability, cmd.getHmiZoneCapabilities().get(index)); - } - - JSONArray prerecordedSpeechArray = JsonUtils.readJsonArrayFromJsonObject(parameters, RegisterAppInterfaceResponse.KEY_PRERECORDED_SPEECH); - for (int index = 0; index < prerecordedSpeechArray.length(); index++) { - PrerecordedSpeech prerecordedSpeech = PrerecordedSpeech.valueForString( prerecordedSpeechArray.get(index).toString() ); - assertEquals(TestValues.MATCH, prerecordedSpeech, cmd.getPrerecordedSpeech().get(index)); - } - - List<Integer> supportedDiagnosticModesList = JsonUtils.readIntegerListFromJsonObject(parameters, RegisterAppInterfaceResponse.KEY_SUPPORTED_DIAG_MODES); - List<Integer> testDiagnosticModesList = cmd.getSupportedDiagModes(); - assertEquals(TestValues.MATCH, supportedDiagnosticModesList.size(), testDiagnosticModesList.size()); - assertTrue(TestValues.TRUE, Validator.validateIntegerList(supportedDiagnosticModesList, testDiagnosticModesList)); - - JSONObject sdlMsgVersionObj = JsonUtils.readJsonObjectFromJsonObject(parameters, RegisterAppInterfaceResponse.KEY_SDL_MSG_VERSION); - SdlMsgVersion sdlMsgVersion = new SdlMsgVersion(JsonRPCMarshaller.deserializeJSONObject(sdlMsgVersionObj)); - assertTrue(TestValues.TRUE, Validator.validateSdlMsgVersion(sdlMsgVersion, cmd.getSdlMsgVersion()) ); - assertEquals(TestValues.MATCH, JsonUtils.readStringFromJsonObject(parameters, RegisterAppInterfaceResponse.KEY_LANGUAGE), cmd.getLanguage().toString()); - - JSONArray buttonCapabilitiesArray = JsonUtils.readJsonArrayFromJsonObject(parameters, RegisterAppInterfaceResponse.KEY_BUTTON_CAPABILITIES); - List<ButtonCapabilities> buttonCapabilitiesList = new ArrayList<ButtonCapabilities>(); - for (int index = 0; index < buttonCapabilitiesArray.length(); index++) { - ButtonCapabilities buttonCapability = new ButtonCapabilities(JsonRPCMarshaller.deserializeJSONObject( (JSONObject)buttonCapabilitiesArray.get(index) )); - buttonCapabilitiesList.add(buttonCapability); - } - assertTrue(TestValues.TRUE, Validator.validateButtonCapabilities(buttonCapabilitiesList, cmd.getButtonCapabilities() )); - - JSONObject displayCapabilitiesObj = JsonUtils.readJsonObjectFromJsonObject(parameters, RegisterAppInterfaceResponse.KEY_DISPLAY_CAPABILITIES); - DisplayCapabilities displayCapabilities = new DisplayCapabilities(JsonRPCMarshaller.deserializeJSONObject(displayCapabilitiesObj)); - assertTrue(TestValues.TRUE, Validator.validateDisplayCapabilities(displayCapabilities, cmd.getDisplayCapabilities()) ); - assertEquals(TestValues.MATCH, JsonUtils.readStringFromJsonObject(parameters, RegisterAppInterfaceResponse.KEY_HMI_DISPLAY_LANGUAGE), cmd.getHmiDisplayLanguage().toString()); - - JSONArray softButtonCapabilitiesArray = JsonUtils.readJsonArrayFromJsonObject(parameters, RegisterAppInterfaceResponse.KEY_SOFT_BUTTON_CAPABILITIES); - List<SoftButtonCapabilities> softButtonCapabilitiesList = new ArrayList<SoftButtonCapabilities>(); - for (int index = 0; index < softButtonCapabilitiesArray.length(); index++) { - SoftButtonCapabilities softButtonCapability = - new SoftButtonCapabilities(JsonRPCMarshaller.deserializeJSONObject( (JSONObject)softButtonCapabilitiesArray.get(index) )); - softButtonCapabilitiesList.add(softButtonCapability); - } - assertTrue(TestValues.TRUE, Validator.validateSoftButtonCapabilities(softButtonCapabilitiesList, cmd.getSoftButtonCapabilities() )); - - JSONObject presetBankCapabilitiesObj = JsonUtils.readJsonObjectFromJsonObject(parameters, RegisterAppInterfaceResponse.KEY_PRESET_BANK_CAPABILITIES); - PresetBankCapabilities presetBankCapabilities = new PresetBankCapabilities(JsonRPCMarshaller.deserializeJSONObject(presetBankCapabilitiesObj)); - assertTrue(TestValues.TRUE, Validator.validatePresetBankCapabilities(presetBankCapabilities, cmd.getPresetBankCapabilities()) ); - - Boolean iconResumed = JsonUtils.readBooleanFromJsonObject(parameters, RegisterAppInterfaceResponse.KEY_ICON_RESUMED); - assertEquals(TestValues.MATCH, iconResumed, cmd.getIconResumed()); - } catch (JSONException e) { - e.printStackTrace(); - } + public void testJsonConstructor() { + JSONObject commandJson = JsonFileReader.readId(getInstrumentation().getContext(), getCommandType(), getMessageType()); + assertNotNull(TestValues.NOT_NULL, commandJson); + + try { + Hashtable<String, Object> hash = JsonRPCMarshaller.deserializeJSONObject(commandJson); + RegisterAppInterfaceResponse cmd = new RegisterAppInterfaceResponse(hash); + + JSONObject body = JsonUtils.readJsonObjectFromJsonObject(commandJson, getMessageType()); + assertNotNull(TestValues.NOT_NULL, body); + + // Test everything in the json body. + assertEquals(TestValues.MATCH, JsonUtils.readStringFromJsonObject(body, RPCMessage.KEY_FUNCTION_NAME), cmd.getFunctionName()); + assertEquals(TestValues.MATCH, JsonUtils.readIntegerFromJsonObject(body, RPCMessage.KEY_CORRELATION_ID), cmd.getCorrelationID()); + + JSONObject parameters = JsonUtils.readJsonObjectFromJsonObject(body, RPCMessage.KEY_PARAMETERS); + + JSONObject vehicleTypeObj = JsonUtils.readJsonObjectFromJsonObject(parameters, RegisterAppInterfaceResponse.KEY_VEHICLE_TYPE); + VehicleType vehicleType = new VehicleType(JsonRPCMarshaller.deserializeJSONObject(vehicleTypeObj)); + assertTrue(TestValues.TRUE, Validator.validateVehicleType(vehicleType, cmd.getVehicleType())); + + JSONObject pcmStreamObj = JsonUtils.readJsonObjectFromJsonObject(parameters, RegisterAppInterfaceResponse.KEY_PCM_STREAM_CAPABILITIES); + AudioPassThruCapabilities pcmStreamCap = new AudioPassThruCapabilities(JsonRPCMarshaller.deserializeJSONObject(pcmStreamObj)); + assertTrue(TestValues.TRUE, Validator.validatePcmStreamCapabilities(pcmStreamCap, cmd.getPcmStreamingCapabilities())); + + JSONArray speechCapabilitiesArray = JsonUtils.readJsonArrayFromJsonObject(parameters, RegisterAppInterfaceResponse.KEY_SPEECH_CAPABILITIES); + for (int index = 0; index < speechCapabilitiesArray.length(); index++) { + SpeechCapabilities speechCapability = SpeechCapabilities.valueForString(speechCapabilitiesArray.get(index).toString()); + assertEquals(TestValues.MATCH, speechCapability, cmd.getSpeechCapabilities().get(index)); + } + + JSONArray vrCapabilitiesArray = JsonUtils.readJsonArrayFromJsonObject(parameters, RegisterAppInterfaceResponse.KEY_VR_CAPABILITIES); + for (int index = 0; index < vrCapabilitiesArray.length(); index++) { + VrCapabilities vrCapability = VrCapabilities.valueForString(vrCapabilitiesArray.get(index).toString()); + assertEquals(TestValues.MATCH, vrCapability, cmd.getVrCapabilities().get(index)); + } + + JSONArray audioPassThruCapabilitiesArray = JsonUtils.readJsonArrayFromJsonObject(parameters, RegisterAppInterfaceResponse.KEY_AUDIO_PASS_THRU_CAPABILITIES); + List<AudioPassThruCapabilities> audioPassThruCapabilitiesList = new ArrayList<AudioPassThruCapabilities>(); + for (int index = 0; index < audioPassThruCapabilitiesArray.length(); index++) { + AudioPassThruCapabilities audioPassThruCapability = + new AudioPassThruCapabilities(JsonRPCMarshaller.deserializeJSONObject((JSONObject) audioPassThruCapabilitiesArray.get(index))); + audioPassThruCapabilitiesList.add(audioPassThruCapability); + } + assertTrue(TestValues.TRUE, Validator.validateAudioPassThruCapabilities(audioPassThruCapabilitiesList, cmd.getAudioPassThruCapabilities())); + + JSONArray hmiZoneCapabilitiesArray = JsonUtils.readJsonArrayFromJsonObject(parameters, RegisterAppInterfaceResponse.KEY_HMI_ZONE_CAPABILITIES); + for (int index = 0; index < hmiZoneCapabilitiesArray.length(); index++) { + HmiZoneCapabilities hmiZoneCapability = HmiZoneCapabilities.valueForString(hmiZoneCapabilitiesArray.get(index).toString()); + assertEquals(TestValues.MATCH, hmiZoneCapability, cmd.getHmiZoneCapabilities().get(index)); + } + + JSONArray prerecordedSpeechArray = JsonUtils.readJsonArrayFromJsonObject(parameters, RegisterAppInterfaceResponse.KEY_PRERECORDED_SPEECH); + for (int index = 0; index < prerecordedSpeechArray.length(); index++) { + PrerecordedSpeech prerecordedSpeech = PrerecordedSpeech.valueForString(prerecordedSpeechArray.get(index).toString()); + assertEquals(TestValues.MATCH, prerecordedSpeech, cmd.getPrerecordedSpeech().get(index)); + } + + List<Integer> supportedDiagnosticModesList = JsonUtils.readIntegerListFromJsonObject(parameters, RegisterAppInterfaceResponse.KEY_SUPPORTED_DIAG_MODES); + List<Integer> testDiagnosticModesList = cmd.getSupportedDiagModes(); + assertEquals(TestValues.MATCH, supportedDiagnosticModesList.size(), testDiagnosticModesList.size()); + assertTrue(TestValues.TRUE, Validator.validateIntegerList(supportedDiagnosticModesList, testDiagnosticModesList)); + + JSONObject sdlMsgVersionObj = JsonUtils.readJsonObjectFromJsonObject(parameters, RegisterAppInterfaceResponse.KEY_SDL_MSG_VERSION); + SdlMsgVersion sdlMsgVersion = new SdlMsgVersion(JsonRPCMarshaller.deserializeJSONObject(sdlMsgVersionObj)); + assertTrue(TestValues.TRUE, Validator.validateSdlMsgVersion(sdlMsgVersion, cmd.getSdlMsgVersion())); + assertEquals(TestValues.MATCH, JsonUtils.readStringFromJsonObject(parameters, RegisterAppInterfaceResponse.KEY_LANGUAGE), cmd.getLanguage().toString()); + + JSONArray buttonCapabilitiesArray = JsonUtils.readJsonArrayFromJsonObject(parameters, RegisterAppInterfaceResponse.KEY_BUTTON_CAPABILITIES); + List<ButtonCapabilities> buttonCapabilitiesList = new ArrayList<ButtonCapabilities>(); + for (int index = 0; index < buttonCapabilitiesArray.length(); index++) { + ButtonCapabilities buttonCapability = new ButtonCapabilities(JsonRPCMarshaller.deserializeJSONObject((JSONObject) buttonCapabilitiesArray.get(index))); + buttonCapabilitiesList.add(buttonCapability); + } + assertTrue(TestValues.TRUE, Validator.validateButtonCapabilities(buttonCapabilitiesList, cmd.getButtonCapabilities())); + + JSONObject displayCapabilitiesObj = JsonUtils.readJsonObjectFromJsonObject(parameters, RegisterAppInterfaceResponse.KEY_DISPLAY_CAPABILITIES); + DisplayCapabilities displayCapabilities = new DisplayCapabilities(JsonRPCMarshaller.deserializeJSONObject(displayCapabilitiesObj)); + assertTrue(TestValues.TRUE, Validator.validateDisplayCapabilities(displayCapabilities, cmd.getDisplayCapabilities())); + assertEquals(TestValues.MATCH, JsonUtils.readStringFromJsonObject(parameters, RegisterAppInterfaceResponse.KEY_HMI_DISPLAY_LANGUAGE), cmd.getHmiDisplayLanguage().toString()); + + JSONArray softButtonCapabilitiesArray = JsonUtils.readJsonArrayFromJsonObject(parameters, RegisterAppInterfaceResponse.KEY_SOFT_BUTTON_CAPABILITIES); + List<SoftButtonCapabilities> softButtonCapabilitiesList = new ArrayList<SoftButtonCapabilities>(); + for (int index = 0; index < softButtonCapabilitiesArray.length(); index++) { + SoftButtonCapabilities softButtonCapability = + new SoftButtonCapabilities(JsonRPCMarshaller.deserializeJSONObject((JSONObject) softButtonCapabilitiesArray.get(index))); + softButtonCapabilitiesList.add(softButtonCapability); + } + assertTrue(TestValues.TRUE, Validator.validateSoftButtonCapabilities(softButtonCapabilitiesList, cmd.getSoftButtonCapabilities())); + + JSONObject presetBankCapabilitiesObj = JsonUtils.readJsonObjectFromJsonObject(parameters, RegisterAppInterfaceResponse.KEY_PRESET_BANK_CAPABILITIES); + PresetBankCapabilities presetBankCapabilities = new PresetBankCapabilities(JsonRPCMarshaller.deserializeJSONObject(presetBankCapabilitiesObj)); + assertTrue(TestValues.TRUE, Validator.validatePresetBankCapabilities(presetBankCapabilities, cmd.getPresetBankCapabilities())); + + Boolean iconResumed = JsonUtils.readBooleanFromJsonObject(parameters, RegisterAppInterfaceResponse.KEY_ICON_RESUMED); + assertEquals(TestValues.MATCH, iconResumed, cmd.getIconResumed()); + } catch (JSONException e) { + e.printStackTrace(); + } } }
\ No newline at end of file diff --git a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/ReleaseInteriorVehicleDataModuleResponseTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/ReleaseInteriorVehicleDataModuleResponseTests.java index b2ba952b8..887d3822d 100644 --- a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/ReleaseInteriorVehicleDataModuleResponseTests.java +++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/ReleaseInteriorVehicleDataModuleResponseTests.java @@ -22,43 +22,43 @@ import static junit.framework.TestCase.fail; public class ReleaseInteriorVehicleDataModuleResponseTests extends BaseRpcTests { - @Override - protected RPCMessage createMessage() { - ReleaseInteriorVehicleDataModuleResponse msg = new ReleaseInteriorVehicleDataModuleResponse(); - return msg; - } + @Override + protected RPCMessage createMessage() { + ReleaseInteriorVehicleDataModuleResponse msg = new ReleaseInteriorVehicleDataModuleResponse(); + return msg; + } - @Override - protected String getMessageType() { - return RPCMessage.KEY_RESPONSE; - } + @Override + protected String getMessageType() { + return RPCMessage.KEY_RESPONSE; + } - @Override - protected String getCommandType() { - return FunctionID.RELEASE_INTERIOR_VEHICLE_MODULE.toString(); - } + @Override + protected String getCommandType() { + return FunctionID.RELEASE_INTERIOR_VEHICLE_MODULE.toString(); + } - @Override - protected JSONObject getExpectedParameters(int sdlVersion) { - return new JSONObject(); - } + @Override + protected JSONObject getExpectedParameters(int sdlVersion) { + return new JSONObject(); + } - @Test - public void testJsonConstructor() { - JSONObject commandJson = JsonFileReader.readId(getInstrumentation().getTargetContext(), getCommandType(), getMessageType()); - assertNotNull(TestValues.NOT_NULL, commandJson); + @Test + public void testJsonConstructor() { + JSONObject commandJson = JsonFileReader.readId(getInstrumentation().getTargetContext(), getCommandType(), getMessageType()); + assertNotNull(TestValues.NOT_NULL, commandJson); - try { - Hashtable<String, Object> hash = JsonRPCMarshaller.deserializeJSONObject(commandJson); - ReleaseInteriorVehicleDataModuleResponse cmd = new ReleaseInteriorVehicleDataModuleResponse(hash); + try { + Hashtable<String, Object> hash = JsonRPCMarshaller.deserializeJSONObject(commandJson); + ReleaseInteriorVehicleDataModuleResponse cmd = new ReleaseInteriorVehicleDataModuleResponse(hash); - JSONObject body = JsonUtils.readJsonObjectFromJsonObject(commandJson, getMessageType()); - assertNotNull(TestValues.NOT_NULL, body); + JSONObject body = JsonUtils.readJsonObjectFromJsonObject(commandJson, getMessageType()); + assertNotNull(TestValues.NOT_NULL, body); - assertEquals(TestValues.MATCH, JsonUtils.readStringFromJsonObject(body, RPCMessage.KEY_FUNCTION_NAME), cmd.getFunctionName()); - assertEquals(TestValues.MATCH, JsonUtils.readIntegerFromJsonObject(body, RPCMessage.KEY_CORRELATION_ID), cmd.getCorrelationID()); - } catch (JSONException e) { - fail(TestValues.JSON_FAIL); - } - } + assertEquals(TestValues.MATCH, JsonUtils.readStringFromJsonObject(body, RPCMessage.KEY_FUNCTION_NAME), cmd.getFunctionName()); + assertEquals(TestValues.MATCH, JsonUtils.readIntegerFromJsonObject(body, RPCMessage.KEY_CORRELATION_ID), cmd.getCorrelationID()); + } catch (JSONException e) { + fail(TestValues.JSON_FAIL); + } + } } diff --git a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/ResetGlobalPropertiesResponseTest.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/ResetGlobalPropertiesResponseTest.java index 980d2d1ba..2c5c441e5 100644 --- a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/ResetGlobalPropertiesResponseTest.java +++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/ResetGlobalPropertiesResponseTest.java @@ -20,38 +20,38 @@ import static junit.framework.TestCase.assertEquals; import static junit.framework.TestCase.assertNotNull; /** - * This is a unit test class for the SmartDeviceLink library project class : + * This is a unit test class for the SmartDeviceLink library project class : * {@link com.smartdevicelink.proxy.rpc.ResetGlobalPropertiesResponse} */ public class ResetGlobalPropertiesResponseTest extends BaseRpcTests { - @Override - protected RPCMessage createMessage(){ + @Override + protected RPCMessage createMessage() { return new ResetGlobalPropertiesResponse(); } @Override - protected String getMessageType(){ + protected String getMessageType() { return RPCMessage.KEY_RESPONSE; } @Override - protected String getCommandType(){ + protected String getCommandType() { return FunctionID.RESET_GLOBAL_PROPERTIES.toString(); } @Override - protected JSONObject getExpectedParameters(int sdlVersion){ + protected JSONObject getExpectedParameters(int sdlVersion) { return new JSONObject(); } /** - * Tests the expected values of the RPC message. - */ + * Tests the expected values of the RPC message. + */ @Test - public void testRpcValues () { - // Invalid/Null Tests - ResetGlobalPropertiesResponse msg = new ResetGlobalPropertiesResponse(); + public void testRpcValues() { + // Invalid/Null Tests + ResetGlobalPropertiesResponse msg = new ResetGlobalPropertiesResponse(); assertNotNull(TestValues.NULL, msg); testNullBase(msg); } @@ -60,23 +60,23 @@ public class ResetGlobalPropertiesResponseTest extends BaseRpcTests { * Tests a valid JSON construction of this RPC message. */ @Test - public void testJsonConstructor () { - JSONObject commandJson = JsonFileReader.readId(getInstrumentation().getTargetContext(), getCommandType(), getMessageType()); - assertNotNull(TestValues.NOT_NULL, commandJson); - - try { - Hashtable<String, Object> hash = JsonRPCMarshaller.deserializeJSONObject(commandJson); - ResetGlobalPropertiesResponse cmd = new ResetGlobalPropertiesResponse(hash); - - JSONObject body = JsonUtils.readJsonObjectFromJsonObject(commandJson, getMessageType()); - assertNotNull(TestValues.NOT_NULL, body); - - // Test everything in the json body. - assertEquals(TestValues.MATCH, JsonUtils.readStringFromJsonObject(body, RPCMessage.KEY_FUNCTION_NAME), cmd.getFunctionName()); - assertEquals(TestValues.MATCH, JsonUtils.readIntegerFromJsonObject(body, RPCMessage.KEY_CORRELATION_ID), cmd.getCorrelationID()); - - } catch (JSONException e) { - e.printStackTrace(); - } - } + public void testJsonConstructor() { + JSONObject commandJson = JsonFileReader.readId(getInstrumentation().getTargetContext(), getCommandType(), getMessageType()); + assertNotNull(TestValues.NOT_NULL, commandJson); + + try { + Hashtable<String, Object> hash = JsonRPCMarshaller.deserializeJSONObject(commandJson); + ResetGlobalPropertiesResponse cmd = new ResetGlobalPropertiesResponse(hash); + + JSONObject body = JsonUtils.readJsonObjectFromJsonObject(commandJson, getMessageType()); + assertNotNull(TestValues.NOT_NULL, body); + + // Test everything in the json body. + assertEquals(TestValues.MATCH, JsonUtils.readStringFromJsonObject(body, RPCMessage.KEY_FUNCTION_NAME), cmd.getFunctionName()); + assertEquals(TestValues.MATCH, JsonUtils.readIntegerFromJsonObject(body, RPCMessage.KEY_CORRELATION_ID), cmd.getCorrelationID()); + + } catch (JSONException e) { + e.printStackTrace(); + } + } }
\ No newline at end of file diff --git a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/ScrollableMessageResponseTest.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/ScrollableMessageResponseTest.java index 6ee9b0779..6e2129083 100644 --- a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/ScrollableMessageResponseTest.java +++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/ScrollableMessageResponseTest.java @@ -20,38 +20,38 @@ import static junit.framework.TestCase.assertEquals; import static junit.framework.TestCase.assertNotNull; /** - * This is a unit test class for the SmartDeviceLink library project class : + * This is a unit test class for the SmartDeviceLink library project class : * {@link com.smartdevicelink.proxy.rpc.ScrollableMessageResponse} */ public class ScrollableMessageResponseTest extends BaseRpcTests { - @Override - protected RPCMessage createMessage(){ + @Override + protected RPCMessage createMessage() { return new ScrollableMessageResponse(); } @Override - protected String getMessageType(){ + protected String getMessageType() { return RPCMessage.KEY_RESPONSE; } @Override - protected String getCommandType(){ + protected String getCommandType() { return FunctionID.SCROLLABLE_MESSAGE.toString(); } @Override - protected JSONObject getExpectedParameters(int sdlVersion){ + protected JSONObject getExpectedParameters(int sdlVersion) { return new JSONObject(); } /** - * Tests the expected values of the RPC message. - */ + * Tests the expected values of the RPC message. + */ @Test - public void testRpcValues () { - // Invalid/Null Tests - ScrollableMessageResponse msg = new ScrollableMessageResponse(); + public void testRpcValues() { + // Invalid/Null Tests + ScrollableMessageResponse msg = new ScrollableMessageResponse(); assertNotNull(TestValues.NOT_NULL, msg); testNullBase(msg); } @@ -60,22 +60,22 @@ public class ScrollableMessageResponseTest extends BaseRpcTests { * Tests a valid JSON construction of this RPC message. */ @Test - public void testJsonConstructor () { - JSONObject commandJson = JsonFileReader.readId(getInstrumentation().getContext(), getCommandType(), getMessageType()); - assertNotNull(TestValues.NOT_NULL, commandJson); - - try { - Hashtable<String, Object> hash = JsonRPCMarshaller.deserializeJSONObject(commandJson); - ScrollableMessageResponse cmd = new ScrollableMessageResponse(hash); - - JSONObject body = JsonUtils.readJsonObjectFromJsonObject(commandJson, getMessageType()); - assertNotNull(TestValues.NOT_NULL, body); - - // Test everything in the json body. - assertEquals(TestValues.MATCH, JsonUtils.readStringFromJsonObject(body, RPCMessage.KEY_FUNCTION_NAME), cmd.getFunctionName()); - assertEquals(TestValues.MATCH, JsonUtils.readIntegerFromJsonObject(body, RPCMessage.KEY_CORRELATION_ID), cmd.getCorrelationID()); - } catch (JSONException e) { - e.printStackTrace(); - } + public void testJsonConstructor() { + JSONObject commandJson = JsonFileReader.readId(getInstrumentation().getContext(), getCommandType(), getMessageType()); + assertNotNull(TestValues.NOT_NULL, commandJson); + + try { + Hashtable<String, Object> hash = JsonRPCMarshaller.deserializeJSONObject(commandJson); + ScrollableMessageResponse cmd = new ScrollableMessageResponse(hash); + + JSONObject body = JsonUtils.readJsonObjectFromJsonObject(commandJson, getMessageType()); + assertNotNull(TestValues.NOT_NULL, body); + + // Test everything in the json body. + assertEquals(TestValues.MATCH, JsonUtils.readStringFromJsonObject(body, RPCMessage.KEY_FUNCTION_NAME), cmd.getFunctionName()); + assertEquals(TestValues.MATCH, JsonUtils.readIntegerFromJsonObject(body, RPCMessage.KEY_CORRELATION_ID), cmd.getCorrelationID()); + } catch (JSONException e) { + e.printStackTrace(); + } } }
\ No newline at end of file diff --git a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/SendLocationResponseTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/SendLocationResponseTests.java index 0ba8ea411..a51fd9309 100644 --- a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/SendLocationResponseTests.java +++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/SendLocationResponseTests.java @@ -20,62 +20,62 @@ import static junit.framework.TestCase.assertEquals; import static junit.framework.TestCase.assertNotNull; /** - * This is a unit test class for the SmartDeviceLink library project class : + * This is a unit test class for the SmartDeviceLink library project class : * {@link com.smartdevicelink.proxy.rpc.SendLocationResponse} */ public class SendLocationResponseTests extends BaseRpcTests { - @Override - protected RPCMessage createMessage() { - SendLocationResponse msg = new SendLocationResponse(); - return msg; - } + @Override + protected RPCMessage createMessage() { + SendLocationResponse msg = new SendLocationResponse(); + return msg; + } + + @Override + protected String getMessageType() { + return RPCMessage.KEY_RESPONSE; + } - @Override - protected String getMessageType() { - return RPCMessage.KEY_RESPONSE; - } + @Override + protected String getCommandType() { + return FunctionID.SEND_LOCATION.toString(); + } - @Override - protected String getCommandType() { - return FunctionID.SEND_LOCATION.toString(); - } + @Override + protected JSONObject getExpectedParameters(int sdlVersion) { + return new JSONObject(); + } - @Override - protected JSONObject getExpectedParameters(int sdlVersion) { - return new JSONObject(); - } - - /** - * Tests the expected values of the RPC message. - */ - @Test - public void testRpcValues () { - // Invalid/Null Tests + /** + * Tests the expected values of the RPC message. + */ + @Test + public void testRpcValues() { + // Invalid/Null Tests SendLocationResponse msg = new SendLocationResponse(); assertNotNull(TestValues.NOT_NULL, msg); testNullBase(msg); - } + } /** * Tests a valid JSON construction of this RPC message. */ @Test - public void testJsonConstructor () { - JSONObject commandJson = JsonFileReader.readId(getInstrumentation().getTargetContext(), getCommandType(), getMessageType()); - assertNotNull(TestValues.NOT_NULL, commandJson); - - try { - Hashtable<String, Object> hash = JsonRPCMarshaller.deserializeJSONObject(commandJson); - SendLocationResponse cmd = new SendLocationResponse(hash); - JSONObject body = JsonUtils.readJsonObjectFromJsonObject(commandJson, getMessageType()); - assertNotNull(TestValues.NOT_NULL, body); - - // Test everything in the json body. - assertEquals(TestValues.MATCH, JsonUtils.readStringFromJsonObject(body, RPCMessage.KEY_FUNCTION_NAME), cmd.getFunctionName()); - assertEquals(TestValues.MATCH, JsonUtils.readIntegerFromJsonObject(body, RPCMessage.KEY_CORRELATION_ID), cmd.getCorrelationID()); - } catch (JSONException e) { - e.printStackTrace(); - } + public void testJsonConstructor() { + JSONObject commandJson = JsonFileReader.readId(getInstrumentation().getTargetContext(), getCommandType(), getMessageType()); + assertNotNull(TestValues.NOT_NULL, commandJson); + + try { + Hashtable<String, Object> hash = JsonRPCMarshaller.deserializeJSONObject(commandJson); + SendLocationResponse cmd = new SendLocationResponse(hash); + JSONObject body = JsonUtils.readJsonObjectFromJsonObject(commandJson, getMessageType()); + assertNotNull(TestValues.NOT_NULL, body); + + // Test everything in the json body. + assertEquals(TestValues.MATCH, JsonUtils.readStringFromJsonObject(body, RPCMessage.KEY_FUNCTION_NAME), cmd.getFunctionName()); + assertEquals(TestValues.MATCH, JsonUtils.readIntegerFromJsonObject(body, RPCMessage.KEY_CORRELATION_ID), cmd.getCorrelationID()); + } catch (JSONException e) { + e.printStackTrace(); + } } }
\ No newline at end of file diff --git a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/SetAppIconResponseTest.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/SetAppIconResponseTest.java index b3a174c02..dc4255259 100644 --- a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/SetAppIconResponseTest.java +++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/SetAppIconResponseTest.java @@ -20,62 +20,62 @@ import static junit.framework.TestCase.assertEquals; import static junit.framework.TestCase.assertNotNull; /** - * This is a unit test class for the SmartDeviceLink library project class : + * This is a unit test class for the SmartDeviceLink library project class : * {@link com.smartdevicelink.proxy.rpc.SetAppIconResponse} */ public class SetAppIconResponseTest extends BaseRpcTests { - @Override - protected RPCMessage createMessage(){ + @Override + protected RPCMessage createMessage() { return new SetAppIconResponse(); } @Override - protected String getMessageType(){ + protected String getMessageType() { return RPCMessage.KEY_RESPONSE; } @Override - protected String getCommandType(){ + protected String getCommandType() { return FunctionID.SET_APP_ICON.toString(); } @Override - protected JSONObject getExpectedParameters(int sdlVersion){ + protected JSONObject getExpectedParameters(int sdlVersion) { return new JSONObject(); } /** - * Tests the expected values of the RPC message. - */ + * Tests the expected values of the RPC message. + */ @Test - public void testRpcValues () { - // Invalid/Null Tests - SetAppIconResponse msg = new SetAppIconResponse(); + public void testRpcValues() { + // Invalid/Null Tests + SetAppIconResponse msg = new SetAppIconResponse(); assertNotNull(TestValues.NOT_NULL, msg); testNullBase(msg); } - + /** * Tests a valid JSON construction of this RPC message. */ @Test - public void testJsonConstructor () { - JSONObject commandJson = JsonFileReader.readId(getInstrumentation().getContext(), getCommandType(), getMessageType()); - assertNotNull(TestValues.NOT_NULL, commandJson); - - try { - Hashtable<String, Object> hash = JsonRPCMarshaller.deserializeJSONObject(commandJson); - SetAppIconResponse cmd = new SetAppIconResponse(hash); - - JSONObject body = JsonUtils.readJsonObjectFromJsonObject(commandJson, getMessageType()); - assertNotNull(TestValues.NOT_NULL, body); - - // Test everything in the json body. - assertEquals(TestValues.MATCH, JsonUtils.readStringFromJsonObject(body, RPCMessage.KEY_FUNCTION_NAME), cmd.getFunctionName()); - assertEquals(TestValues.MATCH, JsonUtils.readIntegerFromJsonObject(body, RPCMessage.KEY_CORRELATION_ID), cmd.getCorrelationID()); - } catch (JSONException e) { - e.printStackTrace(); - } + public void testJsonConstructor() { + JSONObject commandJson = JsonFileReader.readId(getInstrumentation().getContext(), getCommandType(), getMessageType()); + assertNotNull(TestValues.NOT_NULL, commandJson); + + try { + Hashtable<String, Object> hash = JsonRPCMarshaller.deserializeJSONObject(commandJson); + SetAppIconResponse cmd = new SetAppIconResponse(hash); + + JSONObject body = JsonUtils.readJsonObjectFromJsonObject(commandJson, getMessageType()); + assertNotNull(TestValues.NOT_NULL, body); + + // Test everything in the json body. + assertEquals(TestValues.MATCH, JsonUtils.readStringFromJsonObject(body, RPCMessage.KEY_FUNCTION_NAME), cmd.getFunctionName()); + assertEquals(TestValues.MATCH, JsonUtils.readIntegerFromJsonObject(body, RPCMessage.KEY_CORRELATION_ID), cmd.getCorrelationID()); + } catch (JSONException e) { + e.printStackTrace(); + } } }
\ No newline at end of file diff --git a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/SetCloudAppPropertiesResponseTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/SetCloudAppPropertiesResponseTests.java index f6558ab5a..2dea383ff 100644 --- a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/SetCloudAppPropertiesResponseTests.java +++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/SetCloudAppPropertiesResponseTests.java @@ -13,22 +13,22 @@ import static junit.framework.TestCase.assertNotNull; public class SetCloudAppPropertiesResponseTests extends BaseRpcTests { @Override - protected RPCMessage createMessage(){ + protected RPCMessage createMessage() { return new SetCloudAppPropertiesResponse(); } @Override - protected String getMessageType(){ + protected String getMessageType() { return RPCMessage.KEY_RESPONSE; } @Override - protected String getCommandType(){ + protected String getCommandType() { return FunctionID.SET_CLOUD_APP_PROPERTIES.toString(); } @Override - protected JSONObject getExpectedParameters(int sdlVersion){ + protected JSONObject getExpectedParameters(int sdlVersion) { return new JSONObject(); } @@ -36,7 +36,7 @@ public class SetCloudAppPropertiesResponseTests extends BaseRpcTests { * Tests the expected values of the RPC message. */ @Test - public void testRpcValues () { + public void testRpcValues() { // Invalid/Null Tests SetCloudAppPropertiesResponse msg = new SetCloudAppPropertiesResponse(); assertNotNull(TestValues.NOT_NULL, msg); diff --git a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/SetDisplayLayoutResponseTest.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/SetDisplayLayoutResponseTest.java index 6985ad238..f7c08cd90 100644 --- a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/SetDisplayLayoutResponseTest.java +++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/SetDisplayLayoutResponseTest.java @@ -31,130 +31,130 @@ import static junit.framework.TestCase.assertTrue; import static junit.framework.TestCase.fail; /** - * This is a unit test class for the SmartDeviceLink library project class : + * This is a unit test class for the SmartDeviceLink library project class : * {@link com.smartdevicelink.proxy.rpc.SetDisplayLayoutResponse} */ public class SetDisplayLayoutResponseTest extends BaseRpcTests { - @Override - protected RPCMessage createMessage() { - SetDisplayLayoutResponse msg = new SetDisplayLayoutResponse(); - - msg.setDisplayCapabilities(TestValues.GENERAL_DISPLAYCAPABILITIES); - msg.setPresetBankCapabilities(TestValues.GENERAL_PRESETBANKCAPABILITIES); - msg.setButtonCapabilities(TestValues.GENERAL_BUTTONCAPABILITIES_LIST); - msg.setSoftButtonCapabilities(TestValues.GENERAL_SOFTBUTTONCAPABILITIES_LIST); - - return msg; - } - - @Override - protected String getMessageType() { - return RPCMessage.KEY_RESPONSE; - } - - @Override - protected String getCommandType() { - return FunctionID.SET_DISPLAY_LAYOUT.toString(); - } - - @Override - protected JSONObject getExpectedParameters(int sdlVersion) { - JSONObject result = new JSONObject(); - - try { - result.put(SetDisplayLayoutResponse.KEY_DISPLAY_CAPABILITIES, TestValues.GENERAL_DISPLAYCAPABILITIES.serializeJSON()); - result.put(SetDisplayLayoutResponse.KEY_PRESET_BANK_CAPABILITIES, TestValues.JSON_PRESETBANKCAPABILITIES); - result.put(SetDisplayLayoutResponse.KEY_BUTTON_CAPABILITIES, TestValues.JSON_BUTTONCAPABILITIES); + @Override + protected RPCMessage createMessage() { + SetDisplayLayoutResponse msg = new SetDisplayLayoutResponse(); + + msg.setDisplayCapabilities(TestValues.GENERAL_DISPLAYCAPABILITIES); + msg.setPresetBankCapabilities(TestValues.GENERAL_PRESETBANKCAPABILITIES); + msg.setButtonCapabilities(TestValues.GENERAL_BUTTONCAPABILITIES_LIST); + msg.setSoftButtonCapabilities(TestValues.GENERAL_SOFTBUTTONCAPABILITIES_LIST); + + return msg; + } + + @Override + protected String getMessageType() { + return RPCMessage.KEY_RESPONSE; + } + + @Override + protected String getCommandType() { + return FunctionID.SET_DISPLAY_LAYOUT.toString(); + } + + @Override + protected JSONObject getExpectedParameters(int sdlVersion) { + JSONObject result = new JSONObject(); + + try { + result.put(SetDisplayLayoutResponse.KEY_DISPLAY_CAPABILITIES, TestValues.GENERAL_DISPLAYCAPABILITIES.serializeJSON()); + result.put(SetDisplayLayoutResponse.KEY_PRESET_BANK_CAPABILITIES, TestValues.JSON_PRESETBANKCAPABILITIES); + result.put(SetDisplayLayoutResponse.KEY_BUTTON_CAPABILITIES, TestValues.JSON_BUTTONCAPABILITIES); result.put(SetDisplayLayoutResponse.KEY_SOFT_BUTTON_CAPABILITIES, TestValues.JSON_SOFTBUTTONCAPABILITIES); - } catch (JSONException e) { - fail(TestValues.JSON_FAIL); - } - - return result; - } - - /** - * Tests the expected values of the RPC message. - */ - @Test - public void testRpcValues () { - // Test Values - DisplayCapabilities testDisplay = ( (SetDisplayLayoutResponse) msg ).getDisplayCapabilities(); - PresetBankCapabilities testPbc = ( (SetDisplayLayoutResponse) msg ).getPresetBankCapabilities(); - List<ButtonCapabilities> testBc = ( (SetDisplayLayoutResponse) msg ).getButtonCapabilities(); - List<SoftButtonCapabilities> testSbc = ( (SetDisplayLayoutResponse) msg ).getSoftButtonCapabilities(); - - // Valid Tests - assertTrue(TestValues.TRUE, Validator.validateDisplayCapabilities(TestValues.GENERAL_DISPLAYCAPABILITIES, testDisplay)); - assertTrue(TestValues.TRUE, Validator.validatePresetBankCapabilities(TestValues.GENERAL_PRESETBANKCAPABILITIES, testPbc)); - assertEquals(TestValues.MATCH, TestValues.GENERAL_BUTTONCAPABILITIES_LIST.size(), testBc.size()); - assertEquals(TestValues.MATCH, TestValues.GENERAL_SOFTBUTTONCAPABILITIES_LIST.size(), testSbc.size()); - for (int i = 0; i < TestValues.GENERAL_BUTTONCAPABILITIES_LIST.size(); i++) { - assertEquals(TestValues.MATCH, TestValues.GENERAL_BUTTONCAPABILITIES_LIST.get(i), testBc.get(i)); - } - for (int i = 0; i < TestValues.GENERAL_SOFTBUTTONCAPABILITIES_LIST.size(); i++) { - assertEquals(TestValues.MATCH, TestValues.GENERAL_SOFTBUTTONCAPABILITIES_LIST.get(i), testSbc.get(i)); - } - - // Invalid/Null Tests - SetDisplayLayoutResponse msg = new SetDisplayLayoutResponse(); - assertNotNull(TestValues.NOT_NULL, msg); - testNullBase(msg); - - assertNull(TestValues.NULL, msg.getDisplayCapabilities()); - assertNull(TestValues.NULL, msg.getPresetBankCapabilities()); - assertNull(TestValues.NULL, msg.getButtonCapabilities()); - assertNull(TestValues.NULL, msg.getSoftButtonCapabilities()); - } - + } catch (JSONException e) { + fail(TestValues.JSON_FAIL); + } + + return result; + } + + /** + * Tests the expected values of the RPC message. + */ + @Test + public void testRpcValues() { + // Test Values + DisplayCapabilities testDisplay = ((SetDisplayLayoutResponse) msg).getDisplayCapabilities(); + PresetBankCapabilities testPbc = ((SetDisplayLayoutResponse) msg).getPresetBankCapabilities(); + List<ButtonCapabilities> testBc = ((SetDisplayLayoutResponse) msg).getButtonCapabilities(); + List<SoftButtonCapabilities> testSbc = ((SetDisplayLayoutResponse) msg).getSoftButtonCapabilities(); + + // Valid Tests + assertTrue(TestValues.TRUE, Validator.validateDisplayCapabilities(TestValues.GENERAL_DISPLAYCAPABILITIES, testDisplay)); + assertTrue(TestValues.TRUE, Validator.validatePresetBankCapabilities(TestValues.GENERAL_PRESETBANKCAPABILITIES, testPbc)); + assertEquals(TestValues.MATCH, TestValues.GENERAL_BUTTONCAPABILITIES_LIST.size(), testBc.size()); + assertEquals(TestValues.MATCH, TestValues.GENERAL_SOFTBUTTONCAPABILITIES_LIST.size(), testSbc.size()); + for (int i = 0; i < TestValues.GENERAL_BUTTONCAPABILITIES_LIST.size(); i++) { + assertEquals(TestValues.MATCH, TestValues.GENERAL_BUTTONCAPABILITIES_LIST.get(i), testBc.get(i)); + } + for (int i = 0; i < TestValues.GENERAL_SOFTBUTTONCAPABILITIES_LIST.size(); i++) { + assertEquals(TestValues.MATCH, TestValues.GENERAL_SOFTBUTTONCAPABILITIES_LIST.get(i), testSbc.get(i)); + } + + // Invalid/Null Tests + SetDisplayLayoutResponse msg = new SetDisplayLayoutResponse(); + assertNotNull(TestValues.NOT_NULL, msg); + testNullBase(msg); + + assertNull(TestValues.NULL, msg.getDisplayCapabilities()); + assertNull(TestValues.NULL, msg.getPresetBankCapabilities()); + assertNull(TestValues.NULL, msg.getButtonCapabilities()); + assertNull(TestValues.NULL, msg.getSoftButtonCapabilities()); + } + /** * Tests a valid JSON construction of this RPC message. */ @Test - public void testJsonConstructor () { - JSONObject commandJson = JsonFileReader.readId(getInstrumentation().getContext(), getCommandType(), getMessageType()); - assertNotNull(TestValues.NOT_NULL, commandJson); - - try { - Hashtable<String, Object> hash = JsonRPCMarshaller.deserializeJSONObject(commandJson); - SetDisplayLayoutResponse cmd = new SetDisplayLayoutResponse(hash); - - JSONObject body = JsonUtils.readJsonObjectFromJsonObject(commandJson, getMessageType()); - assertNotNull(TestValues.NOT_NULL, body); - - // Test everything in the json body. - assertEquals(TestValues.MATCH, JsonUtils.readStringFromJsonObject(body, RPCMessage.KEY_FUNCTION_NAME), cmd.getFunctionName()); - assertEquals(TestValues.MATCH, JsonUtils.readIntegerFromJsonObject(body, RPCMessage.KEY_CORRELATION_ID), cmd.getCorrelationID()); - - JSONObject parameters = JsonUtils.readJsonObjectFromJsonObject(body, RPCMessage.KEY_PARAMETERS); - - JSONArray buttonCapabilitiesArray = JsonUtils.readJsonArrayFromJsonObject(parameters, SetDisplayLayoutResponse.KEY_BUTTON_CAPABILITIES); - List<ButtonCapabilities> buttonCapabilitiesList = new ArrayList<ButtonCapabilities>(); - for (int index = 0; index < buttonCapabilitiesArray.length(); index++) { - ButtonCapabilities buttonCapability = new ButtonCapabilities(JsonRPCMarshaller.deserializeJSONObject( (JSONObject)buttonCapabilitiesArray.get(index) )); - buttonCapabilitiesList.add(buttonCapability); - } - assertTrue(TestValues.TRUE, Validator.validateButtonCapabilities(buttonCapabilitiesList, cmd.getButtonCapabilities() )); - - JSONObject displayCapabilitiesObj = JsonUtils.readJsonObjectFromJsonObject(parameters, SetDisplayLayoutResponse.KEY_DISPLAY_CAPABILITIES); - DisplayCapabilities displayCapabilities = new DisplayCapabilities(JsonRPCMarshaller.deserializeJSONObject(displayCapabilitiesObj)); - assertTrue(TestValues.TRUE, Validator.validateDisplayCapabilities(displayCapabilities, cmd.getDisplayCapabilities()) ); - - JSONArray softButtonCapabilitiesArray = JsonUtils.readJsonArrayFromJsonObject(parameters, SetDisplayLayoutResponse.KEY_SOFT_BUTTON_CAPABILITIES); - List<SoftButtonCapabilities> softButtonCapabilitiesList = new ArrayList<SoftButtonCapabilities>(); - for (int index = 0; index < softButtonCapabilitiesArray.length(); index++) { - SoftButtonCapabilities softButtonCapability = - new SoftButtonCapabilities(JsonRPCMarshaller.deserializeJSONObject( (JSONObject)softButtonCapabilitiesArray.get(index) )); - softButtonCapabilitiesList.add(softButtonCapability); - } - assertTrue(TestValues.TRUE, Validator.validateSoftButtonCapabilities(softButtonCapabilitiesList, cmd.getSoftButtonCapabilities() )); - - JSONObject presetBankCapabilitiesObj = JsonUtils.readJsonObjectFromJsonObject(parameters, SetDisplayLayoutResponse.KEY_PRESET_BANK_CAPABILITIES); - PresetBankCapabilities presetBankCapabilities = new PresetBankCapabilities(JsonRPCMarshaller.deserializeJSONObject(presetBankCapabilitiesObj)); - assertTrue(TestValues.TRUE, Validator.validatePresetBankCapabilities(presetBankCapabilities, cmd.getPresetBankCapabilities()) ); - } catch (JSONException e) { - e.printStackTrace(); - } - } + public void testJsonConstructor() { + JSONObject commandJson = JsonFileReader.readId(getInstrumentation().getContext(), getCommandType(), getMessageType()); + assertNotNull(TestValues.NOT_NULL, commandJson); + + try { + Hashtable<String, Object> hash = JsonRPCMarshaller.deserializeJSONObject(commandJson); + SetDisplayLayoutResponse cmd = new SetDisplayLayoutResponse(hash); + + JSONObject body = JsonUtils.readJsonObjectFromJsonObject(commandJson, getMessageType()); + assertNotNull(TestValues.NOT_NULL, body); + + // Test everything in the json body. + assertEquals(TestValues.MATCH, JsonUtils.readStringFromJsonObject(body, RPCMessage.KEY_FUNCTION_NAME), cmd.getFunctionName()); + assertEquals(TestValues.MATCH, JsonUtils.readIntegerFromJsonObject(body, RPCMessage.KEY_CORRELATION_ID), cmd.getCorrelationID()); + + JSONObject parameters = JsonUtils.readJsonObjectFromJsonObject(body, RPCMessage.KEY_PARAMETERS); + + JSONArray buttonCapabilitiesArray = JsonUtils.readJsonArrayFromJsonObject(parameters, SetDisplayLayoutResponse.KEY_BUTTON_CAPABILITIES); + List<ButtonCapabilities> buttonCapabilitiesList = new ArrayList<ButtonCapabilities>(); + for (int index = 0; index < buttonCapabilitiesArray.length(); index++) { + ButtonCapabilities buttonCapability = new ButtonCapabilities(JsonRPCMarshaller.deserializeJSONObject((JSONObject) buttonCapabilitiesArray.get(index))); + buttonCapabilitiesList.add(buttonCapability); + } + assertTrue(TestValues.TRUE, Validator.validateButtonCapabilities(buttonCapabilitiesList, cmd.getButtonCapabilities())); + + JSONObject displayCapabilitiesObj = JsonUtils.readJsonObjectFromJsonObject(parameters, SetDisplayLayoutResponse.KEY_DISPLAY_CAPABILITIES); + DisplayCapabilities displayCapabilities = new DisplayCapabilities(JsonRPCMarshaller.deserializeJSONObject(displayCapabilitiesObj)); + assertTrue(TestValues.TRUE, Validator.validateDisplayCapabilities(displayCapabilities, cmd.getDisplayCapabilities())); + + JSONArray softButtonCapabilitiesArray = JsonUtils.readJsonArrayFromJsonObject(parameters, SetDisplayLayoutResponse.KEY_SOFT_BUTTON_CAPABILITIES); + List<SoftButtonCapabilities> softButtonCapabilitiesList = new ArrayList<SoftButtonCapabilities>(); + for (int index = 0; index < softButtonCapabilitiesArray.length(); index++) { + SoftButtonCapabilities softButtonCapability = + new SoftButtonCapabilities(JsonRPCMarshaller.deserializeJSONObject((JSONObject) softButtonCapabilitiesArray.get(index))); + softButtonCapabilitiesList.add(softButtonCapability); + } + assertTrue(TestValues.TRUE, Validator.validateSoftButtonCapabilities(softButtonCapabilitiesList, cmd.getSoftButtonCapabilities())); + + JSONObject presetBankCapabilitiesObj = JsonUtils.readJsonObjectFromJsonObject(parameters, SetDisplayLayoutResponse.KEY_PRESET_BANK_CAPABILITIES); + PresetBankCapabilities presetBankCapabilities = new PresetBankCapabilities(JsonRPCMarshaller.deserializeJSONObject(presetBankCapabilitiesObj)); + assertTrue(TestValues.TRUE, Validator.validatePresetBankCapabilities(presetBankCapabilities, cmd.getPresetBankCapabilities())); + } catch (JSONException e) { + e.printStackTrace(); + } + } }
\ No newline at end of file diff --git a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/SetGlobalPropertiesResponseTest.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/SetGlobalPropertiesResponseTest.java index 04445f520..f4f336381 100644 --- a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/SetGlobalPropertiesResponseTest.java +++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/SetGlobalPropertiesResponseTest.java @@ -21,38 +21,38 @@ import static junit.framework.TestCase.assertNotNull; /** - * This is a unit test class for the SmartDeviceLink library project class : + * This is a unit test class for the SmartDeviceLink library project class : * {@link com.smartdevicelink.proxy.rpc.SetGlobalPropertiesResponse} */ public class SetGlobalPropertiesResponseTest extends BaseRpcTests { - @Override - protected RPCMessage createMessage(){ + @Override + protected RPCMessage createMessage() { return new SetGlobalPropertiesResponse(); } @Override - protected String getMessageType(){ + protected String getMessageType() { return RPCMessage.KEY_RESPONSE; } @Override - protected String getCommandType(){ + protected String getCommandType() { return FunctionID.SET_GLOBAL_PROPERTIES.toString(); } @Override - protected JSONObject getExpectedParameters(int sdlVersion){ + protected JSONObject getExpectedParameters(int sdlVersion) { return new JSONObject(); } /** - * Tests the expected values of the RPC message. - */ + * Tests the expected values of the RPC message. + */ @Test - public void testRpcValues () { - // Invalid/Null Tests - SetGlobalPropertiesResponse msg = new SetGlobalPropertiesResponse(); + public void testRpcValues() { + // Invalid/Null Tests + SetGlobalPropertiesResponse msg = new SetGlobalPropertiesResponse(); assertNotNull(TestValues.NOT_NULL, msg); testNullBase(msg); } @@ -61,22 +61,22 @@ public class SetGlobalPropertiesResponseTest extends BaseRpcTests { * Tests a valid JSON construction of this RPC message. */ @Test - public void testJsonConstructor () { - JSONObject commandJson = JsonFileReader.readId(getInstrumentation().getContext(), getCommandType(), getMessageType()); - assertNotNull(TestValues.NOT_NULL, commandJson); - - try { - Hashtable<String, Object> hash = JsonRPCMarshaller.deserializeJSONObject(commandJson); - SetGlobalPropertiesResponse cmd = new SetGlobalPropertiesResponse(hash); - - JSONObject body = JsonUtils.readJsonObjectFromJsonObject(commandJson, getMessageType()); - assertNotNull(TestValues.NOT_NULL, body); - - // Test everything in the json body. - assertEquals(TestValues.MATCH, JsonUtils.readStringFromJsonObject(body, RPCMessage.KEY_FUNCTION_NAME), cmd.getFunctionName()); - assertEquals(TestValues.MATCH, JsonUtils.readIntegerFromJsonObject(body, RPCMessage.KEY_CORRELATION_ID), cmd.getCorrelationID()); - } catch (JSONException e) { - e.printStackTrace(); - } - } + public void testJsonConstructor() { + JSONObject commandJson = JsonFileReader.readId(getInstrumentation().getContext(), getCommandType(), getMessageType()); + assertNotNull(TestValues.NOT_NULL, commandJson); + + try { + Hashtable<String, Object> hash = JsonRPCMarshaller.deserializeJSONObject(commandJson); + SetGlobalPropertiesResponse cmd = new SetGlobalPropertiesResponse(hash); + + JSONObject body = JsonUtils.readJsonObjectFromJsonObject(commandJson, getMessageType()); + assertNotNull(TestValues.NOT_NULL, body); + + // Test everything in the json body. + assertEquals(TestValues.MATCH, JsonUtils.readStringFromJsonObject(body, RPCMessage.KEY_FUNCTION_NAME), cmd.getFunctionName()); + assertEquals(TestValues.MATCH, JsonUtils.readIntegerFromJsonObject(body, RPCMessage.KEY_CORRELATION_ID), cmd.getCorrelationID()); + } catch (JSONException e) { + e.printStackTrace(); + } + } }
\ No newline at end of file diff --git a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/SetInteriorVehicleDataResponseTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/SetInteriorVehicleDataResponseTests.java index 17187b64b..d191ea4d7 100644 --- a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/SetInteriorVehicleDataResponseTests.java +++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/SetInteriorVehicleDataResponseTests.java @@ -31,7 +31,7 @@ import static junit.framework.TestCase.fail; public class SetInteriorVehicleDataResponseTests extends BaseRpcTests { @Override - protected RPCMessage createMessage(){ + protected RPCMessage createMessage() { SetInteriorVehicleDataResponse msg = new SetInteriorVehicleDataResponse(); @@ -41,22 +41,22 @@ public class SetInteriorVehicleDataResponseTests extends BaseRpcTests { } @Override - protected String getMessageType(){ + protected String getMessageType() { return RPCMessage.KEY_RESPONSE; } @Override - protected String getCommandType(){ + protected String getCommandType() { return FunctionID.SET_INTERIOR_VEHICLE_DATA.toString(); } @Override - protected JSONObject getExpectedParameters(int sdlVersion){ + protected JSONObject getExpectedParameters(int sdlVersion) { JSONObject result = new JSONObject(); - try{ + try { result.put(SetInteriorVehicleDataResponse.KEY_MODULE_DATA, JsonRPCMarshaller.serializeHashtable(TestValues.GENERAL_MODULEDATA.getStore())); - }catch(JSONException e){ + } catch (JSONException e) { fail(TestValues.JSON_FAIL); } @@ -67,9 +67,9 @@ public class SetInteriorVehicleDataResponseTests extends BaseRpcTests { * Tests the expected values of the RPC message. */ @Test - public void testRpcValues () { + public void testRpcValues() { // Test Values - ModuleData testModuleData = ( (SetInteriorVehicleDataResponse) msg ).getModuleData(); + ModuleData testModuleData = ((SetInteriorVehicleDataResponse) msg).getModuleData(); // Valid Tests assertTrue(TestValues.TRUE, Validator.validateModuleData(TestValues.GENERAL_MODULEDATA, testModuleData)); @@ -86,13 +86,13 @@ public class SetInteriorVehicleDataResponseTests extends BaseRpcTests { * Tests a valid JSON construction of this RPC message. */ @Test - public void testJsonConstructor () { + public void testJsonConstructor() { JSONObject commandJson = JsonFileReader.readId(getInstrumentation().getTargetContext(), getCommandType(), getMessageType()); assertNotNull(TestValues.NOT_NULL, commandJson); try { Hashtable<String, Object> hash = JsonRPCMarshaller.deserializeJSONObject(commandJson); - SetInteriorVehicleDataResponse cmd = new SetInteriorVehicleDataResponse (hash); + SetInteriorVehicleDataResponse cmd = new SetInteriorVehicleDataResponse(hash); JSONObject body = JsonUtils.readJsonObjectFromJsonObject(commandJson, getMessageType()); assertNotNull(TestValues.NOT_NULL, body); @@ -106,7 +106,7 @@ public class SetInteriorVehicleDataResponseTests extends BaseRpcTests { ModuleData testModuleData = new ModuleData(JsonRPCMarshaller.deserializeJSONObject((JSONObject) JsonUtils.readObjectFromJsonObject(parameters, SetInteriorVehicleDataResponse.KEY_MODULE_DATA))); ModuleData cmdModuleData = cmd.getModuleData(); - assertTrue(TestValues.TRUE, Validator.validateModuleData(testModuleData, cmdModuleData) ); + assertTrue(TestValues.TRUE, Validator.validateModuleData(testModuleData, cmdModuleData)); } catch (JSONException e) { e.printStackTrace(); } diff --git a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/SetMediaClockTimerResponseTest.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/SetMediaClockTimerResponseTest.java index 4d0b7b081..cfe157579 100644 --- a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/SetMediaClockTimerResponseTest.java +++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/SetMediaClockTimerResponseTest.java @@ -20,38 +20,38 @@ import static junit.framework.TestCase.assertEquals; import static junit.framework.TestCase.assertNotNull; /** - * This is a unit test class for the SmartDeviceLink library project class : + * This is a unit test class for the SmartDeviceLink library project class : * {@link com.smartdevicelink.proxy.rpc.SetMediaClockTimerResponse} */ public class SetMediaClockTimerResponseTest extends BaseRpcTests { - @Override - protected RPCMessage createMessage(){ + @Override + protected RPCMessage createMessage() { return new SetMediaClockTimerResponse(); } @Override - protected String getMessageType(){ + protected String getMessageType() { return RPCMessage.KEY_RESPONSE; } @Override - protected String getCommandType(){ + protected String getCommandType() { return FunctionID.SET_MEDIA_CLOCK_TIMER.toString(); } @Override - protected JSONObject getExpectedParameters(int sdlVersion){ + protected JSONObject getExpectedParameters(int sdlVersion) { return new JSONObject(); } /** - * Tests the expected values of the RPC message. - */ + * Tests the expected values of the RPC message. + */ @Test - public void testRpcValues () { - // Invalid/Null Tests - SetMediaClockTimerResponse msg = new SetMediaClockTimerResponse(); + public void testRpcValues() { + // Invalid/Null Tests + SetMediaClockTimerResponse msg = new SetMediaClockTimerResponse(); assertNotNull(TestValues.NOT_NULL, msg); testNullBase(msg); } @@ -60,22 +60,22 @@ public class SetMediaClockTimerResponseTest extends BaseRpcTests { * Tests a valid JSON construction of this RPC message. */ @Test - public void testJsonConstructor () { - JSONObject commandJson = JsonFileReader.readId(getInstrumentation().getContext(), getCommandType(), getMessageType()); - assertNotNull(TestValues.NOT_NULL, commandJson); - - try { - Hashtable<String, Object> hash = JsonRPCMarshaller.deserializeJSONObject(commandJson); - SetMediaClockTimerResponse cmd = new SetMediaClockTimerResponse(hash); - - JSONObject body = JsonUtils.readJsonObjectFromJsonObject(commandJson, getMessageType()); - assertNotNull(TestValues.NOT_NULL, body); - - // Test everything in the json body. - assertEquals(TestValues.MATCH, JsonUtils.readStringFromJsonObject(body, RPCMessage.KEY_FUNCTION_NAME), cmd.getFunctionName()); - assertEquals(TestValues.MATCH, JsonUtils.readIntegerFromJsonObject(body, RPCMessage.KEY_CORRELATION_ID), cmd.getCorrelationID()); - } catch (JSONException e) { - e.printStackTrace(); - } - } + public void testJsonConstructor() { + JSONObject commandJson = JsonFileReader.readId(getInstrumentation().getContext(), getCommandType(), getMessageType()); + assertNotNull(TestValues.NOT_NULL, commandJson); + + try { + Hashtable<String, Object> hash = JsonRPCMarshaller.deserializeJSONObject(commandJson); + SetMediaClockTimerResponse cmd = new SetMediaClockTimerResponse(hash); + + JSONObject body = JsonUtils.readJsonObjectFromJsonObject(commandJson, getMessageType()); + assertNotNull(TestValues.NOT_NULL, body); + + // Test everything in the json body. + assertEquals(TestValues.MATCH, JsonUtils.readStringFromJsonObject(body, RPCMessage.KEY_FUNCTION_NAME), cmd.getFunctionName()); + assertEquals(TestValues.MATCH, JsonUtils.readIntegerFromJsonObject(body, RPCMessage.KEY_CORRELATION_ID), cmd.getCorrelationID()); + } catch (JSONException e) { + e.printStackTrace(); + } + } }
\ No newline at end of file diff --git a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/ShowAppMenuResponseTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/ShowAppMenuResponseTests.java index 28cf0b436..b0e19efe4 100644 --- a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/ShowAppMenuResponseTests.java +++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/ShowAppMenuResponseTests.java @@ -56,58 +56,58 @@ import static junit.framework.TestCase.assertNotNull; public class ShowAppMenuResponseTests extends BaseRpcTests { - @Override - protected RPCMessage createMessage(){ - return new ShowAppMenuResponse(); - } - - @Override - protected String getMessageType(){ - return RPCMessage.KEY_RESPONSE; - } - - @Override - protected String getCommandType(){ - return FunctionID.SHOW_APP_MENU.toString(); - } - - @Override - protected JSONObject getExpectedParameters(int sdlVersion){ - return new JSONObject(); - } - - /** - * Tests the expected values of the RPC message. - */ - @Test - public void testRpcValues () { - // Invalid/Null Tests - ShowAppMenuResponse msg = new ShowAppMenuResponse(); - assertNotNull(TestValues.NOT_NULL, msg); - testNullBase(msg); - } - - /** - * Tests a valid JSON construction of this RPC message. - */ - @Test - public void testJsonConstructor () { - JSONObject commandJson = JsonFileReader.readId(getInstrumentation().getTargetContext(), getCommandType(), getMessageType()); - assertNotNull(TestValues.NOT_NULL, commandJson); - - try { - Hashtable<String, Object> hash = JsonRPCMarshaller.deserializeJSONObject(commandJson); - ShowAppMenuResponse cmd = new ShowAppMenuResponse(hash); - - JSONObject body = JsonUtils.readJsonObjectFromJsonObject(commandJson, getMessageType()); - assertNotNull(TestValues.NOT_NULL, body); - - // Test everything in the json body. - assertEquals(TestValues.MATCH, JsonUtils.readStringFromJsonObject(body, RPCMessage.KEY_FUNCTION_NAME), cmd.getFunctionName()); - assertEquals(TestValues.MATCH, JsonUtils.readIntegerFromJsonObject(body, RPCMessage.KEY_CORRELATION_ID), cmd.getCorrelationID()); - } catch (JSONException e) { - e.printStackTrace(); - } - } + @Override + protected RPCMessage createMessage() { + return new ShowAppMenuResponse(); + } + + @Override + protected String getMessageType() { + return RPCMessage.KEY_RESPONSE; + } + + @Override + protected String getCommandType() { + return FunctionID.SHOW_APP_MENU.toString(); + } + + @Override + protected JSONObject getExpectedParameters(int sdlVersion) { + return new JSONObject(); + } + + /** + * Tests the expected values of the RPC message. + */ + @Test + public void testRpcValues() { + // Invalid/Null Tests + ShowAppMenuResponse msg = new ShowAppMenuResponse(); + assertNotNull(TestValues.NOT_NULL, msg); + testNullBase(msg); + } + + /** + * Tests a valid JSON construction of this RPC message. + */ + @Test + public void testJsonConstructor() { + JSONObject commandJson = JsonFileReader.readId(getInstrumentation().getTargetContext(), getCommandType(), getMessageType()); + assertNotNull(TestValues.NOT_NULL, commandJson); + + try { + Hashtable<String, Object> hash = JsonRPCMarshaller.deserializeJSONObject(commandJson); + ShowAppMenuResponse cmd = new ShowAppMenuResponse(hash); + + JSONObject body = JsonUtils.readJsonObjectFromJsonObject(commandJson, getMessageType()); + assertNotNull(TestValues.NOT_NULL, body); + + // Test everything in the json body. + assertEquals(TestValues.MATCH, JsonUtils.readStringFromJsonObject(body, RPCMessage.KEY_FUNCTION_NAME), cmd.getFunctionName()); + assertEquals(TestValues.MATCH, JsonUtils.readIntegerFromJsonObject(body, RPCMessage.KEY_CORRELATION_ID), cmd.getCorrelationID()); + } catch (JSONException e) { + e.printStackTrace(); + } + } } diff --git a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/ShowConstantTbtResponseTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/ShowConstantTbtResponseTests.java index 6beaa9e62..220c05828 100644 --- a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/ShowConstantTbtResponseTests.java +++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/ShowConstantTbtResponseTests.java @@ -20,38 +20,38 @@ import static junit.framework.TestCase.assertEquals; import static junit.framework.TestCase.assertNotNull; /** - * This is a unit test class for the SmartDeviceLink library project class : + * This is a unit test class for the SmartDeviceLink library project class : * {@link com.smartdevicelink.proxy.rpc.ShowConstantTbtResponse} */ public class ShowConstantTbtResponseTests extends BaseRpcTests { - @Override - protected RPCMessage createMessage() { - ShowConstantTbtResponse msg = new ShowConstantTbtResponse(); - return msg; - } + @Override + protected RPCMessage createMessage() { + ShowConstantTbtResponse msg = new ShowConstantTbtResponse(); + return msg; + } + + @Override + protected String getMessageType() { + return RPCMessage.KEY_RESPONSE; + } - @Override - protected String getMessageType() { - return RPCMessage.KEY_RESPONSE; - } + @Override + protected String getCommandType() { + return FunctionID.SHOW_CONSTANT_TBT.toString(); + } - @Override - protected String getCommandType() { - return FunctionID.SHOW_CONSTANT_TBT.toString(); - } + @Override + protected JSONObject getExpectedParameters(int sdlVersion) { + return new JSONObject(); + } - @Override - protected JSONObject getExpectedParameters(int sdlVersion) { - return new JSONObject(); - } - - /** - * Tests the expected values of the RPC message. - */ - @Test - public void testRpcValues () { - // Invalid/Null Tests + /** + * Tests the expected values of the RPC message. + */ + @Test + public void testRpcValues() { + // Invalid/Null Tests ShowConstantTbtResponse msg = new ShowConstantTbtResponse(); assertNotNull(TestValues.NOT_NULL, msg); testNullBase(msg); @@ -61,21 +61,21 @@ public class ShowConstantTbtResponseTests extends BaseRpcTests { * Tests a valid JSON construction of this RPC message. */ @Test - public void testJsonConstructor () { - JSONObject commandJson = JsonFileReader.readId(getInstrumentation().getTargetContext(), getCommandType(), getMessageType()); - assertNotNull(TestValues.NOT_NULL, commandJson); - - try { - Hashtable<String, Object> hash = JsonRPCMarshaller.deserializeJSONObject(commandJson); - ShowConstantTbtResponse cmd = new ShowConstantTbtResponse(hash); - JSONObject body = JsonUtils.readJsonObjectFromJsonObject(commandJson, getMessageType()); - assertNotNull(TestValues.NOT_NULL, body); - - // Test everything in the json body. - assertEquals(TestValues.MATCH, JsonUtils.readStringFromJsonObject(body, RPCMessage.KEY_FUNCTION_NAME), cmd.getFunctionName()); - assertEquals(TestValues.MATCH, JsonUtils.readIntegerFromJsonObject(body, RPCMessage.KEY_CORRELATION_ID), cmd.getCorrelationID()); - } catch (JSONException e) { - e.printStackTrace(); - } + public void testJsonConstructor() { + JSONObject commandJson = JsonFileReader.readId(getInstrumentation().getTargetContext(), getCommandType(), getMessageType()); + assertNotNull(TestValues.NOT_NULL, commandJson); + + try { + Hashtable<String, Object> hash = JsonRPCMarshaller.deserializeJSONObject(commandJson); + ShowConstantTbtResponse cmd = new ShowConstantTbtResponse(hash); + JSONObject body = JsonUtils.readJsonObjectFromJsonObject(commandJson, getMessageType()); + assertNotNull(TestValues.NOT_NULL, body); + + // Test everything in the json body. + assertEquals(TestValues.MATCH, JsonUtils.readStringFromJsonObject(body, RPCMessage.KEY_FUNCTION_NAME), cmd.getFunctionName()); + assertEquals(TestValues.MATCH, JsonUtils.readIntegerFromJsonObject(body, RPCMessage.KEY_CORRELATION_ID), cmd.getCorrelationID()); + } catch (JSONException e) { + e.printStackTrace(); + } } }
\ No newline at end of file diff --git a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/ShowResponseTest.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/ShowResponseTest.java index 2062c5fe1..f29b5cf15 100644 --- a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/ShowResponseTest.java +++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/ShowResponseTest.java @@ -21,38 +21,38 @@ import static junit.framework.TestCase.assertNotNull; /** - * This is a unit test class for the SmartDeviceLink library project class : + * This is a unit test class for the SmartDeviceLink library project class : * {@link com.smartdevicelink.proxy.rpc.ShowResponse} */ public class ShowResponseTest extends BaseRpcTests { - @Override - protected RPCMessage createMessage(){ + @Override + protected RPCMessage createMessage() { return new ShowResponse(); } @Override - protected String getMessageType(){ + protected String getMessageType() { return RPCMessage.KEY_RESPONSE; } @Override - protected String getCommandType(){ + protected String getCommandType() { return FunctionID.SHOW.toString(); } @Override - protected JSONObject getExpectedParameters(int sdlVersion){ + protected JSONObject getExpectedParameters(int sdlVersion) { return new JSONObject(); } /** - * Tests the expected values of the RPC message. - */ + * Tests the expected values of the RPC message. + */ @Test - public void testRpcValues () { - // Invalid/Null Tests - ShowResponse msg = new ShowResponse(); + public void testRpcValues() { + // Invalid/Null Tests + ShowResponse msg = new ShowResponse(); assertNotNull(TestValues.NOT_NULL, msg); testNullBase(msg); } @@ -61,22 +61,22 @@ public class ShowResponseTest extends BaseRpcTests { * Tests a valid JSON construction of this RPC message. */ @Test - public void testJsonConstructor () { - JSONObject commandJson = JsonFileReader.readId(getInstrumentation().getContext(), getCommandType(), getMessageType()); - assertNotNull(TestValues.NOT_NULL, commandJson); - - try { - Hashtable<String, Object> hash = JsonRPCMarshaller.deserializeJSONObject(commandJson); - ShowResponse cmd = new ShowResponse(hash); - - JSONObject body = JsonUtils.readJsonObjectFromJsonObject(commandJson, getMessageType()); - assertNotNull(TestValues.NOT_NULL, body); - - // Test everything in the json body. - assertEquals(TestValues.MATCH, JsonUtils.readStringFromJsonObject(body, RPCMessage.KEY_FUNCTION_NAME), cmd.getFunctionName()); - assertEquals(TestValues.MATCH, JsonUtils.readIntegerFromJsonObject(body, RPCMessage.KEY_CORRELATION_ID), cmd.getCorrelationID()); - } catch (JSONException e) { - e.printStackTrace(); - } + public void testJsonConstructor() { + JSONObject commandJson = JsonFileReader.readId(getInstrumentation().getContext(), getCommandType(), getMessageType()); + assertNotNull(TestValues.NOT_NULL, commandJson); + + try { + Hashtable<String, Object> hash = JsonRPCMarshaller.deserializeJSONObject(commandJson); + ShowResponse cmd = new ShowResponse(hash); + + JSONObject body = JsonUtils.readJsonObjectFromJsonObject(commandJson, getMessageType()); + assertNotNull(TestValues.NOT_NULL, body); + + // Test everything in the json body. + assertEquals(TestValues.MATCH, JsonUtils.readStringFromJsonObject(body, RPCMessage.KEY_FUNCTION_NAME), cmd.getFunctionName()); + assertEquals(TestValues.MATCH, JsonUtils.readIntegerFromJsonObject(body, RPCMessage.KEY_CORRELATION_ID), cmd.getCorrelationID()); + } catch (JSONException e) { + e.printStackTrace(); + } } }
\ No newline at end of file diff --git a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/SliderResponseTest.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/SliderResponseTest.java index 4a200d106..78e9244f0 100644 --- a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/SliderResponseTest.java +++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/SliderResponseTest.java @@ -23,83 +23,83 @@ import static junit.framework.TestCase.fail; /** - * This is a unit test class for the SmartDeviceLink library project class : + * This is a unit test class for the SmartDeviceLink library project class : * {@link com.smartdevicelink.proxy.rpc.SliderResponse} */ public class SliderResponseTest extends BaseRpcTests { - - @Override - protected RPCMessage createMessage() { - SliderResponse msg = new SliderResponse(); - msg.setSliderPosition(TestValues.GENERAL_INT); + @Override + protected RPCMessage createMessage() { + SliderResponse msg = new SliderResponse(); - return msg; - } + msg.setSliderPosition(TestValues.GENERAL_INT); - @Override - protected String getMessageType() { - return RPCMessage.KEY_RESPONSE; - } + return msg; + } + + @Override + protected String getMessageType() { + return RPCMessage.KEY_RESPONSE; + } + + @Override + protected String getCommandType() { + return FunctionID.SLIDER.toString(); + } - @Override - protected String getCommandType() { - return FunctionID.SLIDER.toString(); - } + @Override + protected JSONObject getExpectedParameters(int sdlVersion) { + JSONObject result = new JSONObject(); - @Override - protected JSONObject getExpectedParameters(int sdlVersion) { - JSONObject result = new JSONObject(); + try { + result.put(SliderResponse.KEY_SLIDER_POSITION, TestValues.GENERAL_INT); - try { - result.put(SliderResponse.KEY_SLIDER_POSITION, TestValues.GENERAL_INT); - - } catch (JSONException e) { - fail(TestValues.JSON_FAIL); - } + } catch (JSONException e) { + fail(TestValues.JSON_FAIL); + } - return result; - } + return result; + } - @Test - public void testPosition() { - Integer copy = ( (SliderResponse) msg ).getSliderPosition(); - assertEquals(TestValues.MATCH, (Integer) TestValues.GENERAL_INT, copy); - } + @Test + public void testPosition() { + Integer copy = ((SliderResponse) msg).getSliderPosition(); + assertEquals(TestValues.MATCH, (Integer) TestValues.GENERAL_INT, copy); + } - @Test - public void testNull() { - SliderResponse msg = new SliderResponse(); - assertNotNull(TestValues.NOT_NULL, msg); + @Test + public void testNull() { + SliderResponse msg = new SliderResponse(); + assertNotNull(TestValues.NOT_NULL, msg); - testNullBase(msg); + testNullBase(msg); - assertNull(TestValues.NULL, msg.getSliderPosition()); - } + assertNull(TestValues.NULL, msg.getSliderPosition()); + } /** * Tests a valid JSON construction of this RPC message. */ @Test - public void testJsonConstructor () { - JSONObject commandJson = JsonFileReader.readId(getInstrumentation().getContext(), getCommandType(), getMessageType()); - assertNotNull(TestValues.NOT_NULL, commandJson); - - try { - Hashtable<String, Object> hash = JsonRPCMarshaller.deserializeJSONObject(commandJson); - SliderResponse cmd = new SliderResponse(hash); - - JSONObject body = JsonUtils.readJsonObjectFromJsonObject(commandJson, getMessageType()); - assertNotNull(TestValues.NOT_NULL, body); - - // Test everything in the json body. - assertEquals(TestValues.MATCH, JsonUtils.readStringFromJsonObject(body, RPCMessage.KEY_FUNCTION_NAME), cmd.getFunctionName()); - assertEquals(TestValues.MATCH, JsonUtils.readIntegerFromJsonObject(body, RPCMessage.KEY_CORRELATION_ID), cmd.getCorrelationID()); - - JSONObject parameters = JsonUtils.readJsonObjectFromJsonObject(body, RPCMessage.KEY_PARAMETERS); - assertEquals(TestValues.MATCH, JsonUtils.readIntegerFromJsonObject(parameters, SliderResponse.KEY_SLIDER_POSITION), cmd.getSliderPosition()); - } catch (JSONException e) { - e.printStackTrace(); - } + public void testJsonConstructor() { + JSONObject commandJson = JsonFileReader.readId(getInstrumentation().getContext(), getCommandType(), getMessageType()); + assertNotNull(TestValues.NOT_NULL, commandJson); + + try { + Hashtable<String, Object> hash = JsonRPCMarshaller.deserializeJSONObject(commandJson); + SliderResponse cmd = new SliderResponse(hash); + + JSONObject body = JsonUtils.readJsonObjectFromJsonObject(commandJson, getMessageType()); + assertNotNull(TestValues.NOT_NULL, body); + + // Test everything in the json body. + assertEquals(TestValues.MATCH, JsonUtils.readStringFromJsonObject(body, RPCMessage.KEY_FUNCTION_NAME), cmd.getFunctionName()); + assertEquals(TestValues.MATCH, JsonUtils.readIntegerFromJsonObject(body, RPCMessage.KEY_CORRELATION_ID), cmd.getCorrelationID()); + + JSONObject parameters = JsonUtils.readJsonObjectFromJsonObject(body, RPCMessage.KEY_PARAMETERS); + assertEquals(TestValues.MATCH, JsonUtils.readIntegerFromJsonObject(parameters, SliderResponse.KEY_SLIDER_POSITION), cmd.getSliderPosition()); + } catch (JSONException e) { + e.printStackTrace(); + } } }
\ No newline at end of file diff --git a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/SpeakResponseTest.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/SpeakResponseTest.java index 859cd8e30..a6f6effa8 100644 --- a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/SpeakResponseTest.java +++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/SpeakResponseTest.java @@ -20,38 +20,38 @@ import static junit.framework.TestCase.assertEquals; import static junit.framework.TestCase.assertNotNull; /** - * This is a unit test class for the SmartDeviceLink library project class : + * This is a unit test class for the SmartDeviceLink library project class : * {@link com.smartdevicelink.proxy.rpc.SpeakResponse} */ public class SpeakResponseTest extends BaseRpcTests { - @Override - protected RPCMessage createMessage(){ + @Override + protected RPCMessage createMessage() { return new SpeakResponse(); } @Override - protected String getMessageType(){ + protected String getMessageType() { return RPCMessage.KEY_RESPONSE; } @Override - protected String getCommandType(){ + protected String getCommandType() { return FunctionID.SPEAK.toString(); } @Override - protected JSONObject getExpectedParameters(int sdlVersion){ + protected JSONObject getExpectedParameters(int sdlVersion) { return new JSONObject(); } /** - * Tests the expected values of the RPC message. - */ + * Tests the expected values of the RPC message. + */ @Test - public void testRpcValues () { - // Invalid/Null Tests - SpeakResponse msg = new SpeakResponse(); + public void testRpcValues() { + // Invalid/Null Tests + SpeakResponse msg = new SpeakResponse(); assertNotNull(TestValues.NOT_NULL, msg); testNullBase(msg); } @@ -60,22 +60,22 @@ public class SpeakResponseTest extends BaseRpcTests { * Tests a valid JSON construction of this RPC message. */ @Test - public void testJsonConstructor () { - JSONObject commandJson = JsonFileReader.readId(getInstrumentation().getContext(), getCommandType(), getMessageType()); - assertNotNull(TestValues.NOT_NULL, commandJson); - - try { - Hashtable<String, Object> hash = JsonRPCMarshaller.deserializeJSONObject(commandJson); - SpeakResponse cmd = new SpeakResponse(hash); - - JSONObject body = JsonUtils.readJsonObjectFromJsonObject(commandJson, getMessageType()); - assertNotNull(TestValues.NOT_NULL, body); - - // Test everything in the json body. - assertEquals(TestValues.MATCH, JsonUtils.readStringFromJsonObject(body, RPCMessage.KEY_FUNCTION_NAME), cmd.getFunctionName()); - assertEquals(TestValues.MATCH, JsonUtils.readIntegerFromJsonObject(body, RPCMessage.KEY_CORRELATION_ID), cmd.getCorrelationID()); - } catch (JSONException e) { - e.printStackTrace(); - } + public void testJsonConstructor() { + JSONObject commandJson = JsonFileReader.readId(getInstrumentation().getContext(), getCommandType(), getMessageType()); + assertNotNull(TestValues.NOT_NULL, commandJson); + + try { + Hashtable<String, Object> hash = JsonRPCMarshaller.deserializeJSONObject(commandJson); + SpeakResponse cmd = new SpeakResponse(hash); + + JSONObject body = JsonUtils.readJsonObjectFromJsonObject(commandJson, getMessageType()); + assertNotNull(TestValues.NOT_NULL, body); + + // Test everything in the json body. + assertEquals(TestValues.MATCH, JsonUtils.readStringFromJsonObject(body, RPCMessage.KEY_FUNCTION_NAME), cmd.getFunctionName()); + assertEquals(TestValues.MATCH, JsonUtils.readIntegerFromJsonObject(body, RPCMessage.KEY_CORRELATION_ID), cmd.getCorrelationID()); + } catch (JSONException e) { + e.printStackTrace(); + } } }
\ No newline at end of file diff --git a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/SubscribeButtonResponseTest.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/SubscribeButtonResponseTest.java index 4560784ca..c0eb4f664 100644 --- a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/SubscribeButtonResponseTest.java +++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/SubscribeButtonResponseTest.java @@ -21,38 +21,38 @@ import static junit.framework.TestCase.assertNotNull; /** - * This is a unit test class for the SmartDeviceLink library project class : + * This is a unit test class for the SmartDeviceLink library project class : * {@link com.smartdevicelink.proxy.rpc.SubscribeButtonResponse} */ public class SubscribeButtonResponseTest extends BaseRpcTests { - @Override - protected RPCMessage createMessage(){ + @Override + protected RPCMessage createMessage() { return new SubscribeButtonResponse(); } @Override - protected String getMessageType(){ + protected String getMessageType() { return RPCMessage.KEY_RESPONSE; } @Override - protected String getCommandType(){ + protected String getCommandType() { return FunctionID.SUBSCRIBE_BUTTON.toString(); } @Override - protected JSONObject getExpectedParameters(int sdlVersion){ + protected JSONObject getExpectedParameters(int sdlVersion) { return new JSONObject(); } /** - * Tests the expected values of the RPC message. - */ + * Tests the expected values of the RPC message. + */ @Test - public void testRpcValues () { - // Invalid/Null Tests - SubscribeButtonResponse msg = new SubscribeButtonResponse(); + public void testRpcValues() { + // Invalid/Null Tests + SubscribeButtonResponse msg = new SubscribeButtonResponse(); assertNotNull(TestValues.NOT_NULL, msg); testNullBase(msg); } @@ -61,22 +61,22 @@ public class SubscribeButtonResponseTest extends BaseRpcTests { * Tests a valid JSON construction of this RPC message. */ @Test - public void testJsonConstructor () { - JSONObject commandJson = JsonFileReader.readId(getInstrumentation().getContext(), getCommandType(), getMessageType()); - assertNotNull(TestValues.NOT_NULL, commandJson); - - try { - Hashtable<String, Object> hash = JsonRPCMarshaller.deserializeJSONObject(commandJson); - SubscribeButtonResponse cmd = new SubscribeButtonResponse(hash); - - JSONObject body = JsonUtils.readJsonObjectFromJsonObject(commandJson, getMessageType()); - assertNotNull(TestValues.NOT_NULL, body); - - // Test everything in the json body. - assertEquals(TestValues.MATCH, JsonUtils.readStringFromJsonObject(body, RPCMessage.KEY_FUNCTION_NAME), cmd.getFunctionName()); - assertEquals("Correlation ID doesn't match input ID", JsonUtils.readIntegerFromJsonObject(body, RPCMessage.KEY_CORRELATION_ID), cmd.getCorrelationID()); - } catch (JSONException e) { - e.printStackTrace(); - } + public void testJsonConstructor() { + JSONObject commandJson = JsonFileReader.readId(getInstrumentation().getContext(), getCommandType(), getMessageType()); + assertNotNull(TestValues.NOT_NULL, commandJson); + + try { + Hashtable<String, Object> hash = JsonRPCMarshaller.deserializeJSONObject(commandJson); + SubscribeButtonResponse cmd = new SubscribeButtonResponse(hash); + + JSONObject body = JsonUtils.readJsonObjectFromJsonObject(commandJson, getMessageType()); + assertNotNull(TestValues.NOT_NULL, body); + + // Test everything in the json body. + assertEquals(TestValues.MATCH, JsonUtils.readStringFromJsonObject(body, RPCMessage.KEY_FUNCTION_NAME), cmd.getFunctionName()); + assertEquals("Correlation ID doesn't match input ID", JsonUtils.readIntegerFromJsonObject(body, RPCMessage.KEY_CORRELATION_ID), cmd.getCorrelationID()); + } catch (JSONException e) { + e.printStackTrace(); + } } }
\ No newline at end of file diff --git a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/SubscribeVehicleDataResponseTest.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/SubscribeVehicleDataResponseTest.java index 1e486f7eb..6f9c9a45c 100644 --- a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/SubscribeVehicleDataResponseTest.java +++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/SubscribeVehicleDataResponseTest.java @@ -27,197 +27,197 @@ import static junit.framework.TestCase.assertTrue; import static junit.framework.TestCase.fail; /** - * This is a unit test class for the SmartDeviceLink library project class : + * This is a unit test class for the SmartDeviceLink library project class : * {@link com.smartdevicelink.proxy.rpc.SubscribeVehicleDataResponse} */ public class SubscribeVehicleDataResponseTest extends BaseRpcTests { - @Override - protected RPCMessage createMessage() { - SubscribeVehicleDataResponse msg = new SubscribeVehicleDataResponse(); - - msg.setResultCode(TestValues.GENERAL_RESULT); - msg.setSpeed(TestValues.GENERAL_VEHICLEDATARESULT_LIST.get(VehicleDataType.VEHICLEDATA_SPEED.ordinal())); - msg.setRpm(TestValues.GENERAL_VEHICLEDATARESULT_LIST.get(VehicleDataType.VEHICLEDATA_RPM.ordinal())); - msg.setExternalTemperature(TestValues.GENERAL_VEHICLEDATARESULT_LIST.get(VehicleDataType.VEHICLEDATA_EXTERNTEMP.ordinal())); - msg.setFuelLevel(TestValues.GENERAL_VEHICLEDATARESULT_LIST.get(VehicleDataType.VEHICLEDATA_FUELLEVEL.ordinal())); - msg.setPrndl(TestValues.GENERAL_VEHICLEDATARESULT_LIST.get(VehicleDataType.VEHICLEDATA_PRNDL.ordinal())); - msg.setTirePressure(TestValues.GENERAL_VEHICLEDATARESULT_LIST.get(VehicleDataType.VEHICLEDATA_TIREPRESSURE.ordinal())); - msg.setEngineTorque(TestValues.GENERAL_VEHICLEDATARESULT_LIST.get(VehicleDataType.VEHICLEDATA_ENGINETORQUE.ordinal())); - msg.setEngineOilLife(TestValues.GENERAL_VEHICLEDATARESULT_LIST.get(VehicleDataType.VEHICLEDATA_ENGINEOILLIFE.ordinal())); - msg.setOdometer(TestValues.GENERAL_VEHICLEDATARESULT_LIST.get(VehicleDataType.VEHICLEDATA_ODOMETER.ordinal())); - msg.setGps(TestValues.GENERAL_VEHICLEDATARESULT_LIST.get(VehicleDataType.VEHICLEDATA_GPS.ordinal())); - msg.setFuelLevelState(TestValues.GENERAL_VEHICLEDATARESULT_LIST.get(VehicleDataType.VEHICLEDATA_FUELLEVEL_STATE.ordinal())); - msg.setInstantFuelConsumption(TestValues.GENERAL_VEHICLEDATARESULT_LIST.get(VehicleDataType.VEHICLEDATA_FUELCONSUMPTION.ordinal())); - msg.setBeltStatus(TestValues.GENERAL_VEHICLEDATARESULT_LIST.get(VehicleDataType.VEHICLEDATA_BELTSTATUS.ordinal())); - msg.setBodyInformation(TestValues.GENERAL_VEHICLEDATARESULT_LIST.get(VehicleDataType.VEHICLEDATA_BODYINFO.ordinal())); - msg.setDeviceStatus(TestValues.GENERAL_VEHICLEDATARESULT_LIST.get(VehicleDataType.VEHICLEDATA_DEVICESTATUS.ordinal())); - msg.setDriverBraking(TestValues.GENERAL_VEHICLEDATARESULT_LIST.get(VehicleDataType.VEHICLEDATA_BRAKING.ordinal())); - msg.setWiperStatus(TestValues.GENERAL_VEHICLEDATARESULT_LIST.get(VehicleDataType.VEHICLEDATA_WIPERSTATUS.ordinal())); - msg.setHeadLampStatus(TestValues.GENERAL_VEHICLEDATARESULT_LIST.get(VehicleDataType.VEHICLEDATA_HEADLAMPSTATUS.ordinal())); - msg.setAccPedalPosition(TestValues.GENERAL_VEHICLEDATARESULT_LIST.get(VehicleDataType.VEHICLEDATA_ACCPEDAL.ordinal())); - msg.setSteeringWheelAngle(TestValues.GENERAL_VEHICLEDATARESULT_LIST.get(VehicleDataType.VEHICLEDATA_STEERINGWHEEL.ordinal())); - msg.setECallInfo(TestValues.GENERAL_VEHICLEDATARESULT_LIST.get(VehicleDataType.VEHICLEDATA_ECALLINFO.ordinal())); - msg.setAirbagStatus(TestValues.GENERAL_VEHICLEDATARESULT_LIST.get(VehicleDataType.VEHICLEDATA_AIRBAGSTATUS.ordinal())); - msg.setEmergencyEvent(TestValues.GENERAL_VEHICLEDATARESULT_LIST.get(VehicleDataType.VEHICLEDATA_EMERGENCYEVENT.ordinal())); - msg.setClusterModes(TestValues.GENERAL_VEHICLEDATARESULT_LIST.get(VehicleDataType.VEHICLEDATA_CLUSTERMODESTATUS.ordinal())); - msg.setMyKey(TestValues.GENERAL_VEHICLEDATARESULT_LIST.get(VehicleDataType.VEHICLEDATA_MYKEY.ordinal())); - msg.setFuelRange(TestValues.GENERAL_VEHICLEDATARESULT_LIST.get(VehicleDataType.VEHICLEDATA_FUELRANGE.ordinal())); - msg.setTurnSignal(TestValues.GENERAL_VEHICLEDATARESULT_LIST.get(VehicleDataType.VEHICLEDATA_TURNSIGNAL.ordinal())); - msg.setElectronicParkBrakeStatus(TestValues.GENERAL_VEHICLEDATARESULT_LIST.get(VehicleDataType.VEHICLEDATA_ELECTRONICPARKBRAKESTATUS.ordinal())); - msg.setGearStatus(TestValues.GENERAL_VEHICLEDATARESULT_LIST.get(VehicleDataType.VEHICLEDATA_GEARSTATUS.ordinal())); - msg.setHandsOffSteering(TestValues.GENERAL_VEHICLEDATARESULT_LIST.get(VehicleDataType.VEHICLEDATA_HANDSOFFSTEERING.ordinal())); - msg.setWindowStatus(TestValues.GENERAL_VEHICLEDATARESULT_LIST.get(VehicleDataType.VEHICLEDATA_WINDOWSTATUS.ordinal())); - msg.setStabilityControlsStatus(TestValues.GENERAL_VEHICLEDATARESULT_LIST.get(VehicleDataType.VEHICLEDATA_STABILITYCONTROLSSTATUS.ordinal())); - msg.setOEMCustomVehicleData(TestValues.GENERAL_OEM_CUSTOM_VEHICLE_DATA_NAME, TestValues.GENERAL_OEM_CUSTOM_VEHICLE_DATA); - - return msg; - } - - @Override - protected String getMessageType() { - return RPCMessage.KEY_RESPONSE; - } - - @Override - protected String getCommandType() { - return FunctionID.SUBSCRIBE_VEHICLE_DATA.toString(); - } - - @Override - protected JSONObject getExpectedParameters(int sdlVersion) { - JSONObject result = new JSONObject(); - + @Override + protected RPCMessage createMessage() { + SubscribeVehicleDataResponse msg = new SubscribeVehicleDataResponse(); + + msg.setResultCode(TestValues.GENERAL_RESULT); + msg.setSpeed(TestValues.GENERAL_VEHICLEDATARESULT_LIST.get(VehicleDataType.VEHICLEDATA_SPEED.ordinal())); + msg.setRpm(TestValues.GENERAL_VEHICLEDATARESULT_LIST.get(VehicleDataType.VEHICLEDATA_RPM.ordinal())); + msg.setExternalTemperature(TestValues.GENERAL_VEHICLEDATARESULT_LIST.get(VehicleDataType.VEHICLEDATA_EXTERNTEMP.ordinal())); + msg.setFuelLevel(TestValues.GENERAL_VEHICLEDATARESULT_LIST.get(VehicleDataType.VEHICLEDATA_FUELLEVEL.ordinal())); + msg.setPrndl(TestValues.GENERAL_VEHICLEDATARESULT_LIST.get(VehicleDataType.VEHICLEDATA_PRNDL.ordinal())); + msg.setTirePressure(TestValues.GENERAL_VEHICLEDATARESULT_LIST.get(VehicleDataType.VEHICLEDATA_TIREPRESSURE.ordinal())); + msg.setEngineTorque(TestValues.GENERAL_VEHICLEDATARESULT_LIST.get(VehicleDataType.VEHICLEDATA_ENGINETORQUE.ordinal())); + msg.setEngineOilLife(TestValues.GENERAL_VEHICLEDATARESULT_LIST.get(VehicleDataType.VEHICLEDATA_ENGINEOILLIFE.ordinal())); + msg.setOdometer(TestValues.GENERAL_VEHICLEDATARESULT_LIST.get(VehicleDataType.VEHICLEDATA_ODOMETER.ordinal())); + msg.setGps(TestValues.GENERAL_VEHICLEDATARESULT_LIST.get(VehicleDataType.VEHICLEDATA_GPS.ordinal())); + msg.setFuelLevelState(TestValues.GENERAL_VEHICLEDATARESULT_LIST.get(VehicleDataType.VEHICLEDATA_FUELLEVEL_STATE.ordinal())); + msg.setInstantFuelConsumption(TestValues.GENERAL_VEHICLEDATARESULT_LIST.get(VehicleDataType.VEHICLEDATA_FUELCONSUMPTION.ordinal())); + msg.setBeltStatus(TestValues.GENERAL_VEHICLEDATARESULT_LIST.get(VehicleDataType.VEHICLEDATA_BELTSTATUS.ordinal())); + msg.setBodyInformation(TestValues.GENERAL_VEHICLEDATARESULT_LIST.get(VehicleDataType.VEHICLEDATA_BODYINFO.ordinal())); + msg.setDeviceStatus(TestValues.GENERAL_VEHICLEDATARESULT_LIST.get(VehicleDataType.VEHICLEDATA_DEVICESTATUS.ordinal())); + msg.setDriverBraking(TestValues.GENERAL_VEHICLEDATARESULT_LIST.get(VehicleDataType.VEHICLEDATA_BRAKING.ordinal())); + msg.setWiperStatus(TestValues.GENERAL_VEHICLEDATARESULT_LIST.get(VehicleDataType.VEHICLEDATA_WIPERSTATUS.ordinal())); + msg.setHeadLampStatus(TestValues.GENERAL_VEHICLEDATARESULT_LIST.get(VehicleDataType.VEHICLEDATA_HEADLAMPSTATUS.ordinal())); + msg.setAccPedalPosition(TestValues.GENERAL_VEHICLEDATARESULT_LIST.get(VehicleDataType.VEHICLEDATA_ACCPEDAL.ordinal())); + msg.setSteeringWheelAngle(TestValues.GENERAL_VEHICLEDATARESULT_LIST.get(VehicleDataType.VEHICLEDATA_STEERINGWHEEL.ordinal())); + msg.setECallInfo(TestValues.GENERAL_VEHICLEDATARESULT_LIST.get(VehicleDataType.VEHICLEDATA_ECALLINFO.ordinal())); + msg.setAirbagStatus(TestValues.GENERAL_VEHICLEDATARESULT_LIST.get(VehicleDataType.VEHICLEDATA_AIRBAGSTATUS.ordinal())); + msg.setEmergencyEvent(TestValues.GENERAL_VEHICLEDATARESULT_LIST.get(VehicleDataType.VEHICLEDATA_EMERGENCYEVENT.ordinal())); + msg.setClusterModes(TestValues.GENERAL_VEHICLEDATARESULT_LIST.get(VehicleDataType.VEHICLEDATA_CLUSTERMODESTATUS.ordinal())); + msg.setMyKey(TestValues.GENERAL_VEHICLEDATARESULT_LIST.get(VehicleDataType.VEHICLEDATA_MYKEY.ordinal())); + msg.setFuelRange(TestValues.GENERAL_VEHICLEDATARESULT_LIST.get(VehicleDataType.VEHICLEDATA_FUELRANGE.ordinal())); + msg.setTurnSignal(TestValues.GENERAL_VEHICLEDATARESULT_LIST.get(VehicleDataType.VEHICLEDATA_TURNSIGNAL.ordinal())); + msg.setElectronicParkBrakeStatus(TestValues.GENERAL_VEHICLEDATARESULT_LIST.get(VehicleDataType.VEHICLEDATA_ELECTRONICPARKBRAKESTATUS.ordinal())); + msg.setGearStatus(TestValues.GENERAL_VEHICLEDATARESULT_LIST.get(VehicleDataType.VEHICLEDATA_GEARSTATUS.ordinal())); + msg.setHandsOffSteering(TestValues.GENERAL_VEHICLEDATARESULT_LIST.get(VehicleDataType.VEHICLEDATA_HANDSOFFSTEERING.ordinal())); + msg.setWindowStatus(TestValues.GENERAL_VEHICLEDATARESULT_LIST.get(VehicleDataType.VEHICLEDATA_WINDOWSTATUS.ordinal())); + msg.setStabilityControlsStatus(TestValues.GENERAL_VEHICLEDATARESULT_LIST.get(VehicleDataType.VEHICLEDATA_STABILITYCONTROLSSTATUS.ordinal())); + msg.setOEMCustomVehicleData(TestValues.GENERAL_OEM_CUSTOM_VEHICLE_DATA_NAME, TestValues.GENERAL_OEM_CUSTOM_VEHICLE_DATA); + + return msg; + } + + @Override + protected String getMessageType() { + return RPCMessage.KEY_RESPONSE; + } + + @Override + protected String getCommandType() { + return FunctionID.SUBSCRIBE_VEHICLE_DATA.toString(); + } + + @Override + protected JSONObject getExpectedParameters(int sdlVersion) { + JSONObject result = new JSONObject(); + try { - - // Note: If the key values stored in SubscribeVehicleDataResponse - // were to be in a list then this could be easily looped through - // instead of individually set. - - result.put(SubscribeVehicleDataResponse.KEY_RESULT_CODE, TestValues.GENERAL_RESULT); - result.put(SubscribeVehicleDataResponse.KEY_SPEED, TestValues.GENERAL_VEHICLEDATARESULT_LIST.get(VehicleDataType.VEHICLEDATA_SPEED.ordinal()).serializeJSON()); - result.put(SubscribeVehicleDataResponse.KEY_RPM, TestValues.GENERAL_VEHICLEDATARESULT_LIST.get(VehicleDataType.VEHICLEDATA_RPM.ordinal()).serializeJSON()); - result.put(SubscribeVehicleDataResponse.KEY_EXTERNAL_TEMPERATURE, TestValues.GENERAL_VEHICLEDATARESULT_LIST.get(VehicleDataType.VEHICLEDATA_EXTERNTEMP.ordinal()).serializeJSON()); - result.put(SubscribeVehicleDataResponse.KEY_FUEL_LEVEL, TestValues.GENERAL_VEHICLEDATARESULT_LIST.get(VehicleDataType.VEHICLEDATA_FUELLEVEL.ordinal()).serializeJSON()); - result.put(SubscribeVehicleDataResponse.KEY_PRNDL, TestValues.GENERAL_VEHICLEDATARESULT_LIST.get(VehicleDataType.VEHICLEDATA_PRNDL.ordinal()).serializeJSON()); - result.put(SubscribeVehicleDataResponse.KEY_TIRE_PRESSURE, TestValues.GENERAL_VEHICLEDATARESULT_LIST.get(VehicleDataType.VEHICLEDATA_TIREPRESSURE.ordinal()).serializeJSON()); - result.put(SubscribeVehicleDataResponse.KEY_ENGINE_TORQUE, TestValues.GENERAL_VEHICLEDATARESULT_LIST.get(VehicleDataType.VEHICLEDATA_ENGINETORQUE.ordinal()).serializeJSON()); - result.put(SubscribeVehicleDataResponse.KEY_ENGINE_OIL_LIFE, TestValues.GENERAL_VEHICLEDATARESULT_LIST.get(VehicleDataType.VEHICLEDATA_ENGINEOILLIFE.ordinal()).serializeJSON()); - result.put(SubscribeVehicleDataResponse.KEY_ODOMETER, TestValues.GENERAL_VEHICLEDATARESULT_LIST.get(VehicleDataType.VEHICLEDATA_ODOMETER.ordinal()).serializeJSON()); - result.put(SubscribeVehicleDataResponse.KEY_GPS, TestValues.GENERAL_VEHICLEDATARESULT_LIST.get(VehicleDataType.VEHICLEDATA_GPS.ordinal()).serializeJSON()); - result.put(SubscribeVehicleDataResponse.KEY_FUEL_LEVEL_STATE, TestValues.GENERAL_VEHICLEDATARESULT_LIST.get(VehicleDataType.VEHICLEDATA_FUELLEVEL_STATE.ordinal()).serializeJSON()); - result.put(SubscribeVehicleDataResponse.KEY_INSTANT_FUEL_CONSUMPTION, TestValues.GENERAL_VEHICLEDATARESULT_LIST.get(VehicleDataType.VEHICLEDATA_FUELCONSUMPTION.ordinal()).serializeJSON()); - result.put(SubscribeVehicleDataResponse.KEY_BELT_STATUS, TestValues.GENERAL_VEHICLEDATARESULT_LIST.get(VehicleDataType.VEHICLEDATA_BELTSTATUS.ordinal()).serializeJSON()); - result.put(SubscribeVehicleDataResponse.KEY_BODY_INFORMATION, TestValues.GENERAL_VEHICLEDATARESULT_LIST.get(VehicleDataType.VEHICLEDATA_BODYINFO.ordinal()).serializeJSON()); - result.put(SubscribeVehicleDataResponse.KEY_DEVICE_STATUS, TestValues.GENERAL_VEHICLEDATARESULT_LIST.get(VehicleDataType.VEHICLEDATA_DEVICESTATUS.ordinal()).serializeJSON()); - result.put(SubscribeVehicleDataResponse.KEY_DRIVER_BRAKING, TestValues.GENERAL_VEHICLEDATARESULT_LIST.get(VehicleDataType.VEHICLEDATA_BRAKING.ordinal()).serializeJSON()); - result.put(SubscribeVehicleDataResponse.KEY_WIPER_STATUS, TestValues.GENERAL_VEHICLEDATARESULT_LIST.get(VehicleDataType.VEHICLEDATA_WIPERSTATUS.ordinal()).serializeJSON()); - result.put(SubscribeVehicleDataResponse.KEY_HEAD_LAMP_STATUS, TestValues.GENERAL_VEHICLEDATARESULT_LIST.get(VehicleDataType.VEHICLEDATA_HEADLAMPSTATUS.ordinal()).serializeJSON()); - result.put(SubscribeVehicleDataResponse.KEY_ACC_PEDAL_POSITION, TestValues.GENERAL_VEHICLEDATARESULT_LIST.get(VehicleDataType.VEHICLEDATA_ACCPEDAL.ordinal()).serializeJSON()); - result.put(SubscribeVehicleDataResponse.KEY_STEERING_WHEEL_ANGLE, TestValues.GENERAL_VEHICLEDATARESULT_LIST.get(VehicleDataType.VEHICLEDATA_STEERINGWHEEL.ordinal()).serializeJSON()); - result.put(SubscribeVehicleDataResponse.KEY_E_CALL_INFO, TestValues.GENERAL_VEHICLEDATARESULT_LIST.get(VehicleDataType.VEHICLEDATA_ECALLINFO.ordinal()).serializeJSON()); - result.put(SubscribeVehicleDataResponse.KEY_AIRBAG_STATUS, TestValues.GENERAL_VEHICLEDATARESULT_LIST.get(VehicleDataType.VEHICLEDATA_AIRBAGSTATUS.ordinal()).serializeJSON()); - result.put(SubscribeVehicleDataResponse.KEY_EMERGENCY_EVENT, TestValues.GENERAL_VEHICLEDATARESULT_LIST.get(VehicleDataType.VEHICLEDATA_EMERGENCYEVENT.ordinal()).serializeJSON()); - result.put(SubscribeVehicleDataResponse.KEY_CLUSTER_MODES, TestValues.GENERAL_VEHICLEDATARESULT_LIST.get(VehicleDataType.VEHICLEDATA_CLUSTERMODESTATUS.ordinal()).serializeJSON()); - result.put(SubscribeVehicleDataResponse.KEY_MY_KEY, TestValues.GENERAL_VEHICLEDATARESULT_LIST.get(VehicleDataType.VEHICLEDATA_MYKEY.ordinal()).serializeJSON()); - result.put(SubscribeVehicleDataResponse.KEY_FUEL_RANGE, TestValues.GENERAL_VEHICLEDATARESULT_LIST.get(VehicleDataType.VEHICLEDATA_FUELRANGE.ordinal()).serializeJSON()); - result.put(SubscribeVehicleDataResponse.KEY_TURN_SIGNAL, TestValues.GENERAL_VEHICLEDATARESULT_LIST.get(VehicleDataType.VEHICLEDATA_TURNSIGNAL.ordinal()).serializeJSON()); - result.put(SubscribeVehicleDataResponse.KEY_WINDOW_STATUS, TestValues.GENERAL_VEHICLEDATARESULT_LIST.get(VehicleDataType.VEHICLEDATA_WINDOWSTATUS.ordinal()).serializeJSON()); - result.put(SubscribeVehicleDataResponse.KEY_GEAR_STATUS, TestValues.GENERAL_VEHICLEDATARESULT_LIST.get(VehicleDataType.VEHICLEDATA_GEARSTATUS.ordinal()).serializeJSON()); - result.put(SubscribeVehicleDataResponse.KEY_STABILITY_CONTROLS_STATUS, TestValues.GENERAL_VEHICLEDATARESULT_LIST.get(VehicleDataType.VEHICLEDATA_STABILITYCONTROLSSTATUS.ordinal()).serializeJSON()); - result.put(SubscribeVehicleDataResponse.KEY_ELECTRONIC_PARK_BRAKE_STATUS, TestValues.GENERAL_VEHICLEDATARESULT_LIST.get(VehicleDataType.VEHICLEDATA_ELECTRONICPARKBRAKESTATUS.ordinal()).serializeJSON()); - result.put(SubscribeVehicleDataResponse.KEY_HANDS_OFF_STEERING, TestValues.GENERAL_VEHICLEDATARESULT_LIST.get(VehicleDataType.VEHICLEDATA_HANDSOFFSTEERING.ordinal()).serializeJSON()); - result.put(TestValues.GENERAL_OEM_CUSTOM_VEHICLE_DATA_NAME, TestValues.GENERAL_OEM_CUSTOM_VEHICLE_DATA.serializeJSON()); - } catch (JSONException e) { - fail(TestValues.JSON_FAIL); - } - - return result; - } - - /** - * Tests the expected values of the RPC message. - */ - @Test - public void testRpcValues () { - // Test Values - Result testResult = ( (SubscribeVehicleDataResponse) msg ).getResultCode(); - VehicleDataResult testGps = ( (SubscribeVehicleDataResponse) msg ).getGps(); - VehicleDataResult testOdometer = ( (SubscribeVehicleDataResponse) msg ).getOdometer(); - VehicleDataResult testTirePressure = ( (SubscribeVehicleDataResponse) msg ).getTirePressure(); - VehicleDataResult testBeltStatus = ( (SubscribeVehicleDataResponse) msg ).getBeltStatus(); - VehicleDataResult testBodyInfo = ( (SubscribeVehicleDataResponse) msg ).getBodyInformation(); - VehicleDataResult testDeviceStatus = ( (SubscribeVehicleDataResponse) msg ).getDeviceStatus(); - VehicleDataResult testHeadLampStatus = ( (SubscribeVehicleDataResponse) msg ).getHeadLampStatus(); - VehicleDataResult testECallInfo = ( (SubscribeVehicleDataResponse) msg ).getECallInfo(); - VehicleDataResult testAirbagStatus = ( (SubscribeVehicleDataResponse) msg ).getAirbagStatus(); - VehicleDataResult testEmergencyEvent = ( (SubscribeVehicleDataResponse) msg ).getEmergencyEvent(); - VehicleDataResult testClusterMode = ( (SubscribeVehicleDataResponse) msg ).getClusterModes(); - VehicleDataResult testMyKey = ( (SubscribeVehicleDataResponse) msg ).getMyKey(); - VehicleDataResult testSpeed = ( (SubscribeVehicleDataResponse) msg ).getSpeed(); - VehicleDataResult testRpm = ( (SubscribeVehicleDataResponse) msg ).getRpm(); - VehicleDataResult testFuelLevel = ( (SubscribeVehicleDataResponse) msg ).getFuelLevel(); - VehicleDataResult testConsumption = ( (SubscribeVehicleDataResponse) msg ).getInstantFuelConsumption(); - VehicleDataResult testExternalTemp = ( (SubscribeVehicleDataResponse) msg ).getExternalTemperature(); - VehicleDataResult testEngineTorque = ( (SubscribeVehicleDataResponse) msg ).getEngineTorque(); - VehicleDataResult testEngineOilLife = ( (SubscribeVehicleDataResponse) msg ).getEngineOilLife(); - VehicleDataResult testAccPedal = ( (SubscribeVehicleDataResponse) msg ).getAccPedalPosition(); - VehicleDataResult testSteeringWheel = ( (SubscribeVehicleDataResponse) msg ).getSteeringWheelAngle(); - VehicleDataResult testFuelLevelState = ( (SubscribeVehicleDataResponse) msg ).getFuelLevelState(); - VehicleDataResult testPrndl = ( (SubscribeVehicleDataResponse) msg ).getPrndl(); - VehicleDataResult testBraking = ( (SubscribeVehicleDataResponse) msg ).getDriverBraking(); - VehicleDataResult testWiperStatus = ( (SubscribeVehicleDataResponse) msg ).getWiperStatus(); - VehicleDataResult testFuelRange = ( (SubscribeVehicleDataResponse) msg ).getFuelRange(); - VehicleDataResult testTurnSignal = ( (SubscribeVehicleDataResponse) msg ).getTurnSignal(); - VehicleDataResult testEBrakeStatus = ( (SubscribeVehicleDataResponse) msg ).getElectronicParkBrakeStatus(); - VehicleDataResult testHOffSteering = ( (SubscribeVehicleDataResponse) msg ).getHandsOffSteering(); - VehicleDataResult testWindowStatus = ( (SubscribeVehicleDataResponse) msg ).getWindowStatus(); - VehicleDataResult testGearStatus = ( (SubscribeVehicleDataResponse) msg ).getGearStatus(); - VehicleDataResult testStabilityControlStatus = ( (SubscribeVehicleDataResponse) msg ).getStabilityControlsStatus(); - VehicleDataResult testOEMCustomVehicleData = ( (SubscribeVehicleDataResponse) msg ).getOEMCustomVehicleData(TestValues.GENERAL_OEM_CUSTOM_VEHICLE_DATA_NAME); - - // Valid Tests - assertTrue(TestValues.TRUE, testResult.equals(TestValues.GENERAL_RESULT)); - assertTrue(TestValues.TRUE, testGps.getDataType().equals(VehicleDataType.VEHICLEDATA_GPS)); - assertTrue(TestValues.TRUE, testOdometer.getDataType().equals(VehicleDataType.VEHICLEDATA_ODOMETER)); - assertTrue(TestValues.TRUE, testTirePressure.getDataType().equals(VehicleDataType.VEHICLEDATA_TIREPRESSURE)); - assertTrue(TestValues.TRUE, testBeltStatus.getDataType().equals(VehicleDataType.VEHICLEDATA_BELTSTATUS)); - assertTrue(TestValues.TRUE, testBodyInfo.getDataType().equals(VehicleDataType.VEHICLEDATA_BODYINFO)); - assertTrue(TestValues.TRUE, testDeviceStatus.getDataType().equals(VehicleDataType.VEHICLEDATA_DEVICESTATUS)); - assertTrue(TestValues.TRUE, testHeadLampStatus.getDataType().equals(VehicleDataType.VEHICLEDATA_HEADLAMPSTATUS)); - assertTrue(TestValues.TRUE, testECallInfo.getDataType().equals(VehicleDataType.VEHICLEDATA_ECALLINFO)); - assertTrue(TestValues.TRUE, testAirbagStatus.getDataType().equals(VehicleDataType.VEHICLEDATA_AIRBAGSTATUS)); - assertTrue(TestValues.TRUE, testEmergencyEvent.getDataType().equals(VehicleDataType.VEHICLEDATA_EMERGENCYEVENT)); - assertTrue(TestValues.TRUE, testClusterMode.getDataType().equals(VehicleDataType.VEHICLEDATA_CLUSTERMODESTATUS)); - assertTrue(TestValues.TRUE, testMyKey.getDataType().equals(VehicleDataType.VEHICLEDATA_MYKEY)); - assertTrue(TestValues.TRUE, testSpeed.getDataType().equals(VehicleDataType.VEHICLEDATA_SPEED)); - assertTrue(TestValues.TRUE, testRpm.getDataType().equals(VehicleDataType.VEHICLEDATA_RPM)); - assertTrue(TestValues.TRUE, testFuelLevel.getDataType().equals(VehicleDataType.VEHICLEDATA_FUELLEVEL)); - assertTrue(TestValues.TRUE, testConsumption.getDataType().equals(VehicleDataType.VEHICLEDATA_FUELCONSUMPTION)); - assertTrue(TestValues.TRUE, testExternalTemp.getDataType().equals(VehicleDataType.VEHICLEDATA_EXTERNTEMP)); - assertTrue(TestValues.TRUE, testEngineTorque.getDataType().equals(VehicleDataType.VEHICLEDATA_ENGINETORQUE)); - assertTrue(TestValues.TRUE, testEngineOilLife.getDataType().equals(VehicleDataType.VEHICLEDATA_ENGINEOILLIFE)); - assertTrue(TestValues.TRUE, testAccPedal.getDataType().equals(VehicleDataType.VEHICLEDATA_ACCPEDAL)); - assertTrue(TestValues.TRUE, testSteeringWheel.getDataType().equals(VehicleDataType.VEHICLEDATA_STEERINGWHEEL)); - assertTrue(TestValues.TRUE, testFuelLevelState.getDataType().equals(VehicleDataType.VEHICLEDATA_FUELLEVEL_STATE)); - assertTrue(TestValues.TRUE, testPrndl.getDataType().equals(VehicleDataType.VEHICLEDATA_PRNDL)); - assertTrue(TestValues.TRUE, testBraking.getDataType().equals(VehicleDataType.VEHICLEDATA_BRAKING)); - assertTrue(TestValues.TRUE, testWiperStatus.getDataType().equals(VehicleDataType.VEHICLEDATA_WIPERSTATUS)); - assertTrue(TestValues.TRUE, testFuelRange.getDataType().equals(VehicleDataType.VEHICLEDATA_FUELRANGE)); - assertTrue(TestValues.TRUE, testTurnSignal.getDataType().equals(VehicleDataType.VEHICLEDATA_TURNSIGNAL)); - assertTrue(TestValues.TRUE, testEBrakeStatus.getDataType().equals(VehicleDataType.VEHICLEDATA_ELECTRONICPARKBRAKESTATUS)); - assertTrue(TestValues.TRUE, testHOffSteering.getDataType().equals(VehicleDataType.VEHICLEDATA_HANDSOFFSTEERING)); - assertTrue(TestValues.TRUE, testGearStatus.getDataType().equals(VehicleDataType.VEHICLEDATA_GEARSTATUS)); - assertTrue(TestValues.TRUE, testWindowStatus.getDataType().equals(VehicleDataType.VEHICLEDATA_WINDOWSTATUS)); - assertTrue(TestValues.TRUE, testStabilityControlStatus.getDataType().equals(VehicleDataType.VEHICLEDATA_STABILITYCONTROLSSTATUS)); - assertTrue(TestValues.TRUE, testOEMCustomVehicleData.getOEMCustomVehicleDataType().equals(TestValues.GENERAL_OEM_CUSTOM_VEHICLE_DATA_NAME)); - + + // Note: If the key values stored in SubscribeVehicleDataResponse + // were to be in a list then this could be easily looped through + // instead of individually set. + + result.put(SubscribeVehicleDataResponse.KEY_RESULT_CODE, TestValues.GENERAL_RESULT); + result.put(SubscribeVehicleDataResponse.KEY_SPEED, TestValues.GENERAL_VEHICLEDATARESULT_LIST.get(VehicleDataType.VEHICLEDATA_SPEED.ordinal()).serializeJSON()); + result.put(SubscribeVehicleDataResponse.KEY_RPM, TestValues.GENERAL_VEHICLEDATARESULT_LIST.get(VehicleDataType.VEHICLEDATA_RPM.ordinal()).serializeJSON()); + result.put(SubscribeVehicleDataResponse.KEY_EXTERNAL_TEMPERATURE, TestValues.GENERAL_VEHICLEDATARESULT_LIST.get(VehicleDataType.VEHICLEDATA_EXTERNTEMP.ordinal()).serializeJSON()); + result.put(SubscribeVehicleDataResponse.KEY_FUEL_LEVEL, TestValues.GENERAL_VEHICLEDATARESULT_LIST.get(VehicleDataType.VEHICLEDATA_FUELLEVEL.ordinal()).serializeJSON()); + result.put(SubscribeVehicleDataResponse.KEY_PRNDL, TestValues.GENERAL_VEHICLEDATARESULT_LIST.get(VehicleDataType.VEHICLEDATA_PRNDL.ordinal()).serializeJSON()); + result.put(SubscribeVehicleDataResponse.KEY_TIRE_PRESSURE, TestValues.GENERAL_VEHICLEDATARESULT_LIST.get(VehicleDataType.VEHICLEDATA_TIREPRESSURE.ordinal()).serializeJSON()); + result.put(SubscribeVehicleDataResponse.KEY_ENGINE_TORQUE, TestValues.GENERAL_VEHICLEDATARESULT_LIST.get(VehicleDataType.VEHICLEDATA_ENGINETORQUE.ordinal()).serializeJSON()); + result.put(SubscribeVehicleDataResponse.KEY_ENGINE_OIL_LIFE, TestValues.GENERAL_VEHICLEDATARESULT_LIST.get(VehicleDataType.VEHICLEDATA_ENGINEOILLIFE.ordinal()).serializeJSON()); + result.put(SubscribeVehicleDataResponse.KEY_ODOMETER, TestValues.GENERAL_VEHICLEDATARESULT_LIST.get(VehicleDataType.VEHICLEDATA_ODOMETER.ordinal()).serializeJSON()); + result.put(SubscribeVehicleDataResponse.KEY_GPS, TestValues.GENERAL_VEHICLEDATARESULT_LIST.get(VehicleDataType.VEHICLEDATA_GPS.ordinal()).serializeJSON()); + result.put(SubscribeVehicleDataResponse.KEY_FUEL_LEVEL_STATE, TestValues.GENERAL_VEHICLEDATARESULT_LIST.get(VehicleDataType.VEHICLEDATA_FUELLEVEL_STATE.ordinal()).serializeJSON()); + result.put(SubscribeVehicleDataResponse.KEY_INSTANT_FUEL_CONSUMPTION, TestValues.GENERAL_VEHICLEDATARESULT_LIST.get(VehicleDataType.VEHICLEDATA_FUELCONSUMPTION.ordinal()).serializeJSON()); + result.put(SubscribeVehicleDataResponse.KEY_BELT_STATUS, TestValues.GENERAL_VEHICLEDATARESULT_LIST.get(VehicleDataType.VEHICLEDATA_BELTSTATUS.ordinal()).serializeJSON()); + result.put(SubscribeVehicleDataResponse.KEY_BODY_INFORMATION, TestValues.GENERAL_VEHICLEDATARESULT_LIST.get(VehicleDataType.VEHICLEDATA_BODYINFO.ordinal()).serializeJSON()); + result.put(SubscribeVehicleDataResponse.KEY_DEVICE_STATUS, TestValues.GENERAL_VEHICLEDATARESULT_LIST.get(VehicleDataType.VEHICLEDATA_DEVICESTATUS.ordinal()).serializeJSON()); + result.put(SubscribeVehicleDataResponse.KEY_DRIVER_BRAKING, TestValues.GENERAL_VEHICLEDATARESULT_LIST.get(VehicleDataType.VEHICLEDATA_BRAKING.ordinal()).serializeJSON()); + result.put(SubscribeVehicleDataResponse.KEY_WIPER_STATUS, TestValues.GENERAL_VEHICLEDATARESULT_LIST.get(VehicleDataType.VEHICLEDATA_WIPERSTATUS.ordinal()).serializeJSON()); + result.put(SubscribeVehicleDataResponse.KEY_HEAD_LAMP_STATUS, TestValues.GENERAL_VEHICLEDATARESULT_LIST.get(VehicleDataType.VEHICLEDATA_HEADLAMPSTATUS.ordinal()).serializeJSON()); + result.put(SubscribeVehicleDataResponse.KEY_ACC_PEDAL_POSITION, TestValues.GENERAL_VEHICLEDATARESULT_LIST.get(VehicleDataType.VEHICLEDATA_ACCPEDAL.ordinal()).serializeJSON()); + result.put(SubscribeVehicleDataResponse.KEY_STEERING_WHEEL_ANGLE, TestValues.GENERAL_VEHICLEDATARESULT_LIST.get(VehicleDataType.VEHICLEDATA_STEERINGWHEEL.ordinal()).serializeJSON()); + result.put(SubscribeVehicleDataResponse.KEY_E_CALL_INFO, TestValues.GENERAL_VEHICLEDATARESULT_LIST.get(VehicleDataType.VEHICLEDATA_ECALLINFO.ordinal()).serializeJSON()); + result.put(SubscribeVehicleDataResponse.KEY_AIRBAG_STATUS, TestValues.GENERAL_VEHICLEDATARESULT_LIST.get(VehicleDataType.VEHICLEDATA_AIRBAGSTATUS.ordinal()).serializeJSON()); + result.put(SubscribeVehicleDataResponse.KEY_EMERGENCY_EVENT, TestValues.GENERAL_VEHICLEDATARESULT_LIST.get(VehicleDataType.VEHICLEDATA_EMERGENCYEVENT.ordinal()).serializeJSON()); + result.put(SubscribeVehicleDataResponse.KEY_CLUSTER_MODES, TestValues.GENERAL_VEHICLEDATARESULT_LIST.get(VehicleDataType.VEHICLEDATA_CLUSTERMODESTATUS.ordinal()).serializeJSON()); + result.put(SubscribeVehicleDataResponse.KEY_MY_KEY, TestValues.GENERAL_VEHICLEDATARESULT_LIST.get(VehicleDataType.VEHICLEDATA_MYKEY.ordinal()).serializeJSON()); + result.put(SubscribeVehicleDataResponse.KEY_FUEL_RANGE, TestValues.GENERAL_VEHICLEDATARESULT_LIST.get(VehicleDataType.VEHICLEDATA_FUELRANGE.ordinal()).serializeJSON()); + result.put(SubscribeVehicleDataResponse.KEY_TURN_SIGNAL, TestValues.GENERAL_VEHICLEDATARESULT_LIST.get(VehicleDataType.VEHICLEDATA_TURNSIGNAL.ordinal()).serializeJSON()); + result.put(SubscribeVehicleDataResponse.KEY_WINDOW_STATUS, TestValues.GENERAL_VEHICLEDATARESULT_LIST.get(VehicleDataType.VEHICLEDATA_WINDOWSTATUS.ordinal()).serializeJSON()); + result.put(SubscribeVehicleDataResponse.KEY_GEAR_STATUS, TestValues.GENERAL_VEHICLEDATARESULT_LIST.get(VehicleDataType.VEHICLEDATA_GEARSTATUS.ordinal()).serializeJSON()); + result.put(SubscribeVehicleDataResponse.KEY_STABILITY_CONTROLS_STATUS, TestValues.GENERAL_VEHICLEDATARESULT_LIST.get(VehicleDataType.VEHICLEDATA_STABILITYCONTROLSSTATUS.ordinal()).serializeJSON()); + result.put(SubscribeVehicleDataResponse.KEY_ELECTRONIC_PARK_BRAKE_STATUS, TestValues.GENERAL_VEHICLEDATARESULT_LIST.get(VehicleDataType.VEHICLEDATA_ELECTRONICPARKBRAKESTATUS.ordinal()).serializeJSON()); + result.put(SubscribeVehicleDataResponse.KEY_HANDS_OFF_STEERING, TestValues.GENERAL_VEHICLEDATARESULT_LIST.get(VehicleDataType.VEHICLEDATA_HANDSOFFSTEERING.ordinal()).serializeJSON()); + result.put(TestValues.GENERAL_OEM_CUSTOM_VEHICLE_DATA_NAME, TestValues.GENERAL_OEM_CUSTOM_VEHICLE_DATA.serializeJSON()); + } catch (JSONException e) { + fail(TestValues.JSON_FAIL); + } + + return result; + } + + /** + * Tests the expected values of the RPC message. + */ + @Test + public void testRpcValues() { + // Test Values + Result testResult = ((SubscribeVehicleDataResponse) msg).getResultCode(); + VehicleDataResult testGps = ((SubscribeVehicleDataResponse) msg).getGps(); + VehicleDataResult testOdometer = ((SubscribeVehicleDataResponse) msg).getOdometer(); + VehicleDataResult testTirePressure = ((SubscribeVehicleDataResponse) msg).getTirePressure(); + VehicleDataResult testBeltStatus = ((SubscribeVehicleDataResponse) msg).getBeltStatus(); + VehicleDataResult testBodyInfo = ((SubscribeVehicleDataResponse) msg).getBodyInformation(); + VehicleDataResult testDeviceStatus = ((SubscribeVehicleDataResponse) msg).getDeviceStatus(); + VehicleDataResult testHeadLampStatus = ((SubscribeVehicleDataResponse) msg).getHeadLampStatus(); + VehicleDataResult testECallInfo = ((SubscribeVehicleDataResponse) msg).getECallInfo(); + VehicleDataResult testAirbagStatus = ((SubscribeVehicleDataResponse) msg).getAirbagStatus(); + VehicleDataResult testEmergencyEvent = ((SubscribeVehicleDataResponse) msg).getEmergencyEvent(); + VehicleDataResult testClusterMode = ((SubscribeVehicleDataResponse) msg).getClusterModes(); + VehicleDataResult testMyKey = ((SubscribeVehicleDataResponse) msg).getMyKey(); + VehicleDataResult testSpeed = ((SubscribeVehicleDataResponse) msg).getSpeed(); + VehicleDataResult testRpm = ((SubscribeVehicleDataResponse) msg).getRpm(); + VehicleDataResult testFuelLevel = ((SubscribeVehicleDataResponse) msg).getFuelLevel(); + VehicleDataResult testConsumption = ((SubscribeVehicleDataResponse) msg).getInstantFuelConsumption(); + VehicleDataResult testExternalTemp = ((SubscribeVehicleDataResponse) msg).getExternalTemperature(); + VehicleDataResult testEngineTorque = ((SubscribeVehicleDataResponse) msg).getEngineTorque(); + VehicleDataResult testEngineOilLife = ((SubscribeVehicleDataResponse) msg).getEngineOilLife(); + VehicleDataResult testAccPedal = ((SubscribeVehicleDataResponse) msg).getAccPedalPosition(); + VehicleDataResult testSteeringWheel = ((SubscribeVehicleDataResponse) msg).getSteeringWheelAngle(); + VehicleDataResult testFuelLevelState = ((SubscribeVehicleDataResponse) msg).getFuelLevelState(); + VehicleDataResult testPrndl = ((SubscribeVehicleDataResponse) msg).getPrndl(); + VehicleDataResult testBraking = ((SubscribeVehicleDataResponse) msg).getDriverBraking(); + VehicleDataResult testWiperStatus = ((SubscribeVehicleDataResponse) msg).getWiperStatus(); + VehicleDataResult testFuelRange = ((SubscribeVehicleDataResponse) msg).getFuelRange(); + VehicleDataResult testTurnSignal = ((SubscribeVehicleDataResponse) msg).getTurnSignal(); + VehicleDataResult testEBrakeStatus = ((SubscribeVehicleDataResponse) msg).getElectronicParkBrakeStatus(); + VehicleDataResult testHOffSteering = ((SubscribeVehicleDataResponse) msg).getHandsOffSteering(); + VehicleDataResult testWindowStatus = ((SubscribeVehicleDataResponse) msg).getWindowStatus(); + VehicleDataResult testGearStatus = ((SubscribeVehicleDataResponse) msg).getGearStatus(); + VehicleDataResult testStabilityControlStatus = ((SubscribeVehicleDataResponse) msg).getStabilityControlsStatus(); + VehicleDataResult testOEMCustomVehicleData = ((SubscribeVehicleDataResponse) msg).getOEMCustomVehicleData(TestValues.GENERAL_OEM_CUSTOM_VEHICLE_DATA_NAME); + + // Valid Tests + assertTrue(TestValues.TRUE, testResult.equals(TestValues.GENERAL_RESULT)); + assertTrue(TestValues.TRUE, testGps.getDataType().equals(VehicleDataType.VEHICLEDATA_GPS)); + assertTrue(TestValues.TRUE, testOdometer.getDataType().equals(VehicleDataType.VEHICLEDATA_ODOMETER)); + assertTrue(TestValues.TRUE, testTirePressure.getDataType().equals(VehicleDataType.VEHICLEDATA_TIREPRESSURE)); + assertTrue(TestValues.TRUE, testBeltStatus.getDataType().equals(VehicleDataType.VEHICLEDATA_BELTSTATUS)); + assertTrue(TestValues.TRUE, testBodyInfo.getDataType().equals(VehicleDataType.VEHICLEDATA_BODYINFO)); + assertTrue(TestValues.TRUE, testDeviceStatus.getDataType().equals(VehicleDataType.VEHICLEDATA_DEVICESTATUS)); + assertTrue(TestValues.TRUE, testHeadLampStatus.getDataType().equals(VehicleDataType.VEHICLEDATA_HEADLAMPSTATUS)); + assertTrue(TestValues.TRUE, testECallInfo.getDataType().equals(VehicleDataType.VEHICLEDATA_ECALLINFO)); + assertTrue(TestValues.TRUE, testAirbagStatus.getDataType().equals(VehicleDataType.VEHICLEDATA_AIRBAGSTATUS)); + assertTrue(TestValues.TRUE, testEmergencyEvent.getDataType().equals(VehicleDataType.VEHICLEDATA_EMERGENCYEVENT)); + assertTrue(TestValues.TRUE, testClusterMode.getDataType().equals(VehicleDataType.VEHICLEDATA_CLUSTERMODESTATUS)); + assertTrue(TestValues.TRUE, testMyKey.getDataType().equals(VehicleDataType.VEHICLEDATA_MYKEY)); + assertTrue(TestValues.TRUE, testSpeed.getDataType().equals(VehicleDataType.VEHICLEDATA_SPEED)); + assertTrue(TestValues.TRUE, testRpm.getDataType().equals(VehicleDataType.VEHICLEDATA_RPM)); + assertTrue(TestValues.TRUE, testFuelLevel.getDataType().equals(VehicleDataType.VEHICLEDATA_FUELLEVEL)); + assertTrue(TestValues.TRUE, testConsumption.getDataType().equals(VehicleDataType.VEHICLEDATA_FUELCONSUMPTION)); + assertTrue(TestValues.TRUE, testExternalTemp.getDataType().equals(VehicleDataType.VEHICLEDATA_EXTERNTEMP)); + assertTrue(TestValues.TRUE, testEngineTorque.getDataType().equals(VehicleDataType.VEHICLEDATA_ENGINETORQUE)); + assertTrue(TestValues.TRUE, testEngineOilLife.getDataType().equals(VehicleDataType.VEHICLEDATA_ENGINEOILLIFE)); + assertTrue(TestValues.TRUE, testAccPedal.getDataType().equals(VehicleDataType.VEHICLEDATA_ACCPEDAL)); + assertTrue(TestValues.TRUE, testSteeringWheel.getDataType().equals(VehicleDataType.VEHICLEDATA_STEERINGWHEEL)); + assertTrue(TestValues.TRUE, testFuelLevelState.getDataType().equals(VehicleDataType.VEHICLEDATA_FUELLEVEL_STATE)); + assertTrue(TestValues.TRUE, testPrndl.getDataType().equals(VehicleDataType.VEHICLEDATA_PRNDL)); + assertTrue(TestValues.TRUE, testBraking.getDataType().equals(VehicleDataType.VEHICLEDATA_BRAKING)); + assertTrue(TestValues.TRUE, testWiperStatus.getDataType().equals(VehicleDataType.VEHICLEDATA_WIPERSTATUS)); + assertTrue(TestValues.TRUE, testFuelRange.getDataType().equals(VehicleDataType.VEHICLEDATA_FUELRANGE)); + assertTrue(TestValues.TRUE, testTurnSignal.getDataType().equals(VehicleDataType.VEHICLEDATA_TURNSIGNAL)); + assertTrue(TestValues.TRUE, testEBrakeStatus.getDataType().equals(VehicleDataType.VEHICLEDATA_ELECTRONICPARKBRAKESTATUS)); + assertTrue(TestValues.TRUE, testHOffSteering.getDataType().equals(VehicleDataType.VEHICLEDATA_HANDSOFFSTEERING)); + assertTrue(TestValues.TRUE, testGearStatus.getDataType().equals(VehicleDataType.VEHICLEDATA_GEARSTATUS)); + assertTrue(TestValues.TRUE, testWindowStatus.getDataType().equals(VehicleDataType.VEHICLEDATA_WINDOWSTATUS)); + assertTrue(TestValues.TRUE, testStabilityControlStatus.getDataType().equals(VehicleDataType.VEHICLEDATA_STABILITYCONTROLSSTATUS)); + assertTrue(TestValues.TRUE, testOEMCustomVehicleData.getOEMCustomVehicleDataType().equals(TestValues.GENERAL_OEM_CUSTOM_VEHICLE_DATA_NAME)); + // Invalid/Null Tests - SubscribeVehicleDataResponse msg = new SubscribeVehicleDataResponse(); - assertNotNull("Null object creation failed.", msg); + SubscribeVehicleDataResponse msg = new SubscribeVehicleDataResponse(); + assertNotNull("Null object creation failed.", msg); testNullBase(msg); - assertNull(TestValues.NULL, msg.getResultCode()); + assertNull(TestValues.NULL, msg.getResultCode()); assertNull(TestValues.NULL, msg.getAccPedalPosition()); assertNull(TestValues.NULL, msg.getAirbagStatus()); assertNull(TestValues.NULL, msg.getBeltStatus()); @@ -252,161 +252,161 @@ public class SubscribeVehicleDataResponseTest extends BaseRpcTests { assertNull(TestValues.NULL, msg.getStabilityControlsStatus()); assertNull(TestValues.NULL, msg.getOEMCustomVehicleData(TestValues.GENERAL_OEM_CUSTOM_VEHICLE_DATA_NAME)); } - + /** * Tests a valid JSON construction of this RPC message. */ @Test - public void testJsonConstructor () { - JSONObject commandJson = JsonFileReader.readId(getInstrumentation().getContext(), getCommandType(), getMessageType()); - assertNotNull(TestValues.NOT_NULL, commandJson); - - try { - Hashtable<String, Object> hash = JsonRPCMarshaller.deserializeJSONObject(commandJson); - SubscribeVehicleDataResponse cmd = new SubscribeVehicleDataResponse(hash); - - JSONObject body = JsonUtils.readJsonObjectFromJsonObject(commandJson, getMessageType()); - assertNotNull(TestValues.NOT_NULL, body); - - // Test everything in the json body. - assertEquals(TestValues.MATCH, JsonUtils.readStringFromJsonObject(body, RPCMessage.KEY_FUNCTION_NAME), cmd.getFunctionName()); - assertEquals(TestValues.MATCH, JsonUtils.readIntegerFromJsonObject(body, RPCMessage.KEY_CORRELATION_ID), cmd.getCorrelationID()); - - JSONObject parameters = JsonUtils.readJsonObjectFromJsonObject(body, RPCMessage.KEY_PARAMETERS); - - JSONObject speed = JsonUtils.readJsonObjectFromJsonObject(parameters, SubscribeVehicleDataResponse.KEY_SPEED); - VehicleDataResult referenceSpeed = new VehicleDataResult(JsonRPCMarshaller.deserializeJSONObject(speed)); - assertTrue(TestValues.TRUE, Validator.validateVehicleDataResult(referenceSpeed, cmd.getSpeed())); - - JSONObject rpm = JsonUtils.readJsonObjectFromJsonObject(parameters, SubscribeVehicleDataResponse.KEY_RPM); - VehicleDataResult referenceRpm = new VehicleDataResult(JsonRPCMarshaller.deserializeJSONObject(rpm)); - assertTrue(TestValues.TRUE, Validator.validateVehicleDataResult(referenceRpm, cmd.getRpm())); - - JSONObject fuelLevel = JsonUtils.readJsonObjectFromJsonObject(parameters, SubscribeVehicleDataResponse.KEY_FUEL_LEVEL); - VehicleDataResult referenceFuelLevel = new VehicleDataResult(JsonRPCMarshaller.deserializeJSONObject(fuelLevel)); - assertTrue(TestValues.TRUE, Validator.validateVehicleDataResult(referenceFuelLevel, cmd.getFuelLevel())); - - JSONObject externalTemperature = JsonUtils.readJsonObjectFromJsonObject(parameters, SubscribeVehicleDataResponse.KEY_EXTERNAL_TEMPERATURE); - VehicleDataResult referenceExternalTemperature = new VehicleDataResult(JsonRPCMarshaller.deserializeJSONObject(externalTemperature)); - assertTrue(TestValues.TRUE, Validator.validateVehicleDataResult(referenceExternalTemperature, cmd.getExternalTemperature())); - - JSONObject prndl = JsonUtils.readJsonObjectFromJsonObject(parameters, SubscribeVehicleDataResponse.KEY_PRNDL); - VehicleDataResult referencePrndl = new VehicleDataResult(JsonRPCMarshaller.deserializeJSONObject(prndl)); - assertTrue(TestValues.TRUE, Validator.validateVehicleDataResult(referencePrndl, cmd.getPrndl())); - - JSONObject tirePressure = JsonUtils.readJsonObjectFromJsonObject(parameters, SubscribeVehicleDataResponse.KEY_TIRE_PRESSURE); - VehicleDataResult referenceTirePressure = new VehicleDataResult(JsonRPCMarshaller.deserializeJSONObject(tirePressure)); - assertTrue(TestValues.TRUE, Validator.validateVehicleDataResult(referenceTirePressure, cmd.getTirePressure())); - - JSONObject engineTorque = JsonUtils.readJsonObjectFromJsonObject(parameters, SubscribeVehicleDataResponse.KEY_ENGINE_TORQUE); - VehicleDataResult referenceEngineTorque = new VehicleDataResult(JsonRPCMarshaller.deserializeJSONObject(engineTorque)); - assertTrue(TestValues.TRUE, Validator.validateVehicleDataResult(referenceEngineTorque, cmd.getEngineTorque())); - - JSONObject engineOilLife = JsonUtils.readJsonObjectFromJsonObject(parameters, SubscribeVehicleDataResponse.KEY_ENGINE_OIL_LIFE); - VehicleDataResult referenceEngineOilLife = new VehicleDataResult(JsonRPCMarshaller.deserializeJSONObject(engineOilLife)); - assertTrue(TestValues.TRUE, Validator.validateVehicleDataResult(referenceEngineOilLife, cmd.getEngineOilLife())); - - JSONObject odometer = JsonUtils.readJsonObjectFromJsonObject(parameters, SubscribeVehicleDataResponse.KEY_ODOMETER); - VehicleDataResult referenceOdometer = new VehicleDataResult(JsonRPCMarshaller.deserializeJSONObject(odometer)); - assertTrue(TestValues.TRUE, Validator.validateVehicleDataResult(referenceOdometer, cmd.getOdometer())); - - JSONObject gps = JsonUtils.readJsonObjectFromJsonObject(parameters, SubscribeVehicleDataResponse.KEY_GPS); - VehicleDataResult referenceGps = new VehicleDataResult(JsonRPCMarshaller.deserializeJSONObject(gps)); - assertTrue(TestValues.TRUE, Validator.validateVehicleDataResult(referenceGps, cmd.getGps())); - - JSONObject fuelLevelState = JsonUtils.readJsonObjectFromJsonObject(parameters, SubscribeVehicleDataResponse.KEY_FUEL_LEVEL_STATE); - VehicleDataResult referenceFuelLevelState = new VehicleDataResult(JsonRPCMarshaller.deserializeJSONObject(fuelLevelState)); - assertTrue(TestValues.TRUE, Validator.validateVehicleDataResult(referenceFuelLevelState, cmd.getFuelLevelState())); - - JSONObject fuelConsumption = JsonUtils.readJsonObjectFromJsonObject(parameters, SubscribeVehicleDataResponse.KEY_INSTANT_FUEL_CONSUMPTION); - VehicleDataResult referenceFuelConsumption = new VehicleDataResult(JsonRPCMarshaller.deserializeJSONObject(fuelConsumption)); - assertTrue(TestValues.TRUE, Validator.validateVehicleDataResult(referenceFuelConsumption, cmd.getInstantFuelConsumption())); - - JSONObject beltStatus = JsonUtils.readJsonObjectFromJsonObject(parameters, SubscribeVehicleDataResponse.KEY_BELT_STATUS); - VehicleDataResult referenceBeltStatus = new VehicleDataResult(JsonRPCMarshaller.deserializeJSONObject(beltStatus)); - assertTrue(TestValues.TRUE, Validator.validateVehicleDataResult(referenceBeltStatus, cmd.getBeltStatus())); - - JSONObject bodyInformation = JsonUtils.readJsonObjectFromJsonObject(parameters, SubscribeVehicleDataResponse.KEY_BODY_INFORMATION); - VehicleDataResult referenceBodyInformation = new VehicleDataResult(JsonRPCMarshaller.deserializeJSONObject(bodyInformation)); - assertTrue(TestValues.TRUE, Validator.validateVehicleDataResult(referenceBodyInformation, cmd.getBodyInformation())); - - JSONObject deviceStatus = JsonUtils.readJsonObjectFromJsonObject(parameters, SubscribeVehicleDataResponse.KEY_DEVICE_STATUS); - VehicleDataResult referenceDeviceStatus = new VehicleDataResult(JsonRPCMarshaller.deserializeJSONObject(deviceStatus)); - assertTrue(TestValues.TRUE, Validator.validateVehicleDataResult(referenceDeviceStatus, cmd.getDeviceStatus())); - - JSONObject driverBraking = JsonUtils.readJsonObjectFromJsonObject(parameters, SubscribeVehicleDataResponse.KEY_DRIVER_BRAKING); - VehicleDataResult referenceDriverBraking = new VehicleDataResult(JsonRPCMarshaller.deserializeJSONObject(driverBraking)); - assertTrue(TestValues.TRUE, Validator.validateVehicleDataResult(referenceDriverBraking, cmd.getDriverBraking())); - - JSONObject wiperStatus = JsonUtils.readJsonObjectFromJsonObject(parameters, SubscribeVehicleDataResponse.KEY_WIPER_STATUS); - VehicleDataResult referenceWiperStatus = new VehicleDataResult(JsonRPCMarshaller.deserializeJSONObject(wiperStatus)); - assertTrue(TestValues.TRUE, Validator.validateVehicleDataResult(referenceWiperStatus, cmd.getWiperStatus())); - - JSONObject headLampStatus = JsonUtils.readJsonObjectFromJsonObject(parameters, SubscribeVehicleDataResponse.KEY_HEAD_LAMP_STATUS); - VehicleDataResult referenceHeadLampStatus = new VehicleDataResult(JsonRPCMarshaller.deserializeJSONObject(headLampStatus)); - assertTrue(TestValues.TRUE, Validator.validateVehicleDataResult(referenceHeadLampStatus, cmd.getHeadLampStatus())); - - JSONObject accPedalPosition = JsonUtils.readJsonObjectFromJsonObject(parameters, SubscribeVehicleDataResponse.KEY_ACC_PEDAL_POSITION); - VehicleDataResult referenceAccPedalPosition = new VehicleDataResult(JsonRPCMarshaller.deserializeJSONObject(accPedalPosition)); - assertTrue(TestValues.TRUE, Validator.validateVehicleDataResult(referenceAccPedalPosition, cmd.getAccPedalPosition())); - - JSONObject steeringWheelAngle = JsonUtils.readJsonObjectFromJsonObject(parameters, SubscribeVehicleDataResponse.KEY_STEERING_WHEEL_ANGLE); - VehicleDataResult referenceSteeringWheelAngle = new VehicleDataResult(JsonRPCMarshaller.deserializeJSONObject(steeringWheelAngle)); - assertTrue(TestValues.TRUE, Validator.validateVehicleDataResult(referenceSteeringWheelAngle, cmd.getSteeringWheelAngle())); - - JSONObject eCallInfo = JsonUtils.readJsonObjectFromJsonObject(parameters, SubscribeVehicleDataResponse.KEY_E_CALL_INFO); - VehicleDataResult referenceECallInfo = new VehicleDataResult(JsonRPCMarshaller.deserializeJSONObject(eCallInfo)); - assertTrue(TestValues.TRUE, Validator.validateVehicleDataResult(referenceECallInfo, cmd.getECallInfo())); - - JSONObject airbagStatus = JsonUtils.readJsonObjectFromJsonObject(parameters, SubscribeVehicleDataResponse.KEY_AIRBAG_STATUS); - VehicleDataResult referenceAirbagStatus = new VehicleDataResult(JsonRPCMarshaller.deserializeJSONObject(airbagStatus)); - assertTrue(TestValues.TRUE, Validator.validateVehicleDataResult(referenceAirbagStatus, cmd.getAirbagStatus())); - - JSONObject emergencyEvent = JsonUtils.readJsonObjectFromJsonObject(parameters, SubscribeVehicleDataResponse.KEY_EMERGENCY_EVENT); - VehicleDataResult referenceEmergencyEvent = new VehicleDataResult(JsonRPCMarshaller.deserializeJSONObject(emergencyEvent)); - assertTrue(TestValues.TRUE, Validator.validateVehicleDataResult(referenceEmergencyEvent, cmd.getEmergencyEvent())); - - JSONObject clusterModes = JsonUtils.readJsonObjectFromJsonObject(parameters, SubscribeVehicleDataResponse.KEY_CLUSTER_MODES); - VehicleDataResult referenceClusterModes = new VehicleDataResult(JsonRPCMarshaller.deserializeJSONObject(clusterModes)); - assertTrue(TestValues.TRUE, Validator.validateVehicleDataResult(referenceClusterModes, cmd.getClusterModes())); - - JSONObject myKey = JsonUtils.readJsonObjectFromJsonObject(parameters, SubscribeVehicleDataResponse.KEY_MY_KEY); - VehicleDataResult referenceMyKey = new VehicleDataResult(JsonRPCMarshaller.deserializeJSONObject(myKey)); - assertTrue(TestValues.TRUE, Validator.validateVehicleDataResult(referenceMyKey, cmd.getMyKey())); - - JSONObject fuelRange = JsonUtils.readJsonObjectFromJsonObject(parameters, SubscribeVehicleDataResponse.KEY_FUEL_RANGE); - VehicleDataResult referenceFuelRange = new VehicleDataResult(JsonRPCMarshaller.deserializeJSONObject(fuelRange)); - assertTrue(TestValues.TRUE, Validator.validateVehicleDataResult(referenceFuelRange, cmd.getFuelRange())); - - JSONObject turnSignal = JsonUtils.readJsonObjectFromJsonObject(parameters, SubscribeVehicleDataResponse.KEY_TURN_SIGNAL); - VehicleDataResult referenceTurnSignal = new VehicleDataResult(JsonRPCMarshaller.deserializeJSONObject(turnSignal)); - assertTrue(TestValues.TRUE, Validator.validateVehicleDataResult(referenceTurnSignal, cmd.getTurnSignal())); - - JSONObject electronicParkBrakeStatus = JsonUtils.readJsonObjectFromJsonObject(parameters, SubscribeVehicleDataResponse.KEY_ELECTRONIC_PARK_BRAKE_STATUS); - VehicleDataResult referenceEBrakeStatus = new VehicleDataResult(JsonRPCMarshaller.deserializeJSONObject(electronicParkBrakeStatus)); - assertTrue(TestValues.TRUE, Validator.validateVehicleDataResult(referenceEBrakeStatus, cmd.getElectronicParkBrakeStatus())); - - JSONObject handsOffSteering = JsonUtils.readJsonObjectFromJsonObject(parameters, SubscribeVehicleDataResponse.KEY_HANDS_OFF_STEERING); - VehicleDataResult referenceHandsOffSteering = new VehicleDataResult(JsonRPCMarshaller.deserializeJSONObject(handsOffSteering)); - assertTrue(TestValues.TRUE, Validator.validateVehicleDataResult(referenceHandsOffSteering, cmd.getHandsOffSteering())); - - JSONObject windowStatus = JsonUtils.readJsonObjectFromJsonObject(parameters, SubscribeVehicleDataResponse.KEY_WINDOW_STATUS); - VehicleDataResult referenceWindowStatus = new VehicleDataResult(JsonRPCMarshaller.deserializeJSONObject(windowStatus)); - assertTrue(TestValues.TRUE, Validator.validateVehicleDataResult(referenceWindowStatus, cmd.getWindowStatus())); - - JSONObject gearStatus = JsonUtils.readJsonObjectFromJsonObject(parameters, SubscribeVehicleDataResponse.KEY_GEAR_STATUS); - VehicleDataResult referenceGearStatus = new VehicleDataResult(JsonRPCMarshaller.deserializeJSONObject(gearStatus)); - assertTrue(TestValues.TRUE, Validator.validateVehicleDataResult(referenceGearStatus, cmd.getGearStatus())); - - JSONObject stabilityControlStatus = JsonUtils.readJsonObjectFromJsonObject(parameters, SubscribeVehicleDataResponse.KEY_STABILITY_CONTROLS_STATUS); - VehicleDataResult referenceStabilityControlStatus = new VehicleDataResult(JsonRPCMarshaller.deserializeJSONObject(stabilityControlStatus)); - assertTrue(TestValues.TRUE, Validator.validateStabilityControlStatus(referenceStabilityControlStatus, cmd.getStabilityControlsStatus())); - - JSONObject oemCustomVehicleDataName = JsonUtils.readJsonObjectFromJsonObject(parameters, TestValues.GENERAL_OEM_CUSTOM_VEHICLE_DATA_NAME); - VehicleDataResult referenceOemCustomData = new VehicleDataResult(JsonRPCMarshaller.deserializeJSONObject(oemCustomVehicleDataName)); - assertTrue(TestValues.TRUE, Validator.validateVehicleDataResult(referenceOemCustomData, cmd.getOEMCustomVehicleData(TestValues.GENERAL_OEM_CUSTOM_VEHICLE_DATA_NAME))); - } catch (JSONException e) { - e.printStackTrace(); - } + public void testJsonConstructor() { + JSONObject commandJson = JsonFileReader.readId(getInstrumentation().getContext(), getCommandType(), getMessageType()); + assertNotNull(TestValues.NOT_NULL, commandJson); + + try { + Hashtable<String, Object> hash = JsonRPCMarshaller.deserializeJSONObject(commandJson); + SubscribeVehicleDataResponse cmd = new SubscribeVehicleDataResponse(hash); + + JSONObject body = JsonUtils.readJsonObjectFromJsonObject(commandJson, getMessageType()); + assertNotNull(TestValues.NOT_NULL, body); + + // Test everything in the json body. + assertEquals(TestValues.MATCH, JsonUtils.readStringFromJsonObject(body, RPCMessage.KEY_FUNCTION_NAME), cmd.getFunctionName()); + assertEquals(TestValues.MATCH, JsonUtils.readIntegerFromJsonObject(body, RPCMessage.KEY_CORRELATION_ID), cmd.getCorrelationID()); + + JSONObject parameters = JsonUtils.readJsonObjectFromJsonObject(body, RPCMessage.KEY_PARAMETERS); + + JSONObject speed = JsonUtils.readJsonObjectFromJsonObject(parameters, SubscribeVehicleDataResponse.KEY_SPEED); + VehicleDataResult referenceSpeed = new VehicleDataResult(JsonRPCMarshaller.deserializeJSONObject(speed)); + assertTrue(TestValues.TRUE, Validator.validateVehicleDataResult(referenceSpeed, cmd.getSpeed())); + + JSONObject rpm = JsonUtils.readJsonObjectFromJsonObject(parameters, SubscribeVehicleDataResponse.KEY_RPM); + VehicleDataResult referenceRpm = new VehicleDataResult(JsonRPCMarshaller.deserializeJSONObject(rpm)); + assertTrue(TestValues.TRUE, Validator.validateVehicleDataResult(referenceRpm, cmd.getRpm())); + + JSONObject fuelLevel = JsonUtils.readJsonObjectFromJsonObject(parameters, SubscribeVehicleDataResponse.KEY_FUEL_LEVEL); + VehicleDataResult referenceFuelLevel = new VehicleDataResult(JsonRPCMarshaller.deserializeJSONObject(fuelLevel)); + assertTrue(TestValues.TRUE, Validator.validateVehicleDataResult(referenceFuelLevel, cmd.getFuelLevel())); + + JSONObject externalTemperature = JsonUtils.readJsonObjectFromJsonObject(parameters, SubscribeVehicleDataResponse.KEY_EXTERNAL_TEMPERATURE); + VehicleDataResult referenceExternalTemperature = new VehicleDataResult(JsonRPCMarshaller.deserializeJSONObject(externalTemperature)); + assertTrue(TestValues.TRUE, Validator.validateVehicleDataResult(referenceExternalTemperature, cmd.getExternalTemperature())); + + JSONObject prndl = JsonUtils.readJsonObjectFromJsonObject(parameters, SubscribeVehicleDataResponse.KEY_PRNDL); + VehicleDataResult referencePrndl = new VehicleDataResult(JsonRPCMarshaller.deserializeJSONObject(prndl)); + assertTrue(TestValues.TRUE, Validator.validateVehicleDataResult(referencePrndl, cmd.getPrndl())); + + JSONObject tirePressure = JsonUtils.readJsonObjectFromJsonObject(parameters, SubscribeVehicleDataResponse.KEY_TIRE_PRESSURE); + VehicleDataResult referenceTirePressure = new VehicleDataResult(JsonRPCMarshaller.deserializeJSONObject(tirePressure)); + assertTrue(TestValues.TRUE, Validator.validateVehicleDataResult(referenceTirePressure, cmd.getTirePressure())); + + JSONObject engineTorque = JsonUtils.readJsonObjectFromJsonObject(parameters, SubscribeVehicleDataResponse.KEY_ENGINE_TORQUE); + VehicleDataResult referenceEngineTorque = new VehicleDataResult(JsonRPCMarshaller.deserializeJSONObject(engineTorque)); + assertTrue(TestValues.TRUE, Validator.validateVehicleDataResult(referenceEngineTorque, cmd.getEngineTorque())); + + JSONObject engineOilLife = JsonUtils.readJsonObjectFromJsonObject(parameters, SubscribeVehicleDataResponse.KEY_ENGINE_OIL_LIFE); + VehicleDataResult referenceEngineOilLife = new VehicleDataResult(JsonRPCMarshaller.deserializeJSONObject(engineOilLife)); + assertTrue(TestValues.TRUE, Validator.validateVehicleDataResult(referenceEngineOilLife, cmd.getEngineOilLife())); + + JSONObject odometer = JsonUtils.readJsonObjectFromJsonObject(parameters, SubscribeVehicleDataResponse.KEY_ODOMETER); + VehicleDataResult referenceOdometer = new VehicleDataResult(JsonRPCMarshaller.deserializeJSONObject(odometer)); + assertTrue(TestValues.TRUE, Validator.validateVehicleDataResult(referenceOdometer, cmd.getOdometer())); + + JSONObject gps = JsonUtils.readJsonObjectFromJsonObject(parameters, SubscribeVehicleDataResponse.KEY_GPS); + VehicleDataResult referenceGps = new VehicleDataResult(JsonRPCMarshaller.deserializeJSONObject(gps)); + assertTrue(TestValues.TRUE, Validator.validateVehicleDataResult(referenceGps, cmd.getGps())); + + JSONObject fuelLevelState = JsonUtils.readJsonObjectFromJsonObject(parameters, SubscribeVehicleDataResponse.KEY_FUEL_LEVEL_STATE); + VehicleDataResult referenceFuelLevelState = new VehicleDataResult(JsonRPCMarshaller.deserializeJSONObject(fuelLevelState)); + assertTrue(TestValues.TRUE, Validator.validateVehicleDataResult(referenceFuelLevelState, cmd.getFuelLevelState())); + + JSONObject fuelConsumption = JsonUtils.readJsonObjectFromJsonObject(parameters, SubscribeVehicleDataResponse.KEY_INSTANT_FUEL_CONSUMPTION); + VehicleDataResult referenceFuelConsumption = new VehicleDataResult(JsonRPCMarshaller.deserializeJSONObject(fuelConsumption)); + assertTrue(TestValues.TRUE, Validator.validateVehicleDataResult(referenceFuelConsumption, cmd.getInstantFuelConsumption())); + + JSONObject beltStatus = JsonUtils.readJsonObjectFromJsonObject(parameters, SubscribeVehicleDataResponse.KEY_BELT_STATUS); + VehicleDataResult referenceBeltStatus = new VehicleDataResult(JsonRPCMarshaller.deserializeJSONObject(beltStatus)); + assertTrue(TestValues.TRUE, Validator.validateVehicleDataResult(referenceBeltStatus, cmd.getBeltStatus())); + + JSONObject bodyInformation = JsonUtils.readJsonObjectFromJsonObject(parameters, SubscribeVehicleDataResponse.KEY_BODY_INFORMATION); + VehicleDataResult referenceBodyInformation = new VehicleDataResult(JsonRPCMarshaller.deserializeJSONObject(bodyInformation)); + assertTrue(TestValues.TRUE, Validator.validateVehicleDataResult(referenceBodyInformation, cmd.getBodyInformation())); + + JSONObject deviceStatus = JsonUtils.readJsonObjectFromJsonObject(parameters, SubscribeVehicleDataResponse.KEY_DEVICE_STATUS); + VehicleDataResult referenceDeviceStatus = new VehicleDataResult(JsonRPCMarshaller.deserializeJSONObject(deviceStatus)); + assertTrue(TestValues.TRUE, Validator.validateVehicleDataResult(referenceDeviceStatus, cmd.getDeviceStatus())); + + JSONObject driverBraking = JsonUtils.readJsonObjectFromJsonObject(parameters, SubscribeVehicleDataResponse.KEY_DRIVER_BRAKING); + VehicleDataResult referenceDriverBraking = new VehicleDataResult(JsonRPCMarshaller.deserializeJSONObject(driverBraking)); + assertTrue(TestValues.TRUE, Validator.validateVehicleDataResult(referenceDriverBraking, cmd.getDriverBraking())); + + JSONObject wiperStatus = JsonUtils.readJsonObjectFromJsonObject(parameters, SubscribeVehicleDataResponse.KEY_WIPER_STATUS); + VehicleDataResult referenceWiperStatus = new VehicleDataResult(JsonRPCMarshaller.deserializeJSONObject(wiperStatus)); + assertTrue(TestValues.TRUE, Validator.validateVehicleDataResult(referenceWiperStatus, cmd.getWiperStatus())); + + JSONObject headLampStatus = JsonUtils.readJsonObjectFromJsonObject(parameters, SubscribeVehicleDataResponse.KEY_HEAD_LAMP_STATUS); + VehicleDataResult referenceHeadLampStatus = new VehicleDataResult(JsonRPCMarshaller.deserializeJSONObject(headLampStatus)); + assertTrue(TestValues.TRUE, Validator.validateVehicleDataResult(referenceHeadLampStatus, cmd.getHeadLampStatus())); + + JSONObject accPedalPosition = JsonUtils.readJsonObjectFromJsonObject(parameters, SubscribeVehicleDataResponse.KEY_ACC_PEDAL_POSITION); + VehicleDataResult referenceAccPedalPosition = new VehicleDataResult(JsonRPCMarshaller.deserializeJSONObject(accPedalPosition)); + assertTrue(TestValues.TRUE, Validator.validateVehicleDataResult(referenceAccPedalPosition, cmd.getAccPedalPosition())); + + JSONObject steeringWheelAngle = JsonUtils.readJsonObjectFromJsonObject(parameters, SubscribeVehicleDataResponse.KEY_STEERING_WHEEL_ANGLE); + VehicleDataResult referenceSteeringWheelAngle = new VehicleDataResult(JsonRPCMarshaller.deserializeJSONObject(steeringWheelAngle)); + assertTrue(TestValues.TRUE, Validator.validateVehicleDataResult(referenceSteeringWheelAngle, cmd.getSteeringWheelAngle())); + + JSONObject eCallInfo = JsonUtils.readJsonObjectFromJsonObject(parameters, SubscribeVehicleDataResponse.KEY_E_CALL_INFO); + VehicleDataResult referenceECallInfo = new VehicleDataResult(JsonRPCMarshaller.deserializeJSONObject(eCallInfo)); + assertTrue(TestValues.TRUE, Validator.validateVehicleDataResult(referenceECallInfo, cmd.getECallInfo())); + + JSONObject airbagStatus = JsonUtils.readJsonObjectFromJsonObject(parameters, SubscribeVehicleDataResponse.KEY_AIRBAG_STATUS); + VehicleDataResult referenceAirbagStatus = new VehicleDataResult(JsonRPCMarshaller.deserializeJSONObject(airbagStatus)); + assertTrue(TestValues.TRUE, Validator.validateVehicleDataResult(referenceAirbagStatus, cmd.getAirbagStatus())); + + JSONObject emergencyEvent = JsonUtils.readJsonObjectFromJsonObject(parameters, SubscribeVehicleDataResponse.KEY_EMERGENCY_EVENT); + VehicleDataResult referenceEmergencyEvent = new VehicleDataResult(JsonRPCMarshaller.deserializeJSONObject(emergencyEvent)); + assertTrue(TestValues.TRUE, Validator.validateVehicleDataResult(referenceEmergencyEvent, cmd.getEmergencyEvent())); + + JSONObject clusterModes = JsonUtils.readJsonObjectFromJsonObject(parameters, SubscribeVehicleDataResponse.KEY_CLUSTER_MODES); + VehicleDataResult referenceClusterModes = new VehicleDataResult(JsonRPCMarshaller.deserializeJSONObject(clusterModes)); + assertTrue(TestValues.TRUE, Validator.validateVehicleDataResult(referenceClusterModes, cmd.getClusterModes())); + + JSONObject myKey = JsonUtils.readJsonObjectFromJsonObject(parameters, SubscribeVehicleDataResponse.KEY_MY_KEY); + VehicleDataResult referenceMyKey = new VehicleDataResult(JsonRPCMarshaller.deserializeJSONObject(myKey)); + assertTrue(TestValues.TRUE, Validator.validateVehicleDataResult(referenceMyKey, cmd.getMyKey())); + + JSONObject fuelRange = JsonUtils.readJsonObjectFromJsonObject(parameters, SubscribeVehicleDataResponse.KEY_FUEL_RANGE); + VehicleDataResult referenceFuelRange = new VehicleDataResult(JsonRPCMarshaller.deserializeJSONObject(fuelRange)); + assertTrue(TestValues.TRUE, Validator.validateVehicleDataResult(referenceFuelRange, cmd.getFuelRange())); + + JSONObject turnSignal = JsonUtils.readJsonObjectFromJsonObject(parameters, SubscribeVehicleDataResponse.KEY_TURN_SIGNAL); + VehicleDataResult referenceTurnSignal = new VehicleDataResult(JsonRPCMarshaller.deserializeJSONObject(turnSignal)); + assertTrue(TestValues.TRUE, Validator.validateVehicleDataResult(referenceTurnSignal, cmd.getTurnSignal())); + + JSONObject electronicParkBrakeStatus = JsonUtils.readJsonObjectFromJsonObject(parameters, SubscribeVehicleDataResponse.KEY_ELECTRONIC_PARK_BRAKE_STATUS); + VehicleDataResult referenceEBrakeStatus = new VehicleDataResult(JsonRPCMarshaller.deserializeJSONObject(electronicParkBrakeStatus)); + assertTrue(TestValues.TRUE, Validator.validateVehicleDataResult(referenceEBrakeStatus, cmd.getElectronicParkBrakeStatus())); + + JSONObject handsOffSteering = JsonUtils.readJsonObjectFromJsonObject(parameters, SubscribeVehicleDataResponse.KEY_HANDS_OFF_STEERING); + VehicleDataResult referenceHandsOffSteering = new VehicleDataResult(JsonRPCMarshaller.deserializeJSONObject(handsOffSteering)); + assertTrue(TestValues.TRUE, Validator.validateVehicleDataResult(referenceHandsOffSteering, cmd.getHandsOffSteering())); + + JSONObject windowStatus = JsonUtils.readJsonObjectFromJsonObject(parameters, SubscribeVehicleDataResponse.KEY_WINDOW_STATUS); + VehicleDataResult referenceWindowStatus = new VehicleDataResult(JsonRPCMarshaller.deserializeJSONObject(windowStatus)); + assertTrue(TestValues.TRUE, Validator.validateVehicleDataResult(referenceWindowStatus, cmd.getWindowStatus())); + + JSONObject gearStatus = JsonUtils.readJsonObjectFromJsonObject(parameters, SubscribeVehicleDataResponse.KEY_GEAR_STATUS); + VehicleDataResult referenceGearStatus = new VehicleDataResult(JsonRPCMarshaller.deserializeJSONObject(gearStatus)); + assertTrue(TestValues.TRUE, Validator.validateVehicleDataResult(referenceGearStatus, cmd.getGearStatus())); + + JSONObject stabilityControlStatus = JsonUtils.readJsonObjectFromJsonObject(parameters, SubscribeVehicleDataResponse.KEY_STABILITY_CONTROLS_STATUS); + VehicleDataResult referenceStabilityControlStatus = new VehicleDataResult(JsonRPCMarshaller.deserializeJSONObject(stabilityControlStatus)); + assertTrue(TestValues.TRUE, Validator.validateStabilityControlStatus(referenceStabilityControlStatus, cmd.getStabilityControlsStatus())); + + JSONObject oemCustomVehicleDataName = JsonUtils.readJsonObjectFromJsonObject(parameters, TestValues.GENERAL_OEM_CUSTOM_VEHICLE_DATA_NAME); + VehicleDataResult referenceOemCustomData = new VehicleDataResult(JsonRPCMarshaller.deserializeJSONObject(oemCustomVehicleDataName)); + assertTrue(TestValues.TRUE, Validator.validateVehicleDataResult(referenceOemCustomData, cmd.getOEMCustomVehicleData(TestValues.GENERAL_OEM_CUSTOM_VEHICLE_DATA_NAME))); + } catch (JSONException e) { + e.printStackTrace(); + } } }
\ No newline at end of file diff --git a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/SubscribeWaypointsResponseTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/SubscribeWaypointsResponseTests.java index 8a156d12f..3434b12b8 100644 --- a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/SubscribeWaypointsResponseTests.java +++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/SubscribeWaypointsResponseTests.java @@ -25,22 +25,22 @@ import static junit.framework.TestCase.assertNotNull; public class SubscribeWaypointsResponseTests extends BaseRpcTests { @Override - protected RPCMessage createMessage(){ + protected RPCMessage createMessage() { return new SubscribeWayPointsResponse(); } @Override - protected String getMessageType(){ + protected String getMessageType() { return RPCMessage.KEY_RESPONSE; } @Override - protected String getCommandType(){ + protected String getCommandType() { return FunctionID.SUBSCRIBE_WAY_POINTS.toString(); } @Override - protected JSONObject getExpectedParameters(int sdlVersion){ + protected JSONObject getExpectedParameters(int sdlVersion) { return new JSONObject(); } @@ -48,7 +48,7 @@ public class SubscribeWaypointsResponseTests extends BaseRpcTests { * Tests the expected values of the RPC message. */ @Test - public void testRpcValues () { + public void testRpcValues() { // Invalid/Null Tests SubscribeWayPointsResponse msg = new SubscribeWayPointsResponse(); assertNotNull(TestValues.NOT_NULL, msg); @@ -59,7 +59,7 @@ public class SubscribeWaypointsResponseTests extends BaseRpcTests { * Tests a valid JSON construction of this RPC message. */ @Test - public void testJsonConstructor () { + public void testJsonConstructor() { JSONObject commandJson = JsonFileReader.readId(getInstrumentation().getTargetContext(), getCommandType(), getMessageType()); assertNotNull(TestValues.NOT_NULL, commandJson); diff --git a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/SystemRequestResponseTest.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/SystemRequestResponseTest.java index 4fb706980..7e2827d40 100644 --- a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/SystemRequestResponseTest.java +++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/SystemRequestResponseTest.java @@ -20,38 +20,38 @@ import static junit.framework.TestCase.assertEquals; import static junit.framework.TestCase.assertNotNull; /** - * This is a unit test class for the SmartDeviceLink library project class : + * This is a unit test class for the SmartDeviceLink library project class : * {@link com.smartdevicelink.proxy.rpc.SystemRequestResponse} */ public class SystemRequestResponseTest extends BaseRpcTests { - - @Override - protected RPCMessage createMessage(){ + + @Override + protected RPCMessage createMessage() { return new SystemRequestResponse(); } @Override - protected String getMessageType(){ + protected String getMessageType() { return RPCMessage.KEY_RESPONSE; } @Override - protected String getCommandType(){ + protected String getCommandType() { return FunctionID.SYSTEM_REQUEST.toString(); } @Override - protected JSONObject getExpectedParameters(int sdlVersion){ + protected JSONObject getExpectedParameters(int sdlVersion) { return new JSONObject(); } /** - * Tests the expected values of the RPC message. - */ + * Tests the expected values of the RPC message. + */ @Test - public void testRpcValues () { - // Invalid/Null Tests - SystemRequestResponse msg = new SystemRequestResponse(); + public void testRpcValues() { + // Invalid/Null Tests + SystemRequestResponse msg = new SystemRequestResponse(); assertNotNull(TestValues.NOT_NULL, msg); testNullBase(msg); } @@ -60,22 +60,22 @@ public class SystemRequestResponseTest extends BaseRpcTests { * Tests a valid JSON construction of this RPC message. */ @Test - public void testJsonConstructor () { - JSONObject commandJson = JsonFileReader.readId(getInstrumentation().getContext(), getCommandType(), getMessageType()); - assertNotNull(TestValues.NOT_NULL, commandJson); - - try { - Hashtable<String, Object> hash = JsonRPCMarshaller.deserializeJSONObject(commandJson); - SystemRequestResponse cmd = new SystemRequestResponse(hash); - - JSONObject body = JsonUtils.readJsonObjectFromJsonObject(commandJson, getMessageType()); - assertNotNull(TestValues.NOT_NULL, body); - - // Test everything in the json body. - assertEquals(TestValues.MATCH, JsonUtils.readStringFromJsonObject(body, RPCMessage.KEY_FUNCTION_NAME), cmd.getFunctionName()); - assertEquals(TestValues.MATCH, JsonUtils.readIntegerFromJsonObject(body, RPCMessage.KEY_CORRELATION_ID), cmd.getCorrelationID()); - } catch (JSONException e) { - e.printStackTrace(); - } + public void testJsonConstructor() { + JSONObject commandJson = JsonFileReader.readId(getInstrumentation().getContext(), getCommandType(), getMessageType()); + assertNotNull(TestValues.NOT_NULL, commandJson); + + try { + Hashtable<String, Object> hash = JsonRPCMarshaller.deserializeJSONObject(commandJson); + SystemRequestResponse cmd = new SystemRequestResponse(hash); + + JSONObject body = JsonUtils.readJsonObjectFromJsonObject(commandJson, getMessageType()); + assertNotNull(TestValues.NOT_NULL, body); + + // Test everything in the json body. + assertEquals(TestValues.MATCH, JsonUtils.readStringFromJsonObject(body, RPCMessage.KEY_FUNCTION_NAME), cmd.getFunctionName()); + assertEquals(TestValues.MATCH, JsonUtils.readIntegerFromJsonObject(body, RPCMessage.KEY_CORRELATION_ID), cmd.getCorrelationID()); + } catch (JSONException e) { + e.printStackTrace(); + } } }
\ No newline at end of file diff --git a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/UnpublishAppServiceResponseTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/UnpublishAppServiceResponseTests.java index 474c05cd6..ccbe562f9 100644 --- a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/UnpublishAppServiceResponseTests.java +++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/UnpublishAppServiceResponseTests.java @@ -60,58 +60,58 @@ import static junit.framework.TestCase.assertNotNull; */ public class UnpublishAppServiceResponseTests extends BaseRpcTests { - @Override - protected RPCMessage createMessage(){ - return new UnpublishAppServiceResponse(); - } - - @Override - protected String getMessageType(){ - return RPCMessage.KEY_RESPONSE; - } - - @Override - protected String getCommandType(){ - return FunctionID.UNPUBLISH_APP_SERVICE.toString(); - } - - @Override - protected JSONObject getExpectedParameters(int sdlVersion){ - return new JSONObject(); - } - - /** - * Tests the expected values of the RPC message. - */ - @Test - public void testRpcValues () { - // Invalid/Null Tests - UnpublishAppServiceResponse msg = new UnpublishAppServiceResponse(); - assertNotNull(TestValues.NOT_NULL, msg); - testNullBase(msg); - } - - /** - * Tests a valid JSON construction of this RPC message. - */ - @Test - public void testJsonConstructor () { - JSONObject commandJson = JsonFileReader.readId(getInstrumentation().getTargetContext(), getCommandType(), getMessageType()); - assertNotNull(TestValues.NOT_NULL, commandJson); - - try { - Hashtable<String, Object> hash = JsonRPCMarshaller.deserializeJSONObject(commandJson); - UnpublishAppServiceResponse cmd = new UnpublishAppServiceResponse(hash); - - JSONObject body = JsonUtils.readJsonObjectFromJsonObject(commandJson, getMessageType()); - assertNotNull(TestValues.NOT_NULL, body); - - // Test everything in the json body. - assertEquals(TestValues.MATCH, JsonUtils.readStringFromJsonObject(body, RPCMessage.KEY_FUNCTION_NAME), cmd.getFunctionName()); - assertEquals(TestValues.MATCH, JsonUtils.readIntegerFromJsonObject(body, RPCMessage.KEY_CORRELATION_ID), cmd.getCorrelationID()); - } catch (JSONException e) { - e.printStackTrace(); - } - } + @Override + protected RPCMessage createMessage() { + return new UnpublishAppServiceResponse(); + } + + @Override + protected String getMessageType() { + return RPCMessage.KEY_RESPONSE; + } + + @Override + protected String getCommandType() { + return FunctionID.UNPUBLISH_APP_SERVICE.toString(); + } + + @Override + protected JSONObject getExpectedParameters(int sdlVersion) { + return new JSONObject(); + } + + /** + * Tests the expected values of the RPC message. + */ + @Test + public void testRpcValues() { + // Invalid/Null Tests + UnpublishAppServiceResponse msg = new UnpublishAppServiceResponse(); + assertNotNull(TestValues.NOT_NULL, msg); + testNullBase(msg); + } + + /** + * Tests a valid JSON construction of this RPC message. + */ + @Test + public void testJsonConstructor() { + JSONObject commandJson = JsonFileReader.readId(getInstrumentation().getTargetContext(), getCommandType(), getMessageType()); + assertNotNull(TestValues.NOT_NULL, commandJson); + + try { + Hashtable<String, Object> hash = JsonRPCMarshaller.deserializeJSONObject(commandJson); + UnpublishAppServiceResponse cmd = new UnpublishAppServiceResponse(hash); + + JSONObject body = JsonUtils.readJsonObjectFromJsonObject(commandJson, getMessageType()); + assertNotNull(TestValues.NOT_NULL, body); + + // Test everything in the json body. + assertEquals(TestValues.MATCH, JsonUtils.readStringFromJsonObject(body, RPCMessage.KEY_FUNCTION_NAME), cmd.getFunctionName()); + assertEquals(TestValues.MATCH, JsonUtils.readIntegerFromJsonObject(body, RPCMessage.KEY_CORRELATION_ID), cmd.getCorrelationID()); + } catch (JSONException e) { + e.printStackTrace(); + } + } }
\ No newline at end of file diff --git a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/UnregisterAppInterfaceResponseTest.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/UnregisterAppInterfaceResponseTest.java index 02d0623c5..a6fc526f3 100644 --- a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/UnregisterAppInterfaceResponseTest.java +++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/UnregisterAppInterfaceResponseTest.java @@ -20,38 +20,38 @@ import static junit.framework.TestCase.assertEquals; import static junit.framework.TestCase.assertNotNull; /** - * This is a unit test class for the SmartDeviceLink library project class : + * This is a unit test class for the SmartDeviceLink library project class : * {@link com.smartdevicelink.proxy.rpc.UnregisterAppInterfaceResponse} */ public class UnregisterAppInterfaceResponseTest extends BaseRpcTests { - @Override - protected RPCMessage createMessage(){ + @Override + protected RPCMessage createMessage() { return new UnregisterAppInterfaceResponse(); } @Override - protected String getMessageType(){ + protected String getMessageType() { return RPCMessage.KEY_RESPONSE; } @Override - protected String getCommandType(){ + protected String getCommandType() { return FunctionID.UNREGISTER_APP_INTERFACE.toString(); } @Override - protected JSONObject getExpectedParameters(int sdlVersion){ + protected JSONObject getExpectedParameters(int sdlVersion) { return new JSONObject(); } /** - * Tests the expected values of the RPC message. - */ + * Tests the expected values of the RPC message. + */ @Test - public void testRpcValues () { - // Invalid/Null Tests - UnregisterAppInterfaceResponse msg = new UnregisterAppInterfaceResponse(); + public void testRpcValues() { + // Invalid/Null Tests + UnregisterAppInterfaceResponse msg = new UnregisterAppInterfaceResponse(); assertNotNull(TestValues.NOT_NULL, msg); testNullBase(msg); } @@ -60,22 +60,22 @@ public class UnregisterAppInterfaceResponseTest extends BaseRpcTests { * Tests a valid JSON construction of this RPC message. */ @Test - public void testJsonConstructor () { - JSONObject commandJson = JsonFileReader.readId(getInstrumentation().getContext(), getCommandType(), getMessageType()); - assertNotNull(TestValues.NOT_NULL, commandJson); - - try { - Hashtable<String, Object> hash = JsonRPCMarshaller.deserializeJSONObject(commandJson); - UnregisterAppInterfaceResponse cmd = new UnregisterAppInterfaceResponse(hash); - - JSONObject body = JsonUtils.readJsonObjectFromJsonObject(commandJson, getMessageType()); - assertNotNull(TestValues.NOT_NULL, body); - - // Test everything in the json body. - assertEquals(TestValues.MATCH, JsonUtils.readStringFromJsonObject(body, RPCMessage.KEY_FUNCTION_NAME), cmd.getFunctionName()); - assertEquals(TestValues.MATCH, JsonUtils.readIntegerFromJsonObject(body, RPCMessage.KEY_CORRELATION_ID), cmd.getCorrelationID()); - } catch (JSONException e) { - e.printStackTrace(); - } + public void testJsonConstructor() { + JSONObject commandJson = JsonFileReader.readId(getInstrumentation().getContext(), getCommandType(), getMessageType()); + assertNotNull(TestValues.NOT_NULL, commandJson); + + try { + Hashtable<String, Object> hash = JsonRPCMarshaller.deserializeJSONObject(commandJson); + UnregisterAppInterfaceResponse cmd = new UnregisterAppInterfaceResponse(hash); + + JSONObject body = JsonUtils.readJsonObjectFromJsonObject(commandJson, getMessageType()); + assertNotNull(TestValues.NOT_NULL, body); + + // Test everything in the json body. + assertEquals(TestValues.MATCH, JsonUtils.readStringFromJsonObject(body, RPCMessage.KEY_FUNCTION_NAME), cmd.getFunctionName()); + assertEquals(TestValues.MATCH, JsonUtils.readIntegerFromJsonObject(body, RPCMessage.KEY_CORRELATION_ID), cmd.getCorrelationID()); + } catch (JSONException e) { + e.printStackTrace(); + } } }
\ No newline at end of file diff --git a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/UnsubscribeButtonResponseTest.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/UnsubscribeButtonResponseTest.java index 348ffd95d..55d7b1e51 100644 --- a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/UnsubscribeButtonResponseTest.java +++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/UnsubscribeButtonResponseTest.java @@ -21,38 +21,38 @@ import static junit.framework.TestCase.assertNotNull; /** - * This is a unit test class for the SmartDeviceLink library project class : + * This is a unit test class for the SmartDeviceLink library project class : * {@link com.smartdevicelink.proxy.rpc.UnsubscribeButtonResponse} */ public class UnsubscribeButtonResponseTest extends BaseRpcTests { - @Override - protected RPCMessage createMessage(){ + @Override + protected RPCMessage createMessage() { return new UnsubscribeButtonResponse(); } @Override - protected String getMessageType(){ + protected String getMessageType() { return RPCMessage.KEY_RESPONSE; } @Override - protected String getCommandType(){ + protected String getCommandType() { return FunctionID.UNSUBSCRIBE_BUTTON.toString(); } @Override - protected JSONObject getExpectedParameters(int sdlVersion){ + protected JSONObject getExpectedParameters(int sdlVersion) { return new JSONObject(); } /** - * Tests the expected values of the RPC message. - */ + * Tests the expected values of the RPC message. + */ @Test - public void testRpcValues () { - // Invalid/Null Tests - UnsubscribeButtonResponse msg = new UnsubscribeButtonResponse(); + public void testRpcValues() { + // Invalid/Null Tests + UnsubscribeButtonResponse msg = new UnsubscribeButtonResponse(); assertNotNull(TestValues.NOT_NULL, msg); testNullBase(msg); } @@ -61,22 +61,22 @@ public class UnsubscribeButtonResponseTest extends BaseRpcTests { * Tests a valid JSON construction of this RPC message. */ @Test - public void testJsonConstructor () { - JSONObject commandJson = JsonFileReader.readId(getInstrumentation().getContext(), getCommandType(), getMessageType()); - assertNotNull(TestValues.NOT_NULL, commandJson); - - try { - Hashtable<String, Object> hash = JsonRPCMarshaller.deserializeJSONObject(commandJson); - UnsubscribeButtonResponse cmd = new UnsubscribeButtonResponse(hash); - - JSONObject body = JsonUtils.readJsonObjectFromJsonObject(commandJson, getMessageType()); - assertNotNull(TestValues.NOT_NULL, body); - - // Test everything in the json body. - assertEquals(TestValues.MATCH, JsonUtils.readStringFromJsonObject(body, RPCMessage.KEY_FUNCTION_NAME), cmd.getFunctionName()); - assertEquals(TestValues.MATCH, JsonUtils.readIntegerFromJsonObject(body, RPCMessage.KEY_CORRELATION_ID), cmd.getCorrelationID()); - } catch (JSONException e) { - e.printStackTrace(); - } - } + public void testJsonConstructor() { + JSONObject commandJson = JsonFileReader.readId(getInstrumentation().getContext(), getCommandType(), getMessageType()); + assertNotNull(TestValues.NOT_NULL, commandJson); + + try { + Hashtable<String, Object> hash = JsonRPCMarshaller.deserializeJSONObject(commandJson); + UnsubscribeButtonResponse cmd = new UnsubscribeButtonResponse(hash); + + JSONObject body = JsonUtils.readJsonObjectFromJsonObject(commandJson, getMessageType()); + assertNotNull(TestValues.NOT_NULL, body); + + // Test everything in the json body. + assertEquals(TestValues.MATCH, JsonUtils.readStringFromJsonObject(body, RPCMessage.KEY_FUNCTION_NAME), cmd.getFunctionName()); + assertEquals(TestValues.MATCH, JsonUtils.readIntegerFromJsonObject(body, RPCMessage.KEY_CORRELATION_ID), cmd.getCorrelationID()); + } catch (JSONException e) { + e.printStackTrace(); + } + } }
\ No newline at end of file diff --git a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/UnsubscribeVehicleDataResponseTest.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/UnsubscribeVehicleDataResponseTest.java index f4f61fde3..1d5504b08 100644 --- a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/UnsubscribeVehicleDataResponseTest.java +++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/UnsubscribeVehicleDataResponseTest.java @@ -29,199 +29,199 @@ import static junit.framework.TestCase.assertTrue; import static junit.framework.TestCase.fail; /** - * This is a unit test class for the SmartDeviceLink library project class : + * This is a unit test class for the SmartDeviceLink library project class : * {@link com.smartdevicelink.proxy.rpc.UnsubscribeVehicleDataResponse} */ public class UnsubscribeVehicleDataResponseTest extends BaseRpcTests { - @Override - protected RPCMessage createMessage() { - UnsubscribeVehicleDataResponse msg = new UnsubscribeVehicleDataResponse(); - - msg.setResultCode(TestValues.GENERAL_RESULT); - msg.setSpeed(TestValues.GENERAL_VEHICLEDATARESULT_LIST.get(VehicleDataType.VEHICLEDATA_SPEED.ordinal())); - msg.setRpm(TestValues.GENERAL_VEHICLEDATARESULT_LIST.get(VehicleDataType.VEHICLEDATA_RPM.ordinal())); - msg.setExternalTemperature(TestValues.GENERAL_VEHICLEDATARESULT_LIST.get(VehicleDataType.VEHICLEDATA_EXTERNTEMP.ordinal())); - msg.setFuelLevel(TestValues.GENERAL_VEHICLEDATARESULT_LIST.get(VehicleDataType.VEHICLEDATA_FUELLEVEL.ordinal())); - msg.setPrndl(TestValues.GENERAL_VEHICLEDATARESULT_LIST.get(VehicleDataType.VEHICLEDATA_PRNDL.ordinal())); - msg.setTirePressure(TestValues.GENERAL_VEHICLEDATARESULT_LIST.get(VehicleDataType.VEHICLEDATA_TIREPRESSURE.ordinal())); - msg.setEngineTorque(TestValues.GENERAL_VEHICLEDATARESULT_LIST.get(VehicleDataType.VEHICLEDATA_ENGINETORQUE.ordinal())); - msg.setEngineOilLife(TestValues.GENERAL_VEHICLEDATARESULT_LIST.get(VehicleDataType.VEHICLEDATA_ENGINEOILLIFE.ordinal())); - msg.setOdometer(TestValues.GENERAL_VEHICLEDATARESULT_LIST.get(VehicleDataType.VEHICLEDATA_ODOMETER.ordinal())); - msg.setGps(TestValues.GENERAL_VEHICLEDATARESULT_LIST.get(VehicleDataType.VEHICLEDATA_GPS.ordinal())); - msg.setFuelLevelState(TestValues.GENERAL_VEHICLEDATARESULT_LIST.get(VehicleDataType.VEHICLEDATA_FUELLEVEL_STATE.ordinal())); - msg.setInstantFuelConsumption(TestValues.GENERAL_VEHICLEDATARESULT_LIST.get(VehicleDataType.VEHICLEDATA_FUELCONSUMPTION.ordinal())); - msg.setBeltStatus(TestValues.GENERAL_VEHICLEDATARESULT_LIST.get(VehicleDataType.VEHICLEDATA_BELTSTATUS.ordinal())); - msg.setBodyInformation(TestValues.GENERAL_VEHICLEDATARESULT_LIST.get(VehicleDataType.VEHICLEDATA_BODYINFO.ordinal())); - msg.setDeviceStatus(TestValues.GENERAL_VEHICLEDATARESULT_LIST.get(VehicleDataType.VEHICLEDATA_DEVICESTATUS.ordinal())); - msg.setDriverBraking(TestValues.GENERAL_VEHICLEDATARESULT_LIST.get(VehicleDataType.VEHICLEDATA_BRAKING.ordinal())); - msg.setWiperStatus(TestValues.GENERAL_VEHICLEDATARESULT_LIST.get(VehicleDataType.VEHICLEDATA_WIPERSTATUS.ordinal())); - msg.setHeadLampStatus(TestValues.GENERAL_VEHICLEDATARESULT_LIST.get(VehicleDataType.VEHICLEDATA_HEADLAMPSTATUS.ordinal())); - msg.setAccPedalPosition(TestValues.GENERAL_VEHICLEDATARESULT_LIST.get(VehicleDataType.VEHICLEDATA_ACCPEDAL.ordinal())); - msg.setSteeringWheelAngle(TestValues.GENERAL_VEHICLEDATARESULT_LIST.get(VehicleDataType.VEHICLEDATA_STEERINGWHEEL.ordinal())); - msg.setECallInfo(TestValues.GENERAL_VEHICLEDATARESULT_LIST.get(VehicleDataType.VEHICLEDATA_ECALLINFO.ordinal())); - msg.setAirbagStatus(TestValues.GENERAL_VEHICLEDATARESULT_LIST.get(VehicleDataType.VEHICLEDATA_AIRBAGSTATUS.ordinal())); - msg.setEmergencyEvent(TestValues.GENERAL_VEHICLEDATARESULT_LIST.get(VehicleDataType.VEHICLEDATA_EMERGENCYEVENT.ordinal())); - msg.setClusterModes(TestValues.GENERAL_VEHICLEDATARESULT_LIST.get(VehicleDataType.VEHICLEDATA_CLUSTERMODESTATUS.ordinal())); - msg.setMyKey(TestValues.GENERAL_VEHICLEDATARESULT_LIST.get(VehicleDataType.VEHICLEDATA_MYKEY.ordinal())); - msg.setFuelRange(TestValues.GENERAL_VEHICLEDATARESULT_LIST.get(VehicleDataType.VEHICLEDATA_FUELRANGE.ordinal())); - msg.setTurnSignal(TestValues.GENERAL_VEHICLEDATARESULT_LIST.get(VehicleDataType.VEHICLEDATA_TURNSIGNAL.ordinal())); - msg.setElectronicParkBrakeStatus(TestValues.GENERAL_VEHICLEDATARESULT_LIST.get(VehicleDataType.VEHICLEDATA_ELECTRONICPARKBRAKESTATUS.ordinal())); - msg.setWindowStatus(TestValues.GENERAL_VEHICLEDATARESULT_LIST.get(VehicleDataType.VEHICLEDATA_WINDOWSTATUS.ordinal())); - msg.setHandsOffSteering(TestValues.GENERAL_VEHICLEDATARESULT_LIST.get(VehicleDataType.VEHICLEDATA_HANDSOFFSTEERING.ordinal())); - msg.setGearStatus(TestValues.GENERAL_VEHICLEDATARESULT_LIST.get(VehicleDataType.VEHICLEDATA_GEARSTATUS.ordinal())); - msg.setStabilityControlsStatus(TestValues.GENERAL_VEHICLEDATARESULT_LIST.get(VehicleDataType.VEHICLEDATA_STABILITYCONTROLSSTATUS.ordinal())); - msg.setOEMCustomVehicleData(TestValues.GENERAL_OEM_CUSTOM_VEHICLE_DATA_NAME, TestValues.GENERAL_OEM_CUSTOM_VEHICLE_DATA); - - return msg; - } - - @Override - protected String getMessageType() { - return RPCMessage.KEY_RESPONSE; - } - - @Override - protected String getCommandType() { - return FunctionID.UNSUBSCRIBE_VEHICLE_DATA.toString(); - } - - @Override - protected JSONObject getExpectedParameters(int sdlVersion) { - JSONObject result = new JSONObject(); - + @Override + protected RPCMessage createMessage() { + UnsubscribeVehicleDataResponse msg = new UnsubscribeVehicleDataResponse(); + + msg.setResultCode(TestValues.GENERAL_RESULT); + msg.setSpeed(TestValues.GENERAL_VEHICLEDATARESULT_LIST.get(VehicleDataType.VEHICLEDATA_SPEED.ordinal())); + msg.setRpm(TestValues.GENERAL_VEHICLEDATARESULT_LIST.get(VehicleDataType.VEHICLEDATA_RPM.ordinal())); + msg.setExternalTemperature(TestValues.GENERAL_VEHICLEDATARESULT_LIST.get(VehicleDataType.VEHICLEDATA_EXTERNTEMP.ordinal())); + msg.setFuelLevel(TestValues.GENERAL_VEHICLEDATARESULT_LIST.get(VehicleDataType.VEHICLEDATA_FUELLEVEL.ordinal())); + msg.setPrndl(TestValues.GENERAL_VEHICLEDATARESULT_LIST.get(VehicleDataType.VEHICLEDATA_PRNDL.ordinal())); + msg.setTirePressure(TestValues.GENERAL_VEHICLEDATARESULT_LIST.get(VehicleDataType.VEHICLEDATA_TIREPRESSURE.ordinal())); + msg.setEngineTorque(TestValues.GENERAL_VEHICLEDATARESULT_LIST.get(VehicleDataType.VEHICLEDATA_ENGINETORQUE.ordinal())); + msg.setEngineOilLife(TestValues.GENERAL_VEHICLEDATARESULT_LIST.get(VehicleDataType.VEHICLEDATA_ENGINEOILLIFE.ordinal())); + msg.setOdometer(TestValues.GENERAL_VEHICLEDATARESULT_LIST.get(VehicleDataType.VEHICLEDATA_ODOMETER.ordinal())); + msg.setGps(TestValues.GENERAL_VEHICLEDATARESULT_LIST.get(VehicleDataType.VEHICLEDATA_GPS.ordinal())); + msg.setFuelLevelState(TestValues.GENERAL_VEHICLEDATARESULT_LIST.get(VehicleDataType.VEHICLEDATA_FUELLEVEL_STATE.ordinal())); + msg.setInstantFuelConsumption(TestValues.GENERAL_VEHICLEDATARESULT_LIST.get(VehicleDataType.VEHICLEDATA_FUELCONSUMPTION.ordinal())); + msg.setBeltStatus(TestValues.GENERAL_VEHICLEDATARESULT_LIST.get(VehicleDataType.VEHICLEDATA_BELTSTATUS.ordinal())); + msg.setBodyInformation(TestValues.GENERAL_VEHICLEDATARESULT_LIST.get(VehicleDataType.VEHICLEDATA_BODYINFO.ordinal())); + msg.setDeviceStatus(TestValues.GENERAL_VEHICLEDATARESULT_LIST.get(VehicleDataType.VEHICLEDATA_DEVICESTATUS.ordinal())); + msg.setDriverBraking(TestValues.GENERAL_VEHICLEDATARESULT_LIST.get(VehicleDataType.VEHICLEDATA_BRAKING.ordinal())); + msg.setWiperStatus(TestValues.GENERAL_VEHICLEDATARESULT_LIST.get(VehicleDataType.VEHICLEDATA_WIPERSTATUS.ordinal())); + msg.setHeadLampStatus(TestValues.GENERAL_VEHICLEDATARESULT_LIST.get(VehicleDataType.VEHICLEDATA_HEADLAMPSTATUS.ordinal())); + msg.setAccPedalPosition(TestValues.GENERAL_VEHICLEDATARESULT_LIST.get(VehicleDataType.VEHICLEDATA_ACCPEDAL.ordinal())); + msg.setSteeringWheelAngle(TestValues.GENERAL_VEHICLEDATARESULT_LIST.get(VehicleDataType.VEHICLEDATA_STEERINGWHEEL.ordinal())); + msg.setECallInfo(TestValues.GENERAL_VEHICLEDATARESULT_LIST.get(VehicleDataType.VEHICLEDATA_ECALLINFO.ordinal())); + msg.setAirbagStatus(TestValues.GENERAL_VEHICLEDATARESULT_LIST.get(VehicleDataType.VEHICLEDATA_AIRBAGSTATUS.ordinal())); + msg.setEmergencyEvent(TestValues.GENERAL_VEHICLEDATARESULT_LIST.get(VehicleDataType.VEHICLEDATA_EMERGENCYEVENT.ordinal())); + msg.setClusterModes(TestValues.GENERAL_VEHICLEDATARESULT_LIST.get(VehicleDataType.VEHICLEDATA_CLUSTERMODESTATUS.ordinal())); + msg.setMyKey(TestValues.GENERAL_VEHICLEDATARESULT_LIST.get(VehicleDataType.VEHICLEDATA_MYKEY.ordinal())); + msg.setFuelRange(TestValues.GENERAL_VEHICLEDATARESULT_LIST.get(VehicleDataType.VEHICLEDATA_FUELRANGE.ordinal())); + msg.setTurnSignal(TestValues.GENERAL_VEHICLEDATARESULT_LIST.get(VehicleDataType.VEHICLEDATA_TURNSIGNAL.ordinal())); + msg.setElectronicParkBrakeStatus(TestValues.GENERAL_VEHICLEDATARESULT_LIST.get(VehicleDataType.VEHICLEDATA_ELECTRONICPARKBRAKESTATUS.ordinal())); + msg.setWindowStatus(TestValues.GENERAL_VEHICLEDATARESULT_LIST.get(VehicleDataType.VEHICLEDATA_WINDOWSTATUS.ordinal())); + msg.setHandsOffSteering(TestValues.GENERAL_VEHICLEDATARESULT_LIST.get(VehicleDataType.VEHICLEDATA_HANDSOFFSTEERING.ordinal())); + msg.setGearStatus(TestValues.GENERAL_VEHICLEDATARESULT_LIST.get(VehicleDataType.VEHICLEDATA_GEARSTATUS.ordinal())); + msg.setStabilityControlsStatus(TestValues.GENERAL_VEHICLEDATARESULT_LIST.get(VehicleDataType.VEHICLEDATA_STABILITYCONTROLSSTATUS.ordinal())); + msg.setOEMCustomVehicleData(TestValues.GENERAL_OEM_CUSTOM_VEHICLE_DATA_NAME, TestValues.GENERAL_OEM_CUSTOM_VEHICLE_DATA); + + return msg; + } + + @Override + protected String getMessageType() { + return RPCMessage.KEY_RESPONSE; + } + + @Override + protected String getCommandType() { + return FunctionID.UNSUBSCRIBE_VEHICLE_DATA.toString(); + } + + @Override + protected JSONObject getExpectedParameters(int sdlVersion) { + JSONObject result = new JSONObject(); + try { - // Note: If the key values stored in SubscribeVehicleDataResponse - // were to be in a list then this could be easily looped through - // instead of individually set. - - result.put(SubscribeVehicleDataResponse.KEY_RESULT_CODE, TestValues.GENERAL_RESULT); - result.put(SubscribeVehicleDataResponse.KEY_SPEED, TestValues.GENERAL_VEHICLEDATARESULT_LIST.get(VehicleDataType.VEHICLEDATA_SPEED.ordinal()).serializeJSON()); - result.put(SubscribeVehicleDataResponse.KEY_RPM, TestValues.GENERAL_VEHICLEDATARESULT_LIST.get(VehicleDataType.VEHICLEDATA_RPM.ordinal()).serializeJSON()); - result.put(SubscribeVehicleDataResponse.KEY_EXTERNAL_TEMPERATURE, TestValues.GENERAL_VEHICLEDATARESULT_LIST.get(VehicleDataType.VEHICLEDATA_EXTERNTEMP.ordinal()).serializeJSON()); - result.put(SubscribeVehicleDataResponse.KEY_FUEL_LEVEL, TestValues.GENERAL_VEHICLEDATARESULT_LIST.get(VehicleDataType.VEHICLEDATA_FUELLEVEL.ordinal()).serializeJSON()); - result.put(SubscribeVehicleDataResponse.KEY_PRNDL, TestValues.GENERAL_VEHICLEDATARESULT_LIST.get(VehicleDataType.VEHICLEDATA_PRNDL.ordinal()).serializeJSON()); - result.put(SubscribeVehicleDataResponse.KEY_TIRE_PRESSURE, TestValues.GENERAL_VEHICLEDATARESULT_LIST.get(VehicleDataType.VEHICLEDATA_TIREPRESSURE.ordinal()).serializeJSON()); - result.put(SubscribeVehicleDataResponse.KEY_ENGINE_TORQUE, TestValues.GENERAL_VEHICLEDATARESULT_LIST.get(VehicleDataType.VEHICLEDATA_ENGINETORQUE.ordinal()).serializeJSON()); - result.put(SubscribeVehicleDataResponse.KEY_ENGINE_OIL_LIFE, TestValues.GENERAL_VEHICLEDATARESULT_LIST.get(VehicleDataType.VEHICLEDATA_ENGINEOILLIFE.ordinal()).serializeJSON()); - result.put(SubscribeVehicleDataResponse.KEY_ODOMETER, TestValues.GENERAL_VEHICLEDATARESULT_LIST.get(VehicleDataType.VEHICLEDATA_ODOMETER.ordinal()).serializeJSON()); - result.put(SubscribeVehicleDataResponse.KEY_GPS, TestValues.GENERAL_VEHICLEDATARESULT_LIST.get(VehicleDataType.VEHICLEDATA_GPS.ordinal()).serializeJSON()); - result.put(SubscribeVehicleDataResponse.KEY_FUEL_LEVEL_STATE, TestValues.GENERAL_VEHICLEDATARESULT_LIST.get(VehicleDataType.VEHICLEDATA_FUELLEVEL_STATE.ordinal()).serializeJSON()); - result.put(SubscribeVehicleDataResponse.KEY_INSTANT_FUEL_CONSUMPTION, TestValues.GENERAL_VEHICLEDATARESULT_LIST.get(VehicleDataType.VEHICLEDATA_FUELCONSUMPTION.ordinal()).serializeJSON()); - result.put(SubscribeVehicleDataResponse.KEY_BELT_STATUS, TestValues.GENERAL_VEHICLEDATARESULT_LIST.get(VehicleDataType.VEHICLEDATA_BELTSTATUS.ordinal()).serializeJSON()); - result.put(SubscribeVehicleDataResponse.KEY_BODY_INFORMATION, TestValues.GENERAL_VEHICLEDATARESULT_LIST.get(VehicleDataType.VEHICLEDATA_BODYINFO.ordinal()).serializeJSON()); - result.put(SubscribeVehicleDataResponse.KEY_DEVICE_STATUS, TestValues.GENERAL_VEHICLEDATARESULT_LIST.get(VehicleDataType.VEHICLEDATA_DEVICESTATUS.ordinal()).serializeJSON()); - result.put(SubscribeVehicleDataResponse.KEY_DRIVER_BRAKING, TestValues.GENERAL_VEHICLEDATARESULT_LIST.get(VehicleDataType.VEHICLEDATA_BRAKING.ordinal()).serializeJSON()); - result.put(SubscribeVehicleDataResponse.KEY_WIPER_STATUS, TestValues.GENERAL_VEHICLEDATARESULT_LIST.get(VehicleDataType.VEHICLEDATA_WIPERSTATUS.ordinal()).serializeJSON()); - result.put(SubscribeVehicleDataResponse.KEY_HEAD_LAMP_STATUS, TestValues.GENERAL_VEHICLEDATARESULT_LIST.get(VehicleDataType.VEHICLEDATA_HEADLAMPSTATUS.ordinal()).serializeJSON()); - result.put(SubscribeVehicleDataResponse.KEY_ACC_PEDAL_POSITION, TestValues.GENERAL_VEHICLEDATARESULT_LIST.get(VehicleDataType.VEHICLEDATA_ACCPEDAL.ordinal()).serializeJSON()); - result.put(SubscribeVehicleDataResponse.KEY_STEERING_WHEEL_ANGLE, TestValues.GENERAL_VEHICLEDATARESULT_LIST.get(VehicleDataType.VEHICLEDATA_STEERINGWHEEL.ordinal()).serializeJSON()); - result.put(SubscribeVehicleDataResponse.KEY_E_CALL_INFO, TestValues.GENERAL_VEHICLEDATARESULT_LIST.get(VehicleDataType.VEHICLEDATA_ECALLINFO.ordinal()).serializeJSON()); - result.put(SubscribeVehicleDataResponse.KEY_AIRBAG_STATUS, TestValues.GENERAL_VEHICLEDATARESULT_LIST.get(VehicleDataType.VEHICLEDATA_AIRBAGSTATUS.ordinal()).serializeJSON()); - result.put(SubscribeVehicleDataResponse.KEY_EMERGENCY_EVENT, TestValues.GENERAL_VEHICLEDATARESULT_LIST.get(VehicleDataType.VEHICLEDATA_EMERGENCYEVENT.ordinal()).serializeJSON()); - result.put(SubscribeVehicleDataResponse.KEY_CLUSTER_MODES, TestValues.GENERAL_VEHICLEDATARESULT_LIST.get(VehicleDataType.VEHICLEDATA_CLUSTERMODESTATUS.ordinal()).serializeJSON()); - result.put(SubscribeVehicleDataResponse.KEY_MY_KEY, TestValues.GENERAL_VEHICLEDATARESULT_LIST.get(VehicleDataType.VEHICLEDATA_MYKEY.ordinal()).serializeJSON()); - result.put(SubscribeVehicleDataResponse.KEY_FUEL_RANGE, TestValues.GENERAL_VEHICLEDATARESULT_LIST.get(VehicleDataType.VEHICLEDATA_FUELRANGE.ordinal()).serializeJSON()); - result.put(SubscribeVehicleDataResponse.KEY_TURN_SIGNAL, TestValues.GENERAL_VEHICLEDATARESULT_LIST.get(VehicleDataType.VEHICLEDATA_TURNSIGNAL.ordinal()).serializeJSON()); - result.put(SubscribeVehicleDataResponse.KEY_GEAR_STATUS, TestValues.GENERAL_VEHICLEDATARESULT_LIST.get(VehicleDataType.VEHICLEDATA_GEARSTATUS.ordinal()).serializeJSON()); - result.put(SubscribeVehicleDataResponse.KEY_ELECTRONIC_PARK_BRAKE_STATUS, TestValues.GENERAL_VEHICLEDATARESULT_LIST.get(VehicleDataType.VEHICLEDATA_ELECTRONICPARKBRAKESTATUS.ordinal()).serializeJSON()); - result.put(SubscribeVehicleDataResponse.KEY_STABILITY_CONTROLS_STATUS, TestValues.GENERAL_VEHICLEDATARESULT_LIST.get(VehicleDataType.VEHICLEDATA_STABILITYCONTROLSSTATUS.ordinal()).serializeJSON()); - result.put(SubscribeVehicleDataResponse.KEY_ELECTRONIC_PARK_BRAKE_STATUS, TestValues.GENERAL_VEHICLEDATARESULT_LIST.get(VehicleDataType.VEHICLEDATA_ELECTRONICPARKBRAKESTATUS.ordinal()).serializeJSON()); - result.put(SubscribeVehicleDataResponse.KEY_HANDS_OFF_STEERING, TestValues.GENERAL_VEHICLEDATARESULT_LIST.get(VehicleDataType.VEHICLEDATA_HANDSOFFSTEERING.ordinal()).serializeJSON()); - result.put(SubscribeVehicleDataResponse.KEY_WINDOW_STATUS, TestValues.GENERAL_VEHICLEDATARESULT_LIST.get(VehicleDataType.VEHICLEDATA_WINDOWSTATUS.ordinal()).serializeJSON()); - result.put(TestValues.GENERAL_OEM_CUSTOM_VEHICLE_DATA_NAME, TestValues.GENERAL_OEM_CUSTOM_VEHICLE_DATA.serializeJSON()); - } catch (JSONException e) { - fail(TestValues.JSON_FAIL); - } - - return result; - } - - /** - * Tests the expected values of the RPC message. - */ - @Test - public void testRpcValues () { - // Test Values - Result testResult = ( (UnsubscribeVehicleDataResponse) msg ).getResultCode(); - VehicleDataResult testGps = ( (UnsubscribeVehicleDataResponse) msg ).getGps(); - VehicleDataResult testOdometer = ( (UnsubscribeVehicleDataResponse) msg ).getOdometer(); - VehicleDataResult testTirePressure = ( (UnsubscribeVehicleDataResponse) msg ).getTirePressure(); - VehicleDataResult testBeltStatus = ( (UnsubscribeVehicleDataResponse) msg ).getBeltStatus(); - VehicleDataResult testBodyInfo = ( (UnsubscribeVehicleDataResponse) msg ).getBodyInformation(); - VehicleDataResult testDeviceStatus = ( (UnsubscribeVehicleDataResponse) msg ).getDeviceStatus(); - VehicleDataResult testHeadLampStatus = ( (UnsubscribeVehicleDataResponse) msg ).getHeadLampStatus(); - VehicleDataResult testECallInfo = ( (UnsubscribeVehicleDataResponse) msg ).getECallInfo(); - VehicleDataResult testAirbagStatus = ( (UnsubscribeVehicleDataResponse) msg ).getAirbagStatus(); - VehicleDataResult testEmergencyEvent = ( (UnsubscribeVehicleDataResponse) msg ).getEmergencyEvent(); - VehicleDataResult testClusterMode = ( (UnsubscribeVehicleDataResponse) msg ).getClusterModes(); - VehicleDataResult testMyKey = ( (UnsubscribeVehicleDataResponse) msg ).getMyKey(); - VehicleDataResult testSpeed = ( (UnsubscribeVehicleDataResponse) msg ).getSpeed(); - VehicleDataResult testRpm = ( (UnsubscribeVehicleDataResponse) msg ).getRpm(); - VehicleDataResult testFuelLevel = ( (UnsubscribeVehicleDataResponse) msg ).getFuelLevel(); - VehicleDataResult testConsumption = ( (UnsubscribeVehicleDataResponse) msg ).getInstantFuelConsumption(); - VehicleDataResult testExternalTemp = ( (UnsubscribeVehicleDataResponse) msg ).getExternalTemperature(); - VehicleDataResult testEngineTorque = ( (UnsubscribeVehicleDataResponse) msg ).getEngineTorque(); - VehicleDataResult testEngineOilLife = ( (UnsubscribeVehicleDataResponse) msg ).getEngineOilLife(); - VehicleDataResult testAccPedal = ( (UnsubscribeVehicleDataResponse) msg ).getAccPedalPosition(); - VehicleDataResult testSteeringWheel = ( (UnsubscribeVehicleDataResponse) msg ).getSteeringWheelAngle(); - VehicleDataResult testFuelLevelState = ( (UnsubscribeVehicleDataResponse) msg ).getFuelLevelState(); - VehicleDataResult testPrndl = ( (UnsubscribeVehicleDataResponse) msg ).getPrndl(); - VehicleDataResult testBraking = ( (UnsubscribeVehicleDataResponse) msg ).getDriverBraking(); - VehicleDataResult testWiperStatus = ( (UnsubscribeVehicleDataResponse) msg ).getWiperStatus(); - VehicleDataResult testFuelRange = ( (UnsubscribeVehicleDataResponse) msg ).getFuelRange(); - VehicleDataResult testTurnSignal = ( (UnsubscribeVehicleDataResponse) msg ).getTurnSignal(); - VehicleDataResult testEBrakeStatus = ( (UnsubscribeVehicleDataResponse) msg ).getElectronicParkBrakeStatus(); - VehicleDataResult testHOffSteering = ( (UnsubscribeVehicleDataResponse) msg ).getHandsOffSteering(); - VehicleDataResult testGearStatus = ( (UnsubscribeVehicleDataResponse) msg ).getGearStatus(); - VehicleDataResult testWindowStatus = ( (UnsubscribeVehicleDataResponse) msg ).getWindowStatus(); - VehicleDataResult testStabilityControlStatus = ( (UnsubscribeVehicleDataResponse) msg ).getStabilityControlsStatus(); - VehicleDataResult testOemCustomData = ( (UnsubscribeVehicleDataResponse) msg ).getOEMCustomVehicleData(TestValues.GENERAL_OEM_CUSTOM_VEHICLE_DATA_NAME); - - // Valid Tests - assertTrue(TestValues.TRUE, testResult.equals(TestValues.GENERAL_RESULT)); - assertTrue(TestValues.TRUE, testGps.getDataType().equals(VehicleDataType.VEHICLEDATA_GPS)); - assertTrue(TestValues.TRUE, testOdometer.getDataType().equals(VehicleDataType.VEHICLEDATA_ODOMETER)); - assertTrue(TestValues.TRUE, testTirePressure.getDataType().equals(VehicleDataType.VEHICLEDATA_TIREPRESSURE)); - assertTrue(TestValues.TRUE, testBeltStatus.getDataType().equals(VehicleDataType.VEHICLEDATA_BELTSTATUS)); - assertTrue(TestValues.TRUE, testBodyInfo.getDataType().equals(VehicleDataType.VEHICLEDATA_BODYINFO)); - assertTrue(TestValues.TRUE, testDeviceStatus.getDataType().equals(VehicleDataType.VEHICLEDATA_DEVICESTATUS)); - assertTrue(TestValues.TRUE, testHeadLampStatus.getDataType().equals(VehicleDataType.VEHICLEDATA_HEADLAMPSTATUS)); - assertTrue(TestValues.TRUE, testECallInfo.getDataType().equals(VehicleDataType.VEHICLEDATA_ECALLINFO)); - assertTrue(TestValues.TRUE, testAirbagStatus.getDataType().equals(VehicleDataType.VEHICLEDATA_AIRBAGSTATUS)); - assertTrue(TestValues.TRUE, testEmergencyEvent.getDataType().equals(VehicleDataType.VEHICLEDATA_EMERGENCYEVENT)); - assertTrue(TestValues.TRUE, testClusterMode.getDataType().equals(VehicleDataType.VEHICLEDATA_CLUSTERMODESTATUS)); - assertTrue(TestValues.TRUE, testMyKey.getDataType().equals(VehicleDataType.VEHICLEDATA_MYKEY)); - assertTrue(TestValues.TRUE, testSpeed.getDataType().equals(VehicleDataType.VEHICLEDATA_SPEED)); - assertTrue(TestValues.TRUE, testRpm.getDataType().equals(VehicleDataType.VEHICLEDATA_RPM)); - assertTrue(TestValues.TRUE, testFuelLevel.getDataType().equals(VehicleDataType.VEHICLEDATA_FUELLEVEL)); - assertTrue(TestValues.TRUE, testConsumption.getDataType().equals(VehicleDataType.VEHICLEDATA_FUELCONSUMPTION)); - assertTrue(TestValues.TRUE, testExternalTemp.getDataType().equals(VehicleDataType.VEHICLEDATA_EXTERNTEMP)); - assertTrue(TestValues.TRUE, testEngineTorque.getDataType().equals(VehicleDataType.VEHICLEDATA_ENGINETORQUE)); - assertTrue(TestValues.TRUE, testEngineOilLife.getDataType().equals(VehicleDataType.VEHICLEDATA_ENGINEOILLIFE)); - assertTrue(TestValues.TRUE, testAccPedal.getDataType().equals(VehicleDataType.VEHICLEDATA_ACCPEDAL)); - assertTrue(TestValues.TRUE, testSteeringWheel.getDataType().equals(VehicleDataType.VEHICLEDATA_STEERINGWHEEL)); - assertTrue(TestValues.TRUE, testFuelLevelState.getDataType().equals(VehicleDataType.VEHICLEDATA_FUELLEVEL_STATE)); - assertTrue(TestValues.TRUE, testPrndl.getDataType().equals(VehicleDataType.VEHICLEDATA_PRNDL)); - assertTrue(TestValues.TRUE, testBraking.getDataType().equals(VehicleDataType.VEHICLEDATA_BRAKING)); - assertTrue(TestValues.TRUE, testWiperStatus.getDataType().equals(VehicleDataType.VEHICLEDATA_WIPERSTATUS)); - assertTrue(TestValues.TRUE, testFuelRange.getDataType().equals(VehicleDataType.VEHICLEDATA_FUELRANGE)); - assertTrue(TestValues.TRUE, testTurnSignal.getDataType().equals(VehicleDataType.VEHICLEDATA_TURNSIGNAL)); - assertTrue(TestValues.TRUE, testEBrakeStatus.getDataType().equals(VehicleDataType.VEHICLEDATA_ELECTRONICPARKBRAKESTATUS)); - assertTrue(TestValues.TRUE, testHOffSteering.getDataType().equals(VehicleDataType.VEHICLEDATA_HANDSOFFSTEERING)); - assertTrue(TestValues.TRUE, testWindowStatus.getDataType().equals(VehicleDataType.VEHICLEDATA_WINDOWSTATUS)); - assertTrue(TestValues.TRUE, testStabilityControlStatus.getDataType().equals(VehicleDataType.VEHICLEDATA_STABILITYCONTROLSSTATUS)); - assertTrue(TestValues.TRUE, testOemCustomData.getOEMCustomVehicleDataType().equals(TestValues.GENERAL_OEM_CUSTOM_VEHICLE_DATA_NAME)); - assertTrue(TestValues.TRUE, testGearStatus.getDataType().equals(VehicleDataType.VEHICLEDATA_GEARSTATUS)); + // Note: If the key values stored in SubscribeVehicleDataResponse + // were to be in a list then this could be easily looped through + // instead of individually set. + + result.put(SubscribeVehicleDataResponse.KEY_RESULT_CODE, TestValues.GENERAL_RESULT); + result.put(SubscribeVehicleDataResponse.KEY_SPEED, TestValues.GENERAL_VEHICLEDATARESULT_LIST.get(VehicleDataType.VEHICLEDATA_SPEED.ordinal()).serializeJSON()); + result.put(SubscribeVehicleDataResponse.KEY_RPM, TestValues.GENERAL_VEHICLEDATARESULT_LIST.get(VehicleDataType.VEHICLEDATA_RPM.ordinal()).serializeJSON()); + result.put(SubscribeVehicleDataResponse.KEY_EXTERNAL_TEMPERATURE, TestValues.GENERAL_VEHICLEDATARESULT_LIST.get(VehicleDataType.VEHICLEDATA_EXTERNTEMP.ordinal()).serializeJSON()); + result.put(SubscribeVehicleDataResponse.KEY_FUEL_LEVEL, TestValues.GENERAL_VEHICLEDATARESULT_LIST.get(VehicleDataType.VEHICLEDATA_FUELLEVEL.ordinal()).serializeJSON()); + result.put(SubscribeVehicleDataResponse.KEY_PRNDL, TestValues.GENERAL_VEHICLEDATARESULT_LIST.get(VehicleDataType.VEHICLEDATA_PRNDL.ordinal()).serializeJSON()); + result.put(SubscribeVehicleDataResponse.KEY_TIRE_PRESSURE, TestValues.GENERAL_VEHICLEDATARESULT_LIST.get(VehicleDataType.VEHICLEDATA_TIREPRESSURE.ordinal()).serializeJSON()); + result.put(SubscribeVehicleDataResponse.KEY_ENGINE_TORQUE, TestValues.GENERAL_VEHICLEDATARESULT_LIST.get(VehicleDataType.VEHICLEDATA_ENGINETORQUE.ordinal()).serializeJSON()); + result.put(SubscribeVehicleDataResponse.KEY_ENGINE_OIL_LIFE, TestValues.GENERAL_VEHICLEDATARESULT_LIST.get(VehicleDataType.VEHICLEDATA_ENGINEOILLIFE.ordinal()).serializeJSON()); + result.put(SubscribeVehicleDataResponse.KEY_ODOMETER, TestValues.GENERAL_VEHICLEDATARESULT_LIST.get(VehicleDataType.VEHICLEDATA_ODOMETER.ordinal()).serializeJSON()); + result.put(SubscribeVehicleDataResponse.KEY_GPS, TestValues.GENERAL_VEHICLEDATARESULT_LIST.get(VehicleDataType.VEHICLEDATA_GPS.ordinal()).serializeJSON()); + result.put(SubscribeVehicleDataResponse.KEY_FUEL_LEVEL_STATE, TestValues.GENERAL_VEHICLEDATARESULT_LIST.get(VehicleDataType.VEHICLEDATA_FUELLEVEL_STATE.ordinal()).serializeJSON()); + result.put(SubscribeVehicleDataResponse.KEY_INSTANT_FUEL_CONSUMPTION, TestValues.GENERAL_VEHICLEDATARESULT_LIST.get(VehicleDataType.VEHICLEDATA_FUELCONSUMPTION.ordinal()).serializeJSON()); + result.put(SubscribeVehicleDataResponse.KEY_BELT_STATUS, TestValues.GENERAL_VEHICLEDATARESULT_LIST.get(VehicleDataType.VEHICLEDATA_BELTSTATUS.ordinal()).serializeJSON()); + result.put(SubscribeVehicleDataResponse.KEY_BODY_INFORMATION, TestValues.GENERAL_VEHICLEDATARESULT_LIST.get(VehicleDataType.VEHICLEDATA_BODYINFO.ordinal()).serializeJSON()); + result.put(SubscribeVehicleDataResponse.KEY_DEVICE_STATUS, TestValues.GENERAL_VEHICLEDATARESULT_LIST.get(VehicleDataType.VEHICLEDATA_DEVICESTATUS.ordinal()).serializeJSON()); + result.put(SubscribeVehicleDataResponse.KEY_DRIVER_BRAKING, TestValues.GENERAL_VEHICLEDATARESULT_LIST.get(VehicleDataType.VEHICLEDATA_BRAKING.ordinal()).serializeJSON()); + result.put(SubscribeVehicleDataResponse.KEY_WIPER_STATUS, TestValues.GENERAL_VEHICLEDATARESULT_LIST.get(VehicleDataType.VEHICLEDATA_WIPERSTATUS.ordinal()).serializeJSON()); + result.put(SubscribeVehicleDataResponse.KEY_HEAD_LAMP_STATUS, TestValues.GENERAL_VEHICLEDATARESULT_LIST.get(VehicleDataType.VEHICLEDATA_HEADLAMPSTATUS.ordinal()).serializeJSON()); + result.put(SubscribeVehicleDataResponse.KEY_ACC_PEDAL_POSITION, TestValues.GENERAL_VEHICLEDATARESULT_LIST.get(VehicleDataType.VEHICLEDATA_ACCPEDAL.ordinal()).serializeJSON()); + result.put(SubscribeVehicleDataResponse.KEY_STEERING_WHEEL_ANGLE, TestValues.GENERAL_VEHICLEDATARESULT_LIST.get(VehicleDataType.VEHICLEDATA_STEERINGWHEEL.ordinal()).serializeJSON()); + result.put(SubscribeVehicleDataResponse.KEY_E_CALL_INFO, TestValues.GENERAL_VEHICLEDATARESULT_LIST.get(VehicleDataType.VEHICLEDATA_ECALLINFO.ordinal()).serializeJSON()); + result.put(SubscribeVehicleDataResponse.KEY_AIRBAG_STATUS, TestValues.GENERAL_VEHICLEDATARESULT_LIST.get(VehicleDataType.VEHICLEDATA_AIRBAGSTATUS.ordinal()).serializeJSON()); + result.put(SubscribeVehicleDataResponse.KEY_EMERGENCY_EVENT, TestValues.GENERAL_VEHICLEDATARESULT_LIST.get(VehicleDataType.VEHICLEDATA_EMERGENCYEVENT.ordinal()).serializeJSON()); + result.put(SubscribeVehicleDataResponse.KEY_CLUSTER_MODES, TestValues.GENERAL_VEHICLEDATARESULT_LIST.get(VehicleDataType.VEHICLEDATA_CLUSTERMODESTATUS.ordinal()).serializeJSON()); + result.put(SubscribeVehicleDataResponse.KEY_MY_KEY, TestValues.GENERAL_VEHICLEDATARESULT_LIST.get(VehicleDataType.VEHICLEDATA_MYKEY.ordinal()).serializeJSON()); + result.put(SubscribeVehicleDataResponse.KEY_FUEL_RANGE, TestValues.GENERAL_VEHICLEDATARESULT_LIST.get(VehicleDataType.VEHICLEDATA_FUELRANGE.ordinal()).serializeJSON()); + result.put(SubscribeVehicleDataResponse.KEY_TURN_SIGNAL, TestValues.GENERAL_VEHICLEDATARESULT_LIST.get(VehicleDataType.VEHICLEDATA_TURNSIGNAL.ordinal()).serializeJSON()); + result.put(SubscribeVehicleDataResponse.KEY_GEAR_STATUS, TestValues.GENERAL_VEHICLEDATARESULT_LIST.get(VehicleDataType.VEHICLEDATA_GEARSTATUS.ordinal()).serializeJSON()); + result.put(SubscribeVehicleDataResponse.KEY_ELECTRONIC_PARK_BRAKE_STATUS, TestValues.GENERAL_VEHICLEDATARESULT_LIST.get(VehicleDataType.VEHICLEDATA_ELECTRONICPARKBRAKESTATUS.ordinal()).serializeJSON()); + result.put(SubscribeVehicleDataResponse.KEY_STABILITY_CONTROLS_STATUS, TestValues.GENERAL_VEHICLEDATARESULT_LIST.get(VehicleDataType.VEHICLEDATA_STABILITYCONTROLSSTATUS.ordinal()).serializeJSON()); + result.put(SubscribeVehicleDataResponse.KEY_ELECTRONIC_PARK_BRAKE_STATUS, TestValues.GENERAL_VEHICLEDATARESULT_LIST.get(VehicleDataType.VEHICLEDATA_ELECTRONICPARKBRAKESTATUS.ordinal()).serializeJSON()); + result.put(SubscribeVehicleDataResponse.KEY_HANDS_OFF_STEERING, TestValues.GENERAL_VEHICLEDATARESULT_LIST.get(VehicleDataType.VEHICLEDATA_HANDSOFFSTEERING.ordinal()).serializeJSON()); + result.put(SubscribeVehicleDataResponse.KEY_WINDOW_STATUS, TestValues.GENERAL_VEHICLEDATARESULT_LIST.get(VehicleDataType.VEHICLEDATA_WINDOWSTATUS.ordinal()).serializeJSON()); + result.put(TestValues.GENERAL_OEM_CUSTOM_VEHICLE_DATA_NAME, TestValues.GENERAL_OEM_CUSTOM_VEHICLE_DATA.serializeJSON()); + } catch (JSONException e) { + fail(TestValues.JSON_FAIL); + } + + return result; + } + + /** + * Tests the expected values of the RPC message. + */ + @Test + public void testRpcValues() { + // Test Values + Result testResult = ((UnsubscribeVehicleDataResponse) msg).getResultCode(); + VehicleDataResult testGps = ((UnsubscribeVehicleDataResponse) msg).getGps(); + VehicleDataResult testOdometer = ((UnsubscribeVehicleDataResponse) msg).getOdometer(); + VehicleDataResult testTirePressure = ((UnsubscribeVehicleDataResponse) msg).getTirePressure(); + VehicleDataResult testBeltStatus = ((UnsubscribeVehicleDataResponse) msg).getBeltStatus(); + VehicleDataResult testBodyInfo = ((UnsubscribeVehicleDataResponse) msg).getBodyInformation(); + VehicleDataResult testDeviceStatus = ((UnsubscribeVehicleDataResponse) msg).getDeviceStatus(); + VehicleDataResult testHeadLampStatus = ((UnsubscribeVehicleDataResponse) msg).getHeadLampStatus(); + VehicleDataResult testECallInfo = ((UnsubscribeVehicleDataResponse) msg).getECallInfo(); + VehicleDataResult testAirbagStatus = ((UnsubscribeVehicleDataResponse) msg).getAirbagStatus(); + VehicleDataResult testEmergencyEvent = ((UnsubscribeVehicleDataResponse) msg).getEmergencyEvent(); + VehicleDataResult testClusterMode = ((UnsubscribeVehicleDataResponse) msg).getClusterModes(); + VehicleDataResult testMyKey = ((UnsubscribeVehicleDataResponse) msg).getMyKey(); + VehicleDataResult testSpeed = ((UnsubscribeVehicleDataResponse) msg).getSpeed(); + VehicleDataResult testRpm = ((UnsubscribeVehicleDataResponse) msg).getRpm(); + VehicleDataResult testFuelLevel = ((UnsubscribeVehicleDataResponse) msg).getFuelLevel(); + VehicleDataResult testConsumption = ((UnsubscribeVehicleDataResponse) msg).getInstantFuelConsumption(); + VehicleDataResult testExternalTemp = ((UnsubscribeVehicleDataResponse) msg).getExternalTemperature(); + VehicleDataResult testEngineTorque = ((UnsubscribeVehicleDataResponse) msg).getEngineTorque(); + VehicleDataResult testEngineOilLife = ((UnsubscribeVehicleDataResponse) msg).getEngineOilLife(); + VehicleDataResult testAccPedal = ((UnsubscribeVehicleDataResponse) msg).getAccPedalPosition(); + VehicleDataResult testSteeringWheel = ((UnsubscribeVehicleDataResponse) msg).getSteeringWheelAngle(); + VehicleDataResult testFuelLevelState = ((UnsubscribeVehicleDataResponse) msg).getFuelLevelState(); + VehicleDataResult testPrndl = ((UnsubscribeVehicleDataResponse) msg).getPrndl(); + VehicleDataResult testBraking = ((UnsubscribeVehicleDataResponse) msg).getDriverBraking(); + VehicleDataResult testWiperStatus = ((UnsubscribeVehicleDataResponse) msg).getWiperStatus(); + VehicleDataResult testFuelRange = ((UnsubscribeVehicleDataResponse) msg).getFuelRange(); + VehicleDataResult testTurnSignal = ((UnsubscribeVehicleDataResponse) msg).getTurnSignal(); + VehicleDataResult testEBrakeStatus = ((UnsubscribeVehicleDataResponse) msg).getElectronicParkBrakeStatus(); + VehicleDataResult testHOffSteering = ((UnsubscribeVehicleDataResponse) msg).getHandsOffSteering(); + VehicleDataResult testGearStatus = ((UnsubscribeVehicleDataResponse) msg).getGearStatus(); + VehicleDataResult testWindowStatus = ((UnsubscribeVehicleDataResponse) msg).getWindowStatus(); + VehicleDataResult testStabilityControlStatus = ((UnsubscribeVehicleDataResponse) msg).getStabilityControlsStatus(); + VehicleDataResult testOemCustomData = ((UnsubscribeVehicleDataResponse) msg).getOEMCustomVehicleData(TestValues.GENERAL_OEM_CUSTOM_VEHICLE_DATA_NAME); + + // Valid Tests + assertTrue(TestValues.TRUE, testResult.equals(TestValues.GENERAL_RESULT)); + assertTrue(TestValues.TRUE, testGps.getDataType().equals(VehicleDataType.VEHICLEDATA_GPS)); + assertTrue(TestValues.TRUE, testOdometer.getDataType().equals(VehicleDataType.VEHICLEDATA_ODOMETER)); + assertTrue(TestValues.TRUE, testTirePressure.getDataType().equals(VehicleDataType.VEHICLEDATA_TIREPRESSURE)); + assertTrue(TestValues.TRUE, testBeltStatus.getDataType().equals(VehicleDataType.VEHICLEDATA_BELTSTATUS)); + assertTrue(TestValues.TRUE, testBodyInfo.getDataType().equals(VehicleDataType.VEHICLEDATA_BODYINFO)); + assertTrue(TestValues.TRUE, testDeviceStatus.getDataType().equals(VehicleDataType.VEHICLEDATA_DEVICESTATUS)); + assertTrue(TestValues.TRUE, testHeadLampStatus.getDataType().equals(VehicleDataType.VEHICLEDATA_HEADLAMPSTATUS)); + assertTrue(TestValues.TRUE, testECallInfo.getDataType().equals(VehicleDataType.VEHICLEDATA_ECALLINFO)); + assertTrue(TestValues.TRUE, testAirbagStatus.getDataType().equals(VehicleDataType.VEHICLEDATA_AIRBAGSTATUS)); + assertTrue(TestValues.TRUE, testEmergencyEvent.getDataType().equals(VehicleDataType.VEHICLEDATA_EMERGENCYEVENT)); + assertTrue(TestValues.TRUE, testClusterMode.getDataType().equals(VehicleDataType.VEHICLEDATA_CLUSTERMODESTATUS)); + assertTrue(TestValues.TRUE, testMyKey.getDataType().equals(VehicleDataType.VEHICLEDATA_MYKEY)); + assertTrue(TestValues.TRUE, testSpeed.getDataType().equals(VehicleDataType.VEHICLEDATA_SPEED)); + assertTrue(TestValues.TRUE, testRpm.getDataType().equals(VehicleDataType.VEHICLEDATA_RPM)); + assertTrue(TestValues.TRUE, testFuelLevel.getDataType().equals(VehicleDataType.VEHICLEDATA_FUELLEVEL)); + assertTrue(TestValues.TRUE, testConsumption.getDataType().equals(VehicleDataType.VEHICLEDATA_FUELCONSUMPTION)); + assertTrue(TestValues.TRUE, testExternalTemp.getDataType().equals(VehicleDataType.VEHICLEDATA_EXTERNTEMP)); + assertTrue(TestValues.TRUE, testEngineTorque.getDataType().equals(VehicleDataType.VEHICLEDATA_ENGINETORQUE)); + assertTrue(TestValues.TRUE, testEngineOilLife.getDataType().equals(VehicleDataType.VEHICLEDATA_ENGINEOILLIFE)); + assertTrue(TestValues.TRUE, testAccPedal.getDataType().equals(VehicleDataType.VEHICLEDATA_ACCPEDAL)); + assertTrue(TestValues.TRUE, testSteeringWheel.getDataType().equals(VehicleDataType.VEHICLEDATA_STEERINGWHEEL)); + assertTrue(TestValues.TRUE, testFuelLevelState.getDataType().equals(VehicleDataType.VEHICLEDATA_FUELLEVEL_STATE)); + assertTrue(TestValues.TRUE, testPrndl.getDataType().equals(VehicleDataType.VEHICLEDATA_PRNDL)); + assertTrue(TestValues.TRUE, testBraking.getDataType().equals(VehicleDataType.VEHICLEDATA_BRAKING)); + assertTrue(TestValues.TRUE, testWiperStatus.getDataType().equals(VehicleDataType.VEHICLEDATA_WIPERSTATUS)); + assertTrue(TestValues.TRUE, testFuelRange.getDataType().equals(VehicleDataType.VEHICLEDATA_FUELRANGE)); + assertTrue(TestValues.TRUE, testTurnSignal.getDataType().equals(VehicleDataType.VEHICLEDATA_TURNSIGNAL)); + assertTrue(TestValues.TRUE, testEBrakeStatus.getDataType().equals(VehicleDataType.VEHICLEDATA_ELECTRONICPARKBRAKESTATUS)); + assertTrue(TestValues.TRUE, testHOffSteering.getDataType().equals(VehicleDataType.VEHICLEDATA_HANDSOFFSTEERING)); + assertTrue(TestValues.TRUE, testWindowStatus.getDataType().equals(VehicleDataType.VEHICLEDATA_WINDOWSTATUS)); + assertTrue(TestValues.TRUE, testStabilityControlStatus.getDataType().equals(VehicleDataType.VEHICLEDATA_STABILITYCONTROLSSTATUS)); + assertTrue(TestValues.TRUE, testOemCustomData.getOEMCustomVehicleDataType().equals(TestValues.GENERAL_OEM_CUSTOM_VEHICLE_DATA_NAME)); + assertTrue(TestValues.TRUE, testGearStatus.getDataType().equals(VehicleDataType.VEHICLEDATA_GEARSTATUS)); // Invalid/Null Tests - UnsubscribeVehicleDataResponse msg = new UnsubscribeVehicleDataResponse(); - assertNotNull("Null object creation failed.", msg); + UnsubscribeVehicleDataResponse msg = new UnsubscribeVehicleDataResponse(); + assertNotNull("Null object creation failed.", msg); testNullBase(msg); - assertNull(TestValues.NULL, msg.getResultCode()); - assertNull(TestValues.NULL, msg.getAccPedalPosition()); + assertNull(TestValues.NULL, msg.getResultCode()); + assertNull(TestValues.NULL, msg.getAccPedalPosition()); assertNull(TestValues.NULL, msg.getAirbagStatus()); assertNull(TestValues.NULL, msg.getBeltStatus()); assertNull(TestValues.NULL, msg.getDriverBraking()); @@ -249,9 +249,9 @@ public class UnsubscribeVehicleDataResponseTest extends BaseRpcTests { assertNull(TestValues.NULL, msg.getFuelRange()); assertNull(TestValues.NULL, msg.getTurnSignal()); assertNull(TestValues.NULL, msg.getElectronicParkBrakeStatus()); - assertNull(TestValues.NULL, msg.getGearStatus()); - assertNull(TestValues.NULL, msg.getHandsOffSteering()); - assertNull(TestValues.NULL, msg.getWindowStatus()); + assertNull(TestValues.NULL, msg.getGearStatus()); + assertNull(TestValues.NULL, msg.getHandsOffSteering()); + assertNull(TestValues.NULL, msg.getWindowStatus()); assertNull(TestValues.NULL, msg.getHandsOffSteering()); assertNull(TestValues.NULL, msg.getStabilityControlsStatus()); assertNull(TestValues.NULL, msg.getOEMCustomVehicleData(TestValues.GENERAL_OEM_CUSTOM_VEHICLE_DATA_NAME)); @@ -261,156 +261,156 @@ public class UnsubscribeVehicleDataResponseTest extends BaseRpcTests { * Tests a valid JSON construction of this RPC message. */ @Test - public void testJsonConstructor () { - JSONObject commandJson = JsonFileReader.readId(getInstrumentation().getContext(), getCommandType(), getMessageType()); - assertNotNull(TestValues.NOT_NULL, commandJson); - - try { - Hashtable<String, Object> hash = JsonRPCMarshaller.deserializeJSONObject(commandJson); - UnsubscribeVehicleDataResponse cmd = new UnsubscribeVehicleDataResponse(hash); - - JSONObject body = JsonUtils.readJsonObjectFromJsonObject(commandJson, getMessageType()); - assertNotNull(TestValues.NOT_NULL, body); - - // Test everything in the json body. - assertEquals(TestValues.MATCH, JsonUtils.readStringFromJsonObject(body, RPCMessage.KEY_FUNCTION_NAME), cmd.getFunctionName()); - assertEquals(TestValues.MATCH, JsonUtils.readIntegerFromJsonObject(body, RPCMessage.KEY_CORRELATION_ID), cmd.getCorrelationID()); - - JSONObject parameters = JsonUtils.readJsonObjectFromJsonObject(body, RPCMessage.KEY_PARAMETERS); - - JSONObject speed = JsonUtils.readJsonObjectFromJsonObject(parameters, UnsubscribeVehicleDataResponse.KEY_SPEED); - VehicleDataResult referenceSpeed = new VehicleDataResult(JsonRPCMarshaller.deserializeJSONObject(speed)); - assertTrue(TestValues.TRUE, Validator.validateVehicleDataResult(referenceSpeed, cmd.getSpeed())); - - JSONObject rpm = JsonUtils.readJsonObjectFromJsonObject(parameters, UnsubscribeVehicleDataResponse.KEY_RPM); - VehicleDataResult referenceRpm = new VehicleDataResult(JsonRPCMarshaller.deserializeJSONObject(rpm)); - assertTrue(TestValues.TRUE, Validator.validateVehicleDataResult(referenceRpm, cmd.getRpm())); - - JSONObject fuelLevel = JsonUtils.readJsonObjectFromJsonObject(parameters, UnsubscribeVehicleDataResponse.KEY_FUEL_LEVEL); - VehicleDataResult referenceFuelLevel = new VehicleDataResult(JsonRPCMarshaller.deserializeJSONObject(fuelLevel)); - assertTrue(TestValues.TRUE, Validator.validateVehicleDataResult(referenceFuelLevel, cmd.getFuelLevel())); - - JSONObject externalTemperature = JsonUtils.readJsonObjectFromJsonObject(parameters, UnsubscribeVehicleDataResponse.KEY_EXTERNAL_TEMPERATURE); - VehicleDataResult referenceExternalTemperature = new VehicleDataResult(JsonRPCMarshaller.deserializeJSONObject(externalTemperature)); - assertTrue(TestValues.TRUE, Validator.validateVehicleDataResult(referenceExternalTemperature, cmd.getExternalTemperature())); - - JSONObject prndl = JsonUtils.readJsonObjectFromJsonObject(parameters, UnsubscribeVehicleDataResponse.KEY_PRNDL); - VehicleDataResult referencePrndl = new VehicleDataResult(JsonRPCMarshaller.deserializeJSONObject(prndl)); - assertTrue(TestValues.TRUE, Validator.validateVehicleDataResult(referencePrndl, cmd.getPrndl())); - - JSONObject tirePressure = JsonUtils.readJsonObjectFromJsonObject(parameters, UnsubscribeVehicleDataResponse.KEY_TIRE_PRESSURE); - VehicleDataResult referenceTirePressure = new VehicleDataResult(JsonRPCMarshaller.deserializeJSONObject(tirePressure)); - assertTrue(TestValues.TRUE, Validator.validateVehicleDataResult(referenceTirePressure, cmd.getTirePressure())); - - JSONObject engineTorque = JsonUtils.readJsonObjectFromJsonObject(parameters, UnsubscribeVehicleDataResponse.KEY_ENGINE_TORQUE); - VehicleDataResult referenceEngineTorque = new VehicleDataResult(JsonRPCMarshaller.deserializeJSONObject(engineTorque)); - assertTrue(TestValues.TRUE, Validator.validateVehicleDataResult(referenceEngineTorque, cmd.getEngineTorque())); - - JSONObject engineOilLife = JsonUtils.readJsonObjectFromJsonObject(parameters, UnsubscribeVehicleDataResponse.KEY_ENGINE_OIL_LIFE); - VehicleDataResult referenceEngineOilLife = new VehicleDataResult(JsonRPCMarshaller.deserializeJSONObject(engineOilLife)); - assertTrue(TestValues.TRUE, Validator.validateVehicleDataResult(referenceEngineOilLife, cmd.getEngineOilLife())); - - JSONObject odometer = JsonUtils.readJsonObjectFromJsonObject(parameters, UnsubscribeVehicleDataResponse.KEY_ODOMETER); - VehicleDataResult referenceOdometer = new VehicleDataResult(JsonRPCMarshaller.deserializeJSONObject(odometer)); - assertTrue(TestValues.TRUE, Validator.validateVehicleDataResult(referenceOdometer, cmd.getOdometer())); - - JSONObject gps = JsonUtils.readJsonObjectFromJsonObject(parameters, UnsubscribeVehicleDataResponse.KEY_GPS); - VehicleDataResult referenceGps = new VehicleDataResult(JsonRPCMarshaller.deserializeJSONObject(gps)); - assertTrue(TestValues.TRUE, Validator.validateVehicleDataResult(referenceGps, cmd.getGps())); - - JSONObject fuelLevelState = JsonUtils.readJsonObjectFromJsonObject(parameters, UnsubscribeVehicleDataResponse.KEY_FUEL_LEVEL_STATE); - VehicleDataResult referenceFuelLevelState = new VehicleDataResult(JsonRPCMarshaller.deserializeJSONObject(fuelLevelState)); - assertTrue(TestValues.TRUE, Validator.validateVehicleDataResult(referenceFuelLevelState, cmd.getFuelLevelState())); - - JSONObject fuelConsumption = JsonUtils.readJsonObjectFromJsonObject(parameters, UnsubscribeVehicleDataResponse.KEY_INSTANT_FUEL_CONSUMPTION); - VehicleDataResult referenceFuelConsumption = new VehicleDataResult(JsonRPCMarshaller.deserializeJSONObject(fuelConsumption)); - assertTrue(TestValues.TRUE, Validator.validateVehicleDataResult(referenceFuelConsumption, cmd.getInstantFuelConsumption())); - - JSONObject beltStatus = JsonUtils.readJsonObjectFromJsonObject(parameters, UnsubscribeVehicleDataResponse.KEY_BELT_STATUS); - VehicleDataResult referenceBeltStatus = new VehicleDataResult(JsonRPCMarshaller.deserializeJSONObject(beltStatus)); - assertTrue(TestValues.TRUE, Validator.validateVehicleDataResult(referenceBeltStatus, cmd.getBeltStatus())); - - JSONObject bodyInformation = JsonUtils.readJsonObjectFromJsonObject(parameters, UnsubscribeVehicleDataResponse.KEY_BODY_INFORMATION); - VehicleDataResult referenceBodyInformation = new VehicleDataResult(JsonRPCMarshaller.deserializeJSONObject(bodyInformation)); - assertTrue(TestValues.TRUE, Validator.validateVehicleDataResult(referenceBodyInformation, cmd.getBodyInformation())); - - JSONObject deviceStatus = JsonUtils.readJsonObjectFromJsonObject(parameters, UnsubscribeVehicleDataResponse.KEY_DEVICE_STATUS); - VehicleDataResult referenceDeviceStatus = new VehicleDataResult(JsonRPCMarshaller.deserializeJSONObject(deviceStatus)); - assertTrue(TestValues.TRUE, Validator.validateVehicleDataResult(referenceDeviceStatus, cmd.getDeviceStatus())); - - JSONObject driverBraking = JsonUtils.readJsonObjectFromJsonObject(parameters, UnsubscribeVehicleDataResponse.KEY_DRIVER_BRAKING); - VehicleDataResult referenceDriverBraking = new VehicleDataResult(JsonRPCMarshaller.deserializeJSONObject(driverBraking)); - assertTrue(TestValues.TRUE, Validator.validateVehicleDataResult(referenceDriverBraking, cmd.getDriverBraking())); - - JSONObject wiperStatus = JsonUtils.readJsonObjectFromJsonObject(parameters, UnsubscribeVehicleDataResponse.KEY_WIPER_STATUS); - VehicleDataResult referenceWiperStatus = new VehicleDataResult(JsonRPCMarshaller.deserializeJSONObject(wiperStatus)); - assertTrue(TestValues.TRUE, Validator.validateVehicleDataResult(referenceWiperStatus, cmd.getWiperStatus())); - - JSONObject headLampStatus = JsonUtils.readJsonObjectFromJsonObject(parameters, UnsubscribeVehicleDataResponse.KEY_HEAD_LAMP_STATUS); - VehicleDataResult referenceHeadLampStatus = new VehicleDataResult(JsonRPCMarshaller.deserializeJSONObject(headLampStatus)); - assertTrue(TestValues.TRUE, Validator.validateVehicleDataResult(referenceHeadLampStatus, cmd.getHeadLampStatus())); - - JSONObject accPedalPosition = JsonUtils.readJsonObjectFromJsonObject(parameters, UnsubscribeVehicleDataResponse.KEY_ACC_PEDAL_POSITION); - VehicleDataResult referenceAccPedalPosition = new VehicleDataResult(JsonRPCMarshaller.deserializeJSONObject(accPedalPosition)); - assertTrue(TestValues.TRUE, Validator.validateVehicleDataResult(referenceAccPedalPosition, cmd.getAccPedalPosition())); - - JSONObject steeringWheelAngle = JsonUtils.readJsonObjectFromJsonObject(parameters, UnsubscribeVehicleDataResponse.KEY_STEERING_WHEEL_ANGLE); - VehicleDataResult referenceSteeringWheelAngle = new VehicleDataResult(JsonRPCMarshaller.deserializeJSONObject(steeringWheelAngle)); - assertTrue(TestValues.TRUE, Validator.validateVehicleDataResult(referenceSteeringWheelAngle, cmd.getSteeringWheelAngle())); - - JSONObject eCallInfo = JsonUtils.readJsonObjectFromJsonObject(parameters, UnsubscribeVehicleDataResponse.KEY_E_CALL_INFO); - VehicleDataResult referenceECallInfo = new VehicleDataResult(JsonRPCMarshaller.deserializeJSONObject(eCallInfo)); - assertTrue(TestValues.TRUE, Validator.validateVehicleDataResult(referenceECallInfo, cmd.getECallInfo())); - - JSONObject airbagStatus = JsonUtils.readJsonObjectFromJsonObject(parameters, UnsubscribeVehicleDataResponse.KEY_AIRBAG_STATUS); - VehicleDataResult referenceAirbagStatus = new VehicleDataResult(JsonRPCMarshaller.deserializeJSONObject(airbagStatus)); - assertTrue(TestValues.TRUE, Validator.validateVehicleDataResult(referenceAirbagStatus, cmd.getAirbagStatus())); - - JSONObject emergencyEvent = JsonUtils.readJsonObjectFromJsonObject(parameters, UnsubscribeVehicleDataResponse.KEY_EMERGENCY_EVENT); - VehicleDataResult referenceEmergencyEvent = new VehicleDataResult(JsonRPCMarshaller.deserializeJSONObject(emergencyEvent)); - assertTrue(TestValues.TRUE, Validator.validateVehicleDataResult(referenceEmergencyEvent, cmd.getEmergencyEvent())); - - JSONObject clusterModes = JsonUtils.readJsonObjectFromJsonObject(parameters, UnsubscribeVehicleDataResponse.KEY_CLUSTER_MODES); - VehicleDataResult referenceClusterModes = new VehicleDataResult(JsonRPCMarshaller.deserializeJSONObject(clusterModes)); - assertTrue(TestValues.TRUE, Validator.validateVehicleDataResult(referenceClusterModes, cmd.getClusterModes())); - - JSONObject myKey = JsonUtils.readJsonObjectFromJsonObject(parameters, UnsubscribeVehicleDataResponse.KEY_MY_KEY); - VehicleDataResult referenceMyKey = new VehicleDataResult(JsonRPCMarshaller.deserializeJSONObject(myKey)); - assertTrue(TestValues.TRUE, Validator.validateVehicleDataResult(referenceMyKey, cmd.getMyKey())); - - JSONObject fuelRange = JsonUtils.readJsonObjectFromJsonObject(parameters, UnsubscribeVehicleDataResponse.KEY_FUEL_RANGE); - VehicleDataResult referenceFuelRange = new VehicleDataResult(JsonRPCMarshaller.deserializeJSONObject(fuelRange)); - assertTrue(TestValues.TRUE, Validator.validateVehicleDataResult(referenceFuelRange, cmd.getFuelRange())); - - JSONObject turnSignal = JsonUtils.readJsonObjectFromJsonObject(parameters, UnsubscribeVehicleDataResponse.KEY_TURN_SIGNAL); - VehicleDataResult referenceTurnSignal = new VehicleDataResult(JsonRPCMarshaller.deserializeJSONObject(turnSignal)); - assertTrue(TestValues.TRUE, Validator.validateVehicleDataResult(referenceTurnSignal, cmd.getTurnSignal())); - - JSONObject eBrakeStatus = JsonUtils.readJsonObjectFromJsonObject(parameters, UnsubscribeVehicleDataResponse.KEY_ELECTRONIC_PARK_BRAKE_STATUS); - VehicleDataResult referenceEBrakeStatus = new VehicleDataResult(JsonRPCMarshaller.deserializeJSONObject(eBrakeStatus)); - assertTrue(TestValues.TRUE, Validator.validateVehicleDataResult(referenceEBrakeStatus, cmd.getElectronicParkBrakeStatus())); - - JSONObject handsOffSteering = JsonUtils.readJsonObjectFromJsonObject(parameters, UnsubscribeVehicleDataResponse.KEY_HANDS_OFF_STEERING); - VehicleDataResult referenceHandsOffSteering = new VehicleDataResult(JsonRPCMarshaller.deserializeJSONObject(handsOffSteering)); - assertTrue(TestValues.TRUE, Validator.validateVehicleDataResult(referenceHandsOffSteering, cmd.getHandsOffSteering())); - - JSONObject gearStatus = JsonUtils.readJsonObjectFromJsonObject(parameters, UnsubscribeVehicleDataResponse.KEY_GEAR_STATUS); - VehicleDataResult referenceGearStatus = new VehicleDataResult(JsonRPCMarshaller.deserializeJSONObject(gearStatus)); - assertTrue(TestValues.TRUE, Validator.validateVehicleDataResult(referenceGearStatus, cmd.getGearStatus())); - - JSONObject windowStatus = JsonUtils.readJsonObjectFromJsonObject(parameters, UnsubscribeVehicleDataResponse.KEY_WINDOW_STATUS); - VehicleDataResult referenceWindowStatus = new VehicleDataResult(JsonRPCMarshaller.deserializeJSONObject(windowStatus)); - assertTrue(TestValues.TRUE, Validator.validateVehicleDataResult(referenceWindowStatus, cmd.getWindowStatus())); - - JSONObject oemCustomData = JsonUtils.readJsonObjectFromJsonObject(parameters, TestValues.GENERAL_OEM_CUSTOM_VEHICLE_DATA_NAME); - VehicleDataResult referenceOemCustomData = new VehicleDataResult(JsonRPCMarshaller.deserializeJSONObject(oemCustomData)); - assertTrue(TestValues.TRUE, Validator.validateVehicleDataResult(referenceOemCustomData, cmd.getOEMCustomVehicleData(TestValues.GENERAL_OEM_CUSTOM_VEHICLE_DATA_NAME))); - - JSONObject stabilityControlsStatus = JsonUtils.readJsonObjectFromJsonObject(parameters, UnsubscribeVehicleDataResponse.KEY_STABILITY_CONTROLS_STATUS); - VehicleDataResult referenceStabilityControlStatus = new VehicleDataResult(JsonRPCMarshaller.deserializeJSONObject(stabilityControlsStatus)); - assertTrue(TestValues.TRUE, Validator.validateStabilityControlStatus(referenceStabilityControlStatus, cmd.getStabilityControlsStatus())); - } catch (JSONException e) { - e.printStackTrace(); - } + public void testJsonConstructor() { + JSONObject commandJson = JsonFileReader.readId(getInstrumentation().getContext(), getCommandType(), getMessageType()); + assertNotNull(TestValues.NOT_NULL, commandJson); + + try { + Hashtable<String, Object> hash = JsonRPCMarshaller.deserializeJSONObject(commandJson); + UnsubscribeVehicleDataResponse cmd = new UnsubscribeVehicleDataResponse(hash); + + JSONObject body = JsonUtils.readJsonObjectFromJsonObject(commandJson, getMessageType()); + assertNotNull(TestValues.NOT_NULL, body); + + // Test everything in the json body. + assertEquals(TestValues.MATCH, JsonUtils.readStringFromJsonObject(body, RPCMessage.KEY_FUNCTION_NAME), cmd.getFunctionName()); + assertEquals(TestValues.MATCH, JsonUtils.readIntegerFromJsonObject(body, RPCMessage.KEY_CORRELATION_ID), cmd.getCorrelationID()); + + JSONObject parameters = JsonUtils.readJsonObjectFromJsonObject(body, RPCMessage.KEY_PARAMETERS); + + JSONObject speed = JsonUtils.readJsonObjectFromJsonObject(parameters, UnsubscribeVehicleDataResponse.KEY_SPEED); + VehicleDataResult referenceSpeed = new VehicleDataResult(JsonRPCMarshaller.deserializeJSONObject(speed)); + assertTrue(TestValues.TRUE, Validator.validateVehicleDataResult(referenceSpeed, cmd.getSpeed())); + + JSONObject rpm = JsonUtils.readJsonObjectFromJsonObject(parameters, UnsubscribeVehicleDataResponse.KEY_RPM); + VehicleDataResult referenceRpm = new VehicleDataResult(JsonRPCMarshaller.deserializeJSONObject(rpm)); + assertTrue(TestValues.TRUE, Validator.validateVehicleDataResult(referenceRpm, cmd.getRpm())); + + JSONObject fuelLevel = JsonUtils.readJsonObjectFromJsonObject(parameters, UnsubscribeVehicleDataResponse.KEY_FUEL_LEVEL); + VehicleDataResult referenceFuelLevel = new VehicleDataResult(JsonRPCMarshaller.deserializeJSONObject(fuelLevel)); + assertTrue(TestValues.TRUE, Validator.validateVehicleDataResult(referenceFuelLevel, cmd.getFuelLevel())); + + JSONObject externalTemperature = JsonUtils.readJsonObjectFromJsonObject(parameters, UnsubscribeVehicleDataResponse.KEY_EXTERNAL_TEMPERATURE); + VehicleDataResult referenceExternalTemperature = new VehicleDataResult(JsonRPCMarshaller.deserializeJSONObject(externalTemperature)); + assertTrue(TestValues.TRUE, Validator.validateVehicleDataResult(referenceExternalTemperature, cmd.getExternalTemperature())); + + JSONObject prndl = JsonUtils.readJsonObjectFromJsonObject(parameters, UnsubscribeVehicleDataResponse.KEY_PRNDL); + VehicleDataResult referencePrndl = new VehicleDataResult(JsonRPCMarshaller.deserializeJSONObject(prndl)); + assertTrue(TestValues.TRUE, Validator.validateVehicleDataResult(referencePrndl, cmd.getPrndl())); + + JSONObject tirePressure = JsonUtils.readJsonObjectFromJsonObject(parameters, UnsubscribeVehicleDataResponse.KEY_TIRE_PRESSURE); + VehicleDataResult referenceTirePressure = new VehicleDataResult(JsonRPCMarshaller.deserializeJSONObject(tirePressure)); + assertTrue(TestValues.TRUE, Validator.validateVehicleDataResult(referenceTirePressure, cmd.getTirePressure())); + + JSONObject engineTorque = JsonUtils.readJsonObjectFromJsonObject(parameters, UnsubscribeVehicleDataResponse.KEY_ENGINE_TORQUE); + VehicleDataResult referenceEngineTorque = new VehicleDataResult(JsonRPCMarshaller.deserializeJSONObject(engineTorque)); + assertTrue(TestValues.TRUE, Validator.validateVehicleDataResult(referenceEngineTorque, cmd.getEngineTorque())); + + JSONObject engineOilLife = JsonUtils.readJsonObjectFromJsonObject(parameters, UnsubscribeVehicleDataResponse.KEY_ENGINE_OIL_LIFE); + VehicleDataResult referenceEngineOilLife = new VehicleDataResult(JsonRPCMarshaller.deserializeJSONObject(engineOilLife)); + assertTrue(TestValues.TRUE, Validator.validateVehicleDataResult(referenceEngineOilLife, cmd.getEngineOilLife())); + + JSONObject odometer = JsonUtils.readJsonObjectFromJsonObject(parameters, UnsubscribeVehicleDataResponse.KEY_ODOMETER); + VehicleDataResult referenceOdometer = new VehicleDataResult(JsonRPCMarshaller.deserializeJSONObject(odometer)); + assertTrue(TestValues.TRUE, Validator.validateVehicleDataResult(referenceOdometer, cmd.getOdometer())); + + JSONObject gps = JsonUtils.readJsonObjectFromJsonObject(parameters, UnsubscribeVehicleDataResponse.KEY_GPS); + VehicleDataResult referenceGps = new VehicleDataResult(JsonRPCMarshaller.deserializeJSONObject(gps)); + assertTrue(TestValues.TRUE, Validator.validateVehicleDataResult(referenceGps, cmd.getGps())); + + JSONObject fuelLevelState = JsonUtils.readJsonObjectFromJsonObject(parameters, UnsubscribeVehicleDataResponse.KEY_FUEL_LEVEL_STATE); + VehicleDataResult referenceFuelLevelState = new VehicleDataResult(JsonRPCMarshaller.deserializeJSONObject(fuelLevelState)); + assertTrue(TestValues.TRUE, Validator.validateVehicleDataResult(referenceFuelLevelState, cmd.getFuelLevelState())); + + JSONObject fuelConsumption = JsonUtils.readJsonObjectFromJsonObject(parameters, UnsubscribeVehicleDataResponse.KEY_INSTANT_FUEL_CONSUMPTION); + VehicleDataResult referenceFuelConsumption = new VehicleDataResult(JsonRPCMarshaller.deserializeJSONObject(fuelConsumption)); + assertTrue(TestValues.TRUE, Validator.validateVehicleDataResult(referenceFuelConsumption, cmd.getInstantFuelConsumption())); + + JSONObject beltStatus = JsonUtils.readJsonObjectFromJsonObject(parameters, UnsubscribeVehicleDataResponse.KEY_BELT_STATUS); + VehicleDataResult referenceBeltStatus = new VehicleDataResult(JsonRPCMarshaller.deserializeJSONObject(beltStatus)); + assertTrue(TestValues.TRUE, Validator.validateVehicleDataResult(referenceBeltStatus, cmd.getBeltStatus())); + + JSONObject bodyInformation = JsonUtils.readJsonObjectFromJsonObject(parameters, UnsubscribeVehicleDataResponse.KEY_BODY_INFORMATION); + VehicleDataResult referenceBodyInformation = new VehicleDataResult(JsonRPCMarshaller.deserializeJSONObject(bodyInformation)); + assertTrue(TestValues.TRUE, Validator.validateVehicleDataResult(referenceBodyInformation, cmd.getBodyInformation())); + + JSONObject deviceStatus = JsonUtils.readJsonObjectFromJsonObject(parameters, UnsubscribeVehicleDataResponse.KEY_DEVICE_STATUS); + VehicleDataResult referenceDeviceStatus = new VehicleDataResult(JsonRPCMarshaller.deserializeJSONObject(deviceStatus)); + assertTrue(TestValues.TRUE, Validator.validateVehicleDataResult(referenceDeviceStatus, cmd.getDeviceStatus())); + + JSONObject driverBraking = JsonUtils.readJsonObjectFromJsonObject(parameters, UnsubscribeVehicleDataResponse.KEY_DRIVER_BRAKING); + VehicleDataResult referenceDriverBraking = new VehicleDataResult(JsonRPCMarshaller.deserializeJSONObject(driverBraking)); + assertTrue(TestValues.TRUE, Validator.validateVehicleDataResult(referenceDriverBraking, cmd.getDriverBraking())); + + JSONObject wiperStatus = JsonUtils.readJsonObjectFromJsonObject(parameters, UnsubscribeVehicleDataResponse.KEY_WIPER_STATUS); + VehicleDataResult referenceWiperStatus = new VehicleDataResult(JsonRPCMarshaller.deserializeJSONObject(wiperStatus)); + assertTrue(TestValues.TRUE, Validator.validateVehicleDataResult(referenceWiperStatus, cmd.getWiperStatus())); + + JSONObject headLampStatus = JsonUtils.readJsonObjectFromJsonObject(parameters, UnsubscribeVehicleDataResponse.KEY_HEAD_LAMP_STATUS); + VehicleDataResult referenceHeadLampStatus = new VehicleDataResult(JsonRPCMarshaller.deserializeJSONObject(headLampStatus)); + assertTrue(TestValues.TRUE, Validator.validateVehicleDataResult(referenceHeadLampStatus, cmd.getHeadLampStatus())); + + JSONObject accPedalPosition = JsonUtils.readJsonObjectFromJsonObject(parameters, UnsubscribeVehicleDataResponse.KEY_ACC_PEDAL_POSITION); + VehicleDataResult referenceAccPedalPosition = new VehicleDataResult(JsonRPCMarshaller.deserializeJSONObject(accPedalPosition)); + assertTrue(TestValues.TRUE, Validator.validateVehicleDataResult(referenceAccPedalPosition, cmd.getAccPedalPosition())); + + JSONObject steeringWheelAngle = JsonUtils.readJsonObjectFromJsonObject(parameters, UnsubscribeVehicleDataResponse.KEY_STEERING_WHEEL_ANGLE); + VehicleDataResult referenceSteeringWheelAngle = new VehicleDataResult(JsonRPCMarshaller.deserializeJSONObject(steeringWheelAngle)); + assertTrue(TestValues.TRUE, Validator.validateVehicleDataResult(referenceSteeringWheelAngle, cmd.getSteeringWheelAngle())); + + JSONObject eCallInfo = JsonUtils.readJsonObjectFromJsonObject(parameters, UnsubscribeVehicleDataResponse.KEY_E_CALL_INFO); + VehicleDataResult referenceECallInfo = new VehicleDataResult(JsonRPCMarshaller.deserializeJSONObject(eCallInfo)); + assertTrue(TestValues.TRUE, Validator.validateVehicleDataResult(referenceECallInfo, cmd.getECallInfo())); + + JSONObject airbagStatus = JsonUtils.readJsonObjectFromJsonObject(parameters, UnsubscribeVehicleDataResponse.KEY_AIRBAG_STATUS); + VehicleDataResult referenceAirbagStatus = new VehicleDataResult(JsonRPCMarshaller.deserializeJSONObject(airbagStatus)); + assertTrue(TestValues.TRUE, Validator.validateVehicleDataResult(referenceAirbagStatus, cmd.getAirbagStatus())); + + JSONObject emergencyEvent = JsonUtils.readJsonObjectFromJsonObject(parameters, UnsubscribeVehicleDataResponse.KEY_EMERGENCY_EVENT); + VehicleDataResult referenceEmergencyEvent = new VehicleDataResult(JsonRPCMarshaller.deserializeJSONObject(emergencyEvent)); + assertTrue(TestValues.TRUE, Validator.validateVehicleDataResult(referenceEmergencyEvent, cmd.getEmergencyEvent())); + + JSONObject clusterModes = JsonUtils.readJsonObjectFromJsonObject(parameters, UnsubscribeVehicleDataResponse.KEY_CLUSTER_MODES); + VehicleDataResult referenceClusterModes = new VehicleDataResult(JsonRPCMarshaller.deserializeJSONObject(clusterModes)); + assertTrue(TestValues.TRUE, Validator.validateVehicleDataResult(referenceClusterModes, cmd.getClusterModes())); + + JSONObject myKey = JsonUtils.readJsonObjectFromJsonObject(parameters, UnsubscribeVehicleDataResponse.KEY_MY_KEY); + VehicleDataResult referenceMyKey = new VehicleDataResult(JsonRPCMarshaller.deserializeJSONObject(myKey)); + assertTrue(TestValues.TRUE, Validator.validateVehicleDataResult(referenceMyKey, cmd.getMyKey())); + + JSONObject fuelRange = JsonUtils.readJsonObjectFromJsonObject(parameters, UnsubscribeVehicleDataResponse.KEY_FUEL_RANGE); + VehicleDataResult referenceFuelRange = new VehicleDataResult(JsonRPCMarshaller.deserializeJSONObject(fuelRange)); + assertTrue(TestValues.TRUE, Validator.validateVehicleDataResult(referenceFuelRange, cmd.getFuelRange())); + + JSONObject turnSignal = JsonUtils.readJsonObjectFromJsonObject(parameters, UnsubscribeVehicleDataResponse.KEY_TURN_SIGNAL); + VehicleDataResult referenceTurnSignal = new VehicleDataResult(JsonRPCMarshaller.deserializeJSONObject(turnSignal)); + assertTrue(TestValues.TRUE, Validator.validateVehicleDataResult(referenceTurnSignal, cmd.getTurnSignal())); + + JSONObject eBrakeStatus = JsonUtils.readJsonObjectFromJsonObject(parameters, UnsubscribeVehicleDataResponse.KEY_ELECTRONIC_PARK_BRAKE_STATUS); + VehicleDataResult referenceEBrakeStatus = new VehicleDataResult(JsonRPCMarshaller.deserializeJSONObject(eBrakeStatus)); + assertTrue(TestValues.TRUE, Validator.validateVehicleDataResult(referenceEBrakeStatus, cmd.getElectronicParkBrakeStatus())); + + JSONObject handsOffSteering = JsonUtils.readJsonObjectFromJsonObject(parameters, UnsubscribeVehicleDataResponse.KEY_HANDS_OFF_STEERING); + VehicleDataResult referenceHandsOffSteering = new VehicleDataResult(JsonRPCMarshaller.deserializeJSONObject(handsOffSteering)); + assertTrue(TestValues.TRUE, Validator.validateVehicleDataResult(referenceHandsOffSteering, cmd.getHandsOffSteering())); + + JSONObject gearStatus = JsonUtils.readJsonObjectFromJsonObject(parameters, UnsubscribeVehicleDataResponse.KEY_GEAR_STATUS); + VehicleDataResult referenceGearStatus = new VehicleDataResult(JsonRPCMarshaller.deserializeJSONObject(gearStatus)); + assertTrue(TestValues.TRUE, Validator.validateVehicleDataResult(referenceGearStatus, cmd.getGearStatus())); + + JSONObject windowStatus = JsonUtils.readJsonObjectFromJsonObject(parameters, UnsubscribeVehicleDataResponse.KEY_WINDOW_STATUS); + VehicleDataResult referenceWindowStatus = new VehicleDataResult(JsonRPCMarshaller.deserializeJSONObject(windowStatus)); + assertTrue(TestValues.TRUE, Validator.validateVehicleDataResult(referenceWindowStatus, cmd.getWindowStatus())); + + JSONObject oemCustomData = JsonUtils.readJsonObjectFromJsonObject(parameters, TestValues.GENERAL_OEM_CUSTOM_VEHICLE_DATA_NAME); + VehicleDataResult referenceOemCustomData = new VehicleDataResult(JsonRPCMarshaller.deserializeJSONObject(oemCustomData)); + assertTrue(TestValues.TRUE, Validator.validateVehicleDataResult(referenceOemCustomData, cmd.getOEMCustomVehicleData(TestValues.GENERAL_OEM_CUSTOM_VEHICLE_DATA_NAME))); + + JSONObject stabilityControlsStatus = JsonUtils.readJsonObjectFromJsonObject(parameters, UnsubscribeVehicleDataResponse.KEY_STABILITY_CONTROLS_STATUS); + VehicleDataResult referenceStabilityControlStatus = new VehicleDataResult(JsonRPCMarshaller.deserializeJSONObject(stabilityControlsStatus)); + assertTrue(TestValues.TRUE, Validator.validateStabilityControlStatus(referenceStabilityControlStatus, cmd.getStabilityControlsStatus())); + } catch (JSONException e) { + e.printStackTrace(); + } } }
\ No newline at end of file diff --git a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/UnsubscribeWayPointsResponseTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/UnsubscribeWayPointsResponseTests.java index 5cf058392..070a6e631 100644 --- a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/UnsubscribeWayPointsResponseTests.java +++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/UnsubscribeWayPointsResponseTests.java @@ -25,24 +25,24 @@ import static junit.framework.TestCase.assertNotNull; * Created by austinkirk on 6/7/17. */ -public class UnsubscribeWayPointsResponseTests extends BaseRpcTests{ +public class UnsubscribeWayPointsResponseTests extends BaseRpcTests { @Override - protected RPCMessage createMessage(){ + protected RPCMessage createMessage() { return new UnsubscribeWayPointsResponse(); } @Override - protected String getMessageType(){ + protected String getMessageType() { return RPCMessage.KEY_RESPONSE; } @Override - protected String getCommandType(){ + protected String getCommandType() { return FunctionID.UNSUBSCRIBE_WAY_POINTS.toString(); } @Override - protected JSONObject getExpectedParameters(int sdlVersion){ + protected JSONObject getExpectedParameters(int sdlVersion) { return new JSONObject(); } @@ -50,7 +50,7 @@ public class UnsubscribeWayPointsResponseTests extends BaseRpcTests{ * Tests the expected values of the RPC message. */ @Test - public void testRpcValues () { + public void testRpcValues() { // Invalid/Null Tests UnsubscribeWayPointsResponse msg = new UnsubscribeWayPointsResponse(); msg.setWayPoints(TestValues.GENERAL_LOCATIONDETAILS_LIST); @@ -66,7 +66,7 @@ public class UnsubscribeWayPointsResponseTests extends BaseRpcTests{ * Tests a valid JSON construction of this RPC message. */ @Test - public void testJsonConstructor () { + public void testJsonConstructor() { JSONObject commandJson = JsonFileReader.readId(getInstrumentation().getTargetContext(), getCommandType(), getMessageType()); assertNotNull(TestValues.NOT_NULL, commandJson); diff --git a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/UpdateTurnListResponseTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/UpdateTurnListResponseTests.java index 8280e56aa..e44a86419 100644 --- a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/UpdateTurnListResponseTests.java +++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/UpdateTurnListResponseTests.java @@ -20,61 +20,61 @@ import static junit.framework.TestCase.assertEquals; import static junit.framework.TestCase.assertNotNull; /** - * This is a unit test class for the SmartDeviceLink library project class : + * This is a unit test class for the SmartDeviceLink library project class : * {@link com.smartdevicelink.proxy.rpc.UpdateTurnListResponse} */ public class UpdateTurnListResponseTests extends BaseRpcTests { - - @Override - protected RPCMessage createMessage(){ - return new UpdateTurnListResponse(); - } - - @Override - protected String getMessageType(){ + + @Override + protected RPCMessage createMessage() { + return new UpdateTurnListResponse(); + } + + @Override + protected String getMessageType() { return RPCMessage.KEY_RESPONSE; } - - @Override - protected String getCommandType(){ + + @Override + protected String getCommandType() { return FunctionID.UPDATE_TURN_LIST.toString(); } - - @Override - protected JSONObject getExpectedParameters(int sdlVersion){ + + @Override + protected JSONObject getExpectedParameters(int sdlVersion) { return new JSONObject(); - } - - /** - * Tests the expected values of the RPC message. - */ - @Test - public void testRpcValues () { - // Invalid/Null Tests - UpdateTurnListResponse msg = new UpdateTurnListResponse(); - assertNotNull(TestValues.NOT_NULL, msg); - testNullBase(msg); - } - + } + /** - * Tests the expected values of the RPC message. - */ + * Tests the expected values of the RPC message. + */ @Test - public void testJsonConstructor () { - JSONObject commandJson = JsonFileReader.readId(getInstrumentation().getTargetContext(), getCommandType(), getMessageType()); - assertNotNull(TestValues.NOT_NULL, commandJson); - - try { - Hashtable<String, Object> hash = JsonRPCMarshaller.deserializeJSONObject(commandJson); - UpdateTurnListResponse cmd = new UpdateTurnListResponse(hash); - JSONObject body = JsonUtils.readJsonObjectFromJsonObject(commandJson, getMessageType()); - assertNotNull(TestValues.NOT_NULL, body); - - // Test everything in the json body. - assertEquals(TestValues.MATCH, JsonUtils.readStringFromJsonObject(body, RPCMessage.KEY_FUNCTION_NAME), cmd.getFunctionName()); - assertEquals(TestValues.MATCH, JsonUtils.readIntegerFromJsonObject(body, RPCMessage.KEY_CORRELATION_ID), cmd.getCorrelationID()); - } catch (JSONException e) { - e.printStackTrace(); - } - } + public void testRpcValues() { + // Invalid/Null Tests + UpdateTurnListResponse msg = new UpdateTurnListResponse(); + assertNotNull(TestValues.NOT_NULL, msg); + testNullBase(msg); + } + + /** + * Tests the expected values of the RPC message. + */ + @Test + public void testJsonConstructor() { + JSONObject commandJson = JsonFileReader.readId(getInstrumentation().getTargetContext(), getCommandType(), getMessageType()); + assertNotNull(TestValues.NOT_NULL, commandJson); + + try { + Hashtable<String, Object> hash = JsonRPCMarshaller.deserializeJSONObject(commandJson); + UpdateTurnListResponse cmd = new UpdateTurnListResponse(hash); + JSONObject body = JsonUtils.readJsonObjectFromJsonObject(commandJson, getMessageType()); + assertNotNull(TestValues.NOT_NULL, body); + + // Test everything in the json body. + assertEquals(TestValues.MATCH, JsonUtils.readStringFromJsonObject(body, RPCMessage.KEY_FUNCTION_NAME), cmd.getFunctionName()); + assertEquals(TestValues.MATCH, JsonUtils.readIntegerFromJsonObject(body, RPCMessage.KEY_CORRELATION_ID), cmd.getCorrelationID()); + } catch (JSONException e) { + e.printStackTrace(); + } + } }
\ No newline at end of file |