check vr optional tests

3 files changed, 43 insertions, 2 deletions

diff --git a/android/sdl_android/src/androidTest/java/com/smartdevicelink/managers/screen/choiceset/operations/CheckChoiceVROptionalOperationTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/managers/screen/choiceset/operations/CheckChoiceVROptionalOperationTests.java
index 1e01281ff..9c7378798 100644
--- a/android/sdl_android/src/androidTest/java/com/smartdevicelink/managers/screen/choiceset/operations/CheckChoiceVROptionalOperationTests.java
+++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/managers/screen/choiceset/operations/CheckChoiceVROptionalOperationTests.java
@@ -35,12 +35,24 @@
 package com.smartdevicelink.managers.screen.choiceset.operations;
 
 import com.smartdevicelink.AndroidTestCase2;
+import com.smartdevicelink.proxy.interfaces.ISdl;
+import com.smartdevicelink.proxy.rpc.Choice;
+import com.smartdevicelink.proxy.rpc.CreateInteractionChoiceSet;
+import com.smartdevicelink.proxy.rpc.DeleteInteractionChoiceSet;
+
+import static org.mockito.Mockito.mock;
 
 public class CheckChoiceVROptionalOperationTests extends AndroidTestCase2 {
 
+	private CheckChoiceVROptionalOperation checkChoiceVROptionalOperation;
+
 	@Override
 	public void setUp() throws Exception{
 		super.setUp();
+
+		ISdl internalInterface = mock(ISdl.class);
+		CheckChoiceVROptionalInterface checkChoiceVROptionalInterface = mock(CheckChoiceVROptionalInterface.class);
+		checkChoiceVROptionalOperation = new CheckChoiceVROptionalOperation(internalInterface, checkChoiceVROptionalInterface);
 	}
 
 	@Override
@@ -48,4 +60,25 @@ public class CheckChoiceVROptionalOperationTests extends AndroidTestCase2 {
 		super.tearDown();
 	}
 
+	public void testCreateChoiceNoVR(){
+		CreateInteractionChoiceSet setNoVR = checkChoiceVROptionalOperation.testCellWithVR(false);
+		assertNotNull(setNoVR);
+		// This set only has one choice
+		Choice choice = setNoVR.getChoiceSet().get(0);
+		assertNull(choice.getVrCommands());
+	}
+
+	public void testCreateChoiceWithVR(){
+		CreateInteractionChoiceSet setNoVR = checkChoiceVROptionalOperation.testCellWithVR(true);
+		assertNotNull(setNoVR);
+		// This set only has one choice
+		Choice choice = setNoVR.getChoiceSet().get(0);
+		assertEquals(choice.getVrCommands().get(0), "Test VR");
+	}
+
+	public void testDeleteInteractionChoiceSet(){
+		DeleteInteractionChoiceSet deleteSet = checkChoiceVROptionalOperation.createDeleteInteractionChoiceSet();
+		assertNotNull(deleteSet);
+	}
+
 }
diff --git a/base/src/main/java/com/smartdevicelink/managers/screen/choiceset/operations/CheckChoiceVROptionalOperation.java b/base/src/main/java/com/smartdevicelink/managers/screen/choiceset/operations/CheckChoiceVROptionalOperation.java
index 9e65fca7c..0fb54aa89 100644
--- a/base/src/main/java/com/smartdevicelink/managers/screen/choiceset/operations/CheckChoiceVROptionalOperation.java
+++ b/base/src/main/java/com/smartdevicelink/managers/screen/choiceset/operations/CheckChoiceVROptionalOperation.java
@@ -118,7 +118,7 @@ public class CheckChoiceVROptionalOperation implements Runnable {
 	}
 
 	private void deleteTestChoiceSet(){
-		DeleteInteractionChoiceSet delete = new DeleteInteractionChoiceSet(0);
+		DeleteInteractionChoiceSet delete = createDeleteInteractionChoiceSet();
 		delete.setOnRPCResponseListener(new OnRPCResponseListener() {
 			@Override
 			public void onResponse(int correlationId, RPCResponse response) {
@@ -136,7 +136,11 @@ public class CheckChoiceVROptionalOperation implements Runnable {
 		}
 	}
 
-	private CreateInteractionChoiceSet testCellWithVR(boolean hasVR){
+	DeleteInteractionChoiceSet createDeleteInteractionChoiceSet(){
+		return new DeleteInteractionChoiceSet(0);
+	}
+
+	CreateInteractionChoiceSet testCellWithVR(boolean hasVR){
 		Choice choice = new Choice(0, "Test Cell");
 		choice.setVrCommands((hasVR ? Collections.singletonList("Test VR") : null));
 		choice.setIgnoreAddingVRItems(true);
diff --git a/base/src/main/java/com/smartdevicelink/proxy/rpc/Choice.java b/base/src/main/java/com/smartdevicelink/proxy/rpc/Choice.java
index feaf76f41..e21f0a77a 100644
--- a/base/src/main/java/com/smartdevicelink/proxy/rpc/Choice.java
+++ b/base/src/main/java/com/smartdevicelink/proxy/rpc/Choice.java
@@ -262,6 +262,10 @@ public class Choice extends RPCStruct {
         return (Image) getObject(Image.class, KEY_SECONDARY_IMAGE);

     }

 

+    /**

+     * This prevents the @{link Choice#format} method from adding VR commands if set to true

+     * @param ignoreAddingVRItems - whether or not to let the format method add vr commands

+     */

     public void setIgnoreAddingVRItems(boolean ignoreAddingVRItems){

         this.ignoreAddingVRItems = ignoreAddingVRItems;

     }