package com.example.android.apis;
-import android.test.ActivityInstrumentationTestCase;
+import android.test.ActivityInstrumentationTestCase2;
/**
* Make sure that the main launcher activity opens up properly, which will be
- * verified by {@link ActivityInstrumentationTestCase#testActivityTestCaseSetUpProperly}.
+ * verified by {@link #testActivityTestCaseSetUpProperly}.
*/
-public class ApiDemosTest extends ActivityInstrumentationTestCase<ApiDemos> {
+public class ApiDemosTest extends ActivityInstrumentationTestCase2<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.
+ * Create an {@link ActivityInstrumentationTestCase2} that tests the {@link ApiDemos} activity.
*/
public ApiDemosTest() {
- super("com.example.android.apis", ApiDemos.class);
+ super(ApiDemos.class);
}
+ /**
+ * Verifies that activity under test can be launched.
+ */
+ public void testActivityTestCaseSetUpProperly() {
+ assertNotNull("activity should be launched successfully", getActivity());
+ }
}
import com.example.android.apis.R;
-import android.test.ActivityInstrumentationTestCase;
+import android.test.ActivityInstrumentationTestCase2;
import android.test.suitebuilder.annotation.MediumTest;
import android.view.KeyEvent;
import android.widget.Button;
* See {@link com.example.android.apis.AllTests} for documentation on running
* all tests and individual tests in this application.
*/
-public class Focus2ActivityTest extends ActivityInstrumentationTestCase<Focus2> {
+public class Focus2ActivityTest extends ActivityInstrumentationTestCase2<Focus2> {
private Button mLeftButton;
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.
+ * Creates an {@link ActivityInstrumentationTestCase2} that tests the {@link Focus2} activity.
*/
public Focus2ActivityTest() {
- super("com.example.android.apis", Focus2.class);
+ super(Focus2.class);
}
@Override
protected void setUp() throws Exception {
super.setUp();
final Focus2 a = getActivity();
+ // ensure a valid handle to the activity has been returned
+ assertNotNull(a);
mLeftButton = (Button) a.findViewById(R.id.leftButton);
mCenterButton = (Button) a.findViewById(R.id.centerButton);
mRightButton = (Button) a.findViewById(R.id.rightButton);
package com.example.android.helloactivity;
-import android.test.ActivityInstrumentationTestCase;
-
-import com.example.android.helloactivity.HelloActivity;
+import android.test.ActivityInstrumentationTestCase2;
/**
* Make sure that the main launcher activity opens up properly, which will be
- * verified by {@link ActivityTestCase#testActivityTestCaseSetUpProperly}.
+ * verified by {@link #testActivityTestCaseSetUpProperly}.
*/
-public class HelloActivityTest extends ActivityInstrumentationTestCase<HelloActivity> {
+public class HelloActivityTest extends ActivityInstrumentationTestCase2<HelloActivity> {
+
+ /**
+ * Creates an {@link ActivityInstrumentationTestCase2} for the {@link HelloActivity} activity.
+ */
+ public HelloActivityTest() {
+ super(HelloActivity.class);
+ }
- public HelloActivityTest() {
- super("com.example.android.helloactivity", HelloActivity.class);
- }
-
+ /**
+ * Verifies that the activity under test can be launched.
+ */
+ public void testActivityTestCaseSetUpProperly() {
+ assertNotNull("activity should be launched successfully", getActivity());
+ }
}
package com.example.android.lunarlander;
-import android.test.ActivityInstrumentationTestCase;
+import android.test.ActivityInstrumentationTestCase2;
import com.example.android.lunarlander.LunarLander;
/**
* Make sure that the main launcher activity opens up properly, which will be
- * verified by {@link ActivityTestCase#testActivityTestCaseSetUpProperly}.
+ * verified by {@link #testActivityTestCaseSetUpProperly}.
*/
-public class LunarLanderTest extends ActivityInstrumentationTestCase<LunarLander> {
+public class LunarLanderTest extends ActivityInstrumentationTestCase2<LunarLander> {
- public LunarLanderTest() {
- super("com.example.android.lunarlander", LunarLander.class);
- }
-
+ /**
+ * Creates an {@link ActivityInstrumentationTestCase2} for the {@link LunarLander} activity.
+ */
+ public LunarLanderTest() {
+ super(LunarLander.class);
+ }
+
+ /**
+ * Verifies that the activity under test can be launched.
+ */
+ public void testActivityTestCaseSetUpProperly() {
+ assertNotNull("activity should be launched successfully", getActivity());
+ }
}
package com.example.android.notepad;
-import android.test.ActivityInstrumentationTestCase;
+import android.test.ActivityInstrumentationTestCase2;
import com.example.android.notepad.NotesList;
/**
* Make sure that the main launcher activity opens up properly, which will be
- * verified by {@link ActivityTestCase#testActivityTestCaseSetUpProperly}.
+ * verified by {@link #testActivityTestCaseSetUpProperly}.
*/
-public class NotePadTest extends ActivityInstrumentationTestCase<NotesList> {
+public class NotePadTest extends ActivityInstrumentationTestCase2<NotesList> {
- public NotePadTest() {
- super("com.example.android.notepad", NotesList.class);
- }
+ /**
+ * Creates an {@link ActivityInstrumentationTestCase2} for the {@link NotesList} activity.
+ */
+ public NotePadTest() {
+ super(NotesList.class);
+ }
+ /**
+ * Verifies that the activity under test can be launched.
+ */
+ public void testActivityTestCaseSetUpProperly() {
+ assertNotNull("activity should be launched successfully", getActivity());
+ }
}
package com.example.android.skeletonapp;
-import android.test.ActivityInstrumentationTestCase;
-
-import com.example.android.skeletonapp.SkeletonActivity;
+import android.test.ActivityInstrumentationTestCase2;
/**
* Make sure that the main launcher activity opens up properly, which will be
- * verified by {@link ActivityTestCase#testActivityTestCaseSetUpProperly}.
+ * verified by {@link #testActivityTestCaseSetUpProperly}.
*/
-public class SkeletonAppTest extends ActivityInstrumentationTestCase<SkeletonActivity> {
+public class SkeletonAppTest extends ActivityInstrumentationTestCase2<SkeletonActivity> {
+
+ /**
+ * Creates an {@link ActivityInstrumentationTestCase2} for the {@link SkeletonActivity}
+ * activity.
+ */
+ public SkeletonAppTest() {
+ super(SkeletonActivity.class);
+ }
- public SkeletonAppTest() {
- super("com.example.android.skeletonapp", SkeletonActivity.class);
- }
+ /**
+ * Verifies that the activity under test can be launched.
+ */
+ public void testActivityTestCaseSetUpProperly() {
+ assertNotNull("activity should be launched successfully", getActivity());
+ }
}
package com.example.android.snake;
-import android.test.ActivityInstrumentationTestCase;
-
-import com.example.android.snake.Snake;
+import android.test.ActivityInstrumentationTestCase2;
/**
* Make sure that the main launcher activity opens up properly, which will be
- * verified by {@link ActivityTestCase#testActivityTestCaseSetUpProperly}.
+ * verified by {@link #testActivityTestCaseSetUpProperly}.
*/
-public class SnakeTest extends ActivityInstrumentationTestCase<Snake> {
-
- public SnakeTest() {
- super("com.example.android.snake", Snake.class);
- }
-
+public class SnakeTest extends ActivityInstrumentationTestCase2<Snake> {
+
+ /**
+ * Creates an {@link ActivityInstrumentationTestCase2} for the {@link Snake} activity.
+ */
+ public SnakeTest() {
+ super(Snake.class);
+ }
+
+ /**
+ * Verifies that the activity under test can be launched.
+ */
+ public void testActivityTestCaseSetUpProperly() {
+ assertNotNull("activity should be launched successfully", getActivity());
+ }
}