Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
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/...

Automated import of CL 147167
This commit is contained in:
Andy Stadler
2009-04-21 11:51:43 -07:00
committed by The Android Open Source Project
parent 5ed91c8170
commit df2a463b01
4 changed files with 29 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
core/java/android/test/InstrumentationTestCase.java
View File

@@ -62,6 +62,10 @@ public class InstrumentationTestCase extends TestCase {
* action = {@link Intent#ACTION_MAIN}
* 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.
@@ -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

12
test-runner/android/test/ActivityInstrumentationTestCase.java
View File

@@ -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
*/

6
test-runner/android/test/ActivityInstrumentationTestCase2.java
View File

@@ -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) {

6
test-runner/android/test/SingleLaunchActivityTestCase.java
View File

@@ -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) {