Add more unit test for ChoiceSet timeouts

1 files changed, 16 insertions, 1 deletions

diff --git a/android/sdl_android/src/androidTest/java/com/smartdevicelink/managers/screen/choiceset/ChoiceSetTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/managers/screen/choiceset/ChoiceSetTests.java
index f78e4c894..2fd616f51 100644
--- a/android/sdl_android/src/androidTest/java/com/smartdevicelink/managers/screen/choiceset/ChoiceSetTests.java
+++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/managers/screen/choiceset/ChoiceSetTests.java
@@ -86,7 +86,7 @@ public class ChoiceSetTests {
 
         // first constructor was tested in previous method, use the rest here
         ChoiceSet choiceSet = new ChoiceSet(TestValues.GENERAL_STRING, layout, TestValues.GENERAL_INTEGER, TestValues.GENERAL_STRING, TestValues.GENERAL_STRING, TestValues.GENERAL_STRING, TestValues.GENERAL_VRHELPITEM_LIST, TestValues.GENERAL_KEYBOARDPROPERTIES, choices, listener);
-        choiceSet.setDefaultTimeout(5);
+
         assertEquals(choiceSet.getTitle(), TestValues.GENERAL_STRING);
         assertEquals(choiceSet.getInitialPrompt().get(0).getText(), TestValues.GENERAL_STRING);
         assertEquals(choiceSet.getHelpPrompt().get(0).getText(), TestValues.GENERAL_STRING);
@@ -95,7 +95,22 @@ public class ChoiceSetTests {
         assertEquals(choiceSet.getTimeout(), TestValues.GENERAL_INTEGER);
         assertEquals(choiceSet.getChoices(), choices);
         assertEquals(choiceSet.getChoiceSetSelectionListener(), listener);
+
+        // Test timeout and default timeout
+        choiceSet.setDefaultTimeout(20);
+        assertEquals(choiceSet.getDefaultTimeout(), 20);
+        choiceSet.setDefaultTimeout(1);
         assertEquals(choiceSet.getDefaultTimeout(), 5);
+        choiceSet.setDefaultTimeout(101);
+        assertEquals(choiceSet.getDefaultTimeout(), 100);
+
+        choiceSet.setTimeout(20);
+        assertEquals(choiceSet.getTimeout().intValue(), 20);
+        choiceSet.setTimeout(1);
+        assertEquals(choiceSet.getTimeout().intValue(), 5);
+        choiceSet.setTimeout(101);
+        assertEquals(choiceSet.getTimeout().intValue(), 100);
+
 
         ChoiceSet choiceSet2 = new ChoiceSet(TestValues.GENERAL_STRING, layout, TestValues.GENERAL_INTEGER, TestValues.GENERAL_TTSCHUNK_LIST, TestValues.GENERAL_TTSCHUNK_LIST, TestValues.GENERAL_TTSCHUNK_LIST, TestValues.GENERAL_VRHELPITEM_LIST, TestValues.GENERAL_KEYBOARDPROPERTIES, choices, listener);
         assertEquals(choiceSet2.getTitle(), TestValues.GENERAL_STRING);