refactoring: wait for activity in UI test

1 files changed, 8 insertions, 0 deletions

diff --git a/tests/src/cgeo/geocaching/files/SimpleDirChooserUITest.java b/tests/src/cgeo/geocaching/files/SimpleDirChooserUITest.java
index cbcd176..15f7708 100644
--- a/tests/src/cgeo/geocaching/files/SimpleDirChooserUITest.java
+++ b/tests/src/cgeo/geocaching/files/SimpleDirChooserUITest.java
@@ -25,6 +25,9 @@ public class SimpleDirChooserUITest extends ActivityInstrumentationTestCase2<Sim
     }
 
     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();
@@ -71,4 +74,9 @@ public class SimpleDirChooserUITest extends ActivityInstrumentationTestCase2<Sim
         assertEquals(message, expectedChecked, checked);
     }
 
+    @Override
+    public void tearDown() throws Exception {
+        solo.finishOpenedActivities();
+        super.tearDown();
+    }
 }