Call Robolectric resume on test thread

Author: shai-almog

scripts/templates/HelloCodenameOneUiTest.java.tmpl

@@ -23,14 +23,6 @@ import org.robolectric.annotation.Config;
 import org.robolectric.annotation.LooperMode;
 import org.robolectric.shadows.ShadowLooper;
 
-import java.util.concurrent.Callable;
-import java.util.concurrent.ExecutionException;
-import java.util.concurrent.ExecutorService;
-import java.util.concurrent.Executors;
-import java.util.concurrent.Future;
-import java.util.concurrent.TimeUnit;
-import java.util.concurrent.TimeoutException;
-
 @RunWith(RobolectricTestRunner.class)
 @Config(sdk = 30)
 @LooperMode(LooperMode.Mode.LEGACY)
@@ -45,7 +37,9 @@ public class @MAIN_NAME@UiTest {
         log("Activity created (Display.isInitialized=" + Display.isInitialized() + ")");
         controller.start();
         log("Activity started");
-        resumeWithPumpedMainLooper(controller);
+        log("Calling controller.resume() on Robolectric thread");
+        controller.resume();
+        log("controller.resume() completed");
         log("Display initialized after resume: " + Display.isInitialized());
         controller.visible();
         log("Activity made visible");
@@ -84,45 +78,6 @@ public class @MAIN_NAME@UiTest {
         }
     }
 
-    private static void resumeWithPumpedMainLooper(ActivityController<@MAIN_NAME@Stub> controller)
-            throws InterruptedException, ExecutionException, TimeoutException {
-        log("Preparing to resume activity with pumped main looper");
-        ExecutorService executor = Executors.newSingleThreadExecutor();
-        Future<Void> future = executor.submit(new Callable<Void>() {
-            @Override
-            public Void call() {
-                log("Invoking controller.resume()");
-                controller.resume();
-                log("controller.resume() returned");
-                return null;
-            }
-        });
-
-        long deadlineNanos = System.nanoTime() + TimeUnit.SECONDS.toNanos(60);
-        int iterations = 0;
-        try {
-            while (!future.isDone()) {
-                if (System.nanoTime() >= deadlineNanos) {
-                    log("controller.resume() did not finish before deadline; cancelling");
-                    future.cancel(true);
-                    throw new TimeoutException("controller.resume() timed out");
-                }
-                ShadowLooper.runUiThreadTasksIncludingDelayedTasks();
-                if (++iterations % 50 == 0) {
-                    log("Still waiting for controller.resume() after " + iterations + " pump iterations");
-                }
-                Thread.sleep(20L);
-            }
-            future.get(5L, TimeUnit.SECONDS);
-            log("Activity resumed");
-        } catch (TimeoutException | InterruptedException | ExecutionException ex) {
-            log("Failed while resuming activity: " + ex);
-            throw ex;
-        } finally {
-            executor.shutdownNow();
-        }
-    }
-
     private static Bitmap captureScreenshot(@MAIN_NAME@Stub activity) {
         View decorView = activity.getWindow().getDecorView();
         log("Decor view instance=" + decorView);