Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 439444d9 authored by Joe Malin's avatar Joe Malin Committed by Android Git Automerger
Browse files

am 75d3591b: Merge "DOC CHANGE: Fix bug in Testing doc" into gingerbread

Merge commit '75d3591b' into gingerbread-plus-aosp

* commit '75d3591b':
  DOC CHANGE: Fix bug in Testing doc
parents 567db077 75d3591b
Loading
Loading
Loading
Loading
+7 −11
Original line number Diff line number Diff line
@@ -12,14 +12,6 @@ page.title=Testing
</p>
<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
@@ -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>