diff options
author | Kevin Jin <kjin@google.com> | 2015-03-06 16:49:37 +0000 |
---|---|---|
committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2015-03-06 16:49:38 +0000 |
commit | b284da9483474581abc25a8cc822b4dadf2dfa34 (patch) | |
tree | 9d638e644dc9079f06f8c8794cea09dbf404023b /src/io/appium/droiddriver/helpers/BaseDroidDriverTest.java | |
parent | f2c5634785d05fbdaff81a8b5f781910dd7a2894 (diff) | |
parent | 367267b01bcc1ec5965cfc7c26149ccd405c11cf (diff) | |
download | droiddriver-b284da9483474581abc25a8cc822b4dadf2dfa34.tar.gz |
Merge "Add InstrumentationUtils"
Diffstat (limited to 'src/io/appium/droiddriver/helpers/BaseDroidDriverTest.java')
-rw-r--r-- | src/io/appium/droiddriver/helpers/BaseDroidDriverTest.java | 26 |
1 files changed, 1 insertions, 25 deletions
diff --git a/src/io/appium/droiddriver/helpers/BaseDroidDriverTest.java b/src/io/appium/droiddriver/helpers/BaseDroidDriverTest.java index 7b29bc0..0b17dc5 100644 --- a/src/io/appium/droiddriver/helpers/BaseDroidDriverTest.java +++ b/src/io/appium/droiddriver/helpers/BaseDroidDriverTest.java @@ -17,7 +17,6 @@ package io.appium.droiddriver.helpers; import android.app.Activity; -import android.app.Instrumentation; import android.content.Context; import android.os.Debug; import android.test.FlakyTest; @@ -41,29 +40,6 @@ import io.appium.droiddriver.util.Logs; */ public abstract class BaseDroidDriverTest<T extends Activity> extends D2ActivityInstrumentationTestCase2<T> { - /** - * Calls {@link DroidDrivers#init} once and only once. - */ - public static class DroidDriversInitializer extends SingleRun { - private static DroidDriversInitializer instance; - protected final Instrumentation instrumentation; - - protected DroidDriversInitializer(Instrumentation instrumentation) { - this.instrumentation = instrumentation; - } - - @Override - protected void run() { - DroidDrivers.init(DroidDrivers.newDriver(instrumentation)); - } - - public static synchronized DroidDriversInitializer get(Instrumentation instrumentation) { - if (instance == null) { - instance = new DroidDriversInitializer(instrumentation); - } - return instance; - } - } private static boolean classSetUpDone = false; // In case of device-wide fatal errors, e.g. OOME, the remaining tests will @@ -120,7 +96,7 @@ public abstract class BaseDroidDriverTest<T extends Activity> extends * io.appium.droiddriver.instrumentation.ViewElement#overrideClassName} */ protected void classSetUp() { - DroidDriversInitializer.get(getInstrumentation()).singleRun(); + DroidDriversInitializer.get(DroidDrivers.newDriver()).singleRun(); } protected boolean reportSkippedAsFailed() { |