diff options
| author | Andy Stadler <> | 2009-04-21 11:54:14 -0700 |
|---|---|---|
| committer | The Android Open Source Project <initial-contribution@android.com> | 2009-04-21 11:54:14 -0700 |
| commit | 72d5de71f205d1c7f43c495d01185b0fbba7c47f (patch) | |
| tree | d9f65dcbe700f732153710f6f06dedc904be1c8c /test-runner | |
| parent | 65640aa0507a618e74cdbcc2ddf53f90cab96e27 (diff) | |
| download | frameworks_base-72d5de71f205d1c7f43c495d01185b0fbba7c47f.zip frameworks_base-72d5de71f205d1c7f43c495d01185b0fbba7c47f.tar.gz frameworks_base-72d5de71f205d1c7f43c495d01185b0fbba7c47f.tar.bz2 | |
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
Diffstat (limited to 'test-runner')
3 files changed, 20 insertions, 4 deletions
diff --git a/test-runner/android/test/ActivityInstrumentationTestCase.java b/test-runner/android/test/ActivityInstrumentationTestCase.java index e5a9991..f6b31ad 100644 --- a/test-runner/android/test/ActivityInstrumentationTestCase.java +++ b/test-runner/android/test/ActivityInstrumentationTestCase.java @@ -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 */ diff --git a/test-runner/android/test/ActivityInstrumentationTestCase2.java b/test-runner/android/test/ActivityInstrumentationTestCase2.java index 7a84eca..679f634 100644 --- a/test-runner/android/test/ActivityInstrumentationTestCase2.java +++ b/test-runner/android/test/ActivityInstrumentationTestCase2.java @@ -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) { diff --git a/test-runner/android/test/SingleLaunchActivityTestCase.java b/test-runner/android/test/SingleLaunchActivityTestCase.java index 8d43b73..b63b3ce 100644 --- a/test-runner/android/test/SingleLaunchActivityTestCase.java +++ b/test-runner/android/test/SingleLaunchActivityTestCase.java @@ -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) { |