From a9ec9ba5bddd6a52f24c3fe693df1530b667ebdd Mon Sep 17 00:00:00 2001 From: Sergey Solovyev Date: Wed, 3 Jul 2013 01:14:06 +0400 Subject: [PATCH] timeout reduced --- .../android/calculator/CalculatorTestUtils.java | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) diff --git a/core/src/test/java/org/solovyev/android/calculator/CalculatorTestUtils.java b/core/src/test/java/org/solovyev/android/calculator/CalculatorTestUtils.java index 95ca369f..2b9f8185 100644 --- a/core/src/test/java/org/solovyev/android/calculator/CalculatorTestUtils.java +++ b/core/src/test/java/org/solovyev/android/calculator/CalculatorTestUtils.java @@ -46,7 +46,7 @@ import java.util.concurrent.TimeUnit; public class CalculatorTestUtils { // in seconds - public static final int TIMEOUT = 15; + public static final int TIMEOUT = 3; public static void staticSetUp() throws Exception { Locator.getInstance().init(new CalculatorImpl(), newCalculatorEngine(), Mockito.mock(CalculatorClipboard.class), Mockito.mock(CalculatorNotifier.class), Mockito.mock(CalculatorHistory.class), new SystemOutCalculatorLogger(), Mockito.mock(CalculatorPreferenceService.class), Mockito.mock(CalculatorKeyboard.class), Mockito.mock(CalculatorPlotter.class), null); @@ -153,7 +153,9 @@ public class CalculatorTestUtils { @Override public void onCalculatorEvent(@Nonnull CalculatorEventData calculatorEventData, @Nonnull CalculatorEventType calculatorEventType, @Nullable Object data) { - if (this.calculatorEventData != null && calculatorEventData.isSameSequence(this.calculatorEventData)) { + waitForEventData(); + + if (calculatorEventData.isSameSequence(this.calculatorEventData)) { if (calculatorEventType == CalculatorEventType.display_state_changed) { final CalculatorDisplayChangeEventData displayChange = (CalculatorDisplayChangeEventData) data; @@ -169,6 +171,15 @@ public class CalculatorTestUtils { } } + private void waitForEventData() { + while (this.calculatorEventData == null) { + try { + Thread.sleep(200); + } catch (InterruptedException e) { + } + } + } + @Nullable public CalculatorDisplayViewState getResult() { return result;