AI 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/...

Automated import of CL 147167

diff --git a/samples/ApiDemos/tests/src/com/example/android/apis/ApiDemosTest.java b/samples/ApiDemos/tests/src/com/example/android/apis/ApiDemosTest.java
index 0103da8..bc174ea 100644 (file)
--- a/samples/ApiDemos/tests/src/com/example/android/apis/ApiDemosTest.java
+++ b/samples/ApiDemos/tests/src/com/example/android/apis/ApiDemosTest.java
@@ -24,6 +24,12 @@ import android.test.ActivityInstrumentationTestCase;
  */
 public class ApiDemosTest extends ActivityInstrumentationTestCase<ApiDemos> {
 
+    /**
+     * The first constructor parameter 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 of the class - in fact, in
+     * some cases it may not match at all.
+     */
     public ApiDemosTest() {
         super("com.example.android.apis", ApiDemos.class);
     }

diff --git a/samples/ApiDemos/tests/src/com/example/android/apis/view/Focus2ActivityTest.java b/samples/ApiDemos/tests/src/com/example/android/apis/view/Focus2ActivityTest.java
index 91f712f..5938209 100644 (file)
--- a/samples/ApiDemos/tests/src/com/example/android/apis/view/Focus2ActivityTest.java
+++ b/samples/ApiDemos/tests/src/com/example/android/apis/view/Focus2ActivityTest.java
@@ -48,7 +48,12 @@ public class Focus2ActivityTest extends ActivityInstrumentationTestCase<Focus2>
     private Button mCenterButton;
     private Button mRightButton;
 
-
+    /**
+     * The first constructor parameter 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 of the class - in fact, in
+     * some cases it may not match at all.
+     */
     public Focus2ActivityTest() {
         super("com.example.android.apis", Focus2.class);
     }