add onError back in, fix testsfeature/choice_set_manager

4 files changed, 11 insertions, 36 deletions

diff --git a/android/hello_sdl_android/src/main/java/com/sdl/hellosdlandroid/SdlService.java b/android/hello_sdl_android/src/main/java/com/sdl/hellosdlandroid/SdlService.java
index 1cb8d5052..ada04a703 100755
--- a/android/hello_sdl_android/src/main/java/com/sdl/hellosdlandroid/SdlService.java
+++ b/android/hello_sdl_android/src/main/java/com/sdl/hellosdlandroid/SdlService.java
@@ -65,7 +65,7 @@ public class SdlService extends Service {
 	// TCP/IP transport config
 	// The default port is 12345
 	// The IP is of the machine that is running SDL Core
-	private static final int TCP_PORT = 13609;
+	private static final int TCP_PORT = 12247;
 	private static final String DEV_MACHINE_IP_ADDRESS = "m.sdl.tools";
 
 	// variable to create and call functions of the SyncProxy
diff --git a/android/sdl_android/src/androidTest/java/com/smartdevicelink/managers/screen/ScreenManagerTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/managers/screen/ScreenManagerTests.java
index 02996d2bd..c4e22af6f 100644
--- a/android/sdl_android/src/androidTest/java/com/smartdevicelink/managers/screen/ScreenManagerTests.java
+++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/managers/screen/ScreenManagerTests.java
@@ -59,6 +59,7 @@ public class ScreenManagerTests extends AndroidTestCase2 {
 		assertNull(screenManager.getSoftButtonObjectByName("test"));
 		assertNull(screenManager.getSoftButtonObjectById(1));
 		assertEquals(screenManager.getDynamicMenuUpdatesMode(), DynamicMenuUpdatesMode.ON_WITH_COMPAT_MODE);
+		assertEquals(screenManager.getState(), BaseSubManager.READY);
 	}
 	
 	public void testSetTextField() {
diff --git a/android/sdl_android/src/androidTest/java/com/smartdevicelink/managers/screen/choiceset/ChoiceSetManagerTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/managers/screen/choiceset/ChoiceSetManagerTests.java
index 5a9450be1..e52f7b273 100644
--- a/android/sdl_android/src/androidTest/java/com/smartdevicelink/managers/screen/choiceset/ChoiceSetManagerTests.java
+++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/managers/screen/choiceset/ChoiceSetManagerTests.java
@@ -209,41 +209,6 @@ public class ChoiceSetManagerTests extends AndroidTestCase2 {
 		}
 	}
 
-	public void testChoicesToBeDeletedWithArray(){
-
-		ChoiceCell cell1 = new ChoiceCell("test");
-		ChoiceCell cell2 = new ChoiceCell("test2");
-		ChoiceCell cell3 = new ChoiceCell("test3");
-		ChoiceCell cell4 = new ChoiceCell("test4");
-		ChoiceCell cell5 = new ChoiceCell("test5");
-
-		HashSet<ChoiceCell> preloadedChoices = new HashSet<>();
-		preloadedChoices.add(cell1);
-		preloadedChoices.add(cell2);
-		preloadedChoices.add(cell3);
-
-		csm.preloadedChoices.clear();
-		csm.preloadedChoices = preloadedChoices;
-
-		List<ChoiceCell> choices = new ArrayList<>();
-		choices.add(cell1);
-		choices.add(cell2);
-		choices.add(cell3);
-		choices.add(cell4);
-		choices.add(cell5);
-
-		HashSet<ChoiceCell> returnedChoices = csm.choicesToBeUploadedWithArray(choices);
-
-		assertEquals(returnedChoices.size(), 2);
-		for (ChoiceCell cell : returnedChoices){
-			if (cell.getText().equals("test4") || cell.getText().equals("test5")){
-				return;
-			}else{
-				fail();
-			}
-		}
-	}
-
 	public void testChoicesToBeUploadedWithArray(){
 
 		ChoiceCell cell1 = new ChoiceCell("test");
diff --git a/base/src/main/java/com/smartdevicelink/managers/screen/choiceset/CheckChoiceVROptionalOperation.java b/base/src/main/java/com/smartdevicelink/managers/screen/choiceset/CheckChoiceVROptionalOperation.java
index e4b8cb414..c49522c25 100644
--- a/base/src/main/java/com/smartdevicelink/managers/screen/choiceset/CheckChoiceVROptionalOperation.java
+++ b/base/src/main/java/com/smartdevicelink/managers/screen/choiceset/CheckChoiceVROptionalOperation.java
@@ -83,6 +83,15 @@ class CheckChoiceVROptionalOperation implements Runnable {
 					sendTestChoiceWithVR();
 				}
 			}
+
+			@Override
+			public void onError(int correlationId, Result resultCode, String info){
+				DebugTool.logError("There was an error in the check choice vr optional operation. Send test choice with no VR failed. Error: " + info);
+				isVROptional = false;
+				if (checkChoiceVROptionalInterface != null){
+					checkChoiceVROptionalInterface.onError(info);
+				}
+			}
 		});
 
 		if (internalInterface.get() != null) {