Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 7fe68528 authored by Allen Hair's avatar Allen Hair Committed by android-build-merger
Browse files

Merge "Deprecate shell-based UI Automator." into nyc-dev am: f298f4a7 

am: f90c5c5f

* commit 'f90c5c5f':
  Deprecate shell-based UI Automator.

Change-Id: Ia9c137231e0815bb0b6d703d1b538148f5d843ec
parents 5b8a1fbd f90c5c5f

cmds/uiautomator/api/current.txt

+10 −10
Original line number Original line Diff line number Diff line 
package com.android.uiautomator.core {

package com.android.uiautomator.core {





  public final class Configurator {

  public final deprecated class Configurator {

    method public long getActionAcknowledgmentTimeout();

    method public long getActionAcknowledgmentTimeout();

    method public static com.android.uiautomator.core.Configurator getInstance();

    method public static com.android.uiautomator.core.Configurator getInstance();

    method public long getKeyInjectionDelay();

    method public long getKeyInjectionDelay();
@@ -14,7 +14,7 @@ package com.android.uiautomator.core { 
    method public com.android.uiautomator.core.Configurator setWaitForSelectorTimeout(long);

    method public com.android.uiautomator.core.Configurator setWaitForSelectorTimeout(long);

  }

  }





  public class UiCollection extends com.android.uiautomator.core.UiObject {

  public deprecated class UiCollection extends com.android.uiautomator.core.UiObject {

    ctor public UiCollection(com.android.uiautomator.core.UiSelector);

    ctor public UiCollection(com.android.uiautomator.core.UiSelector);

    method public com.android.uiautomator.core.UiObject getChildByDescription(com.android.uiautomator.core.UiSelector, java.lang.String) throws com.android.uiautomator.core.UiObjectNotFoundException;

    method public com.android.uiautomator.core.UiObject getChildByDescription(com.android.uiautomator.core.UiSelector, java.lang.String) throws com.android.uiautomator.core.UiObjectNotFoundException;

    method public com.android.uiautomator.core.UiObject getChildByInstance(com.android.uiautomator.core.UiSelector, int) throws com.android.uiautomator.core.UiObjectNotFoundException;

    method public com.android.uiautomator.core.UiObject getChildByInstance(com.android.uiautomator.core.UiSelector, int) throws com.android.uiautomator.core.UiObjectNotFoundException;
@@ -22,7 +22,7 @@ package com.android.uiautomator.core { 
    method public int getChildCount(com.android.uiautomator.core.UiSelector);

    method public int getChildCount(com.android.uiautomator.core.UiSelector);

  }

  }





  public class UiDevice {

  public deprecated class UiDevice {

    method public void clearLastTraversedText();

    method public void clearLastTraversedText();

    method public boolean click(int, int);

    method public boolean click(int, int);

    method public boolean drag(int, int, int, int, int);

    method public boolean drag(int, int, int, int, int);
@@ -77,7 +77,7 @@ package com.android.uiautomator.core { 
    method public void wakeUp() throws android.os.RemoteException;

    method public void wakeUp() throws android.os.RemoteException;

  }

  }





  public class UiObject {

  public deprecated class UiObject {

    ctor public UiObject(com.android.uiautomator.core.UiSelector);

    ctor public UiObject(com.android.uiautomator.core.UiSelector);

    method public void clearTextField() throws com.android.uiautomator.core.UiObjectNotFoundException;

    method public void clearTextField() throws com.android.uiautomator.core.UiObjectNotFoundException;

    method public boolean click() throws com.android.uiautomator.core.UiObjectNotFoundException;

    method public boolean click() throws com.android.uiautomator.core.UiObjectNotFoundException;
@@ -130,13 +130,13 @@ package com.android.uiautomator.core { 
    field protected static final long WAIT_FOR_WINDOW_TMEOUT = 5500L; // 0x157cL

    field protected static final long WAIT_FOR_WINDOW_TMEOUT = 5500L; // 0x157cL

  }

  }





  public class UiObjectNotFoundException extends java.lang.Exception {

  public deprecated class UiObjectNotFoundException extends java.lang.Exception {

    ctor public UiObjectNotFoundException(java.lang.String);

    ctor public UiObjectNotFoundException(java.lang.String);

    ctor public UiObjectNotFoundException(java.lang.String, java.lang.Throwable);

    ctor public UiObjectNotFoundException(java.lang.String, java.lang.Throwable);

    ctor public UiObjectNotFoundException(java.lang.Throwable);

    ctor public UiObjectNotFoundException(java.lang.Throwable);

  }

  }





  public class UiScrollable extends com.android.uiautomator.core.UiCollection {

  public deprecated class UiScrollable extends com.android.uiautomator.core.UiCollection {

    ctor public UiScrollable(com.android.uiautomator.core.UiSelector);

    ctor public UiScrollable(com.android.uiautomator.core.UiSelector);

    method protected boolean exists(com.android.uiautomator.core.UiSelector);

    method protected boolean exists(com.android.uiautomator.core.UiSelector);

    method public boolean flingBackward() throws com.android.uiautomator.core.UiObjectNotFoundException;

    method public boolean flingBackward() throws com.android.uiautomator.core.UiObjectNotFoundException;
@@ -165,7 +165,7 @@ package com.android.uiautomator.core { 
    method public com.android.uiautomator.core.UiScrollable setSwipeDeadZonePercentage(double);

    method public com.android.uiautomator.core.UiScrollable setSwipeDeadZonePercentage(double);

  }

  }





  public class UiSelector {

  public deprecated class UiSelector {

    ctor public UiSelector();

    ctor public UiSelector();

    method public com.android.uiautomator.core.UiSelector checkable(boolean);

    method public com.android.uiautomator.core.UiSelector checkable(boolean);

    method public com.android.uiautomator.core.UiSelector checked(boolean);

    method public com.android.uiautomator.core.UiSelector checked(boolean);
@@ -198,7 +198,7 @@ package com.android.uiautomator.core { 
    method public com.android.uiautomator.core.UiSelector textStartsWith(java.lang.String);

    method public com.android.uiautomator.core.UiSelector textStartsWith(java.lang.String);

  }

  }





  public abstract interface UiWatcher {

  public abstract deprecated interface UiWatcher {

    method public abstract boolean checkForCondition();

    method public abstract boolean checkForCondition();

  }

  }
@@ -206,11 +206,11 @@ package com.android.uiautomator.core { 




package com.android.uiautomator.testrunner {

package com.android.uiautomator.testrunner {





  public abstract interface IAutomationSupport {

  public abstract deprecated interface IAutomationSupport {

    method public abstract void sendStatus(int, android.os.Bundle);

    method public abstract void sendStatus(int, android.os.Bundle);

  }

  }





  public class UiAutomatorTestCase extends junit.framework.TestCase {

  public deprecated class UiAutomatorTestCase extends junit.framework.TestCase {

    ctor public UiAutomatorTestCase();

    ctor public UiAutomatorTestCase();

    method public com.android.uiautomator.testrunner.IAutomationSupport getAutomationSupport();

    method public com.android.uiautomator.testrunner.IAutomationSupport getAutomationSupport();

    method public android.os.Bundle getParams();

    method public android.os.Bundle getParams();

cmds/uiautomator/cmds/uiautomator/uiautomator

+5 −0
Original line number Original line Diff line number Diff line
@@ -67,6 +67,11 @@ jars= 




# special case pre-processing for 'runtest' command

# special case pre-processing for 'runtest' command

if [ "${cmd}" == "runtest" ]; then

if [ "${cmd}" == "runtest" ]; then

  # Print deprecation warning

  echo "Warning: This version of UI Automator is deprecated. New tests should be written using"

  echo "UI Automator 2.0 which is available as part of the Android Testing Support Library."

  echo "See https://developer.android.com/training/testing/ui-testing/uiautomator-testing.html"

  echo "for more details."

  # first parse the jar paths

  # first parse the jar paths

  while [ true ]; do

  while [ true ]; do

    if [ -z "${1}" ] && [ -z "${jars}" ]; then

    if [ -z "${1}" ] && [ -z "${jars}" ]; then

cmds/uiautomator/instrumentation/testrunner-src/com/android/uiautomator/testrunner/IAutomationSupport.java

+3 −0
Original line number Original line Diff line number Diff line
@@ -22,7 +22,10 @@ import android.os.Bundle; 
 * Provides auxiliary support for running test cases

 * Provides auxiliary support for running test cases

 *

 *

 * @since API Level 16

 * @since API Level 16

 * @deprecated New tests should be written using UI Automator 2.0 which is available as part of the

 * Android Testing Support Library.

 */

 */

@Deprecated

public interface IAutomationSupport {

public interface IAutomationSupport {





    /**

    /**

cmds/uiautomator/instrumentation/testrunner-src/com/android/uiautomator/testrunner/UiAutomatorInstrumentationTestRunner.java

+3 −0
Original line number Original line Diff line number Diff line
@@ -28,7 +28,10 @@ import junit.framework.TestListener; 
/**

/**

 * Test runner for {@link UiAutomatorTestCase}s. Such tests are executed

 * Test runner for {@link UiAutomatorTestCase}s. Such tests are executed

 * on the device and have access to an applications context.

 * on the device and have access to an applications context.

 * @deprecated New tests should be written using UI Automator 2.0 which is available as part of the

 * Android Testing Support Library.

 */

 */

@Deprecated

public class UiAutomatorInstrumentationTestRunner extends InstrumentationTestRunner {

public class UiAutomatorInstrumentationTestRunner extends InstrumentationTestRunner {





    @Override

    @Override

cmds/uiautomator/instrumentation/testrunner-src/com/android/uiautomator/testrunner/UiAutomatorTestCase.java

+3 −0
Original line number Original line Diff line number Diff line
@@ -26,7 +26,10 @@ import com.android.uiautomator.core.UiDevice; 




/**

/**

 * UI Automator test case that is executed on the device.

 * UI Automator test case that is executed on the device.

 * @deprecated New tests should be written using UI Automator 2.0 which is available as part of the

 * Android Testing Support Library.

 */

 */

@Deprecated

public class UiAutomatorTestCase extends InstrumentationTestCase {

public class UiAutomatorTestCase extends InstrumentationTestCase {





    private Bundle mParams;

    private Bundle mParams;