summaryrefslogtreecommitdiffstats
path: root/docs
diff options
context:
space:
mode:
authorJoe Malin <jmalin@google.com>2010-10-14 12:05:33 -0700
committerAndroid (Google) Code Review <android-gerrit@google.com>2010-10-14 12:05:33 -0700
commit75d3591b2dd60e50182542045147b9b6033c2b85 (patch)
tree05bd86be1147eb59a8b527e5769356bd90030873 /docs
parent2d441e148502bb492816ef84837510397f77a039 (diff)
parent9c61f8fc0108649f4340160a9e0da9d9ee88d392 (diff)
downloadframeworks_base-75d3591b2dd60e50182542045147b9b6033c2b85.zip
frameworks_base-75d3591b2dd60e50182542045147b9b6033c2b85.tar.gz
frameworks_base-75d3591b2dd60e50182542045147b9b6033c2b85.tar.bz2
Merge "DOC CHANGE: Fix bug in Testing doc" into gingerbread
Diffstat (limited to 'docs')
-rw-r--r--docs/html/guide/topics/testing/index.jd18
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>