1 files changed, 20 insertions, 2 deletions
diff --git a/tests/src/cgeo/geocaching/files/SimpleDirChooserUITest.java b/tests/src/cgeo/geocaching/files/SimpleDirChooserUITest.java
index 80a2451..15f7708 100644
--- a/tests/src/cgeo/geocaching/files/SimpleDirChooserUITest.java
+++ b/tests/src/cgeo/geocaching/files/SimpleDirChooserUITest.java
@@ -20,12 +20,20 @@ public class SimpleDirChooserUITest extends ActivityInstrumentationTestCase2<Sim
 
     @Override
     public void setUp() throws Exception {
+        super.setUp();
         solo = new Solo(getInstrumentation(), getActivity());
     }
 
     public void testSingleSelection() throws InterruptedException {
+        // normally our activity should be ready, but we already had Jenkins report no checkboxes right here at the beginning
+        solo.waitForActivity(solo.getCurrentActivity().getClass().getSimpleName(), 2000);
+
         assertChecked("Newly opened activity", 0);
         solo.scrollToBottom();
+        pause();
+        // according to the documentation, automatic pauses only happen in the clickXYZ() methods.
+        // Therefore lets introduce a manual pause after the scrolling methods.
+
         final int lastIndex = solo.getCurrentCheckBoxes().size() - 1;
 
         solo.clickOnCheckBox(lastIndex);
@@ -34,12 +42,13 @@ public class SimpleDirChooserUITest extends ActivityInstrumentationTestCase2<Sim
         assertChecked("Clicked last checkbox", 1);
 
         solo.scrollUp();
-        Thread.sleep(20);
+        pause();
         solo.scrollToBottom();
-        Thread.sleep(20);
+        pause();
         assertChecked("Refreshing last checkbox", 1);
 
         solo.scrollToTop();
+        pause();
         solo.clickOnCheckBox(0);
         assertChecked("Clicked first checkbox", 1);
         assertTrue(solo.getCurrentCheckBoxes().get(0).isChecked());
@@ -48,6 +57,10 @@ public class SimpleDirChooserUITest extends ActivityInstrumentationTestCase2<Sim
         assertTrue(solo.getCurrentCheckBoxes().get(1).isChecked());
     }
 
+    private static void pause() throws InterruptedException {
+        Thread.sleep(500);
+    }
+
     private void assertChecked(String message, int expectedChecked) {
         int checked = 0;
         final ArrayList<CheckBox> boxes = solo.getCurrentCheckBoxes();
@@ -61,4 +74,9 @@ public class SimpleDirChooserUITest extends ActivityInstrumentationTestCase2<Sim
         assertEquals(message, expectedChecked, checked);
     }
 
+    @Override
+    public void tearDown() throws Exception {
+        solo.finishOpenedActivities();
+        super.tearDown();
+    }
 }