Add InstrumentationUtils

Move runOnMainSyncWithTimeout to InstrumentationUtils
Add By.resourceId(int) since InstrumentationUtils should always be available

Change-Id: I8e4683030583b88c3e2b777d0b80b5a2f310e279

1 files changed, 9 insertions, 0 deletions

diff --git a/manualtest/src/io/appium/droiddriver/manualtest/ManualTest.java b/manualtest/src/io/appium/droiddriver/manualtest/ManualTest.java
index 6e95272..83966f7 100644
--- a/manualtest/src/io/appium/droiddriver/manualtest/ManualTest.java
+++ b/manualtest/src/io/appium/droiddriver/manualtest/ManualTest.java
@@ -5,6 +5,9 @@ import android.app.Activity;
 import io.appium.droiddriver.finders.By;
 import io.appium.droiddriver.finders.Finder;
 import io.appium.droiddriver.helpers.BaseDroidDriverTest;
+import io.appium.droiddriver.helpers.DroidDrivers;
+import io.appium.droiddriver.helpers.DroidDriversInitializer;
+import io.appium.droiddriver.uiautomation.UiAutomationDriver;
 
 /**
  * This is for manually testing DroidDriver. It is not meant for continuous
@@ -24,6 +27,12 @@ public class ManualTest extends BaseDroidDriverTest<Activity> {
     super(Activity.class);
   }
 
+  // This does not instrument a certain AUT, so InstrumentationDriver won't work
+  protected void classSetUp() {
+    DroidDrivers.checkUiAutomation();
+    DroidDriversInitializer.get(new UiAutomationDriver(getInstrumentation())).singleRun();
+  }
+
   public void testSetTextForPassword() {
     Finder password_edit = By.resourceId("com.google.android.gsf.login:id/password_edit");
     String oldPassword = "A fake password that is not empty and needs to be cleared by setText";