summaryrefslogtreecommitdiffstats
path: root/docs/html/guide/topics/testing
diff options
context:
space:
mode:
authorPin Ting <pinting@google.com>2012-01-09 18:58:13 -0800
committerAndroid (Google) Code Review <android-gerrit@google.com>2012-01-09 18:58:13 -0800
commit497661d309ea960aa9723ef4e0d064b56515b566 (patch)
treea3a9881e1518102dc91db961e379745b0b542bc7 /docs/html/guide/topics/testing
parentd3be0a76e46584357dbb77fcd200128d0d7dc9a8 (diff)
parente4c1e7db167fb1372bd16422fdcb05b2343abf06 (diff)
downloadframeworks_base-497661d309ea960aa9723ef4e0d064b56515b566.zip
frameworks_base-497661d309ea960aa9723ef4e0d064b56515b566.tar.gz
frameworks_base-497661d309ea960aa9723ef4e0d064b56515b566.tar.bz2
Merge "Fixes typo." into ics-mr1
Diffstat (limited to 'docs/html/guide/topics/testing')
-rwxr-xr-xdocs/html/guide/topics/testing/testing_android.jd4
1 files changed, 2 insertions, 2 deletions
diff --git a/docs/html/guide/topics/testing/testing_android.jd b/docs/html/guide/topics/testing/testing_android.jd
index c8a3f6e..adbc59d 100755
--- a/docs/html/guide/topics/testing/testing_android.jd
+++ b/docs/html/guide/topics/testing/testing_android.jd
@@ -318,7 +318,7 @@ parent.link=index.html
A useful general test case class, especially if you are
just starting out with Android testing, is {@link android.test.AndroidTestCase}. It extends
both {@link junit.framework.TestCase} and {@link junit.framework.Assert}. It provides the
- JUnit-standard <code>setUp()</code> and <code>tearDown()</code> methods, as well as well as
+ JUnit-standard <code>setUp()</code> and <code>tearDown()</code> methods, as well as
all of JUnit's Assert methods. In addition, it provides methods for testing permissions, and a
method that guards against memory leaks by clearing out certain class references.
</p>
@@ -401,7 +401,7 @@ parent.link=index.html
Mock objects isolate tests from a running system by stubbing out or overriding
normal operations. For example, a {@link android.test.mock.MockContentResolver}
replaces the normal resolver framework with its own local framework, which is isolated
- from the rest of the system. MockContentResolver also also stubs out the
+ from the rest of the system. MockContentResolver also stubs out the
{@link android.content.ContentResolver#notifyChange(Uri, ContentObserver, boolean)} method
so that observer objects outside the test environment are not accidentally triggered.
</p>