diff options
| author | Joe Malin <jmalin@google.com> | 2010-10-15 14:26:57 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-10-15 14:26:57 -0700 |
| commit | a79935afd08a2dd891373561a3f46c9fa05b2560 (patch) | |
| tree | 56212cf547cd9aec0582cd8d1524ac8fbd9d64d7 | |
| parent | 21420d6d847e111c425233821eddb918cc50a456 (diff) | |
| parent | 439444d9043c46669d2fe8694ed3db8f09d92282 (diff) | |
| download | frameworks_base-a79935afd08a2dd891373561a3f46c9fa05b2560.zip frameworks_base-a79935afd08a2dd891373561a3f46c9fa05b2560.tar.gz frameworks_base-a79935afd08a2dd891373561a3f46c9fa05b2560.tar.bz2 | |
am 439444d9: am 75d3591b: Merge "DOC CHANGE: Fix bug in Testing doc" into gingerbread
Merge commit '439444d9043c46669d2fe8694ed3db8f09d92282'
* commit '439444d9043c46669d2fe8694ed3db8f09d92282':
DOC CHANGE: Fix bug in Testing doc
| -rw-r--r-- | docs/html/guide/topics/testing/index.jd | 18 |
1 files changed, 7 insertions, 11 deletions
diff --git a/docs/html/guide/topics/testing/index.jd b/docs/html/guide/topics/testing/index.jd index 92ed5a7..42a9db5 100644 --- a/docs/html/guide/topics/testing/index.jd +++ b/docs/html/guide/topics/testing/index.jd @@ -13,14 +13,6 @@ page.title=Testing <h4>Concepts</h4> <ul> <li> - Testing Tools describes the Eclipse with ADT and command-line tools you use to test - Android applications. - </li> - <li> - What to Test is an overview of the types of testing you should do. It focuses on testing - system-wide aspects of Android that can affect every component in your application. - </li> - <li> <a href="{@docRoot}guide/topics/testing/activity_testing.html"> Activity Testing</a> focuses on testing activities. It describes how instrumentation allows you to control activities outside the normal application lifecycle. It also lists @@ -38,6 +30,11 @@ page.title=Testing Service Testing</a> focuses on testing services. It also lists service-specific features you should test. </li> + <li> + <a href="{@docRoot}guide/topics/testing/what_to_test.html">What to Test</a> + is an overview of the types of testing you should do. It focuses on testing + system-wide aspects of Android that can affect every component in your application. + </li> </ul> <h4>Procedures</h4> <ul> @@ -65,9 +62,8 @@ page.title=Testing <h4>Samples</h4> <ul> <li> - <a href="{@docRoot}resources/samples/NotePadTest.html">Note Pad Provider - Test</a> is a test package for the - <a href="{@docRoot}resources/samples/NotePad.html">Note Pad</a> sample + <a href="{@docRoot}resources/samples/NotePadTest.html">Note Pad Test</a> is a test + package for the <a href="{@docRoot}resources/samples/NotePad.html">Note Pad</a> sample application. It provides a simple example of unit testing a {@link android.content.ContentProvider}. </li> |