start of vcm tests

3 files changed, 103 insertions, 9 deletions

diff --git a/android/sdl_android/src/androidTest/java/com/smartdevicelink/managers/screen/menu/MenuManagerTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/managers/screen/menu/MenuManagerTests.java
index e766ed62a..f61128c8d 100644
--- a/android/sdl_android/src/androidTest/java/com/smartdevicelink/managers/screen/menu/MenuManagerTests.java
+++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/managers/screen/menu/MenuManagerTests.java
@@ -32,9 +32,26 @@
 
 package com.smartdevicelink.managers.screen.menu;
 
+import android.content.Context;
+
 import com.smartdevicelink.AndroidTestCase2;
 
 public class MenuManagerTests extends AndroidTestCase2 {
 
+	public static final String TAG = "MenuManagerTests";
+	private Context mTestContext;
+
+	// SETUP / HELPERS
+
+	@Override
+	public void setUp() throws Exception{
+		super.setUp();
+		mTestContext = this.getContext();
+	}
+
+	@Override
+	public void tearDown() throws Exception {
+		super.tearDown();
+	}
 
 }
diff --git a/android/sdl_android/src/androidTest/java/com/smartdevicelink/managers/screen/menu/VoiceCommandManagerTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/managers/screen/menu/VoiceCommandManagerTests.java
index 49c77b116..bbddf6ab4 100644
--- a/android/sdl_android/src/androidTest/java/com/smartdevicelink/managers/screen/menu/VoiceCommandManagerTests.java
+++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/managers/screen/menu/VoiceCommandManagerTests.java
@@ -33,8 +33,85 @@
 package com.smartdevicelink.managers.screen.menu;
 
 import com.smartdevicelink.AndroidTestCase2;
+import com.smartdevicelink.managers.BaseSubManager;
+import com.smartdevicelink.managers.CompletionListener;
+import com.smartdevicelink.proxy.interfaces.ISdl;
+import com.smartdevicelink.proxy.rpc.enums.HMILevel;
+
+import java.util.Arrays;
+import java.util.List;
+
+import static org.mockito.Mockito.mock;
 
 public class VoiceCommandManagerTests extends AndroidTestCase2 {
 
+	public static final String TAG = "VCMTests";
+	private List<VoiceCommand> commands;
+	private VoiceCommandManager voiceCommandManager;
+	private static final int voiceCommandIdMin = 1900000000;
+
+	// SETUP / HELPERS
+
+	@Override
+	public void setUp() throws Exception{
+		super.setUp();
+
+		VoiceCommand command = new VoiceCommand(Arrays.asList("Command one", "Command two"), null);
+		VoiceCommand command2 = new VoiceCommand(Arrays.asList("Command three", "Command four"), null);
+		commands = Arrays.asList(command,command2);
+
+		ISdl internalInterface = mock(ISdl.class);
+		voiceCommandManager = new VoiceCommandManager(internalInterface);
+
+		// Check some stuff during setup
+		assertEquals(voiceCommandManager.currentHMILevel, HMILevel.HMI_NONE);
+		assertEquals(voiceCommandManager.getState(), BaseSubManager.SETTING_UP);
+		assertEquals(voiceCommandManager.lastVoiceCommandId, voiceCommandIdMin);
+		assertFalse(voiceCommandManager.hasQueuedUpdate);
+		assertFalse(voiceCommandManager.waitingOnHMIUpdate);
+		assertNotNull(voiceCommandManager.commandListener);
+		assertNotNull(voiceCommandManager.hmiListener);
+		assertNotNull(voiceCommandManager.voiceCommands);
+		assertNotNull(voiceCommandManager.oldVoiceCommands);
+		assertNull(voiceCommandManager.inProgressUpdate);
+	}
+
+	@Override
+	public void tearDown() throws Exception {
+
+		voiceCommandManager.dispose();
+
+		assertEquals(voiceCommandManager.lastVoiceCommandId, voiceCommandIdMin);
+		assertNull(voiceCommandManager.voiceCommands);
+		assertNull(voiceCommandManager.oldVoiceCommands);
+		assertNull(voiceCommandManager.currentHMILevel);
+		assertNull(voiceCommandManager.inProgressUpdate);
+		assertFalse(voiceCommandManager.hasQueuedUpdate);
+		assertFalse(voiceCommandManager.waitingOnHMIUpdate);
+		// after everything, make sure we are in the correct state
+		assertEquals(voiceCommandManager.getState(), BaseSubManager.SHUTDOWN);
+
+		super.tearDown();
+	}
+
+	public void testStartVoiceCommandManager(){
+
+		voiceCommandManager.start(new CompletionListener() {
+			@Override
+			public void onComplete(boolean success) {
+				assertTrue(success);
+				// Make sure the state has changed, as the Screen Manager is dependant on it
+				assertEquals(voiceCommandManager.getState(), BaseSubManager.READY);
+				// now that we are started, set some voice commands
+				sendCommands(voiceCommandManager);
+			}
+		});
+	}
+
+	private void sendCommands(VoiceCommandManager voiceCommandManager){
+
+		voiceCommandManager.setVoiceCommands(commands);
+
+	}
 
 }
diff --git a/base/src/main/java/com/smartdevicelink/managers/screen/menu/BaseVoiceCommandManager.java b/base/src/main/java/com/smartdevicelink/managers/screen/menu/BaseVoiceCommandManager.java
index 0931851d5..e8b57ec05 100644
--- a/base/src/main/java/com/smartdevicelink/managers/screen/menu/BaseVoiceCommandManager.java
+++ b/base/src/main/java/com/smartdevicelink/managers/screen/menu/BaseVoiceCommandManager.java
@@ -55,20 +55,20 @@ import java.util.List;
 
 abstract class BaseVoiceCommandManager extends BaseSubManager {
 
-	private List<VoiceCommand> voiceCommands;
-	private List<VoiceCommand> oldVoiceCommands;
+	List<VoiceCommand> voiceCommands;
+	List<VoiceCommand> oldVoiceCommands;
 
-	private List<AddCommand> inProgressUpdate;
+	List<AddCommand> inProgressUpdate;
 
-	private int lastVoiceCommandId;
+	int lastVoiceCommandId;
 	private static final int voiceCommandIdMin = 1900000000;
 
-	private boolean waitingOnHMIUpdate;
-	private boolean hasQueuedUpdate;
+	boolean waitingOnHMIUpdate;
+	boolean hasQueuedUpdate;
 
-	private HMILevel currentHMILevel;
-	private OnRPCNotificationListener hmiListener;
-	private OnRPCNotificationListener commandListener;
+	HMILevel currentHMILevel;
+	OnRPCNotificationListener hmiListener;
+	OnRPCNotificationListener commandListener;
 
 	// CONSTRUCTORS