Modified termination duration in test casesfeature/blocking_operations_test_cases

2 files changed, 21 insertions, 40 deletions

diff --git a/android/sdl_android/src/androidTest/java/com/smartdevicelink/managers/screen/choiceset/PresentChoiceSetOperationTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/managers/screen/choiceset/PresentChoiceSetOperationTests.java
index ee9d74bb6..d8cf5be9d 100644
--- a/android/sdl_android/src/androidTest/java/com/smartdevicelink/managers/screen/choiceset/PresentChoiceSetOperationTests.java
+++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/managers/screen/choiceset/PresentChoiceSetOperationTests.java
@@ -139,11 +139,10 @@ public class PresentChoiceSetOperationTests extends AndroidTestCase2 {
 		when(internalInterface.getSdlMsgVersion()).thenReturn(new SdlMsgVersion(6, 0));
 		presentChoiceSetOperation = new PresentChoiceSetOperation(internalInterface, choiceSet, InteractionMode.MANUAL_ONLY, null, null, choiceSetSelectionListener, Test.GENERAL_INTEGER);
 		executor.execute(presentChoiceSetOperation);
+
 		try {
-			executor.awaitTermination(5, TimeUnit.SECONDS);
-		} catch (InterruptedException e) {
-			assertTrue(false);
-		}
+			executor.awaitTermination(1, TimeUnit.SECONDS);
+		} catch (InterruptedException e) {}
 
 		assertTrue(presentChoiceSetOperation.isExecuting());
 		assertFalse(presentChoiceSetOperation.isFinished());
@@ -181,10 +180,8 @@ public class PresentChoiceSetOperationTests extends AndroidTestCase2 {
 		presentChoiceSetOperation = new PresentChoiceSetOperation(internalInterface, choiceSet, InteractionMode.MANUAL_ONLY, null, null, choiceSetSelectionListener, Test.GENERAL_INTEGER);
 		executor.execute(presentChoiceSetOperation);
 		try {
-			executor.awaitTermination(5, TimeUnit.SECONDS);
-		} catch (InterruptedException e) {
-			assertTrue(false);
-		}
+			executor.awaitTermination(1, TimeUnit.SECONDS);
+		} catch (InterruptedException e) {}
 
 		assertTrue(presentChoiceSetOperation.isExecuting());
 		assertFalse(presentChoiceSetOperation.isFinished());
@@ -247,10 +244,8 @@ public class PresentChoiceSetOperationTests extends AndroidTestCase2 {
 		// Once the operation has started
 		executor.execute(presentChoiceSetOperation);
 		try {
-			executor.awaitTermination(5, TimeUnit.SECONDS);
-		} catch (InterruptedException e) {
-			assertTrue(false);
-		}
+			executor.awaitTermination(1, TimeUnit.SECONDS);
+		} catch (InterruptedException e) {}
 
 		assertFalse(presentChoiceSetOperation.isExecuting());
 		assertTrue(presentChoiceSetOperation.isFinished());
@@ -267,10 +262,8 @@ public class PresentChoiceSetOperationTests extends AndroidTestCase2 {
 		presentChoiceSetOperation = new PresentChoiceSetOperation(internalInterface, choiceSet, InteractionMode.MANUAL_ONLY, null, null, choiceSetSelectionListener, Test.GENERAL_INTEGER);
 		executor.execute(presentChoiceSetOperation);
 		try {
-			executor.awaitTermination(5, TimeUnit.SECONDS);
-		} catch (InterruptedException e) {
-			assertTrue(false);
-		}
+			executor.awaitTermination(1, TimeUnit.SECONDS);
+		} catch (InterruptedException e) {}
 
 		assertTrue(presentChoiceSetOperation.isExecuting());
 		assertFalse(presentChoiceSetOperation.isFinished());
@@ -298,10 +291,8 @@ public class PresentChoiceSetOperationTests extends AndroidTestCase2 {
 		// Once the operation has started
 		executor.execute(presentChoiceSetOperation);
 		try {
-			executor.awaitTermination(5, TimeUnit.SECONDS);
-		} catch (InterruptedException e) {
-			assertTrue(false);
-		}
+			executor.awaitTermination(1, TimeUnit.SECONDS);
+		} catch (InterruptedException e) {}
 
 		assertFalse(presentChoiceSetOperation.isExecuting());
 		assertTrue(presentChoiceSetOperation.isFinished());
