diff options
author | Kevin Jin <kjin@google.com> | 2015-02-20 09:35:39 -0800 |
---|---|---|
committer | Kevin Jin <kjin@google.com> | 2015-02-20 14:37:53 -0800 |
commit | 4b31201b5a2dbf8036da5a8d089a68a39cc1dc44 (patch) | |
tree | 0a4a6d976ca45f3b87433927d57d50cb3cd51b41 | |
parent | 85a1731f32032690e528a6ca1084aa148200569b (diff) | |
download | droiddriver-4b31201b5a2dbf8036da5a8d089a68a39cc1dc44.tar.gz |
rename package 'com.google.android' to 'io.appium'
Change-Id: I2c7c96cd6a6971806e2ea7b06cd6c2c6666e4340
-rw-r--r-- | AndroidManifest.xml | 4 | ||||
-rw-r--r-- | manualtest/AndroidManifest.xml | 6 | ||||
-rw-r--r-- | manualtest/build.gradle | 4 | ||||
-rw-r--r-- | manualtest/src/io/appium/droiddriver/manualtest/ManualTest.java (renamed from manualtest/src/com/google/android/droiddriver/manualtest/ManualTest.java) | 24 | ||||
-rw-r--r-- | src/io/appium/droiddriver/DroidDriver.java (renamed from src/com/google/android/droiddriver/DroidDriver.java) | 8 | ||||
-rw-r--r-- | src/io/appium/droiddriver/Poller.java (renamed from src/com/google/android/droiddriver/Poller.java) | 6 | ||||
-rw-r--r-- | src/io/appium/droiddriver/UiDevice.java (renamed from src/com/google/android/droiddriver/UiDevice.java) | 4 | ||||
-rw-r--r-- | src/io/appium/droiddriver/UiElement.java (renamed from src/com/google/android/droiddriver/UiElement.java) | 20 | ||||
-rw-r--r-- | src/io/appium/droiddriver/actions/Action.java (renamed from src/com/google/android/droiddriver/actions/Action.java) | 4 | ||||
-rw-r--r-- | src/io/appium/droiddriver/actions/BaseAction.java (renamed from src/com/google/android/droiddriver/actions/BaseAction.java) | 2 | ||||
-rw-r--r-- | src/io/appium/droiddriver/actions/ClickAction.java (renamed from src/com/google/android/droiddriver/actions/ClickAction.java) | 6 | ||||
-rw-r--r-- | src/io/appium/droiddriver/actions/EventAction.java (renamed from src/com/google/android/droiddriver/actions/EventAction.java) | 4 | ||||
-rw-r--r-- | src/io/appium/droiddriver/actions/EventUiElementActor.java (renamed from src/com/google/android/droiddriver/actions/EventUiElementActor.java) | 6 | ||||
-rw-r--r-- | src/io/appium/droiddriver/actions/InputInjector.java (renamed from src/com/google/android/droiddriver/actions/InputInjector.java) | 2 | ||||
-rw-r--r-- | src/io/appium/droiddriver/actions/KeyAction.java (renamed from src/com/google/android/droiddriver/actions/KeyAction.java) | 6 | ||||
-rw-r--r-- | src/io/appium/droiddriver/actions/ScrollAction.java (renamed from src/com/google/android/droiddriver/actions/ScrollAction.java) | 2 | ||||
-rw-r--r-- | src/io/appium/droiddriver/actions/SingleKeyAction.java (renamed from src/com/google/android/droiddriver/actions/SingleKeyAction.java) | 10 | ||||
-rw-r--r-- | src/io/appium/droiddriver/actions/SwipeAction.java (renamed from src/com/google/android/droiddriver/actions/SwipeAction.java) | 14 | ||||
-rw-r--r-- | src/io/appium/droiddriver/actions/TextAction.java (renamed from src/com/google/android/droiddriver/actions/TextAction.java) | 10 | ||||
-rw-r--r-- | src/io/appium/droiddriver/actions/UiElementActor.java (renamed from src/com/google/android/droiddriver/actions/UiElementActor.java) | 6 | ||||
-rw-r--r-- | src/io/appium/droiddriver/actions/accessibility/AccessibilityAction.java (renamed from src/com/google/android/droiddriver/actions/accessibility/AccessibilityAction.java) | 10 | ||||
-rw-r--r-- | src/io/appium/droiddriver/actions/accessibility/AccessibilityClickAction.java (renamed from src/com/google/android/droiddriver/actions/accessibility/AccessibilityClickAction.java) | 6 | ||||
-rw-r--r-- | src/io/appium/droiddriver/actions/accessibility/AccessibilityScrollAction.java (renamed from src/com/google/android/droiddriver/actions/accessibility/AccessibilityScrollAction.java) | 10 | ||||
-rw-r--r-- | src/io/appium/droiddriver/actions/accessibility/AccessibilityUiElementActor.java (renamed from src/com/google/android/droiddriver/actions/accessibility/AccessibilityUiElementActor.java) | 8 | ||||
-rw-r--r-- | src/io/appium/droiddriver/base/BaseDroidDriver.java (renamed from src/com/google/android/droiddriver/base/BaseDroidDriver.java) | 20 | ||||
-rw-r--r-- | src/io/appium/droiddriver/base/BaseUiDevice.java (renamed from src/com/google/android/droiddriver/base/BaseUiDevice.java) | 14 | ||||
-rw-r--r-- | src/io/appium/droiddriver/base/BaseUiElement.java (renamed from src/com/google/android/droiddriver/base/BaseUiElement.java) | 38 | ||||
-rw-r--r-- | src/io/appium/droiddriver/base/DefaultPoller.java (renamed from src/com/google/android/droiddriver/base/DefaultPoller.java) | 14 | ||||
-rw-r--r-- | src/io/appium/droiddriver/base/DroidDriverContext.java (renamed from src/com/google/android/droiddriver/base/DroidDriverContext.java) | 12 | ||||
-rw-r--r-- | src/io/appium/droiddriver/exceptions/ActionException.java (renamed from src/com/google/android/droiddriver/exceptions/ActionException.java) | 2 | ||||
-rw-r--r-- | src/io/appium/droiddriver/exceptions/DroidDriverException.java (renamed from src/com/google/android/droiddriver/exceptions/DroidDriverException.java) | 2 | ||||
-rw-r--r-- | src/io/appium/droiddriver/exceptions/ElementNotFoundException.java (renamed from src/com/google/android/droiddriver/exceptions/ElementNotFoundException.java) | 4 | ||||
-rw-r--r-- | src/io/appium/droiddriver/exceptions/NoRunningActivityException.java (renamed from src/com/google/android/droiddriver/exceptions/NoRunningActivityException.java) | 2 | ||||
-rw-r--r-- | src/io/appium/droiddriver/exceptions/TimeoutException.java (renamed from src/com/google/android/droiddriver/exceptions/TimeoutException.java) | 2 | ||||
-rw-r--r-- | src/io/appium/droiddriver/exceptions/UnrecoverableException.java (renamed from src/com/google/android/droiddriver/exceptions/UnrecoverableException.java) | 4 | ||||
-rw-r--r-- | src/io/appium/droiddriver/finders/Attribute.java (renamed from src/com/google/android/droiddriver/finders/Attribute.java) | 2 | ||||
-rw-r--r-- | src/io/appium/droiddriver/finders/By.java (renamed from src/com/google/android/droiddriver/finders/By.java) | 8 | ||||
-rw-r--r-- | src/io/appium/droiddriver/finders/ByXPath.java (renamed from src/com/google/android/droiddriver/finders/ByXPath.java) | 20 | ||||
-rw-r--r-- | src/io/appium/droiddriver/finders/ChainFinder.java (renamed from src/com/google/android/droiddriver/finders/ChainFinder.java) | 6 | ||||
-rw-r--r-- | src/io/appium/droiddriver/finders/Finder.java (renamed from src/com/google/android/droiddriver/finders/Finder.java) | 6 | ||||
-rw-r--r-- | src/io/appium/droiddriver/finders/MatchFinder.java (renamed from src/com/google/android/droiddriver/finders/MatchFinder.java) | 8 | ||||
-rw-r--r-- | src/io/appium/droiddriver/finders/Predicate.java (renamed from src/com/google/android/droiddriver/finders/Predicate.java) | 2 | ||||
-rw-r--r-- | src/io/appium/droiddriver/finders/Predicates.java (renamed from src/com/google/android/droiddriver/finders/Predicates.java) | 4 | ||||
-rw-r--r-- | src/io/appium/droiddriver/finders/XPaths.java (renamed from src/com/google/android/droiddriver/finders/XPaths.java) | 2 | ||||
-rw-r--r-- | src/io/appium/droiddriver/helpers/BaseDroidDriverTest.java (renamed from src/com/google/android/droiddriver/helpers/BaseDroidDriverTest.java) | 14 | ||||
-rw-r--r-- | src/io/appium/droiddriver/helpers/D2ActivityInstrumentationTestCase2.java (renamed from src/com/google/android/droiddriver/helpers/D2ActivityInstrumentationTestCase2.java) | 2 | ||||
-rw-r--r-- | src/io/appium/droiddriver/helpers/DroidDrivers.java (renamed from src/com/google/android/droiddriver/helpers/DroidDrivers.java) | 14 | ||||
-rw-r--r-- | src/io/appium/droiddriver/helpers/PollingListeners.java (renamed from src/com/google/android/droiddriver/helpers/PollingListeners.java) | 10 | ||||
-rw-r--r-- | src/io/appium/droiddriver/helpers/ScrollerHelper.java (renamed from src/com/google/android/droiddriver/helpers/ScrollerHelper.java) | 14 | ||||
-rw-r--r-- | src/io/appium/droiddriver/helpers/SingleRun.java (renamed from src/com/google/android/droiddriver/helpers/SingleRun.java) | 2 | ||||
-rw-r--r-- | src/io/appium/droiddriver/helpers/package-info.java (renamed from src/com/google/android/droiddriver/helpers/package-info.java) | 2 | ||||
-rw-r--r-- | src/io/appium/droiddriver/instrumentation/InstrumentationDriver.java (renamed from src/com/google/android/droiddriver/instrumentation/InstrumentationDriver.java) | 18 | ||||
-rw-r--r-- | src/io/appium/droiddriver/instrumentation/InstrumentationInputInjector.java (renamed from src/com/google/android/droiddriver/instrumentation/InstrumentationInputInjector.java) | 6 | ||||
-rw-r--r-- | src/io/appium/droiddriver/instrumentation/InstrumentationUiDevice.java (renamed from src/com/google/android/droiddriver/instrumentation/InstrumentationUiDevice.java) | 10 | ||||
-rw-r--r-- | src/io/appium/droiddriver/instrumentation/RootFinder.java (renamed from src/com/google/android/droiddriver/instrumentation/RootFinder.java) | 7 | ||||
-rw-r--r-- | src/io/appium/droiddriver/instrumentation/ViewElement.java (renamed from src/com/google/android/droiddriver/instrumentation/ViewElement.java) | 24 | ||||
-rw-r--r-- | src/io/appium/droiddriver/runner/MinSdkVersion.java (renamed from src/com/google/android/droiddriver/runner/MinSdkVersion.java) | 8 | ||||
-rw-r--r-- | src/io/appium/droiddriver/runner/TestRunner.java (renamed from src/com/google/android/droiddriver/runner/TestRunner.java) | 11 | ||||
-rw-r--r-- | src/io/appium/droiddriver/runner/UseUiAutomation.java (renamed from src/com/google/android/droiddriver/runner/UseUiAutomation.java) | 8 | ||||
-rw-r--r-- | src/io/appium/droiddriver/scroll/AccessibilityEventScrollStepStrategy.java (renamed from src/com/google/android/droiddriver/scroll/AccessibilityEventScrollStepStrategy.java) | 22 | ||||
-rw-r--r-- | src/io/appium/droiddriver/scroll/Direction.java (renamed from src/com/google/android/droiddriver/scroll/Direction.java) | 10 | ||||
-rw-r--r-- | src/io/appium/droiddriver/scroll/DynamicSentinelStrategy.java (renamed from src/com/google/android/droiddriver/scroll/DynamicSentinelStrategy.java) | 20 | ||||
-rw-r--r-- | src/io/appium/droiddriver/scroll/ForwardingScrollStepStrategy.java (renamed from src/com/google/android/droiddriver/scroll/ForwardingScrollStepStrategy.java) | 12 | ||||
-rw-r--r-- | src/io/appium/droiddriver/scroll/ScrollStepStrategy.java (renamed from src/com/google/android/droiddriver/scroll/ScrollStepStrategy.java) | 12 | ||||
-rw-r--r-- | src/io/appium/droiddriver/scroll/Scroller.java (renamed from src/com/google/android/droiddriver/scroll/Scroller.java) | 12 | ||||
-rw-r--r-- | src/io/appium/droiddriver/scroll/Scrollers.java (renamed from src/com/google/android/droiddriver/scroll/Scrollers.java) | 14 | ||||
-rw-r--r-- | src/io/appium/droiddriver/scroll/SentinelStrategy.java (renamed from src/com/google/android/droiddriver/scroll/SentinelStrategy.java) | 26 | ||||
-rw-r--r-- | src/io/appium/droiddriver/scroll/StaticSentinelStrategy.java (renamed from src/com/google/android/droiddriver/scroll/StaticSentinelStrategy.java) | 14 | ||||
-rw-r--r-- | src/io/appium/droiddriver/scroll/StepBasedScroller.java (renamed from src/com/google/android/droiddriver/scroll/StepBasedScroller.java) | 28 | ||||
-rw-r--r-- | src/io/appium/droiddriver/uiautomation/AccessibilityDriver.java (renamed from src/com/google/android/droiddriver/uiautomation/AccessibilityDriver.java) | 14 | ||||
-rw-r--r-- | src/io/appium/droiddriver/uiautomation/UiAutomationContext.java (renamed from src/com/google/android/droiddriver/uiautomation/UiAutomationContext.java) | 6 | ||||
-rw-r--r-- | src/io/appium/droiddriver/uiautomation/UiAutomationDriver.java (renamed from src/com/google/android/droiddriver/uiautomation/UiAutomationDriver.java) | 12 | ||||
-rw-r--r-- | src/io/appium/droiddriver/uiautomation/UiAutomationElement.java (renamed from src/com/google/android/droiddriver/uiautomation/UiAutomationElement.java) | 20 | ||||
-rw-r--r-- | src/io/appium/droiddriver/uiautomation/UiAutomationInputInjector.java (renamed from src/com/google/android/droiddriver/uiautomation/UiAutomationInputInjector.java) | 6 | ||||
-rw-r--r-- | src/io/appium/droiddriver/uiautomation/UiAutomationUiDevice.java (renamed from src/com/google/android/droiddriver/uiautomation/UiAutomationUiDevice.java) | 10 | ||||
-rw-r--r-- | src/io/appium/droiddriver/util/ActivityUtils.java (renamed from src/com/google/android/droiddriver/util/ActivityUtils.java) | 8 | ||||
-rw-r--r-- | src/io/appium/droiddriver/util/Events.java (renamed from src/com/google/android/droiddriver/util/Events.java) | 6 | ||||
-rw-r--r-- | src/io/appium/droiddriver/util/FileUtils.java (renamed from src/com/google/android/droiddriver/util/FileUtils.java) | 6 | ||||
-rw-r--r-- | src/io/appium/droiddriver/util/Logs.java (renamed from src/com/google/android/droiddriver/util/Logs.java) | 2 | ||||
-rw-r--r-- | src/io/appium/droiddriver/util/Preconditions.java (renamed from src/com/google/android/droiddriver/util/Preconditions.java) | 2 | ||||
-rw-r--r-- | src/io/appium/droiddriver/util/Strings.java (renamed from src/com/google/android/droiddriver/util/Strings.java) | 2 | ||||
-rw-r--r-- | src/io/appium/droiddriver/validators/DefaultAccessibilityValidator.java (renamed from src/com/google/android/droiddriver/validators/DefaultAccessibilityValidator.java) | 8 | ||||
-rw-r--r-- | src/io/appium/droiddriver/validators/ExemptRootValidator.java (renamed from src/com/google/android/droiddriver/validators/ExemptRootValidator.java) | 6 | ||||
-rw-r--r-- | src/io/appium/droiddriver/validators/ExemptScrollActionValidator.java (renamed from src/com/google/android/droiddriver/validators/ExemptScrollActionValidator.java) | 8 | ||||
-rw-r--r-- | src/io/appium/droiddriver/validators/ExemptedClassesValidator.java (renamed from src/com/google/android/droiddriver/validators/ExemptedClassesValidator.java) | 8 | ||||
-rw-r--r-- | src/io/appium/droiddriver/validators/FirstApplicableValidator.java (renamed from src/com/google/android/droiddriver/validators/FirstApplicableValidator.java) | 6 | ||||
-rw-r--r-- | src/io/appium/droiddriver/validators/Validator.java (renamed from src/com/google/android/droiddriver/validators/Validator.java) | 6 | ||||
-rw-r--r-- | src/io/appium/droiddriver/validators/VisibilityValidator.java (renamed from src/com/google/android/droiddriver/validators/VisibilityValidator.java) | 6 |
88 files changed, 407 insertions, 409 deletions
diff --git a/AndroidManifest.xml b/AndroidManifest.xml index bfd44d6..4d6a65f 100644 --- a/AndroidManifest.xml +++ b/AndroidManifest.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="utf-8"?> -<manifest xmlns:android="http://schemas.android.com/apk/res/android" - package="com.google.android.droiddriver" > +<manifest + package="io.appium.droiddriver"> </manifest> diff --git a/manualtest/AndroidManifest.xml b/manualtest/AndroidManifest.xml index e628e32..7e07f25 100644 --- a/manualtest/AndroidManifest.xml +++ b/manualtest/AndroidManifest.xml @@ -1,11 +1,11 @@ <?xml version="1.0" encoding="utf-8"?> <manifest xmlns:android="http://schemas.android.com/apk/res/android" xmlns:tools="http://schemas.android.com/tools" - package="com.google.android.droiddriver.manualtest"> + package="io.appium.droiddriver.manualtest"> <instrumentation - android:name="com.google.android.droiddriver.runner.TestRunner" - android:targetPackage="com.google.android.droiddriver.manualtest" /> + android:name="io.appium.droiddriver.runner.TestRunner" + android:targetPackage="io.appium.droiddriver.manualtest" /> <!-- Needed for Android.mk --> <uses-sdk diff --git a/manualtest/build.gradle b/manualtest/build.gradle index 5cbfce3..91fb5eb 100644 --- a/manualtest/build.gradle +++ b/manualtest/build.gradle @@ -19,8 +19,8 @@ android { minSdkVersion 12 targetSdkVersion 21 // Force remove the suffix '.test' - testApplicationId 'com.google.android.droiddriver.manualtest' - testInstrumentationRunner 'com.google.android.droiddriver.runner.TestRunner' + testApplicationId 'io.appium.droiddriver.manualtest' + testInstrumentationRunner 'io.appium.droiddriver.runner.TestRunner' } sourceSets { diff --git a/manualtest/src/com/google/android/droiddriver/manualtest/ManualTest.java b/manualtest/src/io/appium/droiddriver/manualtest/ManualTest.java index c1f3946..6e95272 100644 --- a/manualtest/src/com/google/android/droiddriver/manualtest/ManualTest.java +++ b/manualtest/src/io/appium/droiddriver/manualtest/ManualTest.java @@ -1,24 +1,22 @@ -package com.google.android.droiddriver.manualtest; +package io.appium.droiddriver.manualtest; import android.app.Activity; -import com.google.android.droiddriver.actions.TextAction; -import com.google.android.droiddriver.finders.By; -import com.google.android.droiddriver.finders.Finder; -import com.google.android.droiddriver.helpers.BaseDroidDriverTest; -import com.google.android.droiddriver.helpers.DroidDrivers; +import io.appium.droiddriver.finders.By; +import io.appium.droiddriver.finders.Finder; +import io.appium.droiddriver.helpers.BaseDroidDriverTest; /** * This is for manually testing DroidDriver. It is not meant for continuous * testing. Instead it is used for debugging failures. It assumes the device is * in a condition that is ready to reproduce a failure. For example, * {@link #testSetTextForPassword} assumes the password_edit field is displayed - * on screen and has input focus. + * on screen. * <p> * Run it as (optionally with -e debug true) * * <pre> - * adb shell am instrument -w com.google.android.droiddriver.manualtest/com.google.android.droiddriver.runner.TestRunner + * adb shell am instrument -w io.appium.droiddriver.manualtest/io.appium.droiddriver.runner.TestRunner * </pre> */ public class ManualTest extends BaseDroidDriverTest<Activity> { @@ -28,13 +26,13 @@ public class ManualTest extends BaseDroidDriverTest<Activity> { public void testSetTextForPassword() { Finder password_edit = By.resourceId("com.google.android.gsf.login:id/password_edit"); - driver.on(password_edit).perform( - new TextAction("A fake password that is not empty and needs to be cleared by setText")); - String password = "1"; - driver.on(password_edit).setText(password); + String oldPassword = "A fake password that is not empty and needs to be cleared by setText"; + String newPassword = "1"; + driver.on(password_edit).setText(oldPassword); + driver.on(password_edit).setText(newPassword); // This won't work because password_edit does not reveal text to // Accessibility service. But you can see the length changed on screen. - // assertEquals(password, driver.on(password_edit).getText()); + // assertEquals(newPassword, driver.on(password_edit).getText()); assertEquals(null, driver.on(password_edit).getText()); } } diff --git a/src/com/google/android/droiddriver/DroidDriver.java b/src/io/appium/droiddriver/DroidDriver.java index cd1caca..73c6027 100644 --- a/src/com/google/android/droiddriver/DroidDriver.java +++ b/src/io/appium/droiddriver/DroidDriver.java @@ -14,11 +14,11 @@ * limitations under the License. */ -package com.google.android.droiddriver; +package io.appium.droiddriver; -import com.google.android.droiddriver.exceptions.ElementNotFoundException; -import com.google.android.droiddriver.exceptions.TimeoutException; -import com.google.android.droiddriver.finders.Finder; +import io.appium.droiddriver.exceptions.ElementNotFoundException; +import io.appium.droiddriver.exceptions.TimeoutException; +import io.appium.droiddriver.finders.Finder; /** * The entry interface for using droiddriver. diff --git a/src/com/google/android/droiddriver/Poller.java b/src/io/appium/droiddriver/Poller.java index 548f1ad..387a644 100644 --- a/src/com/google/android/droiddriver/Poller.java +++ b/src/io/appium/droiddriver/Poller.java @@ -14,10 +14,10 @@ * limitations under the License. */ -package com.google.android.droiddriver; +package io.appium.droiddriver; -import com.google.android.droiddriver.exceptions.ElementNotFoundException; -import com.google.android.droiddriver.finders.Finder; +import io.appium.droiddriver.exceptions.ElementNotFoundException; +import io.appium.droiddriver.finders.Finder; /** * Interface for polling mechanism. diff --git a/src/com/google/android/droiddriver/UiDevice.java b/src/io/appium/droiddriver/UiDevice.java index 84fea1b..c2b9086 100644 --- a/src/com/google/android/droiddriver/UiDevice.java +++ b/src/io/appium/droiddriver/UiDevice.java @@ -14,11 +14,11 @@ * limitations under the License. */ -package com.google.android.droiddriver; +package io.appium.droiddriver; import android.graphics.Bitmap.CompressFormat; -import com.google.android.droiddriver.actions.Action; +import io.appium.droiddriver.actions.Action; /** * Interface for device-wide interaction. diff --git a/src/com/google/android/droiddriver/UiElement.java b/src/io/appium/droiddriver/UiElement.java index 03521a9..e160c35 100644 --- a/src/com/google/android/droiddriver/UiElement.java +++ b/src/io/appium/droiddriver/UiElement.java @@ -14,20 +14,20 @@ * limitations under the License. */ -package com.google.android.droiddriver; +package io.appium.droiddriver; import android.graphics.Rect; -import com.google.android.droiddriver.actions.Action; -import com.google.android.droiddriver.actions.InputInjector; -import com.google.android.droiddriver.finders.Attribute; -import com.google.android.droiddriver.finders.Predicate; -import com.google.android.droiddriver.instrumentation.InstrumentationDriver; -import com.google.android.droiddriver.scroll.Direction.PhysicalDirection; -import com.google.android.droiddriver.uiautomation.UiAutomationDriver; - import java.util.List; +import io.appium.droiddriver.actions.Action; +import io.appium.droiddriver.actions.InputInjector; +import io.appium.droiddriver.finders.Attribute; +import io.appium.droiddriver.finders.Predicate; +import io.appium.droiddriver.instrumentation.InstrumentationDriver; +import io.appium.droiddriver.scroll.Direction.PhysicalDirection; +import io.appium.droiddriver.uiautomation.UiAutomationDriver; + /** * Represents an UI element within an Android App. * <p> @@ -50,7 +50,7 @@ public interface UiElement { * Gets the class name of the underlying view. The actual name could be * overridden. * - * @see com.google.android.droiddriver.instrumentation.ViewElement#overrideClassName + * @see io.appium.droiddriver.instrumentation.ViewElement#overrideClassName */ String getClassName(); diff --git a/src/com/google/android/droiddriver/actions/Action.java b/src/io/appium/droiddriver/actions/Action.java index fd5068e..34d1562 100644 --- a/src/com/google/android/droiddriver/actions/Action.java +++ b/src/io/appium/droiddriver/actions/Action.java @@ -14,9 +14,9 @@ * limitations under the License. */ -package com.google.android.droiddriver.actions; +package io.appium.droiddriver.actions; -import com.google.android.droiddriver.UiElement; +import io.appium.droiddriver.UiElement; /** * Interface for performing action on a UiElement. An action is a high-level diff --git a/src/com/google/android/droiddriver/actions/BaseAction.java b/src/io/appium/droiddriver/actions/BaseAction.java index a469fec..e430523 100644 --- a/src/com/google/android/droiddriver/actions/BaseAction.java +++ b/src/io/appium/droiddriver/actions/BaseAction.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.google.android.droiddriver.actions; +package io.appium.droiddriver.actions; /** * Base class of {@link Action} that implements {@link #getTimeoutMillis}. diff --git a/src/com/google/android/droiddriver/actions/ClickAction.java b/src/io/appium/droiddriver/actions/ClickAction.java index 0d7350d..15ac3d7 100644 --- a/src/com/google/android/droiddriver/actions/ClickAction.java +++ b/src/io/appium/droiddriver/actions/ClickAction.java @@ -14,14 +14,14 @@ * limitations under the License. */ -package com.google.android.droiddriver.actions; +package io.appium.droiddriver.actions; import android.graphics.Rect; import android.os.SystemClock; import android.view.ViewConfiguration; -import com.google.android.droiddriver.UiElement; -import com.google.android.droiddriver.util.Events; +import io.appium.droiddriver.UiElement; +import io.appium.droiddriver.util.Events; /** * An action that does clicks on an UiElement. diff --git a/src/com/google/android/droiddriver/actions/EventAction.java b/src/io/appium/droiddriver/actions/EventAction.java index f2736e3..b271646 100644 --- a/src/com/google/android/droiddriver/actions/EventAction.java +++ b/src/io/appium/droiddriver/actions/EventAction.java @@ -14,11 +14,11 @@ * limitations under the License. */ -package com.google.android.droiddriver.actions; +package io.appium.droiddriver.actions; import android.view.InputEvent; -import com.google.android.droiddriver.UiElement; +import io.appium.droiddriver.UiElement; /** * Implements {@link Action} by injecting synthesized events. diff --git a/src/com/google/android/droiddriver/actions/EventUiElementActor.java b/src/io/appium/droiddriver/actions/EventUiElementActor.java index a5414a9..6b4479c 100644 --- a/src/com/google/android/droiddriver/actions/EventUiElementActor.java +++ b/src/io/appium/droiddriver/actions/EventUiElementActor.java @@ -14,10 +14,10 @@ * limitations under the License. */ -package com.google.android.droiddriver.actions; +package io.appium.droiddriver.actions; -import com.google.android.droiddriver.UiElement; -import com.google.android.droiddriver.scroll.Direction.PhysicalDirection; +import io.appium.droiddriver.UiElement; +import io.appium.droiddriver.scroll.Direction.PhysicalDirection; /** * A {@link UiElementActor} that performs actions by injecting synthesized diff --git a/src/com/google/android/droiddriver/actions/InputInjector.java b/src/io/appium/droiddriver/actions/InputInjector.java index 96dc07b..f7a4fd9 100644 --- a/src/com/google/android/droiddriver/actions/InputInjector.java +++ b/src/io/appium/droiddriver/actions/InputInjector.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.google.android.droiddriver.actions; +package io.appium.droiddriver.actions; import android.view.InputEvent; diff --git a/src/com/google/android/droiddriver/actions/KeyAction.java b/src/io/appium/droiddriver/actions/KeyAction.java index 18bbd4c..a1fa2cd 100644 --- a/src/com/google/android/droiddriver/actions/KeyAction.java +++ b/src/io/appium/droiddriver/actions/KeyAction.java @@ -14,10 +14,10 @@ * limitations under the License. */ -package com.google.android.droiddriver.actions; +package io.appium.droiddriver.actions; -import com.google.android.droiddriver.UiElement; -import com.google.android.droiddriver.exceptions.ActionException; +import io.appium.droiddriver.UiElement; +import io.appium.droiddriver.exceptions.ActionException; /** * Base class for {@link Action} that injects key events. diff --git a/src/com/google/android/droiddriver/actions/ScrollAction.java b/src/io/appium/droiddriver/actions/ScrollAction.java index 6305c83..55d847f 100644 --- a/src/com/google/android/droiddriver/actions/ScrollAction.java +++ b/src/io/appium/droiddriver/actions/ScrollAction.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.google.android.droiddriver.actions; +package io.appium.droiddriver.actions; /** * Marker interface for a scroll action. diff --git a/src/com/google/android/droiddriver/actions/SingleKeyAction.java b/src/io/appium/droiddriver/actions/SingleKeyAction.java index b78e54c..e5a8268 100644 --- a/src/com/google/android/droiddriver/actions/SingleKeyAction.java +++ b/src/io/appium/droiddriver/actions/SingleKeyAction.java @@ -14,17 +14,17 @@ * limitations under the License. */ -package com.google.android.droiddriver.actions; +package io.appium.droiddriver.actions; import android.annotation.SuppressLint; import android.annotation.TargetApi; import android.os.Build; import android.view.KeyEvent; -import com.google.android.droiddriver.UiElement; -import com.google.android.droiddriver.util.Events; -import com.google.android.droiddriver.util.Strings; -import com.google.android.droiddriver.util.Strings.ToStringHelper; +import io.appium.droiddriver.UiElement; +import io.appium.droiddriver.util.Events; +import io.appium.droiddriver.util.Strings; +import io.appium.droiddriver.util.Strings.ToStringHelper; /** * An action to press a single key. While it is convenient for navigating the UI, do not overuse it diff --git a/src/com/google/android/droiddriver/actions/SwipeAction.java b/src/io/appium/droiddriver/actions/SwipeAction.java index b5818cb..f43f546 100644 --- a/src/com/google/android/droiddriver/actions/SwipeAction.java +++ b/src/io/appium/droiddriver/actions/SwipeAction.java @@ -14,18 +14,18 @@ * limitations under the License. */ -package com.google.android.droiddriver.actions; +package io.appium.droiddriver.actions; import android.graphics.Rect; import android.os.SystemClock; import android.view.ViewConfiguration; -import com.google.android.droiddriver.UiElement; -import com.google.android.droiddriver.exceptions.ActionException; -import com.google.android.droiddriver.scroll.Direction.PhysicalDirection; -import com.google.android.droiddriver.util.Events; -import com.google.android.droiddriver.util.Strings; -import com.google.android.droiddriver.util.Strings.ToStringHelper; +import io.appium.droiddriver.UiElement; +import io.appium.droiddriver.exceptions.ActionException; +import io.appium.droiddriver.scroll.Direction.PhysicalDirection; +import io.appium.droiddriver.util.Events; +import io.appium.droiddriver.util.Strings; +import io.appium.droiddriver.util.Strings.ToStringHelper; /** * An action that swipes the touch screen. diff --git a/src/com/google/android/droiddriver/actions/TextAction.java b/src/io/appium/droiddriver/actions/TextAction.java index 6c4fda3..b108b00 100644 --- a/src/com/google/android/droiddriver/actions/TextAction.java +++ b/src/io/appium/droiddriver/actions/TextAction.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.google.android.droiddriver.actions; +package io.appium.droiddriver.actions; import android.annotation.SuppressLint; import android.os.Build; @@ -22,10 +22,10 @@ import android.os.SystemClock; import android.view.KeyCharacterMap; import android.view.KeyEvent; -import com.google.android.droiddriver.UiElement; -import com.google.android.droiddriver.exceptions.ActionException; -import com.google.android.droiddriver.util.Preconditions; -import com.google.android.droiddriver.util.Strings; +import io.appium.droiddriver.UiElement; +import io.appium.droiddriver.exceptions.ActionException; +import io.appium.droiddriver.util.Preconditions; +import io.appium.droiddriver.util.Strings; /** * An action to type text. diff --git a/src/com/google/android/droiddriver/actions/UiElementActor.java b/src/io/appium/droiddriver/actions/UiElementActor.java index 80c97f4..bfb6578 100644 --- a/src/com/google/android/droiddriver/actions/UiElementActor.java +++ b/src/io/appium/droiddriver/actions/UiElementActor.java @@ -14,10 +14,10 @@ * limitations under the License. */ -package com.google.android.droiddriver.actions; +package io.appium.droiddriver.actions; -import com.google.android.droiddriver.UiElement; -import com.google.android.droiddriver.scroll.Direction.PhysicalDirection; +import io.appium.droiddriver.UiElement; +import io.appium.droiddriver.scroll.Direction.PhysicalDirection; /** * Interface for performing actions on a {@link UiElement}. diff --git a/src/com/google/android/droiddriver/actions/accessibility/AccessibilityAction.java b/src/io/appium/droiddriver/actions/accessibility/AccessibilityAction.java index 5edc131..34ba85a 100644 --- a/src/com/google/android/droiddriver/actions/accessibility/AccessibilityAction.java +++ b/src/io/appium/droiddriver/actions/accessibility/AccessibilityAction.java @@ -14,14 +14,14 @@ * limitations under the License. */ -package com.google.android.droiddriver.actions.accessibility; +package io.appium.droiddriver.actions.accessibility; import android.view.accessibility.AccessibilityNodeInfo; -import com.google.android.droiddriver.UiElement; -import com.google.android.droiddriver.actions.Action; -import com.google.android.droiddriver.actions.BaseAction; -import com.google.android.droiddriver.uiautomation.UiAutomationElement; +import io.appium.droiddriver.UiElement; +import io.appium.droiddriver.actions.Action; +import io.appium.droiddriver.actions.BaseAction; +import io.appium.droiddriver.uiautomation.UiAutomationElement; /** * Implements {@link Action} via the Accessibility API. diff --git a/src/com/google/android/droiddriver/actions/accessibility/AccessibilityClickAction.java b/src/io/appium/droiddriver/actions/accessibility/AccessibilityClickAction.java index 91ab740..8198059 100644 --- a/src/com/google/android/droiddriver/actions/accessibility/AccessibilityClickAction.java +++ b/src/io/appium/droiddriver/actions/accessibility/AccessibilityClickAction.java @@ -14,13 +14,13 @@ * limitations under the License. */ -package com.google.android.droiddriver.actions.accessibility; +package io.appium.droiddriver.actions.accessibility; import android.annotation.TargetApi; import android.view.accessibility.AccessibilityNodeInfo; -import com.google.android.droiddriver.UiElement; -import com.google.android.droiddriver.exceptions.ActionException; +import io.appium.droiddriver.UiElement; +import io.appium.droiddriver.exceptions.ActionException; /** * An {@link AccessibilityAction} that clicks on a UiElement. diff --git a/src/com/google/android/droiddriver/actions/accessibility/AccessibilityScrollAction.java b/src/io/appium/droiddriver/actions/accessibility/AccessibilityScrollAction.java index 7095867..f5a018f 100644 --- a/src/com/google/android/droiddriver/actions/accessibility/AccessibilityScrollAction.java +++ b/src/io/appium/droiddriver/actions/accessibility/AccessibilityScrollAction.java @@ -14,15 +14,15 @@ * limitations under the License. */ -package com.google.android.droiddriver.actions.accessibility; +package io.appium.droiddriver.actions.accessibility; import android.annotation.TargetApi; import android.view.accessibility.AccessibilityNodeInfo; -import com.google.android.droiddriver.UiElement; -import com.google.android.droiddriver.actions.ScrollAction; -import com.google.android.droiddriver.scroll.Direction.PhysicalDirection; -import com.google.android.droiddriver.util.Strings; +import io.appium.droiddriver.UiElement; +import io.appium.droiddriver.actions.ScrollAction; +import io.appium.droiddriver.scroll.Direction.PhysicalDirection; +import io.appium.droiddriver.util.Strings; /** * An {@link AccessibilityAction} that scrolls an UiElement. diff --git a/src/com/google/android/droiddriver/actions/accessibility/AccessibilityUiElementActor.java b/src/io/appium/droiddriver/actions/accessibility/AccessibilityUiElementActor.java index afb91f1..c1cd52e 100644 --- a/src/com/google/android/droiddriver/actions/accessibility/AccessibilityUiElementActor.java +++ b/src/io/appium/droiddriver/actions/accessibility/AccessibilityUiElementActor.java @@ -14,11 +14,11 @@ * limitations under the License. */ -package com.google.android.droiddriver.actions.accessibility; +package io.appium.droiddriver.actions.accessibility; -import com.google.android.droiddriver.UiElement; -import com.google.android.droiddriver.actions.UiElementActor; -import com.google.android.droiddriver.scroll.Direction.PhysicalDirection; +import io.appium.droiddriver.UiElement; +import io.appium.droiddriver.actions.UiElementActor; +import io.appium.droiddriver.scroll.Direction.PhysicalDirection; /** * A {@link UiElementActor} that performs actions via the Accessibility API. diff --git a/src/com/google/android/droiddriver/base/BaseDroidDriver.java b/src/io/appium/droiddriver/base/BaseDroidDriver.java index 1bd0a33..e985a38 100644 --- a/src/com/google/android/droiddriver/base/BaseDroidDriver.java +++ b/src/io/appium/droiddriver/base/BaseDroidDriver.java @@ -14,19 +14,19 @@ * limitations under the License. */ -package com.google.android.droiddriver.base; +package io.appium.droiddriver.base; import android.util.Log; -import com.google.android.droiddriver.DroidDriver; -import com.google.android.droiddriver.Poller; -import com.google.android.droiddriver.UiElement; -import com.google.android.droiddriver.actions.InputInjector; -import com.google.android.droiddriver.exceptions.ElementNotFoundException; -import com.google.android.droiddriver.exceptions.TimeoutException; -import com.google.android.droiddriver.finders.ByXPath; -import com.google.android.droiddriver.finders.Finder; -import com.google.android.droiddriver.util.Logs; +import io.appium.droiddriver.DroidDriver; +import io.appium.droiddriver.Poller; +import io.appium.droiddriver.UiElement; +import io.appium.droiddriver.actions.InputInjector; +import io.appium.droiddriver.exceptions.ElementNotFoundException; +import io.appium.droiddriver.exceptions.TimeoutException; +import io.appium.droiddriver.finders.ByXPath; +import io.appium.droiddriver.finders.Finder; +import io.appium.droiddriver.util.Logs; /** * Base DroidDriver that implements the common operations. diff --git a/src/com/google/android/droiddriver/base/BaseUiDevice.java b/src/io/appium/droiddriver/base/BaseUiDevice.java index 9d5fdae..5b6d135 100644 --- a/src/com/google/android/droiddriver/base/BaseUiDevice.java +++ b/src/io/appium/droiddriver/base/BaseUiDevice.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.google.android.droiddriver.base; +package io.appium.droiddriver.base; import android.app.Service; import android.graphics.Bitmap; @@ -23,14 +23,14 @@ import android.os.PowerManager; import android.util.Log; import android.view.KeyEvent; -import com.google.android.droiddriver.UiDevice; -import com.google.android.droiddriver.actions.Action; -import com.google.android.droiddriver.actions.SingleKeyAction; -import com.google.android.droiddriver.util.FileUtils; -import com.google.android.droiddriver.util.Logs; - import java.io.BufferedOutputStream; +import io.appium.droiddriver.UiDevice; +import io.appium.droiddriver.actions.Action; +import io.appium.droiddriver.actions.SingleKeyAction; +import io.appium.droiddriver.util.FileUtils; +import io.appium.droiddriver.util.Logs; + /** * Base implementation of {@link UiDevice}. */ diff --git a/src/com/google/android/droiddriver/base/BaseUiElement.java b/src/io/appium/droiddriver/base/BaseUiElement.java index 15ef840..293ee9c 100644 --- a/src/com/google/android/droiddriver/base/BaseUiElement.java +++ b/src/io/appium/droiddriver/base/BaseUiElement.java @@ -14,31 +14,13 @@ * limitations under the License. */ -package com.google.android.droiddriver.base; +package io.appium.droiddriver.base; import android.graphics.Rect; import android.os.Build; import android.text.TextUtils; import android.view.KeyEvent; -import com.google.android.droiddriver.UiElement; -import com.google.android.droiddriver.actions.Action; -import com.google.android.droiddriver.actions.EventUiElementActor; -import com.google.android.droiddriver.actions.InputInjector; -import com.google.android.droiddriver.actions.SingleKeyAction; -import com.google.android.droiddriver.actions.TextAction; -import com.google.android.droiddriver.actions.UiElementActor; -import com.google.android.droiddriver.exceptions.DroidDriverException; -import com.google.android.droiddriver.finders.Attribute; -import com.google.android.droiddriver.finders.Predicate; -import com.google.android.droiddriver.finders.Predicates; -import com.google.android.droiddriver.scroll.Direction.PhysicalDirection; -import com.google.android.droiddriver.util.Events; -import com.google.android.droiddriver.util.Logs; -import com.google.android.droiddriver.util.Strings; -import com.google.android.droiddriver.util.Strings.ToStringHelper; -import com.google.android.droiddriver.validators.Validator; - import java.util.ArrayList; import java.util.Collections; import java.util.List; @@ -47,6 +29,24 @@ import java.util.concurrent.Callable; import java.util.concurrent.ExecutionException; import java.util.concurrent.FutureTask; +import io.appium.droiddriver.UiElement; +import io.appium.droiddriver.actions.Action; +import io.appium.droiddriver.actions.EventUiElementActor; +import io.appium.droiddriver.actions.InputInjector; +import io.appium.droiddriver.actions.SingleKeyAction; +import io.appium.droiddriver.actions.TextAction; +import io.appium.droiddriver.actions.UiElementActor; +import io.appium.droiddriver.exceptions.DroidDriverException; +import io.appium.droiddriver.finders.Attribute; +import io.appium.droiddriver.finders.Predicate; +import io.appium.droiddriver.finders.Predicates; +import io.appium.droiddriver.scroll.Direction.PhysicalDirection; +import io.appium.droiddriver.util.Events; +import io.appium.droiddriver.util.Logs; +import io.appium.droiddriver.util.Strings; +import io.appium.droiddriver.util.Strings.ToStringHelper; +import io.appium.droiddriver.validators.Validator; + /** * Base UiElement that implements the common operations. * diff --git a/src/com/google/android/droiddriver/base/DefaultPoller.java b/src/io/appium/droiddriver/base/DefaultPoller.java index d4d178b..933ae91 100644 --- a/src/com/google/android/droiddriver/base/DefaultPoller.java +++ b/src/io/appium/droiddriver/base/DefaultPoller.java @@ -14,19 +14,19 @@ * limitations under the License. */ -package com.google.android.droiddriver.base; +package io.appium.droiddriver.base; import android.os.SystemClock; -import com.google.android.droiddriver.DroidDriver; -import com.google.android.droiddriver.Poller; -import com.google.android.droiddriver.exceptions.NoRunningActivityException; -import com.google.android.droiddriver.exceptions.TimeoutException; -import com.google.android.droiddriver.finders.Finder; - import java.util.Collection; import java.util.LinkedList; +import io.appium.droiddriver.DroidDriver; +import io.appium.droiddriver.Poller; +import io.appium.droiddriver.exceptions.NoRunningActivityException; +import io.appium.droiddriver.exceptions.TimeoutException; +import io.appium.droiddriver.finders.Finder; + /** * Default implementation of a {@link Poller}. */ diff --git a/src/com/google/android/droiddriver/base/DroidDriverContext.java b/src/io/appium/droiddriver/base/DroidDriverContext.java index 0771086..89e2022 100644 --- a/src/com/google/android/droiddriver/base/DroidDriverContext.java +++ b/src/io/appium/droiddriver/base/DroidDriverContext.java @@ -14,17 +14,12 @@ * limitations under the License. */ -package com.google.android.droiddriver.base; +package io.appium.droiddriver.base; import android.app.Instrumentation; import android.os.Looper; import android.util.Log; -import com.google.android.droiddriver.exceptions.DroidDriverException; -import com.google.android.droiddriver.exceptions.TimeoutException; -import com.google.android.droiddriver.finders.ByXPath; -import com.google.android.droiddriver.util.Logs; - import java.util.Locale; import java.util.Map; import java.util.WeakHashMap; @@ -32,6 +27,11 @@ import java.util.concurrent.ExecutionException; import java.util.concurrent.FutureTask; import java.util.concurrent.TimeUnit; +import io.appium.droiddriver.exceptions.DroidDriverException; +import io.appium.droiddriver.exceptions.TimeoutException; +import io.appium.droiddriver.finders.ByXPath; +import io.appium.droiddriver.util.Logs; + /** * Internal helper for DroidDriver implementation. */ diff --git a/src/com/google/android/droiddriver/exceptions/ActionException.java b/src/io/appium/droiddriver/exceptions/ActionException.java index 2bcee0b..57bb962 100644 --- a/src/com/google/android/droiddriver/exceptions/ActionException.java +++ b/src/io/appium/droiddriver/exceptions/ActionException.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.google.android.droiddriver.exceptions; +package io.appium.droiddriver.exceptions; /** * Thrown when an exception occurs while performing an Action. diff --git a/src/com/google/android/droiddriver/exceptions/DroidDriverException.java b/src/io/appium/droiddriver/exceptions/DroidDriverException.java index 16b6825..e7ba2b7 100644 --- a/src/com/google/android/droiddriver/exceptions/DroidDriverException.java +++ b/src/io/appium/droiddriver/exceptions/DroidDriverException.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.google.android.droiddriver.exceptions; +package io.appium.droiddriver.exceptions; /** * Base exception for DroidDriver. diff --git a/src/com/google/android/droiddriver/exceptions/ElementNotFoundException.java b/src/io/appium/droiddriver/exceptions/ElementNotFoundException.java index 7c78da7..268e617 100644 --- a/src/com/google/android/droiddriver/exceptions/ElementNotFoundException.java +++ b/src/io/appium/droiddriver/exceptions/ElementNotFoundException.java @@ -14,9 +14,9 @@ * limitations under the License. */ -package com.google.android.droiddriver.exceptions; +package io.appium.droiddriver.exceptions; -import com.google.android.droiddriver.finders.Finder; +import io.appium.droiddriver.finders.Finder; /** * Thrown when element is not found. diff --git a/src/com/google/android/droiddriver/exceptions/NoRunningActivityException.java b/src/io/appium/droiddriver/exceptions/NoRunningActivityException.java index af72665..9666f3d 100644 --- a/src/com/google/android/droiddriver/exceptions/NoRunningActivityException.java +++ b/src/io/appium/droiddriver/exceptions/NoRunningActivityException.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.google.android.droiddriver.exceptions; +package io.appium.droiddriver.exceptions; /** * Thrown when the running activity cannot be determined. This can happen when, for example, diff --git a/src/com/google/android/droiddriver/exceptions/TimeoutException.java b/src/io/appium/droiddriver/exceptions/TimeoutException.java index 85df463..83a9fe1 100644 --- a/src/com/google/android/droiddriver/exceptions/TimeoutException.java +++ b/src/io/appium/droiddriver/exceptions/TimeoutException.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.google.android.droiddriver.exceptions; +package io.appium.droiddriver.exceptions; /** * Thrown when an element is not found within the given time. diff --git a/src/com/google/android/droiddriver/exceptions/UnrecoverableException.java b/src/io/appium/droiddriver/exceptions/UnrecoverableException.java index c3b069f..5d30db4 100644 --- a/src/com/google/android/droiddriver/exceptions/UnrecoverableException.java +++ b/src/io/appium/droiddriver/exceptions/UnrecoverableException.java @@ -14,9 +14,9 @@ * limitations under the License. */ -package com.google.android.droiddriver.exceptions; +package io.appium.droiddriver.exceptions; -import com.google.android.droiddriver.helpers.BaseDroidDriverTest; +import io.appium.droiddriver.helpers.BaseDroidDriverTest; /** * When an {@link UnrecoverableException} occurs, the rest of the tests are diff --git a/src/com/google/android/droiddriver/finders/Attribute.java b/src/io/appium/droiddriver/finders/Attribute.java index 9799117..9dda497 100644 --- a/src/com/google/android/droiddriver/finders/Attribute.java +++ b/src/io/appium/droiddriver/finders/Attribute.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.google.android.droiddriver.finders; +package io.appium.droiddriver.finders; public enum Attribute { CHECKABLE("checkable"), diff --git a/src/com/google/android/droiddriver/finders/By.java b/src/io/appium/droiddriver/finders/By.java index 1e3bc8a..874cd29 100644 --- a/src/com/google/android/droiddriver/finders/By.java +++ b/src/io/appium/droiddriver/finders/By.java @@ -14,12 +14,12 @@ * limitations under the License. */ -package com.google.android.droiddriver.finders; +package io.appium.droiddriver.finders; -import static com.google.android.droiddriver.util.Preconditions.checkNotNull; +import io.appium.droiddriver.UiElement; +import io.appium.droiddriver.exceptions.ElementNotFoundException; -import com.google.android.droiddriver.UiElement; -import com.google.android.droiddriver.exceptions.ElementNotFoundException; +import static io.appium.droiddriver.util.Preconditions.checkNotNull; /** * Convenience methods to create commonly used finders. diff --git a/src/com/google/android/droiddriver/finders/ByXPath.java b/src/io/appium/droiddriver/finders/ByXPath.java index 946261a..e230e7f 100644 --- a/src/com/google/android/droiddriver/finders/ByXPath.java +++ b/src/io/appium/droiddriver/finders/ByXPath.java @@ -13,19 +13,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.google.android.droiddriver.finders; +package io.appium.droiddriver.finders; import android.util.Log; -import com.google.android.droiddriver.UiElement; -import com.google.android.droiddriver.base.BaseUiElement; -import com.google.android.droiddriver.exceptions.DroidDriverException; -import com.google.android.droiddriver.exceptions.ElementNotFoundException; -import com.google.android.droiddriver.util.FileUtils; -import com.google.android.droiddriver.util.Logs; -import com.google.android.droiddriver.util.Preconditions; -import com.google.android.droiddriver.util.Strings; - import org.w3c.dom.DOMException; import org.w3c.dom.Document; import org.w3c.dom.Element; @@ -47,6 +38,15 @@ import javax.xml.xpath.XPathExpression; import javax.xml.xpath.XPathExpressionException; import javax.xml.xpath.XPathFactory; +import io.appium.droiddriver.UiElement; +import io.appium.droiddriver.base.BaseUiElement; +import io.appium.droiddriver.exceptions.DroidDriverException; +import io.appium.droiddriver.exceptions.ElementNotFoundException; +import io.appium.droiddriver.util.FileUtils; +import io.appium.droiddriver.util.Logs; +import io.appium.droiddriver.util.Preconditions; +import io.appium.droiddriver.util.Strings; + /** * Find matching UiElement by XPath. */ diff --git a/src/com/google/android/droiddriver/finders/ChainFinder.java b/src/io/appium/droiddriver/finders/ChainFinder.java index 6e42903..492aa22 100644 --- a/src/com/google/android/droiddriver/finders/ChainFinder.java +++ b/src/io/appium/droiddriver/finders/ChainFinder.java @@ -14,10 +14,10 @@ * limitations under the License. */ -package com.google.android.droiddriver.finders; +package io.appium.droiddriver.finders; -import com.google.android.droiddriver.UiElement; -import com.google.android.droiddriver.util.Preconditions; +import io.appium.droiddriver.UiElement; +import io.appium.droiddriver.util.Preconditions; /** * Finds UiElement by applying Finders in turn: using the UiElement returned by diff --git a/src/com/google/android/droiddriver/finders/Finder.java b/src/io/appium/droiddriver/finders/Finder.java index 9a7dd1d..fef83ae 100644 --- a/src/com/google/android/droiddriver/finders/Finder.java +++ b/src/io/appium/droiddriver/finders/Finder.java @@ -14,10 +14,10 @@ * limitations under the License. */ -package com.google.android.droiddriver.finders; +package io.appium.droiddriver.finders; -import com.google.android.droiddriver.UiElement; -import com.google.android.droiddriver.exceptions.ElementNotFoundException; +import io.appium.droiddriver.UiElement; +import io.appium.droiddriver.exceptions.ElementNotFoundException; /** * Interface for finding UiElement. diff --git a/src/com/google/android/droiddriver/finders/MatchFinder.java b/src/io/appium/droiddriver/finders/MatchFinder.java index df92f72..698a915 100644 --- a/src/com/google/android/droiddriver/finders/MatchFinder.java +++ b/src/io/appium/droiddriver/finders/MatchFinder.java @@ -14,13 +14,13 @@ * limitations under the License. */ -package com.google.android.droiddriver.finders; +package io.appium.droiddriver.finders; import android.util.Log; -import com.google.android.droiddriver.UiElement; -import com.google.android.droiddriver.exceptions.ElementNotFoundException; -import com.google.android.droiddriver.util.Logs; +import io.appium.droiddriver.UiElement; +import io.appium.droiddriver.exceptions.ElementNotFoundException; +import io.appium.droiddriver.util.Logs; /** * Traverses the UiElement tree and returns the first UiElement satisfying diff --git a/src/com/google/android/droiddriver/finders/Predicate.java b/src/io/appium/droiddriver/finders/Predicate.java index 18b3e66..b33f287 100644 --- a/src/com/google/android/droiddriver/finders/Predicate.java +++ b/src/io/appium/droiddriver/finders/Predicate.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.google.android.droiddriver.finders; +package io.appium.droiddriver.finders; /** * Determines a true or false value for a given input. diff --git a/src/com/google/android/droiddriver/finders/Predicates.java b/src/io/appium/droiddriver/finders/Predicates.java index 3e4ce3c..1b9ad80 100644 --- a/src/com/google/android/droiddriver/finders/Predicates.java +++ b/src/io/appium/droiddriver/finders/Predicates.java @@ -14,11 +14,11 @@ * limitations under the License. */ -package com.google.android.droiddriver.finders; +package io.appium.droiddriver.finders; import android.text.TextUtils; -import com.google.android.droiddriver.UiElement; +import io.appium.droiddriver.UiElement; /** * Static utility methods pertaining to {@code Predicate} instances. diff --git a/src/com/google/android/droiddriver/finders/XPaths.java b/src/io/appium/droiddriver/finders/XPaths.java index ef97d2d..31add4e 100644 --- a/src/com/google/android/droiddriver/finders/XPaths.java +++ b/src/io/appium/droiddriver/finders/XPaths.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.google.android.droiddriver.finders; +package io.appium.droiddriver.finders; import android.text.TextUtils; diff --git a/src/com/google/android/droiddriver/helpers/BaseDroidDriverTest.java b/src/io/appium/droiddriver/helpers/BaseDroidDriverTest.java index 524e3d8..7b29bc0 100644 --- a/src/com/google/android/droiddriver/helpers/BaseDroidDriverTest.java +++ b/src/io/appium/droiddriver/helpers/BaseDroidDriverTest.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.google.android.droiddriver.helpers; +package io.appium.droiddriver.helpers; import android.app.Activity; import android.app.Instrumentation; @@ -23,17 +23,17 @@ import android.os.Debug; import android.test.FlakyTest; import android.util.Log; -import com.google.android.droiddriver.DroidDriver; -import com.google.android.droiddriver.exceptions.UnrecoverableException; -import com.google.android.droiddriver.util.FileUtils; -import com.google.android.droiddriver.util.Logs; - import java.io.IOException; import java.lang.Thread.UncaughtExceptionHandler; import java.lang.reflect.InvocationTargetException; import java.lang.reflect.Method; import java.lang.reflect.Modifier; +import io.appium.droiddriver.DroidDriver; +import io.appium.droiddriver.exceptions.UnrecoverableException; +import io.appium.droiddriver.util.FileUtils; +import io.appium.droiddriver.util.Logs; + /** * Base class for tests using DroidDriver that reports uncaught exceptions, for * example OOME, * instead of crash. Also supports other features, including taking screenshot on failure. It is NOT @@ -117,7 +117,7 @@ public abstract class BaseDroidDriverTest<T extends Activity> extends * or override this method, which is a simpler alternative with the aforementioned catch. * <p> * If an InstrumentationDriver is used, this is a good place to call {@link - * com.google.android.droiddriver.instrumentation.ViewElement#overrideClassName} + * io.appium.droiddriver.instrumentation.ViewElement#overrideClassName} */ protected void classSetUp() { DroidDriversInitializer.get(getInstrumentation()).singleRun(); diff --git a/src/com/google/android/droiddriver/helpers/D2ActivityInstrumentationTestCase2.java b/src/io/appium/droiddriver/helpers/D2ActivityInstrumentationTestCase2.java index ec5ea9f..ab0585e 100644 --- a/src/com/google/android/droiddriver/helpers/D2ActivityInstrumentationTestCase2.java +++ b/src/io/appium/droiddriver/helpers/D2ActivityInstrumentationTestCase2.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.google.android.droiddriver.helpers; +package io.appium.droiddriver.helpers; import android.app.Activity; import android.test.ActivityInstrumentationTestCase2; diff --git a/src/com/google/android/droiddriver/helpers/DroidDrivers.java b/src/io/appium/droiddriver/helpers/DroidDrivers.java index 4555b84..60c3740 100644 --- a/src/com/google/android/droiddriver/helpers/DroidDrivers.java +++ b/src/io/appium/droiddriver/helpers/DroidDrivers.java @@ -14,20 +14,20 @@ * limitations under the License. */ -package com.google.android.droiddriver.helpers; +package io.appium.droiddriver.helpers; import android.annotation.TargetApi; import android.app.Instrumentation; import android.os.Build; import android.os.Bundle; -import com.google.android.droiddriver.DroidDriver; -import com.google.android.droiddriver.exceptions.DroidDriverException; -import com.google.android.droiddriver.instrumentation.InstrumentationDriver; -import com.google.android.droiddriver.uiautomation.UiAutomationDriver; - import java.lang.reflect.InvocationTargetException; +import io.appium.droiddriver.DroidDriver; +import io.appium.droiddriver.exceptions.DroidDriverException; +import io.appium.droiddriver.instrumentation.InstrumentationDriver; +import io.appium.droiddriver.uiautomation.UiAutomationDriver; + /** * Static utility methods pertaining to {@link DroidDriver} instances. */ @@ -62,7 +62,7 @@ public class DroidDrivers { /** * Initializes for the convenience methods {@link #getInstrumentation()} and * {@link #getOptions()}. Called by - * {@link com.google.android.droiddriver.runner.TestRunner}. If a custom + * {@link io.appium.droiddriver.runner.TestRunner}. If a custom * runner is used, this method must be called appropriately, otherwise the two * convenience methods won't work. */ diff --git a/src/com/google/android/droiddriver/helpers/PollingListeners.java b/src/io/appium/droiddriver/helpers/PollingListeners.java index 154818f..2508fdf 100644 --- a/src/com/google/android/droiddriver/helpers/PollingListeners.java +++ b/src/io/appium/droiddriver/helpers/PollingListeners.java @@ -1,9 +1,9 @@ -package com.google.android.droiddriver.helpers; +package io.appium.droiddriver.helpers; -import com.google.android.droiddriver.DroidDriver; -import com.google.android.droiddriver.Poller.PollingListener; -import com.google.android.droiddriver.exceptions.ElementNotFoundException; -import com.google.android.droiddriver.finders.Finder; +import io.appium.droiddriver.DroidDriver; +import io.appium.droiddriver.Poller.PollingListener; +import io.appium.droiddriver.exceptions.ElementNotFoundException; +import io.appium.droiddriver.finders.Finder; /** * Static utility methods to create commonly used PollingListeners. diff --git a/src/com/google/android/droiddriver/helpers/ScrollerHelper.java b/src/io/appium/droiddriver/helpers/ScrollerHelper.java index c6cc4a4..857ccda 100644 --- a/src/com/google/android/droiddriver/helpers/ScrollerHelper.java +++ b/src/io/appium/droiddriver/helpers/ScrollerHelper.java @@ -14,14 +14,14 @@ * limitations under the License. */ -package com.google.android.droiddriver.helpers; +package io.appium.droiddriver.helpers; -import com.google.android.droiddriver.DroidDriver; -import com.google.android.droiddriver.UiElement; -import com.google.android.droiddriver.exceptions.ElementNotFoundException; -import com.google.android.droiddriver.finders.Finder; -import com.google.android.droiddriver.scroll.Direction.PhysicalDirection; -import com.google.android.droiddriver.scroll.Scroller; +import io.appium.droiddriver.DroidDriver; +import io.appium.droiddriver.UiElement; +import io.appium.droiddriver.exceptions.ElementNotFoundException; +import io.appium.droiddriver.finders.Finder; +import io.appium.droiddriver.scroll.Direction.PhysicalDirection; +import io.appium.droiddriver.scroll.Scroller; /** * Helper for Scroller. diff --git a/src/com/google/android/droiddriver/helpers/SingleRun.java b/src/io/appium/droiddriver/helpers/SingleRun.java index f9c7197..5ffd21e 100644 --- a/src/com/google/android/droiddriver/helpers/SingleRun.java +++ b/src/io/appium/droiddriver/helpers/SingleRun.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.google.android.droiddriver.helpers; +package io.appium.droiddriver.helpers; import java.util.concurrent.atomic.AtomicBoolean; diff --git a/src/com/google/android/droiddriver/helpers/package-info.java b/src/io/appium/droiddriver/helpers/package-info.java index e39e003..62d1f25 100644 --- a/src/com/google/android/droiddriver/helpers/package-info.java +++ b/src/io/appium/droiddriver/helpers/package-info.java @@ -108,4 +108,4 @@ public void setUp() throws Exception { </pre></li> * </ul> */ -package com.google.android.droiddriver.helpers; +package io.appium.droiddriver.helpers; diff --git a/src/com/google/android/droiddriver/instrumentation/InstrumentationDriver.java b/src/io/appium/droiddriver/instrumentation/InstrumentationDriver.java index bd05b8d..fa3fb8e 100644 --- a/src/com/google/android/droiddriver/instrumentation/InstrumentationDriver.java +++ b/src/io/appium/droiddriver/instrumentation/InstrumentationDriver.java @@ -14,23 +14,23 @@ * limitations under the License. */ -package com.google.android.droiddriver.instrumentation; +package io.appium.droiddriver.instrumentation; import android.app.Instrumentation; import android.os.SystemClock; import android.util.Log; import android.view.View; -import com.google.android.droiddriver.actions.InputInjector; -import com.google.android.droiddriver.base.BaseDroidDriver; -import com.google.android.droiddriver.base.DroidDriverContext; -import com.google.android.droiddriver.exceptions.DroidDriverException; -import com.google.android.droiddriver.exceptions.NoRunningActivityException; -import com.google.android.droiddriver.util.ActivityUtils; -import com.google.android.droiddriver.util.Logs; - import java.util.List; +import io.appium.droiddriver.actions.InputInjector; +import io.appium.droiddriver.base.BaseDroidDriver; +import io.appium.droiddriver.base.DroidDriverContext; +import io.appium.droiddriver.exceptions.DroidDriverException; +import io.appium.droiddriver.exceptions.NoRunningActivityException; +import io.appium.droiddriver.util.ActivityUtils; +import io.appium.droiddriver.util.Logs; + /** * Implementation of DroidDriver that is driven via instrumentation. */ diff --git a/src/com/google/android/droiddriver/instrumentation/InstrumentationInputInjector.java b/src/io/appium/droiddriver/instrumentation/InstrumentationInputInjector.java index 7e47e90..52f4730 100644 --- a/src/com/google/android/droiddriver/instrumentation/InstrumentationInputInjector.java +++ b/src/io/appium/droiddriver/instrumentation/InstrumentationInputInjector.java @@ -14,15 +14,15 @@ * limitations under the License. */ -package com.google.android.droiddriver.instrumentation; +package io.appium.droiddriver.instrumentation; import android.app.Instrumentation; import android.view.InputEvent; import android.view.KeyEvent; import android.view.MotionEvent; -import com.google.android.droiddriver.actions.InputInjector; -import com.google.android.droiddriver.exceptions.ActionException; +import io.appium.droiddriver.actions.InputInjector; +import io.appium.droiddriver.exceptions.ActionException; public class InstrumentationInputInjector implements InputInjector { private final Instrumentation instrumentation; diff --git a/src/com/google/android/droiddriver/instrumentation/InstrumentationUiDevice.java b/src/io/appium/droiddriver/instrumentation/InstrumentationUiDevice.java index f94137f..3e3b35c 100644 --- a/src/com/google/android/droiddriver/instrumentation/InstrumentationUiDevice.java +++ b/src/io/appium/droiddriver/instrumentation/InstrumentationUiDevice.java @@ -14,19 +14,19 @@ * limitations under the License. */ -package com.google.android.droiddriver.instrumentation; +package io.appium.droiddriver.instrumentation; import android.graphics.Bitmap; +import android.graphics.Bitmap.Config; import android.graphics.Canvas; import android.graphics.Rect; import android.graphics.RectF; -import android.graphics.Bitmap.Config; import android.util.Log; import android.view.View; -import com.google.android.droiddriver.base.BaseUiDevice; -import com.google.android.droiddriver.base.DroidDriverContext; -import com.google.android.droiddriver.util.Logs; +import io.appium.droiddriver.base.BaseUiDevice; +import io.appium.droiddriver.base.DroidDriverContext; +import io.appium.droiddriver.util.Logs; class InstrumentationUiDevice extends BaseUiDevice { private final DroidDriverContext<View, ViewElement> context; diff --git a/src/com/google/android/droiddriver/instrumentation/RootFinder.java b/src/io/appium/droiddriver/instrumentation/RootFinder.java index b880c3a..0cdc54e 100644 --- a/src/com/google/android/droiddriver/instrumentation/RootFinder.java +++ b/src/io/appium/droiddriver/instrumentation/RootFinder.java @@ -14,20 +14,19 @@ * limitations under the License. */ -package com.google.android.droiddriver.instrumentation; +package io.appium.droiddriver.instrumentation; import android.os.Build; import android.view.View; -import com.google.android.droiddriver.exceptions.DroidDriverException; - import java.lang.reflect.Field; import java.lang.reflect.InvocationTargetException; import java.lang.reflect.Method; - import java.util.Arrays; import java.util.List; +import io.appium.droiddriver.exceptions.DroidDriverException; + /** * Class to find the root view. */ diff --git a/src/com/google/android/droiddriver/instrumentation/ViewElement.java b/src/io/appium/droiddriver/instrumentation/ViewElement.java index d1379cd..a92dee4 100644 --- a/src/com/google/android/droiddriver/instrumentation/ViewElement.java +++ b/src/io/appium/droiddriver/instrumentation/ViewElement.java @@ -14,9 +14,7 @@ * limitations under the License. */ -package com.google.android.droiddriver.instrumentation; - -import static com.google.android.droiddriver.util.Strings.charSequenceToString; +package io.appium.droiddriver.instrumentation; import android.content.res.Resources; import android.graphics.Rect; @@ -26,13 +24,6 @@ import android.view.accessibility.AccessibilityNodeInfo; import android.widget.Checkable; import android.widget.TextView; -import com.google.android.droiddriver.actions.InputInjector; -import com.google.android.droiddriver.base.BaseUiElement; -import com.google.android.droiddriver.base.DroidDriverContext; -import com.google.android.droiddriver.exceptions.DroidDriverException; -import com.google.android.droiddriver.finders.Attribute; -import com.google.android.droiddriver.util.Preconditions; - import java.util.ArrayList; import java.util.Collections; import java.util.EnumMap; @@ -41,6 +32,15 @@ import java.util.List; import java.util.Map; import java.util.concurrent.FutureTask; +import io.appium.droiddriver.actions.InputInjector; +import io.appium.droiddriver.base.BaseUiElement; +import io.appium.droiddriver.base.DroidDriverContext; +import io.appium.droiddriver.exceptions.DroidDriverException; +import io.appium.droiddriver.finders.Attribute; +import io.appium.droiddriver.util.Preconditions; + +import static io.appium.droiddriver.util.Strings.charSequenceToString; + /** * A UiElement that is backed by a View. */ @@ -194,7 +194,7 @@ public class ViewElement extends BaseUiElement<View, ViewElement> { * <p> * If tests fail with InstrumentationDriver, find the actual class name by * examining app code or by calling - * {@link com.google.android.droiddriver.DroidDriver#dumpUiElementTree}, then + * {@link io.appium.droiddriver.DroidDriver#dumpUiElementTree}, then * call this method in setUp to override it with the class name seen in * uiautomatorviewer. * </p> @@ -217,7 +217,7 @@ public class ViewElement extends BaseUiElement<View, ViewElement> { * A snapshot of all attributes is taken at construction. The attributes of a * {@code ViewElement} instance are immutable. If the underlying view is * updated, a new {@code ViewElement} instance will be created in - * {@link com.google.android.droiddriver.DroidDriver#refreshUiElementTree}. + * {@link io.appium.droiddriver.DroidDriver#refreshUiElementTree}. */ public ViewElement(DroidDriverContext<View, ViewElement> context, View view, ViewElement parent) { this.context = Preconditions.checkNotNull(context); diff --git a/src/com/google/android/droiddriver/runner/MinSdkVersion.java b/src/io/appium/droiddriver/runner/MinSdkVersion.java index 79efe9e..c1ea2e9 100644 --- a/src/com/google/android/droiddriver/runner/MinSdkVersion.java +++ b/src/io/appium/droiddriver/runner/MinSdkVersion.java @@ -14,16 +14,16 @@ * limitations under the License. */ -package com.google.android.droiddriver.runner; - -import static java.lang.annotation.ElementType.METHOD; -import static java.lang.annotation.ElementType.TYPE; +package io.appium.droiddriver.runner; import java.lang.annotation.Inherited; import java.lang.annotation.Retention; import java.lang.annotation.RetentionPolicy; import java.lang.annotation.Target; +import static java.lang.annotation.ElementType.METHOD; +import static java.lang.annotation.ElementType.TYPE; + /** * This annotation indicates that its target needs a minimum SDK version * specified as its value. diff --git a/src/com/google/android/droiddriver/runner/TestRunner.java b/src/io/appium/droiddriver/runner/TestRunner.java index 0518294..ec97f9c 100644 --- a/src/com/google/android/droiddriver/runner/TestRunner.java +++ b/src/io/appium/droiddriver/runner/TestRunner.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.google.android.droiddriver.runner; +package io.appium.droiddriver.runner; import android.annotation.TargetApi; import android.app.Activity; @@ -26,10 +26,6 @@ import android.test.suitebuilder.TestMethod; import android.util.Log; import com.android.internal.util.Predicate; -import com.google.android.droiddriver.helpers.DroidDrivers; -import com.google.android.droiddriver.util.ActivityUtils; -import com.google.android.droiddriver.util.ActivityUtils.Supplier; -import com.google.android.droiddriver.util.Logs; import junit.framework.AssertionFailedError; import junit.framework.Test; @@ -43,6 +39,11 @@ import java.util.Set; import java.util.concurrent.FutureTask; import java.util.concurrent.TimeUnit; +import io.appium.droiddriver.helpers.DroidDrivers; +import io.appium.droiddriver.util.ActivityUtils; +import io.appium.droiddriver.util.ActivityUtils.Supplier; +import io.appium.droiddriver.util.Logs; + /** * Adds activity watcher to InstrumentationTestRunner. */ diff --git a/src/com/google/android/droiddriver/runner/UseUiAutomation.java b/src/io/appium/droiddriver/runner/UseUiAutomation.java index 36da45a..316ac8f 100644 --- a/src/com/google/android/droiddriver/runner/UseUiAutomation.java +++ b/src/io/appium/droiddriver/runner/UseUiAutomation.java @@ -14,16 +14,16 @@ * limitations under the License. */ -package com.google.android.droiddriver.runner; - -import static java.lang.annotation.ElementType.METHOD; -import static java.lang.annotation.ElementType.TYPE; +package io.appium.droiddriver.runner; import java.lang.annotation.Inherited; import java.lang.annotation.Retention; import java.lang.annotation.RetentionPolicy; import java.lang.annotation.Target; +import static java.lang.annotation.ElementType.METHOD; +import static java.lang.annotation.ElementType.TYPE; + /** * This annotation indicates that its target needs * {@link android.app.UiAutomation}. It is effectively equivalent to diff --git a/src/com/google/android/droiddriver/scroll/AccessibilityEventScrollStepStrategy.java b/src/io/appium/droiddriver/scroll/AccessibilityEventScrollStepStrategy.java index f3fe91d..6050575 100644 --- a/src/com/google/android/droiddriver/scroll/AccessibilityEventScrollStepStrategy.java +++ b/src/io/appium/droiddriver/scroll/AccessibilityEventScrollStepStrategy.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.google.android.droiddriver.scroll; +package io.appium.droiddriver.scroll; import android.annotation.TargetApi; import android.app.UiAutomation; @@ -21,18 +21,18 @@ import android.app.UiAutomation.AccessibilityEventFilter; import android.util.Log; import android.view.accessibility.AccessibilityEvent; -import com.google.android.droiddriver.DroidDriver; -import com.google.android.droiddriver.UiElement; -import com.google.android.droiddriver.actions.SwipeAction; -import com.google.android.droiddriver.exceptions.UnrecoverableException; -import com.google.android.droiddriver.finders.Finder; -import com.google.android.droiddriver.scroll.Direction.Axis; -import com.google.android.droiddriver.scroll.Direction.DirectionConverter; -import com.google.android.droiddriver.scroll.Direction.PhysicalDirection; -import com.google.android.droiddriver.util.Logs; - import java.util.concurrent.TimeoutException; +import io.appium.droiddriver.DroidDriver; +import io.appium.droiddriver.UiElement; +import io.appium.droiddriver.actions.SwipeAction; +import io.appium.droiddriver.exceptions.UnrecoverableException; +import io.appium.droiddriver.finders.Finder; +import io.appium.droiddriver.scroll.Direction.Axis; +import io.appium.droiddriver.scroll.Direction.DirectionConverter; +import io.appium.droiddriver.scroll.Direction.PhysicalDirection; +import io.appium.droiddriver.util.Logs; + /** * A {@link ScrollStepStrategy} that determines whether more scrolling is * possible by checking the {@link AccessibilityEvent} returned by diff --git a/src/com/google/android/droiddriver/scroll/Direction.java b/src/io/appium/droiddriver/scroll/Direction.java index cbbfd6b..bf660e9 100644 --- a/src/com/google/android/droiddriver/scroll/Direction.java +++ b/src/io/appium/droiddriver/scroll/Direction.java @@ -13,12 +13,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.google.android.droiddriver.scroll; +package io.appium.droiddriver.scroll; -import static com.google.android.droiddriver.scroll.Direction.PhysicalDirection.DOWN; -import static com.google.android.droiddriver.scroll.Direction.PhysicalDirection.LEFT; -import static com.google.android.droiddriver.scroll.Direction.PhysicalDirection.RIGHT; -import static com.google.android.droiddriver.scroll.Direction.PhysicalDirection.UP; +import static io.appium.droiddriver.scroll.Direction.PhysicalDirection.DOWN; +import static io.appium.droiddriver.scroll.Direction.PhysicalDirection.LEFT; +import static io.appium.droiddriver.scroll.Direction.PhysicalDirection.RIGHT; +import static io.appium.droiddriver.scroll.Direction.PhysicalDirection.UP; /** * A namespace to hold interfaces and constants for scroll directions. diff --git a/src/com/google/android/droiddriver/scroll/DynamicSentinelStrategy.java b/src/io/appium/droiddriver/scroll/DynamicSentinelStrategy.java index b7ccce8..051cfa7 100644 --- a/src/com/google/android/droiddriver/scroll/DynamicSentinelStrategy.java +++ b/src/io/appium/droiddriver/scroll/DynamicSentinelStrategy.java @@ -13,19 +13,19 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.google.android.droiddriver.scroll; +package io.appium.droiddriver.scroll; import android.util.Log; -import com.google.android.droiddriver.DroidDriver; -import com.google.android.droiddriver.UiElement; -import com.google.android.droiddriver.exceptions.ElementNotFoundException; -import com.google.android.droiddriver.finders.By; -import com.google.android.droiddriver.finders.Finder; -import com.google.android.droiddriver.scroll.Direction.DirectionConverter; -import com.google.android.droiddriver.scroll.Direction.PhysicalDirection; -import com.google.android.droiddriver.util.Logs; -import com.google.android.droiddriver.util.Strings; +import io.appium.droiddriver.DroidDriver; +import io.appium.droiddriver.UiElement; +import io.appium.droiddriver.exceptions.ElementNotFoundException; +import io.appium.droiddriver.finders.By; +import io.appium.droiddriver.finders.Finder; +import io.appium.droiddriver.scroll.Direction.DirectionConverter; +import io.appium.droiddriver.scroll.Direction.PhysicalDirection; +import io.appium.droiddriver.util.Logs; +import io.appium.droiddriver.util.Strings; /** * Determines whether scrolling is possible by checking whether the sentinel diff --git a/src/com/google/android/droiddriver/scroll/ForwardingScrollStepStrategy.java b/src/io/appium/droiddriver/scroll/ForwardingScrollStepStrategy.java index bf3bc24..c888b60 100644 --- a/src/com/google/android/droiddriver/scroll/ForwardingScrollStepStrategy.java +++ b/src/io/appium/droiddriver/scroll/ForwardingScrollStepStrategy.java @@ -13,14 +13,14 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.google.android.droiddriver.scroll; +package io.appium.droiddriver.scroll; -import com.google.android.droiddriver.DroidDriver; -import com.google.android.droiddriver.UiElement; -import com.google.android.droiddriver.finders.Finder; -import com.google.android.droiddriver.scroll.Direction.DirectionConverter; -import com.google.android.droiddriver.scroll.Direction.PhysicalDirection; +import io.appium.droiddriver.DroidDriver; +import io.appium.droiddriver.UiElement; +import io.appium.droiddriver.finders.Finder; +import io.appium.droiddriver.scroll.Direction.DirectionConverter; +import io.appium.droiddriver.scroll.Direction.PhysicalDirection; /** * An abstract base class for implementing the <a diff --git a/src/com/google/android/droiddriver/scroll/ScrollStepStrategy.java b/src/io/appium/droiddriver/scroll/ScrollStepStrategy.java index 8e3ddc3..a736ff8 100644 --- a/src/com/google/android/droiddriver/scroll/ScrollStepStrategy.java +++ b/src/io/appium/droiddriver/scroll/ScrollStepStrategy.java @@ -13,13 +13,13 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.google.android.droiddriver.scroll; +package io.appium.droiddriver.scroll; -import com.google.android.droiddriver.DroidDriver; -import com.google.android.droiddriver.UiElement; -import com.google.android.droiddriver.finders.Finder; -import com.google.android.droiddriver.scroll.Direction.DirectionConverter; -import com.google.android.droiddriver.scroll.Direction.PhysicalDirection; +import io.appium.droiddriver.DroidDriver; +import io.appium.droiddriver.UiElement; +import io.appium.droiddriver.finders.Finder; +import io.appium.droiddriver.scroll.Direction.DirectionConverter; +import io.appium.droiddriver.scroll.Direction.PhysicalDirection; /** * Interface for determining whether scrolling is possible. diff --git a/src/com/google/android/droiddriver/scroll/Scroller.java b/src/io/appium/droiddriver/scroll/Scroller.java index 277123b..7386be2 100644 --- a/src/com/google/android/droiddriver/scroll/Scroller.java +++ b/src/io/appium/droiddriver/scroll/Scroller.java @@ -13,13 +13,13 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.google.android.droiddriver.scroll; +package io.appium.droiddriver.scroll; -import com.google.android.droiddriver.DroidDriver; -import com.google.android.droiddriver.UiElement; -import com.google.android.droiddriver.exceptions.ElementNotFoundException; -import com.google.android.droiddriver.finders.Finder; -import com.google.android.droiddriver.scroll.Direction.PhysicalDirection; +import io.appium.droiddriver.DroidDriver; +import io.appium.droiddriver.UiElement; +import io.appium.droiddriver.exceptions.ElementNotFoundException; +import io.appium.droiddriver.finders.Finder; +import io.appium.droiddriver.scroll.Direction.PhysicalDirection; /** * Interface for scrolling to the desired item in a scrollable container view. diff --git a/src/com/google/android/droiddriver/scroll/Scrollers.java b/src/io/appium/droiddriver/scroll/Scrollers.java index e95786f..2c9160c 100644 --- a/src/com/google/android/droiddriver/scroll/Scrollers.java +++ b/src/io/appium/droiddriver/scroll/Scrollers.java @@ -14,17 +14,17 @@ * limitations under the License. */ -package com.google.android.droiddriver.scroll; +package io.appium.droiddriver.scroll; import android.app.UiAutomation; import android.widget.ProgressBar; -import com.google.android.droiddriver.DroidDriver; -import com.google.android.droiddriver.finders.By; -import com.google.android.droiddriver.finders.Finder; -import com.google.android.droiddriver.scroll.Direction.Axis; -import com.google.android.droiddriver.scroll.Direction.DirectionConverter; -import com.google.android.droiddriver.scroll.Direction.PhysicalDirection; +import io.appium.droiddriver.DroidDriver; +import io.appium.droiddriver.finders.By; +import io.appium.droiddriver.finders.Finder; +import io.appium.droiddriver.scroll.Direction.Axis; +import io.appium.droiddriver.scroll.Direction.DirectionConverter; +import io.appium.droiddriver.scroll.Direction.PhysicalDirection; /** * Static utility classes and methods pertaining to {@link Scroller} instances. diff --git a/src/com/google/android/droiddriver/scroll/SentinelStrategy.java b/src/io/appium/droiddriver/scroll/SentinelStrategy.java index 19c1258..d1583fd 100644 --- a/src/com/google/android/droiddriver/scroll/SentinelStrategy.java +++ b/src/io/appium/droiddriver/scroll/SentinelStrategy.java @@ -13,24 +13,24 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.google.android.droiddriver.scroll; +package io.appium.droiddriver.scroll; import android.util.Log; -import com.google.android.droiddriver.DroidDriver; -import com.google.android.droiddriver.UiElement; -import com.google.android.droiddriver.exceptions.ElementNotFoundException; -import com.google.android.droiddriver.finders.By; -import com.google.android.droiddriver.finders.Finder; -import com.google.android.droiddriver.finders.Predicate; -import com.google.android.droiddriver.finders.Predicates; -import com.google.android.droiddriver.scroll.Direction.DirectionConverter; -import com.google.android.droiddriver.scroll.Direction.LogicalDirection; -import com.google.android.droiddriver.scroll.Direction.PhysicalDirection; -import com.google.android.droiddriver.util.Logs; - import java.util.List; +import io.appium.droiddriver.DroidDriver; +import io.appium.droiddriver.UiElement; +import io.appium.droiddriver.exceptions.ElementNotFoundException; +import io.appium.droiddriver.finders.By; +import io.appium.droiddriver.finders.Finder; +import io.appium.droiddriver.finders.Predicate; +import io.appium.droiddriver.finders.Predicates; +import io.appium.droiddriver.scroll.Direction.DirectionConverter; +import io.appium.droiddriver.scroll.Direction.LogicalDirection; +import io.appium.droiddriver.scroll.Direction.PhysicalDirection; +import io.appium.droiddriver.util.Logs; + /** * A {@link ScrollStepStrategy} that determines whether scrolling is possible * based on a sentinel. diff --git a/src/com/google/android/droiddriver/scroll/StaticSentinelStrategy.java b/src/io/appium/droiddriver/scroll/StaticSentinelStrategy.java index 4cd3bc7..cc2444b 100644 --- a/src/com/google/android/droiddriver/scroll/StaticSentinelStrategy.java +++ b/src/io/appium/droiddriver/scroll/StaticSentinelStrategy.java @@ -13,16 +13,16 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.google.android.droiddriver.scroll; +package io.appium.droiddriver.scroll; import android.graphics.Rect; -import com.google.android.droiddriver.DroidDriver; -import com.google.android.droiddriver.UiElement; -import com.google.android.droiddriver.finders.Finder; -import com.google.android.droiddriver.instrumentation.InstrumentationDriver; -import com.google.android.droiddriver.scroll.Direction.DirectionConverter; -import com.google.android.droiddriver.scroll.Direction.PhysicalDirection; +import io.appium.droiddriver.DroidDriver; +import io.appium.droiddriver.UiElement; +import io.appium.droiddriver.finders.Finder; +import io.appium.droiddriver.instrumentation.InstrumentationDriver; +import io.appium.droiddriver.scroll.Direction.DirectionConverter; +import io.appium.droiddriver.scroll.Direction.PhysicalDirection; /** * Determines whether scrolling is possible by checking whether the last child diff --git a/src/com/google/android/droiddriver/scroll/StepBasedScroller.java b/src/io/appium/droiddriver/scroll/StepBasedScroller.java index d962ed3..6dbc79e 100644 --- a/src/com/google/android/droiddriver/scroll/StepBasedScroller.java +++ b/src/io/appium/droiddriver/scroll/StepBasedScroller.java @@ -13,23 +13,23 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.google.android.droiddriver.scroll; - -import static com.google.android.droiddriver.scroll.Direction.LogicalDirection.BACKWARD; +package io.appium.droiddriver.scroll; import android.util.Log; -import com.google.android.droiddriver.DroidDriver; -import com.google.android.droiddriver.Poller; -import com.google.android.droiddriver.UiElement; -import com.google.android.droiddriver.exceptions.ElementNotFoundException; -import com.google.android.droiddriver.exceptions.TimeoutException; -import com.google.android.droiddriver.finders.By; -import com.google.android.droiddriver.finders.Finder; -import com.google.android.droiddriver.scroll.Direction.Axis; -import com.google.android.droiddriver.scroll.Direction.DirectionConverter; -import com.google.android.droiddriver.scroll.Direction.PhysicalDirection; -import com.google.android.droiddriver.util.Logs; +import io.appium.droiddriver.DroidDriver; +import io.appium.droiddriver.Poller; +import io.appium.droiddriver.UiElement; +import io.appium.droiddriver.exceptions.ElementNotFoundException; +import io.appium.droiddriver.exceptions.TimeoutException; +import io.appium.droiddriver.finders.By; +import io.appium.droiddriver.finders.Finder; +import io.appium.droiddriver.scroll.Direction.Axis; +import io.appium.droiddriver.scroll.Direction.DirectionConverter; +import io.appium.droiddriver.scroll.Direction.PhysicalDirection; +import io.appium.droiddriver.util.Logs; + +import static io.appium.droiddriver.scroll.Direction.LogicalDirection.BACKWARD; /** * A {@link Scroller} that looks for the desired item in the currently shown diff --git a/src/com/google/android/droiddriver/uiautomation/AccessibilityDriver.java b/src/io/appium/droiddriver/uiautomation/AccessibilityDriver.java index 6e7441d..29c6428 100644 --- a/src/com/google/android/droiddriver/uiautomation/AccessibilityDriver.java +++ b/src/io/appium/droiddriver/uiautomation/AccessibilityDriver.java @@ -14,17 +14,17 @@ * limitations under the License. */ -package com.google.android.droiddriver.uiautomation; +package io.appium.droiddriver.uiautomation; import android.app.Instrumentation; import android.view.accessibility.AccessibilityNodeInfo; -import com.google.android.droiddriver.validators.DefaultAccessibilityValidator; -import com.google.android.droiddriver.validators.ExemptRootValidator; -import com.google.android.droiddriver.validators.FirstApplicableValidator; -import com.google.android.droiddriver.validators.ExemptedClassesValidator; -import com.google.android.droiddriver.validators.ExemptScrollActionValidator; -import com.google.android.droiddriver.validators.Validator; +import io.appium.droiddriver.validators.DefaultAccessibilityValidator; +import io.appium.droiddriver.validators.ExemptRootValidator; +import io.appium.droiddriver.validators.ExemptScrollActionValidator; +import io.appium.droiddriver.validators.ExemptedClassesValidator; +import io.appium.droiddriver.validators.FirstApplicableValidator; +import io.appium.droiddriver.validators.Validator; /** * A UiAutomationDriver that validates accessibility. diff --git a/src/com/google/android/droiddriver/uiautomation/UiAutomationContext.java b/src/io/appium/droiddriver/uiautomation/UiAutomationContext.java index ef13bfb..da7f329 100644 --- a/src/com/google/android/droiddriver/uiautomation/UiAutomationContext.java +++ b/src/io/appium/droiddriver/uiautomation/UiAutomationContext.java @@ -14,15 +14,15 @@ * limitations under the License. */ -package com.google.android.droiddriver.uiautomation; +package io.appium.droiddriver.uiautomation; import android.annotation.TargetApi; import android.app.Instrumentation; import android.app.UiAutomation; import android.view.accessibility.AccessibilityNodeInfo; -import com.google.android.droiddriver.base.DroidDriverContext; -import com.google.android.droiddriver.exceptions.UnrecoverableException; +import io.appium.droiddriver.base.DroidDriverContext; +import io.appium.droiddriver.exceptions.UnrecoverableException; @TargetApi(18) public class UiAutomationContext extends diff --git a/src/com/google/android/droiddriver/uiautomation/UiAutomationDriver.java b/src/io/appium/droiddriver/uiautomation/UiAutomationDriver.java index 9ace07e..2e5d799 100644 --- a/src/com/google/android/droiddriver/uiautomation/UiAutomationDriver.java +++ b/src/io/appium/droiddriver/uiautomation/UiAutomationDriver.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.google.android.droiddriver.uiautomation; +package io.appium.droiddriver.uiautomation; import android.annotation.TargetApi; import android.app.Instrumentation; @@ -25,11 +25,11 @@ import android.view.accessibility.AccessibilityEvent; import android.view.accessibility.AccessibilityManager; import android.view.accessibility.AccessibilityNodeInfo; -import com.google.android.droiddriver.actions.InputInjector; -import com.google.android.droiddriver.base.BaseDroidDriver; -import com.google.android.droiddriver.exceptions.TimeoutException; -import com.google.android.droiddriver.uiautomation.UiAutomationContext.UiAutomationCallable; -import com.google.android.droiddriver.util.Logs; +import io.appium.droiddriver.actions.InputInjector; +import io.appium.droiddriver.base.BaseDroidDriver; +import io.appium.droiddriver.exceptions.TimeoutException; +import io.appium.droiddriver.uiautomation.UiAutomationContext.UiAutomationCallable; +import io.appium.droiddriver.util.Logs; /** * Implementation of DroidDriver that gets attributes via the Accessibility API diff --git a/src/com/google/android/droiddriver/uiautomation/UiAutomationElement.java b/src/io/appium/droiddriver/uiautomation/UiAutomationElement.java index cc9b315..cf7449e 100644 --- a/src/com/google/android/droiddriver/uiautomation/UiAutomationElement.java +++ b/src/io/appium/droiddriver/uiautomation/UiAutomationElement.java @@ -14,9 +14,7 @@ * limitations under the License. */ -package com.google.android.droiddriver.uiautomation; - -import static com.google.android.droiddriver.util.Strings.charSequenceToString; +package io.appium.droiddriver.uiautomation; import android.annotation.TargetApi; import android.app.UiAutomation; @@ -25,12 +23,6 @@ import android.graphics.Rect; import android.view.accessibility.AccessibilityEvent; import android.view.accessibility.AccessibilityNodeInfo; -import com.google.android.droiddriver.actions.InputInjector; -import com.google.android.droiddriver.base.BaseUiElement; -import com.google.android.droiddriver.finders.Attribute; -import com.google.android.droiddriver.uiautomation.UiAutomationContext.UiAutomationCallable; -import com.google.android.droiddriver.util.Preconditions; - import java.util.ArrayList; import java.util.Collections; import java.util.EnumMap; @@ -39,6 +31,14 @@ import java.util.Map; import java.util.concurrent.FutureTask; import java.util.concurrent.TimeoutException; +import io.appium.droiddriver.actions.InputInjector; +import io.appium.droiddriver.base.BaseUiElement; +import io.appium.droiddriver.finders.Attribute; +import io.appium.droiddriver.uiautomation.UiAutomationContext.UiAutomationCallable; +import io.appium.droiddriver.util.Preconditions; + +import static io.appium.droiddriver.util.Strings.charSequenceToString; + /** * A UiElement that gets attributes via the Accessibility API. */ @@ -64,7 +64,7 @@ public class UiAutomationElement extends BaseUiElement<AccessibilityNodeInfo, Ui * {@code UiAutomationElement} instance are immutable. If the underlying * {@link AccessibilityNodeInfo} is updated, a new {@code UiAutomationElement} * instance will be created in - * {@link com.google.android.droiddriver.DroidDriver#refreshUiElementTree}. + * {@link io.appium.droiddriver.DroidDriver#refreshUiElementTree}. */ protected UiAutomationElement(UiAutomationContext context, AccessibilityNodeInfo node, UiAutomationElement parent) { diff --git a/src/com/google/android/droiddriver/uiautomation/UiAutomationInputInjector.java b/src/io/appium/droiddriver/uiautomation/UiAutomationInputInjector.java index ddbed5f..591b9f4 100644 --- a/src/com/google/android/droiddriver/uiautomation/UiAutomationInputInjector.java +++ b/src/io/appium/droiddriver/uiautomation/UiAutomationInputInjector.java @@ -14,14 +14,14 @@ * limitations under the License. */ -package com.google.android.droiddriver.uiautomation; +package io.appium.droiddriver.uiautomation; import android.annotation.TargetApi; import android.app.UiAutomation; import android.view.InputEvent; -import com.google.android.droiddriver.actions.InputInjector; -import com.google.android.droiddriver.uiautomation.UiAutomationContext.UiAutomationCallable; +import io.appium.droiddriver.actions.InputInjector; +import io.appium.droiddriver.uiautomation.UiAutomationContext.UiAutomationCallable; @TargetApi(18) public class UiAutomationInputInjector implements InputInjector { diff --git a/src/com/google/android/droiddriver/uiautomation/UiAutomationUiDevice.java b/src/io/appium/droiddriver/uiautomation/UiAutomationUiDevice.java index 06a417e..64c1b9d 100644 --- a/src/com/google/android/droiddriver/uiautomation/UiAutomationUiDevice.java +++ b/src/io/appium/droiddriver/uiautomation/UiAutomationUiDevice.java @@ -14,17 +14,17 @@ * limitations under the License. */ -package com.google.android.droiddriver.uiautomation; +package io.appium.droiddriver.uiautomation; import android.annotation.TargetApi; import android.app.UiAutomation; import android.graphics.Bitmap; import android.util.Log; -import com.google.android.droiddriver.base.BaseUiDevice; -import com.google.android.droiddriver.exceptions.UnrecoverableException; -import com.google.android.droiddriver.uiautomation.UiAutomationContext.UiAutomationCallable; -import com.google.android.droiddriver.util.Logs; +import io.appium.droiddriver.base.BaseUiDevice; +import io.appium.droiddriver.exceptions.UnrecoverableException; +import io.appium.droiddriver.uiautomation.UiAutomationContext.UiAutomationCallable; +import io.appium.droiddriver.util.Logs; @TargetApi(18) class UiAutomationUiDevice extends BaseUiDevice { diff --git a/src/com/google/android/droiddriver/util/ActivityUtils.java b/src/io/appium/droiddriver/util/ActivityUtils.java index da1480b..1e35de8 100644 --- a/src/com/google/android/droiddriver/util/ActivityUtils.java +++ b/src/io/appium/droiddriver/util/ActivityUtils.java @@ -14,12 +14,12 @@ * limitations under the License. */ -package com.google.android.droiddriver.util; +package io.appium.droiddriver.util; import android.app.Activity; -import com.google.android.droiddriver.exceptions.UnrecoverableException; -import com.google.android.droiddriver.instrumentation.InstrumentationDriver; +import io.appium.droiddriver.exceptions.UnrecoverableException; +import io.appium.droiddriver.instrumentation.InstrumentationDriver; /** * Static helper methods for retrieving activities. @@ -39,7 +39,7 @@ public class ActivityUtils { /** * Sets the Supplier for the running (a.k.a. resumed or foreground) activity. - * Called from {@link com.google.android.droiddriver.runner.TestRunner}. If a + * Called from {@link io.appium.droiddriver.runner.TestRunner}. If a * custom runner is used, this method must be called appropriately, otherwise * {@link #getRunningActivity} won't work. */ diff --git a/src/com/google/android/droiddriver/util/Events.java b/src/io/appium/droiddriver/util/Events.java index 79c7958..ae3c7e3 100644 --- a/src/com/google/android/droiddriver/util/Events.java +++ b/src/io/appium/droiddriver/util/Events.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.google.android.droiddriver.util; +package io.appium.droiddriver.util; import android.annotation.TargetApi; import android.os.Build; @@ -25,8 +25,8 @@ import android.view.InputEvent; import android.view.KeyEvent; import android.view.MotionEvent; -import com.google.android.droiddriver.actions.InputInjector; -import com.google.android.droiddriver.exceptions.ActionException; +import io.appium.droiddriver.actions.InputInjector; +import io.appium.droiddriver.exceptions.ActionException; /** * Helper methods to create InputEvents. diff --git a/src/com/google/android/droiddriver/util/FileUtils.java b/src/io/appium/droiddriver/util/FileUtils.java index 6722dc1..859ed3d 100644 --- a/src/com/google/android/droiddriver/util/FileUtils.java +++ b/src/io/appium/droiddriver/util/FileUtils.java @@ -14,19 +14,19 @@ * limitations under the License. */ -package com.google.android.droiddriver.util; +package io.appium.droiddriver.util; import android.annotation.TargetApi; import android.os.Build; import android.util.Log; -import com.google.android.droiddriver.exceptions.DroidDriverException; - import java.io.BufferedOutputStream; import java.io.File; import java.io.FileNotFoundException; import java.io.FileOutputStream; +import io.appium.droiddriver.exceptions.DroidDriverException; + /** * Internal helper methods for manipulating files. */ diff --git a/src/com/google/android/droiddriver/util/Logs.java b/src/io/appium/droiddriver/util/Logs.java index 3491b96..fdbbce2 100644 --- a/src/com/google/android/droiddriver/util/Logs.java +++ b/src/io/appium/droiddriver/util/Logs.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.google.android.droiddriver.util; +package io.appium.droiddriver.util; import android.text.TextUtils; import android.util.Log; diff --git a/src/com/google/android/droiddriver/util/Preconditions.java b/src/io/appium/droiddriver/util/Preconditions.java index aaf545d..74ddbfa 100644 --- a/src/com/google/android/droiddriver/util/Preconditions.java +++ b/src/io/appium/droiddriver/util/Preconditions.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.google.android.droiddriver.util; +package io.appium.droiddriver.util; /** * Simple static methods to be called at the start of your own methods to verify diff --git a/src/com/google/android/droiddriver/util/Strings.java b/src/io/appium/droiddriver/util/Strings.java index ea75238..7ba3317 100644 --- a/src/com/google/android/droiddriver/util/Strings.java +++ b/src/io/appium/droiddriver/util/Strings.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.google.android.droiddriver.util; +package io.appium.droiddriver.util; /** * Static helper methods for manipulating strings. diff --git a/src/com/google/android/droiddriver/validators/DefaultAccessibilityValidator.java b/src/io/appium/droiddriver/validators/DefaultAccessibilityValidator.java index 4e9704a..1ce3649 100644 --- a/src/com/google/android/droiddriver/validators/DefaultAccessibilityValidator.java +++ b/src/io/appium/droiddriver/validators/DefaultAccessibilityValidator.java @@ -14,15 +14,15 @@ * limitations under the License. */ -package com.google.android.droiddriver.validators; +package io.appium.droiddriver.validators; import android.annotation.TargetApi; import android.text.TextUtils; import android.view.accessibility.AccessibilityNodeInfo; -import com.google.android.droiddriver.UiElement; -import com.google.android.droiddriver.actions.Action; -import com.google.android.droiddriver.uiautomation.UiAutomationElement; +import io.appium.droiddriver.UiElement; +import io.appium.droiddriver.actions.Action; +import io.appium.droiddriver.uiautomation.UiAutomationElement; /** * Fall-back Validator for accessibility. diff --git a/src/com/google/android/droiddriver/validators/ExemptRootValidator.java b/src/io/appium/droiddriver/validators/ExemptRootValidator.java index 1846e37..525ef57 100644 --- a/src/com/google/android/droiddriver/validators/ExemptRootValidator.java +++ b/src/io/appium/droiddriver/validators/ExemptRootValidator.java @@ -14,10 +14,10 @@ * limitations under the License. */ -package com.google.android.droiddriver.validators; +package io.appium.droiddriver.validators; -import com.google.android.droiddriver.UiElement; -import com.google.android.droiddriver.actions.Action; +import io.appium.droiddriver.UiElement; +import io.appium.droiddriver.actions.Action; /** * Exempts root from validation. diff --git a/src/com/google/android/droiddriver/validators/ExemptScrollActionValidator.java b/src/io/appium/droiddriver/validators/ExemptScrollActionValidator.java index d6829ed..5b780a3 100644 --- a/src/com/google/android/droiddriver/validators/ExemptScrollActionValidator.java +++ b/src/io/appium/droiddriver/validators/ExemptScrollActionValidator.java @@ -14,11 +14,11 @@ * limitations under the License. */ -package com.google.android.droiddriver.validators; +package io.appium.droiddriver.validators; -import com.google.android.droiddriver.UiElement; -import com.google.android.droiddriver.actions.Action; -import com.google.android.droiddriver.actions.ScrollAction; +import io.appium.droiddriver.UiElement; +import io.appium.droiddriver.actions.Action; +import io.appium.droiddriver.actions.ScrollAction; /** * {@link ScrollAction} is not validated as TalkBack does not check the diff --git a/src/com/google/android/droiddriver/validators/ExemptedClassesValidator.java b/src/io/appium/droiddriver/validators/ExemptedClassesValidator.java index 268e6b3..894006a 100644 --- a/src/com/google/android/droiddriver/validators/ExemptedClassesValidator.java +++ b/src/io/appium/droiddriver/validators/ExemptedClassesValidator.java @@ -14,14 +14,14 @@ * limitations under the License. */ -package com.google.android.droiddriver.validators; +package io.appium.droiddriver.validators; import android.text.TextUtils; import android.util.Log; -import com.google.android.droiddriver.UiElement; -import com.google.android.droiddriver.actions.Action; -import com.google.android.droiddriver.util.Logs; +import io.appium.droiddriver.UiElement; +import io.appium.droiddriver.actions.Action; +import io.appium.droiddriver.util.Logs; /** * Always validates the classes that TalkBack always has speech. diff --git a/src/com/google/android/droiddriver/validators/FirstApplicableValidator.java b/src/io/appium/droiddriver/validators/FirstApplicableValidator.java index 1c89907..231cacc 100644 --- a/src/com/google/android/droiddriver/validators/FirstApplicableValidator.java +++ b/src/io/appium/droiddriver/validators/FirstApplicableValidator.java @@ -14,10 +14,10 @@ * limitations under the License. */ -package com.google.android.droiddriver.validators; +package io.appium.droiddriver.validators; -import com.google.android.droiddriver.UiElement; -import com.google.android.droiddriver.actions.Action; +import io.appium.droiddriver.UiElement; +import io.appium.droiddriver.actions.Action; /** * Iterates an array of validators and validates against the first one that is diff --git a/src/com/google/android/droiddriver/validators/Validator.java b/src/io/appium/droiddriver/validators/Validator.java index 4c0debb..455b875 100644 --- a/src/com/google/android/droiddriver/validators/Validator.java +++ b/src/io/appium/droiddriver/validators/Validator.java @@ -14,10 +14,10 @@ * limitations under the License. */ -package com.google.android.droiddriver.validators; +package io.appium.droiddriver.validators; -import com.google.android.droiddriver.UiElement; -import com.google.android.droiddriver.actions.Action; +import io.appium.droiddriver.UiElement; +import io.appium.droiddriver.actions.Action; /** * Interface for validating a UiElement, checked when an action is performed. diff --git a/src/com/google/android/droiddriver/validators/VisibilityValidator.java b/src/io/appium/droiddriver/validators/VisibilityValidator.java index df19bd7..d59bcce 100644 --- a/src/com/google/android/droiddriver/validators/VisibilityValidator.java +++ b/src/io/appium/droiddriver/validators/VisibilityValidator.java @@ -14,10 +14,10 @@ * limitations under the License. */ -package com.google.android.droiddriver.validators; +package io.appium.droiddriver.validators; -import com.google.android.droiddriver.UiElement; -import com.google.android.droiddriver.actions.Action; +import io.appium.droiddriver.UiElement; +import io.appium.droiddriver.actions.Action; /** * Validates visibility. |