Moved timeout test to different method

1 files changed, 15 insertions, 15 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 2fd616f51..dc88d85ee 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
@@ -79,6 +79,21 @@ public class ChoiceSetTests {
         assertEquals(choiceSet.getTimeout(), defaultTimeout);
         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);
     }
 
     @Test
@@ -96,21 +111,6 @@ public class ChoiceSetTests {
         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);