Test cases added for dismissing keyboard w manager

2 files changed, 21 insertions, 3 deletions

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 e52f7b273..6e1e86a74 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
@@ -53,7 +53,12 @@ import java.util.Collections;
 import java.util.HashSet;
 import java.util.List;
 
+import static org.mockito.Mockito.doReturn;
 import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.timeout;
+import static org.mockito.Mockito.times;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
 
 public class ChoiceSetManagerTests extends AndroidTestCase2 {
 
@@ -232,7 +237,21 @@ public class ChoiceSetManagerTests extends AndroidTestCase2 {
 		for (ChoiceCell cell : returnedChoices){
 			assertEquals(cell.getText(), "test2");
 		}
+	}
 
+	public void testDismissKeyboardThisIsExecuting(){
+		PresentKeyboardOperation testOp = mock(PresentKeyboardOperation.class);
+		doReturn(true).when(testOp).isExecuting();
+		csm.currentlyPresentedKeyboardOperation = testOp;
+		csm.dismissKeyboard();
+		verify(testOp, times(1)).dismissKeyboard();
 	}
 
+	public void testDismissKeyboardThatIsNotExecuting(){
+		PresentKeyboardOperation testOp = mock(PresentKeyboardOperation.class);
+		doReturn(false).when(testOp).isExecuting();
+		csm.currentlyPresentedKeyboardOperation = testOp;
+		csm.dismissKeyboard();
+		verify(testOp, times(0)).dismissKeyboard();
+	}
 }
diff --git a/base/src/main/java/com/smartdevicelink/managers/screen/choiceset/BaseChoiceSetManager.java b/base/src/main/java/com/smartdevicelink/managers/screen/choiceset/BaseChoiceSetManager.java
index 9432280e2..3dcb6fbaf 100644
--- a/base/src/main/java/com/smartdevicelink/managers/screen/choiceset/BaseChoiceSetManager.java
+++ b/base/src/main/java/com/smartdevicelink/managers/screen/choiceset/BaseChoiceSetManager.java
@@ -404,9 +404,8 @@ abstract class BaseChoiceSetManager extends BaseSubManager {
     }
 
     public void dismissKeyboard() {
-        if (currentlyPresentedKeyboardOperation != null && currentlyPresentedKeyboardOperation.isExecuting()) {
-            currentlyPresentedKeyboardOperation.dismissKeyboard();
-        }
+        if (currentlyPresentedKeyboardOperation == null || !currentlyPresentedKeyboardOperation.isExecuting()) { return; }
+        currentlyPresentedKeyboardOperation.dismissKeyboard();
     }
 
     /**