diff options
| author | Jeff Smith <whydoubt@yahoo.com> | 2012-07-25 15:05:23 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2012-07-25 15:05:23 -0700 |
| commit | ddd88726a247e4100cb62b3dc9d0887ca2ae2ec4 (patch) | |
| tree | 30361d5e73963eaea11100a01fbc7f6e69daae90 /test-runner | |
| parent | 75bea2e8d35044233ba892bedf102ed08406d653 (diff) | |
| parent | 71930dd77e4dc6f6be5c648019d2ab0da5f0584c (diff) | |
| download | frameworks_base-ddd88726a247e4100cb62b3dc9d0887ca2ae2ec4.zip frameworks_base-ddd88726a247e4100cb62b3dc9d0887ca2ae2ec4.tar.gz frameworks_base-ddd88726a247e4100cb62b3dc9d0887ca2ae2ec4.tar.bz2 | |
am 71930dd7: am a45746ef: Fix several cases of broken droiddoc syntax external issue 35214
* commit '71930dd77e4dc6f6be5c648019d2ab0da5f0584c':
Fix several cases of broken droiddoc syntax external issue 35214
Diffstat (limited to 'test-runner')
| -rw-r--r-- | test-runner/src/android/test/MoreAsserts.java | 2 | ||||
| -rw-r--r-- | test-runner/src/android/test/ServiceTestCase.java | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/test-runner/src/android/test/MoreAsserts.java b/test-runner/src/android/test/MoreAsserts.java index 9e0d018..83cc420 100644 --- a/test-runner/src/android/test/MoreAsserts.java +++ b/test-runner/src/android/test/MoreAsserts.java @@ -158,7 +158,7 @@ public final class MoreAsserts { * Asserts that array {@code actual} is the same size and every element * is the same as those in array {@code expected}. Note that this uses * {@code equals()} instead of {@code ==} to compare the objects. - * {@code null} will be considered equal to {code null} (unlike SQL). + * {@code null} will be considered equal to {@code null} (unlike SQL). * On failure, message indicates first specific element mismatch. */ public static void assertEquals( diff --git a/test-runner/src/android/test/ServiceTestCase.java b/test-runner/src/android/test/ServiceTestCase.java index 06c1c5b..eaace27 100644 --- a/test-runner/src/android/test/ServiceTestCase.java +++ b/test-runner/src/android/test/ServiceTestCase.java @@ -91,7 +91,7 @@ import java.util.Random; * {@link #setApplication setApplication()}. You must do this <em>before</em> calling * startService() or bindService(). The test framework provides a * number of alternatives for Context, including - * {link android.test.mock.MockContext MockContext}, + * {@link android.test.mock.MockContext MockContext}, * {@link android.test.RenamingDelegatingContext RenamingDelegatingContext}, * {@link android.content.ContextWrapper ContextWrapper}, and * {@link android.test.IsolatedContext}. |