diff --git a/android/sdl_android/src/androidTest/java/com/smartdevicelink/managers/screen/choiceset/PresentKeyboardOperationTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/managers/screen/choiceset/PresentKeyboardOperationTests.java
index def421a6b..486a1c361 100644
--- a/android/sdl_android/src/androidTest/java/com/smartdevicelink/managers/screen/choiceset/PresentKeyboardOperationTests.java
+++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/managers/screen/choiceset/PresentKeyboardOperationTests.java
@@ -128,10 +128,8 @@ public class PresentKeyboardOperationTests extends AndroidTestCase2 {
 		presentKeyboardOperation = new PresentKeyboardOperation(internalInterface, null, "Test", null, null, Test.GENERAL_INTEGER);
 		executor.execute(presentKeyboardOperation);
 		try {
-			executor.awaitTermination(5, TimeUnit.SECONDS);
-		} catch (InterruptedException e) {
-			assertTrue(false);
-		}
+			executor.awaitTermination(1, TimeUnit.SECONDS);
+		} catch (InterruptedException e) {}
 
 		assertTrue(presentKeyboardOperation.isExecuting());
 		assertFalse(presentKeyboardOperation.isFinished());
@@ -169,10 +167,8 @@ public class PresentKeyboardOperationTests extends AndroidTestCase2 {
         presentKeyboardOperation = new PresentKeyboardOperation(internalInterface, null, "Test", null, null, Test.GENERAL_INTEGER);
         executor.execute(presentKeyboardOperation);
         try {
-            executor.awaitTermination(5, TimeUnit.SECONDS);
-        } catch (InterruptedException e) {
-            assertTrue(false);
-        }
+            executor.awaitTermination(1, TimeUnit.SECONDS);
+        } catch (InterruptedException e) {}
 
         presentKeyboardOperation.dismissKeyboard();
         Answer<Void> cancelInteractionAnswer = new Answer<Void>() {
@@ -231,10 +227,8 @@ public class PresentKeyboardOperationTests extends AndroidTestCase2 {
 		// Once the operation has started
 		executor.execute(presentKeyboardOperation);
 		try {
-			executor.awaitTermination(5, TimeUnit.SECONDS);
-		} catch (InterruptedException e) {
-			assertTrue(false);
-		}
+			executor.awaitTermination(1, TimeUnit.SECONDS);
+		} catch (InterruptedException e) {}
 
 		assertFalse(presentKeyboardOperation.isExecuting());
 		assertTrue(presentKeyboardOperation.isFinished());
@@ -251,10 +245,8 @@ public class PresentKeyboardOperationTests extends AndroidTestCase2 {
 		presentKeyboardOperation = new PresentKeyboardOperation(internalInterface, null, "Test", null, null, Test.GENERAL_INTEGER);
 		executor.execute(presentKeyboardOperation);
 		try {
-			executor.awaitTermination(5, TimeUnit.SECONDS);
-		} catch (InterruptedException e) {
-			assertTrue(false);
-		}
+			executor.awaitTermination(1, TimeUnit.SECONDS);
+		} catch (InterruptedException e) {}
 
 		assertTrue(presentKeyboardOperation.isExecuting());
 		assertFalse(presentKeyboardOperation.isFinished());
@@ -282,10 +274,8 @@ public class PresentKeyboardOperationTests extends AndroidTestCase2 {
 		// Once the operation has started
 		executor.execute(presentKeyboardOperation);
 		try {
-			executor.awaitTermination(5, TimeUnit.SECONDS);
-		} catch (InterruptedException e) {
-			assertTrue(false);
-		}
+			executor.awaitTermination(1, TimeUnit.SECONDS);
+		} catch (InterruptedException e) {}
 
 		assertFalse(presentKeyboardOperation.isExecuting());
 		assertTrue(presentKeyboardOperation.isFinished());