summaryrefslogtreecommitdiffstats
path: root/docs/html/tools
diff options
context:
space:
mode:
authorQuddus Chong <quddusc@google.com>2015-04-03 21:49:43 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2015-04-03 21:49:43 +0000
commitcef55cde1cf1b9b15583d6b4c439dfea7bac7c26 (patch)
treeae2eda7368dee1539b62ef5ba289250b85a0ce1a /docs/html/tools
parent7c167023ed4a9363bfae0ae64c23dde10d5e1d7c (diff)
parentb3c310b60dfab11b9b8d41b00ae06a82090f3d14 (diff)
downloadframeworks_base-cef55cde1cf1b9b15583d6b4c439dfea7bac7c26.zip
frameworks_base-cef55cde1cf1b9b15583d6b4c439dfea7bac7c26.tar.gz
frameworks_base-cef55cde1cf1b9b15583d6b4c439dfea7bac7c26.tar.bz2
am b3c310b6: am ba386b55: am f2c2be78: am d9e2c05d: am 0c3b894c: am 91070dc4: Merge "docs: Added training docs for UI testing frameworks (Espresso, UI Automator)." into lmp-docs
* commit 'b3c310b60dfab11b9b8d41b00ae06a82090f3d14': docs: Added training docs for UI testing frameworks (Espresso, UI Automator).
Diffstat (limited to 'docs/html/tools')
-rw-r--r--docs/html/tools/testing-support-library/index.jd8
1 files changed, 6 insertions, 2 deletions
diff --git a/docs/html/tools/testing-support-library/index.jd b/docs/html/tools/testing-support-library/index.jd
index aeace8e..c8c9ef5 100644
--- a/docs/html/tools/testing-support-library/index.jd
+++ b/docs/html/tools/testing-support-library/index.jd
@@ -391,7 +391,9 @@ onView(withId(R.id.changeTextBt)).perform(click());</pre>
<p>
To learn more about using Espresso, see the
- <a href="{@docRoot}reference/android/support/test/package-summary.html">API reference</a>.
+ <a href="{@docRoot}reference/android/support/test/package-summary.html">API reference</a> and
+ <a href="{@docRoot}training/testing/ui-testing/espresso-testing.html">
+ Testing UI for a Single App</a> training.
</p>
<h3 id="UIAutomator">
@@ -531,7 +533,9 @@ allAppsButton.clickAndWaitForNewWindow();</pre>
<p>
To learn more about using UI Automator, see the
- <a href="{@docRoot}reference/android/support/test/package-summary.html">API reference</a>.
+ <a href="{@docRoot}reference/android/support/test/package-summary.html">API reference</a> and
+ <a href="{@docRoot}training/testing/ui-testing/uiautomator-testing.html">
+ Testing UI for Multiple Apps</a> training.
</p>
<h2 id="setup">