Fix errors found in unit test dealing with null check and fix unit test to test new logic correctly

Author: Julian Kast

android/sdl_android/src/androidTest/java/com/smartdevicelink/managers/screen/menu/VoiceCommandManagerTests.java

@@ -182,7 +182,7 @@ public void testUpdatingCommands() {
 
         // Fake onCommand - we want to make sure that we can pass back onCommand events to our VoiceCommand Objects
         OnCommand onCommand = new OnCommand();
-        onCommand.setCmdID(command3.getCommandId());
+        onCommand.setCmdID(voiceCommandManager.getVoiceCommands().get(voiceCommandManager.getVoiceCommands().indexOf(command3)).getCommandId());
         onCommand.setTriggerSource(TriggerSource.TS_VR); // these are voice commands
         commandListener.onNotified(onCommand); // send off the notification
 

base/src/main/java/com/smartdevicelink/managers/screen/menu/BaseVoiceCommandManager.java

@@ -140,21 +140,28 @@ public void setVoiceCommands(List<VoiceCommand> voiceCommands) {
         // Clone voice commands
         this.voiceCommands = new ArrayList<>();
         for (VoiceCommand voiceCommand : voiceCommands) {
+            if (voiceCommand == null) {
+                continue;
+            }
             this.voiceCommands.add(voiceCommand.clone());
         }
 
         List<VoiceCommand> validatedVoiceCommands = removeEmptyVoiceCommands(this.voiceCommands);
 
         if (validatedVoiceCommands.size() == 0 && voiceCommands.size() > 0) {
             DebugTool.logError(TAG, "New voice commands are invalid, skipping...");
+            this.voiceCommands = null;
             return;
         }
 
         if (!isVoiceCommandsUnique(validatedVoiceCommands)) {
             DebugTool.logError(TAG, "Not all voice command strings are unique across all voice commands. Voice commands will not be set.");
+            this.voiceCommands = null;
             return;
         }
 
+        this.voiceCommands = validatedVoiceCommands;
+
         updateIdsOnVoiceCommands(this.voiceCommands);
 
         cleanTransactionQueue();