turn signal - on notification and testsfeature/issue_650_turn_signals

3 files changed, 30 insertions, 4 deletions

diff --git a/sdl_android/src/androidTest/java/com/smartdevicelink/test/VehicleDataHelper.java b/sdl_android/src/androidTest/java/com/smartdevicelink/test/VehicleDataHelper.java
index e37141d69..06a3d64bb 100644
--- a/sdl_android/src/androidTest/java/com/smartdevicelink/test/VehicleDataHelper.java
+++ b/sdl_android/src/androidTest/java/com/smartdevicelink/test/VehicleDataHelper.java
@@ -320,6 +320,7 @@ public class VehicleDataHelper{
 		VEHICLE_DATA.setEmergencyEvent(EMERGENCY_EVENT);
 		VEHICLE_DATA.setClusterModeStatus(CLUSTER_MODE_STATUS);
 		VEHICLE_DATA.setMyKey(MY_KEY);
+		VEHICLE_DATA.setTurnSignal(TURN_SIGNAL);
 		
 		//set up the GetVehicleDataResponse object
 		VEHICLE_DATA_RESPONSE.setSpeed(SPEED);
diff --git a/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/notifications/OnVehicleDataTests.java b/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/notifications/OnVehicleDataTests.java
index 5d328813c..79883cb31 100644
--- a/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/notifications/OnVehicleDataTests.java
+++ b/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/notifications/OnVehicleDataTests.java
@@ -23,6 +23,7 @@ import com.smartdevicelink.proxy.rpc.SingleTireStatus;
 import com.smartdevicelink.proxy.rpc.TireStatus;
 import com.smartdevicelink.proxy.rpc.enums.ComponentVolumeStatus;
 import com.smartdevicelink.proxy.rpc.enums.PRNDL;
+import com.smartdevicelink.proxy.rpc.enums.TurnSignal;
 import com.smartdevicelink.proxy.rpc.enums.VehicleDataEventStatus;
 import com.smartdevicelink.proxy.rpc.enums.WiperStatus;
 import com.smartdevicelink.test.BaseRpcTests;
@@ -33,7 +34,7 @@ import com.smartdevicelink.test.VehicleDataHelper;
 
 /**
  * This is a unit test class for the SmartDeviceLink library project class : 
- * {@link com.smartdevicelink.rpc.OnVehicleData}
+ * {@link com.smartdevicelink.proxy.rpc.OnVehicleData}
  */
 public class OnVehicleDataTests extends BaseRpcTests{
 	
@@ -82,6 +83,7 @@ public class OnVehicleDataTests extends BaseRpcTests{
             result.put(OnVehicleData.KEY_EMERGENCY_EVENT, VehicleDataHelper.EMERGENCY_EVENT.serializeJSON());
             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_TURN_SIGNAL, VehicleDataHelper.TURN_SIGNAL);
         } catch(JSONException e) {
         	fail(Test.JSON_FAIL);
         }
@@ -119,6 +121,7 @@ public class OnVehicleDataTests extends BaseRpcTests{
     	EmergencyEvent event = ( (OnVehicleData) msg).getEmergencyEvent();
     	ClusterModeStatus cluster = ( (OnVehicleData) msg).getClusterModeStatus();
     	MyKey key = ( (OnVehicleData) msg).getMyKey();
+		TurnSignal turnSignal = ( (OnVehicleData) msg).getTurnSignal();
     	
     	// Valid Tests
     	assertEquals(Test.MATCH, VehicleDataHelper.SPEED, speed);
@@ -146,6 +149,7 @@ public class OnVehicleDataTests extends BaseRpcTests{
 	    assertTrue(Test.TRUE, Validator.validateEmergencyEvent(VehicleDataHelper.EMERGENCY_EVENT, event));
 	    assertTrue(Test.TRUE, Validator.validateClusterModeStatus(VehicleDataHelper.CLUSTER_MODE_STATUS, cluster));
 	    assertTrue(Test.TRUE, Validator.validateMyKey(VehicleDataHelper.MY_KEY, key));
+		assertEquals(Test.MATCH, VehicleDataHelper.TURN_SIGNAL, turnSignal);
     
 	    // Invalid/Null Tests
         OnVehicleData msg = new OnVehicleData();
@@ -176,8 +180,9 @@ public class OnVehicleDataTests extends BaseRpcTests{
         assertNull(Test.NULL, msg.getAirbagStatus());
         assertNull(Test.NULL, msg.getEmergencyEvent());
         assertNull(Test.NULL, msg.getClusterModeStatus());
-        assertNull(Test.NULL, msg.getMyKey());    	
-    }  
+        assertNull(Test.NULL, msg.getMyKey());
+        assertNull(Test.NULL, msg.getTurnSignal());
+	}
     
     public void testJson() {
 		JSONObject reference = new JSONObject();
@@ -339,6 +344,7 @@ public class OnVehicleDataTests extends BaseRpcTests{
 			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_TURN_SIGNAL, VehicleDataHelper.TURN_SIGNAL);
 			
 			JSONObject underTest = msg.serializeJSON();
 			//go inside underTest and only return the JSONObject inside the parameters key inside the notification key
diff --git a/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/OnVehicleData.java b/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/OnVehicleData.java
index 32dba7500..645986eea 100644
--- a/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/OnVehicleData.java
+++ b/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/OnVehicleData.java
@@ -6,6 +6,7 @@ import com.smartdevicelink.protocol.enums.FunctionID;
 import com.smartdevicelink.proxy.RPCNotification;

 import com.smartdevicelink.proxy.rpc.enums.ComponentVolumeStatus;

 import com.smartdevicelink.proxy.rpc.enums.PRNDL;

+import com.smartdevicelink.proxy.rpc.enums.TurnSignal;

 import com.smartdevicelink.proxy.rpc.enums.VehicleDataEventStatus;

 import com.smartdevicelink.proxy.rpc.enums.WiperStatus;

 import com.smartdevicelink.util.DebugTool;

@@ -272,6 +273,7 @@ public class OnVehicleData extends RPCNotification {
 	public static final String KEY_EMERGENCY_EVENT = "emergencyEvent";

 	public static final String KEY_CLUSTER_MODE_STATUS = "clusterModeStatus";

 	public static final String KEY_MY_KEY = "myKey";

+	public static final String KEY_TURN_SIGNAL = "turnSignal";

 

     public OnVehicleData() {

         super(FunctionID.ON_VEHICLE_DATA.toString());

@@ -454,5 +456,22 @@ public class OnVehicleData extends RPCNotification {
     @SuppressWarnings("unchecked")

     public MyKey getMyKey() {

         return (MyKey) getObject(MyKey.class, KEY_MY_KEY);

-    }    

+    }

+

+	/**

+	 * Sets turnSignal

+	 * @param turnSignal

+	 */

+	public void setTurnSignal(TurnSignal turnSignal) {

+		setParameters(KEY_TURN_SIGNAL, turnSignal);

+	}

+

+	/**

+	 * Gets turnSignal

+	 * @return TurnSignal

+	 */

+	@SuppressWarnings("unchecked")

+	public TurnSignal getTurnSignal() {

+		return (TurnSignal) getObject(TurnSignal.class, KEY_TURN_SIGNAL);

+	}

 }