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

Commit dafac622 authored by Dirk Dougherty's avatar Dirk Dougherty
Browse files

Doc change: cherrypick testing changes from master. Squashed commit of the following: 

commit 3341f42f857058707c1c9f77dcfaecb22ff2f125
Author: Joe Malin <jmalin@google.com>
Date:   Wed Sep 1 14:43:24 2010 -0700

    Doc Change: cherrypick from master -- add screenshots to Testing in Eclipse topic

    Change-Id: If0ebd70ece3f077e18c909db2b8cc499a7f92692

commit af2da09a6c69cac02fd1987a44d223d678b2484d
Author: Dirk Dougherty <ddougherty@google.com>
Date:   Sun Oct 10 12:39:55 2010 -0700

    Doc change: Cherrypick from master -- Testing Documentation in the Dev Guide tab

    Conflicts:

    	docs/html/guide/guide_toc.cs
    	docs/html/guide/topics/testing/testing_android.jd

    Change-Id: I6d2e7b7f69517e8aae3a1274596d2ecbd85cac50

Change-Id: Ic6e547ce25c35060ec073b9da75e1d71b4946a85
parent bed5af7e

docs/html/guide/developing/testing/index.jd

+1 −2
Original line number Diff line number Diff line 
page.title=Testing Overview

@jd:body



<p>

    Android includes powerful tools for setting up and running test applications.

    Whether you are working in Eclipse with ADT or working from the command line, these tools
@@ -9,7 +8,7 @@ page.title=Testing Overview 
</p>

<p>

    If you aren't yet familiar with the Android testing framework, please read the topic

    <a href="{@docRoot}guide/topics/testing/testing_android.html">Testing and Instrumentation</a>

    <a href="{@docRoot}guide/topics/testing/testing_android.html">Testing Fundamentals</a>

    before you get started.

    For a step-by-step introduction to Android testing, try the <a

    href="{@docRoot}resources/tutorials/testing/helloandroid_test.html">Hello, Testing</a>

docs/html/guide/developing/testing/testing_eclipse.jd

+442 −278

File changed.

Preview size limit exceeded, changes collapsed.

docs/html/guide/developing/testing/testing_otheride.jd

+320 −311

File changed.

Preview size limit exceeded, changes collapsed.

docs/html/guide/guide_toc.cs

+26 −4
Original line number Diff line number Diff line
@@ -254,12 +254,34 @@ 
            <li><a href="<?cs var:toroot?>guide/topics/search/searchable-config.html">Searchable Configuration</a></li>

          </ul>

      </li>

      <li class="toggle-list">

           <div>

                <a href="<?cs var:toroot ?>guide/topics/testing/index.html">

                   <span class="en">Testing</span>

               </a> <span class="new">new!</span>

           </div>

           <ul>

              <li><a href="<?cs var:toroot?>guide/topics/testing/testing_android.html">

            <span class="en">Testing and Instrumentation</span>

          </a></li>

                <span class="en">Testing Fundamentals</span></a>

              </li>

              <li><a href="<?cs var:toroot?>guide/topics/testing/activity_testing.html">

                <span class="en">Activity Testing</span></a>

              </li>

              <li><a href="<?cs var:toroot ?>guide/topics/testing/contentprovider_testing.html">

                <span class="en">Content Provider Testing</span></a>

              </li>

              <li><a href="<?cs var:toroot ?>guide/topics/testing/service_testing.html">

                <span class="en">Service Testing</span></a>

              </li>

              <li><a href="<?cs var:toroot ?>guide/topics/testing/what_to_test.html">

                <span class="en">What To Test</span></a>

              </li>

           </ul>

      </li>

     <li><a href="<?cs var:toroot?>guide/topics/admin/device-admin.html">

            <span class="en">Device Administration</span>

         </a> <span class="new">new!</span><!-- 10/8/10 --></li>

         </a> <span class="new">new!</span>

    </li>

    </ul>

  </li>

docs/html/guide/topics/testing/activity_testing.jd

0 → 100644
+392 −0

File added.

Preview size limit exceeded, changes collapsed.