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

Commit 72d5de71 authored by Andy Stadler's avatar Andy Stadler Committed by The Android Open Source Project
Browse files

AI 147169: am: CL 147167 am: CL 147162 Emphasize in the javadoc that the "pkg" parameters to 

  InstrumentationTestCase and its descendants should be the
  package manager package name (not the java package name, and
  not the test package) of the package holding the Activity
  under test.
  Added similar notations to the ApiDemos call sites.
  JAVADOC ONLY - should be safe change for cupcake sdk.
  Original author: stadler
  Merged from: //branches/cupcake/...
  Original author: android-build

Automated import of CL 147169
parent 65640aa0

core/java/android/test/InstrumentationTestCase.java

+9 −0
Original line number Diff line number Diff line
@@ -63,6 +63,10 @@ public class InstrumentationTestCase extends TestCase { 
     *  extras = null, unless a custom bundle is provided here

     * All other fields are null or empty.

     * 

     * <p><b>NOTE:</b> The parameter <i>pkg</i> must refer to the package identifier of the

     * package hosting the activity to be launched, which is specified in the AndroidManifest.xml

     * file.  This is not necessarily the same as the java package name.

     *

     * @param pkg The package hosting the activity to be launched.

     * @param activityCls The activity class to launch.

     * @param extras Optional extra stuff to pass to the activity.
@@ -82,6 +86,11 @@ public class InstrumentationTestCase extends TestCase { 


    /**

     * Utility method for launching an activity with a specific Intent.

     * 

     * <p><b>NOTE:</b> The parameter <i>pkg</i> must refer to the package identifier of the

     * package hosting the activity to be launched, which is specified in the AndroidManifest.xml

     * file.  This is not necessarily the same as the java package name.

     *

     * @param pkg The package hosting the activity to be launched.

     * @param activityCls The activity class to launch.

     * @param intent The intent to launch with

test-runner/android/test/ActivityInstrumentationTestCase.java

+10 −2
Original line number Diff line number Diff line
@@ -40,7 +40,11 @@ public abstract class ActivityInstrumentationTestCase<T extends Activity> 
    boolean mInitialTouchMode = false;



    /**

     * @param pkg The package of the instrumentation.

     * <b>NOTE:</b> The parameter <i>pkg</i> must refer to the package identifier of the

     * package hosting the activity to be launched, which is specified in the AndroidManifest.xml

     * file.  This is not necessarily the same as the java package name.

     * 

     * @param pkg The package hosting the activity to be launched.

     * @param activityClass The activity to test.

     */

    public ActivityInstrumentationTestCase(String pkg, Class<T> activityClass) {
@@ -48,7 +52,11 @@ public abstract class ActivityInstrumentationTestCase<T extends Activity> 
    }



    /**

     * @param pkg The package of the instrumentation.

     * <b>NOTE:</b> The parameter <i>pkg</i> must refer to the package identifier of the

     * package hosting the activity to be launched, which is specified in the AndroidManifest.xml

     * file.  This is not necessarily the same as the java package name.

     * 

     * @param pkg The package hosting the activity to be launched.

     * @param activityClass The activity to test.

     * @param initialTouchMode true = in touch mode

     */

test-runner/android/test/ActivityInstrumentationTestCase2.java

+5 −1
Original line number Diff line number Diff line
@@ -46,7 +46,11 @@ public abstract class ActivityInstrumentationTestCase2<T extends Activity> 
    Intent mActivityIntent = null;



    /**

     * @param pkg The package of the instrumentation.

     * <b>NOTE:</b> The parameter <i>pkg</i> must refer to the package identifier of the

     * package hosting the activity to be launched, which is specified in the AndroidManifest.xml

     * file.  This is not necessarily the same as the java package name.

     * 

     * @param pkg The package hosting the activity to be launched.

     * @param activityClass The activity to test.

     */

    public ActivityInstrumentationTestCase2(String pkg, Class<T> activityClass) {

test-runner/android/test/SingleLaunchActivityTestCase.java

+5 −1
Original line number Diff line number Diff line
@@ -37,7 +37,11 @@ public abstract class SingleLaunchActivityTestCase<T extends Activity> 
    private static boolean sActivityLaunchedFlag = false;



    /**

     * @param pkg The package of the instrumentation.

     * <b>NOTE:</b> The parameter <i>pkg</i> must refer to the package identifier of the

     * package hosting the activity to be launched, which is specified in the AndroidManifest.xml

     * file.  This is not necessarily the same as the java package name.

     *

     * @param pkg The package hosting the activity to be launched.

     * @param activityClass The activity to test.

     */

    public SingleLaunchActivityTestCase(String pkg, Class<T> activityClass) {