diff --git a/docs/html/guide/developing/testing/testing_otheride.jd b/docs/html/guide/developing/testing/testing_otheride.jd index a76c5b82b6ddc..2bdf4d0b0b70d 100644 --- a/docs/html/guide/developing/testing/testing_otheride.jd +++ b/docs/html/guide/developing/testing/testing_otheride.jd @@ -68,9 +68,9 @@ page.title=Testing In Other IDEs which provides an overview of Android testing.

- If you are using Eclipse with ADT, the best way to test the application is to use Eclipse with ADT - as well. To learn about this, please read the document Testing in Eclipse, with ADT. + If you are developing in Eclipse with ADT, you can set up and run your tests +directly in Eclipse. For more information, please read Testing in Eclipse, with ADT.

Working with Test Projects

diff --git a/docs/html/guide/topics/manifest/instrumentation-element.jd b/docs/html/guide/topics/manifest/instrumentation-element.jd index 1fd1dd0b2db97..b18e77757bd62 100644 --- a/docs/html/guide/topics/manifest/instrumentation-element.jd +++ b/docs/html/guide/topics/manifest/instrumentation-element.jd @@ -51,10 +51,6 @@ name specified in the {@code android:targetPackage}

The application that the Instrumentation object will run against. An application is identified by the package name assigned in its manifest @@ -62,4 +58,8 @@ file by the

In this document

@@ -80,61 +81,84 @@ page.title=Testing and Instrumentation
-

-Android includes a powerful set of testing tools that extend the industry-standard JUnit test framework with features specific to the Android environment. Although you can -test an Android application with JUnit, the Android tools allow you to write much more sophisticated tests for every aspect of your application, both at the unit and at the framework level. -

-

-Key features of the Android testing environment include: -

+ +

Android includes a powerful set of testing tools that extend the +industry-standard JUnit test framework with features specific to the Android +environment. Although you can test an Android application with JUnit, the +Android tools allow you to write much more sophisticated tests for every aspect +of your application, both at the unit and framework levels.

+ +

Key features of the Android testing environment include:

+
    -
  • Android extensions to the JUnit framework that provide access to Android system objects.
    • -
  • An instrumentation framework that lets tests control and examine the application.
    • +
  • Android extensions to the JUnit framework that provide access to Android +system objects.
    • +
  • An instrumentation framework that lets tests control and examine the +application.
  • Mock versions of commonly-used Android system objects.
    • -
  • Tools for running single tests or test suites, with or without instrumentation.
    • -
  • Support for managing tests and test projects in the ADT Plugin for Eclipse and at the command line.
    • +
  • Tools for running single tests or test suites, with or without +instrumentation.
    • +
  • Support for managing tests and test projects in the ADT Plugin for Eclipse +and at the command line.
-

-This document is an overview of the Android testing environment and the way you use it. The document assumes you have a basic knowledge of -Android application programming and JUnit testing methodology. -

+ +

This document is an overview of the Android testing environment and the way +you use it. The document assumes you have a basic knowledge of Android +application programming and JUnit testing methodology.

+

Overview

-

-At the heart of the Android testing environment is an instrumentation framework that your test application uses to precisely control the application under test. With instrumentation, you can -set up mock system objects such as Contexts before the main application starts, control your application at various points of its lifecycle, send UI events to the application, and -examine the application's state during its execution. The instrumentation framework accomplishes this by running both the main application and the test application in the same process. -

-

- Your test application's manifest file links it to the application under test. The the <instrumentation> attribute in the manifest file points to the application under test - and also tells Android how to run the test application. This is described in more detail in the section Instrumentation Test Runner. -

-

-The following diagram summarizes the Android testing environment: -

+ +

At the heart of the Android testing environment is an instrumentation +framework that your test application uses to precisely control the application +under test. With instrumentation, you can set up mock system objects such as +Contexts before the main application starts, control your application at various +points of its lifecycle, send UI events to the application, and examine the +application's state during its execution. The instrumentation framework +accomplishes this by running both the main application and the test application +in the same process.

+ +

Your test application is linked to the application under test by means of an +<instrumentation> +element in the test application's manifest file. The attributes of the element +specify the package name of the application under test and also tell Android how +to run the test application. Instrumentation is described in more detail in the +section Instrumentation Test +Runner.

+ +

The following diagram summarizes the Android testing environment:

+ -

- In Android, test applications are themselves Android applications, so you write them in much the same way as the application you are testing. The SDK tools - help you create a main application project and its test project at the same time. You can run Android tests within Eclipse with ADT or from the command line. - Eclipse with ADT provides an extensive set of tools for creating tests, running them, and viewing their results. You can also use the adb tool to - run tests, or use a built-in Ant target. -

-

- To learn how to set up and run tests in Eclipse, please refer to Testing in Eclipse, with ADT. - If you're not working in Eclipse, refer to Testing in Other IDEs. -

-

- If you want a step-by-step introduction to Android testing, try one of the testing tutorials: -

-
    -
  • - The Hello, Testing tutorial introduces basic testing concepts and procedures in the - context of the Hello, World application. -
    • -
  • - The Activity Testing tutorial is an excellent follow-up to the Hello, Testing tutorial. - It guides you through a more complex testing scenario that you develop against a more realistic application. -
    • -
+ +

In Android, test applications are themselves Android applications, so you +write them in much the same way as the application you are testing. The SDK +tools help you create a main application project and its test project at the same +time. You can run Android tests within Eclipse with ADT or from the command +line. Eclipse with ADT provides an extensive set of tools for creating tests, +running them, and viewing their results. You can also use the adb +tool to run tests, or use a built-in Ant target.

+ +

To learn how to set up and run tests in Eclipse, please refer to Testing in +Eclipse, with ADT. If you're not working in Eclipse, refer to Testing in Other +IDEs.

+ +

If you want a step-by-step introduction to Android testing, try one of the +testing tutorials:

+ +
    +
  • The Hello, +Testing tutorial introduces basic testing concepts and procedures in the +context of the Hello, World application.
    • +
  • The Activity +Testing tutorial is an excellent follow-up to the Hello, Testing tutorial. +It guides you through a more complex testing scenario that you develop against a +more realistic application.
    • +
+

The Testing API

For writing tests and test applications in the Java programming language, Android provides a